diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml
index 9bcb4699e93a..6874ec344b77 100644
--- a/.azure/pipelines/ci-public.yml
+++ b/.azure/pipelines/ci-public.yml
@@ -19,6 +19,15 @@ pr:
   branches:
     include:
     - '*'
+  paths:
+    exclude:
+    - .devcontainer/*
+    - .github/*
+    - .vscode/*
+    - docs/*
+    - '**/*.md'
+    - LICENSE.TXT
+    - THIRD-PARTY-NOTICES.TXT
 
 parameters:
 # Choose whether to skip tests when running pipeline manually.
@@ -38,6 +47,8 @@ parameters:
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
 - name: _TeamName
   value:  AspNetCore
 - name: _PublishUsingPipelines
@@ -65,8 +76,6 @@ variables:
   value: /bl:artifacts/log/Release/Build.CodeSign.binlog
 - name: WindowsInstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.binlog
-- name: WindowsArm64InstallersLogArgs
-  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _SignType
   value: ''
 - name: _InternalRuntimeDownloadArgs
@@ -79,14 +88,6 @@ variables:
   value: true
 - template: /eng/common/templates/variables/pool-providers.yml
 
-resources:
-  containers:
-  - container: debpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
-
-  - container: rpmpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
-
 stages:
 - stage: build
   displayName: Build
@@ -202,29 +203,14 @@ stages:
                 -sign
                 -buildInstallers
                 -noBuildNative
-                /p:DotNetSignType=$(_SignType)
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-                $(WindowsInstallersLogArgs)
-        displayName: Build Installers
-
-      # Windows installers bundle and sharedfx msi for arm64
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -noBuildRepoTasks
-                -arch arm64
-                -sign
-                -buildInstallers
-                -noBuildNative
                 -publish
                 /p:DotNetSignType=$(_SignType)
                 /p:AssetManifestFileName=aspnetcore-win.xml
                 $(_BuildArgs)
                 $(_PublishArgs)
                 $(_InternalRuntimeDownloadArgs)
-                $(WindowsArm64InstallersLogArgs)
-        displayName: Build ARM64 Installers
+                $(WindowsInstallersLogArgs)
+        displayName: Build Installers
 
       artifacts:
       - name: Windows_Logs_Attempt_$(System.JobAttempt)
@@ -313,43 +299,13 @@ stages:
             --ci
             --arch x64
             --pack
+            --build-installers
             --all
             --no-build-java
             -p:OnlyPackPlatformSpecificPackages=true
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch x64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=deb
-            $(_BuildArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build Debian installers
-        target: debpkg
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch x64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            --publish
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=rpm
-            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
-            $(_BuildArgs)
-            $(_PublishArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build RPM installers
-        target: rpmpkg
       artifacts:
       - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
@@ -404,29 +360,13 @@ stages:
             --ci
             --arch arm64
             --pack
+            --build-installers
             --all
             --no-build-java
             -p:OnlyPackPlatformSpecificPackages=true
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
-      - script: ./eng/build.sh
-            --ci
-            --nobl
-            --arch arm64
-            --build-installers
-            --no-build-deps
-            --no-build-nodejs
-            --publish
-            -p:OnlyPackPlatformSpecificPackages=true
-            -p:BuildRuntimeArchive=false
-            -p:LinuxInstallerType=rpm
-            -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
-            $(_BuildArgs)
-            $(_PublishArgs)
-            $(_InternalRuntimeDownloadArgs)
-        displayName: Build RPM installers
-        target: rpmpkg
       artifacts:
       - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
@@ -446,7 +386,7 @@ stages:
       jobName: Linux_musl_x64_build
       jobDisplayName: "Build: Linux Musl x64"
       agentOs: Linux
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
       buildArgs:
         --arch x64
         --os-name linux-musl
@@ -480,7 +420,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM"
       agentOs: Linux
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
       buildArgs:
         --arch arm
         --os-name linux-musl
@@ -513,7 +453,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM64"
       agentOs: Linux
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
       buildArgs:
         --arch arm64
         --os-name linux-musl
@@ -578,7 +518,7 @@ stages:
         isAzDOTestingJob: true
         buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
         beforeBuild:
-        - bash: "./eng/scripts/install-nginx-mac.sh"
+        - bash: "./eng/scripts/install-nginx.sh"
           displayName: Installing Nginx
         artifacts:
         - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -599,7 +539,7 @@ stages:
         useHostedUbuntu: false
         buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
         beforeBuild:
-        - bash: "./eng/scripts/install-nginx-linux.sh"
+        - bash: "./eng/scripts/install-nginx.sh"
           displayName: Installing Nginx
         - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
           displayName: Increase inotify limit
@@ -613,29 +553,100 @@ stages:
           publishOnError: true
           includeForks: true
 
-    # Helix x64
+    # Helix x64 subset 1
     - template: jobs/default-build.yml
       parameters:
-        jobName: Helix_x64
-        jobDisplayName: 'Tests: Helix x64'
+        jobName: Helix_x64_Subset_1
+        jobDisplayName: 'Tests: Helix x64 Subset 1'
         agentOs: Windows
         timeoutInMinutes: 240
         steps:
         # Build the shared framework
         - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                  /p:VsTestUseMSBuildOutput=false
           displayName: Build shared fx
         # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
-        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
+        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
                   -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                  /p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=1
           displayName: Run build.cmd helix target
           env:
             HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
             SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
         artifacts:
-        - name: Helix_Logs_Attempt_$(System.JobAttempt)
+        - name: Helix_Subset_1_Logs_Attempt_$(System.JobAttempt)
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
+
+    # Helix x64 subset 2
+    - template: jobs/default-build.yml
+      parameters:
+        jobName: Helix_x64_Subset_2
+        jobDisplayName: 'Tests: Helix x64 Subset 2'
+        agentOs: Windows
+        timeoutInMinutes: 240
+        steps:
+        # Build the shared framework
+        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
+                  /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                  /p:VsTestUseMSBuildOutput=false
+          displayName: Build shared fx
+        # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
+        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+                  -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
+                  /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                  /p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=2
+          displayName: Run build.cmd helix target
+          env:
+            HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+
+        artifacts:
+        - name: Helix_Subset_2_Logs_Attempt_$(System.JobAttempt)
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
+
+    # Local development validation
+    - template: jobs/default-build.yml
+      parameters:
+        jobName: Local_Windows
+        jobDisplayName: 'Test: Windows local development validation'
+        agentOs: Windows
+        isAzDOTestingJob: true
+        timeoutInMinutes: 240
+        # Temporarily disabled due to https://github.com/dotnet/aspnetcore/issues/63140
+        condition: 'false'
+        steps:
+        - script: git submodule update --init
+          displayName: Update submodules
+        - script: ./restore.cmd
+          displayName: Run restore.cmd
+        - powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false"
+          displayName: Build (No NodeJS)
+        - script: npm run build
+          displayName: Build JS
+        - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+          displayName: Build (Debug)
+        - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+          displayName: Build (Release)
+        - script: ./src/ProjectTemplates/build.cmd
+                  -test
+                  -NoRestore
+                  -NoBuild
+                  -NoBuildDeps
+                  -configuration Release
+                  -bl
+          displayName: Run project template tests
+        - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose
+          displayName: Run Blazor web app test script
+
+        artifacts:
+        - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
@@ -645,9 +656,9 @@ stages:
     parameters:
       platform:
         name: 'Managed'
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
-        buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-        skipPublishValidation: true
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
+        buildScript: './eng/build.sh'
+        buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
         jobProperties:
           timeoutInMinutes: 120
           variables:
diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml
new file mode 100644
index 000000000000..28dbc0f13365
--- /dev/null
+++ b/.azure/pipelines/ci-unofficial.yml
@@ -0,0 +1,697 @@
+#
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
+#
+
+# Configure which branches trigger builds
+trigger: none
+
+pr: none
+
+parameters:
+# Choose whether to skip tests when running pipeline manually.
+- name: skipTests
+  default: false
+  displayName: Skip tests?
+  type: boolean
+
+variables:
+- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+  value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
+- name: _TeamName
+  value:  AspNetCore
+- name: _PublishUsingPipelines
+  value: true
+- name: PostBuildSign
+  value: false
+- name: _ArcadePublishNonWindowsArg
+  value: ''
+- name: _UseHelixOpenQueues
+  value: ${{ ne(variables['System.TeamProject'], 'internal') }}
+- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
+  - name: _BuildArgs
+    value: /p:TeamName=$(_TeamName)
+           /p:OfficialBuildId=$(Build.BuildNumber)
+           /p:SkipTestBuild=true
+           /p:PostBuildSign=$(PostBuildSign)
+  # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
+  - group: Publish-Build-Assets
+  # The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
+  - name: _PublishArgs
+    value: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
+- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+  - name: _BuildArgs
+    value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
+  - name: _PublishArgs
+    value: ''
+- name: WindowsArm64LogArgs
+  value: /bl:artifacts/log/Release/Build.arm64.binlog
+- name: Windows64LogArgs
+  value: /bl:artifacts/log/Release/Build.x64.binlog
+- name: Windows86LogArgs
+  value: -ExcludeCIBinaryLog
+- name: WindowsSignLogArgs
+  value: /bl:artifacts/log/Release/Build.CodeSign.binlog
+- name: WindowsInstallersLogArgs
+  value: /bl:artifacts/log/Release/Build.Installers.binlog
+- name: _InternalRuntimeDownloadArgs
+  value: -RuntimeSourceFeed https://ci.dot.net/internal
+         -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
+         /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
+# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
+# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
+- name: _InternalRuntimeDownloadCodeSignArgs
+  value: $(_InternalRuntimeDownloadArgs)
+         /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
+         /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
+- group: DotNet-HelixApi-Access
+- name: _SignType
+  value: test
+# Exclude artifacts & .packages folders from CodeQL scans
+- name: LGTM_INDEX_FILTERS
+  value: |
+    exclude:.packages
+    exclude:artifacts
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
+
+resources:
+  repositories:
+  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: NetCore1ESPool-Svc-Internal
+        image: windows.vs2022.amd64
+        os: windows
+      spotBugs:
+        enabled: false
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
+    containers:
+      azureLinux30Net10BuildAmd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
+    stages:
+    - stage: build
+      displayName: Build
+      jobs:
+      # Code check
+      - ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: Code_check
+            jobDisplayName: Code check
+            agentOs: Windows
+            beforeBuild:
+            - script: git submodule update --init
+              displayName: Update submodules
+            steps:
+            - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
+              displayName: Run eng/scripts/CodeCheck.ps1
+            artifacts:
+            - name: Code_Check_Logs_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+
+      # Build Windows (x64/x86/arm64)
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          codeSign: true
+          jobName: Windows_build
+          jobDisplayName: "Build: Windows x64/x86/arm64"
+          agentOs: Windows
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          steps:
+          - ${{ if notIn(variables['Build.Reason'], 'PullRequest') }}:
+            - script: echo "##vso[build.addbuildtag]daily-build"
+              displayName: 'Set CI daily-build tag'
+
+          # !!! NOTE !!! Some of these steps have disabled code signing.
+          # This is intentional to workaround https://github.com/dotnet/arcade/issues/1957 which always re-submits for code-signing, even
+          # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing.
+          # The sign settings have been configured to
+          - script: ./eng/build.cmd
+                    -ci
+                    -prepareMachine
+                    -nativeToolsOnMachine
+                    -arch x64
+                    -pack
+                    -all
+                    $(_BuildArgs)
+                    $(_InternalRuntimeDownloadArgs)
+                    $(Windows64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
+            displayName: Build x64
+
+          # Build the x86 shared framework
+          # This is going to actually build x86 native assets.
+          - script: ./eng/build.cmd
+                    -ci
+                    -prepareMachine
+                    -noBuildRepoTasks
+                    -arch x86
+                    -pack
+                    -all
+                    -noBuildJava
+                    -noBuildNative
+                    /p:OnlyPackPlatformSpecificPackages=true
+                    $(_BuildArgs)
+                    $(_InternalRuntimeDownloadArgs)
+                    $(Windows86LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
+            displayName: Build x86
+
+          # Build the arm64 shared framework
+          - script: ./eng/build.cmd
+                    -ci
+                    -prepareMachine
+                    -noBuildRepoTasks
+                    -arch arm64
+                    -pack
+                    -noBuildJava
+                    -noBuildNative
+                    /p:OnlyPackPlatformSpecificPackages=true
+                    $(_BuildArgs)
+                    $(_InternalRuntimeDownloadArgs)
+                    $(WindowsArm64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
+            displayName: Build ARM64
+
+          - script: .\src\SiteExtensions\build.cmd
+                    -ci
+                    -prepareMachine
+                    -noBuildRepoTasks
+                    -pack
+                    -noBuildDeps
+                    -noBuildNative
+                    $(_BuildArgs)
+                    $(_InternalRuntimeDownloadArgs)
+                    /p:_DevBuild=true
+            env:
+              MSBUILDUSESERVER: "1"
+            displayName: Build SiteExtension
+
+          # Windows installers bundle x86/x64/arm64 assets
+          - script: ./eng/build.cmd
+                    -ci
+                    -prepareMachine
+                    -noBuildRepoTasks
+                    -sign
+                    -buildInstallers
+                    -noBuildNative
+                    -publish
+                    /p:DotNetSignType=$(_SignType)
+                    /p:AssetManifestFileName=aspnetcore-win.xml
+                    $(_BuildArgs)
+                    $(_PublishArgs)
+                    $(_InternalRuntimeDownloadArgs)
+                    $(WindowsInstallersLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
+            displayName: Build Installers
+
+          artifacts:
+          - name: Windows_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Windows_Packages
+            path: artifacts/packages/
+          - name: Windows_HostingBundle
+            path: artifacts/bin/WindowsHostingBundle
+          - name: Windows_ANCM_Msi
+            path: artifacts/bin/ANCMv2
+          - name: Windows_ANCMIISExpress_Msi
+            path: artifacts/bin/AncmIISExpressV2
+
+      # Build MacOS arm64
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: MacOs_arm64_build
+          jobDisplayName: "Build: macOS arm64"
+          agentOs: macOs
+          timeoutInMinutes: 90
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch arm64
+            --pack
+            --all
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: MacOS_arm64_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: MacOS_arm64
+
+      # Build MacOS x64
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: MacOs_x64_build
+          jobDisplayName: "Build: macOS x64"
+          agentOs: macOs
+          timeoutInMinutes: 90
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --pack
+            --all
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: MacOS_x64_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: MacOS_x64
+
+      # Build Linux x64
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Linux_x64_build
+          jobDisplayName: "Build: Linux x64"
+          agentOs: Linux
+          useHostedUbuntu: false
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch x64
+            --pack
+            --all
+            --build-installers
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Linux_x64_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: Linux_x64
+
+      # Build Linux ARM
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Linux_arm_build
+          jobDisplayName: "Build: Linux ARM"
+          agentOs: Linux
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch arm
+            --pack
+            --all
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_arm.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Linux_arm_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: Linux_arm
+
+      # Build Linux ARM64
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Linux_arm64_build
+          jobDisplayName: "Build: Linux ARM64"
+          agentOs: Linux
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch arm64
+            --pack
+            --all
+            --build-installers
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Linux_arm64_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: Linux_arm64
+
+      # Build Linux Musl x64
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Linux_musl_x64_build
+          jobDisplayName: "Build: Linux Musl x64"
+          agentOs: Linux
+          container: azureLinux30Net10BuildAmd64
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch x64
+            --os-name linux-musl
+            --pack
+            --all
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          disableComponentGovernance: true
+          artifacts:
+          - name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Linux_musl_x64_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: Linux_musl_x64
+
+      # Build Linux Musl ARM
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Linux_musl_arm_build
+          jobDisplayName: "Build: Linux Musl ARM"
+          agentOs: Linux
+          useHostedUbuntu: false
+          container: azureLinux30Net10BuildAmd64
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch arm
+            --os-name linux-musl
+            --pack
+            --all
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Linux_musl_arm_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: Linux_musl_arm
+
+      # Build Linux Musl ARM64
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Linux_musl_arm64_build
+          jobDisplayName: "Build: Linux Musl ARM64"
+          agentOs: Linux
+          useHostedUbuntu: false
+          container: azureLinux30Net10BuildAmd64
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          buildArgs:
+            --arch arm64
+            --os-name linux-musl
+            --pack
+            --all
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
+          artifacts:
+          - name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Linux_musl_arm64_Packages
+            path: artifacts/packages/
+
+      - ${{ if ne(variables.PostBuildSign, 'true') }}:
+        - template: .azure/pipelines/jobs/codesign-xplat.yml@self
+          parameters:
+            inputName: Linux_musl_arm64
+
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Windows_Test
+          jobDisplayName: "Test: Windows Server x64"
+          agentOs: Windows
+          isAzDOTestingJob: true
+          continueOnError: true
+          # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
+          cancelTimeoutInMinutes: 30
+          buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
+                     /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
+                     $(_InternalRuntimeDownloadArgs)
+          beforeBuild:
+          - script: git submodule update --init
+            displayName: Update submodules
+          - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
+            displayName: Setup IISExpress test certificates and schema
+          artifacts:
+          - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
+            path: artifacts/TestResults/
+            publishOnError: true
+            includeForks: true
+
+      - ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
+        # Test jobs
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: MacOS_Test
+            jobDisplayName: "Test: macOS"
+            agentOs: macOS
+            timeoutInMinutes: 90
+            isAzDOTestingJob: true
+            buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
+            beforeBuild:
+            - script: git submodule update --init
+              displayName: Update submodules
+            - bash: "./eng/scripts/install-nginx.sh"
+              displayName: Installing Nginx
+            artifacts:
+            - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+            - name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
+              path: artifacts/TestResults/
+              publishOnError: true
+              includeForks: true
+
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: Linux_Test
+            jobDisplayName: "Test: Ubuntu x64"
+            agentOs: Linux
+            isAzDOTestingJob: true
+            useHostedUbuntu: false
+            buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
+            beforeBuild:
+            - script: git submodule update --init
+              displayName: Update submodules
+            - bash: "./eng/scripts/install-nginx.sh"
+              displayName: Installing Nginx
+            - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
+              displayName: Increase inotify limit
+            artifacts:
+            - name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+            - name: Linux_Test_Results_Attempt_$(System.JobAttempt)
+              path: artifacts/TestResults/
+              publishOnError: true
+              includeForks: true
+
+        # Helix x64
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: Helix_x64_Subset_1
+            jobDisplayName: 'Tests: Helix x64 Subset 1'
+            agentOs: Windows
+            timeoutInMinutes: 240
+            beforeBuild:
+            - script: git submodule update --init
+              displayName: Update submodules
+            steps:
+            # Build the shared framework
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
+                      /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              env:
+                MSBUILDUSESERVER: "1"
+              displayName: Build shared fx
+            # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=1
+                      /p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              displayName: Run build.cmd helix target
+              env:
+                HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+                SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+
+            artifacts:
+            - name: Helix_Logs_Subset_1_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+
+        # Helix x64
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: Helix_x64_Subset_2
+            jobDisplayName: 'Tests: Helix x64 Subset 2'
+            agentOs: Windows
+            timeoutInMinutes: 240
+            beforeBuild:
+            - script: git submodule update --init
+              displayName: Update submodules
+            steps:
+            # Build the shared framework
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
+                      /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              env:
+                MSBUILDUSESERVER: "1"
+              displayName: Build shared fx
+            # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=2
+                      /p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              displayName: Run build.cmd helix target
+              env:
+                HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+                SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+
+            artifacts:
+            - name: Helix_Logs_Subset_2_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+
+        # Local development validation
+        - ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
+          - template: .azure/pipelines/jobs/default-build.yml@self
+            parameters:
+              jobName: Local_Windows
+              jobDisplayName: 'Test: Windows local development validation'
+              agentOs: Windows
+              isAzDOTestingJob: true
+              timeoutInMinutes: 240
+              steps:
+              - script: git submodule update --init
+                displayName: Update submodules
+              - script: ./restore.cmd
+                displayName: Run restore.cmd
+              - script: ./eng/build.cmd -all -noBuildJava -noBuildNodeJS
+                displayName: Build (No NodeJS)
+              - script: npm run build
+                displayName: Build JS
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+                displayName: Build (Debug)
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+                displayName: Build (Release)
+              - script: ./src/ProjectTemplates/build.cmd
+                        -test
+                        -NoRestore
+                        -NoBuild
+                        -NoBuildDeps
+                        -configuration Release
+                displayName: Run project template tests
+              - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose
+                displayName: Run Blazor web app test script
+
+              artifacts:
+              - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
+                path: artifacts/log/
+                publishOnError: true
+                includeForks: true
+
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index b0d73169f2b3..ddb60815d107 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -27,16 +27,12 @@ parameters:
   default: false
   displayName: Skip tests?
   type: boolean
-# Choose whether to enable binlogs when running pipeline manually.
-# Binary logs are enabled by default in public builds and aren't designed to be disabled there.
-- name: produceBinlogs
-  default: false
-  displayName: Produce binlogs?
-  type: boolean
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
 - name: _TeamName
   value:  AspNetCore
 - name: _PublishUsingPipelines
@@ -44,9 +40,13 @@ variables:
 - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
   - name: PostBuildSign
     value: false
+  - name: _ArcadePublishNonWindowsArg
+    value: ''
 - ${{ else }}:
   - name: PostBuildSign
     value: true
+  - name: _ArcadePublishNonWindowsArg
+    value: --publish
 - name: _UseHelixOpenQueues
   value: ${{ ne(variables['System.TeamProject'], 'internal') }}
 - ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -63,48 +63,30 @@ variables:
   # The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
   - name: _PublishArgs
     value: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
-  - ${{ if ne(parameters.produceBinlogs, 'true') }}:
-    # Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
-    - name: WindowsArm64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows86LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsSignLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsInstallersLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsArm64InstallersLogArgs
-      value: -ExcludeCIBinaryLog
 - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
   - name: _BuildArgs
     value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
   - name: _PublishArgs
     value: ''
-- ${{ if or(in(variables['Build.Reason'], 'PullRequest'), eq(parameters.produceBinlogs, 'true')) }}:
-  # Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
-  - name: WindowsArm64LogArgs
-    value: /bl:artifacts/log/Release/Build.arm64.binlog
-  - name: Windows64LogArgs
-    value: /bl:artifacts/log/Release/Build.x64.binlog
-  - name: Windows86LogArgs
-    value: -ExcludeCIBinaryLog
-  - name: WindowsSignLogArgs
-    value: /bl:artifacts/log/Release/Build.CodeSign.binlog
-  - name: WindowsInstallersLogArgs
-    value: /bl:artifacts/log/Release/Build.Installers.binlog
-  - name: WindowsArm64InstallersLogArgs
-    value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
+- name: WindowsArm64LogArgs
+  value: /bl:artifacts/log/Release/Build.arm64.binlog
+- name: Windows64LogArgs
+  value: /bl:artifacts/log/Release/Build.x64.binlog
+- name: Windows86LogArgs
+  value: -ExcludeCIBinaryLog
+- name: WindowsSignLogArgs
+  value: /bl:artifacts/log/Release/Build.CodeSign.binlog
+- name: WindowsInstallersLogArgs
+  value: /bl:artifacts/log/Release/Build.Installers.binlog
 - name: _InternalRuntimeDownloadArgs
-  value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
+  value: -RuntimeSourceFeed https://ci.dot.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
          /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
 # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
 # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
 - name: _InternalRuntimeDownloadCodeSignArgs
   value: $(_InternalRuntimeDownloadArgs)
-         /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+         /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
          /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
 - group: DotNet-HelixApi-Access
 - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
@@ -121,12 +103,6 @@ variables:
 - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
 resources:
-  containers:
-  - container: debpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
-
-  - container: rpmpkg
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
   repositories:
   # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
   - repository: 1esPipelines
@@ -144,13 +120,13 @@ extends:
         os: windows
       spotBugs:
         enabled: false
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
     containers:
-      alpine319WithNode:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
-      mariner20CrossArmAlpine:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
-      mariner20CrossArm64Alpine:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
+      azureLinux30Net10BuildAmd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
     stages:
     - stage: build
       displayName: Build
@@ -197,6 +173,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(Windows64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build x64
 
           # Build the x86 shared framework
@@ -214,6 +192,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(Windows86LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build x86
 
           # Build the arm64 shared framework
@@ -222,15 +202,15 @@ extends:
                     -prepareMachine
                     -noBuildRepoTasks
                     -arch arm64
-                    -sign
                     -pack
                     -noBuildJava
                     -noBuildNative
-                    /p:DotNetSignType=$(_SignType)
                     /p:OnlyPackPlatformSpecificPackages=true
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsArm64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build ARM64
 
           - script: .\src\SiteExtensions\build.cmd
@@ -242,23 +222,10 @@ extends:
                     -noBuildNative
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build SiteExtension
 
-          # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
-          # https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other
-          # previous steps. Sign check is disabled because it is run in a separate step below, after installers are built.
-          - script: ./eng/build.cmd
-                    -ci
-                    -prepareMachine
-                    -noBuildRepoTasks
-                    -noBuildNative
-                    -noBuild
-                    -sign
-                    /p:DotNetSignType=$(_SignType)
-                    $(_BuildArgs)
-                    $(WindowsSignLogArgs)
-            displayName: Code sign packages
-
           # Windows installers bundle x86/x64/arm64 assets
           - script: ./eng/build.cmd
                     -ci
@@ -267,29 +234,16 @@ extends:
                     -sign
                     -buildInstallers
                     -noBuildNative
-                    /p:DotNetSignType=$(_SignType)
-                    $(_BuildArgs)
-                    $(_InternalRuntimeDownloadArgs)
-                    $(WindowsInstallersLogArgs)
-            displayName: Build Installers
-
-          # Windows installers bundle and sharedfx msi for arm64
-          - script: ./eng/build.cmd
-                    -ci
-                    -prepareMachine
-                    -noBuildRepoTasks
-                    -arch arm64
-                    -sign
-                    -buildInstallers
-                    -noBuildNative
                     -publish
                     /p:DotNetSignType=$(_SignType)
                     /p:AssetManifestFileName=aspnetcore-win.xml
                     $(_BuildArgs)
                     $(_PublishArgs)
                     $(_InternalRuntimeDownloadArgs)
-                    $(WindowsArm64InstallersLogArgs)
-            displayName: Build ARM64 Installers
+                    $(WindowsInstallersLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
+            displayName: Build Installers
 
           artifacts:
           - name: Windows_Logs_Attempt_$(System.JobAttempt)
@@ -317,7 +271,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
             $(_BuildArgs)
@@ -347,7 +301,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
             $(_BuildArgs)
@@ -373,48 +327,18 @@ extends:
           jobDisplayName: "Build: Linux x64"
           agentOs: Linux
           useHostedUbuntu: false
-          steps:
-          - script: ./eng/build.sh
-                --ci
-                --arch x64
-                --pack
-                --all
-                --no-build-java
-                -p:OnlyPackPlatformSpecificPackages=true
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Run build.sh
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch x64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=deb
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build Debian installers
-            target: debpkg
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch x64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                --publish
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=rpm
-                -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
-                $(_BuildArgs)
-                $(_PublishArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build RPM installers
-            target: rpmpkg
+          buildArgs:
+            --arch x64
+            --pack
+            --all
+            --build-installers
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_x64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
           artifacts:
           - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
@@ -439,7 +363,7 @@ extends:
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_arm.xml
             $(_BuildArgs)
@@ -464,34 +388,18 @@ extends:
           jobName: Linux_arm64_build
           jobDisplayName: "Build: Linux ARM64"
           agentOs: Linux
-          steps:
-          - script: ./eng/build.sh
-                --ci
-                --arch arm64
-                --pack
-                --all
-                --no-build-java
-                -p:OnlyPackPlatformSpecificPackages=true
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Run build.sh
-          - script: ./eng/build.sh
-                --ci
-                --nobl
-                --arch arm64
-                --build-installers
-                --no-build-deps
-                --no-build-nodejs
-                --publish
-                -p:OnlyPackPlatformSpecificPackages=true
-                -p:BuildRuntimeArchive=false
-                -p:LinuxInstallerType=rpm
-                -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
-                $(_BuildArgs)
-                $(_PublishArgs)
-                $(_InternalRuntimeDownloadArgs)
-            displayName: Build RPM installers
-            target: rpmpkg
+          buildArgs:
+            --arch arm64
+            --pack
+            --all
+            --build-installers
+            --no-build-java
+            $(_ArcadePublishNonWindowsArg)
+            -p:OnlyPackPlatformSpecificPackages=true
+            -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
+            $(_BuildArgs)
+            $(_PublishArgs)
+            $(_InternalRuntimeDownloadArgs)
           artifacts:
           - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
@@ -511,14 +419,14 @@ extends:
           jobName: Linux_musl_x64_build
           jobDisplayName: "Build: Linux Musl x64"
           agentOs: Linux
-          container: alpine319WithNode
+          container: azureLinux30Net10BuildAmd64
           buildArgs:
             --arch x64
             --os-name linux-musl
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
             $(_BuildArgs)
@@ -545,14 +453,14 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM"
           agentOs: Linux
           useHostedUbuntu: false
-          container: mariner20CrossArmAlpine
+          container: azureLinux30Net10BuildAmd64
           buildArgs:
             --arch arm
             --os-name linux-musl
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
             $(_BuildArgs)
@@ -578,14 +486,14 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM64"
           agentOs: Linux
           useHostedUbuntu: false
-          container: mariner20CrossArm64Alpine
+          container: azureLinux30Net10BuildAmd64
           buildArgs:
             --arch arm64
             --os-name linux-musl
             --pack
             --all
             --no-build-java
-            --publish
+            $(_ArcadePublishNonWindowsArg)
             -p:OnlyPackPlatformSpecificPackages=true
             -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
             $(_BuildArgs)
@@ -604,32 +512,33 @@ extends:
           parameters:
             inputName: Linux_musl_arm64
 
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Windows_Test
+          jobDisplayName: "Test: Windows Server x64"
+          agentOs: Windows
+          isAzDOTestingJob: true
+          continueOnError: true
+          # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
+          cancelTimeoutInMinutes: 30
+          buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
+                     /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
+                     $(_InternalRuntimeDownloadArgs)
+          beforeBuild:
+          - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
+            displayName: Setup IISExpress test certificates and schema
+          artifacts:
+          - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
+            path: artifacts/TestResults/
+            publishOnError: true
+            includeForks: true
+
       - ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
         # Test jobs
-        - template: .azure/pipelines/jobs/default-build.yml@self
-          parameters:
-            jobName: Windows_Test
-            jobDisplayName: "Test: Windows Server x64"
-            agentOs: Windows
-            isAzDOTestingJob: true
-            # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
-            cancelTimeoutInMinutes: 30
-            buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
-                       /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:RunBlazorPlaywrightTemplateTests=true
-                       $(_InternalRuntimeDownloadArgs)
-            beforeBuild:
-            - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
-              displayName: Setup IISExpress test certificates and schema
-            artifacts:
-            - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
-              path: artifacts/log/
-              publishOnError: true
-              includeForks: true
-            - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
-              path: artifacts/TestResults/
-              publishOnError: true
-              includeForks: true
-
         - template: .azure/pipelines/jobs/default-build.yml@self
           parameters:
             jobName: MacOS_Test
@@ -639,7 +548,7 @@ extends:
             isAzDOTestingJob: true
             buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
             beforeBuild:
-            - bash: "./eng/scripts/install-nginx-mac.sh"
+            - bash: "./eng/scripts/install-nginx.sh"
               displayName: Installing Nginx
             artifacts:
             - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
@@ -660,7 +569,7 @@ extends:
             useHostedUbuntu: false
             buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
             beforeBuild:
-            - bash: "./eng/scripts/install-nginx-linux.sh"
+            - bash: "./eng/scripts/install-nginx.sh"
               displayName: Installing Nginx
             - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
               displayName: Increase inotify limit
@@ -677,39 +586,107 @@ extends:
         # Helix x64
         - template: .azure/pipelines/jobs/default-build.yml@self
           parameters:
-            jobName: Helix_x64
-            jobDisplayName: 'Tests: Helix x64'
+            jobName: Helix_x64_Subset_1
+            jobDisplayName: 'Tests: Helix x64 Subset 1'
             agentOs: Windows
             timeoutInMinutes: 240
             steps:
             # Build the shared framework
             - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
                       /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              env:
+                MSBUILDUSESERVER: "1"
               displayName: Build shared fx
             # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
-            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
-                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=1
+                      /p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              displayName: Run build.cmd helix target
+              env:
+                HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+                SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+
+            artifacts:
+            - name: Helix_Logs_Subset_1_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+
+        # Helix x64
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: Helix_x64_Subset_2
+            jobDisplayName: 'Tests: Helix x64 Subset 2'
+            agentOs: Windows
+            timeoutInMinutes: 240
+            steps:
+            # Build the shared framework
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
                       /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              env:
+                MSBUILDUSESERVER: "1"
+              displayName: Build shared fx
+            # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=2
+                      /p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
               displayName: Run build.cmd helix target
               env:
                 HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
                 SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
             artifacts:
-            - name: Helix_Logs_Attempt_$(System.JobAttempt)
+            - name: Helix_Logs_Subset_2_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
 
+        # Local development validation
+        - ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
+          - template: .azure/pipelines/jobs/default-build.yml@self
+            parameters:
+              jobName: Local_Windows
+              jobDisplayName: 'Test: Windows local development validation'
+              agentOs: Windows
+              isAzDOTestingJob: true
+              timeoutInMinutes: 240
+              steps:
+              - script: git submodule update --init
+                displayName: Update submodules
+              - script: ./restore.cmd
+                displayName: Run restore.cmd
+              - script: ./eng/build.cmd -all -noBuildJava -noBuildNodeJS
+                displayName: Build (No NodeJS)
+              - script: npm run build
+                displayName: Build JS
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+                displayName: Build (Debug)
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+                displayName: Build (Release)
+              - script: ./src/ProjectTemplates/build.cmd
+                        -test
+                        -NoRestore
+                        -NoBuild
+                        -NoBuildDeps
+                        -configuration Release
+                displayName: Run project template tests
+              - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose
+                displayName: Run Blazor web app test script
+
+              artifacts:
+              - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
+                path: artifacts/log/
+                publishOnError: true
+                includeForks: true
       # Source build
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:
           enableInternalSources: true
           platform:
             name: 'Managed'
-            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
-            buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-            skipPublishValidation: true
+            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
+            buildScript: './eng/build.sh'
+            buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
             jobProperties:
               timeoutInMinutes: 120
               variables:
@@ -761,7 +738,8 @@ extends:
                   - Windows_Test
                   - MacOS_Test
                   - Linux_Test
-                  - Helix_x64
+                  - Helix_x64_Subset_1
+                  - Helix_x64_Subset_2
               - ${{ if eq(variables.enableSourceIndex, 'true') }}:
                 - SourceIndexStage1
               - Source_Build_Managed
diff --git a/.azure/pipelines/components-e2e-tests.yml b/.azure/pipelines/components-e2e-tests.yml
index 05812d6e19b6..fc0acb70ba41 100644
--- a/.azure/pipelines/components-e2e-tests.yml
+++ b/.azure/pipelines/components-e2e-tests.yml
@@ -17,6 +17,25 @@ pr:
   branches:
     include:
     - '*'
+  paths:
+    include:
+    - eng/*
+    - src/Components/*
+    - src/Extensions/*
+    - src/Framework/*
+    - src/Hosting/*
+    - src/Http/*
+    - src/Middleware/HttpLogging/*
+    - src/Middleware/HttpOverrides/*
+    - src/Middleware/HttpsPolicy/*
+    - src/Middleware/Localization/*
+    - src/Middleware/Session/*
+    - src/Middleware/StaticFiles/*
+    - src/Middleware/WebSockets/*
+    - src/Servers/*
+    - src/SignalR/*
+    exclude:
+    - '**/*.md'
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -49,11 +68,35 @@ jobs:
       displayName: Build JS
     - script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore
       displayName: Build
-    - script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined!=true|Quarantined=false'
-                 -p:VsTestUseMSBuildOutput=false
-                 --logger:"trx%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.trx"
-                 --logger:"html%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.html"
-                 --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)/Unquarantined
+    - script: |
+        set -eo pipefail
+
+        .dotnet/dotnet test ./src/Components/test/E2ETest \
+          -c $(BuildConfiguration) \
+          --no-build \
+          --filter 'Quarantined!=true|Quarantined=false' \
+          -p:VsTestUseMSBuildOutput=false \
+          --logger:"trx%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.trx" \
+          --logger:"html%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.html" \
+          --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)/Unquarantined \
+          | tee e2e-test-output.log
+
+        if grep -q "No test matches the given testcase filter" e2e-test-output.log
+        then
+          echo "##vso[task.logissue type=error] No tests matched the filter."
+
+          exit 1
+        fi
+
+        # Check total tests run to detect abnormalities. In case the number of tests changes significantly, we should adjust the threshold.
+        # Extract total from the summary line "Failed: xx, Passed: yy, Skipped: zz, Total: NNN, Duration: ..."
+        total=$(sed -nE 's/.*Failed:[[:space:]]*[0-9]+,[[:space:]]*Passed:[[:space:]]*[0-9]+,[[:space:]]*Skipped:[[:space:]]*[0-9]+,[[:space:]]*Total:[[:space:]]*([0-9]+).*/\1/p' e2e-test-output.log)
+        min_total=1000
+        if [ -z "$total" ] || [ "$total" -lt "$min_total" ]
+        then
+          echo "##vso[task.logissue type=error] Insufficient total test count: $total. We expect at least $min_total tests to run."
+          exit 1
+        fi
       displayName: Run E2E tests
     - script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined=true' -p:RunQuarantinedTests=true
                  -p:VsTestUseMSBuildOutput=false
diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index 4d20b27e700b..4f417e1c83e7 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -11,7 +11,6 @@ schedules:
 - cron: "0 9 * * *"
   branches:
     include:
-    - release/6.0
     - release/8.0
     - release/9.0
   always: false
diff --git a/.azure/pipelines/identitymodel-helix-matrix.yml b/.azure/pipelines/identitymodel-helix-matrix.yml
index 9159fe350b7e..11e9cf0a37d8 100644
--- a/.azure/pipelines/identitymodel-helix-matrix.yml
+++ b/.azure/pipelines/identitymodel-helix-matrix.yml
@@ -26,7 +26,7 @@ resources:
     ref: refs/tags/release
 
 extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
   parameters:
     sdl:
       sourceAnalysisPool:
@@ -37,6 +37,8 @@ extends:
         compiled:
           enabled: false
           justificationForDisabling: 'This is a test-only pipeline. The same product code is already scanned in the main pipeline (aspnetcore-ci)'
+    featureFlags:
+      autoEnablePREfastWithNewRuleset: false
 
     stages:
     - stage: build
@@ -86,7 +88,7 @@ extends:
               filePath: $(Build.SourcesDirectory)/eng/scripts/SetupIdentitySources.ps1
               arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -IdentityModelPackageSource $(Build.StagingDirectory)
           # Build the shared framework
-          - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
+          - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -pack -arch x64
                     /p:CrossgenOutput=false /p:IsIdentityModelTestJob=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
             displayName: Build shared fx
           # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
diff --git a/.azure/pipelines/jobs/codesign-xplat.yml b/.azure/pipelines/jobs/codesign-xplat.yml
index 800da4f41398..13ff68a3ecd1 100644
--- a/.azure/pipelines/jobs/codesign-xplat.yml
+++ b/.azure/pipelines/jobs/codesign-xplat.yml
@@ -19,12 +19,20 @@ jobs:
       inputs:
         artifactName: ${{ parameters.inputName }}_Packages
         downloadPath: $(Build.StagingDirectory)/downloaded_packages/
-        itemPattern: '**/*.nupkg'
+        itemPattern: |
+          **/*.nupkg
+          **/*.tar.gz
+          **/*.deb
+          **/*.rpm
     - task: CopyFiles@2
       displayName: Copy packages to ArtifactsShippingPackagesDir
       inputs:
         sourceFolder: $(Build.StagingDirectory)/downloaded_packages/
-        contents: '**/*.nupkg'
+        contents: |
+          **/*.nupkg
+          **/*.tar.gz
+          **/*.deb
+          **/*.rpm
         targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/
         flattenFolders: true
     - powershell: .\eng\common\build.ps1
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index f328550c60c2..0283be806cf1 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -62,11 +62,11 @@ parameters:
   isAzDOTestingJob: false
   enablePublishTestResults: ''
   enableSbom: true
+  continueOnError: false
   variables: []
 
   configuration: 'Release'
   container: ''
-  enableRichCodeNavigation: ''
   installNodeJs: true
   timeoutInMinutes: 180
   testRunTitle: $(AgentOsName)-$(BuildConfiguration)
@@ -86,9 +86,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       ${{ if ne(parameters.condition, '') }}:
         condition: ${{ parameters.condition }}
-      ${{ if ne(parameters.enableRichCodeNavigation, '') }}:
-        enableRichCodeNavigation: true
-        richCodeNavigationLanguage: 'csharp,typescript,java'
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
       ${{ if and(eq(parameters.isAzDOTestingJob, true), ne(parameters.enablePublishTestResults, false)) }}:
@@ -106,13 +103,13 @@ jobs:
       # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
       pool:
         ${{ if eq(parameters.agentOs, 'macOS') }}:
-          vmImage: macOS-12
+          vmImage: macOS-13
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           ${{ if eq(parameters.useHostedUbuntu, true) }}:
-            vmImage: ubuntu-20.04
+            vmImage: ubuntu-22.04
           ${{ else }}:
             name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
+            demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngPublicBuildPool)
           demands: ImageOverride -equals windows.vs2022preview.amd64.open
@@ -132,6 +129,8 @@ jobs:
       - TeamName: AspNetCore
       - ${{ if ne(parameters.codeSign, true) }}:
         - _SignType: ''
+      - ${{ if ne(parameters.isAzDOTestingJob, true) }}:
+        - MSBUILDUSESERVER: "1"
       - LC_ALL: 'en_US.UTF-8'
       - LANG: 'en_US.UTF-8'
       - LANGUAGE: 'en_US.UTF-8'
@@ -164,10 +163,8 @@ jobs:
         - script: df -h
           displayName: Disk size
       - ${{ if eq(parameters.agentOs, 'macOS') }}:
-        - script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
-          displayName: Use XCode 14.2.0
-      - checkout: self
-        clean: true
+        - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
+          displayName: Use XCode 15.2.0
       - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
         - powershell: ./eng/scripts/InstallProcDump.ps1
           displayName: Install ProcDump
@@ -210,16 +207,18 @@ jobs:
                   ${{ step.env }}
       - ${{ if eq(parameters.steps, '')}}:
         - ${{ if eq(parameters.agentOs, 'Windows') }}:
-          - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
               /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
               DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
-          - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
@@ -298,9 +297,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       ${{ if ne(parameters.condition, '') }}:
         condition: ${{ parameters.condition }}
-      ${{ if ne(parameters.enableRichCodeNavigation, '') }}:
-        enableRichCodeNavigation: true
-        richCodeNavigationLanguage: 'csharp,typescript,java'
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
       ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
@@ -323,11 +319,11 @@ jobs:
       pool:
         ${{ if eq(parameters.agentOs, 'macOS') }}:
           name: Azure Pipelines
-          image: macOS-12
+          image: macOS-13
           os: macOS
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           name: $(DncEngInternalBuildPool)
-          image: 1es-ubuntu-2004
+          image: 1es-ubuntu-2204
           os: linux
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngInternalBuildPool)
@@ -354,6 +350,8 @@ jobs:
         - LANGUAGE: 'en_US.UTF-8'
       - ${{ if ne(parameters.codeSign, true) }}:
         - _SignType: ''
+      - ${{ if ne(parameters.isAzDOTestingJob, true) }}:
+        - MSBUILDUSESERVER: "1"
       - ${{ else }}:
         - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
           - _SignType: real
@@ -391,10 +389,8 @@ jobs:
         - script: df -h
           displayName: Disk size
       - ${{ if eq(parameters.agentOs, 'macOS') }}:
-        - script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
-          displayName: Use XCode 14.2.0
-      - checkout: self
-        clean: true
+        - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
+          displayName: Use XCode 15.2.0
       - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
         - powershell: ./eng/scripts/InstallProcDump.ps1
           displayName: Install ProcDump
@@ -451,16 +447,18 @@ jobs:
                   ${{ step.env }}
       - ${{ if eq(parameters.steps, '')}}:
         - ${{ if eq(parameters.agentOs, 'Windows') }}:
-          - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
               /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
               DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
-          - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
diff --git a/.azure/pipelines/localization.yml b/.azure/pipelines/localization.yml
index 65f9c9c3ee2a..e77cdd155891 100644
--- a/.azure/pipelines/localization.yml
+++ b/.azure/pipelines/localization.yml
@@ -25,13 +25,42 @@ parameters:
 variables:
 - name: _TeamName
   value: AspNetCore
-- template: /eng/common/templates/variables/pool-providers.yml
-
-jobs:
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
-  - template: /eng/common/templates/job/onelocbuild.yml
-    parameters:
-      CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
-      LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
-      LclSource: lclFilesFromPackage
-      MirrorRepo: aspnetcore
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
+
+
+resources:
+  repositories:
+  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
+      codeql:
+        compiled:
+          enabled: false
+          justificationForDisabling: "This pipeline doesn't build any code. The product code is already scanned in the main pipeline (aspnetcore-ci)"
+    pool:
+      name: $(DncEngInternalBuildPool)
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+    - stage: build
+      displayName: Build
+      jobs:
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
+        - template: /eng/common/templates-official/job/onelocbuild.yml@self
+          parameters:
+            CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
+            LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
+            LclSource: lclFilesFromPackage
+            MirrorRepo: aspnetcore
diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
index c5438a2d6af9..3ee1c1a7eb6f 100644
--- a/.azure/pipelines/quarantined-pr.yml
+++ b/.azure/pipelines/quarantined-pr.yml
@@ -3,7 +3,7 @@
 #
 
 # Configure which branches trigger builds
-# We want to run quarantined tests on release/6.0 and later as well as on PRs
+# We want to run quarantined tests on release/8.0 and later as well as on PRs
 trigger:
   batch: true
   branches:
diff --git a/.azure/pipelines/report-green.yml b/.azure/pipelines/report-green.yml
new file mode 100644
index 000000000000..5037426f3af1
--- /dev/null
+++ b/.azure/pipelines/report-green.yml
@@ -0,0 +1,37 @@
+# This CI job only runs on PRs where all other jobs are skipped.
+# This allows Build Analysis to report green. Without this, no jobs would run,
+# causing Build Analysis to hang indefinitely (or until someone commented "ba-g {justification}" on the PR).
+
+# Only run this on PRs
+trigger: none
+# Run for all branches, only on paths that no-op other jobs
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - '*'
+  paths:
+    include:
+    - .devcontainer/*
+    - .github/*
+    - .vscode/*
+    - docs/*
+    - '**/*.md'
+    - LICENSE.TXT
+    - THIRD-PARTY-NOTICES.TXT
+
+# ABG - Always Be Green
+jobs:
+- template: /eng/common/templates/jobs/jobs.yml
+  parameters:
+    enableTelemetry: true
+    helixRepo: dotnet/aspnetcore
+    jobs:
+    - job: Report_Green
+      enableSBOM: false
+      pool:
+        vmImage: ubuntu-22.04
+      steps:
+      - powershell: |
+          exit 0
+        displayName: Exit 0
\ No newline at end of file
diff --git a/.azure/pipelines/richnav.yml b/.azure/pipelines/richnav.yml
deleted file mode 100644
index bbc0e27de776..000000000000
--- a/.azure/pipelines/richnav.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
-#
-
-# Configure which branches trigger builds
-trigger:
-  branches:
-    include:
-    - main
-    - release/*
-
-# Do not run this pipeline for PR validation.
-pr: none
-
-variables:
-- name: _BuildArgs
-  value: '/p:SkipTestBuild=true'
-- name: WindowsNonX64LogArgs
-  value: -ExcludeCIBinaryLog
-- template: /eng/common/templates/variables/pool-providers.yml
-
-stages:
-- stage: build
-  displayName: Build
-  jobs:
-  # Build Windows (x64/x86/arm64)
-  - template: jobs/default-build.yml
-    parameters:
-      jobName: Windows_build
-      jobDisplayName: "Build: Windows x64/x86/arm64"
-      enableRichCodeNavigation: true
-      agentOs: Windows
-      steps:
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -nativeToolsOnMachine
-                -arch x64
-                -buildNative
-                /p:EnableRichCodeNavigation=false
-                $(_BuildArgs)
-        displayName: Build x64 native assets
-
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -nativeToolsOnMachine
-                -arch x64
-                -all
-                -noBuildNative
-                -noBuildRepoTasks
-                $(_BuildArgs)
-        displayName: Build x64
-
-      # Build the x86 shared framework
-      # This is going to actually build x86 native assets.
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -nativeToolsOnMachine
-                -arch x86
-                -all
-                -noBuildJava
-                -noBuildNodeJS
-                -noBuildNative
-                -noBuildRepoTasks
-                $(_BuildArgs)
-                $(WindowsNonX64LogArgs)
-        displayName: Build x86
-
-      # Build the arm64 shared framework
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -nativeToolsOnMachine
-                -arch arm64
-                -noBuildJava
-                -noBuildNodeJS
-                -noBuildNative
-                -noBuildRepoTasks
-                $(_BuildArgs)
-                $(WindowsNonX64LogArgs)
-        displayName: Build ARM64
-
diff --git a/.azure/pipelines/template-tests-pr.yml b/.azure/pipelines/template-tests-pr.yml
new file mode 100644
index 000000000000..612a7589c99b
--- /dev/null
+++ b/.azure/pipelines/template-tests-pr.yml
@@ -0,0 +1,55 @@
+# Configure which branches trigger builds
+# We want to run template tests on release/8.0 and later as well as on certain PRs
+trigger:
+  batch: true
+  branches:
+    include:
+    - main
+    - release/*
+
+# Run PR validation on branches that include Helix tests
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    include:
+    - src/ProjectTemplates/*
+    - src/Components/*
+    - src/Mvc/*
+
+variables:
+- name: _UseHelixOpenQueues
+  value: ${{ ne(variables['System.TeamProject'], 'internal') }}
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - group: DotNet-HelixApi-Access
+- template: /eng/common/templates/variables/pool-providers.yml
+
+jobs:
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Helix_templates_x64
+    jobDisplayName: 'Tests: Helix template tests x64'
+    agentOs: Windows
+    timeoutInMinutes: 180
+    steps:
+    - script: git submodule update --init
+      displayName: Update submodules
+    # Build the shared framework
+    - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
+              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /p:VsTestUseMSBuildOutput=false
+      displayName: Build shared fx
+    # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
+    - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+              -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
+              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+              /p:VsTestUseMSBuildOutput=false /p:OnlyTestProjectTemplates=true
+      displayName: Run build.cmd helix target
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+    artifacts:
+    - name: Helix_logs
+      path: artifacts/log/
+      publishOnError: true
diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
index e6da50ccc844..8eb47b3ab1f6 100644
--- a/.config/tsaoptions.json
+++ b/.config/tsaoptions.json
@@ -8,5 +8,6 @@
   ],
   "projectName": "DEVDIV",
   "repositoryName": "AspNetCore",
-  "template": "TFSDEVDIV"
+  "template": "TFSDEVDIV",
+  "serviceTreeId": "4db45fa9-fb0f-43ce-b523-ad1da773dfbc"
 }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c1dd2960976b..a30ea9f0a474 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -18,6 +18,7 @@
     "dbaeumer.vscode-eslint"
   ],
   "settings": {
+    "dotnet.defaultSolution": "AspNetCore.slnx",
     // Loading projects on demand is better for larger codebases
     "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
     "omnisharp.enableRoslynAnalyzers": true,
@@ -31,7 +32,7 @@
   "remoteEnv": {
     "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
     "DOTNET_MULTILEVEL_LOOKUP": "0",
-    "TARGET": "net9.0",
+    "TARGET": "net10.0",
     "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
   },
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
diff --git a/.editorconfig b/.editorconfig
index 536c212ea709..bff8c6c606ab 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -464,6 +464,7 @@ dotnet_diagnostic.IDE0161.severity = silent
 # IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included.
 dotnet_diagnostic.IDE0005.severity = silent
 
+
 # Verify settings
 [*.{received,verified}.{txt,xml,json}]
 charset = "utf-8-bom"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9da9605f0cc3..6afdfa38e076 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,6 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
-/**/PublicAPI.*Shipped.txt                                                        @dotnet/aspnet-api-review
 /global.json                                                                      @dotnet/aspnet-build @wtgodbe
 /.azure/                                                                          @dotnet/aspnet-build @wtgodbe
 /.azuredevops/                                                                    @dotnet/aspnet-build @wtgodbe
@@ -13,39 +12,26 @@
 /.github/workflows/                                                               @dotnet/aspnet-build @wtgodbe
 /docs/                                                                            @captainsafia @mkArtakMSFT
 /eng/                                                                             @dotnet/aspnet-build @wtgodbe
-/eng/common/                                                                      @dotnet-maestro-bot
-/eng/Versions.props                                                               @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
-/eng/Version.Details.xml                                                          @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
-/eng/SourceBuild*                                                                 @dotnet/source-build-internal
+/eng/Versions.props                                                               @dotnet/aspnet-build @wtgodbe
+/eng/Version.Details.xml                                                          @dotnet/aspnet-build @wtgodbe
 /src/Caching/                                                                     @captainsafia @halter73 @mgravell
-/src/Caching/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @captainsafia @halter73 @mgravell
 /src/Components/                                                                  @dotnet/aspnet-blazor-eng
-/src/Components/**/PublicAPI.*Shipped.txt                                         @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
 /src/DefaultBuilder/                                                              @halter73
-/src/DefaultBuilder/**/PublicAPI.*Shipped.txt                                     @dotnet/aspnet-api-review
 /src/Grpc/                                                                        @JamesNK @captainsafia @mgravell
-/src/Grpc/**/PublicAPI.*Shipped.txt                                               @dotnet/aspnet-api-review @JamesNK @captainsafia @mgravell
 /src/Hosting/                                                                     @halter73
-/src/Hosting/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review
 /src/Http/                                                                        @BrennanConroy @halter73 @captainsafia
-/src/Http/**/PublicAPI.*Shipped.txt                                               @dotnet/aspnet-api-review @BrennanConroy
-/src/Http/Routing/                                                                @javiercn
-/src/Http/Routing/**/PublicAPI.*Shipped.txt                                       @dotnet/aspnet-api-review @javiercn
+/src/Http/Routing/                                                                @halter73
 /src/HttpClientFactory/                                                           @captainsafia @halter73
-/src/HttpClientFactory/**/PublicAPI.*Shipped.txt                                  @dotnet/aspnet-api-review @captainsafia @halter73
 /src/Installers/                                                                  @dotnet/aspnet-build @wtgodbe
 /src/JSInterop/                                                                   @dotnet/aspnet-blazor-eng
 /src/Middleware/                                                                  @BrennanConroy
-/src/Middleware/**/PublicAPI.*Shipped.txt                                         @dotnet/aspnet-api-review @BrennanConroy
 /src/Mvc/                                                                         @dotnet/minimal-apis
-/src/Mvc/Mvc.ApiExplorer                                                          @captainsafia @halter73 @brunolins16
-/src/Mvc/**/PublicAPI.*Shipped.txt                                                @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
+/src/Mvc/Mvc.ApiExplorer                                                          @captainsafia @halter73
 /src/OpenApi                                                                      @captainsafia @dotnet/minimal-apis
 /src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/        @dotnet/aspnet-blazor-eng
 /src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/  @dotnet/aspnet-blazor-eng
-/src/Security/**/PublicAPI.*Shipped.txt                                           @dotnet/aspnet-api-review
+/src/Security/                                                                    @halter73
 /src/Servers/                                                                     @halter73 @BrennanConroy @JamesNK @mgravell
-/src/Servers/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @halter73 @BrennanConroy @JamesNK @mgravell
 /src/SignalR/                                                                     @BrennanConroy @halter73
-/src/SignalR/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @BrennanConroy @halter73
 /src/submodules                                                                   @dotnet/aspnet-build @wtgodbe
+/**/PublicAPI.*Shipped.txt                                                        @dotnet/aspnet-api-review @Rick-Anderson @tdykstra
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000000..10bf138a635c
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: [lextm, lextudio] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/ISSUE_TEMPLATE/10_bug_report.yml b/.github/ISSUE_TEMPLATE/10_bug_report.yml
index ad85dbc18e07..bbeb1963e519 100644
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
@@ -1,19 +1,21 @@
 name: 🐞 Bug Report
 description: Create a report about something that is not working
+labels: [triage]
 body:
 - type: markdown
   attributes:
     value: |
-      More information on our issue management policies can be found here: https://aka.ms/aspnet/issue-policies
+      More information on our issue management policies can be queried from support@lextudio.com.
 
       Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting **non-security** bugs and feature requests.
 
-      If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead email your issue details to secure@microsoft.com. Your report may be eligible for our [bug bounty](https://www.microsoft.com/en-us/msrc/bounty-dot-net-core) but ONLY if it is reported through email.
+      If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead email your issue details to support@lextudio.com.
+
       For other types of questions, consider using [StackOverflow](https://stackoverflow.com).
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered ([aspnetcore/issues](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue)). More information on our issue management policies is available [here](https://aka.ms/aspnet/issue-policies).
+    description: Please search to see if an issue already exists for the bug you encountered ([httpbridge/issues](https://github.com/lextudio/httpbridge/issues?q=is%3Aissue)). More information on our issue management policies can be queried from support@lextudio.com.
     options:
     - label: I have searched the existing issues
       required: true
@@ -33,8 +35,8 @@ body:
   attributes:
     label: Steps To Reproduce
     description: |
-      We ❤ code! Point us to a [minimalistic project which reproduces this issue (repro)](https://github.com/dotnet/aspnetcore/blob/main/docs/repro.md) hosted in a public GitHub repo.
-      
+      We ❤ code! Point us to a minimalistic project which reproduces this issue (repro) hosted in a public GitHub repo.
+
       We will close this issue if:
       - The repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
       - If we will not be able to repro the behavior you're reporting.
@@ -46,23 +48,22 @@ body:
   attributes:
     label: Exceptions (if any)
     description: Include the exception you get when facing this issue.
-    placeholder: 
+    placeholder:
   validations:
     required: false
 - type: input
   attributes:
-    label: .NET Version 
+    label: HTTP Bridge Module Version
     description: |
-      Run `dotnet --version`
+      From Windows Control Panel, Programs and Features, find the installed version of HTTP Bridge Module.
   validations:
     required: false
 - type: textarea
   attributes:
     label: Anything else?
     description: |
-      - ASP.NET Core version:
-      - The IDE (VS / VS Code/ VS4Mac) you're running on, and its version:
-      - Include the output of `dotnet --info`:
+      - Python/Node.js/Go version:
+      - The IDE (VS / VS Code) you're running on, and its version:
 
       Links? References? Anything that will give us more context about the issue you are encountering!
 
diff --git a/.github/ISSUE_TEMPLATE/20_feature_request.yml b/.github/ISSUE_TEMPLATE/20_feature_request.yml
index 0806b1713a05..8ab7f3301897 100644
--- a/.github/ISSUE_TEMPLATE/20_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/20_feature_request.yml
@@ -1,14 +1,15 @@
 name: 💡 Feature request
 description: Suggest an idea for this project
+labels: [triage]
 body:
 - type: markdown
   attributes:
     value: |
-      More information on our issue management policies can be found here: https://aka.ms/aspnet/issue-policies
+      More information on our issue management policies can be queried from support@lextudio.com.
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the feature you are requesting. (https://github.com/dotnet/aspnetcore/issues).
+    description: Please search to see if an issue already exists for the feature you are requesting. (https://github.com/lextudio/httpbridge/issues).
     options:
     - label: I have searched the existing issues
       required: true
diff --git a/.github/ISSUE_TEMPLATE/30_api_proposal.md b/.github/ISSUE_TEMPLATE/30_api_proposal.md
deleted file mode 100644
index ef043135073d..000000000000
--- a/.github/ISSUE_TEMPLATE/30_api_proposal.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-name: API proposal
-about: Propose a change to the public API surface
-title: ''
-labels: api-suggestion
-assignees: ''
-
----
-
-## Background and Motivation
-
-<!--
-We welcome API proposals! We have a process to evaluate the value and shape of new API. There is an overview of our process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewProcess.md). This template will help us gather the information we need to start the review process.
-First, please describe the purpose and value of the new API here.
--->
-
-## Proposed API
-
-<!--
-Please provide the specific public API signature diff that you are proposing. For example:
-```diff
-namespace Microsoft.AspNetCore.Http;
-
-public static class HttpResponseWritingExtensions
-{
-+    public Task WriteAsync(this HttpResponse response, StringBuilder builder);
-}
-```
-You may find the [Framework Design Guidelines](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/framework-design-guidelines-digest.md) helpful.
--->
-
-## Usage Examples
-
-<!--
-Please provide code examples that highlight how the proposed API additions are meant to be consumed.
-This will help suggest whether the API has the right shape to be functional, performant and useable.
-You can use code blocks like this:
-```csharp
-// some lines of code here
-```
--->
-
-## Alternative Designs
-
-<!--
-Were there other options you considered, such as alternative API shapes?
-How does this compare to analogous APIs in other ecosystems and libraries?
--->
-
-## Risks
-
-<!--
-Please mention any risks that to your knowledge the API proposal might entail, such as breaking changes, performance regressions, etc.
--->
-
diff --git a/.github/ISSUE_TEMPLATE/40_design_proposal.md b/.github/ISSUE_TEMPLATE/30_design_proposal.md
similarity index 97%
rename from .github/ISSUE_TEMPLATE/40_design_proposal.md
rename to .github/ISSUE_TEMPLATE/30_design_proposal.md
index 729c78e4a2f2..7dd4d24b9e50 100644
--- a/.github/ISSUE_TEMPLATE/40_design_proposal.md
+++ b/.github/ISSUE_TEMPLATE/30_design_proposal.md
@@ -1,7 +1,7 @@
 ---
 name: 🤔 Design proposal
 about: Collaborate on a design for a feature/fix or other change
-labels: design-proposal
+labels: [design-proposal,triage]
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/50_test_failure.md b/.github/ISSUE_TEMPLATE/50_test_failure.md
deleted file mode 100644
index b4643bd6c2a0..000000000000
--- a/.github/ISSUE_TEMPLATE/50_test_failure.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-name: Test failure
-about: Report a failing test that needs to be quarantined
-title: 'Quarantine <FAILING_TEST_NAME>'
-labels: test-failure
-assignees: ''
-
----
-
-<!--
-Note this issue template is specifically for failing tests within the dotnet/aspnetcore repo.
--->
-
-## Failing Test(s)
-
-<!--
-Provide the fully qualified name(s) of the failing tests.
--->
-
--
-
-## Error Message
-
-<!--
-Provide the error message associated with the test failure, if applicable.
--->
-
-```text
-
-```
-
-## Stacktrace
-
-<details>
-<!--
-Provide the stack trace associated with the test failure, if applicable.
--->
-
-```text
-
-```
-</details>
-
-
-## Logs
-
-<details>
-<!--
-If this is a Helix test failure, include the text of the .log artifact from the failing test.
-Note that you have to be signed in to Azure DevOps to see the test artifacts.
--->
-
-```text
-
-```
-</details>
-
-## Build
-
-<!--
-Provide a link to the build where the test failure occurred.
--->
diff --git a/.github/ISSUE_TEMPLATE/60_analyzer_proposal.md b/.github/ISSUE_TEMPLATE/60_analyzer_proposal.md
deleted file mode 100644
index cafd30cf0943..000000000000
--- a/.github/ISSUE_TEMPLATE/60_analyzer_proposal.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-name: Analyzer proposal
-about: Propose a new analyzer/codefixer or an update to an existing one
-title: ''
-labels: api-suggestion, analyzer
-assignees: ''
----
-
-## Background and Motivation
-
-<!--
-We welcome new analyzers and codefixers in the ASP.NET repo!
-
-We use the same process to review both new analyzer/codefixer submissions and API proposals. There is an overview of our process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewProcess.md). This template will help us gather the information we need to start the review process.
-
-Under this heading, describe the problem that your analyzer is trying to solve. Examples of great motivating scenarios include helping users avoid
-performance issues, potentially insecure code, or recommending better APIs for a scenario.
--->
-
-## Proposed Analyzer
-
-### Analyzer Behavior and Message
-
-<!--
-Provide a description of when the analyzer will trigger and the associated analyzer message.
--->
-
-<!--
-Analyzer categories are derived from the categories documented in https://learn.microsoft.com/dotnet/fundamentals/code-analysis/categories
-To select a category, review each category's description and select the best category based on the functionality of your analyzer.
-
-Analyzer severity levels are documented in https://learn.microsoft.com/visualstudio/code-quality/use-roslyn-analyzers#configure-severity-levels
-Review the description to observe how the level set on the analyzer will affect build-time and editor behavior and select the best
-level for the task.
--->
-
-### Category
-
-- [ ] Design
-- [ ] Documentation
-- [ ] Globalization
-- [ ] Interoperability
-- [ ] Maintainability
-- [ ] Naming
-- [ ] Performance
-- [ ] Reliability
-- [ ] Security
-- [ ] Style
-- [ ] Usage
-
-### Severity Level
-
-- [ ] Error
-- [ ] Warning
-- [ ] Info
-- [ ] Hidden
-
-## Usage Scenarios
-
-<!--
-Provide code examples that would trigger your analyzer to warn. Identify the spans of code that the analyzer
-will be triggered on. When applicable, describe the result of the code fix associated with the change.
--->
-
-## Risks
-
-<!--
-Please mention any risks that to your knowledge the API proposal might entail, such as breaking changes, performance regressions, etc.
--->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 5bce061f75ba..0086358db1eb 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,20 +1 @@
 blank_issues_enabled: true
-contact_links:
-  - name: Issue with Razor
-    url:  https://github.com/dotnet/razor/issues/new/choose
-    about: Please open issues relating to Razor tooling or the Razor compiler in dotnet/razor.
-  - name: Issue with .NET runtime or core .NET libraries
-    url:  https://github.com/dotnet/runtime/issues/new/choose
-    about: Please open issues relating to the .NET runtime or core .NET libraries in dotnet/runtime.
-  - name: Issue with .NET SDK
-    url:  https://github.com/dotnet/sdk/issues/new/choose
-    about: Please open issues relating to the .NET SDK itself in dotnet/sdk.
-  - name: Issue with Entity Framework Core
-    url:  https://github.com/dotnet/efcore/issues/new/choose
-    about: Please open issues relating to Entity Framework Core in dotnet/efcore.
-  - name: Issue with Roslyn compiler
-    url:  https://github.com/dotnet/roslyn/issues/new/choose
-    about: Please open issues relating to the Roslyn .NET compiler in dotnet/roslyn.
-  - name: Bug report or feature request for Visual Studio for Windows and Mac
-    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022
-    about: Use Visual Studio's Report a Problem feature for issues and suggestions with Visual Studio tooling
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 000000000000..a0b2a2e577fb
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,42 @@
+## General
+
+* Make only high confidence suggestions when reviewing code changes.
+* Always use the latest version C#, currently C# 13 features.
+* Never change global.json unless explicitly asked to.
+* Never change package.json or package-lock.json files unless explicitly asked to.
+* Never change NuGet.config files unless explicitly asked to.
+
+## Formatting
+
+* Apply code-formatting style defined in `.editorconfig`.
+* Prefer file-scoped namespace declarations and single-line using directives.
+* Insert a newline before the opening curly brace of any code block (e.g., after `if`, `for`, `while`, `foreach`, `using`, `try`, etc.).
+* Ensure that the final return statement of a method is on its own line.
+* Use pattern matching and switch expressions wherever possible.
+* Use `nameof` instead of string literals when referring to member names.
+* Ensure that XML doc comments are created for any public APIs. When applicable, include `<example>` and `<code>` documentation in the comments.
+
+### Nullable Reference Types
+
+* Declare variables non-nullable, and check for `null` at entry points.
+* Always use `is null` or `is not null` instead of `== null` or `!= null`.
+* Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
+
+### Testing
+
+* We use xUnit SDK v3 for tests.
+* Do not emit "Act", "Arrange" or "Assert" comments.
+* Use Moq for mocking in tests.
+* Copy existing style in nearby files for test method names and capitalization.
+
+## Running tests
+
+* To build and run tests in the repo, use the `build.sh` script that is located in each subdirectory within the `src` folder. For example, to run the build with tests in the `src/Http` directory, run `./src/Http/build.sh -test`.
+
+## .NET Environment
+
+* Before running any `dotnet` commands in this repository, always activate the locally installed .NET environment first by running the appropriate activation script from the repository root:
+  * On Windows: `. ./activate.ps1` (from repository root)
+  * On Linux/Mac: `source activate.sh` (from repository root)
+* If not in the repository root, navigate there first or use the full path to the activation script.
+* This ensures that the correct version of .NET SDK is used for the repository.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index aa65a08d99d0..11389fa622f1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,20 +1,13 @@
 version: 2
-registries:
-  dev.azure.com:
-    token: ${{secrets.DEPENDABOT_NPM_TOKEN}}
-    type: npm-registry
-    url: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
 
 updates:
-  - package-ecosystem: npm
+  - package-ecosystem: nuget
     directory: "/"
     # Perform only security updates of our npm dependencies.
     open-pull-requests-limit: 0
-    registries:
-    - dev.azure.com
     # Schedule should be ignored for security updates.
     schedule:
-      interval: monthly
+      interval: weekly
 
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -62,18 +55,6 @@ updates:
     labels:
       - area-infrastructure
     target-branch: "release/2.1"
-  - package-ecosystem: "gitsubmodule"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    allow:
-      - dependency-type: "all"
-    commit-message:
-      prefix: "[release/6.0] "
-      include: scope
-    labels:
-      - area-infrastructure
-    target-branch: "release/6.0"
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 273c0bc419d0..4a9c0e892785 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -1,3 +1,4 @@
+# Policybot docs live at https://eng.ms/docs/more/github-inside-microsoft/policies/resource-management
 id: 
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
@@ -167,6 +168,45 @@ configuration:
             To make sure no conflicting changes have occurred, please rerun validation before merging. You can do this by leaving an `/azp run` comment here (requires commit rights), or by simply closing and reopening.
       - addLabel:
           label: pending-ci-rerun
+    - description: '[Idle Issue Management] Tag aspnet-build on dependency PRs (non-weekend)'
+      frequencies:
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: 'build-ops'
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This dependency PR has had no activity for a full business day - @dotnet/aspnet-build please take a look if you are on build-ops.
+    - description: '[Idle Issue Management] Tag aspnet-build on dependency PRs (weekend)'
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: 'build-ops'
+      - noActivitySince:
+          days: 3
+      actions:
+      - addReply:
+          reply: This dependency PR has had no activity for a full business day - @dotnet/aspnet-build please take a look if you are on build-ops.
     eventResponderTasks:
     - if:
       - payloadType: Issue_Comment
@@ -231,11 +271,13 @@ configuration:
       - isActivitySender:
           user: dotnet-maestro[bot]
           issueAuthor: False
-      - titleContains:
-          pattern: Update dependencies
-          isRegex: False
-      - targetsBranch:
-          branch: main
+      - or:
+        - titleContains:
+            pattern: Update dependencies
+            isRegex: False
+        - titleContains:
+            pattern: Source code updates
+            isRegex: False
       then:
       - addLabel:
           label: area-infrastructure
@@ -244,6 +286,26 @@ configuration:
       - approvePullRequest:
           comment: Auto-approving dependency update.
       description: '[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: dotnet-maestro[bot]
+          issueAuthor: False
+      - targetsBranch:
+          branch: main
+      - or:
+        - titleContains:
+            pattern: Update dependencies
+            isRegex: False
+        - titleContains:
+            pattern: Source code updates
+            isRegex: False
+      then:
+      - addLabel:
+          label: 'build-ops'
+      description: '[Infrastructure PRs] Add build-ops label to dependency update Pull Requests against main'
     - if:
       - payloadType: Pull_Request
       - isAction:
@@ -261,6 +323,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Merge Forward :fast_forward:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving branch merge.
       description: '[Infrastructure PRs] Add area-infrastructure label to auto-merge Pull Requests'
@@ -293,130 +357,6 @@ configuration:
       - addLabel:
           label: 'Attention: Shared Code Modified'
       description: '[Shared Code PRs] Flag PRs that affect shared code src/Shared/Runtime'
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Components/
-            - src/ProjectTemplates/BlazorWasm.ProjectTemplates/
-        then:
-        - addLabel:
-            label: area-blazor
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Tools/
-        then:
-        - addLabel:
-            label: area-commandlinetools
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/DataProtection/
-        then:
-        - addLabel:
-            label: area-dataprotection
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Identity/
-        then:
-        - addLabel:
-            label: area-identity
-      - if:
-        - includesModifiedFiles:
-            files:
-            - global.json
-            - .azure
-            - .config
-            - .github
-            - eng
-            - src/Framework/
-            - src/Installers/
-        then:
-        - addLabel:
-            label: area-infrastructure
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/ProjectTemplates/
-            - src/Razor/
-            - src/Mvc/Mvc.Localization/
-            - src/Mvc/Mvc.DataAnnotations/
-            - src/Mvc/Mvc.Razor.RuntimeCompilation/
-            - src/Mvc/Mvc.Razor/
-            - src/Mvc/Mvc.RazorPages/
-            - src/Mvc/Mvc.TagHelpers/
-            - src/Mvc/Mvc.ViewFeatures/
-        then:
-        - addLabel:
-            label: area-mvc
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Security/
-            - src/Azure/AzureAD/
-        then:
-        - addLabel:
-            label: area-security
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Servers/
-            - src/Http/
-            - src/Azure/AzureAppServicesIntegration/
-            - src/Azure/AzureAppServices.HostingStartup/
-            - src/Middleware/
-            - src/HttpClientFactory/
-            - src/SiteExtensions/
-        then:
-        - addLabel:
-            label: area-networking
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/SignalR/
-        then:
-        - addLabel:
-            label: area-signalr
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Grpc/
-        then:
-        - addLabel:
-            label: area-grpc
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Mvc/Mvc.Abstractions/
-            - src/Mvc/Mvc.Analyzers/
-            - src/Mvc/Mvc.Api.Analyzers/
-            - src/Mvc/Mvc.ApiExplorer/
-            - src/Mvc/Mvc.Core/
-            - src/Mvc/Mvc.Cors/
-            - src/Mvc/Mvc.Formatters.Json/
-            - src/Mvc/Mvc.Formatters.Xml/
-            - src/Mvc/Mvc.NewtonsoftJson/
-            - src/Mvc/Mvc.Testing.Tasks/src/
-            - src/Mvc/Mvc.Testing/
-            - src/Mvc/Mvc/
-            - src/OpenApi/
-            - src/Mvc/perf/
-        then:
-        - addLabel:
-            label: area-mvc
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/DefaultBuilder/
-            - src/Hosting/
-        then:
-        - addLabel:
-            label: area-hosting
-      description: '[PR Labelling] Apply `area-` labels to PRs'
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -501,30 +441,19 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview1
+          milestone: 10.0-rc1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/9.0-rc1
-      then:
-      - removeMilestone
-      - addMilestone:
-          milestone: 9.0-rc1
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-rc1 branch'
-    - if:
-      - payloadType: Pull_Request
-      - isAction:
-          action: Closed
-      - targetsBranch:
-          branch: release/9.0
+          branch: release/10.0-preview7
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0-rc2
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
+          milestone: 10.0-preview7
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues
       - isAction:
@@ -627,31 +556,16 @@ configuration:
       - isAction:
           action: Opened
       - targetsBranch:
-          branch: release/6.0
-      then:
-      - addMilestone:
-          milestone: 6.0.x
-      - addReply:
-          reply: >-
-            Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
-
-            Otherwise, please add `tell-mode` label.
-      description: Add release/6.0 targeting PRs to the servicing project
-    - if:
-      - payloadType: Pull_Request
-      - isAction:
-          action: Opened
-      - targetsBranch:
-          branch: release/2.1
+          branch: release/2.3
       then:
       - addMilestone:
-          milestone: 2.1.x
+          milestone: 2.3.x
       - addReply:
           reply: >-
             Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
 
             Otherwise, please add `tell-mode` label.
-      description: Add release/2.1 targeting PRs to the servicing project
+      description: Add release/2.3 targeting PRs to the servicing project
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -696,12 +610,12 @@ configuration:
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/6.0
+          branch: release/9.0
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 6.0.34
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
+          milestone: 9.0.9
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
@@ -711,7 +625,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.9
+          milestone: 8.0.20
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues
@@ -791,13 +705,41 @@ configuration:
       - titleContains:
           pattern: Update .NET SDK
           isRegex: False
+      - targetsBranch:
+          branch: main
       then:
       - addLabel:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Dependency Update :arrow_up_small:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving SDK update.
-      description: '[Infrastructure PRs] Add area-infrastructure label to SDK update Pull Requests'
+      - enableAutoMerge:
+          mergeMethod: "squash"
+      description: '[Infrastructure PRs] Add area-infrastructure label to SDK update Pull Requests & enable auto-merge'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: dependabot[bot]
+          issueAuthor: False
+      - targetsBranch:
+          branch: main
+      then:
+      - addLabel:
+          label: area-infrastructure
+      - addLabel:
+          label: 'Type: Dependency Update :arrow_up_small:'
+      - addLabel:
+          label: 'build-ops'
+      - approvePullRequest:
+          comment: Auto-approving dependabot update.
+      - enableAutoMerge:
+          mergeMethod: "squash"
+      description: '[Infrastructure PRs] Add area-infrastructure label to dependabot update Pull Requests & enable auto-merge'
 onFailure: 
 onSuccess: 
+
diff --git a/.github/prompts/ApiReview.prompt.md b/.github/prompts/ApiReview.prompt.md
new file mode 100644
index 000000000000..b215608b4e3d
--- /dev/null
+++ b/.github/prompts/ApiReview.prompt.md
@@ -0,0 +1,215 @@
+---
+mode: edit
+---
+
+# Instructions for Filling in an API Review Issue
+
+## Prerequisites
+
+Before you begin filling out an API review issue, gather the following information:
+
+* **Original issue** - The GitHub issue or feature request that prompted this API change
+* **GitHub commit(s) containing the implementation** (if any) - Links to specific commits where the API was implemented
+  * **Pay special attention to `PublicAPI.Unshipped.txt` files** - These files contain API changes and are crucial for the review
+
+**ASK FOR CONFIRMATION**: Make a check-list of all the information (issue and commit). Mark the items that you have gathered. If any item is missing, ask the author to provide it before proceeding.
+
+## Overview
+
+The API review process ensures that new APIs follow common patterns and best practices while guiding engineers toward better API design decisions. The goal is to provide enough context for people working outside that feature area to understand what the change is about and give meaningful feedback.
+
+## Sections
+
+**DO NOT ADD ANY ADDITIONAL INFORMATION THAT IS NOT PART OF THE ORIGINAL ISSUE OR CODE CHANGES**
+**AT THE END OF THE DOCUMENT, FOR ALL CONTENT ON EACH SECTION, YOU MUST JUSTIFY THE SOURCE FOR THAT CONTENT USING A QUOTE FRAGMENT FROM THE ORIGINAL ISSUE OR CODE CHANGES IN THIS FORMAT <<CONTENT>>: "<<QUOTE>>"**
+**ASK FOR ADDITIONAL INFORMATION IF THERE IS NOT ENOUGH CONTEXT IN THE ORIGINAL ISSUE OR CODE CHANGES TO FILL IN A SECTION**
+**YOU CAN FILL IN ANY SECTION WITH N/A IF THERE IS NO RELEVANT INFORMATION AVAILABLE**
+
+Fill out each section following the format and guidelines below:
+
+### 1. Background and Motivation
+
+**Purpose**: Explain the purpose and value of the new API to help reviewers understand why this change is needed.
+
+**Guidelines**:
+- Provide a clear, concise description of the problem being solved
+- Explain the current limitations or gaps that this API addresses
+- Reference the original issue that prompted this change
+- Focus on the "why" rather than the "how"
+
+**Good Example**:
+> Previously, users were able to invoke JavaScript functions from .NET code using the `InvokeAsync` method from the `IJSRuntime` and `IJSObjectReference` interfaces. To perform any other JavaScript operation, they had to wrap it into a plain JavaScript function, deploy that function with their application, and invoke it via `InvokeAsync`. To reduce the need for such boilerplate code, we propose adding methods to the interop API to enable performing common operations directly.
+
+**Bad Example**:
+> Adding a string overload for Widget.ConfigureFactory.
+
+### 2. Proposed API
+
+**Purpose**: Provide the specific public API signature diff that you are proposing.
+
+**Requirements**:
+- Use **ref-assembly format** (more readable and useful for API review discussions)
+- Include the complete namespace and type declarations
+- Show additions with `+` prefix in diff format
+- If linking to generated ref-assembly code in a PR, that's acceptable
+- For areas that don't produce ref-assemblies, write out what it would look like in ref-assembly format
+
+**Format Example**:
+```diff
+namespace Microsoft.AspNetCore.Http;
+
+public static class HttpResponseWritingExtensions
+{
++    public Task WriteAsync(this HttpResponse response, StringBuilder builder);
+}
+```
+
+**Complex API Example**:
+```diff
+namespace Microsoft.JSInterop
+{
+    public interface IJSRuntime
+    {
++        ValueTask<TValue> GetValueAsync<TValue>(string identifier);
++        ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken);
++        ValueTask SetValueAsync<TValue>(string identifier, TValue value);
++        ValueTask SetValueAsync<TValue>(string identifier, TValue value, CancellationToken cancellationToken);
+    }
+}
+```
+
+**Key Points**:
+- Include all overloads and extension methods
+- Show the complete type hierarchy when adding to existing interfaces
+- Reference the `PublicAPI.Unshipped.txt` files if available in your implementation commits
+
+### 3. Usage Examples
+
+**Purpose**: Demonstrate how the proposed API additions are meant to be consumed to validate that the API has the right shape to be functional, performant, and usable.
+
+**Guidelines**:
+- Provide realistic, practical code examples
+- Show both simple and complex usage scenarios
+- Include both synchronous and asynchronous variants (if applicable)
+- Use proper C# code block formatting
+
+**Example Format**:
+```csharp
+@inject IJSRuntime JSRuntime
+
+// Simple property access
+string title = await JSRuntime.GetValueAsync<string>("document.title");
+
+// Setting values
+await JSRuntime.SetValueAsync("document.title", "Hello there");
+
+// Constructor invocation
+IJSObjectReference chartRef = await JSRuntime.InvokeNewAsync("Chart", chartParams);
+
+// Working with object references
+var someChartProperty = await chartRef.GetValueAsync<int>("somePropName");
+```
+
+### 4. Alternative Designs
+
+**Purpose**: Show that you've considered other approaches and explain why the proposed design is the best option.
+
+**Include**:
+- Other API shapes you considered
+- Comparison to analogous APIs in other ecosystems and libraries
+- Trade-offs between different approaches
+- Why the proposed approach was chosen over alternatives
+
+**Example**:
+> We considered supporting the additional operations with only the existing `InvokeAsync` method and selecting its behavior according to what JS entity is found based on the `identifier`. However, this approach has obvious UX issues (clarity, predictability). There is also no way to differentiate, in general, between "normal" and "constructor" functions in JavaScript.
+
+### 5. Risks
+
+**Purpose**: Identify potential issues or concerns with the proposed API.
+
+**Consider**:
+- Breaking changes to existing code
+- Performance implications or regressions
+- Security concerns
+- Compatibility issues
+- Potential for misuse
+- Impact on existing patterns or conventions
+
+**Example**:
+> The added interface methods have default implementations (which throw `NotImplementedException`) to avoid breaking builds of their implementors. A possible criticism of the feature is that streamlining interop in this manner might motivate misuse of inefficient interop calls.
+
+## Quality Checklist
+
+Before marking your issue as `api-ready-for-review`, ensure:
+
+- [ ] **Clear description**: Includes a short description that will help reviewers not familiar with this area
+- [ ] **Complete API specification**: All API changes are in ref-assembly format
+- [ ] **Implementation reference**: Links to commits containing the implementation, especially `PublicAPI.Unshipped.txt` files
+- [ ] **Adequate context**: Larger changes have more explanation and context
+- [ ] **Usage examples**: Realistic code examples that demonstrate the API's intended use
+- [ ] **Risk assessment**: Potential issues and breaking changes are identified
+- [ ] **Champion identified**: Someone is assigned to champion this change in the API review meeting
+
+## Process Notes
+
+1. **Label progression**: Issues move from `api-suggestion` → `api-ready-for-review` → `api-approved`
+2. **Team notification**: Notify @asp-net-api-reviews team when marking as `api-ready-for-review`
+3. **Meeting attendance**: If your API is scheduled for review, you must have a representative in the meeting
+4. **Implementation changes**: If changes to the original proposal are required during implementation, the review becomes obsolete and the process starts over
+
+## Reference Resources
+
+- [API Review Process Documentation](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewProcess.md)
+- [Framework Design Guidelines](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/framework-design-guidelines-digest.md)
+- [API Review Principles](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewPrinciples.md)
+- [Pending API Reviews](https://aka.ms/aspnet/apireviews)
+
+## Template Structure
+
+```markdown
+## Background and Motivation
+
+<!--
+We welcome API proposals! We have a process to evaluate the value and shape of new API. There is an overview of our process [here](https://github.com/dotnet/aspnetcore/blob/main/docs/APIReviewProcess.md). This template will help us gather the information we need to start the review process.
+First, please describe the purpose and value of the new API here.
+-->
+
+## Proposed API
+
+<!--
+Please provide the specific public API signature diff that you are proposing. For example:
+```diff
+namespace Microsoft.AspNetCore.Http;
+
+public static class HttpResponseWritingExtensions
+{
++    public Task WriteAsync(this HttpResponse response, StringBuilder builder);
+}
+```
+You may find the [Framework Design Guidelines](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/framework-design-guidelines-digest.md) helpful.
+-->
+
+## Usage Examples
+
+<!--
+Please provide code examples that highlight how the proposed API additions are meant to be consumed.
+This will help suggest whether the API has the right shape to be functional, performant and useable.
+You can use code blocks like this:
+```csharp
+// some lines of code here
+```
+-->
+
+## Alternative Designs
+
+<!--
+Were there other options you considered, such as alternative API shapes?
+How does this compare to analogous APIs in other ecosystems and libraries?
+-->
+
+## Risks
+
+<!--
+Please mention any risks that to your knowledge the API proposal might entail, such as breaking changes, performance regressions, etc.
+-->
+```
\ No newline at end of file
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 7581f56ee981..8404f90ae630 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%
diff --git a/.github/workflows/browsertesting-issue-body.md b/.github/workflows/browsertesting-issue-body.md
new file mode 100644
index 000000000000..6555c38eb7db
--- /dev/null
+++ b/.github/workflows/browsertesting-issue-body.md
@@ -0,0 +1,24 @@
+## Description
+
+Selenium is used in the aspnetcore repo for automated E2E integration testing.
+Playwright is used in the aspnetcore repo for some benchmarking apps. We need to ensure the docker file and the package version match.
+
+## Instructions
+
+To update the Selenium and Playwright versions, these files need to be updated:
+
+### Packages
+  - [ ] [Selenium in `Versions.props`](eng/Versions.props) from NuGet:
+    - [ ] [Selenium.WebDriver](https://www.nuget.org/packages/Selenium.WebDriver/) (Config variable `SeleniumWebDriverVersion`)
+    - [ ] [Selenium.Support](https://www.nuget.org/packages/Selenium.Support/) (Config variable `SeleniumSupportVersion`)
+  - [ ] Ensure Playwright versions match
+    - [ ]  [Blazor Wasm benchmarks in `src/Components/benchmarkapps/Wasm.Performance/dockerfile`](src/Components/benchmarkapps/Wasm.Performance/dockerfile) (image starts with `mcr.microsoft.com`)
+    - [ ]  [Playwright package version](eng/Versions.props) (Config variable `PlaywrightVersion`)
+
+## Actions
+
+Please, open the PR against `main` branch and include changes to the files listed above.
+
+Also:
+- mention @dotnet/aspnet-build in the opened Pull Request - this will be a responsible engineer for changes validation.
+- add the `build-ops` label to the opened Pull Request
diff --git a/.github/workflows/browsertesting-open-issue.yml b/.github/workflows/browsertesting-open-issue.yml
new file mode 100644
index 000000000000..b50c3a56c9ee
--- /dev/null
+++ b/.github/workflows/browsertesting-open-issue.yml
@@ -0,0 +1,29 @@
+name: "[Monthly] Schedule Browser-Testing Dependencies Update Issue"
+
+on:
+  schedule:
+    # Runs on the first day of every month at midnight UTC
+    - cron: '0 0 1 * *'
+  workflow_dispatch: # for manual triggering
+
+jobs:
+  create-issue:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      # copilot can be assigned to the issue
+      # https://cli.github.com/manual/gh_issue_create
+      - name: Create Issue From Template
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          gh issue create \
+            --title "Request Browser-Testing Dependencies Update" \
+            --body-file ".github/workflows/browsertesting-issue-body.md" \
+            --assignee "@copilot"
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
new file mode 100644
index 000000000000..2714754f2c09
--- /dev/null
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -0,0 +1,24 @@
+name: "Copilot Setup Steps"
+
+# Allow testing of the setup steps from your repository's "Actions" tab.
+on: workflow_dispatch
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: 8-core-ubuntu-latest
+
+    permissions:
+      contents: read
+
+    # You can define any steps you want, and they will run before the agent starts.
+    # If you do not check out your code, Copilot will do this for you.
+    steps:
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
+
+        # Include PrepareForHelix to maximise what is downloaded here
+      - name: Build solution
+        env:
+          # prevent GitInfo errors
+          CI: false
+        run: ./restore.sh
diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml
index 20246c14fc58..135609265f53 100644
--- a/.github/workflows/inter-branch-merge-flow.yml
+++ b/.github/workflows/inter-branch-merge-flow.yml
@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
\ No newline at end of file
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2024-06-24
diff --git a/.github/workflows/labeler-cache-retention.yml b/.github/workflows/labeler-cache-retention.yml
new file mode 100644
index 000000000000..151ff1c9d09d
--- /dev/null
+++ b/.github/workflows/labeler-cache-retention.yml
@@ -0,0 +1,40 @@
+# Workflow template imported and updated from:
+# https://github.com/dotnet/issue-labeler/wiki/Onboarding
+#
+# See labeler.md for more information
+#
+# Regularly restore the prediction models from cache to prevent cache eviction
+name: "Labeler: Cache Retention"
+
+# For more information about GitHub's action cache limits and eviction policy, see:
+# https://docs.github.com/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+
+on:
+  schedule:
+    - cron: "32 16 * * *" # 16:32 every day (arbitrary time daily)
+
+  workflow_dispatch:
+    inputs:
+      cache_key:
+        description: "The cache key suffix to use for restoring the model from cache. Defaults to 'ACTIVE'."
+        required: true
+        default: "ACTIVE"
+
+env:
+  CACHE_KEY: ${{ inputs.cache_key || 'ACTIVE' }}
+
+jobs:
+  restore-cache:
+    # Do not automatically run the workflow on forks outside the 'dotnet' org
+    if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        type: ["issues", "pulls"]
+    steps:
+      - uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: ${{ matrix.type }}
+          cache_key: ${{ env.CACHE_KEY }}
+          fail-on-cache-miss: true
diff --git a/.github/workflows/labeler-predict-issues.yml b/.github/workflows/labeler-predict-issues.yml
new file mode 100644
index 000000000000..a12efc1512af
--- /dev/null
+++ b/.github/workflows/labeler-predict-issues.yml
@@ -0,0 +1,60 @@
+# Workflow template imported and updated from:
+# https://github.com/dotnet/issue-labeler/wiki/Onboarding
+#
+# See labeler.md for more information
+#
+# Predict labels for Issues using a trained model
+name: "Labeler: Predict (Issues)"
+
+on:
+  # Only automatically predict area labels when issues are first opened
+  issues:
+    types: opened
+
+  # Allow dispatching the workflow via the Actions UI, specifying ranges of numbers
+  workflow_dispatch:
+    inputs:
+      issues:
+        description: "Issue Numbers (comma-separated list of ranges)."
+        required: true
+      cache_key:
+        description: "The cache key suffix to use for restoring the model. Defaults to 'ACTIVE'."
+        required: true
+        default: "ACTIVE"
+
+env:
+  # Do not allow failure for jobs triggered automatically (as this causes red noise on the workflows list)
+  ALLOW_FAILURE: ${{ github.event_name == 'workflow_dispatch' }}
+
+  LABEL_PREFIX: "area-"
+  THRESHOLD: 0.40
+  DEFAULT_LABEL: "needs-area-label"
+
+jobs:
+  predict-issue-label:
+    # Do not automatically run the workflow on forks outside the 'dotnet' org
+    if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: "Restore issues model from cache"
+        id: restore-model
+        uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: issues
+          fail-on-cache-miss: ${{ env.ALLOW_FAILURE }}
+          quiet: true
+
+      - name: "Predict issue labels"
+        id: prediction
+        if: ${{ steps.restore-model.outputs.cache-hit == 'true' }}
+        uses: dotnet/issue-labeler/predict@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          issues: ${{ inputs.issues || github.event.issue.number }}
+          label_prefix: ${{ env.LABEL_PREFIX }}
+          threshold: ${{ env.THRESHOLD }}
+          default_label: ${{ env.DEFAULT_LABEL }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        continue-on-error: ${{ !env.ALLOW_FAILURE }}
diff --git a/.github/workflows/labeler-predict-pulls.yml b/.github/workflows/labeler-predict-pulls.yml
new file mode 100644
index 000000000000..7a89fa03f679
--- /dev/null
+++ b/.github/workflows/labeler-predict-pulls.yml
@@ -0,0 +1,73 @@
+# Workflow template imported and updated from:
+# https://github.com/dotnet/issue-labeler/wiki/Onboarding
+#
+# See labeler.md for more information
+#
+# Predict labels for Pull Requests using a trained model
+name: "Labeler: Predict (Pulls)"
+
+on:
+  # Per to the following documentation:
+  # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target
+  #
+  # The `pull_request_target` event runs in the context of the base of the pull request, rather
+  # than in the context of the merge commit, as the `pull_request` event does. This prevents
+  # execution of unsafe code from the head of the pull request that could alter the repository
+  # or steal any secrets you use in your workflow. This event allows your workflow to do things
+  # like label or comment on pull requests from forks.
+  #
+  # Only automatically predict area labels when pull requests are first opened
+  pull_request_target:
+    types: opened
+
+    # Configure the branches that need to have PRs labeled
+    branches:
+      - main
+
+  # Allow dispatching the workflow via the Actions UI, specifying ranges of numbers
+  workflow_dispatch:
+    inputs:
+      pulls:
+        description: "Pull Request Numbers (comma-separated list of ranges)."
+        required: true
+      cache_key:
+        description: "The cache key suffix to use for restoring the model. Defaults to 'ACTIVE'."
+        required: true
+        default: "ACTIVE"
+
+env:
+  # Do not allow failure for jobs triggered automatically (this can block PR merge)
+  ALLOW_FAILURE: ${{ github.event_name == 'workflow_dispatch' }}
+
+  LABEL_PREFIX: "area-"
+  THRESHOLD: 0.40
+  DEFAULT_LABEL: "needs-area-label"
+
+jobs:
+  predict-pull-label:
+    # Do not automatically run the workflow on forks outside the 'dotnet' org
+    if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: "Restore pulls model from cache"
+        id: restore-model
+        uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: pulls
+          fail-on-cache-miss: ${{ env.ALLOW_FAILURE }}
+          quiet: true
+
+      - name: "Predict pull labels"
+        id: prediction
+        if: ${{ steps.restore-model.outputs.cache-hit == 'true' }}
+        uses: dotnet/issue-labeler/predict@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          pulls: ${{ inputs.pulls || github.event.number }}
+          label_prefix: ${{ env.LABEL_PREFIX }}
+          threshold: ${{ env.THRESHOLD }}
+          default_label: ${{ env.DEFAULT_LABEL }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        continue-on-error: ${{ !env.ALLOW_FAILURE }}
diff --git a/.github/workflows/labeler-promote.yml b/.github/workflows/labeler-promote.yml
new file mode 100644
index 000000000000..c01086c51779
--- /dev/null
+++ b/.github/workflows/labeler-promote.yml
@@ -0,0 +1,54 @@
+# Workflow template imported and updated from:
+# https://github.com/dotnet/issue-labeler/wiki/Onboarding
+#
+# See labeler.md for more information
+#
+# Promote a model from staging to 'ACTIVE', backing up the currently 'ACTIVE' model
+name: "Labeler: Promotion"
+
+on:
+  # Dispatched via the Actions UI, promotes the staged models from
+  # a staged slot into the prediction environment
+  workflow_dispatch:
+    inputs:
+      issues:
+        description: "Issues: Promote Model"
+        type: boolean
+        required: true
+      pulls:
+        description: "Pulls: Promote Model"
+        type: boolean
+        required: true
+      staged_key:
+        description: "The cache key suffix to use for promoting a staged model to 'ACTIVE'. Defaults to 'staged'."
+        required: true
+        default: "staged"
+      backup_key:
+        description: "The cache key suffix to use for backing up the currently active model. Defaults to 'backup'."
+        default: "backup"
+
+permissions:
+  actions: write
+
+jobs:
+  promote-issues:
+    if: ${{ inputs.issues }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Promote Model for Issues"
+        uses: dotnet/issue-labeler/promote@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "issues"
+          staged_key: ${{ inputs.staged_key }}
+          backup_key: ${{ inputs.backup_key }}
+
+  promote-pulls:
+    if: ${{ inputs.pulls }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Promote Model for Pull Requests"
+        uses: dotnet/issue-labeler/promote@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "pulls"
+          staged_key: ${{ inputs.staged_key }}
+          backup_key: ${{ inputs.backup_key }}
diff --git a/.github/workflows/labeler-train.yml b/.github/workflows/labeler-train.yml
new file mode 100644
index 000000000000..79ad2db0cced
--- /dev/null
+++ b/.github/workflows/labeler-train.yml
@@ -0,0 +1,161 @@
+# Workflow template imported and updated from:
+# https://github.com/dotnet/issue-labeler/wiki/Onboarding
+#
+# See labeler.md for more information
+#
+# Train the Issues and Pull Requests models for label prediction
+name: "Labeler: Training"
+
+on:
+  workflow_dispatch:
+    inputs:
+      type:
+        description: "Issues or Pull Requests"
+        type: choice
+        required: true
+        default: "Both"
+        options:
+          - "Both"
+          - "Issues"
+          - "Pull Requests"
+
+      steps:
+        description: "Training Steps"
+        type: choice
+        required: true
+        default: "All"
+        options:
+          - "All"
+          - "Download Data"
+          - "Train Model"
+          - "Test Model"
+
+      limit:
+        description: "Max number of items to download for training/testing the model (newest items are used). Defaults to the max number of pages times the page size."
+        type: number
+      page_size:
+        description: "Number of items per page in GitHub API requests. Defaults to 100 for issues, 25 for pull requests."
+        type: number
+      page_limit:
+        description: "Maximum number of pages to download for training/testing the model. Defaults to 1000 for issues, 4000 for pull requests."
+        type: number
+      cache_key_suffix:
+        description: "The cache key suffix to use for staged data/models (use 'ACTIVE' to bypass staging). Defaults to 'staged'."
+        required: true
+        default: "staged"
+
+env:
+  CACHE_KEY: ${{ inputs.cache_key_suffix }}
+  REPOSITORY: ${{ github.repository }}
+  LABEL_PREFIX: "area-"
+  THRESHOLD: "0.40"
+  LIMIT: ${{ inputs.limit }}
+  PAGE_SIZE: ${{ inputs.page_size }}
+  PAGE_LIMIT: ${{ inputs.page_limit }}
+
+jobs:
+  download-issues:
+    if: ${{ contains(fromJSON('["Both", "Issues"]'), inputs.type) && contains(fromJSON('["All", "Download Data"]'), inputs.steps) }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: read
+    steps:
+      - name: "Download Issues"
+        uses: dotnet/issue-labeler/download@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "issues"
+          cache_key: ${{ env.CACHE_KEY }}
+          repository: ${{ env.REPOSITORY }}
+          label_prefix: ${{ env.LABEL_PREFIX }}
+          limit: ${{ env.LIMIT }}
+          page_size: ${{ env.PAGE_SIZE }}
+          page_limit: ${{ env.PAGE_LIMIT }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+  download-pulls:
+    if: ${{ contains(fromJSON('["Both", "Pull Requests"]'), inputs.type) && contains(fromJSON('["All", "Download Data"]'), inputs.steps) }}
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    steps:
+      - name: "Download Pull Requests"
+        uses: dotnet/issue-labeler/download@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "pulls"
+          cache_key: ${{ env.CACHE_KEY }}
+          repository: ${{ env.REPOSITORY }}
+          label_prefix: ${{ env.LABEL_PREFIX }}
+          limit: ${{ env.LIMIT }}
+          page_size: ${{ env.PAGE_SIZE }}
+          page_limit: ${{ env.PAGE_LIMIT }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+  train-issues:
+    if: ${{ always() && contains(fromJSON('["Both", "Issues"]'), inputs.type) && contains(fromJSON('["All", "Train Model"]'), inputs.steps) && contains(fromJSON('["success", "skipped"]'), needs.download-issues.result) }}
+    runs-on: ubuntu-latest
+    permissions: {}
+    needs: download-issues
+    steps:
+      - name: "Train Model for Issues"
+        uses: dotnet/issue-labeler/train@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "issues"
+          data_cache_key: ${{ env.CACHE_KEY }}
+          model_cache_key: ${{ env.CACHE_KEY }}
+
+  train-pulls:
+    if: ${{ always() && contains(fromJSON('["Both", "Pull Requests"]'), inputs.type) && contains(fromJSON('["All", "Train Model"]'), inputs.steps) && contains(fromJSON('["success", "skipped"]'), needs.download-pulls.result) }}
+    runs-on: ubuntu-latest
+    permissions: {}
+    needs: download-pulls
+    steps:
+      - name: "Train Model for Pull Requests"
+        uses: dotnet/issue-labeler/train@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "pulls"
+          data_cache_key: ${{ env.CACHE_KEY }}
+          model_cache_key: ${{ env.CACHE_KEY }}
+
+  test-issues:
+    if: ${{ always() && contains(fromJSON('["Both", "Issues"]'), inputs.type) && contains(fromJSON('["All", "Test Model"]'), inputs.steps) && contains(fromJSON('["success", "skipped"]'), needs.train-issues.result) }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: read
+    needs: train-issues
+    steps:
+      - name: "Test Model for Issues"
+        uses: dotnet/issue-labeler/test@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "issues"
+          cache_key: ${{ env.CACHE_KEY }}
+          repository: ${{ env.REPOSITORY }}
+          label_prefix: ${{ env.LABEL_PREFIX }}
+          threshold: ${{ env.THRESHOLD }}
+          limit: ${{ env.LIMIT }}
+          page_size: ${{ env.PAGE_SIZE }}
+          page_limit: ${{ env.PAGE_LIMIT }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+  test-pulls:
+    if: ${{ always() && contains(fromJSON('["Both", "Pull Requests"]'), inputs.type) && contains(fromJSON('["All", "Test Model"]'), inputs.steps) && contains(fromJSON('["success", "skipped"]'), needs.train-pulls.result) }}
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    needs: train-pulls
+    steps:
+      - name: "Test Model for Pull Requests"
+        uses: dotnet/issue-labeler/test@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: "pulls"
+          cache_key: ${{ env.CACHE_KEY }}
+          repository: ${{ env.REPOSITORY }}
+          label_prefix: ${{ env.LABEL_PREFIX }}
+          threshold: ${{ env.THRESHOLD }}
+          limit: ${{ env.LIMIT }}
+          page_size: ${{ env.PAGE_SIZE }}
+          page_limit: ${{ env.PAGE_LIMIT }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/labeler.md b/.github/workflows/labeler.md
new file mode 100644
index 000000000000..502ebb98a8d0
--- /dev/null
+++ b/.github/workflows/labeler.md
@@ -0,0 +1,32 @@
+# Issue-Labeler Workflows
+
+This repository uses actions from [dotnet/issue-labeler](https://github.com/dotnet/issue-labeler) to predict area labels for issues and pull requests.
+
+The following workflow templates were imported and updated from [dotnet/issue-labeler/wiki/Onboarding](https://github.com/dotnet/issue-labeler/wiki/Onboarding):
+
+1. `labeler-cache-retention.yml`
+2. `labeler-predict-issues.yml`
+3. `labeler-predict-pulls.yml`
+4. `labeler-promote.yml`
+5. `labeler-train.yml`
+
+## Repository Configuration
+
+Across these workflows, the following changes were made to configure the issue labeler for this repository:
+
+1. Set `LABEL_PREFIX` to `"area-"`:
+    - `labeler-predict-issues.yml`
+    - `labeler-predict-pulls.yml`
+    - `labeler-train.yml`
+2. Set `DEFAULT_LABEL` to `"needs-area-label"`:
+    - `labeler-predict-issues.yml`
+    - `labeler-predict-pulls.yml`
+3. Remove the `EXCLUDED_AUTHORS` value as we do not bypass labeling for any authors' issues/pulls in this repository:
+    - `labeler-predict-issues.yml`
+    - `labeler-predict-pulls.yml`
+4. Update the pull request labeling branches to include `main` and `release/*`:
+    - `labeler-predict-pulls.yml`
+5. Remove the `repository` input for training the models against another repository:
+    - `labeler-train.yml`
+6. Update the cache retention cron schedule to an arbitrary time of day:
+    - `labeler-cache-retention.yml`
diff --git a/.github/workflows/locker.yml b/.github/workflows/locker.yml
index 592b01424740..c7248ea716e4 100644
--- a/.github/workflows/locker.yml
+++ b/.github/workflows/locker.yml
@@ -1,7 +1,7 @@
 name: Locker - Lock stale issues
 on:
   schedule:
-    - cron: '34 8 * * *' # Once per day, overnight PT, uncommon minute of hour
+    - cron: '34 12 * * 1-5' # Once per weekday, overnight PT, uncommon minute of hour
 
   workflow_dispatch:
     # Manual triggering through the GitHub UI, API, or CLI
@@ -23,7 +23,7 @@ jobs:
     if: ${{ github.repository_owner == 'dotnet' }}
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v4
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml
index 41149467e7a6..1b50d0b4d6cd 100644
--- a/.github/workflows/markdownlint.yml
+++ b/.github/workflows/markdownlint.yml
@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
     - name: Use Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
       with:
         node-version: 16.x
     - name: Run Markdownlint
       run: |
         echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
-        npm i -g markdownlint-cli
+        npm i -g markdownlint-cli@0.45.0
         markdownlint "docs/**/*.md"
diff --git a/.github/workflows/runtime-sync.yml b/.github/workflows/runtime-sync.yml
index 7dd10fa99595..23be75e0b7c7 100644
--- a/.github/workflows/runtime-sync.yml
+++ b/.github/workflows/runtime-sync.yml
@@ -21,14 +21,14 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Checkout aspnetcore
-      uses: actions/checkout@v4
+      uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
       with:
         # Test this script using changes in a fork
         repository: 'dotnet/aspnetcore'
         path: aspnetcore
         ref: main
     - name: Checkout runtime
-      uses: actions/checkout@v4
+      uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
       with:
         # Test this script using changes in a fork
         repository: 'dotnet/runtime'
@@ -47,7 +47,7 @@ jobs:
         mkdir ..\artifacts
         git status > ..\artifacts\status.txt
         git diff > ..\artifacts\diff.txt
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: results
         path: artifacts
@@ -64,7 +64,7 @@ jobs:
     - name: Send PR
       if: steps.check.outputs.sendpr == 'true'
       # https://github.com/marketplace/actions/create-pull-request
-      uses: dotnet/actions-create-pull-request@v4
+      uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         path: .\aspnetcore
diff --git a/.github/workflows/update-jquery-validate.yml b/.github/workflows/update-jquery-validate.yml
index d30b0dcc49ab..acd3fc13f179 100644
--- a/.github/workflows/update-jquery-validate.yml
+++ b/.github/workflows/update-jquery-validate.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: '20.x'
 
@@ -39,7 +39,7 @@ jobs:
         run: node update-jquery-validate.mjs
 
       - name: Create Pull Request
-        uses: dotnet/actions-create-pull-request@v4
+        uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update jquery.validate to ${{ env.JQUERY_VALIDATE_VERSION }}
diff --git a/.github/workflows/update-sdk.yml b/.github/workflows/update-sdk.yml
index c96f6b550c5c..042dd33eac28 100644
--- a/.github/workflows/update-sdk.yml
+++ b/.github/workflows/update-sdk.yml
@@ -19,8 +19,8 @@ jobs:
     name: Update .NET SDK
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: martincostello/update-dotnet-sdk@67d6e2b14939c06978a7f80444157296c3defe14 # v3.2.3
+    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
+    - uses: martincostello/update-dotnet-sdk@76e2c0df2303d4f6a404228105ebb7d60ace0556 # v3.4.0
       with:
         quality: 'daily'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-selenium-and-playwright-dependencies.yml b/.github/workflows/update-selenium-and-playwright-dependencies.yml
new file mode 100644
index 000000000000..15b720fcfe2e
--- /dev/null
+++ b/.github/workflows/update-selenium-and-playwright-dependencies.yml
@@ -0,0 +1,24 @@
+name: Update Selenium and Playwright dependencies
+
+on:
+  schedule:
+  - cron: '0 0 1-7 * 1' # Run on the first monday of the month
+  workflow_dispatch:  # Allow manual runs
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  update-selenium-and-playwright:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
+
+      - name: Update dependencies
+        run: pwsh eng/scripts/update-selenium-and-playwright-versions.ps1
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/validate-npm-package-lock-json.yml b/.github/workflows/validate-npm-package-lock-json.yml
index 74517b153788..288566e8d04e 100644
--- a/.github/workflows/validate-npm-package-lock-json.yml
+++ b/.github/workflows/validate-npm-package-lock-json.yml
@@ -14,13 +14,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           fetch-depth: 0
           submodules: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 20.x
 
diff --git a/.gitignore b/.gitignore
index 5f426a1c8a8f..ac1192650b58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ artifacts/
 bin/
 obj/
 .dotnet/
+.gradle/
 .nuget/
 .packages/
 .tools/
@@ -13,6 +14,7 @@ BenchmarkDotNet.Artifacts/
 src/SignalR/clients/**/dist/
 modules/
 .ionide/
+TestResults/
 
 # File extensions
 *.aps
@@ -33,9 +35,11 @@ modules/
 *.suo
 *.svclog
 *.tlog
+*.trx
 *.user
 *.userprefs
 *.vspx
+*.json.bak
 
 # Specific files, typically generated by tools
 .config/dotnet-tools.json
diff --git a/.globalconfig b/.globalconfig
index 202ab97159d2..d1455dda013d 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -12,3 +12,20 @@ dotnet_diagnostic.CA1310.severity = error
 
 # TODO: remove this - https://github.com/dotnet/aspnetcore/issues/47912
 dotnet_diagnostic.EnableGenerateDocumentationFile.severity = none
+
+# Referencing types that are defined in M.CA.Workspaces is not appropriate
+# for analyzers or source generators that might be invoked from a command
+# line build because editor-specific types in M.CA.Workspaces are not
+# available in the command line. By default, Roslyn enables RS1038
+# which does a strict check and throws if a reference to M.CA.Workspaces
+# is included in the assembly. Here, we opt for a more relaxed check that
+# validates if M.CA.Workspace type references are included in the specific
+# Roslyn components that might be loaded in command line builds. We do this
+# because we ship editor-specific components, like the routing completion
+# providers, in the shared framework and want to avoid the analyzers warning
+# on the M.CA.Workspaces reference required for their components even though
+# they are never loaded in command line builds. Note: the "relaxed" check that is
+# enabled here will actually examine the types loaded by each individually analyzer
+# to see if they are from a Workspaces assembly so it will take longer than the
+# greedier (and stricter) check for references overall.
+roslyn_correctness.assembly_reference_validation = relaxed
diff --git a/ANCM.slnx b/ANCM.slnx
new file mode 100644
index 000000000000..06e0cfaad0e3
--- /dev/null
+++ b/ANCM.slnx
@@ -0,0 +1,22 @@
+<Solution>
+  <Configurations>
+    <Platform Name="ARM64" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj" Id="ec82302f-d2f0-4727-99d1-eabc0dd9dc3b">
+    <Deploy Solution="*|x86" />
+  </Project>
+  <Project Path="src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj" Id="55494e58-e061-4c4c-a0a8-837008e72f85">
+    <Deploy Solution="*|x86" />
+  </Project>
+  <Project Path="src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj" Id="09d9d1d6-2951-4e14-bc35-76a23cf9391a">
+    <Deploy Solution="*|x86" />
+  </Project>
+  <Project Path="src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj" Id="7f87406c-a3c8-4139-a68d-e4c344294a67">
+    <Deploy Solution="*|x86" />
+  </Project>
+  <Project Path="src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj" Id="1533e271-f61b-441b-8b74-59fb61df0552">
+    <Deploy Solution="*|x86" />
+  </Project>
+</Solution>
diff --git a/AspNetCore.sln b/AspNetCore.sln
deleted file mode 100644
index 5a54800dae83..000000000000
--- a/AspNetCore.sln
+++ /dev/null
@@ -1,11862 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31606.5
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{C28A32F6-8314-412E-9F3B-CBD31C23E878}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0F84F170-57D0-496B-8E2C-7984178EF69F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaselineGenerator", "eng\tools\BaselineGenerator\BaselineGenerator.csproj", "{03C2290A-1C48-489A-81DB-F3447B0DA595}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RepoTasks", "eng\tools\RepoTasks\RepoTasks.csproj", "{2B94628A-CFFB-447E-8026-A126C33B0917}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{017429CC-C5FB-48B4-9C46-034E29EE2F06}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc", "Mvc", "{1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc", "Mvc", "{819B136D-B8B6-46AE-8C4F-5469BBBFC46B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Mvc\Mvc\src\Microsoft.AspNetCore.Mvc.csproj", "{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SignalR", "SignalR", "{5BC5A805-DCA0-41DF-91B8-520B5DAD57DA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{2C022280-340C-43DC-B63D-5A644F0ECBF2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SignalR", "SignalR", "{B6081DA9-738E-4088-92DD-7FFA200523C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR", "src\SignalR\server\SignalR\src\Microsoft.AspNetCore.SignalR.csproj", "{BE70E100-E6C4-4686-8592-73E2A04E877F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{60D51C98-2CC0-40DF-B338-44154EFEE2FF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{6DE916F5-E78F-446C-89CB-9240AED2A2E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Server", "src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj", "{7546E2DD-2CF4-4240-8045-2533DF539458}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Antiforgery", "Antiforgery", "{B55A5DE1-5AF3-4B18-AF04-C1735B071DA6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "src\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{210B7FF8-ADD2-4E11-831A-41B28F423E44}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{627BE8B3-59E6-4F1D-8C9C-76B804D41724}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Abstractions", "Authentication.Abstractions", "{AB0ED518-C27C-42D9-8D66-5F974033F855}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "src\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{18E65289-27FC-4EC6-BFE8-9FA852381319}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Core", "Authentication.Core", "{5CF8E05A-C8DD-4551-8542-844A217B39F2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "src\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "Security", "{A39335E5-7A26-4CFD-BF3B-2CFE75113498}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authorization", "Authorization", "{EB593520-0853-4642-A404-675FC318D181}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{EA034D9C-3281-426B-A363-FF1C05D12483}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "src\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{C2751270-6970-4CC8-8D8C-81A4B8D26446}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Policy", "Policy", "{C63C5E92-1511-45A5-A160-0FCC9B3E3CDB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "src\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{E2083951-98E7-4C1C-AB3A-935EA6311018}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{B59D558B-AC58-4BA4-B5AF-AE51C8531B28}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components", "src\Components\Components\src\Microsoft.AspNetCore.Components.csproj", "{A345753F-B4FA-43E4-8275-151FA5B70728}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{08B240FC-AE5D-478A-963D-890ADE70B0B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Web", "src\Components\Web\src\Microsoft.AspNetCore.Components.Web.csproj", "{34A797ED-AC07-476D-BEB1-E86DBBF2395A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Servers", "Servers", "{0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connections.Abstractions", "Connections.Abstractions", "{78DD1AC3-0981-4109-861B-C3E2F1FC3281}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{D5D2C620-42B7-4ECF-A892-295BB124A833}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Middleware", "Middleware", "{E5963C9F-20A6-4385-B364-814D2581FADF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CORS", "CORS", "{27223011-E8E9-4178-9377-44A7B3CBCC21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "src\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{8CDA0BDC-05C2-451F-9990-2BEF471684BF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataProtection", "DataProtection", "{380430A1-C02F-4943-8A52-FDFA9F7735F0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cryptography.Internal", "Cryptography.Internal", "{5B27FAB7-E5FE-4FF2-8F39-900E177D5E39}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal", "src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{392701C6-0BDB-4505-ADB8-1475770A2421}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataProtection", "DataProtection", "{682157DB-17F2-40D6-B0ED-11B6C6CB064B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "src\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{64D54BBB-13D1-4655-A149-CFB754820BD2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Diagnostics.Abstractions", "Diagnostics.Abstractions", "{ECB76EBA-0512-4449-95AA-7258F543BA2E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "src\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{1D6348B5-0616-41A6-90ED-09D34C452926}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosting", "Hosting", "{2DB7E3C7-D213-4609-95DD-72561F23AB58}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{83C6944F-8F6C-4698-A09A-25DB92BA1AD2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "src\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{456056B5-3888-47AB-AFD7-4F16A8A1454F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server.Abstractions", "Server.Abstractions", "{44663691-023E-48D0-9757-A106974E8AAE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "src\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{4DE12851-6ABC-4675-84B8-0E0EFA142F79}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Html", "Html", "{13E7C397-F40B-4791-B853-F7430AF88D00}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{412D4C15-F48F-4DB1-940A-131D1AA87088}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "src\Html.Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{A400C938-46E2-4B84-B06E-487B13D22E1B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http", "Http", "{3D330C1E-D773-4BA8-9E91-123544B0D672}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "src\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{563714CA-0022-4A95-BDBB-0953541193CA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Abstractions", "Http.Abstractions", "{DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "src\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{E55659A7-5489-4E86-B11C-2E41697555F7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{1A304CA0-7795-4684-88E5-E66402966927}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Connections", "Http.Connections", "{A0FFAF00-D628-4BDB-BE68-8DBA21FBBEA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections", "src\SignalR\common\Http.Connections\src\Microsoft.AspNetCore.Http.Connections.csproj", "{627F94BE-AD74-4188-9F61-12E5096DA826}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Connections.Common", "Http.Connections.Common", "{BC0E5F62-06EE-407D-83C6-490785E9A011}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Common", "src\SignalR\common\Http.Connections.Common\src\Microsoft.AspNetCore.Http.Connections.Common.csproj", "{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Extensions", "Http.Extensions", "{225AEDCF-7162-4A86-AC74-06B84660B379}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "src\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{606C2615-3E08-4A08-993F-FBD90F4CD021}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Features", "Http.Features", "{BFDD5ACE-A1F0-4C33-8DA1-06CB5CA53177}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "src\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{62043A86-BC6F-432E-9AFD-F3B616192D8D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization", "Localization", "{9934060B-1957-40FF-83E1-5C15344E7A33}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "src\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Abstractions", "Mvc.Abstractions", "{D685AF51-2CE2-4CD8-86AA-FB0EDD47533F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.ApiExplorer", "Mvc.ApiExplorer", "{0322CF4A-9701-4E7E-9827-BC7DFFA78842}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "src\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Core", "Mvc.Core", "{5F51EB21-20E2-4793-A137-2E18D50696C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "src\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj", "{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Cors", "Mvc.Cors", "{7ACD11D4-4682-4936-AFF6-DAC64C636612}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "src\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj", "{E071FB7E-E650-44B0-9529-D5D1685AEA62}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.DataAnnotations", "Mvc.DataAnnotations", "{79C7F0D4-7B1A-46BF-8932-5C2E971C5925}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "src\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{6A31248F-5F64-4A73-856C-8DC6492E6AC7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Formatters.Json", "Mvc.Formatters.Json", "{644AAC18-8E13-4392-8891-3814E355C819}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "src\Mvc\Mvc.Formatters.Json\src\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{928C9877-6BF3-447D-9E33-ACF833151D77}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Localization", "Mvc.Localization", "{70AD2DB0-47D7-492F-817A-34BCAFD861C4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "src\Mvc\Mvc.Localization\src\Microsoft.AspNetCore.Mvc.Localization.csproj", "{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Razor", "Mvc.Razor", "{D21F1804-4690-4B00-BC6A-2147C14BF1B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "src\Mvc\Mvc.Razor\src\Microsoft.AspNetCore.Mvc.Razor.csproj", "{451C6023-83D5-4809-9F71-6A23ED725A03}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.RazorPages", "Mvc.RazorPages", "{9578BB4F-D805-4581-9AAE-A66002BFDA1F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "src\Mvc\Mvc.RazorPages\src\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{A47371F8-F47E-4AF3-9F2E-068F28CE6587}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.TagHelpers", "Mvc.TagHelpers", "{3691F0FE-6A8D-4F99-95EB-2D3AD3F9B712}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "src\Mvc\Mvc.TagHelpers\src\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{4C056678-59A0-4D37-BE70-B98D764C7EA4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.ViewFeatures", "Mvc.ViewFeatures", "{DA5E4C5A-E62C-47CD-9557-65F747638BAD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "src\Mvc\Mvc.ViewFeatures\src\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{81A35CF9-214F-4351-9561-334F32B41C3A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor", "Razor", "{B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor", "Razor", "{66A0F71A-FFB5-4763-913E-FB4A4F17EAA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "src\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{50D97D17-79CF-4917-AD70-F79146FE8808}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Runtime", "Razor.Runtime", "{AB316CF4-D9C3-427E-8460-7C5235BED45E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "src\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCaching.Abstractions", "ResponseCaching.Abstractions", "{0408482E-7934-49CA-A590-7E21AF4BE1BF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{A9027A02-135B-4149-947A-79F5B73A7F28}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing", "Routing", "{54C42F57-5447-4C21-9812-4AF665567566}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "src\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing.Abstractions", "Routing.Abstractions", "{3ACCF669-89AB-4B02-809E-E94C81271BFF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "src\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{DEED8B59-B811-471F-936A-D8D71AA97CE1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SignalR.Common", "SignalR.Common", "{DF5E3AC1-94B3-4B8A-B534-9D30924A8E6B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Common", "src\SignalR\common\SignalR.Common\src\Microsoft.AspNetCore.SignalR.Common.csproj", "{B2660D8F-8990-46C7-9B41-F3F94C6402F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{4F99BF26-E900-487C-828F-145166926DE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Core", "src\SignalR\server\Core\src\Microsoft.AspNetCore.SignalR.Core.csproj", "{31E763AD-996E-44EF-A70E-1B8187922C98}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols.Json", "Protocols.Json", "{989F2C7A-807F-41DA-AA5F-08147E8FF433}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Protocols.Json", "src\SignalR\common\Protocols.Json\src\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj", "{3974EB1C-077A-4A79-B295-87B62446C266}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticFiles", "StaticFiles", "{9AA5D0E4-B341-4570-B3E4-081E6653471D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSockets", "WebSockets", "{B7ED4805-AD3E-4D76-BC5B-700A31488493}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSockets", "src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj", "{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebUtilities", "WebUtilities", "{BF4B36D6-D1FA-41A3-9CB3-2E1D2894E2AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "src\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{06492CD6-4C51-41F3-9D1A-0A95F914F871}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Headers", "Headers", "{C59FBB3C-3A7F-4744-A823-1EB92C5B23A2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "src\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{7321E95C-0A37-45BD-B458-1BA4412A14AC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{021E9BF3-2D3D-4169-834E-718ABE0E5B68}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Analyzers", "src\Analyzers\Analyzers\src\Microsoft.AspNetCore.Analyzers.csproj", "{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Analyzers.Test", "src\Analyzers\Analyzers\test\Microsoft.AspNetCore.Analyzers.Test.csproj", "{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery.Test", "src\Antiforgery\test\Microsoft.AspNetCore.Antiforgery.Test.csproj", "{78C5ACC3-6718-4682-B350-737EDA1E4F35}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure", "Azure", "{DFDEED51-6B9B-41B9-A684-9F3FFC07C9B4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kestrel", "Kestrel", "{4FDDC525-4E60-4CAF-83A3-261C5B43721F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kestrel", "Kestrel", "{89472057-8BB2-44A8-B0FC-D9F3ADB1181C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{D69B5668-86EF-4CC5-814B-113BAF740DD0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{0674F69B-FAC8-43E5-8711-A476936F459F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpsPolicy", "HttpsPolicy", "{D9403AE4-77D1-44DE-8785-280C342D215A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy", "src\Middleware\HttpsPolicy\src\Microsoft.AspNetCore.HttpsPolicy.csproj", "{5DEF52C0-B440-4DAC-8A2D-920C7016C580}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IIS", "IIS", "{D67E977E-75DF-41EE-8315-6DBF5C2B7357}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IISIntegration", "IISIntegration", "{EE74FCEC-542A-4B66-B0A9-49B28049C203}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{737D2BC0-092E-404B-BB73-EACAEDBF0E65}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}
-		{55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85}
-		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
-		{1533E271-F61B-441B-8B74-59FB61DF0552} = {1533E271-F61B-441B-8B74-59FB61DF0552}
-		{D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863}
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{7004082D-53E9-45C2-B2DE-EB3CE448B64F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "src\DataProtection\Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Testing", "Mvc.Testing", "{ADAC3089-7247-4137-A8CB-8114D58C9B93}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.csproj", "{183F99F9-0C0B-4790-8152-637B4AE68622}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup", "{EA2941E6-5868-47CD-97AB-2DB1D5F18D97}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "src\Azure\AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServicesIntegration", "AzureAppServicesIntegration", "{AE3F1191-648A-4813-81C5-E8527E716BB7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Azure\AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{32FE10AE-CC85-407A-8720-624CDD3EB890}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "src\Azure\AzureAppServicesIntegration\test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2E944A89-5614-425E-A87A-5F455EDB78D7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesHostingStartupSample", "src\Azure\samples\AzureAppServicesHostingStartupSample\AzureAppServicesHostingStartupSample.csproj", "{FE930950-64DC-45A3-8128-2D68F97EBB19}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesSample", "src\Azure\samples\AzureAppServicesSample\AzureAppServicesSample.csproj", "{81410464-9C9E-4DDE-824C-BCD0DA8E6523}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosting", "Hosting", "{68C2D913-06D4-4EAC-9283-78465BF214E1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "src\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server.IntegrationTesting", "Server.IntegrationTesting", "{F4B3C10B-F713-45D1-84EF-DD503BA09D20}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{7AA8771B-F1F3-409E-960A-EEF00B94135A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestHost", "TestHost", "{E6639EAB-40B0-4BB6-A56B-25ECC4B6D3D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "src\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{822D1519-77F0-484A-B9AB-F694C2CC25F1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenIdConnect", "OpenIdConnect", "{99F9BBC5-46AE-40DC-A675-5E56ACA3C5C8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OpenIdConnect", "src\Security\Authentication\OpenIdConnect\src\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj", "{AB39F04A-A96E-4BE1-99F2-54B804104BA1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{9121A7EA-5751-4811-9FE3-E183BB8709FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OAuth", "src\Security\Authentication\OAuth\src\Microsoft.AspNetCore.Authentication.OAuth.csproj", "{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{03CD847C-2230-4092-BF1C-DE54634805AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "src\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{D47B73A3-740E-4B9A-B123-A42299F1F266}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cookies", "Cookies", "{14A4E3F5-04BB-4062-84AE-1A887C307B17}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "src\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{6906D7DE-CE06-4A6A-81BB-D783C605A184}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JwtBearer", "JwtBearer", "{2AB4FE8F-94FF-4C6E-B12F-9E40A9FAF9AB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "src\Security\Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{F90D4383-89FC-4215-B2AB-BBB242CC5E45}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{A274799D-3D1F-4AE5-A154-4BF6C80A8D94}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers", "src\Components\Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj", "{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers.Tests", "src\Components\Analyzers\test\Microsoft.AspNetCore.Components.Analyzers.Tests.csproj", "{7B382EC7-57B6-4C0C-8B27-5F63B5184193}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebAssembly", "WebAssembly", "{562D5067-8CD8-4F19-BCBB-873204932C61}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebAssembly", "WebAssembly", "{58FFC6CE-5958-460C-A520-32CF3FD0BE61}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly", "src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj", "{DE6F167E-F41C-414D-923E-8E51E992A830}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Tests", "src\Components\WebAssembly\WebAssembly\test\Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj", "{839C479D-64DC-4A59-85E4-04E5A2CC9631}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevServer", "DevServer", "{26196065-4F78-435E-B500-2967A63D277D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.DevServer", "src\Components\WebAssembly\DevServer\src\Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj", "{ADB4912C-BCD5-400F-BD20-37410BA76EF8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{13683DEB-FB7E-4F20-ACB2-015381943541}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Server", "src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj", "{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Performance", "src\Components\Components\perf\Microsoft.AspNetCore.Components.Performance.csproj", "{4510DA15-69F3-411E-86F2-7AD04FFB9823}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Tests", "src\Components\Components\test\Microsoft.AspNetCore.Components.Tests.csproj", "{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Server.Tests", "src\Components\Server\test\Microsoft.AspNetCore.Components.Server.Tests.csproj", "{6CBF1AA9-1073-4A97-B867-FB534C6829C1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0508E463-0269-40C9-B5C2-3B600FB2A28B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.E2ETests", "src\Components\test\E2ETest\Microsoft.AspNetCore.Components.E2ETests.csproj", "{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DefaultBuilder", "DefaultBuilder", "{881FE4C3-1553-4CA1-B430-DDD37B3493AB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore", "src\DefaultBuilder\src\Microsoft.AspNetCore.csproj", "{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Diagnostics", "Diagnostics", "{DE5C0805-1C4A-4C70-B613-89EE2EA0B757}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "src\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{FB86B2B2-60B2-477A-9D78-2530A0089660}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostFiltering", "HostFiltering", "{58915BB2-CEF5-4CA3-8886-A61156564505}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HostFiltering", "src\Middleware\HostFiltering\src\Microsoft.AspNetCore.HostFiltering.csproj", "{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpOverrides", "HttpOverrides", "{39086512-EBC8-4061-BE34-DCCA5D1BA585}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "src\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{34F24889-22D2-40A1-A2AB-A43B9061FE0D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCompression", "ResponseCompression", "{512EFCA7-1590-492A-8D06-84744F79DA91}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression", "src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj", "{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Analyzers", "Mvc.Analyzers", "{515282B6-6EF9-46E0-8EF1-DBD1CD948D9E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "src\Mvc\Mvc.Analyzers\src\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{02A85F31-A092-4322-A3D9-91E894D9ECD2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IIS", "IIS", "{33CAD745-5912-47D3-BAF3-5AE580FED275}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Servers\IIS\IIS\src\Microsoft.AspNetCore.Server.IIS.csproj", "{9E01AF6A-F748-4490-B45B-8558D1E701B4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}
-		{55494E58-E061-4C4C-A0A8-837008E72F85} = {55494E58-E061-4C4C-A0A8-837008E72F85}
-		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
-		{1533E271-F61B-441B-8B74-59FB61DF0552} = {1533E271-F61B-441B-8B74-59FB61DF0552}
-		{D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863}
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {09D9D1D6-2951-4E14-BC35-76A23CF9391A}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transport.Sockets", "Transport.Sockets", "{94174359-D57E-467E-8AC7-167A10260F34}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "src\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols.MessagePack", "Protocols.MessagePack", "{B4B39C18-70F5-4C07-9871-4E124F63F1F7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack", "src\SignalR\common\Protocols.MessagePack\src\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj", "{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols.NewtonsoftJson", "Protocols.NewtonsoftJson", "{01EED30B-3DC5-4591-A4C2-B17C6D36B1DE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson", "src\SignalR\common\Protocols.NewtonsoftJson\src\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj", "{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.NewtonsoftJson", "Mvc.NewtonsoftJson", "{4B6BA2CC-8DE7-4070-A912-D51375998553}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson", "src\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj", "{18FCF9CD-8545-41FC-9E4B-0F18B593863D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{F94AF7F5-7DB1-4716-B4B5-A7DAB066AF2F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JsonPatch", "JsonPatch", "{5FF36127-063D-4D3E-9429-3BFD32713FEE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clients", "clients", "{0338EC37-E5AD-47DA-9502-24A5F7433ADE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp", "csharp", "{2637A22F-182F-4659-A394-C9BC1514B321}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{A6D39EEA-CC08-4ECF-BD2E-134D845876FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client", "src\SignalR\clients\csharp\Client\src\Microsoft.AspNetCore.SignalR.Client.csproj", "{95F132DA-D9B6-4181-8D1B-A58D935B1827}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client.Core", "Client.Core", "{85EFA9E2-A041-438B-BAF9-928C74571141}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.Core", "src\SignalR\clients\csharp\Client.Core\src\Microsoft.AspNetCore.SignalR.Client.Core.csproj", "{9443F095-DA20-4EED-BC97-5BF92470D972}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Connections.Client", "Http.Connections.Client", "{EA798F59-BCF8-4013-AF6B-9611FDC9919C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Client", "src\SignalR\clients\csharp\Http.Connections.Client\src\Microsoft.AspNetCore.Http.Connections.Client.csproj", "{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Web.Tests", "src\Components\Web\test\Microsoft.AspNetCore.Components.Web.Tests.csproj", "{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authorization", "Authorization", "{9DF052F3-D239-4BB5-B41E-DA93A086B4F8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Authorization", "src\Components\Authorization\src\Microsoft.AspNetCore.Components.Authorization.csproj", "{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Authorization.Tests", "src\Components\Authorization\test\Microsoft.AspNetCore.Components.Authorization.Tests.csproj", "{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{59ECEDFE-72E7-495D-BECB-784B0018544E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Forms", "src\Components\Forms\src\Microsoft.AspNetCore.Components.Forms.csproj", "{61F6B56C-0764-4585-9C3F-63A0CF05E56E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Forms.Tests", "src\Components\Forms\test\Microsoft.AspNetCore.Components.Forms.Tests.csproj", "{60B11F05-CA3B-4AD1-BAC1-912C19D37395}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerApp", "src\Components\Samples\BlazorServerApp\BlazorServerApp.csproj", "{8DE6625B-C9E4-4949-A75C-89E3FF556724}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarkapps", "benchmarkapps", "{0CE1CC26-98CE-4022-A81C-E32AAFC9B819}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wasm.Performance", "Wasm.Performance", "{6276A9A0-791B-49C1-AD8F-50AC47CDC196}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.Driver", "src\Components\benchmarkapps\Wasm.Performance\Driver\Wasm.Performance.Driver.csproj", "{B81C7FA1-870F-4F21-A928-A5BE18754E6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.TestApp", "src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj", "{2AEACF69-7F68-414A-B49D-2C627D37D0F6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Server.Tests", "src\Components\WebAssembly\Server\test\Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj", "{0C610220-E00C-4752-98A0-44A3D4B96A21}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication.Msal", "Authentication.Msal", "{1FD5F261-6384-4AE1-A6DA-4D08A0BCE1CF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Authentication.WebAssembly.Msal", "src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj", "{09F72EF0-2BDE-4B73-B116-A87E38C432FE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSInterop", "JSInterop", "{44161B20-CC30-403A-AC94-247592ED7590}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.JSInterop.WebAssembly", "src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj", "{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebAssembly.Authentication", "WebAssembly.Authentication", "{E33C36A1-481C-4A93-BCBE-22CCBA53349B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Authentication", "src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj", "{E167A806-EEFA-4BCF-A14D-D985BAEA9387}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests", "src\Components\WebAssembly\WebAssembly.Authentication\test\Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj", "{15A90CE7-886D-4005-8C14-CF29123344E1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSInterop", "JSInterop", "{E50C2015-42A4-4E71-94B9-62773D369FEE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.JSInterop", "Microsoft.JSInterop", "{16898702-3E33-41C1-B8D8-4CE3F1D46BD9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.JSInterop", "src\JSInterop\Microsoft.JSInterop\src\Microsoft.JSInterop.csproj", "{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions.Tests", "src\DataProtection\Abstractions\test\Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj", "{552EB148-0518-41A6-905D-4696A6438E80}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal.Tests", "src\DataProtection\Cryptography.Internal\test\Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj", "{789E23FE-E8F4-4935-AF43-4A84D25AD130}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cryptography.KeyDerivation", "Cryptography.KeyDerivation", "{9546F4D5-9625-480F-B5BB-5D6FF9369885}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation", "src\DataProtection\Cryptography.KeyDerivation\src\Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj", "{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests", "src\DataProtection\Cryptography.KeyDerivation\test\Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj", "{F421D0C4-6EF7-48B7-9213-AFD21322E08B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Tests", "src\DataProtection\DataProtection\test\Microsoft.AspNetCore.DataProtection.Tests\Microsoft.AspNetCore.DataProtection.Tests.csproj", "{696BE515-B3AB-4925-969C-350F1BDA5C30}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions.Tests", "src\DataProtection\Extensions\test\Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj", "{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StackExchangeRedis", "StackExchangeRedis", "{FE22EB98-C12E-4FAE-A7C2-DF65890F3084}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.StackExchangeRedis", "src\DataProtection\StackExchangeRedis\src\Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj", "{87181A18-6A53-43E6-A6B1-1F867C9D3E45}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests", "src\DataProtection\StackExchangeRedis\test\Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests.csproj", "{3B85171E-9A55-4605-B9B1-56F77E47137B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8275510E-0E6C-45A8-99DF-4F106BC7F075}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomEncryptorSample", "src\DataProtection\samples\CustomEncryptorSample\CustomEncryptorSample.csproj", "{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyManagementSample", "src\DataProtection\samples\KeyManagementSample\KeyManagementSample.csproj", "{58C5FE49-3060-4D9E-B76C-352790FCD1D8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NonDISample", "src\DataProtection\samples\NonDISample\NonDISample.csproj", "{4F39F27E-0E21-4093-8818-D974D4716C14}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Redis", "src\DataProtection\samples\Redis\Redis.csproj", "{BC0CC534-0285-4471-B99E-584BEFEC94DB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EntityFrameworkCore", "EntityFrameworkCore", "{97F5B320-B18E-4275-B0E9-BB5FABDA952F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.EntityFrameworkCore", "src\DataProtection\EntityFrameworkCore\src\Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj", "{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test", "src\DataProtection\EntityFrameworkCore\test\Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test.csproj", "{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkCoreSample", "src\DataProtection\samples\EntityFrameworkCoreSample\EntityFrameworkCoreSample.csproj", "{22F70908-5E62-4185-B76B-F0C5B952F8AE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2F08930D-5646-4D74-AAA2-9E51C93D1192}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DefaultBuilder.SampleApp", "src\DefaultBuilder\samples\SampleApp\DefaultBuilder.SampleApp.csproj", "{0CD27C71-4A3C-4AA0-8258-F7430F875984}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BCD032DD-D088-4F72-B80F-48D0EA845F87}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Tests", "src\DefaultBuilder\test\Microsoft.AspNetCore.Tests\Microsoft.AspNetCore.Tests.csproj", "{58955E85-0D55-45FF-97EE-BDD096522954}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.FunctionalTests", "src\DefaultBuilder\test\Microsoft.AspNetCore.FunctionalTests\Microsoft.AspNetCore.FunctionalTests.csproj", "{D708256C-4A68-4B15-AAE5-6EFA41223A70}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grpc", "Grpc", "{8DAC59BE-CB96-4F04-909C-56C22E7665EB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E763DA15-8F4E-446C-99B8-309053C75598}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropTests", "src\Grpc\Interop\test\InteropTests\InteropTests.csproj", "{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{05A169C7-4F20-4516-B10A-B13C5649D346}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "src\Hosting\Hosting\test\Microsoft.AspNetCore.Hosting.Tests.csproj", "{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C8415333-2A64-4FF0-8FC9-652694A11A77}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericWebHost", "src\Hosting\samples\GenericWebHost\GenericWebHost.csproj", "{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleStartups", "src\Hosting\samples\SampleStartups\SampleStartups.csproj", "{7391E144-5087-4E64-94D8-E0700D57739C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost.Tests", "src\Hosting\TestHost\test\Microsoft.AspNetCore.TestHost.Tests.csproj", "{ED6E6F06-D620-41BC-8F12-01480BF49381}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServices", "WindowsServices", "{3DC5D8DB-5DA3-4793-B090-9CB89A158B51}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.WindowsServices", "src\Hosting\WindowsServices\src\Microsoft.AspNetCore.Hosting.WindowsServices.csproj", "{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.WindowsServices.Tests", "src\Hosting\WindowsServices\test\Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj", "{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C1409A8F-555A-4A88-B803-C6D3E8B6C3B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.FunctionalTests", "src\Hosting\test\FunctionalTests\Microsoft.AspNetCore.Hosting.FunctionalTests.csproj", "{72AA2B1F-1FE7-48B5-968D-89E492F2139D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Owin", "Owin", "{AA465A56-D9D0-4684-95B0-192F4436C582}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin", "src\Http\Owin\src\Microsoft.AspNetCore.Owin.csproj", "{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core.Test", "src\Http\Authentication.Core\test\Microsoft.AspNetCore.Authentication.Core.Test.csproj", "{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers.Tests", "src\Http\Headers\test\Microsoft.Net.Http.Headers.Tests.csproj", "{8CB43443-E02C-4D04-9E96-A4916E5C83C2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Tests", "src\Http\Http\test\Microsoft.AspNetCore.Http.Tests.csproj", "{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions.Tests", "src\Http\Http.Abstractions\test\Microsoft.AspNetCore.Http.Abstractions.Tests.csproj", "{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions.Tests", "src\Http\Http.Extensions\test\Microsoft.AspNetCore.Http.Extensions.Tests.csproj", "{402C3AC9-1B1D-4523-AB80-A992CEA85F57}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin.Tests", "src\Http\Owin\test\Microsoft.AspNetCore.Owin.Tests.csproj", "{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAbstractions.SampleApp", "src\Http\samples\SampleApp\HttpAbstractions.SampleApp.csproj", "{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Tests", "src\Http\WebUtilities\test\Microsoft.AspNetCore.WebUtilities.Tests.csproj", "{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Microbenchmarks", "src\Http\Http\perf\Microbenchmarks\Microsoft.AspNetCore.Http.Microbenchmarks.csproj", "{C713DCA1-B36D-44BD-ACFA-F562782AD40E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Microbenchmarks", "src\Http\Routing\perf\Microbenchmarks\Microsoft.AspNetCore.Routing.Microbenchmarks.csproj", "{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17DD5861-0635-46D0-84BA-6B163150AA4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "src\Http\Routing\test\FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{2DF639CC-DFF2-44D2-9585-D1E925B5A117}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Tests", "src\Http\Routing\test\UnitTests\Microsoft.AspNetCore.Routing.Tests.csproj", "{C71CF302-0FFA-4610-9197-033B277F3065}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "src\Http\Routing.Abstractions\test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{09D2D765-A792-415E-B19A-18948A1C8969}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{E7CADFE4-CDD0-4DE3-90ED-7184A969F47B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Microbenchmarks", "src\Http\WebUtilities\perf\Microbenchmarks\Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj", "{822FF16C-A4E0-40A0-AE65-530752575261}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metadata", "Metadata", "{71DE18B5-87F9-4D03-89BB-C3E243576F92}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Metadata", "src\Http\Metadata\src\Microsoft.AspNetCore.Metadata.csproj", "{3A554C0B-2956-4152-BF31-2C8CAE5D2717}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{9F21A235-436E-4020-A076-1DF4F89D0CA0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9E0B9A09-167E-4DF7-8AA4-F9323A306F90}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EntityFrameworkCore", "EntityFrameworkCore", "{0F5F1299-7303-49B8-BEBF-9FF3B522CE0F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\Identity\EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{473C0171-0AD1-473B-B1A0-93636FD77BA6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F910B1B0-3641-4F3B-8336-5230FAB8FAD5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "src\Identity\EntityFrameworkCore\test\EF.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj", "{D15A9C48-00F1-423B-B14D-6EACE976E2F0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "src\Identity\EntityFrameworkCore\test\EF.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj", "{39B8B1ED-790E-4FF5-8D68-B1153655F87B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.Core", "Extensions.Core", "{7A3BDEED-70A7-4F2A-82D8-6A8752CE2859}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "src\Identity\Extensions.Core\src\Microsoft.Extensions.Identity.Core.csproj", "{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.Stores", "Extensions.Stores", "{83E043A0-50FF-48AB-AA1D-EE88B64A1E4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "src\Identity\Extensions.Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{30BB8038-D162-4171-9404-4041FC7A5BA7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.DefaultUI", "src\Identity\samples\IdentitySample.DefaultUI\IdentitySample.DefaultUI.csproj", "{5750A285-B528-4A6C-953F-7838824E5F81}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.Mvc", "src\Identity\samples\IdentitySample.Mvc\IdentitySample.Mvc.csproj", "{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Specification.Tests", "Specification.Tests", "{85179BD4-F1B1-4FDB-ABA9-3FDB0F5FF1B3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Specification.Tests", "src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj", "{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BCF3D807-5368-4201-8313-34493E60020B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.FunctionalTests", "src\Identity\test\Identity.FunctionalTests\Microsoft.AspNetCore.Identity.FunctionalTests.csproj", "{5EBE548A-E450-466B-B448-D6662E659E58}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.Test", "src\Identity\test\Identity.Test\Microsoft.AspNetCore.Identity.Test.csproj", "{58C3FE63-C364-4AF8-B575-2F65A7565B1F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "src\Identity\test\InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.csproj", "{8B6F219F-CE89-4704-8586-F9953F5FF4AB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{2AFCDBA1-0697-4134-BF22-17C145EB2710}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.UI", "src\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj", "{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CookiePolicy", "CookiePolicy", "{62F3EF13-4A89-4912-A22C-31981278B074}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "src\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Diagnostics.EntityFrameworkCore", "Diagnostics.EntityFrameworkCore", "{3D551023-1D98-479D-A41E-EBD0C05A06FF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "src\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{861CA437-6402-4E45-9E1F-35A509E61568}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rewrite", "Rewrite", "{049030CA-4D78-4B24-A112-28C61AB2509C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite", "src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj", "{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Facebook", "Facebook", "{B714B9AB-0A8F-4FB0-902E-6B73CA60DAB8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "src\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{805264B9-36C9-49D6-BA34-63D0050C9D6E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Google", "Google", "{2654DB24-E7E6-45B0-B350-3226D2D0FDC7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "src\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{C2645178-0B55-47D4-B9CA-A6FFA14E616E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Twitter", "Twitter", "{D38C4227-7692-4C66-B8C2-8A411B46DCE3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "src\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{8192DC13-6878-43C1-B657-96420C3BA9F8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A127217D-26AF-43C4-96A0-7080EB6F1D65}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EchoApp", "src\Middleware\WebSockets\samples\EchoApp\EchoApp.csproj", "{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSockets.TestServer", "src\Middleware\WebSockets\samples\TestServer\WebSockets.TestServer.csproj", "{68E93233-6FF3-41FE-8161-3B7F457473C8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8AAFAD2A-B273-4DB5-8DC9-3CA832248A82}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSockets.ConformanceTests", "src\Middleware\WebSockets\test\ConformanceTests\Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj", "{897EECDD-628F-4233-B1BF-A13F687057BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSockets.Tests", "src\Middleware\WebSockets\test\UnitTests\Microsoft.AspNetCore.WebSockets.Tests.csproj", "{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{41B519F7-CF19-4FB4-B96C-E38A7EF45F70}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagnostics.FunctionalTests", "src\Middleware\Diagnostics\test\FunctionalTests\Diagnostics.FunctionalTests.csproj", "{122907A1-AD5F-40B3-9D61-05A3F8CF859D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Tests", "src\Middleware\Diagnostics\test\UnitTests\Microsoft.AspNetCore.Diagnostics.Tests.csproj", "{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{364376C6-E886-482E-B79C-366E5DAB8A5B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagnostics.EFCore.FunctionalTests", "src\Middleware\Diagnostics.EntityFrameworkCore\test\FunctionalTests\Diagnostics.EFCore.FunctionalTests.csproj", "{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests", "src\Middleware\Diagnostics.EntityFrameworkCore\test\UnitTests\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj", "{4D08EC2C-A488-414E-8739-341E197773DB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MiddlewareAnalysis", "MiddlewareAnalysis", "{07AAFECB-4C42-4533-80D5-0452989FA0F7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{81143573-811E-4F61-9331-6B7173DBA67C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiddlewareAnalysisSample", "src\Middleware\MiddlewareAnalysis\samples\MiddlewareAnalysisSample\MiddlewareAnalysisSample.csproj", "{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis", "src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj", "{35AA4E31-D157-4AD2-B04F-EE3956795420}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.MiddlewareAnalysis.Tests", "src\Middleware\MiddlewareAnalysis\test\Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj", "{21F89E50-DF06-435E-872B-7639BCE695DF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HealthChecks", "HealthChecks", "{DF86A07D-A370-4CBD-97DD-DCB09466545F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.HealthChecks", "src\Middleware\HealthChecks\src\Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj", "{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8EFA9CC7-D03D-4535-898C-F3B80BB19F21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests", "src\Middleware\HealthChecks\test\UnitTests\Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj", "{2E690E42-B20F-4702-9478-1707EEC7C02F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HealthChecks.EntityFrameworkCore", "HealthChecks.EntityFrameworkCore", "{9C7F31F8-B782-4016-9B0E-72C8CB42334C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore", "src\Middleware\HealthChecks.EntityFrameworkCore\src\Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj", "{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests", "src\Middleware\HealthChecks.EntityFrameworkCore\test\Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj", "{922869D9-B9FF-4828-8C6F-FCA7963DB011}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostFilteringSample", "src\Middleware\HostFiltering\sample\HostFilteringSample.csproj", "{ECF7A440-D5FC-473F-958C-FE27643844D8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HostFiltering.Tests", "src\Middleware\HostFiltering\test\Microsoft.AspNetCore.HostFiltering.Tests.csproj", "{92820F5C-4018-4F10-A14B-0AEE619202EE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpOverridesSample", "src\Middleware\HttpOverrides\sample\HttpOverridesSample.csproj", "{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides.Tests", "src\Middleware\HttpOverrides\test\Microsoft.AspNetCore.HttpOverrides.Tests.csproj", "{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpsPolicySample", "src\Middleware\HttpsPolicy\sample\HttpsPolicySample.csproj", "{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpsPolicy.Tests", "src\Middleware\HttpsPolicy\test\Microsoft.AspNetCore.HttpsPolicy.Tests.csproj", "{A837D64D-435A-473F-8828-8E1DD95D8E4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseCompressionSample", "src\Middleware\ResponseCompression\sample\ResponseCompressionSample.csproj", "{4BA8A846-5B24-4F46-90B9-FFEFB889C028}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression.Tests", "src\Middleware\ResponseCompression\test\Microsoft.AspNetCore.ResponseCompression.Tests.csproj", "{3CCE49CA-4145-401F-8963-AC28F0908678}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RewriteSample", "src\Middleware\Rewrite\sample\RewriteSample.csproj", "{A1628BC4-134A-4854-9F98-B841520F1497}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Rewrite.Tests", "src\Middleware\Rewrite\test\Microsoft.AspNetCore.Rewrite.Tests.csproj", "{C69E36EC-3972-4CDF-A467-94CBD7C691A1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LocalizationSample", "src\Middleware\Localization\sample\LocalizationSample.csproj", "{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C9E481E5-F77D-4462-8E85-1F7FF2DCAA97}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.FunctionalTests", "src\Middleware\Localization\test\FunctionalTests\Microsoft.AspNetCore.Localization.FunctionalTests.csproj", "{5930AA76-C824-45F0-9D30-7EE4CB231E7A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Tests", "src\Middleware\Localization\test\UnitTests\Microsoft.AspNetCore.Localization.Tests.csproj", "{5BE39E84-020F-405D-99AF-5D46928785AF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization.Routing", "Localization.Routing", "{8C289D6B-712F-442F-A010-218784BFA4D4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing", "src\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing.Tests", "src\Middleware\Localization.Routing\test\Microsoft.AspNetCore.Localization.Routing.Tests.csproj", "{99CB7560-3B6F-447B-880A-C5A53F1E56F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression.Microbenchmarks", "src\Middleware\ResponseCompression\perf\Microbenchmarks\Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj", "{605D0C19-6E99-4A73-B336-1AD700AE93C0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConformanceTests", "ConformanceTests", "{73BC406B-4D98-4BE0-A756-19F0F3D2B587}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutobahnTestApp", "src\Middleware\WebSockets\test\ConformanceTests\AutobahnTestApp\AutobahnTestApp.csproj", "{2292C14D-151C-4AB7-AA91-7F0165E2073E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{45211BB8-4F51-427D-ADA2-7478E3398A60}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors.Test", "src\Middleware\CORS\test\UnitTests\Microsoft.AspNetCore.Cors.Test.csproj", "{F8410622-2764-4B05-BEC4-8D25CABBC45A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2E4D61F1-F504-450E-B4C2-11C5214E7200}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticFileSample", "src\Middleware\StaticFiles\samples\StaticFileSample\StaticFileSample.csproj", "{5EC5F788-458B-4957-8E33-ADD82DB6E420}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{491D5D41-4424-4642-AF7C-A7DD186CD282}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.FunctionalTests", "src\Middleware\StaticFiles\test\FunctionalTests\Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj", "{7135BA54-DE2E-42CD-8261-1A88907843FC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles.Tests", "src\Middleware\StaticFiles\test\UnitTests\Microsoft.AspNetCore.StaticFiles.Tests.csproj", "{A72BB350-8903-4914-9583-A156B66419EB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResponseCaching", "ResponseCaching", "{7CBB1320-BF86-4B32-9D2B-273A45057727}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{186AF4F9-9AFF-4395-9340-006F78D85DFB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F6BC5402-310D-4B1F-A018-99FD1D6C183A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseCachingSample", "src\Middleware\ResponseCaching\samples\ResponseCachingSample\ResponseCachingSample.csproj", "{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Tests", "src\Middleware\ResponseCaching\test\Microsoft.AspNetCore.ResponseCaching.Tests.csproj", "{8E5588B6-0557-41CF-9A0B-1A0B412754E1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Session", "Session", "{48BEABD3-2446-466C-8694-D34EF0949369}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionSample", "src\Middleware\Session\samples\SessionSample.csproj", "{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session.Tests", "src\Middleware\Session\test\Microsoft.AspNetCore.Session.Tests.csproj", "{A01B523B-35CA-4C14-B792-3887F8741E99}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpSys", "HttpSys", "{166E48ED-9738-4E13-8618-0D805F6F0F65}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeaderPropagation", "HeaderPropagation", "{5527E368-FD50-4E8C-B8D8-C3D1374BE4F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HeaderPropagation", "src\Middleware\HeaderPropagation\src\Microsoft.AspNetCore.HeaderPropagation.csproj", "{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HeaderPropagation.Tests", "src\Middleware\HeaderPropagation\test\Microsoft.AspNetCore.HeaderPropagation.Tests.csproj", "{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C2FDF6AA-A8BD-40A6-81AD-14687927E9FC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeaderPropagationSample", "src\Middleware\HeaderPropagation\samples\HeaderPropagationSample\HeaderPropagationSample.csproj", "{91BD5675-6674-4053-AD04-19F28DD3BAE5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConcurrencyLimiter", "ConcurrencyLimiter", "{4F8ED87D-E4D9-4941-94D7-D529D83DDBA0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConcurrencyLimiterSample", "src\Middleware\ConcurrencyLimiter\sample\ConcurrencyLimiterSample.csproj", "{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ConcurrencyLimiter", "src\Middleware\ConcurrencyLimiter\src\Microsoft.AspNetCore.ConcurrencyLimiter.csproj", "{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ConcurrencyLimiter.Tests", "src\Middleware\ConcurrencyLimiter\test\Microsoft.AspNetCore.ConcurrencyLimiter.Tests.csproj", "{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{9ECF118E-D7A5-4805-B698-DE9013BB91C6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks", "src\Middleware\ConcurrencyLimiter\perf\Microbenchmarks\Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks.csproj", "{5BF572A5-24AF-4815-BF0C-F57DA650207D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IntegrationTesting.IIS", "IntegrationTesting.IIS", "{036FB9FC-7F26-4982-B94E-2C32B4C836E1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "src\Servers\IIS\IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4} = {9E01AF6A-F748-4490-B45B-8558D1E701B4}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{EE65018D-FA12-461D-B2C5-44CA6E385530}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSockets.Microbenchmarks", "src\Middleware\perf\Microbenchmarks\Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj", "{A8E1962B-688E-44B3-81F3-BBB9891534CE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Microbenchmarks", "src\Middleware\perf\ResponseCaching.Microbenchmarks\Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj", "{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicrosoftAccount", "MicrosoftAccount", "{8C4006DF-FF48-46B6-A124-10B1EEAA266E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.MicrosoftAccount", "src\Security\Authentication\MicrosoftAccount\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj", "{F5C54062-B19C-4291-A816-F1B5A167369A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{056535BC-3E30-49E2-BE3B-630C62E641A5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{088C37A5-30D2-40FB-B031-D163CFBED006}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicWebSite", "src\Mvc\test\WebSites\BasicWebSite\BasicWebSite.csproj", "{B5F938FB-37DF-4201-9537-E043513701D7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.RoutingWebSite", "src\Mvc\test\WebSites\RoutingWebSite\Mvc.RoutingWebSite.csproj", "{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorWebSite", "src\Mvc\test\WebSites\RazorWebSite\RazorWebSite.csproj", "{1CF04156-B477-4B88-A25B-15D4E6F587D7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FormatterWebSite", "src\Mvc\test\WebSites\FormatterWebSite\FormatterWebSite.csproj", "{AC688973-3FAD-4A04-99C9-414782E5AE42}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiExplorerWebSite", "src\Mvc\test\WebSites\ApiExplorerWebSite\ApiExplorerWebSite.csproj", "{58BAA9A7-4A2A-459A-BD41-086E8F83022D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersioningWebSite", "src\Mvc\test\WebSites\VersioningWebSite\VersioningWebSite.csproj", "{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TagHelpersWebSite", "src\Mvc\test\WebSites\TagHelpersWebSite\TagHelpersWebSite.csproj", "{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilesWebSite", "src\Mvc\test\WebSites\FilesWebSite\FilesWebSite.csproj", "{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationModelWebSite", "src\Mvc\test\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.csproj", "{975E7F46-8044-463E-89E1-56EB0F7913B8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlGenerationWebSite", "src\Mvc\test\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj", "{BAD5E853-2C9D-41D5-844D-470BC33B43E8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ErrorPageMiddlewareWebSite", "src\Mvc\test\WebSites\ErrorPageMiddlewareWebSite\ErrorPageMiddlewareWebSite.csproj", "{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlFormattersWebSite", "src\Mvc\test\WebSites\XmlFormattersWebSite\XmlFormattersWebSite.csproj", "{A8096362-6304-4DAF-A091-978BE764FF30}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControllersFromServicesWebSite", "src\Mvc\test\WebSites\ControllersFromServicesWebSite\ControllersFromServicesWebSite.csproj", "{0FD49F5F-2950-43B8-8467-78596A4421AC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControllersFromServicesClassLibrary", "src\Mvc\test\WebSites\ControllersFromServicesClassLibrary\ControllersFromServicesClassLibrary.csproj", "{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsWebSite", "src\Mvc\test\WebSites\CorsWebSite\CorsWebSite.csproj", "{7DFECECC-E30C-4217-9746-86A8D652E110}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B8825E86-B8EA-4666-B681-C443D027C95D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "src\Mvc\samples\MvcSandbox\MvcSandbox.csproj", "{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebSite", "src\Mvc\test\WebSites\SimpleWebSite\SimpleWebSite.csproj", "{70F83D54-91BF-4BED-8A82-F310D640C9F8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityWebSite", "src\Mvc\test\WebSites\SecurityWebSite\SecurityWebSite.csproj", "{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesWebSite", "src\Mvc\test\WebSites\RazorPagesWebSite\RazorPagesWebSite.csproj", "{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{CA6DD42B-2DBC-4061-91E8-C91FA8F4C410}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Microbenchmarks", "src\Mvc\perf\Microbenchmarks\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj", "{199639E9-0FAA-49C4-A75F-95EE71F32CC0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite", "src\Mvc\test\WebSites\RazorBuildWebSite\RazorBuildWebSite.csproj", "{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.Views", "src\Mvc\test\WebSites\RazorBuildWebSite.Views\RazorBuildWebSite.Views.csproj", "{039266E2-5F43-4B94-86DA-8BDD7BE8885F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Analyzers.Test", "src\Mvc\Mvc.Analyzers\test\Mvc.Analyzers.Test.csproj", "{EA846E30-4F38-4315-844F-D5BC20F74B07}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesClassLibrary", "src\Mvc\test\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj", "{3BEA35BC-784F-4892-AF1F-90177B8362A1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{3B0F71CD-980F-48DF-AEDA-A5CDF001F7A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.TestCommon", "src\Mvc\shared\Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj", "{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Api.Analyzers", "Mvc.Api.Analyzers", "{2A92D94B-9825-42D3-AB33-52E3010D74E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "src\Mvc\Mvc.Api.Analyzers\test\Mvc.Api.Analyzers.Test.csproj", "{E27910E1-6CCE-41B2-97DD-AE874007B592}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "src\Mvc\Mvc.Api.Analyzers\src\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{72879779-4CAC-4CB0-A052-FF60EB386B7A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.Microbenchmarks", "src\Mvc\perf\Microbenchmarks\Microsoft.AspNetCore.Mvc.Views\Microsoft.AspNetCore.Mvc.Views.Microbenchmarks.csproj", "{5BD69C96-623F-427B-9AAF-67C0817A9A9A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericHostWebSite", "src\Mvc\test\WebSites\GenericHostWebSite\GenericHostWebSite.csproj", "{D10BA44E-219B-4528-98F5-0CB0FCF17017}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Test", "src\Mvc\Mvc\test\Microsoft.AspNetCore.Mvc.Test.csproj", "{EAF56BE6-683A-4C34-AC2D-22770EC13915}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions.Test", "src\Mvc\Mvc.Abstractions\test\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", "{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer.Test", "src\Mvc\Mvc.ApiExplorer\test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", "{332A8F84-FC5B-44A5-95A2-379B69C6E755}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.Test", "src\Mvc\Mvc.Core\test\Microsoft.AspNetCore.Mvc.Core.Test.csproj", "{A28B3D43-619F-44A9-9463-78F0E2474351}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors.Test", "src\Mvc\Mvc.Cors\test\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", "{926D431D-D95F-42BA-817B-DFEAF697E007}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations.Test", "src\Mvc\Mvc.DataAnnotations\test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", "{00D4573D-B61D-48C2-BCB4-027A19EB3247}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Formatters.Xml", "Mvc.Formatters.Xml", "{46AB5306-4FF5-4A4B-8009-DFCFAB178442}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml", "src\Mvc\Mvc.Formatters.Xml\src\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", "{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml.Test", "src\Mvc\Mvc.Formatters.Xml\test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", "{5500EB93-4F36-4929-9730-E593DBC2B7F5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization.Test", "src\Mvc\Mvc.Localization\test\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", "{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Test", "src\Mvc\Mvc.Razor\test\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", "{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "src\Mvc\Mvc.RazorPages\test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers.Test", "src\Mvc\Mvc.TagHelpers\test\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", "{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures.Test", "src\Mvc\Mvc.ViewFeatures\test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "{687BD42C-54CD-4E80-A877-6E278AE21105}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.FunctionalTests", "src\Mvc\test\Mvc.FunctionalTests\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj", "{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.IntegrationTests", "src\Mvc\test\Mvc.IntegrationTests\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", "{BD57D455-9B11-4BA6-9F1D-6B289284642D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestDiagnosticListener", "src\Mvc\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", "{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.TestCommon", "src\Mvc\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test", "src\Mvc\Mvc.NewtonsoftJson\test\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj", "{6D9C0B4C-A902-4F37-921F-1A5B14405463}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Razor.RuntimeCompilation", "Mvc.Razor.RuntimeCompilation", "{59BDE9D7-C177-4A40-B1EF-267FB260A59C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation", "src\Mvc\Mvc.Razor.RuntimeCompilation\src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj", "{9FF8728F-B953-4481-9B9F-11351CA0BFE6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test", "src\Mvc\Mvc.Razor.RuntimeCompilation\test\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj", "{586ECE45-FD14-4520-9823-0A9B043FCC6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.PrecompiledViews", "src\Mvc\test\WebSites\RazorBuildWebSite.PrecompiledViews\RazorBuildWebSite.PrecompiledViews.csproj", "{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "ProjectTemplates", "{08D53E58-4AAE-40C4-8497-63EC8664F304}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Web.ProjectTemplates", "src\ProjectTemplates\Web.ProjectTemplates\Microsoft.DotNet.Web.ProjectTemplates.csproj", "{5D3C520F-0CA7-4759-A563-40496545FA48}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Web.Client.ItemTemplates", "src\ProjectTemplates\Web.Client.ItemTemplates\Microsoft.DotNet.Web.Client.ItemTemplates.csproj", "{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Web.ItemTemplates", "src\ProjectTemplates\Web.ItemTemplates\Microsoft.DotNet.Web.ItemTemplates.csproj", "{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Tests", "src\ProjectTemplates\test\Templates.Tests\Templates.Tests.csproj", "{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Blazor.Tests", "src\ProjectTemplates\test\Templates.Blazor.Tests\Templates.Blazor.Tests.csproj", "{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{A4C26078-B6D8-4FD8-87A6-7C15A3482038}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App.Runtime", "App.Runtime", "{F1A6BA04-853E-43B5-B27E-54558603837B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj", "{3163C56E-99BC-4BD1-8880-4F94A2407741}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "src\Razor\Razor\test\Microsoft.AspNetCore.Razor.Test.csproj", "{776BFCDC-8591-4E3D-BD0D-858A188A033D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime.Test", "src\Razor\Razor.Runtime\test\Microsoft.AspNetCore.Razor.Runtime.Test.csproj", "{ED34C082-619E-4CCB-9D26-4E2375633FA2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CF9D35EC-CA9B-481D-BAAC-5D4654732AB9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthSamples.FunctionalTests", "src\Security\test\AuthSamples.FunctionalTests\AuthSamples.FunctionalTests.csproj", "{31B7D2B1-47AF-432B-BF07-73916EF238EE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cookies", "src\Security\samples\Cookies\Cookies.csproj", "{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClaimsTransformation", "src\Security\samples\ClaimsTransformation\ClaimsTransformation.csproj", "{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicSchemes", "src\Security\samples\DynamicSchemes\DynamicSchemes.csproj", "{256DCEBC-1E1D-46B2-9031-E358E850F3C5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.ExternalClaims", "src\Security\samples\Identity.ExternalClaims\Identity.ExternalClaims.csproj", "{1D1E165C-435A-4716-8769-31A51632D7C2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PathSchemeSelection", "src\Security\samples\PathSchemeSelection\PathSchemeSelection.csproj", "{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomPolicyProvider", "src\Security\samples\CustomPolicyProvider\CustomPolicyProvider.csproj", "{817D138C-19D8-4264-8FAF-660B05AC030D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticFilesAuth", "src\Security\samples\StaticFilesAuth\StaticFilesAuth.csproj", "{1FE68FDC-F122-4605-B49D-FDC8C17324A5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomAuthorizationFailureResponse", "src\Security\samples\CustomAuthorizationFailureResponse\CustomAuthorizationFailureResponse.csproj", "{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy.Test", "src\Security\CookiePolicy\test\Microsoft.AspNetCore.CookiePolicy.Test.csproj", "{45A7FB48-3811-4DAF-989C-141EE4AEFB03}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A75C9764-FC22-4AE1-9704-5519CB556FC3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookiePolicySample", "src\Security\CookiePolicy\samples\CookiePolicySample\CookiePolicySample.csproj", "{86741306-CF87-4AEA-9015-188A3CECBFBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Test", "src\Security\Authorization\test\Microsoft.AspNetCore.Authorization.Test.csproj", "{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Test", "src\Security\Authentication\test\Microsoft.AspNetCore.Authentication.Test.csproj", "{6592343C-B7B7-4687-8942-1C2241414A02}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{618D85A4-F111-41AB-A9B6-BBBB8A395209}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocialSample", "src\Security\Authentication\samples\SocialSample\SocialSample.csproj", "{DA64A7BF-F869-414C-A096-076723E55C61}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{974EA46A-4658-4767-A9AA-A0FF143CF725}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieSample", "src\Security\Authentication\Cookies\samples\CookieSample\CookieSample.csproj", "{06C034BE-0079-4AC3-815B-D71AC44DF3A3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CookieSessionSample", "src\Security\Authentication\Cookies\samples\CookieSessionSample\CookieSessionSample.csproj", "{9DD484F7-062B-43D4-AC70-0E226BA168FF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7FD32066-C831-4E29-978C-9A2215E85C67}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtBearerSample", "src\Security\Authentication\JwtBearer\samples\JwtBearerSample\JwtBearerSample.csproj", "{88C2C45B-ED16-4B85-8498-E3F13679629D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E19E55A2-1562-47A7-8EA6-B51F2CA0CC4C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIdConnectSample", "src\Security\Authentication\OpenIdConnect\samples\OpenIdConnectSample\OpenIdConnectSample.csproj", "{F6B80862-7D74-4362-B5E2-AEBF116F2B19}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WsFederation", "WsFederation", "{602CE06C-E973-401D-8877-90957E613646}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{BECDA951-C285-485D-BFE6-F770BC8C9EB2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WsFedSample", "src\Security\Authentication\WsFederation\samples\WsFedSample\WsFedSample.csproj", "{E1CE011A-47BD-496D-B9EB-2766C198A619}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.WsFederation", "src\Security\Authentication\WsFederation\src\Microsoft.AspNetCore.Authentication.WsFederation.csproj", "{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{966E6A8A-4D9C-4B9E-92DB-06F5144F5DC8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Security.Microbenchmarks", "src\Security\perf\Microbenchmarks\Microsoft.AspNetCore.Security.Microbenchmarks.csproj", "{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Negotiate", "Negotiate", "{3FE077EF-DD37-4652-B71C-3174D4C485E2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A641BE9F-113E-4F2F-8DC0-995E97C5BD27}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NegotiateAuthSample", "src\Security\Authentication\Negotiate\samples\NegotiateAuthSample\NegotiateAuthSample.csproj", "{7F67C1C2-7352-414F-9149-1F16D53C7435}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Negotiate", "src\Security\Authentication\Negotiate\src\Microsoft.AspNetCore.Authentication.Negotiate.csproj", "{046AFDDE-B31B-4205-B059-0E8E194E954D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0AEE12FF-FDFF-4A75-A77E-93B1E24E5587}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Negotiate.Test", "src\Security\Authentication\Negotiate\test\Negotiate.Test\Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj", "{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest", "src\Security\Authentication\Negotiate\test\Negotiate.FunctionalTest\Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj", "{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Certificate", "Certificate", "{8A241C1B-18FA-4237-A354-29D7010C1067}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Certificate", "src\Security\Authentication\Certificate\src\Microsoft.AspNetCore.Authentication.Certificate.csproj", "{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{148D77C2-C6DA-45FA-90A6-761EE01066D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certificate.Sample", "src\Security\Authentication\Certificate\samples\Certificate.Sample\Certificate.Sample.csproj", "{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certificate.Optional.Sample", "src\Security\Authentication\Certificate\samples\Certificate.Optional.Sample\Certificate.Optional.Sample.csproj", "{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{5F0044F2-4C66-46A8-BD79-075F001AA034}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7BAE6185-D148-4388-B65F-34FD22CCD824}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Shared.Tests", "src\Shared\test\Shared.Tests\Microsoft.AspNetCore.Shared.Tests.csproj", "{197EB396-53AA-4C29-8A59-3FEACD3703B6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3E3F7422-36C0-47E4-8B4E-052C2E8EB439}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalRSamples", "src\SignalR\samples\SignalRSamples\SignalRSamples.csproj", "{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocialWeather", "src\SignalR\samples\SocialWeather\SocialWeather.csproj", "{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientSample", "src\SignalR\samples\ClientSample\ClientSample.csproj", "{294EC05D-B818-4CD5-AF6E-95B3F23607FC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSocketSample", "src\SignalR\samples\WebSocketSample\WebSocketSample.csproj", "{892333B9-689B-4E51-82FF-CC5376961A36}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtClientSample", "src\SignalR\samples\JwtClientSample\JwtClientSample.csproj", "{4D4CB590-9F66-4D75-B439-D3B445975A55}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ts", "ts", "{3D423A77-84D4-4214-8F6F-CD532A56A126}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalR.Client.FunctionalTestApp", "src\SignalR\clients\ts\FunctionalTests\SignalR.Client.FunctionalTestApp.csproj", "{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtSample", "src\SignalR\samples\JwtSample\JwtSample.csproj", "{257A6551-7987-4C5C-BE6F-376094477371}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{350A2B0C-246F-4CC1-A194-32DF8C4427A2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.FunctionalTests", "src\SignalR\clients\csharp\Client\test\FunctionalTests\Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj", "{5236B5B7-E2CD-4D20-A65C-D5803E78885F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.Tests", "src\SignalR\clients\csharp\Client\test\UnitTests\Microsoft.AspNetCore.SignalR.Client.Tests.csproj", "{CACBB755-08B6-4176-9390-CAD3F9962E80}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Tests", "src\SignalR\common\Http.Connections\test\Microsoft.AspNetCore.Http.Connections.Tests.csproj", "{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Common.Tests", "src\SignalR\common\SignalR.Common\test\Microsoft.AspNetCore.SignalR.Common.Tests.csproj", "{75F3739D-9404-44B0-8F1F-1BDE4542047A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{5095E70C-6DEE-486E-A9D0-E8849214EE4E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Microbenchmarks", "src\SignalR\perf\Microbenchmarks\Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj", "{A6A95BEF-7E21-4D3D-921B-F77267219D27}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests", "src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.Tests\Microsoft.AspNetCore.SignalR.Tests.csproj", "{4DC9C494-9867-4319-937E-5FBC0E5F5A51}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Specification.Tests", "Specification.Tests", "{245939DA-D68D-4B5C-A95E-D3B6923614FF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Specification.Tests", "src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj", "{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StackExchangeRedis", "StackExchangeRedis", "{CD9041EE-8C47-4C6F-8A21-6EDCBC0D409E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.StackExchangeRedis", "src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj", "{DEA32B7F-E9B4-4E87-8B47-30555D286D93}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests", "src\SignalR\server\StackExchangeRedis\test\Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj", "{6248B017-2912-4989-9994-2685C4D88E9A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebEncoders", "WebEncoders", "{4C93CC04-1EE4-48EA-8FAE-DC2283528BEB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.WebEncoders", "src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj", "{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FileProviders", "FileProviders", "{FED63417-432B-49CD-AB4B-44ADA837C2E7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Embedded", "Embedded", "{898F7E0B-1671-42CB-9DFB-689AFF212ED3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Embedded", "src\FileProviders\Embedded\src\Microsoft.Extensions.FileProviders.Embedded.csproj", "{65EE0531-4533-407F-A9CA-2EBCDC444397}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{0B200A66-B809-4ED3-A790-CB1C2E80975E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-dev-certs", "dotnet-dev-certs", "{A4EECF29-6E66-4E7F-B781-A169B0C2AB29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dev-certs", "src\Tools\dotnet-dev-certs\src\dotnet-dev-certs.csproj", "{52433D20-35EA-48CC-BB4A-4DFE3023670B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-sql-cache", "dotnet-sql-cache", "{8562A154-B802-411B-897C-89621C4B05CB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sql-cache", "src\Tools\dotnet-sql-cache\src\dotnet-sql-cache.csproj", "{C911DC19-9556-4DCC-9794-AD907137348F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-user-secrets", "dotnet-user-secrets", "{F31AC68C-2D71-492C-BA4B-41FE503FFD56}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-user-secrets", "src\Tools\dotnet-user-secrets\src\dotnet-user-secrets.csproj", "{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-user-secrets.Tests", "src\Tools\dotnet-user-secrets\test\dotnet-user-secrets.Tests.csproj", "{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.dotnet-openapi", "Microsoft.dotnet-openapi", "{192363C9-2D7B-47BD-A1A3-C6FEC6DF5D9D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.dotnet-openapi", "src\Tools\Microsoft.dotnet-openapi\src\Microsoft.dotnet-openapi.csproj", "{4655E193-E5F4-449B-B1A3-6358AC8D3A27}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-microsoft.openapi.Tests", "src\Tools\Microsoft.dotnet-openapi\test\dotnet-microsoft.openapi.Tests.csproj", "{7A29AAAB-2B4B-4D47-A315-23A0E830E214}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.ApiDescription.Client", "Extensions.ApiDescription.Client", "{755D9C6A-F036-4122-8334-96F0CC70F370}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Client", "src\Tools\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj", "{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-getdocument", "dotnet-getdocument", "{3CE23673-047A-47AA-A028-7F2942805870}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "src\Tools\dotnet-getdocument\src\dotnet-getdocument.csproj", "{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.ApiDescription.Server", "Extensions.ApiDescription.Server", "{BE2C2FE4-7BC7-4A4B-A8B8-19FF0648DEFD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Server", "src\Tools\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj", "{EBE144DD-577E-4E98-BFEB-94E479753927}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GetDocumentInsider", "GetDocumentInsider", "{A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocument.Insider", "src\Tools\GetDocumentInsider\src\GetDocument.Insider.csproj", "{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Client.Tests", "src\Tools\Extensions.ApiDescription.Client\test\Microsoft.Extensions.ApiDescription.Client.Tests.csproj", "{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FirstRunCertGenerator", "FirstRunCertGenerator", "{E5BE8CB1-57A8-48FD-9904-76A8C6B540BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests", "src\Tools\FirstRunCertGenerator\test\Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj", "{A8A42FB4-1B51-4290-9291-445D3A489758}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DeveloperCertificates.XPlat", "src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj", "{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch.Tests", "src\Features\JsonPatch\test\Microsoft.AspNetCore.JsonPatch.Tests.csproj", "{9883418F-C427-426E-9021-E3F1BAF33E6B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{49016328-4D32-46E4-A4D2-94686ED38EA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestClient", "src\Servers\HttpSys\samples\TestClient\TestClient.csproj", "{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfHostServer", "src\Servers\HttpSys\samples\SelfHostServer\SelfHostServer.csproj", "{31405D54-645D-490B-9041-88119D8B1B47}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotAddSample", "src\Servers\HttpSys\samples\HotAddSample\HotAddSample.csproj", "{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C3722C5D-E159-4AB3-AF60-769185B31B47}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.FunctionalTests", "src\Servers\HttpSys\test\FunctionalTests\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj", "{10959BB7-197C-4DE1-A2F2-CA9445E3591F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.Tests", "src\Servers\HttpSys\test\Tests\Microsoft.AspNetCore.Server.HttpSys.Tests.csproj", "{3297D10B-B32A-4F70-8200-2B727C759C8D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueueSharing", "src\Servers\HttpSys\samples\QueueSharing\QueueSharing.csproj", "{8EAE1C36-4A33-4A96-BACD-3FDC35844249}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "src\Servers\IIS\IIS\test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B49E037F-1F0A-46CA-9977-1987465C306C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "src\Servers\IIS\IIS\samples\NativeIISSample\NativeIISSample.csproj", "{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{ABC4EF1D-3525-41A9-929D-0FF7CEED4DDB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Microbenchmarks", "src\Servers\IIS\IIS\perf\Microbenchmarks\IIS.Microbenchmarks.csproj", "{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "src\Servers\IIS\IIS\test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "src\Servers\IIS\IIS\test\IIS.Tests\IIS.Tests.csproj", "{8A6992D5-478C-49E4-936F-EA97E5850A7D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.NewHandler.FunctionalTests", "src\Servers\IIS\IIS\test\IIS.NewHandler.FunctionalTests\IIS.NewHandler.FunctionalTests.csproj", "{7107FC61-E540-4946-A090-A0E0D8357505}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.NewShim.FunctionalTests", "src\Servers\IIS\IIS\test\IIS.NewShim.FunctionalTests\IIS.NewShim.FunctionalTests.csproj", "{514D41F9-8D97-49A6-8C7A-74545358E2CD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1B635E97-715B-4F8D-AE58-4553C7B07016}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "src\Servers\IIS\IISIntegration\test\Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{F8AB0D33-1082-4F41-90E7-77C06EDD983D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4BBD404C-5588-49C4-A320-C5B1D3532B18}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISSample", "src\Servers\IIS\IISIntegration\samples\IISSample\IISSample.csproj", "{647F0202-165F-4E98-A798-B2B3113050EC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core.Tests", "src\Servers\Kestrel\Core\test\Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj", "{0C3C1602-BE06-4DDE-835F-A0DE1563808B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Tests", "src\Servers\Kestrel\Kestrel\test\Microsoft.AspNetCore.Server.Kestrel.Tests.csproj", "{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{C69630AA-7BCC-401E-B0EE-AACFCF55F6A8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks", "src\Servers\Kestrel\perf\Microbenchmarks\Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj", "{51A02E3E-6932-479C-A287-CC6C3611B715}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Http2SampleApp", "src\Servers\Kestrel\samples\Http2SampleApp\Http2SampleApp.csproj", "{7542D11F-2401-457C-992B-0473ADBD7842}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LargeResponseApp", "src\Servers\Kestrel\samples\LargeResponseApp\LargeResponseApp.csproj", "{ADFCDE19-5A3D-482D-8133-B7F419D96668}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlaintextApp", "src\Servers\Kestrel\samples\PlaintextApp\PlaintextApp.csproj", "{B43F63FE-0957-42A1-8431-B2D6E4F2958E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.SampleApp", "src\Servers\Kestrel\samples\SampleApp\Kestrel.SampleApp.csproj", "{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SystemdTestApp", "src\Servers\Kestrel\samples\SystemdTestApp\SystemdTestApp.csproj", "{73788491-F1D6-41C7-838B-F9E8060E7FB9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{47EF1A9F-89DB-4EBA-9BC1-1D4E0E12DE44}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sockets.FunctionalTests", "src\Servers\Kestrel\test\Sockets.FunctionalTests\Sockets.FunctionalTests.csproj", "{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2C7F02B9-2994-4B5B-BB97-0896BCB64101}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerator", "src\Servers\Kestrel\tools\CodeGenerator\CodeGenerator.csproj", "{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InMemory.FunctionalTests", "src\Servers\Kestrel\test\InMemory.FunctionalTests\InMemory.FunctionalTests.csproj", "{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Interop.FunctionalTests", "src\Servers\Kestrel\test\Interop.FunctionalTests\Interop.FunctionalTests.csproj", "{71568623-71F9-4110-ACE2-093CD0DA911C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sockets.BindTests", "src\Servers\Kestrel\test\Sockets.BindTests\Sockets.BindTests.csproj", "{EDE77D0C-321A-49FD-95D7-56ED41242A93}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "http2cat", "src\Servers\Kestrel\samples\http2cat\http2cat.csproj", "{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transport.Quic", "Transport.Quic", "{EE9D0952-6060-4723-B329-94A2950A6762}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic", "src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj", "{132D43A2-067A-4E24-A520-45B9F14DCB8E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Http3SampleApp", "src\Servers\Kestrel\samples\Http3SampleApp\Http3SampleApp.csproj", "{2EC4E939-513F-44CD-A956-498966EAC929}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpStress", "src\Servers\Kestrel\stress\HttpStress.csproj", "{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "src\Servers\test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{6126DCE4-9692-4EE2-B240-C65743572995}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{46FB7E93-1294-4068-B80A-D4864F78277A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.App", "src\Components\test\testassets\ComponentsApp.App\ComponentsApp.App.csproj", "{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "src\Components\test\testassets\ComponentsApp.Server\ComponentsApp.Server.csproj", "{19974360-4A63-425A-94DB-C2C940A3A97A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LazyTestContentPackage", "src\Components\test\testassets\LazyTestContentPackage\LazyTestContentPackage.csproj", "{ADF9C126-F322-4E34-AFD3-E626A4487206}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "src\Components\test\testassets\TestContentPackage\TestContentPackage.csproj", "{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.TestServer", "src\Components\test\testassets\Components.TestServer\Components.TestServer.csproj", "{8A59AF88-4A82-46ED-977D-D909001F8107}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ObjectPool", "ObjectPool", "{E235DAAD-FE73-469E-B16F-F2B8E872E217}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ObjectPool", "src\ObjectPool\src\Microsoft.Extensions.ObjectPool.csproj", "{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{00B2DD87-7E2A-4460-BE1B-5E18B1062B7F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropClient", "src\Grpc\Interop\test\testassets\InteropClient\InteropClient.csproj", "{C3A0F425-669F-46A8-893F-CF449A6DAE56}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropWebsite", "src\Grpc\Interop\test\testassets\InteropWebsite\InteropWebsite.csproj", "{19189670-E206-471D-94F8-7D3D545E5020}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.ConsoleHost", "src\Components\benchmarkapps\Wasm.Performance\ConsoleHost\Wasm.Performance.ConsoleHost.csproj", "{E9408723-E6A9-4715-B906-3B25B0238ABA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "src\Servers\IIS\IIS\test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{8DA61885-B95E-4BA1-A752-C79B6597FC44}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ANCM", "ANCM", "{D62AF49B-F9FE-4794-AC39-A473FF13CA81}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj", "{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\Servers\IIS\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "src\Servers\IIS\AspNetCoreModuleV2\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "src\Servers\IIS\AspNetCoreModuleV2\gtest\gtest.vcxproj", "{CAC1267B-8778-4257-AAC6-CAF481723B01}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\Servers\IIS\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\Servers\IIS\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ANCMSymbols", "src\Servers\IIS\AspNetCoreModuleV2\Symbols\Microsoft.AspNetCore.ANCMSymbols.csproj", "{7E268085-1046-4362-80CB-2977FF826DCA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{7D2B0799-A634-42AC-AE77-5D167BA51389}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Client", "src\Components\WebAssembly\testassets\HostedInAspNet.Client\HostedInAspNet.Client.csproj", "{9788C76F-658B-4441-88F8-22C6B86FAD27}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Server", "src\Components\WebAssembly\testassets\HostedInAspNet.Server\HostedInAspNet.Server.csproj", "{1970D5CD-D9A4-4673-A297-179BB04199F4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "src\Components\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj", "{A40350FE-4334-4007-B1C3-6BEB1B070309}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreadingApp", "src\Components\WebAssembly\testassets\ThreadingApp\ThreadingApp.csproj", "{A40350FE-4334-4007-B1C3-6BEB1B070308}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreadingApp.Server", "src\Components\WebAssembly\testassets\ThreadingApp.Server\ThreadingApp.Server.csproj", "{F1792637-28B9-4F2A-B318-FA923C365049}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HealthChecks", "HealthChecks", "{C1E7F837-6988-43E2-9E1C-7302DB484F99}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7CB09412-C9B0-47E8-A8C3-311AA4CFDE04}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{22D7D74B-565D-4047-97B4-F149B1A13350}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj", "{B06040BC-DA28-4923-8CAC-20EB517D471B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks", "src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj", "{55CACC1F-FE96-47C8-8073-91F4CAA55C75}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Diagnostics.HealthChecks.Tests", "src\HealthChecks\HealthChecks\test\Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj", "{7509AA1E-3093-4BEE-984F-E11579E98A11}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.JSInterop.Tests", "src\JSInterop\Microsoft.JSInterop\test\Microsoft.JSInterop.Tests.csproj", "{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.KeyPerFile", "src\Configuration.KeyPerFile\src\Microsoft.Extensions.Configuration.KeyPerFile.csproj", "{498A4F54-F11A-46C5-A58D-09DE56C6A034}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration.KeyPerFile", "Configuration.KeyPerFile", "{AEB1933E-9369-4305-B20E-F186F888158F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.KeyPerFile.Tests", "src\Configuration.KeyPerFile\test\Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj", "{B9D37BCF-80D1-489D-9FC6-55191FDBB033}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manifest.MSBuildTask", "Manifest.MSBuildTask", "{8C15FD04-7F90-43FC-B488-023432FE3CE1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Embedded.Manifest.Task", "src\FileProviders\Manifest.MSBuildTask\src\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj", "{37329855-01B8-4B03-9765-1A941B06E43C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests", "src\FileProviders\Manifest.MSBuildTask\test\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj", "{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Embedded.Tests", "src\FileProviders\Embedded\test\Microsoft.Extensions.FileProviders.Embedded.Tests.csproj", "{B06ADD57-E855-4D8C-85DC-B323509AE540}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Ref", "src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj", "{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.UnitTests", "src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj", "{010A9638-F20E-4FE6-A186-85732BFC9CB0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Localization", "Localization", "{3D34C81F-2CB5-459E-87E9-0CC04757A2A0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GlobalizationWasmApp", "src\Components\test\testassets\GlobalizationWasmApp\GlobalizationWasmApp.csproj", "{04CFE286-6D32-41EF-8887-4B5F8086A365}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.Abstractions", "src\Localization\Abstractions\src\Microsoft.Extensions.Localization.Abstractions.csproj", "{FEF97646-9BC9-4D1B-A939-784D915C18A4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization", "src\Localization\Localization\src\Microsoft.Extensions.Localization.csproj", "{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.RootNamespace.Tests", "src\Localization\Localization\test\Microsoft.Extensions.Localization.RootNamespace.Tests\Microsoft.Extensions.Localization.RootNamespace.Tests.csproj", "{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Localization.Tests", "src\Localization\Localization\test\Microsoft.Extensions.Localization.Tests\Microsoft.Extensions.Localization.Tests.csproj", "{16B899B4-A4F4-4EF7-93BB-355861977A12}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logging.AzureAppServices", "Logging.AzureAppServices", "{3EAB9890-2C01-444C-ACA0-D77B29CDE08B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.AzureAppServices", "src\Logging.AzureAppServices\src\Microsoft.Extensions.Logging.AzureAppServices.csproj", "{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.AzureAppServices.Tests", "src\Logging.AzureAppServices\test\Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj", "{43E3B132-2486-44A3-92C6-39E39724FAFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{7B739F28-21DE-435D-9EA6-579064932350}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingWebSite", "src\Http\Routing\test\testassets\RoutingWebSite\RoutingWebSite.csproj", "{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingSandbox", "src\Http\Routing\test\testassets\RoutingSandbox\RoutingSandbox.csproj", "{0EBEE047-CBAD-4A69-8095-E3961B863446}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "src\Http\Routing\test\testassets\Benchmarks\Benchmarks.csproj", "{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SiteExtensions", "SiteExtensions", "{DFC4F588-B4B4-484B-AB93-B36721374AD3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoggingAggregate", "LoggingAggregate", "{48FF1D87-5066-4294-B802-2D1B478C6EB6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "src\SiteExtensions\LoggingAggregate\src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{563A3FFA-32DA-4ADA-891C-E00897BD919E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests", "src\SiteExtensions\LoggingAggregate\test\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj", "{DC5DE087-5C93-4441-9D62-1743A50E5086}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LB", "src\SiteExtensions\LoggingBranch\LB.csproj", "{F00CE8C1-5715-4683-A8E5-C467B712AD46}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Web.Xdt.Extensions", "Microsoft.Web.Xdt.Extensions", "{56B45580-B089-424E-A847-A6115D591950}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions", "src\SiteExtensions\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj", "{4382555A-E4CD-4DFC-B59B-408FD4E93530}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions.Tests", "src\SiteExtensions\Microsoft.Web.Xdt.Extensions\tests\Microsoft.Web.Xdt.Extensions.Tests.csproj", "{545751D5-71FC-4889-A3A0-BBD731DBA18A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{E83B0BCC-A8E0-4FBD-BE51-9A533C9CB972}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup", "src\SiteExtensions\Sdk\HostingStartup\HostingStartup.csproj", "{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomBasePathApp", "src\Components\WebAssembly\testassets\CustomBasePathApp\CustomBasePathApp.csproj", "{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests.Utils", "src\SignalR\common\testassets\Tests.Utils\Microsoft.AspNetCore.SignalR.Tests.Utils.csproj", "{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Analyzer.Testing", "src\Analyzers\Microsoft.AspNetCore.Analyzer.Testing\src\Microsoft.AspNetCore.Analyzer.Testing.csproj", "{399EF81E-C3B5-4D86-8BF1-DC7926252A63}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching", "Caching", "{0F39820F-F4A5-41C6-9809-D79B68F032EF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpClientFactory", "HttpClientFactory", "{8DFA596B-BD00-404E-9445-BCFAC65BDC34}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Polly", "src\HttpClientFactory\Polly\src\Microsoft.Extensions.Http.Polly.csproj", "{4FB95E16-918B-49C1-9F65-49D07CDE072C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Polly.Tests", "src\HttpClientFactory\Polly\test\Microsoft.Extensions.Http.Polly.Tests.csproj", "{8001580F-B702-404B-A0FD-13538DDB9672}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SqlServer", "SqlServer", "{43ED0D49-E29A-4B12-8D10-531E006038E5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StackExchangeRedis", "StackExchangeRedis", "{A7B8F295-AD6E-42C1-A215-17337033EBE9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.SqlServer", "src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj", "{A19F94D3-0C6A-429D-811A-7A750AAD122A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.SqlServer.Tests", "src\Caching\SqlServer\test\Microsoft.Extensions.Caching.SqlServer.Tests.csproj", "{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.StackExchangeRedis", "src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj", "{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.StackExchangeRedis.Tests", "src\Caching\StackExchangeRedis\test\Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj", "{14DBB385-A1B1-49B2-A737-4DF90E127E5A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStartupInjectionAssemblyName", "src\Hosting\test\testassets\IStartupInjectionAssemblyName\IStartupInjectionAssemblyName.csproj", "{5FD94164-7D13-4618-93AD-7346B0EA0CDD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing.Tasks", "src\Mvc\Mvc.Testing.Tasks\src\Microsoft.AspNetCore.Mvc.Testing.Tasks.csproj", "{5C50FA92-5488-4470-B42E-48EFEBA51D5A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Testing.Tasks", "Mvc.Testing.Tasks", "{34465A80-3BAF-4059-81B3-9090C0DB598F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "src\Servers\IIS\IIS\test\testassets\TestTasks\TestTasks.csproj", "{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Common.TestLib", "src\Servers\IIS\IIS\test\testassets\IIS.Common.TestLib\IIS.Common.TestLib.csproj", "{7F295396-DBBD-40A5-A645-10004D1324DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessNewShimWebSite", "src\Servers\IIS\IIS\test\testassets\InProcessNewShimWebSite\InProcessNewShimWebSite.csproj", "{22EA0993-8DFC-40C2-8481-8E85E21EFB56}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BrowserTesting", "BrowserTesting", "{8F33439F-5532-45D6-8A44-20EF9104AA9D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.BrowserTesting", "src\Shared\BrowserTesting\src\Microsoft.AspNetCore.BrowserTesting.csproj", "{B739074E-6652-4F5B-B37E-775DC2245FEC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmLinkerTest", "src\Components\WebAssembly\testassets\WasmLinkerTest\WasmLinkerTest.csproj", "{3B375FFC-1E38-453E-A26D-A510CCD3339E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{71287382-95EF-490D-A285-87196E29E88A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostedBlazorWebassemblyApp", "HostedBlazorWebassemblyApp", "{B4226BE2-DCB7-40C5-93F2-94C9BD6F4394}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedBlazorWebassemblyApp.Client", "src\Components\WebAssembly\Samples\HostedBlazorWebassemblyApp\Client\HostedBlazorWebassemblyApp.Client.csproj", "{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedBlazorWebassemblyApp.Server", "src\Components\WebAssembly\Samples\HostedBlazorWebassemblyApp\Server\HostedBlazorWebassemblyApp.Server.csproj", "{1A5582DD-06F4-4427-BFDC-B021A84A01BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedBlazorWebassemblyApp.Shared", "src\Components\WebAssembly\Samples\HostedBlazorWebassemblyApp\Shared\HostedBlazorWebassemblyApp.Shared.csproj", "{E18EF144-9C2C-4366-B54C-09ACF7692A4F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebView", "WebView", "{C445B129-0A4D-41F5-8347-6534B6B12303}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks", "src\Http\Http.Abstractions\perf\Microbenchmarks\Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj", "{3F752B48-2936-4FCA-B0DC-4AB0F788F897}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStartupAssembly1", "src\Hosting\test\testassets\TestStartupAssembly1\TestStartupAssembly1.csproj", "{262FF30C-34B4-462D-B5E2-0DABB9196E40}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spa", "Spa", "{0A064174-8E5C-4F97-B941-A4E302661DF2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SpaProxy", "SpaProxy", "{5AC2A052-1D4F-4C2F-BCF5-3F07A3E31857}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaProxy", "src\Middleware\Spa\SpaProxy\src\Microsoft.AspNetCore.SpaProxy.csproj", "{0DBACF8E-2EDB-47FC-B998-B76522637B2E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SpaServices.Extensions", "SpaServices.Extensions", "{7F99E967-3DC1-4198-9D55-47CD9471D0B6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions", "src\Middleware\Spa\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj", "{DF4637DA-5F07-4903-8461-4E2DAB235F3C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions.Tests", "src\Middleware\Spa\SpaServices.Extensions\test\Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj", "{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalSample", "src\Http\samples\MinimalSample\MinimalSample.csproj", "{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MinimalSampleFSharp", "src\Http\samples\MinimalSampleFSharp\MinimalSampleFSharp.fsproj", "{11BE4471-6C3D-4758-881A-97B6A16F21F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpLogging", "HttpLogging", "{022B4B80-E813-4256-8034-11A68146F4EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpLogging", "src\Middleware\HttpLogging\src\Microsoft.AspNetCore.HttpLogging.csproj", "{FF413F1C-A998-4FA2-823F-52AC0916B35C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpLogging.Tests", "src\Middleware\HttpLogging\test\Microsoft.AspNetCore.HttpLogging.Tests.csproj", "{3A1EC883-EF9C-43E8-95E5-6B527428867B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpLogging.Sample", "src\Middleware\HttpLogging\samples\HttpLogging.Sample\HttpLogging.Sample.csproj", "{908B2263-B58B-4261-A125-B5F2DFF92799}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests", "src\Servers\Kestrel\Transport.Quic\test\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj", "{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{17F28812-983E-4415-A55D-842DD7EC6887}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Features", "src\Extensions\Features\src\Microsoft.Extensions.Features.csproj", "{A07D3B13-388B-444F-9E37-DDC0787C4690}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Features.Tests", "src\Extensions\Features\test\Microsoft.Extensions.Features.Tests.csproj", "{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView", "src\Components\WebView\WebView\src\Microsoft.AspNetCore.Components.WebView.csproj", "{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Test", "src\Components\WebView\WebView\test\Microsoft.AspNetCore.Components.WebView.Test.csproj", "{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebSiteWithWebApplicationBuilder", "src\Mvc\test\WebSites\SimpleWebSiteWithWebApplicationBuilder\SimpleWebSiteWithWebApplicationBuilder.csproj", "{6CCCF618-2E70-4870-B39F-32C016FE08F0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B730328F-D9E9-4EAA-B28E-4631A14095F9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PhotinoPlatform", "PhotinoPlatform", "{44963D50-8B58-44E6-918D-788BCB406695}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{3EC71A0E-6515-4A5A-B759-F0BCF1BCFC56}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PhotinoTestApp", "src\Components\WebView\Samples\PhotinoPlatform\testassets\PhotinoTestApp\PhotinoTestApp.csproj", "{558C46DE-DE16-41D5-8DB7-D6D748E32977}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Photino", "src\Components\WebView\Samples\PhotinoPlatform\src\Microsoft.AspNetCore.Components.WebView.Photino.csproj", "{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebSiteWithWebApplicationBuilderException", "src\Mvc\test\WebSites\SimpleWebSiteWithWebApplicationBuilderException\SimpleWebSiteWithWebApplicationBuilderException.csproj", "{5C641396-7E92-4F5C-A5A1-B4CDF480539B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Http.Results", "Http.Results", "{323C3EB6-1D15-4B3D-918D-699D7F64DED9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Results", "src\Http\Http.Results\src\Microsoft.AspNetCore.Http.Results.csproj", "{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Results.Tests", "src\Http\Http.Results\test\Microsoft.AspNetCore.Http.Results.Tests.csproj", "{F599EAA6-399F-4A91-9B1F-D311305B43D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging.W3C.Sample", "src\Middleware\HttpLogging\samples\Logging.W3C.Sample\Logging.W3C.Sample.csproj", "{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client.SourceGenerator", "Client.SourceGenerator", "{4FC50620-4C8B-495F-859C-BFACAD158033}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.SourceGenerator", "src\SignalR\clients\csharp\Client.SourceGenerator\src\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj", "{E090F82D-8345-477E-92E8-F724F08ADC56}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpClientApp", "src\Servers\Kestrel\samples\HttpClientApp\HttpClientApp.csproj", "{514726D2-3D2E-44C1-B056-163E37DE3E8B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{48526D13-69E2-4409-A57B-C3FA3C64B4F7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "src\Identity\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{835A4E0F-A697-4B69-9736-3E99D163C4B9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Prerendered.Client", "src\Components\WebAssembly\testassets\Wasm.Prerendered.Client\Wasm.Prerendered.Client.csproj", "{148A5B4F-C8A3-4468-92F6-51DB5641FB49}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Prerendered.Server", "src\Components\WebAssembly\testassets\Wasm.Prerendered.Server\Wasm.Prerendered.Server.csproj", "{6D365C86-3158-49F5-A21D-506C1E06E870}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreAnalyzers", "AspNetCoreAnalyzers", "{4DA84F2B-1948-439B-85AB-E99E31331A9C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5D98AEB-9409-4280-8225-9C1EC6A791B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Analyzers", "src\Framework\AspNetCoreAnalyzers\src\Analyzers\Microsoft.AspNetCore.App.Analyzers.csproj", "{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.CodeFixes", "src\Framework\AspNetCoreAnalyzers\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj", "{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Analyzers.Test", "src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj", "{40F493E2-FE59-4787-BE44-3AED39D585BF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{97F9F7E9-56DA-49FE-B672-499E68EBB9DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryWithPortablePdbs", "src\Middleware\Diagnostics\test\testassets\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.csproj", "{6F335C66-C1D6-45FA-8529-6503B7CD42CC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseErrorPageSample", "src\Middleware\Diagnostics\test\testassets\DatabaseErrorPageSample\DatabaseErrorPageSample.csproj", "{71A54D7F-245F-43C2-B429-342D80AC6F23}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeveloperExceptionPageSample", "src\Middleware\Diagnostics\test\testassets\DeveloperExceptionPageSample\DeveloperExceptionPageSample.csproj", "{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExceptionHandlerSample", "src\Middleware\Diagnostics\test\testassets\ExceptionHandlerSample\ExceptionHandlerSample.csproj", "{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatusCodePagesSample", "src\Middleware\Diagnostics\test\testassets\StatusCodePagesSample\StatusCodePagesSample.csproj", "{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WelcomePageSample", "src\Middleware\Diagnostics\test\testassets\WelcomePageSample\WelcomePageSample.csproj", "{FD819B29-9EFE-4102-BD0A-375A63051458}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{18AE79DF-54D1-423A-99A1-2F54CAC3F4EC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HealthChecksSample", "src\Middleware\HealthChecks\test\testassets\HealthChecksSample\HealthChecksSample.csproj", "{53EA8180-8942-4D16-B92A-C5D3813D47CE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{B5E22428-DAD8-4275-B8F0-14EC2174DDFE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LocalizationWebsite", "src\Middleware\Localization\testassets\LocalizationWebsite\LocalizationWebsite.csproj", "{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResourcesClassLibraryNoAttribute", "src\Middleware\Localization\testassets\ResourcesClassLibraryNoAttribute\ResourcesClassLibraryNoAttribute.csproj", "{C397F73C-CADC-460E-9B27-71230B9C291E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResourcesClassLibraryWithAttribute", "src\Middleware\Localization\testassets\ResourcesClassLibraryWithAttribute\ResourcesClassLibraryWithAttribute.csproj", "{3F0C05F5-47EF-4896-8D32-4C80C4563286}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{83FA6123-6EC3-47F3-A0DC-A10225B5EB16}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsMiddlewareWebSite", "src\Middleware\CORS\test\testassets\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj", "{9B240135-3D1E-4EE6-B870-D810F3C856FB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{5E46DC83-C39C-4E3A-B242-C064607F4367}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "src\Installers\Windows\AspNetCoreModule-Setup\IIS-Setup\iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\Installers\Windows\AspNetCoreModule-Setup\IIS-Setup\IIS-Common\lib\IISSetup.CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModule-Setup", "AspNetCoreModule-Setup", "{D30A658D-61F6-444B-9AC7-F66A1A1B86B6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFramework", "SharedFramework", "{31854B06-DC6B-4416-97C3-559CC390B8B4}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "src\Installers\Windows\SharedFramework\SharedFramework.wixproj", "{C681D730-4505-42C6-9E6C-87F757C4FB32}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkLib", "src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj", "{5244BC49-2568-4701-80A6-EAB8950AB5FA}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "src\Servers\testassets\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegationSite", "src\Servers\HttpSys\test\testassets\DelegationSite\DelegationSite.csproj", "{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.NonHelixTests", "src\Servers\HttpSys\test\NonHelixTests\Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj", "{8EB0B983-8851-4565-B92F-366F1B126E61}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ShadowCopy.Tests", "src\Servers\IIS\IIS\test\IIS.ShadowCopy.Tests\IIS.ShadowCopy.Tests.csproj", "{93D3CC76-9FA9-4198-B49D-54BA918105EE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK-Analyzers", "SDK-Analyzers", "{6C06163A-80E9-49C1-817C-B391852BA563}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{CC45FA2D-128B-485D-BA6D-DFD9735CB3C3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.SdkAnalyzers", "src\Tools\SDK-Analyzers\Components\src\Microsoft.AspNetCore.Components.SdkAnalyzers.csproj", "{825BCF97-67A9-4834-B3A8-C3DC97A90E41}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.SdkAnalyzers.Tests", "src\Tools\SDK-Analyzers\Components\test\Microsoft.AspNetCore.Components.SdkAnalyzers.Tests.csproj", "{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OutputCaching", "OutputCaching", "{AA5ABFBC-177C-421E-B743-005E0FD1248B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching", "src\Middleware\OutputCaching\src\Microsoft.AspNetCore.OutputCaching.csproj", "{5D5A3B60-A014-447C-9126-B1FA6C821C8D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B5AC1D8B-9D43-4261-AE0F-6B7574656F2C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutputCachingSample", "src\Middleware\OutputCaching\samples\OutputCachingSample\OutputCachingSample.csproj", "{C3FFA4E4-0E7E-4866-A15F-034245BFD800}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RequestDecompression", "RequestDecompression", "{5465F96F-33D5-454E-9C40-494E58AEEE5D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RequestDecompression.Tests", "src\Middleware\RequestDecompression\test\Microsoft.AspNetCore.RequestDecompression.Tests.csproj", "{97996D39-7722-4AFC-A41A-AD61CA7A413D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RequestDecompressionSample", "src\Middleware\RequestDecompression\sample\RequestDecompressionSample.csproj", "{37144E52-611B-40E8-807C-2821F5A814CB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RequestDecompression", "src\Middleware\RequestDecompression\src\Microsoft.AspNetCore.RequestDecompression.csproj", "{559FE354-7E08-4310-B4F3-AE30F34DEED5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LinkabilityChecker", "LinkabilityChecker", "{94F95276-7CDF-44A8-B159-D09702EF6794}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinkabilityChecker", "src\Tools\LinkabilityChecker\LinkabilityChecker.csproj", "{EA7D844B-C180-41C7-9D55-273AD88BF71F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interop", "Interop", "{7A331A1C-E2C4-4E37-B0A0-B5AA10661229}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JsonTranscoding", "JsonTranscoding", "{DD076DDA-7956-4361-A7D4-2B8025AB3DFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{5CDB8ABC-9DD0-4A9F-8948-EED5FFE89F67}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{151E6F9E-107B-4DDC-A2B1-95115801FD14}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B43BE3EB-9846-4484-88D8-05165202A0FC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{9A8AE587-A3DB-4211-8354-430C4CCBEB9B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestsWebsite", "src\Grpc\JsonTranscoding\test\testassets\IntegrationTestsWebsite\IntegrationTestsWebsite.csproj", "{2E28881D-A188-47AF-800A-B5877AD8C288}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "src\Grpc\JsonTranscoding\test\testassets\Sandbox\Sandbox.csproj", "{A53696E8-6065-41BA-84FB-E89E0DACFF6C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Grpc.JsonTranscoding", "src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.JsonTranscoding\Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj", "{109C702D-DACE-4F82-A490-15E5AFA94005}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Grpc.Swagger", "src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.Swagger\Microsoft.AspNetCore.Grpc.Swagger.csproj", "{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Grpc.Swagger.Tests", "src\Grpc\JsonTranscoding\test\Microsoft.AspNetCore.Grpc.Swagger.Tests\Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj", "{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests", "src\Grpc\JsonTranscoding\test\Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests\Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.csproj", "{F18E97AE-3A3F-424D-8DC2-4D001A167F98}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests", "src\Grpc\JsonTranscoding\test\Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests\Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.csproj", "{8C3E422A-F281-4B93-A567-88C7A1ED0412}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Grpc.Microbenchmarks", "src\Grpc\JsonTranscoding\perf\Microsoft.AspNetCore.Grpc.Microbenchmarks\Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj", "{EB14F068-AD55-4970-B9B4-1FBE33704243}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.LongTests", "src\Servers\IIS\IIS\test\IIS.LongTests\IIS.LongTests.csproj", "{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildAfterTargetingPack", "BuildAfterTargetingPack", "{489020F2-80D9-4468-A5D3-07E785837A5D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildAfterTargetingPack", "src\BuildAfterTargetingPack\BuildAfterTargetingPack.csproj", "{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.Tests", "src\Middleware\OutputCaching\test\Microsoft.AspNetCore.OutputCaching.Tests.csproj", "{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResultsOfTGenerator", "src\Http\Http.Results\tools\ResultsOfTGenerator\ResultsOfTGenerator.csproj", "{9716D0D0-2251-44DD-8596-67D253EEF41C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenApi", "OpenApi", "{2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OpenApi", "src\OpenApi\src\Microsoft.AspNetCore.OpenApi.csproj", "{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RateLimiting", "src\Middleware\RateLimiting\src\Microsoft.AspNetCore.RateLimiting.csproj", "{8EE73488-2B92-42BD-96C9-0DD65405C828}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RateLimiting.Tests", "src\Middleware\RateLimiting\test\Microsoft.AspNetCore.RateLimiting.Tests.csproj", "{41FF4F96-98D2-4482-A2A7-4B179E80D285}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelixTestRunner", "eng\tools\HelixTestRunner\HelixTestRunner.csproj", "{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions.Tests", "src\Html.Abstractions\test\Microsoft.AspNetCore.Html.Abstractions.Tests.csproj", "{487EF7BE-5009-4C70-B79E-45519BDD9603}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RateLimiting", "RateLimiting", "{1D865E78-7A66-4CA9-92EE-2B350E45281F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RequestDecompression.Microbenchmarks", "src\Middleware\RequestDecompression\perf\Microbenchmarks\Microsoft.AspNetCore.RequestDecompression.Microbenchmarks.csproj", "{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-user-jwts", "src\Tools\dotnet-user-jwts\src\dotnet-user-jwts.csproj", "{B34CB502-0286-4939-B25F-45998528A802}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-user-jwts", "dotnet-user-jwts", "{AB4B9E75-719C-4589-B852-20FBFD727730}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalJwtBearerSample", "src\Security\Authentication\JwtBearer\samples\MinimalJwtBearerSample\MinimalJwtBearerSample.csproj", "{7F079E92-32D5-4257-B95B-CFFB0D49C160}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-user-jwts.Tests", "src\Tools\dotnet-user-jwts\test\dotnet-user-jwts.Tests.csproj", "{89896261-C5DD-4901-BCA7-7A5F718BC008}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestInfrastructure", "TestInfrastructure", "{F0FBA346-D8BC-4FAE-A4B2-85B33FA23055}"
-	ProjectSection(SolutionItems) = preProject
-		src\ProjectTemplates\TestInfrastructure\Directory.Build.props.in = src\ProjectTemplates\TestInfrastructure\Directory.Build.props.in
-		src\ProjectTemplates\TestInfrastructure\Directory.Build.targets.in = src\ProjectTemplates\TestInfrastructure\Directory.Build.targets.in
-		src\ProjectTemplates\TestInfrastructure\PrepareForTest.targets = src\ProjectTemplates\TestInfrastructure\PrepareForTest.targets
-		src\ProjectTemplates\TestInfrastructure\runtimeconfig.norollforward.json = src\ProjectTemplates\TestInfrastructure\runtimeconfig.norollforward.json
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Mvc.Tests", "src\ProjectTemplates\test\Templates.Mvc.Tests\Templates.Mvc.Tests.csproj", "{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stress", "stress", "{A5946454-4788-4871-8F23-A9471D55F115}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.CustomElements", "src\Components\CustomElements\src\Microsoft.AspNetCore.Components.CustomElements.csproj", "{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CustomElements", "CustomElements", "{0BB58FB6-8B66-4C6D-BA8A-DF3AFAF9AB8F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Blazor.WebAssembly.Tests", "src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Tests\Templates.Blazor.WebAssembly.Tests.csproj", "{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RateLimitingSample", "src\Middleware\RateLimiting\samples\RateLimitingSample\RateLimitingSample.csproj", "{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebTransportSampleApp", "src\Servers\Kestrel\samples\WebTransportSampleApp\WebTransportSampleApp.csproj", "{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalOpenIdConnectSample", "src\Security\Authentication\OpenIdConnect\samples\MinimalOpenIdConnectSample\MinimalOpenIdConnectSample.csproj", "{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebTransportInteractiveSampleApp", "src\Servers\Kestrel\samples\WebTransportInteractiveSampleApp\WebTransportInteractiveSampleApp.csproj", "{BA649043-EF2B-42DC-B422-A46127BE8296}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Blazor.WebAssembly.Auth.Tests", "src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Auth.Tests\Templates.Blazor.WebAssembly.Auth.Tests.csproj", "{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{890B5210-48EF-488F-93A2-F13BCB07C780}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebAppSample", "src\Framework\AspNetCoreAnalyzers\samples\WebAppSample\WebAppSample.csproj", "{A8E2AB77-8F57-47C2-A961-2F316793CAFF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F43CC5EA-6032-4A11-A9B2-6D48CB5EB082}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{74377D3E-E0C6-41A4-89ED-11A9C00142A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks", "src\Servers\HttpSys\perf\Microbenchmarks\Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj", "{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transport.NamedPipes", "Transport.NamedPipes", "{F057512B-55BF-4A8B-A027-A0505F8BA10C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes", "src\Servers\Kestrel\Transport.NamedPipes\src\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj", "{10173568-A65E-44E5-8C6F-4AA49D0577A1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests", "src\Servers\Kestrel\Transport.NamedPipes\test\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj", "{97C7D2A4-87E5-4A4A-A170-D736427D5C21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.RequestDelegateGenerator", "src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj", "{4730F56D-24EF-4BB2-AA75-862E31205F3A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickGrid", "QuickGrid", "{C406D9E0-1585-43F9-AA8F-D468AF84A996}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.QuickGrid", "src\Components\QuickGrid\Microsoft.AspNetCore.Components.QuickGrid\src\Microsoft.AspNetCore.Components.QuickGrid.csproj", "{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter", "src\Components\QuickGrid\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter\src\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter.csproj", "{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazingPizza.Server", "src\Components\benchmarkapps\BlazingPizza.Server\BlazingPizza.Server.csproj", "{A05652B3-953E-4915-9D7F-0E361D988815}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Endpoints", "Endpoints", "{7BAEB9BF-28F4-4DFD-9A04-E5193683C261}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Endpoints", "src\Components\Endpoints\src\Microsoft.AspNetCore.Components.Endpoints.csproj", "{AE4D272D-6F13-42C8-9404-C149188AFA33}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Endpoints.Tests", "src\Components\Endpoints\test\Microsoft.AspNetCore.Components.Endpoints.Tests.csproj", "{5D438258-CB19-4282-814F-974ABBC71411}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorUnitedApp", "src\Components\Samples\BlazorUnitedApp\BlazorUnitedApp.csproj", "{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BearerToken", "BearerToken", "{56291265-B7BF-4756-92AB-FC30F09381D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.BearerToken", "src\Security\Authentication\BearerToken\src\Microsoft.AspNetCore.Authentication.BearerToken.csproj", "{66FA1041-5556-43A0-9CA3-F9937F085F6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.ApiEndpoints", "src\Identity\samples\IdentitySample.ApiEndpoints\IdentitySample.ApiEndpoints.csproj", "{37FC77EA-AC44-4D08-B002-8EFF415C424A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.WasmMinimal", "src\Components\test\testassets\Components.WasmMinimal\Components.WasmMinimal.csproj", "{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalFormSample", "src\Antiforgery\samples\MinimalFormSample\MinimalFormSample.csproj", "{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcFormSample", "src\Mvc\samples\MvcFormSample\MvcFormSample.csproj", "{055F86AA-FB37-40CC-B39E-C29CE7547BB7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.Microbenchmarks", "src\Middleware\OutputCaching\perf\Microbenchmarks\Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj", "{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebViewE2E.Test", "src\Components\WebView\test\E2ETest\Microsoft.AspNetCore.Components.WebViewE2E.Test.csproj", "{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.Tests", "src\Middleware\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\test\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.Tests.csproj", "{A939893A-B3CD-48F6-80D3-340C8A6E275B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.StackExchangeRedis", "src\Middleware\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\src\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.csproj", "{F232B503-D412-45EE-8B31-EFD46B9FA302}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.InternalTesting", "src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj", "{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.InternalTesting.Tests", "src\Testing\test\Microsoft.AspNetCore.InternalTesting.Tests.csproj", "{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotReferencedInWasmCodePackage", "src\Components\test\testassets\NotReferencedInWasmCodePackage\NotReferencedInWasmCodePackage.csproj", "{433F91E4-E39D-4EB0-B798-2998B3969A2C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.WasmRemoteAuthentication", "src\Components\test\testassets\Components.WasmRemoteAuthentication\Components.WasmRemoteAuthentication.csproj", "{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "src\OpenApi\sample\Sample.csproj", "{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroBenchmarks", "MicroBenchmarks", "{6469F11E-8CEE-4292-820B-324DFFC88EBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.MicroBenchmarks", "src\Caching\perf\MicroBenchmarks\Microsoft.Extensions.Caching.MicroBenchmarks\Microsoft.Extensions.Caching.MicroBenchmarks.csproj", "{8D2CC6ED-5105-4F52-8757-C21F4DE78589}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{9DC6B242-457B-4767-A84B-C3D23B76C642}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OpenApi.Microbenchmarks", "src\OpenApi\perf\Microbenchmarks\Microsoft.AspNetCore.OpenApi.Microbenchmarks.csproj", "{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyManagementSimulator", "src\DataProtection\samples\KeyManagementSimulator\KeyManagementSimulator.csproj", "{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticAssets", "StaticAssets", "{274100A5-5B2D-4EA2-AC42-A62257FC6BDC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticAssets", "src\StaticAssets\src\Microsoft.AspNetCore.StaticAssets.csproj", "{4D8DE54A-4F32-4881-B07B-DDC79619E573}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticAssets.Tests", "src\StaticAssets\test\Microsoft.AspNetCore.StaticAssets.Tests.csproj", "{9536C284-65B4-4884-BB50-06D629095C3E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetDocumentInsider.Tests", "src\Tools\GetDocumentInsider\tests\GetDocumentInsider.Tests.csproj", "{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetDocumentSample", "src\Tools\GetDocumentInsider\sample\GetDocumentSample.csproj", "{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorUnitedApp.Client", "src\Components\Samples\BlazorUnitedApp.Client\BlazorUnitedApp.Client.csproj", "{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.OpenApi.Tests", "src\OpenApi\test\Microsoft.AspNetCore.OpenApi.Tests\Microsoft.AspNetCore.OpenApi.Tests.csproj", "{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|arm64 = Debug|arm64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|arm64 = Release|arm64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|arm64.Build.0 = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|x64.Build.0 = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Debug|x86.Build.0 = Debug|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|arm64.ActiveCfg = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|arm64.Build.0 = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|x64.ActiveCfg = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|x64.Build.0 = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|x86.ActiveCfg = Release|Any CPU
-		{03C2290A-1C48-489A-81DB-F3447B0DA595}.Release|x86.Build.0 = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|x64.Build.0 = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Debug|x86.Build.0 = Debug|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|arm64.Build.0 = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|x64.ActiveCfg = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|x64.Build.0 = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|x86.ActiveCfg = Release|Any CPU
-		{2B94628A-CFFB-447E-8026-A126C33B0917}.Release|x86.Build.0 = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|x64.Build.0 = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Debug|x86.Build.0 = Debug|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|arm64.Build.0 = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|x64.ActiveCfg = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|x64.Build.0 = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|x86.ActiveCfg = Release|Any CPU
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50}.Release|x86.Build.0 = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|x64.Build.0 = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Debug|x86.Build.0 = Debug|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|arm64.Build.0 = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|x64.ActiveCfg = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|x64.Build.0 = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|x86.ActiveCfg = Release|Any CPU
-		{BE70E100-E6C4-4686-8592-73E2A04E877F}.Release|x86.Build.0 = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|x64.Build.0 = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Debug|x86.Build.0 = Debug|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|arm64.Build.0 = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|x64.ActiveCfg = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|x64.Build.0 = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|x86.ActiveCfg = Release|Any CPU
-		{7546E2DD-2CF4-4240-8045-2533DF539458}.Release|x86.Build.0 = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|arm64.Build.0 = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|x64.Build.0 = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Debug|x86.Build.0 = Debug|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|arm64.ActiveCfg = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|arm64.Build.0 = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|x64.ActiveCfg = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|x64.Build.0 = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|x86.ActiveCfg = Release|Any CPU
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44}.Release|x86.Build.0 = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|arm64.Build.0 = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|x64.Build.0 = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Debug|x86.Build.0 = Debug|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|Any CPU.Build.0 = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|arm64.ActiveCfg = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|arm64.Build.0 = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|x64.ActiveCfg = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|x64.Build.0 = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|x86.ActiveCfg = Release|Any CPU
-		{18E65289-27FC-4EC6-BFE8-9FA852381319}.Release|x86.Build.0 = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|x64.Build.0 = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Debug|x86.Build.0 = Debug|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|arm64.Build.0 = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|x64.ActiveCfg = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|x64.Build.0 = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|x86.ActiveCfg = Release|Any CPU
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2}.Release|x86.Build.0 = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|x64.Build.0 = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|arm64.Build.0 = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|x64.ActiveCfg = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|x64.Build.0 = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446}.Release|x86.Build.0 = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Debug|x86.Build.0 = Debug|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|arm64.Build.0 = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|x64.Build.0 = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2083951-98E7-4C1C-AB3A-935EA6311018}.Release|x86.Build.0 = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|x64.Build.0 = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Debug|x86.Build.0 = Debug|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|arm64.Build.0 = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|x64.ActiveCfg = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|x64.Build.0 = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|x86.ActiveCfg = Release|Any CPU
-		{A345753F-B4FA-43E4-8275-151FA5B70728}.Release|x86.Build.0 = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|x64.Build.0 = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Debug|x86.Build.0 = Debug|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|arm64.Build.0 = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|x64.ActiveCfg = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|x64.Build.0 = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|x86.ActiveCfg = Release|Any CPU
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A}.Release|x86.Build.0 = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|arm64.Build.0 = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|x64.Build.0 = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5D2C620-42B7-4ECF-A892-295BB124A833}.Release|x86.Build.0 = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|arm64.Build.0 = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|x64.Build.0 = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF}.Release|x86.Build.0 = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|arm64.Build.0 = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|x64.Build.0 = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Debug|x86.Build.0 = Debug|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|Any CPU.Build.0 = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|arm64.ActiveCfg = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|arm64.Build.0 = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|x64.ActiveCfg = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|x64.Build.0 = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|x86.ActiveCfg = Release|Any CPU
-		{392701C6-0BDB-4505-ADB8-1475770A2421}.Release|x86.Build.0 = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|x64.Build.0 = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Debug|x86.Build.0 = Debug|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|arm64.Build.0 = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|x64.ActiveCfg = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|x64.Build.0 = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|x86.ActiveCfg = Release|Any CPU
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1}.Release|x86.Build.0 = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|arm64.Build.0 = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|x64.Build.0 = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A}.Release|x86.Build.0 = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|x64.Build.0 = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Debug|x86.Build.0 = Debug|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|arm64.Build.0 = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|x64.ActiveCfg = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|x64.Build.0 = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|x86.ActiveCfg = Release|Any CPU
-		{1D6348B5-0616-41A6-90ED-09D34C452926}.Release|x86.Build.0 = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|x64.Build.0 = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Debug|x86.Build.0 = Debug|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|arm64.Build.0 = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|x64.ActiveCfg = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|x64.Build.0 = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|x86.ActiveCfg = Release|Any CPU
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F}.Release|x86.Build.0 = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|x64.Build.0 = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Debug|x86.Build.0 = Debug|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|arm64.Build.0 = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|x64.ActiveCfg = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|x64.Build.0 = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|x86.ActiveCfg = Release|Any CPU
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79}.Release|x86.Build.0 = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|arm64.Build.0 = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|x64.Build.0 = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A400C938-46E2-4B84-B06E-487B13D22E1B}.Release|x86.Build.0 = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|arm64.Build.0 = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|x64.Build.0 = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Debug|x86.Build.0 = Debug|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|arm64.ActiveCfg = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|arm64.Build.0 = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|x64.ActiveCfg = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|x64.Build.0 = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|x86.ActiveCfg = Release|Any CPU
-		{563714CA-0022-4A95-BDBB-0953541193CA}.Release|x86.Build.0 = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|x64.Build.0 = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Debug|x86.Build.0 = Debug|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|arm64.Build.0 = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|x64.ActiveCfg = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|x64.Build.0 = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|x86.ActiveCfg = Release|Any CPU
-		{E55659A7-5489-4E86-B11C-2E41697555F7}.Release|x86.Build.0 = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|arm64.Build.0 = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|x64.Build.0 = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Debug|x86.Build.0 = Debug|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|Any CPU.Build.0 = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|arm64.ActiveCfg = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|arm64.Build.0 = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|x64.ActiveCfg = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|x64.Build.0 = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|x86.ActiveCfg = Release|Any CPU
-		{627F94BE-AD74-4188-9F61-12E5096DA826}.Release|x86.Build.0 = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|x64.Build.0 = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|arm64.Build.0 = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|x64.ActiveCfg = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|x64.Build.0 = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5}.Release|x86.Build.0 = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|arm64.Build.0 = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|x64.Build.0 = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Debug|x86.Build.0 = Debug|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|Any CPU.Build.0 = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|arm64.ActiveCfg = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|arm64.Build.0 = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|x64.ActiveCfg = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|x64.Build.0 = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|x86.ActiveCfg = Release|Any CPU
-		{606C2615-3E08-4A08-993F-FBD90F4CD021}.Release|x86.Build.0 = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|x64.Build.0 = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Debug|x86.Build.0 = Debug|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|arm64.Build.0 = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|x64.ActiveCfg = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|x64.Build.0 = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|x86.ActiveCfg = Release|Any CPU
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D}.Release|x86.Build.0 = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|x64.Build.0 = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Debug|x86.Build.0 = Debug|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|arm64.Build.0 = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|x64.ActiveCfg = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|x64.Build.0 = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|x86.ActiveCfg = Release|Any CPU
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D}.Release|x86.Build.0 = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|arm64.Build.0 = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|x64.Build.0 = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1}.Release|x86.Build.0 = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|x64.Build.0 = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Debug|x86.Build.0 = Debug|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|arm64.Build.0 = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|x64.ActiveCfg = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|x64.Build.0 = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|x86.ActiveCfg = Release|Any CPU
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A}.Release|x86.Build.0 = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|x64.Build.0 = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Debug|x86.Build.0 = Debug|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|arm64.Build.0 = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|x64.ActiveCfg = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|x64.Build.0 = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|x86.ActiveCfg = Release|Any CPU
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A}.Release|x86.Build.0 = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|x64.Build.0 = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Debug|x86.Build.0 = Debug|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|arm64.Build.0 = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|x64.ActiveCfg = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|x64.Build.0 = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|x86.ActiveCfg = Release|Any CPU
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62}.Release|x86.Build.0 = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|x64.Build.0 = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Debug|x86.Build.0 = Debug|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|arm64.Build.0 = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|x64.ActiveCfg = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|x64.Build.0 = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|x86.ActiveCfg = Release|Any CPU
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7}.Release|x86.Build.0 = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|arm64.Build.0 = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|x64.Build.0 = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Debug|x86.Build.0 = Debug|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|arm64.ActiveCfg = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|arm64.Build.0 = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|x64.ActiveCfg = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|x64.Build.0 = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|x86.ActiveCfg = Release|Any CPU
-		{928C9877-6BF3-447D-9E33-ACF833151D77}.Release|x86.Build.0 = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|arm64.Build.0 = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|x64.Build.0 = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Debug|x86.Build.0 = Debug|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|arm64.ActiveCfg = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|arm64.Build.0 = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|x64.ActiveCfg = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|x64.Build.0 = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|x86.ActiveCfg = Release|Any CPU
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028}.Release|x86.Build.0 = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|arm64.Build.0 = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|x64.Build.0 = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Debug|x86.Build.0 = Debug|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|arm64.ActiveCfg = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|arm64.Build.0 = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|x64.ActiveCfg = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|x64.Build.0 = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|x86.ActiveCfg = Release|Any CPU
-		{451C6023-83D5-4809-9F71-6A23ED725A03}.Release|x86.Build.0 = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|x64.Build.0 = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Debug|x86.Build.0 = Debug|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|arm64.Build.0 = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|x64.ActiveCfg = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|x64.Build.0 = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|x86.ActiveCfg = Release|Any CPU
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587}.Release|x86.Build.0 = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|x64.Build.0 = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Debug|x86.Build.0 = Debug|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|arm64.Build.0 = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|x64.ActiveCfg = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|x64.Build.0 = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|x86.ActiveCfg = Release|Any CPU
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4}.Release|x86.Build.0 = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|x64.Build.0 = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Debug|x86.Build.0 = Debug|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|arm64.Build.0 = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|x64.ActiveCfg = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|x64.Build.0 = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|x86.ActiveCfg = Release|Any CPU
-		{81A35CF9-214F-4351-9561-334F32B41C3A}.Release|x86.Build.0 = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|arm64.Build.0 = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|x64.Build.0 = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Debug|x86.Build.0 = Debug|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|arm64.ActiveCfg = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|arm64.Build.0 = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|x64.ActiveCfg = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|x64.Build.0 = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|x86.ActiveCfg = Release|Any CPU
-		{50D97D17-79CF-4917-AD70-F79146FE8808}.Release|x86.Build.0 = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|x64.Build.0 = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Debug|x86.Build.0 = Debug|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|arm64.Build.0 = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|x64.ActiveCfg = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|x64.Build.0 = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|x86.ActiveCfg = Release|Any CPU
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5}.Release|x86.Build.0 = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|x64.Build.0 = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Debug|x86.Build.0 = Debug|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|arm64.Build.0 = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|x64.ActiveCfg = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|x64.Build.0 = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|x86.ActiveCfg = Release|Any CPU
-		{A9027A02-135B-4149-947A-79F5B73A7F28}.Release|x86.Build.0 = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|arm64.Build.0 = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|x64.Build.0 = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Debug|x86.Build.0 = Debug|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|Any CPU.Build.0 = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|arm64.ActiveCfg = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|arm64.Build.0 = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|x64.ActiveCfg = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|x64.Build.0 = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|x86.ActiveCfg = Release|Any CPU
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227}.Release|x86.Build.0 = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|x64.Build.0 = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Debug|x86.Build.0 = Debug|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|arm64.Build.0 = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|x64.ActiveCfg = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|x64.Build.0 = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|x86.ActiveCfg = Release|Any CPU
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1}.Release|x86.Build.0 = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|arm64.Build.0 = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|x64.Build.0 = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6}.Release|x86.Build.0 = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|arm64.Build.0 = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|x64.Build.0 = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Debug|x86.Build.0 = Debug|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|arm64.ActiveCfg = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|arm64.Build.0 = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|x64.ActiveCfg = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|x64.Build.0 = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|x86.ActiveCfg = Release|Any CPU
-		{31E763AD-996E-44EF-A70E-1B8187922C98}.Release|x86.Build.0 = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|x64.Build.0 = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Debug|x86.Build.0 = Debug|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|arm64.Build.0 = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|x64.ActiveCfg = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|x64.Build.0 = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|x86.ActiveCfg = Release|Any CPU
-		{3974EB1C-077A-4A79-B295-87B62446C266}.Release|x86.Build.0 = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|x64.Build.0 = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Debug|x86.Build.0 = Debug|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|arm64.Build.0 = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|x64.ActiveCfg = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|x64.Build.0 = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|x86.ActiveCfg = Release|Any CPU
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D}.Release|x86.Build.0 = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|x64.Build.0 = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Debug|x86.Build.0 = Debug|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|arm64.Build.0 = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|x64.ActiveCfg = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|x64.Build.0 = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|x86.ActiveCfg = Release|Any CPU
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760}.Release|x86.Build.0 = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|arm64.Build.0 = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|x64.Build.0 = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Debug|x86.Build.0 = Debug|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|arm64.ActiveCfg = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|arm64.Build.0 = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|x64.ActiveCfg = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|x64.Build.0 = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|x86.ActiveCfg = Release|Any CPU
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871}.Release|x86.Build.0 = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|x64.Build.0 = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Debug|x86.Build.0 = Debug|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|arm64.Build.0 = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|x64.ActiveCfg = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|x64.Build.0 = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|x86.ActiveCfg = Release|Any CPU
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C}.Release|x86.Build.0 = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|arm64.Build.0 = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|x64.Build.0 = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1}.Release|x86.Build.0 = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|x64.Build.0 = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Debug|x86.Build.0 = Debug|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|arm64.Build.0 = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|x64.ActiveCfg = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|x64.Build.0 = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|x86.ActiveCfg = Release|Any CPU
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3}.Release|x86.Build.0 = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|arm64.Build.0 = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|x64.Build.0 = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Debug|x86.Build.0 = Debug|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|arm64.ActiveCfg = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|arm64.Build.0 = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|x64.ActiveCfg = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|x64.Build.0 = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|x86.ActiveCfg = Release|Any CPU
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35}.Release|x86.Build.0 = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|x64.Build.0 = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Debug|x86.Build.0 = Debug|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|arm64.Build.0 = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|x64.ActiveCfg = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|x64.Build.0 = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|x86.ActiveCfg = Release|Any CPU
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F}.Release|x86.Build.0 = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|x64.Build.0 = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Debug|x86.Build.0 = Debug|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|arm64.Build.0 = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|x64.ActiveCfg = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|x64.Build.0 = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|x86.ActiveCfg = Release|Any CPU
-		{0674F69B-FAC8-43E5-8711-A476936F459F}.Release|x86.Build.0 = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|x64.Build.0 = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Debug|x86.Build.0 = Debug|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|arm64.Build.0 = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|x64.ActiveCfg = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|x64.Build.0 = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|x86.ActiveCfg = Release|Any CPU
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580}.Release|x86.Build.0 = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|arm64.Build.0 = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|x64.Build.0 = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Debug|x86.Build.0 = Debug|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|arm64.ActiveCfg = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|arm64.Build.0 = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|x64.ActiveCfg = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|x64.Build.0 = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|x86.ActiveCfg = Release|Any CPU
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65}.Release|x86.Build.0 = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|x64.Build.0 = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Debug|x86.Build.0 = Debug|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|arm64.Build.0 = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|x64.ActiveCfg = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|x64.Build.0 = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|x86.ActiveCfg = Release|Any CPU
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF}.Release|x86.Build.0 = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|arm64.Build.0 = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|x64.Build.0 = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Debug|x86.Build.0 = Debug|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|Any CPU.Build.0 = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|arm64.ActiveCfg = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|arm64.Build.0 = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|x64.ActiveCfg = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|x64.Build.0 = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|x86.ActiveCfg = Release|Any CPU
-		{183F99F9-0C0B-4790-8152-637B4AE68622}.Release|x86.Build.0 = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|x64.Build.0 = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|arm64.Build.0 = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|x64.ActiveCfg = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|x64.Build.0 = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B}.Release|x86.Build.0 = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|arm64.Build.0 = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|x64.Build.0 = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Debug|x86.Build.0 = Debug|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|arm64.ActiveCfg = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|arm64.Build.0 = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|x64.ActiveCfg = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|x64.Build.0 = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|x86.ActiveCfg = Release|Any CPU
-		{32FE10AE-CC85-407A-8720-624CDD3EB890}.Release|x86.Build.0 = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|arm64.Build.0 = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|x64.Build.0 = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Debug|x86.Build.0 = Debug|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|arm64.ActiveCfg = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|arm64.Build.0 = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|x64.ActiveCfg = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|x64.Build.0 = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|x86.ActiveCfg = Release|Any CPU
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24}.Release|x86.Build.0 = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|arm64.Build.0 = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|x64.Build.0 = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Debug|x86.Build.0 = Debug|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|arm64.ActiveCfg = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|arm64.Build.0 = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|x64.ActiveCfg = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|x64.Build.0 = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|x86.ActiveCfg = Release|Any CPU
-		{FE930950-64DC-45A3-8128-2D68F97EBB19}.Release|x86.Build.0 = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|arm64.Build.0 = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|x64.Build.0 = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Debug|x86.Build.0 = Debug|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|arm64.ActiveCfg = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|arm64.Build.0 = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|x64.ActiveCfg = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|x64.Build.0 = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|x86.ActiveCfg = Release|Any CPU
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523}.Release|x86.Build.0 = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Debug|x86.Build.0 = Debug|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|arm64.Build.0 = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|x64.ActiveCfg = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|x64.Build.0 = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|x86.ActiveCfg = Release|Any CPU
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3}.Release|x86.Build.0 = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|x64.Build.0 = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Debug|x86.Build.0 = Debug|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|arm64.Build.0 = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|x64.ActiveCfg = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|x64.Build.0 = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|x86.ActiveCfg = Release|Any CPU
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A}.Release|x86.Build.0 = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|x64.Build.0 = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Debug|x86.Build.0 = Debug|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|arm64.Build.0 = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|x64.ActiveCfg = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|x64.Build.0 = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|x86.ActiveCfg = Release|Any CPU
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D}.Release|x86.Build.0 = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|x64.Build.0 = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Debug|x86.Build.0 = Debug|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|arm64.Build.0 = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|x64.ActiveCfg = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|x64.Build.0 = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|x86.ActiveCfg = Release|Any CPU
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1}.Release|x86.Build.0 = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|x64.Build.0 = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Debug|x86.Build.0 = Debug|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|arm64.Build.0 = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|x64.ActiveCfg = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|x64.Build.0 = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|x86.ActiveCfg = Release|Any CPU
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9}.Release|x86.Build.0 = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|x64.Build.0 = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Debug|x86.Build.0 = Debug|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|arm64.Build.0 = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x64.ActiveCfg = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x64.Build.0 = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x86.ActiveCfg = Release|Any CPU
-		{D47B73A3-740E-4B9A-B123-A42299F1F266}.Release|x86.Build.0 = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|x64.Build.0 = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Debug|x86.Build.0 = Debug|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|arm64.Build.0 = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|x64.ActiveCfg = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|x64.Build.0 = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|x86.ActiveCfg = Release|Any CPU
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184}.Release|x86.Build.0 = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|x64.Build.0 = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Debug|x86.Build.0 = Debug|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|arm64.Build.0 = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|x64.ActiveCfg = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|x64.Build.0 = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|x86.ActiveCfg = Release|Any CPU
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45}.Release|x86.Build.0 = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|arm64.Build.0 = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|x64.Build.0 = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D}.Release|x86.Build.0 = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|x64.Build.0 = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Debug|x86.Build.0 = Debug|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|arm64.Build.0 = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|x64.ActiveCfg = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|x64.Build.0 = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|x86.ActiveCfg = Release|Any CPU
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193}.Release|x86.Build.0 = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|x64.Build.0 = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|arm64.Build.0 = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|x64.ActiveCfg = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|x64.Build.0 = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE6F167E-F41C-414D-923E-8E51E992A830}.Release|x86.Build.0 = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|arm64.Build.0 = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|x64.Build.0 = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Debug|x86.Build.0 = Debug|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|Any CPU.Build.0 = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|arm64.ActiveCfg = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|arm64.Build.0 = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|x64.ActiveCfg = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|x64.Build.0 = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|x86.ActiveCfg = Release|Any CPU
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631}.Release|x86.Build.0 = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|x64.Build.0 = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Debug|x86.Build.0 = Debug|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|arm64.Build.0 = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|x64.ActiveCfg = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|x64.Build.0 = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|x86.ActiveCfg = Release|Any CPU
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8}.Release|x86.Build.0 = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|arm64.Build.0 = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|x64.Build.0 = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7}.Release|x86.Build.0 = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|x64.Build.0 = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Debug|x86.Build.0 = Debug|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|arm64.Build.0 = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|x64.ActiveCfg = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|x64.Build.0 = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|x86.ActiveCfg = Release|Any CPU
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823}.Release|x86.Build.0 = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|x64.Build.0 = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Debug|x86.Build.0 = Debug|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|arm64.Build.0 = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|x64.ActiveCfg = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|x64.Build.0 = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|x86.ActiveCfg = Release|Any CPU
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB}.Release|x86.Build.0 = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|x64.Build.0 = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Debug|x86.Build.0 = Debug|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|arm64.Build.0 = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|x64.ActiveCfg = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|x64.Build.0 = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|x86.ActiveCfg = Release|Any CPU
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1}.Release|x86.Build.0 = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|x64.Build.0 = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Debug|x86.Build.0 = Debug|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|arm64.Build.0 = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|x64.ActiveCfg = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|x64.Build.0 = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|x86.ActiveCfg = Release|Any CPU
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667}.Release|x86.Build.0 = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|x64.Build.0 = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Debug|x86.Build.0 = Debug|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|arm64.Build.0 = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|x64.ActiveCfg = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|x64.Build.0 = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|x86.ActiveCfg = Release|Any CPU
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1}.Release|x86.Build.0 = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|arm64.Build.0 = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|x64.Build.0 = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Debug|x86.Build.0 = Debug|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|arm64.ActiveCfg = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|arm64.Build.0 = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|x64.ActiveCfg = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|x64.Build.0 = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|x86.ActiveCfg = Release|Any CPU
-		{FB86B2B2-60B2-477A-9D78-2530A0089660}.Release|x86.Build.0 = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|x64.Build.0 = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Debug|x86.Build.0 = Debug|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|arm64.Build.0 = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|x64.ActiveCfg = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|x64.Build.0 = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|x86.ActiveCfg = Release|Any CPU
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D}.Release|x86.Build.0 = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|x64.Build.0 = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Debug|x86.Build.0 = Debug|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|arm64.Build.0 = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|x64.ActiveCfg = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|x64.Build.0 = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|x86.ActiveCfg = Release|Any CPU
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D}.Release|x86.Build.0 = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|x64.Build.0 = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Debug|x86.Build.0 = Debug|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|arm64.Build.0 = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|x64.ActiveCfg = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|x64.Build.0 = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|x86.ActiveCfg = Release|Any CPU
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B}.Release|x86.Build.0 = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|x64.Build.0 = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Debug|x86.Build.0 = Debug|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|arm64.Build.0 = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|x64.ActiveCfg = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|x64.Build.0 = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|x86.ActiveCfg = Release|Any CPU
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2}.Release|x86.Build.0 = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|x64.Build.0 = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Debug|x86.Build.0 = Debug|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|arm64.Build.0 = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|x64.ActiveCfg = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|x64.Build.0 = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|x86.ActiveCfg = Release|Any CPU
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4}.Release|x86.Build.0 = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|x64.Build.0 = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Debug|x86.Build.0 = Debug|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|arm64.Build.0 = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|x64.ActiveCfg = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|x64.Build.0 = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|x86.ActiveCfg = Release|Any CPU
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A}.Release|x86.Build.0 = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|x64.Build.0 = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|arm64.Build.0 = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|x64.ActiveCfg = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|x64.Build.0 = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7}.Release|x86.Build.0 = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Debug|x86.Build.0 = Debug|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|arm64.Build.0 = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|x64.Build.0 = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB}.Release|x86.Build.0 = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|x64.Build.0 = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Debug|x86.Build.0 = Debug|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|arm64.Build.0 = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|x64.ActiveCfg = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|x64.Build.0 = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|x86.ActiveCfg = Release|Any CPU
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D}.Release|x86.Build.0 = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|arm64.Build.0 = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|x64.Build.0 = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29}.Release|x86.Build.0 = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|arm64.Build.0 = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|x64.Build.0 = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Debug|x86.Build.0 = Debug|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|arm64.ActiveCfg = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|arm64.Build.0 = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|x64.ActiveCfg = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|x64.Build.0 = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|x86.ActiveCfg = Release|Any CPU
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827}.Release|x86.Build.0 = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|x64.Build.0 = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Debug|x86.Build.0 = Debug|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|arm64.Build.0 = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|x64.ActiveCfg = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|x64.Build.0 = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|x86.ActiveCfg = Release|Any CPU
-		{9443F095-DA20-4EED-BC97-5BF92470D972}.Release|x86.Build.0 = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|x64.Build.0 = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Debug|x86.Build.0 = Debug|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|arm64.Build.0 = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|x64.Build.0 = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE}.Release|x86.Build.0 = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|x64.Build.0 = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Debug|x86.Build.0 = Debug|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|arm64.Build.0 = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|x64.ActiveCfg = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|x64.Build.0 = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|x86.ActiveCfg = Release|Any CPU
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A}.Release|x86.Build.0 = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|x64.Build.0 = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Debug|x86.Build.0 = Debug|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|arm64.Build.0 = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|x64.ActiveCfg = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|x64.Build.0 = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|x86.ActiveCfg = Release|Any CPU
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94}.Release|x86.Build.0 = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|x64.Build.0 = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Debug|x86.Build.0 = Debug|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|arm64.Build.0 = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|x64.ActiveCfg = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|x64.Build.0 = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|x86.ActiveCfg = Release|Any CPU
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8}.Release|x86.Build.0 = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|x64.Build.0 = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Debug|x86.Build.0 = Debug|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|arm64.Build.0 = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|x64.ActiveCfg = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|x64.Build.0 = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|x86.ActiveCfg = Release|Any CPU
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E}.Release|x86.Build.0 = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|arm64.Build.0 = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|x64.Build.0 = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Debug|x86.Build.0 = Debug|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|arm64.ActiveCfg = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|arm64.Build.0 = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|x64.ActiveCfg = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|x64.Build.0 = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|x86.ActiveCfg = Release|Any CPU
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395}.Release|x86.Build.0 = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|x64.Build.0 = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Debug|x86.Build.0 = Debug|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|arm64.Build.0 = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|x64.ActiveCfg = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|x64.Build.0 = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|x86.ActiveCfg = Release|Any CPU
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724}.Release|x86.Build.0 = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|x64.Build.0 = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Debug|x86.Build.0 = Debug|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|arm64.Build.0 = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|x64.ActiveCfg = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|x64.Build.0 = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E}.Release|x86.Build.0 = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|arm64.Build.0 = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|x64.Build.0 = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6}.Release|x86.Build.0 = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|arm64.Build.0 = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|x64.Build.0 = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C610220-E00C-4752-98A0-44A3D4B96A21}.Release|x86.Build.0 = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|arm64.Build.0 = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|x64.Build.0 = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE}.Release|x86.Build.0 = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|x64.Build.0 = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Debug|x86.Build.0 = Debug|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|arm64.Build.0 = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|x64.ActiveCfg = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|x64.Build.0 = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|x86.ActiveCfg = Release|Any CPU
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE}.Release|x86.Build.0 = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|x64.Build.0 = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Debug|x86.Build.0 = Debug|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|arm64.Build.0 = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|x64.ActiveCfg = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|x64.Build.0 = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|x86.ActiveCfg = Release|Any CPU
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387}.Release|x86.Build.0 = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|arm64.Build.0 = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|x64.Build.0 = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{15A90CE7-886D-4005-8C14-CF29123344E1}.Release|x86.Build.0 = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|x64.Build.0 = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|arm64.Build.0 = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|x64.ActiveCfg = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|x64.Build.0 = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7}.Release|x86.Build.0 = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|arm64.Build.0 = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|x64.Build.0 = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Debug|x86.Build.0 = Debug|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|arm64.ActiveCfg = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|arm64.Build.0 = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|x64.ActiveCfg = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|x64.Build.0 = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|x86.ActiveCfg = Release|Any CPU
-		{552EB148-0518-41A6-905D-4696A6438E80}.Release|x86.Build.0 = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|arm64.Build.0 = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|x64.Build.0 = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Debug|x86.Build.0 = Debug|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|Any CPU.Build.0 = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|arm64.ActiveCfg = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|arm64.Build.0 = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|x64.ActiveCfg = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|x64.Build.0 = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|x86.ActiveCfg = Release|Any CPU
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130}.Release|x86.Build.0 = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|x64.Build.0 = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Debug|x86.Build.0 = Debug|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|arm64.Build.0 = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|x64.ActiveCfg = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|x64.Build.0 = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|x86.ActiveCfg = Release|Any CPU
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1}.Release|x86.Build.0 = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|x64.Build.0 = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Debug|x86.Build.0 = Debug|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|arm64.Build.0 = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|x64.ActiveCfg = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|x64.Build.0 = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|x86.ActiveCfg = Release|Any CPU
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B}.Release|x86.Build.0 = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|arm64.Build.0 = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|x64.Build.0 = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Debug|x86.Build.0 = Debug|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|arm64.ActiveCfg = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|arm64.Build.0 = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|x64.ActiveCfg = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|x64.Build.0 = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|x86.ActiveCfg = Release|Any CPU
-		{696BE515-B3AB-4925-969C-350F1BDA5C30}.Release|x86.Build.0 = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|x64.Build.0 = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Debug|x86.Build.0 = Debug|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|arm64.Build.0 = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|x64.ActiveCfg = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|x64.Build.0 = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|x86.ActiveCfg = Release|Any CPU
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38}.Release|x86.Build.0 = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|arm64.Build.0 = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|x64.Build.0 = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Debug|x86.Build.0 = Debug|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|arm64.ActiveCfg = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|arm64.Build.0 = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|x64.ActiveCfg = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|x64.Build.0 = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|x86.ActiveCfg = Release|Any CPU
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45}.Release|x86.Build.0 = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|x64.Build.0 = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Debug|x86.Build.0 = Debug|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|arm64.Build.0 = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|x64.ActiveCfg = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|x64.Build.0 = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|x86.ActiveCfg = Release|Any CPU
-		{3B85171E-9A55-4605-B9B1-56F77E47137B}.Release|x86.Build.0 = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|x64.Build.0 = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Debug|x86.Build.0 = Debug|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|arm64.Build.0 = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|x64.ActiveCfg = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|x64.Build.0 = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|x86.ActiveCfg = Release|Any CPU
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F}.Release|x86.Build.0 = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|arm64.Build.0 = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|x64.ActiveCfg = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|x64.Build.0 = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8}.Release|x86.Build.0 = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|x64.Build.0 = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Debug|x86.Build.0 = Debug|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|arm64.Build.0 = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|x64.ActiveCfg = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|x64.Build.0 = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|x86.ActiveCfg = Release|Any CPU
-		{4F39F27E-0E21-4093-8818-D974D4716C14}.Release|x86.Build.0 = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|x64.Build.0 = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Debug|x86.Build.0 = Debug|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|arm64.Build.0 = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|x64.ActiveCfg = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|x64.Build.0 = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|x86.ActiveCfg = Release|Any CPU
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB}.Release|x86.Build.0 = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|x64.Build.0 = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Debug|x86.Build.0 = Debug|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|arm64.Build.0 = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|x64.Build.0 = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02}.Release|x86.Build.0 = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|arm64.Build.0 = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|x64.Build.0 = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Debug|x86.Build.0 = Debug|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|arm64.ActiveCfg = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|arm64.Build.0 = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|x64.ActiveCfg = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|x64.Build.0 = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|x86.ActiveCfg = Release|Any CPU
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368}.Release|x86.Build.0 = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|x64.Build.0 = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Debug|x86.Build.0 = Debug|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|arm64.Build.0 = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|x64.ActiveCfg = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|x64.Build.0 = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|x86.ActiveCfg = Release|Any CPU
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE}.Release|x86.Build.0 = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|x64.Build.0 = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Debug|x86.Build.0 = Debug|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|arm64.Build.0 = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|x64.ActiveCfg = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|x64.Build.0 = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|x86.ActiveCfg = Release|Any CPU
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984}.Release|x86.Build.0 = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|arm64.Build.0 = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|x64.Build.0 = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Debug|x86.Build.0 = Debug|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|arm64.ActiveCfg = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|arm64.Build.0 = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|x64.ActiveCfg = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|x64.Build.0 = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|x86.ActiveCfg = Release|Any CPU
-		{58955E85-0D55-45FF-97EE-BDD096522954}.Release|x86.Build.0 = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|x64.Build.0 = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Debug|x86.Build.0 = Debug|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|arm64.Build.0 = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|x64.ActiveCfg = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|x64.Build.0 = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|x86.ActiveCfg = Release|Any CPU
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70}.Release|x86.Build.0 = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|x64.Build.0 = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Debug|x86.Build.0 = Debug|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|arm64.Build.0 = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x64.ActiveCfg = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x64.Build.0 = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.ActiveCfg = Release|Any CPU
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.Build.0 = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|x64.Build.0 = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|x86.Build.0 = Debug|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|arm64.Build.0 = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|x64.ActiveCfg = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|x64.Build.0 = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|x86.ActiveCfg = Release|Any CPU
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Release|x86.Build.0 = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|x64.Build.0 = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Debug|x86.Build.0 = Debug|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|arm64.Build.0 = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|x64.ActiveCfg = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|x64.Build.0 = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|x86.ActiveCfg = Release|Any CPU
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA}.Release|x86.Build.0 = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|x64.Build.0 = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Debug|x86.Build.0 = Debug|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|arm64.Build.0 = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|x64.ActiveCfg = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|x64.Build.0 = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|x86.ActiveCfg = Release|Any CPU
-		{7391E144-5087-4E64-94D8-E0700D57739C}.Release|x86.Build.0 = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|x64.Build.0 = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Debug|x86.Build.0 = Debug|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|arm64.Build.0 = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|x64.ActiveCfg = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|x64.Build.0 = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|x86.ActiveCfg = Release|Any CPU
-		{ED6E6F06-D620-41BC-8F12-01480BF49381}.Release|x86.Build.0 = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|x64.Build.0 = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Debug|x86.Build.0 = Debug|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|arm64.Build.0 = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|x64.ActiveCfg = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|x64.Build.0 = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|x86.ActiveCfg = Release|Any CPU
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42}.Release|x86.Build.0 = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|x64.Build.0 = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Debug|x86.Build.0 = Debug|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|arm64.Build.0 = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|x64.ActiveCfg = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|x64.Build.0 = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|x86.ActiveCfg = Release|Any CPU
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6}.Release|x86.Build.0 = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|x64.Build.0 = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Debug|x86.Build.0 = Debug|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|arm64.Build.0 = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|x64.ActiveCfg = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|x64.Build.0 = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|x86.ActiveCfg = Release|Any CPU
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D}.Release|x86.Build.0 = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|arm64.Build.0 = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|x64.Build.0 = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Debug|x86.Build.0 = Debug|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|arm64.ActiveCfg = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|arm64.Build.0 = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|x64.ActiveCfg = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|x64.Build.0 = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|x86.ActiveCfg = Release|Any CPU
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42}.Release|x86.Build.0 = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|arm64.Build.0 = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|x64.ActiveCfg = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|x64.Build.0 = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B}.Release|x86.Build.0 = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|x64.Build.0 = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Debug|x86.Build.0 = Debug|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|arm64.Build.0 = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|x64.ActiveCfg = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|x64.Build.0 = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|x86.ActiveCfg = Release|Any CPU
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2}.Release|x86.Build.0 = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|x64.Build.0 = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Debug|x86.Build.0 = Debug|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|arm64.Build.0 = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|x64.ActiveCfg = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|x64.Build.0 = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|x86.ActiveCfg = Release|Any CPU
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101}.Release|x86.Build.0 = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|x64.Build.0 = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Debug|x86.Build.0 = Debug|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|arm64.Build.0 = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|x64.ActiveCfg = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|x64.Build.0 = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|x86.ActiveCfg = Release|Any CPU
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD}.Release|x86.Build.0 = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|arm64.Build.0 = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|x64.Build.0 = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Debug|x86.Build.0 = Debug|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|Any CPU.Build.0 = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|arm64.ActiveCfg = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|arm64.Build.0 = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x64.ActiveCfg = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x64.Build.0 = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x86.ActiveCfg = Release|Any CPU
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x86.Build.0 = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|arm64.Build.0 = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|x64.Build.0 = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|x86.Build.0 = Debug|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|arm64.ActiveCfg = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|arm64.Build.0 = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|x64.ActiveCfg = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|x64.Build.0 = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|x86.ActiveCfg = Release|Any CPU
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Release|x86.Build.0 = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|x64.Build.0 = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Debug|x86.Build.0 = Debug|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|arm64.Build.0 = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|x64.ActiveCfg = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|x64.Build.0 = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|x86.ActiveCfg = Release|Any CPU
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997}.Release|x86.Build.0 = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Debug|x86.Build.0 = Debug|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|arm64.Build.0 = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|x64.Build.0 = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}.Release|x86.Build.0 = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|arm64.Build.0 = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|x64.Build.0 = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E}.Release|x86.Build.0 = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|x64.Build.0 = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Debug|x86.Build.0 = Debug|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|arm64.Build.0 = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|x64.ActiveCfg = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|x64.Build.0 = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|x86.ActiveCfg = Release|Any CPU
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}.Release|x86.Build.0 = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|x64.Build.0 = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Debug|x86.Build.0 = Debug|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|arm64.Build.0 = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|x64.ActiveCfg = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|x64.Build.0 = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117}.Release|x86.Build.0 = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|x64.Build.0 = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Debug|x86.Build.0 = Debug|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|arm64.Build.0 = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|x64.ActiveCfg = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|x64.Build.0 = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|x86.ActiveCfg = Release|Any CPU
-		{C71CF302-0FFA-4610-9197-033B277F3065}.Release|x86.Build.0 = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|arm64.Build.0 = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|x64.Build.0 = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Debug|x86.Build.0 = Debug|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|arm64.ActiveCfg = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|arm64.Build.0 = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|x64.ActiveCfg = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|x64.Build.0 = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|x86.ActiveCfg = Release|Any CPU
-		{09D2D765-A792-415E-B19A-18948A1C8969}.Release|x86.Build.0 = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|arm64.Build.0 = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|x64.Build.0 = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Debug|x86.Build.0 = Debug|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|Any CPU.Build.0 = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|arm64.ActiveCfg = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|arm64.Build.0 = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|x64.ActiveCfg = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|x64.Build.0 = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|x86.ActiveCfg = Release|Any CPU
-		{822FF16C-A4E0-40A0-AE65-530752575261}.Release|x86.Build.0 = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|x64.Build.0 = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Debug|x86.Build.0 = Debug|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|arm64.Build.0 = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x64.ActiveCfg = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x64.Build.0 = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x86.ActiveCfg = Release|Any CPU
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x86.Build.0 = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|x64.Build.0 = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|x86.Build.0 = Debug|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|arm64.Build.0 = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|x64.ActiveCfg = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|x64.Build.0 = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|x86.ActiveCfg = Release|Any CPU
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Release|x86.Build.0 = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|x64.Build.0 = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Debug|x86.Build.0 = Debug|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|arm64.Build.0 = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|x64.ActiveCfg = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|x64.Build.0 = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|x86.ActiveCfg = Release|Any CPU
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6}.Release|x86.Build.0 = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|x64.Build.0 = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Debug|x86.Build.0 = Debug|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|arm64.Build.0 = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|x64.Build.0 = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0}.Release|x86.Build.0 = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|x64.Build.0 = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Debug|x86.Build.0 = Debug|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|arm64.Build.0 = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|x64.ActiveCfg = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|x64.Build.0 = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|x86.ActiveCfg = Release|Any CPU
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B}.Release|x86.Build.0 = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|x64.Build.0 = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Debug|x86.Build.0 = Debug|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|arm64.Build.0 = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|x64.ActiveCfg = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|x64.Build.0 = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|x86.ActiveCfg = Release|Any CPU
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C}.Release|x86.Build.0 = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|x64.Build.0 = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Debug|x86.Build.0 = Debug|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|arm64.Build.0 = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|x64.ActiveCfg = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|x64.Build.0 = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|x86.ActiveCfg = Release|Any CPU
-		{30BB8038-D162-4171-9404-4041FC7A5BA7}.Release|x86.Build.0 = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|x64.Build.0 = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Debug|x86.Build.0 = Debug|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|arm64.Build.0 = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|x64.ActiveCfg = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|x64.Build.0 = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|x86.ActiveCfg = Release|Any CPU
-		{5750A285-B528-4A6C-953F-7838824E5F81}.Release|x86.Build.0 = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Debug|x86.Build.0 = Debug|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|arm64.Build.0 = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|x64.Build.0 = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2}.Release|x86.Build.0 = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|arm64.Build.0 = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|x64.Build.0 = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704}.Release|x86.Build.0 = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|x64.Build.0 = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Debug|x86.Build.0 = Debug|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|arm64.Build.0 = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|x64.ActiveCfg = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|x64.Build.0 = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|x86.ActiveCfg = Release|Any CPU
-		{5EBE548A-E450-466B-B448-D6662E659E58}.Release|x86.Build.0 = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|x64.Build.0 = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Debug|x86.Build.0 = Debug|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|arm64.Build.0 = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|x64.ActiveCfg = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|x64.Build.0 = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|x86.ActiveCfg = Release|Any CPU
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F}.Release|x86.Build.0 = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|x64.Build.0 = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Debug|x86.Build.0 = Debug|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|arm64.Build.0 = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|x64.ActiveCfg = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|x64.Build.0 = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|x86.ActiveCfg = Release|Any CPU
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB}.Release|x86.Build.0 = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|arm64.Build.0 = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|x64.Build.0 = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D}.Release|x86.Build.0 = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|arm64.Build.0 = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|x64.Build.0 = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7}.Release|x86.Build.0 = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|arm64.Build.0 = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|x64.Build.0 = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Debug|x86.Build.0 = Debug|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|Any CPU.Build.0 = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|arm64.ActiveCfg = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|arm64.Build.0 = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|x64.ActiveCfg = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|x64.Build.0 = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|x86.ActiveCfg = Release|Any CPU
-		{861CA437-6402-4E45-9E1F-35A509E61568}.Release|x86.Build.0 = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|x64.Build.0 = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|arm64.Build.0 = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|x64.ActiveCfg = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|x64.Build.0 = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C}.Release|x86.Build.0 = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|x64.Build.0 = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Debug|x86.Build.0 = Debug|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|arm64.Build.0 = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|x64.ActiveCfg = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|x64.Build.0 = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|x86.ActiveCfg = Release|Any CPU
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E}.Release|x86.Build.0 = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|arm64.Build.0 = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|x64.Build.0 = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E}.Release|x86.Build.0 = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Debug|x86.Build.0 = Debug|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|arm64.Build.0 = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|x64.Build.0 = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{8192DC13-6878-43C1-B657-96420C3BA9F8}.Release|x86.Build.0 = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|x64.Build.0 = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|arm64.Build.0 = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|x64.ActiveCfg = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|x64.Build.0 = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7}.Release|x86.Build.0 = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|x64.Build.0 = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Debug|x86.Build.0 = Debug|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|arm64.Build.0 = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|x64.ActiveCfg = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|x64.Build.0 = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|x86.ActiveCfg = Release|Any CPU
-		{68E93233-6FF3-41FE-8161-3B7F457473C8}.Release|x86.Build.0 = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|arm64.Build.0 = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|x64.Build.0 = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{897EECDD-628F-4233-B1BF-A13F687057BC}.Release|x86.Build.0 = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|x64.Build.0 = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Debug|x86.Build.0 = Debug|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|arm64.Build.0 = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|x64.ActiveCfg = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|x64.Build.0 = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|x86.ActiveCfg = Release|Any CPU
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51}.Release|x86.Build.0 = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|x64.Build.0 = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Debug|x86.Build.0 = Debug|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|arm64.Build.0 = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|x64.ActiveCfg = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|x64.Build.0 = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|x86.ActiveCfg = Release|Any CPU
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D}.Release|x86.Build.0 = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|x64.Build.0 = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Debug|x86.Build.0 = Debug|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|arm64.Build.0 = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|x64.ActiveCfg = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|x64.Build.0 = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|x86.ActiveCfg = Release|Any CPU
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D}.Release|x86.Build.0 = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|x64.Build.0 = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Debug|x86.Build.0 = Debug|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|arm64.Build.0 = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|x64.ActiveCfg = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|x64.Build.0 = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|x86.ActiveCfg = Release|Any CPU
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024}.Release|x86.Build.0 = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|x64.Build.0 = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Debug|x86.Build.0 = Debug|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|arm64.Build.0 = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|x64.ActiveCfg = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|x64.Build.0 = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|x86.ActiveCfg = Release|Any CPU
-		{4D08EC2C-A488-414E-8739-341E197773DB}.Release|x86.Build.0 = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|x64.Build.0 = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Debug|x86.Build.0 = Debug|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|arm64.Build.0 = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|x64.ActiveCfg = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|x64.Build.0 = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|x86.ActiveCfg = Release|Any CPU
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17}.Release|x86.Build.0 = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|arm64.Build.0 = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|x64.Build.0 = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Debug|x86.Build.0 = Debug|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|arm64.ActiveCfg = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|arm64.Build.0 = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|x64.ActiveCfg = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|x64.Build.0 = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|x86.ActiveCfg = Release|Any CPU
-		{35AA4E31-D157-4AD2-B04F-EE3956795420}.Release|x86.Build.0 = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|x64.Build.0 = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Debug|x86.Build.0 = Debug|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|arm64.Build.0 = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|x64.ActiveCfg = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|x64.Build.0 = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{21F89E50-DF06-435E-872B-7639BCE695DF}.Release|x86.Build.0 = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|x64.Build.0 = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Debug|x86.Build.0 = Debug|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|arm64.Build.0 = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|x64.ActiveCfg = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|x64.Build.0 = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|x86.ActiveCfg = Release|Any CPU
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E}.Release|x86.Build.0 = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|x64.Build.0 = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Debug|x86.Build.0 = Debug|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|arm64.Build.0 = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|x64.ActiveCfg = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|x64.Build.0 = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E690E42-B20F-4702-9478-1707EEC7C02F}.Release|x86.Build.0 = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|x64.Build.0 = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Debug|x86.Build.0 = Debug|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|arm64.Build.0 = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|x64.ActiveCfg = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|x64.Build.0 = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|x86.ActiveCfg = Release|Any CPU
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119}.Release|x86.Build.0 = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|arm64.Build.0 = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|x64.Build.0 = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Debug|x86.Build.0 = Debug|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|Any CPU.Build.0 = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|arm64.ActiveCfg = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|arm64.Build.0 = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|x64.ActiveCfg = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|x64.Build.0 = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|x86.ActiveCfg = Release|Any CPU
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011}.Release|x86.Build.0 = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|arm64.Build.0 = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|x64.ActiveCfg = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|x64.Build.0 = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{ECF7A440-D5FC-473F-958C-FE27643844D8}.Release|x86.Build.0 = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|x64.Build.0 = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Debug|x86.Build.0 = Debug|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|arm64.Build.0 = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|x64.Build.0 = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{92820F5C-4018-4F10-A14B-0AEE619202EE}.Release|x86.Build.0 = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Debug|x86.Build.0 = Debug|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|arm64.Build.0 = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|x64.Build.0 = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5}.Release|x86.Build.0 = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|x64.Build.0 = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Debug|x86.Build.0 = Debug|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|arm64.Build.0 = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|x64.ActiveCfg = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|x64.Build.0 = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5}.Release|x86.Build.0 = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|x64.Build.0 = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Debug|x86.Build.0 = Debug|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|arm64.Build.0 = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|x64.ActiveCfg = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|x64.Build.0 = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|x86.ActiveCfg = Release|Any CPU
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF}.Release|x86.Build.0 = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|arm64.Build.0 = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|x64.Build.0 = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B}.Release|x86.Build.0 = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|x64.Build.0 = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Debug|x86.Build.0 = Debug|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|arm64.Build.0 = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|x64.ActiveCfg = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|x64.Build.0 = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|x86.ActiveCfg = Release|Any CPU
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028}.Release|x86.Build.0 = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|x64.Build.0 = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Debug|x86.Build.0 = Debug|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|arm64.Build.0 = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|x64.ActiveCfg = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|x64.Build.0 = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|x86.ActiveCfg = Release|Any CPU
-		{3CCE49CA-4145-401F-8963-AC28F0908678}.Release|x86.Build.0 = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|x64.Build.0 = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Debug|x86.Build.0 = Debug|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|arm64.Build.0 = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|x64.ActiveCfg = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|x64.Build.0 = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1628BC4-134A-4854-9F98-B841520F1497}.Release|x86.Build.0 = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Debug|x86.Build.0 = Debug|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|arm64.Build.0 = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|x64.Build.0 = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1}.Release|x86.Build.0 = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|x64.Build.0 = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Debug|x86.Build.0 = Debug|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|arm64.Build.0 = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|x64.ActiveCfg = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|x64.Build.0 = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|x86.ActiveCfg = Release|Any CPU
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926}.Release|x86.Build.0 = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|x64.Build.0 = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Debug|x86.Build.0 = Debug|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|arm64.Build.0 = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|x64.ActiveCfg = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|x64.Build.0 = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|x86.ActiveCfg = Release|Any CPU
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A}.Release|x86.Build.0 = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|arm64.Build.0 = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|x64.Build.0 = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BE39E84-020F-405D-99AF-5D46928785AF}.Release|x86.Build.0 = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|x64.Build.0 = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Debug|x86.Build.0 = Debug|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|arm64.Build.0 = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|x64.ActiveCfg = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|x64.Build.0 = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|x86.ActiveCfg = Release|Any CPU
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8}.Release|x86.Build.0 = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|x64.Build.0 = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Debug|x86.Build.0 = Debug|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|arm64.Build.0 = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|x64.ActiveCfg = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|x64.Build.0 = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|x86.ActiveCfg = Release|Any CPU
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9}.Release|x86.Build.0 = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|x64.Build.0 = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Debug|x86.Build.0 = Debug|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|arm64.Build.0 = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|x64.ActiveCfg = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|x64.Build.0 = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|x86.ActiveCfg = Release|Any CPU
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0}.Release|x86.Build.0 = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|x64.Build.0 = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Debug|x86.Build.0 = Debug|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|arm64.Build.0 = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|x64.ActiveCfg = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|x64.Build.0 = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|x86.ActiveCfg = Release|Any CPU
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E}.Release|x86.Build.0 = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|x64.Build.0 = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|arm64.Build.0 = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|x64.ActiveCfg = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|x64.Build.0 = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A}.Release|x86.Build.0 = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|x64.Build.0 = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Debug|x86.Build.0 = Debug|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|arm64.Build.0 = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|x64.ActiveCfg = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|x64.Build.0 = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|x86.ActiveCfg = Release|Any CPU
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420}.Release|x86.Build.0 = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|x64.Build.0 = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Debug|x86.Build.0 = Debug|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|arm64.Build.0 = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|x64.ActiveCfg = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|x64.Build.0 = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{7135BA54-DE2E-42CD-8261-1A88907843FC}.Release|x86.Build.0 = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|x64.Build.0 = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Debug|x86.Build.0 = Debug|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|arm64.Build.0 = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|x64.ActiveCfg = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|x64.Build.0 = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|x86.ActiveCfg = Release|Any CPU
-		{A72BB350-8903-4914-9583-A156B66419EB}.Release|x86.Build.0 = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|x64.Build.0 = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Debug|x86.Build.0 = Debug|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|arm64.Build.0 = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|x64.ActiveCfg = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|x64.Build.0 = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|x86.ActiveCfg = Release|Any CPU
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB}.Release|x86.Build.0 = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|x64.Build.0 = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Debug|x86.Build.0 = Debug|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|arm64.Build.0 = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|x64.ActiveCfg = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|x64.Build.0 = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|x86.ActiveCfg = Release|Any CPU
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D}.Release|x86.Build.0 = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|arm64.Build.0 = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|x64.Build.0 = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1}.Release|x86.Build.0 = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|arm64.Build.0 = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|x64.ActiveCfg = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|x64.Build.0 = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF}.Release|x86.Build.0 = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|x64.Build.0 = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Debug|x86.Build.0 = Debug|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|arm64.Build.0 = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|x64.ActiveCfg = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|x64.Build.0 = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|x86.ActiveCfg = Release|Any CPU
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B}.Release|x86.Build.0 = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|x64.Build.0 = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Debug|x86.Build.0 = Debug|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|arm64.Build.0 = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|x64.ActiveCfg = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|x64.Build.0 = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|x86.ActiveCfg = Release|Any CPU
-		{A01B523B-35CA-4C14-B792-3887F8741E99}.Release|x86.Build.0 = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|arm64.Build.0 = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|x64.Build.0 = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16}.Release|x86.Build.0 = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|x64.Build.0 = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Debug|x86.Build.0 = Debug|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|arm64.Build.0 = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|x64.ActiveCfg = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|x64.Build.0 = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|x86.ActiveCfg = Release|Any CPU
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B}.Release|x86.Build.0 = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|x64.Build.0 = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Debug|x86.Build.0 = Debug|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|arm64.Build.0 = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|x64.Build.0 = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD}.Release|x86.Build.0 = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|x64.Build.0 = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Debug|x86.Build.0 = Debug|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|arm64.Build.0 = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|x64.ActiveCfg = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|x64.Build.0 = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|x86.ActiveCfg = Release|Any CPU
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5}.Release|x86.Build.0 = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|x64.Build.0 = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Debug|x86.Build.0 = Debug|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|arm64.Build.0 = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|x64.ActiveCfg = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|x64.Build.0 = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|x86.ActiveCfg = Release|Any CPU
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC}.Release|x86.Build.0 = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Debug|x86.Build.0 = Debug|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|arm64.Build.0 = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|x64.Build.0 = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0}.Release|x86.Build.0 = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|x64.Build.0 = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Debug|x86.Build.0 = Debug|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|arm64.Build.0 = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|x64.ActiveCfg = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|x64.Build.0 = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154}.Release|x86.Build.0 = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|arm64.Build.0 = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|x64.Build.0 = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D}.Release|x86.Build.0 = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|arm64.Build.0 = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|x64.Build.0 = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1}.Release|x86.Build.0 = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Debug|x86.Build.0 = Debug|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|arm64.Build.0 = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|x64.Build.0 = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE}.Release|x86.Build.0 = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|arm64.Build.0 = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x64.Build.0 = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x86.Build.0 = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|x64.Build.0 = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|arm64.Build.0 = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|x64.ActiveCfg = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|x64.Build.0 = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5C54062-B19C-4291-A816-F1B5A167369A}.Release|x86.Build.0 = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|arm64.Build.0 = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|x64.Build.0 = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{B5F938FB-37DF-4201-9537-E043513701D7}.Release|x86.Build.0 = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Debug|x86.Build.0 = Debug|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|arm64.Build.0 = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|x64.Build.0 = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160}.Release|x86.Build.0 = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|arm64.Build.0 = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|x64.Build.0 = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7}.Release|x86.Build.0 = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|arm64.Build.0 = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|x64.Build.0 = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC688973-3FAD-4A04-99C9-414782E5AE42}.Release|x86.Build.0 = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|x64.Build.0 = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Debug|x86.Build.0 = Debug|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|arm64.Build.0 = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|x64.ActiveCfg = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|x64.Build.0 = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|x86.ActiveCfg = Release|Any CPU
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D}.Release|x86.Build.0 = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|x64.Build.0 = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Debug|x86.Build.0 = Debug|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|arm64.Build.0 = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|x64.ActiveCfg = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|x64.Build.0 = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|x86.ActiveCfg = Release|Any CPU
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4}.Release|x86.Build.0 = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|arm64.Build.0 = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|x64.Build.0 = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Debug|x86.Build.0 = Debug|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|Any CPU.Build.0 = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|arm64.ActiveCfg = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|arm64.Build.0 = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|x64.ActiveCfg = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|x64.Build.0 = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|x86.ActiveCfg = Release|Any CPU
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931}.Release|x86.Build.0 = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|x64.Build.0 = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Debug|x86.Build.0 = Debug|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|arm64.Build.0 = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|x64.ActiveCfg = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|x64.Build.0 = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|x86.ActiveCfg = Release|Any CPU
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633}.Release|x86.Build.0 = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|x64.Build.0 = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Debug|x86.Build.0 = Debug|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|arm64.Build.0 = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|x64.ActiveCfg = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|x64.Build.0 = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|x86.ActiveCfg = Release|Any CPU
-		{975E7F46-8044-463E-89E1-56EB0F7913B8}.Release|x86.Build.0 = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|x64.Build.0 = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Debug|x86.Build.0 = Debug|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|arm64.Build.0 = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|x64.ActiveCfg = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|x64.Build.0 = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|x86.ActiveCfg = Release|Any CPU
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8}.Release|x86.Build.0 = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|x64.Build.0 = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Debug|x86.Build.0 = Debug|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|arm64.Build.0 = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|x64.ActiveCfg = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|x64.Build.0 = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|x86.ActiveCfg = Release|Any CPU
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7}.Release|x86.Build.0 = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Debug|x86.Build.0 = Debug|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|arm64.Build.0 = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|x64.Build.0 = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8096362-6304-4DAF-A091-978BE764FF30}.Release|x86.Build.0 = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|x64.Build.0 = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Debug|x86.Build.0 = Debug|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|arm64.Build.0 = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|x64.ActiveCfg = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|x64.Build.0 = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|x86.ActiveCfg = Release|Any CPU
-		{0FD49F5F-2950-43B8-8467-78596A4421AC}.Release|x86.Build.0 = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|x64.Build.0 = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Debug|x86.Build.0 = Debug|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|arm64.Build.0 = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|x64.ActiveCfg = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|x64.Build.0 = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|x86.ActiveCfg = Release|Any CPU
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1}.Release|x86.Build.0 = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|x64.Build.0 = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Debug|x86.Build.0 = Debug|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|arm64.Build.0 = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|x64.ActiveCfg = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|x64.Build.0 = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|x86.ActiveCfg = Release|Any CPU
-		{7DFECECC-E30C-4217-9746-86A8D652E110}.Release|x86.Build.0 = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|x64.Build.0 = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Debug|x86.Build.0 = Debug|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|arm64.Build.0 = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|x64.ActiveCfg = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|x64.Build.0 = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|x86.ActiveCfg = Release|Any CPU
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90}.Release|x86.Build.0 = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Debug|x86.Build.0 = Debug|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|arm64.Build.0 = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|x64.Build.0 = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8}.Release|x86.Build.0 = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|arm64.Build.0 = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|x64.Build.0 = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6}.Release|x86.Build.0 = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|x64.Build.0 = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Debug|x86.Build.0 = Debug|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|arm64.Build.0 = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|x64.ActiveCfg = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|x64.Build.0 = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|x86.ActiveCfg = Release|Any CPU
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A}.Release|x86.Build.0 = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|x64.Build.0 = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Debug|x86.Build.0 = Debug|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|arm64.Build.0 = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|x64.ActiveCfg = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|x64.Build.0 = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|x86.ActiveCfg = Release|Any CPU
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0}.Release|x86.Build.0 = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|x64.Build.0 = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|arm64.Build.0 = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|x64.ActiveCfg = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|x64.Build.0 = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|x86.ActiveCfg = Release|Any CPU
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}.Release|x86.Build.0 = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|x64.Build.0 = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Debug|x86.Build.0 = Debug|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|arm64.Build.0 = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|x64.ActiveCfg = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|x64.Build.0 = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|x86.ActiveCfg = Release|Any CPU
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F}.Release|x86.Build.0 = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|x64.Build.0 = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Debug|x86.Build.0 = Debug|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|arm64.Build.0 = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|x64.ActiveCfg = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|x64.Build.0 = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|x86.ActiveCfg = Release|Any CPU
-		{EA846E30-4F38-4315-844F-D5BC20F74B07}.Release|x86.Build.0 = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Debug|x86.Build.0 = Debug|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|arm64.Build.0 = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|x64.Build.0 = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1}.Release|x86.Build.0 = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|x64.Build.0 = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Debug|x86.Build.0 = Debug|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|arm64.Build.0 = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|x64.ActiveCfg = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|x64.Build.0 = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|x86.ActiveCfg = Release|Any CPU
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55}.Release|x86.Build.0 = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|x64.Build.0 = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Debug|x86.Build.0 = Debug|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|arm64.Build.0 = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|x64.ActiveCfg = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|x64.Build.0 = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|x86.ActiveCfg = Release|Any CPU
-		{E27910E1-6CCE-41B2-97DD-AE874007B592}.Release|x86.Build.0 = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|x64.Build.0 = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Debug|x86.Build.0 = Debug|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|arm64.Build.0 = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|x64.ActiveCfg = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|x64.Build.0 = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|x86.ActiveCfg = Release|Any CPU
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A}.Release|x86.Build.0 = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|arm64.Build.0 = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|x64.Build.0 = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A}.Release|x86.Build.0 = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|x64.Build.0 = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Debug|x86.Build.0 = Debug|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|arm64.Build.0 = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|x64.ActiveCfg = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|x64.Build.0 = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|x86.ActiveCfg = Release|Any CPU
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017}.Release|x86.Build.0 = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|x64.Build.0 = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Debug|x86.Build.0 = Debug|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|arm64.Build.0 = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|x64.ActiveCfg = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|x64.Build.0 = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|x86.ActiveCfg = Release|Any CPU
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915}.Release|x86.Build.0 = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|x64.Build.0 = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Debug|x86.Build.0 = Debug|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|arm64.Build.0 = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|x64.ActiveCfg = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|x64.Build.0 = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|x86.ActiveCfg = Release|Any CPU
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A}.Release|x86.Build.0 = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|arm64.Build.0 = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|x64.Build.0 = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Debug|x86.Build.0 = Debug|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|Any CPU.Build.0 = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|arm64.ActiveCfg = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|arm64.Build.0 = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|x64.ActiveCfg = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|x64.Build.0 = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|x86.ActiveCfg = Release|Any CPU
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755}.Release|x86.Build.0 = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|x64.Build.0 = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Debug|x86.Build.0 = Debug|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|arm64.Build.0 = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|x64.ActiveCfg = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|x64.Build.0 = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|x86.ActiveCfg = Release|Any CPU
-		{A28B3D43-619F-44A9-9463-78F0E2474351}.Release|x86.Build.0 = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|arm64.Build.0 = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|x64.Build.0 = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Debug|x86.Build.0 = Debug|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|Any CPU.Build.0 = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|arm64.ActiveCfg = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|arm64.Build.0 = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|x64.ActiveCfg = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|x64.Build.0 = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|x86.ActiveCfg = Release|Any CPU
-		{926D431D-D95F-42BA-817B-DFEAF697E007}.Release|x86.Build.0 = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|arm64.Build.0 = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|x64.Build.0 = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Debug|x86.Build.0 = Debug|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|arm64.ActiveCfg = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|arm64.Build.0 = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|x64.ActiveCfg = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|x64.Build.0 = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|x86.ActiveCfg = Release|Any CPU
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247}.Release|x86.Build.0 = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|x64.Build.0 = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Debug|x86.Build.0 = Debug|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|arm64.Build.0 = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|x64.ActiveCfg = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|x64.Build.0 = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|x86.ActiveCfg = Release|Any CPU
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC}.Release|x86.Build.0 = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|x64.Build.0 = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Debug|x86.Build.0 = Debug|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|arm64.Build.0 = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|x64.ActiveCfg = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|x64.Build.0 = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|x86.ActiveCfg = Release|Any CPU
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5}.Release|x86.Build.0 = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|x64.Build.0 = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Debug|x86.Build.0 = Debug|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|arm64.Build.0 = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|x64.ActiveCfg = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|x64.Build.0 = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|x86.ActiveCfg = Release|Any CPU
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596}.Release|x86.Build.0 = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|arm64.Build.0 = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|x64.Build.0 = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Debug|x86.Build.0 = Debug|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|arm64.ActiveCfg = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|arm64.Build.0 = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|x64.ActiveCfg = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|x64.Build.0 = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|x86.ActiveCfg = Release|Any CPU
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70}.Release|x86.Build.0 = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|x64.Build.0 = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Debug|x86.Build.0 = Debug|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|arm64.Build.0 = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|x64.ActiveCfg = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|x64.Build.0 = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|x86.ActiveCfg = Release|Any CPU
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5}.Release|x86.Build.0 = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|x64.Build.0 = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|arm64.Build.0 = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|x64.ActiveCfg = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|x64.Build.0 = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136}.Release|x86.Build.0 = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|arm64.Build.0 = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|x64.Build.0 = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Debug|x86.Build.0 = Debug|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|Any CPU.Build.0 = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|arm64.ActiveCfg = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|arm64.Build.0 = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|x64.ActiveCfg = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|x64.Build.0 = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|x86.ActiveCfg = Release|Any CPU
-		{687BD42C-54CD-4E80-A877-6E278AE21105}.Release|x86.Build.0 = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|arm64.Build.0 = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|x64.ActiveCfg = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|x64.Build.0 = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797}.Release|x86.Build.0 = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|x64.Build.0 = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Debug|x86.Build.0 = Debug|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|arm64.Build.0 = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|x64.ActiveCfg = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|x64.Build.0 = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D}.Release|x86.Build.0 = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|arm64.Build.0 = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|x64.Build.0 = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3}.Release|x86.Build.0 = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|x64.Build.0 = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Debug|x86.Build.0 = Debug|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|arm64.Build.0 = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|x64.ActiveCfg = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|x64.Build.0 = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|x86.ActiveCfg = Release|Any CPU
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3}.Release|x86.Build.0 = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|x64.Build.0 = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Debug|x86.Build.0 = Debug|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|arm64.Build.0 = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|x64.ActiveCfg = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|x64.Build.0 = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|x86.ActiveCfg = Release|Any CPU
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463}.Release|x86.Build.0 = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|x64.Build.0 = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Debug|x86.Build.0 = Debug|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|arm64.Build.0 = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|x64.ActiveCfg = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|x64.Build.0 = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|x86.ActiveCfg = Release|Any CPU
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6}.Release|x86.Build.0 = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|x64.Build.0 = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Debug|x86.Build.0 = Debug|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|arm64.Build.0 = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|x64.ActiveCfg = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|x64.Build.0 = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|x86.ActiveCfg = Release|Any CPU
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E}.Release|x86.Build.0 = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|x64.Build.0 = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Debug|x86.Build.0 = Debug|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|arm64.Build.0 = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|x64.ActiveCfg = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|x64.Build.0 = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|x86.ActiveCfg = Release|Any CPU
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F}.Release|x86.Build.0 = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|arm64.Build.0 = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|x64.Build.0 = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D3C520F-0CA7-4759-A563-40496545FA48}.Release|x86.Build.0 = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|x64.Build.0 = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Debug|x86.Build.0 = Debug|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|arm64.Build.0 = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|x64.ActiveCfg = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|x64.Build.0 = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|x86.ActiveCfg = Release|Any CPU
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29}.Release|x86.Build.0 = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|x64.Build.0 = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Debug|x86.Build.0 = Debug|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|arm64.Build.0 = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|x64.ActiveCfg = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|x64.Build.0 = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|x86.ActiveCfg = Release|Any CPU
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB}.Release|x86.Build.0 = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|x64.Build.0 = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Debug|x86.Build.0 = Debug|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|arm64.Build.0 = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|x64.ActiveCfg = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|x64.Build.0 = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|x86.ActiveCfg = Release|Any CPU
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61}.Release|x86.Build.0 = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|x64.Build.0 = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Debug|x86.Build.0 = Debug|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|arm64.Build.0 = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|x64.ActiveCfg = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|x64.Build.0 = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|x86.ActiveCfg = Release|Any CPU
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9}.Release|x86.Build.0 = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|x64.Build.0 = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Debug|x86.Build.0 = Debug|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|arm64.Build.0 = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|x64.ActiveCfg = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|x64.Build.0 = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|x86.ActiveCfg = Release|Any CPU
-		{3163C56E-99BC-4BD1-8880-4F94A2407741}.Release|x86.Build.0 = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|x64.Build.0 = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Debug|x86.Build.0 = Debug|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|arm64.Build.0 = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|x64.ActiveCfg = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|x64.Build.0 = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|x86.ActiveCfg = Release|Any CPU
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D}.Release|x86.Build.0 = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|x64.Build.0 = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Debug|x86.Build.0 = Debug|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|arm64.Build.0 = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|x64.ActiveCfg = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|x64.Build.0 = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|x86.ActiveCfg = Release|Any CPU
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2}.Release|x86.Build.0 = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|x64.Build.0 = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Debug|x86.Build.0 = Debug|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|arm64.Build.0 = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|x64.Build.0 = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE}.Release|x86.Build.0 = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|x64.Build.0 = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Debug|x86.Build.0 = Debug|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|arm64.Build.0 = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|x64.ActiveCfg = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|x64.Build.0 = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|x86.ActiveCfg = Release|Any CPU
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9}.Release|x86.Build.0 = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|x64.Build.0 = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Debug|x86.Build.0 = Debug|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|arm64.Build.0 = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|x64.ActiveCfg = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|x64.Build.0 = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|x86.ActiveCfg = Release|Any CPU
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173}.Release|x86.Build.0 = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|x64.Build.0 = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Debug|x86.Build.0 = Debug|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|arm64.Build.0 = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|x64.ActiveCfg = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|x64.Build.0 = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|x86.ActiveCfg = Release|Any CPU
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5}.Release|x86.Build.0 = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|x64.Build.0 = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Debug|x86.Build.0 = Debug|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|arm64.Build.0 = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|x64.ActiveCfg = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|x64.Build.0 = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|x86.ActiveCfg = Release|Any CPU
-		{1D1E165C-435A-4716-8769-31A51632D7C2}.Release|x86.Build.0 = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|x64.Build.0 = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Debug|x86.Build.0 = Debug|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|arm64.Build.0 = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|x64.ActiveCfg = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|x64.Build.0 = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|x86.ActiveCfg = Release|Any CPU
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8}.Release|x86.Build.0 = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|x64.Build.0 = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Debug|x86.Build.0 = Debug|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|arm64.Build.0 = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|x64.ActiveCfg = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|x64.Build.0 = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|x86.ActiveCfg = Release|Any CPU
-		{817D138C-19D8-4264-8FAF-660B05AC030D}.Release|x86.Build.0 = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|x64.Build.0 = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Debug|x86.Build.0 = Debug|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|arm64.Build.0 = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|x64.ActiveCfg = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|x64.Build.0 = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5}.Release|x86.Build.0 = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Debug|x86.Build.0 = Debug|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|arm64.Build.0 = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|x64.Build.0 = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894}.Release|x86.Build.0 = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|arm64.Build.0 = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|x64.Build.0 = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Debug|x86.Build.0 = Debug|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|arm64.ActiveCfg = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|arm64.Build.0 = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|x64.ActiveCfg = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|x64.Build.0 = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|x86.ActiveCfg = Release|Any CPU
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03}.Release|x86.Build.0 = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|x64.Build.0 = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Debug|x86.Build.0 = Debug|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|arm64.Build.0 = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|x64.ActiveCfg = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|x64.Build.0 = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|x86.ActiveCfg = Release|Any CPU
-		{86741306-CF87-4AEA-9015-188A3CECBFBC}.Release|x86.Build.0 = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|x64.Build.0 = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Debug|x86.Build.0 = Debug|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|arm64.Build.0 = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|x64.ActiveCfg = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|x64.Build.0 = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|x86.ActiveCfg = Release|Any CPU
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC}.Release|x86.Build.0 = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|x64.Build.0 = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Debug|x86.Build.0 = Debug|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|arm64.Build.0 = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|x64.ActiveCfg = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|x64.Build.0 = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|x86.ActiveCfg = Release|Any CPU
-		{6592343C-B7B7-4687-8942-1C2241414A02}.Release|x86.Build.0 = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|x64.Build.0 = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Debug|x86.Build.0 = Debug|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|arm64.Build.0 = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|x64.ActiveCfg = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|x64.Build.0 = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|x86.ActiveCfg = Release|Any CPU
-		{DA64A7BF-F869-414C-A096-076723E55C61}.Release|x86.Build.0 = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|x64.Build.0 = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Debug|x86.Build.0 = Debug|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|arm64.Build.0 = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|x64.ActiveCfg = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|x64.Build.0 = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|x86.ActiveCfg = Release|Any CPU
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3}.Release|x86.Build.0 = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|x64.Build.0 = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|arm64.Build.0 = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|x64.Build.0 = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF}.Release|x86.Build.0 = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|x64.Build.0 = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Debug|x86.Build.0 = Debug|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|arm64.Build.0 = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|x64.ActiveCfg = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|x64.Build.0 = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|x86.ActiveCfg = Release|Any CPU
-		{88C2C45B-ED16-4B85-8498-E3F13679629D}.Release|x86.Build.0 = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|x64.Build.0 = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Debug|x86.Build.0 = Debug|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|arm64.Build.0 = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|x64.Build.0 = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|x86.ActiveCfg = Release|Any CPU
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19}.Release|x86.Build.0 = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|x64.Build.0 = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Debug|x86.Build.0 = Debug|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|arm64.Build.0 = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|x64.ActiveCfg = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|x64.Build.0 = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|x86.ActiveCfg = Release|Any CPU
-		{E1CE011A-47BD-496D-B9EB-2766C198A619}.Release|x86.Build.0 = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|arm64.Build.0 = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|x64.Build.0 = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5}.Release|x86.Build.0 = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|arm64.Build.0 = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|x64.Build.0 = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}.Release|x86.Build.0 = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Debug|x86.Build.0 = Debug|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|arm64.Build.0 = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|x64.Build.0 = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F67C1C2-7352-414F-9149-1F16D53C7435}.Release|x86.Build.0 = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|x64.Build.0 = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Debug|x86.Build.0 = Debug|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|arm64.Build.0 = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|x64.ActiveCfg = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|x64.Build.0 = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|x86.ActiveCfg = Release|Any CPU
-		{046AFDDE-B31B-4205-B059-0E8E194E954D}.Release|x86.Build.0 = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|x64.Build.0 = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Debug|x86.Build.0 = Debug|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|arm64.Build.0 = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|x64.ActiveCfg = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|x64.Build.0 = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|x86.ActiveCfg = Release|Any CPU
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44}.Release|x86.Build.0 = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Debug|x86.Build.0 = Debug|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|arm64.Build.0 = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|x64.Build.0 = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF}.Release|x86.Build.0 = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|x64.Build.0 = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Debug|x86.Build.0 = Debug|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|arm64.Build.0 = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|x64.ActiveCfg = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|x64.Build.0 = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|x86.ActiveCfg = Release|Any CPU
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E}.Release|x86.Build.0 = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|x64.Build.0 = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Debug|x86.Build.0 = Debug|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|arm64.Build.0 = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|x64.ActiveCfg = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|x64.Build.0 = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|x86.ActiveCfg = Release|Any CPU
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB}.Release|x86.Build.0 = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|x64.Build.0 = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Debug|x86.Build.0 = Debug|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|arm64.Build.0 = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|x64.ActiveCfg = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|x64.Build.0 = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|x86.ActiveCfg = Release|Any CPU
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4}.Release|x86.Build.0 = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|x64.Build.0 = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Debug|x86.Build.0 = Debug|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|arm64.Build.0 = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|x64.ActiveCfg = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|x64.Build.0 = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|x86.ActiveCfg = Release|Any CPU
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6}.Release|x86.Build.0 = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|x64.Build.0 = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|arm64.Build.0 = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|x64.ActiveCfg = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|x64.Build.0 = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5}.Release|x86.Build.0 = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|arm64.Build.0 = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|x64.Build.0 = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC}.Release|x86.Build.0 = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|x64.Build.0 = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Debug|x86.Build.0 = Debug|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|arm64.Build.0 = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|x64.ActiveCfg = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|x64.Build.0 = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC}.Release|x86.Build.0 = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|arm64.Build.0 = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|x64.Build.0 = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Debug|x86.Build.0 = Debug|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|arm64.ActiveCfg = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|arm64.Build.0 = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|x64.ActiveCfg = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|x64.Build.0 = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|x86.ActiveCfg = Release|Any CPU
-		{892333B9-689B-4E51-82FF-CC5376961A36}.Release|x86.Build.0 = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|x64.Build.0 = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Debug|x86.Build.0 = Debug|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|arm64.Build.0 = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|x64.ActiveCfg = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|x64.Build.0 = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|x86.ActiveCfg = Release|Any CPU
-		{4D4CB590-9F66-4D75-B439-D3B445975A55}.Release|x86.Build.0 = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|x64.Build.0 = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Debug|x86.Build.0 = Debug|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|arm64.Build.0 = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|x64.ActiveCfg = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|x64.Build.0 = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|x86.ActiveCfg = Release|Any CPU
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D}.Release|x86.Build.0 = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|arm64.Build.0 = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|x64.Build.0 = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Debug|x86.Build.0 = Debug|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|Any CPU.Build.0 = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|arm64.ActiveCfg = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|arm64.Build.0 = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|x64.ActiveCfg = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|x64.Build.0 = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|x86.ActiveCfg = Release|Any CPU
-		{257A6551-7987-4C5C-BE6F-376094477371}.Release|x86.Build.0 = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|x64.Build.0 = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Debug|x86.Build.0 = Debug|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|arm64.Build.0 = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|x64.ActiveCfg = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|x64.Build.0 = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|x86.ActiveCfg = Release|Any CPU
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F}.Release|x86.Build.0 = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|x64.Build.0 = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Debug|x86.Build.0 = Debug|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|arm64.Build.0 = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|x64.ActiveCfg = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|x64.Build.0 = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|x86.ActiveCfg = Release|Any CPU
-		{CACBB755-08B6-4176-9390-CAD3F9962E80}.Release|x86.Build.0 = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|x64.Build.0 = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Debug|x86.Build.0 = Debug|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|arm64.Build.0 = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|x64.ActiveCfg = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|x64.Build.0 = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|x86.ActiveCfg = Release|Any CPU
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B}.Release|x86.Build.0 = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|x64.Build.0 = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Debug|x86.Build.0 = Debug|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|arm64.Build.0 = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|x64.ActiveCfg = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|x64.Build.0 = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|x86.ActiveCfg = Release|Any CPU
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A}.Release|x86.Build.0 = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|x64.Build.0 = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Debug|x86.Build.0 = Debug|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|arm64.Build.0 = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|x64.ActiveCfg = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|x64.Build.0 = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|x86.ActiveCfg = Release|Any CPU
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27}.Release|x86.Build.0 = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|x64.Build.0 = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Debug|x86.Build.0 = Debug|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|arm64.Build.0 = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|x64.ActiveCfg = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|x64.Build.0 = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|x86.ActiveCfg = Release|Any CPU
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51}.Release|x86.Build.0 = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|arm64.Build.0 = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|x64.Build.0 = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE}.Release|x86.Build.0 = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|x64.Build.0 = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Debug|x86.Build.0 = Debug|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|arm64.Build.0 = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|x64.ActiveCfg = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|x64.Build.0 = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|x86.ActiveCfg = Release|Any CPU
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93}.Release|x86.Build.0 = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|x64.Build.0 = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Debug|x86.Build.0 = Debug|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|arm64.Build.0 = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|x64.ActiveCfg = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|x64.Build.0 = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|x86.ActiveCfg = Release|Any CPU
-		{6248B017-2912-4989-9994-2685C4D88E9A}.Release|x86.Build.0 = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|x64.Build.0 = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|arm64.Build.0 = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|x64.Build.0 = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2}.Release|x86.Build.0 = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|arm64.Build.0 = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|x64.Build.0 = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Debug|x86.Build.0 = Debug|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|arm64.ActiveCfg = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|arm64.Build.0 = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|x64.ActiveCfg = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|x64.Build.0 = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|x86.ActiveCfg = Release|Any CPU
-		{65EE0531-4533-407F-A9CA-2EBCDC444397}.Release|x86.Build.0 = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|x64.Build.0 = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Debug|x86.Build.0 = Debug|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|arm64.Build.0 = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|x64.ActiveCfg = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|x64.Build.0 = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|x86.ActiveCfg = Release|Any CPU
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B}.Release|x86.Build.0 = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|x64.Build.0 = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Debug|x86.Build.0 = Debug|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|arm64.Build.0 = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|x64.ActiveCfg = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|x64.Build.0 = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|x86.ActiveCfg = Release|Any CPU
-		{C911DC19-9556-4DCC-9794-AD907137348F}.Release|x86.Build.0 = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|x64.Build.0 = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Debug|x86.Build.0 = Debug|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|arm64.Build.0 = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|x64.ActiveCfg = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|x64.Build.0 = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|x86.ActiveCfg = Release|Any CPU
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73}.Release|x86.Build.0 = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|x64.Build.0 = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Debug|x86.Build.0 = Debug|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|arm64.Build.0 = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|x64.ActiveCfg = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|x64.Build.0 = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|x86.ActiveCfg = Release|Any CPU
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB}.Release|x86.Build.0 = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|x64.Build.0 = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Debug|x86.Build.0 = Debug|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|arm64.Build.0 = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|x64.ActiveCfg = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|x64.Build.0 = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|x86.ActiveCfg = Release|Any CPU
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27}.Release|x86.Build.0 = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|x64.Build.0 = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|arm64.Build.0 = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|x64.ActiveCfg = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|x64.Build.0 = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|x86.ActiveCfg = Release|Any CPU
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214}.Release|x86.Build.0 = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|x64.Build.0 = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Debug|x86.Build.0 = Debug|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|arm64.Build.0 = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|x64.ActiveCfg = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|x64.Build.0 = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|x86.ActiveCfg = Release|Any CPU
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491}.Release|x86.Build.0 = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|x64.Build.0 = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Debug|x86.Build.0 = Debug|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|arm64.Build.0 = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|x64.ActiveCfg = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|x64.Build.0 = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|x86.ActiveCfg = Release|Any CPU
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F}.Release|x86.Build.0 = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|x64.Build.0 = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Debug|x86.Build.0 = Debug|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|arm64.Build.0 = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|x64.ActiveCfg = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|x64.Build.0 = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|x86.ActiveCfg = Release|Any CPU
-		{EBE144DD-577E-4E98-BFEB-94E479753927}.Release|x86.Build.0 = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|x64.Build.0 = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Debug|x86.Build.0 = Debug|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|arm64.Build.0 = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|x64.ActiveCfg = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|x64.Build.0 = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|x86.ActiveCfg = Release|Any CPU
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B}.Release|x86.Build.0 = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|arm64.Build.0 = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|x64.Build.0 = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Debug|x86.Build.0 = Debug|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|arm64.ActiveCfg = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|arm64.Build.0 = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|x64.ActiveCfg = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|x64.Build.0 = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|x86.ActiveCfg = Release|Any CPU
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42}.Release|x86.Build.0 = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Debug|x86.Build.0 = Debug|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|arm64.Build.0 = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|x64.Build.0 = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8A42FB4-1B51-4290-9291-445D3A489758}.Release|x86.Build.0 = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|x64.Build.0 = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Debug|x86.Build.0 = Debug|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|arm64.Build.0 = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|x64.Build.0 = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|x86.ActiveCfg = Release|Any CPU
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F}.Release|x86.Build.0 = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|x64.Build.0 = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Debug|x86.Build.0 = Debug|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|arm64.Build.0 = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|x64.ActiveCfg = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|x64.Build.0 = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|x86.ActiveCfg = Release|Any CPU
-		{9883418F-C427-426E-9021-E3F1BAF33E6B}.Release|x86.Build.0 = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|x64.Build.0 = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Debug|x86.Build.0 = Debug|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|arm64.Build.0 = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|x64.ActiveCfg = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|x64.Build.0 = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF}.Release|x86.Build.0 = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|arm64.Build.0 = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|x64.Build.0 = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Debug|x86.Build.0 = Debug|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|arm64.ActiveCfg = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|arm64.Build.0 = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|x64.ActiveCfg = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|x64.Build.0 = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|x86.ActiveCfg = Release|Any CPU
-		{31405D54-645D-490B-9041-88119D8B1B47}.Release|x86.Build.0 = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|x64.Build.0 = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Debug|x86.Build.0 = Debug|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|arm64.Build.0 = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|x64.ActiveCfg = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|x64.Build.0 = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|x86.ActiveCfg = Release|Any CPU
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D}.Release|x86.Build.0 = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|x64.Build.0 = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Debug|x86.Build.0 = Debug|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|arm64.Build.0 = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|x64.ActiveCfg = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|x64.Build.0 = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|x86.ActiveCfg = Release|Any CPU
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F}.Release|x86.Build.0 = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|x64.Build.0 = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Debug|x86.Build.0 = Debug|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|arm64.Build.0 = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|x64.ActiveCfg = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|x64.Build.0 = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|x86.ActiveCfg = Release|Any CPU
-		{3297D10B-B32A-4F70-8200-2B727C759C8D}.Release|x86.Build.0 = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|x64.Build.0 = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Debug|x86.Build.0 = Debug|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|arm64.Build.0 = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|x64.ActiveCfg = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|x64.Build.0 = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|x86.ActiveCfg = Release|Any CPU
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249}.Release|x86.Build.0 = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|x64.Build.0 = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Debug|x86.Build.0 = Debug|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|arm64.Build.0 = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|x64.ActiveCfg = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|x64.Build.0 = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|x86.ActiveCfg = Release|Any CPU
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895}.Release|x86.Build.0 = Release|Any CPU
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|Any CPU.Build.0 = Debug|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|arm64.ActiveCfg = Debug|x86
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|x64.ActiveCfg = Debug|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|x64.Build.0 = Debug|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|x86.ActiveCfg = Debug|x86
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Debug|x86.Build.0 = Debug|x86
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|Any CPU.ActiveCfg = Release|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|Any CPU.Build.0 = Release|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|arm64.ActiveCfg = Release|x86
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|x64.ActiveCfg = Release|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|x64.Build.0 = Release|x64
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|x86.ActiveCfg = Release|x86
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|x86.Build.0 = Release|x86
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.Build.0 = Debug|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.Build.0 = Debug|ARM64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.ActiveCfg = Debug|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.Build.0 = Debug|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.ActiveCfg = Debug|x86
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.Build.0 = Debug|x86
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|Any CPU.ActiveCfg = Release|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|Any CPU.Build.0 = Release|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|arm64.ActiveCfg = Release|ARM64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x64.ActiveCfg = Release|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x64.Build.0 = Release|x64
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x86.ActiveCfg = Release|x86
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x86.Build.0 = Release|x86
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|arm64.Build.0 = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|x64.Build.0 = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}.Release|x86.Build.0 = Release|Any CPU
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|Any CPU.Build.0 = Debug|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|arm64.ActiveCfg = Debug|x86
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|x64.ActiveCfg = Debug|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|x64.Build.0 = Debug|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|x86.ActiveCfg = Debug|x86
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Debug|x86.Build.0 = Debug|x86
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|Any CPU.ActiveCfg = Release|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|Any CPU.Build.0 = Release|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|arm64.ActiveCfg = Release|x86
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|x64.ActiveCfg = Release|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|x64.Build.0 = Release|x64
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|x86.ActiveCfg = Release|x86
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D}.Release|x86.Build.0 = Release|x86
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|x64.Build.0 = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Debug|x86.Build.0 = Debug|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|arm64.Build.0 = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|x64.ActiveCfg = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|x64.Build.0 = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|x86.ActiveCfg = Release|Any CPU
-		{7107FC61-E540-4946-A090-A0E0D8357505}.Release|x86.Build.0 = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|x64.Build.0 = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Debug|x86.Build.0 = Debug|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|arm64.Build.0 = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|x64.ActiveCfg = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|x64.Build.0 = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|x86.ActiveCfg = Release|Any CPU
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD}.Release|x86.Build.0 = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|x64.Build.0 = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|arm64.Build.0 = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|x64.ActiveCfg = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|x64.Build.0 = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D}.Release|x86.Build.0 = Release|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|x64.Build.0 = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Debug|x86.Build.0 = Debug|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Release|arm64.Build.0 = Release|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Release|x64.ActiveCfg = Release|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Release|x86.ActiveCfg = Release|Any CPU
-		{647F0202-165F-4E98-A798-B2B3113050EC}.Release|x86.Build.0 = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|arm64.Build.0 = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|x64.Build.0 = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B}.Release|x86.Build.0 = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|x64.Build.0 = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|arm64.Build.0 = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|x64.Build.0 = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF}.Release|x86.Build.0 = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|arm64.Build.0 = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|x64.Build.0 = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Debug|x86.Build.0 = Debug|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|arm64.ActiveCfg = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|arm64.Build.0 = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|x64.ActiveCfg = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|x64.Build.0 = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|x86.ActiveCfg = Release|Any CPU
-		{51A02E3E-6932-479C-A287-CC6C3611B715}.Release|x86.Build.0 = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|x64.Build.0 = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Debug|x86.Build.0 = Debug|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|arm64.Build.0 = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|x64.ActiveCfg = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|x64.Build.0 = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|x86.ActiveCfg = Release|Any CPU
-		{7542D11F-2401-457C-992B-0473ADBD7842}.Release|x86.Build.0 = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|x64.Build.0 = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Debug|x86.Build.0 = Debug|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|arm64.Build.0 = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|x64.ActiveCfg = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|x64.Build.0 = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|x86.ActiveCfg = Release|Any CPU
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668}.Release|x86.Build.0 = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|x64.Build.0 = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Debug|x86.Build.0 = Debug|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|arm64.Build.0 = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|x64.ActiveCfg = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|x64.Build.0 = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E}.Release|x86.Build.0 = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|x64.Build.0 = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Debug|x86.Build.0 = Debug|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|arm64.Build.0 = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|x64.ActiveCfg = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|x64.Build.0 = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|x86.ActiveCfg = Release|Any CPU
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2}.Release|x86.Build.0 = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|x64.Build.0 = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Debug|x86.Build.0 = Debug|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|arm64.Build.0 = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|x64.ActiveCfg = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|x64.Build.0 = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|x86.ActiveCfg = Release|Any CPU
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9}.Release|x86.Build.0 = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|x64.Build.0 = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Debug|x86.Build.0 = Debug|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|arm64.Build.0 = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|x64.ActiveCfg = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|x64.Build.0 = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|x86.ActiveCfg = Release|Any CPU
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05}.Release|x86.Build.0 = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|x64.Build.0 = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Debug|x86.Build.0 = Debug|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|arm64.Build.0 = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|x64.ActiveCfg = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|x64.Build.0 = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|x86.ActiveCfg = Release|Any CPU
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753}.Release|x86.Build.0 = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|x64.Build.0 = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Debug|x86.Build.0 = Debug|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|arm64.Build.0 = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|x64.ActiveCfg = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|x64.Build.0 = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|x86.ActiveCfg = Release|Any CPU
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF}.Release|x86.Build.0 = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|x64.Build.0 = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Debug|x86.Build.0 = Debug|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|arm64.Build.0 = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|x64.ActiveCfg = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|x64.Build.0 = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|x86.ActiveCfg = Release|Any CPU
-		{71568623-71F9-4110-ACE2-093CD0DA911C}.Release|x86.Build.0 = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|x64.Build.0 = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Debug|x86.Build.0 = Debug|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|arm64.Build.0 = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|x64.ActiveCfg = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|x64.Build.0 = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|x86.ActiveCfg = Release|Any CPU
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93}.Release|x86.Build.0 = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|x64.Build.0 = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Debug|x86.Build.0 = Debug|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|arm64.Build.0 = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|x64.ActiveCfg = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|x64.Build.0 = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|x86.ActiveCfg = Release|Any CPU
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D}.Release|x86.Build.0 = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|x64.Build.0 = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Debug|x86.Build.0 = Debug|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|arm64.Build.0 = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|x64.ActiveCfg = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|x64.Build.0 = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|x86.ActiveCfg = Release|Any CPU
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E}.Release|x86.Build.0 = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|x64.Build.0 = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Debug|x86.Build.0 = Debug|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|arm64.Build.0 = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|x64.ActiveCfg = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|x64.Build.0 = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|x86.ActiveCfg = Release|Any CPU
-		{2EC4E939-513F-44CD-A956-498966EAC929}.Release|x86.Build.0 = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|x64.Build.0 = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Debug|x86.Build.0 = Debug|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|arm64.Build.0 = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|x64.ActiveCfg = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|x64.Build.0 = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|x86.ActiveCfg = Release|Any CPU
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A}.Release|x86.Build.0 = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|x64.Build.0 = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Debug|x86.Build.0 = Debug|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|arm64.Build.0 = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x64.ActiveCfg = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x64.Build.0 = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x86.ActiveCfg = Release|Any CPU
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}.Release|x86.Build.0 = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|x64.Build.0 = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Debug|x86.Build.0 = Debug|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|arm64.Build.0 = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|x64.ActiveCfg = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|x64.Build.0 = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|x86.ActiveCfg = Release|Any CPU
-		{46FB7E93-1294-4068-B80A-D4864F78277A}.Release|x86.Build.0 = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|arm64.Build.0 = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|x64.Build.0 = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Debug|x86.Build.0 = Debug|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|arm64.ActiveCfg = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|arm64.Build.0 = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|x64.ActiveCfg = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|x64.Build.0 = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|x86.ActiveCfg = Release|Any CPU
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16}.Release|x86.Build.0 = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|x64.Build.0 = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Debug|x86.Build.0 = Debug|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|arm64.Build.0 = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|x64.ActiveCfg = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|x64.Build.0 = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|x86.ActiveCfg = Release|Any CPU
-		{19974360-4A63-425A-94DB-C2C940A3A97A}.Release|x86.Build.0 = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|arm64.Build.0 = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|x64.Build.0 = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Debug|x86.Build.0 = Debug|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|arm64.ActiveCfg = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|arm64.Build.0 = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|x64.ActiveCfg = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|x64.Build.0 = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|x86.ActiveCfg = Release|Any CPU
-		{ADF9C126-F322-4E34-AFD3-E626A4487206}.Release|x86.Build.0 = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|x64.Build.0 = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Debug|x86.Build.0 = Debug|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|arm64.Build.0 = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|x64.ActiveCfg = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|x64.Build.0 = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|x86.ActiveCfg = Release|Any CPU
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}.Release|x86.Build.0 = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|arm64.Build.0 = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|x64.Build.0 = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A59AF88-4A82-46ED-977D-D909001F8107}.Release|x86.Build.0 = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|x64.Build.0 = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Debug|x86.Build.0 = Debug|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|arm64.Build.0 = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|x64.ActiveCfg = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|x64.Build.0 = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|x86.ActiveCfg = Release|Any CPU
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD}.Release|x86.Build.0 = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|x64.Build.0 = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Debug|x86.Build.0 = Debug|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|arm64.Build.0 = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|x64.ActiveCfg = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|x64.Build.0 = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|x86.ActiveCfg = Release|Any CPU
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56}.Release|x86.Build.0 = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|arm64.Build.0 = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|x64.Build.0 = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Debug|x86.Build.0 = Debug|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|arm64.ActiveCfg = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|arm64.Build.0 = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|x64.ActiveCfg = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|x64.Build.0 = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|x86.ActiveCfg = Release|Any CPU
-		{19189670-E206-471D-94F8-7D3D545E5020}.Release|x86.Build.0 = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|x64.Build.0 = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Debug|x86.Build.0 = Debug|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|arm64.Build.0 = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|x64.Build.0 = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9408723-E6A9-4715-B906-3B25B0238ABA}.Release|x86.Build.0 = Release|Any CPU
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|Any CPU.Build.0 = Debug|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|arm64.ActiveCfg = Debug|x86
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|x64.ActiveCfg = Debug|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|x64.Build.0 = Debug|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|x86.ActiveCfg = Debug|x86
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Debug|x86.Build.0 = Debug|x86
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|Any CPU.ActiveCfg = Release|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|Any CPU.Build.0 = Release|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|arm64.ActiveCfg = Release|x86
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|x64.ActiveCfg = Release|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|x64.Build.0 = Release|x64
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|x86.ActiveCfg = Release|x86
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|x86.Build.0 = Release|x86
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.Build.0 = Debug|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|arm64.Build.0 = Debug|ARM64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Build.0 = Debug|Win32
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Deploy.0 = Debug|Win32
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.Build.0 = Release|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|arm64.ActiveCfg = Release|ARM64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|arm64.Build.0 = Release|ARM64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.ActiveCfg = Release|Win32
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.Build.0 = Release|Win32
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.Deploy.0 = Release|Win32
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.Build.0 = Debug|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|arm64.Build.0 = Debug|ARM64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Deploy.0 = Debug|Win32
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.Build.0 = Release|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|arm64.ActiveCfg = Release|Any CPU
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|arm64.Build.0 = Release|Any CPU
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.ActiveCfg = Release|Win32
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Build.0 = Release|Win32
-		{55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Deploy.0 = Release|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.Build.0 = Debug|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.Build.0 = Debug|ARM64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Build.0 = Debug|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Deploy.0 = Debug|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.Build.0 = Release|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|arm64.ActiveCfg = Release|ARM64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|arm64.Build.0 = Release|ARM64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Build.0 = Release|Win32
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Deploy.0 = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.Build.0 = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.Build.0 = Debug|ARM64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Build.0 = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Deploy.0 = Debug|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.Build.0 = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|arm64.ActiveCfg = Release|ARM64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|arm64.Build.0 = Release|ARM64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Build.0 = Release|Win32
-		{CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Deploy.0 = Release|Win32
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.Build.0 = Debug|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|arm64.Build.0 = Debug|ARM64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.ActiveCfg = Debug|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Build.0 = Debug|Win32
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.Deploy.0 = Debug|Win32
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.ActiveCfg = Release|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|Any CPU.Build.0 = Release|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|arm64.Build.0 = Release|Any CPU
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.ActiveCfg = Release|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Deploy.0 = Release|Win32
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.Build.0 = Debug|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|arm64.Build.0 = Debug|ARM64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Deploy.0 = Debug|Win32
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.Build.0 = Release|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|arm64.Build.0 = Release|Any CPU
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32
-		{D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Deploy.0 = Release|Win32
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.Build.0 = Debug|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|arm64.Build.0 = Debug|ARM64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Deploy.0 = Debug|Win32
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.Build.0 = Release|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|arm64.Build.0 = Release|Any CPU
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32
-		{7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Deploy.0 = Release|Win32
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.Build.0 = Debug|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|arm64.Build.0 = Debug|ARM64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Build.0 = Debug|Win32
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.Deploy.0 = Debug|Win32
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.ActiveCfg = Release|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|Any CPU.Build.0 = Release|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|arm64.Build.0 = Release|Any CPU
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.ActiveCfg = Release|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32
-		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Deploy.0 = Release|Win32
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|x64.Build.0 = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Debug|x86.Build.0 = Debug|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|arm64.Build.0 = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|x64.ActiveCfg = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|x64.Build.0 = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|x86.ActiveCfg = Release|Any CPU
-		{7E268085-1046-4362-80CB-2977FF826DCA}.Release|x86.Build.0 = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|x64.Build.0 = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Debug|x86.Build.0 = Debug|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|arm64.Build.0 = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|x64.ActiveCfg = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|x64.Build.0 = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|x86.ActiveCfg = Release|Any CPU
-		{9788C76F-658B-4441-88F8-22C6B86FAD27}.Release|x86.Build.0 = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Debug|x86.Build.0 = Debug|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|arm64.Build.0 = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|x64.Build.0 = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{1970D5CD-D9A4-4673-A297-179BB04199F4}.Release|x86.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|x64.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Debug|x86.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|arm64.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x64.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x64.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x86.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x86.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|x64.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Debug|x86.Build.0 = Debug|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|arm64.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|x64.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|x64.Build.0 = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|x86.ActiveCfg = Release|Any CPU
-		{A40350FE-4334-4007-B1C3-6BEB1B070308}.Release|x86.Build.0 = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|x64.Build.0 = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Debug|x86.Build.0 = Debug|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|arm64.Build.0 = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|x64.ActiveCfg = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|x64.Build.0 = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|x86.ActiveCfg = Release|Any CPU
-		{F1792637-28B9-4F2A-B318-FA923C365049}.Release|x86.Build.0 = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|x64.Build.0 = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|x86.Build.0 = Debug|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|arm64.Build.0 = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|x64.ActiveCfg = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|x64.Build.0 = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|x86.ActiveCfg = Release|Any CPU
-		{B06040BC-DA28-4923-8CAC-20EB517D471B}.Release|x86.Build.0 = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|arm64.Build.0 = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|x64.Build.0 = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Debug|x86.Build.0 = Debug|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|arm64.ActiveCfg = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|arm64.Build.0 = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|x64.ActiveCfg = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|x64.Build.0 = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|x86.ActiveCfg = Release|Any CPU
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75}.Release|x86.Build.0 = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|x64.Build.0 = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Debug|x86.Build.0 = Debug|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|arm64.Build.0 = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|x64.ActiveCfg = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|x64.Build.0 = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|x86.ActiveCfg = Release|Any CPU
-		{7509AA1E-3093-4BEE-984F-E11579E98A11}.Release|x86.Build.0 = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|x64.Build.0 = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Debug|x86.Build.0 = Debug|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|arm64.Build.0 = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|x64.ActiveCfg = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|x64.Build.0 = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E}.Release|x86.Build.0 = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|arm64.Build.0 = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|x64.Build.0 = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Debug|x86.Build.0 = Debug|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|Any CPU.Build.0 = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|arm64.ActiveCfg = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|arm64.Build.0 = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|x64.ActiveCfg = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|x64.Build.0 = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|x86.ActiveCfg = Release|Any CPU
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034}.Release|x86.Build.0 = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|x64.Build.0 = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Debug|x86.Build.0 = Debug|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|arm64.Build.0 = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|x64.ActiveCfg = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|x64.Build.0 = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|x86.ActiveCfg = Release|Any CPU
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033}.Release|x86.Build.0 = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|x64.Build.0 = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Debug|x86.Build.0 = Debug|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|arm64.Build.0 = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|x64.ActiveCfg = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|x64.Build.0 = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|x86.ActiveCfg = Release|Any CPU
-		{37329855-01B8-4B03-9765-1A941B06E43C}.Release|x86.Build.0 = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|x64.Build.0 = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Debug|x86.Build.0 = Debug|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|arm64.Build.0 = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|x64.ActiveCfg = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|x64.Build.0 = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|x86.ActiveCfg = Release|Any CPU
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB}.Release|x86.Build.0 = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|x64.Build.0 = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Debug|x86.Build.0 = Debug|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|arm64.Build.0 = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|x64.ActiveCfg = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|x64.Build.0 = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|x86.ActiveCfg = Release|Any CPU
-		{B06ADD57-E855-4D8C-85DC-B323509AE540}.Release|x86.Build.0 = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Debug|x86.Build.0 = Debug|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|arm64.Build.0 = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|x64.Build.0 = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1}.Release|x86.Build.0 = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|x64.Build.0 = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Debug|x86.Build.0 = Debug|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|arm64.Build.0 = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|x64.ActiveCfg = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|x64.Build.0 = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|x86.ActiveCfg = Release|Any CPU
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0}.Release|x86.Build.0 = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|arm64.Build.0 = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|x64.Build.0 = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Debug|x86.Build.0 = Debug|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|arm64.ActiveCfg = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|arm64.Build.0 = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|x64.ActiveCfg = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|x64.Build.0 = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|x86.ActiveCfg = Release|Any CPU
-		{04CFE286-6D32-41EF-8887-4B5F8086A365}.Release|x86.Build.0 = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|x64.Build.0 = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Debug|x86.Build.0 = Debug|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|arm64.Build.0 = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|x64.Build.0 = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4}.Release|x86.Build.0 = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|x64.Build.0 = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Debug|x86.Build.0 = Debug|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|arm64.Build.0 = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|x64.ActiveCfg = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|x64.Build.0 = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|x86.ActiveCfg = Release|Any CPU
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B}.Release|x86.Build.0 = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|x64.Build.0 = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Debug|x86.Build.0 = Debug|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|arm64.Build.0 = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|x64.ActiveCfg = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|x64.Build.0 = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|x86.ActiveCfg = Release|Any CPU
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8}.Release|x86.Build.0 = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|arm64.Build.0 = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|x64.Build.0 = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Debug|x86.Build.0 = Debug|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|arm64.ActiveCfg = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|arm64.Build.0 = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|x64.ActiveCfg = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|x64.Build.0 = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|x86.ActiveCfg = Release|Any CPU
-		{16B899B4-A4F4-4EF7-93BB-355861977A12}.Release|x86.Build.0 = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|arm64.Build.0 = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|x64.Build.0 = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC}.Release|x86.Build.0 = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|x64.Build.0 = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Debug|x86.Build.0 = Debug|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|arm64.Build.0 = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|x64.ActiveCfg = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|x64.Build.0 = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|x86.ActiveCfg = Release|Any CPU
-		{43E3B132-2486-44A3-92C6-39E39724FAFD}.Release|x86.Build.0 = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|x64.Build.0 = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Debug|x86.Build.0 = Debug|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|arm64.Build.0 = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|x64.ActiveCfg = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|x64.Build.0 = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|x86.ActiveCfg = Release|Any CPU
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C}.Release|x86.Build.0 = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|x64.Build.0 = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Debug|x86.Build.0 = Debug|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|arm64.Build.0 = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|x64.ActiveCfg = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|x64.Build.0 = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|x86.ActiveCfg = Release|Any CPU
-		{0EBEE047-CBAD-4A69-8095-E3961B863446}.Release|x86.Build.0 = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|x64.Build.0 = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Debug|x86.Build.0 = Debug|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|arm64.Build.0 = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|x64.ActiveCfg = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|x64.Build.0 = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|x86.ActiveCfg = Release|Any CPU
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB}.Release|x86.Build.0 = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|x64.Build.0 = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Debug|x86.Build.0 = Debug|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|arm64.Build.0 = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|x64.ActiveCfg = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|x64.Build.0 = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|x86.ActiveCfg = Release|Any CPU
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E}.Release|x86.Build.0 = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|x64.Build.0 = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Debug|x86.Build.0 = Debug|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|arm64.Build.0 = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|x64.ActiveCfg = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|x64.Build.0 = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC5DE087-5C93-4441-9D62-1743A50E5086}.Release|x86.Build.0 = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|x64.Build.0 = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Debug|x86.Build.0 = Debug|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|arm64.Build.0 = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|x64.ActiveCfg = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|x64.Build.0 = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|x86.ActiveCfg = Release|Any CPU
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46}.Release|x86.Build.0 = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|x64.Build.0 = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Debug|x86.Build.0 = Debug|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|arm64.Build.0 = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|x64.ActiveCfg = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|x64.Build.0 = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|x86.ActiveCfg = Release|Any CPU
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530}.Release|x86.Build.0 = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|x64.Build.0 = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Debug|x86.Build.0 = Debug|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|arm64.Build.0 = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|x64.ActiveCfg = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|x64.Build.0 = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|x86.ActiveCfg = Release|Any CPU
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A}.Release|x86.Build.0 = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|arm64.Build.0 = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|x64.Build.0 = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}.Release|x86.Build.0 = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Debug|x86.Build.0 = Debug|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|arm64.Build.0 = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|x64.Build.0 = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8}.Release|x86.Build.0 = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|x64.Build.0 = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Debug|x86.Build.0 = Debug|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|arm64.Build.0 = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|x64.ActiveCfg = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|x64.Build.0 = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|x86.ActiveCfg = Release|Any CPU
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}.Release|x86.Build.0 = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|arm64.Build.0 = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|x64.Build.0 = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Debug|x86.Build.0 = Debug|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|arm64.ActiveCfg = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|arm64.Build.0 = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x64.ActiveCfg = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x64.Build.0 = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x86.ActiveCfg = Release|Any CPU
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x86.Build.0 = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x64.Build.0 = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x86.Build.0 = Debug|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|arm64.Build.0 = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x64.ActiveCfg = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x64.Build.0 = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x86.ActiveCfg = Release|Any CPU
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x86.Build.0 = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x64.Build.0 = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x86.Build.0 = Debug|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|arm64.Build.0 = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x64.ActiveCfg = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x64.Build.0 = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x86.ActiveCfg = Release|Any CPU
-		{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x86.Build.0 = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x64.Build.0 = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x86.Build.0 = Debug|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|arm64.Build.0 = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x64.ActiveCfg = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x64.Build.0 = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x86.ActiveCfg = Release|Any CPU
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x86.Build.0 = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x64.Build.0 = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x86.Build.0 = Debug|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|arm64.Build.0 = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x64.ActiveCfg = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x64.Build.0 = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x86.ActiveCfg = Release|Any CPU
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x86.Build.0 = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x64.Build.0 = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x86.Build.0 = Debug|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|arm64.Build.0 = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x64.ActiveCfg = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x64.Build.0 = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x86.ActiveCfg = Release|Any CPU
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x86.Build.0 = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|arm64.Build.0 = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x64.Build.0 = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x86.Build.0 = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|x64.Build.0 = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Debug|x86.Build.0 = Debug|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|arm64.Build.0 = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|x64.ActiveCfg = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|x64.Build.0 = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|x86.ActiveCfg = Release|Any CPU
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD}.Release|x86.Build.0 = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|arm64.Build.0 = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|x64.Build.0 = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A}.Release|x86.Build.0 = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|x64.Build.0 = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Debug|x86.Build.0 = Debug|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|arm64.Build.0 = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|x64.ActiveCfg = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|x64.Build.0 = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|x86.ActiveCfg = Release|Any CPU
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85}.Release|x86.Build.0 = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Debug|x86.Build.0 = Debug|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|arm64.Build.0 = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|x64.Build.0 = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F295396-DBBD-40A5-A645-10004D1324DA}.Release|x86.Build.0 = Release|Any CPU
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|Any CPU.Build.0 = Debug|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|arm64.ActiveCfg = Debug|x86
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|x64.ActiveCfg = Debug|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|x64.Build.0 = Debug|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|x86.ActiveCfg = Debug|x86
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Debug|x86.Build.0 = Debug|x86
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|Any CPU.ActiveCfg = Release|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|Any CPU.Build.0 = Release|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|arm64.ActiveCfg = Release|x86
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|x64.ActiveCfg = Release|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|x64.Build.0 = Release|x64
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|x86.ActiveCfg = Release|x86
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56}.Release|x86.Build.0 = Release|x86
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|x64.Build.0 = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Debug|x86.Build.0 = Debug|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|arm64.Build.0 = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|x64.ActiveCfg = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|x64.Build.0 = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|x86.ActiveCfg = Release|Any CPU
-		{B739074E-6652-4F5B-B37E-775DC2245FEC}.Release|x86.Build.0 = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|x64.Build.0 = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Debug|x86.Build.0 = Debug|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|arm64.Build.0 = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|x64.ActiveCfg = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|x64.Build.0 = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|x86.ActiveCfg = Release|Any CPU
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E}.Release|x86.Build.0 = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|x64.Build.0 = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Debug|x86.Build.0 = Debug|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|arm64.Build.0 = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|x64.ActiveCfg = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|x64.Build.0 = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|x86.ActiveCfg = Release|Any CPU
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC}.Release|x86.Build.0 = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|arm64.Build.0 = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|x64.Build.0 = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC}.Release|x86.Build.0 = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|x64.Build.0 = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Debug|x86.Build.0 = Debug|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|arm64.Build.0 = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|x64.ActiveCfg = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|x64.Build.0 = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|x86.ActiveCfg = Release|Any CPU
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F}.Release|x86.Build.0 = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x64.Build.0 = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|arm64.Build.0 = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x64.ActiveCfg = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x64.Build.0 = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x86.Build.0 = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|arm64.Build.0 = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x64.Build.0 = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x86.Build.0 = Debug|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|arm64.ActiveCfg = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|arm64.Build.0 = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x64.ActiveCfg = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x64.Build.0 = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x86.ActiveCfg = Release|Any CPU
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x86.Build.0 = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|x64.Build.0 = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Debug|x86.Build.0 = Debug|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|arm64.Build.0 = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|x64.ActiveCfg = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|x64.Build.0 = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|x86.ActiveCfg = Release|Any CPU
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E}.Release|x86.Build.0 = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|x64.Build.0 = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Debug|x86.Build.0 = Debug|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|arm64.Build.0 = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|x64.ActiveCfg = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|x64.Build.0 = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|x86.ActiveCfg = Release|Any CPU
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C}.Release|x86.Build.0 = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|x64.Build.0 = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Debug|x86.Build.0 = Debug|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|arm64.Build.0 = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|x64.Build.0 = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD}.Release|x86.Build.0 = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|x64.Build.0 = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Debug|x86.Build.0 = Debug|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|arm64.Build.0 = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x64.ActiveCfg = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x64.Build.0 = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x86.ActiveCfg = Release|Any CPU
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38}.Release|x86.Build.0 = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|arm64.Build.0 = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|x64.Build.0 = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6}.Release|x86.Build.0 = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|x64.Build.0 = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Debug|x86.Build.0 = Debug|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|arm64.Build.0 = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|x64.ActiveCfg = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|x64.Build.0 = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|x86.ActiveCfg = Release|Any CPU
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C}.Release|x86.Build.0 = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|x64.Build.0 = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Debug|x86.Build.0 = Debug|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|arm64.Build.0 = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|x64.ActiveCfg = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|x64.Build.0 = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|x86.ActiveCfg = Release|Any CPU
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B}.Release|x86.Build.0 = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|arm64.Build.0 = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|x64.Build.0 = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Debug|x86.Build.0 = Debug|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|Any CPU.Build.0 = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|arm64.ActiveCfg = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|arm64.Build.0 = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x64.ActiveCfg = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x64.Build.0 = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x86.ActiveCfg = Release|Any CPU
-		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x86.Build.0 = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x64.Build.0 = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x86.Build.0 = Debug|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|arm64.Build.0 = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.ActiveCfg = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.Build.0 = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.ActiveCfg = Release|Any CPU
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.Build.0 = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x64.Build.0 = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x86.Build.0 = Debug|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|arm64.Build.0 = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x64.ActiveCfg = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x64.Build.0 = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x86.ActiveCfg = Release|Any CPU
-		{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x86.Build.0 = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x64.Build.0 = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x86.Build.0 = Debug|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|arm64.Build.0 = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x64.Build.0 = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x86.Build.0 = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|x64.Build.0 = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Debug|x86.Build.0 = Debug|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|arm64.Build.0 = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|x64.ActiveCfg = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|x64.Build.0 = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|x86.ActiveCfg = Release|Any CPU
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E}.Release|x86.Build.0 = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|x64.Build.0 = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Debug|x86.Build.0 = Debug|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|arm64.Build.0 = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|x64.ActiveCfg = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|x64.Build.0 = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|x86.ActiveCfg = Release|Any CPU
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5}.Release|x86.Build.0 = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|x64.Build.0 = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Debug|x86.Build.0 = Debug|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|arm64.Build.0 = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|x64.Build.0 = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|x86.ActiveCfg = Release|Any CPU
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0}.Release|x86.Build.0 = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|arm64.Build.0 = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|x64.Build.0 = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Debug|x86.Build.0 = Debug|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|Any CPU.Build.0 = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|arm64.ActiveCfg = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|arm64.Build.0 = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|x64.ActiveCfg = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|x64.Build.0 = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|x86.ActiveCfg = Release|Any CPU
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977}.Release|x86.Build.0 = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|x64.Build.0 = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Debug|x86.Build.0 = Debug|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|arm64.Build.0 = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x64.ActiveCfg = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x64.Build.0 = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x86.ActiveCfg = Release|Any CPU
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x86.Build.0 = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x64.Build.0 = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x86.Build.0 = Debug|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|arm64.Build.0 = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x64.ActiveCfg = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x64.Build.0 = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x86.ActiveCfg = Release|Any CPU
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x86.Build.0 = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|arm64.Build.0 = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|x64.Build.0 = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Debug|x86.Build.0 = Debug|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|arm64.ActiveCfg = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|arm64.Build.0 = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|x64.ActiveCfg = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|x64.Build.0 = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|x86.ActiveCfg = Release|Any CPU
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8}.Release|x86.Build.0 = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|x64.Build.0 = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Debug|x86.Build.0 = Debug|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|arm64.Build.0 = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|x64.ActiveCfg = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|x64.Build.0 = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|x86.ActiveCfg = Release|Any CPU
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9}.Release|x86.Build.0 = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|arm64.Build.0 = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|x64.Build.0 = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Debug|x86.Build.0 = Debug|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|arm64.ActiveCfg = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|arm64.Build.0 = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|x64.ActiveCfg = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|x64.Build.0 = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|x86.ActiveCfg = Release|Any CPU
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85}.Release|x86.Build.0 = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|x64.Build.0 = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Debug|x86.Build.0 = Debug|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|x64.ActiveCfg = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|x64.Build.0 = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|x86.ActiveCfg = Release|Any CPU
-		{E090F82D-8345-477E-92E8-F724F08ADC56}.Release|x86.Build.0 = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x64.Build.0 = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x86.Build.0 = Debug|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|arm64.Build.0 = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x64.ActiveCfg = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x64.Build.0 = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x86.ActiveCfg = Release|Any CPU
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x86.Build.0 = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|x64.Build.0 = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Debug|x86.Build.0 = Debug|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|arm64.Build.0 = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|x64.ActiveCfg = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|x64.Build.0 = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|x86.ActiveCfg = Release|Any CPU
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9}.Release|x86.Build.0 = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|arm64.Build.0 = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|x64.Build.0 = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Debug|x86.Build.0 = Debug|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|arm64.ActiveCfg = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|arm64.Build.0 = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|x64.ActiveCfg = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|x64.Build.0 = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|x86.ActiveCfg = Release|Any CPU
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49}.Release|x86.Build.0 = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|x64.Build.0 = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Debug|x86.Build.0 = Debug|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|arm64.Build.0 = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|x64.ActiveCfg = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|x64.Build.0 = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|x86.ActiveCfg = Release|Any CPU
-		{6D365C86-3158-49F5-A21D-506C1E06E870}.Release|x86.Build.0 = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|x64.Build.0 = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Debug|x86.Build.0 = Debug|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|x64.ActiveCfg = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|x64.Build.0 = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|x86.ActiveCfg = Release|Any CPU
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00}.Release|x86.Build.0 = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|x64.Build.0 = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC}.Release|x86.Build.0 = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|x64.Build.0 = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{40F493E2-FE59-4787-BE44-3AED39D585BF}.Release|x86.Build.0 = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|x64.Build.0 = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Debug|x86.Build.0 = Debug|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|arm64.Build.0 = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|x64.ActiveCfg = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|x64.Build.0 = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|x86.ActiveCfg = Release|Any CPU
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC}.Release|x86.Build.0 = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|arm64.Build.0 = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|x64.Build.0 = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Debug|x86.Build.0 = Debug|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|arm64.ActiveCfg = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|arm64.Build.0 = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|x64.ActiveCfg = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|x64.Build.0 = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|x86.ActiveCfg = Release|Any CPU
-		{71A54D7F-245F-43C2-B429-342D80AC6F23}.Release|x86.Build.0 = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|arm64.Build.0 = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|x64.Build.0 = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Debug|x86.Build.0 = Debug|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|arm64.ActiveCfg = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|arm64.Build.0 = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|x64.ActiveCfg = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|x64.Build.0 = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|x86.ActiveCfg = Release|Any CPU
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950}.Release|x86.Build.0 = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|x64.Build.0 = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Debug|x86.Build.0 = Debug|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|arm64.Build.0 = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|x64.ActiveCfg = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|x64.Build.0 = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|x86.ActiveCfg = Release|Any CPU
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC}.Release|x86.Build.0 = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|x64.Build.0 = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|arm64.Build.0 = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|x64.ActiveCfg = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|x64.Build.0 = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F}.Release|x86.Build.0 = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|arm64.Build.0 = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|x64.Build.0 = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Debug|x86.Build.0 = Debug|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|arm64.ActiveCfg = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|arm64.Build.0 = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|x64.ActiveCfg = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|x64.Build.0 = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|x86.ActiveCfg = Release|Any CPU
-		{FD819B29-9EFE-4102-BD0A-375A63051458}.Release|x86.Build.0 = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|x64.Build.0 = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Debug|x86.Build.0 = Debug|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|arm64.Build.0 = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|x64.ActiveCfg = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|x64.Build.0 = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|x86.ActiveCfg = Release|Any CPU
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE}.Release|x86.Build.0 = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|x64.Build.0 = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Debug|x86.Build.0 = Debug|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|arm64.Build.0 = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|x64.ActiveCfg = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|x64.Build.0 = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|x86.ActiveCfg = Release|Any CPU
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2}.Release|x86.Build.0 = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|arm64.Build.0 = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|x64.Build.0 = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C397F73C-CADC-460E-9B27-71230B9C291E}.Release|x86.Build.0 = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|x64.Build.0 = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|arm64.Build.0 = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|x64.ActiveCfg = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|x64.Build.0 = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286}.Release|x86.Build.0 = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|x64.Build.0 = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Debug|x86.Build.0 = Debug|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|arm64.Build.0 = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x64.ActiveCfg = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x64.Build.0 = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x86.ActiveCfg = Release|Any CPU
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x86.Build.0 = Release|Any CPU
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|arm64.ActiveCfg = Debug|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x64.ActiveCfg = Debug|x64
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x64.Build.0 = Debug|x64
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x86.ActiveCfg = Debug|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x86.Build.0 = Debug|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x86.Deploy.0 = Debug|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|Any CPU.ActiveCfg = Release|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|arm64.ActiveCfg = Release|ARM64
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|arm64.Build.0 = Release|ARM64
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x64.ActiveCfg = Release|x64
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x64.Build.0 = Release|x64
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x86.ActiveCfg = Release|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x86.Build.0 = Release|Win32
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x86.Deploy.0 = Release|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|arm64.ActiveCfg = Debug|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x64.ActiveCfg = Debug|x64
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x64.Build.0 = Debug|x64
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.ActiveCfg = Debug|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.Build.0 = Debug|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.Deploy.0 = Debug|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|arm64.ActiveCfg = Release|ARM64
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|arm64.Build.0 = Release|ARM64
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x64.ActiveCfg = Release|x64
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x64.Build.0 = Release|x64
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x86.ActiveCfg = Release|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x86.Build.0 = Release|Win32
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x86.Deploy.0 = Release|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|arm64.ActiveCfg = Debug|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x64.ActiveCfg = Debug|x64
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x64.Build.0 = Debug|x64
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.ActiveCfg = Debug|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.Build.0 = Debug|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.Deploy.0 = Debug|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|arm64.ActiveCfg = Release|ARM64
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|arm64.Build.0 = Release|ARM64
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x64.ActiveCfg = Release|x64
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x64.Build.0 = Release|x64
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.ActiveCfg = Release|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Build.0 = Release|Win32
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Deploy.0 = Release|Win32
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|Any CPU.ActiveCfg = Debug|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|arm64.ActiveCfg = Debug|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|arm64.Build.0 = Debug|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x64.ActiveCfg = Debug|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x86.ActiveCfg = Debug|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|Any CPU.ActiveCfg = Release|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|arm64.ActiveCfg = Release|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|arm64.Build.0 = Release|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x64.ActiveCfg = Release|arm64
-		{C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.ActiveCfg = Release|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|Any CPU.ActiveCfg = Debug|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.ActiveCfg = Debug|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.Build.0 = Debug|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x64.ActiveCfg = Debug|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x86.ActiveCfg = Debug|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|Any CPU.ActiveCfg = Release|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.ActiveCfg = Release|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.Build.0 = Release|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x64.ActiveCfg = Release|arm64
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.ActiveCfg = Release|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|Any CPU.ActiveCfg = Debug|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|arm64.ActiveCfg = Debug|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|arm64.Build.0 = Debug|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x64.ActiveCfg = Debug|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x86.ActiveCfg = Debug|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|Any CPU.ActiveCfg = Release|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|arm64.ActiveCfg = Release|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|arm64.Build.0 = Release|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x64.ActiveCfg = Release|arm64
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x86.ActiveCfg = Release|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|Any CPU.ActiveCfg = Debug|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.ActiveCfg = Debug|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.Build.0 = Debug|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|x64.ActiveCfg = Debug|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|x86.ActiveCfg = Debug|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|Any CPU.ActiveCfg = Release|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|arm64.ActiveCfg = Release|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|arm64.Build.0 = Release|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|x64.ActiveCfg = Release|arm64
-		{6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|x86.ActiveCfg = Release|arm64
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Debug|arm64.ActiveCfg = Debug|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Debug|x64.ActiveCfg = Debug|x64
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Debug|x64.Build.0 = Debug|x64
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Debug|x86.ActiveCfg = Debug|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Debug|x86.Build.0 = Debug|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Release|Any CPU.ActiveCfg = Release|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Release|arm64.ActiveCfg = Release|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Release|x64.ActiveCfg = Release|x64
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Release|x64.Build.0 = Release|x64
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Release|x86.ActiveCfg = Release|x86
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}.Release|x86.Build.0 = Release|x86
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|x64.Build.0 = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Debug|x86.Build.0 = Debug|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|arm64.Build.0 = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|x64.ActiveCfg = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|x64.Build.0 = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|x86.ActiveCfg = Release|Any CPU
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D}.Release|x86.Build.0 = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|x64.Build.0 = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Debug|x86.Build.0 = Debug|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|arm64.Build.0 = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|x64.ActiveCfg = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|x64.Build.0 = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|x86.ActiveCfg = Release|Any CPU
-		{8EB0B983-8851-4565-B92F-366F1B126E61}.Release|x86.Build.0 = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|arm64.Build.0 = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|x64.Build.0 = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Debug|x86.Build.0 = Debug|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|arm64.ActiveCfg = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|arm64.Build.0 = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|x64.Build.0 = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE}.Release|x86.Build.0 = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|arm64.Build.0 = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|x64.Build.0 = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Debug|x86.Build.0 = Debug|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|arm64.ActiveCfg = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|arm64.Build.0 = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|x64.ActiveCfg = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|x64.Build.0 = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|x86.ActiveCfg = Release|Any CPU
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41}.Release|x86.Build.0 = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|x64.Build.0 = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Debug|x86.Build.0 = Debug|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|arm64.Build.0 = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|x64.ActiveCfg = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|x64.Build.0 = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF}.Release|x86.Build.0 = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|arm64.Build.0 = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|x64.Build.0 = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D}.Release|x86.Build.0 = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|x64.Build.0 = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Debug|x86.Build.0 = Debug|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|arm64.Build.0 = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|x64.ActiveCfg = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|x64.Build.0 = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|x86.ActiveCfg = Release|Any CPU
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800}.Release|x86.Build.0 = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|arm64.Build.0 = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|x64.Build.0 = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Debug|x86.Build.0 = Debug|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|arm64.ActiveCfg = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|arm64.Build.0 = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|x64.ActiveCfg = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|x64.Build.0 = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|x86.ActiveCfg = Release|Any CPU
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D}.Release|x86.Build.0 = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Debug|x86.Build.0 = Debug|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|arm64.Build.0 = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|x64.Build.0 = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{37144E52-611B-40E8-807C-2821F5A814CB}.Release|x86.Build.0 = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|arm64.Build.0 = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|x64.Build.0 = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Debug|x86.Build.0 = Debug|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|arm64.ActiveCfg = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|arm64.Build.0 = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|x64.ActiveCfg = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|x64.Build.0 = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|x86.ActiveCfg = Release|Any CPU
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5}.Release|x86.Build.0 = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|x64.Build.0 = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Debug|x86.Build.0 = Debug|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|arm64.Build.0 = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|x64.ActiveCfg = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|x64.Build.0 = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|x86.ActiveCfg = Release|Any CPU
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F}.Release|x86.Build.0 = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|x64.Build.0 = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Debug|x86.Build.0 = Debug|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|arm64.Build.0 = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|x64.ActiveCfg = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|x64.Build.0 = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E28881D-A188-47AF-800A-B5877AD8C288}.Release|x86.Build.0 = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|x64.Build.0 = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Debug|x86.Build.0 = Debug|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|arm64.Build.0 = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|x64.ActiveCfg = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|x64.Build.0 = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|x86.ActiveCfg = Release|Any CPU
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C}.Release|x86.Build.0 = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|arm64.Build.0 = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|x64.Build.0 = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Debug|x86.Build.0 = Debug|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|Any CPU.Build.0 = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|arm64.ActiveCfg = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|arm64.Build.0 = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|x64.ActiveCfg = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|x64.Build.0 = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|x86.ActiveCfg = Release|Any CPU
-		{109C702D-DACE-4F82-A490-15E5AFA94005}.Release|x86.Build.0 = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|arm64.Build.0 = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|x64.Build.0 = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Debug|x86.Build.0 = Debug|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|arm64.ActiveCfg = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|arm64.Build.0 = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|x64.ActiveCfg = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|x64.Build.0 = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|x86.ActiveCfg = Release|Any CPU
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11}.Release|x86.Build.0 = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|x64.Build.0 = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Debug|x86.Build.0 = Debug|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|arm64.Build.0 = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|x64.ActiveCfg = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|x64.Build.0 = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|x86.ActiveCfg = Release|Any CPU
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3}.Release|x86.Build.0 = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|x64.Build.0 = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Debug|x86.Build.0 = Debug|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|arm64.Build.0 = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|x64.ActiveCfg = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|x64.Build.0 = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|x86.ActiveCfg = Release|Any CPU
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98}.Release|x86.Build.0 = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|x64.Build.0 = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Debug|x86.Build.0 = Debug|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|arm64.Build.0 = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|x64.ActiveCfg = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|x64.Build.0 = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|x86.ActiveCfg = Release|Any CPU
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412}.Release|x86.Build.0 = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|x64.Build.0 = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Debug|x86.Build.0 = Debug|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|arm64.Build.0 = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|x64.ActiveCfg = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|x64.Build.0 = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|x86.ActiveCfg = Release|Any CPU
-		{EB14F068-AD55-4970-B9B4-1FBE33704243}.Release|x86.Build.0 = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|x64.Build.0 = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Debug|x86.Build.0 = Debug|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|arm64.Build.0 = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|x64.ActiveCfg = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|x64.Build.0 = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04}.Release|x86.Build.0 = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|x64.Build.0 = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Debug|x86.Build.0 = Debug|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|arm64.Build.0 = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|x64.ActiveCfg = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|x64.Build.0 = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|x86.ActiveCfg = Release|Any CPU
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85}.Release|x86.Build.0 = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|arm64.Build.0 = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|x64.Build.0 = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7}.Release|x86.Build.0 = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|x64.Build.0 = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Debug|x86.Build.0 = Debug|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|arm64.Build.0 = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|x64.ActiveCfg = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|x64.Build.0 = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|x86.ActiveCfg = Release|Any CPU
-		{9716D0D0-2251-44DD-8596-67D253EEF41C}.Release|x86.Build.0 = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|arm64.Build.0 = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|x64.Build.0 = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Debug|x86.Build.0 = Debug|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|arm64.ActiveCfg = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|arm64.Build.0 = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|x64.ActiveCfg = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|x64.Build.0 = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|x86.ActiveCfg = Release|Any CPU
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40}.Release|x86.Build.0 = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|x64.Build.0 = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Debug|x86.Build.0 = Debug|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|arm64.Build.0 = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|x64.ActiveCfg = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|x64.Build.0 = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|x86.ActiveCfg = Release|Any CPU
-		{8EE73488-2B92-42BD-96C9-0DD65405C828}.Release|x86.Build.0 = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|arm64.Build.0 = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|x64.Build.0 = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Debug|x86.Build.0 = Debug|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|arm64.ActiveCfg = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|arm64.Build.0 = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x64.ActiveCfg = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x64.Build.0 = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x86.ActiveCfg = Release|Any CPU
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x86.Build.0 = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|arm64.Build.0 = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x64.Build.0 = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x86.Build.0 = Debug|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|arm64.ActiveCfg = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|arm64.Build.0 = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x64.ActiveCfg = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x64.Build.0 = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x86.ActiveCfg = Release|Any CPU
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x86.Build.0 = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|arm64.Build.0 = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x64.Build.0 = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x86.Build.0 = Debug|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|Any CPU.Build.0 = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|arm64.ActiveCfg = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|arm64.Build.0 = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x64.ActiveCfg = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x64.Build.0 = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x86.ActiveCfg = Release|Any CPU
-		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x86.Build.0 = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|x64.Build.0 = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Debug|x86.Build.0 = Debug|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|arm64.Build.0 = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|x64.ActiveCfg = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|x64.Build.0 = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|x86.ActiveCfg = Release|Any CPU
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0}.Release|x86.Build.0 = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|x64.Build.0 = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Debug|x86.Build.0 = Debug|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|arm64.Build.0 = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|x64.ActiveCfg = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|x64.Build.0 = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|x86.ActiveCfg = Release|Any CPU
-		{B34CB502-0286-4939-B25F-45998528A802}.Release|x86.Build.0 = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Debug|x86.Build.0 = Debug|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|arm64.Build.0 = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|x64.Build.0 = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160}.Release|x86.Build.0 = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|arm64.Build.0 = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|x64.Build.0 = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Debug|x86.Build.0 = Debug|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|arm64.ActiveCfg = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|arm64.Build.0 = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|x64.ActiveCfg = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|x64.Build.0 = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|x86.ActiveCfg = Release|Any CPU
-		{89896261-C5DD-4901-BCA7-7A5F718BC008}.Release|x86.Build.0 = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|x64.Build.0 = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|arm64.Build.0 = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x64.Build.0 = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x86.Build.0 = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|arm64.Build.0 = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|x64.Build.0 = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|x86.Build.0 = Debug|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|arm64.ActiveCfg = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|arm64.Build.0 = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|x64.ActiveCfg = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|x64.Build.0 = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|x86.ActiveCfg = Release|Any CPU
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Release|x86.Build.0 = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|x64.Build.0 = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Debug|x86.Build.0 = Debug|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|arm64.Build.0 = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|x64.ActiveCfg = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|x64.Build.0 = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|x86.ActiveCfg = Release|Any CPU
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9}.Release|x86.Build.0 = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|x64.Build.0 = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Debug|x86.Build.0 = Debug|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|arm64.Build.0 = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|x64.ActiveCfg = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|x64.Build.0 = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|x86.ActiveCfg = Release|Any CPU
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9}.Release|x86.Build.0 = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|x64.Build.0 = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Debug|x86.Build.0 = Debug|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|arm64.Build.0 = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|x64.ActiveCfg = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|x64.Build.0 = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|x86.ActiveCfg = Release|Any CPU
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853}.Release|x86.Build.0 = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Debug|x86.Build.0 = Debug|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|arm64.Build.0 = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|x64.Build.0 = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF}.Release|x86.Build.0 = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|arm64.Build.0 = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|x64.Build.0 = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Debug|x86.Build.0 = Debug|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|arm64.ActiveCfg = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|arm64.Build.0 = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|x64.ActiveCfg = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|x64.Build.0 = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|x86.ActiveCfg = Release|Any CPU
-		{BA649043-EF2B-42DC-B422-A46127BE8296}.Release|x86.Build.0 = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|x64.Build.0 = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Debug|x86.Build.0 = Debug|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|arm64.Build.0 = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|x64.ActiveCfg = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|x64.Build.0 = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|x86.ActiveCfg = Release|Any CPU
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08}.Release|x86.Build.0 = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Debug|x86.Build.0 = Debug|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|arm64.Build.0 = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|x64.Build.0 = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF}.Release|x86.Build.0 = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Debug|x86.Build.0 = Debug|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|arm64.Build.0 = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|x64.Build.0 = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB}.Release|x86.Build.0 = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|arm64.Build.0 = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Debug|x86.Build.0 = Debug|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|arm64.ActiveCfg = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|arm64.Build.0 = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|x64.Build.0 = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1}.Release|x86.Build.0 = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|arm64.Build.0 = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|x64.Build.0 = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Debug|x86.Build.0 = Debug|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|arm64.ActiveCfg = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|arm64.Build.0 = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|x64.ActiveCfg = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|x64.Build.0 = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|x86.ActiveCfg = Release|Any CPU
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21}.Release|x86.Build.0 = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|x64.Build.0 = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Debug|x86.Build.0 = Debug|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|arm64.Build.0 = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|x64.ActiveCfg = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|x64.Build.0 = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|x86.ActiveCfg = Release|Any CPU
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A}.Release|x86.Build.0 = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|arm64.Build.0 = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|x64.Build.0 = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Debug|x86.Build.0 = Debug|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|arm64.ActiveCfg = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|arm64.Build.0 = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|x64.ActiveCfg = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|x64.Build.0 = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2}.Release|x86.Build.0 = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|arm64.Build.0 = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|x64.ActiveCfg = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|x64.Build.0 = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931}.Release|x86.Build.0 = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|x64.Build.0 = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Debug|x86.Build.0 = Debug|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|arm64.Build.0 = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|x64.ActiveCfg = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|x64.Build.0 = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|x86.ActiveCfg = Release|Any CPU
-		{A05652B3-953E-4915-9D7F-0E361D988815}.Release|x86.Build.0 = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|arm64.Build.0 = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|x64.Build.0 = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Debug|x86.Build.0 = Debug|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|arm64.ActiveCfg = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|arm64.Build.0 = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|x64.ActiveCfg = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|x64.Build.0 = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|x86.ActiveCfg = Release|Any CPU
-		{AE4D272D-6F13-42C8-9404-C149188AFA33}.Release|x86.Build.0 = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|x64.Build.0 = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Debug|x86.Build.0 = Debug|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|arm64.Build.0 = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|x64.ActiveCfg = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|x64.Build.0 = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|x86.ActiveCfg = Release|Any CPU
-		{5D438258-CB19-4282-814F-974ABBC71411}.Release|x86.Build.0 = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|x64.Build.0 = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|arm64.Build.0 = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|x64.ActiveCfg = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|x64.Build.0 = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E}.Release|x86.Build.0 = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|x64.Build.0 = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Debug|x86.Build.0 = Debug|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|arm64.Build.0 = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|x64.ActiveCfg = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|x64.Build.0 = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|x86.ActiveCfg = Release|Any CPU
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E}.Release|x86.Build.0 = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|x64.Build.0 = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Debug|x86.Build.0 = Debug|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|arm64.Build.0 = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x64.ActiveCfg = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x64.Build.0 = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x86.ActiveCfg = Release|Any CPU
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x86.Build.0 = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|arm64.Build.0 = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x64.Build.0 = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x86.Build.0 = Debug|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|arm64.ActiveCfg = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|arm64.Build.0 = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x64.ActiveCfg = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x64.Build.0 = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x86.ActiveCfg = Release|Any CPU
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x86.Build.0 = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|x64.Build.0 = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|arm64.Build.0 = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|x64.ActiveCfg = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|x64.Build.0 = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|x86.ActiveCfg = Release|Any CPU
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A}.Release|x86.Build.0 = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|x64.Build.0 = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Debug|x86.Build.0 = Debug|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|arm64.Build.0 = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|x64.ActiveCfg = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|x64.Build.0 = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|x86.ActiveCfg = Release|Any CPU
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7}.Release|x86.Build.0 = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|arm64.Build.0 = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|x64.Build.0 = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Debug|x86.Build.0 = Debug|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|arm64.ActiveCfg = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|arm64.Build.0 = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|x64.ActiveCfg = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|x64.Build.0 = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|x86.ActiveCfg = Release|Any CPU
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6}.Release|x86.Build.0 = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|x64.Build.0 = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Debug|x86.Build.0 = Debug|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|arm64.Build.0 = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|x64.ActiveCfg = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|x64.Build.0 = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|x86.ActiveCfg = Release|Any CPU
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C}.Release|x86.Build.0 = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|arm64.Build.0 = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|x64.Build.0 = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B}.Release|x86.Build.0 = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|arm64.Build.0 = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|x64.Build.0 = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Debug|x86.Build.0 = Debug|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|arm64.ActiveCfg = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|arm64.Build.0 = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x64.ActiveCfg = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x64.Build.0 = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.ActiveCfg = Release|Any CPU
-		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.Build.0 = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x64.Build.0 = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x86.Build.0 = Debug|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|arm64.Build.0 = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x64.ActiveCfg = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x64.Build.0 = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x86.Build.0 = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x64.Build.0 = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x86.Build.0 = Debug|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|arm64.Build.0 = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x64.ActiveCfg = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x64.Build.0 = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x86.ActiveCfg = Release|Any CPU
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x86.Build.0 = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|x64.Build.0 = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Debug|x86.Build.0 = Debug|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|arm64.Build.0 = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|x64.ActiveCfg = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|x64.Build.0 = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|x86.ActiveCfg = Release|Any CPU
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C}.Release|x86.Build.0 = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|arm64.Build.0 = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|x64.Build.0 = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13}.Release|x86.Build.0 = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|x64.Build.0 = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Debug|x86.Build.0 = Debug|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|arm64.Build.0 = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x64.ActiveCfg = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x64.Build.0 = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x86.ActiveCfg = Release|Any CPU
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x86.Build.0 = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|arm64.Build.0 = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|x64.Build.0 = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|x86.Build.0 = Debug|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|arm64.ActiveCfg = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|arm64.Build.0 = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|x64.Build.0 = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|x86.ActiveCfg = Release|Any CPU
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Release|x86.Build.0 = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|x64.Build.0 = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Debug|x86.Build.0 = Debug|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|arm64.Build.0 = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|x64.ActiveCfg = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|x64.Build.0 = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|x86.ActiveCfg = Release|Any CPU
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734}.Release|x86.Build.0 = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|arm64.Build.0 = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Debug|x86.Build.0 = Debug|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|arm64.Build.0 = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x64.Build.0 = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4}.Release|x86.Build.0 = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|arm64.Build.0 = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x64.Build.0 = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Debug|x86.Build.0 = Debug|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|arm64.ActiveCfg = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|arm64.Build.0 = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x64.ActiveCfg = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x64.Build.0 = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x86.ActiveCfg = Release|Any CPU
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573}.Release|x86.Build.0 = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|arm64.Build.0 = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x64.Build.0 = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Debug|x86.Build.0 = Debug|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|arm64.ActiveCfg = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|arm64.Build.0 = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x64.ActiveCfg = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x64.Build.0 = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x86.ActiveCfg = Release|Any CPU
-		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x86.Build.0 = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|arm64.Build.0 = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x64.Build.0 = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x86.Build.0 = Debug|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|arm64.ActiveCfg = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|arm64.Build.0 = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x64.ActiveCfg = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x64.Build.0 = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x86.ActiveCfg = Release|Any CPU
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x86.Build.0 = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|arm64.Build.0 = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x64.Build.0 = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x86.Build.0 = Debug|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|arm64.ActiveCfg = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|arm64.Build.0 = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x64.ActiveCfg = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x64.Build.0 = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x86.ActiveCfg = Release|Any CPU
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x86.Build.0 = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|arm64.Build.0 = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x64.Build.0 = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x86.Build.0 = Debug|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|arm64.ActiveCfg = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|arm64.Build.0 = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x64.ActiveCfg = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x64.Build.0 = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x86.ActiveCfg = Release|Any CPU
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x86.Build.0 = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|x64.Build.0 = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Debug|x86.Build.0 = Debug|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|arm64.Build.0 = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x64.ActiveCfg = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x64.Build.0 = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x86.ActiveCfg = Release|Any CPU
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0F84F170-57D0-496B-8E2C-7984178EF69F} = {C28A32F6-8314-412E-9F3B-CBD31C23E878}
-		{03C2290A-1C48-489A-81DB-F3447B0DA595} = {0F84F170-57D0-496B-8E2C-7984178EF69F}
-		{2B94628A-CFFB-447E-8026-A126C33B0917} = {0F84F170-57D0-496B-8E2C-7984178EF69F}
-		{1A0EFF9F-E699-4303-AE50-BFAF9804EEB6} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{819B136D-B8B6-46AE-8C4F-5469BBBFC46B} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{D4FBDF11-7A65-4205-8AF6-ABC190EFCF50} = {819B136D-B8B6-46AE-8C4F-5469BBBFC46B}
-		{5BC5A805-DCA0-41DF-91B8-520B5DAD57DA} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{2C022280-340C-43DC-B63D-5A644F0ECBF2} = {5BC5A805-DCA0-41DF-91B8-520B5DAD57DA}
-		{B6081DA9-738E-4088-92DD-7FFA200523C9} = {2C022280-340C-43DC-B63D-5A644F0ECBF2}
-		{BE70E100-E6C4-4686-8592-73E2A04E877F} = {B6081DA9-738E-4088-92DD-7FFA200523C9}
-		{60D51C98-2CC0-40DF-B338-44154EFEE2FF} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{6DE916F5-E78F-446C-89CB-9240AED2A2E2} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{7546E2DD-2CF4-4240-8045-2533DF539458} = {6DE916F5-E78F-446C-89CB-9240AED2A2E2}
-		{B55A5DE1-5AF3-4B18-AF04-C1735B071DA6} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{210B7FF8-ADD2-4E11-831A-41B28F423E44} = {B55A5DE1-5AF3-4B18-AF04-C1735B071DA6}
-		{627BE8B3-59E6-4F1D-8C9C-76B804D41724} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{AB0ED518-C27C-42D9-8D66-5F974033F855} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{18E65289-27FC-4EC6-BFE8-9FA852381319} = {AB0ED518-C27C-42D9-8D66-5F974033F855}
-		{5CF8E05A-C8DD-4551-8542-844A217B39F2} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{74CF6CCE-B922-4FEF-87AA-38C85D42A4A2} = {5CF8E05A-C8DD-4551-8542-844A217B39F2}
-		{A39335E5-7A26-4CFD-BF3B-2CFE75113498} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{EB593520-0853-4642-A404-675FC318D181} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
-		{EA034D9C-3281-426B-A363-FF1C05D12483} = {EB593520-0853-4642-A404-675FC318D181}
-		{C2751270-6970-4CC8-8D8C-81A4B8D26446} = {EA034D9C-3281-426B-A363-FF1C05D12483}
-		{C63C5E92-1511-45A5-A160-0FCC9B3E3CDB} = {EB593520-0853-4642-A404-675FC318D181}
-		{E2083951-98E7-4C1C-AB3A-935EA6311018} = {C63C5E92-1511-45A5-A160-0FCC9B3E3CDB}
-		{B59D558B-AC58-4BA4-B5AF-AE51C8531B28} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{A345753F-B4FA-43E4-8275-151FA5B70728} = {B59D558B-AC58-4BA4-B5AF-AE51C8531B28}
-		{08B240FC-AE5D-478A-963D-890ADE70B0B5} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{34A797ED-AC07-476D-BEB1-E86DBBF2395A} = {08B240FC-AE5D-478A-963D-890ADE70B0B5}
-		{0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{78DD1AC3-0981-4109-861B-C3E2F1FC3281} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
-		{D5D2C620-42B7-4ECF-A892-295BB124A833} = {78DD1AC3-0981-4109-861B-C3E2F1FC3281}
-		{E5963C9F-20A6-4385-B364-814D2581FADF} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{27223011-E8E9-4178-9377-44A7B3CBCC21} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{8CDA0BDC-05C2-451F-9990-2BEF471684BF} = {27223011-E8E9-4178-9377-44A7B3CBCC21}
-		{380430A1-C02F-4943-8A52-FDFA9F7735F0} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{5B27FAB7-E5FE-4FF2-8F39-900E177D5E39} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{392701C6-0BDB-4505-ADB8-1475770A2421} = {5B27FAB7-E5FE-4FF2-8F39-900E177D5E39}
-		{682157DB-17F2-40D6-B0ED-11B6C6CB064B} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{DAF8C29D-5FAE-414F-8630-43CA8ECDCCD1} = {682157DB-17F2-40D6-B0ED-11B6C6CB064B}
-		{64D54BBB-13D1-4655-A149-CFB754820BD2} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{5BF0F5D9-8502-4431-BFFD-CA8B9D21142A} = {64D54BBB-13D1-4655-A149-CFB754820BD2}
-		{ECB76EBA-0512-4449-95AA-7258F543BA2E} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{1D6348B5-0616-41A6-90ED-09D34C452926} = {ECB76EBA-0512-4449-95AA-7258F543BA2E}
-		{2DB7E3C7-D213-4609-95DD-72561F23AB58} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{83C6944F-8F6C-4698-A09A-25DB92BA1AD2} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{456056B5-3888-47AB-AFD7-4F16A8A1454F} = {83C6944F-8F6C-4698-A09A-25DB92BA1AD2}
-		{44663691-023E-48D0-9757-A106974E8AAE} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{4DE12851-6ABC-4675-84B8-0E0EFA142F79} = {44663691-023E-48D0-9757-A106974E8AAE}
-		{13E7C397-F40B-4791-B853-F7430AF88D00} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{412D4C15-F48F-4DB1-940A-131D1AA87088} = {13E7C397-F40B-4791-B853-F7430AF88D00}
-		{A400C938-46E2-4B84-B06E-487B13D22E1B} = {412D4C15-F48F-4DB1-940A-131D1AA87088}
-		{3D330C1E-D773-4BA8-9E91-123544B0D672} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{563714CA-0022-4A95-BDBB-0953541193CA} = {3D330C1E-D773-4BA8-9E91-123544B0D672}
-		{DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{E55659A7-5489-4E86-B11C-2E41697555F7} = {DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5}
-		{1A304CA0-7795-4684-88E5-E66402966927} = {5BC5A805-DCA0-41DF-91B8-520B5DAD57DA}
-		{A0FFAF00-D628-4BDB-BE68-8DBA21FBBEA2} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{627F94BE-AD74-4188-9F61-12E5096DA826} = {A0FFAF00-D628-4BDB-BE68-8DBA21FBBEA2}
-		{BC0E5F62-06EE-407D-83C6-490785E9A011} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{F5EAE3E3-951B-46B7-A6B0-0BC76CCB83C5} = {BC0E5F62-06EE-407D-83C6-490785E9A011}
-		{225AEDCF-7162-4A86-AC74-06B84660B379} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{606C2615-3E08-4A08-993F-FBD90F4CD021} = {225AEDCF-7162-4A86-AC74-06B84660B379}
-		{BFDD5ACE-A1F0-4C33-8DA1-06CB5CA53177} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{62043A86-BC6F-432E-9AFD-F3B616192D8D} = {BFDD5ACE-A1F0-4C33-8DA1-06CB5CA53177}
-		{9934060B-1957-40FF-83E1-5C15344E7A33} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{EEC636DE-4C4D-4F16-9D57-0AD1762CCB4D} = {9934060B-1957-40FF-83E1-5C15344E7A33}
-		{D685AF51-2CE2-4CD8-86AA-FB0EDD47533F} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{600CB408-C94D-4F69-83DB-D99EF6DAE0E1} = {D685AF51-2CE2-4CD8-86AA-FB0EDD47533F}
-		{0322CF4A-9701-4E7E-9827-BC7DFFA78842} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{3AEEC6C0-65ED-43D1-BA42-F7E6913BB69A} = {0322CF4A-9701-4E7E-9827-BC7DFFA78842}
-		{5F51EB21-20E2-4793-A137-2E18D50696C5} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{9CE2DD5F-BC82-4EEB-BF7B-70E75677566A} = {5F51EB21-20E2-4793-A137-2E18D50696C5}
-		{7ACD11D4-4682-4936-AFF6-DAC64C636612} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{E071FB7E-E650-44B0-9529-D5D1685AEA62} = {7ACD11D4-4682-4936-AFF6-DAC64C636612}
-		{79C7F0D4-7B1A-46BF-8932-5C2E971C5925} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{6A31248F-5F64-4A73-856C-8DC6492E6AC7} = {79C7F0D4-7B1A-46BF-8932-5C2E971C5925}
-		{644AAC18-8E13-4392-8891-3814E355C819} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{928C9877-6BF3-447D-9E33-ACF833151D77} = {644AAC18-8E13-4392-8891-3814E355C819}
-		{70AD2DB0-47D7-492F-817A-34BCAFD861C4} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{51D0FA50-6970-4C19-B31B-3D6CCDF6C028} = {70AD2DB0-47D7-492F-817A-34BCAFD861C4}
-		{D21F1804-4690-4B00-BC6A-2147C14BF1B2} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{451C6023-83D5-4809-9F71-6A23ED725A03} = {D21F1804-4690-4B00-BC6A-2147C14BF1B2}
-		{9578BB4F-D805-4581-9AAE-A66002BFDA1F} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{A47371F8-F47E-4AF3-9F2E-068F28CE6587} = {9578BB4F-D805-4581-9AAE-A66002BFDA1F}
-		{3691F0FE-6A8D-4F99-95EB-2D3AD3F9B712} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{4C056678-59A0-4D37-BE70-B98D764C7EA4} = {3691F0FE-6A8D-4F99-95EB-2D3AD3F9B712}
-		{DA5E4C5A-E62C-47CD-9557-65F747638BAD} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{81A35CF9-214F-4351-9561-334F32B41C3A} = {DA5E4C5A-E62C-47CD-9557-65F747638BAD}
-		{B27FBAC2-ADA3-4A05-B232-64011B6B2DA3} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{66A0F71A-FFB5-4763-913E-FB4A4F17EAA2} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
-		{50D97D17-79CF-4917-AD70-F79146FE8808} = {66A0F71A-FFB5-4763-913E-FB4A4F17EAA2}
-		{AB316CF4-D9C3-427E-8460-7C5235BED45E} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
-		{135B4B7B-D641-4A45-87F4-15C6A8CAA7F5} = {AB316CF4-D9C3-427E-8460-7C5235BED45E}
-		{0408482E-7934-49CA-A590-7E21AF4BE1BF} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{A9027A02-135B-4149-947A-79F5B73A7F28} = {0408482E-7934-49CA-A590-7E21AF4BE1BF}
-		{54C42F57-5447-4C21-9812-4AF665567566} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{352D08E0-782E-4AE3-99B2-7BC5B2C3F227} = {54C42F57-5447-4C21-9812-4AF665567566}
-		{3ACCF669-89AB-4B02-809E-E94C81271BFF} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{DEED8B59-B811-471F-936A-D8D71AA97CE1} = {3ACCF669-89AB-4B02-809E-E94C81271BFF}
-		{DF5E3AC1-94B3-4B8A-B534-9D30924A8E6B} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{B2660D8F-8990-46C7-9B41-F3F94C6402F6} = {DF5E3AC1-94B3-4B8A-B534-9D30924A8E6B}
-		{4F99BF26-E900-487C-828F-145166926DE2} = {2C022280-340C-43DC-B63D-5A644F0ECBF2}
-		{31E763AD-996E-44EF-A70E-1B8187922C98} = {4F99BF26-E900-487C-828F-145166926DE2}
-		{989F2C7A-807F-41DA-AA5F-08147E8FF433} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{3974EB1C-077A-4A79-B295-87B62446C266} = {989F2C7A-807F-41DA-AA5F-08147E8FF433}
-		{9AA5D0E4-B341-4570-B3E4-081E6653471D} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{CE49768E-1D4C-4724-9D35-1D0F73E49C9D} = {9AA5D0E4-B341-4570-B3E4-081E6653471D}
-		{B7ED4805-AD3E-4D76-BC5B-700A31488493} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{AB3A72FB-5DF6-4F95-BAA8-19CF5BC97760} = {B7ED4805-AD3E-4D76-BC5B-700A31488493}
-		{BF4B36D6-D1FA-41A3-9CB3-2E1D2894E2AD} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{06492CD6-4C51-41F3-9D1A-0A95F914F871} = {BF4B36D6-D1FA-41A3-9CB3-2E1D2894E2AD}
-		{C59FBB3C-3A7F-4744-A823-1EB92C5B23A2} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{62BE5BF4-24BB-4013-ACE8-3D76521FA77C} = {C59FBB3C-3A7F-4744-A823-1EB92C5B23A2}
-		{7321E95C-0A37-45BD-B458-1BA4412A14AC} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{021E9BF3-2D3D-4169-834E-718ABE0E5B68} = {7321E95C-0A37-45BD-B458-1BA4412A14AC}
-		{E5CA56AF-64B6-47B4-BCB7-EF95B53D14E1} = {021E9BF3-2D3D-4169-834E-718ABE0E5B68}
-		{C73F3203-4E8C-46BC-A299-1A5BB81DA2C3} = {021E9BF3-2D3D-4169-834E-718ABE0E5B68}
-		{78C5ACC3-6718-4682-B350-737EDA1E4F35} = {B55A5DE1-5AF3-4B18-AF04-C1735B071DA6}
-		{DFDEED51-6B9B-41B9-A684-9F3FFC07C9B4} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{4FDDC525-4E60-4CAF-83A3-261C5B43721F} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
-		{89472057-8BB2-44A8-B0FC-D9F3ADB1181C} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{D40C86C9-0E5D-4974-84D8-A835B58B2A8F} = {89472057-8BB2-44A8-B0FC-D9F3ADB1181C}
-		{D69B5668-86EF-4CC5-814B-113BAF740DD0} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{0674F69B-FAC8-43E5-8711-A476936F459F} = {D69B5668-86EF-4CC5-814B-113BAF740DD0}
-		{D9403AE4-77D1-44DE-8785-280C342D215A} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{5DEF52C0-B440-4DAC-8A2D-920C7016C580} = {D9403AE4-77D1-44DE-8785-280C342D215A}
-		{D67E977E-75DF-41EE-8315-6DBF5C2B7357} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
-		{EE74FCEC-542A-4B66-B0A9-49B28049C203} = {D67E977E-75DF-41EE-8315-6DBF5C2B7357}
-		{737D2BC0-092E-404B-BB73-EACAEDBF0E65} = {EE74FCEC-542A-4B66-B0A9-49B28049C203}
-		{7004082D-53E9-45C2-B2DE-EB3CE448B64F} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{478D4BE2-F4AC-45EF-BEE4-35399DECCABF} = {7004082D-53E9-45C2-B2DE-EB3CE448B64F}
-		{ADAC3089-7247-4137-A8CB-8114D58C9B93} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{183F99F9-0C0B-4790-8152-637B4AE68622} = {ADAC3089-7247-4137-A8CB-8114D58C9B93}
-		{EA2941E6-5868-47CD-97AB-2DB1D5F18D97} = {DFDEED51-6B9B-41B9-A684-9F3FFC07C9B4}
-		{F8C6AE5D-ED8B-4CCD-9E4C-28AD16EF075B} = {EA2941E6-5868-47CD-97AB-2DB1D5F18D97}
-		{AE3F1191-648A-4813-81C5-E8527E716BB7} = {DFDEED51-6B9B-41B9-A684-9F3FFC07C9B4}
-		{32FE10AE-CC85-407A-8720-624CDD3EB890} = {AE3F1191-648A-4813-81C5-E8527E716BB7}
-		{425D32AE-C933-4E4B-AC96-B2DCD9FA2B24} = {AE3F1191-648A-4813-81C5-E8527E716BB7}
-		{2E944A89-5614-425E-A87A-5F455EDB78D7} = {DFDEED51-6B9B-41B9-A684-9F3FFC07C9B4}
-		{FE930950-64DC-45A3-8128-2D68F97EBB19} = {2E944A89-5614-425E-A87A-5F455EDB78D7}
-		{81410464-9C9E-4DDE-824C-BCD0DA8E6523} = {2E944A89-5614-425E-A87A-5F455EDB78D7}
-		{68C2D913-06D4-4EAC-9283-78465BF214E1} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{D2CA01D0-954A-4F90-AF9B-F081DA9F40E3} = {68C2D913-06D4-4EAC-9283-78465BF214E1}
-		{F4B3C10B-F713-45D1-84EF-DD503BA09D20} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{7AA8771B-F1F3-409E-960A-EEF00B94135A} = {F4B3C10B-F713-45D1-84EF-DD503BA09D20}
-		{E6639EAB-40B0-4BB6-A56B-25ECC4B6D3D9} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{0B490CDE-C350-41A0-9DEA-CDA5FB72205D} = {E6639EAB-40B0-4BB6-A56B-25ECC4B6D3D9}
-		{822D1519-77F0-484A-B9AB-F694C2CC25F1} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
-		{99F9BBC5-46AE-40DC-A675-5E56ACA3C5C8} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{AB39F04A-A96E-4BE1-99F2-54B804104BA1} = {99F9BBC5-46AE-40DC-A675-5E56ACA3C5C8}
-		{9121A7EA-5751-4811-9FE3-E183BB8709FB} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{EE23169F-C3A7-4A03-8FB7-C1F1B76301A9} = {9121A7EA-5751-4811-9FE3-E183BB8709FB}
-		{03CD847C-2230-4092-BF1C-DE54634805AD} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{D47B73A3-740E-4B9A-B123-A42299F1F266} = {03CD847C-2230-4092-BF1C-DE54634805AD}
-		{14A4E3F5-04BB-4062-84AE-1A887C307B17} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{6906D7DE-CE06-4A6A-81BB-D783C605A184} = {14A4E3F5-04BB-4062-84AE-1A887C307B17}
-		{2AB4FE8F-94FF-4C6E-B12F-9E40A9FAF9AB} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{F90D4383-89FC-4215-B2AB-BBB242CC5E45} = {2AB4FE8F-94FF-4C6E-B12F-9E40A9FAF9AB}
-		{A274799D-3D1F-4AE5-A154-4BF6C80A8D94} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{D5DF181B-E759-4797-ABAF-0BFDEC2A883D} = {A274799D-3D1F-4AE5-A154-4BF6C80A8D94}
-		{7B382EC7-57B6-4C0C-8B27-5F63B5184193} = {A274799D-3D1F-4AE5-A154-4BF6C80A8D94}
-		{562D5067-8CD8-4F19-BCBB-873204932C61} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{58FFC6CE-5958-460C-A520-32CF3FD0BE61} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{DE6F167E-F41C-414D-923E-8E51E992A830} = {58FFC6CE-5958-460C-A520-32CF3FD0BE61}
-		{839C479D-64DC-4A59-85E4-04E5A2CC9631} = {58FFC6CE-5958-460C-A520-32CF3FD0BE61}
-		{26196065-4F78-435E-B500-2967A63D277D} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{ADB4912C-BCD5-400F-BD20-37410BA76EF8} = {26196065-4F78-435E-B500-2967A63D277D}
-		{13683DEB-FB7E-4F20-ACB2-015381943541} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{1721A1A3-D8A0-4CEE-A11D-4D168F93F0D7} = {13683DEB-FB7E-4F20-ACB2-015381943541}
-		{4510DA15-69F3-411E-86F2-7AD04FFB9823} = {B59D558B-AC58-4BA4-B5AF-AE51C8531B28}
-		{B46A45E2-27E8-4C85-920B-1BFF45B7EBEB} = {B59D558B-AC58-4BA4-B5AF-AE51C8531B28}
-		{6CBF1AA9-1073-4A97-B867-FB534C6829C1} = {6DE916F5-E78F-446C-89CB-9240AED2A2E2}
-		{0508E463-0269-40C9-B5C2-3B600FB2A28B} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{A71B95EE-1BFF-49BA-BA5F-121EFAE41667} = {0508E463-0269-40C9-B5C2-3B600FB2A28B}
-		{881FE4C3-1553-4CA1-B430-DDD37B3493AB} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{DAAB40E7-73DD-4BF1-BCB7-FE3E20F2F7C1} = {881FE4C3-1553-4CA1-B430-DDD37B3493AB}
-		{DE5C0805-1C4A-4C70-B613-89EE2EA0B757} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{FB86B2B2-60B2-477A-9D78-2530A0089660} = {DE5C0805-1C4A-4C70-B613-89EE2EA0B757}
-		{58915BB2-CEF5-4CA3-8886-A61156564505} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{7FC5CFC7-9BFE-4C19-90DE-A84A76A8E03D} = {58915BB2-CEF5-4CA3-8886-A61156564505}
-		{39086512-EBC8-4061-BE34-DCCA5D1BA585} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{34F24889-22D2-40A1-A2AB-A43B9061FE0D} = {39086512-EBC8-4061-BE34-DCCA5D1BA585}
-		{512EFCA7-1590-492A-8D06-84744F79DA91} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{CC783D3A-71CB-4DFD-9769-9EC7EF1ADF1B} = {512EFCA7-1590-492A-8D06-84744F79DA91}
-		{515282B6-6EF9-46E0-8EF1-DBD1CD948D9E} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{02A85F31-A092-4322-A3D9-91E894D9ECD2} = {515282B6-6EF9-46E0-8EF1-DBD1CD948D9E}
-		{33CAD745-5912-47D3-BAF3-5AE580FED275} = {D67E977E-75DF-41EE-8315-6DBF5C2B7357}
-		{9E01AF6A-F748-4490-B45B-8558D1E701B4} = {33CAD745-5912-47D3-BAF3-5AE580FED275}
-		{94174359-D57E-467E-8AC7-167A10260F34} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{94F7E7AE-4AEF-44EC-B9F2-ABD1A5AC9E4A} = {94174359-D57E-467E-8AC7-167A10260F34}
-		{B4B39C18-70F5-4C07-9871-4E124F63F1F7} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{B2D225EF-BE70-4FA0-B631-0A4D24DB7BD7} = {B4B39C18-70F5-4C07-9871-4E124F63F1F7}
-		{01EED30B-3DC5-4591-A4C2-B17C6D36B1DE} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{EDFF668F-1DB2-4EC7-BB6F-9DDBF70437CB} = {01EED30B-3DC5-4591-A4C2-B17C6D36B1DE}
-		{4B6BA2CC-8DE7-4070-A912-D51375998553} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{18FCF9CD-8545-41FC-9E4B-0F18B593863D} = {4B6BA2CC-8DE7-4070-A912-D51375998553}
-		{F94AF7F5-7DB1-4716-B4B5-A7DAB066AF2F} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{5FF36127-063D-4D3E-9429-3BFD32713FEE} = {F94AF7F5-7DB1-4716-B4B5-A7DAB066AF2F}
-		{5BFA4A13-895A-4680-BCC6-3BDA8F048A29} = {5FF36127-063D-4D3E-9429-3BFD32713FEE}
-		{0338EC37-E5AD-47DA-9502-24A5F7433ADE} = {5BC5A805-DCA0-41DF-91B8-520B5DAD57DA}
-		{2637A22F-182F-4659-A394-C9BC1514B321} = {0338EC37-E5AD-47DA-9502-24A5F7433ADE}
-		{A6D39EEA-CC08-4ECF-BD2E-134D845876FB} = {2637A22F-182F-4659-A394-C9BC1514B321}
-		{95F132DA-D9B6-4181-8D1B-A58D935B1827} = {A6D39EEA-CC08-4ECF-BD2E-134D845876FB}
-		{85EFA9E2-A041-438B-BAF9-928C74571141} = {2637A22F-182F-4659-A394-C9BC1514B321}
-		{9443F095-DA20-4EED-BC97-5BF92470D972} = {85EFA9E2-A041-438B-BAF9-928C74571141}
-		{EA798F59-BCF8-4013-AF6B-9611FDC9919C} = {2637A22F-182F-4659-A394-C9BC1514B321}
-		{C10C8A03-9ECC-4CDC-9D8E-9E0FDF12E4EE} = {EA798F59-BCF8-4013-AF6B-9611FDC9919C}
-		{9EA5219C-3C11-45D4-BD43-8BE05FB2812A} = {08B240FC-AE5D-478A-963D-890ADE70B0B5}
-		{9DF052F3-D239-4BB5-B41E-DA93A086B4F8} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{CBA2A020-E44D-4AFF-ADB8-E6414E7EAD94} = {9DF052F3-D239-4BB5-B41E-DA93A086B4F8}
-		{418848BA-83AE-49E4-9EEC-7AFB5591D8E8} = {9DF052F3-D239-4BB5-B41E-DA93A086B4F8}
-		{59ECEDFE-72E7-495D-BECB-784B0018544E} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{61F6B56C-0764-4585-9C3F-63A0CF05E56E} = {59ECEDFE-72E7-495D-BECB-784B0018544E}
-		{60B11F05-CA3B-4AD1-BAC1-912C19D37395} = {59ECEDFE-72E7-495D-BECB-784B0018544E}
-		{5FE1FBC1-8CE3-4355-9866-44FE1307C5F1} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{8DE6625B-C9E4-4949-A75C-89E3FF556724} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
-		{0CE1CC26-98CE-4022-A81C-E32AAFC9B819} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{6276A9A0-791B-49C1-AD8F-50AC47CDC196} = {0CE1CC26-98CE-4022-A81C-E32AAFC9B819}
-		{B81C7FA1-870F-4F21-A928-A5BE18754E6E} = {6276A9A0-791B-49C1-AD8F-50AC47CDC196}
-		{2AEACF69-7F68-414A-B49D-2C627D37D0F6} = {6276A9A0-791B-49C1-AD8F-50AC47CDC196}
-		{0C610220-E00C-4752-98A0-44A3D4B96A21} = {13683DEB-FB7E-4F20-ACB2-015381943541}
-		{1FD5F261-6384-4AE1-A6DA-4D08A0BCE1CF} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{09F72EF0-2BDE-4B73-B116-A87E38C432FE} = {1FD5F261-6384-4AE1-A6DA-4D08A0BCE1CF}
-		{44161B20-CC30-403A-AC94-247592ED7590} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{E0B1F2AA-4EBA-4DC7-92D5-2F081354C8DE} = {44161B20-CC30-403A-AC94-247592ED7590}
-		{E33C36A1-481C-4A93-BCBE-22CCBA53349B} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{E167A806-EEFA-4BCF-A14D-D985BAEA9387} = {E33C36A1-481C-4A93-BCBE-22CCBA53349B}
-		{15A90CE7-886D-4005-8C14-CF29123344E1} = {E33C36A1-481C-4A93-BCBE-22CCBA53349B}
-		{E50C2015-42A4-4E71-94B9-62773D369FEE} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{16898702-3E33-41C1-B8D8-4CE3F1D46BD9} = {E50C2015-42A4-4E71-94B9-62773D369FEE}
-		{70B719CD-C70E-4417-B1EE-FD24B5AFB0B7} = {16898702-3E33-41C1-B8D8-4CE3F1D46BD9}
-		{552EB148-0518-41A6-905D-4696A6438E80} = {64D54BBB-13D1-4655-A149-CFB754820BD2}
-		{789E23FE-E8F4-4935-AF43-4A84D25AD130} = {5B27FAB7-E5FE-4FF2-8F39-900E177D5E39}
-		{9546F4D5-9625-480F-B5BB-5D6FF9369885} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{DA626A01-8198-4E1A-A1EE-0EA4AB0B02C1} = {9546F4D5-9625-480F-B5BB-5D6FF9369885}
-		{F421D0C4-6EF7-48B7-9213-AFD21322E08B} = {9546F4D5-9625-480F-B5BB-5D6FF9369885}
-		{696BE515-B3AB-4925-969C-350F1BDA5C30} = {682157DB-17F2-40D6-B0ED-11B6C6CB064B}
-		{3CB3CA43-6D65-4DDE-B5E3-A9E0DF957E38} = {7004082D-53E9-45C2-B2DE-EB3CE448B64F}
-		{FE22EB98-C12E-4FAE-A7C2-DF65890F3084} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{87181A18-6A53-43E6-A6B1-1F867C9D3E45} = {FE22EB98-C12E-4FAE-A7C2-DF65890F3084}
-		{3B85171E-9A55-4605-B9B1-56F77E47137B} = {FE22EB98-C12E-4FAE-A7C2-DF65890F3084}
-		{8275510E-0E6C-45A8-99DF-4F106BC7F075} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{DF5EDCB1-139C-4804-9D00-C5E7DCEC104F} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
-		{58C5FE49-3060-4D9E-B76C-352790FCD1D8} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
-		{4F39F27E-0E21-4093-8818-D974D4716C14} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
-		{BC0CC534-0285-4471-B99E-584BEFEC94DB} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
-		{97F5B320-B18E-4275-B0E9-BB5FABDA952F} = {380430A1-C02F-4943-8A52-FDFA9F7735F0}
-		{E9216C2B-A12B-48C3-8F5D-C67C5D75EF02} = {97F5B320-B18E-4275-B0E9-BB5FABDA952F}
-		{28B6FDEF-3DC0-42E0-8913-C7D33CE93368} = {97F5B320-B18E-4275-B0E9-BB5FABDA952F}
-		{22F70908-5E62-4185-B76B-F0C5B952F8AE} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
-		{2F08930D-5646-4D74-AAA2-9E51C93D1192} = {881FE4C3-1553-4CA1-B430-DDD37B3493AB}
-		{0CD27C71-4A3C-4AA0-8258-F7430F875984} = {2F08930D-5646-4D74-AAA2-9E51C93D1192}
-		{BCD032DD-D088-4F72-B80F-48D0EA845F87} = {881FE4C3-1553-4CA1-B430-DDD37B3493AB}
-		{58955E85-0D55-45FF-97EE-BDD096522954} = {BCD032DD-D088-4F72-B80F-48D0EA845F87}
-		{D708256C-4A68-4B15-AAE5-6EFA41223A70} = {BCD032DD-D088-4F72-B80F-48D0EA845F87}
-		{8DAC59BE-CB96-4F04-909C-56C22E7665EB} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{E763DA15-8F4E-446C-99B8-309053C75598} = {7A331A1C-E2C4-4E37-B0A0-B5AA10661229}
-		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1} = {E763DA15-8F4E-446C-99B8-309053C75598}
-		{05A169C7-4F20-4516-B10A-B13C5649D346} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987} = {68C2D913-06D4-4EAC-9283-78465BF214E1}
-		{C8415333-2A64-4FF0-8FC9-652694A11A77} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA} = {C8415333-2A64-4FF0-8FC9-652694A11A77}
-		{7391E144-5087-4E64-94D8-E0700D57739C} = {C8415333-2A64-4FF0-8FC9-652694A11A77}
-		{ED6E6F06-D620-41BC-8F12-01480BF49381} = {E6639EAB-40B0-4BB6-A56B-25ECC4B6D3D9}
-		{3DC5D8DB-5DA3-4793-B090-9CB89A158B51} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{F80F007A-AEE5-478A-8A5E-2A4EEDA9FD42} = {3DC5D8DB-5DA3-4793-B090-9CB89A158B51}
-		{31B7F6ED-C7B6-4FDB-ADA9-4E5B6B8FCAB6} = {3DC5D8DB-5DA3-4793-B090-9CB89A158B51}
-		{C1409A8F-555A-4A88-B803-C6D3E8B6C3B0} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
-		{72AA2B1F-1FE7-48B5-968D-89E492F2139D} = {C1409A8F-555A-4A88-B803-C6D3E8B6C3B0}
-		{AA465A56-D9D0-4684-95B0-192F4436C582} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{670B30E8-4E6F-453F-A5B7-B6DB3D83FE42} = {AA465A56-D9D0-4684-95B0-192F4436C582}
-		{F0540D2E-1A56-4AFE-9DC4-EA7E5CB8E10B} = {5CF8E05A-C8DD-4551-8542-844A217B39F2}
-		{8CB43443-E02C-4D04-9E96-A4916E5C83C2} = {C59FBB3C-3A7F-4744-A823-1EB92C5B23A2}
-		{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101} = {3D330C1E-D773-4BA8-9E91-123544B0D672}
-		{529AB96D-853D-41B4-ABE6-D0DED4A50DFD} = {DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5}
-		{402C3AC9-1B1D-4523-AB80-A992CEA85F57} = {225AEDCF-7162-4A86-AC74-06B84660B379}
-		{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85} = {AA465A56-D9D0-4684-95B0-192F4436C582}
-		{EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997} = {EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}
-		{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0} = {BF4B36D6-D1FA-41A3-9CB3-2E1D2894E2AD}
-		{C713DCA1-B36D-44BD-ACFA-F562782AD40E} = {3D330C1E-D773-4BA8-9E91-123544B0D672}
-		{A2701184-BD48-4B72-AA6E-8DD1DE2F217F} = {54C42F57-5447-4C21-9812-4AF665567566}
-		{17DD5861-0635-46D0-84BA-6B163150AA4F} = {54C42F57-5447-4C21-9812-4AF665567566}
-		{2DF639CC-DFF2-44D2-9585-D1E925B5A117} = {17DD5861-0635-46D0-84BA-6B163150AA4F}
-		{C71CF302-0FFA-4610-9197-033B277F3065} = {17DD5861-0635-46D0-84BA-6B163150AA4F}
-		{09D2D765-A792-415E-B19A-18948A1C8969} = {3ACCF669-89AB-4B02-809E-E94C81271BFF}
-		{E7CADFE4-CDD0-4DE3-90ED-7184A969F47B} = {BF4B36D6-D1FA-41A3-9CB3-2E1D2894E2AD}
-		{822FF16C-A4E0-40A0-AE65-530752575261} = {E7CADFE4-CDD0-4DE3-90ED-7184A969F47B}
-		{71DE18B5-87F9-4D03-89BB-C3E243576F92} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{3A554C0B-2956-4152-BF31-2C8CAE5D2717} = {71DE18B5-87F9-4D03-89BB-C3E243576F92}
-		{9F21A235-436E-4020-A076-1DF4F89D0CA0} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{9E0B9A09-167E-4DF7-8AA4-F9323A306F90} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{F1B75625-567A-4AF3-BB68-75A4CF93F2B8} = {9E0B9A09-167E-4DF7-8AA4-F9323A306F90}
-		{0F5F1299-7303-49B8-BEBF-9FF3B522CE0F} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{473C0171-0AD1-473B-B1A0-93636FD77BA6} = {0F5F1299-7303-49B8-BEBF-9FF3B522CE0F}
-		{F910B1B0-3641-4F3B-8336-5230FAB8FAD5} = {0F5F1299-7303-49B8-BEBF-9FF3B522CE0F}
-		{D15A9C48-00F1-423B-B14D-6EACE976E2F0} = {F910B1B0-3641-4F3B-8336-5230FAB8FAD5}
-		{39B8B1ED-790E-4FF5-8D68-B1153655F87B} = {F910B1B0-3641-4F3B-8336-5230FAB8FAD5}
-		{7A3BDEED-70A7-4F2A-82D8-6A8752CE2859} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{886DDAF8-052A-4AC5-87FD-96EBCBAC2B7C} = {7A3BDEED-70A7-4F2A-82D8-6A8752CE2859}
-		{83E043A0-50FF-48AB-AA1D-EE88B64A1E4F} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{30BB8038-D162-4171-9404-4041FC7A5BA7} = {83E043A0-50FF-48AB-AA1D-EE88B64A1E4F}
-		{64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{5750A285-B528-4A6C-953F-7838824E5F81} = {64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C}
-		{C4C7C4FC-F83C-4DFA-803A-6E88001DF0F2} = {64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C}
-		{85179BD4-F1B1-4FDB-ABA9-3FDB0F5FF1B3} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{5D91E19A-E6EB-4ED7-BAC8-B41DEB9F4704} = {85179BD4-F1B1-4FDB-ABA9-3FDB0F5FF1B3}
-		{BCF3D807-5368-4201-8313-34493E60020B} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{5EBE548A-E450-466B-B448-D6662E659E58} = {BCF3D807-5368-4201-8313-34493E60020B}
-		{58C3FE63-C364-4AF8-B575-2F65A7565B1F} = {BCF3D807-5368-4201-8313-34493E60020B}
-		{8B6F219F-CE89-4704-8586-F9953F5FF4AB} = {BCF3D807-5368-4201-8313-34493E60020B}
-		{2AFCDBA1-0697-4134-BF22-17C145EB2710} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{8A2FFCF4-548A-4527-AB0A-CE2F3402FB0D} = {2AFCDBA1-0697-4134-BF22-17C145EB2710}
-		{62F3EF13-4A89-4912-A22C-31981278B074} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
-		{CE8BC4CA-0068-439A-A012-6B1E764CD5D7} = {62F3EF13-4A89-4912-A22C-31981278B074}
-		{3D551023-1D98-479D-A41E-EBD0C05A06FF} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{861CA437-6402-4E45-9E1F-35A509E61568} = {3D551023-1D98-479D-A41E-EBD0C05A06FF}
-		{049030CA-4D78-4B24-A112-28C61AB2509C} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{5EE9EEE3-C472-4A6D-8DB8-C82998584E2C} = {049030CA-4D78-4B24-A112-28C61AB2509C}
-		{B714B9AB-0A8F-4FB0-902E-6B73CA60DAB8} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{805264B9-36C9-49D6-BA34-63D0050C9D6E} = {B714B9AB-0A8F-4FB0-902E-6B73CA60DAB8}
-		{2654DB24-E7E6-45B0-B350-3226D2D0FDC7} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{C2645178-0B55-47D4-B9CA-A6FFA14E616E} = {2654DB24-E7E6-45B0-B350-3226D2D0FDC7}
-		{D38C4227-7692-4C66-B8C2-8A411B46DCE3} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{8192DC13-6878-43C1-B657-96420C3BA9F8} = {D38C4227-7692-4C66-B8C2-8A411B46DCE3}
-		{A127217D-26AF-43C4-96A0-7080EB6F1D65} = {B7ED4805-AD3E-4D76-BC5B-700A31488493}
-		{19BE6DF6-24F5-4F58-86C8-A9D8368427A7} = {A127217D-26AF-43C4-96A0-7080EB6F1D65}
-		{68E93233-6FF3-41FE-8161-3B7F457473C8} = {A127217D-26AF-43C4-96A0-7080EB6F1D65}
-		{8AAFAD2A-B273-4DB5-8DC9-3CA832248A82} = {B7ED4805-AD3E-4D76-BC5B-700A31488493}
-		{897EECDD-628F-4233-B1BF-A13F687057BC} = {8AAFAD2A-B273-4DB5-8DC9-3CA832248A82}
-		{E7F7B6E9-3374-4C37-8FDA-CB3682442D51} = {8AAFAD2A-B273-4DB5-8DC9-3CA832248A82}
-		{41B519F7-CF19-4FB4-B96C-E38A7EF45F70} = {DE5C0805-1C4A-4C70-B613-89EE2EA0B757}
-		{122907A1-AD5F-40B3-9D61-05A3F8CF859D} = {41B519F7-CF19-4FB4-B96C-E38A7EF45F70}
-		{5A3DF44F-53B3-4EC0-A0EF-EFE78190C48D} = {41B519F7-CF19-4FB4-B96C-E38A7EF45F70}
-		{364376C6-E886-482E-B79C-366E5DAB8A5B} = {3D551023-1D98-479D-A41E-EBD0C05A06FF}
-		{BDC1141A-DA5D-48D4-B0A7-61612D4F8024} = {364376C6-E886-482E-B79C-366E5DAB8A5B}
-		{4D08EC2C-A488-414E-8739-341E197773DB} = {364376C6-E886-482E-B79C-366E5DAB8A5B}
-		{07AAFECB-4C42-4533-80D5-0452989FA0F7} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{81143573-811E-4F61-9331-6B7173DBA67C} = {07AAFECB-4C42-4533-80D5-0452989FA0F7}
-		{F4160B93-03F2-4C0F-BEBA-C89F02CACD17} = {81143573-811E-4F61-9331-6B7173DBA67C}
-		{35AA4E31-D157-4AD2-B04F-EE3956795420} = {07AAFECB-4C42-4533-80D5-0452989FA0F7}
-		{21F89E50-DF06-435E-872B-7639BCE695DF} = {07AAFECB-4C42-4533-80D5-0452989FA0F7}
-		{DF86A07D-A370-4CBD-97DD-DCB09466545F} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{8C828211-F2EC-4BFD-B922-98F73D9DAB5E} = {DF86A07D-A370-4CBD-97DD-DCB09466545F}
-		{8EFA9CC7-D03D-4535-898C-F3B80BB19F21} = {DF86A07D-A370-4CBD-97DD-DCB09466545F}
-		{2E690E42-B20F-4702-9478-1707EEC7C02F} = {8EFA9CC7-D03D-4535-898C-F3B80BB19F21}
-		{9C7F31F8-B782-4016-9B0E-72C8CB42334C} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{6DEB6C24-3A35-4E72-BCA8-33344EEE0119} = {9C7F31F8-B782-4016-9B0E-72C8CB42334C}
-		{922869D9-B9FF-4828-8C6F-FCA7963DB011} = {9C7F31F8-B782-4016-9B0E-72C8CB42334C}
-		{ECF7A440-D5FC-473F-958C-FE27643844D8} = {58915BB2-CEF5-4CA3-8886-A61156564505}
-		{92820F5C-4018-4F10-A14B-0AEE619202EE} = {58915BB2-CEF5-4CA3-8886-A61156564505}
-		{2C76F024-8C85-4672-AC23-ACEA0FA5E9B5} = {39086512-EBC8-4061-BE34-DCCA5D1BA585}
-		{C520CDA2-BA0C-4427-8B26-F6B3C2FEB5A5} = {39086512-EBC8-4061-BE34-DCCA5D1BA585}
-		{91DD8440-7A66-4880-A0CE-BC6009D2DCFF} = {D9403AE4-77D1-44DE-8785-280C342D215A}
-		{A837D64D-435A-473F-8828-8E1DD95D8E4B} = {D9403AE4-77D1-44DE-8785-280C342D215A}
-		{4BA8A846-5B24-4F46-90B9-FFEFB889C028} = {512EFCA7-1590-492A-8D06-84744F79DA91}
-		{3CCE49CA-4145-401F-8963-AC28F0908678} = {512EFCA7-1590-492A-8D06-84744F79DA91}
-		{A1628BC4-134A-4854-9F98-B841520F1497} = {049030CA-4D78-4B24-A112-28C61AB2509C}
-		{C69E36EC-3972-4CDF-A467-94CBD7C691A1} = {049030CA-4D78-4B24-A112-28C61AB2509C}
-		{B4FCACA3-FD16-4B89-9D3D-E19C141CE926} = {9934060B-1957-40FF-83E1-5C15344E7A33}
-		{C9E481E5-F77D-4462-8E85-1F7FF2DCAA97} = {9934060B-1957-40FF-83E1-5C15344E7A33}
-		{5930AA76-C824-45F0-9D30-7EE4CB231E7A} = {C9E481E5-F77D-4462-8E85-1F7FF2DCAA97}
-		{5BE39E84-020F-405D-99AF-5D46928785AF} = {C9E481E5-F77D-4462-8E85-1F7FF2DCAA97}
-		{8C289D6B-712F-442F-A010-218784BFA4D4} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{D8DE9D37-4733-45F0-9F9D-B5A184CA1ED8} = {8C289D6B-712F-442F-A010-218784BFA4D4}
-		{99CB7560-3B6F-447B-880A-C5A53F1E56F9} = {8C289D6B-712F-442F-A010-218784BFA4D4}
-		{605D0C19-6E99-4A73-B336-1AD700AE93C0} = {512EFCA7-1590-492A-8D06-84744F79DA91}
-		{73BC406B-4D98-4BE0-A756-19F0F3D2B587} = {8AAFAD2A-B273-4DB5-8DC9-3CA832248A82}
-		{2292C14D-151C-4AB7-AA91-7F0165E2073E} = {73BC406B-4D98-4BE0-A756-19F0F3D2B587}
-		{45211BB8-4F51-427D-ADA2-7478E3398A60} = {27223011-E8E9-4178-9377-44A7B3CBCC21}
-		{F8410622-2764-4B05-BEC4-8D25CABBC45A} = {45211BB8-4F51-427D-ADA2-7478E3398A60}
-		{2E4D61F1-F504-450E-B4C2-11C5214E7200} = {9AA5D0E4-B341-4570-B3E4-081E6653471D}
-		{5EC5F788-458B-4957-8E33-ADD82DB6E420} = {2E4D61F1-F504-450E-B4C2-11C5214E7200}
-		{491D5D41-4424-4642-AF7C-A7DD186CD282} = {9AA5D0E4-B341-4570-B3E4-081E6653471D}
-		{7135BA54-DE2E-42CD-8261-1A88907843FC} = {491D5D41-4424-4642-AF7C-A7DD186CD282}
-		{A72BB350-8903-4914-9583-A156B66419EB} = {491D5D41-4424-4642-AF7C-A7DD186CD282}
-		{7CBB1320-BF86-4B32-9D2B-273A45057727} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{186AF4F9-9AFF-4395-9340-006F78D85DFB} = {7CBB1320-BF86-4B32-9D2B-273A45057727}
-		{F6BC5402-310D-4B1F-A018-99FD1D6C183A} = {7CBB1320-BF86-4B32-9D2B-273A45057727}
-		{6BB8474D-B8E1-4B77-AA44-253ACA5E686D} = {F6BC5402-310D-4B1F-A018-99FD1D6C183A}
-		{8E5588B6-0557-41CF-9A0B-1A0B412754E1} = {7CBB1320-BF86-4B32-9D2B-273A45057727}
-		{48BEABD3-2446-466C-8694-D34EF0949369} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{F0F3E6B1-5BB5-444E-B965-F2A9FFAB26CF} = {48BEABD3-2446-466C-8694-D34EF0949369}
-		{609FEA30-36D6-4FEB-AF07-7BE2BCD4D00B} = {48BEABD3-2446-466C-8694-D34EF0949369}
-		{A01B523B-35CA-4C14-B792-3887F8741E99} = {48BEABD3-2446-466C-8694-D34EF0949369}
-		{166E48ED-9738-4E13-8618-0D805F6F0F65} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
-		{AC0CBDEB-B750-4B81-AEC3-F218A384FB16} = {166E48ED-9738-4E13-8618-0D805F6F0F65}
-		{5527E368-FD50-4E8C-B8D8-C3D1374BE4F1} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{EC7CA990-BB0E-44AF-81B6-44E0E27FDE9B} = {5527E368-FD50-4E8C-B8D8-C3D1374BE4F1}
-		{399AC9FB-7DCA-4868-B299-2EE4C88D41AD} = {5527E368-FD50-4E8C-B8D8-C3D1374BE4F1}
-		{C2FDF6AA-A8BD-40A6-81AD-14687927E9FC} = {5527E368-FD50-4E8C-B8D8-C3D1374BE4F1}
-		{91BD5675-6674-4053-AD04-19F28DD3BAE5} = {C2FDF6AA-A8BD-40A6-81AD-14687927E9FC}
-		{4F8ED87D-E4D9-4941-94D7-D529D83DDBA0} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{56BA4AB2-B915-46DC-AE67-234D60BFEDBC} = {4F8ED87D-E4D9-4941-94D7-D529D83DDBA0}
-		{532D447F-0CDE-4BA6-B181-DD1FB4B07BF0} = {4F8ED87D-E4D9-4941-94D7-D529D83DDBA0}
-		{2D6567CC-2BAE-4208-BBD0-F8D2F6E57154} = {4F8ED87D-E4D9-4941-94D7-D529D83DDBA0}
-		{9ECF118E-D7A5-4805-B698-DE9013BB91C6} = {4F8ED87D-E4D9-4941-94D7-D529D83DDBA0}
-		{5BF572A5-24AF-4815-BF0C-F57DA650207D} = {9ECF118E-D7A5-4805-B698-DE9013BB91C6}
-		{036FB9FC-7F26-4982-B94E-2C32B4C836E1} = {D67E977E-75DF-41EE-8315-6DBF5C2B7357}
-		{559F1CCF-7E01-4E27-AB45-2E3B6B4984E1} = {036FB9FC-7F26-4982-B94E-2C32B4C836E1}
-		{EE65018D-FA12-461D-B2C5-44CA6E385530} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{A8E1962B-688E-44B3-81F3-BBB9891534CE} = {EE65018D-FA12-461D-B2C5-44CA6E385530}
-		{8A745E35-8098-4EB4-AC55-587B9F0DC4BE} = {EE65018D-FA12-461D-B2C5-44CA6E385530}
-		{8C4006DF-FF48-46B6-A124-10B1EEAA266E} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{F5C54062-B19C-4291-A816-F1B5A167369A} = {8C4006DF-FF48-46B6-A124-10B1EEAA266E}
-		{056535BC-3E30-49E2-BE3B-630C62E641A5} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{088C37A5-30D2-40FB-B031-D163CFBED006} = {056535BC-3E30-49E2-BE3B-630C62E641A5}
-		{B5F938FB-37DF-4201-9537-E043513701D7} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{2C155AA6-B549-4FCA-A9A0-34F28A9A4160} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{1CF04156-B477-4B88-A25B-15D4E6F587D7} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{AC688973-3FAD-4A04-99C9-414782E5AE42} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{58BAA9A7-4A2A-459A-BD41-086E8F83022D} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{F4F604C5-C4BB-4217-94DB-2A51EC4AAEA4} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{185D4D67-FFE4-4673-8F3A-AD77EA2D3931} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{D8BA7FEB-2720-4CCD-8C7F-FAAC5D8D0633} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{975E7F46-8044-463E-89E1-56EB0F7913B8} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{BAD5E853-2C9D-41D5-844D-470BC33B43E8} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{9C2BD6C2-803D-4D19-BD40-860F1B340DC7} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{A8096362-6304-4DAF-A091-978BE764FF30} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{0FD49F5F-2950-43B8-8467-78596A4421AC} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{773877FC-7C04-48F9-BC1D-9B4231D9B6D1} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{7DFECECC-E30C-4217-9746-86A8D652E110} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{B8825E86-B8EA-4666-B681-C443D027C95D} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{3936CFC3-AA2D-40CF-A5CB-3C676D99BB90} = {B8825E86-B8EA-4666-B681-C443D027C95D}
-		{70F83D54-91BF-4BED-8A82-F310D640C9F8} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{4BCC89AB-3429-4C38-AFF9-DBBD605075F6} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{12EFA8EE-25FC-4CAD-98AC-B2B97368579A} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{CA6DD42B-2DBC-4061-91E8-C91FA8F4C410} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{199639E9-0FAA-49C4-A75F-95EE71F32CC0} = {CA6DD42B-2DBC-4061-91E8-C91FA8F4C410}
-		{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{039266E2-5F43-4B94-86DA-8BDD7BE8885F} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{EA846E30-4F38-4315-844F-D5BC20F74B07} = {515282B6-6EF9-46E0-8EF1-DBD1CD948D9E}
-		{3BEA35BC-784F-4892-AF1F-90177B8362A1} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{3B0F71CD-980F-48DF-AEDA-A5CDF001F7A9} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{9D70EEB0-1E6D-4C07-8B5F-5D7E4CD5EE55} = {3B0F71CD-980F-48DF-AEDA-A5CDF001F7A9}
-		{2A92D94B-9825-42D3-AB33-52E3010D74E2} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{E27910E1-6CCE-41B2-97DD-AE874007B592} = {2A92D94B-9825-42D3-AB33-52E3010D74E2}
-		{72879779-4CAC-4CB0-A052-FF60EB386B7A} = {2A92D94B-9825-42D3-AB33-52E3010D74E2}
-		{5BD69C96-623F-427B-9AAF-67C0817A9A9A} = {CA6DD42B-2DBC-4061-91E8-C91FA8F4C410}
-		{D10BA44E-219B-4528-98F5-0CB0FCF17017} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{EAF56BE6-683A-4C34-AC2D-22770EC13915} = {819B136D-B8B6-46AE-8C4F-5469BBBFC46B}
-		{6DA1B006-0D5B-4C92-8ED6-9F1FB99C187A} = {D685AF51-2CE2-4CD8-86AA-FB0EDD47533F}
-		{332A8F84-FC5B-44A5-95A2-379B69C6E755} = {0322CF4A-9701-4E7E-9827-BC7DFFA78842}
-		{A28B3D43-619F-44A9-9463-78F0E2474351} = {5F51EB21-20E2-4793-A137-2E18D50696C5}
-		{926D431D-D95F-42BA-817B-DFEAF697E007} = {7ACD11D4-4682-4936-AFF6-DAC64C636612}
-		{00D4573D-B61D-48C2-BCB4-027A19EB3247} = {79C7F0D4-7B1A-46BF-8932-5C2E971C5925}
-		{46AB5306-4FF5-4A4B-8009-DFCFAB178442} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{EFDFAA40-91FA-4896-BC6B-06A30CE44DEC} = {46AB5306-4FF5-4A4B-8009-DFCFAB178442}
-		{5500EB93-4F36-4929-9730-E593DBC2B7F5} = {46AB5306-4FF5-4A4B-8009-DFCFAB178442}
-		{0F346D2C-FF9F-4F1A-AB0D-BA6F1F731596} = {70AD2DB0-47D7-492F-817A-34BCAFD861C4}
-		{19F3DD0C-2FA6-47A5-83A3-F66D7CAA5F70} = {D21F1804-4690-4B00-BC6A-2147C14BF1B2}
-		{FFA69E3E-1168-49F1-AF95-D16C08E34BC5} = {9578BB4F-D805-4581-9AAE-A66002BFDA1F}
-		{DE9982E8-CBC6-4CD7-B322-AC0D792F7136} = {3691F0FE-6A8D-4F99-95EB-2D3AD3F9B712}
-		{687BD42C-54CD-4E80-A877-6E278AE21105} = {DA5E4C5A-E62C-47CD-9557-65F747638BAD}
-		{F0A4EEF4-EBD5-4F01-96D0-183478ECC797} = {056535BC-3E30-49E2-BE3B-630C62E641A5}
-		{BD57D455-9B11-4BA6-9F1D-6B289284642D} = {056535BC-3E30-49E2-BE3B-630C62E641A5}
-		{0C6E7B48-5D25-4E83-8958-B26DDC8E2BB3} = {3B0F71CD-980F-48DF-AEDA-A5CDF001F7A9}
-		{16F6B07A-3ECA-4BFB-ABDF-DE1D224D2AF3} = {3B0F71CD-980F-48DF-AEDA-A5CDF001F7A9}
-		{6D9C0B4C-A902-4F37-921F-1A5B14405463} = {4B6BA2CC-8DE7-4070-A912-D51375998553}
-		{59BDE9D7-C177-4A40-B1EF-267FB260A59C} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{9FF8728F-B953-4481-9B9F-11351CA0BFE6} = {59BDE9D7-C177-4A40-B1EF-267FB260A59C}
-		{586ECE45-FD14-4520-9823-0A9B043FCC6E} = {59BDE9D7-C177-4A40-B1EF-267FB260A59C}
-		{6BDD94A4-91DF-40F5-A1CE-88D46F26084F} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{08D53E58-4AAE-40C4-8497-63EC8664F304} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{5D3C520F-0CA7-4759-A563-40496545FA48} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{4F2C221D-7D0B-46B3-9362-2D68F92ECF29} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{D0E73F40-0DA9-42A9-8A88-EED8D5EFBEFB} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{6DE03095-7EAC-41DF-8AE4-3018ED29BC61} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{18CE63FC-3BFE-47DF-A8D7-9D716FEB04C9} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{A4C26078-B6D8-4FD8-87A6-7C15A3482038} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{F1A6BA04-853E-43B5-B27E-54558603837B} = {A4C26078-B6D8-4FD8-87A6-7C15A3482038}
-		{3163C56E-99BC-4BD1-8880-4F94A2407741} = {F1A6BA04-853E-43B5-B27E-54558603837B}
-		{776BFCDC-8591-4E3D-BD0D-858A188A033D} = {66A0F71A-FFB5-4763-913E-FB4A4F17EAA2}
-		{ED34C082-619E-4CCB-9D26-4E2375633FA2} = {AB316CF4-D9C3-427E-8460-7C5235BED45E}
-		{CF9D35EC-CA9B-481D-BAAC-5D4654732AB9} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
-		{31B7D2B1-47AF-432B-BF07-73916EF238EE} = {CF9D35EC-CA9B-481D-BAAC-5D4654732AB9}
-		{C75B1FB3-6BB7-411A-B76C-06E5E0C3D957} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
-		{A2A2BBB7-990D-4EDE-BDF7-C8AD5C67E5F9} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{1EA4C71B-CF8C-45A4-90A9-2F7F78A94173} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{256DCEBC-1E1D-46B2-9031-E358E850F3C5} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{1D1E165C-435A-4716-8769-31A51632D7C2} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{AD25BD40-D6D6-4D82-A700-FE2376EE27A8} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{817D138C-19D8-4264-8FAF-660B05AC030D} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{1FE68FDC-F122-4605-B49D-FDC8C17324A5} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{C4CE88C8-1E48-49FC-A344-D6EE92FC9894} = {C75B1FB3-6BB7-411A-B76C-06E5E0C3D957}
-		{45A7FB48-3811-4DAF-989C-141EE4AEFB03} = {62F3EF13-4A89-4912-A22C-31981278B074}
-		{A75C9764-FC22-4AE1-9704-5519CB556FC3} = {62F3EF13-4A89-4912-A22C-31981278B074}
-		{86741306-CF87-4AEA-9015-188A3CECBFBC} = {A75C9764-FC22-4AE1-9704-5519CB556FC3}
-		{2FBBC39E-DA8E-4B92-9A0D-3DF6D5BA9EAC} = {EB593520-0853-4642-A404-675FC318D181}
-		{6592343C-B7B7-4687-8942-1C2241414A02} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{618D85A4-F111-41AB-A9B6-BBBB8A395209} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{DA64A7BF-F869-414C-A096-076723E55C61} = {618D85A4-F111-41AB-A9B6-BBBB8A395209}
-		{974EA46A-4658-4767-A9AA-A0FF143CF725} = {14A4E3F5-04BB-4062-84AE-1A887C307B17}
-		{06C034BE-0079-4AC3-815B-D71AC44DF3A3} = {974EA46A-4658-4767-A9AA-A0FF143CF725}
-		{9DD484F7-062B-43D4-AC70-0E226BA168FF} = {974EA46A-4658-4767-A9AA-A0FF143CF725}
-		{7FD32066-C831-4E29-978C-9A2215E85C67} = {2AB4FE8F-94FF-4C6E-B12F-9E40A9FAF9AB}
-		{88C2C45B-ED16-4B85-8498-E3F13679629D} = {7FD32066-C831-4E29-978C-9A2215E85C67}
-		{E19E55A2-1562-47A7-8EA6-B51F2CA0CC4C} = {99F9BBC5-46AE-40DC-A675-5E56ACA3C5C8}
-		{F6B80862-7D74-4362-B5E2-AEBF116F2B19} = {E19E55A2-1562-47A7-8EA6-B51F2CA0CC4C}
-		{602CE06C-E973-401D-8877-90957E613646} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{BECDA951-C285-485D-BFE6-F770BC8C9EB2} = {602CE06C-E973-401D-8877-90957E613646}
-		{E1CE011A-47BD-496D-B9EB-2766C198A619} = {BECDA951-C285-485D-BFE6-F770BC8C9EB2}
-		{3BB0B48C-4ED8-48C2-B8DF-8B92354CAFB5} = {602CE06C-E973-401D-8877-90957E613646}
-		{966E6A8A-4D9C-4B9E-92DB-06F5144F5DC8} = {A39335E5-7A26-4CFD-BF3B-2CFE75113498}
-		{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F} = {966E6A8A-4D9C-4B9E-92DB-06F5144F5DC8}
-		{3FE077EF-DD37-4652-B71C-3174D4C485E2} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{A641BE9F-113E-4F2F-8DC0-995E97C5BD27} = {3FE077EF-DD37-4652-B71C-3174D4C485E2}
-		{7F67C1C2-7352-414F-9149-1F16D53C7435} = {A641BE9F-113E-4F2F-8DC0-995E97C5BD27}
-		{046AFDDE-B31B-4205-B059-0E8E194E954D} = {3FE077EF-DD37-4652-B71C-3174D4C485E2}
-		{0AEE12FF-FDFF-4A75-A77E-93B1E24E5587} = {3FE077EF-DD37-4652-B71C-3174D4C485E2}
-		{3FBD8F55-38A8-4263-A98D-AD723C6D9C44} = {0AEE12FF-FDFF-4A75-A77E-93B1E24E5587}
-		{7E4C524F-94E1-4F7F-9498-FD503BC97CEF} = {0AEE12FF-FDFF-4A75-A77E-93B1E24E5587}
-		{8A241C1B-18FA-4237-A354-29D7010C1067} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{119D3F97-535C-45BF-AC4C-FEDFE0FA5D7E} = {8A241C1B-18FA-4237-A354-29D7010C1067}
-		{148D77C2-C6DA-45FA-90A6-761EE01066D5} = {8A241C1B-18FA-4237-A354-29D7010C1067}
-		{A43BC0BA-9C01-4AEC-B763-5E5AA8C8DBAB} = {148D77C2-C6DA-45FA-90A6-761EE01066D5}
-		{451FF6F1-E6B4-42FF-A8AA-2731F3C4CCF4} = {148D77C2-C6DA-45FA-90A6-761EE01066D5}
-		{5F0044F2-4C66-46A8-BD79-075F001AA034} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{7BAE6185-D148-4388-B65F-34FD22CCD824} = {5F0044F2-4C66-46A8-BD79-075F001AA034}
-		{197EB396-53AA-4C29-8A59-3FEACD3703B6} = {7BAE6185-D148-4388-B65F-34FD22CCD824}
-		{3E3F7422-36C0-47E4-8B4E-052C2E8EB439} = {5BC5A805-DCA0-41DF-91B8-520B5DAD57DA}
-		{7A88CF78-413B-4EC7-A2E5-853C7E8075A5} = {3E3F7422-36C0-47E4-8B4E-052C2E8EB439}
-		{0D162D66-86E8-40AA-84EA-AA1EDA2482BC} = {3E3F7422-36C0-47E4-8B4E-052C2E8EB439}
-		{294EC05D-B818-4CD5-AF6E-95B3F23607FC} = {3E3F7422-36C0-47E4-8B4E-052C2E8EB439}
-		{892333B9-689B-4E51-82FF-CC5376961A36} = {3E3F7422-36C0-47E4-8B4E-052C2E8EB439}
-		{4D4CB590-9F66-4D75-B439-D3B445975A55} = {3E3F7422-36C0-47E4-8B4E-052C2E8EB439}
-		{3D423A77-84D4-4214-8F6F-CD532A56A126} = {0338EC37-E5AD-47DA-9502-24A5F7433ADE}
-		{4C8F04E9-24EC-496B-88FA-62DE096F1C3D} = {3D423A77-84D4-4214-8F6F-CD532A56A126}
-		{257A6551-7987-4C5C-BE6F-376094477371} = {3E3F7422-36C0-47E4-8B4E-052C2E8EB439}
-		{350A2B0C-246F-4CC1-A194-32DF8C4427A2} = {A6D39EEA-CC08-4ECF-BD2E-134D845876FB}
-		{5236B5B7-E2CD-4D20-A65C-D5803E78885F} = {350A2B0C-246F-4CC1-A194-32DF8C4427A2}
-		{CACBB755-08B6-4176-9390-CAD3F9962E80} = {350A2B0C-246F-4CC1-A194-32DF8C4427A2}
-		{B84D149A-3DD6-47EA-B78E-D36EF2379D6B} = {A0FFAF00-D628-4BDB-BE68-8DBA21FBBEA2}
-		{75F3739D-9404-44B0-8F1F-1BDE4542047A} = {DF5E3AC1-94B3-4B8A-B534-9D30924A8E6B}
-		{5095E70C-6DEE-486E-A9D0-E8849214EE4E} = {5BC5A805-DCA0-41DF-91B8-520B5DAD57DA}
-		{A6A95BEF-7E21-4D3D-921B-F77267219D27} = {5095E70C-6DEE-486E-A9D0-E8849214EE4E}
-		{4DC9C494-9867-4319-937E-5FBC0E5F5A51} = {B6081DA9-738E-4088-92DD-7FFA200523C9}
-		{245939DA-D68D-4B5C-A95E-D3B6923614FF} = {2C022280-340C-43DC-B63D-5A644F0ECBF2}
-		{39CB00C0-D775-4DEC-BEAA-94234BA8A1FE} = {245939DA-D68D-4B5C-A95E-D3B6923614FF}
-		{CD9041EE-8C47-4C6F-8A21-6EDCBC0D409E} = {2C022280-340C-43DC-B63D-5A644F0ECBF2}
-		{DEA32B7F-E9B4-4E87-8B47-30555D286D93} = {CD9041EE-8C47-4C6F-8A21-6EDCBC0D409E}
-		{6248B017-2912-4989-9994-2685C4D88E9A} = {CD9041EE-8C47-4C6F-8A21-6EDCBC0D409E}
-		{4C93CC04-1EE4-48EA-8FAE-DC2283528BEB} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{AA2F0EF8-FB46-4F05-89D4-025F348ABDD2} = {4C93CC04-1EE4-48EA-8FAE-DC2283528BEB}
-		{FED63417-432B-49CD-AB4B-44ADA837C2E7} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{898F7E0B-1671-42CB-9DFB-689AFF212ED3} = {FED63417-432B-49CD-AB4B-44ADA837C2E7}
-		{65EE0531-4533-407F-A9CA-2EBCDC444397} = {898F7E0B-1671-42CB-9DFB-689AFF212ED3}
-		{0B200A66-B809-4ED3-A790-CB1C2E80975E} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{A4EECF29-6E66-4E7F-B781-A169B0C2AB29} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{52433D20-35EA-48CC-BB4A-4DFE3023670B} = {A4EECF29-6E66-4E7F-B781-A169B0C2AB29}
-		{8562A154-B802-411B-897C-89621C4B05CB} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{C911DC19-9556-4DCC-9794-AD907137348F} = {8562A154-B802-411B-897C-89621C4B05CB}
-		{F31AC68C-2D71-492C-BA4B-41FE503FFD56} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{4E6AFAD6-C0B7-47AD-8C16-D903CCA4AE73} = {F31AC68C-2D71-492C-BA4B-41FE503FFD56}
-		{4FB3DFA0-3124-474B-A908-694DF4FC1ABB} = {F31AC68C-2D71-492C-BA4B-41FE503FFD56}
-		{192363C9-2D7B-47BD-A1A3-C6FEC6DF5D9D} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{4655E193-E5F4-449B-B1A3-6358AC8D3A27} = {192363C9-2D7B-47BD-A1A3-C6FEC6DF5D9D}
-		{7A29AAAB-2B4B-4D47-A315-23A0E830E214} = {192363C9-2D7B-47BD-A1A3-C6FEC6DF5D9D}
-		{755D9C6A-F036-4122-8334-96F0CC70F370} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{AB8C9BF4-3134-449B-BA3F-BAFDE9394491} = {755D9C6A-F036-4122-8334-96F0CC70F370}
-		{3CE23673-047A-47AA-A028-7F2942805870} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{7B1E6D8C-2658-4FD2-8BB2-672E9E56872F} = {3CE23673-047A-47AA-A028-7F2942805870}
-		{BE2C2FE4-7BC7-4A4B-A8B8-19FF0648DEFD} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{EBE144DD-577E-4E98-BFEB-94E479753927} = {BE2C2FE4-7BC7-4A4B-A8B8-19FF0648DEFD}
-		{A1B75FC7-A777-4412-A635-D0C9ED8FE7A0} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{DD63EA3C-929C-48FF-8E8A-8F3CC553E93B} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
-		{34E40892-48C1-4D3D-AB49-FAC3C4C00B42} = {755D9C6A-F036-4122-8334-96F0CC70F370}
-		{E5BE8CB1-57A8-48FD-9904-76A8C6B540BC} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{A8A42FB4-1B51-4290-9291-445D3A489758} = {E5BE8CB1-57A8-48FD-9904-76A8C6B540BC}
-		{3C8D5C14-F27B-4657-93C2-AC0E94EE683F} = {E5BE8CB1-57A8-48FD-9904-76A8C6B540BC}
-		{9883418F-C427-426E-9021-E3F1BAF33E6B} = {5FF36127-063D-4D3E-9429-3BFD32713FEE}
-		{49016328-4D32-46E4-A4D2-94686ED38EA2} = {166E48ED-9738-4E13-8618-0D805F6F0F65}
-		{A34041A8-20B9-4DE8-B336-8A900BDAD4EF} = {49016328-4D32-46E4-A4D2-94686ED38EA2}
-		{31405D54-645D-490B-9041-88119D8B1B47} = {49016328-4D32-46E4-A4D2-94686ED38EA2}
-		{689FE2B6-EDEE-477D-9F4F-91B0B2E73F4D} = {49016328-4D32-46E4-A4D2-94686ED38EA2}
-		{C3722C5D-E159-4AB3-AF60-769185B31B47} = {166E48ED-9738-4E13-8618-0D805F6F0F65}
-		{10959BB7-197C-4DE1-A2F2-CA9445E3591F} = {C3722C5D-E159-4AB3-AF60-769185B31B47}
-		{3297D10B-B32A-4F70-8200-2B727C759C8D} = {C3722C5D-E159-4AB3-AF60-769185B31B47}
-		{8EAE1C36-4A33-4A96-BACD-3FDC35844249} = {49016328-4D32-46E4-A4D2-94686ED38EA2}
-		{41BB7BA4-AC08-4E9A-83EA-6D587A5B951C} = {33CAD745-5912-47D3-BAF3-5AE580FED275}
-		{C0B46E28-F6BB-45C7-A7B1-9E294FCB0895} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{B49E037F-1F0A-46CA-9977-1987465C306C} = {33CAD745-5912-47D3-BAF3-5AE580FED275}
-		{D07B2752-8919-4CFE-8438-DFAFE91A4AB0} = {B49E037F-1F0A-46CA-9977-1987465C306C}
-		{ABC4EF1D-3525-41A9-929D-0FF7CEED4DDB} = {33CAD745-5912-47D3-BAF3-5AE580FED275}
-		{65EC29AD-91CA-49BA-B1FC-D3DF127BE887} = {ABC4EF1D-3525-41A9-929D-0FF7CEED4DDB}
-		{45A023F9-C7E7-42CA-968B-5FCE9EC626BC} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{8A6992D5-478C-49E4-936F-EA97E5850A7D} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{7107FC61-E540-4946-A090-A0E0D8357505} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{514D41F9-8D97-49A6-8C7A-74545358E2CD} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{1B635E97-715B-4F8D-AE58-4553C7B07016} = {EE74FCEC-542A-4B66-B0A9-49B28049C203}
-		{F8AB0D33-1082-4F41-90E7-77C06EDD983D} = {1B635E97-715B-4F8D-AE58-4553C7B07016}
-		{4BBD404C-5588-49C4-A320-C5B1D3532B18} = {EE74FCEC-542A-4B66-B0A9-49B28049C203}
-		{647F0202-165F-4E98-A798-B2B3113050EC} = {4BBD404C-5588-49C4-A320-C5B1D3532B18}
-		{0C3C1602-BE06-4DDE-835F-A0DE1563808B} = {D69B5668-86EF-4CC5-814B-113BAF740DD0}
-		{1F6EC9ED-55DB-42E9-BA01-F7C3A27581FF} = {89472057-8BB2-44A8-B0FC-D9F3ADB1181C}
-		{C69630AA-7BCC-401E-B0EE-AACFCF55F6A8} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{51A02E3E-6932-479C-A287-CC6C3611B715} = {C69630AA-7BCC-401E-B0EE-AACFCF55F6A8}
-		{7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{7542D11F-2401-457C-992B-0473ADBD7842} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{ADFCDE19-5A3D-482D-8133-B7F419D96668} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{B43F63FE-0957-42A1-8431-B2D6E4F2958E} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{F9ED6D85-7A8D-45A6-808F-5BC0AAFC22D2} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{73788491-F1D6-41C7-838B-F9E8060E7FB9} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{47EF1A9F-89DB-4EBA-9BC1-1D4E0E12DE44} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{6E3A74C9-EF79-45A0-AA3A-76411AA06A05} = {47EF1A9F-89DB-4EBA-9BC1-1D4E0E12DE44}
-		{2C7F02B9-2994-4B5B-BB97-0896BCB64101} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{AB6F5423-8D5E-4A9A-BA18-3AD004CD6753} = {2C7F02B9-2994-4B5B-BB97-0896BCB64101}
-		{3EE7F5FE-4376-442D-BA77-82AD531DBFBF} = {47EF1A9F-89DB-4EBA-9BC1-1D4E0E12DE44}
-		{71568623-71F9-4110-ACE2-093CD0DA911C} = {47EF1A9F-89DB-4EBA-9BC1-1D4E0E12DE44}
-		{EDE77D0C-321A-49FD-95D7-56ED41242A93} = {47EF1A9F-89DB-4EBA-9BC1-1D4E0E12DE44}
-		{8BDEC645-73BD-453B-8A5C-D616BC4EA08D} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{EE9D0952-6060-4723-B329-94A2950A6762} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{132D43A2-067A-4E24-A520-45B9F14DCB8E} = {EE9D0952-6060-4723-B329-94A2950A6762}
-		{2EC4E939-513F-44CD-A956-498966EAC929} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{987E1C29-F124-40C8-8E6F-1B2B6A4CB62A} = {A5946454-4788-4871-8F23-A9471D55F115}
-		{3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643} = {0ACCEDA7-339C-4B4D-8DD4-1AC271F31C04}
-		{48E64014-B249-4644-8AEB-CDEE8ABA0DC2} = {3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643}
-		{6126DCE4-9692-4EE2-B240-C65743572995} = {0508E463-0269-40C9-B5C2-3B600FB2A28B}
-		{46FB7E93-1294-4068-B80A-D4864F78277A} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{25FA84DB-EEA7-4068-8E2D-F3D48B281C16} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{19974360-4A63-425A-94DB-C2C940A3A97A} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{ADF9C126-F322-4E34-AFD3-E626A4487206} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{8A59AF88-4A82-46ED-977D-D909001F8107} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{E235DAAD-FE73-469E-B16F-F2B8E872E217} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{CE5D01C2-6BBD-4F33-A1C4-A1479DA99CAD} = {E235DAAD-FE73-469E-B16F-F2B8E872E217}
-		{00B2DD87-7E2A-4460-BE1B-5E18B1062B7F} = {E763DA15-8F4E-446C-99B8-309053C75598}
-		{C3A0F425-669F-46A8-893F-CF449A6DAE56} = {00B2DD87-7E2A-4460-BE1B-5E18B1062B7F}
-		{19189670-E206-471D-94F8-7D3D545E5020} = {00B2DD87-7E2A-4460-BE1B-5E18B1062B7F}
-		{E9408723-E6A9-4715-B906-3B25B0238ABA} = {6276A9A0-791B-49C1-AD8F-50AC47CDC196}
-		{8DA61885-B95E-4BA1-A752-C79B6597FC44} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{D62AF49B-F9FE-4794-AC39-A473FF13CA81} = {D67E977E-75DF-41EE-8315-6DBF5C2B7357}
-		{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{55494E58-E061-4C4C-A0A8-837008E72F85} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{CAC1267B-8778-4257-AAC6-CAF481723B01} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{D57EA297-6DC2-4BC0-8C91-334863327863} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{1533E271-F61B-441B-8B74-59FB61DF0552} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{7E268085-1046-4362-80CB-2977FF826DCA} = {D62AF49B-F9FE-4794-AC39-A473FF13CA81}
-		{7D2B0799-A634-42AC-AE77-5D167BA51389} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{9788C76F-658B-4441-88F8-22C6B86FAD27} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{1970D5CD-D9A4-4673-A297-179BB04199F4} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{A40350FE-4334-4007-B1C3-6BEB1B070309} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{A40350FE-4334-4007-B1C3-6BEB1B070308} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{F1792637-28B9-4F2A-B318-FA923C365049} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{C1E7F837-6988-43E2-9E1C-7302DB484F99} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E} = {C1E7F837-6988-43E2-9E1C-7302DB484F99}
-		{7CB09412-C9B0-47E8-A8C3-311AA4CFDE04} = {C1E7F837-6988-43E2-9E1C-7302DB484F99}
-		{22D7D74B-565D-4047-97B4-F149B1A13350} = {2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E}
-		{B06040BC-DA28-4923-8CAC-20EB517D471B} = {22D7D74B-565D-4047-97B4-F149B1A13350}
-		{55CACC1F-FE96-47C8-8073-91F4CAA55C75} = {2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E}
-		{7509AA1E-3093-4BEE-984F-E11579E98A11} = {7CB09412-C9B0-47E8-A8C3-311AA4CFDE04}
-		{DAAB6B35-CBD2-4573-B633-CDD42F583A0E} = {16898702-3E33-41C1-B8D8-4CE3F1D46BD9}
-		{498A4F54-F11A-46C5-A58D-09DE56C6A034} = {AEB1933E-9369-4305-B20E-F186F888158F}
-		{AEB1933E-9369-4305-B20E-F186F888158F} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{B9D37BCF-80D1-489D-9FC6-55191FDBB033} = {AEB1933E-9369-4305-B20E-F186F888158F}
-		{8C15FD04-7F90-43FC-B488-023432FE3CE1} = {FED63417-432B-49CD-AB4B-44ADA837C2E7}
-		{37329855-01B8-4B03-9765-1A941B06E43C} = {8C15FD04-7F90-43FC-B488-023432FE3CE1}
-		{D3246226-BC1A-47F1-8E3E-C3380A8F13FB} = {8C15FD04-7F90-43FC-B488-023432FE3CE1}
-		{B06ADD57-E855-4D8C-85DC-B323509AE540} = {898F7E0B-1671-42CB-9DFB-689AFF212ED3}
-		{BAD47859-95DF-4C8F-9AF7-C48B68F478A1} = {A4C26078-B6D8-4FD8-87A6-7C15A3482038}
-		{010A9638-F20E-4FE6-A186-85732BFC9CB0} = {A4C26078-B6D8-4FD8-87A6-7C15A3482038}
-		{3D34C81F-2CB5-459E-87E9-0CC04757A2A0} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{04CFE286-6D32-41EF-8887-4B5F8086A365} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{FEF97646-9BC9-4D1B-A939-784D915C18A4} = {3D34C81F-2CB5-459E-87E9-0CC04757A2A0}
-		{839CE175-E0D9-43B9-9FA8-F32C47E7F56B} = {3D34C81F-2CB5-459E-87E9-0CC04757A2A0}
-		{50BF2926-7435-4F4B-88A9-3D0EDEB67FC8} = {3D34C81F-2CB5-459E-87E9-0CC04757A2A0}
-		{16B899B4-A4F4-4EF7-93BB-355861977A12} = {3D34C81F-2CB5-459E-87E9-0CC04757A2A0}
-		{3EAB9890-2C01-444C-ACA0-D77B29CDE08B} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{3E29454A-C4DC-44B7-AF0A-A782AD2E73BC} = {3EAB9890-2C01-444C-ACA0-D77B29CDE08B}
-		{43E3B132-2486-44A3-92C6-39E39724FAFD} = {3EAB9890-2C01-444C-ACA0-D77B29CDE08B}
-		{7B739F28-21DE-435D-9EA6-579064932350} = {17DD5861-0635-46D0-84BA-6B163150AA4F}
-		{F502ED22-EB37-4EF8-BFA0-3EFB3E2BE20C} = {7B739F28-21DE-435D-9EA6-579064932350}
-		{0EBEE047-CBAD-4A69-8095-E3961B863446} = {7B739F28-21DE-435D-9EA6-579064932350}
-		{B4F76DF0-1638-42DA-B46A-30DC16AECEAB} = {7B739F28-21DE-435D-9EA6-579064932350}
-		{DFC4F588-B4B4-484B-AB93-B36721374AD3} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{48FF1D87-5066-4294-B802-2D1B478C6EB6} = {DFC4F588-B4B4-484B-AB93-B36721374AD3}
-		{563A3FFA-32DA-4ADA-891C-E00897BD919E} = {48FF1D87-5066-4294-B802-2D1B478C6EB6}
-		{DC5DE087-5C93-4441-9D62-1743A50E5086} = {48FF1D87-5066-4294-B802-2D1B478C6EB6}
-		{F00CE8C1-5715-4683-A8E5-C467B712AD46} = {DFC4F588-B4B4-484B-AB93-B36721374AD3}
-		{56B45580-B089-424E-A847-A6115D591950} = {DFC4F588-B4B4-484B-AB93-B36721374AD3}
-		{4382555A-E4CD-4DFC-B59B-408FD4E93530} = {56B45580-B089-424E-A847-A6115D591950}
-		{545751D5-71FC-4889-A3A0-BBD731DBA18A} = {56B45580-B089-424E-A847-A6115D591950}
-		{E83B0BCC-A8E0-4FBD-BE51-9A533C9CB972} = {DFC4F588-B4B4-484B-AB93-B36721374AD3}
-		{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21} = {E83B0BCC-A8E0-4FBD-BE51-9A533C9CB972}
-		{E2461809-D2EA-436D-B5C3-8A9EE0A283B8} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{C1CDD339-B51B-42BE-99F2-F39A4EC0D404} = {BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1}
-		{BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1} = {1A304CA0-7795-4684-88E5-E66402966927}
-		{399EF81E-C3B5-4D86-8BF1-DC7926252A63} = {05A169C7-4F20-4516-B10A-B13C5649D346}
-		{0F39820F-F4A5-41C6-9809-D79B68F032EF} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{8DFA596B-BD00-404E-9445-BCFAC65BDC34} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{4FB95E16-918B-49C1-9F65-49D07CDE072C} = {8DFA596B-BD00-404E-9445-BCFAC65BDC34}
-		{8001580F-B702-404B-A0FD-13538DDB9672} = {8DFA596B-BD00-404E-9445-BCFAC65BDC34}
-		{43ED0D49-E29A-4B12-8D10-531E006038E5} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
-		{A7B8F295-AD6E-42C1-A215-17337033EBE9} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
-		{A19F94D3-0C6A-429D-811A-7A750AAD122A} = {43ED0D49-E29A-4B12-8D10-531E006038E5}
-		{20CA28CC-FCDB-49F3-8452-5036E0BADCA7} = {43ED0D49-E29A-4B12-8D10-531E006038E5}
-		{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D} = {A7B8F295-AD6E-42C1-A215-17337033EBE9}
-		{14DBB385-A1B1-49B2-A737-4DF90E127E5A} = {A7B8F295-AD6E-42C1-A215-17337033EBE9}
-		{5FD94164-7D13-4618-93AD-7346B0EA0CDD} = {C1409A8F-555A-4A88-B803-C6D3E8B6C3B0}
-		{5C50FA92-5488-4470-B42E-48EFEBA51D5A} = {34465A80-3BAF-4059-81B3-9090C0DB598F}
-		{34465A80-3BAF-4059-81B3-9090C0DB598F} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
-		{9B8F871E-ED33-4D2F-AA49-E39D9299EC85} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{7F295396-DBBD-40A5-A645-10004D1324DA} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{22EA0993-8DFC-40C2-8481-8E85E21EFB56} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{8F33439F-5532-45D6-8A44-20EF9104AA9D} = {5F0044F2-4C66-46A8-BD79-075F001AA034}
-		{B739074E-6652-4F5B-B37E-775DC2245FEC} = {8F33439F-5532-45D6-8A44-20EF9104AA9D}
-		{3B375FFC-1E38-453E-A26D-A510CCD3339E} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{71287382-95EF-490D-A285-87196E29E88A} = {562D5067-8CD8-4F19-BCBB-873204932C61}
-		{B4226BE2-DCB7-40C5-93F2-94C9BD6F4394} = {71287382-95EF-490D-A285-87196E29E88A}
-		{8F6F73F7-0DDA-4AA3-9887-2FB0141786AC} = {B4226BE2-DCB7-40C5-93F2-94C9BD6F4394}
-		{1A5582DD-06F4-4427-BFDC-B021A84A01BC} = {B4226BE2-DCB7-40C5-93F2-94C9BD6F4394}
-		{E18EF144-9C2C-4366-B54C-09ACF7692A4F} = {B4226BE2-DCB7-40C5-93F2-94C9BD6F4394}
-		{C445B129-0A4D-41F5-8347-6534B6B12303} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{3F752B48-2936-4FCA-B0DC-4AB0F788F897} = {DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5}
-		{262FF30C-34B4-462D-B5E2-0DABB9196E40} = {C1409A8F-555A-4A88-B803-C6D3E8B6C3B0}
-		{0A064174-8E5C-4F97-B941-A4E302661DF2} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{5AC2A052-1D4F-4C2F-BCF5-3F07A3E31857} = {0A064174-8E5C-4F97-B941-A4E302661DF2}
-		{0DBACF8E-2EDB-47FC-B998-B76522637B2E} = {5AC2A052-1D4F-4C2F-BCF5-3F07A3E31857}
-		{7F99E967-3DC1-4198-9D55-47CD9471D0B6} = {0A064174-8E5C-4F97-B941-A4E302661DF2}
-		{DF4637DA-5F07-4903-8461-4E2DAB235F3C} = {7F99E967-3DC1-4198-9D55-47CD9471D0B6}
-		{AAB50C64-39AA-4AED-8E9C-50D68E7751AD} = {7F99E967-3DC1-4198-9D55-47CD9471D0B6}
-		{9647D8B7-4616-4E05-B258-BAD5CAEEDD38} = {EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}
-		{11BE4471-6C3D-4758-881A-97B6A16F21F6} = {EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}
-		{022B4B80-E813-4256-8034-11A68146F4EF} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{FF413F1C-A998-4FA2-823F-52AC0916B35C} = {022B4B80-E813-4256-8034-11A68146F4EF}
-		{3A1EC883-EF9C-43E8-95E5-6B527428867B} = {022B4B80-E813-4256-8034-11A68146F4EF}
-		{908B2263-B58B-4261-A125-B5F2DFF92799} = {022B4B80-E813-4256-8034-11A68146F4EF}
-		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52} = {EE9D0952-6060-4723-B329-94A2950A6762}
-		{17F28812-983E-4415-A55D-842DD7EC6887} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{A07D3B13-388B-444F-9E37-DDC0787C4690} = {17F28812-983E-4415-A55D-842DD7EC6887}
-		{09FFBC53-3EFF-45C4-9822-5D66089CD6AD} = {17F28812-983E-4415-A55D-842DD7EC6887}
-		{3044DFA5-DE4F-44D8-8DD8-EDF547BE513E} = {C445B129-0A4D-41F5-8347-6534B6B12303}
-		{4BD6F0DB-BE9C-4C54-B52A-D20B88855ED5} = {C445B129-0A4D-41F5-8347-6534B6B12303}
-		{6CCCF618-2E70-4870-B39F-32C016FE08F0} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{B730328F-D9E9-4EAA-B28E-4631A14095F9} = {C445B129-0A4D-41F5-8347-6534B6B12303}
-		{44963D50-8B58-44E6-918D-788BCB406695} = {B730328F-D9E9-4EAA-B28E-4631A14095F9}
-		{3EC71A0E-6515-4A5A-B759-F0BCF1BCFC56} = {44963D50-8B58-44E6-918D-788BCB406695}
-		{558C46DE-DE16-41D5-8DB7-D6D748E32977} = {3EC71A0E-6515-4A5A-B759-F0BCF1BCFC56}
-		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD} = {44963D50-8B58-44E6-918D-788BCB406695}
-		{5C641396-7E92-4F5C-A5A1-B4CDF480539B} = {088C37A5-30D2-40FB-B031-D163CFBED006}
-		{323C3EB6-1D15-4B3D-918D-699D7F64DED9} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
-		{092EA9F6-84D4-41EF-A618-BDA50A0E10A8} = {323C3EB6-1D15-4B3D-918D-699D7F64DED9}
-		{F599EAA6-399F-4A91-9B1F-D311305B43D9} = {323C3EB6-1D15-4B3D-918D-699D7F64DED9}
-		{17459B97-1AA3-4154-83D3-C6BDC9FA3F85} = {022B4B80-E813-4256-8034-11A68146F4EF}
-		{4FC50620-4C8B-495F-859C-BFACAD158033} = {2637A22F-182F-4659-A394-C9BC1514B321}
-		{E090F82D-8345-477E-92E8-F724F08ADC56} = {4FC50620-4C8B-495F-859C-BFACAD158033}
-		{514726D2-3D2E-44C1-B056-163E37DE3E8B} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{48526D13-69E2-4409-A57B-C3FA3C64B4F7} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
-		{835A4E0F-A697-4B69-9736-3E99D163C4B9} = {48526D13-69E2-4409-A57B-C3FA3C64B4F7}
-		{148A5B4F-C8A3-4468-92F6-51DB5641FB49} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{6D365C86-3158-49F5-A21D-506C1E06E870} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
-		{4DA84F2B-1948-439B-85AB-E99E31331A9C} = {A4C26078-B6D8-4FD8-87A6-7C15A3482038}
-		{B5D98AEB-9409-4280-8225-9C1EC6A791B2} = {4DA84F2B-1948-439B-85AB-E99E31331A9C}
-		{2A150BE3-D7DC-4E2A-8399-6EBAB77DEF00} = {B5D98AEB-9409-4280-8225-9C1EC6A791B2}
-		{D5F4D764-887D-4EB3-8D00-FCBE23FFDBBC} = {B5D98AEB-9409-4280-8225-9C1EC6A791B2}
-		{40F493E2-FE59-4787-BE44-3AED39D585BF} = {F43CC5EA-6032-4A11-A9B2-6D48CB5EB082}
-		{97F9F7E9-56DA-49FE-B672-499E68EBB9DA} = {41B519F7-CF19-4FB4-B96C-E38A7EF45F70}
-		{6F335C66-C1D6-45FA-8529-6503B7CD42CC} = {97F9F7E9-56DA-49FE-B672-499E68EBB9DA}
-		{71A54D7F-245F-43C2-B429-342D80AC6F23} = {97F9F7E9-56DA-49FE-B672-499E68EBB9DA}
-		{75F11BE7-E2AF-43E0-B7B3-1B86D70AD950} = {97F9F7E9-56DA-49FE-B672-499E68EBB9DA}
-		{DD02AEBD-FA05-40AE-AEA7-3E0BE6C5B2DC} = {97F9F7E9-56DA-49FE-B672-499E68EBB9DA}
-		{B2D7BD12-5BDF-47F5-A55B-4A09D705731F} = {97F9F7E9-56DA-49FE-B672-499E68EBB9DA}
-		{FD819B29-9EFE-4102-BD0A-375A63051458} = {97F9F7E9-56DA-49FE-B672-499E68EBB9DA}
-		{18AE79DF-54D1-423A-99A1-2F54CAC3F4EC} = {8EFA9CC7-D03D-4535-898C-F3B80BB19F21}
-		{53EA8180-8942-4D16-B92A-C5D3813D47CE} = {18AE79DF-54D1-423A-99A1-2F54CAC3F4EC}
-		{B5E22428-DAD8-4275-B8F0-14EC2174DDFE} = {C9E481E5-F77D-4462-8E85-1F7FF2DCAA97}
-		{B73AF959-3560-4DB2-9BC7-E1F4441D6AA2} = {B5E22428-DAD8-4275-B8F0-14EC2174DDFE}
-		{C397F73C-CADC-460E-9B27-71230B9C291E} = {B5E22428-DAD8-4275-B8F0-14EC2174DDFE}
-		{3F0C05F5-47EF-4896-8D32-4C80C4563286} = {B5E22428-DAD8-4275-B8F0-14EC2174DDFE}
-		{83FA6123-6EC3-47F3-A0DC-A10225B5EB16} = {45211BB8-4F51-427D-ADA2-7478E3398A60}
-		{9B240135-3D1E-4EE6-B870-D810F3C856FB} = {83FA6123-6EC3-47F3-A0DC-A10225B5EB16}
-		{5E46DC83-C39C-4E3A-B242-C064607F4367} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{7C27E72F-54D0-4820-8CFA-5E4BE640974B} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
-		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
-		{B54A8F61-60DE-4AD9-87CA-D102F230678E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
-		{D30A658D-61F6-444B-9AC7-F66A1A1B86B6} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
-		{31854B06-DC6B-4416-97C3-559CC390B8B4} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
-		{C681D730-4505-42C6-9E6C-87F757C4FB32} = {31854B06-DC6B-4416-97C3-559CC390B8B4}
-		{D6C54D8B-043F-4877-B751-60E7390F9EC6} = {31854B06-DC6B-4416-97C3-559CC390B8B4}
-		{5244BC49-2568-4701-80A6-EAB8950AB5FA} = {31854B06-DC6B-4416-97C3-559CC390B8B4}
-		{6F1B115C-1903-40CB-837D-7961AB610F4E} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
-		{56DFE643-7F0F-40C8-9F7F-8EA5357781EF} = {3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643}
-		{E0BE6B86-F8DB-405D-AC05-78C8C9D3857D} = {C3722C5D-E159-4AB3-AF60-769185B31B47}
-		{8EB0B983-8851-4565-B92F-366F1B126E61} = {C3722C5D-E159-4AB3-AF60-769185B31B47}
-		{93D3CC76-9FA9-4198-B49D-54BA918105EE} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{6C06163A-80E9-49C1-817C-B391852BA563} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{CC45FA2D-128B-485D-BA6D-DFD9735CB3C3} = {6C06163A-80E9-49C1-817C-B391852BA563}
-		{825BCF97-67A9-4834-B3A8-C3DC97A90E41} = {CC45FA2D-128B-485D-BA6D-DFD9735CB3C3}
-		{DC349A25-0DBF-4468-99E1-B95C22D3A7EF} = {CC45FA2D-128B-485D-BA6D-DFD9735CB3C3}
-		{AA5ABFBC-177C-421E-B743-005E0FD1248B} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{5D5A3B60-A014-447C-9126-B1FA6C821C8D} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
-		{B5AC1D8B-9D43-4261-AE0F-6B7574656F2C} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
-		{C3FFA4E4-0E7E-4866-A15F-034245BFD800} = {B5AC1D8B-9D43-4261-AE0F-6B7574656F2C}
-		{5465F96F-33D5-454E-9C40-494E58AEEE5D} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{97996D39-7722-4AFC-A41A-AD61CA7A413D} = {5465F96F-33D5-454E-9C40-494E58AEEE5D}
-		{37144E52-611B-40E8-807C-2821F5A814CB} = {5465F96F-33D5-454E-9C40-494E58AEEE5D}
-		{559FE354-7E08-4310-B4F3-AE30F34DEED5} = {5465F96F-33D5-454E-9C40-494E58AEEE5D}
-		{94F95276-7CDF-44A8-B159-D09702EF6794} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{EA7D844B-C180-41C7-9D55-273AD88BF71F} = {94F95276-7CDF-44A8-B159-D09702EF6794}
-		{7A331A1C-E2C4-4E37-B0A0-B5AA10661229} = {8DAC59BE-CB96-4F04-909C-56C22E7665EB}
-		{DD076DDA-7956-4361-A7D4-2B8025AB3DFD} = {8DAC59BE-CB96-4F04-909C-56C22E7665EB}
-		{5CDB8ABC-9DD0-4A9F-8948-EED5FFE89F67} = {DD076DDA-7956-4361-A7D4-2B8025AB3DFD}
-		{151E6F9E-107B-4DDC-A2B1-95115801FD14} = {DD076DDA-7956-4361-A7D4-2B8025AB3DFD}
-		{B43BE3EB-9846-4484-88D8-05165202A0FC} = {DD076DDA-7956-4361-A7D4-2B8025AB3DFD}
-		{9A8AE587-A3DB-4211-8354-430C4CCBEB9B} = {B43BE3EB-9846-4484-88D8-05165202A0FC}
-		{2E28881D-A188-47AF-800A-B5877AD8C288} = {9A8AE587-A3DB-4211-8354-430C4CCBEB9B}
-		{A53696E8-6065-41BA-84FB-E89E0DACFF6C} = {9A8AE587-A3DB-4211-8354-430C4CCBEB9B}
-		{109C702D-DACE-4F82-A490-15E5AFA94005} = {151E6F9E-107B-4DDC-A2B1-95115801FD14}
-		{E3C5FAD2-8AB7-47C8-AAFD-8262551A5D11} = {151E6F9E-107B-4DDC-A2B1-95115801FD14}
-		{90CF4DC6-AC53-459F-9EAB-623A11EADAA3} = {B43BE3EB-9846-4484-88D8-05165202A0FC}
-		{F18E97AE-3A3F-424D-8DC2-4D001A167F98} = {B43BE3EB-9846-4484-88D8-05165202A0FC}
-		{8C3E422A-F281-4B93-A567-88C7A1ED0412} = {B43BE3EB-9846-4484-88D8-05165202A0FC}
-		{EB14F068-AD55-4970-B9B4-1FBE33704243} = {5CDB8ABC-9DD0-4A9F-8948-EED5FFE89F67}
-		{B7DAA48B-8E5E-4A5D-9FEB-E6D49AE76A04} = {41BB7BA4-AC08-4E9A-83EA-6D587A5B951C}
-		{489020F2-80D9-4468-A5D3-07E785837A5D} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{8FED7E65-A7DD-4F13-8980-BF03E77B6C85} = {489020F2-80D9-4468-A5D3-07E785837A5D}
-		{046F43BC-BEE4-48B7-8C09-ED0A1054A2D7} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
-		{9716D0D0-2251-44DD-8596-67D253EEF41C} = {323C3EB6-1D15-4B3D-918D-699D7F64DED9}
-		{2299CCD8-8F9C-4F2B-A633-9BF4DA81022B} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
-		{8EE73488-2B92-42BD-96C9-0DD65405C828} = {1D865E78-7A66-4CA9-92EE-2B350E45281F}
-		{41FF4F96-98D2-4482-A2A7-4B179E80D285} = {1D865E78-7A66-4CA9-92EE-2B350E45281F}
-		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F} = {0F84F170-57D0-496B-8E2C-7984178EF69F}
-		{487EF7BE-5009-4C70-B79E-45519BDD9603} = {412D4C15-F48F-4DB1-940A-131D1AA87088}
-		{1D865E78-7A66-4CA9-92EE-2B350E45281F} = {E5963C9F-20A6-4385-B364-814D2581FADF}
-		{3309FA1E-4E95-49E9-BE2A-827D01FD63C0} = {5465F96F-33D5-454E-9C40-494E58AEEE5D}
-		{B34CB502-0286-4939-B25F-45998528A802} = {AB4B9E75-719C-4589-B852-20FBFD727730}
-		{AB4B9E75-719C-4589-B852-20FBFD727730} = {0B200A66-B809-4ED3-A790-CB1C2E80975E}
-		{7F079E92-32D5-4257-B95B-CFFB0D49C160} = {7FD32066-C831-4E29-978C-9A2215E85C67}
-		{89896261-C5DD-4901-BCA7-7A5F718BC008} = {AB4B9E75-719C-4589-B852-20FBFD727730}
-		{F0FBA346-D8BC-4FAE-A4B2-85B33FA23055} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{A5946454-4788-4871-8F23-A9471D55F115} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD} = {0BB58FB6-8B66-4C6D-BA8A-DF3AFAF9AB8F}
-		{0BB58FB6-8B66-4C6D-BA8A-DF3AFAF9AB8F} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{7CA0A9AF-9088-471C-B0B6-EBF43F21D3B9} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{91C3C03E-EA56-4ABA-9E73-A3DA4C2833D9} = {1D865E78-7A66-4CA9-92EE-2B350E45281F}
-		{F4A9CC79-5FE3-4F2B-9CC3-7F42DEDB4853} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{07FDBE0D-B7A1-43DE-B120-F699C30E7CEF} = {E19E55A2-1562-47A7-8EA6-B51F2CA0CC4C}
-		{BA649043-EF2B-42DC-B422-A46127BE8296} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
-		{3A6FD623-F7F3-404B-8A39-CAFB40CA6A08} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
-		{890B5210-48EF-488F-93A2-F13BCB07C780} = {4DA84F2B-1948-439B-85AB-E99E31331A9C}
-		{A8E2AB77-8F57-47C2-A961-2F316793CAFF} = {890B5210-48EF-488F-93A2-F13BCB07C780}
-		{F43CC5EA-6032-4A11-A9B2-6D48CB5EB082} = {4DA84F2B-1948-439B-85AB-E99E31331A9C}
-		{74377D3E-E0C6-41A4-89ED-11A9C00142A9} = {166E48ED-9738-4E13-8618-0D805F6F0F65}
-		{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB} = {74377D3E-E0C6-41A4-89ED-11A9C00142A9}
-		{F057512B-55BF-4A8B-A027-A0505F8BA10C} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
-		{10173568-A65E-44E5-8C6F-4AA49D0577A1} = {F057512B-55BF-4A8B-A027-A0505F8BA10C}
-		{97C7D2A4-87E5-4A4A-A170-D736427D5C21} = {F057512B-55BF-4A8B-A027-A0505F8BA10C}
-		{4730F56D-24EF-4BB2-AA75-862E31205F3A} = {225AEDCF-7162-4A86-AC74-06B84660B379}
-		{C406D9E0-1585-43F9-AA8F-D468AF84A996} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{7757E360-40F5-4C90-9D7F-E6B0E62BA9E2} = {C406D9E0-1585-43F9-AA8F-D468AF84A996}
-		{F0BF2260-5AE2-4248-81DE-AC5B9FC6A931} = {C406D9E0-1585-43F9-AA8F-D468AF84A996}
-		{A05652B3-953E-4915-9D7F-0E361D988815} = {0CE1CC26-98CE-4022-A81C-E32AAFC9B819}
-		{7BAEB9BF-28F4-4DFD-9A04-E5193683C261} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
-		{AE4D272D-6F13-42C8-9404-C149188AFA33} = {7BAEB9BF-28F4-4DFD-9A04-E5193683C261}
-		{5D438258-CB19-4282-814F-974ABBC71411} = {7BAEB9BF-28F4-4DFD-9A04-E5193683C261}
-		{F5AE525F-F435-40F9-A567-4D5EC3B50D6E} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
-		{56291265-B7BF-4756-92AB-FC30F09381D1} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
-		{66FA1041-5556-43A0-9CA3-F9937F085F6E} = {56291265-B7BF-4756-92AB-FC30F09381D1}
-		{37FC77EA-AC44-4D08-B002-8EFF415C424A} = {64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C}
-		{87D58D50-20D1-4091-88C5-8D88DCCC2DE3} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{F7BCD3AD-31E2-4223-B215-851C3D0AB78A} = {B55A5DE1-5AF3-4B18-AF04-C1735B071DA6}
-		{055F86AA-FB37-40CC-B39E-C29CE7547BB7} = {B8825E86-B8EA-4666-B681-C443D027C95D}
-		{137AD17B-066F-4ED4-80FA-8D21C7B76CA6} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
-		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C} = {C445B129-0A4D-41F5-8347-6534B6B12303}
-		{A939893A-B3CD-48F6-80D3-340C8A6E275B} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
-		{F232B503-D412-45EE-8B31-EFD46B9FA302} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
-		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E} = {05A169C7-4F20-4516-B10A-B13C5649D346}
-		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E} = {05A169C7-4F20-4516-B10A-B13C5649D346}
-		{433F91E4-E39D-4EB0-B798-2998B3969A2C} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13} = {6126DCE4-9692-4EE2-B240-C65743572995}
-		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
-		{6469F11E-8CEE-4292-820B-324DFFC88EBC} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
-		{8D2CC6ED-5105-4F52-8757-C21F4DE78589} = {6469F11E-8CEE-4292-820B-324DFFC88EBC}
-		{9DC6B242-457B-4767-A84B-C3D23B76C642} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
-		{D53F0EF7-0CDC-49B4-AA2D-229901B0A734} = {9DC6B242-457B-4767-A84B-C3D23B76C642}
-		{5B5F86CC-3598-463C-9F9B-F78FBB6642F4} = {8275510E-0E6C-45A8-99DF-4F106BC7F075}
-		{274100A5-5B2D-4EA2-AC42-A62257FC6BDC} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{4D8DE54A-4F32-4881-B07B-DDC79619E573} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
-		{9536C284-65B4-4884-BB50-06D629095C3E} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
-		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
-		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
-		{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
-		{B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
-		{B9BBC1A8-7F58-4F43-94C3-5F3CB125CEF7} = {B32FF7A7-9CB3-4DCD-AE97-3B2594DB9DAC}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}
-	EndGlobalSection
-EndGlobal
diff --git a/AspNetCore.slnx b/AspNetCore.slnx
new file mode 100644
index 000000000000..60f5ca0d74fc
--- /dev/null
+++ b/AspNetCore.slnx
@@ -0,0 +1,1284 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="arm64" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/eng/" />
+  <Folder Name="/eng/tools/">
+    <Project Path="eng/tools/BaselineGenerator/BaselineGenerator.csproj" />
+    <Project Path="eng/tools/RepoTasks/RepoTasks.csproj" />
+  </Folder>
+  <Folder Name="/src/" />
+  <Folder Name="/src/Analyzers/" />
+  <Folder Name="/src/Analyzers/Analyzers/">
+    <Project Path="src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj" />
+    <Project Path="src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Antiforgery/">
+    <Project Path="src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj" />
+    <Project Path="src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Azure/" />
+  <Folder Name="/src/Azure/AzureAppServices.HostingStartup/">
+    <Project Path="src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
+  </Folder>
+  <Folder Name="/src/Azure/AzureAppServicesIntegration/">
+    <Project Path="src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
+    <Project Path="src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Azure/samples/">
+    <Project Path="src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj" />
+    <Project Path="src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Caching/" />
+  <Folder Name="/src/Caching/SqlServer/">
+    <Project Path="src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj" />
+    <Project Path="src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Caching/StackExchangeRedis/">
+    <Project Path="src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
+    <Project Path="src/Caching/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/" />
+  <Folder Name="/src/Components/Analyzers/">
+    <Project Path="src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj" />
+    <Project Path="src/Components/Analyzers/test/Microsoft.AspNetCore.Components.Analyzers.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Authorization/">
+    <Project Path="src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj" />
+    <Project Path="src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/benchmarkapps/">
+    <Project Path="src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/benchmarkapps/Wasm.Performance/">
+    <Project Path="src/Components/benchmarkapps/Wasm.Performance/ConsoleHost/Wasm.Performance.ConsoleHost.csproj" />
+    <Project Path="src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj" />
+    <Project Path="src/Components/benchmarkapps/Wasm.Performance/TestApp/Wasm.Performance.TestApp.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Components/">
+    <Project Path="src/Components/Components/perf/Microsoft.AspNetCore.Components.Performance.csproj" />
+    <Project Path="src/Components/Components/src/Microsoft.AspNetCore.Components.csproj" />
+    <Project Path="src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/CustomElements/">
+    <Project Path="src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Endpoints/">
+    <Project Path="src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj" />
+    <Project Path="src/Components/Endpoints/test/Microsoft.AspNetCore.Components.Endpoints.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Forms/">
+    <Project Path="src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj" />
+    <Project Path="src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Samples/">
+    <Project Path="src/Components/Samples/BlazorServerApp/BlazorServerApp.csproj" />
+    <Project Path="src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj" />
+    <Project Path="src/Components/Samples/BlazorUnitedApp/BlazorUnitedApp.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Server/">
+    <Project Path="src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj" />
+    <Project Path="src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/test/">
+    <Project Path="src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/test/testassets/">
+    <Project Path="src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj" />
+    <Project Path="src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj" />
+    <Project Path="src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj" />
+    <Project Path="src/Components/test/testassets/Components.WasmRemoteAuthentication/Components.WasmRemoteAuthentication.csproj" />
+    <Project Path="src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj" />
+    <Project Path="src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj" />
+    <Project Path="src/Components/test/testassets/GlobalizationWasmApp/GlobalizationWasmApp.csproj" />
+    <Project Path="src/Components/test/testassets/LazyTestContentPackage/LazyTestContentPackage.csproj" />
+    <Project Path="src/Components/test/testassets/NotReferencedInWasmCodePackage/NotReferencedInWasmCodePackage.csproj" />
+    <Project Path="src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/Web/">
+    <Project Path="src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj" />
+    <Project Path="src/Components/Web/test/Microsoft.AspNetCore.Components.Web.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/" />
+  <Folder Name="/src/Components/WebAssembly/Authentication.Msal/">
+    <Project Path="src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/DevServer/">
+    <Project Path="src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/JSInterop/">
+    <Project Path="src/Components/WebAssembly/JSInterop/src/Microsoft.JSInterop.WebAssembly.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/Samples/" />
+  <Folder Name="/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/">
+    <Project Path="src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj" />
+    <Project Path="src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Server/HostedBlazorWebassemblyApp.Server.csproj" />
+    <Project Path="src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Shared/HostedBlazorWebassemblyApp.Shared.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/Server/">
+    <Project Path="src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
+    <Project Path="src/Components/WebAssembly/Server/test/Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/testassets/">
+    <Project Path="src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/ThreadingApp.Server/ThreadingApp.Server.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/Wasm.Prerendered.Client.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj" />
+    <Project Path="src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/WebAssembly.Authentication/">
+    <Project Path="src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
+    <Project Path="src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebAssembly/WebAssembly/">
+    <Project Path="src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj" />
+    <Project Path="src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebView/">
+    <Project Path="src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj" />
+    <Project Path="src/Components/WebView/WebView/test/Microsoft.AspNetCore.Components.WebView.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebView/Samples/" />
+  <Folder Name="/src/Components/WebView/Samples/PhotinoPlatform/">
+    <Project Path="src/Components/WebView/Samples/PhotinoPlatform/src/Microsoft.AspNetCore.Components.WebView.Photino.csproj" />
+  </Folder>
+  <Folder Name="/src/Components/WebView/Samples/PhotinoPlatform/testassets/">
+    <Project Path="src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj" />
+  </Folder>
+  <Folder Name="/src/Configuration.KeyPerFile/">
+    <Project Path="src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj" />
+    <Project Path="src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/" />
+  <Folder Name="/src/DataProtection/Abstractions/">
+    <Project Path="src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
+    <Project Path="src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/Cryptography.Internal/">
+    <Project Path="src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj" />
+    <Project Path="src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/Cryptography.KeyDerivation/">
+    <Project Path="src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj" />
+    <Project Path="src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/DataProtection/">
+    <Project Path="src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj" />
+    <Project Path="src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Microsoft.AspNetCore.DataProtection.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/EntityFrameworkCore/">
+    <Project Path="src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj" />
+    <Project Path="src/DataProtection/EntityFrameworkCore/test/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/Extensions/">
+    <Project Path="src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj" />
+    <Project Path="src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/samples/">
+    <Project Path="src/DataProtection/samples/CustomEncryptorSample/CustomEncryptorSample.csproj" />
+    <Project Path="src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj" />
+    <Project Path="src/DataProtection/samples/KeyManagementSample/KeyManagementSample.csproj" />
+    <Project Path="src/DataProtection/samples/NonDISample/NonDISample.csproj" />
+    <Project Path="src/DataProtection/samples/Redis/Redis.csproj" />
+  </Folder>
+  <Folder Name="/src/DataProtection/StackExchangeRedis/">
+    <Project Path="src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj" />
+    <Project Path="src/DataProtection/StackExchangeRedis/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/DefaultBuilder/">
+    <Project Path="src/DefaultBuilder/src/Microsoft.AspNetCore.csproj" />
+  </Folder>
+  <Folder Name="/src/DefaultBuilder/samples/">
+    <Project Path="src/DefaultBuilder/samples/SampleApp/DefaultBuilder.SampleApp.csproj" />
+  </Folder>
+  <Folder Name="/src/DefaultBuilder/test/">
+    <Project Path="src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj" />
+    <Project Path="src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Features/" />
+  <Folder Name="/src/Features/JsonPatch.SystemTextJson/" Id="02ea681e-c7d8-13c7-8484-4ac65e1b71e8">
+    <Project Path="src/Features/JsonPatch.SystemTextJson/src/Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj" />
+    <Project Path="src/Features/JsonPatch.SystemTextJson/test/Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Features/JsonPatch/">
+    <Project Path="src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj" />
+    <Project Path="src/Features/JsonPatch/test/Microsoft.AspNetCore.JsonPatch.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/FileProviders/" />
+  <Folder Name="/src/FileProviders/Embedded/">
+    <Project Path="src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj" />
+    <Project Path="src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/FileProviders/Manifest.MSBuildTask/">
+    <Project Path="src/FileProviders/Manifest.MSBuildTask/src/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj" />
+    <Project Path="src/FileProviders/Manifest.MSBuildTask/test/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Framework/">
+    <Project Path="src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj" Type="C#" />
+    <Project Path="src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Framework/App.Runtime/">
+    <Project Path="src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj" Type="C#" />
+  </Folder>
+  <Folder Name="/src/Framework/AspNetCoreAnalyzers/" />
+  <Folder Name="/src/Framework/AspNetCoreAnalyzers/src/">
+    <Project Path="src/Framework/AspNetCoreAnalyzers/src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj">
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+    <Project Path="src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Microsoft.AspNetCore.App.CodeFixes.csproj">
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Grpc/" />
+  <Folder Name="/src/Grpc/Interop/" />
+  <Folder Name="/src/Grpc/Interop/test/">
+    <Project Path="src/Grpc/Interop/test/InteropTests/InteropTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/Interop/test/testassets/">
+    <Project Path="src/Grpc/Interop/test/testassets/InteropClient/InteropClient.csproj" />
+    <Project Path="src/Grpc/Interop/test/testassets/InteropWebsite/InteropWebsite.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/" />
+  <Folder Name="/src/Grpc/JsonTranscoding/perf/">
+    <Project Path="src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/src/">
+    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/test/">
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/test/testassets/">
+    <Project Path="src/Grpc/JsonTranscoding/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/testassets/Sandbox/Sandbox.csproj" />
+  </Folder>
+  <Folder Name="/src/HealthChecks/" />
+  <Folder Name="/src/HealthChecks/src/">
+    <Project Path="src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
+  </Folder>
+  <Folder Name="/src/HealthChecks/src/Abstractions/">
+    <Project Path="src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/HealthChecks/test/">
+    <Project Path="src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/" />
+  <Folder Name="/src/Hosting/Abstractions/">
+    <Project Path="src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/Hosting/">
+    <Project Path="src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj" />
+    <Project Path="src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/samples/">
+    <Project Path="src/Hosting/samples/GenericWebHost/GenericWebHost.csproj" />
+    <Project Path="src/Hosting/samples/SampleStartups/SampleStartups.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/Server.Abstractions/">
+    <Project Path="src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/Server.IntegrationTesting/">
+    <Project Path="src/Hosting/Server.IntegrationTesting/src/Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/test/">
+    <Project Path="src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj" />
+    <Project Path="src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj" />
+    <Project Path="src/Hosting/test/testassets/TestStartupAssembly1/TestStartupAssembly1.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/TestHost/">
+    <Project Path="src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj" />
+    <Project Path="src/Hosting/TestHost/test/Microsoft.AspNetCore.TestHost.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Hosting/WindowsServices/">
+    <Project Path="src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj" />
+    <Project Path="src/Hosting/WindowsServices/test/Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Html/" />
+  <Folder Name="/src/Html/Abstractions/">
+    <Project Path="src/Html.Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/" />
+  <Folder Name="/src/Http/Authentication.Abstractions/">
+    <Project Path="src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Authentication.Core/">
+    <Project Path="src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj" />
+    <Project Path="src/Http/Authentication.Core/test/Microsoft.AspNetCore.Authentication.Core.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Features/">
+    <Project Path="src/Extensions/Features/src/Microsoft.Extensions.Features.csproj" />
+    <Project Path="src/Extensions/Features/test/Microsoft.Extensions.Features.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Headers/">
+    <Project Path="src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj" />
+    <Project Path="src/Http/Headers/test/Microsoft.Net.Http.Headers.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Http.Abstractions/">
+    <Project Path="src/Http/Http.Abstractions/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj" />
+    <Project Path="src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj" />
+    <Project Path="src/Http/Http.Abstractions/test/Microsoft.AspNetCore.Http.Abstractions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Http.Extensions/">
+    <Project Path="src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj" />
+    <Project Path="src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Http.Extensions/gen/">
+    <Project Path="src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Http.Features/">
+    <Project Path="src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Http.Results/">
+    <Project Path="src/Http/Http.Results/src/Microsoft.AspNetCore.Http.Results.csproj" />
+    <Project Path="src/Http/Http.Results/test/Microsoft.AspNetCore.Http.Results.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Http/">
+    <Project Path="src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj" />
+    <Project Path="src/Http/Http/src/Microsoft.AspNetCore.Http.csproj" />
+    <Project Path="src/Http/Http/test/Microsoft.AspNetCore.Http.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Metadata/">
+    <Project Path="src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Owin/">
+    <Project Path="src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks.csproj" />
+    <Project Path="src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj" />
+    <Project Path="src/Http/Owin/test/Microsoft.AspNetCore.Owin.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Routing.Abstractions/">
+    <Project Path="src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj" />
+    <Project Path="src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Routing/">
+    <Project Path="src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj" />
+    <Project Path="src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Routing/test/">
+    <Project Path="src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj" />
+    <Project Path="src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/Routing/test/testassets/">
+    <Project Path="src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj" />
+    <Project Path="src/Http/Routing/test/testassets/RoutingSandbox/RoutingSandbox.csproj" />
+    <Project Path="src/Http/Routing/test/testassets/RoutingWebSite/RoutingWebSite.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/samples/">
+    <Project Path="src/Http/samples/MinimalSample/MinimalSample.csproj" />
+    <Project Path="src/Http/samples/MinimalSampleFSharp/MinimalSampleFSharp.fsproj" />
+    <Project Path="src/Http/samples/MinimalSampleOwin/MinimalSampleOwin.csproj" />
+    <Project Path="src/Http/samples/SampleApp/HttpAbstractions.SampleApp.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/WebUtilities/">
+    <Project Path="src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj" />
+    <Project Path="src/Http/WebUtilities/test/Microsoft.AspNetCore.WebUtilities.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Http/WebUtilities/perf/">
+    <Project Path="src/Http/WebUtilities/perf/Microbenchmarks/Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/HttpClientFactory/">
+    <Project Path="src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj" />
+    <Project Path="src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/" />
+  <Folder Name="/src/Identity/Core/">
+    <Project Path="src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/EntityFrameworkCore/">
+    <Project Path="src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/EntityFrameworkCore/test/">
+    <Project Path="src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj" />
+    <Project Path="src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/Extensions.Core/">
+    <Project Path="src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/Extensions.Stores/">
+    <Project Path="src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/samples/">
+    <Project Path="src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj" />
+    <Project Path="src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj" />
+    <Project Path="src/Identity/samples/IdentitySample.PasskeyConformance/IdentitySample.PasskeyConformance.csproj" />
+    <Project Path="src/Identity/samples/IdentitySample.PasskeyUI/IdentitySample.PasskeyUI.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/Specification.Tests/">
+    <Project Path="src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/test/">
+    <Project Path="src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj" />
+    <Project Path="src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj" />
+    <Project Path="src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/testassets/">
+    <Project Path="src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj" />
+  </Folder>
+  <Folder Name="/src/Identity/UI/">
+    <Project Path="src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj" />
+  </Folder>
+  <Folder Name="/src/Installers/" />
+  <Folder Name="/src/Installers/AspNetCoreModule-Setup/">
+    <Project Path="src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj" Id="7c27e72f-54d0-4820-8cfa-5e4be640974b">
+      <Platform Solution="*|Any CPU" Project="Win32" />
+      <Platform Solution="Debug|arm64" Project="Win32" />
+      <Platform Solution="Release|arm64" Project="ARM64" />
+      <Build Solution="*|Any CPU" Project="false" />
+      <Build Solution="Debug|arm64" Project="false" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj" Id="b54a8f61-60de-4ad9-87ca-d102f230678e">
+      <Platform Solution="*|Any CPU" Project="Win32" />
+      <Platform Solution="Debug|arm64" Project="Win32" />
+      <Platform Solution="Release|arm64" Project="ARM64" />
+      <Build Solution="*|Any CPU" Project="false" />
+      <Build Solution="Debug|arm64" Project="false" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj" Id="7324770c-0871-4d73-be3d-5e2f3e9e1b1e">
+      <Platform Solution="*|Any CPU" Project="Win32" />
+      <Platform Solution="Debug|arm64" Project="Win32" />
+      <Platform Solution="Release|arm64" Project="ARM64" />
+      <Build Solution="*|Any CPU" Project="false" />
+      <Build Solution="Debug|arm64" Project="false" />
+      <Deploy Solution="*|x86" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/JSInterop/" />
+  <Folder Name="/src/JSInterop/Microsoft.JSInterop/">
+    <Project Path="src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj" />
+    <Project Path="src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Localization/">
+    <Project Path="src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj" />
+    <Project Path="src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj" />
+    <Project Path="src/Localization/Localization/test/Microsoft.Extensions.Localization.RootNamespace.Tests/Microsoft.Extensions.Localization.RootNamespace.Tests.csproj" />
+    <Project Path="src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Logging.AzureAppServices/">
+    <Project Path="src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj" />
+    <Project Path="src/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/" />
+  <Folder Name="/src/Middleware/ConcurrencyLimiter/">
+    <Project Path="src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj" />
+    <Project Path="src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj" />
+    <Project Path="src/Middleware/ConcurrencyLimiter/test/Microsoft.AspNetCore.ConcurrencyLimiter.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/ConcurrencyLimiter/perf/">
+    <Project Path="src/Middleware/ConcurrencyLimiter/perf/Microbenchmarks/Microsoft.AspNetCore.ConcurrencyLimiter.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/CORS/">
+    <Project Path="src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/CORS/test/">
+    <Project Path="src/Middleware/CORS/test/UnitTests/Microsoft.AspNetCore.Cors.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/CORS/test/testassets/">
+    <Project Path="src/Middleware/CORS/test/testassets/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Diagnostics.Abstractions/">
+    <Project Path="src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Diagnostics.EntityFrameworkCore/">
+    <Project Path="src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Diagnostics.EntityFrameworkCore/test/">
+    <Project Path="src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj" />
+    <Project Path="src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Diagnostics/">
+    <Project Path="src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Diagnostics/test/">
+    <Project Path="src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj" />
+    <Project Path="src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Diagnostics/test/testassets/">
+    <Project Path="src/Middleware/Diagnostics/test/testassets/ClassLibraryWithPortablePdbs/ClassLibraryWithPortablePdbs.csproj" />
+    <Project Path="src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj" />
+    <Project Path="src/Middleware/Diagnostics/test/testassets/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj" />
+    <Project Path="src/Middleware/Diagnostics/test/testassets/ExceptionHandlerSample/ExceptionHandlerSample.csproj" />
+    <Project Path="src/Middleware/Diagnostics/test/testassets/StatusCodePagesSample/StatusCodePagesSample.csproj" />
+    <Project Path="src/Middleware/Diagnostics/test/testassets/WelcomePageSample/WelcomePageSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HeaderPropagation/">
+    <Project Path="src/Middleware/HeaderPropagation/src/Microsoft.AspNetCore.HeaderPropagation.csproj" />
+    <Project Path="src/Middleware/HeaderPropagation/test/Microsoft.AspNetCore.HeaderPropagation.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HeaderPropagation/samples/">
+    <Project Path="src/Middleware/HeaderPropagation/samples/HeaderPropagationSample/HeaderPropagationSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HealthChecks.EntityFrameworkCore/">
+    <Project Path="src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj" />
+    <Project Path="src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HealthChecks/">
+    <Project Path="src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HealthChecks/test/">
+    <Project Path="src/Middleware/HealthChecks/test/UnitTests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HealthChecks/test/testassets/">
+    <Project Path="src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HostFiltering/">
+    <Project Path="src/Middleware/HostFiltering/sample/HostFilteringSample.csproj" />
+    <Project Path="src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj" />
+    <Project Path="src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HttpLogging/">
+    <Project Path="src/Middleware/HttpLogging/samples/HttpLogging.Sample/HttpLogging.Sample.csproj" />
+    <Project Path="src/Middleware/HttpLogging/samples/Logging.W3C.Sample/Logging.W3C.Sample.csproj" />
+    <Project Path="src/Middleware/HttpLogging/src/Microsoft.AspNetCore.HttpLogging.csproj" />
+    <Project Path="src/Middleware/HttpLogging/test/Microsoft.AspNetCore.HttpLogging.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HttpOverrides/">
+    <Project Path="src/Middleware/HttpOverrides/sample/HttpOverridesSample.csproj" />
+    <Project Path="src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj" />
+    <Project Path="src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/HttpsPolicy/">
+    <Project Path="src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj" />
+    <Project Path="src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj" />
+    <Project Path="src/Middleware/HttpsPolicy/test/Microsoft.AspNetCore.HttpsPolicy.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Localization.Routing/">
+    <Project Path="src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj" />
+    <Project Path="src/Middleware/Localization.Routing/test/Microsoft.AspNetCore.Localization.Routing.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Localization/">
+    <Project Path="src/Middleware/Localization/sample/LocalizationSample.csproj" />
+    <Project Path="src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Localization/test/">
+    <Project Path="src/Middleware/Localization/test/FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj" />
+    <Project Path="src/Middleware/Localization/test/UnitTests/Microsoft.AspNetCore.Localization.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Localization/test/testassets/">
+    <Project Path="src/Middleware/Localization/testassets/LocalizationWebsite/LocalizationWebsite.csproj" />
+    <Project Path="src/Middleware/Localization/testassets/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj" />
+    <Project Path="src/Middleware/Localization/testassets/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/MiddlewareAnalysis/">
+    <Project Path="src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
+    <Project Path="src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/MiddlewareAnalysis/samples/">
+    <Project Path="src/Middleware/MiddlewareAnalysis/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/perf/">
+    <Project Path="src/Middleware/perf/Microbenchmarks/Microsoft.AspNetCore.WebSockets.Microbenchmarks.csproj" />
+    <Project Path="src/Middleware/perf/ResponseCaching.Microbenchmarks/Microsoft.AspNetCore.ResponseCaching.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/ResponseCaching.Abstractions/">
+    <Project Path="src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/ResponseCaching/">
+    <Project Path="src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj" />
+    <Project Path="src/Middleware/ResponseCaching/test/Microsoft.AspNetCore.ResponseCaching.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/ResponseCaching/samples/">
+    <Project Path="src/Middleware/ResponseCaching/samples/ResponseCachingSample/ResponseCachingSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/ResponseCompression/">
+    <Project Path="src/Middleware/ResponseCompression/perf/Microbenchmarks/Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj" />
+    <Project Path="src/Middleware/ResponseCompression/sample/ResponseCompressionSample.csproj" />
+    <Project Path="src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj" />
+    <Project Path="src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Rewrite/">
+    <Project Path="src/Middleware/Rewrite/sample/RewriteSample.csproj" />
+    <Project Path="src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj" />
+    <Project Path="src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Session/">
+    <Project Path="src/Middleware/Session/samples/SessionSample.csproj" />
+    <Project Path="src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj" />
+    <Project Path="src/Middleware/Session/test/Microsoft.AspNetCore.Session.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Spa/" />
+  <Folder Name="/src/Middleware/Spa/SpaProxy/">
+    <Project Path="src/Middleware/Spa/SpaProxy/src/Microsoft.AspNetCore.SpaProxy.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/Spa/SpaServices.Extensions/">
+    <Project Path="src/Middleware/Spa/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
+    <Project Path="src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/StaticFiles/">
+    <Project Path="src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/StaticFiles/samples/">
+    <Project Path="src/Middleware/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/StaticFiles/test/">
+    <Project Path="src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj" />
+    <Project Path="src/Middleware/StaticFiles/test/UnitTests/Microsoft.AspNetCore.StaticFiles.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/WebSockets/">
+    <Project Path="src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/WebSockets/samples/">
+    <Project Path="src/Middleware/WebSockets/samples/EchoApp/EchoApp.csproj" />
+    <Project Path="src/Middleware/WebSockets/samples/TestServer/WebSockets.TestServer.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/WebSockets/test/">
+    <Project Path="src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj" />
+    <Project Path="src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Middleware/WebSockets/test/ConformanceTests/">
+    <Project Path="src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/" />
+  <Folder Name="/src/Mvc/benchmarks/">
+    <Project Path="src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Microsoft.AspNetCore.Mvc.Views.Microbenchmarks.csproj" />
+    <Project Path="src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Abstractions/">
+    <Project Path="src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
+    <Project Path="src/Mvc/Mvc.Abstractions/test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Analyzers/">
+    <Project Path="src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj" />
+    <Project Path="src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Api.Analyzers/">
+    <Project Path="src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj" />
+    <Project Path="src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.ApiExplorer/">
+    <Project Path="src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
+    <Project Path="src/Mvc/Mvc.ApiExplorer/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Core/">
+    <Project Path="src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj" />
+    <Project Path="src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Cors/">
+    <Project Path="src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj" />
+    <Project Path="src/Mvc/Mvc.Cors/test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.DataAnnotations/">
+    <Project Path="src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
+    <Project Path="src/Mvc/Mvc.DataAnnotations/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Formatters.Json/">
+    <Project Path="src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Formatters.Xml/">
+    <Project Path="src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+    <Project Path="src/Mvc/Mvc.Formatters.Xml/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Localization/">
+    <Project Path="src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj" />
+    <Project Path="src/Mvc/Mvc.Localization/test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.NewtonsoftJson/">
+    <Project Path="src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
+    <Project Path="src/Mvc/Mvc.NewtonsoftJson/test/Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Razor.RuntimeCompilation/">
+    <Project Path="src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj" />
+    <Project Path="src/Mvc/Mvc.Razor.RuntimeCompilation/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Razor/">
+    <Project Path="src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj" />
+    <Project Path="src/Mvc/Mvc.Razor/test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.RazorPages/">
+    <Project Path="src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
+    <Project Path="src/Mvc/Mvc.RazorPages/test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.TagHelpers/">
+    <Project Path="src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
+    <Project Path="src/Mvc/Mvc.TagHelpers/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Testing.Tasks/">
+    <Project Path="src/Mvc/Mvc.Testing.Tasks/src/Microsoft.AspNetCore.Mvc.Testing.Tasks.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.Testing/">
+    <Project Path="src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc.ViewFeatures/">
+    <Project Path="src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
+    <Project Path="src/Mvc/Mvc.ViewFeatures/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/Mvc/">
+    <Project Path="src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj" />
+    <Project Path="src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/samples/">
+    <Project Path="src/Mvc/samples/MvcSandbox/MvcSandbox.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/shared/">
+    <Project Path="src/Mvc/shared/Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
+    <Project Path="src/Mvc/shared/Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+    <Project Path="src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/test/">
+    <Project Path="src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj" />
+    <Project Path="src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Mvc/test/WebSites/">
+    <Project Path="src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj" />
+    <Project Path="src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/GenericHostWebSite/GenericHostWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/RoutingWebSite/Mvc.RoutingWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/SimpleWebSiteWithWebApplicationBuilder/SimpleWebSiteWithWebApplicationBuilder.csproj" />
+    <Project Path="src/Mvc/test/WebSites/SimpleWebSiteWithWebApplicationBuilderException/SimpleWebSiteWithWebApplicationBuilderException.csproj" />
+    <Project Path="src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj" />
+    <Project Path="src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj" />
+  </Folder>
+  <Folder Name="/src/ObjectPool/">
+    <Project Path="src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj" />
+  </Folder>
+  <Folder Name="/src/OpenApi/" />
+  <Folder Name="/src/OpenApi/gen/">
+    <Project Path="src/OpenApi/gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj" />
+  </Folder>
+  <Folder Name="/src/OpenApi/test/">
+    <Project Path="src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/Microsoft.AspNetCore.OpenApi.Build.Tests.csproj" />
+    <Project Path="src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/ProjectTemplates/">
+    <Project Path="src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj" />
+    <Project Path="src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj" />
+    <Project Path="src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj" />
+    <Project Path="src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj" />
+    <Project Path="src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj" />
+  </Folder>
+  <Folder Name="/src/Razor/" />
+  <Folder Name="/src/Razor/Razor.Runtime/">
+    <Project Path="src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj" />
+    <Project Path="src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Razor/Razor/">
+    <Project Path="src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj" />
+    <Project Path="src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/" />
+  <Folder Name="/src/Security/Authentication/">
+    <Project Path="src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Certificate/">
+    <Project Path="src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Certificate/samples/">
+    <Project Path="src/Security/Authentication/Certificate/samples/Certificate.Optional.Sample/Certificate.Optional.Sample.csproj" />
+    <Project Path="src/Security/Authentication/Certificate/samples/Certificate.Sample/Certificate.Sample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Cookies/">
+    <Project Path="src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Cookies/samples/">
+    <Project Path="src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj" />
+    <Project Path="src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Core/">
+    <Project Path="src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Facebook/">
+    <Project Path="src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Google/">
+    <Project Path="src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/JwtBearer/">
+    <Project Path="src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/JwtBearer/samples/">
+    <Project Path="src/Security/Authentication/JwtBearer/samples/JwtBearerSample/JwtBearerSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/MicrosoftAccount/">
+    <Project Path="src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Negotiate/">
+    <Project Path="src/Security/Authentication/Negotiate/src/Microsoft.AspNetCore.Authentication.Negotiate.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Negotiate/samples/">
+    <Project Path="src/Security/Authentication/Negotiate/samples/NegotiateAuthSample/NegotiateAuthSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Negotiate/test/">
+    <Project Path="src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj" />
+    <Project Path="src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/OAuth/">
+    <Project Path="src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/OpenIdConnect/">
+    <Project Path="src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/OpenIdConnect/samples/">
+    <Project Path="src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/OpenIdConnectSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/samples/">
+    <Project Path="src/Security/Authentication/samples/SocialSample/SocialSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/Twitter/">
+    <Project Path="src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/WsFederation/">
+    <Project Path="src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authentication/WsFederation/samples/">
+    <Project Path="src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authorization/">
+    <Project Path="src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authorization/Core/">
+    <Project Path="src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/Authorization/Policy/">
+    <Project Path="src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/benchmarks/">
+    <Project Path="src/Security/perf/Microbenchmarks/Microsoft.AspNetCore.Security.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/CookiePolicy/">
+    <Project Path="src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj" />
+    <Project Path="src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/CookiePolicy/samples/">
+    <Project Path="src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/samples/">
+    <Project Path="src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj" />
+    <Project Path="src/Security/samples/Cookies/Cookies.csproj" />
+    <Project Path="src/Security/samples/CustomAuthorizationFailureResponse/CustomAuthorizationFailureResponse.csproj" />
+    <Project Path="src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj" />
+    <Project Path="src/Security/samples/DynamicSchemes/DynamicSchemes.csproj" />
+    <Project Path="src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj" />
+    <Project Path="src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj" />
+    <Project Path="src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj" />
+  </Folder>
+  <Folder Name="/src/Security/test/">
+    <Project Path="src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/" />
+  <Folder Name="/src/Servers/Connections.Abstractions/">
+    <Project Path="src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/HttpSys/">
+    <Project Path="src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/HttpSys/samples/">
+    <Project Path="src/Servers/HttpSys/samples/HotAddSample/HotAddSample.csproj" />
+    <Project Path="src/Servers/HttpSys/samples/QueueSharing/QueueSharing.csproj" />
+    <Project Path="src/Servers/HttpSys/samples/SelfHostServer/SelfHostServer.csproj" />
+    <Project Path="src/Servers/HttpSys/samples/TestClient/TestClient.csproj" />
+    <Project Path="src/Servers/HttpSys/samples/TlsFeaturesObserve/TlsFeaturesObserve.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/HttpSys/test/">
+    <Project Path="src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj" />
+    <Project Path="src/Servers/HttpSys/test/Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/IIS/" />
+  <Folder Name="/src/Servers/IIS/ANCM/">
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj" Id="ec82302f-d2f0-4727-99d1-eabc0dd9dc3b">
+      <Platform Solution="*|arm64" Project="ARM64" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj" Id="55494e58-e061-4c4c-a0a8-837008e72f85">
+      <Platform Solution="Debug|arm64" Project="ARM64" />
+      <Platform Solution="Release|arm64" Project="Any CPU" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj" Id="1eac8125-1765-4e2d-8cbe-56dc98a1c8c1">
+      <Platform Solution="*|arm64" Project="ARM64" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj" Id="cac1267b-8778-4257-aac6-caf481723b01">
+      <Platform Solution="*|arm64" Project="ARM64" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj" Id="09d9d1d6-2951-4e14-bc35-76a23cf9391a">
+      <Platform Solution="Debug|arm64" Project="ARM64" />
+      <Platform Solution="Release|arm64" Project="Any CPU" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj" Id="d57ea297-6dc2-4bc0-8c91-334863327863">
+      <Platform Solution="Debug|arm64" Project="ARM64" />
+      <Platform Solution="Release|arm64" Project="Any CPU" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj" Id="7f87406c-a3c8-4139-a68d-e4c344294a67">
+      <Platform Solution="Debug|arm64" Project="ARM64" />
+      <Platform Solution="Release|arm64" Project="Any CPU" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj" Id="1533e271-f61b-441b-8b74-59fb61df0552">
+      <Platform Solution="Debug|arm64" Project="ARM64" />
+      <Platform Solution="Release|arm64" Project="Any CPU" />
+      <Deploy Solution="*|x86" />
+    </Project>
+    <Project Path="src/Servers/IIS/AspNetCoreModuleV2/Symbols/Microsoft.AspNetCore.ANCMSymbols.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IIS/">
+    <Project Path="src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj">
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IIS/benchmarks/">
+    <Project Path="src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj">
+      <Platform Solution="*|Any CPU" Project="x64" />
+      <Platform Solution="*|arm64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+      <Build Solution="Release|arm64" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IIS/samples/">
+    <Project Path="src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj">
+      <Platform Solution="*|Any CPU" Project="x64" />
+      <Platform Solution="*|arm64" Project="x86" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IIS/test/">
+    <Project Path="src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj" />
+    <Project Path="src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj" />
+    <Project Path="src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj" />
+    <Project Path="src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj">
+      <Platform Solution="*|Any CPU" Project="x64" />
+      <Platform Solution="*|arm64" Project="x86" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+    <Project Path="src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj" />
+    <Project Path="src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj" />
+    <Project Path="src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj">
+      <Platform Solution="*|Any CPU" Project="x64" />
+      <Platform Solution="*|arm64" Project="x86" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+    <Project Path="src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj">
+      <Platform Solution="*|Any CPU" Project="x64" />
+      <Platform Solution="*|arm64" Project="x86" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+    <Project Path="src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IISIntegration/">
+    <Project Path="src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj">
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj" />
+      <BuildDependency Project="src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IISIntegration/samples/">
+    <Project Path="src/Servers/IIS/IISIntegration/samples/IISSample/IISSample.csproj">
+      <Build Solution="*|Any CPU" Project="false" />
+      <Build Solution="Release|x64" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IISIntegration/test/">
+    <Project Path="src/Servers/IIS/IISIntegration/test/Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/IIS/IntegrationTesting.IIS/">
+    <Project Path="src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj">
+      <BuildDependency Project="src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/" />
+  <Folder Name="/src/Servers/Kestrel/Core/">
+    <Project Path="src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
+    <Project Path="src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/Kestrel/">
+    <Project Path="src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj" />
+    <Project Path="src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/perf/">
+    <Project Path="src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/samples/">
+    <Project Path="src/Servers/Kestrel/samples/http2cat/http2cat.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/Http2SampleApp/Http2SampleApp.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/Http3SampleApp/Http3SampleApp.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/HttpClientApp/HttpClientApp.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/LargeResponseApp/LargeResponseApp.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/PlaintextApp/PlaintextApp.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/SampleApp/Kestrel.SampleApp.csproj" />
+    <Project Path="src/Servers/Kestrel/samples/SystemdTestApp/SystemdTestApp.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/test/">
+    <Project Path="src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj" />
+    <Project Path="src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj" />
+    <Project Path="src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj" />
+    <Project Path="src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/tools/">
+    <Project Path="src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/Transport.Quic/">
+    <Project Path="src/Servers/Kestrel/Transport.Quic/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj" />
+    <Project Path="src/Servers/Kestrel/Transport.Quic/test/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/Kestrel/Transport.Sockets/">
+    <Project Path="src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj" />
+  </Folder>
+  <Folder Name="/src/Servers/test/">
+    <Project Path="src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Shared/" />
+  <Folder Name="/src/Shared/BrowserTesting/">
+    <Project Path="src/Shared/BrowserTesting/src/Microsoft.AspNetCore.BrowserTesting.csproj" />
+  </Folder>
+  <Folder Name="/src/Shared/test/">
+    <Project Path="src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/" />
+  <Folder Name="/src/SignalR/clients/" />
+  <Folder Name="/src/SignalR/clients/csharp/" />
+  <Folder Name="/src/SignalR/clients/csharp/Client.Core/">
+    <Project Path="src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/clients/csharp/Client.SourceGenerator/">
+    <Project Path="src/SignalR/clients/csharp/Client.SourceGenerator/src/Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj">
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/src/SignalR/clients/csharp/Client/">
+    <Project Path="src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/clients/csharp/Client/test/">
+    <Project Path="src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj" />
+    <Project Path="src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/clients/csharp/Http.Connections.Client/">
+    <Project Path="src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/clients/ts/">
+    <Project Path="src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/" />
+  <Folder Name="/src/SignalR/common/Http.Connections.Common/">
+    <Project Path="src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/Http.Connections/">
+    <Project Path="src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj" />
+    <Project Path="src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/Protocols.Json/">
+    <Project Path="src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/Protocols.MessagePack/">
+    <Project Path="src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/Protocols.NewtonsoftJson/">
+    <Project Path="src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/SignalR.Common/">
+    <Project Path="src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj" />
+    <Project Path="src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/common/testassets/">
+    <Project Path="src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/perf/">
+    <Project Path="src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/samples/">
+    <Project Path="src/SignalR/samples/ClientSample/ClientSample.csproj" />
+    <Project Path="src/SignalR/samples/JwtClientSample/JwtClientSample.csproj" />
+    <Project Path="src/SignalR/samples/JwtSample/JwtSample.csproj" />
+    <Project Path="src/SignalR/samples/SignalRSamples/SignalRSamples.csproj" />
+    <Project Path="src/SignalR/samples/SocialWeather/SocialWeather.csproj" />
+    <Project Path="src/SignalR/samples/WebSocketSample/WebSocketSample.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/server/" />
+  <Folder Name="/src/SignalR/server/Core/">
+    <Project Path="src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/server/SignalR/">
+    <Project Path="src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj" />
+    <Project Path="src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/server/Specification.Tests/">
+    <Project Path="src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SignalR/server/StackExchangeRedis/">
+    <Project Path="src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
+    <Project Path="src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/">
+    <Project Path="src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj" />
+    <Project Path="src/SiteExtensions/Microsoft.Web.Xdt.Extensions/tests/Microsoft.Web.Xdt.Extensions.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Testing/">
+    <Project Path="src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/" />
+  <Folder Name="/src/Tools/dotnet-dev-certs/">
+    <Project Path="src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/dotnet-getdocument/">
+    <Project Path="src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/dotnet-sql-cache/">
+    <Project Path="src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/dotnet-user-secrets/">
+    <Project Path="src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj" />
+    <Project Path="src/Tools/dotnet-user-secrets/test/dotnet-user-secrets.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/Extensions.ApiDescription.Client/">
+    <Project Path="src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj" />
+    <Project Path="src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/Extensions.ApiDescription.Server/">
+    <Project Path="src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/FirstRunCertGenerator/">
+    <Project Path="src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj" />
+    <Project Path="src/Tools/FirstRunCertGenerator/test/Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/GetDocumentInsider/">
+    <Project Path="src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj" />
+  </Folder>
+  <Folder Name="/src/Tools/Microsoft.dotnet-openapi/">
+    <Project Path="src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj" />
+    <Project Path="src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Validation/" />
+  <Folder Name="/src/Validation/gen/">
+    <Project Path="src/Validation/gen/Microsoft.Extensions.Validation.ValidationsGenerator.csproj" />
+  </Folder>
+  <Folder Name="/src/Validation/src/">
+    <Project Path="src/Validation/src/Microsoft.Extensions.Validation.csproj" />
+  </Folder>
+  <Folder Name="/src/Validation/test/">
+    <Project Path="src/Validation/test/Microsoft.Extensions.Validation.Tests/Microsoft.Extensions.Validation.Tests.csproj" />
+    <Project Path="src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/Microsoft.Extensions.Validation.GeneratorTests.csproj" />
+  </Folder>
+  <Folder Name="/src/WebEncoders/">
+    <Project Path="src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj" />
+  </Folder>
+  <Folder Name="/stress/">
+    <Project Path="src/Servers/Kestrel/stress/HttpStress.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj">
+      <Build Solution="*|arm64" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/TestInfrastructure/">
+    <File Path="src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in" />
+    <File Path="src/ProjectTemplates/TestInfrastructure/Directory.Build.targets.in" />
+    <File Path="src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets" />
+    <File Path="src/ProjectTemplates/TestInfrastructure/runtimeconfig.norollforward.json" />
+  </Folder>
+  <Project Path="eng/tools/HelixTestRunner/HelixTestRunner.csproj" />
+  <Project Path="src/Antiforgery/samples/MinimalFormSample/MinimalFormSample.csproj" />
+  <Project Path="src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj" />
+  <Project Path="src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj" />
+  <Project Path="src/Caching/perf/MicroBenchmarks/Microsoft.Extensions.Caching.MicroBenchmarks/Microsoft.Extensions.Caching.MicroBenchmarks.csproj" />
+  <Project Path="src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter/src/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter.csproj" />
+  <Project Path="src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj" />
+  <Project Path="src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj" />
+  <Project Path="src/Components/WebView/test/E2ETest/Microsoft.AspNetCore.Components.WebViewE2E.Test.csproj" />
+  <Project Path="src/DataProtection/samples/KeyManagementSimulator/KeyManagementSimulator.csproj" />
+  <Project Path="src/Framework/AspNetCoreAnalyzers/samples/WebAppSample/WebAppSample.csproj" />
+  <Project Path="src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj" />
+  <Project Path="src/Html.Abstractions/test/Microsoft.AspNetCore.Html.Abstractions.Tests.csproj" />
+  <Project Path="src/Http/Http.Results/tools/ResultsOfTGenerator/ResultsOfTGenerator.csproj" />
+  <Project Path="src/Identity/samples/IdentitySample.ApiEndpoints/IdentitySample.ApiEndpoints.csproj" />
+  <Project Path="src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj">
+    <Platform Project="arm64" />
+    <Build Solution="*|arm64" />
+  </Project>
+  <Project Path="src/Middleware/Microsoft.AspNetCore.OutputCaching.StackExchangeRedis/src/Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.csproj" />
+  <Project Path="src/Middleware/Microsoft.AspNetCore.OutputCaching.StackExchangeRedis/test/Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.Tests.csproj" />
+  <Project Path="src/Middleware/OutputCaching/perf/Microbenchmarks/Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj" />
+  <Project Path="src/Middleware/OutputCaching/samples/OutputCachingSample/OutputCachingSample.csproj" />
+  <Project Path="src/Middleware/OutputCaching/src/Microsoft.AspNetCore.OutputCaching.csproj" />
+  <Project Path="src/Middleware/OutputCaching/test/Microsoft.AspNetCore.OutputCaching.Tests.csproj" />
+  <Project Path="src/Middleware/RateLimiting/samples/RateLimitingSample/RateLimitingSample.csproj" />
+  <Project Path="src/Middleware/RateLimiting/src/Microsoft.AspNetCore.RateLimiting.csproj" />
+  <Project Path="src/Middleware/RateLimiting/test/Microsoft.AspNetCore.RateLimiting.Tests.csproj" />
+  <Project Path="src/Middleware/RequestDecompression/perf/Microbenchmarks/Microsoft.AspNetCore.RequestDecompression.Microbenchmarks.csproj" />
+  <Project Path="src/Middleware/RequestDecompression/sample/RequestDecompressionSample.csproj" />
+  <Project Path="src/Middleware/RequestDecompression/src/Microsoft.AspNetCore.RequestDecompression.csproj" />
+  <Project Path="src/Middleware/RequestDecompression/test/Microsoft.AspNetCore.RequestDecompression.Tests.csproj" />
+  <Project Path="src/Mvc/samples/MvcFormSample/MvcFormSample.csproj" />
+  <Project Path="src/OpenApi/perf/Microbenchmarks/Microsoft.AspNetCore.OpenApi.Microbenchmarks.csproj" />
+  <Project Path="src/OpenApi/sample/Sample.csproj" />
+  <Project Path="src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj" />
+  <Project Path="src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Microsoft.AspNetCore.OpenApi.Tests.csproj" />
+  <Project Path="src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj" />
+  <Project Path="src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj" />
+  <Project Path="src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj" />
+  <Project Path="src/Security/Authentication/BearerToken/src/Microsoft.AspNetCore.Authentication.BearerToken.csproj" />
+  <Project Path="src/Security/Authentication/JwtBearer/samples/MinimalJwtBearerSample/MinimalJwtBearerSample.csproj" />
+  <Project Path="src/Security/Authentication/OpenIdConnect/samples/MinimalOpenIdConnectSample/MinimalOpenIdConnectSample.csproj" />
+  <Project Path="src/Servers/HttpSys/perf/Microbenchmarks/Microsoft.AspNetCore.Server.HttpSys.Microbenchmarks.csproj" />
+  <Project Path="src/Servers/HttpSys/test/NonHelixTests/Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj" />
+  <Project Path="src/Servers/HttpSys/test/testassets/DelegationSite/DelegationSite.csproj" />
+  <Project Path="src/Servers/IIS/IIS/test/IIS.LongTests/IIS.LongTests.csproj" />
+  <Project Path="src/Servers/IIS/IIS/test/IIS.ShadowCopy.Tests/IIS.ShadowCopy.Tests.csproj" />
+  <Project Path="src/Servers/Kestrel/samples/WebTransportInteractiveSampleApp/WebTransportInteractiveSampleApp.csproj" />
+  <Project Path="src/Servers/Kestrel/samples/WebTransportSampleApp/WebTransportSampleApp.csproj" />
+  <Project Path="src/Servers/Kestrel/Transport.NamedPipes/src/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj" />
+  <Project Path="src/Servers/Kestrel/Transport.NamedPipes/test/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Tests.csproj" />
+  <Project Path="src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj">
+    <Platform Solution="*|Any CPU" Project="x86" />
+    <Platform Solution="*|arm64" Project="x86" />
+    <Platform Solution="*|x64" Project="x64" />
+    <Platform Solution="*|x86" Project="x86" />
+    <Build Solution="*|Any CPU" Project="false" />
+    <Build Solution="*|arm64" Project="false" />
+  </Project>
+  <Project Path="src/StaticAssets/src/Microsoft.AspNetCore.StaticAssets.csproj" />
+  <Project Path="src/StaticAssets/test/Microsoft.AspNetCore.StaticAssets.Tests.csproj" />
+  <Project Path="src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj" />
+  <Project Path="src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj" />
+  <Project Path="src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj" />
+  <Project Path="src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj" />
+  <Project Path="src/Tools/GetDocumentInsider/sample/GetDocumentSample.csproj" />
+  <Project Path="src/Tools/GetDocumentInsider/tests/GetDocumentInsider.Tests.csproj" />
+  <Project Path="src/Tools/LinkabilityChecker/LinkabilityChecker.csproj" />
+  <Project Path="src/Tools/SDK-Analyzers/Components/src/Microsoft.AspNetCore.Components.SdkAnalyzers.csproj" />
+  <Project Path="src/Tools/SDK-Analyzers/Components/test/Microsoft.AspNetCore.Components.SdkAnalyzers.Tests.csproj" />
+</Solution>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 175a777570c3..8fa37e0b3554 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,8 @@ Start a discussion on the [repository issue tracker](https://github.com/dotnet/a
 
 ## Bugs and feature requests?
 
-❗ **IMPORTANT: If you want to report a security-related issue, please see the `Reporting security issues and bugs` section below.**
+> [!IMPORTANT]
+> **If you want to report a security-related issue, please see the `Reporting security issues and bugs` section below.**
 
 Before reporting a new issue, try to find an existing issue if one already exists. If it already exists, upvote (👍) it. Also, consider adding a comment with your unique scenarios and requirements related to that issue.  Upvotes and clear details on the issue's impact help us prioritize the most important issues to be worked on sooner rather than later. If you can't find one, that's okay, we'd rather get a duplicate report than none.
 
diff --git a/Development.md b/Development.md
new file mode 100644
index 000000000000..bcc73ec8bafe
--- /dev/null
+++ b/Development.md
@@ -0,0 +1,30 @@
+# Development Tips
+
+## Steps to Produce Release Mode Installers
+
+1. Install Visual Studio 2022 (C++ desktop development must be enabled).
+1. Clone this repo and switch to a release tag.
+1. Run `restore.cmd` to initialize.
+1. Run `build.all.bat` to build everything out.
+
+The MSI files are `artifacts\installers\Release\*.msi`.
+
+## Steps to Set Up Local Development Environment
+
+The steps to set up local debugging environment are (assume you are on Windows x64 with VS2022/IIS/HTTP Bridge Module for IIS already installed),
+
+1. Clone this repo.
+1. Switch to a release tag (like `httpbridge_v9.0.2-rc.1`).
+1. Ensure VS2022 latest version is installed and execute restore.cmd.
+1. Modify `build.debug.bat` to use the VS2022 edition you are using (Community or another), and execute it to build the debug bits.
+1. Stop IIS via `iisreset /stop`.
+1. Copy the files from `artifacts\bin\AspNetCoreModuleShim\x64\Debug` to `%ProgramFiles%\IIS\HTTP Bridge Module\V2` and overwrite the release bits.
+1. Copy the files from `artifacts\bin\OutOfProcessRequestHandler\x64\Debug` to `%ProgramFiles%\IIS\HTTP Bridge Module\V2\xx.0.xxxxx` to replace the release bits.
+1. Start IIS via `iisreset /start`.
+1. Launch VS2022 and open `src\Servers\IIS\IISIntegration.slnf`.
+1. Launch your web app in IIS and attach VS2022 debugger to the proper `w3wp.exe` process.
+1. Set breakpoints in the code base to debug around.
+
+### Typical Locations to Debug
+
+* Breakpoints in `src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp` can be used to debug the actual token being passed.
diff --git a/Directory.Build.BeforeCommonTargets.targets b/Directory.Build.BeforeCommonTargets.targets
index f25d6a7ebff7..8ce4366421d1 100644
--- a/Directory.Build.BeforeCommonTargets.targets
+++ b/Directory.Build.BeforeCommonTargets.targets
@@ -6,7 +6,7 @@
         Condition="'$(ExcludeFromSourceOnlyBuild)' == '' and
             '$(DotNetBuildSourceOnly)' == 'true' and
             '$(IsAspNetCoreApp)' != 'true' and
-            '$(MSBuildProjectName)' != '$(TargetingPackName)' and
+            '$(UsingMicrosoftDotNetSharedFrameworkSdk)' != 'true' and
             '$(IsAnalyzersProject)' != 'true' and
             '$(IsProjectTemplateProject)' != 'true'">true</ExcludeFromSourceOnlyBuild>
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 499cf17df265..2754f04d06c3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,4 @@
 <Project>
-  <Import Project="eng\Common.props" />
 
   <PropertyGroup>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
@@ -9,7 +8,9 @@
     <!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. -->
     <RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot>
 
-    <RepositoryUrl>https://github.com/dotnet/aspnetcore</RepositoryUrl>
+    <DefaultRepositoryUrl>https://github.com/dotnet/aspnetcore</DefaultRepositoryUrl>
+    <RepositoryUrl>$(DefaultRepositoryUrl)</RepositoryUrl>
+    <PackageProjectUrl>$(DefaultRepositoryUrl)</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
@@ -48,15 +49,6 @@
         '$(IsBenchmarkProject)' == 'true' OR
         '$(IsPublishedAppTestProject)' == 'true' OR
         $(IsUnitTestProject) ">false</IsShipping>
-
-    <!--
-      Following logic mimics core-setup approach as well as
-      https://github.com/dotnet/arcade/blob/694d59f090b743f894779d04a7ffe11cbaf352e7/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj#L30-L31
-      $(DotNetFinalVersionKind) is set globally when doing final aka stable builds. Arcade infrastructure should pick
-      up $(IsStableBuild) automatically; property is also used to control prerelease branding.
-    -->
-    <IsStableBuild>false</IsStableBuild>
-    <IsStableBuild Condition=" '$(DotNetFinalVersionKind)' == 'release' ">true</IsStableBuild>
   </PropertyGroup>
 
   <!-- Disable logging of some task parameters or metadata to reduce binlog size.
@@ -98,6 +90,7 @@
   <Import Project="eng\QuarantinedTests.BeforeArcade.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\QuarantinedTests.AfterArcade.props" />
+  <Import Project="eng\Common.props" />
 
   <PropertyGroup>
     <Product>Microsoft ASP.NET Core</Product>
@@ -113,7 +106,12 @@
     <NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
 
     <IncludeSymbols>true</IncludeSymbols>
+
     <DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
+    <!-- Current xunit.runner.visualstudio supports net472+/net8.0+ only. So we can't use net462 -->
+    <DefaultNetFxTargetFramework Condition="'$(IsTestProject)'=='true'">net472</DefaultNetFxTargetFramework>
+
+    <CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
   </PropertyGroup>
 
   <!-- Warnings and errors -->
@@ -130,6 +128,9 @@
     <!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
     <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
 
+    <!-- don't warn about calling ConfigureAwait in test methods. we already commonly get off the xunit threads because they cause issues. -->
+    <NoWarn>$(NoWarn);xUnit1030</NoWarn>
+
     <!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
     <NoWarn>$(NoWarn);IL2121</NoWarn>
 
@@ -201,18 +202,13 @@
       limitations in the way the .NET SDK finds shared frameworks and targeting packs. It allows
       tests to use the shared frameworks and targeting packs that were just built.
 
-      However, source-build needs this to not happen while building projects that rely on the
-      AppHost framework pack. Source-build installs an SDK in a custom location outside this
+      However, the VMR needs this to not happen while building projects that rely on the
+      AppHost framework pack. The VMR installs an SDK in a custom location outside this
       repository, and setting NetCoreTargetingPackRoot to a different location causes source-build
       to restore the AppHost pack as a prebuilt rather than using the one that's present in the SDK.
-      Source-build doesn't run tests, so the property is simply conditioned out.
+      The dotnet product build doesn't run tests, so the property is simply conditioned out.
     -->
     <NetCoreTargetingPackRoot Condition="'$(DotNetBuild)' != 'true'">$(LocalDotNetRoot)packs\</NetCoreTargetingPackRoot>
-    <!-- This is not correct and needs attention eventually. This is primarily used to find the nethost headers in the apphost pack.
-         These should be coming from a restored apphost pack, rather than a hard-coded local SDK. In fact, aspnetcore
-         should not rely on a local SDK or mutating one to build. -->
-    <NetCoreTargetingPackRoot Condition="'$(DotNetBuild)' == 'true'">$(DotNetRoot)packs\</NetCoreTargetingPackRoot>
-
   </PropertyGroup>
 
   <Import Project="eng\tools\RepoTasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />
@@ -239,6 +235,38 @@
     <ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <OfficialBaseURL>https://builds.dotnet.microsoft.com/dotnet/</OfficialBaseURL>
+    <!-- Allow overriding the public base URL for Unified Build scenarios to pull assets from a local build. -->
+    <PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://ci.dot.net/public/</PublicBaseURL>
+    <InternalBaseURL>https://ci.dot.net/internal/</InternalBaseURL>
+    <!-- Allow overriding where installers are pulled in from previously completed jobs in Unified Build scenarios. -->
+    <AddVersionToCrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' != ''">true</AddVersionToCrossArchitectureInstallerBasePath>
+    <CrossArchitectureInstallerBasePath Condition="'$(CrossArchitectureInstallerBasePath)' == ''">$(ArtifactsShippingPackagesDir)</CrossArchitectureInstallerBasePath>
+  </PropertyGroup>
+
+  <!-- Try various places to find the runtime. It's either released (use official version),
+        public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
+  <ItemGroup Condition="'$(DotNetBuild)' != 'true'">
+    <RemoteAssetBaseURL Include="$(OfficialBaseURL)" />
+    <RemoteAssetBaseURL Include="$(PublicBaseURL)" />
+    <!-- Include the token here as we'll generate the URLs to download based on this item group. -->
+    <RemoteAssetBaseURL Include="$(InternalBaseURL)"
+                        Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
+      <token>$(DotnetRuntimeSourceFeedKey)</token>
+    </RemoteAssetBaseURL>
+  </ItemGroup>
+
+  <!--
+    Only try downloading from the "public" base URL when doing a vertical build.
+    In a vertical build, the public URL will be overwritten to point to local build artifacts.
+  -->
+  <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
+    <!-- MSBuild removes the '//' slashes when passing PublicBaseURL from the outer to the inner build. -->
+    <RemoteAssetBaseURL Condition="$(PublicBaseURL.StartsWith('file:')) and '$(OS)' != 'Windows_NT'" Include="$([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242'))" />
+    <RemoteAssetBaseURL Condition="!$(PublicBaseURL.StartsWith('file:')) or '$(OS)' == 'Windows_NT'" Include="$(PublicBaseURL)" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
     <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>
@@ -252,9 +280,9 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <!-- Set the arcade before common targets so we compute ExcludeFromBuild before arcade uses it. -->
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>
-    <CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonCrossTargetingTargets>
+    <!-- Set the before common targets so we compute ExcludeFromBuild before arcade uses it. -->
+    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets;$(CustomBeforeMicrosoftCommonTargets)</CustomBeforeMicrosoftCommonTargets>
+    <CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets;$(CustomBeforeMicrosoftCommonCrossTargetingTargets)</CustomBeforeMicrosoftCommonCrossTargetingTargets>
   </PropertyGroup>
 
   <Import Project="eng\Workarounds.props" />
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 140420599154..a2245ab43544 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -119,7 +119,7 @@
     <IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
 
     <BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND $(IsTestProject) ">true</BuildHelixPayload>
-    <SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
+    <SkipTests Condition="'$(SkipTests)' == '' AND '$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -172,6 +172,17 @@
         SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
   </Target>
 
+  <!--
+    Remove the implicit package reference for Microsoft.AspNetCore.App.Internal.Assets.
+    Projects within the repo will consume framework assets by importing
+    Microsoft.AspNetCore.App.Internal.Assets.targets directly
+  -->
+  <Target Name="_RemoveAspNetCoreAppInternalAssetsReference" AfterTargets="ProcessFrameworkReferences">
+    <ItemGroup>
+      <PackageReference Remove="Microsoft.AspNetCore.App.Internal.Assets" />
+    </ItemGroup>
+  </Target>
+
   <Import Project="eng\Workarounds.targets" />
   <Import Project="artifacts\bin\GenerateFiles\Directory.Build.targets" Condition=" '$(MSBuildProjectName)' != 'GenerateFiles' " />
   <Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
@@ -179,7 +190,9 @@
   <Import Project="eng\targets\CSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
   <Import Project="eng\targets\FSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
   <Import Project="eng\targets\Wix.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
+  <Import Project="eng\targets\Node.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.nodeproj'" />
   <Import Project="eng\targets\Java.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.javaproj'" />
+  <Import Project="eng\targets\Sfx.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.sfxproj'" />
   <Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
   <Import Project="eng\targets\Helix.targets" Condition=" $(IsTestProject) " />
   <Import Project="eng\targets\FunctionalTestWithAssets.targets"
diff --git a/LICENSE.txt b/LICENSE.txt
index 984713a49622..a3903a713af7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) LeXtudio Inc.
 
 All rights reserved.
 
diff --git a/NuGet.config b/NuGet.config
index 9c0abd15023f..974c0d5109a7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,21 +2,20 @@
 <configuration>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-pub-dotnet-dotnet-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-dotnet -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-    <!-- Used for the SiteExtension bits that are included in the 8.0 build -->
-    <add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
-    <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
-    <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
-    <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
-    <!-- Used for the Rich Navigation indexing task -->
-    <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/README.md b/README.md
index 48d103faf360..e235f7ae87cb 100644
--- a/README.md
+++ b/README.md
@@ -1,63 +1,41 @@
-ASP.NET Core
-============
+HTTP Bridge Module for IIS
+==========================
 
-[![.NET Foundation](https://img.shields.io/badge/.NET%20Foundation-blueviolet.svg)](https://www.dotnetfoundation.org/)
-[![MIT License](https://img.shields.io/github/license/dotnet/aspnetcore?color=%230b0&style=flat-square)](https://github.com/dotnet/aspnetcore/blob/main/LICENSE.txt) [![Help Wanted](https://img.shields.io/github/issues/dotnet/aspnetcore/help%20wanted?color=%232EA043&label=help%20wanted&style=flat-square)](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) [![Good First Issues](https://img.shields.io/github/issues/dotnet/aspnetcore/good%20first%20issue?color=%23512BD4&label=good%20first%20issue&style=flat-square)](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-[![Discord](https://img.shields.io/discord/732297728826277939?style=flat-square&label=Discord&logo=discord&logoColor=white&color=7289DA)](https://aka.ms/dotnet-discord)
+[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads-pre/lextudio/httpbridge/total?style=flat-square)](https://github.com/lextudio/httpbridge/releases)
+[![MIT License](https://img.shields.io/github/license/lextudio/httpbridge?color=%230b0&style=flat-square)](https://github.com/lextudio/httpbridge/blob/main/LICENSE.txt) [![Help Wanted](https://img.shields.io/github/issues/lextudio/httpbridge/help%20wanted?color=%232EA043&label=help%20wanted&style=flat-square)](https://github.com/lextudio/httpbridge/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) [![Good First Issues](https://img.shields.io/github/issues/lextudio/httpbridge/good%20first%20issue?color=%23512BD4&label=good%20first%20issue&style=flat-square)](https://github.com/lextudio/httpbridge/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
 
-ASP.NET Core is an open-source and cross-platform framework for building modern cloud-based internet-connected applications, such as web apps, IoT apps, and mobile backends. ASP.NET Core apps run on [.NET](https://dot.net), a free, cross-platform, and open-source application runtime. It was architected to provide an optimized development framework for apps that are deployed to the cloud or run on-premises. It consists of modular components with minimal overhead, so you retain flexibility while constructing your solutions. You can develop and run your ASP.NET Core apps cross-platform on Windows, Mac, and Linux. [Learn more about ASP.NET Core](https://learn.microsoft.com/aspnet/core/).
+HttpPlatformHandler was created by Microsoft Azure team and made publicly available in 2015. More history about this Microsoft product can be found [in this blog post](https://docs.lextudio.com/blog/the-rough-history-of-iis-httpplatformhandler/).
 
-## Get started
+As Microsoft didn't publish any new release after v1.2 and more issues related to this old release were reported by users, there is a need to give the user community something new. Our team at LeXtudio Inc. are experienced .NET developers with extensive IIS knowledge so we decided to give this a try.
 
-Follow the [Getting Started](https://learn.microsoft.com/aspnet/core/getting-started) instructions.
+We chose to fork and build upon ASP.NET Core module, which was initially a fork of HttpPlatformHandler itself, now is both open-source and well maintained by Microsoft ASP.NET Core team. By renaming many things through the code base, we are able to derive a slim module that just works for any programming languages/application servers. And most importantly we keep this new module backward compatible with HttpPlatformHandler v1.2. We used to call this project "HttpPlatformHandler v2" but now prefer to rename it to "HTTP Bridge Module for IIS" to better reflect its role as a generic bridging/compatibility layer and to avoid future confusion with any Microsoft offerings.
 
-Also check out the [.NET Homepage](https://www.microsoft.com/net) for released versions of .NET, getting started guides, and learning resources.
+"HTTP Bridge Module" is a drop‑in replacement for the original Microsoft HttpPlatformHandler 1.2 with continued community maintenance. The existing configuration schema remain unchanged so existing deployments can adopt the new module without altering their configuration files.
 
-See the [Triage Process](https://github.com/dotnet/aspnetcore/blob/main/docs/TriageProcess.md) document for more information on how we handle incoming issues.
+The changes we make are released under the MIT license.
 
-## How to engage, contribute, and give feedback
+## Get started
 
-Some of the best ways to contribute are to try things out, file issues, join in design conversations,
-and make pull-requests.
+Find a release from [the Releases section](https://github.com/lextudio/httpbridge/releases) and you can see the installers (x86, x64, and ARM64).
 
-* [Download our latest daily builds](./docs/DailyBuilds.md)
-* Follow along with the development of ASP.NET Core:
-    * [Community Standup](https://live.asp.net): The community standup is held every week and streamed live on YouTube. You can view past standups in the linked playlist.
-    * [Roadmap](https://aka.ms/aspnet/roadmap): The schedule and milestone themes for ASP.NET Core.
-* [Build ASP.NET Core source code](./docs/BuildFromSource.md)
-* Check out the [contributing](CONTRIBUTING.md) page to see the best places to log issues and start discussions.
+Install them accordingly to the IIS/IIS Express builds you are using, and then you can apply your previous knowledge/configuration of HttpPlatformHandler with this new HTTP Bridge Module. Existing `httpPlatform` schema elements continue to work.
 
-## Reporting security issues and bugs
+## FAQ
 
-Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC)  secure@microsoft.com. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094.aspx).
+### Why was the project renamed?
 
-## Related projects
+"HttpPlatformHandler v2" mimicked the original Microsoft product name and risked future confusion if Microsoft ships an updated official module. "HTTP Bridge Module for IIS" emphasizes its role as a community-maintained compatibility and bridging layer between IIS and arbitrary application servers while retaining full backward compatibility. For seamless upgrades we intentionally keep the original configuration schema names so existing `web.config` files do not require edits.
 
-These are some other repos for related projects:
+### Do I need to change my existing configuration?
 
-* [Documentation](https://github.com/aspnet/Docs) - documentation sources for https://learn.microsoft.com/aspnet/core/
-* [Entity Framework Core](https://github.com/dotnet/efcore) - data access technology
-* [Runtime](https://github.com/dotnet/runtime) - cross-platform runtime for cloud, mobile, desktop, and IoT apps
-* [Razor](https://github.com/dotnet/razor) - the Razor compiler and tooling for working with Razor syntax (.cshtml, .razor)
+No. Continue to use the existing `httpPlatform` section and attributes. Only project documentation and branding changed.
 
-## Code of conduct
+## Reporting bugs or asking questions
 
-See [CODE-OF-CONDUCT](./CODE-OF-CONDUCT.md)
+Bugs or questions can be reported to [the Issues section](https://github.com/lextudio/httpbridge/issues).
 
-## Nightly builds
+For commercial support inquiries, please contact LeXtudio Inc. via email support@lextudio.com or our [home page](https://lextudio.com).
 
-This table includes links to download the latest builds of the ASP.NET Core Shared Framework. Also included are links to download the Windows Hosting Bundle, which includes the ASP.NET Core Shared Framework, the .NET Runtime Shared Framework, and the IIS plugin (ASP.NET Core Module). You can download the latest .NET Runtime builds [here](https://github.com/dotnet/runtime/blob/main/docs/project/dogfooding.md#nightly-builds-table), and the latest .NET SDK builds [here](https://github.com/dotnet/installer#table). **If you're unsure what you need, then install the SDK; it has everything except the IIS plugin.**
+## Reporting security issues
 
-| Platform | Shared Framework (Installer) | Shared Framework (Binaries) | Hosting Bundle (Installer) |
-| :--------- | :----------: | :----------: | :----------: |
-| **Windows x64** | [Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x64.exe) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x64.zip) | [Installer](https://aka.ms/dotnet/9.0/daily/dotnet-hosting-win.exe) |
-| **Windows x86** | [Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x86.exe) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-x86.zip) | [Installer](https://aka.ms/dotnet/9.0/daily/dotnet-hosting-win.exe) |
-| **Windows arm64** | [Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-arm64.exe) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-win-arm64.zip) | [Installer](https://aka.ms/dotnet/9.0/daily/dotnet-hosting-win.exe) |
-| **macOS x64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-osx-x64.tar.gz) | **N/A** |
-| **macOS arm64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-osx-arm64.tar.gz) | **N/A** |
-| **Linux x64** | [Deb Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-x64.deb) - [RPM Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-x64.rpm) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-x64.tar.gz) | **N/A** |
-| **Linux arm** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-arm.tar.gz) | **N/A** |
-| **Linux arm64** | [RPM Installer](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-aarch64.rpm) | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-arm64.tar.gz) | **N/A** |
-| **Linux-musl-x64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-musl-x64.tar.gz) | **N/A** |
-| **Linux-musl-arm** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-musl-arm.tar.gz) | **N/A** |
-| **Linux-musl-arm64** | **N/A** | [Binaries](https://aka.ms/dotnet/9.0/daily/aspnetcore-runtime-linux-musl-arm64.tar.gz) | **N/A** |
+Security issues should be reported privately, via email, to LeXtudio Inc. support@lextudio.com. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
diff --git a/activate.sh b/activate.sh
old mode 100644
new mode 100755
diff --git a/build.all.bat b/build.all.bat
new file mode 100644
index 000000000000..0eded03d1b5f
--- /dev/null
+++ b/build.all.bat
@@ -0,0 +1,14 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+call build.binaries.bat
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call build.installers.bat
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call pwsh -file sign.installers.ps1
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+echo All build and signing steps completed successfully.
+exit /b 0
diff --git a/build.binaries.bat b/build.binaries.bat
new file mode 100644
index 000000000000..12b1fc11bfb7
--- /dev/null
+++ b/build.binaries.bat
@@ -0,0 +1,25 @@
+REM Use vswhere to locate MSBuild.exe
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe`) do set MSBUILD_PATH=%%i
+
+if not defined MSBUILD_PATH (
+    echo Could not find MSBuild.exe via vswhere. Please ensure Visual Studio is installed.
+    exit /b 1
+)
+
+call "%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj /p:Platform=x64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj /p:Platform=ARM64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj /p:Platform=Win32 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj /p:Platform=x64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj /p:Platform=ARM64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj /p:Platform=Win32 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
diff --git a/build.debug.bat b/build.debug.bat
new file mode 100644
index 000000000000..80fc7f21f596
--- /dev/null
+++ b/build.debug.bat
@@ -0,0 +1,9 @@
+
+@echo off
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe`) do set MSBUILD_PATH=%%i
+if not defined MSBUILD_PATH (
+    echo MSBuild not found via vswhere.
+    exit /b 1
+)
+"%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj /p:Platform=x64 /p:Configuration=Debug
+"%MSBUILD_PATH%" src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj /p:Platform=x64 /p:Configuration=Debug
diff --git a/build.installers.bat b/build.installers.bat
new file mode 100644
index 000000000000..1d46d6be7734
--- /dev/null
+++ b/build.installers.bat
@@ -0,0 +1,52 @@
+REM Use vswhere to locate MSBuild.exe
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe`) do set MSBUILD_PATH=%%i
+
+if not defined MSBUILD_PATH (
+    echo Could not find MSBuild.exe via vswhere. Please ensure Visual Studio is installed.
+    exit /b 1
+)
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /t:restore
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /t:clean /p:Platform=x64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /t:clean /p:Platform=arm64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /t:clean /p:Platform=x86 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /p:Platform=x64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /p:Platform=arm64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj /p:Platform=x86 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /t:restore
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /t:clean /p:Platform=x64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /t:clean /p:Platform=arm64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /t:clean /p:Platform=x86 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /p:Platform=x64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /p:Platform=arm64 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+call "%MSBUILD_PATH%" src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj /p:Platform=x86 /p:Configuration=Release
+if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+
+echo All installer builds completed successfully.
+exit /b 0
diff --git a/deploy.bat b/deploy.bat
new file mode 100644
index 000000000000..5147235283b4
--- /dev/null
+++ b/deploy.bat
@@ -0,0 +1,6 @@
+iisreset /stop
+copy artifacts\bin\OutOfProcessRequestHandler\Win32\Debug\httpbridge_outofprocess.dll "C:\Program Files (x86)\IIS Express\HTTP Bridge Module\V2\18.0.24105"
+copy artifacts\bin\OutOfProcessRequestHandler\Win32\Debug\httpbridge_outofprocess.pdb "C:\Program Files (x86)\IIS Express\HTTP Bridge Module\V2\18.0.24105"
+copy artifacts\bin\AspNetCoreModuleShim\Win32\Debug\httpbridge.dll "C:\Program Files (x86)\IIS Express\HTTP Bridge Module\V2"
+copy artifacts\bin\AspNetCoreModuleShim\Win32\Debug\httpbridge.pdb "C:\Program Files (x86)\IIS Express\HTTP Bridge Module\V2"
+iisreset /start
diff --git a/deploy.debug.bat b/deploy.debug.bat
new file mode 100644
index 000000000000..96c0cd6392f0
--- /dev/null
+++ b/deploy.debug.bat
@@ -0,0 +1,59 @@
+@echo off
+echo Copying ASP.NET Core Module debug build files to IIS HTTP Bridge Module directory...
+
+set SOURCE_DIR1=C:\Users\Administrator\source\repos\httpbridge\artifacts\bin\OutOfProcessRequestHandler\x64\Debug
+set SOURCE_DIR2=C:\Users\Administrator\source\repos\httpbridge\artifacts\bin\AspNetCoreModuleShim\x64\Debug
+set TARGET_DIR1=C:\Program Files\IIS\HTTP Bridge Module\V2\19.0.25152
+set TARGET_DIR2=C:\Program Files\IIS\HTTP Bridge Module\V2
+
+REM Check if source directories exist
+if not exist "%SOURCE_DIR1%" (
+    echo Error: Source directory not found: %SOURCE_DIR1%
+    exit /b 1
+)
+
+if not exist "%SOURCE_DIR2%" (
+    echo Error: Source directory not found: %SOURCE_DIR2%
+    exit /b 1
+)
+
+REM Check if target directories exist, create if not
+if not exist "%TARGET_DIR1%" (
+    echo Target directory does not exist. Creating directory: %TARGET_DIR1%
+    mkdir "%TARGET_DIR1%"
+    if %errorlevel% NEQ 0 (
+        echo Error: Failed to create target directory. Make sure you have administrator privileges.
+        exit /b %errorlevel%
+    )
+)
+
+if not exist "%TARGET_DIR2%" (
+    echo Target directory does not exist. Creating directory: %TARGET_DIR2%
+    mkdir "%TARGET_DIR2%"
+    if %errorlevel% NEQ 0 (
+        echo Error: Failed to create target directory. Make sure you have administrator privileges.
+        exit /b %errorlevel%
+    )
+)
+
+REM Copy OutOfProcessRequestHandler DLL and PDB files
+echo Copying OutOfProcessRequestHandler files to %TARGET_DIR1%...
+copy /Y "%SOURCE_DIR1%\*.dll" "%TARGET_DIR1%\"
+copy /Y "%SOURCE_DIR1%\*.pdb" "%TARGET_DIR1%\"
+
+if %errorlevel% NEQ 0 (
+    echo Error: Failed to copy OutOfProcessRequestHandler files. Make sure you have administrator privileges.
+    exit /b %errorlevel%
+)
+
+REM Copy AspNetCoreModuleShim DLL and PDB files
+echo Copying AspNetCoreModuleShim files to %TARGET_DIR2%...
+copy /Y "%SOURCE_DIR2%\*.dll" "%TARGET_DIR2%\"
+copy /Y "%SOURCE_DIR2%\*.pdb" "%TARGET_DIR2%\"
+
+if %errorlevel% NEQ 0 (
+    echo Error: Failed to copy AspNetCoreModuleShim files. Make sure you have administrator privileges.
+    exit /b %errorlevel%
+)
+
+echo All files copied successfully
\ No newline at end of file
diff --git a/docs/APIReviewPrinciples.md b/docs/APIReviewPrinciples.md
new file mode 100644
index 000000000000..a00a2c78ff0e
--- /dev/null
+++ b/docs/APIReviewPrinciples.md
@@ -0,0 +1,13 @@
+# API Review Conventions and Principles
+
+Welcome to the API Review Conventions and Principles document for the dotnet/aspnetcore repository. This document serves as a comprehensive guide to the conventions and principles that our team has established over time. It is designed to encapsulate our collective knowledge and best practices, ensuring consistency and quality in our API design.
+
+The primary goal of this document is to provide a reference for our team and contributors, helping them to understand and apply these principles when proposing new APIs. By adhering to these guidelines, we aim to foster a collaborative and informed API review process, ultimately enhancing the robustness and usability of our APIs.
+
+We encourage you to refer to this document regularly and contribute to its evolution as we continue to refine our API review process. We also encourage you to follow the [.NET framework design guidelines](https://learn.microsoft.com/dotnet/standard/design-guidelines/) for more general guidance not specific to the dotnet/aspnetcore repository.
+
+## Principles
+- Principle 1
+
+## Conventions
+- Convention 1
diff --git a/docs/APIReviewProcess.md b/docs/APIReviewProcess.md
index 17c522cb2b77..2a8755a54e83 100644
--- a/docs/APIReviewProcess.md
+++ b/docs/APIReviewProcess.md
@@ -19,6 +19,10 @@ The process is visualized in the below diagram:
 1. The owner of the issue is now free to work on the implementation of the proposed API.
 1. In case during implementation changes to the original proposal are required, the review should become obsolete and the process should start from the beginning.
 
+## Learnings and growth
+
+Over time the team will build up certain conventions and principles, that will be useful to establish for future API reviews too. To help with this, the [API Review Principles document](/docs/APIReviewPrinciples.md) document will be used to store such principles and conventions, making them persistent over time. Eventually, it will grow into a good knowledge base that will also help newcomers to learn and be better prepared with designing their APIs.
+
 ## What Makes an issue/PR "ready-for-review"?
 
 Before marking an issue as `api-ready-for-review`, make sure that the issue has the following:
diff --git a/docs/AddingNewProjects.md b/docs/AddingNewProjects.md
index c13db88fbf42..ce1a25cc1ede 100644
--- a/docs/AddingNewProjects.md
+++ b/docs/AddingNewProjects.md
@@ -28,13 +28,13 @@ Sample PR of final result: https://github.com/dotnet/aspnetcore/pull/41945
   - If VS has not already modified these files, open the `.slnf` you want to add the project to. Create a solution folder for your project if doesn't exist already. Then right click solution folder -> Add -> Existing Project... -> follow the wizard.
 1. Run the `eng/scripts/GenerateProjectList.ps1` file to regenerate a number of `eng/*.props` files e.g. ProjectReferences.props.
 
-**Note:** If you are adding a new project to the root `src` directory, you will also need to add a reference in both of the `DotNetProjects` lists of the `eng/Build.props` file. The first list (the one with condition `'$(BuildMainlyReferenceProviders)' != 'true'"`) has items in the format of:
+**Note:** If you are adding a new project to the root `src` directory, you will also need to add a reference in both the `ProjectsWithTestsSubsetN` and `DotNetProjects` lists of the `eng/Build.props` file. The `ProjectsWithTestsSubsetN` lists (the one with condition `'$(BuildMainlyReferenceProviders)' != 'true'"`) has items in the format of:
   ```XML
-   <DotNetProjects Include="
+   <ProjectsWithTestsSubsetN Include="
                           $(RepoRoot)src\[YOUR FOLDER]\**\*.csproj;
                           ...
   ```
-while the second (the one with condition `'$(BuildMainlyReferenceProviders)' == 'true'"`) has them in the format of (note the second `src`):
+. You should add your project to whichever `ProjectsWithTestsSubsetN` list is shorter (`ProjectsWithTestsSubset1` or `ProjectsWithTestsSubset2`). The `DotNetProjects` list (the one with condition `'$(BuildMainlyReferenceProviders)' == 'true'"`) has them in the format of (note the second `src`):
   ```XML
   <DotNetProjects Include="
                         $(RepoRoot)src\[YOUR FOLDER]\**\src\*.csproj;
@@ -50,4 +50,4 @@ while the second (the one with condition `'$(BuildMainlyReferenceProviders)' ==
 3. Add your project name to the lists in `src\Framework\test\TestData.cs`. This is not strictly necessary for the project to work but there is a test on CI that will fail if this is not done. Make sure to include your project in a way that maintains alphabetical order.
 
 ## Manually saving solution and solution filter files
-VS is pretty good at keeping the files up to date and organized correctly. It will also prompt you if it finds an error and, in most cases, offer a solution to fix the issue. Sometimes just saving the file will trigger VS to resolve any issues automatically. However, if you would like to add a new solution filter file or update one manually you can find a tutorial link [here](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).
+VS is pretty good at keeping the files up to date and organized correctly. It will also prompt you if it finds an error and, in most cases, offer a solution to fix the issue. Sometimes just saving the file will trigger VS to resolve any issues automatically. However, if you would like to add a new solution filter file or update one manually you can find a [tutorial on filtered solutions in Visual Studio](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).
diff --git a/docs/DailyBuilds.md b/docs/DailyBuilds.md
index 09121497f18b..eb7ba2def9e5 100644
--- a/docs/DailyBuilds.md
+++ b/docs/DailyBuilds.md
@@ -4,7 +4,7 @@ Daily builds include the latest source code changes. They are not supported for
 
 If you want to download the latest daily build and use it in a project, then you need to:
 
-* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
+* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
 * Add a NuGet.Config to your project directory with the following content:
 
 ## .NET 8
@@ -33,6 +33,19 @@ If you want to download the latest daily build and use it in a project, then you
   </configuration>
   ```
 
+## .NET 10
+
+  ```xml
+  <?xml version="1.0" encoding="utf-8"?>
+  <configuration>
+      <packageSources>
+          <clear />
+          <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+          <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+      </packageSources>
+  </configuration>
+  ```
+
   *NOTE: This NuGet.Config should be with your application unless you want nightly packages to potentially start being restored for other apps on the machine.*
 
 Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio.
@@ -47,4 +60,4 @@ These are available in the [Visual Studio Preview](https://www.visualstudio.com/
 
 ## Downloading daily builds of aspnetcore
 
-Links to our daily builds can be found [here](https://github.com/dotnet/aspnetcore/blob/main/README.md#nightly-builds).
+Links to our daily builds can be found in the [ASP.NET Core nightly builds section](https://github.com/dotnet/aspnetcore/blob/main/README.md#nightly-builds).
diff --git a/docs/OnboardingNewOS.md b/docs/OnboardingNewOS.md
new file mode 100644
index 000000000000..9a14be282c1a
--- /dev/null
+++ b/docs/OnboardingNewOS.md
@@ -0,0 +1,23 @@
+# Onboarding New Operating System Versions
+
+Guidance for onboarding new OS versions in ASP.NET, including how to add build & test coverage.
+
+For broader context on our OS philosophy in .NET, see [Onboarding Guide for New Operating System Versions](https://github.com/dotnet/runtime/blob/main/docs/project/os-onboarding.md) in dotnet/runtime.
+
+To see the list of our latest docker tags, see [this file](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json).
+
+For the full set of docker tags, see [this file](https://mcr.microsoft.com/v2/dotnet-buildtools/prereqs/tags/list).
+
+For info on modifying/adding new docker images, see [this doc](https://github.com/dotnet/dotnet-buildtools-prereqs-docker?tab=readme-ov-file#how-to-modify-or-create-a-new-image).
+
+## Building on a new Operating System
+
+On Mac and Linux, dotnet/aspnetcore does not build any native code - therefore we cross-compile all of our Linux bits on one docker image in CI. If you need to update the image that we use, simply follow the pattern from [this PR](https://github.com/dotnet/aspnetcore/pull/60260) to update the image we use in [ci.yml](https://github.com/dotnet/aspnetcore/blob/main/.azure/pipelines/ci.yml) and [ci-public.yml](https://github.com/dotnet/aspnetcore/blob/main/.azure/pipelines/ci-public.yml). Make sure to use one of the docker tags from the link above.
+
+## Testing on a new Operating System
+
+We run our tests in Helix on a variety of Operating Systems - the set of queues that we run tests on is listed in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props). 
+
+In order to update one of the queues we use, follow the example in [this PR](https://github.com/dotnet/aspnetcore/pull/54609) - if you change any property names, be sure to find and replace all instances of that property in the repo.
+
+In order to add a new queue to the Helix matrix, add the new queue to the top of [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/8ee12ef7a2c179f3d7c7da5ab33d76d652042d0b/eng/targets/Helix.Common.props#L3-L9), and add it to the [list of queues we use in the Helix Matrix](https://github.com/dotnet/aspnetcore/blob/8ee12ef7a2c179f3d7c7da5ab33d76d652042d0b/eng/targets/Helix.Common.props#L39-L60). Be sure to queue a build of the [aspnetcore-helix-matrix pipeline](https://dev.azure.com/dnceng-public/public/_build?definitionId=85) against your branch for validation.
\ No newline at end of file
diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md
index ec4a810fc764..dd9bc10124e8 100644
--- a/docs/ReferenceResolution.md
+++ b/docs/ReferenceResolution.md
@@ -104,6 +104,8 @@ is changing to `Microsoft.AspNetCore.BetterThanOrange`, you would need to make t
 
 `darc` is a command-line tool that is used for dependency management in the dotnet ecosystem of repos. `darc` can be installed using the `darc-init` scripts located inside the `eng/common` directory. Once `darc` is installed, you'll need to set up the appropriate access tokens as outlined [in the official Darc docs](https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#setting-up-your-darc-client).
 
+> :warning: Much of the functionality described below can now be done via the [web UI](https://maestro.dot.net/) - it's recommended to try that out first.
+
 Once `darc` is installed and set-up, it can be used to modify the subscriptions and dependencies in a project.
 
 ### Getting the list of subscriptions in a repo
diff --git a/docs/Servicing.md b/docs/Servicing.md
index a958fb955260..d646a59c0766 100644
--- a/docs/Servicing.md
+++ b/docs/Servicing.md
@@ -4,7 +4,7 @@ We maintain several on-going releases at once and produce patches for them. An e
 
 See the [.NET Core release lifecycle](https://dotnet.microsoft.com/platform/support/policy/dotnet-core#lifecycle) for more details on the currently-supported .NET releases.
 
-The status of current servicing fixes can be found on the [Servicing Status](https://github.com/dotnet/aspnetcore/projects/11) GitHub project.
+The status of current servicing fixes can be found on the [Servicing Status](https://github.com/orgs/dotnet/projects/448) GitHub project.
 
 ## Servicing Bar
 
diff --git a/docs/WebTransport.md b/docs/WebTransport.md
index 3cf9b9d32d25..ae2ae6c33ce3 100644
--- a/docs/WebTransport.md
+++ b/docs/WebTransport.md
@@ -18,7 +18,7 @@ To use it, simply run from VS. This will launch the server and terminal. Now you
 
 ## Using Edge or Chrome DevTools as a client
 
-The Chromium project has implemented a WebTransport client and can be accessed via their JS API from the Chrome or Edge DevTools console. A good sample app demonstrating how to use that API can be found [here](https://github.com/myjimmy/google-webtransport-sample/blob/ee13bde656c4d421d1f2a8e88fd71f572272c163/client.js).
+The Chromium project has implemented a WebTransport client and can be accessed via their JS API from the Chrome or Edge DevTools console. A good sample app demonstrating how to use that API can be found in the [Google WebTransport sample repository](https://github.com/myjimmy/google-webtransport-sample/blob/ee13bde656c4d421d1f2a8e88fd71f572272c163/client.js).
 
 ## Note about preview features
 
@@ -171,7 +171,7 @@ session.Abort(int errorCode);
 ```
 Aborting a WebTransport session will result in severing the connection with the client and aborting all the streams. You can optionally specify an error code that will be passed down into the logs. The default value (256) represents no error.
 
-**Note:** valid error codes are defined [here](https://www.rfc-editor.org/rfc/rfc9114.html#name-http-3-error-codes).
+**Note:** valid error codes are defined in the [HTTP/3 Error Codes specification](https://www.rfc-editor.org/rfc/rfc9114.html#name-http-3-error-codes).
 
 - Aborting a WebTransport stream
 ```C#
diff --git a/docs/area-owners.md b/docs/area-owners.md
index 4511f3c2a776..618af640082d 100644
--- a/docs/area-owners.md
+++ b/docs/area-owners.md
@@ -2,37 +2,44 @@
 
 The below table lists all the `area-`labels used in the **dotnet/aspnetcore** repository and their owners.
 
-The **dotnet/runtime** repo has [its own list](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md).
+| area label                                                                                                                    | Owners                                                                                                                                                                                                                     | Doc Owners  | Description                                                                                                                                                            |
+| ----------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **[area-auth](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-auth)**                         | [@joperezr](https://github.com/joperezr) [@mikekistler](https://github.com/mikekistler) [@halter73](https://github.com/halter73) [@mackinnonbuck](https://github.com/mackinnonbuck)                                        | [@wadepickett](https://github.com/wadepickett) [@tdykstra](https://github.com/tdykstra)  | Authn, Authz, OAuth, OIDC, Bearer                                                                                                                                      |
+| **[area-blazor](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-blazor)**                     | [@lewing](https://github.com/lewing) [@danroth27](https://github.com/danroth27) [@aspnet-blazor-eng](https://github.com/aspnet-blazor-eng)                                                                                 | [@guardrex](https://github.com/guardrex)  | Blazor, Razor Components (WASM issues may be moved to dotnet/runtime repo)                                                                                             |
+| **[area-commandlinetools](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-commandlinetools)** | [@adityamandaleeka](https://github.com/adityamandaleeka) [@mikekistler](https://github.com/mikekistler) [@captainsafia](https://github.com/captainsafia)                                                                   | [@wadepickett](https://github.com/wadepickett) | Command line tools, dotnet-dev-certs, dotnet-user-jwts, and OpenAPI                                                                                                    |
+| **[area-dataprotection](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-dataprotection)**     | [@adityamandaleeka](https://github.com/adityamandaleeka) [@DeagleGross](https://github.com/DeagleGross)                                                                                                                    | [@tdykstra](https://github.com/tdykstra) | DataProtection                                                                                                                                                         |
+| **[area-grpc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-grpc)**                         | [@adityamandaleeka](https://github.com/adityamandaleeka) [@mikekistler](https://github.com/mikekistler) [@jamesnk](https://github.com/jamesnk) [@mgravell](https://github.com/mgravell)                                    | [@wadepickett](https://github.com/wadepickett)  | GRPC wire-up, templates (library itself is  https://github.com/grpc/grpc-dotnet)                                                                                       |
+| **[area-healthchecks](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-healthchecks)**         | [@adityamandaleeka](https://github.com/adityamandaleeka) [@samsp-msft](https://github.com/samsp-msft) [@brennanconroy](https://github.com/brennanconroy)                                                                   | [@wadepickett](https://github.com/wadepickett) | Healthchecks (some bugs also in Extensions repo)                                                                                                                       |
+| **[area-hosting](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-hosting)**                   | [@joperezr](https://github.com/joperezr) [@danroth27](https://github.com/danroth27) [@halter73](https://github.com/halter73)                                                                                               | [@tdykstra](https://github.com/tdykstra) | Includes Hosting                                                                                                                                                       |
+| **[area-identity](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-identity)**                 | [@joperezr](https://github.com/joperezr) [@mikekistler](https://github.com/mikekistler) [@halter73](https://github.com/halter73) [@mackinnonbuck](https://github.com/mackinnonbuck)                                        | [@tdykstra](https://github.com/tdykstra) [@wadepickett](https://github.com/wadepickett) | Identity and providers                                                                                                                                                 |
+| **[area-infrastructure](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-infrastructure)**     | [@joperezr](https://github.com/joperezr) [@wtgodbe](https://github.com/wtgodbe)                                                                                                                                            | [@tdykstra](https://github.com/tdykstra) | MSBuild projects/targets, build scripts, CI, Installers and shared framework                                                                                           |
+| **[area-middleware](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-middleware)**             | [@adityamandaleeka](https://github.com/adityamandaleeka) [@samsp-msft](https://github.com/samsp-msft) [@brennanconroy](https://github.com/brennanconroy)                                                                   | [@wadepickett](https://github.com/wadepickett) | URL rewrite, redirect, response cache/compression, session, caching, and other general middlewares                                                                     |
+| **[area-minimal](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-minimal)**                   | [@adityamandaleeka](https://github.com/adityamandaleeka) [@mikekistler](https://github.com/mikekistler) [@captainsafia](https://github.com/captainsafia) [@mitchdenny](https://github.com/mitchdenny)                      | [@wadepickett](https://github.com/wadepickett)  | Includes minimal APIs, endpoint filters, parameter binding, request delegate generator etc                                                                             |
+| **[area-mvc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-mvc)**                           | [@adityamandaleeka](https://github.com/adityamandaleeka) [@mikekistler](https://github.com/mikekistler) [@captainsafia](https://github.com/captainsafia)                                                                   | [@tdykstra](https://github.com/tdykstra) | MVC, Actions and Controllers, Localization, CORS, most templates                                                                                                       |
+| **[area-networking](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-networking)**             | [@adityamandaleeka](https://github.com/adityamandaleeka) [@samsp-msft](https://github.com/samsp-msft) [@brennanconroy](https://github.com/brennanconroy) [@DeagleGross](https://github.com/DeagleGross)                    | [@tdykstra](https://github.com/tdykstra) | Includes Kestrel/servers, protocols such as HTTP/2, HTTP3, YARP, jsonpatch, bedrock, websockets, http client factory, http abstractions, networking aspects of caching |
+| **[area-perf](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-perf)**                         | [@joperezr](https://github.com/joperezr) [@sebastienros](https://github.com/sebastienros)                                                                                                                                  | [@tdykstra](https://github.com/tdykstra) | Autofiled performance bugs, perf infra.                                                                                                                                |
+| **[area-routing](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-routing)**                   | [@joperezr](https://github.com/joperezr) [@danroth27](https://github.com/danroth27) [@halter73](https://github.com/halter73) [@JamesNK](https://github.com/JamesNK) ([@javiercn](https://github.com/javiercn)  consulting) | [@tdykstra](https://github.com/tdykstra) | Routing                                                                                                                                                                |
+| **[area-security](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-security)**                 | [@joperezr](https://github.com/joperezr) [@mikekistler](https://github.com/mikekistler) [@halter73](https://github.com/halter73) [@mackinnonbuck](https://github.com/mackinnonbuck)                                        | [@wadepickett](https://github.com/wadepickett) [@tdykstra](https://github.com/tdykstra)  | security features/work                                                                                                                                                 |
+| **[area-signalr](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-signalr)**                   | [@adityamandaleeka](https://github.com/adityamandaleeka) [@mikekistler](https://github.com/mikekistler) [@brennanconroy](https://github.com/brennanconroy)                                                                 | [@wadepickett](https://github.com/wadepickett)  | SignalR clients and servers                                                                                                                                            |
+| **[area-ui-rendering](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-ui-rendering)**         | [@joperezr](https://github.com/joperezr) [@danroth27](https://github.com/danroth27) [@mackinnonbuck](https://github.com/mackinnonbuck)                                                                                     | [@wadepickett](https://github.com/wadepickett) | MVC Views/Pages, Razor Views/Page                                                                                                                                      |
+| **[area-unified-build](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-unified-build)**       | [@joperezr](https://github.com/joperezr) [@wtgodbe](https://github.com/wtgodbe)                                                                                                                                            | [@tdykstra](https://github.com/tdykstra) | Work related to https://github.com/dotnet/dotnet                                                                                                                       |
+
+| other repo          | Owners                                                                                                                                                   | Doc Owners  | Description                                                                                  |
+| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | -------------------------------------------------------------------------------------------- |
+| {aspire}            | [@joperezr](https://github.com/joperezr) [@maddymontaquila](https://github.com/maddymontaquila)                                                          | [@IEvangelist](https://github.com/IEvangelist) | [https://github.com/dotnet/aspire](https://github.com/dotnet/aspire)                         |
+| {extensions}        | [@joperezr](https://github.com/joperezr) [@russkie](https://github.com/russkie)                                                                          | [@wadepickett](https://github.com/wadepickett) | [https://github.com/dotnet/extensions](https://github.com/dotnet/extensions)                 |
+| {orleans}           | [@adityamandaleeka](https://github.com/adityamandaleeka) [@mikekistler](https://github.com/mikekistler)                                                  | [@IEvangelist](https://github.com/IEvangelist) | [https://github.com/dotnet/orleans](https://github.com/dotnet/orleans)                       |
+| {systemwebadapters} | [@joperezr](https://github.com/joperezr) [@danroth27](https://github.com/danroth27)                                                                      | [@tdykstra](https://github.com/tdykstra) | [https://github.com/dotnet/systemweb-adapters](https://github.com/dotnet/systemweb-adapters) |
+| {yarp}              | [@adityamandaleeka](https://github.com/adityamandaleeka) [@samsp-msft](https://github.com/samsp-msft) [@benjaminpetit](https://github.com/benjaminpetit) | [@wadepickett](https://github.com/wadepickett) | [https://github.com/dotnet/yarp](https://github.com/dotnet/yarp)                             |
 
-| **area**                                                                                                                      | **owners**                                                                                    | **lead**                                                 | **notes**               |
-|-------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|----------------------------------------------------------|-------------------------|
-| **[area-blazor](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-blazor)**                     |                                                                                               | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-commandlinetools](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-commandlinetools)** | [@amcasey](https://github.com/amcasey) [@captainsafia](https://github.com/captainsafia)       | [@adityamandaleeka](https://github.com/adityamandaleeka)           | dev certs, user jwts, user secrets, dotnet watch ([@tmat](https://github.com/tmat)) |
-| **[area-dataprotection](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-dataprotection)**     | [@amcasey](https://github.com/amcasey)                                                        | [@adityamandaleeka](https://github.com/adityamandaleeka) |                         |
-| **[area-efcore](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-efcore)**                     |                                                                                               | [@ajcvickers](https://github.com/ajcvickers)             | Home repo: https://github.com/dotnet/efcore/ |
-| **[area-grpc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-grpc)**                         | [@JamesNK](https://github.com/JamesNK) [@mgravell](https://github.com/mgravell)               | [@adityamandaleeka](https://github.com/adityamandaleeka) | Home repo: https://github.com/grpc/grpc-dotnet/ |
-| **[area-healthchecks](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-healthchecks)**         |                                                                                               | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-hosting](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-hosting)**                   | [@halter73](https://github.com/halter73)                                                      | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-identity](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-identity)**                 | [@halter73](https://github.com/halter73)                                                      | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-infrastructure](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-infrastructure)**     | [@wtgodbe](https://github.com/wtgodbe)                                                        | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-middleware](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-middleware)**             | [@mitchdenny](https://github.com/mitchdenny)                                                  | [@adityamandaleeka](https://github.com/adityamandaleeka) |                         |
-| **[area-minimal](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-minimal)**                   | [@captainsafia](https://github.com/captainsafia) [@mitchdenny](https://github.com/mitchdenny) | [@adityamandaleeka](https://github.com/adityamandaleeka) |                         |
-| **[area-mvc](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-mvc)**                           | [@captainsafia](https://github.com/captainsafia)                                              | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           | @mkArtakMSFT owns views, @adityamandaleeka owns the other parts                        |
-| **[area-networking](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-networking)**             | [@amcasey](https://github.com/amcasey)                                                        | [@adityamandaleeka](https://github.com/adityamandaleeka) |                         |
-| **[area-perf](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-perf)**                         | [@sebastienros](https://github.com/sebastienros)                                              |                                                          |                         |
-| **[area-razor.compiler](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-razor.compiler)**     |                                                                                               |                                                          |                         |
-| **[area-razor.tooling](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-razor.tooling)**       |                                                                                               |                                                          |                         |
-| **[area-routing](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-routing)**                   |                                                                                               | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-security](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-security)**                 |                                                                                               | [@blowdart](https://github.com/blowdart)                 |                         |
-| **[area-signalr](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-signalr)**                   | [@BrennanConroy](https://github.com/BrennanConroy)                                            | [@adityamandaleeka](https://github.com/adityamandaleeka) | |
-| **[area-ui-rendering](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-ui-rendering)**         |                                                                                               | [@mkArtakMSFT](https://github.com/mkArtakMSFT)           |                         |
-| **[area-web-frameworks](https://github.com/dotnet/aspnetcore/issues?q=is%3Aissue+is%3Aopen+label%3Aarea-web-frameworks)**     | [@captainsafia](https://github.com/captainsafia) [@mitchdenny](https://github.com/mitchdenny) | [@adityamandaleeka](https://github.com/adityamandaleeka) | Label is deprecated              |
+The **dotnet/runtime** repo has [its own list](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md).
 
 ## Community Triagers
 
-While not necessarily associated with a specific area, these community members have the power to assist with routing and labeling issues and pull requests, and are generally knowledgeable about how the repo works:
+While not necessarily associated with a specific area, these community members have the power to assist with routing and labeling issues and pull requests, and have been recognized for being consistently knowledgeable about and helpful in this repo:
 
-- [@david-acker](https://github.com/david-acker)
+- [@Andrzej-W](https://github.com/Andrzej-W)
+- [@davidacker](https://github.com/davidacker)
 - [@egil](https://github.com/egil)
 - [@gfoidl](https://github.com/gfoidl)
 - [@hishamco](https://github.com/hishamco)
diff --git a/docs/list-of-diagnostics.md b/docs/list-of-diagnostics.md
index 64bbc9f53655..e6195634513e 100644
--- a/docs/list-of-diagnostics.md
+++ b/docs/list-of-diagnostics.md
@@ -30,6 +30,11 @@
 |  __`ASP0022`__ | Route conflict detected between route handlers |
 |  __`ASP0023`__ | Route conflict detected between controller actions |
 |  __`ASP0024`__ | Route handler has multiple parameters with the [FromBody] attribute |
+|  __`ASP0025`__ | Use AddAuthorizationBuilder |
+|  __`ASP0026`__ | [Authorize] overridden by [AllowAnonymous] from farther away |
+|  __`ASP0027`__ | Unnecessary public Program class declaration |
+|  __`ASP0028`__ | Consider using ListenAnyIP() instead of Listen(IPAddress.Any) |
+|  __`ASP0029`__ | Experimental warning for validations resolver APIs |
 
 ### API (`API1000-API1003`)
 
diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
index de108aec2723..c629174994f3 100644
--- a/eng/AfterSolutionBuild.targets
+++ b/eng/AfterSolutionBuild.targets
@@ -1,12 +1,12 @@
 <Project>
 
+  <Import Project="Common.props" />
   <Import Project="tools\RepoTasks\RepoTasks.tasks" />
   <Import Project="SharedFramework.External.props" />
   <Import Project="SharedFramework.Local.props" />
 
   <!-- This is temporary until we can use FrameworkReference to build our own packages. -->
-  <Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec" AfterTargets="Pack"
-      Condition=" '$(MSBuildRuntimeType)' == 'core' ">
+  <Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec" AfterTargets="Pack" Condition="'$(BuildManaged)' == 'true'">
     <ItemGroup>
       <_BuildOutput Include="$(ArtifactsShippingPackagesDir)*.nupkg"
                     Exclude="$(ArtifactsShippingPackagesDir)*.symbols.nupkg" />
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 9effde6fbf51..f566358b9acb 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,485 +2,488 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>8.0.0</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>9.0.0</AspNetCoreBaselineVersion>
   </PropertyGroup>
-  <!-- Package: AspNetCoreRuntime.8.0.x64-->
-  <PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.8.0.x64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+  <!-- Package: AspNetCoreRuntime.9.0.x64-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.9.0.x64' ">
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <!-- Package: AspNetCoreRuntime.8.0.x86-->
-  <PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.8.0.x86' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+  <!-- Package: AspNetCoreRuntime.9.0.x86-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.9.0.x86' ">
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: dotnet-sql-cache-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-sql-cache' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Ref-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Ref' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.linux-arm-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.linux-arm' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.linux-arm64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.linux-arm64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.linux-musl-arm-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.linux-musl-arm' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.linux-musl-arm64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.linux-musl-arm64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.linux-musl-x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.linux-musl-x64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.linux-x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.linux-x64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.osx-arm64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.osx-arm64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.osx-x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.osx-x64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.win-arm64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.win-arm64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.win-x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.win-x64' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.win-x86-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.win-x86' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Certificate-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Certificate' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Certificate' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Certificate' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Facebook-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Google-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.JwtBearer-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[7.0.3, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[8.0.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.MicrosoftAccount-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Negotiate-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Negotiate' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Negotiate' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.DirectoryServices.Protocols" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Negotiate' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.DirectoryServices.Protocols" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.OpenIdConnect-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[7.0.3, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[8.0.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Twitter-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.WsFederation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[7.0.3, )" />
-    <BaselinePackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[7.0.3, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[8.0.1, )" />
+    <BaselinePackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[8.0.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authorization-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.AzureAppServices.HostingStartup-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Json" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.AzureAppServices.SiteExtension-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.SiteExtension' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.AzureAppServicesIntegration-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Analyzers-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Analyzers' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Authorization-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.CustomElements-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.CustomElements' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.CustomElements' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.CustomElements' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Forms-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.QuickGrid-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.QuickGrid' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.QuickGrid' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.QuickGrid' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Web-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Authentication-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.DevServer-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.DevServer' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Server-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebView-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebView' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebView' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebView' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.ConcurrencyLimiter-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Threading.RateLimiting" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Threading.RateLimiting" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.IO.Pipelines" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.IO.Pipelines" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Features" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.IO.Pipelines" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Cryptography.Internal-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Cryptography.KeyDerivation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[5.0.0, )" />
     <BaselinePackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="[4.3.0, )" />
-    <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[5.0.0, )" />
-    <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.Security.Principal.Windows" Version="[5.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Abstractions' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.EntityFrameworkCore' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.Extensions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.StackExchangeRedis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Grpc.JsonTranscoding-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Grpc.JsonTranscoding' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Grpc.JsonTranscoding' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Google.Api.CommonProtos" Version="[2.5.0, )" />
-    <BaselinePackageReference Include="Google.Protobuf" Version="[3.23.1, )" />
-    <BaselinePackageReference Include="Grpc.AspNetCore.Server" Version="[2.57.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Grpc.JsonTranscoding' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Google.Api.CommonProtos" Version="[2.15.0, )" />
+    <BaselinePackageReference Include="Google.Protobuf" Version="[3.27.0, )" />
+    <BaselinePackageReference Include="Grpc.AspNetCore.Server" Version="[2.64.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.HeaderPropagation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HeaderPropagation' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HeaderPropagation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HeaderPropagation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Hosting.WindowsServices-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.WindowsServices' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.WindowsServices' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="System.ServiceProcess.ServiceController" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.WindowsServices' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="System.ServiceProcess.ServiceController" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Connections.Client-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.Net.Http" Version="[4.3.4, )" />
+    <BaselinePackageReference Include="System.Net.ServerSentEvents" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="[4.3.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Net.ServerSentEvents" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Net.ServerSentEvents" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Net.ServerSentEvents" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Connections.Common-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Text.Json" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Json" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Text.Json" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Json" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Identity.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Identity.UI-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.JsonPatch-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND '$(TargetFramework)' == 'net462' ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
@@ -490,505 +493,510 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Metadata-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Metadata' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.MiddlewareAnalysis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.NewtonsoftJson-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
     <BaselinePackageReference Include="Newtonsoft.Json.Bson" Version="[1.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="[6.0.0, )" />
     <BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[6.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Testing-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Testing' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Testing' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.TestHost" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Testing' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.TestHost" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.OpenApi-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.OpenApi' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.OpenApi' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.OpenApi" Version="[1.4.3, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.OpenApi' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.OpenApi" Version="[1.6.17, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.OutputCaching.StackExchangeRedis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.OutputCaching.StackExchangeRedis' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.OutputCaching.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.OutputCaching.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Owin-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Client-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Client.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.TimeProvider" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Threading.Channels" Version="[8.0.0, )" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Threading.Channels" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.TimeProvider" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Threading.Channels" Version="[9.0.0, )" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Threading.Channels" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.TimeProvider" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Threading.Channels" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.TimeProvider" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Threading.Channels" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.TimeProvider" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Threading.Channels" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.TimeProvider" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Threading.Channels" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Common-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.Net.Sockets" Version="[4.3.0, )" />
-    <BaselinePackageReference Include="System.Text.Json" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Json" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Text.Json" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Json" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.Json-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.MessagePack-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="MessagePack" Version="[2.5.108, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="MessagePack" Version="[2.5.187, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="MessagePack" Version="[2.5.108, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="MessagePack" Version="[2.5.187, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="MessagePack" Version="[2.5.108, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="MessagePack" Version="[2.5.187, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Specification.Tests-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[9.0.0, )" />
     <BaselinePackageReference Include="xunit.assert" Version="[2.4.2, )" />
     <BaselinePackageReference Include="xunit.extensibility.core" Version="[2.4.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.StackExchangeRedis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="MessagePack" Version="[2.5.108, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="MessagePack" Version="[2.5.187, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SpaProxy-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaProxy' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.SpaServices.Extensions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.TestHost-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.TestHost' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.TestHost' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
-  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.WebUtilities-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebUtilities' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebUtilities' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.IO.Pipelines" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebUtilities' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Authentication.WebAssembly.Msal-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.dotnet-openapi-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.dotnet-openapi' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.DotNet.Web.Client.ItemTemplates-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.Client.ItemTemplates' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <!-- Package: Microsoft.DotNet.Web.ItemTemplates.8.0-->
-  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.ItemTemplates.8.0' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+  <!-- Package: Microsoft.DotNet.Web.ItemTemplates.9.0-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.ItemTemplates.9.0' ">
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <!-- Package: Microsoft.DotNet.Web.ProjectTemplates.8.0-->
-  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.ProjectTemplates.8.0' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+  <!-- Package: Microsoft.DotNet.Web.ProjectTemplates.9.0-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.ProjectTemplates.9.0' ">
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.ApiDescription.Client-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ApiDescription.Client' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.ApiDescription.Server-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ApiDescription.Server' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.Caching.SqlServer-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.SqlServer' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.SqlServer' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Data.SqlClient" Version="[4.0.1, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Azure.Identity" Version="[1.11.4, )" />
+    <BaselinePackageReference Include="Microsoft.Data.SqlClient" Version="[4.0.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.SqlServer' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Data.SqlClient" Version="[4.0.1, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.SqlServer' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Azure.Identity" Version="[1.11.4, )" />
+    <BaselinePackageReference Include="Microsoft.Data.SqlClient" Version="[4.0.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.SqlServer' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Data.SqlClient" Version="[4.0.1, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Azure.Identity" Version="[1.11.4, )" />
+    <BaselinePackageReference Include="Microsoft.Data.SqlClient" Version="[4.0.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Caching.StackExchangeRedis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.StackExchangeRedis' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.StackExchangeRedis' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.StackExchangeRedis' AND '$(TargetFramework)' == 'net8.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.StackExchangeRedis' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.6.122, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.7.27, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Configuration.KeyPerFile-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Diagnostics.HealthChecks-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Features-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Features' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.FileProviders.Embedded-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Http.Polly-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Http.Polly' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Http.Polly' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[9.0.0, )" />
     <BaselinePackageReference Include="Polly" Version="[7.2.4, )" />
     <BaselinePackageReference Include="Polly.Extensions.Http" Version="[3.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Identity.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[5.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Identity.Stores-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Localization-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Localization.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization.Abstractions' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.Logging.AzureAppServices-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.AzureAppServices' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.AzureAppServices' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.Net.Http" Version="[4.3.4, )" />
     <BaselinePackageReference Include="System.ValueTuple" Version="[4.5.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.AzureAppServices' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.AzureAppServices' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.ValueTuple" Version="[4.5.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Logging.AzureAppServices' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0, )" />
     <BaselinePackageReference Include="System.ValueTuple" Version="[4.5.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.ObjectPool-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ObjectPool' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.WebEncoders-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' AND '$(TargetFramework)' == 'net462' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Text.Encodings.Web" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Encodings.Web" Version="[9.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )" />
-    <BaselinePackageReference Include="System.Text.Encodings.Web" Version="[8.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0, )" />
+    <BaselinePackageReference Include="System.Text.Encodings.Web" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.JSInterop-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.JSInterop.WebAssembly-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[9.0.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Net.Http.Headers-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' ">
-    <BaselinePackageVersion>8.0.0</BaselinePackageVersion>
+    <BaselinePackageVersion>9.0.0</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net8.0') ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[8.0.0, )" />
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Net.Http.Headers' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net9.0') ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[9.0.0, )" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index a53374025b2a..1b4ce55e8e33 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele
 Update this list when preparing for a new patch.
 
 -->
-<Baseline Version="8.0.0">
-  <Package Id="AspNetCoreRuntime.8.0.x64" Version="8.0.0" />
-  <Package Id="AspNetCoreRuntime.8.0.x86" Version="8.0.0" />
-  <Package Id="dotnet-sql-cache" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Ref" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Authorization" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.CustomElements" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Forms" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.QuickGrid" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebView" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Metadata" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.Owin" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SpaProxy" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
-  <Package Id="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
-  <Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="8.0.0" />
-  <Package Id="Microsoft.dotnet-openapi" Version="8.0.0" />
-  <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="8.0.0" />
-  <Package Id="Microsoft.DotNet.Web.ItemTemplates.8.0" Version="8.0.0" />
-  <Package Id="Microsoft.DotNet.Web.ProjectTemplates.8.0" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Caching.SqlServer" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Features" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Identity.Core" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Localization" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Localization.Abstractions" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
-  <Package Id="Microsoft.Extensions.WebEncoders" Version="8.0.0" />
-  <Package Id="Microsoft.JSInterop" Version="8.0.0" />
-  <Package Id="Microsoft.JSInterop.WebAssembly" Version="8.0.0" />
-  <Package Id="Microsoft.Net.Http.Headers" Version="8.0.0" />
+<Baseline Version="9.0.0">
+  <Package Id="AspNetCoreRuntime.9.0.x64" Version="9.0.0" />
+  <Package Id="AspNetCoreRuntime.9.0.x86" Version="9.0.0" />
+  <Package Id="dotnet-sql-cache" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Ref" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.CustomElements" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Forms" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Components.WebView" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Metadata" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.Owin" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SpaProxy" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
+  <Package Id="Microsoft.AspNetCore.WebUtilities" Version="9.0.0" />
+  <Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="9.0.0" />
+  <Package Id="Microsoft.dotnet-openapi" Version="9.0.0" />
+  <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="9.0.0" />
+  <Package Id="Microsoft.DotNet.Web.ItemTemplates.9.0" Version="9.0.0" />
+  <Package Id="Microsoft.DotNet.Web.ProjectTemplates.9.0" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Features" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Identity.Stores" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Localization" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Localization.Abstractions" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
+  <Package Id="Microsoft.Extensions.WebEncoders" Version="9.0.0" />
+  <Package Id="Microsoft.JSInterop" Version="9.0.0" />
+  <Package Id="Microsoft.JSInterop.WebAssembly" Version="9.0.0" />
+  <Package Id="Microsoft.Net.Http.Headers" Version="9.0.0" />
 </Baseline>
\ No newline at end of file
diff --git a/eng/Build.props b/eng/Build.props
index 57f53a3ce17b..33d09a7a1017 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -9,7 +9,7 @@
     the format is correct) and undo any temporary changes. When complete, only BuildAfterTargetingPack.csproj and
     other @(RequiresDelayedBuild) projects should mention projects listed in RequiresDelayedBuildProjects.props.
   -->
-  <Import Project="RequiresDelayedBuildProjects.props" />
+  <Import Project="RequiresDelayedBuildProjects.props" Condition="'$(OnlyTestProjectTemplates)' != 'true'" />
 
   <!-- These projects are always excluded, even when -projects is specified on command line. -->
   <ItemGroup>
@@ -55,11 +55,24 @@
                       $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj;
                       $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
                       " />
+
+    <!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
+    <ProjectToExclude Include="
+                      $(RepoRoot)src\Installers\**\*.vcxproj;
+                      "
+                      Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
+
+
+    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
+    <ProjectToExclude Include="
+                      $(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
+                      "
+                      Condition=" '$(TargetOsName)' == 'win' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
   </ItemGroup>
 
   <Choose>
     <!-- Project selection can be overridden on the command line by passing in -projects. -->
-    <When Condition="'$(ProjectToBuild)' != ''">
+    <When Condition="'$(ProjectToBuild)' != '' and '$(DotNetBuildPass)' != '2'">
       <ItemGroup>
         <ProjectToBuild Include="$(ProjectToBuild)"
             Exclude="@(ProjectToExclude);$(RepoRoot)**\bin\**\*;$(RepoRoot)**\obj\**\*">
@@ -70,60 +83,44 @@
         </ProjectToBuild>
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup Condition=" '$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
-        <!-- Build the ANCM custom action -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=Win32" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=ARM64" />
-
-        <!-- Build the ANCM msis -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x86" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=arm64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=x64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=x86" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=arm64" />
-
-        <!-- Build the targeting pack installers -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=x64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=x86" />
-        <!-- This really shouldn't be here, but instead of harvesting from the intermediate/output directories, the targeting pack installer logic
-        harvests from a zip of the reference assemblies. Producing it in each leg ends up with multiple targeting packs
-        getting produced and the BAR will reject the build. Centralize building the targeting pack in the x86/x64 leg. -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=arm64" />
-
-        <!-- Build the SharedFramework installers -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x86" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=arm64" />
-
-        <!-- Build the SharedFramework wixlib -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x64" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=x86" />
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />
-
-        <!-- Windows hosting bundled -->
-        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
+    <!-- Projects to build in .NET product build pass 2 -->
+    <When Condition="'$(DotNetBuildPass)' == '2'">
+      <ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
+        <!-- Build Hosting Bundle -->
+        <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj">
+          <AdditionalProperties>Platform=x86</AdditionalProperties>
+          <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
+        </ProjectToBuild>
+        <ProjectToBuild Include="$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" >
+          <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
+        </ProjectToBuild>
+        <!-- Build SiteExtensions -->
+        <ProjectToBuild Include="$(RepoRoot)src\SiteExtensions\LoggingAggregate\src\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj">
+          <DotNetBuildPass>$(DotNetBuildPass)</DotNetBuildPass>
+        </ProjectToBuild>
       </ItemGroup>
-
-      <ItemGroup Condition="'$(BuildInstallers)' == 'true' AND ('$(TargetRuntimeIdentifier)' == 'linux-x64' OR '$(TargetRuntimeIdentifier)' == 'linux-arm64')">
-        <ProjectToBuild Condition=" '$(LinuxInstallerType)' == 'deb' "
-                        Include="$(RepoRoot)src\Installers\Debian\**\*.*proj" />
-        <ProjectToBuild Condition=" '$(LinuxInstallerType)' == 'rpm' "
-                        Include="$(RepoRoot)src\Installers\Rpm\**\*.*proj" />
+    </When>
+    <Otherwise>
+      <!-- BuildNative -->
+      <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND '$(DotNetBuild)' == 'true' ">
+        <NativeProjects Condition="'$(TargetArchitecture)' == 'x64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
+        <NativeProjects Condition="'$(TargetArchitecture)' == 'x86'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
+        <NativeProjects Condition="'$(TargetArchitecture)' == 'arm64'" Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
       </ItemGroup>
 
-      <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
+      <ItemGroup Condition=" '$(TargetOsName)' == 'win' AND '$(DotNetBuild)' != 'true' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">
         <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=x64" />
         <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
         <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
       </ItemGroup>
 
       <ItemGroup>
-        <ProjectToBuild Condition=" $(BuildNative) " Include="@(NativeProjects)" Exclude="@(ProjectToExclude)" />
+        <ProjectToBuild Condition=" $(BuildNative) " Include="@(NativeProjects)" Exclude="@(ProjectToExclude)" BuildStep="native" />
         <ProjectToExclude Condition=" !$(BuildNative) " Include="@(NativeProjects)" />
+      </ItemGroup>
 
+      <!-- BuildNode -->
+      <ItemGroup>
         <NodeJsProjects
           Include="$(RepoRoot)eng\Npm.Workspace.nodeproj;
                    $(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj;"
@@ -134,63 +131,42 @@
 
         <ExplicitRequiresDelay Include="$(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj" />
 
-        <ProjectToBuild Condition=" '$(BuildNodeJS)' == 'true'" Include="@(NodeJsProjects)" Exclude="@(ProjectToExclude)" />
+        <ProjectToBuild Condition=" '$(BuildNodeJS)' == 'true'" Include="@(NodeJsProjects)" Exclude="@(ProjectToExclude)" BuildStep="node" />
         <ProjectToExclude Condition=" '$(BuildNodeJS)' != 'true'" Include="@(NodeJsProjects)" />
+      </ItemGroup>
 
+      <!-- BuildJava -->
+      <ItemGroup>
         <JavaProjects Include="$(RepoRoot)src\SignalR\**\*.javaproj"
                       Exclude="@(ProjectToExclude)" />
 
-        <ProjectToBuild Condition=" '$(BuildJava)' == 'true'" Include="@(JavaProjects)" Exclude="@(ProjectToExclude)" />
+        <ProjectToBuild Condition=" '$(BuildJava)' == 'true'" Include="@(JavaProjects)" Exclude="@(ProjectToExclude)" BuildStep="managed" />
         <ProjectToExclude Condition=" '$(BuildJava)' != 'true'" Include="@(JavaProjects)" />
+      </ItemGroup>
 
+      <!-- BuildManaged (runs in parallel with BuildJava) -->
+      <ItemGroup>
         <!--
           Use caution to avoid deep recursion. If the globbing pattern picks up something which exceeds MAX_PATH,
           the entire pattern will silently fail to evaluate correctly.
         -->
+
+        <!-- 
+          When adding new projects to this file, add them to either ProjectsWithTestsSubset1 or 
+          ProjectsWithTestsSubset2 - whichever has fewer entries.
+        -->
+
+        <!-- Strictly projects with no associated tests - projects with tests are added in subsets below. -->
         <DotNetProjects Include="
-                          $(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
+                          $(RepoRoot)src\Assets\**\*.*proj;
+                          $(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj;
                           $(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
-                          $(RepoRoot)src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj;
-                          $(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
-                          $(RepoRoot)src\Caching\**\*.*proj;
-                          $(RepoRoot)src\DefaultBuilder\**\*.*proj;
-                          $(RepoRoot)src\Features\JsonPatch\**\*.*proj;
-                          $(RepoRoot)src\DataProtection\**\*.*proj;
-                          $(RepoRoot)src\Antiforgery\**\*.*proj;
-                          $(RepoRoot)src\Hosting\**\*.*proj;
-                          $(RepoRoot)src\Http\**\*.*proj;
-                          $(RepoRoot)src\HttpClientFactory\**\*.*proj;
-                          $(RepoRoot)src\Html.Abstractions\**\*.*proj;
-                          $(RepoRoot)src\Identity\**\*.*proj;
-                          $(RepoRoot)src\Servers\**\*.csproj;
-                          $(RepoRoot)src\Security\**\*.*proj;
-                          $(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\**\*.csproj;
-                          $(RepoRoot)src\SiteExtensions\LoggingAggregate\test\**\*.csproj;
-                          $(RepoRoot)src\Shared\**\*.*proj;
-                          $(RepoRoot)src\Tools\**\*.*proj;
-                          $(RepoRoot)src\Logging.AzureAppServices\**\src\*.csproj;
-                          $(RepoRoot)src\Middleware\**\*.csproj;
-                          $(RepoRoot)src\Razor\**\*.*proj;
-                          $(RepoRoot)src\Mvc\**\*.*proj;
-                          $(RepoRoot)src\Azure\**\*.*proj;
-                          $(RepoRoot)src\SignalR\**\*.csproj;
-                          $(RepoRoot)src\StaticAssets\**\*.csproj;
-                          $(RepoRoot)src\Components\**\*.csproj;
-                          $(RepoRoot)src\Analyzers\**\*.csproj;
-                          $(RepoRoot)src\FileProviders\**\*.csproj;
-                          $(RepoRoot)src\Configuration.KeyPerFile\**\*.csproj;
-                          $(RepoRoot)src\Localization\**\*.csproj;
-                          $(RepoRoot)src\ObjectPool\**\*.csproj;
-                          $(RepoRoot)src\JSInterop\**\*.csproj;
-                          $(RepoRoot)src\WebEncoders\**\*.csproj;
-                          $(RepoRoot)src\HealthChecks\**\*.csproj;
-                          $(RepoRoot)src\Testing\**\*.csproj;
-                          $(RepoRoot)src\Grpc\**\*.csproj;
-                          $(RepoRoot)src\ProjectTemplates\**\*.csproj;
-                          $(RepoRoot)src\Extensions\**\*.csproj;
-                          $(RepoRoot)src\BuildAfterTargetingPack\*.csproj;
-                          $(RepoRoot)src\OpenApi\**\*.csproj;
+                          $(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime.proj;
+                          $(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime-composite.proj;
+                          $(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-base-runtime.proj;
+                          $(RepoRoot)src\Framework\App.Runtime\bundle\aspnetcore-runtime-bundle.bundleproj;
                           $(RepoRoot)eng\tools\HelixTestRunner\HelixTestRunner.csproj;
+                          $(RepoRoot)src\BuildAfterTargetingPack\*.csproj;
                           "
                         Exclude="
                           @(ProjectToBuild);
@@ -200,9 +176,10 @@
                           $(RepoRoot)**\obj\**\*;"
                         Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
         <DotNetProjects Include="
+                          $(RepoRoot)src\Assets\**\*.*proj;
                           $(RepoRoot)src\Caching\**\src\*.csproj;
                           $(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
-                          $(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;
+                          $(RepoRoot)src\Features\**\src\*.csproj;
                           $(RepoRoot)src\DataProtection\**\src\*.csproj;
                           $(RepoRoot)src\Antiforgery\**\src\*.csproj;
                           $(RepoRoot)src\Hosting\**\src\*.csproj;
@@ -233,6 +210,7 @@
                           $(RepoRoot)src\Extensions\**\src\*.csproj;
                           $(RepoRoot)src\BuildAfterTargetingPack\*.csproj;
                           $(RepoRoot)src\OpenApi\**\src\*.csproj;
+                          $(RepoRoot)src\Validation\**\src\*.csproj;
                           "
                         Exclude="
                           @(ProjectToBuild);
@@ -242,9 +220,105 @@
                           $(RepoRoot)**\obj\**\*;"
                         Condition=" '$(BuildMainlyReferenceProviders)' == 'true' " />
 
-        <ProjectToBuild Condition=" '$(BuildManaged)' == 'true'" Include="@(DotNetProjects)" Exclude="@(ProjectToExclude)" />
+
+        <ProjectsWithTestsSubset1 Include="
+                          $(RepoRoot)src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj;
+                          $(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
+                          $(RepoRoot)src\Caching\**\*.*proj;
+                          $(RepoRoot)src\DefaultBuilder\**\*.*proj;
+                          $(RepoRoot)src\Features\**\*.*proj;
+                          $(RepoRoot)src\DataProtection\**\*.*proj;
+                          $(RepoRoot)src\Antiforgery\**\*.*proj;
+                          $(RepoRoot)src\Hosting\**\*.*proj;
+                          $(RepoRoot)src\Http\**\*.*proj;
+                          $(RepoRoot)src\HttpClientFactory\**\*.*proj;
+                          $(RepoRoot)src\Html.Abstractions\**\*.*proj;
+                          $(RepoRoot)src\Identity\**\*.*proj;
+                          $(RepoRoot)src\Servers\**\*.csproj;
+                          $(RepoRoot)src\Security\**\*.*proj;
+                          $(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\**\*.csproj;
+                          $(RepoRoot)src\SiteExtensions\LoggingAggregate\test\**\*.csproj;
+                          $(RepoRoot)src\Shared\**\*.*proj;
+                          $(RepoRoot)src\Tools\**\*.*proj;
+                          $(RepoRoot)src\Logging.AzureAppServices\**\src\*.csproj;
+                          $(RepoRoot)src\Middleware\**\*.csproj;
+                          "
+                        Exclude="
+                          @(ProjectToBuild);
+                          @(ProjectToExclude);
+                          $(RepoRoot)**\node_modules\**\*;
+                          $(RepoRoot)**\bin\**\*;
+                          $(RepoRoot)**\obj\**\*;"
+                        Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
+
+        <ProjectsWithTestsSubset2 Include="
+                          $(RepoRoot)src\Razor\**\*.*proj;
+                          $(RepoRoot)src\Mvc\**\*.*proj;
+                          $(RepoRoot)src\Azure\**\*.*proj;
+                          $(RepoRoot)src\SignalR\**\*.csproj;
+                          $(RepoRoot)src\StaticAssets\**\*.csproj;
+                          $(RepoRoot)src\Components\**\*.csproj;
+                          $(RepoRoot)src\Analyzers\**\*.csproj;
+                          $(RepoRoot)src\FileProviders\**\*.csproj;
+                          $(RepoRoot)src\Configuration.KeyPerFile\**\*.csproj;
+                          $(RepoRoot)src\Localization\**\*.csproj;
+                          $(RepoRoot)src\ObjectPool\**\*.csproj;
+                          $(RepoRoot)src\JSInterop\**\*.csproj;
+                          $(RepoRoot)src\WebEncoders\**\*.csproj;
+                          $(RepoRoot)src\HealthChecks\**\*.csproj;
+                          $(RepoRoot)src\Testing\**\*.csproj;
+                          $(RepoRoot)src\Grpc\**\*.csproj;
+                          $(RepoRoot)src\ProjectTemplates\**\*.csproj;
+                          $(RepoRoot)src\Extensions\**\*.csproj;
+                          $(RepoRoot)src\OpenApi\**\*.csproj;
+                          $(RepoRoot)src\Validation\**\*.csproj;
+                          "
+                        Exclude="
+                          @(ProjectToBuild);
+                          @(ProjectToExclude);
+                          $(RepoRoot)**\node_modules\**\*;
+                          $(RepoRoot)**\bin\**\*;
+                          $(RepoRoot)**\obj\**\*;"
+                        Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
+
+        <DotNetProjects Condition=" '$(HelixSubset)' == '' OR '$(HelixSubset)' == '1'" Include="@(ProjectsWithTestsSubset1)" />
+        <DotNetProjects Condition=" '$(HelixSubset)' == '' OR '$(HelixSubset)' == '2'" Include="@(ProjectsWithTestsSubset2)" />
+
+        <ProjectToBuild Condition=" '$(BuildManaged)' == 'true'" Include="@(DotNetProjects)" Exclude="@(ProjectToExclude)" BuildStep="managed" />
         <ProjectToExclude Condition=" '$(BuildManaged)' != 'true'" Include="@(DotNetProjects)" />
       </ItemGroup>
+
+      <!-- BuildInstallers -->
+      <PropertyGroup>
+        <_BuildWindowsInstallers Condition="'$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64' OR '$(TargetArchitecture)' == 'arm64') ">true</_BuildWindowsInstallers>
+
+        <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'x86'">Win32</_VcxTargetPlatform>
+        <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'x64'">x64</_VcxTargetPlatform>
+        <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
+      </PropertyGroup>
+
+      <!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
+      <ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
+        <!-- Build the ANCM custom action -->
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=Win32" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=ARM64" />
+
+        <!-- Build the ANCM msis -->
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x64" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=x86" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj" AdditionalProperties="Platform=arm64" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=x64" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=x86" />
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj" AdditionalProperties="Platform=arm64" />
+
+        <!-- Windows hosting bundle -->
+        <InstallerProject Include="$(RepoRoot)src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj" AdditionalProperties="Platform=x86" />
+      </ItemGroup>
+
+      <ItemGroup>
+        <ProjectToBuild Condition=" '$(BuildInstallers)' == 'true'" Include="@(InstallerProject)" BuildStep="installer" />
+      </ItemGroup>
     </Otherwise>
   </Choose>
 
diff --git a/eng/Common.props b/eng/Common.props
index 40ede46e5522..f48599b4970f 100644
--- a/eng/Common.props
+++ b/eng/Common.props
@@ -4,10 +4,14 @@
     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))">freebsd</TargetOsName>
+
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
+    <NativePlatform>$(TargetArchitecture)</NativePlatform>
+    <NativePlatform Condition=" '$(NativePlatform)' == 'x86' ">Win32</NativePlatform>
+
     <TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
     <PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
-    <DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
+    <DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
 
     <BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
     <BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>
@@ -27,4 +31,22 @@
   <PropertyGroup>
     <BuildNative Condition=" '$(BuildNative)' == '' ">false</BuildNative>
   </PropertyGroup>
+
+  <!-- Don't restore w/ nuget.targets in VMR pass 2 -->
+  <!-- This allows us to hook targets before Restore in the SiteExtensions build -->
+  <PropertyGroup Condition=" '$(DotNetBuildPass)' == '2' " >
+    <RestoreUsingNuGetTargets>false</RestoreUsingNuGetTargets>
+  </PropertyGroup>
+
+  <PropertyGroup>
+      <!--
+      Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
+      - If we're building outside of the VMR, publish these assets from the Windows job.
+      - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
+    -->
+    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildFromVMR)' != 'true')
+                                                or ('$(DotNetBuildFromVMR)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
+                                                    and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
+    <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
+  </PropertyGroup>
 </Project>
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index af9ef7fa88e3..d41269c96137 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -27,6 +27,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.CSharp" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <LatestPackageReference Include="Microsoft.Extensions.Caching.Hybrid" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
@@ -66,10 +67,11 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <LatestPackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <LatestPackageReference Include="Microsoft.Win32.Registry" />
-    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
-    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
+    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
+    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
+    <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
     <LatestPackageReference Include="Microsoft.OpenApi" />
-    <LatestPackageReference Include="Microsoft.OpenApi.Readers" />
+    <LatestPackageReference Include="Microsoft.OpenApi.YamlReader" />
     <LatestPackageReference Include="System.Buffers" />
     <LatestPackageReference Include="System.CodeDom" />
     <LatestPackageReference Include="System.CommandLine.Experimental" />
@@ -79,16 +81,17 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Diagnostics.DiagnosticSource" />
     <LatestPackageReference Include="System.Diagnostics.EventLog" />
     <LatestPackageReference Include="System.DirectoryServices.Protocols" />
-    <LatestPackageReference Include="System.Drawing.Common" />
+    <LatestPackageReference Include="System.Formats.Cbor" />
     <LatestPackageReference Include="System.IdentityModel.Tokens.Jwt" />
     <LatestPackageReference Include="System.IO.Pipelines" />
+    <LatestPackageReference Include="System.Memory" />
     <LatestPackageReference Include="System.Net.Http" />
     <LatestPackageReference Include="System.Net.Http.Json" />
     <LatestPackageReference Include="System.Net.Sockets" />
     <LatestPackageReference Include="System.Net.ServerSentEvents" />
-    <LatestPackageReference Include="System.Private.Uri" />
     <LatestPackageReference Include="System.Reflection.Metadata" />
     <LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <LatestPackageReference Include="System.Runtime.Caching" />
     <LatestPackageReference Include="System.Security.Cryptography.Pkcs" />
     <LatestPackageReference Include="System.Security.Cryptography.X509Certificates" />
     <LatestPackageReference Include="System.Security.Cryptography.Xml" />
@@ -141,10 +144,10 @@ and are generated based on the last package release.
 
   <ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" />
-    <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" />
-    <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" />
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x64" />
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" />
     <LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
     <LatestPackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport" />
     <LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
@@ -222,6 +225,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="StackExchange.Redis" />
     <LatestPackageReference Include="Swashbuckle.AspNetCore" />
     <LatestPackageReference Include="System.Reactive.Linq" />
+    <LatestPackageReference Include="Verify.SourceGenerators" />
     <LatestPackageReference Include="Verify.Xunit" />
     <LatestPackageReference Include="xunit.abstractions" />
     <LatestPackageReference Include="xunit.analyzers" />
@@ -251,7 +255,26 @@ and are generated based on the last package release.
     -->
     <LatestPackageReference Update="@(LatestPackageReference->WithMetadataValue('Version', ''))">
       <Version
-          Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRuntimeVersion)</Version>
+          Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion)</Version>
+    </LatestPackageReference>
+  </ItemGroup>
+
+  <!-- Replicates the same overriding of versions that occurs on Roslyn package versions for source only builds -->
+  <ItemGroup Label="Source only build overrides" Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Common">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Razor">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
     </LatestPackageReference>
   </ItemGroup>
 </Project>
diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
deleted file mode 100644
index 8f6e67aba60f..000000000000
--- a/eng/DotNetBuild.props
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
-
-<Project>
-
-  <PropertyGroup>
-    <GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
-    <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
-    <SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0</SourceBuildTargetFrameworkFilter>
-  </PropertyGroup>
-
-  <!--
-    Remove inner source .globalconfig file as both the inner and outer config files get loaded and cause a conflict.
-    Leaving the inner will cause all conflicting settings to be ignored.
-    https://learn.microsoft.com/dotnet/fundamentals/code-analysis/configuration-files#general-options.
-    This only needs to be done if there is an inner clone.
-  -->
-  <Target Name="RemoveInnerGlobalConfig"
-          DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
-          BeforeTargets="RunInnerSourceBuildCommand"
-          Condition="'$(DotNetBuildOrchestrator)' != 'true'">
-
-    <Delete Files="$(InnerSourceBuildRepoRoot).globalconfig" />
-  </Target>
-
-  <!-- Build RepoTasks - this is normally triggered via the build script but the inner ArPow source-build is run via msbuild.
-       https://github.com/dotnet/source-build/issues/3807 -->
-  <Target Name="BuildRepoTasks"
-          Condition="'$(DotNetBuildInnerRepo)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
-          BeforeTargets="Execute">
-    <!-- If the alternative runtime location and key are present, pass those through -->
-    <PropertyGroup>
-      <_AdditionalRepoTaskBuildArgs />
-      <_AdditionalRepoTaskBuildArgs Condition="'$(DotNetRuntimeSourceFeed)' != ''" >$(_AdditionalRepoTaskBuildArgs) --runtimesourcefeed $(DotNetRuntimeSourceFeed)</_AdditionalRepoTaskBuildArgs>
-      <_AdditionalRepoTaskBuildArgs Condition="'$(DotNetRuntimeSourceFeedKey)' != ''" >$(_AdditionalRepoTaskBuildArgs) --runtimesourcefeedkey $(DotNetRuntimeSourceFeedKey)</_AdditionalRepoTaskBuildArgs>
-      <_AdditionalRepoTaskBuildArgs Condition="'$(RestoreConfigFile)' != ''" >$(_AdditionalRepoTaskBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile)</_AdditionalRepoTaskBuildArgs>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- We need to flow FullAssemblySigningSupported even when building repo tasks because they use full signing -->
-      <InnerBuildEnv Condition="'$(FullAssemblySigningSupported)' != ''" Include="FullAssemblySigningSupported=$(FullAssemblySigningSupported)" />
-      <InnerBuildEnv Include="DotNetBuildSourceOnly=$(DotNetBuildSourceOnly)" />
-    </ItemGroup>
-
-    <!-- Call the build.sh script to build the repo tasks. Set IgnoreStandardErrorWarningFormat
-         to true. This avoids fatal errors, because in internal builds there are usually a few failed installation
-         attempts as the install script walks through potential locations for a runtime.
-         The overall build script will return a proper exit code, but we don't want to pick up the printed error messages. -->
-    <Exec
-      Command="./eng/build.sh --only-build-repo-tasks -bl $(_AdditionalRepoTaskBuildArgs)"
-      IgnoreStandardErrorWarningFormat="true"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)"
-      EnvironmentVariables="@(InnerBuildEnv)"
-      Condition="'$(OS)' != 'Windows_NT'" />
-
-    <Exec
-      Command=".\eng\build.cmd -OnlyBuildRepoTasks -bl $(_AdditionalRepoTaskBuildArgs)"
-      IgnoreStandardErrorWarningFormat="true"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)"
-      EnvironmentVariables="@(InnerBuildEnv)"
-      Condition="'$(OS)' == 'Windows_NT'" />
-  </Target>
-
-  <Target Name="CustomizeInnerBuildArgs"
-          BeforeTargets="GetSourceBuildCommandConfiguration">
-
-    <PropertyGroup>
-      <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="GetAspnetcoreCategorizedIntermediateNupkgContents"
-          BeforeTargets="GetCategorizedIntermediateNupkgContents">
-    <PropertyGroup>
-      <InstallersArtifactsDir>$(CurrentRepoSourceBuildArtifactsDir)\installers\$(Configuration)\</InstallersArtifactsDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!--
-        Add the internal installers artifacts required by dotnet/installer.
-      -->
-      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.tar.gz" />
-      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore_base_runtime.version" />
-      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.msi" />
-      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.pkg" />
-      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.deb" />
-      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-*.rpm" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="RestoreNpmPackages"
-          Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
-          BeforeTargets="RunInnerSourceBuildCommand">
-
-    <Message Text="Checking node version..." Importance="high" />
-    <Exec
-      Command="node --version"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
-
-    <Message Text="Checking npm version..." Importance="high" />
-    <Exec
-      Command="npm --version"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
-
-    <PropertyGroup>
-      <!-- Disable installing puppeteer browsers when running in source build -->
-      <_AdditionalEnvironmentVariable Condition="$(ArcadeBuildFromSource) == 'true'">PUPPETEER_SKIP_DOWNLOAD=1</_AdditionalEnvironmentVariable>
-    </PropertyGroup>
-
-    <Exec
-      Command="npm ci"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)"
-      EnvironmentVariables="$(_AdditionalEnvironmentVariable)" />
-
-  </Target>
-
-  <Target Name="BuildNpmFiles"
-          Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
-          DependsOnTargets="RestoreNpmPackages"
-          BeforeTargets="RunInnerSourceBuildCommand">
-
-    <Message Text="Building Node JS files..." Importance="high" />
-
-    <Exec
-      Command="npm run build"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
-
-  </Target>
-
-</Project>
diff --git a/eng/Npm.Workspace.FunctionalTests.nodeproj b/eng/Npm.Workspace.FunctionalTests.nodeproj
index 16fb46697cfb..bab16d51900b 100644
--- a/eng/Npm.Workspace.FunctionalTests.nodeproj
+++ b/eng/Npm.Workspace.FunctionalTests.nodeproj
@@ -1,4 +1,4 @@
-<Project>
+<Project DefaultTargets="Build">
 
   <!-- Import Directory.Build.Props -->
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
diff --git a/eng/Npm.Workspace.nodeproj b/eng/Npm.Workspace.nodeproj
index 58722e78cc3a..d28b99c7af83 100644
--- a/eng/Npm.Workspace.nodeproj
+++ b/eng/Npm.Workspace.nodeproj
@@ -1,4 +1,4 @@
-<Project>
+<Project DefaultTargets="Build">
 
   <!-- Import Directory.Build.Props -->
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
@@ -19,15 +19,131 @@
     <_NpmAdditionalEnvironmentVariables>PUPPETEER_SKIP_DOWNLOAD=1</_NpmAdditionalEnvironmentVariables>
   </PropertyGroup>
 
-  <Target Name="Restore">
+  <PropertyGroup>
+    <NpmWorkspaceRoot>$(MSBuildThisFileDirectory)..</NpmWorkspaceRoot>
+    <NodeModulesMarkerFile>$(NpmWorkspaceRoot)\node_modules\.package-lock.json</NodeModulesMarkerFile>
+    <!-- Common exclude patterns for NPM build input/output files -->
+    <NpmCommonExcludePatterns>
+      **\pkg-version.ts;
+      $(NpmWorkspaceRoot)\src\**\node_modules\**\*;
+      $(NpmWorkspaceRoot)\src\**\bin\**\*;
+      $(NpmWorkspaceRoot)\src\**\obj\**\*
+    </NpmCommonExcludePatterns>
+  </PropertyGroup>
+
+  <!-- Input files for incremental restore check -->
+  <ItemGroup>
+    <NpmInputFiles Include="$(NpmWorkspaceRoot)\package.json" />
+    <NpmInputFiles Include="$(NpmWorkspaceRoot)\package-lock.json" Condition="Exists('$(NpmWorkspaceRoot)\package-lock.json')" />
+    <NpmInputFiles Include="$(NpmWorkspaceRoot)\src\**\package.json" Exclude="$(NpmWorkspaceRoot)\src\**\node_modules\**\package.json" />
+    <NpmInputFiles Include="$(NpmWorkspaceRoot)\.npmrc" Condition="Exists('$(NpmWorkspaceRoot)\.npmrc')" />
+  </ItemGroup>
+
+  <!-- Output files for incremental restore check -->
+  <ItemGroup>
+    <NpmOutputFiles Include="$(NodeModulesMarkerFile)" />
+  </ItemGroup>
+
+  <!-- Output files for incremental build check -->
+  <ItemGroup>
+    <!-- SignalR client outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\browser\signalr.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\browser\signalr.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\browser\signalr.min.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\browser\signalr.min.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\cjs\**\*.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\cjs\**\*.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\esm\**\*.d.ts" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\esm\**\*.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\esm\**\*.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\webworker\signalr.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\webworker\signalr.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\webworker\signalr.min.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr\dist\webworker\signalr.min.js.map" />
+
+    <!-- SignalR MessagePack protocol outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\browser\signalr-protocol-msgpack.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\browser\signalr-protocol-msgpack.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\browser\signalr-protocol-msgpack.min.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\browser\signalr-protocol-msgpack.min.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\cjs\**\*.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\cjs\**\*.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\esm\**\*.d.ts" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\esm\**\*.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\signalr-protocol-msgpack\dist\esm\**\*.js.map" />
+
+    <!-- JSInterop outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\JSInterop\Microsoft.JSInterop.JS\src\dist\src\Microsoft.JSInterop.d.ts" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\JSInterop\Microsoft.JSInterop.JS\src\dist\src\Microsoft.JSInterop.d.ts.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\JSInterop\Microsoft.JSInterop.JS\src\dist\src\Microsoft.JSInterop.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\JSInterop\Microsoft.JSInterop.JS\src\dist\src\Microsoft.JSInterop.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\JSInterop\Microsoft.JSInterop.JS\src\dist\tsconfig.tsbuildinfo" />
+
+    <!-- Components Web.JS outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.server.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.server.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.web.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.web.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.webassembly.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.webassembly.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Debug\blazor.webview.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.server.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.server.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.web.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.web.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.webassembly.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.webassembly.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\Web.JS\dist\Release\blazor.webview.js" />
+
+    <!-- WebAssembly Authentication outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\WebAssembly\WebAssembly.Authentication\src\Interop\dist\Debug\AuthenticationService.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\WebAssembly\WebAssembly.Authentication\src\Interop\dist\Debug\AuthenticationService.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\WebAssembly\WebAssembly.Authentication\src\Interop\dist\Release\AuthenticationService.js" />
+
+    <!-- WebAssembly Authentication MSAL outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\WebAssembly\Authentication.Msal\src\Interop\dist\Debug\AuthenticationService.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\WebAssembly\Authentication.Msal\src\Interop\dist\Debug\AuthenticationService.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\WebAssembly\Authentication.Msal\src\Interop\dist\Release\AuthenticationService.js" />
+
+    <!-- Custom Elements outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\CustomElements\src\js\dist\Debug\Microsoft.AspNetCore.Components.CustomElements.lib.module.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\CustomElements\src\js\dist\Debug\Microsoft.AspNetCore.Components.CustomElements.lib.module.js.map" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\Components\CustomElements\src\js\dist\Release\Microsoft.AspNetCore.Components.CustomElements.lib.module.js" />
+
+    <!-- FunctionalTests outputs -->
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\FunctionalTests\wwwroot\dist\signalr-functional-tests.js" />
+    <NpmBuildOutputFiles Include="$(NpmWorkspaceRoot)\src\SignalR\clients\ts\FunctionalTests\wwwroot\dist\signalr-functional-tests.js.map" />
+  </ItemGroup>
+
+  <!-- Input files for incremental build check -->
+  <ItemGroup>
+    <!-- Source files -->
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\*.ts" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns)" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\*.js" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns);**\samples\**\wwwroot\lib\**\*;**\FunctionalTests\wwwroot\lib\**\*;$(NpmWorkspaceRoot)\src\**\dist\**\*" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\*.mjs" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns);$(NpmWorkspaceRoot)\src\**\dist\**\*" />
+
+    <!-- Configuration files -->
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\package.json" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns);$(NpmWorkspaceRoot)\src\**\node_modules\**\package.json" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\tsconfig*.json" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns)" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\rollup.config.*" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns)" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\webpack.config.*" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns)" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\src\**\jest.config.*" Exclude="@(NpmBuildOutputFiles);$(NpmCommonExcludePatterns)" />
+
+    <!-- Root workspace configuration files that affect build -->
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\package.json" />
+    <NpmBuildInputFiles Include="$(NpmWorkspaceRoot)\tsconfig*.json" />
+  </ItemGroup>
+
+
+  <Target Name="Restore" Inputs="@(NpmInputFiles)" Outputs="@(NpmOutputFiles)">
     <Message Text="Restoring NPM packages..." Importance="high" />
     <Exec
       Command="npm ci"
-      WorkingDirectory="$(MSBuildThisFileDirectory).."
+      WorkingDirectory="$(NpmWorkspaceRoot)"
       EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />
   </Target>
 
-  <Target Name="Build">
+  <Target Name="Build" DependsOnTargets="Restore" Inputs="@(NpmBuildInputFiles)" Outputs="@(NpmBuildOutputFiles)">
     <PropertyGroup>
       <PackageVersion>$(VersionPrefix)</PackageVersion>
       <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
@@ -36,7 +152,7 @@
 
     <Message Text="Building NPM packages..." Importance="high" />
 
-    <Exec Condition="'$(ContinuousIntegrationBuild)' == 'true'"
+    <Exec
       Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --update-versions $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
       EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />
 
@@ -51,13 +167,19 @@
     <Exec Command="npm run test" ContinueOnError="true" WorkingDirectory="$(MSBuildThisFileDirectory).." />
   </Target>
 
-  <Target Name="Pack">
+  <Target Name="Pack" DependsOnTargets="Build">
     <PropertyGroup>
       <PackageVersion>$(VersionPrefix)</PackageVersion>
       <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
     </PropertyGroup>
     <Message Text="Packing NPM packages..." Importance="high" />
     <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists('$(PackageOutputPath)')" />
+    <MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
+
+    <Exec
+      Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --update-versions $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
+      EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />
+
     <Exec
       Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --create-packages $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
       EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index d95f9cd46411..4dcee4af652b 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -5,9 +5,11 @@
 -->
 <Project>
   <ItemGroup>
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.App.Internal.Assets" ProjectPath="$(RepoRoot)src\Assets\Microsoft.AspNetCore.App.Internal.Assets.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" ProjectPath="$(RepoRoot)src\Features\JsonPatch.SystemTextJson\src\Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepoRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Cryptography.Internal" ProjectPath="$(RepoRoot)src\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj" />
@@ -168,5 +170,6 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.JsonTranscoding\Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.Swagger" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.Swagger\Microsoft.AspNetCore.Grpc.Swagger.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.OpenApi" ProjectPath="$(RepoRoot)src\OpenApi\src\Microsoft.AspNetCore.OpenApi.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.Validation" ProjectPath="$(RepoRoot)src\Validation\src\Microsoft.Extensions.Validation.csproj" />
   </ItemGroup>
 </Project>
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 002b0d7fb8ee..0da2def77321 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -3,17 +3,13 @@
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
 
-    <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-         Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-         the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-         to be published. Use DotNetBuildRepo is only set in the internal source build,
-         and Build.proj is invoked from the wrapper build. -->
+    <!-- Don't sign and publish rid agnostic nuget packages from other builds than windows when not building
+         inside the VMR. Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+         the nupkgs pushed. -->
     <EnableDefaultArtifacts Condition="'$(OS)' != 'Windows_NT' and
                                        '$(PostBuildSign)' != 'true' and
-                                       '$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
+                                       '$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>
 
-    <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == '' and 
-                                            ('$(OS)' == 'Windows_NT' or '$(DotNetBuildOrchestrator)' == 'true')">true</PublishInstallerBaseVersion>
     <!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
     <AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
   </PropertyGroup>
@@ -22,34 +18,6 @@
   <ItemGroup>
     <!-- Include our "loose" PDBs when publishing symbols. -->
     <FilesToPublishToSymbolServer Include="$(ArtifactsDir)symbols\**\*.pdb" />
-
-    <!-- Prepare for _PublishInstallersAndChecksums target. -->
-    <_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.jar" UploadPathSegment="jar" />
-    <_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.pom" UploadPathSegment="jar" />
-    <!-- All builds produce npm assets - only publish them once -->
-    <_InstallersToPublish Include="$(ArtifactsDir)packages\**\*.tgz" UploadPathSegment="npm" Condition="'$(OS)' == 'Windows_NT' or '$(DotNetBuildOrchestrator)' == 'true'" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.version" UploadPathSegment="Runtime" Condition="'$(PublishInstallerBaseVersion)' == 'true'" />
-
-    <!-- The following installers create checksums -->
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.deb" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.exe" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.msi" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.rpm" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.tar.gz" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.wixlib" UploadPathSegment="Runtime" ChecksumPath="%(FullPath).sha512" />
-    <_InstallersToPublish Include="$(ArtifactsDir)installers\**\*.zip" UploadPathSegment="Runtime" >
-      <!-- Exclude wixpack.zip files from checksum generation -->
-      <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
-    </_InstallersToPublish>
-
-    <!-- Remove wixpacks if not doing post-build signing, since they are not needed -->
-    <_InstallersToPublish Remove="$(ArtifactsDir)installers\**\*.wixpack.zip" Condition="'$(PostBuildSign)' != 'true'" />
-
-    <Artifact Include="@(_InstallersToPublish)">
-      <!-- Working around msbuild not being able to negate the result of Contains() outside of targets -->
-      <IsShipping Condition="$([System.String]::Copy('%(Filename)').ToLowerInvariant().Contains('internal')) == 'True'">false</IsShipping>
-      <IsShipping Condition="$([System.String]::Copy('%(Filename)').ToLowerInvariant().Contains('internal')) != 'True'">true</IsShipping>
-    </Artifact>
   </ItemGroup>
 
   <Target Name="GetNonStableProductVersion">
@@ -69,10 +37,10 @@
     </PropertyGroup>
   </Target>
 
+  <!-- Generate productVersion.txt files containing the product version. -->
   <Target Name="GenerateProductVersionFiles"
           BeforeTargets="PublishToAzureDevOpsArtifacts"
-          DependsOnTargets="GetNonStableProductVersion"
-          Condition="'$(PublishInstallerBaseVersion)' == 'true'">
+          Condition="'$(PublishInstallerBaseVersion)' == 'true' and '$(DotNetBuildPass)' != '2'">
     <MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
         Properties="ExcludeFromBuild=false;IsShipping=true"
         Targets="_GetPackageVersionInfo">
@@ -88,25 +56,23 @@
       <ProductVersionFile Include="$(ArtifactsShippingPackagesDir)aspnetcore-productVersion.txt" />
     </ItemGroup>
 
-    <!-- Generate productVersion.txt file containing the product version. -->
     <WriteLinesToFile File="%(ProductVersionFile.Identity)"
                       Lines="$(ProductVersion)"
                       Overwrite="true"
                       Encoding="ASCII" />
 
     <ItemGroup>
-      <Artifact Include="@(ProductVersionFile)"
-                RelativeBlobPath="aspnetcore/Runtime/$(NonStableProductVersion)/%(Filename)%(Extension)" />
+      <Artifact Include="@(ProductVersionFile)" Kind="Blob" UploadPathSegment="Runtime/" />
     </ItemGroup>
   </Target>
 
-  <Target Name="AddRelativeBlobPathToInstallerArtifacts"
+  <Target Name="AddRelativeBlobPathToBlobArtifacts"
           BeforeTargets="PublishToAzureDevOpsArtifacts"
-          AfterTargets="GenerateChecksumsFromArtifacts"
+          AfterTargets="GenerateProductVersionFiles;GenerateChecksumsFromArtifacts"
           DependsOnTargets="GetNonStableProductVersion">
     <ItemGroup>
-      <Artifact Condition="'%(Artifact.PublishFlatContainer)' == 'true' and '%(Artifact.UploadPathSegment)' != ''"
-                RelativeBlobPath="aspnetcore/%(Artifact.UploadPathSegment)/$(NonStableProductVersion)/%(Filename)%(Extension)" />
+      <Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.RelativeBlobPath)' == ''"
+                RelativeBlobPath="aspnetcore/%(Artifact.UploadPathSegment)$(NonStableProductVersion)/%(Filename)%(Extension)" />
     </ItemGroup>
   </Target>
 
diff --git a/eng/RequiresDelayedBuildProjects.props b/eng/RequiresDelayedBuildProjects.props
index 1a771e0d5e74..1383ad7a677c 100644
--- a/eng/RequiresDelayedBuildProjects.props
+++ b/eng/RequiresDelayedBuildProjects.props
@@ -22,7 +22,13 @@
     <RequiresDelayedBuild Include="$(RepoRoot)src\Grpc\JsonTranscoding\test\testassets\Sandbox\Sandbox.csproj" />
     <RequiresDelayedBuild Include="$(RepoRoot)src\OpenApi\test\Microsoft.AspNetCore.OpenApi.NativeAotTests\Microsoft.AspNetCore.OpenApi.NativeAotTests.proj" />
     <RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.Tests\Templates.Blazor.Tests.csproj" />
+    <RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Auth.Tests\Templates.Blazor.WebAssembly.Auth.Tests.csproj" />
+    <RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Tests\Templates.Blazor.WebAssembly.Tests.csproj" />
+    <RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Mvc.Tests\Templates.Mvc.Tests.csproj" />
+    <RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Tests\Templates.Tests.csproj" />
     <RequiresDelayedBuild Include="$(RepoRoot)src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.TrimmingTests\Microsoft.AspNetCore.SignalR.TrimmingTests.proj" />
     <RequiresDelayedBuild Include="$(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj" />
+    <RequiresDelayedBuild Include="$(RepoRoot)src\Validation\test\Microsoft.Extensions.Validation.NativeAotTests\Microsoft.Extensions.Validation.NativeAotTests.proj" />
+    <RequiresDelayedBuild Include="$(RepoRoot)src\Validation\test\Microsoft.Extensions.Validation.TrimmingTests\Microsoft.Extensions.Validation.TrimmingTests.proj" />
   </ItemGroup>
 </Project>
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
index 8b5b19fb9861..a24d266f8f27 100644
--- a/eng/SharedFramework.External.props
+++ b/eng/SharedFramework.External.props
@@ -42,6 +42,7 @@
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options.DataAnnotations"                 Version="$(MicrosoftExtensionsOptionsDataAnnotationsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options"                                 Version="$(MicrosoftExtensionsOptionsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives"                              Version="$(MicrosoftExtensionsPrimitivesVersion)" />
+    <ExternalAspNetCoreAppReference Include="System.Formats.Cbor"                                          Version="$(SystemFormatsCborVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml"                             Version="$(SystemSecurityCryptographyXmlVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Threading.RateLimiting"                                Version="$(SystemThreadingRateLimitingVersion)" />
 
diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props
index 533709fb9bf4..28efd974e7f0 100644
--- a/eng/SharedFramework.Local.props
+++ b/eng/SharedFramework.Local.props
@@ -37,6 +37,7 @@
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
     <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Features" />
+    <AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Validation" />
 
     <!-- These assemblies are only in the shared framework -->
     <AspNetCoreAppReference Include="Microsoft.AspNetCore" />
diff --git a/eng/ShippingAssemblies.props b/eng/ShippingAssemblies.props
index 0f6c1a3cdd4e..0acec8474d50 100644
--- a/eng/ShippingAssemblies.props
+++ b/eng/ShippingAssemblies.props
@@ -105,8 +105,11 @@
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Features" />
+    <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Validation" />
+    <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.App.Internal.Assets" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.SqlServer" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
+    <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" />
     <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch" />
     <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />
     <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
diff --git a/eng/Signing.props b/eng/Signing.props
index c8f233696c6f..7537e82282fc 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -2,87 +2,12 @@
   <!-- See https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Signing.md for details. -->
   <Import Project="Common.props" />
 
-  <ItemGroup>
-    <!-- Reset Arcade's defaults. -->
-    <ItemsToSign Remove="@(ItemsToSign)" />
-    <ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" />
-    <FileExtensionSignInfo Remove="@(FileExtensionSignInfo)" />
-  </ItemGroup>
-
   <PropertyGroup>
     <!-- Use the dotnet certificate for any remaining defaults (e.g. StrongNameSignInfo) -->
     <UseDotNetCertificate>true</UseDotNetCertificate>
   </PropertyGroup>
 
-  <!-- Files that should be always be signed between in-build and post-build signing -->
-  <ItemGroup Label="Common Files to Sign">
-    <CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
-    <CommonFilesToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
-    <CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.jar"  />
-    <CommonFilesToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" />
-    <CommonFilesToSign Remove="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" Condition="'$(PostBuildSign)' != 'true'" />
-  </ItemGroup>
-  <Choose>
-    <!-- When post build signing is false - Sign as normal.
-         When post build signing is true - Sign all of our signable artifacts
-          that we would publish. Use a different ItemGroup name so that
-          the signing stage signs nothing. We then set ItemToSign during
-          publishing to this ItemGroup.
-        -->
-    <When Condition="'$(PostBuildSign)' != 'true'">
-      <ItemGroup Label="Files To Sign">
-        <ItemsToSign Include="@(CommonFilesToSign)" />
-        <ItemsToSign Remove="$(ArtifactsPackagesDir)**\*symbols.nupkg" />
-      </ItemGroup>
-    </When>
-    <When Condition="'$(PostBuildSign)' == 'true'">
-      <PropertyGroup>
-        <AllowEmptySignList>true</AllowEmptySignList>
-      </PropertyGroup>
-      <ItemGroup Label="Files To Sign">
-        <!-- Sign symbol nupkgs so that shared files between layouts and msis end up identical. -->
-        <ItemsToSignPostBuild Include="@(CommonFilesToSign)" />
-        <ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" />
-        <ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" />
-        <!-- Wixlibs are signed because they are containers of other files -->
-        <ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.wixlib" />
-      </ItemGroup>
-    </When>
-  </Choose>
-
-
   <ItemGroup Label="File signing information">
-    <!--
-      Map file extensions to a code-sign cert.
-      "None" means don't sign the file itself, but still scan the contents for signable files.
-    -->
-    <FileExtensionSignInfo Include=".jar" CertificateName="MicrosoftJARSHA2" />
-    <FileExtensionSignInfo Include=".ps1;.psd1;.psm1;.psc1" CertificateName="MicrosoftDotNet500" />
-    <FileExtensionSignInfo Include=".dll;.exe" CertificateName="MicrosoftDotNet500" />
-    <FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
-    <FileExtensionSignInfo Include=".vsix" CertificateName="VsixSHA2" />
-    <FileExtensionSignInfo Include=".zip" CertificateName="None" />
-    <FileExtensionSignInfo Include=".cab" CertificateName="None" />
-    <!-- If doing post build sign, explicitly give MSIs a cert. If doing in build signing,
-         this is handled by the wix targets, and .msi should be "None" -->
-    <FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" Condition="'$(PostBuildSign)' == 'true'" />
-    <FileExtensionSignInfo Include=".msi" CertificateName="None" Condition="'$(PostBuildSign)' != 'true'" />
-
-    <!-- Native .dll's. These don't have a public key token, but are from Microsoft and should be signed. -->
-    <FileSignInfo Include="aspnetcore.dll" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="aspnetcorev2_inprocess.dll" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="aspnetcorev2_outofprocess.dll" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="aspnetcorev2.dll" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="blazor-devserver.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="dotnet-dev-certs.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="dotnet-sql-cache.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="dotnet-user-secrets.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="dotnet-watch.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="dotnet-openapi.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="dotnet-user-jwts.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="Microsoft.AspNetCore.Blazor.Build.exe" CertificateName="MicrosoftDotNet500" />
-    <FileSignInfo Include="sni.dll" CertificateName="MicrosoftDotNet500" />
-
     <!-- Third-party components which should be signed.  -->
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="AngleSharp.dll" CertificateName="3PartySHA2" />
@@ -92,21 +17,27 @@
     <FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Composite r2r images show up as fully native images and trigger the 3rd party warning when signing on Mac/Linux
+         even though they don't have readable copyright info. Skip those files in the signing check. -->
+    <ItemsToSkip3rdPartyCheck Include="Microsoft.AspNetCore.App.Runtime.Composite.r2r.dll" />
+  </ItemGroup>
+
   <PropertyGroup>
     <BaseRedistNetCorePath>$(ArtifactsObjDir)RedistSharedFx.Layout\$(Configuration)\</BaseRedistNetCorePath>
     <RedistNetCorePath>$(BaseRedistNetCorePath)$(TargetRuntimeIdentifier)\</RedistNetCorePath>
   </PropertyGroup>
 
   <ItemGroup Label="Code sign exclusions">
-    <!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
-    <FileExtensionSignInfo Include=".js" CertificateName="None" />
     <!-- We don't produce font files. We rebundle some for using the web browser, so they do not need to be signed. -->
-    <FileExtensionSignInfo Include=".otf" CertificateName="None" />
-    <FileExtensionSignInfo Include=".ttf" CertificateName="None" />
+    <FileExtensionSignInfo Update=".otf" CertificateName="None" />
+    <FileExtensionSignInfo Update=".ttf" CertificateName="None" />
     <!-- This is a text file which doesn't need to be code signed, even though some .mof files can be signed. -->
     <FileSignInfo Include="ancm.mof" CertificateName="None" />
     <!-- Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. -->
     <FileSignInfo Include="apphost.exe" CertificateName="None" />
+    <!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
+    <FileExtensionSignInfo Update=".js" CertificateName="None" />
 
     <!--
       These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime.
@@ -147,4 +78,36 @@
     <FileSignInfo Include="Microsoft.Identity.Client.dll" CertificateName="None" />
   </ItemGroup>
 
+  <!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
+  <ItemGroup>
+    <!-- Prepare for _PublishInstallersAndChecksums target. -->
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.jar" UploadPathSegment="jar/" ChecksumPath="%(FullPath).sha512" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.pom" UploadPathSegment="jar/" ChecksumPath="%(FullPath).sha512" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" />
+    <!-- All builds produce npm assets - only publish them once -->
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tgz" UploadPathSegment="npm/"  ChecksumPath="%(FullPath).sha512" Condition="'$(PublishAllBuildsAssetsInThisJob)' == 'true'" />
+    <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.version" UploadPathSegment="Runtime/" Condition="'$(PublishInstallerBaseVersion)' == 'true'" />
+
+    <!-- The following installers create checksums -->
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.deb" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.rpm" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.tar.gz" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="Runtime/" >
+       <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
+    </_InstallersToPublish>
+
+    <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" UploadPathSegment="Runtime/" ChecksumPath="%(FullPath).sha512" />
+    <_InstallersToPublish Include="$(ArtifactsDir)installers\$(Configuration)\**\*.zip" UploadPathSegment="Runtime/" >
+      <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
+    </_InstallersToPublish>
+
+    <Artifact Include="@(_InstallersToPublish)" Kind="Blob">
+      <IsShipping>true</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('NonShipping'))">false</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(Identity)').ToLowerInvariant().Contains('wixpack.zip'))">false</IsShipping>
+    </Artifact>
+  </ItemGroup>
+
 </Project>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
deleted file mode 100644
index 4c14fddbe34c..000000000000
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
-<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
-
-<UsageData>
-  <IgnorePatterns>
-    <!-- These are used in-build for repo-tasks and should come from previously source built -->
-    <UsagePattern IdentityGlob="NuGet.Common/*6.2.4*" />
-    <UsagePattern IdentityGlob="NuGet.Configuration/*6.2.4*" />
-    <UsagePattern IdentityGlob="NuGet.Frameworks/*6.2.4*" />
-    <UsagePattern IdentityGlob="NuGet.Packaging/*6.2.4*" />
-    <UsagePattern IdentityGlob="NuGet.Versioning/*6.2.4*" />
-
-    <!-- Only used by the ASP.NET Core CI, not needed for source build -->
-    <UsagePattern IdentityGlob="System.Composition/8.0.0*" />
-    <UsagePattern IdentityGlob="System.Composition.AttributedModel/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Composition.Convention/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Composition.Hosting/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Composition.Runtime/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Composition.TypedParts/*8.0.0*" />
-    <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.*" />
-
-    <!-- These are what the analyzers are built against. They are overridden in full source build.
-         It may be possible to generate SBRPs -->
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*2.9.4*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Common/*3.3.1*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp/*3.3.1*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Workspaces/*3.3.1*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Workspaces.Common/*3.3.1*" />
-    <UsagePattern IdentityGlob="System.Composition/1.0.*" />
-    <UsagePattern IdentityGlob="System.Composition/*7.0.0*" />
-    <UsagePattern IdentityGlob="System.IO.Pipelines/8.0.*" />
-    <UsagePattern IdentityGlob="System.Threading.Tasks.Extensions/*4.5.3*" />
-
-    <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
-    <UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*9.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
-
-    <!-- Transivite dependency of Microsoft.CodeAnalysis.ExternalAccess.AspNetCore -> Microsoft.CodeAnalysis.Features.
-         In product build the dependency is bumped to latest, which also bumps the version of DiaSymReader  -->
-    <UsagePattern IdentityGlob="Microsoft.DiaSymReader/*2.0.0*" />
-
-    <!-- Transitive dependency of Roslyn dependencies. -->
-    <UsagePattern IdentityGlob="System.Text.Json/8.0.0*" />
-    <UsagePattern IdentityGlob="System.Text.Encodings.Web/8.0.0*" />
-
-    <!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
-    <UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
-  </IgnorePatterns>
-</UsageData>
diff --git a/eng/Tools.props b/eng/Tools.props
index e00d1d215cee..c71ff436864d 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -1,8 +1,7 @@
 <Project>
-  <!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
+  <!-- Update the generated files when we restore projects. -->
   <Target Name="GenerateDirectoryBuildFiles"
-      AfterTargets="Restore"
-      Condition=" '$(MSBuildRuntimeType)' == 'core' ">
+      AfterTargets="Restore">
     <!-- Separate invocations and use different properties to ensure second can load the restored package info. -->
     <MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
         RemoveProperties="BaseIntermediateOutputPath"
diff --git a/eng/TrimmableProjects.props b/eng/TrimmableProjects.props
index 199d65af1b49..fbbe6f0bc44a 100644
--- a/eng/TrimmableProjects.props
+++ b/eng/TrimmableProjects.props
@@ -118,5 +118,6 @@
     <TrimmableProject Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
     <TrimmableProject Include="Microsoft.Extensions.Features" />
     <TrimmableProject Include="Microsoft.AspNetCore.OpenApi" />
+    <TrimmableProject Include="Microsoft.Extensions.Validation" />
   </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
new file mode 100644
index 000000000000..d52eba764667
--- /dev/null
+++ b/eng/Version.Details.props
@@ -0,0 +1,238 @@
+<!--
+This file is auto-generated by the Maestro dependency flow system.
+Do not edit it manually, as it will get overwritten by automation.
+This file should be imported by eng/Versions.props
+-->
+<Project>
+  <PropertyGroup>
+    <!-- dotnet/dotnet dependencies -->
+    <dotnetefPackageVersion>10.0.0</dotnetefPackageVersion>
+    <MicrosoftBclAsyncInterfacesPackageVersion>10.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
+    <MicrosoftBclTimeProviderPackageVersion>10.0.0</MicrosoftBclTimeProviderPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksArchivesPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetRemoteExecutorPackageVersion>
+    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>10.0.0</MicrosoftEntityFrameworkCorePackageVersion>
+    <MicrosoftEntityFrameworkCoreDesignPackageVersion>10.0.0</MicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>10.0.0</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>10.0.0</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>10.0.0</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>10.0.0</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>10.0.0</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftExtensionsCachingAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>10.0.0</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>10.0.0</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>10.0.0</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>10.0.0</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>10.0.0</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDiagnosticsPackageVersion>10.0.0</MicrosoftExtensionsDiagnosticsPackageVersion>
+    <MicrosoftExtensionsDiagnosticsAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsDiagnosticsAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>10.0.0</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>10.0.0</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25515.111</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>10.0.0</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsHostingAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>10.0.0</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>10.0.0</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingConfigurationPackageVersion>10.0.0</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>10.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>10.0.0</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingEventLogPackageVersion>10.0.0</MicrosoftExtensionsLoggingEventLogPackageVersion>
+    <MicrosoftExtensionsLoggingEventSourcePackageVersion>10.0.0</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>10.0.0</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>10.0.0</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>10.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>10.0.0</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>10.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftInternalRuntimeAspNetCoreTransportPackageVersion>10.0.0-rtm.25515.111</MicrosoftInternalRuntimeAspNetCoreTransportPackageVersion>
+    <MicrosoftNETRuntimeMonoAOTCompilerTaskPackageVersion>10.0.0</MicrosoftNETRuntimeMonoAOTCompilerTaskPackageVersion>
+    <MicrosoftNETRuntimeWebAssemblySdkPackageVersion>10.0.0</MicrosoftNETRuntimeWebAssemblySdkPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>10.0.0-rtm.25515.111</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25515.111</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftWebXdtPackageVersion>3.2.0-preview.25515.111</MicrosoftWebXdtPackageVersion>
+    <NuGetFrameworksPackageVersion>7.0.0-rc.1611</NuGetFrameworksPackageVersion>
+    <NuGetPackagingPackageVersion>7.0.0-rc.1611</NuGetPackagingPackageVersion>
+    <NuGetVersioningPackageVersion>7.0.0-rc.1611</NuGetVersioningPackageVersion>
+    <SystemCollectionsImmutablePackageVersion>10.0.0</SystemCollectionsImmutablePackageVersion>
+    <SystemCompositionPackageVersion>10.0.0</SystemCompositionPackageVersion>
+    <SystemConfigurationConfigurationManagerPackageVersion>10.0.0</SystemConfigurationConfigurationManagerPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>10.0.0</SystemDiagnosticsEventLogPackageVersion>
+    <SystemDiagnosticsPerformanceCounterPackageVersion>10.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
+    <SystemDirectoryServicesProtocolsPackageVersion>10.0.0</SystemDirectoryServicesProtocolsPackageVersion>
+    <SystemFormatsAsn1PackageVersion>10.0.0</SystemFormatsAsn1PackageVersion>
+    <SystemFormatsCborPackageVersion>10.0.0</SystemFormatsCborPackageVersion>
+    <SystemIOHashingPackageVersion>10.0.0</SystemIOHashingPackageVersion>
+    <SystemIOPipelinesPackageVersion>10.0.0</SystemIOPipelinesPackageVersion>
+    <SystemMemoryDataPackageVersion>10.0.0</SystemMemoryDataPackageVersion>
+    <SystemNetHttpJsonPackageVersion>10.0.0</SystemNetHttpJsonPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>10.0.0</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetServerSentEventsPackageVersion>10.0.0</SystemNetServerSentEventsPackageVersion>
+    <SystemNumericsTensorsPackageVersion>10.0.0</SystemNumericsTensorsPackageVersion>
+    <SystemReflectionMetadataPackageVersion>10.0.0</SystemReflectionMetadataPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
+    <SystemRuntimeCachingPackageVersion>10.0.0</SystemRuntimeCachingPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>10.0.0</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>10.0.0</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>10.0.0</SystemSecurityPermissionsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>10.0.0</SystemServiceProcessServiceControllerPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>10.0.0</SystemTextEncodingsWebPackageVersion>
+    <SystemTextJsonPackageVersion>10.0.0</SystemTextJsonPackageVersion>
+    <SystemThreadingAccessControlPackageVersion>10.0.0</SystemThreadingAccessControlPackageVersion>
+    <SystemThreadingChannelsPackageVersion>10.0.0</SystemThreadingChannelsPackageVersion>
+    <SystemThreadingRateLimitingPackageVersion>10.0.0</SystemThreadingRateLimitingPackageVersion>
+    <!-- dotnet/roslyn dependencies -->
+    <MicrosoftCodeAnalysisCommonPackageVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCommonPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessAspNetCorePackageVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisExternalAccessAspNetCorePackageVersion>
+    <!-- dotnet/extensions dependencies -->
+    <MicrosoftExtensionsCachingHybridPackageVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsCachingHybridPackageVersion>
+    <MicrosoftExtensionsDiagnosticsTestingPackageVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
+    <MicrosoftExtensionsTimeProviderTestingPackageVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsTimeProviderTestingPackageVersion>
+    <!-- _git/dotnet-optimization dependencies -->
+    <optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
+    <optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>
+    <optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
+    <optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
+    <optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
+    <!-- dotnet/msbuild dependencies -->
+    <MicrosoftBuildPackageVersion>17.12.36</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>17.12.36</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>17.12.36</MicrosoftBuildTasksCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>17.12.36</MicrosoftBuildUtilitiesCorePackageVersion>
+  </PropertyGroup>
+  <!--Property group for alternate package version names-->
+  <PropertyGroup>
+    <!-- dotnet/dotnet dependencies -->
+    <dotnetefVersion>$(dotnetefPackageVersion)</dotnetefVersion>
+    <MicrosoftBclAsyncInterfacesVersion>$(MicrosoftBclAsyncInterfacesPackageVersion)</MicrosoftBclAsyncInterfacesVersion>
+    <MicrosoftBclTimeProviderVersion>$(MicrosoftBclTimeProviderPackageVersion)</MicrosoftBclTimeProviderVersion>
+    <MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>$(MicrosoftDotNetBuildTasksArchivesPackageVersion)</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>$(MicrosoftDotNetBuildTasksInstallersPackageVersion)</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>$(MicrosoftDotNetRemoteExecutorPackageVersion)</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetSharedFrameworkSdkVersion>$(MicrosoftDotNetSharedFrameworkSdkPackageVersion)</MicrosoftDotNetSharedFrameworkSdkVersion>
+    <MicrosoftEntityFrameworkCoreVersion>$(MicrosoftEntityFrameworkCorePackageVersion)</MicrosoftEntityFrameworkCoreVersion>
+    <MicrosoftEntityFrameworkCoreDesignVersion>$(MicrosoftEntityFrameworkCoreDesignPackageVersion)</MicrosoftEntityFrameworkCoreDesignVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryVersion>$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)</MicrosoftEntityFrameworkCoreInMemoryVersion>
+    <MicrosoftEntityFrameworkCoreRelationalVersion>$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)</MicrosoftEntityFrameworkCoreRelationalVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion>$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)</MicrosoftEntityFrameworkCoreSqlServerVersion>
+    <MicrosoftEntityFrameworkCoreToolsVersion>$(MicrosoftEntityFrameworkCoreToolsPackageVersion)</MicrosoftEntityFrameworkCoreToolsVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>$(MicrosoftExtensionsCachingAbstractionsPackageVersion)</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>$(MicrosoftExtensionsCachingMemoryPackageVersion)</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>$(MicrosoftExtensionsConfigurationBinderPackageVersion)</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationCommandLineVersion>$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)</MicrosoftExtensionsConfigurationCommandLineVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsVersion>$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)</MicrosoftExtensionsConfigurationFileExtensionsVersion>
+    <MicrosoftExtensionsConfigurationIniVersion>$(MicrosoftExtensionsConfigurationIniPackageVersion)</MicrosoftExtensionsConfigurationIniVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>$(MicrosoftExtensionsConfigurationJsonPackageVersion)</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsVersion>$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)</MicrosoftExtensionsConfigurationUserSecretsVersion>
+    <MicrosoftExtensionsConfigurationXmlVersion>$(MicrosoftExtensionsConfigurationXmlPackageVersion)</MicrosoftExtensionsConfigurationXmlVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>$(MicrosoftExtensionsDependencyInjectionPackageVersion)</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftExtensionsDiagnosticsVersion>$(MicrosoftExtensionsDiagnosticsPackageVersion)</MicrosoftExtensionsDiagnosticsVersion>
+    <MicrosoftExtensionsDiagnosticsAbstractionsVersion>$(MicrosoftExtensionsDiagnosticsAbstractionsPackageVersion)</MicrosoftExtensionsDiagnosticsAbstractionsVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsVersion>$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)</MicrosoftExtensionsFileProvidersAbstractionsVersion>
+    <MicrosoftExtensionsFileProvidersCompositeVersion>$(MicrosoftExtensionsFileProvidersCompositePackageVersion)</MicrosoftExtensionsFileProvidersCompositeVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalVersion>$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)</MicrosoftExtensionsFileProvidersPhysicalVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>$(MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion)</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsHostingVersion>$(MicrosoftExtensionsHostingPackageVersion)</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>$(MicrosoftExtensionsHostingAbstractionsPackageVersion)</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHttpVersion>$(MicrosoftExtensionsHttpPackageVersion)</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLoggingPackageVersion)</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>$(MicrosoftExtensionsLoggingConfigurationPackageVersion)</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsolePackageVersion)</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingDebugVersion>$(MicrosoftExtensionsLoggingDebugPackageVersion)</MicrosoftExtensionsLoggingDebugVersion>
+    <MicrosoftExtensionsLoggingEventLogVersion>$(MicrosoftExtensionsLoggingEventLogPackageVersion)</MicrosoftExtensionsLoggingEventLogVersion>
+    <MicrosoftExtensionsLoggingEventSourceVersion>$(MicrosoftExtensionsLoggingEventSourcePackageVersion)</MicrosoftExtensionsLoggingEventSourceVersion>
+    <MicrosoftExtensionsLoggingTraceSourceVersion>$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)</MicrosoftExtensionsLoggingTraceSourceVersion>
+    <MicrosoftExtensionsOptionsVersion>$(MicrosoftExtensionsOptionsPackageVersion)</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsVersion>$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)</MicrosoftExtensionsOptionsDataAnnotationsVersion>
+    <MicrosoftExtensionsPrimitivesVersion>$(MicrosoftExtensionsPrimitivesPackageVersion)</MicrosoftExtensionsPrimitivesVersion>
+    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>$(MicrosoftInternalRuntimeAspNetCoreTransportPackageVersion)</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
+    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>$(MicrosoftNETRuntimeMonoAOTCompilerTaskPackageVersion)</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
+    <MicrosoftNETRuntimeWebAssemblySdkVersion>$(MicrosoftNETRuntimeWebAssemblySdkPackageVersion)</MicrosoftNETRuntimeWebAssemblySdkVersion>
+    <MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>$(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion)</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+    <MicrosoftNETCorePlatformsVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftWebXdtVersion>$(MicrosoftWebXdtPackageVersion)</MicrosoftWebXdtVersion>
+    <NuGetFrameworksVersion>$(NuGetFrameworksPackageVersion)</NuGetFrameworksVersion>
+    <NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
+    <NuGetVersioningVersion>$(NuGetVersioningPackageVersion)</NuGetVersioningVersion>
+    <SystemCollectionsImmutableVersion>$(SystemCollectionsImmutablePackageVersion)</SystemCollectionsImmutableVersion>
+    <SystemCompositionVersion>$(SystemCompositionPackageVersion)</SystemCompositionVersion>
+    <SystemConfigurationConfigurationManagerVersion>$(SystemConfigurationConfigurationManagerPackageVersion)</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>$(SystemDiagnosticsDiagnosticSourcePackageVersion)</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsEventLogVersion>$(SystemDiagnosticsEventLogPackageVersion)</SystemDiagnosticsEventLogVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>$(SystemDiagnosticsPerformanceCounterPackageVersion)</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemDirectoryServicesProtocolsVersion>$(SystemDirectoryServicesProtocolsPackageVersion)</SystemDirectoryServicesProtocolsVersion>
+    <SystemFormatsAsn1Version>$(SystemFormatsAsn1PackageVersion)</SystemFormatsAsn1Version>
+    <SystemFormatsCborVersion>$(SystemFormatsCborPackageVersion)</SystemFormatsCborVersion>
+    <SystemIOHashingVersion>$(SystemIOHashingPackageVersion)</SystemIOHashingVersion>
+    <SystemIOPipelinesVersion>$(SystemIOPipelinesPackageVersion)</SystemIOPipelinesVersion>
+    <SystemMemoryDataVersion>$(SystemMemoryDataPackageVersion)</SystemMemoryDataVersion>
+    <SystemNetHttpJsonVersion>$(SystemNetHttpJsonPackageVersion)</SystemNetHttpJsonVersion>
+    <SystemNetHttpWinHttpHandlerVersion>$(SystemNetHttpWinHttpHandlerPackageVersion)</SystemNetHttpWinHttpHandlerVersion>
+    <SystemNetServerSentEventsVersion>$(SystemNetServerSentEventsPackageVersion)</SystemNetServerSentEventsVersion>
+    <SystemNumericsTensorsVersion>$(SystemNumericsTensorsPackageVersion)</SystemNumericsTensorsVersion>
+    <SystemReflectionMetadataVersion>$(SystemReflectionMetadataPackageVersion)</SystemReflectionMetadataVersion>
+    <SystemResourcesExtensionsVersion>$(SystemResourcesExtensionsPackageVersion)</SystemResourcesExtensionsVersion>
+    <SystemRuntimeCachingVersion>$(SystemRuntimeCachingPackageVersion)</SystemRuntimeCachingVersion>
+    <SystemSecurityCryptographyPkcsVersion>$(SystemSecurityCryptographyPkcsPackageVersion)</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>$(SystemSecurityCryptographyXmlPackageVersion)</SystemSecurityCryptographyXmlVersion>
+    <SystemSecurityPermissionsVersion>$(SystemSecurityPermissionsPackageVersion)</SystemSecurityPermissionsVersion>
+    <SystemServiceProcessServiceControllerVersion>$(SystemServiceProcessServiceControllerPackageVersion)</SystemServiceProcessServiceControllerVersion>
+    <SystemTextEncodingsWebVersion>$(SystemTextEncodingsWebPackageVersion)</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
+    <SystemThreadingAccessControlVersion>$(SystemThreadingAccessControlPackageVersion)</SystemThreadingAccessControlVersion>
+    <SystemThreadingChannelsVersion>$(SystemThreadingChannelsPackageVersion)</SystemThreadingChannelsVersion>
+    <SystemThreadingRateLimitingVersion>$(SystemThreadingRateLimitingPackageVersion)</SystemThreadingRateLimitingVersion>
+    <!-- dotnet/roslyn dependencies -->
+    <MicrosoftCodeAnalysisCommonVersion>$(MicrosoftCodeAnalysisCommonPackageVersion)</MicrosoftCodeAnalysisCommonVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
+    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>$(MicrosoftCodeAnalysisExternalAccessAspNetCorePackageVersion)</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
+    <!-- dotnet/extensions dependencies -->
+    <MicrosoftExtensionsCachingHybridVersion>$(MicrosoftExtensionsCachingHybridPackageVersion)</MicrosoftExtensionsCachingHybridVersion>
+    <MicrosoftExtensionsDiagnosticsTestingVersion>$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)</MicrosoftExtensionsDiagnosticsTestingVersion>
+    <MicrosoftExtensionsTimeProviderTestingVersion>$(MicrosoftExtensionsTimeProviderTestingPackageVersion)</MicrosoftExtensionsTimeProviderTestingVersion>
+    <!-- _git/dotnet-optimization dependencies -->
+    <optimizationlinuxarm64MIBCRuntimeVersion>$(optimizationlinuxarm64MIBCRuntimePackageVersion)</optimizationlinuxarm64MIBCRuntimeVersion>
+    <optimizationlinuxx64MIBCRuntimeVersion>$(optimizationlinuxx64MIBCRuntimePackageVersion)</optimizationlinuxx64MIBCRuntimeVersion>
+    <optimizationwindows_ntarm64MIBCRuntimeVersion>$(optimizationwindows_ntarm64MIBCRuntimePackageVersion)</optimizationwindows_ntarm64MIBCRuntimeVersion>
+    <optimizationwindows_ntx64MIBCRuntimeVersion>$(optimizationwindows_ntx64MIBCRuntimePackageVersion)</optimizationwindows_ntx64MIBCRuntimeVersion>
+    <optimizationwindows_ntx86MIBCRuntimeVersion>$(optimizationwindows_ntx86MIBCRuntimePackageVersion)</optimizationwindows_ntx86MIBCRuntimeVersion>
+    <!-- dotnet/msbuild dependencies -->
+    <MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
+    <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
+  </PropertyGroup>
+</Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a65febf0683c..9e723335d9cf 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,437 +8,450 @@
   See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc.
 -->
 <Dependencies>
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="aspnetcore" Sha="79c85d969a02abd06c2202949318fd4c21e5e7a0" BarId="287426" />
   <ProductDependencies>
-    <Dependency Name="dotnet-ef" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="dotnet-ef" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
       <SourceBuildTarball RepoName="efcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-rtm.24473.8">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>c7035b3ccc485a63bd03a64da4d9f0ec18f27948</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Diagnostics" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Http" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Options" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="10.0.0-rtm.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.DirectoryServices.Protocols" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.DirectoryServices.Protocols" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Formats.Asn1" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Formats.Cbor" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.IO.Pipelines" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Net.ServerSentEvents" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Net.Http.Json" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Net.ServerSentEvents" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Reflection.Metadata" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Resources.Extensions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Security.Permissions" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.AccessControl" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Text.Json" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.RateLimiting" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Threading.AccessControl" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Threading.Channels" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="System.Threading.RateLimiting" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
     <!-- Transitive package to provide coherency in dotnet/extensions -->
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <!--
-         Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
-         All Runtime.$rid packages should have the same version.
-    -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-      <SourceBuild RepoName="runtime" ManagedOnly="false" />
-    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24453.1">
-      <Uri>https://github.com/dotnet/xdt</Uri>
-      <Sha>c2a9df9c1867454039a1223cef1c090359e33646</Sha>
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.xdt" Version="9.0.0-preview.24453.1">
-      <Uri>https://github.com/dotnet/xdt</Uri>
-      <Sha>c2a9df9c1867454039a1223cef1c090359e33646</Sha>
-      <SourceBuild RepoName="xdt" ManagedOnly="true" />
-    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24413.1">
-      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>1b838a42e4952b8fdf212cb1b43c5ce4d69f27b3</Sha>
-      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
-    </Dependency>
-    <!-- Not updated automatically -->
-    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.11.0-1.24218.5">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>afa1eb6821f62183651ab017b2f5c3fbeb934904</Sha>
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.11.0-1.24218.5">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>afa1eb6821f62183651ab017b2f5c3fbeb934904</Sha>
+    <Dependency Name="System.Collections.Immutable" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-1.24218.5">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>afa1eb6821f62183651ab017b2f5c3fbeb934904</Sha>
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="System.IO.Hashing" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="System.Memory.Data" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="System.Numerics.Tensors" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="System.Runtime.Caching" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="10.0.0-rtm.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Web.Xdt" Version="3.2.0-preview.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="System.Composition" Version="10.0.0">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0-1.24218.5">
+    <!-- Dependencies required for source build to lift to the previously-source-built version. -->
+    <!-- These versions are manually updated -->
+    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.13.0-3.24613.7" Label="Manual">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>afa1eb6821f62183651ab017b2f5c3fbeb934904</Sha>
+      <Sha>06f095f368c0ea9d54c80e313279574da9d96ea3</Sha>
     </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-1.24218.5">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.13.0-3.24613.7" Label="Manual">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>afa1eb6821f62183651ab017b2f5c3fbeb934904</Sha>
-      <SourceBuild RepoName="roslyn" ManagedOnly="true" />
+      <Sha>afdd413cee50c16318620252e4e64dc326e2d300</Sha>
     </Dependency>
-    <Dependency Name="System.Composition" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.24613.7" Label="Manual">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>afdd413cee50c16318620252e4e64dc326e2d300</Sha>
     </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24452.1">
-      <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>eab3dc5eabdf8bcd9bbdf917741aab335c74373d</Sha>
-      <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.24613.7" Label="Manual">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>afdd413cee50c16318620252e4e64dc326e2d300</Sha>
     </Dependency>
+    <!-- End of manually updated dependencies -->
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-rtm.24473.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="9.0.0-rtm.24472.2">
-      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>ed3e6c60a08cae482f78e5f31e87393a995bfbd4</Sha>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24466.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24466.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
-      <SourceBuild RepoName="arcade" ManagedOnly="true" />
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24466.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24466.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24466.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25515.111">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24466.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
+    <Dependency Name="Microsoft.Extensions.Caching.Hybrid" Version="9.10.0-preview.1.25475.1">
+      <Uri>https://github.com/dotnet/extensions</Uri>
+      <Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.9.24472.1">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0-preview.1.25475.1">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>43e4b5c99ad3ebcb2b05285ba8aabbfc6acd42e7</Sha>
+      <Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0-preview.9.24472.1">
+    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0-preview.1.25475.1">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>43e4b5c99ad3ebcb2b05285ba8aabbfc6acd42e7</Sha>
+      <Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
+    </Dependency>
+    <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
+    </Dependency>
+    <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
+    </Dependency>
+    <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
+    </Dependency>
+    <Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
+    </Dependency>
+    <Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+      <Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
+    </Dependency>
+    <!-- Dependencies required for source build to lift to the previously-source-built version. -->
+    <!-- These versions are manually updated -->
+    <Dependency Name="Microsoft.Build" Version="17.12.36" Label="Manual">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Build.Framework" Version="17.12.36" Label="Manual">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.12.36" Label="Manual">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Frameworks" Version="6.2.4">
-      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.12.36" Label="Manual">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Packaging" Version="6.2.4">
-      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
+    <Dependency Name="NuGet.Frameworks" Version="7.0.0-rc.1611" Label="Manual">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Versioning" Version="6.2.4">
-      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
+    <Dependency Name="NuGet.Packaging" Version="7.0.0-rc.1611" Label="Manual">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.2.0-beta.24327.2">
-      <Uri>https://github.com/dotnet/symreader</Uri>
-      <Sha>0710a7892d89999956e8808c28e9dd0512bd53f3</Sha>
-      <SourceBuild RepoName="symreader" ManagedOnly="true" />
+    <Dependency Name="NuGet.Versioning" Version="7.0.0-rc.1611" Label="Manual">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>79c85d969a02abd06c2202949318fd4c21e5e7a0</Sha>
     </Dependency>
+    <!-- End of manually updated dependencies -->
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9df28b4590d1..df7f15551a4a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,12 +5,12 @@
 
 -->
 <Project>
+  <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
   <PropertyGroup Label="Version settings">
-    <AspNetCoreMajorVersion>9</AspNetCoreMajorVersion>
+    <AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
-    <PreReleaseVersionIteration>
-    </PreReleaseVersionIteration>
+    <PreReleaseVersionIteration></PreReleaseVersionIteration>
     <ValidateBaseline>true</ValidateBaseline>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">8.0.1</IdentityModelVersion>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">*-*</IdentityModelVersion>
@@ -20,7 +20,7 @@
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
-    <PreReleaseBrandingLabel>RTM</PreReleaseBrandingLabel>
+    <PreReleaseBrandingLabel>RTM $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
     <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
     <AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
@@ -44,11 +44,11 @@
       src\Components\WebAssembly\Sdk\testassets\Directory.Build.props, and
       src\Razor\test\testassets\Directory.Build.props when this changes.
     -->
-    <DefaultNetCoreTargetFramework>net9.0</DefaultNetCoreTargetFramework>
+    <DefaultNetCoreTargetFramework>net10.0</DefaultNetCoreTargetFramework>
     <!-- this should usually match for LTS builds, and be off-by-one otherwise;
       example use-case here is OOB packages where Aspire wants to be able to consume
       new features specific to OOB -->
-    <CurrentLtsTargetFramework>net8.0</CurrentLtsTargetFramework>
+    <CurrentLtsTargetFramework>net10.0</CurrentLtsTargetFramework>
   </PropertyGroup>
   <PropertyGroup Label="Arcade settings">
     <!-- Opt-in to Arcade tools for building VSIX projects. -->
@@ -57,183 +57,40 @@
     <UsingToolXliff>false</UsingToolXliff>
   </PropertyGroup>
   <!--
-
-    These versions should ONLY be updated by automation.
-
-    DO NOT UPDATE THESE MANUALLY. Use the `darc` command line tool to update this file so it stays in sync with
-    Version.Details.xml.
-
-    See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc.
-
-  -->
-  <PropertyGroup Label="Automated">
-    <!-- Packages from dotnet/runtime -->
-    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24473.2</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24473.2</MicrosoftNETCoreAppRuntimewinx64Version>
-    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>9.0.0-rtm.24473.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
-    <MicrosoftNETRuntimeWebAssemblySdkVersion>9.0.0-rtm.24473.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
-    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>9.0.0-rtm.24473.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24473.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationCommandLineVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationCommandLineVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationFileExtensionsVersion>
-    <MicrosoftExtensionsConfigurationIniVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationIniVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationUserSecretsVersion>
-    <MicrosoftExtensionsConfigurationXmlVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationXmlVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDiagnosticsAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDiagnosticsAbstractionsVersion>
-    <MicrosoftExtensionsDiagnosticsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDiagnosticsVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsFileProvidersAbstractionsVersion>
-    <MicrosoftExtensionsFileProvidersCompositeVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsFileProvidersCompositeVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsFileProvidersPhysicalVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingDebugVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingDebugVersion>
-    <MicrosoftExtensionsLoggingEventSourceVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingEventSourceVersion>
-    <MicrosoftExtensionsLoggingEventLogVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingEventLogVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsLoggingTraceSourceVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingTraceSourceVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsOptionsDataAnnotationsVersion>
-    <MicrosoftExtensionsOptionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftExtensionsPrimitivesVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsPrimitivesVersion>
-    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>9.0.0-rtm.24473.2</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
-    <MicrosoftSourceBuildIntermediateruntimelinuxx64Version>9.0.0-rtm.24473.2</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
-    <SystemCompositionVersion>9.0.0-rtm.24473.2</SystemCompositionVersion>
-    <SystemConfigurationConfigurationManagerVersion>9.0.0-rtm.24473.2</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rtm.24473.2</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsEventLogVersion>9.0.0-rtm.24473.2</SystemDiagnosticsEventLogVersion>
-    <SystemDirectoryServicesProtocolsVersion>9.0.0-rtm.24473.2</SystemDirectoryServicesProtocolsVersion>
-    <SystemIOPipelinesVersion>9.0.0-rtm.24473.2</SystemIOPipelinesVersion>
-    <SystemNetHttpJsonVersion>9.0.0-rtm.24473.2</SystemNetHttpJsonVersion>
-    <SystemNetHttpWinHttpHandlerVersion>9.0.0-rtm.24473.2</SystemNetHttpWinHttpHandlerVersion>
-    <SystemNetServerSentEventsVersion>9.0.0-rtm.24473.2</SystemNetServerSentEventsVersion>
-    <SystemReflectionMetadataVersion>9.0.0-rtm.24473.2</SystemReflectionMetadataVersion>
-    <SystemResourcesExtensionsVersion>9.0.0-rtm.24473.2</SystemResourcesExtensionsVersion>
-    <SystemSecurityCryptographyPkcsVersion>9.0.0-rtm.24473.2</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>9.0.0-rtm.24473.2</SystemSecurityCryptographyXmlVersion>
-    <SystemSecurityPermissionsVersion>9.0.0-rtm.24473.2</SystemSecurityPermissionsVersion>
-    <SystemServiceProcessServiceControllerVersion>9.0.0-rtm.24473.2</SystemServiceProcessServiceControllerVersion>
-    <SystemTextEncodingsWebVersion>9.0.0-rtm.24473.2</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rtm.24473.2</SystemTextJsonVersion>
-    <SystemThreadingAccessControlVersion>9.0.0-rtm.24473.2</SystemThreadingAccessControlVersion>
-    <SystemThreadingChannelsVersion>9.0.0-rtm.24473.2</SystemThreadingChannelsVersion>
-    <SystemThreadingRateLimitingVersion>9.0.0-rtm.24473.2</SystemThreadingRateLimitingVersion>
-    <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsVersion>9.0.0-rtm.24473.2</MicrosoftNETCorePlatformsVersion>
-    <MicrosoftBclAsyncInterfacesVersion>9.0.0-rtm.24473.2</MicrosoftBclAsyncInterfacesVersion>
-    <!-- Transitive package to provide coherency in dotnet/extensions -->
-    <MicrosoftBclTimeProviderVersion>9.0.0-rtm.24473.2</MicrosoftBclTimeProviderVersion>
-    <SystemCollectionsImmutableVersion>9.0.0-rtm.24473.2</SystemCollectionsImmutableVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>9.0.0-rtm.24473.2</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>9.0.0-rtm.24473.2</SystemIOHashingVersion>
-    <SystemRuntimeCachingVersion>9.0.0-rtm.24473.2</SystemRuntimeCachingVersion>
-    <!-- Packages from dotnet/extensions -->
-    <MicrosoftExtensionsDiagnosticsTestingVersion>9.0.0-preview.9.24472.1</MicrosoftExtensionsDiagnosticsTestingVersion>
-    <MicrosoftExtensionsTimeProviderTestingVersion>9.0.0-preview.9.24472.1</MicrosoftExtensionsTimeProviderTestingVersion>
-    <!-- Packages from dotnet/efcore -->
-    <dotnetefVersion>9.0.0-rtm.24473.8</dotnetefVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreInMemoryVersion>
-    <MicrosoftEntityFrameworkCoreRelationalVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreRelationalVersion>
-    <MicrosoftEntityFrameworkCoreSqliteVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreSqliteVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreSqlServerVersion>
-    <MicrosoftEntityFrameworkCoreToolsVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreToolsVersion>
-    <MicrosoftEntityFrameworkCoreVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreVersion>
-    <MicrosoftEntityFrameworkCoreDesignVersion>9.0.0-rtm.24473.8</MicrosoftEntityFrameworkCoreDesignVersion>
-    <!-- Packages from dotnet/roslyn -->
-    <MicrosoftCodeAnalysisCommonVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisCommonVersion>
-    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
-    <MicrosoftSourceBuildIntermediateroslynVersion>4.11.0-1.24218.5</MicrosoftSourceBuildIntermediateroslynVersion>
-    <!-- Packages from NuGet/Nuget.client -->
-    <!-- If you update these versions, make sure to also update https://github.com/dotnet/aspnetcore/blob/main/eng/SourceBuildPrebuiltBaseline.xml -->
-    <NuGetPackagingVersion>6.2.4</NuGetPackagingVersion>
-    <NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
-    <NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
-    <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24466.2</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24466.2</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24466.2</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24466.2</MicrosoftSourceBuildIntermediatearcadeVersion>
-    <!-- Packages from dotnet/source-build-externals -->
-    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24452.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
-    <!-- Packages from dotnet/source-build-reference-packages -->
-    <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>9.0.0-alpha.1.24413.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
-    <!-- Packages from dotnet/symreader -->
-    <MicrosoftSourceBuildIntermediatesymreaderVersion>2.2.0-beta.24327.2</MicrosoftSourceBuildIntermediatesymreaderVersion>
-    <!-- Packages from dotnet/winforms -->
-    <SystemDrawingCommonVersion>9.0.0-rtm.24472.2</SystemDrawingCommonVersion>
-    <!-- Packages from dotnet/xdt -->
-    <MicrosoftWebXdtVersion>9.0.0-preview.24453.1</MicrosoftWebXdtVersion>
-    <MicrosoftSourceBuildIntermediatexdtVersion>9.0.0-preview.24453.1</MicrosoftSourceBuildIntermediatexdtVersion>
-  </PropertyGroup>
-  <!--
-
-    ^^^^^^^^^^
-    SEE NOTE ABOVE.
-
-    Versions above this comment are updated automatically. Don't change them manually.
-
     Versions below this comment are not managed by automation and can be changed as needed.
   -->
-  <PropertyGroup Label="Dependency version settings">
-    <!--
-      Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
-      All Runtime.$rid packages should have the same version.
-    -->
-    <MicrosoftNETCoreAppRuntimeVersion>$(MicrosoftNETCoreAppRuntimewinx64Version)</MicrosoftNETCoreAppRuntimeVersion>
-  </PropertyGroup>
   <PropertyGroup Label="Manual">
+    <!-- Dependencies from maintenance-packages -->
+    <MicrosoftBCLHashCodeVersion>6.0.0</MicrosoftBCLHashCodeVersion>
+    <MicrosoftIoRedistVersion>6.1.3</MicrosoftIoRedistVersion>
+    <SystemBuffersVersion>4.6.1</SystemBuffersVersion>
+    <SystemMemoryVersion>4.6.3</SystemMemoryVersion>
+    <SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
+    <SystemValueTupleVersion>4.6.1</SystemValueTupleVersion>
     <!-- DiagnosticAdapter package pinned temporarily (??) until migrated/deprecated -->
     <!-- This is the latest version found in dotnet-public. -->
     <MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion>
     <!-- Build tool dependencies -->
     <MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
-    <RepoTasksSystemSecurityCryptographyXmlVersion>8.0.0</RepoTasksSystemSecurityCryptographyXmlVersion>
     <!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
     <MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
     <NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
-    <SystemBuffersVersion>4.5.0</SystemBuffersVersion>
     <SystemCodeDomVersion>4.4.0</SystemCodeDomVersion>
     <SystemCommandlineExperimentalVersion>0.3.0-alpha.19317.1</SystemCommandlineExperimentalVersion>
     <SystemComponentModelVersion>4.3.0</SystemComponentModelVersion>
     <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
     <SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
-    <SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
     <SystemSecurityCryptographyX509CertificatesVersion>4.3.2</SystemSecurityCryptographyX509CertificatesVersion>
     <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
-    <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
-    <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <!-- Packages developed by @aspnet, but manually updated as necessary. -->
     <MicrosoftAspNetWebApiClientVersion>5.2.6</MicrosoftAspNetWebApiClientVersion>
     <MicrosoftAspNetCoreRazorLanguageVersion>6.0.0</MicrosoftAspNetCoreRazorLanguageVersion>
     <MicrosoftAspNetCoreMvcRazorExtensionsVersion>6.0.0</MicrosoftAspNetCoreMvcRazorExtensionsVersion>
     <MicrosoftCodeAnalysisRazorVersion>6.0.0</MicrosoftCodeAnalysisRazorVersion>
     <!-- Partner teams -->
-    <MicrosoftBCLHashCodeVersion>1.1.1</MicrosoftBCLHashCodeVersion>
-    <MicrosoftBuildVersion>17.4.0</MicrosoftBuildVersion>
     <MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
-    <MicrosoftBuildFrameworkVersion>17.4.0</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildTasksCoreVersion>17.4.0</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>17.4.0</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>17.4.0</MicrosoftBuildUtilitiesCoreVersion>
     <!--
       Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test
       framework in current .NET SDKs.
@@ -252,16 +109,13 @@
     -->
     <Analyzer_MicrosoftCodeAnalysisCSharpVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpVersion>
     <Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>
-    <!-- Pin the version of the M.CA dependencies that we utilize with a cutom version property $(MicrosoftCodeAnalysisVersion_LatestVS) to avoid automatically
+    <!-- Pin the version of the M.CA dependencies that we utilize with a custom version property $(MicrosoftCodeAnalysisVersion_LatestVS) to avoid automatically
     consuming the newest version of the packages when using the $(MicrosoftCodeAnalysisCSharpVersion) properties in source-build. -->
-    <MicrosoftCodeAnalysisVersion_LatestVS>4.11.0-1.24218.5</MicrosoftCodeAnalysisVersion_LatestVS>
-    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
-    <MicrosoftCodeAnalysisCommonVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisCommonVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.11.0-1.24218.5</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
+    <MicrosoftCodeAnalysisVersion_LatestVS>4.13.0-3.24613.7</MicrosoftCodeAnalysisVersion_LatestVS>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
-    <MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
-    <MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
+    <MicrosoftCodeAnalysisCSharpAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisCSharpAnalyzerTestingVersion>
+    <MicrosoftCodeAnalysisCSharpCodeFixTestingVersion>1.1.2</MicrosoftCodeAnalysisCSharpCodeFixTestingVersion>
+    <MicrosoftCodeAnalysisCSharpSourceGeneratorsTestingVersion>1.1.2</MicrosoftCodeAnalysisCSharpSourceGeneratorsTestingVersion>
     <MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
     <MicrosoftIdentityModelLoggingVersion>$(IdentityModelVersion)</MicrosoftIdentityModelLoggingVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectVersion>$(IdentityModelVersion)</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
@@ -276,12 +130,12 @@
     <SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
     <!-- Packages from downlevel branches used for site extension build. -->
-    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.25-servicing-23523-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
-    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
-    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version>8.0.0-rtm-23531-12</MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension80x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension80x64Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension80x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension80Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension80x86Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>9.0.0-rtm-24529-3</MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x64Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension90Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension90x86Version>
     <!-- 3rd party dependencies -->
     <AzureIdentityVersion>1.11.4</AzureIdentityVersion>
     <AngleSharpVersion>0.9.9</AngleSharpVersion>
@@ -296,12 +150,11 @@
     <GrpcAuthVersion>2.64.0</GrpcAuthVersion>
     <GrpcNetClientVersion>2.64.0</GrpcNetClientVersion>
     <GrpcToolsVersion>2.64.0</GrpcToolsVersion>
-    <MessagePackVersion>2.5.108</MessagePackVersion>
-    <MicrosoftIdentityWebVersion>3.0.0</MicrosoftIdentityWebVersion>
-    <MicrosoftIdentityWebGraphServiceClientVersion>3.0.0</MicrosoftIdentityWebGraphServiceClientVersion>
-    <MicrosoftIdentityWebUIVersion>3.0.0</MicrosoftIdentityWebUIVersion>
-    <MicrosoftIdentityWebDownstreamApiVersion>3.0.0</MicrosoftIdentityWebDownstreamApiVersion>
-    <MicrosoftIoRedistVersion>6.0.1</MicrosoftIoRedistVersion>
+    <MessagePackVersion>2.5.187</MessagePackVersion>
+    <MicrosoftIdentityWebVersion>3.14.1</MicrosoftIdentityWebVersion>
+    <MicrosoftIdentityWebGraphServiceClientVersion>3.14.1</MicrosoftIdentityWebGraphServiceClientVersion>
+    <MicrosoftIdentityWebUIVersion>3.14.1</MicrosoftIdentityWebUIVersion>
+    <MicrosoftIdentityWebDownstreamApiVersion>3.14.1</MicrosoftIdentityWebDownstreamApiVersion>
     <MicrosoftWindowsCsWin32Version>0.3.46-beta</MicrosoftWindowsCsWin32Version>
     <MessagePackAnalyzerVersion>$(MessagePackVersion)</MessagePackAnalyzerVersion>
     <MoqVersion>4.10.0</MoqVersion>
@@ -311,27 +164,28 @@
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <NSwagApiDescriptionClientVersion>13.0.4</NSwagApiDescriptionClientVersion>
     <PhotinoNETVersion>2.5.2</PhotinoNETVersion>
-    <MicrosoftPlaywrightVersion>1.45.1</MicrosoftPlaywrightVersion>
+    <MicrosoftPlaywrightVersion>1.54.0</MicrosoftPlaywrightVersion>
     <PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
     <PollyVersion>7.2.4</PollyVersion>
-    <SeleniumSupportVersion>4.22.0</SeleniumSupportVersion>
-    <SeleniumWebDriverVersion>4.22.0</SeleniumWebDriverVersion>
+    <SeleniumSupportVersion>4.34.0</SeleniumSupportVersion>
+    <SeleniumWebDriverVersion>4.34.0</SeleniumWebDriverVersion>
     <SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
     <SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
     <StackExchangeRedisVersion>2.7.27</StackExchangeRedisVersion>
     <SystemReactiveLinqVersion>5.0.0</SystemReactiveLinqVersion>
     <SwashbuckleAspNetCoreVersion>6.6.2</SwashbuckleAspNetCoreVersion>
+    <VerifySourceGeneratorsVersion>2.2.0</VerifySourceGeneratorsVersion>
     <VerifyXunitVersion>19.14.0</VerifyXunitVersion>
     <XunitAbstractionsVersion>2.0.3</XunitAbstractionsVersion>
-    <XunitAnalyzersVersion>1.0.0</XunitAnalyzersVersion>
-    <XunitVersion>2.4.2</XunitVersion>
+    <XunitAnalyzersVersion>1.15.0</XunitAnalyzersVersion>
+    <XunitVersion>2.9.2</XunitVersion>
     <XunitAssertVersion>$(XunitVersion)</XunitAssertVersion>
     <XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
-    <XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
-    <MicrosoftDataSqlClientVersion>4.0.5</MicrosoftDataSqlClientVersion>
-    <MicrosoftOpenApiVersion>1.6.17</MicrosoftOpenApiVersion>
-    <MicrosoftOpenApiReadersVersion>1.6.17</MicrosoftOpenApiReadersVersion>
+    <XUnitRunnerVisualStudioVersion>3.1.3</XUnitRunnerVisualStudioVersion>
+    <MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
+    <MicrosoftOpenApiVersion>2.0.0</MicrosoftOpenApiVersion>
+    <MicrosoftOpenApiYamlReaderVersion>2.0.0</MicrosoftOpenApiYamlReaderVersion>
     <!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
     <DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
     <DotnetServeVersion>1.10.93</DotnetServeVersion>
diff --git a/eng/build.ps1 b/eng/build.ps1
index 3696fe11e0df..854fe0679036 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -99,6 +99,12 @@ Additional feed that can be used when downloading .NET runtimes and SDKs
 .PARAMETER RuntimeSourceFeedKey
 Key for feed that can be used when downloading .NET runtimes and SDKs
 
+.PARAMETER ProductBuild
+Build the repository in product mode (short: -pb).
+
+.PARAMETER fromVMR
+Set when building from within the VMR.
+
 .EXAMPLE
 Building both native and managed projects.
 
@@ -184,6 +190,7 @@ param(
     [Alias('v')]
     [string]$Verbosity = 'minimal',
     [switch]$DumpProcesses, # Capture all running processes and dump them to a file.
+    [string]$msbuildEngine = 'dotnet',
 
     # Other lifecycle targets
     [switch]$Help, # Show help
@@ -195,6 +202,13 @@ param(
     [Alias('DotNetRuntimeSourceFeedKey')]
     [string]$RuntimeSourceFeedKey,
 
+    # Product build
+    [Alias('pb')]
+    [switch]$ProductBuild,
+
+    # Intentionally lowercase as tools.ps1 depends on it
+    [switch]$fromVMR,
+
     # Capture the rest
     [Parameter(ValueFromRemainingArguments = $true)]
     [string[]]$MSBuildArguments
@@ -249,6 +263,8 @@ if ($BuildManaged -or ($All -and (-not $NoBuildManaged))) {
     }
 }
 
+$CommandLineArguments = $MSBuildArguments
+
 if ($NoBuildDeps) { $MSBuildArguments += "/p:BuildProjectReferences=false" }
 
 $RunBuild = if ($NoBuild) { $false } else { $true }
@@ -272,6 +288,9 @@ $MSBuildArguments += "/p:Publish=$Publish"
 $MSBuildArguments += "/p:TargetArchitecture=$Architecture"
 $MSBuildArguments += "/p:TargetOsName=win"
 
+if ($ProductBuild) { $MSBuildArguments += "/p:DotNetBuild=$ProductBuild" }
+if ($fromVMR) { $MSBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" }
+
 if (-not $Configuration) {
     $Configuration = if ($CI) { 'Release' } else { 'Debug' }
 }
@@ -286,26 +305,30 @@ if ($RuntimeSourceFeed -or $RuntimeSourceFeedKey) {
     $ToolsetBuildArguments += $runtimeFeedArg
     $ToolsetBuildArguments += $runtimeFeedKeyArg
 }
+if ($ProductBuild) { $ToolsetBuildArguments += "/p:DotNetBuild=$ProductBuild" }
+if ($fromVMR) { $ToolsetBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" }
 
 # Split build categories between dotnet msbuild and desktop msbuild. Use desktop msbuild as little as possible.
-[string[]]$dotnetBuildArguments = $MSBuildArguments
+[string[]]$dotnetBuildArguments = ''
+[string[]]$MSBuildOnlyArguments = ''
+
 if ($All) { $dotnetBuildArguments += '/p:BuildAllProjects=true' }
 if ($Projects) {
     if ($BuildNative) {
-        $MSBuildArguments += "/p:ProjectToBuild=$Projects"
+        $MSBuildOnlyArguments += "/p:ProjectToBuild=$Projects"
     } else {
         $dotnetBuildArguments += "/p:ProjectToBuild=$Projects"
     }
 }
 
-if ($NoBuildInstallers) { $MSBuildArguments += "/p:BuildInstallers=false"; $BuildInstallers = $false }
-if ($BuildInstallers) { $MSBuildArguments += "/p:BuildInstallers=true" }
+if ($NoBuildInstallers) { $MSBuildOnlyArguments += "/p:BuildInstallers=false"; $BuildInstallers = $false }
+if ($BuildInstallers) { $MSBuildOnlyArguments += "/p:BuildInstallers=true" }
 
 # Build native projects by default unless -NoBuildNative was specified.
 $specifiedBuildNative = $BuildNative
 $BuildNative = $true
-if ($NoBuildNative) { $MSBuildArguments += "/p:BuildNative=false"; $BuildNative = $false }
-if ($BuildNative) { $MSBuildArguments += "/p:BuildNative=true"}
+if ($NoBuildNative) { $MSBuildOnlyArguments += "/p:BuildNative=false"; $BuildNative = $false }
+if ($BuildNative) { $MSBuildOnlyArguments += "/p:BuildNative=true"}
 
 if ($NoBuildJava) { $dotnetBuildArguments += "/p:BuildJava=false"; $BuildJava = $false }
 if ($BuildJava) { $dotnetBuildArguments += "/p:BuildJava=true" }
@@ -317,23 +340,24 @@ if ($BuildNodeJS) { $dotnetBuildArguments += "/p:BuildNodeJSUnlessSourcebuild=tr
 # Don't bother with two builds if just one will build everything. Ignore super-weird cases like
 # "-Projects ... -NoBuildJava -NoBuildManaged -NoBuildNodeJS". An empty `./build.ps1` command will build both
 # managed and native projects.
-$performDesktopBuild = $BuildInstallers -or $BuildNative
-$performDotnetBuild = $BuildJava -or $BuildManaged -or $BuildNodeJS -or `
+
+# If -msbuildEngine vs is explicitly passed in, use desktop msbuild only.
+# This is necessary for one-shot builds like within the VMR.
+
+$performDesktopBuild = $BuildInstallers -or $BuildNative -or $msbuildEngine -eq 'vs'
+$performDotnetBuild = $msBuildEngine -ne 'vs' -and ($BuildJava -or $BuildManaged -or $BuildNodeJS -or `
     ($All -and -not ($NoBuildJava -and $NoBuildManaged -and $NoBuildNodeJS)) -or `
-    ($Projects -and -not ($BuildInstallers -or $specifiedBuildNative))
+    ($Projects -and -not ($BuildInstallers -or $specifiedBuildNative)))
 
 # Initialize global variables need to be set before the import of Arcade is imported
 $restore = $RunRestore
 
-# Though VS Code may indicate $nodeReuse and $msbuildEngine are unused, tools.ps1 uses them.
+# Though VS Code may indicate $nodeReuse is unused, tools.ps1 uses them.
 
 # Disable node reuse - Workaround perpetual issues in node reuse and custom task assemblies
 $nodeReuse = $false
 $env:MSBUILDDISABLENODEREUSE=1
 
-# Use `dotnet msbuild` by default
-$msbuildEngine = 'dotnet'
-
 # Ensure passing neither -bl nor -nobl on CI avoids errors in tools.ps1. This is needed because both parameters are
 # $false by default i.e. they always exist. (We currently avoid binary logs but that is made visible in the YAML.)
 if ($CI -and -not $excludeCIBinarylog) {
@@ -346,10 +370,6 @@ Remove-Item variable:global:_DotNetInstallDir -ea Ignore
 Remove-Item variable:global:_ToolsetBuildProj -ea Ignore
 Remove-Item variable:global:_MSBuildExe -ea Ignore
 
-# tools.ps1 expects the remaining arguments to be available via the $properties string array variable
-# TODO: Remove when https://github.com/dotnet/source-build/issues/4337 is implemented.
-[string[]] $properties = $MSBuildArguments
-
 # Import Arcade
 . "$PSScriptRoot/common/tools.ps1"
 
@@ -414,12 +434,17 @@ if ($BinaryLog) {
     $bl = GetMSBuildBinaryLogCommandLineArgument($MSBuildArguments)
     if (-not $bl) {
         $dotnetBuildArguments += "/bl:" + (Join-Path $LogDir "Build.binlog")
-        $MSBuildArguments += "/bl:" + (Join-Path $LogDir "Build.native.binlog")
+
+        # When running both builds, use a different binary log path for the desktop msbuild.
+        if ($performDesktopBuild -and $performDotnetBuild) {
+            $MSBuildOnlyArguments += "/bl:" + (Join-Path $LogDir "Build.native.binlog")
+        }
+
         $ToolsetBuildArguments += "/bl:" + (Join-Path $LogDir "Build.repotasks.binlog")
     } else {
         # Use a different binary log path when running desktop msbuild if doing both builds.
         if ($performDesktopBuild -and $performDotnetBuild) {
-            $MSBuildArguments += "/bl:" + [System.IO.Path]::ChangeExtension($bl, "native.binlog")
+            $MSBuildOnlyArguments += "/bl:" + [System.IO.Path]::ChangeExtension($bl, "native.binlog")
         }
 
         $ToolsetBuildArguments += "/bl:" + [System.IO.Path]::ChangeExtension($bl, "repotasks.binlog")
@@ -469,7 +494,8 @@ try {
             /p:Restore=$RunRestore `
             /p:Build=true `
             /clp:NoSummary `
-            @ToolsetBuildArguments
+            @ToolsetBuildArguments `
+            @CommandLineArguments
     }
 
     if (-not $OnlyBuildRepoTasks) {
@@ -478,7 +504,12 @@ try {
             Remove-Item variable:global:_BuildTool -ErrorAction Ignore
             $msbuildEngine = 'vs'
 
-            MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @MSBuildArguments
+            # When running with desktop msbuild only, append the dotnet build specific arguments.
+            if (-not $performDotnetBuild) {
+                $MSBuildOnlyArguments += $dotnetBuildArguments
+            }
+
+            MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @MSBuildArguments @MSBuildOnlyArguments
         }
 
         if ($performDotnetBuild) {
@@ -486,7 +517,7 @@ try {
             Remove-Item variable:global:_BuildTool -ErrorAction Ignore
             $msbuildEngine = 'dotnet'
 
-            MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @dotnetBuildArguments
+            MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @MSBuildArguments @dotnetBuildArguments
         }
     }
 }
diff --git a/eng/build.sh b/eng/build.sh
index 1275859dfaf0..91e398561b8b 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -20,6 +20,7 @@ run_build=true
 run_pack=false
 run_publish=false
 run_tests=false
+run_sign=false
 build_all=false
 build_deps=true
 only_build_repo_tasks=false
@@ -34,6 +35,11 @@ target_arch='x64'
 configuration=''
 runtime_source_feed=''
 runtime_source_feed_key=''
+source_build=''
+product_build=''
+from_vmr=''
+warn_as_error=true
+from_vmr=''
 
 if [ "$(uname)" = "Darwin" ]; then
     target_os_name='osx'
@@ -64,6 +70,7 @@ Options:
     --[no-]pack                       Produce packages.
     --[no-]test                       Run tests.
     --[no-]publish                    Run publish.
+    --[no-]sign                       Run code signing.
 
     --projects                        A list of projects to build. (Must be an absolute path.)
                                       Globbing patterns are supported, such as \"$(pwd)/**/*.csproj\".
@@ -82,10 +89,15 @@ Options:
     --binarylog|-bl                   Use a binary logger
     --excludeCIBinarylog              Don't output binary log by default in CI builds (short: -nobl).
     --verbosity|-v                    MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
+    --warnAsError                     Sets warnaserror msbuild parameter: 'true' or 'false'
 
     --runtime-source-feed             Additional feed that can be used when downloading .NET runtimes and SDKs
     --runtime-source-feed-key         Key for feed that can be used when downloading .NET runtimes and SDKs
 
+    --sourceBuild|-sb                 Build the repository in source-only mode.
+    --productBuild|-pb                Build the repository in product-build mode.
+    --fromVMR                         Set when building from within the VMR.
+
 Description:
     This build script installs required tools and runs an MSBuild command on this repository
     This script can be used to invoke various targets, such as targets to produce packages
@@ -166,6 +178,12 @@ while [[ $# -gt 0 ]]; do
         -no-test|-notest)
             run_tests=false
             ;;
+        -sign)
+            run_sign=true
+            ;;
+        -no-sign|-nosign)
+            run_sign=false
+            ;;
         -projects)
             shift
             build_projects="${1:-}"
@@ -224,6 +242,11 @@ while [[ $# -gt 0 ]]; do
         -excludeCIBinarylog|-nobl)
             exclude_ci_binary_log=true
             ;;
+        -verbosity|-v)
+            shift
+            [ -z "${1:-}" ] && __error "Missing value for parameter --verbosity" && __usage
+            verbosity="${1:-}"
+            ;;
         -dotnet-runtime-source-feed|-dotnetruntimesourcefeed|-runtime-source-feed|-runtimesourcefeed)
             shift
             [ -z "${1:-}" ] && __error "Missing value for parameter --runtime-source-feed" && __usage
@@ -234,6 +257,21 @@ while [[ $# -gt 0 ]]; do
             [ -z "${1:-}" ] && __error "Missing value for parameter --runtime-source-feed-key" && __usage
             runtime_source_feed_key="${1:-}"
             ;;
+        -sourcebuild|-source-build|-sb)
+            source_build=true
+            product_build=true
+            ;;
+        -productbuild|-product-build|-pb)
+            product_build=true
+            ;;
+        -fromvmr|-from-vmr)
+            from_vmr=true
+            ;;
+        -warnaserror)
+            shift
+            [ -z "${1:-}" ] && __error "Missing value for parameter --warnaserror" && __usage
+            warn_as_error="${1:-}"
+            ;;
         *)
             msbuild_args[${#msbuild_args[*]}]="$1"
             ;;
@@ -241,6 +279,12 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
+commandline_args=()
+
+if [ ${#msbuild_args[@]} -gt 0 ]; then
+    commandline_args=("${msbuild_args[@]}")
+fi
+
 if [ "$build_all" = true ]; then
     msbuild_args[${#msbuild_args[*]}]="-p:BuildAllProjects=true"
 fi
@@ -285,6 +329,9 @@ fi
 [ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJSUnlessSourcebuild=$build_nodejs"
 [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed"
 [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers"
+[ ! -z "$product_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuild=$product_build"
+[ ! -z "$source_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildSourceOnly=$source_build"
+[ ! -z "$from_vmr" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr"
 
 # Run restore by default unless --no-restore or --no-build was specified.
 [ -z "$run_restore" ] && run_restore=true
@@ -297,6 +344,7 @@ fi
 msbuild_args[${#msbuild_args[*]}]="-p:Pack=$run_pack"
 msbuild_args[${#msbuild_args[*]}]="-p:Publish=$run_publish"
 msbuild_args[${#msbuild_args[*]}]="-p:Test=$run_tests"
+msbuild_args[${#msbuild_args[*]}]="-p:Sign=$run_sign"
 
 msbuild_args[${#msbuild_args[*]}]="-p:TargetArchitecture=$target_arch"
 msbuild_args[${#msbuild_args[*]}]="-p:TargetOsName=$target_os_name"
@@ -313,13 +361,16 @@ msbuild_args[${#msbuild_args[*]}]="-p:Configuration=$configuration"
 # Set up additional runtime args
 toolset_build_args=()
 if [ ! -z "$runtime_source_feed$runtime_source_feed_key" ]; then
-    runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$runtime_source_feed"
-    runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$runtime_source_feed_key"
+    runtimeFeedArg="-p:DotNetRuntimeSourceFeed=$runtime_source_feed"
+    runtimeFeedKeyArg="-p:DotNetRuntimeSourceFeedKey=$runtime_source_feed_key"
     msbuild_args[${#msbuild_args[*]}]=$runtimeFeedArg
     msbuild_args[${#msbuild_args[*]}]=$runtimeFeedKeyArg
     toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedArg
     toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedKeyArg
 fi
+[ ! -z "$product_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuild=$product_build"
+[ ! -z "$source_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildSourceOnly=$source_build"
+[ ! -z "$from_vmr" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr"
 
 # Initialize global variables need to be set before the import of Arcade is imported
 restore=$run_restore
@@ -339,10 +390,6 @@ if [ "$(uname)" = "Darwin" ]; then
     ulimit -n 10000
 fi
 
-# tools.sh expects the remaining arguments to be available via the $properties string array variable
-# TODO: Remove when https://github.com/dotnet/source-build/issues/4337 is implemented.
-properties=$msbuild_args
-
 # Import Arcade
 . "$DIR/common/tools.sh"
 
@@ -379,6 +426,10 @@ InitializeToolset
 
 restore=$_tmp_restore=
 
+if [ ${#commandline_args[@]} -gt 0 ]; then
+  toolset_build_args+=("${commandline_args[@]}")
+fi
+
 if [ "$build_repo_tasks" = true ]; then
     MSBuild $_InitializeToolset \
         -p:RepoRoot="$repo_root" \
diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd
index 56c2f25ac22f..ac1f72bf94e0 100644
--- a/eng/common/CIBuild.cmd
+++ b/eng/common/CIBuild.cmd
@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
\ No newline at end of file
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index 5db4ad71ee2f..fc8d618014e0 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -7,11 +7,11 @@
 # See example call for this script below.
 #
 #  - task: PowerShell@2
-#    displayName: Setup Private Feeds Credentials
+#    displayName: Setup internal Feeds Credentials
 #    condition: eq(variables['Agent.OS'], 'Windows_NT')
 #    inputs:
-#      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-#      arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+#      filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
+#      arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
 #    env:
 #      Token: $(dn-bot-dnceng-artifact-feeds-rw)
 #
@@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0
 
 . $PSScriptRoot\tools.ps1
 
+# Adds or enables the package source with the given name
+function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
+    if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) {
+        AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password
+    }
+}
+
 # Add source entry to PackageSources
 function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
     $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
     
     if ($packageSource -eq $null)
     {
+        Write-Host "Adding package source $SourceName"
+
         $packageSource = $doc.CreateElement("add")
         $packageSource.SetAttribute("key", $SourceName)
         $packageSource.SetAttribute("value", $SourceEndPoint)
         $sources.AppendChild($packageSource) | Out-Null
     }
     else {
-        Write-Host "Package source $SourceName already present."
+        Write-Host "Package source $SourceName already present and enabled."
     }
 
     AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
@@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) {
         return;
     }
 
+    Write-Host "Inserting credential for feed: " $source
+
     # Looks for credential configuration for the given SourceName. Create it if none is found.
     $sourceElement = $creds.SelectSingleNode($Source)
     if ($sourceElement -eq $null)
@@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) {
     $passwordElement.SetAttribute("value", $pwd)
 }
 
-function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
-    $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
-
-    Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
-    
-    ForEach ($PackageSource in $maestroPrivateSources) {
-        Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
-        AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
+# Enable all darc-int package sources.
+function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) {
+    $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
+    ForEach ($DisabledPackageSource in $maestroInternalSources) {
+        EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key
     }
 }
 
-function EnablePrivatePackageSources($DisabledPackageSources) {
-    $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
-    ForEach ($DisabledPackageSource in $maestroPrivateSources) {
-        Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
+# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise.
+function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) {
+    $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']")
+    if ($DisabledPackageSource) {
+        Write-Host "Enabling internal source '$($DisabledPackageSource.key)'."
+        
         # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
         $DisabledPackageSources.RemoveChild($DisabledPackageSource)
+
+        AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password
+        return $true
     }
+    return $false
 }
 
 if (!(Test-Path $ConfigFile -PathType Leaf)) {
@@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument
 $filename = (Get-Item $ConfigFile).FullName
 $doc.Load($filename)
 
-# Get reference to <PackageSources> or create one if none exist already
+# Get reference to <PackageSources> - fail if none exist
 $sources = $doc.DocumentElement.SelectSingleNode("packageSources")
 if ($sources -eq $null) {
-    $sources = $doc.CreateElement("packageSources")
-    $doc.DocumentElement.AppendChild($sources) | Out-Null
+    Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile"
+    ExitWithExitCode 1
 }
 
 $creds = $null
+$feedSuffix = "v3/index.json"
 if ($Password) {
+    $feedSuffix = "v2"
     # Looks for a <PackageSourceCredentials> node. Create it if none is found.
     $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
     if ($creds -eq $null) {
@@ -138,33 +154,22 @@ if ($Password) {
     }
 }
 
+$userName = "dn-bot"
+
 # Check for disabledPackageSources; we'll enable any darc-int ones we find there
 $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
 if ($disabledSources -ne $null) {
     Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
-    EnablePrivatePackageSources -DisabledPackageSources $disabledSources
-}
-
-$userName = "dn-bot"
-
-# Insert credential nodes for Maestro's private feeds
-InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
-
-# 3.1 uses a different feed url format so it's handled differently here
-$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
-if ($dotnet31Source -ne $null) {
-    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
-    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
+    EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds
 }
-
-$dotnetVersions = @('5','6','7','8','9')
+$dotnetVersions = @('5','6','7','8','9','10')
 
 foreach ($dotnetVersion in $dotnetVersions) {
     $feedPrefix = "dotnet" + $dotnetVersion;
     $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
     if ($dotnetSource -ne $null) {
-        AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
-        AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
+        AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
+        AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
     }
 }
 
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index 4604b61b0323..b97cc536379d 100755
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -11,8 +11,8 @@
 #  - task: Bash@3
 #    displayName: Setup Internal Feeds
 #    inputs:
-#      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-#      arguments: $(Build.SourcesDirectory)/NuGet.config
+#      filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
+#      arguments: $(System.DefaultWorkingDirectory)/NuGet.config
 #    condition: ne(variables['Agent.OS'], 'Windows_NT')
 #  - task: NuGetAuthenticate@1
 #
@@ -52,78 +52,124 @@ if [[ `uname -s` == "Darwin" ]]; then
     TB=''
 fi
 
-# Ensure there is a <packageSources>...</packageSources> section.
-grep -i "<packageSources>" $ConfigFile
-if [ "$?" != "0" ]; then
-    echo "Adding <packageSources>...</packageSources> section."
-    ConfigNodeHeader="<configuration>"
-    PackageSourcesTemplate="${TB}<packageSources>${NL}${TB}</packageSources>"
+# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found.
+EnableInternalPackageSource() {
+    local PackageSourceName="$1"
+    
+    # Check if disabledPackageSources section exists
+    grep -i "<disabledPackageSources>" "$ConfigFile" > /dev/null
+    if [ "$?" != "0" ]; then
+        return 1  # No disabled sources section
+    fi
+    
+    # Check if this source name is disabled
+    grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
+    if [ "$?" == "0" ]; then
+        echo "Enabling internal source '$PackageSourceName'."
+        # Remove the disabled entry (including any surrounding comments or whitespace on the same line)
+        sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
+        
+        # Add the source name to PackageSources for credential handling
+        PackageSources+=("$PackageSourceName")
+        return 0  # Found and enabled
+    fi
+    
+    return 1  # Not found in disabled sources
+}
+
+# Add source entry to PackageSources
+AddPackageSource() {
+    local SourceName="$1"
+    local SourceEndPoint="$2"
+    
+    # Check if source already exists
+    grep -i "<add key=\"$SourceName\"" "$ConfigFile" > /dev/null
+    if [ "$?" == "0" ]; then
+        echo "Package source $SourceName already present and enabled."
+        PackageSources+=("$SourceName")
+        return
+    fi
+    
+    echo "Adding package source $SourceName"
+    PackageSourcesNodeFooter="</packageSources>"
+    PackageSourceTemplate="${TB}<add key=\"$SourceName\" value=\"$SourceEndPoint\" />"
+    
+    sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile"
+    PackageSources+=("$SourceName")
+}
+
+# Adds or enables the package source with the given name
+AddOrEnablePackageSource() {
+    local SourceName="$1"
+    local SourceEndPoint="$2"
+    
+    # Try to enable if disabled, if not found then add new source
+    EnableInternalPackageSource "$SourceName"
+    if [ "$?" != "0" ]; then
+        AddPackageSource "$SourceName" "$SourceEndPoint"
+    fi
+}
 
-    sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
-fi
+# Enable all darc-int package sources
+EnableMaestroInternalPackageSources() {
+    # Check if disabledPackageSources section exists
+    grep -i "<disabledPackageSources>" "$ConfigFile" > /dev/null
+    if [ "$?" != "0" ]; then
+        return  # No disabled sources section
+    fi
+    
+    # Find all darc-int disabled sources
+    local DisabledDarcIntSources=()
+    DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"')
+    
+    for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
+        if [[ $DisabledSourceName == darc-int* ]]; then
+            EnableInternalPackageSource "$DisabledSourceName"
+        fi
+    done
+}
 
-# Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section. 
-grep -i "<packageSourceCredentials>" $ConfigFile
+# Ensure there is a <packageSources>...</packageSources> section.
+grep -i "<packageSources>" $ConfigFile
 if [ "$?" != "0" ]; then
-    echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
-
-    PackageSourcesNodeFooter="</packageSources>"
-    PackageSourceCredentialsTemplate="${TB}<packageSourceCredentials>${NL}${TB}</packageSourceCredentials>"
-
-    sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile
+    Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile"
+    ExitWithExitCode 1
 fi
 
 PackageSources=()
 
-# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
-grep -i "<add key=\"dotnet3.1\"" $ConfigFile
-if [ "$?" == "0" ]; then
-    grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
+# Set feed suffix based on whether credentials are provided
+FeedSuffix="v3/index.json"
+if [ -n "$CredToken" ]; then
+    FeedSuffix="v2"
+    
+    # Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section.
+    grep -i "<packageSourceCredentials>" $ConfigFile
     if [ "$?" != "0" ]; then
-        echo "Adding dotnet3.1-internal to the packageSources."
-        PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
+        echo "Adding <packageSourceCredentials>...</packageSourceCredentials> section."
 
-        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
-    fi
-    PackageSources+=('dotnet3.1-internal')
-
-    grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
-    if [ "$?" != "0" ]; then
-        echo "Adding dotnet3.1-internal-transport to the packageSources."
         PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
+        PackageSourceCredentialsTemplate="${TB}<packageSourceCredentials>${NL}${TB}</packageSourceCredentials>"
 
-        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
+        sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile
     fi
-    PackageSources+=('dotnet3.1-internal-transport')
 fi
 
-DotNetVersions=('5' '6' '7' '8' '9')
+# Check for disabledPackageSources; we'll enable any darc-int ones we find there
+grep -i "<disabledPackageSources>" $ConfigFile > /dev/null
+if [ "$?" == "0" ]; then
+    echo "Checking for any darc-int disabled package sources in the disabledPackageSources node"
+    EnableMaestroInternalPackageSources
+fi
+
+DotNetVersions=('5' '6' '7' '8' '9' '10')
 
 for DotNetVersion in ${DotNetVersions[@]} ; do
     FeedPrefix="dotnet${DotNetVersion}";
-    grep -i "<add key=\"$FeedPrefix\"" $ConfigFile
+    grep -i "<add key=\"$FeedPrefix\"" $ConfigFile > /dev/null
     if [ "$?" == "0" ]; then
-        grep -i "<add key=\"$FeedPrefix-internal\"" $ConfigFile
-        if [ "$?" != "0" ]; then
-            echo "Adding $FeedPrefix-internal to the packageSources."
-            PackageSourcesNodeFooter="</packageSources>"
-            PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/v2\" />"
-
-            sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
-        fi
-        PackageSources+=("$FeedPrefix-internal")
-
-        grep -i "<add key=\"$FeedPrefix-internal-transport\">" $ConfigFile
-        if [ "$?" != "0" ]; then
-            echo "Adding $FeedPrefix-internal-transport to the packageSources."
-            PackageSourcesNodeFooter="</packageSources>"
-            PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/v2\" />"
-
-            sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
-        fi
-        PackageSources+=("$FeedPrefix-internal-transport")
+        AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix"
+        AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix"
     fi
 done
 
@@ -139,29 +185,12 @@ if [ "$CredToken" ]; then
         # Check if there is no existing credential for this FeedName
         grep -i "<$FeedName>" $ConfigFile 
         if [ "$?" != "0" ]; then
-            echo "Adding credentials for $FeedName."
+            echo "	Inserting credential for feed: $FeedName"
 
             PackageSourceCredentialsNodeFooter="</packageSourceCredentials>"
-            NewCredential="${TB}${TB}<$FeedName>${NL}<add key=\"Username\" value=\"dn-bot\" />${NL}<add key=\"ClearTextPassword\" value=\"$CredToken\" />${NL}</$FeedName>"
+            NewCredential="${TB}${TB}<$FeedName>${NL}${TB}<add key=\"Username\" value=\"dn-bot\" />${NL}${TB}${TB}<add key=\"ClearTextPassword\" value=\"$CredToken\" />${NL}${TB}${TB}</$FeedName>"
 
             sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
         fi
     done
 fi
-
-# Re-enable any entries in disabledPackageSources where the feed name contains darc-int
-grep -i "<disabledPackageSources>" $ConfigFile
-if [ "$?" == "0" ]; then
-    DisabledDarcIntSources=()
-    echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile"
-    DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile  | tr -d '"')
-    for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
-        if [[ $DisabledSourceName == darc-int* ]]
-            then
-                OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
-                NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
-                sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
-                echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
-        fi
-    done
-fi
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 438f9920c43e..8cfee107e7a3 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -7,6 +7,7 @@ Param(
   [string] $msbuildEngine = $null,
   [bool] $warnAsError = $true,
   [bool] $nodeReuse = $true,
+  [switch] $buildCheck = $false,
   [switch][Alias('r')]$restore,
   [switch] $deployDeps,
   [switch][Alias('b')]$build,
@@ -20,6 +21,7 @@ Param(
   [switch] $publish,
   [switch] $clean,
   [switch][Alias('pb')]$productBuild,
+  [switch]$fromVMR,
   [switch][Alias('bl')]$binaryLog,
   [switch][Alias('nobl')]$excludeCIBinarylog,
   [switch] $ci,
@@ -71,6 +73,9 @@ function Print-Usage() {
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
   Write-Host "  -excludePrereleaseVS    Set to exclude build engines in prerelease versions of Visual Studio"
   Write-Host "  -nativeToolsOnMachine   Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
+  Write-Host "  -nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
+  Write-Host "  -buildCheck             Sets /check msbuild parameter"
+  Write-Host "  -fromVMR                Set when building from within the VMR"
   Write-Host ""
 
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +102,7 @@ function Build {
 
   $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
   $platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
+  $check = if ($buildCheck) { '/check' } else { '' }
 
   if ($projects) {
     # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +119,7 @@ function Build {
   MSBuild $toolsetBuildProj `
     $bl `
     $platformArg `
+    $check `
     /p:Configuration=$configuration `
     /p:RepoRoot=$RepoRoot `
     /p:Restore=$restore `
@@ -122,11 +129,13 @@ function Build {
     /p:Deploy=$deploy `
     /p:Test=$test `
     /p:Pack=$pack `
-    /p:DotNetBuildRepo=$productBuild `
+    /p:DotNetBuild=$productBuild `
+    /p:DotNetBuildFromVMR=$fromVMR `
     /p:IntegrationTest=$integrationTest `
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `
     /p:Publish=$publish `
+    /p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
     @properties
 }
 
diff --git a/eng/common/build.sh b/eng/common/build.sh
index ac1ee8620cd2..9767bb411a4f 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -42,6 +42,8 @@ usage()
   echo "  --prepareMachine         Prepare machine for CI run, clean up processes after build"
   echo "  --nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
   echo "  --warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
+  echo "  --buildCheck <value>     Sets /check msbuild parameter"
+  echo "  --fromVMR                Set when building from within the VMR"
   echo ""
   echo "Command line arguments not listed above are passed thru to msbuild."
   echo "Arguments can also be passed in with a single hyphen."
@@ -63,6 +65,7 @@ restore=false
 build=false
 source_build=false
 product_build=false
+from_vmr=false
 rebuild=false
 test=false
 integration_test=false
@@ -76,6 +79,7 @@ clean=false
 
 warn_as_error=true
 node_reuse=true
+build_check=false
 binary_log=false
 exclude_ci_binary_log=false
 pipelines_log=false
@@ -87,7 +91,7 @@ verbosity='minimal'
 runtime_source_feed=''
 runtime_source_feed_key=''
 
-properties=''
+properties=()
 while [[ $# > 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
@@ -127,19 +131,22 @@ while [[ $# > 0 ]]; do
     -pack)
       pack=true
       ;;
-    -sourcebuild|-sb)
+    -sourcebuild|-source-build|-sb)
       build=true
       source_build=true
       product_build=true
       restore=true
       pack=true
       ;;
-    -productBuild|-pb)
+    -productbuild|-product-build|-pb)
       build=true
       product_build=true
       restore=true
       pack=true
       ;;
+    -fromvmr|-from-vmr)
+      from_vmr=true
+      ;;
     -test|-t)
       test=true
       ;;
@@ -173,6 +180,9 @@ while [[ $# > 0 ]]; do
       node_reuse=$2
       shift
       ;;
+    -buildcheck)
+      build_check=true
+      ;;
     -runtimesourcefeed)
       runtime_source_feed=$2
       shift
@@ -182,7 +192,7 @@ while [[ $# > 0 ]]; do
       shift
       ;;
     *)
-      properties="$properties $1"
+      properties+=("$1")
       ;;
   esac
 
@@ -216,7 +226,7 @@ function Build {
   InitializeCustomToolset
 
   if [[ ! -z "$projects" ]]; then
-    properties="$properties /p:Projects=$projects"
+    properties+=("/p:Projects=$projects")
   fi
 
   local bl=""
@@ -224,15 +234,21 @@ function Build {
     bl="/bl:\"$log_dir/Build.binlog\""
   fi
 
+  local check=""
+  if [[ "$build_check" == true ]]; then
+    check="/check"
+  fi
+
   MSBuild $_InitializeToolset \
     $bl \
+    $check \
     /p:Configuration=$configuration \
     /p:RepoRoot="$repo_root" \
     /p:Restore=$restore \
     /p:Build=$build \
-    /p:DotNetBuildRepo=$product_build \
-    /p:ArcadeBuildFromSource=$source_build \
+    /p:DotNetBuild=$product_build \
     /p:DotNetBuildSourceOnly=$source_build \
+    /p:DotNetBuildFromVMR=$from_vmr \
     /p:Rebuild=$rebuild \
     /p:Test=$test \
     /p:Pack=$pack \
@@ -240,7 +256,8 @@ function Build {
     /p:PerformanceTest=$performance_test \
     /p:Sign=$sign \
     /p:Publish=$publish \
-    $properties
+    /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
+    ${properties[@]+"${properties[@]}"}
 
   ExitWithExitCode 0
 }
diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh
index 1a02c0dec8fd..66e3b0ac61c3 100755
--- a/eng/common/cibuild.sh
+++ b/eng/common/cibuild.sh
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
-. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
\ No newline at end of file
+. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml
index ba53ebfbd513..5ce518406198 100644
--- a/eng/common/core-templates/job/job.yml
+++ b/eng/common/core-templates/job/job.yml
@@ -19,10 +19,11 @@ parameters:
   # publishing defaults
   artifacts: ''
   enableMicrobuild: false
+  enableMicrobuildForMacAndLinux: false
+  microbuildUseESRP: true
   enablePublishBuildArtifacts: false
   enablePublishBuildAssets: false
   enablePublishTestResults: false
-  enablePublishUsingPipelines: false
   enableBuildRetry: false
   mergeTestResults: false
   testRunTitle: ''
@@ -73,9 +74,6 @@ jobs:
   - ${{ if ne(parameters.enableTelemetry, 'false') }}:
     - name: DOTNET_CLI_TELEMETRY_PROFILE
       value: '$(Build.Repository.Uri)'
-  - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
-    - name: EnableRichCodeNavigation
-      value: 'true'
   # Retry signature validation up to three times, waiting 2 seconds between attempts.
   # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
   - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
@@ -127,18 +125,12 @@ jobs:
       - ${{ preStep }}
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-      - task: MicroBuildSigningPlugin@4
-        displayName: Install MicroBuild plugin
-        inputs:
-          signType: $(_SignType)
-          zipSources: false
-          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-        env:
-          TeamName: $(_TeamName)
-          MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
+    - template: /eng/common/core-templates/steps/install-microbuild.yml
+      parameters:
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
+        microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
         continueOnError: ${{ parameters.continueOnError }}
-        condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
     - task: NuGetAuthenticate@1
@@ -154,27 +146,15 @@ jobs:
   - ${{ each step in parameters.steps }}:
     - ${{ step }}
 
-  - ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
-    - task: RichCodeNavIndexer@0
-      displayName: RichCodeNav Upload
-      inputs:
-        languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
-        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
-        richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
-        uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
-      continueOnError: true
-
   - ${{ each step in parameters.componentGovernanceSteps }}:
     - ${{ step }}
 
-  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
-    - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-      - task: MicroBuildCleanup@1
-        displayName: Execute Microbuild cleanup tasks
-        condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
+  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/common/core-templates/steps/cleanup-microbuild.yml
+      parameters:
+        enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
         continueOnError: ${{ parameters.continueOnError }}
-        env:
-          TeamName: $(_TeamName)
 
   # Publish test results
   - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
@@ -183,7 +163,7 @@ jobs:
       inputs:
         testResultsFormat: 'xUnit'
         testResultsFiles: '*.xml'
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+        searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
         testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
         mergeTestResults: ${{ parameters.mergeTestResults }}
       continueOnError: true
@@ -194,7 +174,7 @@ jobs:
       inputs:
         testResultsFormat: 'VSTest'
         testResultsFiles: '*.trx'
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+        searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
         testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
         mergeTestResults: ${{ parameters.mergeTestResults }}
       continueOnError: true
@@ -238,7 +218,7 @@ jobs:
     - task: CopyFiles@2
       displayName: Gather buildconfiguration for build retry
       inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
+        SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
         Contents: '**'
         TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
       continueOnError: true
diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml
index 00feec8ebbc3..c5788829a872 100644
--- a/eng/common/core-templates/job/onelocbuild.yml
+++ b/eng/common/core-templates/job/onelocbuild.yml
@@ -4,11 +4,11 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool: ''
-    
+
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
-  SourcesDirectory: $(Build.SourcesDirectory)
+  SourcesDirectory: $(System.DefaultWorkingDirectory)
   CreatePr: true
   AutoCompletePr: false
   ReusePr: true
@@ -27,7 +27,7 @@ parameters:
   is1ESPipeline: ''
 jobs:
 - job: OneLocBuild${{ parameters.JobNameSuffix }}
-  
+
   dependsOn: ${{ parameters.dependsOn }}
 
   displayName: OneLocBuild${{ parameters.JobNameSuffix }}
@@ -68,7 +68,7 @@ jobs:
     - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
       - task: Powershell@2
         inputs:
-          filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+          filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
           arguments: $(_GenerateLocProjectArguments)
         displayName: Generate LocProject.json
         condition: ${{ parameters.condition }}
@@ -86,8 +86,7 @@ jobs:
         isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
         ${{ if eq(parameters.CreatePr, true) }}:
           isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
-          ${{ if eq(parameters.RepoType, 'gitHub') }}:
-            isShouldReusePrSelected: ${{ parameters.ReusePr }}
+          isShouldReusePrSelected: ${{ parameters.ReusePr }}
         packageSourceAuth: patAuth
         patVariable: ${{ parameters.CeapexPat }}
         ${{ if eq(parameters.RepoType, 'gitHub') }}:
@@ -100,22 +99,20 @@ jobs:
           mirrorBranch: ${{ parameters.MirrorBranch }}
       condition: ${{ parameters.condition }}
 
-    - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
-      parameters:
-        is1ESPipeline: ${{ parameters.is1ESPipeline }}
-        args:
-          displayName: Publish Localization Files
-          pathToPublish: '$(Build.ArtifactStagingDirectory)/loc'
-          publishLocation: Container
-          artifactName: Loc
-          condition: ${{ parameters.condition }}
+    # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
+    - task: CopyFiles@2
+      displayName: Copy LocProject.json
+      inputs:
+        SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/'
+        Contents: 'LocProject.json'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
+      condition: ${{ parameters.condition }}
 
-    - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+    - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
       parameters:
         is1ESPipeline: ${{ parameters.is1ESPipeline }}
         args:
-          displayName: Publish LocProject.json
-          pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
-          publishLocation: Container
-          artifactName: Loc
-          condition: ${{ parameters.condition }}
\ No newline at end of file
+          targetPath: '$(Build.ArtifactStagingDirectory)/loc'
+          artifactName: 'Loc'
+          displayName: 'Publish Localization Files'
+          condition: ${{ parameters.condition }}
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
index 3d3356e31967..37dff559fc1b 100644
--- a/eng/common/core-templates/job/publish-build-assets.yml
+++ b/eng/common/core-templates/job/publish-build-assets.yml
@@ -20,9 +20,6 @@ parameters:
   #           if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
   runAsPublic: false
 
-  # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
-  publishUsingPipelines: false
-
   # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
   publishAssetsImmediately: false
 
@@ -32,6 +29,19 @@ parameters:
 
   is1ESPipeline: ''
 
+  # Optional: 🌤️ or not the build has assets it wants to publish to BAR
+  isAssetlessBuild: false
+
+  # Optional, publishing version
+  publishingVersion: 3
+
+  # Optional: A minimatch pattern for the asset manifests to publish to BAR
+  assetManifestsPattern: '*/manifests/**/*.xml'
+
+  repositoryAlias: self
+
+  officialBuildId: ''
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -54,6 +64,11 @@ jobs:
       value: false
     # unconditional - needed for logs publishing (redactor tool version)
     - template: /eng/common/core-templates/post-build/common-variables.yml
+  - name: OfficialBuildId
+    ${{ if ne(parameters.officialBuildId, '') }}:
+      value: ${{ parameters.officialBuildId }}
+    ${{ else }}:
+      value: $(Build.BuildNumber)
 
   pool:
     # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -72,18 +87,36 @@ jobs:
     - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - checkout: self
+    - checkout: ${{ parameters.repositoryAlias }}
       fetchDepth: 3
       clean: true
-      
-    - task: DownloadBuildArtifacts@0
-      displayName: Download artifact
-      inputs:
-        artifactName: AssetManifests
-        downloadPath: '$(Build.StagingDirectory)/Download'
-        checkDownloadedFiles: true
-      condition: ${{ parameters.condition }}
-      continueOnError: ${{ parameters.continueOnError }}
+
+    - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: 
+      - ${{ if eq(parameters.publishingVersion, 3) }}: 
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Asset Manifests
+          inputs:
+            artifactName: AssetManifests
+            targetPath: '$(Build.StagingDirectory)/AssetManifests'
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+      - ${{ if eq(parameters.publishingVersion, 4) }}:
+        - task: DownloadPipelineArtifact@2
+          displayName: Download V4 asset manifests
+          inputs:
+            itemPattern: '*/manifests/**/*.xml'
+            targetPath: '$(Build.StagingDirectory)/AllAssetManifests'
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+        - task: CopyFiles@2
+          displayName: Copy V4 asset manifests to AssetManifests
+          inputs:
+            SourceFolder: '$(Build.StagingDirectory)/AllAssetManifests'
+            Contents: ${{ parameters.assetManifestsPattern }}
+            TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
+            flattenFolders: true
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
     
     - task: NuGetAuthenticate@1
 
@@ -93,12 +126,12 @@ jobs:
         azureSubscription: "Darc: Maestro Production"
         scriptType: ps
         scriptLocation: scriptPath
-        scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
+        scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
         arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
-          /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
+          /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
+          /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
           /p:MaestroApiEndpoint=https://maestro.dot.net
-          /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
-          /p:OfficialBuildId=$(Build.BuildNumber)
+          /p:OfficialBuildId=$(OfficialBuildId)
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
     
@@ -113,13 +146,24 @@ jobs:
           Add-Content -Path $filePath -Value "$(DefaultChannels)"
           Add-Content -Path $filePath -Value $(IsStableBuild)
 
-          $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
+          $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
           if (Test-Path -Path $symbolExclusionfile)
           {
             Write-Host "SymbolExclusionFile exists"
             Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
           }
 
+    - ${{ if eq(parameters.publishingVersion, 4) }}:
+      - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+        parameters:
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+          args:
+            targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
+            artifactName: AssetManifests
+            displayName: 'Publish Merged Manifest'
+            retryCountOnTaskFailure: 10 # for any logs being locked
+            sbomEnabled: false  # we don't need SBOM for logs
+
     - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
       parameters:
         is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -129,7 +173,7 @@ jobs:
           publishLocation: Container
           artifactName: ReleaseConfigs
 
-    - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+    - ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
       - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
         parameters:
           BARBuildId: ${{ parameters.BARBuildId }}
@@ -142,7 +186,7 @@ jobs:
           azureSubscription: "Darc: Maestro Production"
           scriptType: ps
           scriptLocation: scriptPath
-          scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+          scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
           arguments: >
             -BuildId $(BARBuildId)
             -PublishingInfraVersion 3
@@ -150,6 +194,7 @@ jobs:
             -WaitPublishingFinish true
             -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
             -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+            -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
 
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/core-templates/steps/publish-logs.yml
diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index c4713c8b6ede..d805d5faeb94 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -12,9 +12,10 @@ parameters:
   #   The name of the job. This is included in the job ID.
   # targetRID: ''
   #   The name of the target RID to use, instead of the one auto-detected by Arcade.
-  # nonPortable: false
+  # portableBuild: false
   #   Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
-  #   linux-x64), and compiling against distro-provided packages rather than portable ones.
+  #   linux-x64), and compiling against distro-provided packages rather than portable ones. The
+  #   default is portable mode.
   # skipPublishValidation: false
   #   Disables publishing validation.  By default, a check is performed to ensure no packages are
   #   published by source-build.
@@ -26,6 +27,8 @@ parameters:
   #   Specifies the build script to invoke to perform the build in the repo. The default
   #   './build.sh' should work for typical Arcade repositories, but this is customizable for
   #   difficult situations.
+  # buildArguments: ''
+  #   Specifies additional build arguments to pass to the build script.
   # jobProperties: {}
   #   A list of job properties to inject at the top level, for potential extensibility beyond
   #   container and pool.
diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml
index 205fb5b3a395..30530359a5d6 100644
--- a/eng/common/core-templates/job/source-index-stage1.yml
+++ b/eng/common/core-templates/job/source-index-stage1.yml
@@ -1,8 +1,5 @@
 parameters:
   runAsPublic: false
-  sourceIndexUploadPackageVersion: 2.0.0-20240522.1
-  sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
-  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: []
   binlogPath: artifacts/log/Debug/Build.binlog
@@ -16,12 +13,6 @@ jobs:
   dependsOn: ${{ parameters.dependsOn }}
   condition: ${{ parameters.condition }}
   variables:
-  - name: SourceIndexUploadPackageVersion
-    value: ${{ parameters.sourceIndexUploadPackageVersion }}
-  - name: SourceIndexProcessBinlogPackageVersion
-    value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
-  - name: SourceIndexPackageSource
-    value: ${{ parameters.sourceIndexPackageSource }}
   - name: BinlogPath
     value: ${{ parameters.binlogPath }}
   - template: /eng/common/core-templates/variables/pool-providers.yml
@@ -34,12 +25,10 @@ jobs:
     pool:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: $(DncEngPublicBuildPool)
-        image: 1es-windows-2022-open
-        os: windows
+        image: windows.vs2022.amd64.open
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         name: $(DncEngInternalBuildPool)
-        image: 1es-windows-2022
-        os: windows
+        image: windows.vs2022.amd64
 
   steps:
   - ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -47,35 +36,9 @@ jobs:
 
   - ${{ each preStep in parameters.preSteps }}:
     - ${{ preStep }}
-
-  - task: UseDotNet@2
-    displayName: Use .NET 8 SDK
-    inputs:
-      packageType: sdk
-      version: 8.0.x
-      installationPath: $(Agent.TempDirectory)/dotnet
-      workingDirectory: $(Agent.TempDirectory)
-
-  - script: |
-      $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
-      $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
-    displayName: Download Tools
-    # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
-    workingDirectory: $(Agent.TempDirectory)
-
   - script: ${{ parameters.sourceIndexBuildCommand }}
     displayName: Build Repository
 
-  - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
-    displayName: Process Binlog into indexable sln
-
-  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - task: AzureCLI@2
-      displayName: Log in to Azure and upload stage1 artifacts to source index
-      inputs:
-        azureSubscription: 'SourceDotNet Stage1 Publish'
-        addSpnToEnvironment: true
-        scriptType: 'ps'
-        scriptLocation: 'inlineScript'
-        inlineScript: |
-          $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
+  - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
+    parameters:
+      binLogPath: ${{ parameters.binLogPath }}
\ No newline at end of file
diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml
index f2144252cc65..dbc14ac580a2 100644
--- a/eng/common/core-templates/jobs/codeql-build.yml
+++ b/eng/common/core-templates/jobs/codeql-build.yml
@@ -15,7 +15,6 @@ jobs:
     enablePublishBuildArtifacts: false
     enablePublishTestResults: false
     enablePublishBuildAssets: false
-    enablePublishUsingPipelines: false
     enableTelemetry: true
 
     variables:
@@ -25,7 +24,7 @@ jobs:
       - name: DefaultGuardianVersion
         value: 0.109.0
       - name: GuardianPackagesConfigFile
-        value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
+        value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
       - name: GuardianVersion
         value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
   
diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml
index ea69be4341c6..01ada7476651 100644
--- a/eng/common/core-templates/jobs/jobs.yml
+++ b/eng/common/core-templates/jobs/jobs.yml
@@ -5,9 +5,6 @@ parameters:
   # Optional: Include PublishBuildArtifacts task
   enablePublishBuildArtifacts: false
 
-  # Optional: Enable publishing using release pipelines
-  enablePublishUsingPipelines: false
-
   # Optional: Enable running the source-build jobs to build repo from source
   enableSourceBuild: false
 
@@ -30,6 +27,9 @@ parameters:
   # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
   publishAssetsImmediately: false
 
+  # Optional: 🌤️ or not the build has assets it wants to publish to BAR
+  isAssetlessBuild: false
+
   # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
   artifactsPublishingAdditionalParameters: ''
   signingValidationAdditionalParameters: ''
@@ -43,6 +43,8 @@ parameters:
 
   artifacts: {}
   is1ESPipeline: ''
+  repositoryAlias: self
+  officialBuildId: ''
 
 # Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
 # and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -83,7 +85,6 @@ jobs:
   - template: /eng/common/core-templates/jobs/source-build.yml
     parameters:
       is1ESPipeline: ${{ parameters.is1ESPipeline }}
-      allCompletedJobId: Source_Build_Complete
       ${{ each parameter in parameters.sourceBuildParameters }}:
         ${{ parameter.key }}: ${{ parameter.value }}
 
@@ -96,7 +97,7 @@ jobs:
         ${{ parameter.key }}: ${{ parameter.value }}
 
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-  - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
+  - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
     - template: ../job/publish-build-assets.yml
       parameters:
         is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -108,12 +109,12 @@ jobs:
         - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
           - ${{ each job in parameters.jobs }}:
             - ${{ job.job }}
-        - ${{ if eq(parameters.enableSourceBuild, true) }}:
-          - Source_Build_Complete
 
         runAsPublic: ${{ parameters.runAsPublic }}
-        publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
-        publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
+        publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
+        isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
         enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
         artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
         signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
+        repositoryAlias: ${{ parameters.repositoryAlias }}
+        officialBuildId: ${{ parameters.officialBuildId }}
diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml
index a10ccfbee6de..d92860cba208 100644
--- a/eng/common/core-templates/jobs/source-build.yml
+++ b/eng/common/core-templates/jobs/source-build.yml
@@ -2,19 +2,13 @@ parameters:
   # This template adds arcade-powered source-build to CI. A job is created for each platform, as
   # well as an optional server job that completes when all platform jobs complete.
 
-  # The name of the "join" job for all source-build platforms. If set to empty string, the job is
-  # not included. Existing repo pipelines can use this job depend on all source-build jobs
-  # completing without maintaining a separate list of every single job ID: just depend on this one
-  # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'.
-  allCompletedJobId: ''
-
   # See /eng/common/core-templates/job/source-build.yml
   jobNamePrefix: 'Source_Build'
 
   # This is the default platform provided by Arcade, intended for use by a managed-only repo.
   defaultManagedPlatform:
     name: 'Managed'
-    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
+    container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
 
   # Defines the platforms on which to run build jobs. One job is created for each platform, and the
   # object in this array is sent to the job template as 'platform'. If no platforms are specified,
@@ -31,16 +25,6 @@ parameters:
 
 jobs:
 
-- ${{ if ne(parameters.allCompletedJobId, '') }}:
-  - job: ${{ parameters.allCompletedJobId }}
-    displayName: Source-Build Complete
-    pool: server
-    dependsOn:
-    - ${{ each platform in parameters.platforms }}:
-      - ${{ parameters.jobNamePrefix }}_${{ platform.name }}
-    - ${{ if eq(length(parameters.platforms), 0) }}:
-      - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}
-
 - ${{ each platform in parameters.platforms }}:
   - template: /eng/common/core-templates/job/source-build.yml
     parameters:
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
index 454fd75c7aff..f6f87fe5c675 100644
--- a/eng/common/core-templates/post-build/post-build.yml
+++ b/eng/common/core-templates/post-build/post-build.yml
@@ -44,6 +44,11 @@ parameters:
     displayName: Publish installers and checksums
     type: boolean
     default: true
+    
+  - name: requireDefaultChannels
+    displayName: Fail the build if there are no default channel(s) registrations for the current build
+    type: boolean
+    default: false
 
   - name: SDLValidationParameters
     type: object
@@ -55,6 +60,11 @@ parameters:
       artifactNames: ''
       downloadArtifacts: true
 
+  - name: isAssetlessBuild
+    type: boolean
+    displayName: Is Assetless Build
+    default: false
+
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
   - name: symbolPublishingAdditionalParameters
@@ -144,7 +154,7 @@ stages:
         - task: PowerShell@2
           displayName: Validate
           inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
+            filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1
             arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
 
     - job:
@@ -183,9 +193,6 @@ stages:
             buildId: $(AzDOBuildId)
             artifactName: PackageArtifacts
             checkDownloadedFiles: true
-            itemPattern: |
-              **
-              !**/Microsoft.SourceBuild.Intermediate.*.nupkg
 
         # This is necessary whenever we want to publish/restore to an AzDO private feed
         # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -201,7 +208,7 @@ stages:
             filePath: eng\common\sdk-task.ps1
             arguments: -task SigningValidation -restore -msbuildEngine vs
               /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
-              /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
+              /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
               ${{ parameters.signingValidationAdditionalParameters }}
 
         - template: /eng/common/core-templates/steps/publish-logs.yml
@@ -251,7 +258,7 @@ stages:
         - task: PowerShell@2
           displayName: Validate
           inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
+            filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1
             arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ 
               -ExtractPath $(Agent.BuildDirectory)/Extract/ 
               -GHRepoName $(Build.Repository.Name) 
@@ -306,11 +313,13 @@ stages:
             azureSubscription: "Darc: Maestro Production"
             scriptType: ps
             scriptLocation: scriptPath
-            scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
+            scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
             arguments: >
               -BuildId $(BARBuildId)
               -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
               -AzdoToken '$(System.AccessToken)'
               -WaitPublishingFinish true
+              -RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
               -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
               -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+              -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml
index f7602980dbe7..a7abd58c4bb6 100644
--- a/eng/common/core-templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -36,7 +36,7 @@ steps:
             $AzureDevOpsBuildId = $Env:Build_BuildId
           }
           else {
-            . $(Build.SourcesDirectory)\eng\common\tools.ps1
+            . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1
             $darc = Get-Darc
             $buildInfo = & $darc get-build `
               --id ${{ parameters.BARBuildId }} `
diff --git a/eng/common/core-templates/steps/cleanup-microbuild.yml b/eng/common/core-templates/steps/cleanup-microbuild.yml
new file mode 100644
index 000000000000..c0fdcd3379d7
--- /dev/null
+++ b/eng/common/core-templates/steps/cleanup-microbuild.yml
@@ -0,0 +1,28 @@
+parameters:
+  # Enable cleanup tasks for MicroBuild
+  enableMicrobuild: false
+  # Enable cleanup tasks for MicroBuild on Mac and Linux
+  # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
+  enableMicrobuildForMacAndLinux: false
+  continueOnError: false
+
+steps:
+  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+    - task: MicroBuildCleanup@1
+      displayName: Execute Microbuild cleanup tasks
+      condition: and(
+        always(),
+        or(
+          and(
+            eq(variables['Agent.Os'], 'Windows_NT'),
+            in(variables['_SignType'], 'real', 'test')
+          ),
+          and(
+            ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
+            ne(variables['Agent.Os'], 'Windows_NT'),
+            eq(variables['_SignType'], 'real')
+          )
+        ))
+      continueOnError: ${{ parameters.continueOnError }}
+      env:
+        TeamName: $(_TeamName)
diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml
index 64f881bffc3c..4085512b6909 100644
--- a/eng/common/core-templates/steps/enable-internal-sources.yml
+++ b/eng/common/core-templates/steps/enable-internal-sources.yml
@@ -17,8 +17,8 @@ steps:
     - task: PowerShell@2
       displayName: Setup Internal Feeds
       inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-        arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+        filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
+        arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
       env:
         Token: ${{ parameters.legacyCredential }}
   # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate.
@@ -29,8 +29,8 @@ steps:
       - task: PowerShell@2
         displayName: Setup Internal Feeds
         inputs:
-          filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-          arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config
+          filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
+          arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config
     - ${{ else }}:
       - template: /eng/common/templates/steps/get-federated-access-token.yml
         parameters:
@@ -39,8 +39,8 @@ steps:
       - task: PowerShell@2
         displayName: Setup Internal Feeds
         inputs:
-          filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-          arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token)
+          filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
+          arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token)
   # This is required in certain scenarios to install the ADO credential provider.
   # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others
   # (e.g. dotnet msbuild).
diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml
index d938b60e1bb5..c05f65027979 100644
--- a/eng/common/core-templates/steps/generate-sbom.yml
+++ b/eng/common/core-templates/steps/generate-sbom.yml
@@ -5,8 +5,8 @@
 # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
 
 parameters:
-  PackageVersion: 9.0.0
-  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  PackageVersion: 10.0.0
+  BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
   PackageName: '.NET'
   ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
   IgnoreDirectories: ''
@@ -38,7 +38,7 @@ steps:
       PackageName: ${{ parameters.packageName }}
       BuildDropPath: ${{ parameters.buildDropPath }}
       PackageVersion: ${{ parameters.packageVersion }}
-      ManifestDirPath: ${{ parameters.manifestDirPath }}
+      ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
       ${{ if ne(parameters.IgnoreDirectories, '') }}:
         AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
 
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
new file mode 100644
index 000000000000..d6b9878f54db
--- /dev/null
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -0,0 +1,91 @@
+parameters:
+  # Enable install tasks for MicroBuild
+  enableMicrobuild: false
+  # Enable install tasks for MicroBuild on Mac and Linux
+  # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
+  enableMicrobuildForMacAndLinux: false
+  # Determines whether the ESRP service connection information should be passed to the signing plugin.
+  # This overlaps with _SignType to some degree. We only need the service connection for real signing.
+  # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
+  # Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod.
+  # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
+  # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
+  microbuildUseESRP: true
+  # Location of the MicroBuild output folder
+  # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
+  microBuildOutputFolder: '$(Build.SourcesDirectory)'
+
+  continueOnError: false
+
+steps:
+  - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+    - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
+      # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
+      - task: UseDotNet@2
+        displayName: Install .NET 8.0 SDK for MicroBuild Plugin
+        inputs:
+          packageType: sdk
+          version: 8.0.x
+          installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
+          workingDirectory: ${{ parameters.microBuildOutputFolder }}
+        condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
+
+    - script: |
+        REM Check if ESRP is disabled while SignType is real
+        if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" (
+          echo Error: ESRP must be enabled when SignType is real.
+          exit /b 1
+        )
+      displayName: 'Validate ESRP usage (Windows)'
+      condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
+    - script: |
+        # Check if ESRP is disabled while SignType is real
+        if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then
+          echo "Error: ESRP must be enabled when SignType is real."
+          exit 1
+        fi
+      displayName: 'Validate ESRP usage (Non-Windows)'
+      condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
+
+    # Two different MB install steps. This is due to not being able to use the agent OS during
+    # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However,
+    # we can avoid including the MB install step if not enabled at all. This avoids a bunch of
+    # extra pipeline authorizations, since most pipelines do not sign on non-Windows.
+    - task: MicroBuildSigningPlugin@4
+      displayName: Install MicroBuild plugin (Windows)
+      inputs:
+        signType: $(_SignType)
+        zipSources: false
+        feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+        ${{ if eq(parameters.microbuildUseESRP, true) }}:
+          ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
+          ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+            ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+          ${{ else }}:
+            ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
+      env:
+        TeamName: $(_TeamName)
+        MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      continueOnError: ${{ parameters.continueOnError }}
+      condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
+
+    - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
+      - task: MicroBuildSigningPlugin@4
+        displayName: Install MicroBuild plugin (non-Windows)
+        inputs:
+          signType: $(_SignType)
+          zipSources: false
+          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+          ${{ if eq(parameters.microbuildUseESRP, true) }}:
+            ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
+            ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+              ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39
+            ${{ else }}:
+              ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
+        env:
+          TeamName: $(_TeamName)
+          MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+        continueOnError: ${{ parameters.continueOnError }}
+        condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'),  eq(variables['_SignType'], 'real'))
diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml
index 80788c523191..10f825e270a0 100644
--- a/eng/common/core-templates/steps/publish-logs.yml
+++ b/eng/common/core-templates/steps/publish-logs.yml
@@ -12,29 +12,31 @@ steps:
   inputs:
     targetType: inline
     script: |
-      New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
-      Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
+      New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
+      Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
   continueOnError: true
   condition: always()
     
 - task: PowerShell@2
   displayName: Redact Logs
   inputs:
-    filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
+    filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1
     # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
-    # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
+    # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
     #  If the file exists - sensitive data for redaction will be sourced from it
     #  (single entry per line, lines starting with '# ' are considered comments and skipped)
-    arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' 
+    arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' 
       -BinlogToolVersion ${{parameters.BinlogToolVersion}}
-      -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
+      -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
       '$(publishing-dnceng-devdiv-code-r-build-re)'
       '$(MaestroAccessToken)'
       '$(dn-bot-all-orgs-artifact-feeds-rw)'
       '$(akams-client-id)'
       '$(microsoft-symbol-server-pat)'
       '$(symweb-symbol-server-pat)'
+      '$(dnceng-symbol-server-pat)'
       '$(dn-bot-all-orgs-build-rw-code-rw)'
+      '$(System.AccessToken)'
       ${{parameters.CustomSensitiveDataList}}
   continueOnError: true
   condition: always()
@@ -42,9 +44,10 @@ steps:
 - task: CopyFiles@2
   displayName: Gather post build logs
   inputs:
-    SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs'
+    SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs'
     Contents: '**'
     TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs'
+  condition: always()
 
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
   parameters:
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 2915d29bb7f6..acf16ed34963 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -19,25 +19,12 @@ steps:
     set -x
     df -h
 
-    # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo.
-    internalRestoreArgs=
-    if ! git diff --quiet; then
-      internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
-      # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
-      # This only works if there is a username/email configured, which won't be the case in most CI runs.
-      git config --get user.email
-      if [ $? -ne 0 ]; then
-        git config user.email dn-bot@microsoft.com
-        git config user.name dn-bot
-      fi
-    fi
-
     # If building on the internal project, the internal storage variable may be available (usually only if needed)
     # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
     # in the default public locations.
     internalRuntimeDownloadArgs=
     if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
-      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
+      internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
     fi
 
     buildConfig=Release
@@ -46,84 +33,33 @@ steps:
       buildConfig='$(_BuildConfig)'
     fi
 
-    officialBuildArgs=
-    if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
-      officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
-    fi
-
     targetRidArgs=
     if [ '${{ parameters.platform.targetRID }}' != '' ]; then
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
-    runtimeOsArgs=
-    if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
-      runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
-    fi
-
-    baseOsArgs=
-    if [ '${{ parameters.platform.baseOS }}' != '' ]; then
-      baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
-    fi
-
-    publishArgs=
-    if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
-      publishArgs='--publish'
-    fi
-
-    assetManifestFileName=SourceBuild_RidSpecific.xml
-    if [ '${{ parameters.platform.name }}' != '' ]; then
-      assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
+    portableBuildArgs=
+    if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
+      portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
     fi
 
     ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
       --configuration $buildConfig \
-      --restore --build --pack $publishArgs -bl \
-      $officialBuildArgs \
+      --restore --build --pack -bl \
+      --source-build \
+      ${{ parameters.platform.buildArguments }} \
       $internalRuntimeDownloadArgs \
-      $internalRestoreArgs \
       $targetRidArgs \
-      $runtimeOsArgs \
-      $baseOsArgs \
-      /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
-      /p:ArcadeBuildFromSource=true \
-      /p:DotNetBuildSourceOnly=true \
-      /p:DotNetBuildRepo=true \
-      /p:AssetManifestFileName=$assetManifestFileName
+      $portableBuildArgs \
   displayName: Build
 
-# Upload build logs for diagnosis.
-- task: CopyFiles@2
-  displayName: Prepare BuildLogs staging directory
-  inputs:
-    SourceFolder: '$(Build.SourcesDirectory)'
-    Contents: |
-      **/*.log
-      **/*.binlog
-      artifacts/sb/prebuilt-report/**
-    TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
-    CleanTargetFolder: true
-  continueOnError: true
-  condition: succeededOrFailed()
-
 - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
   parameters:
     is1ESPipeline: ${{ parameters.is1ESPipeline }}
     args:
       displayName: Publish BuildLogs
-      targetPath: '$(Build.StagingDirectory)/BuildLogs'
+      targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
       artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
       continueOnError: true
       condition: succeededOrFailed()
       sbomEnabled: false  # we don't need SBOM for logs
-
-# Manually inject component detection so that we can ignore the source build upstream cache, which contains
-# a nupkg cache of input packages (a local feed).
-# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
-# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
-- template: /eng/common/core-templates/steps/component-governance.yml
-  parameters:
-    displayName: Component Detection (Exclude upstream cache)
-    is1ESPipeline: ${{ parameters.is1ESPipeline }}
-    componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
-    disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}
diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml
new file mode 100644
index 000000000000..e9a694afa58e
--- /dev/null
+++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml
@@ -0,0 +1,35 @@
+parameters:
+  sourceIndexUploadPackageVersion: 2.0.0-20250818.1
+  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
+  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
+  binlogPath: artifacts/log/Debug/Build.binlog
+
+steps:
+- task: UseDotNet@2
+  displayName: "Source Index: Use .NET 9 SDK"
+  inputs:
+    packageType: sdk
+    version: 9.0.x
+    installationPath: $(Agent.TempDirectory)/dotnet
+    workingDirectory: $(Agent.TempDirectory)
+
+- script: |
+    $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+    $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+  displayName: "Source Index: Download netsourceindex Tools"
+  # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
+  workingDirectory: $(Agent.TempDirectory)
+
+- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
+  displayName: "Source Index: Process Binlog into indexable sln"
+
+- ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - task: AzureCLI@2
+    displayName: "Source Index: Upload Source Index stage1 artifacts to Azure"
+    inputs:
+      azureSubscription: 'SourceDotNet Stage1 Publish'
+      addSpnToEnvironment: true
+      scriptType: 'ps'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch
index af7c8be05906..2cebc547382e 100644
--- a/eng/common/cross/arm64/tizen/tizen.patch
+++ b/eng/common/cross/arm64/tizen/tizen.patch
@@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
     Use the shared library, but some functions are only in
     the static library, so try that secondarily.  */
  OUTPUT_FORMAT(elf64-littleaarch64)
--GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
+-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
 +GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-aarch64.so.1 ) )
diff --git a/eng/common/cross/armel/armel.jessie.patch b/eng/common/cross/armel/armel.jessie.patch
deleted file mode 100644
index 2d2615619351..000000000000
--- a/eng/common/cross/armel/armel.jessie.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
---- a/usr/include/urcu/uatomic/generic.h	2014-10-22 15:00:58.000000000 -0700
-+++ b/usr/include/urcu/uatomic/generic.h	2020-10-30 21:38:28.550000000 -0700
-@@ -69,10 +69,10 @@
- #endif
- #ifdef UATOMIC_HAS_ATOMIC_SHORT
- 	case 2:
--		return __sync_val_compare_and_swap_2(addr, old, _new);
-+		return __sync_val_compare_and_swap_2((uint16_t*) addr, old, _new);
- #endif
- 	case 4:
--		return __sync_val_compare_and_swap_4(addr, old, _new);
-+		return __sync_val_compare_and_swap_4((uint32_t*) addr, old, _new);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
- 		return __sync_val_compare_and_swap_8(addr, old, _new);
-@@ -109,7 +109,7 @@
- 		return;
- #endif
- 	case 4:
--		__sync_and_and_fetch_4(addr, val);
-+		__sync_and_and_fetch_4((uint32_t*) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
-@@ -148,7 +148,7 @@
- 		return;
- #endif
- 	case 4:
--		__sync_or_and_fetch_4(addr, val);
-+		__sync_or_and_fetch_4((uint32_t*) addr, val);
- 		return;
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
-@@ -187,7 +187,7 @@
- 		return __sync_add_and_fetch_2(addr, val);
- #endif
- 	case 4:
--		return __sync_add_and_fetch_4(addr, val);
-+		return __sync_add_and_fetch_4((uint32_t*) addr, val);
- #if (CAA_BITS_PER_LONG == 64)
- 	case 8:
- 		return __sync_add_and_fetch_8(addr, val);
diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh
index 7e9ba2b75ed3..fbd8d80848a6 100755
--- a/eng/common/cross/build-android-rootfs.sh
+++ b/eng/common/cross/build-android-rootfs.sh
@@ -6,10 +6,11 @@ usage()
 {
     echo "Creates a toolchain and sysroot used for cross-compiling for Android."
     echo
-    echo "Usage: $0 [BuildArch] [ApiLevel]"
+    echo "Usage: $0 [BuildArch] [ApiLevel] [--ndk NDKVersion]"
     echo
     echo "BuildArch is the target architecture of Android. Currently only arm64 is supported."
     echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html"
+    echo "NDKVersion is the version of Android NDK. The default is r21. See https://developer.android.com/ndk/downloads/revision_history"
     echo
     echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior"
     echo "by setting the TOOLCHAIN_DIR environment variable"
@@ -25,10 +26,15 @@ __BuildArch=arm64
 __AndroidArch=aarch64
 __AndroidToolchain=aarch64-linux-android
 
-for i in "$@"
-    do
-        lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
-        case $lowerI in
+while :; do
+    if [[ "$#" -le 0 ]]; then
+        break
+    fi
+
+    i=$1
+
+    lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
+    case $lowerI in
         -?|-h|--help)
             usage
             exit 1
@@ -43,6 +49,10 @@ for i in "$@"
             __AndroidArch=arm
             __AndroidToolchain=arm-linux-androideabi
             ;;
+        --ndk)
+            shift
+            __NDK_Version=$1
+            ;;
         *[0-9])
             __ApiLevel=$i
             ;;
@@ -50,8 +60,17 @@ for i in "$@"
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i"
             ;;
     esac
+    shift
 done
 
+if [[ "$__NDK_Version" == "r21" ]] || [[ "$__NDK_Version" == "r22" ]]; then
+    __NDK_File_Arch_Spec=-x86_64
+    __SysRoot=sysroot
+else
+    __NDK_File_Arch_Spec=
+    __SysRoot=toolchains/llvm/prebuilt/linux-x86_64/sysroot
+fi
+
 # Obtain the location of the bash script to figure out where the root of the repo is.
 __ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -78,6 +97,7 @@ fi
 
 echo "Target API level: $__ApiLevel"
 echo "Target architecture: $__BuildArch"
+echo "NDK version: $__NDK_Version"
 echo "NDK location: $__NDK_Dir"
 echo "Target Toolchain location: $__ToolchainDir"
 
@@ -85,8 +105,8 @@ echo "Target Toolchain location: $__ToolchainDir"
 if [ ! -d $__NDK_Dir ]; then
     echo Downloading the NDK into $__NDK_Dir
     mkdir -p $__NDK_Dir
-    wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip
-    unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir
+    wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux$__NDK_File_Arch_Spec.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux.zip
+    unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux.zip -d $__CrossDir
 fi
 
 if [ ! -d $__lldb_Dir ]; then
@@ -116,16 +136,11 @@ for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/
     fi
 done
 
-cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/"
+cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/$__SysRoot/usr/"
 
 # Generate platform file for build.sh script to assign to __DistroRid
 echo "Generating platform file..."
-echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform
-
-echo "Now to build coreclr, libraries and installers; run:"
-echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory coreclr
-echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory libraries
-echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \
-    --subsetCategory installer
+echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/$__SysRoot/android_platform
+
+echo "Now to build coreclr, libraries and host; run:"
+echo ROOTFS_DIR=$(realpath $__ToolchainDir/$__SysRoot) ./build.sh clr+libs+host --cross --arch $__BuildArch
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 4b5e8d7166bd..8abfb71f7275 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -5,7 +5,7 @@ set -e
 usage()
 {
     echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
-    echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
+    echo "BuildArch can be: arm(default), arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64, x86"
     echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
     echo "                               for alpine can be specified with version: alpineX.YY or alpineedge"
     echo "                               for FreeBSD can be: freebsd13, freebsd14"
@@ -15,6 +15,7 @@ usage()
     echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
     echo "--skipsigcheck - optional, will skip package signature checks (allowing untrusted packages)."
+    echo "--skipemulation - optional, will skip qemu and debootstrap requirement when building environment for debian based systems."
     echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
     echo "--jobs N - optional, restrict to N jobs."
     exit 1
@@ -52,28 +53,27 @@ __UbuntuPackages+=" symlinks"
 __UbuntuPackages+=" libicu-dev"
 __UbuntuPackages+=" liblttng-ust-dev"
 __UbuntuPackages+=" libunwind8-dev"
-__UbuntuPackages+=" libnuma-dev"
 
 __AlpinePackages+=" gettext-dev"
 __AlpinePackages+=" icu-dev"
 __AlpinePackages+=" libunwind-dev"
 __AlpinePackages+=" lttng-ust-dev"
 __AlpinePackages+=" compiler-rt"
-__AlpinePackages+=" numactl-dev"
 
 # runtime libraries' dependencies
 __UbuntuPackages+=" libcurl4-openssl-dev"
 __UbuntuPackages+=" libkrb5-dev"
 __UbuntuPackages+=" libssl-dev"
 __UbuntuPackages+=" zlib1g-dev"
+__UbuntuPackages+=" libbrotli-dev"
 
 __AlpinePackages+=" curl-dev"
 __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"
 
-__FreeBSDBase="13.3-RELEASE"
-__FreeBSDPkg="1.17.0"
+__FreeBSDBase="13.4-RELEASE"
+__FreeBSDPkg="1.21.3"
 __FreeBSDABI="13"
 __FreeBSDPackages="libunwind"
 __FreeBSDPackages+=" icu"
@@ -91,18 +91,18 @@ __HaikuPackages="gcc_syslibs"
 __HaikuPackages+=" gcc_syslibs_devel"
 __HaikuPackages+=" gmp"
 __HaikuPackages+=" gmp_devel"
-__HaikuPackages+=" icu66"
-__HaikuPackages+=" icu66_devel"
+__HaikuPackages+=" icu[0-9]+"
+__HaikuPackages+=" icu[0-9]*_devel"
 __HaikuPackages+=" krb5"
 __HaikuPackages+=" krb5_devel"
 __HaikuPackages+=" libiconv"
 __HaikuPackages+=" libiconv_devel"
-__HaikuPackages+=" llvm12_libunwind"
-__HaikuPackages+=" llvm12_libunwind_devel"
+__HaikuPackages+=" llvm[0-9]*_libunwind"
+__HaikuPackages+=" llvm[0-9]*_libunwind_devel"
 __HaikuPackages+=" mpfr"
 __HaikuPackages+=" mpfr_devel"
-__HaikuPackages+=" openssl"
-__HaikuPackages+=" openssl_devel"
+__HaikuPackages+=" openssl3"
+__HaikuPackages+=" openssl3_devel"
 __HaikuPackages+=" zlib"
 __HaikuPackages+=" zlib_devel"
 
@@ -128,10 +128,12 @@ __AlpineKeys='
 616adfeb:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU\npNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X\n0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6\nADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ\nraQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy\nKLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj\n/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H\nKuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs\nmFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1\n/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq\nXIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4\nVORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ==
 616ae350:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0\nXkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ\npiM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46\nxLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP\nODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM\nEyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr\nDzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+\nf53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF\nHwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk\nOk9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6\n9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT\nJZDr++FjKrnnijbyNF8b98UCAwEAAQ==
 616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ==
+66ba20fe:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtfB12w4ZgqsXWZDfUAV/\n6Y4aHUKIu3q4SXrNZ7CXF9nXoAVYrS7NAxJdAodsY3vPCN0g5O8DFXR+390LdOuQ\n+HsGKCc1k5tX5ZXld37EZNTNSbR0k+NKhd9h6X3u6wqPOx7SIKxwAQR8qeeFq4pP\nrt9GAGlxtuYgzIIcKJPwE0dZlcBCg+GnptCUZXp/38BP1eYC+xTXSL6Muq1etYfg\nodXdb7Yl+2h1IHuOwo5rjgY5kpY7GcAs8AjGk3lDD/av60OTYccknH0NCVSmPoXK\nvrxDBOn0LQRNBLcAfnTKgHrzy0Q5h4TNkkyTgxkoQw5ObDk9nnabTxql732yy9BY\ns+hM9+dSFO1HKeVXreYSA2n1ndF18YAvAumzgyqzB7I4pMHXq1kC/8bONMJxwSkS\nYm6CoXKyavp7RqGMyeVpRC7tV+blkrrUml0BwNkxE+XnwDRB3xDV6hqgWe0XrifD\nYTfvd9ScZQP83ip0r4IKlq4GMv/R5shcCRJSkSZ6QSGshH40JYSoiwJf5FHbj9ND\n7do0UAqebWo4yNx63j/wb2ULorW3AClv0BCFSdPsIrCStiGdpgJDBR2P2NZOCob3\nG9uMj+wJD6JJg2nWqNJxkANXX37Qf8plgzssrhrgOvB0fjjS7GYhfkfmZTJ0wPOw\nA8+KzFseBh4UFGgue78KwgkCAwEAAQ==
 '
 __Keyring=
 __KeyringFile="/usr/share/keyrings/ubuntu-archive-keyring.gpg"
 __SkipSigCheck=0
+__SkipEmulation=0
 __UseMirror=0
 
 __UnprocessedBuildArgs=
@@ -162,9 +164,13 @@ while :; do
         armel)
             __BuildArch=armel
             __UbuntuArch=armel
-            __UbuntuRepo="http://ftp.debian.org/debian/"
-            __CodeName=jessie
+            __UbuntuRepo="http://archive.debian.org/debian/"
+            __CodeName=buster
             __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+            __LLDB_Package="liblldb-6.0-dev"
+            __UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
+            __UbuntuPackages="${__UbuntuPackages// libomp5/}"
+            __UbuntuSuites=
             ;;
         armv6)
             __BuildArch=armv6
@@ -180,6 +186,18 @@ while :; do
                 __Keyring="--keyring $__KeyringFile"
             fi
             ;;
+        loongarch64)
+            __BuildArch=loongarch64
+            __AlpineArch=loongarch64
+            __QEMUArch=loongarch64
+            __UbuntuArch=loong64
+            __UbuntuSuites=unreleased
+            __LLDB_Package="liblldb-19-dev"
+
+            if [[ "$__CodeName" == "sid" ]]; then
+                __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/"
+            fi
+            ;;
         riscv64)
             __BuildArch=riscv64
             __AlpineArch=riscv64
@@ -264,44 +282,21 @@ while :; do
 
             ;;
         xenial) # Ubuntu 16.04
-            if [[ "$__CodeName" != "jessie" ]]; then
-                __CodeName=xenial
-            fi
-            ;;
-        zesty) # Ubuntu 17.04
-            if [[ "$__CodeName" != "jessie" ]]; then
-                __CodeName=zesty
-            fi
+            __CodeName=xenial
             ;;
         bionic) # Ubuntu 18.04
-            if [[ "$__CodeName" != "jessie" ]]; then
-                __CodeName=bionic
-            fi
+            __CodeName=bionic
             ;;
         focal) # Ubuntu 20.04
-            if [[ "$__CodeName" != "jessie" ]]; then
-                __CodeName=focal
-            fi
+            __CodeName=focal
             ;;
         jammy) # Ubuntu 22.04
-            if [[ "$__CodeName" != "jessie" ]]; then
-                __CodeName=jammy
-            fi
+            __CodeName=jammy
             ;;
         noble) # Ubuntu 24.04
-            if [[ "$__CodeName" != "jessie" ]]; then
-                __CodeName=noble
-            fi
-            if [[ -n "$__LLDB_Package" ]]; then
-                __LLDB_Package="liblldb-18-dev"
-            fi
-            ;;
-        jessie) # Debian 8
-            __CodeName=jessie
-            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
-
-            if [[ -z "$__UbuntuRepo" ]]; then
-                __UbuntuRepo="http://ftp.debian.org/debian/"
+            __CodeName=noble
+            if [[ -z "$__LLDB_Package" ]]; then
+                __LLDB_Package="liblldb-19-dev"
             fi
             ;;
         stretch) # Debian 9
@@ -319,7 +314,7 @@ while :; do
             __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
 
             if [[ -z "$__UbuntuRepo" ]]; then
-                __UbuntuRepo="http://ftp.debian.org/debian/"
+                __UbuntuRepo="http://archive.debian.org/debian/"
             fi
             ;;
         bullseye) # Debian 11
@@ -340,10 +335,28 @@ while :; do
             ;;
         sid) # Debian sid
             __CodeName=sid
-            __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+            __UbuntuSuites=
 
-            if [[ -z "$__UbuntuRepo" ]]; then
-                __UbuntuRepo="http://ftp.debian.org/debian/"
+            # Debian-Ports architectures need different values
+            case "$__UbuntuArch" in
+            amd64|arm64|armel|armhf|i386|mips64el|ppc64el|riscv64|s390x)
+                __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg"
+
+                if [[ -z "$__UbuntuRepo" ]]; then
+                    __UbuntuRepo="http://ftp.debian.org/debian/"
+                fi
+                ;;
+            *)
+                __KeyringFile="/usr/share/keyrings/debian-ports-archive-keyring.gpg"
+
+                if [[ -z "$__UbuntuRepo" ]]; then
+                    __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/"
+                fi
+                ;;
+            esac
+
+            if [[ -e "$__KeyringFile" ]]; then
+                __Keyring="--keyring $__KeyringFile"
             fi
             ;;
         tizen)
@@ -370,7 +383,7 @@ while :; do
             ;;
         freebsd14)
             __CodeName=freebsd
-            __FreeBSDBase="14.0-RELEASE"
+            __FreeBSDBase="14.2-RELEASE"
             __FreeBSDABI="14"
             __SkipUnmount=1
             ;;
@@ -388,6 +401,9 @@ while :; do
         --skipsigcheck)
             __SkipSigCheck=1
             ;;
+        --skipemulation)
+            __SkipEmulation=1
+            ;;
         --rootfsdir|-rootfsdir)
             shift
             __RootfsDir="$1"
@@ -420,16 +436,15 @@ case "$__AlpineVersion" in
         elif [[ "$__AlpineArch" == "x86" ]]; then
             __AlpineVersion=3.17 # minimum version that supports lldb-dev
             __AlpinePackages+=" llvm15-libs"
-        elif [[ "$__AlpineArch" == "riscv64" ]]; then
+        elif [[ "$__AlpineArch" == "riscv64" || "$__AlpineArch" == "loongarch64" ]]; then
+            __AlpineVersion=3.21 # minimum version that supports lldb-dev
+            __AlpinePackages+=" llvm19-libs"
+        elif [[ -n "$__AlpineMajorVersion" ]]; then
+            # use whichever alpine version is provided and select the latest toolchain libs
             __AlpineLlvmLibsLookup=1
-            __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
         else
             __AlpineVersion=3.13 # 3.13 to maximize compatibility
             __AlpinePackages+=" llvm10-libs"
-
-            if [[ "$__AlpineArch" == "armv7" ]]; then
-                __AlpinePackages="${__AlpinePackages//numactl-dev/}"
-            fi
         fi
 esac
 
@@ -439,15 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then
     __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}"
 fi
 
-if [[ "$__BuildArch" == "armel" ]]; then
-    __LLDB_Package="lldb-3.5-dev"
-fi
-
-if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then
-    # libnuma-dev is not available on armhf for xenial
-    __UbuntuPackages="${__UbuntuPackages//libnuma-dev/}"
-fi
-
 __UbuntuPackages+=" ${__LLDB_Package:-}"
 
 if [[ -z "$__UbuntuRepo" ]]; then
@@ -496,7 +502,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
     arch="$(uname -m)"
 
     ensureDownloadTool
-    
+
     if [[ "$__hasWget" == 1 ]]; then
         wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static"
     else
@@ -512,11 +518,6 @@ if [[ "$__CodeName" == "alpine" ]]; then
     echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c
     chmod +x "$__ApkToolsDir/apk.static"
 
-    if [[ -f "/usr/bin/qemu-$__QEMUArch-static" ]]; then
-        mkdir -p "$__RootfsDir"/usr/bin
-        cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin"
-    fi
-
     if [[ "$__AlpineVersion" == "edge" ]]; then
         version=edge
     else
@@ -536,6 +537,10 @@ if [[ "$__CodeName" == "alpine" ]]; then
         __ApkSignatureArg="--keys-dir $__ApkKeysDir"
     fi
 
+    if [[ "$__SkipEmulation" == "1" ]]; then
+        __NoEmulationArg="--no-scripts"
+    fi
+
     # initialize DB
     # shellcheck disable=SC2086
     "$__ApkToolsDir/apk.static" \
@@ -557,7 +562,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
     "$__ApkToolsDir/apk.static" \
         -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
         -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
-        -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
+        -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" $__NoEmulationArg \
         add $__AlpinePackages
 
     rm -r "$__ApkToolsDir"
@@ -573,7 +578,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
         curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
     fi
     echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
-    echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
+    echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
     mkdir -p "$__RootfsDir"/tmp
     # get and build package manager
     if [[ "$__hasWget" == 1 ]]; then
@@ -681,7 +686,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then
 
     ensureDownloadTool
 
-    echo "Downloading Haiku package tool"
+    echo "Downloading Haiku package tools"
     git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script"
     if [[ "$__hasWget" == 1 ]]; then
         wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)"
@@ -691,34 +696,42 @@ elif [[ "$__CodeName" == "haiku" ]]; then
 
     unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin"
 
-    DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg"
-    HpkgBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
+    HaikuBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
+    HaikuPortsBaseUrl="https://eu.hpkg.haiku-os.org/haikuports/master/$__HaikuArch/current"
+
+    echo "Downloading HaikuPorts package repository index..."
+    if [[ "$__hasWget" == 1 ]]; then
+        wget -P "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
+    else
+        curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
+    fi
 
-    # Download Haiku packages
     echo "Downloading Haiku packages"
     read -ra array <<<"$__HaikuPackages"
     for package in "${array[@]}"; do
         echo "Downloading $package..."
-        # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60
-        # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598
+        hpkgFilename="$(LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package_repo" list -f "$__RootfsDir/tmp/download/repo" |
+            grep -E "${package}-" | sort -V | tail -n 1 | xargs)"
+        if [ -z "$hpkgFilename" ]; then
+            >&2 echo "ERROR: package $package missing."
+            exit 1
+        fi
+        echo "Resolved filename: $hpkgFilename..."
+        hpkgDownloadUrl="$HaikuPortsBaseUrl/packages/$hpkgFilename"
         if [[ "$__hasWget" == 1 ]]; then
-            hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \
-                --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
             wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
         else
-            hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \
-                --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
             curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
         fi
     done
     for package in haiku haiku_devel; do
         echo "Downloading $package..."
         if [[ "$__hasWget" == 1 ]]; then
-            hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
-            wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
+            hpkgVersion="$(wget -qO- "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
+            wget -P "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
         else
-            hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
-            curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
+            hpkgVersion="$(curl -sSL "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
+            curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
         fi
     done
 
@@ -744,25 +757,67 @@ elif [[ "$__CodeName" == "haiku" ]]; then
     popd
     rm -rf "$__RootfsDir/tmp"
 elif [[ -n "$__CodeName" ]]; then
+    __Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"
+
+    if [[ "$__SkipEmulation" == "1" ]]; then
+        if [[ -z "$AR" ]]; then
+            if command -v ar &>/dev/null; then
+                AR="$(command -v ar)"
+            elif command -v llvm-ar &>/dev/null; then
+                AR="$(command -v llvm-ar)"
+            else
+                echo "Unable to find ar or llvm-ar on PATH, add them to PATH or set AR environment variable pointing to the available AR tool"
+                exit 1
+            fi
+        fi
+
+        PYTHON=${PYTHON_EXECUTABLE:-python3}
+
+        # shellcheck disable=SC2086,SC2046
+        echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
+            $(for suite in $__Suites; do echo -n "--suite $suite "; done) \
+            $__UbuntuPackages
+
+        # shellcheck disable=SC2086,SC2046
+        "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
+            $(for suite in $__Suites; do echo -n "--suite $suite "; done) \
+            $__UbuntuPackages
 
+        exit 0
+    fi
+
+    __UpdateOptions=
     if [[ "$__SkipSigCheck" == "0" ]]; then
         __Keyring="$__Keyring --force-check-gpg"
+    else
+        __Keyring=
+        __UpdateOptions="--allow-unauthenticated --allow-insecure-repositories"
     fi
 
     # shellcheck disable=SC2086
     echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
-    debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
 
+    # shellcheck disable=SC2086
+    if ! debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"; then
+        echo "debootstrap failed! dumping debootstrap.log"
+        cat "$__RootfsDir/debootstrap/debootstrap.log"
+        exit 1
+    fi
+
+    rm -rf "$__RootfsDir"/etc/apt/*.{sources,list} "$__RootfsDir"/etc/apt/sources.list.d
     mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
+
+    # shellcheck disable=SC2086
     cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
 Types: deb
 URIs: $__UbuntuRepo
-Suites: $__CodeName $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
+Suites: $__Suites
 Components: main universe
 Signed-By: $__KeyringFile
 EOF
 
-    chroot "$__RootfsDir" apt-get update
+    # shellcheck disable=SC2086
+    chroot "$__RootfsDir" apt-get update $__UpdateOptions
     chroot "$__RootfsDir" apt-get -f -y install
     # shellcheck disable=SC2086
     chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages
@@ -772,12 +827,6 @@ EOF
     if [[ "$__SkipUnmount" == "0" ]]; then
         umount "$__RootfsDir"/* || true
     fi
-
-    if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
-        pushd "$__RootfsDir"
-        patch -p1 < "$__CrossDir/$__BuildArch/armel.jessie.patch"
-        popd
-    fi
 elif [[ "$__Tizen" == "tizen" ]]; then
     ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
 else
diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py
new file mode 100755
index 000000000000..c81eb37e522e
--- /dev/null
+++ b/eng/common/cross/install-debs.py
@@ -0,0 +1,334 @@
+#!/usr/bin/env python3
+
+import argparse
+import asyncio
+import aiohttp
+import gzip
+import os
+import re
+import shutil
+import subprocess
+import sys
+import tarfile
+import tempfile
+import zstandard
+
+from collections import deque
+from functools import cmp_to_key
+
+async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, timeout=60):
+    """Asynchronous file download with retries."""
+    attempt = 0
+    while attempt < max_retries:
+        try:
+            async with session.get(url, timeout=aiohttp.ClientTimeout(total=timeout)) as response:
+                if response.status == 200:
+                    with open(dest_path, "wb") as f:
+                        content = await response.read()
+                        f.write(content)
+                    print(f"Downloaded {url} at {dest_path}")
+                    return
+                else:
+                    print(f"Failed to download {url}, Status Code: {response.status}")
+                    break
+        except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e:
+            print(f"Error downloading {url}: {type(e).__name__} - {e}. Retrying...")
+
+        attempt += 1
+        await asyncio.sleep(retry_delay)
+
+    print(f"Failed to download {url} after {max_retries} attempts.")
+
+async def download_deb_files_parallel(mirror, packages, tmp_dir):
+    """Download .deb files in parallel."""
+    os.makedirs(tmp_dir, exist_ok=True)
+
+    tasks = []
+    timeout = aiohttp.ClientTimeout(total=60)
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        for pkg, info in packages.items():
+            filename = info.get("Filename")
+            if filename:
+                url = f"{mirror}/{filename}"
+                dest_path = os.path.join(tmp_dir, os.path.basename(filename))
+                tasks.append(asyncio.create_task(download_file(session, url, dest_path)))
+
+        await asyncio.gather(*tasks)
+
+async def download_package_index_parallel(mirror, arch, suites):
+    """Download package index files for specified suites and components entirely in memory."""
+    tasks = []
+    timeout = aiohttp.ClientTimeout(total=60)
+
+    async with aiohttp.ClientSession(timeout=timeout) as session:
+        for suite in suites:
+            for component in ["main", "universe"]:
+                url = f"{mirror}/dists/{suite}/{component}/binary-{arch}/Packages.gz"
+                tasks.append(fetch_and_decompress(session, url))
+
+        results = await asyncio.gather(*tasks, return_exceptions=True)
+
+    merged_content = ""
+    for result in results:
+        if isinstance(result, str):
+            if merged_content:
+                merged_content += "\n\n"
+            merged_content += result
+
+    return merged_content
+
+async def fetch_and_decompress(session, url):
+    """Fetch and decompress the Packages.gz file."""
+    try:
+        async with session.get(url) as response:
+            if response.status == 200:
+                compressed_data = await response.read()
+                decompressed_data = gzip.decompress(compressed_data).decode('utf-8')
+                print(f"Downloaded index: {url}")
+                return decompressed_data
+            else:
+                print(f"Skipped index: {url} (doesn't exist)")
+                return None
+    except Exception as e:
+        print(f"Error fetching {url}: {e}")
+
+def parse_debian_version(version):
+    """Parse a Debian package version into epoch, upstream version, and revision."""
+    match = re.match(r'^(?:(\d+):)?([^-]+)(?:-(.+))?$', version)
+    if not match:
+        raise ValueError(f"Invalid Debian version format: {version}")
+    epoch, upstream, revision = match.groups()
+    return int(epoch) if epoch else 0, upstream, revision or ""
+
+def compare_upstream_version(v1, v2):
+    """Compare upstream or revision parts using Debian rules."""
+    def tokenize(version):
+        tokens = re.split(r'([0-9]+|[A-Za-z]+)', version)
+        return [int(x) if x.isdigit() else x for x in tokens if x]
+
+    tokens1 = tokenize(v1)
+    tokens2 = tokenize(v2)
+
+    for token1, token2 in zip(tokens1, tokens2):
+        if type(token1) == type(token2):
+            if token1 != token2:
+                return (token1 > token2) - (token1 < token2)
+        else:
+            return -1 if isinstance(token1, str) else 1
+
+    return len(tokens1) - len(tokens2)
+
+def compare_debian_versions(version1, version2):
+    """Compare two Debian package versions."""
+    epoch1, upstream1, revision1 = parse_debian_version(version1)
+    epoch2, upstream2, revision2 = parse_debian_version(version2)
+
+    if epoch1 != epoch2:
+        return epoch1 - epoch2
+
+    result = compare_upstream_version(upstream1, upstream2)
+    if result != 0:
+        return result
+
+    return compare_upstream_version(revision1, revision2)
+
+def resolve_dependencies(packages, aliases, desired_packages):
+    """Recursively resolves dependencies for the desired packages."""
+    resolved = []
+    to_process = deque(desired_packages)
+
+    while to_process:
+        current = to_process.popleft()
+        resolved_package = current if current in packages else aliases.get(current, [None])[0]
+
+        if not resolved_package:
+            print(f"Error: Package '{current}' was not found in the available packages.")
+            sys.exit(1)
+
+        if resolved_package not in resolved:
+            resolved.append(resolved_package)
+
+            deps = packages.get(resolved_package, {}).get("Depends", "")
+            if deps:
+                deps = [dep.split(' ')[0] for dep in deps.split(', ') if dep]
+                for dep in deps:
+                    if dep not in resolved and dep not in to_process and dep in packages:
+                        to_process.append(dep)
+
+    return resolved
+
+def parse_package_index(content):
+    """Parses the Packages.gz file and returns package information."""
+    packages = {}
+    aliases = {}
+    entries = re.split(r'\n\n+', content)
+
+    for entry in entries:
+        fields = dict(re.findall(r'^(\S+): (.+)$', entry, re.MULTILINE))
+        if "Package" in fields:
+            package_name = fields["Package"]
+            version = fields.get("Version")
+            filename = fields.get("Filename")
+            depends = fields.get("Depends")
+            provides = fields.get("Provides", None)
+
+            # Only update if package_name is not in packages or if the new version is higher
+            if package_name not in packages or compare_debian_versions(version, packages[package_name]["Version"]) > 0:
+                packages[package_name] = {
+                    "Version": version,
+                    "Filename": filename,
+                    "Depends": depends
+                }
+
+                # Update aliases if package provides any alternatives
+                if provides:
+                    provides_list = [x.strip() for x in provides.split(",")]
+                    for alias in provides_list:
+                        # Strip version specifiers
+                        alias_name = re.sub(r'\s*\(=.*\)', '', alias)
+                        if alias_name not in aliases:
+                            aliases[alias_name] = []
+                        if package_name not in aliases[alias_name]:
+                            aliases[alias_name].append(package_name)
+
+    return packages, aliases
+
+def install_packages(mirror, packages_info, aliases, tmp_dir, extract_dir, ar_tool, desired_packages):
+    """Downloads .deb files and extracts them."""
+    resolved_packages = resolve_dependencies(packages_info, aliases, desired_packages)
+    print(f"Resolved packages (including dependencies): {resolved_packages}")
+
+    packages_to_download = {}
+
+    for pkg in resolved_packages:
+        if pkg in packages_info:
+            packages_to_download[pkg] = packages_info[pkg]
+
+        if pkg in aliases:
+            for alias in aliases[pkg]:
+                if alias in packages_info:
+                    packages_to_download[alias] = packages_info[alias]
+
+    asyncio.run(download_deb_files_parallel(mirror, packages_to_download, tmp_dir))
+
+    package_to_deb_file_map = {}
+    for pkg in resolved_packages:
+        pkg_info = packages_info.get(pkg)
+        if pkg_info:
+            deb_filename = pkg_info.get("Filename")
+            if deb_filename:
+                deb_file_path = os.path.join(tmp_dir, os.path.basename(deb_filename))
+                package_to_deb_file_map[pkg] = deb_file_path
+
+    for pkg in reversed(resolved_packages):
+        deb_file = package_to_deb_file_map.get(pkg)
+        if deb_file and os.path.exists(deb_file):
+            extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool)
+
+    print("All done!")
+
+def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool):
+    """Extract .deb file contents"""
+
+    os.makedirs(extract_dir, exist_ok=True)
+
+    with tempfile.TemporaryDirectory(dir=tmp_dir) as tmp_subdir:
+        result = subprocess.run(f"{ar_tool} t {os.path.abspath(deb_file)}", cwd=tmp_subdir, check=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        tar_filename = None
+        for line in result.stdout.decode().splitlines():
+            if line.startswith("data.tar"):
+                tar_filename = line.strip()
+                break
+
+        if not tar_filename:
+            raise FileNotFoundError(f"Could not find 'data.tar.*' in {deb_file}.")
+
+        tar_file_path = os.path.join(tmp_subdir, tar_filename)
+        print(f"Extracting {tar_filename} from {deb_file}..")
+
+        subprocess.run(f"{ar_tool} p {os.path.abspath(deb_file)} {tar_filename} > {tar_file_path}", check=True, shell=True)
+
+        file_extension = os.path.splitext(tar_file_path)[1].lower()
+
+        if file_extension == ".xz":
+            mode = "r:xz"
+        elif file_extension == ".gz":
+            mode = "r:gz"
+        elif file_extension == ".zst":
+            # zstd is not supported by standard library yet
+            decompressed_tar_path = tar_file_path.replace(".zst", "")
+            with open(tar_file_path, "rb") as zst_file, open(decompressed_tar_path, "wb") as decompressed_file:
+                dctx = zstandard.ZstdDecompressor()
+                dctx.copy_stream(zst_file, decompressed_file)
+
+            tar_file_path = decompressed_tar_path
+            mode = "r"
+        else:
+            raise ValueError(f"Unsupported compression format: {file_extension}")
+
+        with tarfile.open(tar_file_path, mode) as tar:
+            tar.extractall(path=extract_dir, filter='fully_trusted')
+
+def finalize_setup(rootfsdir):
+    lib_dir = os.path.join(rootfsdir, 'lib')
+    usr_lib_dir = os.path.join(rootfsdir, 'usr', 'lib')
+
+    if os.path.exists(lib_dir):
+        if os.path.islink(lib_dir):
+            os.remove(lib_dir)
+        else:
+            os.makedirs(usr_lib_dir, exist_ok=True)
+
+            for item in os.listdir(lib_dir):
+                src = os.path.join(lib_dir, item)
+                dest = os.path.join(usr_lib_dir, item)
+
+                if os.path.isdir(src):
+                    shutil.copytree(src, dest, dirs_exist_ok=True)
+                else:
+                    shutil.copy2(src, dest)
+
+            shutil.rmtree(lib_dir)
+
+    os.symlink(usr_lib_dir, lib_dir)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Generate rootfs for .NET runtime on Debian-like OS")
+    parser.add_argument("--distro", required=False, help="Distro name (e.g., debian, ubuntu, etc.)")
+    parser.add_argument("--arch", required=True, help="Architecture (e.g., amd64, loong64, etc.)")
+    parser.add_argument("--rootfsdir", required=True, help="Destination directory.")
+    parser.add_argument('--suite', required=True, action='append', help='Specify one or more repository suites to collect index data.')
+    parser.add_argument("--mirror", required=False, help="Mirror (e.g., http://ftp.debian.org/debian-ports etc.)")
+    parser.add_argument("--artool", required=False, default="ar", help="ar tool to extract debs (e.g., ar, llvm-ar etc.)")
+    parser.add_argument("packages", nargs="+", help="List of package names to be installed.")
+
+    args = parser.parse_args()
+
+    if args.mirror is None:
+        if args.distro == "ubuntu":
+            args.mirror = "http://archive.ubuntu.com/ubuntu" if args.arch in ["amd64", "i386"] else "http://ports.ubuntu.com/ubuntu-ports"
+        elif args.distro == "debian":
+            args.mirror = "http://ftp.debian.org/debian-ports"
+        else:
+            raise Exception("Unsupported distro")
+
+    DESIRED_PACKAGES = args.packages + [ # base packages
+        "dpkg",
+        "busybox",
+        "libc-bin",
+        "base-files",
+        "base-passwd",
+        "debianutils"
+    ]
+
+    print(f"Creating rootfs. rootfsdir: {args.rootfsdir}, distro: {args.distro}, arch: {args.arch}, suites: {args.suite}, mirror: {args.mirror}")
+
+    package_index_content = asyncio.run(download_package_index_parallel(args.mirror, args.arch, args.suite))
+
+    packages_info, aliases = parse_package_index(package_index_content)
+
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        install_packages(args.mirror, packages_info, aliases, tmp_dir, args.rootfsdir, args.artool, DESIRED_PACKAGES)
+
+    finalize_setup(args.rootfsdir)
diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh
old mode 100644
new mode 100755
diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh
old mode 100644
new mode 100755
index 28936ceef3a7..37c3a61f1de8
--- a/eng/common/cross/tizen-fetch.sh
+++ b/eng/common/cross/tizen-fetch.sh
@@ -156,13 +156,8 @@ fetch_tizen_pkgs()
     done
 }
 
-if [ "$TIZEN_ARCH" == "riscv64" ]; then
-    BASE="Tizen-Base-RISCV"
-    UNIFIED="Tizen-Unified-RISCV"
-else
-    BASE="Tizen-Base"
-    UNIFIED="Tizen-Unified"
-fi
+BASE="Tizen-Base"
+UNIFIED="Tizen-Unified"
 
 Inform "Initialize ${TIZEN_ARCH} base"
 fetch_tizen_pkgs_init standard $BASE
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 9a4e285a5ae3..0ff85cf0367e 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
   if(TIZEN)
-    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
+    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   elseif(LINUX)
     set(TOOLCHAIN "aarch64-linux-gnu")
     if(TIZEN)
-      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
+      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
     endif()
   elseif(FREEBSD)
     set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
   set(TOOLCHAIN "arm-linux-gnueabi")
   if(TIZEN)
-    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
+    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "armv6")
   set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -67,6 +67,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "loongarch64")
+  set(CMAKE_SYSTEM_PROCESSOR "loongarch64")
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl)
+    set(TOOLCHAIN "loongarch64-alpine-linux-musl")
+  else()
+    set(TOOLCHAIN "loongarch64-linux-gnu")
+  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
   set(CMAKE_SYSTEM_PROCESSOR ppc64le)
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
@@ -81,7 +88,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
   else()
     set(TOOLCHAIN "riscv64-linux-gnu")
     if(TIZEN)
-      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
+      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu")
     endif()
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
@@ -98,7 +105,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
   elseif(LINUX)
     set(TOOLCHAIN "x86_64-linux-gnu")
     if(TIZEN)
-      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
+      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
     endif()
   elseif(FREEBSD)
     set(triple "x86_64-unknown-freebsd12")
@@ -115,10 +122,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
     set(TOOLCHAIN "i686-linux-gnu")
   endif()
   if(TIZEN)
-    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
+    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
   endif()
 else()
-  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
+  message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!")
 endif()
 
 if(DEFINED ENV{TOOLCHAIN})
@@ -127,32 +134,46 @@ endif()
 
 # Specify include paths
 if(TIZEN)
-  if(TARGET_ARCH_NAME STREQUAL "arm")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
-  endif()
-  if(TARGET_ARCH_NAME STREQUAL "armel")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
-  endif()
-  if(TARGET_ARCH_NAME STREQUAL "arm64")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
-  endif()
-  if(TARGET_ARCH_NAME STREQUAL "x86")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
-  endif()
-  if(TARGET_ARCH_NAME STREQUAL "x64")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
-  endif()
-  if(TARGET_ARCH_NAME STREQUAL "riscv64")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
+  function(find_toolchain_dir prefix)
+    # Dynamically find the version subdirectory
+    file(GLOB DIRECTORIES "${prefix}/*")
+    list(GET DIRECTORIES 0 FIRST_MATCH)
+    get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
+
+    set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
+  endfunction()
+
+  if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
+    find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+  else()
+    find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
   endif()
+
+  message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
+
+  include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
+  include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
 endif()
 
+function(locate_toolchain_exec exec var)
+    set(TOOLSET_PREFIX ${TOOLCHAIN}-)
+    string(TOUPPER ${exec} EXEC_UPPERCASE)
+    if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
+        set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
+        return()
+    endif()
+
+    find_program(EXEC_LOCATION_${exec}
+        NAMES
+        "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
+        "${TOOLSET_PREFIX}${exec}")
+
+    if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
+        message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
+    endif()
+    set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
+endfunction()
+
 if(ANDROID)
     if(TARGET_ARCH_NAME STREQUAL "arm")
         set(ANDROID_ABI armeabi-v7a)
@@ -183,66 +204,24 @@ elseif(FREEBSD)
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
 elseif(ILLUMOS)
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
+    set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
+    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
+    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
 
     include_directories(SYSTEM ${CROSS_ROOTFS}/include)
 
-    set(TOOLSET_PREFIX ${TOOLCHAIN}-)
-    function(locate_toolchain_exec exec var)
-        string(TOUPPER ${exec} EXEC_UPPERCASE)
-        if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
-            set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
-            return()
-        endif()
-
-        find_program(EXEC_LOCATION_${exec}
-            NAMES
-            "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
-            "${TOOLSET_PREFIX}${exec}")
-
-        if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
-            message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
-        endif()
-        set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
-    endfunction()
-
-    set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
-
     locate_toolchain_exec(gcc CMAKE_C_COMPILER)
     locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
-
-    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
-    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
 elseif(HAIKU)
     set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
     set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
-
-    set(TOOLSET_PREFIX ${TOOLCHAIN}-)
-    function(locate_toolchain_exec exec var)
-        string(TOUPPER ${exec} EXEC_UPPERCASE)
-        if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
-            set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
-            return()
-        endif()
-
-        find_program(EXEC_LOCATION_${exec}
-            NAMES
-            "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
-            "${TOOLSET_PREFIX}${exec}")
-
-        if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
-            message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
-        endif()
-        set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
-    endfunction()
-
     set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
+    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
+    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
 
     locate_toolchain_exec(gcc CMAKE_C_COMPILER)
     locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 
-    set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
-    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
-
     # let CMake set up the correct search paths
     include(Platform/Haiku)
 else()
@@ -272,21 +251,21 @@ endif()
 
 if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
   if(TIZEN)
-    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
   endif()
 elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
   if(TIZEN)
-    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
 
     add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
     add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
-    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
   add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -297,10 +276,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
   endif()
   add_toolchain_linker_flag(-m32)
   if(TIZEN)
-    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
-    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+    add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
   endif()
 elseif(ILLUMOS)
   add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
@@ -312,7 +291,7 @@ endif()
 
 # Specify compile options
 
-if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
+if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
   set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index 36dbd45e1ce8..e889f439b8dc 100755
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -68,7 +68,7 @@ function InstallDarcCli {
     fi
   fi
 
-  local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
+  local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
 
   echo "Installing Darc CLI version $darcVersion..."
   echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
diff --git a/eng/common/dotnet.cmd b/eng/common/dotnet.cmd
new file mode 100644
index 000000000000..527fa4bb38fb
--- /dev/null
+++ b/eng/common/dotnet.cmd
@@ -0,0 +1,7 @@
+@echo off
+
+:: This script is used to install the .NET SDK.
+:: It will also invoke the SDK with any provided arguments.
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*"
+exit /b %ErrorLevel%
diff --git a/eng/common/dotnet.ps1 b/eng/common/dotnet.ps1
new file mode 100644
index 000000000000..45e5676c9ebd
--- /dev/null
+++ b/eng/common/dotnet.ps1
@@ -0,0 +1,11 @@
+# This script is used to install the .NET SDK.
+# It will also invoke the SDK with any provided arguments.
+
+. $PSScriptRoot\tools.ps1
+$dotnetRoot = InitializeDotNetCli -install:$true
+
+# Invoke acquired SDK with args if they are provided
+if ($args.count -gt 0) {
+  $env:DOTNET_NOLOGO=1
+  & "$dotnetRoot\dotnet.exe" $args
+}
diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh
new file mode 100755
index 000000000000..2ef68235675f
--- /dev/null
+++ b/eng/common/dotnet.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# This script is used to install the .NET SDK.
+# It will also invoke the SDK with any provided arguments.
+
+source="${BASH_SOURCE[0]}"
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+source $scriptroot/tools.sh
+InitializeDotNetCli true # install
+
+# Invoke acquired SDK with args if they are provided
+if [[ $# > 0 ]]; then
+  __dotnetDir=${_InitializeDotNetCli}
+  dotnetPath=${__dotnetDir}/dotnet
+  ${dotnetPath} "$@"
+fi
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 524aaa57f2b7..fa1cdc2b3007 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object {
 
 $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
 
+$wxlFilesV3 = @()
+$wxlFilesV5 = @()
 $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
 if (-not $wxlFiles) {
     $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } #  pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
     if ($wxlEnFiles) {
-      $wxlFiles = @()
-      $wxlEnFiles | ForEach-Object {
-        $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
-        $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
-      }
+        $wxlFiles = @()
+        $wxlEnFiles | ForEach-Object {
+            $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
+            $content = Get-Content $_.FullName -Raw
+
+            # Split files on schema to select different parser settings in the generated project.
+            if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*")
+            {
+                $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru
+            }
+            elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*")
+            {
+                $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru
+            }
+        }
     }
 }
 
@@ -114,7 +126,32 @@ $locJson = @{
             CloneLanguageSet = "WiX_CloneLanguages"
             LssFiles = @( "wxl_loc.lss" )
             LocItems = @(
-                $wxlFiles | ForEach-Object {
+                $wxlFilesV3 | ForEach-Object {
+                    $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
+                    $continue = $true
+                    foreach ($exclusion in $exclusions.Exclusions) {
+                        if ($_.FullName.Contains($exclusion)) {
+                            $continue = $false
+                        }
+                    }
+                    $sourceFile = ($_.FullName | Resolve-Path -Relative)
+                    if ($continue)
+                    {
+                        return @{
+                            SourceFile = $sourceFile
+                            CopyOption = "LangIDOnPath"
+                            OutputPath = $outputPath
+                        }
+                    }
+                }
+            )
+        },
+        @{
+            LanguageSet = $LanguageSet
+            CloneLanguageSet = "WiX_CloneLanguages"
+            LssFiles = @( "P210WxlSchemaV4.lss" )
+            LocItems = @(
+                $wxlFilesV5 | ForEach-Object {
                     $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
                     $continue = $true
                     foreach ($exclusion in $exclusions.Exclusions) {
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index 3e5c1c74a1c5..a0c7d792a76f 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -4,18 +4,26 @@ Param(
 
 . $PSScriptRoot\pipeline-logging-functions.ps1
 
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
+$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
+$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
+
+Write-Host "Artifact name before : $ArtifactName"
+Write-Host "Artifact name after : $SafeArtifactName"
+
 Write-Host "Creating dir $ManifestDirPath"
+
 # create directory for sbom manifest to be placed
-if (!(Test-Path -path $ManifestDirPath))
+if (!(Test-Path -path $SbomGenerationDir))
 {
-  New-Item -ItemType Directory -path $ManifestDirPath
-  Write-Host "Successfully created directory $ManifestDirPath"
+  New-Item -ItemType Directory -path $SbomGenerationDir
+  Write-Host "Successfully created directory $SbomGenerationDir"
 }
 else{
   Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
 }
 
 Write-Host "Updating artifact name"
-$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
-Write-Host "Artifact name $artifact_name"
-Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
old mode 100644
new mode 100755
index d5c76dc827b4..b8ecca72bbf5
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -14,19 +14,24 @@ done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 . $scriptroot/pipeline-logging-functions.sh
 
+
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
 manifest_dir=$1
 
-if [ ! -d "$manifest_dir" ] ; then
-  mkdir -p "$manifest_dir"
-  echo "Sbom directory created." $manifest_dir
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+sbom_generation_dir="$manifest_dir/$safe_artifact_name"
+
+if [ ! -d "$sbom_generation_dir" ] ; then
+  mkdir -p "$sbom_generation_dir"
+  echo "Sbom directory created." $sbom_generation_dir
 else
   Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
 fi
 
-artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
 echo "Artifact name before : "$artifact_name
-# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
-safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
 echo "Artifact name after : "$safe_artifact_name
 export ARTIFACT_NAME=$safe_artifact_name
 echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config
index 19d3d311b166..f70261ed689b 100644
--- a/eng/common/internal/NuGet.config
+++ b/eng/common/internal/NuGet.config
@@ -4,4 +4,7 @@
     <clear />
     <add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <clear />
+  </packageSourceMapping>
 </configuration>
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index 32f79dfb3402..feaa6d20812d 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -15,16 +15,6 @@
     <PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
     <PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
   </ItemGroup>
-  <PropertyGroup>
-    <RestoreSources></RestoreSources>
-    <RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
-      https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
-      $(RestoreSources);
-      https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
 
   <!-- Repository extensibility point -->
   <Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
new file mode 100755
index 000000000000..477a44f335be
--- /dev/null
+++ b/eng/common/native/install-dependencies.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+# This is a simple script primarily used for CI to install necessary dependencies
+#
+# Usage:
+#
+# ./install-dependencies.sh <OS>
+
+os="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+
+if [ -z "$os" ]; then
+    . "$(dirname "$0")"/init-os-and-arch.sh
+fi
+
+case "$os" in
+    linux)
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+        fi
+
+        if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then
+            apt update
+
+            apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
+                libssl-dev libkrb5-dev pigz cpio
+
+            localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+        elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
+            pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
+            $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
+        elif [ "$ID" = "alpine" ]; then
+            apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
+        else
+            echo "Unsupported distro. distro: $ID"
+            exit 1
+        fi
+        ;;
+
+    osx|maccatalyst|ios|iossimulator|tvos|tvossimulator)
+        echo "Installed xcode version: $(xcode-select -p)"
+
+        export HOMEBREW_NO_INSTALL_CLEANUP=1
+        export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+        # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
+        # brew update --preinstall
+        brew bundle --no-upgrade --file=- <<EOF
+brew "cmake"
+brew "icu4c"
+brew "openssl@3"
+brew "pkgconf"
+brew "python3"
+brew "pigz"
+EOF
+        ;;
+
+    *)
+        echo "Unsupported platform. OS: $os"
+        exit 1
+        ;;
+esac
diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1
index a365194a9389..ac5c69ffcac5 100644
--- a/eng/common/post-build/nuget-verification.ps1
+++ b/eng/common/post-build/nuget-verification.ps1
@@ -30,7 +30,7 @@
 [CmdletBinding(PositionalBinding = $false)]
 param(
    [string]$NuGetExePath,
-   [string]$PackageSource = "https://api.nuget.org/v3/index.json",
+   [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
    [string]$DownloadPath,
    [Parameter(ValueFromRemainingArguments = $true)]
    [string[]]$args
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 90b58e32a87b..1eda208a3bbf 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -5,7 +5,9 @@ param(
   [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
+  [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
+  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
+  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
 )
 
 try {
@@ -33,6 +35,14 @@ try {
   if ("false" -eq $WaitPublishingFinish) {
     $optionalParams.Add("--no-wait") | Out-Null
   }
+  
+  if ("true" -eq $RequireDefaultChannels) {
+    $optionalParams.Add("--default-channels-required") | Out-Null
+  }
+
+  if ("true" -eq $SkipAssetsPublishing) {
+    $optionalParams.Add("--skip-assets-publishing") | Out-Null
+  }
 
   & $darc add-build-to-channel `
     --id $buildId `
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index aab40de3fd9a..b62e132d32a4 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -6,13 +6,15 @@ Param(
   [string] $msbuildEngine = $null,
   [switch] $restore,
   [switch] $prepareMachine,
+  [switch][Alias('nobl')]$excludeCIBinaryLog,
+  [switch]$noWarnAsError,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
 $ci = $true
-$binaryLog = $true
-$warnAsError = $true
+$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
+$warnAsError = if ($noWarnAsError) { $false } else { $true }
 
 . $PSScriptRoot\tools.ps1
 
@@ -27,6 +29,7 @@ function Print-Usage() {
   Write-Host "Advanced settings:"
   Write-Host "  -prepareMachine         Prepare machine for CI run"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+  Write-Host "  -excludeCIBinaryLog     When running on CI, allow no binary log (short: -nobl)"
   Write-Host ""
   Write-Host "Command line arguments not listed above are passed thru to msbuild."
 }
@@ -34,10 +37,11 @@ function Print-Usage() {
 function Build([string]$target) {
   $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
   $log = Join-Path $LogDir "$task$logSuffix.binlog"
+  $binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
   $outputPath = Join-Path $ToolsetDir "$task\"
 
   MSBuild $taskProject `
-    /bl:$log `
+    $binaryLogArg `
     /t:$target `
     /p:Configuration=$configuration `
     /p:RepoRoot=$RepoRoot `
@@ -64,7 +68,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh
new file mode 100755
index 000000000000..3270f83fa9a7
--- /dev/null
+++ b/eng/common/sdk-task.sh
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+
+show_usage() {
+    echo "Common settings:"
+    echo "  --task <value>           Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
+    echo "  --restore                Restore dependencies"
+    echo "  --verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
+    echo "  --help                   Print help and exit"
+    echo ""
+
+    echo "Advanced settings:"
+    echo "  --excludeCIBinarylog     Don't output binary log (short: -nobl)"
+    echo "  --noWarnAsError          Do not warn as error"
+    echo ""
+    echo "Command line arguments not listed above are passed thru to msbuild."
+}
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $source until the file is no longer a symlink
+while [[ -h "$source" ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+Build() {
+    local target=$1
+    local log_suffix=""
+    [[ "$target" != "Execute" ]] && log_suffix=".$target"
+    local log="$log_dir/$task$log_suffix.binlog"
+    local binaryLogArg=""
+    [[ $binary_log == true ]] && binaryLogArg="/bl:$log"
+    local output_path="$toolset_dir/$task/"
+
+    MSBuild "$taskProject" \
+        $binaryLogArg \
+        /t:"$target" \
+        /p:Configuration="$configuration" \
+        /p:RepoRoot="$repo_root" \
+        /p:BaseIntermediateOutputPath="$output_path" \
+        /v:"$verbosity" \
+        $properties
+}
+
+binary_log=true
+configuration="Debug"
+verbosity="minimal"
+exclude_ci_binary_log=false
+restore=false
+help=false
+properties=''
+warnAsError=true
+
+while (($# > 0)); do
+  lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
+  case $lowerI in
+    --task)
+      task=$2
+      shift 2
+      ;;
+    --restore)
+      restore=true
+      shift 1
+      ;;
+    --verbosity)
+      verbosity=$2
+      shift 2
+      ;;
+    --excludecibinarylog|--nobl)
+      binary_log=false
+      exclude_ci_binary_log=true
+      shift 1
+      ;;
+    --noWarnAsError)
+      warnAsError=false
+      shift 1
+      ;;
+    --help)
+      help=true
+      shift 1
+      ;;
+    *)
+      properties="$properties $1"
+      shift 1
+      ;;
+  esac
+done
+
+ci=true
+
+if $help; then
+  show_usage
+  exit 0
+fi
+
+. "$scriptroot/tools.sh"
+InitializeToolset
+
+if [[ -z "$task" ]]; then
+    Write-PipelineTelemetryError -Category 'Task' -Name 'MissingTask' -Message "Missing required parameter '-task <value>'"
+    ExitWithExitCode 1
+fi
+
+taskProject=$(GetSdkTaskProject "$task")
+if [[ ! -e "$taskProject" ]]; then
+    Write-PipelineTelemetryError -Category 'Task' -Name 'UnknownTask' -Message "Unknown task: $task"
+    ExitWithExitCode 1
+fi
+
+if $restore; then
+    Build "Restore"
+fi
+
+Build "Execute"
+
+
+ExitWithExitCode 0
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 4585cfd6bba1..e5f543ea68c2 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
+  <package id="Microsoft.Guardian.Cli" version="0.199.0"/>
 </packages>
diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md
index 5ef6c30ba924..4bf4cf41bd7c 100644
--- a/eng/common/template-guidance.md
+++ b/eng/common/template-guidance.md
@@ -50,14 +50,14 @@ extends:
           - task: CopyFiles@2
               displayName: Gather build output
               inputs:
-                SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel'
+                SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel'
                 Contents: '**'
                 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel'
 ```
 
 Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
 
-# Development notes
+## Development notes
 
 **Folder / file structure**
 
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 3d16b41c78c1..92a0664f5647 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -1,8 +1,9 @@
 parameters:
 # Sbom related params
   enableSbom: true
+  runAsPublic: false
   PackageVersion: 9.0.0
-  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
 
 jobs:
 - template: /eng/common/core-templates/job/job.yml
@@ -15,6 +16,7 @@ jobs:
         parameters:
           PackageVersion: ${{ parameters.packageVersion }}
           BuildDropPath: ${{ parameters.buildDropPath }}
+          ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
           publishArtifacts: false
 
     # publish artifacts
@@ -29,6 +31,7 @@ jobs:
             PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
             ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
             condition: always()
+            retryCountOnTaskFailure: 10 # for any logs being locked
             continueOnError: true
         - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
           - output: pipelineArtifact
@@ -37,6 +40,7 @@ jobs:
             displayName: 'Publish logs'
             continueOnError: true
             condition: always()
+            retryCountOnTaskFailure: 10 # for any logs being locked
             sbomEnabled: false  # we don't need SBOM for logs
 
       - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
@@ -44,7 +48,7 @@ jobs:
           displayName: Publish Logs
           PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
           publishLocation: Container
-          ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
+          ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
           continueOnError: true
           condition: always()
           sbomEnabled: false  # we don't need SBOM for logs
diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml
index 100a3fc98493..fcf6637b2ebc 100644
--- a/eng/common/templates-official/steps/publish-build-artifacts.yml
+++ b/eng/common/templates-official/steps/publish-build-artifacts.yml
@@ -24,6 +24,10 @@ parameters:
 - name: is1ESPipeline
   type: boolean
   default: true
+
+- name: retryCountOnTaskFailure
+  type: string
+  default: 10
   
 steps:
 - ${{ if ne(parameters.is1ESPipeline, true) }}:
@@ -38,4 +42,5 @@ steps:
     PathtoPublish: ${{ parameters.pathToPublish }}
     ${{ if parameters.artifactName }}:
       ArtifactName: ${{ parameters.artifactName }}
-      
+    ${{ if parameters.retryCountOnTaskFailure }}:
+      retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
diff --git a/eng/common/templates-official/steps/source-index-stage1-publish.yml b/eng/common/templates-official/steps/source-index-stage1-publish.yml
new file mode 100644
index 000000000000..9b8b80942b5c
--- /dev/null
+++ b/eng/common/templates-official/steps/source-index-stage1-publish.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
+  parameters:
+    is1ESPipeline: true
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml
index dbdd66d4a4b3..f1311bbb1b33 100644
--- a/eng/common/templates-official/variables/sdl-variables.yml
+++ b/eng/common/templates-official/variables/sdl-variables.yml
@@ -4,4 +4,4 @@ variables:
 - name: DefaultGuardianVersion
   value: 0.109.0
 - name: GuardianPackagesConfigFile
-  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
+  value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
\ No newline at end of file
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 07d317bf8f9a..238fa0818f7b 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -4,8 +4,9 @@ parameters:
   componentGovernanceIgnoreDirectories: ''
 # Sbom related params
   enableSbom: true
+  runAsPublic: false
   PackageVersion: 9.0.0
-  BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
 
 jobs:
 - template: /eng/common/core-templates/job/job.yml
@@ -45,6 +46,7 @@ jobs:
               artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
               continueOnError: true
               condition: always()
+              retryCountOnTaskFailure: 10 # for any logs being locked
       - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
         - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
           parameters:
@@ -55,6 +57,7 @@ jobs:
               displayName: 'Publish logs'
               continueOnError: true
               condition: always()
+              retryCountOnTaskFailure: 10 # for any logs being locked
               sbomEnabled: false  # we don't need SBOM for logs
 
     - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
@@ -65,7 +68,7 @@ jobs:
             displayName: Publish Logs
             pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
             publishLocation: Container
-            artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
+            artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
             continueOnError: true
             condition: always()
 
@@ -74,7 +77,7 @@ jobs:
         parameters:
           is1ESPipeline: false
           args:
-            targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
+            targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration'
             artifactName: 'BuildConfiguration'
             displayName: 'Publish build retry configuration'
             continueOnError: true
diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml
index 6428a98dfef6..605e602e94d1 100644
--- a/eng/common/templates/steps/publish-build-artifacts.yml
+++ b/eng/common/templates/steps/publish-build-artifacts.yml
@@ -25,6 +25,10 @@ parameters:
   type: string
   default: 'Container'
 
+- name: retryCountOnTaskFailure
+  type: string
+  default: 10
+
 steps:
 - ${{ if eq(parameters.is1ESPipeline, true) }}:
   - 'eng/common/templates cannot be referenced from a 1ES managed template': error
@@ -37,4 +41,6 @@ steps:
     PublishLocation: ${{ parameters.publishLocation }}  
     PathtoPublish: ${{ parameters.pathToPublish }}
     ${{ if parameters.artifactName }}:
-      ArtifactName: ${{ parameters.artifactName }}
\ No newline at end of file
+      ArtifactName: ${{ parameters.artifactName }}
+    ${{ if parameters.retryCountOnTaskFailure }}:
+      retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
diff --git a/eng/common/templates/steps/source-index-stage1-publish.yml b/eng/common/templates/steps/source-index-stage1-publish.yml
new file mode 100644
index 000000000000..182cec33a7bb
--- /dev/null
+++ b/eng/common/templates/steps/source-index-stage1-publish.yml
@@ -0,0 +1,7 @@
+steps:
+- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
+  parameters:
+    is1ESPipeline: false
+
+    ${{ each parameter in parameters }}:
+      ${{ parameter.key }}: ${{ parameter.value }}
diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml
new file mode 100644
index 000000000000..599afb6186b8
--- /dev/null
+++ b/eng/common/templates/steps/vmr-sync.yml
@@ -0,0 +1,207 @@
+### These steps synchronize new code from product repositories into the VMR (https://github.com/dotnet/dotnet).
+### They initialize the darc CLI and pull the new updates.
+### Changes are applied locally onto the already cloned VMR (located in $vmrPath).
+
+parameters:
+- name: targetRef
+  displayName: Target revision in dotnet/<repo> to synchronize
+  type: string
+  default: $(Build.SourceVersion)
+
+- name: vmrPath
+  displayName: Path where the dotnet/dotnet is checked out to
+  type: string
+  default: $(Agent.BuildDirectory)/vmr
+
+- name: additionalSyncs
+  displayName: Optional list of package names whose repo's source will also be synchronized in the local VMR, e.g. NuGet.Protocol
+  type: object
+  default: []
+
+steps:
+- checkout: vmr
+  displayName: Clone dotnet/dotnet
+  path: vmr
+  clean: true
+
+- checkout: self
+  displayName: Clone $(Build.Repository.Name)
+  path: repo
+  fetchDepth: 0
+
+# This step is needed so that when we get a detached HEAD / shallow clone,
+# we still pull the commit into the temporary repo clone to use it during the sync.
+# Also unshallow the clone so that forwardflow command would work.
+- script: |
+    git branch repo-head
+    git rev-parse HEAD
+  displayName: Label PR commit
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- script: |
+    vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml)
+    echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
+  displayName: Obtain the vmr sha from Version.Details.xml (Unix)
+  condition: ne(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- powershell: |
+    [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml
+    $vmr_sha = $xml.SelectSingleNode("//Source").Sha
+    Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha"
+  displayName: Obtain the vmr sha from Version.Details.xml (Windows)
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- script: |
+    git fetch --all
+    git checkout $(vmr_sha)
+  displayName: Checkout VMR at correct sha for repo flow
+  workingDirectory: ${{ parameters.vmrPath }}
+
+- script: |
+    git config --global user.name "dotnet-maestro[bot]"
+    git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com"
+  displayName: Set git author to dotnet-maestro[bot]
+  workingDirectory: ${{ parameters.vmrPath }}
+
+- script: |
+    ./eng/common/vmr-sync.sh                         \
+      --vmr ${{ parameters.vmrPath }}         \
+      --tmp $(Agent.TempDirectory)            \
+      --azdev-pat '$(dn-bot-all-orgs-code-r)' \
+      --ci                                    \
+      --debug
+
+    if [ "$?" -ne 0 ]; then
+      echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+      exit 1
+    fi
+  displayName: Sync repo into VMR (Unix)
+  condition: ne(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- script: |
+    git config --global diff.astextplain.textconv echo
+    git config --system core.longpaths true
+  displayName: Configure Windows git (longpaths, astextplain)
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+
+- powershell: |
+    ./eng/common/vmr-sync.ps1                      `
+      -vmr ${{ parameters.vmrPath }}        `
+      -tmp $(Agent.TempDirectory)           `
+      -azdevPat '$(dn-bot-all-orgs-code-r)' `
+      -ci                                   `
+      -debugOutput
+
+    if ($LASTEXITCODE -ne 0) {
+      echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+      exit 1
+    }
+  displayName: Sync repo into VMR (Windows)
+  condition: eq(variables['Agent.OS'], 'Windows_NT')
+  workingDirectory: $(Agent.BuildDirectory)/repo
+
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  - task: CopyFiles@2
+    displayName: Collect failed patches
+    condition: failed()
+    inputs:
+      SourceFolder: '$(Agent.TempDirectory)'
+      Contents: '*.patch'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)/FailedPatches'
+
+  - publish: '$(Build.ArtifactStagingDirectory)/FailedPatches'
+    artifact: $(System.JobDisplayName)_FailedPatches
+    displayName: Upload failed patches
+    condition: failed()
+
+- ${{ each assetName in parameters.additionalSyncs }}:
+  # The vmr-sync script ends up staging files in the local VMR so we have to commit those
+  - script:
+      git commit --allow-empty -am "Forward-flow $(Build.Repository.Name)"
+    displayName: Commit local VMR changes
+    workingDirectory: ${{ parameters.vmrPath }}
+
+  - script: |
+      set -ex
+
+      echo "Searching for details of asset ${{ assetName }}..."
+
+      # Use darc to get dependencies information
+      dependencies=$(./.dotnet/dotnet darc get-dependencies --name '${{ assetName }}' --ci)
+
+      # Extract repository URL and commit hash
+      repository=$(echo "$dependencies" | grep 'Repo:' | sed 's/Repo:[[:space:]]*//' | head -1)
+
+      if [ -z "$repository" ]; then
+        echo "##vso[task.logissue type=error]Asset ${{ assetName }} not found in the dependency list"
+        exit 1
+      fi
+
+      commit=$(echo "$dependencies" | grep 'Commit:' | sed 's/Commit:[[:space:]]*//' | head -1)
+
+      echo "Updating the VMR from $repository / $commit..."
+      cd ..
+      git clone $repository ${{ assetName }}
+      cd ${{ assetName }}
+      git checkout $commit
+      git branch "sync/$commit"
+
+      ./eng/common/vmr-sync.sh                         \
+        --vmr ${{ parameters.vmrPath }}         \
+        --tmp $(Agent.TempDirectory)            \
+        --azdev-pat '$(dn-bot-all-orgs-code-r)' \
+        --ci                                    \
+        --debug
+
+      if [ "$?" -ne 0 ]; then
+        echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+        exit 1
+      fi
+    displayName: Sync ${{ assetName }} into (Unix)
+    condition: ne(variables['Agent.OS'], 'Windows_NT')
+    workingDirectory: $(Agent.BuildDirectory)/repo
+
+  - powershell: |
+      $ErrorActionPreference = 'Stop'
+
+      Write-Host "Searching for details of asset ${{ assetName }}..."
+
+      $dependencies = .\.dotnet\dotnet darc get-dependencies --name '${{ assetName }}' --ci
+
+      $repository = $dependencies | Select-String -Pattern 'Repo:\s+([^\s]+)' | Select-Object -First 1
+      $repository -match 'Repo:\s+([^\s]+)' | Out-Null
+      $repository = $matches[1]
+
+      if ($repository -eq $null) {
+          Write-Error "Asset ${{ assetName }} not found in the dependency list"
+          exit 1
+      }
+
+      $commit = $dependencies | Select-String -Pattern 'Commit:\s+([^\s]+)' | Select-Object -First 1
+      $commit -match 'Commit:\s+([^\s]+)' | Out-Null
+      $commit = $matches[1]
+
+      Write-Host "Updating the VMR from $repository / $commit..."
+      cd ..
+      git clone $repository ${{ assetName }}
+      cd ${{ assetName }}
+      git checkout $commit
+      git branch "sync/$commit"
+
+      .\eng\common\vmr-sync.ps1 `
+        -vmr ${{ parameters.vmrPath }}             `
+        -tmp $(Agent.TempDirectory)                `
+        -azdevPat '$(dn-bot-all-orgs-code-r)'      `
+        -ci                                        `
+        -debugOutput
+
+      if ($LASTEXITCODE -ne 0) {
+        echo "##vso[task.logissue type=error]Failed to synchronize the VMR"
+        exit 1
+      }
+    displayName: Sync ${{ assetName }} into (Windows)
+    condition: ne(variables['Agent.OS'], 'Windows_NT')
+    workingDirectory: $(Agent.BuildDirectory)/repo
diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml
new file mode 100644
index 000000000000..ce3c29a62faf
--- /dev/null
+++ b/eng/common/templates/vmr-build-pr.yml
@@ -0,0 +1,42 @@
+# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
+#
+# It will run a full set of verification jobs defined in:
+# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
+#
+# For repos that do not need to run the full set, you would do the following:
+#
+# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
+#
+# 2. Add `verifications` parameter to VMR template reference
+#
+#    Examples:
+#    - For source-build stage 1 verification, add the following:
+#        verifications: [ "source-build-stage1" ]
+#
+#    - For Windows only verifications, add the following:
+#        verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
+
+trigger: none
+pr: none
+
+variables:
+- template: /eng/common/templates/variables/pool-providers.yml@self
+
+- name: skipComponentGovernanceDetection  # we run CG on internal builds only
+  value: true
+
+- name: Codeql.Enabled  # we run CodeQL on internal builds only
+  value: false
+
+resources:
+  repositories:
+  - repository: vmr
+    type: github
+    name: dotnet/dotnet
+    endpoint: dotnet
+
+stages:
+- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr
+  parameters:
+    isBuiltFromVmr: false
+    scope: lite
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 9574f4eb9df0..06b44de78709 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,7 +42,7 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -65,10 +65,8 @@ $ErrorActionPreference = 'Stop'
 # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed
 [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null }
 
-# True if the build is a product build
-[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
-
-[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
+# True when the build is running within the VMR.
+[bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false }
 
 function Create-Directory ([string[]] $path) {
     New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
@@ -259,10 +257,23 @@ function Retry($downloadBlock, $maxRetries = 5) {
 
 function GetDotNetInstallScript([string] $dotnetRoot) {
   $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
+  $shouldDownload = $false
+  
   if (!(Test-Path $installScript)) {
+    $shouldDownload = $true
+  } else {
+    # Check if the script is older than 30 days
+    $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime
+    if ($fileAge.Days -gt 30) {
+      Write-Host "Existing install script is too old, re-downloading..."
+      $shouldDownload = $true
+    }
+  }
+  
+  if ($shouldDownload) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
+    $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
     Retry({
       Write-Host "GET $uri"
@@ -320,7 +331,7 @@ function InstallDotNet([string] $dotnetRoot,
   $variations += @($installParameters)
 
   $dotnetBuilds = $installParameters.Clone()
-  $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
+  $dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
   $variations += @($dotnetBuilds)
 
   if ($runtimeSourceFeed) {
@@ -383,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
-  $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
+  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
+  $defaultXCopyMSBuildVersion = '17.13.0'
 
   if (!$vsRequirements) {
     if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
@@ -416,7 +427,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # Locate Visual Studio installation or download x-copy msbuild.
   $vsInfo = LocateVisualStudio $vsRequirements
-  if ($vsInfo -ne $null) {
+  if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
     # Ensure vsInstallDir has a trailing slash
     $vsInstallDir = Join-Path $vsInfo.installationPath "\"
     $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
@@ -533,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') {
     $vswhereVersion = $GlobalJson.tools.vswhere
   } else {
-    $vswhereVersion = '2.5.2'
+    # keep this in sync with the VSWhereVersion in DefaultVersions.props
+    $vswhereVersion = '3.1.7'
   }
 
   $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion"
@@ -541,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){
 
   if (!(Test-Path $vsWhereExe)) {
     Create-Directory $vsWhereDir
-    Write-Host 'Downloading vswhere'
+    Write-Host "Downloading vswhere $vswhereVersion"
+    $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     Retry({
       Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
     })
@@ -604,14 +617,7 @@ function InitializeBuildTool() {
     }
     $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
 
-    # Use override if it exists - commonly set by source-build
-    if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
-      $initializeBuildToolFramework="net9.0"
-    } else {
-      $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
-    }
-    
-    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
+    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' }
   } elseif ($msbuildEngine -eq "vs") {
     try {
       $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -620,7 +626,7 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
 
-    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS }
+    $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS }
   } else {
     Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'."
     ExitWithExitCode 1
@@ -653,7 +659,6 @@ function GetNuGetPackageCachePath() {
       $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
     } else {
       $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
-      $env:RESTORENOHTTPCACHE = $true
     }
   }
 
@@ -775,26 +780,13 @@ function MSBuild() {
 
     $toolsetBuildProject = InitializeToolset
     $basePath = Split-Path -parent $toolsetBuildProject
-    $possiblePaths = @(
-      # new scripts need to work with old packages, so we need to look for the old names/versions
-      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path $buildTool.Framework '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')),
-      (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
-    )
-    $selectedPath = $null
-    foreach ($path in $possiblePaths) {
-      if (Test-Path $path -PathType Leaf) {
-        $selectedPath = $path
-        break
-      }
-    }
+    $selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
+
     if (-not $selectedPath) {
-      Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
+      Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath"
       ExitWithExitCode 1
     }
+
     $args += "/logger:$selectedPath"
   }
 
@@ -857,8 +849,8 @@ function MSBuild-Core() {
     }
 
     # When running on Azure Pipelines, override the returned exit code to avoid double logging.
-    # Skip this when the build is a child of the VMR orchestrator build.
-    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
+    # Skip this when the build is a child of the VMR build.
+    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) {
       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
@@ -900,7 +892,7 @@ function IsWindowsPlatform() {
 }
 
 function Get-Darc($version) {
-  $darcPath  = "$TempDir\darc\$(New-Guid)"
+  $darcPath  = "$TempDir\darc\$([guid]::NewGuid())"
   if ($version -ne $null) {
     & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
   } else {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 00473c9f918d..c1841c9dfd0f 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -5,6 +5,9 @@
 # CI mode - set to true on CI server for PR validation build or official build.
 ci=${ci:-false}
 
+# Build mode
+source_build=${source_build:-false}
+
 # Set to true to use the pipelines logger which will enable Azure logging output.
 # https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
 # This flag is meant as a temporary opt-opt for the feature while validate it across
@@ -54,11 +57,12 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
-if [[ "$ci" == true ]]; then
+# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props.
+if [[ "$ci" == true || "$source_build" == true ]]; then
   use_global_nuget_cache=${use_global_nuget_cache:-false}
 else
   use_global_nuget_cache=${use_global_nuget_cache:-true}
@@ -68,8 +72,8 @@ fi
 runtime_source_feed=${runtime_source_feed:-''}
 runtime_source_feed_key=${runtime_source_feed_key:-''}
 
-# True if the build is a product build
-product_build=${product_build:-false}
+# True when the build is running within the VMR.
+from_vmr=${from_vmr:-false}
 
 # Resolve any symlinks in the given path.
 function ResolvePath {
@@ -232,7 +236,7 @@ function InstallDotNet {
   local public_location=("${installParameters[@]}")
   variations+=(public_location)
 
-  local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
+  local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
   variations+=(dotnetbuilds)
 
   if [[ -n "${6:-}" ]]; then
@@ -295,9 +299,30 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local timestamp_file="$root/.dotnet-install.timestamp"
+  local should_download=false
 
   if [[ ! -a "$install_script" ]]; then
+    should_download=true
+  elif [[ -f "$timestamp_file" ]]; then
+    # Check if the script is older than 30 days using timestamp file
+    local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0")
+    local current_time=$(date +%s)
+    local age_seconds=$((current_time - download_time))
+    
+    # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds
+    if [[ $age_seconds -gt 2592000 ]]; then
+      echo "Existing install script is too old, re-downloading..."
+      should_download=true
+    fi
+  else
+    # No timestamp file exists, assume script is old and re-download
+    echo "No timestamp found for existing install script, re-downloading..."
+    should_download=true
+  fi
+
+  if [[ "$should_download" == true ]]; then
     mkdir -p "$root"
 
     echo "Downloading '$install_script_url'"
@@ -324,6 +349,9 @@ function GetDotNetInstallScript {
         ExitWithExitCode $exit_code
       }
     fi
+    
+    # Create timestamp file to track download time in seconds from epoch
+    date +%s > "$timestamp_file"
   fi
   # return value
   _GetDotNetInstallScript="$install_script"
@@ -339,22 +367,14 @@ function InitializeBuildTool {
   # return values
   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
   _InitializeBuildToolCommand="msbuild"
-  # use override if it exists - commonly set by source-build
-  if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
-    _InitializeBuildToolFramework="net9.0"
-  else
-    _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
-  fi
 }
 
-# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
 function GetNuGetPackageCachePath {
   if [[ -z ${NUGET_PACKAGES:-} ]]; then
     if [[ "$use_global_nuget_cache" == true ]]; then
       export NUGET_PACKAGES="$HOME/.nuget/packages/"
     else
       export NUGET_PACKAGES="$repo_root/.packages/"
-      export RESTORENOHTTPCACHE=true
     fi
   fi
 
@@ -451,25 +471,13 @@ function MSBuild {
     fi
 
     local toolset_dir="${_InitializeToolset%/*}"
-    # new scripts need to work with old packages, so we need to look for the old names/versions
-    local selectedPath=
-    local possiblePaths=()
-    possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
-    for path in "${possiblePaths[@]}"; do
-      if [[ -f $path ]]; then
-        selectedPath=$path
-        break
-      fi
-    done
+    local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll"
+
     if [[ -z "$selectedPath" ]]; then
-      Write-PipelineTelemetryError -category 'Build'  "Unable to find arcade sdk logger assembly."
+      Write-PipelineTelemetryError -category 'Build'  "Unable to find arcade sdk logger assembly: $selectedPath"
       ExitWithExitCode 1
     fi
+
     args+=( "-logger:$selectedPath" )
   fi
 
@@ -506,8 +514,8 @@ function MSBuild-Core {
       echo "Build failed with exit code $exit_code. Check errors above."
 
       # When running on Azure Pipelines, override the returned exit code to avoid double logging.
-      # Skip this when the build is a child of the VMR orchestrator build.
-      if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
+      # Skip this when the build is a child of the VMR build.
+      if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; 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
@@ -530,6 +538,13 @@ function GetDarc {
     fi
 
     "$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version
+    darc_tool="$darc_path/darc"
+}
+
+# Returns a full path to an Arcade SDK task project file.
+function GetSdkTaskProject {
+  taskName=$1
+  echo "$(dirname $_InitializeToolset)/SdkTasks/$taskName.proj"
 }
 
 ResolvePath "${BASH_SOURCE[0]}"
diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1
new file mode 100755
index 000000000000..97302f3205be
--- /dev/null
+++ b/eng/common/vmr-sync.ps1
@@ -0,0 +1,138 @@
+<#
+.SYNOPSIS
+
+This script is used for synchronizing the current repository into a local VMR.
+It pulls the current repository's code into the specified VMR directory for local testing or
+Source-Build validation.
+
+.DESCRIPTION
+
+The tooling used for synchronization will clone the VMR repository into a temporary folder if
+it does not already exist. These clones can be reused in future synchronizations, so it is
+recommended to dedicate a folder for this to speed up re-runs.
+
+.EXAMPLE
+  Synchronize current repository into a local VMR:
+    ./vmr-sync.ps1 -vmrDir "$HOME/repos/dotnet" -tmpDir "$HOME/repos/tmp"
+
+.PARAMETER tmpDir
+Required. Path to the temporary folder where repositories will be cloned
+
+.PARAMETER vmrBranch
+Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch
+
+.PARAMETER azdevPat
+Optional. Azure DevOps PAT to use for cloning private repositories.
+
+.PARAMETER vmrDir
+Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder
+
+.PARAMETER debugOutput
+Optional. Enables debug logging in the darc vmr command.
+
+.PARAMETER ci
+Optional. Denotes that the script is running in a CI environment.
+#>
+param (
+  [Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")]
+  [string][Alias('t', 'tmp')]$tmpDir,
+  [string][Alias('b', 'branch')]$vmrBranch,
+  [string]$remote,
+  [string]$azdevPat,
+  [string][Alias('v', 'vmr')]$vmrDir,
+  [switch]$ci,
+  [switch]$debugOutput
+)
+
+function Fail {
+  Write-Host "> $($args[0])" -ForegroundColor 'Red'
+}
+
+function Highlight {
+  Write-Host "> $($args[0])" -ForegroundColor 'Cyan'
+}
+
+$verbosity = 'verbose'
+if ($debugOutput) {
+  $verbosity = 'debug'
+}
+# Validation
+
+if (-not $tmpDir) {
+  Fail "Missing -tmpDir argument. Please specify the path to the temporary folder where the repositories will be cloned"
+  exit 1
+}
+
+# Sanitize the input
+
+if (-not $vmrDir) {
+  $vmrDir = Join-Path $tmpDir 'dotnet'
+}
+
+if (-not (Test-Path -Path $tmpDir -PathType Container)) {
+  New-Item -ItemType Directory -Path $tmpDir | Out-Null
+}
+
+# Prepare the VMR
+
+if (-not (Test-Path -Path $vmrDir -PathType Container)) {
+  Highlight "Cloning 'dotnet/dotnet' into $vmrDir.."
+  git clone https://github.com/dotnet/dotnet $vmrDir
+
+  if ($vmrBranch) {
+    git -C $vmrDir switch -c $vmrBranch
+  }
+}
+else {
+  if ((git -C $vmrDir diff --quiet) -eq $false) {
+    Fail "There are changes in the working tree of $vmrDir. Please commit or stash your changes"
+    exit 1
+  }
+
+  if ($vmrBranch) {
+    Highlight "Preparing $vmrDir"
+    git -C $vmrDir checkout $vmrBranch
+    git -C $vmrDir pull
+  }
+}
+
+Set-StrictMode -Version Latest
+
+# Prepare darc
+
+Highlight 'Installing .NET, preparing the tooling..'
+. .\eng\common\tools.ps1
+$dotnetRoot = InitializeDotNetCli -install:$true
+$darc = Get-Darc
+$dotnet = "$dotnetRoot\dotnet.exe"
+
+Highlight "Starting the synchronization of VMR.."
+
+# Synchronize the VMR
+$darcArgs = (
+  "vmr", "forwardflow",
+  "--tmp", $tmpDir,
+  "--$verbosity",
+  $vmrDir
+)
+
+if ($ci) {
+  $darcArgs += ("--ci")
+}
+
+if ($azdevPat) {
+  $darcArgs += ("--azdev-pat", $azdevPat)
+}
+
+& "$darc" $darcArgs
+
+if ($LASTEXITCODE -eq 0) {
+  Highlight "Synchronization succeeded"
+}
+else {
+  Fail "Synchronization of repo to VMR failed!"
+  Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)."
+  Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)."
+  Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
+  exit 1
+}
diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh
new file mode 100755
index 000000000000..44239e331c0c
--- /dev/null
+++ b/eng/common/vmr-sync.sh
@@ -0,0 +1,207 @@
+#!/bin/bash
+
+### This script is used for synchronizing the current repository into a local VMR.
+### It pulls the current repository's code into the specified VMR directory for local testing or
+### Source-Build validation.
+###
+### The tooling used for synchronization will clone the VMR repository into a temporary folder if
+### it does not already exist. These clones can be reused in future synchronizations, so it is
+### recommended to dedicate a folder for this to speed up re-runs.
+###
+### USAGE:
+###   Synchronize current repository into a local VMR:
+###     ./vmr-sync.sh --tmp "$HOME/repos/tmp" "$HOME/repos/dotnet"
+###
+### Options:
+###   -t, --tmp, --tmp-dir PATH
+###       Required. Path to the temporary folder where repositories will be cloned
+###
+###   -b, --branch, --vmr-branch BRANCH_NAME
+###       Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch
+###
+###   --debug
+###       Optional. Turns on the most verbose logging for the VMR tooling
+###
+###   --remote name:URI
+###       Optional. Additional remote to use during the synchronization
+###       This can be used to synchronize to a commit from a fork of the repository
+###       Example: 'runtime:https://github.com/yourfork/runtime'
+###
+###   --azdev-pat
+###       Optional. Azure DevOps PAT to use for cloning private repositories.
+###
+###   -v, --vmr, --vmr-dir PATH
+###       Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $source until the file is no longer a symlink
+while [[ -h "$source" ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+function print_help () {
+    sed -n '/^### /,/^$/p' "$source" | cut -b 5-
+}
+
+COLOR_RED=$(tput setaf 1 2>/dev/null || true)
+COLOR_CYAN=$(tput setaf 6 2>/dev/null || true)
+COLOR_CLEAR=$(tput sgr0 2>/dev/null || true)
+COLOR_RESET=uniquesearchablestring
+FAILURE_PREFIX='> '
+
+function fail () {
+  echo "${COLOR_RED}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_RED}}${COLOR_CLEAR}" >&2
+}
+
+function highlight () {
+  echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}"
+}
+
+tmp_dir=''
+vmr_dir=''
+vmr_branch=''
+additional_remotes=''
+verbosity=verbose
+azdev_pat=''
+ci=false
+
+while [[ $# -gt 0 ]]; do
+  opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+  case "$opt" in
+    -t|--tmp|--tmp-dir)
+      tmp_dir=$2
+      shift
+      ;;
+    -v|--vmr|--vmr-dir)
+      vmr_dir=$2
+      shift
+      ;;
+    -b|--branch|--vmr-branch)
+      vmr_branch=$2
+      shift
+      ;;
+    --remote)
+      additional_remotes="$additional_remotes $2"
+      shift
+      ;;
+    --azdev-pat)
+      azdev_pat=$2
+      shift
+      ;;
+    --ci)
+      ci=true
+      ;;
+    -d|--debug)
+      verbosity=debug
+      ;;
+    -h|--help)
+      print_help
+      exit 0
+      ;;
+    *)
+      fail "Invalid argument: $1"
+      print_help
+      exit 1
+      ;;
+  esac
+
+  shift
+done
+
+# Validation
+
+if [[ -z "$tmp_dir" ]]; then
+  fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned"
+  exit 1
+fi
+
+# Sanitize the input
+
+if [[ -z "$vmr_dir" ]]; then
+  vmr_dir="$tmp_dir/dotnet"
+fi
+
+if [[ ! -d "$tmp_dir" ]]; then
+  mkdir -p "$tmp_dir"
+fi
+
+if [[ "$verbosity" == "debug" ]]; then
+  set -x
+fi
+
+# Prepare the VMR
+
+if [[ ! -d "$vmr_dir" ]]; then
+  highlight "Cloning 'dotnet/dotnet' into $vmr_dir.."
+  git clone https://github.com/dotnet/dotnet "$vmr_dir"
+
+  if [[ -n "$vmr_branch" ]]; then
+    git -C "$vmr_dir" switch -c "$vmr_branch"
+  fi
+else
+  if ! git -C "$vmr_dir" diff --quiet; then
+    fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes"
+    exit 1
+  fi
+
+  if [[ -n "$vmr_branch" ]]; then
+    highlight "Preparing $vmr_dir"
+    git -C "$vmr_dir" checkout "$vmr_branch"
+    git -C "$vmr_dir" pull
+  fi
+fi
+
+set -e
+
+# Prepare darc
+
+highlight 'Installing .NET, preparing the tooling..'
+source "./eng/common/tools.sh"
+InitializeDotNetCli true
+GetDarc
+dotnetDir=$( cd ./.dotnet/; pwd -P )
+dotnet=$dotnetDir/dotnet
+
+highlight "Starting the synchronization of VMR.."
+set +e
+
+if [[ -n "$additional_remotes" ]]; then
+  additional_remotes="--additional-remotes $additional_remotes"
+fi
+
+if [[ -n "$azdev_pat" ]]; then
+  azdev_pat="--azdev-pat $azdev_pat"
+fi
+
+ci_arg=''
+if [[ "$ci" == "true" ]]; then
+  ci_arg="--ci"
+fi
+
+# Synchronize the VMR
+
+export DOTNET_ROOT="$dotnetDir"
+
+"$darc_tool" vmr forwardflow \
+  --tmp "$tmp_dir"             \
+  $azdev_pat                   \
+  --$verbosity                 \
+  $ci_arg                      \
+  $additional_remotes          \
+  "$vmr_dir"
+
+if [[ $? == 0 ]]; then
+  highlight "Synchronization succeeded"
+else
+  fail "Synchronization of repo to VMR failed!"
+  fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)."
+  fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)."
+  fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script."
+  exit 1
+fi
diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh
index 4d6e51f58de1..776adaa0d0a2 100755
--- a/eng/configure-toolset.sh
+++ b/eng/configure-toolset.sh
@@ -2,7 +2,7 @@
 # We could potentially try to find an existing installation that has all the required runtimes,
 # but it's unlikely one will be available.
 
-if [ "${DotNetBuild:-false}" = false ]; then
+if [ "$product_build" = false ]; then
     use_installed_dotnet_cli="false"
 fi
 
diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index f31e201d516e..e3d34a926045 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -6,6 +6,7 @@
       This must be reset in order for Build.props to evaluate a list of projects to be tested on Helix.
     -->
     <ProjectToBuild Condition="'$(ProjectToBuild)' == '$(MSBuildProjectFullPath)'"/>
+    <ProjectToBuild Condition="'$(OnlyTestProjectTemplates)' == 'true'">$(RepoRoot)src\ProjectTemplates\test\**\*.csproj</ProjectToBuild>
 
     <!--
       Do not load NuGet.targets since this project doesn't reference anything from NuGet. Reduces `msbuild`
@@ -52,18 +53,18 @@
   <!-- Specify the .NET runtime we need which will be included as a correlation payload. -->
   <ItemGroup>
     <!--
-      Use the BrowserDebugHost transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
+      Use the Microsoft.Internal.Runtime.AspNetCore.Transport transport package as a sentinel for the non-shipping version of the NETCoreApp shared framework.
     -->
-    <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
+    <AdditionalDotNetPackage Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)">
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
 
-    <AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
+    <AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
                                  Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
       <SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
     </AdditionalDotNetPackageFeed>
 
-    <AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
+    <AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
                                  Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
       <SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
     </AdditionalDotNetPackageFeed>
@@ -74,7 +75,7 @@
     <HelixCorrelationPayload Include="$(NUGET_PACKAGES)\dotnet-serve\$(DotnetServeVersion)\dotnet-serve.$(DotnetServeVersion).nupkg" />
 
     <!-- Grab published `HelixTestRunner` project output. -->
-    <HelixCorrelationPayload Include="$(ArtifactsBinDir)HelixTestRunner\$(Configuration)\net9.0\publish\"
+    <HelixCorrelationPayload Include="$(ArtifactsBinDir)HelixTestRunner\$(Configuration)\net10.0\publish\"
         Destination="HelixTestRunner" />
   </ItemGroup>
 
@@ -118,14 +119,12 @@
     the current versions.
   -->
   <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather">
-    <MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
-        Properties="ExcludeFromBuild=false"
-        Targets="_GetPackageVersionInfo">
-      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedProductVersionInfo" />
+    <MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
+        Targets="ReturnProductVersion">
+      <Output TaskParameter="TargetOutputs" PropertyName="SharedFxVersion" />
     </MSBuild>
 
     <PropertyGroup>
-      <SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
       <_AppRefSubPath>$([System.IO.Path]::Combine('packs', 'Microsoft.AspNetCore.App.Ref', '$(SharedFxVersion)'))</_AppRefSubPath>
       <_AppRuntimeSubPath>$([System.IO.Path]::Combine('shared', 'Microsoft.AspNetCore.App', '$(SharedFxVersion)'))</_AppRuntimeSubPath>
       <_AppRefPath>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'obj', 'TargetingPack.Layout', '$(Configuration)', '$(_AppRefSubPath)'))</_AppRefPath>
diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1
index 61217486f190..90e04810f19f 100644
--- a/eng/scripts/CodeCheck.ps1
+++ b/eng/scripts/CodeCheck.ps1
@@ -107,65 +107,8 @@ try {
             "Packages in package-lock.json file resolved from wrong registry. All dependencies must be resolved from $registry"
     }
 
-    #
-    # Versions.props and Version.Details.xml
-    #
-
-    Write-Host "Checking that Versions.props and Version.Details.xml match"
-    [xml] $versionProps = Get-Content "$repoRoot/eng/Versions.props"
-    [xml] $versionDetails = Get-Content "$repoRoot/eng/Version.Details.xml"
-    $globalJson = Get-Content $repoRoot/global.json | ConvertFrom-Json
-
-    $versionVars = New-Object 'System.Collections.Generic.HashSet[string]'
-    foreach ($vars in $versionProps.SelectNodes("//PropertyGroup[`@Label=`"Automated`"]/*")) {
-        $versionVars.Add($vars.Name) | Out-Null
-    }
-
-    foreach ($dep in $versionDetails.SelectNodes('//Dependency')) {
-        Write-Verbose "Found $dep"
-
-        $expectedVersion = $dep.Version
-
-        if ($dep.Name -in $globalJson.'msbuild-sdks'.PSObject.Properties.Name) {
-            $actualVersion = $globalJson.'msbuild-sdks'.($dep.Name)
-
-            if ($expectedVersion -ne $actualVersion) {
-                LogError -filepath "$repoRoot\global.json" `
-                    ("MSBuild SDK version '$($dep.Name)' in global.json does not match the value in " +
-                     "Version.Details.xml. Expected '$expectedVersion', actual '$actualVersion'")
-            }
-        }
-        else {
-            $varName = $dep.Name -replace '\.',''
-            $varName = $varName -replace '\-',''
-            $varName = "${varName}Version"
-
-            $versionVar = $versionProps.SelectSingleNode("//PropertyGroup[`@Label=`"Automated`"]/$varName")
-            $actualVersion = $versionVar.InnerText
-            $versionVars.Remove($varName) | Out-Null
-
-            if (-not $versionVar) {
-                LogError "Missing version variable '$varName' in the 'Automated' property group in $repoRoot/eng/Versions.props"
-                continue
-            }
-
-            if ($expectedVersion -ne $actualVersion) {
-                LogError -filepath "$repoRoot\eng\Versions.props" `
-                    ("Version variable '$varName' does not match the value in Version.Details.xml. " +
-                     "Expected '$expectedVersion', actual '$actualVersion'")
-            }
-        }
-    }
-
-    foreach ($unexpectedVar in $versionVars) {
-        LogError -Filepath "$repoRoot\eng\Versions.props" `
-            ("Version variable '$unexpectedVar' does not have a matching entry in Version.Details.xml. " +
-             "See https://github.com/dotnet/aspnetcore/blob/main/docs/ReferenceResolution.md for instructions " +
-             "on how to add a new dependency.")
-    }
-
     # ComponentsWebAssembly-CSharp.sln is used by the templating engine; MessagePack.sln is irrelevant (in submodule).
-    $solution = Get-ChildItem "$repoRoot/AspNetCore.sln"
+    $solution = Get-ChildItem "$repoRoot/AspNetCore.slnx"
     $solutionFile = Split-Path -Leaf $solution
 
     Write-Host "Checking that $solutionFile is up to date"
diff --git a/eng/scripts/InstallGoogleChrome.ps1 b/eng/scripts/InstallGoogleChrome.ps1
index 2159c7de09d1..c62dbb2535cf 100644
--- a/eng/scripts/InstallGoogleChrome.ps1
+++ b/eng/scripts/InstallGoogleChrome.ps1
@@ -1,4 +1,4 @@
 $InstallerPath = "$env:Temp\chrome_installer.exe";
-& $PSScriptRoot\Download.ps1 "http://dl.google.com/chrome/install/375.126/chrome_installer.exe" $InstallerPath
+& $PSScriptRoot\Download.ps1 "https://dl.google.com/chrome/install/latest/chrome_installer.exe" $InstallerPath
 Start-Process -FilePath $InstallerPath -Args "/silent /install" -Verb RunAs -Wait;
 Remove-Item $InstallerPath
diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1
index 0872f241a982..35dc6c8d9e0f 100644
--- a/eng/scripts/InstallJdk.ps1
+++ b/eng/scripts/InstallJdk.ps1
@@ -22,8 +22,7 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\"
 $javacExe = "$installDir\bin\javac.exe"
 $tempDir = "$repoRoot\obj"
 if (-not $JdkVersion) {
-    $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
-    $JdkVersion = $globalJson.'native-tools'.jdk
+    $JdkVersion = "11.0.24"
 }
 
 if (Test-Path $javacExe) {
@@ -46,7 +45,7 @@ Expand-Archive "$tempDir/jdk.zip" -d "$tempDir/jdk/"
 Write-Host "Expanded JDK to $tempDir"
 Write-Host "Installing JDK to $installDir"
 # The name of the file directory within the zip is based on the version, but may contain a +N for build number.
-Move-Item "$(Get-ChildItem -Path "$tempDir/jdk" | Select-Object -First 1)/*" $installDir
+Move-Item "$(Get-ChildItem -Path "$tempDir/jdk" | Select-Object -First 1 -ExpandProperty FullName)/*" $installDir
 Write-Host "Done installing JDK to $installDir"
 
 if ($env:TF_BUILD) {
diff --git a/eng/scripts/install-nginx-mac.sh b/eng/scripts/install-nginx-mac.sh
deleted file mode 100755
index e7df86f57c0a..000000000000
--- a/eng/scripts/install-nginx-mac.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-brew update
-brew list openssl || brew install openssl
-brew list nginx || brew install nginx
diff --git a/eng/scripts/install-nginx-linux.sh b/eng/scripts/install-nginx.sh
similarity index 75%
rename from eng/scripts/install-nginx-linux.sh
rename to eng/scripts/install-nginx.sh
index bbfb79c48203..23d71043ed19 100755
--- a/eng/scripts/install-nginx-linux.sh
+++ b/eng/scripts/install-nginx.sh
@@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 reporoot="$(dirname "$(dirname "$scriptroot")")"
 nginxinstall="$reporoot/.tools/nginx"
 
-curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/
+curl -sSL http://nginx.org/download/nginx-1.29.1.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.29.1/
 ./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
 make
 make install
diff --git a/eng/scripts/npm/update-dependency-versions.mjs b/eng/scripts/npm/update-dependency-versions.mjs
index ce8b9b42c6d7..d4e2ebea88bf 100644
--- a/eng/scripts/npm/update-dependency-versions.mjs
+++ b/eng/scripts/npm/update-dependency-versions.mjs
@@ -45,6 +45,13 @@ function applyPackageVersion(packagesToPack, defaultPackageVersion) {
     const packageName = packageJson.name;
     const packageVersion = defaultPackageVersion;
     const packageDir = path.dirname(packagePath);
+
+    // Check if the version is already correct
+    if (packageJson.version === packageVersion) {
+      console.log(`Skipping ${packageName} - version ${packageVersion} already applied.`);
+      continue;
+    }
+
     // Run npm version packageVersion --no-git-tag-version
     // This will update the package.json version to the specified version without creating a git tag
     // Make a backup of the package.json
@@ -52,9 +59,18 @@ function applyPackageVersion(packagesToPack, defaultPackageVersion) {
     renames.push([`${packagePath}.bak`, packagePath]);
 
     process.chdir(packageDir);
-    execSync(`npm version ${packageVersion} --no-git-tag-version`, { stdio: 'inherit' });
+    try {
+      execSync(`npm version ${packageVersion} --no-git-tag-version --allow-same-version`, { stdio: 'inherit' });
+      console.log(`Applied version ${packageVersion} to ${packageName} in ${packageDir}...`);
+    } catch (error) {
+      console.warn(`Failed to run npm version command for ${packageName}, falling back to manual version update...`);
+      // Fallback: manually update the version in package.json
+      const packageJson = fs.readJsonSync(packagePath);
+      packageJson.version = packageVersion;
+      fs.writeJsonSync(packagePath, packageJson, { spaces: 2 });
+      console.log(`Manually applied version ${packageVersion} to ${packageName} in ${packageDir}...`);
+    }
     process.chdir(currentDir);
-    console.log(`Applied version ${packageVersion} to ${packageName} in ${packageDir}...`);
   }
 
   return renames;
@@ -81,11 +97,16 @@ function updateDependencyVersions(packagesToPack) {
         // Find the dependency in packagesToPack, load the package.json and update the dependency version
         const dependencyPackage = seenPackagesAndVersions.find(([_, packageJson]) => packageJson.name === dependency);
         if (dependencyPackage) {
-          modified = true;
           const dependencyPackagePath = dependencyPackage[0];
           const dependencyPackageJson = JSON.parse(fs.readFileSync(dependencyPackagePath, 'utf-8'));
-          dependencies[dependency] = `>=${dependencyPackageJson.version}`;
-          console.log(`Updated dependency ${dependency} to ${dependencyPackageJson.version} in ${packageJson.name}.`);
+          const newDependencyVersion = `>=${dependencyPackageJson.version}`;
+
+          // Only update if the dependency version is actually different
+          if (dependencies[dependency] !== newDependencyVersion) {
+            modified = true;
+            dependencies[dependency] = newDependencyVersion;
+            console.log(`Updated dependency ${dependency} to ${dependencyPackageJson.version} in ${packageJson.name}.`);
+          }
         }
       }
       if (modified) {
diff --git a/eng/scripts/update-npm-dependencies.ps1 b/eng/scripts/update-npm-dependencies.ps1
index 8b41b9f63994..f2070df6a129 100644
--- a/eng/scripts/update-npm-dependencies.ps1
+++ b/eng/scripts/update-npm-dependencies.ps1
@@ -9,8 +9,6 @@ param (
 
 $ErrorActionPreference = "Stop"
 
-$env:npm_config_cache = "$PWD/src/submodules/Node-Externals/cache"
-
 Write-Host "Ensuring the repository is clean"
 if (-not $WhatIf) {
     git clean -xdff
@@ -21,12 +19,6 @@ if (-not $WhatIf) {
     Remove-Item .\package-lock.json
 }
 
-if (-not $SkipClearCache -and -not $WhatIf) {
-    Write-Host "Clearing the npm cache"
-    Remove-Item -Recurse -Force "$PWD/src/submodules/Node-Externals/cache"
-    New-Item -ItemType Directory -Path "$PWD/src/submodules/Node-Externals/cache"
-}
-
 try {
     Get-Command vsts-npm-auth -CommandType ExternalScript
     Write-Host "vsts-npm-auth is already installed"
@@ -50,6 +42,7 @@ if (-not $WhatIf) {
     npm install --prefer-online --include optional
 }
 
+# Add optional dependencies to the cache to ensure that they get mirrored
 Write-Host "Adding optional dependencies to the cache"
 $rollupOptionalDependencies = (Get-Content .\package-lock.json | ConvertFrom-Json -AsHashtable).packages['node_modules/rollup'].optionalDependencies |
 Select-Object '@rollup/rollup-*';
@@ -76,48 +69,18 @@ if ($null -ne $commonOptionalDependencyVersion) {
     }
 }
 
-Write-Host "Verifying the cache"
-if(-not $WhatIf) {
-    npm cache verify
-}
-
-# Navigate to the Node-Externals submodule
-# Checkout a branch named infrastructure/update-npm-package-cache-<date>
-# Stage the changes in the folder
-# Commit the changes with the message "Updated npm package cache <date>"
-# Use the GH CLI to create a PR for the branch in the origin remote
-
-Push-Location src/submodules/Node-Externals
-$branchName = "infrastructure/update-npm-package-cache-$(Get-Date -Format 'yyyy-MM-dd')"
-if (-not $WhatIf) {
-    git branch -D $branchName 2>$null
-    git checkout -b $branchName
-    git add .
-    git commit -m "Updated npm package cache $(Get-Date -Format 'yyyy-MM-dd')"
-}
-
-if ($WhatIf -or $SkipPullRequestCreation) {
-    Write-Host "Skipping pull request creation for Node-Externals submodule"
-}
-else {
-    Write-Host "Creating pull request for Node-Externals submodule"
-    git branch --set-upstream-to=origin/main
-    git push origin $branchName`:$branchName --force;
-    gh repo set-default dotnet/Node-Externals
-    gh pr create --base main --head "infrastructure/update-npm-package-cache-$(Get-Date -Format 'yyyy-MM-dd')" --title "[Infrastructure] Updated npm package cache $(Get-Date -Format 'yyyy-MM-dd')" --body "Do not merge this PR until the one in aspnetcore passes all checks."
-}
 
 ## Navigate to the root of the repository
-## Checkout a branch named infrastructure/update-npm-package-cache-<date>
+## Checkout a branch named infrastructure/update-npm-packages-<date>
 ## Stage the changes in the folder
-## Commit the changes with the message "Updated npm package cache <date>"
+## Commit the changes with the message "Updated npm packages <date>"
 ## Use the GH CLI to create a PR for the branch in the origin remote
-Pop-Location
 if(-not $WhatIf) {
+    $branchName = "infrastructure/update-npm-packages-$(Get-Date -Format 'yyyy-MM-dd')"
     git branch -D $branchName 2>$null
     git checkout -b $branchName
     git add .
-    git commit -m "Updated npm package cache $(Get-Date -Format 'yyyy-MM-dd')"
+    git commit -m "Updated npm packages $(Get-Date -Format 'yyyy-MM-dd')"
 }
 
 if ($WhatIf -or $SkipPullRequestCreation) {
@@ -128,5 +91,5 @@ else {
     git branch --set-upstream-to=origin/main
     git push origin $branchName`:$branchName --force;
     gh repo set-default dotnet/aspnetcore
-    gh pr create --base main --head $branchName --title "[Infrastructure] Updated npm package cache $(Get-Date -Format 'yyyy-MM-dd')" --body ""
+    gh pr create --base main --head $branchName --title "[Infrastructure] Updated npm packages $(Get-Date -Format 'yyyy-MM-dd')" --body ""
 }
diff --git a/eng/scripts/update-selenium-and-playwright-versions.ps1 b/eng/scripts/update-selenium-and-playwright-versions.ps1
new file mode 100644
index 000000000000..d0bbef6b10fb
--- /dev/null
+++ b/eng/scripts/update-selenium-and-playwright-versions.ps1
@@ -0,0 +1,113 @@
+# Define the packages and their corresponding XML entries
+$packages = @{
+    "Microsoft.Playwright" = "MicrosoftPlaywrightVersion"
+    "Selenium.Support" = "SeleniumSupportVersion"
+    "Selenium.WebDriver" = "SeleniumWebDriverVersion"
+  }
+
+  # Function to get the latest stable version from NuGet
+function Get-LatestNuGetVersion {
+    param (
+        [string]$packageName
+    )
+    $packageName = $packageName.ToLower();
+    $url = "https://api.nuget.org/v3-flatcontainer/$packageName/index.json"
+    $response = Invoke-RestMethod -Uri $url
+    $versions = $response.versions | Where-Object { $_ -notmatch "-" } | ForEach-Object { [System.Version]$_ }
+    return ($versions | Sort-Object -Property Major, Minor, Build, Revision -Descending | Select-Object -First 1).ToString()
+}
+
+# Function to update the Versions.props file
+function Update-VersionsProps {
+param (
+    [string]$filePath,
+    [hashtable]$versions
+)
+$content = Get-Content -Path $filePath
+foreach ($package in $versions.Keys) {
+    $entryName = $packages[$package]
+    $version = $versions[$package]
+    $pattern = "(?<=<$entryName>)(.*?)(?=</$entryName>)"
+    $replacement = $version
+    $content = $content -replace $pattern, $replacement
+}
+Set-Content -Path $filePath -Value $content
+}
+
+# Function to check if the Docker image exists
+function Test-DockerImageExists {
+param (
+    [string]$imageName,
+    [string]$version
+)
+$url = "https://mcr.microsoft.com/v2/$imageName/tags/list"
+$response = Invoke-RestMethod -Uri $url
+return $response.tags -contains $version
+}
+
+# Function to update the Dockerfile
+function Update-Dockerfile {
+param (
+    [string]$filePath,
+    [string]$version
+)
+(Get-Content -Path $filePath) -replace 'FROM mcr.microsoft.com/playwright/dotnet:.* AS final', "FROM mcr.microsoft.com/playwright/dotnet:$version AS final" | Set-Content -Path $filePath
+}
+
+# Get the latest versions of the packages
+$versions = @{}
+foreach ($package in $packages.Keys) {
+$versions[$package] = Get-LatestNuGetVersion -packageName $package
+}
+
+# Print the package versions found
+foreach ($package in $versions.Keys) {
+    Write-Host "$($package): $($versions[$package])"
+}
+
+# Update the Versions.props file
+Update-VersionsProps -filePath "eng/Versions.props" -versions $versions
+
+# Check if the Docker image exists
+$playwrightVersion = "v$($versions["Microsoft.Playwright"])-jammy-amd64"
+if (Test-DockerImageExists -imageName "playwright/dotnet" -version $playwrightVersion) {
+# Update the Dockerfile
+Update-Dockerfile -filePath "src/Components/benchmarkapps/Wasm.Performance/dockerfile" -version $playwrightVersion
+} else {
+Write-Error "Docker image for Playwright version $playwrightVersion not found."
+exit 1
+}
+
+# Check if there are changes
+git diff --quiet
+if ($LASTEXITCODE -eq 0) {
+    Write-Host "No changes to commit."
+    # exit 0
+}else {
+    Write-Host "Updating the version of packages";
+}
+
+# Create a new branch
+git checkout -b infrastructure/update-selenium-and-typescript-dependencies
+
+# Stage the changes
+git add eng/Versions.props src/Components/benchmarkapps/Wasm.Performance/dockerfile
+
+# Commit the changes
+$commitMessage = @"
+[Infrastructure] Update Selenium and Playwright dependencies $(Get-Date -Format "yyyy-MM-dd")
+* Updated Microsoft.Playwright version to $($versions["Microsoft.Playwright"])
+* Updated Selenium.Support version to $($versions["Selenium.Support"])
+* Updated Selenium.WebDriver version to $($versions["Selenium.WebDriver"])
+"@
+git commit -m $commitMessage
+
+# Push the branch
+git push origin infrastructure/update-selenium-and-typescript-dependencies
+
+$prBody = $commitMessage + @"
+
+Please see the [MirroringPackages.md](https://github.com/dotnet/arcade/blob/main/Documentation/MirroringPackages.md) document in the [dotnet/arcade](https://github.com/dotnet/arcade) repository for information on how to mirror these packages on the MS NuGet feed.
+"@
+
+gh pr create --title "Update Selenium and Playwright dependencies $(Get-Date -Format "yyyy-MM-dd")" --body $prBody --base main --head infrastructure/update-selenium-and-typescript-dependencies
diff --git a/eng/targets/BeforeWix.Common.targets b/eng/targets/BeforeWix.Common.targets
new file mode 100644
index 000000000000..99c95b6f503d
--- /dev/null
+++ b/eng/targets/BeforeWix.Common.targets
@@ -0,0 +1,26 @@
+<!-- Targets for making .wixproj better. -->
+<Project>
+  <PropertyGroup Condition="'$(OutputType)' == 'package'">
+    <EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
+    <InstallDir>$(ProductName)</InstallDir>
+
+    <DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
+    <DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
+    <Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
+    <Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
+    <Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
+    <InstallerPlatform>$(Platform)</InstallerPlatform>
+    <OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
+
+    <DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
+    <DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
+    <DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index 6b6a41ca4a64..471a470911ee 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -94,7 +94,12 @@
         <_Parameter2>$(RepositoryUrl)/tree/$(SourceRevisionId)</_Parameter2>
       </AssemblyAttribute>
 
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(RepoOriginalSourceRevisionId)' != ''">
+        <_Parameter1>OriginalRepoCommitHash</_Parameter1>
+        <_Parameter2>$(RepoOriginalSourceRevisionId)</_Parameter2>
+      </AssemblyAttribute>
+
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
         <_Parameter1>Serviceable</_Parameter1>
         <_Parameter2>True</_Parameter2>
       </AssemblyAttribute>
diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props
index c824b87caa9a..ca1335ef2c85 100644
--- a/eng/targets/Cpp.Common.props
+++ b/eng/targets/Cpp.Common.props
@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-    <SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
+    <SignOutput>false</SignOutput>
     <IsPackable>false</IsPackable>
 
     <!-- This maps the common MSBuild property name to equivalent C++ project properties.  -->
@@ -25,8 +25,4 @@
     <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
     <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-
-  <Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
-  <Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
-
 </Project>
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index cedd59cd34ad..febe906600ce 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -1,12 +1,13 @@
 <Project>
   <!-- This file is shared between Helix.proj and .csproj files. -->
   <PropertyGroup>
-    <HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
-    <HelixQueueAlpine318>(Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64</HelixQueueAlpine318>
-    <HelixQueueDebian12>(Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64</HelixQueueDebian12>
-    <HelixQueueFedora38>(Fedora.38.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix</HelixQueueFedora38>
-    <HelixQueueMariner>(Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64</HelixQueueMariner>
-    <HelixQueueArmDebian12>(Debian.12.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
+    <HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
+    <HelixQueueAlpine>(Alpine.321.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
+    <HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
+    <HelixQueueDebian>(Debian.13.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
+    <HelixQueueFedora>(Fedora.42.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-42-helix-amd64</HelixQueueFedora>
+    <!-- Arm64 -->
+    <HelixQueueArmDebian>(Debian.13.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>
 
     <!-- Do not attempt to override global property. -->
     <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
@@ -29,8 +30,7 @@
       <!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
       <ItemGroup>
         <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="OSX.13.Amd64.Open" Platform="OSX" />
-        <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
+        <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
         <HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
       </ItemGroup>
     </When>
@@ -39,20 +39,22 @@
       <!-- aspnetcore-quarantined-tests (quarantined-tests.yml) and RunHelix.ps1 -RunQuarantinedTests -->
       <ItemGroup>
         <!-- Linux -->
-        <HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux8)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux)" Platform="Linux" />
 
         <!-- Containers -->
-        <HelixAvailableTargetQueue Include="$(HelixQueueAlpine318)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueDebian12)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueFedora38)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
+        <!-- Arm64 -->
+        <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />
 
         <!-- Mac -->
-        <HelixAvailableTargetQueue Include="OSX.1200.Amd64.Open" Platform="OSX" />
+        <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
 
         <!-- Windows -->
         <HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
+        <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
 
         <!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on its setup scripts. -->
         <HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows"
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 43bf0cb7f7f1..d58bc8feedde 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -16,11 +16,11 @@
 
   <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
     <SkipHelixQueues>
-      $(HelixQueueAlmaLinux8);
-      $(HelixQueueAlpine318);
-      $(HelixQueueDebian12);
-      $(HelixQueueFedora38);
-      $(HelixQueueMariner);
+      $(HelixQueueAlmaLinux);
+      $(HelixQueueAlpine);
+      $(HelixQueueAzureLinux);
+      $(HelixQueueDebian);
+      $(HelixQueueFedora40);
       Ubuntu.2004.Amd64.Open;
     </SkipHelixQueues>
     <SkipHelixArm>true</SkipHelixArm>
diff --git a/eng/targets/Java.Common.targets b/eng/targets/Java.Common.targets
index c8905b10c4b6..81c643e60c27 100644
--- a/eng/targets/Java.Common.targets
+++ b/eng/targets/Java.Common.targets
@@ -64,8 +64,8 @@
 
   <Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)">
     <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Pack" />
-    <Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
-    <Exec Command="../gradlew $(GradleOptions) createPackage" />
+    <Message Text="> gradlew $(GradleOptions) publishToMavenLocal" Importance="high" />
+    <Exec Command="../gradlew $(GradleOptions) publishToMavenLocal" />
     <Message Importance="high" Text="$(PackageId) -> $(PackageOutputPath)%(JavaBuildFiles.Identity)" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(PackageOutputPath)" />
   </Target>
diff --git a/eng/targets/Node.Common.targets b/eng/targets/Node.Common.targets
new file mode 100644
index 000000000000..ef9e5d9d16fb
--- /dev/null
+++ b/eng/targets/Node.Common.targets
@@ -0,0 +1,7 @@
+<Project>
+
+  <!-- Add an empty ComputeRunArguments target which is defined by the Microsoft.NET.Sdk.
+       Necessary as called by Arcade's Test infra. -->
+  <Target Name="ComputeRunArguments" />
+
+</Project>
\ No newline at end of file
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index e416d43f3038..6dd4f551a26e 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -227,10 +227,6 @@
       Condition=" '@(PackageReference->HasMetadata('Private')->Count())' != '0' "
       Code="BUILD004"
       Text="%25(Private) metadata should not be applied to the %(Identity) package reference. Did you mean %25(PrivateAssets)?" />
-    <Warning
-      Condition=" '@(ProjectReference->HasMetadata('PrivateAssets')->Count())' != '0' "
-      Code="BUILD005"
-      Text="%25(PrivateAssets) metadata should not be applied to the %(Identity) project reference. Did you mean %25(Private)?" />
     <Warning
       Condition=" '@(Reference->HasMetadata('PrivateAssets')->Count())' != '0' "
       Code="BUILD006"
@@ -249,6 +245,7 @@
   <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Runtime' AND
       '$(MSBuildProjectName)' != 'RepoTasks' AND
       ('$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref' OR
+      '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref.Sfx' OR
       (('$(IsAspNetCoreApp)' == 'true' OR '$(UseAspNetCoreSharedRuntime)' == 'true') AND
       $(_CompileTfmUsingReferenceAssemblies))) ">
     <PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
@@ -268,11 +265,12 @@
   -->
   <Target Name="RemoveExtensionsCompileAssets"
       AfterTargets="ResolvePackageAssets"
-      Condition=" '$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)' != '' AND
+      Condition="'$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref'
+        OR ( '$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)' != '' AND
           '$(IsServicingBuild)' == 'true' AND
           '$(IsImplementationProject)' == 'true' AND
           '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Runtime' AND
-          ($(_CompileTfmUsingReferenceAssemblies) OR '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref') ">
+          $(_CompileTfmUsingReferenceAssemblies)) ">
     <ItemGroup>
       <ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)"
           Condition=" '%(NuGetPackageId)' != 'Microsoft.Internal.Runtime.AspNetCore.Transport' AND
diff --git a/eng/targets/Sfx.Common.targets b/eng/targets/Sfx.Common.targets
new file mode 100644
index 000000000000..f97b37939110
--- /dev/null
+++ b/eng/targets/Sfx.Common.targets
@@ -0,0 +1,48 @@
+<Project>
+  <Import Project="$(RepoRoot)eng\targets\ResolveReferences.targets" />
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <!-- Mibc data to use when exact architecture match is available -->
+    <MIBCPackageDef Include="optimization.windows_nt-x86.mibc.runtime" Version="$(optimizationwindows_ntx86MIBCRuntimeVersion)" MibcArchitecture="windows/x86"/>
+    <MIBCPackageDef Include="optimization.windows_nt-x64.mibc.runtime" Version="$(optimizationwindows_ntx64MIBCRuntimeVersion)" MibcArchitecture="windows/x64"/>
+    <MIBCPackageDef Include="optimization.windows_nt-arm64.mibc.runtime" Version="$(optimizationwindows_ntarm64MIBCRuntimeVersion)" MibcArchitecture="windows/arm64"/>
+    <MIBCPackageDef Include="optimization.linux-x64.mibc.runtime" Version="$(optimizationlinuxx64MIBCRuntimeVersion)" MibcArchitecture="linux/x64"/>
+    <MIBCPackageDef Include="optimization.linux-arm64.mibc.runtime" Version="$(optimizationlinuxarm64MIBCRuntimeVersion)" MibcArchitecture="linux/arm64"/>
+
+    <!-- Mibc data to use when exact architecture match not available -->
+    <MIBCPackageDef Include="optimization.windows_nt-x64.mibc.runtime" Version="$(optimizationwindows_ntx64MIBCRuntimeVersion)" MibcArchitecture="windows"/>
+    <MIBCPackageDef Include="optimization.linux-x64.mibc.runtime" Version="$(optimizationlinuxx64MIBCRuntimeVersion)" MibcArchitecture="linux"/>
+    <MIBCPackageDef Include="optimization.linux-x64.mibc.runtime" Version="$(optimizationlinuxx64MIBCRuntimeVersion)" MibcArchitecture="osx"/>
+
+    <MIBCPackage Include="@(MIBCPackageDef->HasMetadata('MibcArchitecture')->WithMetadataValue('MibcArchitecture','$(TargetOS)/$(TargetArchitecture)'))" />
+    <MIBCPackage Include="@(MIBCPackageDef->HasMetadata('MibcArchitecture')->WithMetadataValue('MibcArchitecture','$(TargetOS)'))" Condition="'@(MIBCPackage)' == ''" />
+
+    <!-- Fallback in case no os specific data is available-->
+    <MIBCPackage Include="optimization.linux-x64.mibc.runtime" Version="$(optimizationlinuxx64MIBCRuntimeVersion)" Condition="'@(MIBCPackage)' == ''" />
+
+    <PackageDownload Include="@(MIBCPackage)" Version="[%(Version)]" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>$(GetSharedFrameworkFilesForReadyToRunDependsOn);_AddOptimizationDataForReadyToRun</GetSharedFrameworkFilesForReadyToRunDependsOn>
+  </PropertyGroup>
+
+  <!-- IBC data packages don't follow NuGet conventions.  -->
+  <Target Name="_AddOptimizationDataForReadyToRun">
+    <ItemGroup>
+      <MIBCPackage>
+        <PackagePath>$(NuGetPackageRoot)%(MIBCPackage.Identity)/%(MIBCPackage.Version)</PackagePath>
+      </MIBCPackage>
+      <PublishReadyToRunPgoFiles Include="%(MIBCPackage.PackagePath)/**/*.mibc" />
+    </ItemGroup>
+  </Target>
+
+  <!-- We need to reference the live RID graph to get a graph with any additionally supported RIDs for this build. -->
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.NETCore.Platforms" Version="[$(MicrosoftNETCorePlatformsVersion)]" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsVersion)')">
+    <RuntimeIdentifierGraphPath>$(NuGetPackageRoot)microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsVersion)/PortableRuntimeIdentifierGraph.json</RuntimeIdentifierGraphPath>
+  </PropertyGroup>
+</Project>
diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props
index d8fcb93ea39a..1b0b1dff407b 100644
--- a/eng/targets/Wix.Common.props
+++ b/eng/targets/Wix.Common.props
@@ -3,11 +3,10 @@
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProductVersion>3.14</ProductVersion>
-    <WixVersion>$(MicrosoftSignedWixVersion)</WixVersion>
   </PropertyGroup>
 
   <PropertyGroup>
+    <CustomBeforeWixTargets>$(MSBuildThisFileDirectory)BeforeWix.Common.targets</CustomBeforeWixTargets>
     <TargetFrameworkMoniker>Native,Version=v0.0</TargetFrameworkMoniker>
 
     <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
@@ -17,18 +16,19 @@
     <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildToolsPath)\NuGet.targets</NuGetRestoreTargets>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(_ProjectExtensionsWereImported)' != 'true'" />
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.Signed.Wix" Version="$(WixVersion)" />
+    <!-- Microsoft.Wix is a dotnet tool package, so exlude its assets. -->
+    <PackageReference Include="Microsoft.Wix" Version="$(MicrosoftWixToolsetSdkVersion)" ExcludeAssets="all" />
+    <!-- Installers needs the $(PkgMicrosoftWixToolsetUIwixext) property to locate the extension. -->
+    <PackageReference Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
   </ItemGroup>
 
   <PropertyGroup>
-    <SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
+    <SignOutput>false</SignOutput>
     <DarkToolPath>$(WixExtDir)dark.exe</DarkToolPath>
   </PropertyGroup>
-
-  <Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
-  <Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
-
 </Project>
diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets
index 72cec114582b..f4e4866c5f33 100644
--- a/eng/targets/Wix.Common.targets
+++ b/eng/targets/Wix.Common.targets
@@ -1,57 +1,4 @@
-<!-- Targets for making .wixproj better. -->
 <Project>
-
-  <ItemDefinitionGroup>
-    <!-- Override the MicroBuild default certs which still uses MicrosoftSHA1 and Microsoft401 -->
-    <SignCabs>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignCabs>
-    <SignMsi>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignMsi>
-    <SignBundle>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignBundle>
-    <SignBundleEngine>
-      <Authenticode>Microsoft400</Authenticode>
-    </SignBundleEngine>
-  </ItemDefinitionGroup>
-
-  <PropertyGroup Condition="'$(OutputType)' == 'package'">
-    <!-- Set package version for SharedFx & TargetingPack wixproj's -->
-    <!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
-    <_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
-    <_GeneratedPackageVersion
-        Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
-    <!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
-    <OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>
-
-    <EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
-    <InstallDir>$(ProductName)</InstallDir>
-
-    <DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
-    <DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
-    <Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
-    <Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
-    <Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
-    <InstallerPlatform>$(Platform)</InstallerPlatform>
-    <OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
-
-    <DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
-    <DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-
-  <Import Project="$(NuGetRestoreTargets)" />
-  <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" />
-  <Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)' != '' " />
   <!-- Don't import the Microbuild signing targets when post build sign is enabled. They override the
        standard Wix targets for signing, and call ESRP directly (rather than through SignTool). So without this,
        ASPNetCore will sign even when PostbuildSign == true -->
diff --git a/eng/test-configuration.json b/eng/test-configuration.json
index e8b8b41a7a91..9430296a7ed1 100644
--- a/eng/test-configuration.json
+++ b/eng/test-configuration.json
@@ -7,10 +7,14 @@
     {"testName": {"contains": "MaxRequestBufferSizeTests.LargeUpload" }}, // tries to manipulate the state of the server's buffer
     {"testName": {"contains": "CertificateChangedOnDisk"}}, // depends on FS event timing
     {"testName": {"contains": "CertificateChangedOnDisk_Symlink"}}, // depends on FS event timing
-    {"testName": {"contains": "POST_ServerAbort_ClientReceivesAbort"}},
     {"testName": {"contains": "CanLaunchPhotinoWebViewAndClickButton"}},
     {"testName": {"contains": "CheckInvalidHostingModelParameter"}},
-    {"testName": {"contains": "CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUser"}},
+    {"testName": {"contains": "CheckNewShimIsUsed"}}, // Issue: https://github.com/dotnet/aspnetcore/issues/57538
+    {"testName": {"contains": "ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit"}}, // Issue: https://github.com/dotnet/aspnetcore/issues/57551
+    {"testName": {"contains": "ComponentDisposeMethodThrowsExceptionTerminatesTheCircuit"}}, // Issue: https://github.com/dotnet/aspnetcore/issues/57551
+    {"testName": {"contains": "PhoneFactorFailsAfterSecurityStampChangeTest"}}, // Issue: https://github.com/dotnet/aspnetcore/issues/58231
+    {"testName": {"contains": "AbortSendsFinalGOAWAY"}}, // Issue: https://github.com/dotnet/aspnetcore/issues/59358
+    {"testName": {"contains": "Http2_RequestWithDataAndContentLength_Success"}}, // Issue: https://github.com/dotnet/aspnetcore/issues/63266
     {"testAssembly": {"contains": "IIS"}},
     {"testAssembly": {"contains": "Template"}},
     {"failureMessage": {"contains":"(Site is started but no worker process found)"}},
diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets
index 0b4c65ac90c2..26dae763a703 100644
--- a/eng/testing/linker/SupportFiles/Directory.Build.targets
+++ b/eng/testing/linker/SupportFiles/Directory.Build.targets
@@ -1,43 +1,33 @@
 <Project>
-
-  <PropertyGroup>
-    <!-- Used to silence the warning caused by the workaround for https://github.com/dotnet/runtime/issues/81382 -->
-    <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
-  </PropertyGroup>
-
-  <!-- needed to reference a specific version of NetCoreApp. Workaround https://github.com/dotnet/runtime/issues/81382 -->
   <ItemGroup>
     <FrameworkReference Update="Microsoft.NETCore.App"
-                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)" />
+                        RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)" />
 
-    <PackageReference Include="Microsoft.DotNet.ILCompiler"
-                      Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
-
-    <!-- Workaround when there is no vNext SDK available; copy known packs info from 8.0. -->
-    <KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+    <!-- Workaround when there is no vNext SDK available; copy known packs info from 9.0. -->
+    <KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
                      TargetFramework="$(TargetFramework)"
                      Condition="'@(KnownAppHostPack->Count())' != '0' AND
                                  !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
-    <KnownRuntimePack Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net8.0'))"
+    <KnownRuntimePack Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net9.0'))"
                      TargetFramework="$(TargetFramework)"
                      Condition="'@(KnownRuntimePack->Count())' != '0' AND
                                  !(@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
-    <KnownFrameworkReference Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net8.0'))"
+    <KnownFrameworkReference Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net9.0'))"
                      TargetFramework="$(TargetFramework)"
                      Condition="'@(KnownFrameworkReference->Count())' != '0' AND
                                  !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
-    <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+    <KnownILLinkPack Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net9.0'))"
                      TargetFramework="$(TargetFramework)"
                      Condition="'@(KnownILLinkPack->Count())' != '0' AND
                                  !(@(KnownILLinkPack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
-    <KnownILCompilerPack Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+    <KnownILCompilerPack Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net9.0'))"
                      TargetFramework="$(TargetFramework)"
                      Condition="'@(KnownILCompilerPack->Count())' != '0' AND
                                  !(@(KnownILCompilerPack->AnyHaveMetadataValue('TargetFramework', '$(TargetFramework)')))" />
 
     <KnownFrameworkReference Update="Microsoft.NETCore.App">
       <LatestRuntimeFrameworkVersion
-          Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
+          Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRefVersion)</LatestRuntimeFrameworkVersion>
       <TargetingPackVersion
           Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
       <!--
@@ -48,22 +38,29 @@
         e.g. tool projects (again, property not set) use latest.
       -->
       <DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
-          '%(TargetFramework)' == '$(TargetFramework)'">$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
+          '%(TargetFramework)' == '$(TargetFramework)'">$(MicrosoftNETCoreAppRefVersion)</DefaultRuntimeFrameworkVersion>
       <RuntimePackRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
     </KnownFrameworkReference>
 
     <KnownAppHostPack Update="Microsoft.NETCore.App">
       <AppHostPackVersion
-        Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRuntimeVersion)</AppHostPackVersion>
+        Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRefVersion)</AppHostPackVersion>
       <AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
     </KnownAppHostPack>
 
     <KnownRuntimePack Update="Microsoft.NETCore.App">
       <LatestRuntimeFrameworkVersion
-        Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
+        Condition=" '%(TargetFramework)' == '$(TargetFramework)' ">$(MicrosoftNETCoreAppRefVersion)</LatestRuntimeFrameworkVersion>
       <AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
     </KnownRuntimePack>
 
+    <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
+      <ILCompilerPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
+    </KnownILCompilerPack>
+
+    <KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks">
+      <ILLinkPackVersion>$(MicrosoftNETCoreAppRefVersion)</ILLinkPackVersion>
+    </KnownILLinkPack>
   </ItemGroup>
 
   <!--
@@ -76,7 +73,9 @@
     <ProjectReference Include="$(RepoRoot)src\SignalR\clients\csharp\Client\src\Microsoft.AspNetCore.SignalR.Client.csproj" />
     <ProjectReference Include="$(RepoRoot)src\SignalR\server\SignalR\src\Microsoft.AspNetCore.SignalR.csproj" />
     <ProjectReference Include="$(RepoRoot)src\OpenApi\src\Microsoft.AspNetCore.OpenApi.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(RepoRoot)src\Validation\src\Microsoft.Extensions.Validation.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Validation\gen\Microsoft.Extensions.Validation.ValidationsGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(RepoRoot)src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
 </Project>
diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
index ea368a6caa54..38688d6a95f2 100644
--- a/eng/testing/linker/project.csproj.template
+++ b/eng/testing/linker/project.csproj.template
@@ -5,7 +5,6 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>{RuntimeIdentifier}</RuntimeIdentifier>
     <PublishAot>{PublishAot}</PublishAot>
-    <MicrosoftNETCoreAppRuntimeVersion>{MicrosoftNETCoreAppRuntimeVersion}</MicrosoftNETCoreAppRuntimeVersion>
     <MicrosoftNETCoreAppRefVersion>{MicrosoftNETCoreAppRefVersion}</MicrosoftNETCoreAppRefVersion>
     <RepoRoot>{RepoRoot}</RepoRoot>
     <!-- This warning code is no longer generated by new ILLinker, but the repo still uses the old ILLinker so we need to suppress temporarily -->
@@ -13,7 +12,7 @@
     <!-- Workaround while there is no SDK available that understands the TFM; suppress unsupported version errors. -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
     <_ExtraTrimmerArgs>{ExtraTrimmerArgs} $(_ExtraTrimmerArgs)</_ExtraTrimmerArgs>
-    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
+    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated;Microsoft.Extensions.Validation.Generated</InterceptorsPreviewNamespaces>
     <!-- Ensure individual warnings are shown when publishing -->
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
     {AdditionalProperties}
diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets
index 1018b14a641b..32235265135f 100644
--- a/eng/testing/linker/trimmingTests.targets
+++ b/eng/testing/linker/trimmingTests.targets
@@ -84,7 +84,6 @@
                                                  .Replace('{TargetFramework}', '%(TestConsoleApps.TargetFramework)')
                                                  .Replace('{RuntimeIdentifier}','%(TestConsoleApps.TestRuntimeIdentifier)')
                                                  .Replace('{PublishAot}','$(IsNativeAotTestProject)')
-                                                 .Replace('{MicrosoftNETCoreAppRuntimeVersion}','$(MicrosoftNETCoreAppRuntimeVersion)')
                                                  .Replace('{MicrosoftNETCoreAppRefVersion}','$(MicrosoftNETCoreAppRefVersion)')
                                                  .Replace('{RepoRoot}', '$(RepoRoot)')
                                                  .Replace('{ExtraTrimmerArgs}', '%(TestConsoleApps.ExtraTrimmerArgs)')
diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in
index 619ec1ded3d9..49747cadbe74 100644
--- a/eng/tools/GenerateFiles/Directory.Build.props.in
+++ b/eng/tools/GenerateFiles/Directory.Build.props.in
@@ -4,8 +4,6 @@
     <ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
     <TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
     <LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
-    
-    <!-- Temporarily hardcoded to true -->
-    <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
+    <_ProductVersionForInstallers>${MicrosoftAspNetCoreAppRuntimeVersion}</_ProductVersionForInstallers>
   </PropertyGroup>
 </Project>
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
index a056fb9edcfa..6f763355eb28 100644
--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
@@ -7,63 +7,65 @@
       Condition=" '$(UpdateAspNetCoreKnownFramework)' == '' ">true</UpdateAspNetCoreKnownFramework>
   </PropertyGroup>
 
-  <!-- Workaround when there is no vNext SDK available; copy known apphost/framework reference info from 8.0. -->
+  <!-- Workaround when there is no vNext SDK available; copy known apphost/framework reference info from 9.0. -->
   <ItemGroup>
     <KnownAppHostPack
-      Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+      Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="'@(KnownAppHostPack->Count())' != '0' AND
         !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
     <KnownRuntimePack
-      Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net8.0'))"
+      Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net9.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="'@(KnownRuntimePack->Count())' != '0' AND
         !(@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
     <KnownFrameworkReference
-      Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net8.0'))"
+      Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net9.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="'@(KnownFrameworkReference->Count())' != '0' AND
         !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
     <KnownILLinkPack
-      Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+      Include="@(KnownILLinkPack->WithMetadataValue('TargetFramework', 'net9.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="'@(KnownILLinkPack->Count())' != '0' AND
         !(@(KnownILLinkPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
     <KnownILCompilerPack
-      Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+      Include="@(KnownILCompilerPack->WithMetadataValue('TargetFramework', 'net9.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="'@(KnownILCompilerPack->Count())' != '0' AND
         !(@(KnownILCompilerPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
     <KnownWebAssemblySdkPack
-      Include="@(KnownWebAssemblySdkPack->WithMetadataValue('TargetFramework', 'net8.0'))"
+      Include="@(KnownWebAssemblySdkPack->WithMetadataValue('TargetFramework', 'net9.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="'@(KnownWebAssemblySdkPack->Count())' != '0' AND
         !(@(KnownWebAssemblySdkPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
+    <KnownAspNetCorePack
+      Include="@(KnownAspNetCorePack->WithMetadataValue('TargetFramework', 'net9.0'))"
+      TargetFramework="${DefaultNetCoreTargetFramework}"
+      Condition="'@(KnownAspNetCorePack->Count())' != '0' AND
+        !(@(KnownAspNetCorePack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
   </ItemGroup>
 
   <ItemGroup>
     <!--
       Reference base shared framework at incoming dependency flow version, not bundled sdk version.
-      Apply this to all projects that target the default tfm (e.g. net8.0) or a rid-based variant of it (e.g. net8.0-windows)
+      Apply this to all projects that target the default tfm (e.g. net9.0) or a rid-based variant of it (e.g. net9.0-windows)
     -->
     <FrameworkReference
       Update="Microsoft.NETCore.App"
       Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
-      RuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
+      RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}"
       TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />
-
-    <PackageReference Include="Microsoft.DotNet.ILCompiler"
-      Condition=" '$(PublishAot)' == 'true' "
-      Version="${MicrosoftNETCoreAppRuntimeVersion}" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Use the same NETCore shared framework as repo built against except when building product code in servicing. -->
-    <KnownFrameworkReference Update="Microsoft.NETCore.App">
+    <!-- We cannot use live shims when building tool packs in the .NET product mode as only packages for the current arch are available. -->
+    <KnownFrameworkReference Update="Microsoft.NETCore.App" Condition=" '$(DotNetBuild)' != 'true' OR '$(PackAsToolShimRuntimeIdentifiers)' == '' ">
       <LatestRuntimeFrameworkVersion
-          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</LatestRuntimeFrameworkVersion>
+          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</LatestRuntimeFrameworkVersion>
       <TargetingPackVersion
-          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</TargetingPackVersion>
+          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' and '$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRefVersion}</TargetingPackVersion>
       <!--
         Change the default shared framework version only when _not_ servicing. Avoid bumping version used in most
         projects. When servicing, projects (Microsoft.AspNetCore.App.Runtime in particular) can use
@@ -74,38 +76,49 @@
       -->
       <DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
           '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' AND
-          '$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRuntimeVersion}</DefaultRuntimeFrameworkVersion>
-      <RuntimePackRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
+          '$(TargetLatestDotNetRuntime)' != 'false' ">${MicrosoftNETCoreAppRefVersion}</DefaultRuntimeFrameworkVersion>
+      <RuntimePackRuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">%(RuntimePackRuntimeIdentifiers);$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
     </KnownFrameworkReference>
 
-    <KnownAppHostPack Update="Microsoft.NETCore.App">
+    <!-- We cannot use live shims when building tool packs in .NET product build mode as only packages for the current arch are available. -->
+    <KnownAppHostPack Update="Microsoft.NETCore.App" Condition=" '$(DotNetBuild)' != 'true' OR '$(PackAsToolShimRuntimeIdentifiers)' == '' ">
       <AppHostPackVersion
-        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</AppHostPackVersion>
+        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</AppHostPackVersion>
       <AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
     </KnownAppHostPack>
 
     <KnownRuntimePack Update="Microsoft.NETCore.App">
       <LatestRuntimeFrameworkVersion
-        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</LatestRuntimeFrameworkVersion>
+        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</LatestRuntimeFrameworkVersion>
       <AppHostRuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
     </KnownRuntimePack>
 
     <KnownWebAssemblySdkPack Update="Microsoft.NET.Sdk.WebAssembly.Pack">
       <WebAssemblySdkPackVersion
-        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</WebAssemblySdkPackVersion>
+        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</WebAssemblySdkPackVersion>
     </KnownWebAssemblySdkPack>
 
-    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
+    <KnownAspNetCorePack Update="Microsoft.AspNetCore.App.Internal.Assets">
+      <AspNetCorePackVersion
+        Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion}</AspNetCorePackVersion>
+    </KnownAspNetCorePack>
+
+    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
       <Crossgen2PackVersion
-          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</Crossgen2PackVersion>
-      <Crossgen2RuntimeIdentifiers>$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
+          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</Crossgen2PackVersion>
+      <Crossgen2RuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">%(Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier);$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
     </KnownCrossgen2Pack>
 
     <KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
       <ILLinkPackVersion
-          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</ILLinkPackVersion>
+          Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</ILLinkPackVersion>
     </KnownILLinkPack>
 
+    <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
+      <ILCompilerPackVersion
+        Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'">${MicrosoftNETCoreAppRefVersion}</ILCompilerPackVersion>
+    </KnownILCompilerPack>
+
     <!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
     <KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
       <LatestRuntimeFrameworkVersion
@@ -121,14 +134,14 @@
   </ItemGroup>
 
   <!-- When building and running locally, manually resolve the just-built frameworks. On Helix, let the SDK resolve the packs itself (they're laid out on top of the .NET SDK in the work items) -->
-  <PropertyGroup Condition="$(UpdateAspNetCoreKnownFramework) and '$(HELIX_CORRELATION_PAYLOAD)' == ''">
+  <PropertyGroup Condition="'$(UpdateAspNetCoreKnownFramework)' == 'true' AND '$(HELIX_CORRELATION_PAYLOAD)' == ''">
     <!-- Allow additional targeting and runtime packs to be downloaded only if required by a test. -->
     <EnableTargetingPackDownload Condition="'$(TestRequiresTargetingPackDownload)' != 'true'">false</EnableTargetingPackDownload>
     <EnableRuntimePackDownload Condition="'$(TestRequiresRuntimePackDownload)' != 'true'">false</EnableRuntimePackDownload>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
   </PropertyGroup>
 
-  <Target Name="ResolveLiveBuiltAspnetCoreKnownFramework" Condition="$(UpdateAspNetCoreKnownFramework) and '$(HELIX_CORRELATION_PAYLOAD)' == ''" AfterTargets="ResolveFrameworkReferences">
+  <Target Name="ResolveLiveBuiltAspnetCoreKnownFramework" Condition="'$(UpdateAspNetCoreKnownFramework)' == 'true' AND '$(HELIX_CORRELATION_PAYLOAD)' == ''" AfterTargets="ResolveFrameworkReferences">
     <Error Text="Requested Microsoft.AspNetCore.App v${MicrosoftAspNetCoreAppRefVersion} ref pack does not exist."
         Condition="!Exists('$(TargetingPackLayoutRoot)packs\Microsoft.AspNetCore.App.Ref\${MicrosoftAspNetCoreAppRefVersion}\data\FrameworkList.xml') " />
     <ItemGroup>
diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj
index 8a1be59353fe..48f57adcade4 100644
--- a/eng/tools/GenerateFiles/GenerateFiles.csproj
+++ b/eng/tools/GenerateFiles/GenerateFiles.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. -->
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
 
     <ConfigDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.config'))</ConfigDirectory>
@@ -23,7 +23,6 @@
         MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion);
         MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion);
         MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion);
-        MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
         MicrosoftPlaywrightCLIVersion=$(MicrosoftPlaywrightCLIVersion);
         LibNetHostAppPackVersion=$(BundledNETCoreAppPackageVersion);
         SupportedRuntimeIdentifiers=$([MSBuild]::Escape($(SupportedRuntimeIdentifiers)));
diff --git a/eng/tools/HelixTestRunner/HelixTestRunner.csproj b/eng/tools/HelixTestRunner/HelixTestRunner.csproj
index 91a6385bc2ec..b7c3c1a77023 100644
--- a/eng/tools/HelixTestRunner/HelixTestRunner.csproj
+++ b/eng/tools/HelixTestRunner/HelixTestRunner.csproj
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <!-- Update helix.proj when this TFM is updated. -->
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);CA2007;NU5104</NoWarn>
diff --git a/eng/tools/RepoTasks/GenerateTestDevCert.cs b/eng/tools/RepoTasks/GenerateTestDevCert.cs
new file mode 100644
index 000000000000..37a4b33216ed
--- /dev/null
+++ b/eng/tools/RepoTasks/GenerateTestDevCert.cs
@@ -0,0 +1,74 @@
+// 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.Linq;
+using System.Text.Json;
+using System.Threading;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace RepoTasks;
+
+/// <summary>
+/// Generates the test HTTPs certificate used by the template tests
+/// </summary>
+public class GenerateTestDevCert : Task
+{
+    [Required]
+    public string CertificatePath { get; private set; }
+
+    public override bool Execute()
+    {
+        Mutex mutex = null;
+        try
+        {
+            // MSBuild will potentially invoke this task in parallel across different subprocesses/nodes.
+            // The build is configured to generate the certificate in a single location, but multiple projects
+            // import the same targets that will use this task, which will result in multiple calls.
+            // To avoid issues where we try to generate multiple certificates on the same location, we wrap the
+            // usage in a named mutex which guarantees that only one instance will run at a time.
+            mutex = new(initiallyOwned: true, "Global\\GenerateTestDevCert", out var createdNew);
+            if (!createdNew)
+            {
+                // The mutex already exists, wait for it to be released.
+                mutex.WaitOne();
+            }
+
+            if (File.Exists(CertificatePath))
+            {
+                Log.LogMessage(MessageImportance.Normal, $"A test certificate already exists at {CertificatePath}");
+                return true;
+            }
+
+            var cert = DevelopmentCertificate.Create(CertificatePath);
+
+            var devCertJsonFile = Path.ChangeExtension(CertificatePath, ".json");
+            var devCertJson = new CertificateInfo
+            {
+                Password = cert.CertificatePassword,
+                Thumbprint = cert.CertificateThumbprint
+            };
+
+            using var file = File.OpenWrite(devCertJsonFile);
+            file.SetLength(0);
+            JsonSerializer.Serialize(file, devCertJson);
+        }
+        catch (Exception e)
+        {
+            Log.LogErrorFromException(e, showStackTrace: true);
+        }
+        finally
+        {
+            mutex.ReleaseMutex();
+        }
+
+        return !Log.HasLoggedErrors;
+    }
+
+    private class CertificateInfo
+    {
+        public string Password { get; set; }
+        public string Thumbprint { get; set; }
+    }
+}
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index c9fd42558d07..a13fe176e4e1 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
@@ -20,21 +21,30 @@
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
+
+    <Reference Include="System.Security.Cryptography.Pkcs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
+    <Compile Include="$(SharedSourceRoot)CertificateGeneration\**\*.cs" LinkBase="shared\CertificateGeneration" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Compile Remove="GenerateTestDevCert.cs" />
+    <Compile Remove="shared\CertificateGeneration\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
-    <!-- Manually updated version from 6.0.0 to address CVE-2023-29331 -->
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(RepoTasksSystemSecurityCryptographyXmlVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <PackageReference Include="Microsoft.IO.Redist" Version="$(MicrosoftIoRedistVersion)" />
     <PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
 
+    <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Tasks.v4.0" />
@@ -46,4 +56,5 @@
       <HintPath>$(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.Package.dll</HintPath>
     </Reference>
   </ItemGroup>
+
 </Project>
diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks
index c5722a9e266d..b6cd9a820d1e 100644
--- a/eng/tools/RepoTasks/RepoTasks.tasks
+++ b/eng/tools/RepoTasks/RepoTasks.tasks
@@ -10,5 +10,6 @@
   <UsingTask TaskName="RepoTasks.GenerateSharedFrameworkDepsFile" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.CreateFrameworkListFile" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.RemoveSharedFrameworkDependencies" AssemblyFile="$(_RepoTaskAssembly)" />
+  <UsingTask TaskName="RepoTasks.GenerateTestDevCert" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="DownloadFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
 </Project>
diff --git a/eng/tools/RepoTasks/shared/CertificateGeneration/DevelopmentCertificate.cs b/eng/tools/RepoTasks/shared/CertificateGeneration/DevelopmentCertificate.cs
new file mode 100644
index 000000000000..a7c826021814
--- /dev/null
+++ b/eng/tools/RepoTasks/shared/CertificateGeneration/DevelopmentCertificate.cs
@@ -0,0 +1,45 @@
+// 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.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Certificates.Generation;
+
+namespace RepoTasks;
+
+public readonly struct DevelopmentCertificate
+{
+    public DevelopmentCertificate(string certificatePath, string certificatePassword, string certificateThumbprint)
+    {
+        CertificatePath = certificatePath;
+        CertificatePassword = certificatePassword;
+        CertificateThumbprint = certificateThumbprint;
+    }
+
+    public readonly string CertificatePath { get; }
+    public readonly string CertificatePassword { get; }
+    public readonly string CertificateThumbprint { get; }
+
+    public static DevelopmentCertificate Create(string certificatePath)
+    {
+        var certificatePassword = "";
+        var certificateThumbprint = EnsureDevelopmentCertificates(certificatePath, certificatePassword);
+
+        return new DevelopmentCertificate(certificatePath, certificatePassword, certificateThumbprint);
+    }
+
+    private static string EnsureDevelopmentCertificates(string certificatePath, string certificatePassword)
+    {
+        var now = DateTimeOffset.Now;
+        var manager = CertificateManager.Instance;
+        var certificate = manager.CreateAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));
+        var certificateThumbprint = certificate.Thumbprint;
+        manager.ExportCertificate(certificate, path: certificatePath, includePrivateKey: true, certificatePassword, CertificateKeyExportFormat.Pfx);
+
+        return certificateThumbprint;
+    }
+}
diff --git a/eng/tools/RepoTasks/shared/CertificateGeneration/Global.cs b/eng/tools/RepoTasks/shared/CertificateGeneration/Global.cs
new file mode 100644
index 000000000000..b9ed6282209f
--- /dev/null
+++ b/eng/tools/RepoTasks/shared/CertificateGeneration/Global.cs
@@ -0,0 +1,6 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+global using System;
+global using System.Collections.Generic;
+global using System.IO;
diff --git a/eng/tools/tools.slnf b/eng/tools/tools.slnf
index bdd4896e94f4..b7524a84eccd 100644
--- a/eng/tools/tools.slnf
+++ b/eng/tools/tools.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "eng\\tools\\BaselineGenerator\\BaselineGenerator.csproj",
       "eng\\tools\\RepoTasks\\RepoTasks.csproj",
diff --git a/es-metadata.yml b/es-metadata.yml
new file mode 100644
index 000000000000..a9fe05cc4ca9
--- /dev/null
+++ b/es-metadata.yml
@@ -0,0 +1,8 @@
+schemaVersion: 0.0.1
+isProduction: true
+accountableOwners:
+  service: 4db45fa9-fb0f-43ce-b523-ad1da773dfbc
+routing:
+  defaultAreaPath:
+    org: devdiv
+    path: DevDiv\ASP.NET Core\Policy Violations
diff --git a/get.hashes.ps1 b/get.hashes.ps1
new file mode 100644
index 000000000000..d154abba577d
--- /dev/null
+++ b/get.hashes.ps1
@@ -0,0 +1,8 @@
+$files = Get-ChildItem .\artifacts\installers\Release\* -Include ('*.msi') -File
+
+Write-Output "SHA-1 hashes of the installers are,`n"
+
+foreach ($file in $files) {
+    $hash = Get-FileHash $file.FullName -Algorithm SHA1
+    Write-Output "* $($file.Name): $($hash.Hash)"
+}
diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc
index 022528b04cce..cb4e76360d22 100644
--- a/github-merge-flow.jsonc
+++ b/github-merge-flow.jsonc
@@ -1,20 +1,20 @@
 // IMPORTANT: This file is read by the merge flow from main branch only. 
 {
     "merge-flow-configurations": {
-        // Automate opening PRs to merge release/9.0 to main
-        "release/9.0":{
+        // Automate opening PRs to merge release/10.0 to main
+        "release/10.0":{
             "MergeToBranch": "main",
             "ExtraSwitches": "-QuietComments"
         },
-        // Automate opening PRs to merge release/9.0-rc1 to release/9.0
-        "release/9.0-rc1":{
-            "MergeToBranch": "release/9.0",
+        // Automate opening PRs to merge release/10.0-rc1 to release/10.0
+        "release/10.0-rc1":{
+            "MergeToBranch": "release/10.0",
             "ExtraSwitches": "-QuietComments"
         },
-        // Automate opening PRs to merge release/9.0-rc2 to release/9.0
-        "release/9.0-rc2":{
-            "MergeToBranch": "release/9.0",
+        // Automate opening PRs to merge release/10.0-rc2 to release/10.0
+        "release/10.0-rc2":{
+            "MergeToBranch": "release/10.0",
             "ExtraSwitches": "-QuietComments"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/global.json b/global.json
index d4c978d226d2..3aabfb8498f6 100644
--- a/global.json
+++ b/global.json
@@ -1,19 +1,19 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12"
+    "version": "10.0.100-rc.1.25451.107"
   },
   "tools": {
-    "dotnet": "9.0.100-rc.1.24452.12",
+    "dotnet": "10.0.100-rc.1.25451.107",
     "runtimes": {
       "dotnet/x86": [
-        "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
+        "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
       ],
       "dotnet": [
-        "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
+        "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
       ]
     },
     "vs": {
-      "version": "17.2",
+      "version": "17.13",
       "components": [
         "Microsoft.VisualStudio.Component.VC.ATL",
         "Microsoft.VisualStudio.Component.VC.ATL.ARM64",
@@ -21,13 +21,17 @@
         "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
       ]
     },
-    "xcopy-msbuild": "17.1.0"
+    "xcopy-msbuild": "17.13.0"
   },
   "native-tools": {
-    "jdk": "11"
+    "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25515.111",
+    "Microsoft.Build.NoTargets": "3.7.0",
+    "Microsoft.Build.Traversal": "3.4.0",
+    "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 01c597224000..8dda72e96a3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "aspnetcore",
+  "name": "@microsoft/aspnetcore",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "aspnetcore",
+      "name": "@microsoft/aspnetcore",
       "version": "1.0.0",
       "workspaces": [
         "src/SignalR/clients/ts/signalr",
@@ -74,13 +74,14 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha1-iC/Z4J6O4yTklr0EBAHG8EbvRGU=",
+      "version": "7.26.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha1-S1+rl9MzOO/5FiNQVfDrwh5XOoU=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -88,9 +89,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/compat-data/-/compat-data-7.24.8.tgz",
-      "integrity": "sha1-+RlkVTNMONBZrIsaFqUd7NqdMNM=",
+      "version": "7.26.8",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha1-ghwdNWQcNVKE1KhwuKSnsMFB42c=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -98,22 +99,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/core/-/core-7.24.8.tgz",
-      "integrity": "sha1-wk+DmFIU9ZnO5fwm05PZqzIDQvQ=",
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/core/-/core-7.26.10.tgz",
+      "integrity": "sha1-XIdvg8jE3LIz7ktnDAYG8qwwAPk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.8",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-module-transforms": "^7.24.8",
-        "@babel/helpers": "^7.24.8",
-        "@babel/parser": "^7.24.8",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.8",
-        "@babel/types": "^7.24.8",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.10",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.10",
+        "@babel/parser": "^7.26.10",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.10",
+        "@babel/types": "^7.26.10",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -129,13 +130,13 @@
       }
     },
     "node_modules/@babel/core/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -146,66 +147,46 @@
         }
       }
     },
-    "node_modules/@babel/core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@babel/generator": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/generator/-/generator-7.24.8.tgz",
-      "integrity": "sha1-GALWrE13qRmcda4+tqCDNuXR05o=",
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/generator/-/generator-7.26.10.tgz",
+      "integrity": "sha1-pg2d5JysoWdE5jQMNljf72E4w/c=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.8",
+        "@babel/parser": "^7.26.10",
+        "@babel/types": "^7.26.10",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha1-U3PHvINmsSoDO0vhrBOiBsZlaqs=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
-      "integrity": "sha1-N9Zv6wEgJPJCK3Yrmyp8/ifH+6M=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha1-2OrE0twNe24R+m5TUzLg0xhPBrQ=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
-      "integrity": "sha1-tgfDFhzZ0XRJd9T5cTlXL+d4wnE=",
+      "version": "7.26.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha1-ddkruNjVEwHA1J5Splyaf+lFFNg=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.8",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -214,20 +195,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz",
-      "integrity": "sha1-R/VGQI0TwgDAhn+dk1GE6qCFGwk=",
+      "version": "7.26.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz",
+      "integrity": "sha1-1vg+MDlUf7s5ln54BDzTyLeCDHE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.8",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.26.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -238,14 +217,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
-      "integrity": "sha1-vk9DWoDcKwU8du60t9Ft0iz8ido=",
+      "version": "7.26.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha1-UWl1bsvh2V94ZrkLtVWwIllTAqA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -256,9 +235,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-      "integrity": "sha1-GFlPeJw1lKyyTP20p/e30ui9kS0=",
+      "version": "0.6.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha1-9PJ5L64u84IHS8LXE1Is8k5t2yE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -273,13 +252,13 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -290,93 +269,44 @@
         }
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha1-SzG6lVHR+QeBuoNJHdWc+bJp99k=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-      "integrity": "sha1-dfHhcldC85rGWE7gsW2UUT2jjdI=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-      "integrity": "sha1-tO3hzeL9iUNjl/MNyTdu4GsPJe4=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
-      "integrity": "sha1-YVXgeckTNX0kpMIEgNt8cSpcP7Y=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha1-nf/+RvcnAFpeopBRrINftzXkwaM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.8",
-        "@babel/types": "^7.24.8"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha1-8vmAOS3luEwzKPxx04vYG7uDBCs=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha1-5/jSBgLr2/nrvqCgdR+w8qQUFxU=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-module-transforms/-/helper-module-transforms-7.24.8.tgz",
-      "integrity": "sha1-sfLfT5bzRlsNA1tpfshstR/zSP4=",
+      "version": "7.26.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha1-jOVOydWSaV5Y2EzYhLe1xqL97q4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -386,22 +316,22 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
-      "integrity": "sha1-iwoEVskvazI9J8/QDR1mTnZpKg8=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha1-MySuULrn4qs8M/YMmod7agFGtU4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha1-lO5n6OwOXUTqe661Hlcb0mrweHg=",
+      "version": "7.26.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha1-GFgNAMmTQRetcZOSxPZYXJMzzDU=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -409,15 +339,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
-      "integrity": "sha1-s/DyA2KFInE4SdSUA/GkFEaL5Mc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha1-5TlWqz1bn7iL4Es+LzG1I6/TS5I=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.24.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -427,15 +357,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
-      "integrity": "sha1-+TO37tgaHAJldA7ckUkc5RJQ92U=",
+      "version": "7.26.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+      "integrity": "sha1-bLBOgq4pHa6OcjNd/kOLByXxTI0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -444,51 +374,24 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha1-vK3o2jrsjtFrnElTt05Qa1G17bM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
-      "integrity": "sha1-X4+oO2ntXCetxWBE+L4rPqlmadk=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha1-g5SUNokOB/o9aHPGGpbju/aS2FY=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha1-Cy4bYtVg1rGVSJP9K3BdwXyR8Mk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha1-WzMpyaWIA9XfQl5XhYZYgagcpI0=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha1-Gqu3Lucu01eJtLvK08ooYs5hTow=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -496,9 +399,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha1-dbiJz6+eNcKq9Czw1yyOkXGSUds=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha1-JLZOLD7HzTs8VHcpuNFocfIsvcc=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -506,9 +409,9 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha1-NyXN7qi0gOhtNN8VMEgGoGl14z0=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha1-huRb2KSat+A/J2V3+WF5ZT1B2nI=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -516,73 +419,75 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
-      "integrity": "sha1-UtiTr35C7cp8bSxnZFSYJjNqrh8=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha1-2Z39WVMS5siUvX0jdHACXIXuqdA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helpers/-/helpers-7.24.8.tgz",
-      "integrity": "sha1-KCDWTV1mhsyoeJ3RWwdM2GJ5WHM=",
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/helpers/-/helpers-7.26.10.tgz",
+      "integrity": "sha1-a66jzWLsLQwQaHeNY8sTFPZjc4Q=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.8"
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha1-oFqx3xNLKGVYquDtQebF9zG/QJ0=",
+    "node_modules/@babel/parser": {
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/parser/-/parser-7.26.10.tgz",
+      "integrity": "sha1-6b24LxS5ffZWmwsDjt1DaDnFd0k=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/types": "^7.26.10"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/parser": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/parser/-/parser-7.24.8.tgz",
-      "integrity": "sha1-WKTbvK1+sdSJMFJKP9k9k+kITG8=",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha1-zC5T6/CgNAd3//XtUhlD4lO02P4=",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "parser": "bin/babel-parser.js"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz",
-      "integrity": "sha1-/QWf0nsYTqK0x+ZGhoqaOBu8MFU=",
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha1-r55PtjzLiry5I3Wy/P42tgx3TTA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -592,13 +497,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
-      "integrity": "sha1-RoCWykS7y+j8xXBXThLrGVDhgQc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha1-6Nwm/NYW5sW/K9DVosFR1PkqkTc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -608,15 +513,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
-      "integrity": "sha1-5Oq91RCazDmbONeZmy72b8ICL4k=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha1-gHpmf5FYrKxvYWS0vrha2evJ4dE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -626,14 +531,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
-      "integrity": "sha1-cbIbsChtWBDmOhU4qpAcWOhzdew=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha1-3nCT8efer2jq3XzGsH8quCVDJp4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -710,40 +615,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha1-AolkqbqA28CUyRXEh618TnpmRlo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
-      "integrity": "sha1-KgtAa1hxogqEEkBYaxMAziCIp3g=",
+      "version": "7.26.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha1-YgQSQFBY76VuSlZJA7eTVQIPRF8=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -753,13 +632,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
-      "integrity": "sha1-tPnqlaeeaRJIDEtiZzn4agdmJMo=",
+      "version": "7.26.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha1-OxQShHaZ7qc5tPJgLHTONvawsPc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -795,13 +674,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
-      "integrity": "sha1-OaH6Sn49PX804qzGvlhbcY0w4C0=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha1-o0MToXjqVvGVFZm5KcHOrO5xkpA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -921,13 +800,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
-      "integrity": "sha1-WNRYJxtNO2uyfuaslSWsuyWbrRw=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha1-Z92it02kNyfPIdRs+a/vI/Q2U5k=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -954,13 +833,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
-      "integrity": "sha1-T2iGwR5CO9afPOUdv0JCSl8nVRQ=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha1-eCHUQQvuXaqtu0zdmmZJcE4XaEU=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -970,16 +849,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz",
-      "integrity": "sha1-czClxQ4FGBylI1G4/QFkIADJbP0=",
+      "version": "7.26.8",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
+      "integrity": "sha1-XjmRE147nG6q9e/1bRrloR30X/g=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-remap-async-to-generator": "^7.24.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.26.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -989,15 +867,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
-      "integrity": "sha1-cqOvbEUdV1hCp+m1oChjQUNVvcw=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+      "integrity": "sha1-yAAI2srlFIJ5PlqcCLOaW+fhLXE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-remap-async-to-generator": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1007,13 +885,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
-      "integrity": "sha1-pCUdmOoMDzmdr+GjWAHqukVbvx8=",
+      "version": "7.26.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+      "integrity": "sha1-PcRAXTGtHL5FKTqlcgWm47AJ1T4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1023,13 +901,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
-      "integrity": "sha1-QgY+TeuFDHvXxV5ia/Tnq0jmzgI=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha1-wzZl5GsGdZyTaHyg+EOVuAwEc6E=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1039,14 +917,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
-      "integrity": "sha1-JWh5RntXsLaMfd/Ft2WE85jNaDQ=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha1-qM6E/tua1RJUmYQQH6hAgKn19R8=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1056,15 +934,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
-      "integrity": "sha1-yCAn67cBC8M8EW1LUET7v4wFSE0=",
+      "version": "7.26.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha1-bI2iGfTrFcrpg07ENI/46eCWZKA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1074,19 +951,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz",
-      "integrity": "sha1-rSMwH+W8FTykz3+1cqm8iwtxHPc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha1-cVJFf3iAtZOmOt6Khh5uJqRGn1I=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1097,14 +972,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
-      "integrity": "sha1-TKsyFOgLxx+uOFMjjRPQl7AExwc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha1-2zZJLHhGDlNLiFKx1b7+PJI+8Qs=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/template": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1114,13 +989,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz",
-      "integrity": "sha1-yCjoFNvkKicYqDjCouFqQI4FVVA=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha1-lm6iWVxJgiQ0CINgLTz9egx5zqE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1130,14 +1005,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
-      "integrity": "sha1-X4v4poDyEWpyB+FiiKX5dK1Hp6A=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha1-uteUXdB3NMpS/jrU6HK0DtCbsJo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1147,13 +1022,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
-      "integrity": "sha1-3SAQKJfJojJOWt//tn/zYQNZqO4=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha1-iFDd9X3OKuu0OUu0NKdZgDEFnm0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1162,15 +1037,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha1-b3JZtN4SdyGgjx5RZbhS/KppbTE=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
-      "integrity": "sha1-TYuV47risDdnMJGqCc0z/s1kGfQ=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha1-I+kX3mPtI8ZgDF3QbZRmnc5597g=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1180,14 +1071,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
-      "integrity": "sha1-tinuImRfQSAkKX1SRbzkJcMfmw0=",
+      "version": "7.26.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha1-4p8Btt4wLHwseUJ3pI8Eqcp/A7w=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1197,14 +1087,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
-      "integrity": "sha1-F21S2NjtUWrq5wE+6VVtVAxT8Zc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha1-kHRf5VBTOU9VTkBYTNqB8sikAqI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1214,14 +1103,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
-      "integrity": "sha1-8lsz9y3x2L52OZ4bjz+dNm61vHA=",
+      "version": "7.26.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
+      "integrity": "sha1-JyMfedUXDvM7URHwf+XK/rLJalY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1231,15 +1120,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
-      "integrity": "sha1-bYYB+//mZciURAq0RwvHId2RMdY=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha1-k52VbmimBmYQBb/VUMT8Lvlfe5c=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1249,14 +1138,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
-      "integrity": "sha1-8+nDfAo3P+6G42iA1Fs2ZM7a9zo=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha1-yG20B8uCfN7ZAqkMcH0ngaqolmA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1266,13 +1154,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
-      "integrity": "sha1-NrUFweZVFRqddgd5mpmI/FRn0Gw=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha1-GhxrTUqlm8TK1bazoiOgq9aFyd4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1282,14 +1170,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
-      "integrity": "sha1-pY+27aFsncj5/xx7G6bet/RpTLA=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha1-sZRBqMOaL9oJApALMG6gWuEFXbc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1299,13 +1186,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
-      "integrity": "sha1-O0RU+w4wLhi6SUW6MkassSSDFd8=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha1-Y9/xl2PqZKMfXmwglX5qJeQe1d4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1315,14 +1202,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
-      "integrity": "sha1-ZQkO1JPEqDSXajyhzed25sz/Mtc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha1-SbpHjyKVEBVEq9eUSGzTCI3dtsU=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1332,15 +1219,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz",
-      "integrity": "sha1-q2Qh5WS3F8tHXW//cK5/EDU26jw=",
+      "version": "7.26.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha1-jwEdRLINAsPeRNiFDZcdhJf5gfs=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-simple-access": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1350,16 +1236,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
-      "integrity": "sha1-+AEjFsUJj26N7m7NWOK8bwA9DOc=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha1-i9G0ODYmnj0zMHFRoRS887pnk/g=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1369,14 +1255,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
-      "integrity": "sha1-7dn0PsVJCZYg333yTnuhO1x278g=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha1-ZxAHnN18aU2zZSmh6EEeSfy/FMk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1386,14 +1272,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
-      "integrity": "sha1-kELpuFa8azaIwMLkBg6eELFGCSM=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha1-RUmQrmzCL9Kg+mCzosb2OjgGTmo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1403,13 +1289,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
-      "integrity": "sha1-Mf9UxOBVXMVJ1YFuSrOSQd+2qwA=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha1-QuYXESlLEFwkgzbcsEt3BU6ovs0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1419,14 +1305,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
-      "integrity": "sha1-HeRTTFkK+VlvU9Z/UqkvEtuYQSA=",
+      "version": "7.26.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+      "integrity": "sha1-+/azySy1CeezGe5G49qJxb7dMf4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1436,14 +1321,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
-      "integrity": "sha1-vqYrU4yAYF2KD6ybQPSOl++n3mM=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha1-v+11hmJhqLZDRosMz9J18gMyFKE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1453,16 +1337,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
-      "integrity": "sha1-0Tork0Na64oZfhFSIcqyZrpuVdY=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha1-AgNyUCUHQWSAi88aLPqQxlLJnxg=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1472,14 +1355,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
-      "integrity": "sha1-Zu6v94MLupRd2JibYypAwE7WJb4=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha1-OF1d4TUWKTO+tKPSJ6K35Su0zwM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1489,14 +1372,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
-      "integrity": "sha1-AOq9iD0N1qYMHFV1SHhZGbbnF7Q=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha1-EOcNltUrsfEMXKqsWaxUXqK6f/M=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1506,15 +1388,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz",
-      "integrity": "sha1-uwKme2D/BAYIXBPRBMmag1zfNl0=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha1-4ULriZ0m73FUNfIBq24TlUHu590=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1524,13 +1405,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
-      "integrity": "sha1-WIHwriEBhADjIPx+uBflKdElS2g=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha1-uFaEIgWz534Yt6ehuUlYBpx7olc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1540,14 +1421,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
-      "integrity": "sha1-5jGHRrKucKWdAj1cwTRKK6enX14=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha1-hH9BOSY1d1JkVdfTIjzYvaUeO1c=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1557,16 +1438,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
-      "integrity": "sha1-TuxrxwEojB+rX3LmpLvJ1n+soGE=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha1-nItz5k5sw8uydDYziFp90sOF/jM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1576,13 +1456,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
-      "integrity": "sha1-8NLtg4DfvtlJxC1NeQJmUl1ju9w=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha1-1y1Yi9iLDeyLYuNvb9qRzt/ijj8=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1592,13 +1472,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
-      "integrity": "sha1-AhVi3kU02LSxhRdZ/Xr04F0sR/g=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha1-A6ikZw1s666VMFrG3vrIHs53dAs=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -1608,14 +1488,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.26.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+      "integrity": "sha1-L1g3pbXNOEKpGdgUfpkDzHRVuFA=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
-      "integrity": "sha1-gAN/5PvwMfwRJQIheP85OLs3Q6Q=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha1-A5iu0vHxC6P3ipPbIZsn70F/uc4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1625,13 +1522,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
-      "integrity": "sha1-hUSMa5luEi+p4ol0YUCqqZ2mTnM=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha1-u3heYJH5n4JqlfmJT8Fv3mHBY/I=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1641,14 +1538,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
-      "integrity": "sha1-6KOMD954guD7jxYDePdL2IXMe7M=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha1-JKNRU5MbS6PRPOxKd0jCGrVRTvk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1658,13 +1555,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
-      "integrity": "sha1-lq6A16flJR9le1zxjx6mv5JvX+s=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha1-x/ArlE6YakF4F7ILosUE38FFPTI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1674,13 +1571,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
-      "integrity": "sha1-oF3rtKkHKuj5hbz3fz8hVDTI+Mg=",
+      "version": "7.26.8",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
+      "integrity": "sha1-lmsV0VOpkRcqVApprV4YRc7ZkLU=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1690,13 +1587,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
-      "integrity": "sha1-OD2rN/sHP1v+bmDGVMqsMJ+Suhw=",
+      "version": "7.26.7",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+      "integrity": "sha1-0OM6zZIjdEwehX29b6F70KN4aTc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1706,16 +1603,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.8.tgz",
-      "integrity": "sha1-wQTWKG4Ev35EuMuhtobUG61X64Q=",
+      "version": "7.26.8",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.8.tgz",
+      "integrity": "sha1-LpyqhwqhAvUNcSUkDZ2/kTNLCVA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-create-class-features-plugin": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/plugin-syntax-typescript": "^7.24.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-syntax-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1725,13 +1623,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
-      "integrity": "sha1-ICOoLO0ftJcWMKLgeXZFAsQUjg4=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha1-p17zlHzhU2P8yqOOLdm8cLJ4i4I=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1741,14 +1639,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
-      "integrity": "sha1-kHOkzRO4bqccMmRllZCsCGYFu80=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha1-qQHpbywdBxsNG7XcDTyIDOj1PdM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1758,14 +1656,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
-      "integrity": "sha1-38PUpREnEICZsZgXwJY75qKt8Z8=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha1-Xq50f+OerPE6i9AGpPsLXR+l6bE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1775,14 +1673,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
-      "integrity": "sha1-1AcF1nUjgDpXbinGPO9uUWuFjtk=",
+      "version": "7.25.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha1-ZRFMF7T/wg+lsWPGPHDA0lYh+r4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1792,92 +1690,80 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/preset-env/-/preset-env-7.24.8.tgz",
-      "integrity": "sha1-4NuU1/F9bw4lZOjSkZC8jNrOwtE=",
+      "version": "7.26.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/preset-env/-/preset-env-7.26.9.tgz",
+      "integrity": "sha1-LsZOkD0O/nQ2mfd6EL33lVwhI8M=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.8",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-validator-option": "^7.24.8",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
+        "@babel/compat-data": "^7.26.8",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.7",
-        "@babel/plugin-syntax-import-attributes": "^7.24.7",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-import-assertions": "^7.26.0",
+        "@babel/plugin-syntax-import-attributes": "^7.26.0",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.7",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.7",
-        "@babel/plugin-transform-async-to-generator": "^7.24.7",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
-        "@babel/plugin-transform-block-scoping": "^7.24.7",
-        "@babel/plugin-transform-class-properties": "^7.24.7",
-        "@babel/plugin-transform-class-static-block": "^7.24.7",
-        "@babel/plugin-transform-classes": "^7.24.8",
-        "@babel/plugin-transform-computed-properties": "^7.24.7",
-        "@babel/plugin-transform-destructuring": "^7.24.8",
-        "@babel/plugin-transform-dotall-regex": "^7.24.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
-        "@babel/plugin-transform-dynamic-import": "^7.24.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
-        "@babel/plugin-transform-for-of": "^7.24.7",
-        "@babel/plugin-transform-function-name": "^7.24.7",
-        "@babel/plugin-transform-json-strings": "^7.24.7",
-        "@babel/plugin-transform-literals": "^7.24.7",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
-        "@babel/plugin-transform-modules-amd": "^7.24.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.7",
-        "@babel/plugin-transform-modules-umd": "^7.24.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
-        "@babel/plugin-transform-new-target": "^7.24.7",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
-        "@babel/plugin-transform-numeric-separator": "^7.24.7",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
-        "@babel/plugin-transform-object-super": "^7.24.7",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.8",
-        "@babel/plugin-transform-parameters": "^7.24.7",
-        "@babel/plugin-transform-private-methods": "^7.24.7",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
-        "@babel/plugin-transform-property-literals": "^7.24.7",
-        "@babel/plugin-transform-regenerator": "^7.24.7",
-        "@babel/plugin-transform-reserved-words": "^7.24.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
-        "@babel/plugin-transform-spread": "^7.24.7",
-        "@babel/plugin-transform-sticky-regex": "^7.24.7",
-        "@babel/plugin-transform-template-literals": "^7.24.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-regex": "^7.24.7",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+        "@babel/plugin-transform-arrow-functions": "^7.25.9",
+        "@babel/plugin-transform-async-generator-functions": "^7.26.8",
+        "@babel/plugin-transform-async-to-generator": "^7.25.9",
+        "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
+        "@babel/plugin-transform-block-scoping": "^7.25.9",
+        "@babel/plugin-transform-class-properties": "^7.25.9",
+        "@babel/plugin-transform-class-static-block": "^7.26.0",
+        "@babel/plugin-transform-classes": "^7.25.9",
+        "@babel/plugin-transform-computed-properties": "^7.25.9",
+        "@babel/plugin-transform-destructuring": "^7.25.9",
+        "@babel/plugin-transform-dotall-regex": "^7.25.9",
+        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-dynamic-import": "^7.25.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+        "@babel/plugin-transform-for-of": "^7.26.9",
+        "@babel/plugin-transform-function-name": "^7.25.9",
+        "@babel/plugin-transform-json-strings": "^7.25.9",
+        "@babel/plugin-transform-literals": "^7.25.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+        "@babel/plugin-transform-modules-amd": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.26.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+        "@babel/plugin-transform-modules-umd": "^7.25.9",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-new-target": "^7.25.9",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
+        "@babel/plugin-transform-numeric-separator": "^7.25.9",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+        "@babel/plugin-transform-object-super": "^7.25.9",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9",
+        "@babel/plugin-transform-private-methods": "^7.25.9",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+        "@babel/plugin-transform-property-literals": "^7.25.9",
+        "@babel/plugin-transform-regenerator": "^7.25.9",
+        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+        "@babel/plugin-transform-reserved-words": "^7.25.9",
+        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+        "@babel/plugin-transform-spread": "^7.25.9",
+        "@babel/plugin-transform-sticky-regex": "^7.25.9",
+        "@babel/plugin-transform-template-literals": "^7.26.8",
+        "@babel/plugin-transform-typeof-symbol": "^7.26.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-corejs3": "^0.11.0",
         "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.37.1",
+        "core-js-compat": "^3.40.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1903,17 +1789,17 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz",
-      "integrity": "sha1-Zs2G6o+MAUhVZx1eqac3E5y7/vE=",
+      "version": "7.26.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz",
+      "integrity": "sha1-SlcPG40QSiQtkjlX/6Hq/xQqEG0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-option": "^7.24.7",
-        "@babel/plugin-syntax-jsx": "^7.24.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.7",
-        "@babel/plugin-transform-typescript": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1922,17 +1808,10 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha1-8LppsHXh8F+yglt/rZkeetuxgxA=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@babel/runtime": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/runtime/-/runtime-7.24.8.tgz",
-      "integrity": "sha1-XZWMOCexPMbQXgOMB/suXjQg2C4=",
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha1-oHtNj6J68TGmM9ezUk24A+tHZMI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1943,35 +1822,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha1-Au/O4xfQYJ0sBxF8tw74+xercxU=",
+      "version": "7.26.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha1-RXetPd9D0ZRSjP9OH6ayMvpgm7I=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/traverse/-/traverse-7.24.8.tgz",
-      "integrity": "sha1-bBTtUjK3VJ3zNx2CD72av819+rc=",
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/traverse/-/traverse-7.26.10.tgz",
+      "integrity": "sha1-Q8yjPXYAXbqpMCT65TbMGUakw4A=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.8",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.8",
-        "@babel/types": "^7.24.8",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.10",
+        "@babel/parser": "^7.26.10",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.10",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1980,13 +1856,13 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1997,23 +1873,15 @@
         }
       }
     },
-    "node_modules/@babel/traverse/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@babel/types": {
-      "version": "7.24.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/types/-/types-7.24.8.tgz",
-      "integrity": "sha1-1R/6kEOxfTZiLvpE6GGknmnhMKg=",
+      "version": "7.26.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@babel/types/-/types-7.26.10.tgz",
+      "integrity": "sha1-OWOC9jNb1P62V0Hqz8gIIY+Fklk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2097,25 +1965,28 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha1-ojUU6Pua8SadX3eIqlVnmNYca1k=",
+      "version": "4.5.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@eslint-community/eslint-utils/-/eslint-utils-4.5.0.tgz",
+      "integrity": "sha1-cWY39QiordWBTMZMVuWMzle9vpM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha1-sP/QMStKP9LW93I35ySKWtOmgK4=",
+      "version": "4.12.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha1-z8bP/jnfOQo4Qc3iq8z5Lqp64OA=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2154,13 +2025,13 @@
       "license": "Python-2.0"
     },
     "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2200,13 +2071,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/type-fest/-/type-fest-0.20.2.tgz",
@@ -2221,9 +2085,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha1-pUF66EJ4c/HdCLcLNXS0U+Z7X38=",
+      "version": "8.57.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha1-3mM9s+wu9qPIni8ZA4Bj6KEi4sI=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2238,13 +2102,13 @@
       "license": "MIT"
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha1-145IGgOfdWbsyWYLTqf+ax/sRCs=",
+      "version": "0.13.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha1-+5B2JN8yVtBLmqLfUNeql+xkh0g=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -2253,13 +2117,13 @@
       }
     },
     "node_modules/@humanwhocodes/config-array/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2270,13 +2134,6 @@
         }
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2317,9 +2174,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo=",
+      "version": "6.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha1-lexAnGlhnWyxuLNPFLZg7yjr1lQ=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2446,82 +2303,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/core": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jest/core/-/core-29.7.0.tgz",
@@ -2571,96 +2352,33 @@
       }
     },
     "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+    "node_modules/@jest/core/node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha1-ykLHWDEPNlv6caC9oKgHFgt3aBI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha1-ykLHWDEPNlv6caC9oKgHFgt3aBI=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/core/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/@jest/core/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -2668,19 +2386,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/environment": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jest/environment/-/environment-29.7.0.tgz",
@@ -2802,59 +2507,6 @@
         }
       }
     },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@jest/reporters/node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
@@ -2876,16 +2528,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
       "version": "6.0.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
@@ -2904,9 +2546,9 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -2916,19 +2558,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jest/schemas/-/schemas-29.6.3.tgz",
@@ -3016,82 +2645,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@jest/transform/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/types": {
       "version": "29.6.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jest/types/-/types-29.6.3.tgz",
@@ -3110,121 +2663,45 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.8",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha1-Tw4GNi4BNi+CPTSPGHKwj2ZtgUI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha1-eg7mAfYPmaIMfHxf8MgDiMEYm9Y=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha1-VY+2Ry7RakyFC4iVMOazZDjEkoA=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha1-3M5q/3S99trRqVgCtpsEovyx+zY=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha1-eg7mAfYPmaIMfHxf8MgDiMEYm9Y=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha1-VY+2Ry7RakyFC4iVMOazZDjEkoA=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha1-nXHKiG4yUC65NiyadKRnh8Nt+Bo=",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha1-nXHKiG4yUC65NiyadKRnh8Nt+Bo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3250,10 +2727,42 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@microsoft/client-ts": {
+      "resolved": "src/SignalR/clients/ts",
+      "link": true
+    },
+    "node_modules/@microsoft/components.authentication": {
+      "resolved": "src/Components/WebAssembly/WebAssembly.Authentication/src/Interop",
+      "link": true
+    },
     "node_modules/@microsoft/dotnet-js-interop": {
       "resolved": "src/JSInterop/Microsoft.JSInterop.JS/src",
       "link": true
     },
+    "node_modules/@microsoft/dotnet-runtime": {
+      "resolved": "src/Components/dotnet-runtime-js",
+      "link": true
+    },
+    "node_modules/@microsoft/functionaltests": {
+      "resolved": "src/SignalR/clients/ts/FunctionalTests",
+      "link": true
+    },
+    "node_modules/@microsoft/microsoft.aspnetcore.components.web.js": {
+      "resolved": "src/Components/Web.JS",
+      "link": true
+    },
+    "node_modules/@microsoft/microsoft.aspnetcore.projecttemplates.tests": {
+      "resolved": "src/ProjectTemplates/test/Templates.Tests",
+      "link": true
+    },
+    "node_modules/@microsoft/microsoft.components.customelements": {
+      "resolved": "src/Components/CustomElements/src/js",
+      "link": true
+    },
+    "node_modules/@microsoft/microsoft.msal.components.webassembly": {
+      "resolved": "src/Components/WebAssembly/Authentication.Msal/src/Interop",
+      "link": true
+    },
     "node_modules/@microsoft/signalr": {
       "resolved": "src/SignalR/clients/ts/signalr",
       "link": true
@@ -3323,9 +2832,9 @@
       }
     },
     "node_modules/@npmcli/fs/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -3366,9 +2875,9 @@
       }
     },
     "node_modules/@npmcli/git/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -3546,20 +3055,19 @@
       }
     },
     "node_modules/@puppeteer/browsers": {
-      "version": "2.2.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@puppeteer/browsers/-/browsers-2.2.3.tgz",
-      "integrity": "sha1-rWt5EpxQgl533auggmgPTa0LZ04=",
+      "version": "2.8.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@puppeteer/browsers/-/browsers-2.8.0.tgz",
+      "integrity": "sha1-nVkpM8vvxmw3gjdwhEuMusUmB90=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "debug": "4.3.4",
-        "extract-zip": "2.0.1",
-        "progress": "2.0.3",
-        "proxy-agent": "6.4.0",
-        "semver": "7.6.0",
-        "tar-fs": "3.0.5",
-        "unbzip2-stream": "1.4.3",
-        "yargs": "17.7.2"
+        "debug": "^4.4.0",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.5.0",
+        "semver": "^7.7.1",
+        "tar-fs": "^3.0.8",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "browsers": "lib/cjs/main-cli.js"
@@ -3584,13 +3092,13 @@
       }
     },
     "node_modules/@puppeteer/browsers/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha1-Exn2V5NX8jONMzfSzdSRS7XcyGU=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -3601,35 +3109,12 @@
         }
       }
     },
-    "node_modules/@puppeteer/browsers/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@puppeteer/browsers/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha1-Gkak20v/zM2Xt0O1AFyDJfI9Ti0=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -3637,13 +3122,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@puppeteer/browsers/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@puppeteer/browsers/node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/yargs/-/yargs-17.7.2.tgz",
@@ -3690,16 +3168,15 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.2.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
-      "integrity": "sha1-5eCwWb2FyldIlJLylc6IwtSw2vk=",
+      "version": "15.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz",
+      "integrity": "sha1-ZgCJU8JSS+eGqjGdSeMvISgpang=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
         "deepmerge": "^4.2.2",
-        "is-builtin-module": "^3.2.1",
         "is-module": "^1.0.0",
         "resolve": "^1.22.1"
       },
@@ -3788,15 +3265,15 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
-      "integrity": "sha1-flPt3Ix/SDpK0LlK+x9/X9PHceA=",
+      "version": "5.1.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
+      "integrity": "sha1-u5Tx+eqqyUTaI3dnzf7mxbImLUo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
-        "picomatch": "^2.3.1"
+        "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -3811,9 +3288,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.1.tgz",
-      "integrity": "sha1-8NpIEkS32eoVKWs19/45zYEVc5Y=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.35.0.tgz",
+      "integrity": "sha1-4ddwBzX36N5WHvfR+gNiCCoYDEM=",
       "cpu": [
         "arm"
       ],
@@ -3825,9 +3302,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.1.tgz",
-      "integrity": "sha1-gqs8V19CNftker6l4I7sbPMllk4=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.35.0.tgz",
+      "integrity": "sha1-+mzfsfyeLI4ien811STY9/kM9Ns=",
       "cpu": [
         "arm64"
       ],
@@ -3839,9 +3316,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.1.tgz",
-      "integrity": "sha1-alMEUuaKkVKAnOWN4fiVl2MqCFs=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.35.0.tgz",
+      "integrity": "sha1-baWh3cTxHUp66Fq0Q4JMtr9hTjA=",
       "cpu": [
         "arm64"
       ],
@@ -3853,9 +3330,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.1.tgz",
-      "integrity": "sha1-R3J0efXKKSz0NNfnWvJyW3JOy8c=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.35.0.tgz",
+      "integrity": "sha1-JbdM4tjT+eqOEZsBOE1EocCg064=",
       "cpu": [
         "x64"
       ],
@@ -3866,10 +3343,38 @@
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.35.0.tgz",
+      "integrity": "sha1-vj0540Qd9dbhh8g9FYxgZWyC4gM=",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.35.0.tgz",
+      "integrity": "sha1-zZMtPsZ5cR79Zcolgh+zGOJbfOQ=",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.1.tgz",
-      "integrity": "sha1-Rhk8SYqnkCqNuJrAASgGAyDoT+8=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.35.0.tgz",
+      "integrity": "sha1-0wC3TG+AVHQiVjLxhdqurnYKwrs=",
       "cpu": [
         "arm"
       ],
@@ -3881,9 +3386,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.1.tgz",
-      "integrity": "sha1-Itgx/iOWQ8HQXJiQZCAyXO5DnYU=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.35.0.tgz",
+      "integrity": "sha1-LKrGIjgPMUxBk07R5ozq9sw4DMM=",
       "cpu": [
         "arm"
       ],
@@ -3895,9 +3400,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.1.tgz",
-      "integrity": "sha1-GavTNpXsnViLSoWNEiYxQzCE5KM=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.35.0.tgz",
+      "integrity": "sha1-HshBZQsDjMFcGUwmMmSD/X6/8+M=",
       "cpu": [
         "arm64"
       ],
@@ -3909,9 +3414,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.1.tgz",
-      "integrity": "sha1-1gr4wLm+QkQk/5aguhn85l0m9qs=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.35.0.tgz",
+      "integrity": "sha1-L8cKRG2Ybif2EB6nToF0aYf2kVA=",
       "cpu": [
         "arm64"
       ],
@@ -3922,10 +3427,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.35.0.tgz",
+      "integrity": "sha1-VhvQRc2c6eCMlfQueoaIr4yT12Q=",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.1.tgz",
-      "integrity": "sha1-sRlOXtbROP3eCELRJvzN50qQ9Fc=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.35.0.tgz",
+      "integrity": "sha1-RdhJoLM4E/M/5eup+Z4P8Vq1yq0=",
       "cpu": [
         "ppc64"
       ],
@@ -3937,9 +3456,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.1.tgz",
-      "integrity": "sha1-9aY1wBe5v/i4VrAiH71cDjNzt+w=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.35.0.tgz",
+      "integrity": "sha1-eN3j5vz1tXM6l9CmdILXaKoeg6U=",
       "cpu": [
         "riscv64"
       ],
@@ -3951,9 +3470,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.1.tgz",
-      "integrity": "sha1-8QQ9n0Amv2mVhjyz+N1HMmBuS6o=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.35.0.tgz",
+      "integrity": "sha1-LjSDUCD54D37QRRzpcKg6KnFA3s=",
       "cpu": [
         "s390x"
       ],
@@ -3965,9 +3484,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.1.tgz",
-      "integrity": "sha1-HngXML5EURnwbJ318YXhk7yCxhA=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.35.0.tgz",
+      "integrity": "sha1-T5d0vt3G9CdN9XrJmGLrIwQN5GE=",
       "cpu": [
         "x64"
       ],
@@ -3979,9 +3498,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.1.tgz",
-      "integrity": "sha1-CPEuGWXW8n1omP+TJZISHMpqvEs=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.35.0.tgz",
+      "integrity": "sha1-38/ywa7VGLPSPM/7Sa+zSddPtgg=",
       "cpu": [
         "x64"
       ],
@@ -3993,9 +3512,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.1.tgz",
-      "integrity": "sha1-Sl3Lvnr31ByskrCXmOfBgx2h9Zk=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.35.0.tgz",
+      "integrity": "sha1-sLN+LXcEHjqncvUZKRMJq/TAOoQ=",
       "cpu": [
         "arm64"
       ],
@@ -4007,9 +3526,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.1.tgz",
-      "integrity": "sha1-B1sHE95ieEOnO0zw4IfFa1Pp14A=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.35.0.tgz",
+      "integrity": "sha1-W1pA5Ep0PdwOBrjhs5gvhW3Jzgo=",
       "cpu": [
         "ia32"
       ],
@@ -4021,9 +3540,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.1.tgz",
-      "integrity": "sha1-DLJAwUfA39Dj6v9MwGCnctOeFVw=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.35.0.tgz",
+      "integrity": "sha1-BfJdvJmBvuGubnE9qrEDlwRKRso=",
       "cpu": [
         "x64"
       ],
@@ -4371,13 +3890,6 @@
         "@types/responselike": "^1.0.0"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha1-v9AsHyIkVnZ2wVRRmfh8OoYdh40=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/cors": {
       "version": "2.8.17",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/cors/-/cors-2.8.17.tgz",
@@ -4396,9 +3908,9 @@
       "license": "MIT"
     },
     "node_modules/@types/eslint": {
-      "version": "8.56.10",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/eslint/-/eslint-8.56.10.tgz",
-      "integrity": "sha1-6yNwpzvwSpAe66jyJZXH7g9+tY0=",
+      "version": "9.6.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha1-1Xla1zLOgXFfJ/ddqRMASlZ1FYQ=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4418,9 +3930,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha1-ps4+VW4A/ZiV3Yct0XKtDUvWh/Q=",
+      "version": "1.0.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha1-Yo7/7q4gZKG055946B2Ht+X8e1A=",
       "dev": true,
       "license": "MIT"
     },
@@ -4505,9 +4017,9 @@
       "license": "MIT"
     },
     "node_modules/@types/karma": {
-      "version": "6.3.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/karma/-/karma-6.3.8.tgz",
-      "integrity": "sha1-Bss+zdq+zoHrQ6EIeo8Brez2RkU=",
+      "version": "6.3.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/karma/-/karma-6.3.9.tgz",
+      "integrity": "sha1-dAqWeyZiCX4Tamf4HBhpn7365Fc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4525,12 +4037,12 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.14.10",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/node/-/node-20.14.10.tgz",
-      "integrity": "sha1-oaIYKQ8bZChoLjrwRHheWHTbRpo=",
+      "version": "22.13.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/node/-/node-22.13.10.tgz",
+      "integrity": "sha1-356jWMXtmRJmvswxCdwtyRJdd+Q=",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/parse5": {
@@ -4615,9 +4127,9 @@
       "license": "MIT"
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha1-Awd0cjovf6r+v2RfTlpINx3KYik=",
+      "version": "17.0.33",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha1-jDIwPag+7AUKhLPHrnufki0T4y0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4678,13 +4190,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4695,17 +4207,10 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -4744,13 +4249,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4761,13 +4266,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "5.62.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
@@ -4815,13 +4313,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4832,13 +4330,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@typescript-eslint/types": {
       "version": "5.62.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@typescript-eslint/types/-/types-5.62.0.tgz",
@@ -4882,13 +4373,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4899,17 +4390,10 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -4947,9 +4431,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -4978,9 +4462,9 @@
       }
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha1-dWZBrbWHhRtcyz4JXa8nrlgchAY=",
+      "version": "1.3.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha1-0Gu7OE689sUF/eHD0O1N3/4Kr/g=",
       "dev": true,
       "license": "ISC"
     },
@@ -5036,82 +4520,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@wdio/logger/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/logger/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@wdio/logger/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@wdio/logger/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@wdio/logger/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@wdio/logger/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@wdio/protocols": {
       "version": "6.12.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@wdio/protocols/-/protocols-6.12.0.tgz",
@@ -5149,73 +4557,73 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha1-uxag6LGRT5efRYZMI4Gcw+Pw1Ls=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha1-qfagfysDyVyNOMRTah/ftSH/VbY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha1-2svLla/xNcgmD3f6O0xf6mAKZDE=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha1-/Moe7dscxOe27tT8eVbWgTshufs=",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha1-YTL2jErNWdzRQcRLGMvrvZ8vp2g=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha1-4KFhUiSLw42u523X4h8Vxe86sec=",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha1-bfINJy6lQ5vyCrNJK3+3Dpv8s/Y=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha1-giqbxgMWZTH31d+E5ntb+ZtyuWs=",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha1-y85efgwb0yz0kFrkRO9kzqkZ8bU=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha1-29kyVI5xGfS4p4d/1ajSDmNJCy0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha1-uy69s7g6om2bqtTEbUMVKDrNUek=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha1-5VYQh1j0SKroTIUOWTzhig6zHgs=",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha1-PaYjIzrhpgQJtQmlKt6bwio3978=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha1-lindqcRDDqtUtZEFPW3G87oFA0g=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha1-u2ZckdCxT//OsOOCmMMprwQ8bjo=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha1-HF6qzh1gatosf9cEXqk1bFnuDbo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5223,9 +4631,9 @@
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha1-cOYOXoL5rIERi8JTgaCyg4kyQNc=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha1-V8XD3rAQXQLOJfo/109OvJ/Qu7A=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -5233,79 +4641,79 @@
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha1-kPi8NMVhWV/hVmA75yU8280Pq1o=",
+      "version": "1.13.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha1-kXog6T9xrVYClmwtaFrgxsIfYPE=",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha1-n58/9SoUyYCTm+DvnV3568Z4rjs=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha1-rGaJ9QIhm1kZjd7ELc1JaxAE1Zc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha1-plIGAdobVwBEgnNmanGtCkXXhUc=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha1-mR5/DAkMsLtiu6yIIHbj0hnalXA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha1-nm6BR138+2LatXSsLdo4ImwjK8U=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha1-5vce18yuRngcIGAX08FMUO+oEGs=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha1-xHrLkObwgzkeP6YdETZQ7qHpWTc=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha1-s+E/GJNgXKeLUsaOVM9qhl+Qufs=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha1-vOz2YdfRq9r5idg0Gkgz4z4rMaw=",
+      "version": "1.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha1-O7PpY4qK5f2vlhDnoGtNn5qm/gc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -5402,11 +4810,21 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha1-cWFr3MviXielRDngBG6JynbfIkg=",
-      "dev": true,
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha1-WOMjpy/twNb5zU0x/kn1FHlZDM0=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.14.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha1-ch1dwQ99W1YJqJF3PUdzF5aTXfs=",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -5426,16 +4844,6 @@
         "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha1-frFVexugXvGLXtDsZ1kb+rBGiO8=",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -5447,9 +4855,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha1-nK6sKe76oMQePUxlE33k1vNN9D4=",
+      "version": "8.3.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha1-eU3RacOXft9LpOpHWDWHxYZiNrc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5473,13 +4881,13 @@
       }
     },
     "node_modules/agent-base/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -5490,17 +4898,10 @@
         }
       }
     },
-    "node_modules/agent-base/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/agentkeepalive": {
-      "version": "4.5.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
-      "integrity": "sha1-JnOtE4mzxBjFogxdc2T5PKBL6SM=",
+      "version": "4.6.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
+      "integrity": "sha1-Nfc+lLP0C/ZfEFIZxiOtGcE26mo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5583,16 +4984,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/ansi-align": {
       "version": "3.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-align/-/ansi-align-3.0.1.tgz",
@@ -5630,16 +5021,19 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+      "version": "4.3.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
@@ -5656,6 +5050,19 @@
         "node": ">= 8"
       }
     },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/aproba": {
       "version": "2.0.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/aproba/-/aproba-2.0.0.tgz",
@@ -5823,16 +5230,16 @@
       }
     },
     "node_modules/ast-types/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/async/-/async-3.2.5.tgz",
-      "integrity": "sha1-69Uqj9r3oiiaJN85n42Ehcika2Y=",
+      "version": "3.2.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/async/-/async-3.2.6.tgz",
+      "integrity": "sha1-Gwco4Ukp1RuFtEm38G4nwRReOM4=",
       "dev": true,
       "license": "MIT"
     },
@@ -5874,9 +5281,9 @@
       }
     },
     "node_modules/b4a": {
-      "version": "1.6.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/b4a/-/b4a-1.6.6.tgz",
-      "integrity": "sha1-pMw0mjhRmHw8SsLXeFwYdE9tqbo=",
+      "version": "1.6.7",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/b4a/-/b4a-1.6.7.tgz",
+      "integrity": "sha1-qZWH1Ou/vVpuOyG9tdX6OFdnq+Q=",
       "dev": true,
       "license": "Apache-2.0"
     },
@@ -5902,82 +5309,6 @@
         "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -6012,14 +5343,14 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.11",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-      "integrity": "sha1-MDIN/j/+GjNsFa/c2v1v1hWyXjM=",
+      "version": "0.4.12",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+      "integrity": "sha1-ylW77Iqw7e7vPXuP/XUyLiEIeak=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -6027,51 +5358,54 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.10.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
-      "integrity": "sha1-eJrIJAWtZkwgR20CM7SFKB3rnHc=",
+      "version": "0.11.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
+      "integrity": "sha1-Tk4YLxuzfHumLir4HY3QnfMTRPY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.1",
-        "core-js-compat": "^3.36.1"
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
+        "core-js-compat": "^3.40.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
-      "integrity": "sha1-rdxH4kDt0doQWOvaAwIfOCu6eF4=",
+      "version": "0.6.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+      "integrity": "sha1-q+sfPxx2LqzjdYf0JUiwi1d4m8g=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha1-tDmSObibKgEfndvj5PQB/EDP9zs=",
+      "version": "1.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+      "integrity": "sha1-mpKer+zkGWEu9K5PYLGGLrrY7zA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
@@ -6102,54 +5436,72 @@
       "license": "MIT"
     },
     "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha1-MUDMp6DhHUmz7cUEGrVgZZ/Y4fg=",
+      "version": "2.5.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-events/-/bare-events-2.5.4.tgz",
+      "integrity": "sha1-FhQ9Q14e2er9GrhfEribM1ekF0U=",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "2.3.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-fs/-/bare-fs-2.3.1.tgz",
-      "integrity": "sha1-zb1j2selUt+yuH0YyCIpjR79IT0=",
+      "version": "4.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-fs/-/bare-fs-4.0.1.tgz",
+      "integrity": "sha1-hYRPNNqBnHZ1TVRTI6iyPtNhfHY=",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
         "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
+        "bare-path": "^3.0.0",
         "bare-stream": "^2.0.0"
+      },
+      "engines": {
+        "bare": ">=1.7.0"
       }
     },
     "node_modules/bare-os": {
-      "version": "2.4.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-os/-/bare-os-2.4.0.tgz",
-      "integrity": "sha1-XeXjuncE9FnJZWYp7cp8xzbgZgg=",
+      "version": "3.6.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-os/-/bare-os-3.6.0.tgz",
+      "integrity": "sha1-FGXdfhvr4N7CMAl6I60A99tR+Vc=",
       "dev": true,
       "license": "Apache-2.0",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "bare": ">=1.14.0"
+      }
     },
     "node_modules/bare-path": {
-      "version": "2.1.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-path/-/bare-path-2.1.3.tgz",
-      "integrity": "sha1-WUEEyCnvZg5DtVieyNrvffbO2z4=",
+      "version": "3.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-path/-/bare-path-3.0.0.tgz",
+      "integrity": "sha1-tZ0YEwulKmr5J22z6WouPT6lIXg=",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "bare-os": "^2.1.0"
+        "bare-os": "^3.0.1"
       }
     },
     "node_modules/bare-stream": {
-      "version": "2.1.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-stream/-/bare-stream-2.1.3.tgz",
-      "integrity": "sha1-BwtpkZljpDfMniBVTt4HnOChKbI=",
+      "version": "2.6.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/bare-stream/-/bare-stream-2.6.5.tgz",
+      "integrity": "sha1-u6joeWdMTCf34ngF3wBcFdeiygc=",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "streamx": "^2.18.0"
+        "streamx": "^2.21.0"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*",
+        "bare-events": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        },
+        "bare-events": {
+          "optional": true
+        }
       }
     },
     "node_modules/base64-js": {
@@ -6227,9 +5579,9 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha1-b+sOIcRyTQbef/ONo22tT1enR/0=",
+      "version": "1.20.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha1-GVNDEiHG+1zWPEs21T+rCSjlSMY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6241,7 +5593,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -6298,22 +5650,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/boxen/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/boxen/node_modules/camelcase": {
       "version": "6.3.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/camelcase/-/camelcase-6.3.0.tgz",
@@ -6327,66 +5663,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/boxen/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/boxen/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/boxen/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/boxen/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/boxen/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/boxen/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/type-fest/-/type-fest-0.20.2.tgz",
@@ -6438,9 +5714,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/browserslist/-/browserslist-4.23.2.tgz",
-      "integrity": "sha1-JE/oA2QfHBnCjEjEtuyXNus9Mu0=",
+      "version": "4.24.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha1-xrKGWj8IvLhgoOgnOJADuf5obks=",
       "dev": true,
       "funding": [
         {
@@ -6458,10 +5734,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001640",
-        "electron-to-chromium": "^1.4.820",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.1.0"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -6714,18 +5990,29 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha1-BgFlmcQMVkmMGHadJzC+JCtvo7k=",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha1-S1QowiK+mF15w9gmV0edvgtZstY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha1-I43pNdKippKSjFOMfM+pEGf9Bio=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6756,9 +6043,9 @@
       }
     },
     "node_modules/camel-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -6773,9 +6060,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001642",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz",
-      "integrity": "sha1-aqZhDrJAZ8JG0wxX8FWp0Kf40F8=",
+      "version": "1.0.30001704",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz",
+      "integrity": "sha1-ZkT+kJ2SSsOnEl6KCravlbHzKZA=",
       "dev": true,
       "funding": [
         {
@@ -6806,25 +6093,27 @@
       }
     },
     "node_modules/capital-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+      "version": "4.1.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/change-case": {
@@ -6849,9 +6138,9 @@
       }
     },
     "node_modules/change-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -6928,7 +6217,17 @@
         "rimraf": "^3.0.2"
       }
     },
-    "node_modules/chrome-launcher/node_modules/glob": {
+    "node_modules/chrome-launcher/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/chrome-launcher/node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
       "integrity": "sha1-uN8PuAK7+o6JvR2Ti04WV47UTys=",
@@ -6989,15 +6288,14 @@
       }
     },
     "node_modules/chromium-bidi": {
-      "version": "0.6.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chromium-bidi/-/chromium-bidi-0.6.0.tgz",
-      "integrity": "sha1-y6lzfc30KF0MsauCmOA9COE3C2Q=",
+      "version": "2.1.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chromium-bidi/-/chromium-bidi-2.1.2.tgz",
+      "integrity": "sha1-sHECefmTEo1OC0HIkiCeoJMhfZc=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "mitt": "3.0.1",
-        "urlpattern-polyfill": "10.0.0",
-        "zod": "3.23.8"
+        "mitt": "^3.0.1",
+        "zod": "^3.24.1"
       },
       "peerDependencies": {
         "devtools-protocol": "*"
@@ -7020,9 +6318,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.3.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
-      "integrity": "sha1-xIU0Guj9mZyk7lry16HJrgHgCZw=",
+      "version": "1.4.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha1-D3lzHrjP4exyrNQGbvrJ1hmRsA0=",
       "dev": true,
       "license": "MIT"
     },
@@ -7049,10 +6347,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/client-ts": {
-      "resolved": "src/SignalR/clients/ts",
-      "link": true
-    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cliui/-/cliui-7.0.4.tgz",
@@ -7111,19 +6405,22 @@
       "license": "MIT"
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
+      "version": "2.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "version": "1.1.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
       "dev": true,
       "license": "MIT"
     },
@@ -7191,10 +6488,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/components.authentication": {
-      "resolved": "src/Components/WebAssembly/WebAssembly.Authentication/src/Interop",
-      "link": true
-    },
     "node_modules/compress-commons": {
       "version": "4.1.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/compress-commons/-/compress-commons-4.1.2.tgz",
@@ -7381,9 +6674,9 @@
       }
     },
     "node_modules/constant-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -7405,9 +6698,9 @@
       "license": "MIT"
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha1-DkHyTeXs8xeUfIL8eJ4GqISCRDI=",
+      "version": "0.7.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha1-VWNpxHKiupEPKXmJG1JrNDYjftc=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7415,9 +6708,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.37.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/core-js/-/core-js-3.37.1.tgz",
-      "integrity": "sha1-0hdR3bdWUYrFoA5NZkmd+YGmLbk=",
+      "version": "3.41.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/core-js/-/core-js-3.41.0.tgz",
+      "integrity": "sha1-V3FNr7jHUaYJXQKKdCjx+1g0p3Y=",
       "hasInstallScript": true,
       "license": "MIT",
       "funding": {
@@ -7426,13 +6719,13 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.37.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/core-js-compat/-/core-js-compat-3.37.1.tgz",
-      "integrity": "sha1-yEQxDHhS9L30m40zlzC5fhf/Ce4=",
+      "version": "3.41.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha1-TN/OlfOajyd1m2Z89pPZbl3aPRc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0"
+        "browserslist": "^4.24.4"
       },
       "funding": {
         "type": "opencollective",
@@ -7556,82 +6849,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/create-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/create-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/create-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/create-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/create-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/create-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/create-require/-/create-require-1.1.1.tgz",
@@ -7640,9 +6857,9 @@
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha1-9zqFudXUHQRVUcF34ogtSshXKKY=",
+      "version": "7.0.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha1-ilj+ePANzXDDcEUXWd+/rwPo7p8=",
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -7660,10 +6877,11 @@
       "license": "MIT"
     },
     "node_modules/css-shorthand-properties": {
-      "version": "1.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
-      "integrity": "sha1-HICOY1U8KD8ony3Vb87o8zN72TU=",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/css-shorthand-properties/-/css-shorthand-properties-1.1.2.tgz",
+      "integrity": "sha1-OP4thCIZBgfNsZwnPEIwO3dNr5k=",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/css-value": {
       "version": "0.0.1",
@@ -7751,9 +6969,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha1-EEQJKITSRdG39lcl+krUxveBzCM=",
+      "version": "10.5.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha1-DzccfPbEiYzgr7CYNttzzYIBDyI=",
       "dev": true,
       "license": "MIT"
     },
@@ -8023,9 +7241,9 @@
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.1299070",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/devtools-protocol/-/devtools-protocol-0.0.1299070.tgz",
-      "integrity": "sha1-s+TPC2eKRvD5B65uB+A606U8AN8=",
+      "version": "0.0.1413902",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/devtools-protocol/-/devtools-protocol-0.0.1413902.tgz",
+      "integrity": "sha1-oPAP6eslqzN6j5ZWop4KGmn0JAE=",
       "dev": true,
       "license": "BSD-3-Clause"
     },
@@ -8120,15 +7338,26 @@
       }
     },
     "node_modules/dot-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
-    "node_modules/dotnet-runtime": {
-      "resolved": "src/Components/dotnet-runtime-js",
-      "link": true
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha1-165mfh3INIL4tw/Q9u78UNow9Yo=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/duplexer": {
       "version": "0.1.1",
@@ -8185,9 +7414,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.827",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/electron-to-chromium/-/electron-to-chromium-1.4.827.tgz",
-      "integrity": "sha1-dgaO0ccd05Y+G+/IroFQBLLaagI=",
+      "version": "1.5.116",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/electron-to-chromium/-/electron-to-chromium-1.5.116.tgz",
+      "integrity": "sha1-t3nXPNDMdTBdEq5PBh1/e87kx2E=",
       "dev": true,
       "license": "ISC"
     },
@@ -8264,18 +7493,17 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.5.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/engine.io/-/engine.io-6.5.5.tgz",
-      "integrity": "sha1-QwuA2IQMqrkaUOniPLVRRVGV/JM=",
+      "version": "6.6.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha1-Comj5rbB1LDCoqY3SV58FJ7I2O4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
@@ -8296,13 +7524,13 @@
       }
     },
     "node_modules/engine.io/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.3.7",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha1-h5RbQVGgEddtlaGY1xEchlw2ClI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -8313,13 +7541,6 @@
         }
       }
     },
-    "node_modules/engine.io/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/engine.io/node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.17.1.tgz",
@@ -8357,13 +7578,16 @@
       }
     },
     "node_modules/ent": {
-      "version": "2.2.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ent/-/ent-2.2.1.tgz",
-      "integrity": "sha1-aNyZoALxFXksJiObrtquqecMDKI=",
+      "version": "2.2.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ent/-/ent-2.2.2.tgz",
+      "integrity": "sha1-IqXtL9fODLz/HRR0z0kJpEvbboU=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "punycode": "^1.4.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "punycode": "^1.4.1",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8393,9 +7617,9 @@
       }
     },
     "node_modules/envinfo": {
-      "version": "7.13.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/envinfo/-/envinfo-7.13.0.tgz",
-      "integrity": "sha1-gfu4Hl2jXXToFJQa6rfDJaYG+zE=",
+      "version": "7.14.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/envinfo/-/envinfo-7.14.0.tgz",
+      "integrity": "sha1-JtrF21RBjypMEVkVOgsq6YCDiq4=",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -8436,14 +7660,11 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha1-x/rvvf+LJpbPX0aSHt+3fMS6OEU=",
+      "version": "1.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha1-mD6y+aZyTpMD9hrd8BHHLgngsPo=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
       "engines": {
         "node": ">= 0.4"
       }
@@ -8459,12 +7680,41 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.5.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-      "integrity": "sha1-qO/sOj2pkeYO+mtjOnytarjSa3g=",
+      "version": "1.6.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha1-2kn1h/2eaO4kBP5OJWwMfTqBviE=",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha1-HE8sSDcydZfOadLKGQp/3RcjOME=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha1-8x274MGDsAptJutjJcgQwP0YvU0=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es6-error": {
       "version": "4.1.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/es6-error/-/es6-error-4.1.1.tgz",
@@ -8480,9 +7730,9 @@
       "license": "MIT"
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha1-VAdumrKepb89jx7WKs/7uIJy3yc=",
+      "version": "3.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha1-ARo/aYVroYnf+n3I/M6Z0qh5A+U=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8497,13 +7747,16 @@
       "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "version": "4.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ=",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/escodegen": {
@@ -8539,17 +7792,17 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha1-x4am/Q4LaJQar2JFlvuYcIkZVmg=",
+      "version": "8.57.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha1-ffEJZUq6fju+XI6uUzxeRh08bKk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -8628,13 +7881,13 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -8645,30 +7898,10 @@
         }
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -8715,22 +7948,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/eslint/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/argparse/-/argparse-2.0.1.tgz",
@@ -8738,51 +7955,14 @@
       "dev": true,
       "license": "Python-2.0"
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -8793,19 +7973,6 @@
         }
       }
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -8866,16 +8033,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -8905,13 +8062,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/eslint/node_modules/p-locate": {
       "version": "5.0.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/p-locate/-/p-locate-5.0.0.tgz",
@@ -8928,19 +8078,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/type-fest/-/type-fest-0.20.2.tgz",
@@ -9145,9 +8282,9 @@
       }
     },
     "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha1-ZKx1Jv40GrGKOQFs0ix4fQHgC/Y=",
+      "version": "3.1.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
+      "integrity": "sha1-qPJq25a/eOjNitEDeSjV5cBnnZE=",
       "dev": true,
       "license": "Apache-2.0"
     },
@@ -9180,13 +8317,13 @@
       }
     },
     "node_modules/extract-zip/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -9213,13 +8350,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/extract-zip/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -9235,9 +8365,9 @@
       "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha1-qQRQHlfP3S/83tRemaVP71XkYSk=",
+      "version": "3.3.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha1-0G1YXOjbqQoWsFBcVDw8z7OuuBg=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9245,7 +8375,7 @@
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -9279,11 +8409,21 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fast-uri/-/fast-uri-3.0.1.tgz",
-      "integrity": "sha1-zd0u7PyDpxwb4swu8gYTMb6KcTQ=",
+      "version": "3.0.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha1-iPEwt3z66iN41Wv5cN6iElemh0g=",
       "dev": true,
-      "license": "MIT"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
@@ -9296,9 +8436,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha1-KlI/B6TnsegaQrkbi/IlQQd1O0c=",
+      "version": "1.19.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha1-1Q6rqAPIhGqIPBZJKCHrzSzaVfU=",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -9572,9 +8712,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha1-IdtHBymmc01JlwAvQ5yzCJh/Vno=",
+      "version": "3.3.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha1-Z8j62VRUp8er6/dLt47nSkQCM1g=",
       "dev": true,
       "license": "ISC"
     },
@@ -9586,9 +8726,9 @@
       "license": "MIT"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha1-f4FcDNpCScdP8J6V75fCO1/QOZs=",
+      "version": "1.15.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha1-pgT6EORDv5jKlCKNnuvMLoosjuE=",
       "dev": true,
       "funding": [
         {
@@ -9607,13 +8747,13 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.2.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/foreground-child/-/foreground-child-3.2.1.tgz",
-      "integrity": "sha1-dnAEzPOlsw3zm+2QcYurQ/4KWfc=",
+      "version": "3.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha1-Mujp7Rtoo0l777msK2rfkqY4V28=",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -9637,14 +8777,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha1-k5Gdrq82HuUpWEubMWZNwSyfpFI=",
+      "version": "4.0.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha1-eEzczgZpqdaOlNEaxO6pgIjt0sQ=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -9652,9 +8794,9 @@
       }
     },
     "node_modules/fp-ts": {
-      "version": "2.16.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fp-ts/-/fp-ts-2.16.8.tgz",
-      "integrity": "sha1-36HqHJZ6xnlMQ86HeuuO129eDfc=",
+      "version": "2.16.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fp-ts/-/fp-ts-2.16.9.tgz",
+      "integrity": "sha1-mWKPxeC7O0MsShbY9EVSRzgLroo=",
       "dev": true,
       "license": "MIT"
     },
@@ -9732,10 +8874,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/functionaltests": {
-      "resolved": "src/SignalR/clients/ts/FunctionalTests",
-      "link": true
-    },
     "node_modules/gauge": {
       "version": "4.0.4",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/gauge/-/gauge-4.0.4.tgz",
@@ -9777,17 +8915,22 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha1-44X1pLUifUScPqu60FSU7wq76t0=",
+      "version": "1.3.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha1-dD8OO2lkqTpUke0b/6rgVNf5jQE=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9819,6 +8962,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha1-FQs/J0OGnvPoUewMSdFbHRTQDuE=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-ready": {
       "version": "1.0.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/get-ready/-/get-ready-1.0.0.tgz",
@@ -9840,29 +8997,28 @@
       }
     },
     "node_modules/get-uri": {
-      "version": "6.0.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/get-uri/-/get-uri-6.0.3.tgz",
-      "integrity": "sha1-DSZpe8E8+RCS5RmqY6pg7ltvOFo=",
+      "version": "6.0.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/get-uri/-/get-uri-6.0.4.tgz",
+      "integrity": "sha1-barunhL5dZ4Z5VujE5Vog+9Q4Kc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "basic-ftp": "^5.0.2",
         "data-uri-to-buffer": "^6.0.2",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.2.0"
+        "debug": "^4.3.4"
       },
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/get-uri/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -9873,28 +9029,6 @@
         }
       }
     },
-    "node_modules/get-uri/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha1-5w4X361kIyKH0BkpOZ4Op8hrDls=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/get-uri/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/glob": {
       "version": "8.1.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-8.1.0.tgz",
@@ -9978,9 +9112,9 @@
       }
     },
     "node_modules/global-agent/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -10039,13 +9173,13 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha1-Kf923mnax0ibfAkYpXiOVkd8Myw=",
+      "version": "1.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha1-ifVrghe9vIgCvSmd9tfxCB1+UaE=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -10120,13 +9254,13 @@
       "license": "MIT"
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "version": "4.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
@@ -10142,10 +9276,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha1-sx3f6bDm6ZFFNqarKGQm0CFPd/0=",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha1-/JxqeDoISVHQuXH+EBjegTcHozg=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10155,12 +9289,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha1-u3ssQ0klHc6HsSX3vfh0qnyLOfg=",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha1-LNxC1AvvLltO6rfAGnPFTOerWrw=",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10211,16 +9348,16 @@
       }
     },
     "node_modules/header-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
     "node_modules/hosted-git-info": {
-      "version": "6.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
-      "integrity": "sha1-YpRCx4iaacBd5gTVKZa3T+bybVg=",
+      "version": "6.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/hosted-git-info/-/hosted-git-info-6.1.3.tgz",
+      "integrity": "sha1-LuGhSgl6Eja934Zyw1thPEbFWUY=",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -10324,13 +9461,13 @@
       }
     },
     "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -10341,13 +9478,6 @@
         }
       }
     },
-    "node_modules/http-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/http2-wrapper": {
       "version": "1.0.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
@@ -10376,13 +9506,13 @@
       }
     },
     "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -10393,13 +9523,6 @@
         }
       }
     },
-    "node_modules/https-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/human-signals": {
       "version": "2.1.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/human-signals/-/human-signals-2.1.0.tgz",
@@ -10454,9 +9577,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha1-UHPlVM1CxbM7OUN19Ti4WT401O8=",
+      "version": "5.3.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha1-PNQOcp82Q/2HywTlC/DrcivFlvU=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10503,9 +9626,9 @@
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=",
+      "version": "3.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha1-nOy1ZQPAraHydB271lRuSxO1fM8=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10530,9 +9653,9 @@
       }
     },
     "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha1-tEed+KX9RPbNziQHBnVnYGPJXLQ=",
+      "version": "3.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha1-w9XHRXmMAqb4uJdyarpRABhu4mA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10615,82 +9738,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/inspectpack/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inspectpack/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inspectpack/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inspectpack/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/inspectpack/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inspectpack/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/interpret": {
       "version": "2.2.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/interpret/-/interpret-2.2.0.tgz",
@@ -10702,9 +9749,9 @@
       }
     },
     "node_modules/io-ts": {
-      "version": "2.2.21",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/io-ts/-/io-ts-2.2.21.tgz",
-      "integrity": "sha1-TvdUF29wgqEJnQTH1cTqUyZ8Uwo=",
+      "version": "2.2.22",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/io-ts/-/io-ts-2.2.22.tgz",
+      "integrity": "sha1-WrDTY2/oSUonXwJmRhqwGdpLjQs=",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -10780,9 +9827,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha1-Q7jvn0amoIiI22ex/9Tsnj39WdE=",
+      "version": "2.16.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha1-KpiAGoSfQ+Kt1kT7trxiKbGaTvQ=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10937,6 +9984,25 @@
         "@types/estree": "*"
       }
     },
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha1-dtcKPtEO+b5I61d4h9dCBb8MrSI=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/is-stream/-/is-stream-2.0.1.tgz",
@@ -11041,29 +10107,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
@@ -11080,13 +10123,13 @@
       }
     },
     "node_modules/istanbul-lib-source-maps/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -11097,13 +10140,6 @@
         }
       }
     },
-    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/istanbul-reports": {
       "version": "3.1.7",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
@@ -11135,9 +10171,9 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.9.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jake/-/jake-10.9.1.tgz",
-      "integrity": "sha1-jclrf8xByxmqUCr1BtpOHVb15is=",
+      "version": "10.9.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha1-auSH5qaa/sOl4WdiiZa1nzWuK38=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -11153,109 +10189,33 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+    "node_modules/jasmine": {
+      "version": "3.99.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jasmine/-/jasmine-3.99.0.tgz",
+      "integrity": "sha1-fMeu2nreLVdpT8gYo3T3eMu06mI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "glob": "^7.1.6",
+        "jasmine-core": "~3.99.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "bin": {
+        "jasmine": "bin/jasmine.js"
       }
     },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+    "node_modules/jasmine-core": {
+      "version": "3.99.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jasmine-core/-/jasmine-core-3.99.1.tgz",
+      "integrity": "sha1-W/pLLXZhiGi/rEyP8Iuyb/+kEg0=",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jasmine": {
-      "version": "3.99.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jasmine/-/jasmine-3.99.0.tgz",
-      "integrity": "sha1-fMeu2nreLVdpT8gYo3T3eMu06mI=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob": "^7.1.6",
-        "jasmine-core": "~3.99.0"
-      },
-      "bin": {
-        "jasmine": "bin/jasmine.js"
-      }
-    },
-    "node_modules/jasmine-core": {
-      "version": "3.99.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jasmine-core/-/jasmine-core-3.99.1.tgz",
-      "integrity": "sha1-W/pLLXZhiGi/rEyP8Iuyb/+kEg0=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jasmine/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha1-uN8PuAK7+o6JvR2Ti04WV47UTys=",
-      "dev": true,
-      "license": "ISC",
+      "license": "MIT"
+    },
+    "node_modules/jasmine/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha1-uN8PuAK7+o6JvR2Ti04WV47UTys=",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11346,66 +10306,16 @@
       }
     },
     "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jest-circus/node_modules/pretty-format": {
@@ -11423,19 +10333,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-circus/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -11443,19 +10340,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-cli/-/jest-cli-29.7.0.tgz",
@@ -11490,39 +10374,6 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/jest-cli/node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/cliui/-/cliui-8.0.1.tgz",
@@ -11538,49 +10389,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli/node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/yargs/-/yargs-17.7.2.tgz",
@@ -11647,87 +10455,37 @@
       }
     },
     "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+    "node_modules/jest-config/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha1-uN8PuAK7+o6JvR2Ti04WV47UTys=",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "*"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-config/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha1-uN8PuAK7+o6JvR2Ti04WV47UTys=",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/jest-config/node_modules/pretty-format": {
@@ -11745,19 +10503,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-config/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -11765,19 +10510,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-diff": {
       "version": "26.6.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-diff/-/jest-diff-26.6.2.tgz",
@@ -11794,69 +10526,6 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-diff/node_modules/jest-get-type": {
       "version": "26.3.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-get-type/-/jest-get-type-26.3.0.tgz",
@@ -11867,19 +10536,6 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-docblock": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-docblock/-/jest-docblock-29.7.0.tgz",
@@ -11911,66 +10567,16 @@
       }
     },
     "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jest-each/node_modules/pretty-format": {
@@ -11988,19 +10594,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-each/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -12008,19 +10601,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-environment-jsdom": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
@@ -12145,116 +10725,40 @@
       }
     },
     "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+    "node_modules/jest-jasmine2/node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha1-ykLHWDEPNlv6caC9oKgHFgt3aBI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha1-ykLHWDEPNlv6caC9oKgHFgt3aBI=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha1-6DVX3BLq5jqZ4AOkY4ix3LtE234=",
+    "node_modules/jest-jasmine2/node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha1-6DVX3BLq5jqZ4AOkY4ix3LtE234=",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-junit": {
       "version": "13.2.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-junit/-/jest-junit-13.2.0.tgz",
@@ -12337,58 +10841,18 @@
       }
     },
     "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jest-matcher-utils/node_modules/diff-sequences": {
       "version": "29.6.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/diff-sequences/-/diff-sequences-29.6.3.tgz",
@@ -12399,16 +10863,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-matcher-utils/node_modules/jest-diff": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-diff/-/jest-diff-29.7.0.tgz",
@@ -12440,19 +10894,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-matcher-utils/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -12460,19 +10901,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-message-util": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-message-util/-/jest-message-util-29.7.0.tgz",
@@ -12495,66 +10923,16 @@
       }
     },
     "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jest-message-util/node_modules/pretty-format": {
@@ -12572,19 +10950,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-message-util/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -12592,19 +10957,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-mock": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-mock/-/jest-mock-29.7.0.tgz",
@@ -12683,189 +11035,37 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha1-gJrwctQIpT3P0uhJpMl20xMvcY4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-resolve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha1-gJrwctQIpT3P0uhJpMl20xMvcY4=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runtime": {
@@ -12902,59 +11102,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jest-runtime/node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
@@ -12976,29 +11123,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-snapshot": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
@@ -13032,58 +11156,18 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jest-snapshot/node_modules/diff-sequences": {
       "version": "29.6.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/diff-sequences/-/diff-sequences-29.6.3.tgz",
@@ -13094,16 +11178,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-snapshot/node_modules/jest-diff": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-diff/-/jest-diff-29.7.0.tgz",
@@ -13135,19 +11209,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-snapshot/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -13156,9 +11217,9 @@
       "license": "MIT"
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -13168,111 +11229,35 @@
         "node": ">=10"
       }
     },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha1-I8K2K/sivoK0TemAVYAv83EPwLw=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha1-I8K2K/sivoK0TemAVYAv83EPwLw=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI=",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "node": ">=8.6"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/jest-validate": {
@@ -13294,16 +11279,13 @@
       }
     },
     "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+      "version": "5.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -13322,53 +11304,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-validate/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-validate/node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -13384,19 +11319,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha1-B0SWkK1Fd30ZJKwquy/IiV26g2s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-validate/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/react-is/-/react-is-18.3.1.tgz",
@@ -13404,19 +11326,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watcher": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-watcher/-/jest-watcher-29.7.0.tgz",
@@ -13437,82 +11346,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-watcher/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "29.7.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-worker/-/jest-worker-29.7.0.tgz",
@@ -13529,16 +11362,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-8.1.1.tgz",
@@ -13640,9 +11463,9 @@
       }
     },
     "node_modules/jsdom/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha1-DXUFpur+Kw5xLSMrQiefU7wom7w=",
+      "version": "8.18.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha1-6hMdN4Th39/5GtsKShFrEnUV48s=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13662,16 +11485,16 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=",
+      "version": "3.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha1-dNM1ojT2ftGZB/2t+sfM+dQJgl0=",
       "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
@@ -13744,9 +11567,9 @@
       "license": "MIT"
     },
     "node_modules/karma": {
-      "version": "6.4.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/karma/-/karma-6.4.3.tgz",
-      "integrity": "sha1-dj5QD5lZchi7tTbeGhSsxM7qfOg=",
+      "version": "6.4.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/karma/-/karma-6.4.4.tgz",
+      "integrity": "sha1-36WkJs9ai1O0PNVO8NDQl0I1FJI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13888,31 +11711,96 @@
         "xmlbuilder": "12.0.0"
       },
       "engines": {
-        "node": ">= 8"
-      },
-      "peerDependencies": {
-        "karma": ">=0.9"
+        "node": ">= 8"
+      },
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-mocha-reporter": {
+      "version": "2.2.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
+      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "peerDependencies": {
+        "karma": ">=0.13"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha1-Ej1keekq1FrYl9QFTjx8p9tJROE=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/karma-mocha-reporter": {
-      "version": "2.2.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
-      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+    "node_modules/karma-mocha-reporter/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "peerDependencies": {
-        "karma": ">=0.13"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/karma-mocha-reporter/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha1-Ej1keekq1FrYl9QFTjx8p9tJROE=",
+    "node_modules/karma-mocha-reporter/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/karma-mocha-reporter/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13932,6 +11820,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/karma-mocha-reporter/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/karma-safari-launcher": {
       "version": "1.0.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
@@ -13980,82 +11881,6 @@
         "karma": "5.x || 6.x"
       }
     },
-    "node_modules/karma-summary-reporter/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/karma-summary-reporter/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/karma-summary-reporter/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/karma-summary-reporter/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/karma-summary-reporter/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/karma-summary-reporter/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/karma/node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/glob/-/glob-7.2.3.tgz",
@@ -14380,6 +12205,84 @@
         "node": ">=4"
       }
     },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/log-symbols/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/log4js": {
       "version": "6.9.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/log4js/-/log4js-6.9.1.tgz",
@@ -14398,13 +12301,13 @@
       }
     },
     "node_modules/log4js/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -14415,17 +12318,10 @@
         }
       }
     },
-    "node_modules/log4js/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/loglevel": {
-      "version": "1.9.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/loglevel/-/loglevel-1.9.1.tgz",
-      "integrity": "sha1-1jl2rJvNA8fIcxFtQcKoW6//G+c=",
+      "version": "1.9.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/loglevel/-/loglevel-1.9.2.tgz",
+      "integrity": "sha1-wuAo1sdXcgEH305kUIUw22Yhugg=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14454,9 +12350,9 @@
       }
     },
     "node_modules/lower-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -14480,13 +12376,13 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.10",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/magic-string/-/magic-string-0.30.10.tgz",
-      "integrity": "sha1-Ej2cQaDLVkDIkrBB1M+zvQqks54=",
+      "version": "0.30.17",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha1-RQpElnPSRg5bvPupphkWoXFMdFM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/make-dir": {
@@ -14506,9 +12402,9 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -14671,9 +12567,9 @@
       }
     },
     "node_modules/make-fetch-happen/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -14759,17 +12655,14 @@
         "node": ">=10"
       }
     },
-    "node_modules/matcher/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ=",
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha1-oN10voHiqlwvJ+Zc4oNgXuTit/k=",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.4"
       }
     },
     "node_modules/media-typer": {
@@ -14847,9 +12740,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha1-M+gZDZ/kdKmJVSX1YY7uE21GwuU=",
+      "version": "4.0.8",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha1-1m+hjzpHB2eJMgubGvMr2G2fogI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14860,21 +12753,18 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/microsoft.aspnetcore.components.web.js": {
-      "resolved": "src/Components/Web.JS",
-      "link": true
-    },
-    "node_modules/microsoft.aspnetcore.projecttemplates.tests": {
-      "resolved": "src/ProjectTemplates/test/Templates.Tests",
-      "link": true
-    },
-    "node_modules/microsoft.components.customelements": {
-      "resolved": "src/Components/CustomElements/src/js",
-      "link": true
-    },
-    "node_modules/microsoft.msal.components.webassembly": {
-      "resolved": "src/Components/WebAssembly/Authentication.Msal/src/Interop",
-      "link": true
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
     },
     "node_modules/mime": {
       "version": "2.6.0",
@@ -15075,9 +12965,9 @@
       "license": "ISC"
     },
     "node_modules/minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha1-ftu5JYj7/C/x2y/BA5est7a0Sqc=",
+      "version": "1.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz",
+      "integrity": "sha1-USFhbHehHEBsP/p3UJ4Ld7smfsM=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15235,7 +13125,6 @@
       "version": "2.1.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.3.tgz",
       "integrity": "sha1-V0yBOM4dK1hh8LRFedut1gxmFbI=",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/natural-compare": {
@@ -15253,9 +13142,9 @@
       "license": "MIT"
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha1-WOMjpy/twNb5zU0x/kn1FHlZDM0=",
+      "version": "0.6.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha1-d3lI4kUmUcVwtxLdAcI+JicT//c=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15291,9 +13180,9 @@
       }
     },
     "node_modules/no-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -15403,9 +13292,9 @@
       }
     },
     "node_modules/node-gyp/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -15423,9 +13312,9 @@
       "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha1-L/sFO864sr6Elezhq2zmAMRGGws=",
+      "version": "2.0.19",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha1-nkRaUpUJUexNF32EOvNwtBHK8xQ=",
       "dev": true,
       "license": "MIT"
     },
@@ -15462,9 +13351,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -15523,9 +13412,9 @@
       }
     },
     "node_modules/npm-install-checks/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -15562,9 +13451,9 @@
       }
     },
     "node_modules/npm-package-arg/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -15604,9 +13493,9 @@
       }
     },
     "node_modules/npm-pick-manifest/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -15730,9 +13619,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.12",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/nwsapi/-/nwsapi-2.2.12.tgz",
-      "integrity": "sha1-+2r1wOw1sntFges7utNOyeXGlvg=",
+      "version": "2.2.18",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/nwsapi/-/nwsapi-2.2.18.tgz",
+      "integrity": "sha1-PE15J+HvTQQtMZQ47P2mzYG37kE=",
       "dev": true,
       "license": "MIT"
     },
@@ -15747,9 +13636,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha1-3qAIhGf7mR5nr0BYFHokgkowQ/8=",
+      "version": "1.13.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha1-g3UmXiG8IND6WCwi4bE0hdbgAhM=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15940,46 +13829,43 @@
       }
     },
     "node_modules/pac-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
-      "integrity": "sha1-D7Aklr2fuK5+sRz9mDhtqqxEL1g=",
+      "version": "7.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
+      "integrity": "sha1-nPrzP/Jdo29hR6IIRCMOySwG5d8=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@tootallnate/quickjs-emscripten": "^0.23.0",
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "get-uri": "^6.0.1",
         "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.5",
+        "https-proxy-agent": "^7.0.6",
         "pac-resolver": "^7.0.1",
-        "socks-proxy-agent": "^8.0.4"
+        "socks-proxy-agent": "^8.0.5"
       },
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/pac-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha1-vb3tffsJa3UaKgh+7rlmRyWy4xc=",
+      "version": "7.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha1-KUNeuCG8QZRjOluJ5bxHA7r8JaE=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/pac-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -16005,34 +13891,27 @@
       }
     },
     "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha1-notQE4cymeEfq2/VSEBdotbGArI=",
+      "version": "7.0.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha1-2o3+rH2hMLBcK6S1nJts1mYRprk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
         "node": ">= 14"
       }
     },
-    "node_modules/pac-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha1-kHHcoXr5X0gzADFvSwY1ePoNsIw=",
+      "version": "8.0.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha1-uc205+mYUJ12WdaJznaXrCFkW+4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.1.1",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "socks": "^2.8.3"
       },
@@ -16055,9 +13934,9 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha1-5QHNMJSyeEletCWNTJ9tWsMBnwA=",
+      "version": "1.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha1-TxRxoBCCeob5TP2bByfjbSZ95QU=",
       "dev": true,
       "license": "BlueOak-1.0.0"
     },
@@ -16106,9 +13985,9 @@
       }
     },
     "node_modules/param-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -16145,13 +14024,13 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha1-Bza+u/13eTgjJAojt/xeAQt/jjI=",
+      "version": "7.2.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha1-iSj1WRXmEl9DDMRDCXZb8XVWozo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -16179,9 +14058,9 @@
       }
     },
     "node_modules/pascal-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -16197,9 +14076,9 @@
       }
     },
     "node_modules/path-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -16280,20 +14159,20 @@
       "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha1-qK1Xm1cZUvDl0liS3lRFvP4lqqE=",
+      "version": "1.1.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha1-PTIa8+q5ObCDyPkpodEs2oHCa2s=",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI=",
+      "version": "4.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha1-d8dCkx6PO4gglGx2zQwfE3MNHas=",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -16388,82 +14267,6 @@
         "@types/yargs-parser": "*"
       }
     },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/pretty-format/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pretty-format/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/proc-log": {
       "version": "3.0.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/proc-log/-/proc-log-3.0.0.tgz",
@@ -16536,46 +14339,43 @@
       }
     },
     "node_modules/proxy-agent": {
-      "version": "6.4.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/proxy-agent/-/proxy-agent-6.4.0.tgz",
-      "integrity": "sha1-tOLdUd7is3d0iu+NRWBMLXYIZS0=",
+      "version": "6.5.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha1-nkmsuo5O4jSqy1Ofie2cI9AvIy0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "http-proxy-agent": "^7.0.1",
-        "https-proxy-agent": "^7.0.3",
+        "https-proxy-agent": "^7.0.6",
         "lru-cache": "^7.14.1",
-        "pac-proxy-agent": "^7.0.1",
+        "pac-proxy-agent": "^7.1.0",
         "proxy-from-env": "^1.1.0",
-        "socks-proxy-agent": "^8.0.2"
+        "socks-proxy-agent": "^8.0.5"
       },
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/proxy-agent/node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha1-vb3tffsJa3UaKgh+7rlmRyWy4xc=",
+      "version": "7.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha1-KUNeuCG8QZRjOluJ5bxHA7r8JaE=",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -16601,13 +14401,13 @@
       }
     },
     "node_modules/proxy-agent/node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha1-notQE4cymeEfq2/VSEBdotbGArI=",
+      "version": "7.0.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha1-2o3+rH2hMLBcK6S1nJts1mYRprk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
@@ -16624,21 +14424,14 @@
         "node": ">=12"
       }
     },
-    "node_modules/proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha1-kHHcoXr5X0gzADFvSwY1ePoNsIw=",
+      "version": "8.0.5",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha1-uc205+mYUJ12WdaJznaXrCFkW+4=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.1.1",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "socks": "^2.8.3"
       },
@@ -16661,15 +14454,30 @@
       "license": "MIT"
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha1-0N8qE38AeUVl/K87LADNCfjVpac=",
-      "license": "MIT"
+      "version": "1.15.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha1-vazjGJbx2XzsannoIkiYzpPZdMY=",
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
+    },
+    "node_modules/psl/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha1-AnQi4vrsCyXhVJw+G9gwm5EztuU=",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
+      "version": "3.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha1-g28+3WvC7lmSVskk/+DYhXPdy/g=",
       "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
@@ -16684,20 +14492,22 @@
       "license": "MIT"
     },
     "node_modules/puppeteer": {
-      "version": "22.13.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/puppeteer/-/puppeteer-22.13.0.tgz",
-      "integrity": "sha1-/1ZhYWUsL73C2/LDjIW+hBi4owI=",
+      "version": "24.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/puppeteer/-/puppeteer-24.4.0.tgz",
+      "integrity": "sha1-+0WmfnL05uNNuPQE72HN1CCZ5uY=",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@puppeteer/browsers": "2.2.3",
+        "@puppeteer/browsers": "2.8.0",
+        "chromium-bidi": "2.1.2",
         "cosmiconfig": "^9.0.0",
-        "devtools-protocol": "0.0.1299070",
-        "puppeteer-core": "22.13.0"
+        "devtools-protocol": "0.0.1413902",
+        "puppeteer-core": "24.4.0",
+        "typed-query-selector": "^2.12.0"
       },
       "bin": {
-        "puppeteer": "lib/esm/puppeteer/node/cli.js"
+        "puppeteer": "lib/cjs/puppeteer/node/cli.js"
       },
       "engines": {
         "node": ">=18"
@@ -16745,13 +14555,13 @@
       "license": "ISC"
     },
     "node_modules/puppeteer-core/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -16804,13 +14614,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/puppeteer-core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/puppeteer-core/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/rimraf/-/rimraf-3.0.2.tgz",
@@ -16828,9 +14631,9 @@
       }
     },
     "node_modules/puppeteer-core/node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha1-SJoVq4Xx8L76uzcLfeT561y+h4Q=",
+      "version": "2.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha1-+zuIQ6JrbxOgjmBveSKHXrH7v5I=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16863,13 +14666,13 @@
       }
     },
     "node_modules/puppeteer/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -16880,34 +14683,28 @@
         }
       }
     },
-    "node_modules/puppeteer/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/puppeteer/node_modules/puppeteer-core": {
-      "version": "22.13.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/puppeteer-core/-/puppeteer-core-22.13.0.tgz",
-      "integrity": "sha1-q6RekAzVN5/eiFELf0kVAXzGtcM=",
+      "version": "24.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/puppeteer-core/-/puppeteer-core-24.4.0.tgz",
+      "integrity": "sha1-owHFg0T+k5tIdwRZNoHqn5E/5vg=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@puppeteer/browsers": "2.2.3",
-        "chromium-bidi": "0.6.0",
-        "debug": "^4.3.5",
-        "devtools-protocol": "0.0.1299070",
-        "ws": "^8.18.0"
+        "@puppeteer/browsers": "2.8.0",
+        "chromium-bidi": "2.1.2",
+        "debug": "^4.4.0",
+        "devtools-protocol": "0.0.1413902",
+        "typed-query-selector": "^2.12.0",
+        "ws": "^8.18.1"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/puppeteer/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha1-DXUFpur+Kw5xLSMrQiefU7wom7w=",
+      "version": "8.18.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha1-6hMdN4Th39/5GtsKShFrEnUV48s=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16954,13 +14751,13 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha1-/Q2WNEb3pl4TZ+AavYVClFPww3o=",
+      "version": "6.13.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha1-bKO9WEOffiRWVXmJl3h7DYilGQY=",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -17015,13 +14812,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha1-9vB6yCwf1g+C4Ji0F6gOUvH0wUI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -17243,6 +15033,19 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/readdirp/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha1-O6ODNzNkbZ0+SZWUbBNlpn+wekI=",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/rechoir": {
       "version": "0.7.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/rechoir/-/rechoir-0.7.1.tgz",
@@ -17264,9 +15067,9 @@
       "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha1-aw4FSJ2QdrBMQ28xjZsGe7pFlIA=",
+      "version": "10.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha1-Ym4534w3Izjqm4Ao0fmdw/2cPbA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17294,16 +15097,16 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha1-EaKwaITzUnrsPpPbv0o7lYqVVGs=",
+      "version": "6.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha1-DlGQ155UK/KUlV3Mq64E08fVOCY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -17311,26 +15114,37 @@
         "node": ">=4"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha1-3yP/JuDFswCmRwytFgqdCQw6N6s=",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha1-Jy0FqhDHwfZwlbH/Ct2uhEL8Vwk=",
+      "version": "0.12.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha1-DoRt9sZTBYZCk3feVuBHVYOwiNw=",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "version": "3.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha1-u4sJpll7pCZCXy5KByRcPQC5ND4=",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/require-directory": {
@@ -17360,19 +15174,22 @@
       "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha1-tsh6nyqgbfq1Lj1wrIzeMh+lpI0=",
+      "version": "1.22.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha1-tmPoP/sJu/I4aURza6roAwKbizk=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -17407,9 +15224,9 @@
       }
     },
     "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha1-+Mk0uOahP1OeOLcJji42E08B6AA=",
+      "version": "2.0.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha1-QZVebxtAE7dYb4c3SaY13qB+vj8=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -17456,9 +15273,9 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY=",
+      "version": "1.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha1-D+E7lSLhRz9RtVjueW4I8R+bSJ8=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -17481,9 +15298,9 @@
       "license": "MIT"
     },
     "node_modules/rimraf": {
-      "version": "5.0.9",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/rimraf/-/rimraf-5.0.9.tgz",
-      "integrity": "sha1-w7qhuIbq3C7HmBoGpZPD0BE0/+k=",
+      "version": "5.0.10",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha1-I7mEPT3JLbcfluGizpLjn9KoIhw=",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -17492,9 +15309,6 @@
       "bin": {
         "rimraf": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": "14 >=14.20 || 16 >=16.20 || >=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -17582,13 +15396,13 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/rollup": {
-      "version": "4.18.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/rollup/-/rollup-4.18.1.tgz",
-      "integrity": "sha1-GKYG3152ylO4pp8tjqslbWndqFE=",
+      "version": "4.35.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/rollup/-/rollup-4.35.0.tgz",
+      "integrity": "sha1-dslduheled9MAMOVWu0yql1Nxm0=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -17598,22 +15412,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.18.1",
-        "@rollup/rollup-android-arm64": "4.18.1",
-        "@rollup/rollup-darwin-arm64": "4.18.1",
-        "@rollup/rollup-darwin-x64": "4.18.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.1",
-        "@rollup/rollup-linux-arm64-musl": "4.18.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.1",
-        "@rollup/rollup-linux-x64-gnu": "4.18.1",
-        "@rollup/rollup-linux-x64-musl": "4.18.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.1",
-        "@rollup/rollup-win32-x64-msvc": "4.18.1",
+        "@rollup/rollup-android-arm-eabi": "4.35.0",
+        "@rollup/rollup-android-arm64": "4.35.0",
+        "@rollup/rollup-darwin-arm64": "4.35.0",
+        "@rollup/rollup-darwin-x64": "4.35.0",
+        "@rollup/rollup-freebsd-arm64": "4.35.0",
+        "@rollup/rollup-freebsd-x64": "4.35.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.35.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.35.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.35.0",
+        "@rollup/rollup-linux-arm64-musl": "4.35.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.35.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.35.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.35.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.35.0",
+        "@rollup/rollup-linux-x64-gnu": "4.35.0",
+        "@rollup/rollup-linux-x64-musl": "4.35.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.35.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.35.0",
+        "@rollup/rollup-win32-x64-msvc": "4.35.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -17694,6 +15511,24 @@
       ],
       "license": "MIT"
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha1-f4fftnoxUHguqvGFg/9dFxGsEME=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -17702,9 +15537,9 @@
       "license": "MIT"
     },
     "node_modules/saucelabs": {
-      "version": "7.5.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/saucelabs/-/saucelabs-7.5.0.tgz",
-      "integrity": "sha1-dciKleFRmmO3mXjRRqdkou7LTw4=",
+      "version": "9.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/saucelabs/-/saucelabs-9.0.2.tgz",
+      "integrity": "sha1-mfYXDz14n8sL4vJw99N6nXzfUYc=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -17769,9 +15604,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha1-cNfJPhU6JzqAWAGILr07/yDYnIs=",
+      "version": "4.3.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha1-O2afBPcf8t+1q6fOLVqdebNWIsA=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17781,7 +15616,7 @@
         "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -17864,12 +15699,12 @@
       }
     },
     "node_modules/selenium-standalone/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -17880,12 +15715,6 @@
         }
       }
     },
-    "node_modules/selenium-standalone/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "license": "MIT"
-    },
     "node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-6.3.1.tgz",
@@ -17916,9 +15745,9 @@
       }
     },
     "node_modules/sentence-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -17969,29 +15798,11 @@
       "license": "ISC"
     },
     "node_modules/set-cookie-parser": {
-      "version": "2.6.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz",
-      "integrity": "sha1-Exkh5Q9i/xpmpGHX1i17IdXRWlE=",
+      "version": "2.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha1-MBbxUAciAt++kPre4FNXPMidKUM=",
       "license": "MIT"
     },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha1-qscjFBmOrtl1z3eyw7a4gGleVEk=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -18034,16 +15845,73 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha1-q9Jft80kuvRUZkBrEJa3gxySFfI=",
+      "version": "1.1.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha1-w/z/nE2pMnhIczNeyXZfqU/2a8k=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha1-EMtZhCYxFdO3oOM2WR4pCoMK+K0=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha1-1rtrN5Asb+9RdOX1M/q0xzKib0I=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha1-Ed2hnVNo5Azp7CvcH7DsvAeQ7Oo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18191,16 +16059,16 @@
       }
     },
     "node_modules/snake-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
     "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha1-Vustl2rvnRRF83OmLXgaQcet2Pg=",
+      "version": "4.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha1-+g6v+WXMl/30JF6NR5RhhFn3VYo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18208,7 +16076,7 @@
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },
@@ -18228,13 +16096,13 @@
       }
     },
     "node_modules/socket.io-adapter/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.3.7",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha1-h5RbQVGgEddtlaGY1xEchlw2ClI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -18245,13 +16113,6 @@
         }
       }
     },
-    "node_modules/socket.io-adapter/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/socket.io-adapter/node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.17.1.tgz",
@@ -18289,13 +16150,13 @@
       }
     },
     "node_modules/socket.io-parser/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.3.7",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha1-h5RbQVGgEddtlaGY1xEchlw2ClI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -18306,21 +16167,14 @@
         }
       }
     },
-    "node_modules/socket.io-parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/socket.io/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.3.7",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha1-h5RbQVGgEddtlaGY1xEchlw2ClI=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -18331,17 +16185,10 @@
         }
       }
     },
-    "node_modules/socket.io/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha1-Hr0PCcUrqVoJdQr+Pz+fckqADLU=",
+      "version": "2.8.4",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/socks/-/socks-2.8.4.tgz",
+      "integrity": "sha1-BxCXVc3U2gMmm9pHJbqgYatW1cw=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18369,13 +16216,13 @@
       }
     },
     "node_modules/socks-proxy-agent/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -18386,13 +16233,6 @@
         }
       }
     },
-    "node_modules/socks-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/source-map/-/source-map-0.6.1.tgz",
@@ -18444,9 +16284,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha1-IqqSLc8vKIWmSUomHy2LdTRdAyY=",
+      "version": "3.0.21",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+      "integrity": "sha1-bW6YDJ3ytvyQU0OjstcCpiOVNsM=",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -18549,13 +16389,13 @@
       }
     },
     "node_modules/streamroller/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -18591,13 +16431,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/streamroller/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/streamroller/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/universalify/-/universalify-0.1.2.tgz",
@@ -18609,14 +16442,13 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.18.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/streamx/-/streamx-2.18.0.tgz",
-      "integrity": "sha1-W8GlHrQSpmfr/c1ObPam/GVyGsc=",
+      "version": "2.22.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/streamx/-/streamx-2.22.0.tgz",
+      "integrity": "sha1-zXteV8larvD/myrveQWvpi7G5Kc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
         "text-decoder": "^1.1.0"
       },
       "optionalDependencies": {
@@ -18746,18 +16578,18 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -18809,9 +16641,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tar-fs/-/tar-fs-3.0.5.tgz",
-      "integrity": "sha1-+VTXd2fk5u35czhOHrlfj4HWTtk=",
+      "version": "3.0.9",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tar-fs/-/tar-fs-3.0.9.tgz",
+      "integrity": "sha1-1XB5PGNw1weJJsQfpCKJFWagthc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18819,8 +16651,8 @@
         "tar-stream": "^3.1.5"
       },
       "optionalDependencies": {
-        "bare-fs": "^2.1.1",
-        "bare-path": "^2.1.0"
+        "bare-fs": "^4.0.1",
+        "bare-path": "^3.0.0"
       }
     },
     "node_modules/tar-fs/node_modules/tar-stream": {
@@ -18885,9 +16717,9 @@
       "license": "ISC"
     },
     "node_modules/terser": {
-      "version": "5.31.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/terser/-/terser-5.31.2.tgz",
-      "integrity": "sha1-tcoYgQe3BghNyoL5iAifphAuuhE=",
+      "version": "5.39.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/terser/-/terser-5.39.0.tgz",
+      "integrity": "sha1-DoIDPtV7Pd8flnCNEjzKcX2Gyjo=",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -18904,17 +16736,17 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha1-kE9MkZPG/SoD9pOiFQxiqS9A0Zk=",
+      "version": "5.3.14",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha1-kDHUjlerJ1Z/AqzoXH1pDbZsPgY=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -18938,16 +16770,6 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -18963,25 +16785,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha1-9QqIh3w8AWUqFbYirp6Xld96YP4=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-8.1.1.tgz",
@@ -19046,9 +16849,9 @@
       }
     },
     "node_modules/text-decoder": {
-      "version": "1.1.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/text-decoder/-/text-decoder-1.1.1.tgz",
-      "integrity": "sha1-XfnCJM66xKeXdyC58IP576Gu/eg=",
+      "version": "1.2.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/text-decoder/-/text-decoder-1.2.3.tgz",
+      "integrity": "sha1-sZ2jZNmBsjJtX0MJnDEMyA13DGU=",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -19093,16 +16896,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -19183,9 +16976,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha1-S0kOJxKfHo5oa0XMSrY3FNxg7qE=",
+      "version": "1.4.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha1-v8IhX+ZSj+yrKw+6VwouikJjsGQ=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19196,21 +16989,21 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.2.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ts-jest/-/ts-jest-29.2.2.tgz",
-      "integrity": "sha1-DSOHuwTTkXSyCgUXKpaPJYrt/00=",
+      "version": "29.2.6",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ts-jest/-/ts-jest-29.2.6.tgz",
+      "integrity": "sha1-31Pt+LcvuJ3gMs+jEKvzdYKFHZo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bs-logger": "0.x",
-        "ejs": "^3.0.0",
-        "fast-json-stable-stringify": "2.x",
+        "bs-logger": "^0.2.6",
+        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "^2.1.0",
         "jest-util": "^29.0.0",
         "json5": "^2.2.3",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "^7.5.3",
-        "yargs-parser": "^21.0.1"
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.7.1",
+        "yargs-parser": "^21.1.1"
       },
       "bin": {
         "ts-jest": "cli.js"
@@ -19245,9 +17038,9 @@
       }
     },
     "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -19278,73 +17071,10 @@
         "webpack": "*"
       }
     },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -19354,19 +17084,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ts-node/-/ts-node-10.9.2.tgz",
@@ -19450,13 +17167,13 @@
       }
     },
     "node_modules/tuf-js/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -19532,13 +17249,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/tuf-js/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tunnel": {
       "version": "0.0.6",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tunnel/-/tunnel-0.0.6.tgz",
@@ -19599,10 +17309,17 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typed-query-selector": {
+      "version": "2.12.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
+      "integrity": "sha1-krZdvApCZV/M9K6xoIsd3c6K9fI=",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha1-4bCjw5QZCDigsWjncbCtVqCvD6o=",
+      "version": "5.8.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha1-gXCzcC90t52y5aliB8FeZYB5meQ=",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -19614,9 +17331,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.38",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
-      "integrity": "sha1-9JfYpNwf7G6FTlyqSy+ZE0Iu8FQ=",
+      "version": "0.7.40",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ua-parser-js/-/ua-parser-js-0.7.40.tgz",
+      "integrity": "sha1-yH2Dt7slgi7Ppjl6DaWQOTTqFWI=",
       "dev": true,
       "funding": [
         {
@@ -19633,6 +17350,9 @@
         }
       ],
       "license": "MIT",
+      "bin": {
+        "ua-parser-js": "script/cli.js"
+      },
       "engines": {
         "node": "*"
       }
@@ -19649,15 +17369,15 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha1-vNU5iT0AtW6WT9JlekhmsiGmVhc=",
+      "version": "6.20.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha1-gXG/IsH1iNFVTVW/IEvGJK84hDM=",
       "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw=",
+      "version": "2.0.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha1-yzFz/kfKdD4ighbko93EyE1ijMI=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19679,9 +17399,9 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha1-y1//3NFqBRJPWksL98N3Agisu+A=",
+      "version": "2.2.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha1-oEAa7nJxRZj3ObaLEE5P46DLPHE=",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19744,9 +17464,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha1-fKYcDYZQdmCQcoBG5BaozeaChZ4=",
+      "version": "1.1.3",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha1-NIN33SRSFvnnBg/1CxWht0C3VCA=",
       "dev": true,
       "funding": [
         {
@@ -19764,8 +17484,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -19795,16 +17515,16 @@
       }
     },
     "node_modules/upper-case-first/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
     "node_modules/upper-case/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha1-BDj4EK16ntzeeiQcPYDbaTyMv+A=",
+      "version": "2.8.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
       "dev": true,
       "license": "0BSD"
     },
@@ -19838,13 +17558,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "node_modules/urlpattern-polyfill": {
-      "version": "10.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
-      "integrity": "sha1-8KA6l7+wPN8zVT5eeaKq3SLKyOw=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -19958,9 +17671,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha1-KTCPLKwVD6jkyS+Q4OyVSp/tf/8=",
+      "version": "2.4.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha1-L+6u1nQS58MxhOWnnKc4+9OFZNo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20080,22 +17793,21 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.93.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack/-/webpack-5.93.0.tgz",
-      "integrity": "sha1-LonscDVXm9+6l2DSbGOsXDRipeU=",
+      "version": "5.98.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/webpack/-/webpack-5.98.0.tgz",
+      "integrity": "sha1-RK4ZqPK6l1N5eCRgcvuJ0Q0fvRc=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -20105,9 +17817,9 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
+        "schema-utils": "^4.3.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
+        "terser-webpack-plugin": "^5.3.11",
         "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
@@ -20211,9 +17923,9 @@
       }
     },
     "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.17.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
-      "integrity": "sha1-0DdgN4ndlVW4mq7H63iEXEkIm8U=",
+      "version": "5.18.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha1-coqwgvi3toNt5R8WN6q107lWj68=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -20224,25 +17936,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha1-9QqIh3w8AWUqFbYirp6Xld96YP4=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/webpack/node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/tapable/-/tapable-2.2.1.tgz",
@@ -20395,78 +18088,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/wrappy/-/wrappy-1.0.2.tgz",
@@ -20699,9 +18320,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.23.8",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/zod/-/zod-3.23.8.tgz",
-      "integrity": "sha1-43uVe11SB5dp+4CXCZtZLw70Bn0=",
+      "version": "3.24.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/zod/-/zod-3.24.2.tgz",
+      "integrity": "sha1-jvp0EmKHxnXpL0aHHPyNFcNDcrM=",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -20709,28 +18330,28 @@
       }
     },
     "src/Components/CustomElements/src/js": {
-      "name": "microsoft.components.customelements"
+      "name": "@microsoft/microsoft.components.customelements"
     },
     "src/Components/dotnet-runtime-js": {
-      "name": "dotnet-runtime",
+      "name": "@microsoft/dotnet-runtime",
       "version": "1.0.0",
       "license": "MIT"
     },
     "src/Components/Web.JS": {
-      "name": "microsoft.aspnetcore.components.web.js",
+      "name": "@microsoft/microsoft.aspnetcore.components.web.js",
       "version": "0.0.1",
       "devDependencies": {
         "@babel/core": "^7.23.6",
         "@babel/preset-env": "^7.23.6",
         "@babel/preset-typescript": "^7.23.3",
         "@microsoft/dotnet-js-interop": "*",
+        "@microsoft/dotnet-runtime": "*",
         "@microsoft/signalr": "*",
         "@microsoft/signalr-protocol-msgpack": "*",
         "@types/jsdom": "^16.2.14",
         "@typescript-eslint/eslint-plugin": "^5.26.0",
         "@typescript-eslint/parser": "^5.26.0",
         "babel-jest": "^29.7.0",
-        "dotnet-runtime": "*",
         "eslint": "^8.16.0",
         "eslint-plugin-header": "^3.1.1",
         "jest": "^29.7.0",
@@ -20755,27 +18376,34 @@
       }
     },
     "src/Components/WebAssembly/Authentication.Msal/src/Interop": {
-      "name": "microsoft.msal.components.webassembly",
+      "name": "@microsoft/microsoft.msal.components.webassembly",
       "dependencies": {
         "@azure/msal-browser": "^2.28.3"
       }
     },
     "src/Components/WebAssembly/WebAssembly.Authentication/src/Interop": {
-      "name": "components.authentication",
+      "name": "@microsoft/components.authentication",
       "dependencies": {
         "oidc-client": "^1.11.5"
       }
     },
     "src/JSInterop/Microsoft.JSInterop.JS/src": {
       "name": "@microsoft/dotnet-js-interop",
-      "version": "8.0.0-dev",
+      "version": "10.0.0-dev",
       "license": "MIT",
       "devDependencies": {
+        "@babel/core": "^7.23.6",
+        "@babel/preset-env": "^7.23.6",
+        "@babel/preset-typescript": "^7.26.0",
         "@typescript-eslint/eslint-plugin": "^6.15.0",
         "@typescript-eslint/parser": "^6.15.0",
+        "babel-jest": "^29.7.0",
         "eslint": "^8.56.0",
         "eslint-plugin-jsdoc": "^46.9.1",
         "eslint-plugin-prefer-arrow": "^1.2.3",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
+        "jest-junit": "^16.0.0",
         "rimraf": "^5.0.5",
         "typescript": "^5.3.3"
       }
@@ -21014,13 +18642,13 @@
       }
     },
     "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha1-6DRE7Ouf7dSh2lbWca4kRqAabh4=",
+      "version": "4.4.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha1-Kz8q6i/+t3ZHdGAmc3fchxD6uoo=",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -21031,19 +18659,6 @@
         }
       }
     },
-    "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ=",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/eslint-plugin-jsdoc": {
       "version": "46.10.1",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.10.1.tgz",
@@ -21068,6 +18683,22 @@
         "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
+    "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/jest-junit": {
+      "version": "16.0.0",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/jest-junit/-/jest-junit-16.0.0.tgz",
+      "integrity": "sha1-2DjoxWHPn91+tU9jAgd37uQTZ4U=",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "strip-ansi": "^6.0.1",
+        "uuid": "^8.3.2",
+        "xml": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
     "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/minimatch": {
       "version": "9.0.3",
       "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-9.0.3.tgz",
@@ -21084,17 +18715,10 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-      "dev": true,
-      "license": "MIT"
-    },
     "src/JSInterop/Microsoft.JSInterop.JS/src/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha1-Hjs0dZ+Jbo8U1hNHMs55iusMbhM=",
+      "version": "7.7.1",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -21116,7 +18740,7 @@
       }
     },
     "src/ProjectTemplates/test/Templates.Tests": {
-      "name": "microsoft.aspnetcore.projecttemplates.tests",
+      "name": "@microsoft/microsoft.aspnetcore.projecttemplates.tests",
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
@@ -21125,7 +18749,7 @@
       }
     },
     "src/SignalR/clients/ts": {
-      "name": "client-ts",
+      "name": "@microsoft/client-ts",
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
@@ -21145,12 +18769,12 @@
         "ts-jest": "^29.0.5",
         "ts-loader": "^8.0.17",
         "typescript": "^4.9.5",
-        "webpack": "^5.76.3",
+        "webpack": "^5.94.0",
         "webpack-cli": "^4.9.2"
       }
     },
     "src/SignalR/clients/ts/FunctionalTests": {
-      "name": "functionaltests",
+      "name": "@microsoft/functionaltests",
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
@@ -21187,7 +18811,7 @@
         "rxjs": "^6.3.3",
         "ts-node": "^10.9.2",
         "typescript": "^5.0.2",
-        "webpack": "^5.76.3",
+        "webpack": "^5.94.0",
         "ws": " ^6.0.0"
       }
     },
@@ -21199,9 +18823,9 @@
       "license": "MIT"
     },
     "src/SignalR/clients/ts/FunctionalTests/node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha1-4bCjw5QZCDigsWjncbCtVqCvD6o=",
+      "version": "5.8.2",
+      "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha1-gXCzcC90t52y5aliB8FeZYB5meQ=",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -21272,22 +18896,22 @@
     },
     "src/SignalR/clients/ts/signalr": {
       "name": "@microsoft/signalr",
-      "version": "5.0.0-dev",
+      "version": "10.0.0-dev",
       "license": "MIT",
       "dependencies": {
         "abort-controller": "^3.0.0",
         "eventsource": "^2.0.2",
         "fetch-cookie": "^2.0.3",
         "node-fetch": "^2.6.7",
-        "ws": "^7.4.5"
+        "ws": "^7.5.10"
       }
     },
     "src/SignalR/clients/ts/signalr-protocol-msgpack": {
       "name": "@microsoft/signalr-protocol-msgpack",
-      "version": "5.0.0-dev",
+      "version": "10.0.0-dev",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/signalr": "*",
+        "@microsoft/signalr": ">=10.0.0-dev",
         "@msgpack/msgpack": "^2.7.0"
       }
     },
diff --git a/package.json b/package.json
index 32c7d1df34ce..48c94efe5535 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "aspnetcore",
+  "name": "@microsoft/aspnetcore",
   "version": "1.0.0",
   "private": true,
   "workspaces": [
diff --git a/print-hash.ps1 b/print-hash.ps1
new file mode 100644
index 000000000000..0218ee5fda9a
--- /dev/null
+++ b/print-hash.ps1
@@ -0,0 +1,11 @@
+# Get all .msi files in the current directory
+$msiFiles = Get-ChildItem -Path "artifacts\installers\Release" -Filter "*.msi"
+
+# For each .msi file
+foreach ($file in $msiFiles) {
+    # Calculate the SHA-1 hash
+    $hash = Get-FileHash -Algorithm SHA1 $file.FullName
+
+    # Print the file name and the hash
+    Write-Output "* $($file.Name): $($hash.Hash)"
+}
diff --git a/sign.installers.ps1 b/sign.installers.ps1
new file mode 100644
index 000000000000..1953e69518ff
--- /dev/null
+++ b/sign.installers.ps1
@@ -0,0 +1,134 @@
+if ($env:CI -eq "true") {
+    exit 0
+}
+
+# Function to check if a binary is ARM64
+function Test-IsArm64Binary {
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$FilePath
+    )
+
+    try {
+        # Read the PE header to determine the architecture
+        $fileStream = [System.IO.File]::OpenRead($FilePath)
+        $binaryReader = New-Object System.IO.BinaryReader($fileStream)
+
+        # Check DOS header magic number (MZ)
+        $dosHeader = $binaryReader.ReadUInt16()
+        if ($dosHeader -ne 0x5A4D) { # "MZ" signature
+            $binaryReader.Close()
+            $fileStream.Close()
+            return $false
+        }
+
+        # Seek to e_lfanew field (offset 60)
+        $fileStream.Position = 60
+        $peHeaderOffset = $binaryReader.ReadUInt32()
+
+        # Go to PE header and verify signature
+        $fileStream.Position = $peHeaderOffset
+        $peSignature = $binaryReader.ReadUInt32()
+        if ($peSignature -ne 0x00004550) { # "PE\0\0" signature
+            $binaryReader.Close()
+            $fileStream.Close()
+            return $false
+        }
+
+        # Machine type is at offset PE header + 4
+        $fileStream.Position = $peHeaderOffset + 4
+        $machineType = $binaryReader.ReadUInt16()
+
+        $binaryReader.Close()
+        $fileStream.Close()
+
+        # 0x8664 = AMD64 (x64), 0x14c = i386, 0xAA64 = ARM64
+        return $machineType -eq 0xAA64
+    }
+    catch {
+        Write-Host "Error examining binary: $_"
+        return $false
+    }
+}
+
+$cert = Get-ChildItem -Path Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
+if ($null -eq $cert) {
+    Write-Host "No code signing certificate found in MY store. Exit."
+    exit 1
+}
+
+Write-Host "Certificate found. Sign the MSI installers."
+
+# Determine if we're running on ARM64
+$isArm64System = [System.Environment]::Is64BitOperatingSystem -and [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture -eq [System.Runtime.InteropServices.Architecture]::Arm64
+
+# Find signtool.exe candidates
+$signtoolCandidates = Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits\10\bin" -Recurse -Filter "signtool.exe"
+if ($signtoolCandidates.Count -eq 0) {
+    Write-Host "No signtool.exe found. Exit."
+    exit 1
+}
+
+# Prioritize ARM64 candidates if on ARM64 system
+if ($isArm64System) {
+    Write-Host "Running on ARM64 Windows, prioritizing ARM64 signtool..."
+    $prioritizedCandidates = @()
+    $nonArm64Candidates = @()
+
+    foreach ($candidate in $signtoolCandidates) {
+        if (Test-IsArm64Binary -FilePath $candidate.FullName) {
+            Write-Host "Found ARM64 signtool at $($candidate.FullName)"
+            $prioritizedCandidates += $candidate
+        } else {
+            $nonArm64Candidates += $candidate
+        }
+    }
+
+    # Combine ARM64 candidates first, then non-ARM64 candidates
+    $signtoolCandidates = $prioritizedCandidates + $nonArm64Candidates
+}
+
+Write-Host "Found $($signtoolCandidates.Count) signtool candidates."
+$files = Get-ChildItem .\artifacts\installers\Release\* -Include ('*.msi') -File
+Write-Host "Found $($files.Count) MSI installers to sign."
+
+# Try each signtool until one works
+$signedSuccessfully = $false
+foreach ($signtoolCandidate in $signtoolCandidates) {
+    $signtool = $signtoolCandidate.FullName
+    Write-Host "Trying signtool at: $signtool"
+
+    $allFilesSigned = $true
+
+    foreach ($file in $files) {
+        Write-Host "Signing $($file.FullName) with $signtool"
+        & $signtool sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /d "HTTP Bridge Module for IIS" /a $file.FullName 2>&1 | Write-Debug
+
+        if ($LASTEXITCODE -ne 0) {
+            Write-Host "Failed to sign $($file.FullName) with $signtool (exit code $LASTEXITCODE)"
+            $allFilesSigned = $false
+            break
+        }
+
+        # Verify immediately after signing
+        & $signtool verify /pa /q $file.FullName 2>&1 | Write-Debug
+        if ($LASTEXITCODE -ne 0) {
+            Write-Host "Failed to verify $($file.FullName) with $signtool (exit code $LASTEXITCODE)"
+            $allFilesSigned = $false
+            break
+        }
+    }
+
+    if ($allFilesSigned) {
+        $signedSuccessfully = $true
+        Write-Host "Successfully signed all MSI installers with $signtool"
+        break
+    }
+}
+
+if (-not $signedSuccessfully) {
+    Write-Host "Failed to sign MSI installers with any available signtool. Exit."
+    exit 1
+}
+
+Write-Host "Signing and verification finished successfully."
diff --git a/src/Analyzers/Analyzers.slnf b/src/Analyzers/Analyzers.slnf
index bfb010ea2d1c..af0bf459e28e 100644
--- a/src/Analyzers/Analyzers.slnf
+++ b/src/Analyzers/Analyzers.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Mvc\\Mvc\\src\\Microsoft.AspNetCore.Mvc.csproj",
       "src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj",
diff --git a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
index 5c89ff96a301..9290cc9741f5 100644
--- a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
+++ b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Analyzers\Analyzers\src\Microsoft.AspNetCore.Analyzers.csproj" />
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <Reference Include="Microsoft.Extensions.DependencyModel" />
 
diff --git a/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs b/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs
index 42b9fbd86036..0e5e579977d9 100644
--- a/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs
+++ b/src/Analyzers/Analyzers/test/StartupCSharpAnalyzerTest.cs
@@ -5,11 +5,11 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
+using Microsoft.CodeAnalysis.Testing;
 
 namespace Microsoft.AspNetCore.Analyzers;
 
-internal sealed class StartupCSharpAnalyzerTest : CSharpAnalyzerTest<StartupAnalyzer, XUnitVerifier>
+internal sealed class StartupCSharpAnalyzerTest : CSharpAnalyzerTest<StartupAnalyzer, DefaultVerifier>
 {
     public StartupCSharpAnalyzerTest(StartupAnalyzer analyzer, ImmutableArray<MetadataReference> metadataReferences)
     {
diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Assert.cs b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Assert.cs
index 7f0f69a709f7..7dcaff1b6808 100644
--- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Assert.cs
+++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Assert.cs
@@ -18,7 +18,7 @@ public static void DiagnosticLocation(DiagnosticLocation expected, Location actu
         {
             if (actualLinePosition.Line + 1 != expected.Line)
             {
-                throw new DiagnosticLocationAssertException(
+                throw EqualException.ForMismatchedValues(
                     expected,
                     actual,
                     $"Expected diagnostic to be on line \"{expected.Line}\" was actually on line \"{actualLinePosition.Line + 1}\"");
@@ -30,25 +30,11 @@ public static void DiagnosticLocation(DiagnosticLocation expected, Location actu
         {
             if (actualLinePosition.Character + 1 != expected.Column)
             {
-                throw new DiagnosticLocationAssertException(
+                throw EqualException.ForMismatchedValues(
                     expected,
                     actual,
                     $"Expected diagnostic to start at column \"{expected.Column}\" was actually on column \"{actualLinePosition.Character + 1}\"");
             }
         }
     }
-
-    private sealed class DiagnosticLocationAssertException : EqualException
-    {
-        public DiagnosticLocationAssertException(
-            DiagnosticLocation expected,
-            Location actual,
-            string message)
-            : base(expected, actual)
-        {
-            Message = message;
-        }
-
-        public override string Message { get; }
-    }
 }
diff --git a/src/Antiforgery/Antiforgery.slnf b/src/Antiforgery/Antiforgery.slnf
index 4329531a5f8f..7ce6a6ecf3dd 100644
--- a/src/Antiforgery/Antiforgery.slnf
+++ b/src/Antiforgery/Antiforgery.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\samples\\MinimalFormSample\\MinimalFormSample.csproj",
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
diff --git a/src/Antiforgery/src/PublicAPI.Shipped.txt b/src/Antiforgery/src/PublicAPI.Shipped.txt
index fe55066bc165..a83f5d0b56fc 100644
--- a/src/Antiforgery/src/PublicAPI.Shipped.txt
+++ b/src/Antiforgery/src/PublicAPI.Shipped.txt
@@ -7,6 +7,8 @@ Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.FormFieldName.get -> string!
 Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.FormFieldName.set -> void
 Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.HeaderName.get -> string?
 Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.HeaderName.set -> void
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressReadingTokenFromFormBody.get -> bool
+Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressReadingTokenFromFormBody.set -> void
 Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressXFrameOptionsHeader.get -> bool
 Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressXFrameOptionsHeader.set -> void
 Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet
diff --git a/src/Antiforgery/src/PublicAPI.Unshipped.txt b/src/Antiforgery/src/PublicAPI.Unshipped.txt
index cdd99e7d264d..7dc5c58110bf 100644
--- a/src/Antiforgery/src/PublicAPI.Unshipped.txt
+++ b/src/Antiforgery/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressReadingTokenFromFormBody.get -> bool
-Microsoft.AspNetCore.Antiforgery.AntiforgeryOptions.SuppressReadingTokenFromFormBody.set -> void
diff --git a/src/Antiforgery/test/BinaryBlobTest.cs b/src/Antiforgery/test/BinaryBlobTest.cs
index c239927f9d32..5a1fe5993372 100644
--- a/src/Antiforgery/test/BinaryBlobTest.cs
+++ b/src/Antiforgery/test/BinaryBlobTest.cs
@@ -56,10 +56,10 @@ public void Ctor_Data()
     [Theory]
     [InlineData((object[]?)null)]
     [InlineData(new byte[] { 0x01, 0x02, 0x03 })]
-    public void Ctor_Data_Bad(byte[] data)
+    public void Ctor_Data_Bad(byte[]? data)
     {
         // Act & assert
-        var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new BinaryBlob(32, data));
+        var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new BinaryBlob(32, data!));
         Assert.Equal("data", ex.ParamName);
     }
 
diff --git a/src/Antiforgery/test/DefaultAntiforgeryTest.cs b/src/Antiforgery/test/DefaultAntiforgeryTest.cs
index a3819c95d12f..4e3fc6b2d41b 100644
--- a/src/Antiforgery/test/DefaultAntiforgeryTest.cs
+++ b/src/Antiforgery/test/DefaultAntiforgeryTest.cs
@@ -1079,7 +1079,7 @@ public void SetCookieTokenAndHeader_OverridesExistingCachingHeaders()
     [InlineData(true, null)]
     public void SetCookieTokenAndHeader_AddsXFrameOptionsHeader(
         bool suppressXFrameOptions,
-        string expectedHeaderValue)
+        string? expectedHeaderValue)
     {
         // Arrange
         var options = new AntiforgeryOptions()
diff --git a/src/Antiforgery/test/DefaultAntiforgeryTokenStoreTest.cs b/src/Antiforgery/test/DefaultAntiforgeryTokenStoreTest.cs
index 65a3536d8051..bfef37e4dd40 100644
--- a/src/Antiforgery/test/DefaultAntiforgeryTokenStoreTest.cs
+++ b/src/Antiforgery/test/DefaultAntiforgeryTokenStoreTest.cs
@@ -396,7 +396,7 @@ public void SaveCookieToken_HonorsCookieSecurePolicy_OnOptions(
     [InlineData("/", "/")]
     [InlineData("/vdir1", "/vdir1")]
     [InlineData("/vdir1/vdir2", "/vdir1/vdir2")]
-    public void SaveCookieToken_SetsCookieWithApproriatePathBase(string requestPathBase, string expectedCookiePath)
+    public void SaveCookieToken_SetsCookieWithApproriatePathBase(string? requestPathBase, string expectedCookiePath)
     {
         // Arrange
         var token = "serialized-value";
diff --git a/src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj b/src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj
new file mode 100644
index 000000000000..bdb335eba896
--- /dev/null
+++ b/src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <Description>ASP.NET Core static framework assets</Description>
+    <PackageId>Microsoft.AspNetCore.App.Internal.Assets</PackageId>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
+    <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IncludeSymbols>false</IncludeSymbols>
+    <ImplicitUsings>disable</ImplicitUsings>
+
+    <!-- The package doesn't produce any lib or ref assemblies -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_BlazorJSContentRoot Condition="'$(Configuration)' == 'Debug'">$(RepoRoot)src\Components\Web.JS\dist\Debug</_BlazorJSContentRoot>
+    <_BlazorJSContentRoot Condition="'$(Configuration)' == 'Release'">$(RepoRoot)src\Components\Web.JS\dist\Release</_BlazorJSContentRoot>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BuildNodeJS)' == 'true'">
+    <_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.web.js" />
+    <_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.server.js" />
+    <_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.webassembly.js" />
+
+    <_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.web.js.map" />
+    <_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.server.js.map" />
+    <_BlazorJSFile Include="$(_BlazorJSContentRoot)\blazor.webassembly.js.map" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="build\*" Pack="true" PackagePath="%(Identity)" />
+    <None Include="buildMultiTargeting\*" Pack="true" PackagePath="%(Identity)" />
+    <None Include="buildTransitive\*" Pack="true" PackagePath="%(Identity)" />
+    <None Include="@(_BlazorJSFile)" Pack="true" PackagePath="_framework\%(FileName)%(Extension)" />
+  </ItemGroup>
+
+  <Target Name="_CheckBlazorJSPath" AfterTargets="ResolveProjectReferences">
+    <ItemGroup>
+      <_MissingBlazorJSFile Include="@(_BlazorJSFile)" Condition="!EXISTS('%(_BlazorJSFile.FullPath)')" />
+    </ItemGroup>
+
+    <Error
+      Condition="'@(_MissingBlazorJSFile)' != ''"
+      Text="'%(_MissingBlazorJSFile.Identity)' does not exist. Run 'npm run build' in the repo root to generate the file." />
+  </Target>
+
+</Project>
diff --git a/src/Assets/build.cmd b/src/Assets/build.cmd
new file mode 100644
index 000000000000..5274e00264f0
--- /dev/null
+++ b/src/Assets/build.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET RepoRoot=%~dp0..\..
+%RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj %*
diff --git a/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.props b/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.props
new file mode 100644
index 000000000000..8c119d5413b5
--- /dev/null
+++ b/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.props
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets b/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets
new file mode 100644
index 000000000000..12b2cf3736b3
--- /dev/null
+++ b/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets
@@ -0,0 +1,72 @@
+<Project>
+  <PropertyGroup>
+    <ResolveStaticWebAssetsInputsDependsOn>
+      $(ResolveStaticWebAssetsInputsDependsOn);
+      _AddBlazorFrameworkStaticWebAssets;
+    </ResolveStaticWebAssetsInputsDependsOn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <BlazorFrameworkStaticWebAssetRoot Condition="'$(BlazorFrameworkStaticWebAssetRoot)' == ''">$(MSBuildThisFileDirectory)..\_framework</BlazorFrameworkStaticWebAssetRoot>
+  </PropertyGroup>
+
+  <Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(OutputType)' == 'Exe'">
+    <ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">
+      <_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js">
+        <RelativePath>_framework/blazor.web.js</RelativePath>
+      </_FrameworkStaticWebAssetCandidate>
+      <_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js">
+        <RelativePath>_framework/blazor.server.js</RelativePath>
+      </_FrameworkStaticWebAssetCandidate>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(UseBlazorFrameworkDebugAssets)' == 'true'">
+      <_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.web.js.map">
+        <RelativePath>_framework/blazor.web.js.map</RelativePath>
+      </_FrameworkStaticWebAssetCandidate>
+      <_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\blazor.server.js.map">
+        <RelativePath>_framework/blazor.server.js.map</RelativePath>
+      </_FrameworkStaticWebAssetCandidate>
+    </ItemGroup>
+
+    <ItemGroup>
+      <_MissingFrameworkStaticWebAssetCandidate
+        Include="@(_FrameworkStaticWebAssetCandidate)"
+        Condition="!EXISTS('%(Identity)')" />
+      <_FrameworkStaticWebAssetCandidate Remove="@(_MissingFrameworkStaticWebAssetCandidate)" />
+    </ItemGroup>
+
+    <Message
+      Importance="High"
+      Condition="'@(_MissingFrameworkStaticWebAssetCandidate->Count())' != '0'"
+      Text="Framework asset '%(_MissingFrameworkStaticWebAssetCandidate.Identity)' could not be found and won't be included in the project." />
+
+    <DefineStaticWebAssets
+      Condition="'@(_FrameworkStaticWebAssetCandidate->Count())' != '0'"
+      CandidateAssets="@(_FrameworkStaticWebAssetCandidate)"
+      ContentRoot="$(BlazorFrameworkStaticWebAssetRoot)"
+      SourceId="$(PackageId)"
+      SourceType="Discovered"
+      AssetKind="All"
+      AssetMode="CurrentProject"
+      AssetRole="Primary"
+      FingerprintCandidates="true"
+      BasePath="$(StaticWebAssetBasePath)">
+      <Output TaskParameter="Assets" ItemName="_FrameworkStaticWebAsset" />
+    </DefineStaticWebAssets>
+
+    <DefineStaticWebAssetEndpoints
+      Condition="'@(_FrameworkStaticWebAsset)' != ''"
+      CandidateAssets="@(_FrameworkStaticWebAsset)"
+      ExistingEndpoints=""
+      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)">
+      <Output TaskParameter="Endpoints" ItemName="_FrameworkStaticAssetEndpoint" />
+    </DefineStaticWebAssetEndpoints>
+
+    <ItemGroup>
+      <StaticWebAsset Include="@(_FrameworkStaticWebAsset)" />
+      <StaticWebAssetEndpoint Include="@(_FrameworkStaticAssetEndpoint)" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/Assets/buildMultiTargeting/Microsoft.AspNetCore.App.Internal.Assets.targets b/src/Assets/buildMultiTargeting/Microsoft.AspNetCore.App.Internal.Assets.targets
new file mode 100644
index 000000000000..37470182e922
--- /dev/null
+++ b/src/Assets/buildMultiTargeting/Microsoft.AspNetCore.App.Internal.Assets.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Microsoft.AspNetCore.App.Internal.Assets.targets"/>
+</Project>
diff --git a/src/Assets/buildTransitive/Microsoft.AspNetCore.App.Internal.Assets.targets b/src/Assets/buildTransitive/Microsoft.AspNetCore.App.Internal.Assets.targets
new file mode 100644
index 000000000000..79251dcb3657
--- /dev/null
+++ b/src/Assets/buildTransitive/Microsoft.AspNetCore.App.Internal.Assets.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.AspNetCore.App.Internal.Assets.targets"/>
+</Project>
diff --git a/src/Azure/Azure.slnf b/src/Azure/Azure.slnf
index cc5388ec225f..0726d70db8ac 100644
--- a/src/Azure/Azure.slnf
+++ b/src/Azure/Azure.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\Azure\\AzureAppServices.HostingStartup\\src\\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj",
diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
index fe1c0f19275e..dbc464028962 100644
--- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
+++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
@@ -13,7 +13,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index c7d6da260af9..49a8a3b6431e 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -32,16 +32,17 @@
     <!-- RequiresDelayedBuild Include="..." / -->
 
     <!-- Enforce build order. Need shared Fx before building the important projects. -->
-    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
+    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 
   <!-- Cannot build in source-build because that does not create an App.Ref layout. -->
+  <!-- Only build on win-x64 -->
   <Target Name="BuildDelayedProjects"
       BeforeTargets="Build"
-      Condition=" '$(DotNetBuild)' != 'true' "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       Returns="@(TargetPathWithTargetPlatformMoniker)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -52,13 +53,13 @@
     </MSBuild>
   </Target>
 
-  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuild)' != 'true' ">
+  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Clean" />
   </Target>
 
   <Target Name="CreateHelixPayloadDelayedProjects"
       BeforeTargets="CreateHelixPayload"
-      Condition=" '$(DotNetBuild)' != 'true' "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       Returns="@(HelixWorkItem)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -76,19 +77,19 @@
     </MSBuild>
   </Target>
 
-  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuild)' != 'true' ">
+  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Pack" />
   </Target>
 
-  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuild)' != 'true' ">
+  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Publish" />
   </Target>
 
-  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuild)' != 'true' ">
+  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Test" />
   </Target>
 
-  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuild)' != 'true' ">
+  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="VSTest" />
   </Target>
 
diff --git a/src/Caching/Caching.slnf b/src/Caching/Caching.slnf
index 094d2826ef12..7b0c24b73089 100644
--- a/src/Caching/Caching.slnf
+++ b/src/Caching/Caching.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Caching\\SqlServer\\src\\Microsoft.Extensions.Caching.SqlServer.csproj",
       "src\\Caching\\SqlServer\\test\\Microsoft.Extensions.Caching.SqlServer.Tests.csproj",
diff --git a/src/Caching/SqlServer/src/CompatibilitySuppressions.xml b/src/Caching/SqlServer/src/CompatibilitySuppressions.xml
deleted file mode 100644
index fa12ab27fb23..000000000000
--- a/src/Caching/SqlServer/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj b/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj
index c3f7de250341..4c53c8507e96 100644
--- a/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj
+++ b/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <Description>Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Redis.</Description>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0;$(CurrentLtsTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition="! $(TargetFrameworks.Contains('$(CurrentLtsTargetFramework)'))">$(TargetFrameworks);$(CurrentLtsTargetFramework)</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;distributedcache;redis</PackageTags>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
diff --git a/src/Caching/StackExchangeRedis/src/PACKAGE.md b/src/Caching/StackExchangeRedis/src/PACKAGE.md
new file mode 100644
index 000000000000..23d0d2ca7785
--- /dev/null
+++ b/src/Caching/StackExchangeRedis/src/PACKAGE.md
@@ -0,0 +1,40 @@
+## About
+
+`Microsoft.Extensions.Caching.StackExchangeRedis` provides a distributed cache implementation of `Microsoft.Extensions.Caching.Distributed.IDistributedCache` using Redis.
+
+## How to Use
+
+To use `Microsoft.Extensions.Caching.StackExchangeRedis`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.Extensions.Caching.StackExchangeRedis
+```
+
+### Configuration
+
+To configure the Redis cache in your app, use the `AddStackExchangeRedisCache` extension method. Here's an example:
+
+```csharp
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddStackExchangeRedisCache(options =>
+{
+    options.Configuration = builder.Configuration.GetConnectionString("MyRedisConStr");
+    options.InstanceName = "MyCache";
+});
+```
+
+## Main Types
+
+* `RedisCache`: Provides a distributed cache implementation using Redis
+* `RedisCacheOptions`: Provides options used for configuring a `RedisCache`
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/performance/caching/distributed#distributed-redis-cache) on using the Distributed Redis Cache in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.Extensions.Caching.StackExchangeRedis` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Shipped.txt
rename to src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt
rename to src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Shipped.txt
index 7dc5c58110bf..bb997fdc8643 100644
--- a/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Shipped.txt
+++ b/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -1 +1,26 @@
 #nullable enable
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Dispose() -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Get(string! key) -> byte[]?
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.GetAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<byte[]?>!
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RedisCache(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! optionsAccessor) -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Refresh(string! key) -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RefreshAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Remove(string! key) -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RemoveAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Set(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options) -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.SetAsync(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.get -> string?
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.set -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConfigurationOptions.get -> StackExchange.Redis.ConfigurationOptions?
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConfigurationOptions.set -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConnectionMultiplexerFactory.get -> System.Func<System.Threading.Tasks.Task<StackExchange.Redis.IConnectionMultiplexer!>!>?
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConnectionMultiplexerFactory.set -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.get -> string?
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.set -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.get -> System.Func<StackExchange.Redis.Profiling.ProfilingSession!>?
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.set -> void
+Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.RedisCacheOptions() -> void
+Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions
+static Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions.AddStackExchangeRedisCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt
index bb997fdc8643..7dc5c58110bf 100644
--- a/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt
+++ b/src/Caching/StackExchangeRedis/src/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -1,26 +1 @@
 #nullable enable
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Dispose() -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Get(string! key) -> byte[]?
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.GetAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<byte[]?>!
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RedisCache(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! optionsAccessor) -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Refresh(string! key) -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RefreshAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Remove(string! key) -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RemoveAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Set(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options) -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.SetAsync(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.get -> string?
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.set -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConfigurationOptions.get -> StackExchange.Redis.ConfigurationOptions?
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConfigurationOptions.set -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConnectionMultiplexerFactory.get -> System.Func<System.Threading.Tasks.Task<StackExchange.Redis.IConnectionMultiplexer!>!>?
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConnectionMultiplexerFactory.set -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.get -> string?
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.set -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.get -> System.Func<StackExchange.Redis.Profiling.ProfilingSession!>?
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.set -> void
-Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.RedisCacheOptions() -> void
-Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions
-static Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions.AddStackExchangeRedisCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Caching/StackExchangeRedis/src/RedisCache.cs b/src/Caching/StackExchangeRedis/src/RedisCache.cs
index debec0237040..95bba7dd0088 100644
--- a/src/Caching/StackExchangeRedis/src/RedisCache.cs
+++ b/src/Caching/StackExchangeRedis/src/RedisCache.cs
@@ -53,6 +53,8 @@ private static RedisValue[] GetHashFields(bool getData) => getData
     private long _firstErrorTimeTicks;
     private long _previousErrorTimeTicks;
 
+    internal virtual bool IsHybridCacheActive() => false;
+
     // StackExchange.Redis will also be trying to reconnect internally,
     // so limit how often we recreate the ConnectionMultiplexer instance
     // in an attempt to reconnect
@@ -375,6 +377,11 @@ private void TryAddSuffix(IConnectionMultiplexer connection)
         {
             connection.AddLibraryNameSuffix("aspnet");
             connection.AddLibraryNameSuffix("DC");
+
+            if (IsHybridCacheActive())
+            {
+                connection.AddLibraryNameSuffix("HC");
+            }
         }
         catch (Exception ex)
         {
diff --git a/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs b/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs
index dab5bfc8655b..0a58d43e136d 100644
--- a/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs
+++ b/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs
@@ -1,6 +1,9 @@
 // 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 Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -8,13 +11,20 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis;
 
 internal sealed class RedisCacheImpl : RedisCache
 {
-    public RedisCacheImpl(IOptions<RedisCacheOptions> optionsAccessor, ILogger<RedisCache> logger)
+    private readonly IServiceProvider _services;
+
+    internal override bool IsHybridCacheActive()
+        => _services.GetService<HybridCache>() is not null;
+
+    public RedisCacheImpl(IOptions<RedisCacheOptions> optionsAccessor, ILogger<RedisCache> logger, IServiceProvider services)
         : base(optionsAccessor, logger)
     {
+        _services = services; // important: do not check for HybridCache here due to dependency - creates a cycle
     }
 
-    public RedisCacheImpl(IOptions<RedisCacheOptions> optionsAccessor)
+    public RedisCacheImpl(IOptions<RedisCacheOptions> optionsAccessor, IServiceProvider services)
         : base(optionsAccessor)
     {
+        _services = services; // important: do not check for HybridCache here due to dependency - creates a cycle
     }
 }
diff --git a/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs b/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs
index 29a49a7cec70..71e31d19928a 100644
--- a/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs
+++ b/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs
@@ -1,11 +1,19 @@
 // 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.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
@@ -121,4 +129,71 @@ public void AddStackExchangeRedisCache_UsesLoggerFactoryAlreadyRegisteredWithSer
 
         loggerFactory.Verify();
     }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void AddStackExchangeRedisCache_HybridCacheDetected(bool hybridCacheActive)
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        services.AddLogging();
+
+        // Act
+        services.AddStackExchangeRedisCache(options => { });
+        if (hybridCacheActive)
+        {
+            services.AddMemoryCache();
+            services.TryAddSingleton<HybridCache, DummyHybridCache>();
+        }
+
+        using var provider = services.BuildServiceProvider();
+        var cache = Assert.IsAssignableFrom<RedisCache>(provider.GetRequiredService<IDistributedCache>());
+        Assert.Equal(hybridCacheActive, cache.IsHybridCacheActive());
+    }
+
+    sealed class DummyHybridCache : HybridCache
+    {
+        // emulate the layout from HybridCache in dotnet/extensions
+        public DummyHybridCache(IOptions<HybridCacheOptions> options, IServiceProvider services)
+        {
+            if (services is null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            var l1 = services.GetRequiredService<IMemoryCache>();
+            _ = options.Value;
+            var logger = services.GetService<ILoggerFactory>()?.CreateLogger(typeof(HybridCache)) ?? NullLogger.Instance;
+            // var clock = services.GetService<TimeProvider>() ?? TimeProvider.System;
+            var l2 = services.GetService<IDistributedCache>(); // note optional
+
+            // ignore L2 if it is really just the same L1, wrapped
+            // (note not just an "is" test; if someone has a custom subclass, who knows what it does?)
+            if (l2 is not null
+                && l2.GetType() == typeof(MemoryDistributedCache)
+                && l1.GetType() == typeof(MemoryCache))
+            {
+                l2 = null;
+            }
+
+            IHybridCacheSerializerFactory[] factories = services.GetServices<IHybridCacheSerializerFactory>().ToArray();
+            Array.Reverse(factories);
+        }
+
+        public class HybridCacheOptions { }
+
+        public override ValueTask<T> GetOrCreateAsync<TState, T>(string key, TState state, Func<TState, CancellationToken, ValueTask<T>> factory, HybridCacheEntryOptions options = null, IEnumerable<string> tags = null, CancellationToken cancellationToken = default)
+            => throw new NotSupportedException();
+
+        public override ValueTask RemoveAsync(string key, CancellationToken cancellationToken = default)
+            => throw new NotSupportedException();
+
+        public override ValueTask RemoveByTagAsync(string tag, CancellationToken cancellationToken = default)
+            => throw new NotSupportedException();
+
+        public override ValueTask SetAsync<T>(string key, T value, HybridCacheEntryOptions options = null, IEnumerable<string> tags = null, CancellationToken cancellationToken = default)
+            => throw new NotSupportedException();
+    }
 }
diff --git a/src/Components/Analyzers/src/ComponentFacts.cs b/src/Components/Analyzers/src/ComponentFacts.cs
index 43561128b0a5..debd00db09ee 100644
--- a/src/Components/Analyzers/src/ComponentFacts.cs
+++ b/src/Components/Analyzers/src/ComponentFacts.cs
@@ -87,6 +87,77 @@ public static bool IsCascadingParameter(ComponentSymbols symbols, IPropertySymbo
         return property.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, symbols.CascadingParameterAttribute));
     }
 
+    public static bool IsSupplyParameterFromForm(ComponentSymbols symbols, IPropertySymbol property)
+    {
+        if (symbols == null)
+        {
+            throw new ArgumentNullException(nameof(symbols));
+        }
+
+        if (property == null)
+        {
+            throw new ArgumentNullException(nameof(property));
+        }
+
+        if (symbols.SupplyParameterFromFormAttribute == null)
+        {
+            return false;
+        }
+
+        return property.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, symbols.SupplyParameterFromFormAttribute));
+    }
+
+    public static bool IsPersistentState(ComponentSymbols symbols, IPropertySymbol property)
+    {
+        if (symbols == null)
+        {
+            throw new ArgumentNullException(nameof(symbols));
+        }
+
+        if (property == null)
+        {
+            throw new ArgumentNullException(nameof(property));
+        }
+
+        if (symbols.PersistentStateAttribute == null)
+        {
+            return false;
+        }
+
+        return property.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, symbols.PersistentStateAttribute));
+    }
+
+    public static bool IsComponentBase(ComponentSymbols symbols, INamedTypeSymbol type)
+    {
+        if (symbols is null)
+        {
+            throw new ArgumentNullException(nameof(symbols));
+        }
+
+        if (type is null)
+        {
+            throw new ArgumentNullException(nameof(type));
+        }
+
+        if (symbols.ComponentBaseType == null)
+        {
+            return false;
+        }
+
+        // Check if the type inherits from ComponentBase
+        var current = type.BaseType;
+        while (current != null)
+        {
+            if (SymbolEqualityComparer.Default.Equals(current, symbols.ComponentBaseType))
+            {
+                return true;
+            }
+            current = current.BaseType;
+        }
+
+        return false;
+    }
+
     public static bool IsComponent(ComponentSymbols symbols, Compilation compilation, INamedTypeSymbol type)
     {
         if (symbols is null)
diff --git a/src/Components/Analyzers/src/ComponentSymbols.cs b/src/Components/Analyzers/src/ComponentSymbols.cs
index ccdca61d9749..52b9c175ea27 100644
--- a/src/Components/Analyzers/src/ComponentSymbols.cs
+++ b/src/Components/Analyzers/src/ComponentSymbols.cs
@@ -47,9 +47,17 @@ public static bool TryCreate(Compilation compilation, out ComponentSymbols symbo
 
         var parameterCaptureUnmatchedValuesRuntimeType = dictionary.Construct(@string, @object);
 
+        // Try to get optional symbols for SupplyParameterFromForm and PersistentState analyzers
+        var supplyParameterFromFormAttribute = compilation.GetTypeByMetadataName(ComponentsApi.SupplyParameterFromFormAttribute.MetadataName);
+        var persistentStateAttribute = compilation.GetTypeByMetadataName(ComponentsApi.PersistentStateAttribute.MetadataName);
+        var componentBaseType = compilation.GetTypeByMetadataName(ComponentsApi.ComponentBase.MetadataName);
+
         symbols = new ComponentSymbols(
             parameterAttribute,
             cascadingParameterAttribute,
+            supplyParameterFromFormAttribute,
+            persistentStateAttribute,
+            componentBaseType,
             parameterCaptureUnmatchedValuesRuntimeType,
             icomponentType);
         return true;
@@ -58,11 +66,17 @@ public static bool TryCreate(Compilation compilation, out ComponentSymbols symbo
     private ComponentSymbols(
         INamedTypeSymbol parameterAttribute,
         INamedTypeSymbol cascadingParameterAttribute,
+        INamedTypeSymbol supplyParameterFromFormAttribute,
+        INamedTypeSymbol persistentStateAttribute,
+        INamedTypeSymbol componentBaseType,
         INamedTypeSymbol parameterCaptureUnmatchedValuesRuntimeType,
         INamedTypeSymbol icomponentType)
     {
         ParameterAttribute = parameterAttribute;
         CascadingParameterAttribute = cascadingParameterAttribute;
+        SupplyParameterFromFormAttribute = supplyParameterFromFormAttribute; // Can be null
+        PersistentStateAttribute = persistentStateAttribute; // Can be null
+        ComponentBaseType = componentBaseType; // Can be null
         ParameterCaptureUnmatchedValuesRuntimeType = parameterCaptureUnmatchedValuesRuntimeType;
         IComponentType = icomponentType;
     }
@@ -74,5 +88,11 @@ private ComponentSymbols(
 
     public INamedTypeSymbol CascadingParameterAttribute { get; }
 
+    public INamedTypeSymbol SupplyParameterFromFormAttribute { get; } // Can be null if not available
+
+    public INamedTypeSymbol PersistentStateAttribute { get; } // Can be null if not available
+
+    public INamedTypeSymbol ComponentBaseType { get; } // Can be null if not available
+
     public INamedTypeSymbol IComponentType { get; }
 }
diff --git a/src/Components/Analyzers/src/ComponentsApi.cs b/src/Components/Analyzers/src/ComponentsApi.cs
index a62d070dedef..a2dc5b852c6d 100644
--- a/src/Components/Analyzers/src/ComponentsApi.cs
+++ b/src/Components/Analyzers/src/ComponentsApi.cs
@@ -23,6 +23,24 @@ public static class CascadingParameterAttribute
         public const string MetadataName = FullTypeName;
     }
 
+    public static class SupplyParameterFromFormAttribute
+    {
+        public const string FullTypeName = "Microsoft.AspNetCore.Components.SupplyParameterFromFormAttribute";
+        public const string MetadataName = FullTypeName;
+    }
+
+    public static class ComponentBase
+    {
+        public const string FullTypeName = "Microsoft.AspNetCore.Components.ComponentBase";
+        public const string MetadataName = FullTypeName;
+    }
+
+    public static class PersistentStateAttribute
+    {
+        public const string FullTypeName = "Microsoft.AspNetCore.Components.PersistentStateAttribute";
+        public const string MetadataName = FullTypeName;
+    }
+
     public static class IComponent
     {
         public const string FullTypeName = "Microsoft.AspNetCore.Components.IComponent";
diff --git a/src/Components/Analyzers/src/DiagnosticDescriptors.cs b/src/Components/Analyzers/src/DiagnosticDescriptors.cs
index 6fb448f45b34..5f67edaf8447 100644
--- a/src/Components/Analyzers/src/DiagnosticDescriptors.cs
+++ b/src/Components/Analyzers/src/DiagnosticDescriptors.cs
@@ -8,65 +8,88 @@ namespace Microsoft.AspNetCore.Components.Analyzers;
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
 internal static class DiagnosticDescriptors
 {
-    public static readonly DiagnosticDescriptor ComponentParameterSettersShouldBePublic = new DiagnosticDescriptor(
+    private const string Encapsulation = "Encapsulation";
+    private const string Usage = "Usage";
+
+    private static LocalizableResourceString CreateLocalizableResourceString(string resource) => new(resource, Resources.ResourceManager, typeof(Resources));
+
+    public static readonly DiagnosticDescriptor ComponentParameterSettersShouldBePublic = new(
         "BL0001",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Format), Resources.ResourceManager, typeof(Resources)),
-        "Encapsulation",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Format)),
+        Encapsulation,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Description)));
 
-    public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesMustBeUnique = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesMustBeUnique = new(
         "BL0002",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description)));
 
-    public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesHasWrongType = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesHasWrongType = new(
         "BL0003",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Format), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Format)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Description)));
 
-    public static readonly DiagnosticDescriptor ComponentParametersShouldBePublic = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor ComponentParametersShouldBePublic = new(
         "BL0004",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Format), Resources.ResourceManager, typeof(Resources)),
-        "Encapsulation",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Format)),
+        Encapsulation,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParametersShouldBePublic_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParametersShouldBePublic_Description)));
 
-    public static readonly DiagnosticDescriptor ComponentParametersShouldNotBeSetOutsideOfTheirDeclaredComponent = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor ComponentParametersShouldNotBeSetOutsideOfTheirDeclaredComponent = new(
         "BL0005",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Format), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Format)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Description)));
 
-    public static readonly DiagnosticDescriptor DoNotUseRenderTreeTypes = new DiagnosticDescriptor(
+    public static readonly DiagnosticDescriptor DoNotUseRenderTreeTypes = new(
         "BL0006",
-        new LocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Title)),
+        CreateLocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description)));
 
     public static readonly DiagnosticDescriptor ComponentParametersShouldBeAutoProperties = new(
         "BL0007",
-        new LocalizableResourceString(nameof(Resources.ComponentParametersShouldBeAutoProperties_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParametersShouldBeAutoProperties_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParametersShouldBeAutoProperties_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParametersShouldBeAutoProperties_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true);
+
+    public static readonly DiagnosticDescriptor SupplyParameterFromFormShouldNotHavePropertyInitializer = new(
+        "BL0008",
+        CreateLocalizableResourceString(nameof(Resources.SupplyParameterFromFormShouldNotHavePropertyInitializer_Title)),
+        CreateLocalizableResourceString(nameof(Resources.SupplyParameterFromFormShouldNotHavePropertyInitializer_Format)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        description: CreateLocalizableResourceString(nameof(Resources.SupplyParameterFromFormShouldNotHavePropertyInitializer_Description)));
+
+    public static readonly DiagnosticDescriptor PersistentStateShouldNotHavePropertyInitializer = new(
+        "BL0009",
+        CreateLocalizableResourceString(nameof(Resources.PersistentStateShouldNotHavePropertyInitializer_Title)),
+        CreateLocalizableResourceString(nameof(Resources.PersistentStateShouldNotHavePropertyInitializer_Format)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        description: CreateLocalizableResourceString(nameof(Resources.PersistentStateShouldNotHavePropertyInitializer_Description)));
 }
diff --git a/src/Components/Analyzers/src/PersistentStateAnalyzer.cs b/src/Components/Analyzers/src/PersistentStateAnalyzer.cs
new file mode 100644
index 000000000000..8cd361302d3c
--- /dev/null
+++ b/src/Components/Analyzers/src/PersistentStateAnalyzer.cs
@@ -0,0 +1,101 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+#nullable enable
+
+namespace Microsoft.AspNetCore.Components.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class PersistentStateAnalyzer : DiagnosticAnalyzer
+{
+    public PersistentStateAnalyzer()
+    {
+        SupportedDiagnostics = ImmutableArray.Create(
+            DiagnosticDescriptors.PersistentStateShouldNotHavePropertyInitializer);
+    }
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.EnableConcurrentExecution();
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+        context.RegisterCompilationStartAction(context =>
+        {
+            if (!ComponentSymbols.TryCreate(context.Compilation, out var symbols))
+            {
+                // Types we need are not defined.
+                return;
+            }
+
+            context.RegisterSyntaxNodeAction(context =>
+            {
+                var propertyDeclaration = (PropertyDeclarationSyntax)context.Node;
+
+                // Check if property has an initializer
+                if (propertyDeclaration.Initializer == null)
+                {
+                    return;
+                }
+
+                // Ignore initializers that set to default values (null, default, etc.)
+                if (IsDefaultValueInitializer(propertyDeclaration.Initializer.Value))
+                {
+                    return;
+                }
+
+                var propertySymbol = context.SemanticModel.GetDeclaredSymbol(propertyDeclaration);
+                if (propertySymbol == null)
+                {
+                    return;
+                }
+
+                // Check if property has [PersistentState] attribute
+                if (!ComponentFacts.IsPersistentState(symbols, propertySymbol))
+                {
+                    return;
+                }
+
+                // Check if the containing type inherits from ComponentBase
+                var containingType = propertySymbol.ContainingType;
+                if (!ComponentFacts.IsComponentBase(symbols, containingType))
+                {
+                    return;
+                }
+
+                var propertyLocation = propertySymbol.Locations.FirstOrDefault();
+                if (propertyLocation != null)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        DiagnosticDescriptors.PersistentStateShouldNotHavePropertyInitializer,
+                        propertyLocation,
+                        propertySymbol.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)));
+                }
+            }, SyntaxKind.PropertyDeclaration);
+        });
+    }
+
+    private static bool IsDefaultValueInitializer(ExpressionSyntax expression)
+    {
+        return expression switch
+        {
+            // null
+            LiteralExpressionSyntax { Token.ValueText: "null" } => true,
+            // null!
+            PostfixUnaryExpressionSyntax { Operand: LiteralExpressionSyntax { Token.ValueText: "null" }, OperatorToken.ValueText: "!" } => true,
+            // default
+            LiteralExpressionSyntax literal when literal.Token.IsKind(SyntaxKind.DefaultKeyword) => true,
+            // default!
+            PostfixUnaryExpressionSyntax { Operand: LiteralExpressionSyntax literal, OperatorToken.ValueText: "!" } 
+                when literal.Token.IsKind(SyntaxKind.DefaultKeyword) => true,
+            _ => false
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Analyzers/src/Resources.resx b/src/Components/Analyzers/src/Resources.resx
index 5ef9f54b53eb..6a23211094aa 100644
--- a/src/Components/Analyzers/src/Resources.resx
+++ b/src/Components/Analyzers/src/Resources.resx
@@ -180,4 +180,22 @@
   <data name="ComponentParametersShouldBeAutoProperties_Title" xml:space="preserve">
     <value>Component parameters should be auto properties</value>
   </data>
+  <data name="SupplyParameterFromFormShouldNotHavePropertyInitializer_Description" xml:space="preserve">
+    <value>The value of a property decorated with [SupplyParameterFromForm] and initialized with a property initializer can be overwritten with null when the component receives parameters. To ensure the initialized value is not overwritten, move the initialization to a component lifecycle method like OnInitialized or OnInitializedAsync</value>
+  </data>
+  <data name="SupplyParameterFromFormShouldNotHavePropertyInitializer_Format" xml:space="preserve">
+    <value>Property '{0}' has [SupplyParameterFromForm] and a property initializer. This can be overwritten with null during form posts.</value>
+  </data>
+  <data name="SupplyParameterFromFormShouldNotHavePropertyInitializer_Title" xml:space="preserve">
+    <value>Property with [SupplyParameterFromForm] should not have initializer</value>
+  </data>
+  <data name="PersistentStateShouldNotHavePropertyInitializer_Description" xml:space="preserve">
+    <value>The value of a property decorated with [PersistentState] and initialized with a property initializer can be overwritten when the component receives parameters. To ensure the initialized value is not overwritten, move the initialization to a component lifecycle method like OnInitialized or OnInitializedAsync</value>
+  </data>
+  <data name="PersistentStateShouldNotHavePropertyInitializer_Format" xml:space="preserve">
+    <value>Property '{0}' has [PersistentState] and a property initializer. This can be overwritten during parameter binding.</value>
+  </data>
+  <data name="PersistentStateShouldNotHavePropertyInitializer_Title" xml:space="preserve">
+    <value>Property with [PersistentState] should not have initializer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Components/Analyzers/src/SupplyParameterFromFormAnalyzer.cs b/src/Components/Analyzers/src/SupplyParameterFromFormAnalyzer.cs
new file mode 100644
index 000000000000..00bbbcaa1180
--- /dev/null
+++ b/src/Components/Analyzers/src/SupplyParameterFromFormAnalyzer.cs
@@ -0,0 +1,101 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+#nullable enable
+
+namespace Microsoft.AspNetCore.Components.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class SupplyParameterFromFormAnalyzer : DiagnosticAnalyzer
+{
+    public SupplyParameterFromFormAnalyzer()
+    {
+        SupportedDiagnostics = ImmutableArray.Create(
+            DiagnosticDescriptors.SupplyParameterFromFormShouldNotHavePropertyInitializer);
+    }
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.EnableConcurrentExecution();
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+        context.RegisterCompilationStartAction(context =>
+        {
+            if (!ComponentSymbols.TryCreate(context.Compilation, out var symbols))
+            {
+                // Types we need are not defined.
+                return;
+            }
+
+            context.RegisterSyntaxNodeAction(context =>
+            {
+                var propertyDeclaration = (PropertyDeclarationSyntax)context.Node;
+
+                // Check if property has an initializer
+                if (propertyDeclaration.Initializer == null)
+                {
+                    return;
+                }
+
+                // Ignore initializers that set to default values (null, default, etc.)
+                if (IsDefaultValueInitializer(propertyDeclaration.Initializer.Value))
+                {
+                    return;
+                }
+
+                var propertySymbol = context.SemanticModel.GetDeclaredSymbol(propertyDeclaration);
+                if (propertySymbol == null)
+                {
+                    return;
+                }
+
+                // Check if property has [SupplyParameterFromForm] attribute
+                if (!ComponentFacts.IsSupplyParameterFromForm(symbols, propertySymbol))
+                {
+                    return;
+                }
+
+                // Check if the containing type inherits from ComponentBase
+                var containingType = propertySymbol.ContainingType;
+                if (!ComponentFacts.IsComponentBase(symbols, containingType))
+                {
+                    return;
+                }
+
+                var propertyLocation = propertySymbol.Locations.FirstOrDefault();
+                if (propertyLocation != null)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        DiagnosticDescriptors.SupplyParameterFromFormShouldNotHavePropertyInitializer,
+                        propertyLocation,
+                        propertySymbol.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)));
+                }
+            }, SyntaxKind.PropertyDeclaration);
+        });
+    }
+
+    private static bool IsDefaultValueInitializer(ExpressionSyntax expression)
+    {
+        return expression switch
+        {
+            // null
+            LiteralExpressionSyntax { Token.ValueText: "null" } => true,
+            // null!
+            PostfixUnaryExpressionSyntax { Operand: LiteralExpressionSyntax { Token.ValueText: "null" }, OperatorToken.ValueText: "!" } => true,
+            // default
+            LiteralExpressionSyntax literal when literal.Token.IsKind(SyntaxKind.DefaultKeyword) => true,
+            // default!
+            PostfixUnaryExpressionSyntax { Operand: LiteralExpressionSyntax literal, OperatorToken.ValueText: "!" } 
+                when literal.Token.IsKind(SyntaxKind.DefaultKeyword) => true,
+            _ => false
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Analyzers/test/PersistentStateAnalyzerTest.cs b/src/Components/Analyzers/test/PersistentStateAnalyzerTest.cs
new file mode 100644
index 000000000000..f95df939f0e5
--- /dev/null
+++ b/src/Components/Analyzers/test/PersistentStateAnalyzerTest.cs
@@ -0,0 +1,282 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using TestHelper;
+
+namespace Microsoft.AspNetCore.Components.Analyzers.Test;
+
+public class PersistentStateAnalyzerTest : DiagnosticVerifier
+{
+    protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() => new PersistentStateAnalyzer();
+
+    private static readonly string TestDeclarations = $@"
+    namespace {typeof(ParameterAttribute).Namespace}
+    {{
+        public class {typeof(ParameterAttribute).Name} : System.Attribute
+        {{
+            public bool CaptureUnmatchedValues {{ get; set; }}
+        }}
+
+        public class {typeof(CascadingParameterAttribute).Name} : System.Attribute
+        {{
+        }}
+
+        public abstract class CascadingParameterAttributeBase : System.Attribute
+        {{
+        }}
+
+        public class PersistentStateAttribute : CascadingParameterAttributeBase
+        {{
+            public RestoreBehavior RestoreBehavior {{ get; set; }}
+            public bool AllowUpdates {{ get; set; }}
+        }}
+
+        public enum RestoreBehavior
+        {{
+            Default,
+            SkipInitialValue,
+            SkipLastSnapshot
+        }}
+
+        public interface {typeof(IComponent).Name}
+        {{
+        }}
+
+        public abstract class ComponentBase : {typeof(IComponent).Name}
+        {{
+        }}
+    }}
+";
+
+    [Fact]
+    public void IgnoresPropertiesWithoutPersistentStateAttribute()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresPersistentStateWithoutInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }}
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresNonComponentBaseClasses()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class NotAComponent
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void ReportsWarningForPersistentStateWithInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0009",
+            Message = "Property 'ConsoleApplication1.TestComponent.MyProperty' has [PersistentState] and a property initializer. This can be overwritten during parameter binding.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 7, 45)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+
+    [Fact]
+    public void ReportsWarningForPersistentStateWithObjectInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public InputModel Input {{ get; set; }} = new InputModel();
+        }}
+
+        class InputModel
+        {{
+            public string Value {{ get; set; }} = """";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0009",
+            Message = "Property 'ConsoleApplication1.TestComponent.Input' has [PersistentState] and a property initializer. This can be overwritten during parameter binding.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 7, 49)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+
+    [Fact]
+    public void IgnoresPersistentStateWithNullInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = null;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresPersistentStateWithNullForgivingInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = null!;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresPersistentStateWithDefaultInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = default;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresPersistentStateWithDefaultForgivingInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = default!;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void WorksWithInheritedComponentBase()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class BaseComponent : ComponentBase
+        {{
+        }}
+
+        class TestComponent : BaseComponent
+        {{
+            [PersistentState] public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0009",
+            Message = "Property 'ConsoleApplication1.TestComponent.MyProperty' has [PersistentState] and a property initializer. This can be overwritten during parameter binding.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 11, 45)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+
+    [Fact]
+    public void WorksWithPersistentStateAttributeWithParameters()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue, AllowUpdates = true)] 
+            public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0009",
+            Message = "Property 'ConsoleApplication1.TestComponent.MyProperty' has [PersistentState] and a property initializer. This can be overwritten during parameter binding.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 8, 27)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Analyzers/test/SupplyParameterFromFormAnalyzerTest.cs b/src/Components/Analyzers/test/SupplyParameterFromFormAnalyzerTest.cs
new file mode 100644
index 000000000000..549b3cf115ec
--- /dev/null
+++ b/src/Components/Analyzers/test/SupplyParameterFromFormAnalyzerTest.cs
@@ -0,0 +1,243 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using TestHelper;
+
+namespace Microsoft.AspNetCore.Components.Analyzers.Test;
+
+public class SupplyParameterFromFormAnalyzerTest : DiagnosticVerifier
+{
+    protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() => new SupplyParameterFromFormAnalyzer();
+
+    private static readonly string TestDeclarations = $@"
+    namespace {typeof(ParameterAttribute).Namespace}
+    {{
+        public class {typeof(ParameterAttribute).Name} : System.Attribute
+        {{
+            public bool CaptureUnmatchedValues {{ get; set; }}
+        }}
+
+        public class {typeof(CascadingParameterAttribute).Name} : System.Attribute
+        {{
+        }}
+
+        public class SupplyParameterFromFormAttribute : System.Attribute
+        {{
+            public string Name {{ get; set; }}
+            public string FormName {{ get; set; }}
+        }}
+
+        public interface {typeof(IComponent).Name}
+        {{
+        }}
+
+        public abstract class ComponentBase : {typeof(IComponent).Name}
+        {{
+        }}
+    }}
+";
+
+    [Fact]
+    public void IgnoresPropertiesWithoutSupplyParameterFromFormAttribute()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresSupplyParameterFromFormWithoutInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }}
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresNonComponentBaseClasses()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class NotAComponent
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void ReportsWarningForSupplyParameterFromFormWithInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0008",
+            Message = "Property 'ConsoleApplication1.TestComponent.MyProperty' has [SupplyParameterFromForm] and a property initializer. This can be overwritten with null during form posts.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 7, 53)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+
+    [Fact]
+    public void ReportsWarningForSupplyParameterFromFormWithObjectInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public InputModel Input {{ get; set; }} = new InputModel();
+        }}
+
+        class InputModel
+        {{
+            public string Value {{ get; set; }} = """";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0008",
+            Message = "Property 'ConsoleApplication1.TestComponent.Input' has [SupplyParameterFromForm] and a property initializer. This can be overwritten with null during form posts.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 7, 57)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+
+    [Fact]
+    public void IgnoresSupplyParameterFromFormWithNullInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = null;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresSupplyParameterFromFormWithNullForgivingInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = null!;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresSupplyParameterFromFormWithDefaultInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = default;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void IgnoresSupplyParameterFromFormWithDefaultForgivingInitializer()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class TestComponent : ComponentBase
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = default!;
+        }}
+    }}" + TestDeclarations;
+
+        VerifyCSharpDiagnostic(test);
+    }
+
+    [Fact]
+    public void WorksWithInheritedComponentBase()
+    {
+        var test = $@"
+    namespace ConsoleApplication1
+    {{
+        using {typeof(ParameterAttribute).Namespace};
+        class BaseComponent : ComponentBase
+        {{
+        }}
+
+        class TestComponent : BaseComponent
+        {{
+            [SupplyParameterFromForm] public string MyProperty {{ get; set; }} = ""initial-value"";
+        }}
+    }}" + TestDeclarations;
+
+        var expected = new DiagnosticResult
+        {
+            Id = "BL0008",
+            Message = "Property 'ConsoleApplication1.TestComponent.MyProperty' has [SupplyParameterFromForm] and a property initializer. This can be overwritten with null during form posts.",
+            Severity = DiagnosticSeverity.Warning,
+            Locations = new[]
+            {
+                new DiagnosticResultLocation("Test0.cs", 11, 53)
+            }
+        };
+
+        VerifyCSharpDiagnostic(test, expected);
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Analyzers/test/Verifiers/CodeFixVerifier.cs b/src/Components/Analyzers/test/Verifiers/CodeFixVerifier.cs
index 53c978d3f847..0d156fd8d051 100644
--- a/src/Components/Analyzers/test/Verifiers/CodeFixVerifier.cs
+++ b/src/Components/Analyzers/test/Verifiers/CodeFixVerifier.cs
@@ -109,7 +109,7 @@ private void VerifyFix(string language, DiagnosticAnalyzer analyzer, CodeFixProv
                 document = document.WithSyntaxRoot(Formatter.Format(document.GetSyntaxRootAsync().Result, Formatter.Annotation, document.Project.Solution.Workspace));
                 newCompilerDiagnostics = GetNewDiagnostics(compilerDiagnostics, GetCompilerDiagnostics(document));
 
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Fix introduced new compiler diagnostics:\r\n{0}\r\n\r\nNew document:\r\n{1}\r\n",
diff --git a/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs b/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs
index 8dde75a73683..f1d5a434de28 100644
--- a/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs
+++ b/src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs
@@ -112,7 +112,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
         {
             string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : "    NONE.";
 
-            Assert.True(false,
+            Assert.Fail(
                 string.Format(CultureInfo.InvariantCulture, "Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput));
         }
 
@@ -125,7 +125,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
             {
                 if (actual.Location != Location.None)
                 {
-                    Assert.True(false,
+                    Assert.Fail(
                         string.Format(CultureInfo.InvariantCulture, "Expected:\nA project diagnostic with No location\nActual:\n{0}",
                         FormatDiagnostics(analyzer, actual)));
                 }
@@ -137,7 +137,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
                 if (additionalLocations.Length != expected.Locations.Length - 1)
                 {
-                    Assert.True(false,
+                    Assert.Fail(
                         string.Format(
                             CultureInfo.InvariantCulture,
                             "Expected {0} additional locations but got {1} for Diagnostic:\r\n    {2}\r\n",
@@ -153,7 +153,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.Id != expected.Id)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -162,7 +162,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.Severity != expected.Severity)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -171,7 +171,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -204,7 +204,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             if (actualLinePosition.Line + 1 != expected.Line)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -217,7 +217,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             if (actualLinePosition.Character + 1 != expected.Column)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
diff --git a/src/Components/Authorization/src/AttributeAuthorizeDataCache.cs b/src/Components/Authorization/src/AttributeAuthorizeDataCache.cs
index 1181537155cc..6f7f4bd06539 100644
--- a/src/Components/Authorization/src/AttributeAuthorizeDataCache.cs
+++ b/src/Components/Authorization/src/AttributeAuthorizeDataCache.cs
@@ -3,13 +3,24 @@
 
 using System.Collections.Concurrent;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.HotReload;
 
 namespace Microsoft.AspNetCore.Components.Authorization;
 
 internal static class AttributeAuthorizeDataCache
 {
+    static AttributeAuthorizeDataCache()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
     private static readonly ConcurrentDictionary<Type, IAuthorizeData[]?> _cache = new();
 
+    private static void ClearCache() => _cache.Clear();
+
     public static IAuthorizeData[]? GetAuthorizeDataForType(Type type)
     {
         if (!_cache.TryGetValue(type, out var result))
diff --git a/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj
index 53340c6d6159..cef47c8d844d 100644
--- a/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj
+++ b/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj
@@ -14,4 +14,8 @@
     <Reference Include="Microsoft.AspNetCore.Components" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/Authorization/src/PublicAPI.Shipped.txt b/src/Components/Authorization/src/PublicAPI.Shipped.txt
index 247a98915bb8..2151d091daf8 100644
--- a/src/Components/Authorization/src/PublicAPI.Shipped.txt
+++ b/src/Components/Authorization/src/PublicAPI.Shipped.txt
@@ -6,6 +6,14 @@ Microsoft.AspNetCore.Components.Authorization.AuthenticationState
 Microsoft.AspNetCore.Components.Authorization.AuthenticationState.AuthenticationState(System.Security.Claims.ClaimsPrincipal! user) -> void
 Microsoft.AspNetCore.Components.Authorization.AuthenticationState.User.get -> System.Security.Claims.ClaimsPrincipal!
 Microsoft.AspNetCore.Components.Authorization.AuthenticationStateChangedHandler
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.AuthenticationStateData() -> void
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.Claims.get -> System.Collections.Generic.IList<Microsoft.AspNetCore.Components.Authorization.ClaimData>!
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.Claims.set -> void
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.NameClaimType.get -> string!
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.NameClaimType.set -> void
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.RoleClaimType.get -> string!
+Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.RoleClaimType.set -> void
 Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider
 Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider.AuthenticationStateChanged -> Microsoft.AspNetCore.Components.Authorization.AuthenticationStateChangedHandler?
 Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider.AuthenticationStateProvider() -> void
@@ -40,6 +48,12 @@ Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState
 Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.CascadingAuthenticationState() -> void
 Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.ChildContent.get -> Microsoft.AspNetCore.Components.RenderFragment?
 Microsoft.AspNetCore.Components.Authorization.CascadingAuthenticationState.ChildContent.set -> void
+Microsoft.AspNetCore.Components.Authorization.ClaimData
+Microsoft.AspNetCore.Components.Authorization.ClaimData.ClaimData() -> void
+Microsoft.AspNetCore.Components.Authorization.ClaimData.ClaimData(string! type, string! value) -> void
+Microsoft.AspNetCore.Components.Authorization.ClaimData.ClaimData(System.Security.Claims.Claim! claim) -> void
+Microsoft.AspNetCore.Components.Authorization.ClaimData.Type.get -> string!
+Microsoft.AspNetCore.Components.Authorization.ClaimData.Value.get -> string!
 Microsoft.AspNetCore.Components.Authorization.IHostEnvironmentAuthenticationStateProvider
 Microsoft.AspNetCore.Components.Authorization.IHostEnvironmentAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void
 Microsoft.Extensions.DependencyInjection.CascadingAuthenticationStateServiceCollectionExtensions
diff --git a/src/Components/Authorization/src/PublicAPI.Unshipped.txt b/src/Components/Authorization/src/PublicAPI.Unshipped.txt
index e02769f17caf..7dc5c58110bf 100644
--- a/src/Components/Authorization/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Authorization/src/PublicAPI.Unshipped.txt
@@ -1,15 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.AuthenticationStateData() -> void
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.Claims.get -> System.Collections.Generic.IList<Microsoft.AspNetCore.Components.Authorization.ClaimData>!
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.Claims.set -> void
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.NameClaimType.get -> string!
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.NameClaimType.set -> void
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.RoleClaimType.get -> string!
-Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData.RoleClaimType.set -> void
-Microsoft.AspNetCore.Components.Authorization.ClaimData
-Microsoft.AspNetCore.Components.Authorization.ClaimData.ClaimData() -> void
-Microsoft.AspNetCore.Components.Authorization.ClaimData.ClaimData(string! type, string! value) -> void
-Microsoft.AspNetCore.Components.Authorization.ClaimData.ClaimData(System.Security.Claims.Claim! claim) -> void
-Microsoft.AspNetCore.Components.Authorization.ClaimData.Type.get -> string!
-Microsoft.AspNetCore.Components.Authorization.ClaimData.Value.get -> string!
diff --git a/src/Components/Authorization/test/AuthorizeViewTest.cs b/src/Components/Authorization/test/AuthorizeViewTest.cs
index 5db236f3afc2..d957d76e311f 100644
--- a/src/Components/Authorization/test/AuthorizeViewTest.cs
+++ b/src/Components/Authorization/test/AuthorizeViewTest.cs
@@ -321,7 +321,7 @@ public async Task RendersAuthorizingUntilAuthorizationCompletedAsync()
         // (This wouldn't happen under the sync context or in wasm)
         var renderTcs = new TaskCompletionSource();
         renderer.OnUpdateDisplayComplete = () => renderTcs.SetResult();
-        authTcs.SetResult(CreateAuthenticationState("Monsieur").Result);
+        authTcs.SetResult(await CreateAuthenticationState("Monsieur"));
 
         await renderTcs.Task;
         Assert.Equal(2, renderer.Batches.Count);
@@ -347,7 +347,7 @@ public async Task RendersAuthorizingUntilAuthorizationCompletedAsync()
     }
 
     [Fact]
-    public void RendersAuthorizingUntilAuthorizationCompleted()
+    public async Task RendersAuthorizingUntilAuthorizationCompleted()
     {
         // Arrange
         var @event = new ManualResetEventSlim();
@@ -377,7 +377,7 @@ public void RendersAuthorizingUntilAuthorizationCompleted()
 
         // Act/Assert 2: Auth process completes asynchronously
         @event.Reset();
-        authTcs.SetResult(CreateAuthenticationState("Monsieur").Result);
+        authTcs.SetResult(await CreateAuthenticationState("Monsieur"));
 
         // We need to wait here because the continuations of SetResult will be scheduled to run asynchronously.
         @event.Wait(Timeout);
diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf
index b3975358cac3..aa83a0f8a9ef 100644
--- a/src/Components/Components.slnf
+++ b/src/Components/Components.slnf
@@ -1,9 +1,10 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Analyzers\\Microsoft.AspNetCore.Analyzer.Testing\\src\\Microsoft.AspNetCore.Analyzer.Testing.csproj",
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
+      "src\\Assets\\Microsoft.AspNetCore.App.Internal.Assets.csproj",
       "src\\Components\\Analyzers\\src\\Microsoft.AspNetCore.Components.Analyzers.csproj",
       "src\\Components\\Analyzers\\test\\Microsoft.AspNetCore.Components.Analyzers.Tests.csproj",
       "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
@@ -18,6 +19,7 @@
       "src\\Components\\Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
       "src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter\\src\\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter.csproj",
       "src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid\\src\\Microsoft.AspNetCore.Components.QuickGrid.csproj",
+      "src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid\\test\\Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj",
       "src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
       "src\\Components\\Samples\\BlazorUnitedApp.Client\\BlazorUnitedApp.Client.csproj",
       "src\\Components\\Samples\\BlazorUnitedApp\\BlazorUnitedApp.csproj",
@@ -153,6 +155,10 @@
       "src\\StaticAssets\\src\\Microsoft.AspNetCore.StaticAssets.csproj",
       "src\\StaticAssets\\test\\Microsoft.AspNetCore.StaticAssets.Tests.csproj",
       "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
+      "src\\Validation\\gen\\Microsoft.Extensions.Validation.ValidationsGenerator.csproj",
+      "src\\Validation\\src\\Microsoft.Extensions.Validation.csproj",
+      "src\\Validation\\test\\Microsoft.Extensions.Validation.GeneratorTests\\Microsoft.Extensions.Validation.GeneratorTests.csproj",
+      "src\\Validation\\test\\Microsoft.Extensions.Validation.Tests\\Microsoft.Extensions.Validation.Tests.csproj",
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
diff --git a/src/Components/Components/src/BindConverter.cs b/src/Components/Components/src/BindConverter.cs
index 06a03a05f390..a3e68de026a5 100644
--- a/src/Components/Components/src/BindConverter.cs
+++ b/src/Components/Components/src/BindConverter.cs
@@ -8,6 +8,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
+using Microsoft.AspNetCore.Components.HotReload;
 
 namespace Microsoft.AspNetCore.Components;
 
@@ -1667,6 +1668,14 @@ private static class FormatterDelegateCache
     {
         private static readonly ConcurrentDictionary<Type, Delegate> _cache = new ConcurrentDictionary<Type, Delegate>();
 
+        static FormatterDelegateCache()
+        {
+            if (HotReloadManager.Default.MetadataUpdateSupported)
+            {
+                HotReloadManager.Default.OnDeltaApplied += _cache.Clear;
+            }
+        }
+
         private static MethodInfo? _makeArrayFormatter;
 
         [UnconditionalSuppressMessage(
@@ -1856,6 +1865,14 @@ internal static class ParserDelegateCache
     {
         private static readonly ConcurrentDictionary<Type, Delegate> _cache = new ConcurrentDictionary<Type, Delegate>();
 
+        static ParserDelegateCache()
+        {
+            if (HotReloadManager.Default.MetadataUpdateSupported)
+            {
+                HotReloadManager.Default.OnDeltaApplied += _cache.Clear;
+            }
+        }
+
         private static MethodInfo? _convertToEnum;
         private static MethodInfo? _convertToNullableEnum;
         private static MethodInfo? _makeArrayTypeConverter;
diff --git a/src/Components/Components/src/CascadingParameterState.cs b/src/Components/Components/src/CascadingParameterState.cs
index ae4f526d5d3a..2193e49b4766 100644
--- a/src/Components/Components/src/CascadingParameterState.cs
+++ b/src/Components/Components/src/CascadingParameterState.cs
@@ -13,17 +13,16 @@
 namespace Microsoft.AspNetCore.Components;
 
 internal readonly struct CascadingParameterState
+    (in CascadingParameterInfo parameterInfo, ICascadingValueSupplier valueSupplier, object? key)
 {
     private static readonly ConcurrentDictionary<Type, CascadingParameterInfo[]> _cachedInfos = new();
 
-    public CascadingParameterInfo ParameterInfo { get; }
-    public ICascadingValueSupplier ValueSupplier { get; }
+    public CascadingParameterInfo ParameterInfo { get; } = parameterInfo;
+    public ICascadingValueSupplier ValueSupplier { get; } = valueSupplier;
+    public object? Key { get; } = key;
 
     public CascadingParameterState(in CascadingParameterInfo parameterInfo, ICascadingValueSupplier valueSupplier)
-    {
-        ParameterInfo = parameterInfo;
-        ValueSupplier = valueSupplier;
-    }
+        : this(parameterInfo, valueSupplier, key: null) { }
 
     public static IReadOnlyList<CascadingParameterState> FindCascadingParameters(ComponentState componentState, out bool hasSingleDeliveryParameters)
     {
@@ -55,7 +54,7 @@ public static IReadOnlyList<CascadingParameterState> FindCascadingParameters(Com
             {
                 // Although not all parameters might be matched, we know the maximum number
                 resultStates ??= new List<CascadingParameterState>(infos.Length - infoIndex);
-                resultStates.Add(new CascadingParameterState(info, supplier));
+                resultStates.Add(new CascadingParameterState(info, supplier, componentState));
 
                 if (info.Attribute.SingleDelivery)
                 {
diff --git a/src/Components/Components/src/CascadingValue.cs b/src/Components/Components/src/CascadingValue.cs
index a040894ac57c..d89320a53566 100644
--- a/src/Components/Components/src/CascadingValue.cs
+++ b/src/Components/Components/src/CascadingValue.cs
@@ -140,7 +140,7 @@ bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterI
             || string.Equals(requestedName, Name, StringComparison.OrdinalIgnoreCase); // Also match on name
     }
 
-    object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
+    object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
     {
         return Value;
     }
diff --git a/src/Components/Components/src/CascadingValueSource.cs b/src/Components/Components/src/CascadingValueSource.cs
index 3645b17bed39..eb17138786c6 100644
--- a/src/Components/Components/src/CascadingValueSource.cs
+++ b/src/Components/Components/src/CascadingValueSource.cs
@@ -149,7 +149,7 @@ bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterI
             || string.Equals(requestedName, _name, StringComparison.OrdinalIgnoreCase); // Also match on name
     }
 
-    object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
+    object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
     {
         if (_initialValueFactory is not null)
         {
diff --git a/src/Components/Components/src/ChangeDetection.cs b/src/Components/Components/src/ChangeDetection.cs
index 68918d023758..952debeb8f90 100644
--- a/src/Components/Components/src/ChangeDetection.cs
+++ b/src/Components/Components/src/ChangeDetection.cs
@@ -1,10 +1,23 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Concurrent;
+using Microsoft.AspNetCore.Components.HotReload;
+
 namespace Microsoft.AspNetCore.Components;
 
 internal sealed class ChangeDetection
 {
+    private static readonly ConcurrentDictionary<Type, bool> _immutableObjectTypesCache = new();
+
+    static ChangeDetection()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += _immutableObjectTypesCache.Clear;
+        }
+    }
+
     public static bool MayHaveChanged<T1, T2>(T1 oldValue, T2 newValue)
     {
         var oldIsNotNull = oldValue != null;
@@ -30,10 +43,6 @@ public static bool MayHaveChanged<T1, T2>(T1 oldValue, T2 newValue)
         return false;
     }
 
-    // The contents of this list need to trade off false negatives against computation
-    // time. So we don't want a huge list of types to check (or would have to move to
-    // a hashtable lookup, which is differently expensive). It's better not to include
-    // uncommon types here even if they are known to be immutable.
     // This logic assumes that no new System.TypeCode enum entries have been declared since 7.0, or at least that any new ones
     // represent immutable types. If System.TypeCode changes, review this logic to ensure it is still correct.
     // Supported immutable types : bool, byte, sbyte, short, ushort, int, uint, long, ulong, char, double,
@@ -41,6 +50,11 @@ public static bool MayHaveChanged<T1, T2>(T1 oldValue, T2 newValue)
     // For performance reasons, the following immutable types are not supported: IntPtr, UIntPtr, Type.
     private static bool IsKnownImmutableType(Type type)
         => Type.GetTypeCode(type) != TypeCode.Object
-        || type == typeof(Guid)
+        || _immutableObjectTypesCache.GetOrAdd(type, IsImmutableObjectTypeCore);
+
+    private static bool IsImmutableObjectTypeCore(Type type)
+        => type == typeof(Guid)
+        || type == typeof(DateOnly)
+        || type == typeof(TimeOnly)
         || typeof(IEventCallback).IsAssignableFrom(type);
 }
diff --git a/src/Components/Components/src/ComponentBase.cs b/src/Components/Components/src/ComponentBase.cs
index 5de04ae8d70b..eefe8eb74655 100644
--- a/src/Components/Components/src/ComponentBase.cs
+++ b/src/Components/Components/src/ComponentBase.cs
@@ -283,7 +283,10 @@ private async Task RunInitAndSetParametersAsync()
             // to defer calling StateHasChanged up until the first bit of async code happens or until
             // the end. Additionally, we want to avoid calling StateHasChanged if no
             // async work is to be performed.
-            StateHasChanged();
+            if (task.Status != TaskStatus.Faulted)
+            {
+                StateHasChanged();
+            }
 
             try
             {
@@ -319,7 +322,10 @@ private Task CallOnParametersSetAsync()
 
         // We always call StateHasChanged here as we want to trigger a rerender after OnParametersSet and
         // the synchronous part of OnParametersSetAsync has run.
-        StateHasChanged();
+        if (task.Status != TaskStatus.Faulted)
+        {
+            StateHasChanged();
+        }
 
         return shouldAwaitTask ?
             CallStateHasChangedOnAsyncCompletion(task) :
diff --git a/src/Components/Components/src/ComponentFactory.cs b/src/Components/Components/src/ComponentFactory.cs
index 12ad8ba03dea..0618c9a4d20a 100644
--- a/src/Components/Components/src/ComponentFactory.cs
+++ b/src/Components/Components/src/ComponentFactory.cs
@@ -4,6 +4,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Reflection;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,11 +14,24 @@ namespace Microsoft.AspNetCore.Components;
 
 internal sealed class ComponentFactory
 {
+    // This switch is unsupported and will be removed in a future version.
+    private static readonly bool _propertyInjectionDisabled =
+        AppContext.TryGetSwitch("Microsoft.AspNetCore.Components.Unsupported.DisablePropertyInjection", out var isDisabled) &&
+        isDisabled;
+
     private const BindingFlags _injectablePropertyBindingFlags
         = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
     private static readonly ConcurrentDictionary<Type, ComponentTypeInfoCacheEntry> _cachedComponentTypeInfo = new();
 
+    static ComponentFactory()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
     private readonly IComponentActivator _componentActivator;
     private readonly Renderer _renderer;
 
@@ -73,15 +87,18 @@ public IComponent InstantiateComponent(IServiceProvider serviceProvider, [Dynami
             throw new InvalidOperationException($"The component activator returned a null value for a component of type {componentType.FullName}.");
         }
 
-        if (component.GetType() == componentType)
+        if (!_propertyInjectionDisabled)
         {
-            // Fast, common case: use the cached data we already looked up
-            propertyInjector(serviceProvider, component);
-        }
-        else
-        {
-            // Uncommon case where the activator/resolver returned a different type. Needs an extra cache lookup.
-            PerformPropertyInjection(serviceProvider, component);
+            if (component.GetType() == componentType)
+            {
+                // Fast, common case: use the cached data we already looked up
+                propertyInjector(serviceProvider, component);
+            }
+            else
+            {
+                // Uncommon case where the activator/resolver returned a different type. Needs an extra cache lookup.
+                PerformPropertyInjection(serviceProvider, component);
+            }
         }
 
         return component;
diff --git a/src/Components/Components/src/ComponentSubscriptionKey.cs b/src/Components/Components/src/ComponentSubscriptionKey.cs
new file mode 100644
index 000000000000..010510f480a6
--- /dev/null
+++ b/src/Components/Components/src/ComponentSubscriptionKey.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+[DebuggerDisplay("{GetDebuggerDisplay(),nq}")]
+internal readonly struct ComponentSubscriptionKey(ComponentState subscriber, string propertyName) : IEquatable<ComponentSubscriptionKey>
+{
+    public ComponentState Subscriber { get; } = subscriber;
+
+    public string PropertyName { get; } = propertyName;
+
+    public bool Equals(ComponentSubscriptionKey other)
+        => Subscriber == other.Subscriber && PropertyName == other.PropertyName;
+
+    public override bool Equals(object? obj)
+        => obj is ComponentSubscriptionKey other && Equals(other);
+
+    public override int GetHashCode()
+        => HashCode.Combine(Subscriber, PropertyName);
+
+    private string GetDebuggerDisplay()
+        => $"{Subscriber.Component.GetType().Name}.{PropertyName}";
+}
diff --git a/src/Components/Components/src/ComponentsActivitySource.cs b/src/Components/Components/src/ComponentsActivitySource.cs
new file mode 100644
index 000000000000..add795e7ec24
--- /dev/null
+++ b/src/Components/Components/src/ComponentsActivitySource.cs
@@ -0,0 +1,143 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using Microsoft.AspNetCore.Components.Infrastructure;
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// This is instance scoped per renderer
+/// </summary>
+internal class ComponentsActivitySource
+{
+    internal const string Name = "Microsoft.AspNetCore.Components";
+    internal const string OnRouteName = $"{Name}.Navigate";
+    internal const string OnEventName = $"{Name}.HandleEvent";
+
+    private static ActivitySource ActivitySource { get; } = new ActivitySource(Name);
+    private ComponentsActivityLinkStore? _componentsActivityLinkStore;
+
+    public void Init(ComponentsActivityLinkStore store)
+    {
+        _componentsActivityLinkStore = store;
+    }
+
+    public ComponentsActivityHandle StartNavigateActivity(string componentType, string route)
+    {
+        var activity = ActivitySource.CreateActivity(OnRouteName, ActivityKind.Internal, parentId: null, null, null);
+        if (activity is not null)
+        {
+            var httpActivity = Activity.Current;
+            activity.DisplayName = $"Route {route ?? "[unknown path]"} -> {componentType ?? "[unknown component]"}";
+            Activity.Current = null; // do not inherit the parent activity
+            activity.Start();
+
+            if (activity.IsAllDataRequested)
+            {
+                if (componentType != null)
+                {
+                    activity.SetTag("aspnetcore.components.type", componentType);
+                }
+                if (route != null)
+                {
+                    activity.SetTag("aspnetcore.components.route", route);
+
+                    // store self link
+                    _componentsActivityLinkStore!.SetActivityContext(ComponentsActivityLinkStore.Route, activity.Context,
+                        new KeyValuePair<string, object?>("aspnetcore.components.route", route));
+                }
+            }
+
+            return new ComponentsActivityHandle { Activity = activity, Previous = httpActivity };
+        }
+        return default;
+    }
+
+    public void StopNavigateActivity(ComponentsActivityHandle activityHandle, Exception? ex)
+    {
+        StopComponentActivity(ComponentsActivityLinkStore.Route, activityHandle, ex);
+    }
+
+    public static ComponentsActivityHandle StartHandleEventActivity(string? componentType, string? methodName, string? attributeName)
+    {
+        var activity = ActivitySource.CreateActivity(OnEventName, ActivityKind.Internal, parentId: null, null, null);
+
+        if (activity is not null)
+        {
+            var previousActivity = Activity.Current;
+            activity.DisplayName = $"Event {attributeName ?? "[unknown attribute]"} -> {componentType ?? "[unknown component]"}.{methodName ?? "[unknown method]"}";
+            Activity.Current = null; // do not inherit the parent activity
+            activity.Start();
+
+            if (activity.IsAllDataRequested)
+            {
+                if (componentType != null)
+                {
+                    activity.SetTag("aspnetcore.components.type", componentType);
+                }
+                if (methodName != null)
+                {
+                    activity.SetTag("code.function.name", methodName);
+                }
+                if (attributeName != null)
+                {
+                    activity.SetTag("aspnetcore.components.attribute.name", attributeName);
+                }
+            }
+
+            return new ComponentsActivityHandle { Activity = activity, Previous = previousActivity };
+        }
+        return default;
+    }
+
+    public void StopHandleEventActivity(ComponentsActivityHandle activityHandle, Exception? ex)
+    {
+        StopComponentActivity(ComponentsActivityLinkStore.Event, activityHandle, ex);
+    }
+
+    public async Task CaptureHandleEventStopAsync(Task task, ComponentsActivityHandle activityHandle)
+    {
+        try
+        {
+            await task;
+            StopHandleEventActivity(activityHandle, null);
+        }
+        catch (Exception ex)
+        {
+            StopHandleEventActivity(activityHandle, ex);
+        }
+    }
+
+    private void StopComponentActivity(string category, ComponentsActivityHandle activityHandle, Exception? ex)
+    {
+        var activity = activityHandle.Activity;
+        if (activity != null && !activity.IsStopped)
+        {
+            if (ex != null)
+            {
+                activity.SetTag("error.type", ex.GetType().FullName);
+                activity.SetStatus(ActivityStatusCode.Error);
+            }
+            if (activity.IsAllDataRequested)
+            {
+                _componentsActivityLinkStore!.AddActivityContexts(category, activity);
+            }
+            activity.Stop();
+
+            if (Activity.Current == null && activityHandle.Previous != null && !activityHandle.Previous.IsStopped)
+            {
+                Activity.Current = activityHandle.Previous;
+            }
+        }
+    }
+}
+
+/// <summary>
+/// Named tuple for restoring the previous activity after stopping the current one.
+/// </summary>
+internal struct ComponentsActivityHandle
+{
+    public Activity? Previous;
+    public Activity? Activity;
+}
diff --git a/src/Components/Components/src/ComponentsMetrics.cs b/src/Components/Components/src/ComponentsMetrics.cs
new file mode 100644
index 000000000000..64fad76c66dd
--- /dev/null
+++ b/src/Components/Components/src/ComponentsMetrics.cs
@@ -0,0 +1,209 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Components;
+
+internal sealed class ComponentsMetrics : IDisposable
+{
+    public const string MeterName = "Microsoft.AspNetCore.Components";
+    public const string LifecycleMeterName = "Microsoft.AspNetCore.Components.Lifecycle";
+    private readonly Meter _meter;
+    private readonly Meter _lifeCycleMeter;
+
+    private readonly Counter<long> _navigationCount;
+
+    private readonly Histogram<double> _eventDuration;
+    private readonly Histogram<double> _parametersDuration;
+    private readonly Histogram<double> _batchDuration;
+    private readonly Histogram<int> _batchSize;
+
+    public bool IsNavigationEnabled => _navigationCount.Enabled;
+
+    public bool IsEventEnabled => _eventDuration.Enabled;
+
+    public bool IsParametersEnabled => _parametersDuration.Enabled;
+
+    public bool IsBatchEnabled => _batchDuration.Enabled;
+
+    public ComponentsMetrics(IMeterFactory meterFactory)
+    {
+        Debug.Assert(meterFactory != null);
+
+        _meter = meterFactory.Create(MeterName);
+        _lifeCycleMeter = meterFactory.Create(LifecycleMeterName);
+
+        _navigationCount = _meter.CreateCounter<long>(
+            "aspnetcore.components.navigate",
+            unit: "{route}",
+            description: "Total number of route changes.");
+
+        _eventDuration = _meter.CreateHistogram(
+            "aspnetcore.components.handle_event.duration",
+            unit: "s",
+            description: "Duration of processing browser event.  It includes business logic of the component but not affected child components.",
+            advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
+
+        _parametersDuration = _lifeCycleMeter.CreateHistogram(
+            "aspnetcore.components.update_parameters.duration",
+            unit: "s",
+            description: "Duration of processing component parameters. It includes business logic of the component.",
+            advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.BlazorRenderingSecondsBucketBoundaries });
+
+        _batchDuration = _lifeCycleMeter.CreateHistogram(
+            "aspnetcore.components.render_diff.duration",
+            unit: "s",
+            description: "Duration of rendering component tree and producing HTML diff. It includes business logic of the changed components.",
+            advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.BlazorRenderingSecondsBucketBoundaries });
+
+        _batchSize = _lifeCycleMeter.CreateHistogram(
+            "aspnetcore.components.render_diff.size",
+            unit: "{elements}",
+            description: "Number of HTML elements modified during a rendering batch.",
+            advice: new InstrumentAdvice<int> { HistogramBucketBoundaries = MetricsConstants.BlazorRenderingDiffLengthBucketBoundaries });
+    }
+
+    public void Navigation(string componentType, string route)
+    {
+        var tags = new TagList();
+        AddComponentTypeTag(ref tags, componentType);
+        AddRouteTag(ref tags, route);
+
+        _navigationCount.Add(1, tags);
+    }
+
+    public async Task CaptureEventDuration(Task task, long startTimestamp, string? componentType, string? methodName, string? attributeName)
+    {
+        var tags = new TagList();
+        AddComponentTypeTag(ref tags, componentType);
+        AddMethodNameTag(ref tags, methodName);
+        AddAttributeNameTag(ref tags, attributeName);
+
+        try
+        {
+            await task;
+        }
+        catch (Exception ex)
+        {
+            AddErrorTag(ref tags, ex);
+        }
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+        _eventDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    public void FailEventSync(Exception ex, long startTimestamp, string? componentType, string? methodName, string? attributeName)
+    {
+        var tags = new TagList();
+        AddComponentTypeTag(ref tags, componentType);
+        AddMethodNameTag(ref tags, methodName);
+        AddAttributeNameTag(ref tags, attributeName);
+        AddErrorTag(ref tags, ex);
+        
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+        _eventDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    public async Task CaptureParametersDuration(Task task, long startTimestamp, string? componentType)
+    {
+        var tags = new TagList();
+        AddComponentTypeTag(ref tags, componentType);
+
+        try
+        {
+            await task;
+        }
+        catch(Exception ex)
+        {
+            AddErrorTag(ref tags, ex);
+        }
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+        _parametersDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    public void FailParametersSync(Exception ex, long startTimestamp, string? componentType)
+    {
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+        var tags = new TagList();
+        AddComponentTypeTag(ref tags, componentType);
+        AddErrorTag(ref tags, ex);
+        
+        _parametersDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    public async Task CaptureBatchDuration(Task task, long startTimestamp, int diffLength)
+    {
+        var tags = new TagList();
+
+        try
+        {
+            await task;
+        }
+        catch (Exception ex)
+        {
+            AddErrorTag(ref tags, ex);
+        }
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+        _batchDuration.Record(duration.TotalSeconds, tags);
+        _batchSize.Record(diffLength, tags);
+    }
+
+    public void FailBatchSync(Exception ex, long startTimestamp)
+    {
+        var duration = Stopwatch.GetElapsedTime(startTimestamp);
+        var tags = new TagList();
+        AddErrorTag(ref tags, ex);
+        
+        _batchDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    public void Dispose()
+    {
+        _meter.Dispose();
+        _lifeCycleMeter.Dispose();
+    }
+
+    private static void AddComponentTypeTag(ref TagList tags, string? componentType)
+    {
+        if (componentType != null)
+        {
+            tags.Add("aspnetcore.components.type", componentType);
+        }
+    }
+
+    private static void AddRouteTag(ref TagList tags, string? route)
+    {
+        if (route != null)
+        {
+            tags.Add("aspnetcore.components.route", route);
+        }
+    }
+
+    private static void AddMethodNameTag(ref TagList tags, string? methodName)
+    {
+        if (methodName != null)
+        {
+            tags.Add("code.function.name", methodName);
+        }
+    }
+
+    private static void AddAttributeNameTag(ref TagList tags, string? attributeName)
+    {
+        if (attributeName != null)
+        {
+            tags.Add("aspnetcore.components.attribute.name", attributeName);
+        }
+    }
+
+    private static void AddErrorTag(ref TagList tags, Exception? exception)
+    {
+        var errorType = exception?.GetType().FullName;
+        if (errorType is not null)
+        {
+            tags.Add("error.type", errorType);
+        }
+    }
+}
diff --git a/src/Components/Components/src/DefaultComponentActivator.cs b/src/Components/Components/src/DefaultComponentActivator.cs
index 716591e4a660..24b92dcb1056 100644
--- a/src/Components/Components/src/DefaultComponentActivator.cs
+++ b/src/Components/Components/src/DefaultComponentActivator.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Components;
@@ -11,6 +12,14 @@ internal sealed class DefaultComponentActivator(IServiceProvider serviceProvider
 {
     private static readonly ConcurrentDictionary<Type, ObjectFactory> _cachedComponentTypeInfo = new();
 
+    static DefaultComponentActivator()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
     public static void ClearCache() => _cachedComponentTypeInfo.Clear();
 
     /// <inheritdoc />
diff --git a/src/Components/Components/src/EventCallback.cs b/src/Components/Components/src/EventCallback.cs
index 07efd535c082..cc4a63bacf4b 100644
--- a/src/Components/Components/src/EventCallback.cs
+++ b/src/Components/Components/src/EventCallback.cs
@@ -80,5 +80,5 @@ public override int GetHashCode()
     public override bool Equals(object? obj)
         => obj is EventCallback other
         && ReferenceEquals(Receiver, other.Receiver)
-        && ReferenceEquals(Delegate, other.Delegate);
+        && (Delegate?.Equals(other.Delegate) ?? (other.Delegate == null));
 }
diff --git a/src/Components/Components/src/EventCallbackOfT.cs b/src/Components/Components/src/EventCallbackOfT.cs
index e22317d9114f..f2c84c942646 100644
--- a/src/Components/Components/src/EventCallbackOfT.cs
+++ b/src/Components/Components/src/EventCallbackOfT.cs
@@ -80,5 +80,5 @@ public override int GetHashCode()
     public override bool Equals(object? obj)
         => obj is EventCallback<TValue> other
         && ReferenceEquals(Receiver, other.Receiver)
-        && ReferenceEquals(Delegate, other.Delegate);
+        && (Delegate?.Equals(other.Delegate) ?? (other.Delegate == null));
 }
diff --git a/src/Components/Components/src/ICascadingValueSupplier.cs b/src/Components/Components/src/ICascadingValueSupplier.cs
index c535d9cfda16..c61362537062 100644
--- a/src/Components/Components/src/ICascadingValueSupplier.cs
+++ b/src/Components/Components/src/ICascadingValueSupplier.cs
@@ -11,7 +11,7 @@ internal interface ICascadingValueSupplier
 
     bool CanSupplyValue(in CascadingParameterInfo parameterInfo);
 
-    object? GetCurrentValue(in CascadingParameterInfo parameterInfo);
+    object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo);
 
     void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo);
 
diff --git a/src/Components/Components/src/IPersistentComponentStateSerializer.cs b/src/Components/Components/src/IPersistentComponentStateSerializer.cs
new file mode 100644
index 000000000000..bcbfebbacf0a
--- /dev/null
+++ b/src/Components/Components/src/IPersistentComponentStateSerializer.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+
+namespace Microsoft.AspNetCore.Components;
+
+internal interface IPersistentComponentStateSerializer
+{
+    void Persist(Type type, object value, IBufferWriter<byte> writer);
+    object Restore(Type type, ReadOnlySequence<byte> data);
+}
\ No newline at end of file
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 9ebdbfc3778f..f165e6f82489 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -17,11 +17,15 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="RenderTree" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\JsonSerializerOptionsProvider.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\RootTypeCache.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)PooledArrayBufferWriter.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)QueryStringEnumerable.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)UrlDecoder\UrlDecoder.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Components\ComponentsActivityLinkStore.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <Import Project="Microsoft.AspNetCore.Components.Routing.targets" />
@@ -85,6 +89,7 @@
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.Tests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.Endpoints.Tests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.Web.Tests" />
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.QuickGrid.Tests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.ProtectedBrowserStorage.Tests" />
     <InternalsVisibleTo Include="Components.TestServer" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
index 2ec67a3f538c..41a3ecd9d4a1 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework=".net9.0">
+      <group targetFramework=".net10.0">
         <dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$componentAnalyzerVersion$" />
         <dependency id="Microsoft.AspNetCore.Authorization" version="$authorizationVersion$" exclude="Build,Analyzers" />
       </group>
diff --git a/src/Components/Components/src/NavigationManager.cs b/src/Components/Components/src/NavigationManager.cs
index fab5c69e9635..fecbfaca6c28 100644
--- a/src/Components/Components/src/NavigationManager.cs
+++ b/src/Components/Components/src/NavigationManager.cs
@@ -35,6 +35,25 @@ public event EventHandler<LocationChangedEventArgs> LocationChanged
 
     private CancellationTokenSource? _locationChangingCts;
 
+    /// <summary>
+    /// An event that fires when the page is not found.
+    /// </summary>
+    public event EventHandler<NotFoundEventArgs> OnNotFound
+    {
+        add
+        {
+            AssertInitialized();
+            _notFound += value;
+        }
+        remove
+        {
+            AssertInitialized();
+            _notFound -= value;
+        }
+    }
+
+    private EventHandler<NotFoundEventArgs>? _notFound;
+
     // For the baseUri it's worth storing as a System.Uri so we can do operations
     // on that type. System.Uri gives us access to the original string anyway.
     private Uri? _baseUri;
@@ -177,6 +196,24 @@ protected virtual void NavigateToCore([StringSyntax(StringSyntaxAttribute.Uri)]
     public virtual void Refresh(bool forceReload = false)
         => NavigateTo(Uri, forceLoad: true, replace: true);
 
+    /// <summary>
+    /// Handles setting the NotFound state.
+    /// </summary>
+    public void NotFound() => NotFoundCore();
+
+    private void NotFoundCore()
+    {
+        if (_notFound == null)
+        {
+            // global router doesn't exist, no events were registered
+            return;
+        }
+        else
+        {
+            _notFound.Invoke(this, new NotFoundEventArgs());
+        }
+    }
+
     /// <summary>
     /// Called to initialize BaseURI and current URI before these values are used for the first time.
     /// Override <see cref="EnsureInitialized" /> and call this method to dynamically calculate these values.
diff --git a/src/Components/Components/src/OwningComponentBase.cs b/src/Components/Components/src/OwningComponentBase.cs
index 739f0614258d..b2e9d9ef554a 100644
--- a/src/Components/Components/src/OwningComponentBase.cs
+++ b/src/Components/Components/src/OwningComponentBase.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Components;
 /// requires disposal such as a repository or database abstraction. Using <see cref="OwningComponentBase"/>
 /// as a base class ensures that the service provider scope is disposed with the component.
 /// </remarks>
-public abstract class OwningComponentBase : ComponentBase, IDisposable
+public abstract class OwningComponentBase : ComponentBase, IDisposable, IAsyncDisposable
 {
     private AsyncServiceScope? _scope;
 
@@ -44,20 +44,53 @@ protected IServiceProvider ScopedServices
         }
     }
 
+    /// <inhertidoc />
     void IDisposable.Dispose()
+    {
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Releases the service scope used by the component.
+    /// </summary>
+    /// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing)
     {
         if (!IsDisposed)
         {
-            _scope?.Dispose();
-            _scope = null;
-            Dispose(disposing: true);
+            if (disposing && _scope.HasValue && _scope.Value is IDisposable disposable)
+            {
+                disposable.Dispose();
+                _scope = null;
+            }
+
             IsDisposed = true;
         }
     }
 
-    /// <inheritdoc />
-    protected virtual void Dispose(bool disposing)
+    /// <inhertidoc />
+    async ValueTask IAsyncDisposable.DisposeAsync()
     {
+        await DisposeAsyncCore().ConfigureAwait(false);
+
+        Dispose(disposing: false);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Asynchronously releases the service scope used by the component.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous dispose operation.</returns>
+    protected virtual async ValueTask DisposeAsyncCore()
+    {
+        if (!IsDisposed && _scope.HasValue)
+        {
+            await _scope.Value.DisposeAsync().ConfigureAwait(false);
+            _scope = null;
+        }
+
+        IsDisposed = true;
     }
 }
 
diff --git a/src/Components/Components/src/ParameterView.cs b/src/Components/Components/src/ParameterView.cs
index 01252270fbe5..a1dc464399d6 100644
--- a/src/Components/Components/src/ParameterView.cs
+++ b/src/Components/Components/src/ParameterView.cs
@@ -437,7 +437,7 @@ public bool MoveNext()
                 _currentIndex = nextIndex;
 
                 var state = _cascadingParameters[_currentIndex];
-                var currentValue = state.ValueSupplier.GetCurrentValue(state.ParameterInfo);
+                var currentValue = state.ValueSupplier.GetCurrentValue(state.Key, state.ParameterInfo);
                 _current = new ParameterValue(state.ParameterInfo.PropertyName, currentValue!, true);
                 return true;
             }
diff --git a/src/Components/Components/src/PersistentComponentState.cs b/src/Components/Components/src/PersistentComponentState.cs
index bc193dd77e5f..56b669f5e2fe 100644
--- a/src/Components/Components/src/PersistentComponentState.cs
+++ b/src/Components/Components/src/PersistentComponentState.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
@@ -16,24 +17,30 @@ public class PersistentComponentState
     private readonly IDictionary<string, byte[]> _currentState;
 
     private readonly List<PersistComponentStateRegistration> _registeredCallbacks;
+    private readonly List<RestoreComponentStateRegistration> _registeredRestoringCallbacks;
 
     internal PersistentComponentState(
-        IDictionary<string , byte[]> currentState,
-        List<PersistComponentStateRegistration> pauseCallbacks)
+        IDictionary<string, byte[]> currentState,
+        List<PersistComponentStateRegistration> pauseCallbacks,
+        List<RestoreComponentStateRegistration> restoringCallbacks)
     {
         _currentState = currentState;
         _registeredCallbacks = pauseCallbacks;
+        _registeredRestoringCallbacks = restoringCallbacks;
     }
 
     internal bool PersistingState { get; set; }
 
-    internal void InitializeExistingState(IDictionary<string, byte[]> existingState)
+    internal RestoreContext CurrentContext { get; private set; } = RestoreContext.InitialValue;
+
+    internal void InitializeExistingState(IDictionary<string, byte[]> existingState, RestoreContext context)
     {
         if (_existingState != null)
         {
             throw new InvalidOperationException("PersistentComponentState already initialized.");
         }
         _existingState = existingState ?? throw new ArgumentNullException(nameof(existingState));
+        CurrentContext = context;
     }
 
     /// <summary>
@@ -56,6 +63,11 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
     {
         ArgumentNullException.ThrowIfNull(callback);
 
+        if (PersistingState)
+        {
+            throw new InvalidOperationException("Registering a callback while persisting state is not allowed.");
+        }
+
         var persistenceCallback = new PersistComponentStateRegistration(callback, renderMode);
 
         _registeredCallbacks.Add(persistenceCallback);
@@ -63,6 +75,30 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
         return new PersistingComponentStateSubscription(_registeredCallbacks, persistenceCallback);
     }
 
+    /// <summary>
+    /// Register a callback to restore the state when the application state is being restored.
+    /// </summary>
+    /// <param name="callback"> The callback to invoke when the application state is being restored.</param>
+    /// <param name="options">Options that control the restoration behavior.</param>
+    /// <returns>A subscription that can be used to unregister the callback when disposed.</returns>
+    public RestoringComponentStateSubscription RegisterOnRestoring(Action callback, RestoreOptions options)
+    {
+        Debug.Assert(CurrentContext != null);
+        if (CurrentContext.ShouldRestore(options))
+        {
+            callback();
+        }
+
+        if (options.AllowUpdates)
+        {
+            var registration = new RestoreComponentStateRegistration(callback);
+            _registeredRestoringCallbacks.Add(registration);
+            return new RestoringComponentStateSubscription(_registeredRestoringCallbacks, registration);
+        }
+
+        return default;
+    }
+
     /// <summary>
     /// Serializes <paramref name="instance"/> as JSON and persists it under the given <paramref name="key"/>.
     /// </summary>
@@ -79,12 +115,46 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
             throw new InvalidOperationException("Persisting state is only allowed during an OnPersisting callback.");
         }
 
-        if (_currentState.ContainsKey(key))
+        if (!_currentState.TryAdd(key, JsonSerializer.SerializeToUtf8Bytes(instance, JsonSerializerOptionsProvider.Options)))
         {
             throw new ArgumentException($"There is already a persisted object under the same key '{key}'");
         }
+    }
+
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    internal void PersistAsJson(string key, object instance, [DynamicallyAccessedMembers(JsonSerialized)] Type type)
+    {
+        ArgumentNullException.ThrowIfNull(key);
+
+        if (!PersistingState)
+        {
+            throw new InvalidOperationException("Persisting state is only allowed during an OnPersisting callback.");
+        }
+
+        if (!_currentState.TryAdd(key, JsonSerializer.SerializeToUtf8Bytes(instance, type, JsonSerializerOptionsProvider.Options)))
+        {
+            throw new ArgumentException($"There is already a persisted object under the same key '{key}'");
+        }
+    }
+
+    /// <summary>
+    /// Persists the provided byte array under the given key.
+    /// </summary>
+    /// <param name="key">The key to use to persist the state.</param>
+    /// <param name="data">The byte array to persist.</param>
+    internal void PersistAsBytes(string key, byte[] data)
+    {
+        ArgumentNullException.ThrowIfNull(key);
+
+        if (!PersistingState)
+        {
+            throw new InvalidOperationException("Persisting state is only allowed during an OnPersisting callback.");
+        }
 
-        _currentState.Add(key, JsonSerializer.SerializeToUtf8Bytes(instance, JsonSerializerOptionsProvider.Options));
+        if (!_currentState.TryAdd(key, data))
+        {
+            throw new ArgumentException($"There is already a persisted object under the same key '{key}'");
+        }
     }
 
     /// <summary>
@@ -114,6 +184,37 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
         }
     }
 
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    internal bool TryTakeFromJson(string key, [DynamicallyAccessedMembers(JsonSerialized)] Type type, [MaybeNullWhen(false)] out object? instance)
+    {
+        ArgumentNullException.ThrowIfNull(type);
+        ArgumentNullException.ThrowIfNull(key);
+        if (TryTake(key, out var data))
+        {
+            var reader = new Utf8JsonReader(data);
+            instance = JsonSerializer.Deserialize(ref reader, type, JsonSerializerOptionsProvider.Options);
+            return true;
+        }
+        else
+        {
+            instance = default;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Tries to retrieve the persisted state as raw bytes with the given <paramref name="key"/>.
+    /// When the key is present, the raw bytes are successfully returned via <paramref name="data"/>
+    /// and removed from the <see cref="PersistentComponentState"/>.
+    /// </summary>
+    /// <param name="key">The key used to persist the data.</param>
+    /// <param name="data">The persisted raw bytes.</param>
+    /// <returns><c>true</c> if the state was found; <c>false</c> otherwise.</returns>
+    internal bool TryTakeBytes(string key, [MaybeNullWhen(false)] out byte[]? data)
+    {
+        return TryTake(key, out data);
+    }
+
     private bool TryTake(string key, out byte[]? value)
     {
         ArgumentNullException.ThrowIfNull(key);
@@ -138,4 +239,17 @@ private bool TryTake(string key, out byte[]? value)
             return false;
         }
     }
+
+    internal void UpdateExistingState(IDictionary<string, byte[]> state, RestoreContext context)
+    {
+        ArgumentNullException.ThrowIfNull(state);
+
+        if (_existingState == null || _existingState.Count > 0)
+        {
+            throw new InvalidOperationException("Cannot update existing state: previous state has not been cleared or state is not initialized.");
+        }
+
+        _existingState = state;
+        CurrentContext = context;
+    }
 }
diff --git a/src/Components/Components/src/Infrastructure/ComponentStatePersistenceManager.cs b/src/Components/Components/src/PersistentState/ComponentStatePersistenceManager.cs
similarity index 53%
rename from src/Components/Components/src/Infrastructure/ComponentStatePersistenceManager.cs
rename to src/Components/Components/src/PersistentState/ComponentStatePersistenceManager.cs
index e1b4fdf605ec..e0f82daf4b57 100644
--- a/src/Components/Components/src/Infrastructure/ComponentStatePersistenceManager.cs
+++ b/src/Components/Components/src/PersistentState/ComponentStatePersistenceManager.cs
@@ -12,20 +12,40 @@ namespace Microsoft.AspNetCore.Components.Infrastructure;
 public class ComponentStatePersistenceManager
 {
     private readonly List<PersistComponentStateRegistration> _registeredCallbacks = new();
+    private readonly List<RestoreComponentStateRegistration> _registeredRestoringCallbacks = new();
     private readonly ILogger<ComponentStatePersistenceManager> _logger;
 
     private bool _stateIsPersisted;
+    private bool _stateIsInitialized;
+    private readonly PersistentServicesRegistry? _servicesRegistry;
     private readonly Dictionary<string, byte[]> _currentState = new(StringComparer.Ordinal);
 
     /// <summary>
     /// Initializes a new instance of <see cref="ComponentStatePersistenceManager"/>.
     /// </summary>
+    /// <param name="logger"></param>
     public ComponentStatePersistenceManager(ILogger<ComponentStatePersistenceManager> logger)
     {
-        State = new PersistentComponentState(_currentState, _registeredCallbacks);
+        State = new PersistentComponentState(_currentState, _registeredCallbacks, _registeredRestoringCallbacks);
         _logger = logger;
     }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="ComponentStatePersistenceManager"/>.
+    /// </summary>
+    /// <param name="logger"></param>
+    /// <param name="serviceProvider"></param>
+    public ComponentStatePersistenceManager(ILogger<ComponentStatePersistenceManager> logger, IServiceProvider serviceProvider) : this(logger)
+    {
+        _servicesRegistry = new PersistentServicesRegistry(serviceProvider);
+    }
+
+    // For testing purposes only
+    internal PersistentServicesRegistry? ServicesRegistry => _servicesRegistry;
+
+    // For testing purposes only
+    internal List<PersistComponentStateRegistration> RegisteredCallbacks => _registeredCallbacks;
+
     /// <summary>
     /// Gets the <see cref="ComponentStatePersistenceManager"/> associated with the <see cref="ComponentStatePersistenceManager"/>.
     /// </summary>
@@ -37,9 +57,38 @@ public ComponentStatePersistenceManager(ILogger<ComponentStatePersistenceManager
     /// <param name="store">The <see cref="IPersistentComponentStateStore"/> to restore the application state from.</param>
     /// <returns>A <see cref="Task"/> that will complete when the state has been restored.</returns>
     public async Task RestoreStateAsync(IPersistentComponentStateStore store)
+    {
+        await RestoreStateAsync(store, RestoreContext.InitialValue);
+    }
+
+    /// <summary>
+    /// Restores the application state.
+    /// </summary>
+    /// <param name="store"> The <see cref="IPersistentComponentStateStore"/> to restore the application state from.</param>
+    /// <param name="context">The <see cref="RestoreContext"/> that provides additional context for the restoration.</param>
+    /// <returns>A <see cref="Task"/> that will complete when the state has been restored.</returns>
+    public async Task RestoreStateAsync(IPersistentComponentStateStore store, RestoreContext context)
     {
         var data = await store.GetPersistedStateAsync();
-        State.InitializeExistingState(data);
+
+        if (_stateIsInitialized)
+        {
+            if (context != RestoreContext.ValueUpdate)
+            {
+                throw new InvalidOperationException("State already initialized.");
+            }
+            State.UpdateExistingState(data, context);
+            foreach (var registration in _registeredRestoringCallbacks)
+            {
+                registration.Callback();
+            }
+        }
+        else
+        {
+            State.InitializeExistingState(data, context);
+            _servicesRegistry?.RegisterForPersistence(State);
+            _stateIsInitialized = true;
+        }
     }
 
     /// <summary>
@@ -72,29 +121,64 @@ async Task PauseAndPersistState()
                 // the next store can start with a clean slate.
                 foreach (var store in compositeStore)
                 {
-                    await PersistState(store);
+                    var result = await TryPersistState(store);
+                    if (!result)
+                    {
+                        break;
+                    }
                     _currentState.Clear();
                 }
             }
             else
             {
-                await PersistState(store);
+                await TryPersistState(store);
             }
 
             State.PersistingState = false;
             _stateIsPersisted = true;
         }
 
-        async Task PersistState(IPersistentComponentStateStore store)
+        async Task<bool> TryPersistState(IPersistentComponentStateStore store)
         {
-            await PauseAsync(store);
+            if (!await TryPauseAsync(store))
+            {
+                _currentState.Clear();
+                return false;
+            }
+
             await store.PersistStateAsync(_currentState);
+            return true;
         }
     }
 
+    /// <summary>
+    /// Initializes the render mode for state persisted by the platform.
+    /// </summary>
+    /// <param name="renderMode">The render mode to use for state persisted by the platform.</param>
+    /// <exception cref="InvalidOperationException">when the render mode is already set.</exception>
+    public void SetPlatformRenderMode(IComponentRenderMode renderMode)
+    {
+        if (_servicesRegistry == null)
+        {
+            return;
+        }
+        else if (_servicesRegistry?.RenderMode != null)
+        {
+            throw new InvalidOperationException("Render mode already set.");
+        }
+
+        _servicesRegistry!.RenderMode = renderMode;
+    }
+
     private void InferRenderModes(Renderer renderer)
     {
-        for (var i = 0; i < _registeredCallbacks.Count; i++)
+        // We are iterating backwards to allow the callbacks to remove themselves from the list.
+        // Otherwise, we would have to make a copy of the list to avoid running into situations
+        // where we don't run all the callbacks because the count of the list changed while we
+        // were iterating over it.
+        // It is not allowed to register a callback while we are persisting the state, so we don't
+        // need to worry about new callbacks being added to the list.
+        for (var i = _registeredCallbacks.Count - 1; i >= 0; i--)
         {
             var registration = _registeredCallbacks[i];
             if (registration.RenderMode != null)
@@ -125,11 +209,17 @@ private void InferRenderModes(Renderer renderer)
         }
     }
 
-    internal Task PauseAsync(IPersistentComponentStateStore store)
+    internal Task<bool> TryPauseAsync(IPersistentComponentStateStore store)
     {
-        List<Task>? pendingCallbackTasks = null;
+        List<Task<bool>>? pendingCallbackTasks = null;
 
-        for (var i = 0; i < _registeredCallbacks.Count; i++)
+        // We are iterating backwards to allow the callbacks to remove themselves from the list.
+        // Otherwise, we would have to make a copy of the list to avoid running into situations
+        // where we don't run all the callbacks because the count of the list changed while we
+        // were iterating over it.
+        // It is not allowed to register a callback while we are persisting the state, so we don't
+        // need to worry about new callbacks being added to the list.
+        for (var i = _registeredCallbacks.Count - 1; i >= 0; i--)
         {
             var registration = _registeredCallbacks[i];
 
@@ -142,31 +232,38 @@ internal Task PauseAsync(IPersistentComponentStateStore store)
                 continue;
             }
 
-            var result = ExecuteCallback(registration.Callback, _logger);
+            var result = TryExecuteCallback(registration.Callback, _logger);
             if (!result.IsCompletedSuccessfully)
             {
-                pendingCallbackTasks ??= new();
+                pendingCallbackTasks ??= [];
                 pendingCallbackTasks.Add(result);
             }
+            else
+            {
+                if (!result.Result)
+                {
+                    return Task.FromResult(false);
+                }
+            }
         }
 
         if (pendingCallbackTasks != null)
         {
-            return Task.WhenAll(pendingCallbackTasks);
+            return AnyTaskFailed(pendingCallbackTasks);
         }
         else
         {
-            return Task.CompletedTask;
+            return Task.FromResult(true);
         }
 
-        static Task ExecuteCallback(Func<Task> callback, ILogger<ComponentStatePersistenceManager> logger)
+        static Task<bool> TryExecuteCallback(Func<Task> callback, ILogger<ComponentStatePersistenceManager> logger)
         {
             try
             {
                 var current = callback();
                 if (current.IsCompletedSuccessfully)
                 {
-                    return current;
+                    return Task.FromResult(true);
                 }
                 else
                 {
@@ -176,21 +273,36 @@ static Task ExecuteCallback(Func<Task> callback, ILogger<ComponentStatePersisten
             catch (Exception ex)
             {
                 logger.LogError(new EventId(1000, "PersistenceCallbackError"), ex, "There was an error executing a callback while pausing the application.");
-                return Task.CompletedTask;
+                return Task.FromResult(false);
             }
 
-            static async Task Awaited(Task task, ILogger<ComponentStatePersistenceManager> logger)
+            static async Task<bool> Awaited(Task task, ILogger<ComponentStatePersistenceManager> logger)
             {
                 try
                 {
                     await task;
+                    return true;
                 }
                 catch (Exception ex)
                 {
                     logger.LogError(new EventId(1000, "PersistenceCallbackError"), ex, "There was an error executing a callback while pausing the application.");
-                    return;
+                    return false;
+                }
+            }
+        }
+
+        static async Task<bool> AnyTaskFailed(List<Task<bool>> pendingCallbackTasks)
+        {
+            foreach (var result in await Task.WhenAll(pendingCallbackTasks))
+            {
+                if (!result)
+                {
+                    return false;
                 }
             }
+
+            return true;
         }
     }
+
 }
diff --git a/src/Components/Components/src/PersistentState/IPersistentServiceRegistration.cs b/src/Components/Components/src/PersistentState/IPersistentServiceRegistration.cs
new file mode 100644
index 000000000000..47f10fee8abc
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/IPersistentServiceRegistration.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+// Represents a component that is registered for state persistence.
+internal interface IPersistentServiceRegistration
+{
+    public string Assembly { get; }
+    public string FullTypeName { get; }
+
+    public IComponentRenderMode? GetRenderModeOrDefault();
+
+    public Type? GetResolvedTypeOrNull() => null;
+}
diff --git a/src/Components/Components/src/PersistComponentStateRegistration.cs b/src/Components/Components/src/PersistentState/PersistComponentStateRegistration.cs
similarity index 100%
rename from src/Components/Components/src/PersistComponentStateRegistration.cs
rename to src/Components/Components/src/PersistentState/PersistComponentStateRegistration.cs
diff --git a/src/Components/Components/src/PersistentState/PersistentComponentStateSerializer.cs b/src/Components/Components/src/PersistentState/PersistentComponentStateSerializer.cs
new file mode 100644
index 000000000000..c3705bdc4197
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentComponentStateSerializer.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// Provides custom serialization logic for persistent component state values of type <typeparamref name="T"/>.
+/// </summary>
+/// <typeparam name="T">The type of the value to serialize.</typeparam>
+public abstract class PersistentComponentStateSerializer<T> : IPersistentComponentStateSerializer
+{
+    /// <summary>
+    /// Serializes the provided <paramref name="value"/> and writes it to the <paramref name="writer"/>.
+    /// </summary>
+    /// <param name="value">The value to serialize.</param>
+    /// <param name="writer">The buffer writer to write the serialized data to.</param>
+    public abstract void Persist(T value, IBufferWriter<byte> writer);
+
+    /// <summary>
+    /// Deserializes a value of type <typeparamref name="T"/> from the provided <paramref name="data"/>.
+    /// This method must be synchronous to avoid UI tearing during component state restoration.
+    /// </summary>
+    /// <param name="data">The serialized data to deserialize.</param>
+    /// <returns>The deserialized value.</returns>
+    public abstract T Restore(ReadOnlySequence<byte> data);
+
+    /// <summary>
+    /// Explicit interface implementation for non-generic serialization.
+    /// </summary>
+    void IPersistentComponentStateSerializer.Persist(Type type, object value, IBufferWriter<byte> writer)
+        => Persist((T)value, writer);
+
+    /// <summary>
+    /// Explicit interface implementation for non-generic deserialization.
+    /// </summary>
+    object IPersistentComponentStateSerializer.Restore(Type type, ReadOnlySequence<byte> data)
+        => Restore(data)!;
+}
\ No newline at end of file
diff --git a/src/Components/Components/src/PersistentState/PersistentServiceRegistration.cs b/src/Components/Components/src/PersistentState/PersistentServiceRegistration.cs
new file mode 100644
index 000000000000..060a35df76d7
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentServiceRegistration.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Components;
+
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+internal sealed class PersistentServiceRegistration<TService>(IComponentRenderMode componentRenderMode) : IPersistentServiceRegistration
+{
+    public string Assembly => typeof(TService).Assembly.GetName().Name!;
+    public string FullTypeName => typeof(TService).FullName!;
+
+    public IComponentRenderMode? GetRenderModeOrDefault() => componentRenderMode;
+
+    public Type? GetResolvedTypeOrNull() => typeof(TService);
+
+    private string GetDebuggerDisplay() => $"{Assembly}::{FullTypeName}";
+}
diff --git a/src/Components/Components/src/PersistentState/PersistentServicesRegistry.cs b/src/Components/Components/src/PersistentState/PersistentServicesRegistry.cs
new file mode 100644
index 000000000000..e27e5c2560b0
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentServicesRegistry.cs
@@ -0,0 +1,254 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.AspNetCore.Components.HotReload;
+using Microsoft.AspNetCore.Components.Reflection;
+using Microsoft.AspNetCore.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+internal sealed class PersistentServicesRegistry
+{
+    private static readonly string _registryKey = typeof(PersistentServicesRegistry).FullName!;
+    private static readonly RootTypeCache _persistentServiceTypeCache = new();
+
+    private readonly IServiceProvider _serviceProvider;
+    private IPersistentServiceRegistration[] _registrations;
+    private List<(PersistingComponentStateSubscription, RestoringComponentStateSubscription)> _subscriptions = [];
+    private static readonly ConcurrentDictionary<Type, PropertiesAccessor> _cachedAccessorsByType = new();
+
+    static PersistentServicesRegistry()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += _cachedAccessorsByType.Clear;
+        }
+    }
+
+    public PersistentServicesRegistry(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+        _registrations = ResolveRegistrations(serviceProvider.GetService<RegisteredPersistentServiceRegistrationCollection>()?.Registrations ?? []);
+    }
+
+    internal IComponentRenderMode? RenderMode { get; set; }
+
+    internal IReadOnlyList<IPersistentServiceRegistration> Registrations => _registrations;
+
+    [UnconditionalSuppressMessage(
+        "Trimming",
+        "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code",
+        Justification = "Types registered for persistence are preserved in the API call to register them and typically live in assemblies that aren't trimmed.")]
+    internal void RegisterForPersistence(PersistentComponentState state)
+    {
+        if (_subscriptions.Count != 0)
+        {
+            return;
+        }
+
+        UpdateRegistrations(state);
+        var subscriptions = new List<(PersistingComponentStateSubscription, RestoringComponentStateSubscription)>(
+            _registrations.Length + 1);
+        for (var i = 0; i < _registrations.Length; i++)
+        {
+            var registration = _registrations[i];
+            var type = ResolveType(registration);
+            if (type == null)
+            {
+                continue;
+            }
+
+            var renderMode = registration.GetRenderModeOrDefault();
+
+            var instance = _serviceProvider.GetRequiredService(type);
+            subscriptions.Add((
+                state.RegisterOnPersisting(() =>
+                {
+                    PersistInstanceState(instance, type, state);
+                    return Task.CompletedTask;
+                }, renderMode),
+                // In order to avoid registering one callback per property, we register a single callback with the most
+                // permissive options and perform the filtering inside of it.
+                state.RegisterOnRestoring(() =>
+                {
+                    RestoreInstanceState(instance, type, state);
+                }, new RestoreOptions { AllowUpdates = true })));
+        }
+
+        if (RenderMode != null)
+        {
+            subscriptions.Add((
+                state.RegisterOnPersisting(() =>
+                {
+                    state.PersistAsJson(_registryKey, _registrations);
+                    return Task.CompletedTask;
+                }, RenderMode),
+                default));
+        }
+
+        _subscriptions = subscriptions;
+    }
+
+    [RequiresUnreferencedCode("Calls Microsoft.AspNetCore.Components.PersistentComponentState.PersistAsJson(String, Object, Type)")]
+    private static void PersistInstanceState(object instance, Type type, PersistentComponentState state)
+    {
+        var accessors = _cachedAccessorsByType.GetOrAdd(instance.GetType(), static (runtimeType, declaredType) => new PropertiesAccessor(runtimeType, declaredType), type);
+        foreach (var (key, propertyType) in accessors.KeyTypePairs)
+        {
+            var (setter, getter, options) = accessors.GetAccessor(key);
+            var value = getter.GetValue(instance);
+            if (value != null)
+            {
+                state.PersistAsJson(key, value, propertyType);
+            }
+        }
+    }
+
+    [UnconditionalSuppressMessage("Trimming",
+        "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code",
+        Justification = "Types registered for persistence are preserved in the API call to register them and typically live in assemblies that aren't trimmed.")]
+    [DynamicDependency(LinkerFlags.JsonSerialized, typeof(PersistentServiceRegistration))]
+    private void UpdateRegistrations(PersistentComponentState state)
+    {
+        if (state.TryTakeFromJson<PersistentServiceRegistration[]>(_registryKey, out var registry) && registry != null)
+        {
+            _registrations = ResolveRegistrations(_registrations.Concat(registry));
+        }
+    }
+
+    [RequiresUnreferencedCode("Calls Microsoft.AspNetCore.Components.PersistentComponentState.TryTakeFromJson(String, Type, out Object)")]
+    private static void RestoreInstanceState(object instance, Type type, PersistentComponentState state)
+    {
+        var accessors = _cachedAccessorsByType.GetOrAdd(instance.GetType(), static (runtimeType, declaredType) => new PropertiesAccessor(runtimeType, declaredType), type);
+        foreach (var (key, propertyType) in accessors.KeyTypePairs)
+        {
+            var (setter, getter, options) = accessors.GetAccessor(key);
+            if (!state.CurrentContext.ShouldRestore(options))
+            {
+                continue;
+            }
+            if (state.TryTakeFromJson(key, propertyType, out var result))
+            {
+                setter.SetValue(instance, result!);
+            }
+        }
+    }
+
+    internal static IPersistentServiceRegistration[] ResolveRegistrations(IEnumerable<IPersistentServiceRegistration> registrations) => [.. registrations.DistinctBy(r => (r.Assembly, r.FullTypeName)).OrderBy(r => r.Assembly).ThenBy(r => r.FullTypeName)];
+
+    private static Type? ResolveType(IPersistentServiceRegistration registration)
+    {
+        if (registration.GetResolvedTypeOrNull() is Type type)
+        {
+            return type;
+        }
+        var assembly = registration.Assembly;
+        var fullTypeName = registration.FullTypeName;
+        return _persistentServiceTypeCache.GetRootType(assembly, fullTypeName);
+    }
+
+    private sealed class PropertiesAccessor
+    {
+        internal const BindingFlags BindablePropertyFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.IgnoreCase;
+
+        private readonly Dictionary<string, (PropertySetter, PropertyGetter, RestoreOptions)> _underlyingAccessors;
+        private readonly (string, Type)[] _cachedKeysForService;
+
+        public PropertiesAccessor([DynamicallyAccessedMembers(LinkerFlags.Component)] Type targetType, Type keyType)
+        {
+            _underlyingAccessors = new Dictionary<string, (PropertySetter, PropertyGetter, RestoreOptions)>(StringComparer.OrdinalIgnoreCase);
+
+            var keys = new List<(string, Type)>();
+            foreach (var propertyInfo in GetCandidateBindableProperties(targetType))
+            {
+                PersistentStateAttribute? parameterAttribute = null;
+                foreach (var attribute in propertyInfo.GetCustomAttributes())
+                {
+                    if (attribute is PersistentStateAttribute persistentStateAttribute)
+                    {
+                        parameterAttribute = persistentStateAttribute;
+                        break;
+                    }
+                }
+                if (parameterAttribute == null)
+                {
+                    continue;
+                }
+
+                var propertyName = propertyInfo.Name;
+                var key = ComputeKey(keyType, propertyName);
+                keys.Add(new(key, propertyInfo.PropertyType));
+                if (propertyInfo.SetMethod == null || !propertyInfo.SetMethod.IsPublic)
+                {
+                    throw new InvalidOperationException(
+                        $"The type '{targetType.FullName}' declares a property matching the name '{propertyName}' that is not public. Persistent service properties must be public.");
+                }
+
+                if (propertyInfo.GetMethod == null || !propertyInfo.GetMethod.IsPublic)
+                {
+                    throw new InvalidOperationException(
+                        $"The type '{targetType.FullName}' declares a property matching the name '{propertyName}' that is not public. Persistent service properties must be public.");
+                }
+
+                var restoreOptions = new RestoreOptions
+                {
+                    RestoreBehavior = parameterAttribute.RestoreBehavior,
+                    AllowUpdates = parameterAttribute.AllowUpdates,
+                };
+
+                var propertySetter = new PropertySetter(targetType, propertyInfo);
+                var propertyGetter = new PropertyGetter(targetType, propertyInfo);
+
+                _underlyingAccessors.Add(key, (propertySetter, propertyGetter, restoreOptions));
+            }
+
+            _cachedKeysForService = [.. keys];
+        }
+
+        public (string, Type)[] KeyTypePairs => _cachedKeysForService;
+
+        private static string ComputeKey(Type keyType, string propertyName)
+        {
+            // This happens once per type and property combo, so allocations are ok.
+            var assemblyName = keyType.Assembly.FullName;
+            var typeName = keyType.FullName;
+
+            // Internal classes can be bundled in different assemblies during prerendering and WASM rendering.
+            bool isTypeInternal = (!keyType.IsPublic && !keyType.IsNested) || keyType.IsNestedAssembly;
+            var inputString = isTypeInternal
+                ? string.Join(".", typeName, propertyName)
+                : string.Join(".", assemblyName, typeName, propertyName);
+
+            var input = Encoding.UTF8.GetBytes(inputString);
+            var hash = SHA256.HashData(input);
+            return Convert.ToBase64String(hash);
+        }
+
+        internal static IEnumerable<PropertyInfo> GetCandidateBindableProperties(
+            [DynamicallyAccessedMembers(LinkerFlags.Component)] Type targetType)
+            => MemberAssignment.GetPropertiesIncludingInherited(targetType, BindablePropertyFlags);
+
+        internal (PropertySetter setter, PropertyGetter getter, RestoreOptions options) GetAccessor(string key) =>
+            _underlyingAccessors.TryGetValue(key, out var result) ? result : default;
+    }
+
+    [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+    private class PersistentServiceRegistration : IPersistentServiceRegistration
+    {
+        public string Assembly { get; set; } = "";
+
+        public string FullTypeName { get; set; } = "";
+
+        public IComponentRenderMode? GetRenderModeOrDefault() => null;
+
+        private string GetDebuggerDisplay() => $"{Assembly}::{FullTypeName}";
+    }
+}
diff --git a/src/Components/Components/src/PersistentState/PersistentStateProviderServiceCollectionExtensions.cs b/src/Components/Components/src/PersistentState/PersistentStateProviderServiceCollectionExtensions.cs
new file mode 100644
index 000000000000..f806a7597a30
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentStateProviderServiceCollectionExtensions.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+/// <summary>
+/// Enables component parameters to be supplied from <see cref="PersistentComponentState"/> with <see cref="PersistentStateAttribute"/>.
+/// </summary>
+public static class PersistentStateProviderServiceCollectionExtensions
+{
+    /// <summary>
+    /// Enables component parameters to be supplied from <see cref="PersistentComponentState"/> with <see cref="PersistentStateAttribute"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddSupplyValueFromPersistentComponentStateProvider(this IServiceCollection services)
+    {
+        services.TryAddEnumerable(ServiceDescriptor.Scoped<ICascadingValueSupplier, PersistentStateValueProvider>());
+        return services;
+    }
+}
diff --git a/src/Components/Components/src/PersistentState/PersistentStateValueProvider.cs b/src/Components/Components/src/PersistentState/PersistentStateValueProvider.cs
new file mode 100644
index 000000000000..53158b44e0db
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentStateValueProvider.cs
@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+internal sealed partial class PersistentStateValueProvider(PersistentComponentState state, ILogger<PersistentStateValueProvider> logger, IServiceProvider serviceProvider) : ICascadingValueSupplier
+{
+    private readonly Dictionary<ComponentSubscriptionKey, PersistentValueProviderComponentSubscription> _subscriptions = [];
+
+    public bool IsFixed => false;
+    // For testing purposes only
+    internal Dictionary<ComponentSubscriptionKey, PersistentValueProviderComponentSubscription> Subscriptions => _subscriptions;
+
+    public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
+        => parameterInfo.Attribute is PersistentStateAttribute;
+
+    [UnconditionalSuppressMessage(
+        "ReflectionAnalysis",
+        "IL2026:RequiresUnreferencedCode message",
+        Justification = "JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    [UnconditionalSuppressMessage(
+        "Trimming",
+        "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.",
+        Justification = "JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
+    {
+        var componentState = (ComponentState)key!;
+
+        if (_subscriptions.TryGetValue(new(componentState, parameterInfo.PropertyName), out var subscription))
+        {
+            return subscription.GetOrComputeLastValue();
+        }
+
+        return null;
+    }
+
+    public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
+    {
+        var propertyName = parameterInfo.PropertyName;
+
+        var componentSubscription = new PersistentValueProviderComponentSubscription(
+            state,
+            subscriber,
+            parameterInfo,
+            serviceProvider,
+            logger);
+
+        _subscriptions.Add(new ComponentSubscriptionKey(subscriber, propertyName), componentSubscription);
+    }
+
+    public void Unsubscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
+    {
+        if (_subscriptions.TryGetValue(new(subscriber, parameterInfo.PropertyName), out var subscription))
+        {
+            subscription.Dispose();
+            _subscriptions.Remove(new(subscriber, parameterInfo.PropertyName));
+        }
+    }
+}
diff --git a/src/Components/Components/src/PersistentState/PersistentStateValueProviderKeyResolver.cs b/src/Components/Components/src/PersistentState/PersistentStateValueProviderKeyResolver.cs
new file mode 100644
index 000000000000..8de18363342c
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentStateValueProviderKeyResolver.cs
@@ -0,0 +1,214 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Globalization;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.AspNetCore.Components.HotReload;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+internal static class PersistentStateValueProviderKeyResolver
+{
+    private static readonly ConcurrentDictionary<(string, string, string), byte[]> _keyCache = new();
+
+    static PersistentStateValueProviderKeyResolver()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCaches;
+        }
+    }
+
+    private static void ClearCaches()
+    {
+        _keyCache.Clear();
+    }
+
+    // Internal for testing only
+    internal static string ComputeKey(ComponentState componentState, string propertyName)
+    {
+        // We need to come up with a pseudo-unique key for the storage key.
+        // We need to consider the property name, the component type, and its position within the component tree.
+        // If only one component of a given type is present on the page, then only the component type + property name is enough.
+        // If multiple components of the same type are present on the page, then we need to consider the position within the tree.
+        // To do that, we are going to use the `@key` directive on the component if present and if we deem it serializable.
+        // Serializable keys are Guid, DateOnly, TimeOnly, and any primitive type.
+        // The key is composed of four segments:
+        // Parent component type
+        // Component type
+        // Property name
+        // @key directive if present and serializable.
+        // We combine the first three parts into an identifier, and then we generate a derived identifier with the key
+        // We do it this way because the information for the first three pieces of data is static for the lifetime of the
+        // program and can be cached on each situation.
+
+        var parentComponentType = GetParentComponentType(componentState);
+        var componentType = GetComponentType(componentState);
+
+        var preKey = _keyCache.GetOrAdd((parentComponentType, componentType, propertyName), KeyFactory);
+        var finalKey = ComputeFinalKey(preKey, componentState);
+
+        return finalKey;
+    }
+
+    private static string ComputeFinalKey(byte[] preKey, ComponentState componentState)
+    {
+        Span<byte> keyHash = stackalloc byte[SHA256.HashSizeInBytes];
+
+        var key = GetSerializableKey(componentState);
+        byte[]? pool = null;
+        try
+        {
+            Span<byte> keyBuffer = stackalloc byte[1024];
+            var currentBuffer = keyBuffer;
+            preKey.CopyTo(keyBuffer);
+            if (key is IUtf8SpanFormattable spanFormattable)
+            {
+                var wroteKey = false;
+                while (!wroteKey)
+                {
+                    currentBuffer = keyBuffer[preKey.Length..];
+                    wroteKey = spanFormattable.TryFormat(currentBuffer, out var written, "", CultureInfo.InvariantCulture);
+                    if (!wroteKey)
+                    {
+                        // It is really unlikely that we will enter here, but we need to handle this case
+                        Debug.Assert(written == 0);
+                        GrowBuffer(ref pool, ref keyBuffer);
+                    }
+                    else
+                    {
+                        currentBuffer = currentBuffer[..written];
+                    }
+                }
+            }
+            else
+            {
+                var keySpan = ResolveKeySpan(key);
+                var wroteKey = false;
+                while (!wroteKey)
+                {
+                    currentBuffer = keyBuffer[preKey.Length..];
+                    wroteKey = Encoding.UTF8.TryGetBytes(keySpan, currentBuffer, out var written);
+                    if (!wroteKey)
+                    {
+                        // It is really unlikely that we will enter here, but we need to handle this case
+                        Debug.Assert(written == 0);
+                        // Since this is utf-8, grab a buffer the size of the key * 4 + the preKey size
+                        // this guarantees we have enough space to encode the key
+                        GrowBuffer(ref pool, ref keyBuffer, keySpan.Length * 4 + preKey.Length);
+                    }
+                    else
+                    {
+                        currentBuffer = currentBuffer[..written];
+                    }
+                }
+            }
+
+            keyBuffer = keyBuffer[..(preKey.Length + currentBuffer.Length)];
+
+            var hashSucceeded = SHA256.TryHashData(keyBuffer, keyHash, out _);
+            Debug.Assert(hashSucceeded);
+            return Convert.ToBase64String(keyHash);
+        }
+        finally
+        {
+            if (pool != null)
+            {
+                ArrayPool<byte>.Shared.Return(pool, clearArray: true);
+            }
+        }
+    }
+
+    private static ReadOnlySpan<char> ResolveKeySpan(object? key)
+    {
+        if (key is IFormattable formattable)
+        {
+            var keyString = formattable.ToString("", CultureInfo.InvariantCulture);
+            return keyString.AsSpan();
+        }
+        else if (key is IConvertible convertible)
+        {
+            var keyString = convertible.ToString(CultureInfo.InvariantCulture);
+            return keyString.AsSpan();
+        }
+        return default;
+    }
+
+    private static void GrowBuffer(ref byte[]? pool, ref Span<byte> keyBuffer, int? size = null)
+    {
+        var newPool = pool == null ? ArrayPool<byte>.Shared.Rent(size ?? 2048) : ArrayPool<byte>.Shared.Rent(pool.Length * 2);
+        keyBuffer.CopyTo(newPool);
+        keyBuffer = newPool;
+        if (pool != null)
+        {
+            ArrayPool<byte>.Shared.Return(pool, clearArray: true);
+        }
+        pool = newPool;
+    }
+
+    private static object? GetSerializableKey(ComponentState componentState)
+    {
+        var componentKey = componentState.GetComponentKey();
+        if (componentKey != null && IsSerializableKey(componentKey))
+        {
+            return componentKey;
+        }
+
+        return null;
+    }
+
+    private static string GetComponentType(ComponentState componentState) => componentState.Component.GetType().FullName!;
+
+    private static string GetParentComponentType(ComponentState componentState)
+    {
+        if (componentState.ParentComponentState == null)
+        {
+            return "";
+        }
+        if (componentState.ParentComponentState.Component == null)
+        {
+            return "";
+        }
+
+        if (componentState.ParentComponentState.ParentComponentState != null)
+        {
+            var renderer = componentState.Renderer;
+            var parentRenderMode = renderer.GetComponentRenderMode(componentState.ParentComponentState.Component);
+            var grandParentRenderMode = renderer.GetComponentRenderMode(componentState.ParentComponentState.ParentComponentState.Component);
+            if (parentRenderMode != grandParentRenderMode)
+            {
+                // This is the case when EndpointHtmlRenderer introduces an SSRRenderBoundary component.
+                // We want to return "" because the SSRRenderBoundary component is not a real component
+                // and won't appear on the component tree in the WebAssemblyRenderer and RemoteRenderer
+                // interactive scenarios.
+                return "";
+            }
+        }
+
+        return GetComponentType(componentState.ParentComponentState);
+    }
+
+    private static byte[] KeyFactory((string parentComponentType, string componentType, string propertyName) parts) =>
+        SHA256.HashData(Encoding.UTF8.GetBytes(string.Join(".", parts.parentComponentType, parts.componentType, parts.propertyName)));
+
+    private static bool IsSerializableKey(object key)
+    {
+        if (key == null)
+        {
+            return false;
+        }
+        var keyType = key.GetType();
+        var result = Type.GetTypeCode(keyType) != TypeCode.Object
+            || keyType == typeof(Guid)
+            || keyType == typeof(DateTimeOffset)
+            || keyType == typeof(DateOnly)
+            || keyType == typeof(TimeOnly);
+
+        return result;
+    }
+}
diff --git a/src/Components/Components/src/PersistentState/PersistentValueProviderComponentSubscription.cs b/src/Components/Components/src/PersistentState/PersistentValueProviderComponentSubscription.cs
new file mode 100644
index 000000000000..35ad18735816
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/PersistentValueProviderComponentSubscription.cs
@@ -0,0 +1,264 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using Microsoft.AspNetCore.Components.HotReload;
+using Microsoft.AspNetCore.Components.Reflection;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+internal partial class PersistentValueProviderComponentSubscription : IDisposable
+{
+    private static readonly ConcurrentDictionary<(Type, string), PropertyGetter> _propertyGetterCache = new();
+    private static readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();
+    private static readonly object _uninitializedSentinel = new();
+
+    static PersistentValueProviderComponentSubscription()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCaches;
+        }
+    }
+
+    private static void ClearCaches()
+    {
+        _propertyGetterCache.Clear();
+        _serializerCache.Clear();
+    }
+
+    private readonly PersistentComponentState _state;
+    private readonly ComponentState _subscriber;
+    private readonly string _propertyName;
+    private readonly Type _propertyType;
+    private readonly PropertyGetter _propertyGetter;
+    private readonly IPersistentComponentStateSerializer? _customSerializer;
+    private readonly ILogger _logger;
+
+    private readonly PersistingComponentStateSubscription? _persistingSubscription;
+    private readonly RestoringComponentStateSubscription? _restoringSubscription;
+    private object? _lastValue = _uninitializedSentinel;
+    private bool _hasPendingInitialValue;
+    private bool _ignoreComponentPropertyValue;
+    private string? _storageKey;
+
+    public PersistentValueProviderComponentSubscription(
+        PersistentComponentState state,
+        ComponentState subscriber,
+        CascadingParameterInfo parameterInfo,
+        IServiceProvider serviceProvider,
+        ILogger logger)
+    {
+        _state = state;
+        _subscriber = subscriber;
+        _propertyName = parameterInfo.PropertyName;
+        _propertyType = parameterInfo.PropertyType;
+        _logger = logger;
+        var attribute = (PersistentStateAttribute)parameterInfo.Attribute;
+
+        _customSerializer = _serializerCache.GetOrAdd(_propertyType, SerializerFactory, serviceProvider);
+        _propertyGetter = _propertyGetterCache.GetOrAdd((subscriber.Component.GetType(), _propertyName), PropertyGetterFactory);
+
+        _persistingSubscription = state.RegisterOnPersisting(
+            PersistProperty,
+            subscriber.Renderer.GetComponentRenderMode(subscriber.Component));
+
+        _restoringSubscription = state.RegisterOnRestoring(
+            RestoreProperty,
+            new RestoreOptions { RestoreBehavior = attribute.RestoreBehavior, AllowUpdates = attribute.AllowUpdates });
+    }
+
+    // GetOrComputeLastValue is a bit of a special provider.
+    // Right after a Restore operation it will capture the last value and return that, but it must support the user
+    // overriding the property at a later point, so to support that, we need to keep track of whether or not we have
+    // delivered the last value, and if so, instead of returning the _lastValue, we simply read the property and return
+    // that instead. That way, if the component updates the property in SetParametersAsync, we won't revert it to the
+    // value we restored from the persistent state.
+    internal object? GetOrComputeLastValue()
+    {
+        var isInitialized = !ReferenceEquals(_lastValue, _uninitializedSentinel);
+        if (!isInitialized)
+        {
+            // Remove the uninitialized sentinel.
+            _lastValue = null;
+            if (_hasPendingInitialValue)
+            {
+                RestoreProperty();
+                _hasPendingInitialValue = false;
+            }
+        }
+        else
+        {
+            if (_ignoreComponentPropertyValue)
+            {
+                // At this point, we just received a value update from `RestoreProperty`.
+                // The property value might have been modified by the component and in this
+                // case we want to overwrite it with the value we just restored.
+                _ignoreComponentPropertyValue = false;
+                return _lastValue;
+            }
+            else
+            {
+                // In this case, the component might have modified the property value after
+                // we restored it from the persistent state. We don't want to overwrite it
+                // with a previously restored value.
+                var currentPropertyValue = _propertyGetter.GetValue(_subscriber.Component);
+                return currentPropertyValue;
+            }
+        }
+
+        return _lastValue;
+    }
+
+    [UnconditionalSuppressMessage("Trimming", "IL2075:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "OpenComponent already has the right set of attributes")]
+    [UnconditionalSuppressMessage("Trimming", "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+    [UnconditionalSuppressMessage("Trimming", "IL2077:'type' argument does not satisfy 'DynamicallyAccessedMemberTypes' in call to target method. The source field does not have matching annotations.", Justification = "Property types on components are preserved through other means.")]
+    internal void RestoreProperty()
+    {
+        var skipNotifications = _hasPendingInitialValue;
+        if (ReferenceEquals(_lastValue, _uninitializedSentinel) && !_hasPendingInitialValue)
+        {
+            // Upon subscribing, the callback might be invoked right away,
+            // but this is too early to restore the first value since the component state
+            // hasn't been fully initialized yet.
+            // For that reason, we make a mark to restore the state on GetOrComputeLastValue.
+            _hasPendingInitialValue = true;
+            return;
+        }
+
+        // The key needs to be computed here, do not move this outside of the lambda.
+        _storageKey ??= PersistentStateValueProviderKeyResolver.ComputeKey(_subscriber, _propertyName);
+
+        if (_customSerializer != null)
+        {
+            if (_state.TryTakeBytes(_storageKey, out var data))
+            {
+                Log.RestoringValueFromState(_logger, _storageKey, _propertyType.Name, _propertyName);
+                var sequence = new ReadOnlySequence<byte>(data!);
+                _lastValue = _customSerializer.Restore(_propertyType, sequence);
+                _ignoreComponentPropertyValue = true;
+                if (!skipNotifications)
+                {
+                    _subscriber.NotifyCascadingValueChanged(ParameterViewLifetime.Unbound);
+                }
+            }
+            else
+            {
+                Log.ValueNotFoundInPersistentState(_logger, _storageKey, _propertyType.Name, "null", _propertyName);
+            }
+        }
+        else
+        {
+            if (_state.TryTakeFromJson(_storageKey, _propertyType, out var value))
+            {
+                Log.RestoredValueFromPersistentState(_logger, _storageKey, _propertyType.Name, "null", _propertyName);
+                _lastValue = value;
+                _ignoreComponentPropertyValue = true;
+                if (!skipNotifications)
+                {
+                    _subscriber.NotifyCascadingValueChanged(ParameterViewLifetime.Unbound);
+                }
+            }
+            else
+            {
+                Log.NoValueToRestoreFromState(_logger, _storageKey, _propertyType.Name, _propertyName);
+            }
+        }
+    }
+
+    [UnconditionalSuppressMessage("Trimming", "IL2075:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "OpenComponent already has the right set of attributes")]
+    [UnconditionalSuppressMessage("Trimming", "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+    [UnconditionalSuppressMessage("Trimming", "IL2077:'type' argument does not satisfy 'DynamicallyAccessedMemberTypes' in call to target method. The source field does not have matching annotations.", Justification = "Property types on components are preserved through other means.")]
+    private Task PersistProperty()
+    {
+        // The key needs to be computed here, do not move this outside of the lambda.
+        _storageKey ??= PersistentStateValueProviderKeyResolver.ComputeKey(_subscriber, _propertyName);
+
+        var property = _propertyGetter.GetValue(_subscriber.Component);
+        if (property == null)
+        {
+            Log.SkippedPersistingNullValue(_logger, _storageKey, _propertyType.Name, _subscriber.Component.GetType().Name, _propertyName);
+            return Task.CompletedTask;
+        }
+
+        if (_customSerializer != null)
+        {
+            Log.PersistingValueToState(_logger, _storageKey, _propertyType.Name, _subscriber.Component.GetType().Name, _propertyName);
+
+            using var writer = new PooledArrayBufferWriter<byte>();
+            _customSerializer.Persist(_propertyType, property, writer);
+            _state.PersistAsBytes(_storageKey, writer.WrittenMemory.ToArray());
+            return Task.CompletedTask;
+        }
+
+        // Fallback to JSON serialization
+        Log.PersistingValueToState(_logger, _storageKey, _propertyType.Name, _subscriber.Component.GetType().Name, _propertyName);
+        _state.PersistAsJson(_storageKey, property, _propertyType);
+        return Task.CompletedTask;
+    }
+
+    public void Dispose()
+    {
+        _persistingSubscription?.Dispose();
+        _restoringSubscription?.Dispose();
+    }
+
+    private IPersistentComponentStateSerializer? SerializerFactory(Type type, IServiceProvider serviceProvider)
+    {
+        var serializerType = typeof(PersistentComponentStateSerializer<>).MakeGenericType(type);
+        var serializer = serviceProvider.GetService(serializerType);
+
+        // The generic class now inherits from the internal interface, so we can cast directly
+        return serializer as IPersistentComponentStateSerializer;
+    }
+
+    [UnconditionalSuppressMessage(
+    "Trimming",
+    "IL2077:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The source field does not have matching annotations.",
+    Justification = "Properties of rendered components are preserved through other means and won't get trimmed.")]
+
+    private static PropertyGetter PropertyGetterFactory((Type type, string propertyName) key)
+    {
+        var (type, propertyName) = key;
+        var propertyInfo = GetPropertyInfo(type, propertyName);
+        if (propertyInfo == null || propertyInfo.GetMethod == null || !propertyInfo.GetMethod.IsPublic)
+        {
+            throw new InvalidOperationException(
+                $"A public property '{propertyName}' on component type '{type.FullName}' with a public getter wasn't found.");
+        }
+
+        return new PropertyGetter(type, propertyInfo);
+
+        static PropertyInfo? GetPropertyInfo([DynamicallyAccessedMembers(LinkerFlags.Component)] Type type, string propertyName)
+            => type.GetProperty(propertyName);
+    }
+
+    private static partial class Log
+    {
+        [LoggerMessage(1, LogLevel.Debug, "Persisting value for storage key '{StorageKey}' of type '{PropertyType}' from component '{ComponentType}' for property '{PropertyName}'", EventName = "PersistingValueToState")]
+        public static partial void PersistingValueToState(ILogger logger, string storageKey, string propertyType, string componentType, string propertyName);
+
+        [LoggerMessage(2, LogLevel.Debug, "Skipped persisting null value for storage key '{StorageKey}' of type '{PropertyType}' from component '{ComponentType}' for property '{PropertyName}'", EventName = "SkippedPersistingNullValue")]
+        public static partial void SkippedPersistingNullValue(ILogger logger, string storageKey, string propertyType, string componentType, string propertyName);
+
+        [LoggerMessage(3, LogLevel.Debug, "Restoring value for storage key '{StorageKey}' of type '{PropertyType}' for property '{PropertyName}'", EventName = "RestoringValueFromState")]
+        public static partial void RestoringValueFromState(ILogger logger, string storageKey, string propertyType, string propertyName);
+
+        [LoggerMessage(4, LogLevel.Debug, "No value to restore for storage key '{StorageKey}' of type '{PropertyType}' for property '{PropertyName}'", EventName = "NoValueToRestoreFromState")]
+        public static partial void NoValueToRestoreFromState(ILogger logger, string storageKey, string propertyType, string propertyName);
+
+        [LoggerMessage(5, LogLevel.Debug, "Restored value from persistent state for storage key '{StorageKey}' of type '{PropertyType}' for component '{ComponentType}' for property '{PropertyName}'", EventName = "RestoredValueFromPersistentState")]
+        public static partial void RestoredValueFromPersistentState(ILogger logger, string storageKey, string propertyType, string componentType, string propertyName);
+
+        [LoggerMessage(6, LogLevel.Debug, "Value not found in persistent state for storage key '{StorageKey}' of type '{PropertyType}' for component '{ComponentType}' for property '{PropertyName}'", EventName = "ValueNotFoundInPersistentState")]
+        public static partial void ValueNotFoundInPersistentState(ILogger logger, string storageKey, string propertyType, string componentType, string propertyName);
+    }
+}
diff --git a/src/Components/Components/src/PersistingComponentStateSubscription.cs b/src/Components/Components/src/PersistentState/PersistingComponentStateSubscription.cs
similarity index 100%
rename from src/Components/Components/src/PersistingComponentStateSubscription.cs
rename to src/Components/Components/src/PersistentState/PersistingComponentStateSubscription.cs
diff --git a/src/Components/Components/src/PersistentState/RegisteredPersistentServiceRegistrationCollection.cs b/src/Components/Components/src/PersistentState/RegisteredPersistentServiceRegistrationCollection.cs
new file mode 100644
index 000000000000..3885086c65da
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/RegisteredPersistentServiceRegistrationCollection.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+internal class RegisteredPersistentServiceRegistrationCollection(IEnumerable<IPersistentServiceRegistration> registrations)
+{
+    private readonly IEnumerable<IPersistentServiceRegistration> _registrations =
+        PersistentServicesRegistry.ResolveRegistrations(registrations);
+
+    public IEnumerable<IPersistentServiceRegistration> Registrations => _registrations;
+}
diff --git a/src/Components/Components/src/PersistentState/RestoreBehavior.cs b/src/Components/Components/src/PersistentState/RestoreBehavior.cs
new file mode 100644
index 000000000000..e958eed03c15
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/RestoreBehavior.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// Indicates the behavior to use when restoring state for a component parameter.
+/// </summary>
+/// <remarks>
+/// By default, it always restores the value in all situations.
+/// Use <see cref="SkipInitialValue"/> to skip restoring the initial value
+/// when the host starts up.
+/// Use <see cref="SkipLastSnapshot"/> to skip restoring the last value captured
+/// the last time the current host was shut down, if the host supports restarting.
+/// </remarks>
+[Flags]
+public enum RestoreBehavior
+{
+    /// <summary>
+    /// Restore the value in all situations.
+    /// </summary>
+    Default = 0,
+    /// <summary>
+    /// Avoid restoring the initial value when the host starts up.
+    /// </summary>
+    SkipInitialValue = 1,
+
+    /// <summary>
+    /// Avoid restoring the last value captured when the current host was shut down.
+    /// </summary>
+    SkipLastSnapshot = 2
+}
diff --git a/src/Components/Components/src/PersistentState/RestoreComponentStateRegistration.cs b/src/Components/Components/src/PersistentState/RestoreComponentStateRegistration.cs
new file mode 100644
index 000000000000..1d5b16f8fce4
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/RestoreComponentStateRegistration.cs
@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+internal readonly struct RestoreComponentStateRegistration(Action callback)
+{
+    public Action Callback { get; } = callback;
+}
diff --git a/src/Components/Components/src/PersistentState/RestoreContext.cs b/src/Components/Components/src/PersistentState/RestoreContext.cs
new file mode 100644
index 000000000000..461792bff6f7
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/RestoreContext.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// The context where the restore operation is taking place.
+/// </summary>
+public sealed class RestoreContext
+{
+    private readonly bool _initialValue;
+    private readonly bool _lastSnapshot;
+    private readonly bool _allowUpdates;
+
+    /// <summary>
+    /// Gets a <see cref="RestoreContext"/> that indicates the host is restoring initial values.
+    /// </summary>
+    public static RestoreContext InitialValue { get; } = new RestoreContext(true, false, false);
+
+    /// <summary>
+    /// Gets a <see cref="RestoreContext"/> that indicates the host is restoring the last snapshot
+    /// available from the previous time the host was running.
+    /// </summary>
+    public static RestoreContext LastSnapshot { get; } = new RestoreContext(false, true, false);
+
+    /// <summary>
+    /// Gets the <see cref="RestoreContext"/> that indicates the host is providing an external state
+    /// update to the current value.
+    /// </summary>
+    public static RestoreContext ValueUpdate { get; } = new RestoreContext(false, false, true);
+
+    private RestoreContext(bool initialValue, bool lastSnapshot, bool allowUpdates)
+    {
+        _initialValue = initialValue;
+        _lastSnapshot = lastSnapshot;
+        _allowUpdates = allowUpdates;
+    }
+
+    internal bool ShouldRestore(RestoreOptions options)
+    {
+        if (_initialValue && !options.RestoreBehavior.HasFlag(RestoreBehavior.SkipInitialValue))
+        {
+            return true;
+        }
+
+        if (_lastSnapshot && !options.RestoreBehavior.HasFlag(RestoreBehavior.SkipLastSnapshot))
+        {
+            return true;
+        }
+
+        if (_allowUpdates && options.AllowUpdates)
+        {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Components/Components/src/PersistentState/RestoreOptions.cs b/src/Components/Components/src/PersistentState/RestoreOptions.cs
new file mode 100644
index 000000000000..4f2696f6546f
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/RestoreOptions.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// Represents the options available for a restore operation.
+/// </summary>
+public readonly struct RestoreOptions
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RestoreOptions"/> struct with default values.
+    /// </summary>
+    public RestoreOptions()
+    {
+    }
+
+    /// <summary>
+    /// Gets the behavior to use when restoring data.
+    /// </summary>
+    public RestoreBehavior RestoreBehavior { get; init; } = RestoreBehavior.Default;
+
+    /// <summary>
+    /// Gets a value indicating whether the registration wants to receive updates beyond
+    /// the initially provided value.
+    /// </summary>
+    public bool AllowUpdates { get; init; } = false;
+}
diff --git a/src/Components/Components/src/PersistentState/RestoringComponentStateSubscription.cs b/src/Components/Components/src/PersistentState/RestoringComponentStateSubscription.cs
new file mode 100644
index 000000000000..48b2319ba7cf
--- /dev/null
+++ b/src/Components/Components/src/PersistentState/RestoringComponentStateSubscription.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// Represents a subscription to component state restoration events. Dispose to unsubscribe.
+/// </summary>
+public readonly struct RestoringComponentStateSubscription : IDisposable
+{
+    private readonly List<RestoreComponentStateRegistration> _registeredRestoringCallbacks;
+    private readonly RestoreComponentStateRegistration? _registration;
+
+    internal RestoringComponentStateSubscription(
+        List<RestoreComponentStateRegistration> registeredRestoringCallbacks,
+        RestoreComponentStateRegistration registration)
+    {
+        _registeredRestoringCallbacks = registeredRestoringCallbacks;
+        _registration = registration;
+    }
+
+    /// <summary>
+    /// Unsubscribes from state restoration events.
+    /// </summary>
+    public void Dispose()
+    {
+        if (_registration.HasValue)
+        {
+            _registeredRestoringCallbacks?.Remove(_registration.Value);
+        }
+    }
+}
diff --git a/src/Components/Components/src/PersistentStateAttribute.cs b/src/Components/Components/src/PersistentStateAttribute.cs
new file mode 100644
index 000000000000..cd8de101bda9
--- /dev/null
+++ b/src/Components/Components/src/PersistentStateAttribute.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// Indicates that the value for the parameter might come from persistent component state from a
+/// previous render.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+public sealed class PersistentStateAttribute : CascadingParameterAttributeBase
+{
+    /// <summary>
+    /// Gets or sets the behavior to use when restoring data.
+    /// </summary>
+    /// <remarks>
+    /// By default it always restores the value on all situations.
+    /// Use <code cref="RestoreBehavior.SkipInitialValue"/> to skip restoring the initial value
+    /// when the host starts up.
+    /// Use <code cref="RestoreBehavior.SkipLastSnapshot"/> to skip restoring the last value captured
+    /// the last time the current host was shut down.
+    /// </remarks>
+    public RestoreBehavior RestoreBehavior { get; set; } = RestoreBehavior.Default;
+
+    /// <summary>
+    /// Gets or sets a value whether the component wants to receive updates to the parameter
+    /// beyond the initial value provided during initialization.
+    /// </summary>
+    public bool AllowUpdates { get; set; }
+}
diff --git a/src/Components/Components/src/PublicAPI.Shipped.txt b/src/Components/Components/src/PublicAPI.Shipped.txt
index 0aabe63f06c2..c417cab5be3a 100644
--- a/src/Components/Components/src/PublicAPI.Shipped.txt
+++ b/src/Components/Components/src/PublicAPI.Shipped.txt
@@ -72,10 +72,13 @@ Microsoft.AspNetCore.Components.ChangeEventArgs.Value.get -> object?
 Microsoft.AspNetCore.Components.ChangeEventArgs.Value.set -> void
 Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers
 Microsoft.AspNetCore.Components.ComponentBase
+Microsoft.AspNetCore.Components.ComponentBase.Assets.get -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
+Microsoft.AspNetCore.Components.ComponentBase.AssignedRenderMode.get -> Microsoft.AspNetCore.Components.IComponentRenderMode?
 Microsoft.AspNetCore.Components.ComponentBase.ComponentBase() -> void
 Microsoft.AspNetCore.Components.ComponentBase.DispatchExceptionAsync(System.Exception! exception) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.ComponentBase.InvokeAsync(System.Action! workItem) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.ComponentBase.InvokeAsync(System.Func<System.Threading.Tasks.Task!>! workItem) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.ComponentBase.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
 Microsoft.AspNetCore.Components.ComponentBase.StateHasChanged() -> void
 Microsoft.AspNetCore.Components.Dispatcher
 Microsoft.AspNetCore.Components.Dispatcher.AssertAccess() -> void
@@ -150,6 +153,8 @@ Microsoft.AspNetCore.Components.EventHandlerAttribute.EnableStopPropagation.get
 Microsoft.AspNetCore.Components.EventHandlerAttribute.EventArgsType.get -> System.Type!
 Microsoft.AspNetCore.Components.EventHandlerAttribute.EventHandlerAttribute(string! attributeName, System.Type! eventArgsType) -> void
 Microsoft.AspNetCore.Components.EventHandlerAttribute.EventHandlerAttribute(string! attributeName, System.Type! eventArgsType, bool enableStopPropagation, bool enablePreventDefault) -> void
+Microsoft.AspNetCore.Components.ExcludeFromInteractiveRoutingAttribute
+Microsoft.AspNetCore.Components.ExcludeFromInteractiveRoutingAttribute.ExcludeFromInteractiveRoutingAttribute() -> void
 Microsoft.AspNetCore.Components.IComponent
 Microsoft.AspNetCore.Components.IComponent.Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle) -> void
 Microsoft.AspNetCore.Components.IComponent.SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task!
@@ -260,15 +265,22 @@ Microsoft.AspNetCore.Components.PersistentComponentState.TryTakeFromJson<TValue>
 Microsoft.AspNetCore.Components.PersistingComponentStateSubscription
 Microsoft.AspNetCore.Components.PersistingComponentStateSubscription.Dispose() -> void
 Microsoft.AspNetCore.Components.PersistingComponentStateSubscription.PersistingComponentStateSubscription() -> void
+Microsoft.AspNetCore.Components.RendererInfo
+Microsoft.AspNetCore.Components.RendererInfo.IsInteractive.get -> bool
+Microsoft.AspNetCore.Components.RendererInfo.Name.get -> string!
+Microsoft.AspNetCore.Components.RendererInfo.RendererInfo(string! rendererName, bool isInteractive) -> void
 Microsoft.AspNetCore.Components.RenderFragment
 Microsoft.AspNetCore.Components.RenderFragment<TValue>
 Microsoft.AspNetCore.Components.RenderHandle
+Microsoft.AspNetCore.Components.RenderHandle.Assets.get -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
 Microsoft.AspNetCore.Components.RenderHandle.Dispatcher.get -> Microsoft.AspNetCore.Components.Dispatcher!
 Microsoft.AspNetCore.Components.RenderHandle.DispatchExceptionAsync(System.Exception! exception) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.RenderHandle.IsInitialized.get -> bool
 Microsoft.AspNetCore.Components.RenderHandle.IsRenderingOnMetadataUpdate.get -> bool
 Microsoft.AspNetCore.Components.RenderHandle.Render(Microsoft.AspNetCore.Components.RenderFragment! renderFragment) -> void
+Microsoft.AspNetCore.Components.RenderHandle.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
 Microsoft.AspNetCore.Components.RenderHandle.RenderHandle() -> void
+Microsoft.AspNetCore.Components.RenderHandle.RenderMode.get -> Microsoft.AspNetCore.Components.IComponentRenderMode?
 Microsoft.AspNetCore.Components.Rendering.ComponentState
 Microsoft.AspNetCore.Components.Rendering.ComponentState.Component.get -> Microsoft.AspNetCore.Components.IComponent!
 Microsoft.AspNetCore.Components.Rendering.ComponentState.ComponentId.get -> int
@@ -403,6 +415,18 @@ Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType.NamedEvent = 10 -
 Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType.None = 0 -> Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType
 Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType.Region = 5 -> Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType
 Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType.Text = 2 -> Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType
+Microsoft.AspNetCore.Components.ResourceAsset
+Microsoft.AspNetCore.Components.ResourceAsset.Properties.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAssetProperty!>?
+Microsoft.AspNetCore.Components.ResourceAsset.ResourceAsset(string! url, System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAssetProperty!>? properties) -> void
+Microsoft.AspNetCore.Components.ResourceAsset.Url.get -> string!
+Microsoft.AspNetCore.Components.ResourceAssetCollection
+Microsoft.AspNetCore.Components.ResourceAssetCollection.IsContentSpecificUrl(string! path) -> bool
+Microsoft.AspNetCore.Components.ResourceAssetCollection.ResourceAssetCollection(System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAsset!>! resources) -> void
+Microsoft.AspNetCore.Components.ResourceAssetCollection.this[string! key].get -> string!
+Microsoft.AspNetCore.Components.ResourceAssetProperty
+Microsoft.AspNetCore.Components.ResourceAssetProperty.Name.get -> string!
+Microsoft.AspNetCore.Components.ResourceAssetProperty.ResourceAssetProperty(string! name, string! value) -> void
+Microsoft.AspNetCore.Components.ResourceAssetProperty.Value.get -> string!
 Microsoft.AspNetCore.Components.RouteAttribute
 Microsoft.AspNetCore.Components.RouteAttribute.RouteAttribute(string! template) -> void
 Microsoft.AspNetCore.Components.RouteAttribute.Template.get -> string!
@@ -685,6 +709,7 @@ static readonly Microsoft.AspNetCore.Components.EventCallback.Empty -> Microsoft
 static readonly Microsoft.AspNetCore.Components.EventCallback.Factory -> Microsoft.AspNetCore.Components.EventCallbackFactory!
 static readonly Microsoft.AspNetCore.Components.EventCallback<TValue>.Empty -> Microsoft.AspNetCore.Components.EventCallback<TValue>
 static readonly Microsoft.AspNetCore.Components.EventCallbackWorkItem.Empty -> Microsoft.AspNetCore.Components.EventCallbackWorkItem
+static readonly Microsoft.AspNetCore.Components.ResourceAssetCollection.Empty -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
 virtual Microsoft.AspNetCore.Components.ComponentBase.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
 virtual Microsoft.AspNetCore.Components.ComponentBase.OnAfterRender(bool firstRender) -> void
 virtual Microsoft.AspNetCore.Components.ComponentBase.OnAfterRenderAsync(bool firstRender) -> System.Threading.Tasks.Task!
@@ -703,11 +728,13 @@ virtual Microsoft.AspNetCore.Components.NavigationManager.SetNavigationLockState
 virtual Microsoft.AspNetCore.Components.OwningComponentBase.Dispose(bool disposing) -> void
 virtual Microsoft.AspNetCore.Components.Rendering.ComponentState.DisposeAsync() -> System.Threading.Tasks.ValueTask
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.AddPendingTask(Microsoft.AspNetCore.Components.Rendering.ComponentState? componentState, System.Threading.Tasks.Task! task) -> void
+virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.Assets.get -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.CreateComponentState(int componentId, Microsoft.AspNetCore.Components.IComponent! component, Microsoft.AspNetCore.Components.Rendering.ComponentState? parentComponentState) -> Microsoft.AspNetCore.Components.Rendering.ComponentState!
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo? fieldInfo, System.EventArgs! eventArgs) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo? fieldInfo, System.EventArgs! eventArgs, bool waitForQuiescence) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.Dispose(bool disposing) -> void
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.GetComponentRenderMode(Microsoft.AspNetCore.Components.IComponent! component) -> Microsoft.AspNetCore.Components.IComponentRenderMode?
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.ProcessPendingRender() -> void
+virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.ResolveComponentForRenderMode(System.Type! componentType, int? parentComponentId, Microsoft.AspNetCore.Components.IComponentActivator! componentActivator, Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> Microsoft.AspNetCore.Components.IComponent!
 virtual Microsoft.AspNetCore.Components.RouteView.Render(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
diff --git a/src/Components/Components/src/PublicAPI.Unshipped.txt b/src/Components/Components/src/PublicAPI.Unshipped.txt
index e8c43eb034cf..2da7d492e710 100644
--- a/src/Components/Components/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Components/src/PublicAPI.Unshipped.txt
@@ -1,28 +1,53 @@
 #nullable enable
-Microsoft.AspNetCore.Components.ComponentBase.Assets.get -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
-Microsoft.AspNetCore.Components.ComponentBase.AssignedRenderMode.get -> Microsoft.AspNetCore.Components.IComponentRenderMode?
-Microsoft.AspNetCore.Components.ComponentBase.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
-Microsoft.AspNetCore.Components.ExcludeFromInteractiveRoutingAttribute
-Microsoft.AspNetCore.Components.ExcludeFromInteractiveRoutingAttribute.ExcludeFromInteractiveRoutingAttribute() -> void
-Microsoft.AspNetCore.Components.RendererInfo
-Microsoft.AspNetCore.Components.RendererInfo.IsInteractive.get -> bool
-Microsoft.AspNetCore.Components.RendererInfo.Name.get -> string!
-Microsoft.AspNetCore.Components.RendererInfo.RendererInfo(string! rendererName, bool isInteractive) -> void
-Microsoft.AspNetCore.Components.RenderHandle.Assets.get -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
-Microsoft.AspNetCore.Components.RenderHandle.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
-Microsoft.AspNetCore.Components.RenderHandle.RenderMode.get -> Microsoft.AspNetCore.Components.IComponentRenderMode?
-Microsoft.AspNetCore.Components.ResourceAsset
-Microsoft.AspNetCore.Components.ResourceAsset.Properties.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAssetProperty!>?
-Microsoft.AspNetCore.Components.ResourceAsset.ResourceAsset(string! url, System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAssetProperty!>? properties) -> void
-Microsoft.AspNetCore.Components.ResourceAsset.Url.get -> string!
-Microsoft.AspNetCore.Components.ResourceAssetCollection
-Microsoft.AspNetCore.Components.ResourceAssetCollection.IsContentSpecificUrl(string! path) -> bool
-Microsoft.AspNetCore.Components.ResourceAssetCollection.ResourceAssetCollection(System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAsset!>! resources) -> void
-Microsoft.AspNetCore.Components.ResourceAssetCollection.this[string! key].get -> string!
-Microsoft.AspNetCore.Components.ResourceAssetProperty
-Microsoft.AspNetCore.Components.ResourceAssetProperty.Name.get -> string!
-Microsoft.AspNetCore.Components.ResourceAssetProperty.ResourceAssetProperty(string! name, string! value) -> void
-Microsoft.AspNetCore.Components.ResourceAssetProperty.Value.get -> string!
-static readonly Microsoft.AspNetCore.Components.ResourceAssetCollection.Empty -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
-virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.Assets.get -> Microsoft.AspNetCore.Components.ResourceAssetCollection!
-virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
+*REMOVED*Microsoft.AspNetCore.Components.ResourceAsset.ResourceAsset(string! url, System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAssetProperty!>? properties) -> void
+Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.RestoreStateAsync(Microsoft.AspNetCore.Components.IPersistentComponentStateStore! store, Microsoft.AspNetCore.Components.RestoreContext! context) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.PersistentComponentState.RegisterOnRestoring(System.Action! callback, Microsoft.AspNetCore.Components.RestoreOptions options) -> Microsoft.AspNetCore.Components.RestoringComponentStateSubscription
+Microsoft.AspNetCore.Components.PersistentStateAttribute.AllowUpdates.get -> bool
+Microsoft.AspNetCore.Components.PersistentStateAttribute.AllowUpdates.set -> void
+Microsoft.AspNetCore.Components.PersistentStateAttribute.RestoreBehavior.get -> Microsoft.AspNetCore.Components.RestoreBehavior
+Microsoft.AspNetCore.Components.PersistentStateAttribute.RestoreBehavior.set -> void
+Microsoft.AspNetCore.Components.Rendering.ComponentState.Renderer.get -> Microsoft.AspNetCore.Components.RenderTree.Renderer!
+Microsoft.AspNetCore.Components.ResourceAsset.ResourceAsset(string! url, System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Components.ResourceAssetProperty!>? properties = null) -> void
+Microsoft.AspNetCore.Components.RestoreBehavior
+Microsoft.AspNetCore.Components.RestoreBehavior.Default = 0 -> Microsoft.AspNetCore.Components.RestoreBehavior
+Microsoft.AspNetCore.Components.RestoreBehavior.SkipInitialValue = 1 -> Microsoft.AspNetCore.Components.RestoreBehavior
+Microsoft.AspNetCore.Components.RestoreBehavior.SkipLastSnapshot = 2 -> Microsoft.AspNetCore.Components.RestoreBehavior
+Microsoft.AspNetCore.Components.RestoreContext
+Microsoft.AspNetCore.Components.RestoreOptions
+Microsoft.AspNetCore.Components.RestoreOptions.AllowUpdates.get -> bool
+Microsoft.AspNetCore.Components.RestoreOptions.AllowUpdates.init -> void
+Microsoft.AspNetCore.Components.RestoreOptions.RestoreBehavior.get -> Microsoft.AspNetCore.Components.RestoreBehavior
+Microsoft.AspNetCore.Components.RestoreOptions.RestoreBehavior.init -> void
+Microsoft.AspNetCore.Components.RestoreOptions.RestoreOptions() -> void
+Microsoft.AspNetCore.Components.RestoringComponentStateSubscription
+Microsoft.AspNetCore.Components.RestoringComponentStateSubscription.Dispose() -> void
+Microsoft.AspNetCore.Components.RestoringComponentStateSubscription.RestoringComponentStateSubscription() -> void
+Microsoft.AspNetCore.Components.Routing.Router.NotFoundPage.get -> System.Type?
+Microsoft.AspNetCore.Components.Routing.Router.NotFoundPage.set -> void
+Microsoft.AspNetCore.Components.Infrastructure.ComponentsMetricsServiceCollectionExtensions
+Microsoft.AspNetCore.Components.NavigationManager.OnNotFound -> System.EventHandler<Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs!>!
+Microsoft.AspNetCore.Components.NavigationManager.NotFound() -> void
+Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager.Initialize(string! baseUri, string! uri, System.Func<string!, System.Threading.Tasks.Task!>! onNavigateTo) -> void
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.NotFoundEventArgs() -> void
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.Path.get -> string?
+Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.Path.set -> void
+Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.ComponentStatePersistenceManager(Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager!>! logger, System.IServiceProvider! serviceProvider) -> void
+Microsoft.AspNetCore.Components.Infrastructure.ComponentStatePersistenceManager.SetPlatformRenderMode(Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> void
+Microsoft.AspNetCore.Components.Infrastructure.RegisterPersistentComponentStateServiceCollectionExtensions
+Microsoft.AspNetCore.Components.PersistentStateAttribute
+Microsoft.AspNetCore.Components.PersistentStateAttribute.PersistentStateAttribute() -> void
+Microsoft.AspNetCore.Components.Infrastructure.PersistentStateProviderServiceCollectionExtensions
+Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>
+Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>.PersistentComponentStateSerializer() -> void
+abstract Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>.Persist(T value, System.Buffers.IBufferWriter<byte>! writer) -> void
+abstract Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>.Restore(System.Buffers.ReadOnlySequence<byte> data) -> T
+static Microsoft.AspNetCore.Components.Infrastructure.RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<TService>(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.AspNetCore.Components.IComponentRenderMode! componentRenderMode) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.AspNetCore.Components.Infrastructure.ComponentsMetricsServiceCollectionExtensions.AddComponentsMetrics(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.AspNetCore.Components.Infrastructure.ComponentsMetricsServiceCollectionExtensions.AddComponentsTracing(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.AspNetCore.Components.RestoreContext.InitialValue.get -> Microsoft.AspNetCore.Components.RestoreContext!
+static Microsoft.AspNetCore.Components.RestoreContext.LastSnapshot.get -> Microsoft.AspNetCore.Components.RestoreContext!
+static Microsoft.AspNetCore.Components.RestoreContext.ValueUpdate.get -> Microsoft.AspNetCore.Components.RestoreContext!
+virtual Microsoft.AspNetCore.Components.OwningComponentBase.DisposeAsyncCore() -> System.Threading.Tasks.ValueTask
+static Microsoft.AspNetCore.Components.Infrastructure.PersistentStateProviderServiceCollectionExtensions.AddSupplyValueFromPersistentComponentStateProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+virtual Microsoft.AspNetCore.Components.Rendering.ComponentState.GetComponentKey() -> object?
diff --git a/src/Components/Components/src/Reflection/ComponentProperties.cs b/src/Components/Components/src/Reflection/ComponentProperties.cs
index b9e3779c43a0..353576925963 100644
--- a/src/Components/Components/src/Reflection/ComponentProperties.cs
+++ b/src/Components/Components/src/Reflection/ComponentProperties.cs
@@ -5,12 +5,21 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNetCore.Components.HotReload;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.AspNetCore.Components.Reflection;
 
 internal static class ComponentProperties
 {
+    static ComponentProperties()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
     internal const BindingFlags BindablePropertyFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.IgnoreCase;
 
     // Right now it's not possible for a component to define a Parameter and a Cascading Parameter with
diff --git a/src/Components/Components/src/Reflection/PropertyGetter.cs b/src/Components/Components/src/Reflection/PropertyGetter.cs
new file mode 100644
index 000000000000..c458feda0af7
--- /dev/null
+++ b/src/Components/Components/src/Reflection/PropertyGetter.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.AspNetCore.Components.Reflection;
+
+internal sealed class PropertyGetter
+{
+    private static readonly MethodInfo CallPropertyGetterOpenGenericMethod =
+        typeof(PropertyGetter).GetMethod(nameof(CallPropertyGetter), BindingFlags.NonPublic | BindingFlags.Static)!;
+
+    private readonly Func<object, object?> _GetterDelegate;
+
+    public PropertyInfo PropertyInfo { get; }
+
+    [UnconditionalSuppressMessage(
+        "ReflectionAnalysis",
+        "IL2060:MakeGenericMethod",
+        Justification = "The referenced methods don't have any DynamicallyAccessedMembers annotations. See https://github.com/mono/linker/issues/1727")]
+    public PropertyGetter(Type targetType, PropertyInfo property)
+    {
+        PropertyInfo = property;
+
+        if (property.GetMethod == null)
+        {
+            throw new InvalidOperationException("Cannot provide a value for property " +
+                $"'{property.Name}' on type '{targetType.FullName}' because the property " +
+                "has no getter.");
+        }
+
+        if (RuntimeFeature.IsDynamicCodeSupported)
+        {
+            var getMethod = property.GetMethod;
+
+            var propertyGetterAsFunc =
+                getMethod.CreateDelegate(typeof(Func<,>).MakeGenericType(targetType, property.PropertyType));
+
+            var callPropertyGetterClosedGenericMethod =
+                CallPropertyGetterOpenGenericMethod.MakeGenericMethod(targetType, property.PropertyType);
+
+            _GetterDelegate = (Func<object, object>)
+                callPropertyGetterClosedGenericMethod.CreateDelegate(typeof(Func<object, object>), propertyGetterAsFunc);
+        }
+        else
+        {
+            _GetterDelegate = property.GetValue;
+        }
+    }
+
+    public object? GetValue(object target) => _GetterDelegate(target);
+
+    private static object? CallPropertyGetter<TTarget, TValue>(
+        Func<TTarget, TValue> Getter,
+        object target)
+        where TTarget : notnull
+    {
+        return (object?)Getter((TTarget)target);
+    }
+}
diff --git a/src/Components/Components/src/RegisterPersistentComponentStateServiceCollectionExtensions.cs b/src/Components/Components/src/RegisterPersistentComponentStateServiceCollectionExtensions.cs
new file mode 100644
index 000000000000..9e6d84edc4a0
--- /dev/null
+++ b/src/Components/Components/src/RegisterPersistentComponentStateServiceCollectionExtensions.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using static Microsoft.AspNetCore.Internal.LinkerFlags;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+/// <summary>
+/// Infrastructure APIs for registering services that persist state.
+/// </summary>
+public static class RegisterPersistentComponentStateServiceCollectionExtensions
+{
+    /// <summary>
+    /// Saves <typeparamref name="TService"/> state when the application is persisting state and restores it at the appropriate time automatically.
+    /// </summary>
+    /// <remarks>
+    /// Only public properties annotated with <see cref="PersistentStateAttribute"/> are persisted and restored.
+    /// </remarks>
+    /// <typeparam name="TService">The service type to register for persistence.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="componentRenderMode">The <see cref="IComponentRenderMode"/> to register the service for.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddPersistentServiceRegistration<[DynamicallyAccessedMembers(JsonSerialized)] TService>(
+        IServiceCollection services,
+        IComponentRenderMode componentRenderMode)
+    {
+        // This method does something very similar to what we do when we register root components, except in this case we are registering services.
+        // We collect a list of all the registrations on during static rendering mode and push those registrations to interactive mode.
+        // When the interactive mode starts, we retrieve the registry, and this triggers the process for restoring all the states for all the services.
+        // The process for retrieving the services is the same as we do for root components.
+        // We look for the assembly in the current list of loaded assemblies.
+        // We look for the type inside the assembly.
+        // We resolve the service from the DI container.
+        // We loop through the properties in the type and try to restore the properties that have PersistentState on them.
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IPersistentServiceRegistration>(new PersistentServiceRegistration<TService>(componentRenderMode)));
+        services.TryAddSingleton<RegisteredPersistentServiceRegistrationCollection>();
+
+        return services;
+    }
+}
diff --git a/src/Components/Components/src/RegisterRenderingMetricsServiceCollectionExtensions.cs b/src/Components/Components/src/RegisterRenderingMetricsServiceCollectionExtensions.cs
new file mode 100644
index 000000000000..e1e224e5f71b
--- /dev/null
+++ b/src/Components/Components/src/RegisterRenderingMetricsServiceCollectionExtensions.cs
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.Metrics;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+
+/// <summary>
+/// Infrastructure APIs for registering diagnostic metrics.
+/// </summary>
+public static class ComponentsMetricsServiceCollectionExtensions
+{
+    /// <summary>
+    /// Registers component rendering metrics
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddComponentsMetrics(
+        IServiceCollection services)
+    {
+        // do not register IConfigureOptions<StartupValidatorOptions> multiple times
+        if (!IsMeterFactoryRegistered(services))
+        {
+            services.AddMetrics();
+        }
+        services.TryAddSingleton<ComponentsMetrics>();
+
+        return services;
+    }
+
+    /// <summary>
+    /// Registers component rendering traces
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddComponentsTracing(
+        IServiceCollection services)
+    {
+        services.TryAddScoped<ComponentsActivitySource>();
+
+        return services;
+    }
+
+    private static bool IsMeterFactoryRegistered(IServiceCollection services)
+    {
+        foreach (var service in services)
+        {
+            if (service.ServiceType == typeof(IMeterFactory))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/Components/Components/src/RenderHandle.cs b/src/Components/Components/src/RenderHandle.cs
index 6ac2b7b3cdec..edcb644bddfb 100644
--- a/src/Components/Components/src/RenderHandle.cs
+++ b/src/Components/Components/src/RenderHandle.cs
@@ -21,6 +21,9 @@ internal RenderHandle(Renderer renderer, int componentId)
         _componentId = componentId;
     }
 
+    internal ComponentsMetrics? ComponentMetrics => _renderer?.ComponentMetrics;
+    internal ComponentsActivitySource? ComponentActivitySource => _renderer?.ComponentActivitySource;
+
     /// <summary>
     /// Gets the <see cref="Components.Dispatcher" /> associated with the component.
     /// </summary>
diff --git a/src/Components/Components/src/RenderTree/EventArgsTypeCache.cs b/src/Components/Components/src/RenderTree/EventArgsTypeCache.cs
index 1c3a795d9e25..5b9abafb0bed 100644
--- a/src/Components/Components/src/RenderTree/EventArgsTypeCache.cs
+++ b/src/Components/Components/src/RenderTree/EventArgsTypeCache.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Concurrent;
 using System.Reflection;
+using Microsoft.AspNetCore.Components.HotReload;
 
 namespace Microsoft.AspNetCore.Components.RenderTree;
 
@@ -10,6 +11,14 @@ internal static class EventArgsTypeCache
 {
     private static readonly ConcurrentDictionary<MethodInfo, Type> Cache = new ConcurrentDictionary<MethodInfo, Type>();
 
+    static EventArgsTypeCache()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += Cache.Clear;
+        }
+    }
+
     public static Type GetEventArgsType(MethodInfo methodInfo)
     {
         return Cache.GetOrAdd(methodInfo, methodInfo =>
diff --git a/src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs b/src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs
index a4c3ebbf2a6e..e61fb6d2d932 100644
--- a/src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs
+++ b/src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs
@@ -746,10 +746,50 @@ private static void AppendDiffEntriesForFramesWithSameSequence(
             // We don't handle attributes here, they have their own diff logic.
             // See AppendDiffEntriesForAttributeFrame
             default:
-                throw new NotImplementedException($"Encountered unsupported frame type during diffing: {newTree[newFrameIndex].FrameTypeField}");
+                throw new NotImplementedException(CreateDiffErrorMessage(ref diffContext, newFrameIndex));
         }
     }
 
+    private static string CreateDiffErrorMessage(ref DiffContext diffContext, int newFrameIndex)
+    {
+        var newTree = diffContext.NewTree;
+        var unsupportedFrameType = newTree[newFrameIndex].FrameTypeField;
+        
+        // Build component hierarchy path
+        var componentPath = BuildComponentPath(diffContext.Renderer, diffContext.ComponentId);
+        
+        // Build frame types descriptor
+        var frameTypesDescriptor = BuildFrameTypeDescriptor(newTree, newFrameIndex);
+        
+        return $"Encountered an unsupported frame type during diffing {unsupportedFrameType} for Component Path: '{componentPath}' on tree with length '{newTree.Length}' and contents '{frameTypesDescriptor}'.";
+    }
+
+    private static string BuildFrameTypeDescriptor(RenderTreeFrame[] renderTree, int frameIndex)
+    {
+        var frameTypes = new List<string>();
+        for (var i = 0; i <= frameIndex && i < renderTree.Length; i++)
+        {
+            frameTypes.Add(renderTree[i].FrameTypeField.ToString());
+        }
+        
+        return string.Join(", ", frameTypes);
+    }
+
+    private static string BuildComponentPath(Renderer renderer, int componentId)
+    {
+        var componentPath = new List<string>();
+        var currentComponentState = renderer.GetRequiredComponentState(componentId);
+        
+        while (currentComponentState is not null)
+        {
+            var componentType = currentComponentState.Component.GetType();
+            componentPath.Insert(0, componentType.Name);
+            currentComponentState = currentComponentState.ParentComponentState;
+        }
+        
+        return string.Join(" -> ", componentPath);
+    }
+
     // This should only be called for attributes that have the same name. This is an
     // invariant maintained by the callers.
     private static void AppendDiffEntriesForAttributeFrame(
diff --git a/src/Components/Components/src/RenderTree/Renderer.cs b/src/Components/Components/src/RenderTree/Renderer.cs
index e0fcfd834340..ad0864443da4 100644
--- a/src/Components/Components/src/RenderTree/Renderer.cs
+++ b/src/Components/Components/src/RenderTree/Renderer.cs
@@ -7,6 +7,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.AspNetCore.Components.HotReload;
+using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Reflection;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,6 +16,8 @@
 
 namespace Microsoft.AspNetCore.Components.RenderTree;
 
+using CategoryLink = Tuple<ActivityContext, KeyValuePair<string, object?>?>;
+
 /// <summary>
 /// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside
 /// of the Blazor framework. These types will change in a future release.
@@ -24,15 +27,22 @@ namespace Microsoft.AspNetCore.Components.RenderTree;
 // dispatching events to them, and notifying when the user interface is being updated.
 public abstract partial class Renderer : IDisposable, IAsyncDisposable
 {
+    internal static readonly Task CanceledRenderTask = Task.FromCanceled(new CancellationToken(canceled: true));
+
     private readonly object _lockObject = new();
     private readonly IServiceProvider _serviceProvider;
     private readonly Dictionary<int, ComponentState> _componentStateById = new Dictionary<int, ComponentState>();
     private readonly Dictionary<IComponent, ComponentState> _componentStateByComponent = new Dictionary<IComponent, ComponentState>();
     private readonly RenderBatchBuilder _batchBuilder = new RenderBatchBuilder();
-    private readonly Dictionary<ulong, (int RenderedByComponentId, EventCallback Callback)> _eventBindings = new();
+    private readonly Dictionary<ulong, (int RenderedByComponentId, EventCallback Callback, string? attributeName)> _eventBindings = new();
     private readonly Dictionary<ulong, ulong> _eventHandlerIdReplacements = new Dictionary<ulong, ulong>();
     private readonly ILogger _logger;
     private readonly ComponentFactory _componentFactory;
+    private readonly ComponentsMetrics? _componentsMetrics;
+    private readonly ComponentsActivitySource? _componentsActivitySource;
+    private readonly object _activityLinksStore = new Dictionary<string, CategoryLink>(StringComparer.OrdinalIgnoreCase);
+    internal object ActivityLinksStore => _activityLinksStore;
+
     private Dictionary<int, ParameterView>? _rootComponentsLatestParameters;
     private Task? _ongoingQuiescenceTask;
 
@@ -44,6 +54,7 @@ public abstract partial class Renderer : IDisposable, IAsyncDisposable
     private bool _rendererIsDisposed;
 
     private bool _hotReloadInitialized;
+    private HotReloadRenderHandler? _hotReloadRenderHandler;
 
     /// <summary>
     /// Allows the caller to handle exceptions from the SynchronizationContext when one is available.
@@ -89,12 +100,18 @@ public Renderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory,
         // logger name in here as a string literal.
         _logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Components.RenderTree.Renderer");
         _componentFactory = new ComponentFactory(componentActivator, this);
+        _componentsMetrics = serviceProvider.GetService<ComponentsMetrics>();
+        _componentsActivitySource = serviceProvider.GetService<ComponentsActivitySource>();
+        _componentsActivitySource?.Init(new ComponentsActivityLinkStore(this));
 
         ServiceProviderCascadingValueSuppliers = serviceProvider.GetService<ICascadingValueSupplier>() is null
             ? Array.Empty<ICascadingValueSupplier>()
             : serviceProvider.GetServices<ICascadingValueSupplier>().ToArray();
     }
 
+    internal ComponentsMetrics? ComponentMetrics => _componentsMetrics;
+    internal ComponentsActivitySource? ComponentActivitySource => _componentsActivitySource;
+
     internal ICascadingValueSupplier[] ServiceProviderCascadingValueSuppliers { get; }
 
     internal HotReloadManager HotReloadManager { get; set; } = HotReloadManager.Default;
@@ -215,7 +232,12 @@ protected internal int AssignRootComponentId(IComponent component)
             _hotReloadInitialized = true;
             if (HotReloadManager.MetadataUpdateSupported)
             {
-                HotReloadManager.OnDeltaApplied += RenderRootComponentsOnHotReload;
+                // Capture the current ExecutionContext so AsyncLocal values present during initial root component
+                // registration flow through to hot reload re-renders. Without this, hot reload callbacks execute
+                // on a thread without the original ambient context and AsyncLocal values appear null.
+                var executionContext = ExecutionContext.Capture();
+                _hotReloadRenderHandler = new HotReloadRenderHandler(this, executionContext);
+                HotReloadManager.OnDeltaApplied += _hotReloadRenderHandler.RerenderOnHotReload;
             }
         }
 
@@ -316,7 +338,7 @@ protected internal void RemoveRootComponent(int componentId)
     /// </summary>
     /// <param name="componentId">The root component ID.</param>
     /// <returns>The type of the component.</returns>
-    internal Type GetRootComponentType(int componentId)
+    internal Type GetRootTypeType(int componentId)
         => GetRequiredRootComponentState(componentId).Component.GetType();
 
     /// <summary>
@@ -371,12 +393,16 @@ private ComponentState AttachAndInitComponent(IComponent component, int parentCo
         var parentComponentState = GetOptionalComponentState(parentComponentId);
         var componentState = CreateComponentState(componentId, component, parentComponentState);
         Log.InitializingComponent(_logger, componentState, parentComponentState);
-        _componentStateById.Add(componentId, componentState);
-        _componentStateByComponent.Add(component, componentState);
         component.Attach(new RenderHandle(this, componentId));
         return componentState;
     }
 
+    internal void RegisterComponentState(IComponent component, int componentId, ComponentState componentState)
+    {
+        _componentStateById.Add(componentId, componentState);
+        _componentStateByComponent.Add(component, componentState);
+    }
+
     /// <summary>
     /// Creates a <see cref="ComponentState"/> instance to track state associated with a newly-instantiated component.
     /// This is called before the component is initialized and tracked within the <see cref="Renderer"/>. Subclasses
@@ -431,7 +457,20 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo? fie
             _pendingTasks ??= new();
         }
 
-        var (renderedByComponentId, callback) = GetRequiredEventBindingEntry(eventHandlerId);
+        var (renderedByComponentId, callback, attributeName) = GetRequiredEventBindingEntry(eventHandlerId);
+
+        // collect trace
+        ComponentsActivityHandle activityHandle = default;
+        string receiverName = null;
+        string methodName = null;
+        if (ComponentActivitySource != null)
+        {
+            receiverName ??= (callback.Receiver?.GetType() ?? callback.Delegate.Target?.GetType())?.FullName;
+            methodName ??= callback.Delegate.Method?.Name;
+            activityHandle = ComponentsActivitySource.StartHandleEventActivity(receiverName, methodName, attributeName);
+        }
+
+        var eventStartTimestamp = ComponentMetrics != null && ComponentMetrics.IsEventEnabled ? Stopwatch.GetTimestamp() : 0;
 
         // If this event attribute was rendered by a component that's since been disposed, don't dispatch the event at all.
         // This can occur because event handler disposal is deferred, so event handler IDs can outlive their components.
@@ -473,9 +512,35 @@ public virtual Task DispatchEventAsync(ulong eventHandlerId, EventFieldInfo? fie
             _isBatchInProgress = true;
 
             task = callback.InvokeAsync(eventArgs);
+
+            // collect metrics
+            if (ComponentMetrics != null && ComponentMetrics.IsEventEnabled)
+            {
+                receiverName ??= (callback.Receiver?.GetType() ?? callback.Delegate.Target?.GetType())?.FullName;
+                methodName ??= callback.Delegate.Method?.Name;
+                _ = ComponentMetrics.CaptureEventDuration(task, eventStartTimestamp, receiverName, methodName, attributeName);
+            }
+
+            // stop activity/trace
+            if (ComponentActivitySource != null && activityHandle.Activity != null)
+            {
+                _ = ComponentActivitySource.CaptureHandleEventStopAsync(task, activityHandle);
+            }
         }
         catch (Exception e)
         {
+            if (ComponentMetrics != null && ComponentMetrics.IsEventEnabled)
+            {
+                receiverName ??= (callback.Receiver?.GetType() ?? callback.Delegate.Target?.GetType())?.FullName;
+                methodName ??= callback.Delegate.Method?.Name;
+                ComponentMetrics.FailEventSync(e, eventStartTimestamp, receiverName, methodName, attributeName);
+            }
+
+            if (ComponentActivitySource != null && activityHandle.Activity != null)
+            {
+                ComponentActivitySource.StopHandleEventActivity(activityHandle, e);
+            }
+
             HandleExceptionViaErrorBoundary(e, receiverComponentState);
             return Task.CompletedTask;
         }
@@ -627,7 +692,7 @@ internal void AssignEventHandlerId(int renderedByComponentId, ref RenderTreeFram
             //
             // When that happens we intentionally box the EventCallback because we need to hold on to
             // the receiver.
-            _eventBindings.Add(id, (renderedByComponentId, callback));
+            _eventBindings.Add(id, (renderedByComponentId, callback, frame.AttributeName));
         }
         else if (frame.AttributeValueField is MulticastDelegate @delegate)
         {
@@ -635,7 +700,7 @@ internal void AssignEventHandlerId(int renderedByComponentId, ref RenderTreeFram
             // is the same as delegate.Target. In this case since the receiver is implicit we can
             // avoid boxing the EventCallback object and just re-hydrate it on the other side of the
             // render tree.
-            _eventBindings.Add(id, (renderedByComponentId, new EventCallback(@delegate.Target as IHandleEvent, @delegate)));
+            _eventBindings.Add(id, (renderedByComponentId, new EventCallback(@delegate.Target as IHandleEvent, @delegate), frame.AttributeName));
         }
 
         // NOTE: we do not to handle EventCallback<T> here. EventCallback<T> is only used when passing
@@ -679,7 +744,7 @@ internal void TrackReplacedEventHandlerId(ulong oldEventHandlerId, ulong newEven
         _eventHandlerIdReplacements.Add(oldEventHandlerId, newEventHandlerId);
     }
 
-    private (int RenderedByComponentId, EventCallback Callback) GetRequiredEventBindingEntry(ulong eventHandlerId)
+    private (int RenderedByComponentId, EventCallback Callback, string? attributeName) GetRequiredEventBindingEntry(ulong eventHandlerId)
     {
         if (!_eventBindings.TryGetValue(eventHandlerId, out var entry))
         {
@@ -699,7 +764,7 @@ private ulong FindLatestEventHandlerIdInChain(ulong eventHandlerId)
         return eventHandlerId;
     }
 
-    private ComponentState GetRequiredComponentState(int componentId)
+    internal ComponentState GetRequiredComponentState(int componentId)
         => _componentStateById.TryGetValue(componentId, out var componentState)
             ? componentState
             : throw new ArgumentException($"The renderer does not have a component with ID {componentId}.");
@@ -745,6 +810,7 @@ private void ProcessRenderQueue()
 
         _isBatchInProgress = true;
         var updateDisplayTask = Task.CompletedTask;
+        var batchStartTimestamp = ComponentMetrics != null && ComponentMetrics.IsBatchEnabled ? Stopwatch.GetTimestamp() : 0;
 
         try
         {
@@ -776,9 +842,19 @@ private void ProcessRenderQueue()
             // Fire off the execution of OnAfterRenderAsync, but don't wait for it
             // if there is async work to be done.
             _ = InvokeRenderCompletedCalls(batch.UpdatedComponents, updateDisplayTask);
+
+            if (ComponentMetrics != null && ComponentMetrics.IsBatchEnabled)
+            {
+                _ = ComponentMetrics.CaptureBatchDuration(updateDisplayTask, batchStartTimestamp, batch.UpdatedComponents.Count);
+            }
         }
         catch (Exception e)
         {
+            if (ComponentMetrics != null && ComponentMetrics.IsBatchEnabled)
+            {
+                ComponentMetrics.FailBatchSync(e, batchStartTimestamp);
+            }
+
             // Ensure we catch errors while running the render functions of the components.
             HandleException(e);
             return;
@@ -922,6 +998,7 @@ private void RenderInExistingBatch(RenderQueueEntry renderQueueEntry)
     {
         var componentState = renderQueueEntry.ComponentState;
         Log.RenderingComponent(_logger, componentState);
+
         componentState.RenderIntoBatch(_batchBuilder, renderQueueEntry.RenderFragment, out var renderFragmentException);
         if (renderFragmentException != null)
         {
@@ -1126,9 +1203,9 @@ private void HandleExceptionViaErrorBoundary(Exception error, ComponentState? er
     /// <param name="disposing"><see langword="true"/> if this method is being invoked by <see cref="IDisposable.Dispose"/>, otherwise <see langword="false"/>.</param>
     protected virtual void Dispose(bool disposing)
     {
-        // Unlike other Renderer APIs, we need Dispose to be thread-safe 
-        // (and not require being called only from the sync context) 
-        // because other classes many need to dispose a Renderer during their own Dispose (rather than DisposeAsync) 
+        // Unlike other Renderer APIs, we need Dispose to be thread-safe
+        // (and not require being called only from the sync context)
+        // because other classes many need to dispose a Renderer during their own Dispose (rather than DisposeAsync)
         // and we don't want to force that other code to deal with calling InvokeAsync from a synchronous method.
         lock (_lockObject)
         {
@@ -1163,9 +1240,9 @@ protected virtual void Dispose(bool disposing)
             _rendererIsDisposed = true;
         }
 
-        if (_hotReloadInitialized && HotReloadManager.MetadataUpdateSupported)
+        if (_hotReloadInitialized && HotReloadManager.MetadataUpdateSupported && _hotReloadRenderHandler is not null)
         {
-            HotReloadManager.OnDeltaApplied -= RenderRootComponentsOnHotReload;
+            HotReloadManager.OnDeltaApplied -= _hotReloadRenderHandler.RerenderOnHotReload;
         }
 
         // It's important that we handle all exceptions here before reporting any of them.
@@ -1300,4 +1377,19 @@ public async ValueTask DisposeAsync()
             }
         }
     }
+
+    private sealed class HotReloadRenderHandler(Renderer renderer, ExecutionContext? executionContext)
+    {
+        public void RerenderOnHotReload()
+        {
+            if (executionContext is null)
+            {
+                renderer.RenderRootComponentsOnHotReload();
+            }
+            else
+            {
+                ExecutionContext.Run(executionContext, static s => ((Renderer)s!).RenderRootComponentsOnHotReload(), renderer);
+            }
+        }
+    }
 }
diff --git a/src/Components/Components/src/RenderTree/RendererInfo.cs b/src/Components/Components/src/RenderTree/RendererInfo.cs
index 9c401b5ce006..7f006550acb8 100644
--- a/src/Components/Components/src/RenderTree/RendererInfo.cs
+++ b/src/Components/Components/src/RenderTree/RendererInfo.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+
 namespace Microsoft.AspNetCore.Components;
 
 /// <summary>
@@ -8,6 +10,7 @@ namespace Microsoft.AspNetCore.Components;
 /// </summary>
 /// <param name="rendererName">The name of the platform.</param>
 /// <param name="isInteractive">A flag to indicate if the platform is interactive.</param>
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 public sealed class RendererInfo(string rendererName, bool isInteractive)
 {
     /// <summary>
@@ -19,4 +22,6 @@ public sealed class RendererInfo(string rendererName, bool isInteractive)
     /// Gets a flag to indicate if the platform is interactive.
     /// </summary>
     public bool IsInteractive { get; } = isInteractive;
+
+    private string GetDebuggerDisplay() => $"Name: {Name}, Interactive: {IsInteractive}";
 }
diff --git a/src/Components/Components/src/Rendering/ComponentState.cs b/src/Components/Components/src/Rendering/ComponentState.cs
index 4d973398f639..d1b42a80b153 100644
--- a/src/Components/Components/src/Rendering/ComponentState.cs
+++ b/src/Components/Components/src/Rendering/ComponentState.cs
@@ -23,6 +23,7 @@ public class ComponentState : IAsyncDisposable
     private RenderTreeBuilder _nextRenderTree;
     private ArrayBuilder<RenderTreeFrame>? _latestDirectParametersSnapshot; // Lazily instantiated
     private bool _componentWasDisposed;
+    private readonly string? _componentTypeName;
 
     /// <summary>
     /// Constructs an instance of <see cref="ComponentState"/>.
@@ -44,11 +45,18 @@ public ComponentState(Renderer renderer, int componentId, IComponent component,
         CurrentRenderTree = new RenderTreeBuilder();
         _nextRenderTree = new RenderTreeBuilder();
 
+        _renderer.RegisterComponentState(component, ComponentId, this);
+
         if (_cascadingParameters.Count != 0)
         {
             _hasCascadingParameters = true;
             _hasAnyCascadingParameterSubscriptions = AddCascadingParameterSubscriptions();
         }
+
+        if (_renderer.ComponentMetrics != null && _renderer.ComponentMetrics.IsParametersEnabled)
+        {
+            _componentTypeName = component.GetType().FullName;
+        }
     }
 
     private static ComponentState? GetSectionOutletLogicalParent(Renderer renderer, SectionOutlet sectionOutlet)
@@ -85,7 +93,12 @@ public ComponentState(Renderer renderer, int componentId, IComponent component,
 
     internal RenderTreeBuilder CurrentRenderTree { get; set; }
 
-    internal Renderer Renderer => _renderer;
+    /// <summary>
+    /// Gets the <see cref="Renderer"/> instance used to render the output.
+    /// </summary>
+    /// <remarks>The <see cref="Renderer"/> instance is accessible to derived classes and classes within the
+    /// same assembly. It provides rendering functionality that may be used for custom rendering logic.</remarks>
+    protected internal Renderer Renderer => _renderer;
 
     internal void RenderIntoBatch(RenderBatchBuilder batchBuilder, RenderFragment renderFragment, out Exception? renderFragmentException)
     {
@@ -229,14 +242,27 @@ internal void NotifyCascadingValueChanged(in ParameterViewLifetime lifetime)
     // a consistent set to the recipient.
     private void SupplyCombinedParameters(ParameterView directAndCascadingParameters)
     {
-        // Normalise sync and async exceptions into a Task
+        var parametersStartTimestamp = _renderer.ComponentMetrics != null && _renderer.ComponentMetrics.IsParametersEnabled ? Stopwatch.GetTimestamp() : 0;
+
+        // Normalize sync and async exceptions into a Task
         Task setParametersAsyncTask;
         try
         {
             setParametersAsyncTask = Component.SetParametersAsync(directAndCascadingParameters);
+
+            // collect metrics
+            if (_renderer.ComponentMetrics != null && _renderer.ComponentMetrics.IsParametersEnabled)
+            {
+                _ = _renderer.ComponentMetrics.CaptureParametersDuration(setParametersAsyncTask, parametersStartTimestamp, _componentTypeName);
+            }
         }
         catch (Exception ex)
         {
+            if (_renderer.ComponentMetrics != null && _renderer.ComponentMetrics.IsParametersEnabled)
+            {
+                _renderer.ComponentMetrics.FailParametersSync(ex, parametersStartTimestamp, _componentTypeName);
+            }
+
             setParametersAsyncTask = Task.FromException(ex);
         }
 
@@ -318,6 +344,39 @@ internal ValueTask DisposeInBatchAsync(RenderBatchBuilder batchBuilder)
         return DisposeAsync();
     }
 
+    /// <summary>
+    /// Gets the component key for this component instance.
+    /// This is used for state persistence and component identification across render modes.
+    /// </summary>
+    /// <returns>The component key, or null if no key is available.</returns>
+    protected internal virtual object? GetComponentKey()
+    {
+        if (ParentComponentState is not { } parentComponentState)
+        {
+            return null;
+        }
+
+        // Check if the parentComponentState has a `@key` directive applied to the current component.
+        var frames = parentComponentState.CurrentRenderTree.GetFrames();
+        for (var i = 0; i < frames.Count; i++)
+        {
+            ref var currentFrame = ref frames.Array[i];
+
+            Debug.Assert(currentFrame.FrameType != RenderTreeFrameType.Component || currentFrame.Component != null, "GetComponentKey is being invoked too soon, ComponentState is not fully constructed.");
+
+            if (currentFrame.FrameType != RenderTreeFrameType.Component ||
+                !ReferenceEquals(Component, currentFrame.Component))
+            {
+                // Skip any frame that is not the current component.
+                continue;
+            }
+
+            return currentFrame.ComponentKey;
+        }
+
+        return null;
+    }
+
     private string GetDebuggerDisplay()
     {
         return $"ComponentId = {ComponentId}, Type = {Component.GetType().Name}, Disposed = {_componentWasDisposed}";
diff --git a/src/Components/Components/src/ResourceAsset.cs b/src/Components/Components/src/ResourceAsset.cs
index 3bd98d5e6e60..4336f66c85bd 100644
--- a/src/Components/Components/src/ResourceAsset.cs
+++ b/src/Components/Components/src/ResourceAsset.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Components;
 /// <param name="url">The URL of the resource.</param>
 /// <param name="properties">The properties associated to this resource.</param>
 [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
-public sealed class ResourceAsset(string url, IReadOnlyList<ResourceAssetProperty>? properties)
+public sealed class ResourceAsset(string url, IReadOnlyList<ResourceAssetProperty>? properties = null)
 {
     /// <summary>
     /// Gets the URL that identifies this resource.
diff --git a/src/Components/Components/src/RouteAttribute.cs b/src/Components/Components/src/RouteAttribute.cs
index 58d3c2500dc9..b258ed7ae1b5 100644
--- a/src/Components/Components/src/RouteAttribute.cs
+++ b/src/Components/Components/src/RouteAttribute.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace Microsoft.AspNetCore.Components;
 
 /// <summary>
@@ -13,7 +15,7 @@ public sealed class RouteAttribute : Attribute
     /// Constructs an instance of <see cref="RouteAttribute"/>.
     /// </summary>
     /// <param name="template">The route template.</param>
-    public RouteAttribute(string template)
+    public RouteAttribute([StringSyntax("Route")] string template)
     {
         ArgumentNullException.ThrowIfNull(template);
 
diff --git a/src/Components/Components/src/RouteView.cs b/src/Components/Components/src/RouteView.cs
index e5c0a5e2916c..36560a2aa342 100644
--- a/src/Components/Components/src/RouteView.cs
+++ b/src/Components/Components/src/RouteView.cs
@@ -28,9 +28,6 @@ static RouteView()
         }
     }
 
-    [Inject]
-    private NavigationManager NavigationManager { get; set; }
-
     /// <summary>
     /// Gets or sets the route data. This determines the page that will be
     /// displayed and the parameter values that will be supplied to the page.
@@ -71,6 +68,7 @@ public Task SetParametersAsync(ParameterView parameters)
     /// Renders the component.
     /// </summary>
     /// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
+    [UnconditionalSuppressMessage("Trimming", "IL2110", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
     [UnconditionalSuppressMessage("Trimming", "IL2111", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
     [UnconditionalSuppressMessage("Trimming", "IL2118", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
     protected virtual void Render(RenderTreeBuilder builder)
diff --git a/src/Components/Components/src/Routing/IHostEnvironmentNavigationManager.cs b/src/Components/Components/src/Routing/IHostEnvironmentNavigationManager.cs
index cbe9274f9792..c1488a9b7bc3 100644
--- a/src/Components/Components/src/Routing/IHostEnvironmentNavigationManager.cs
+++ b/src/Components/Components/src/Routing/IHostEnvironmentNavigationManager.cs
@@ -15,4 +15,13 @@ public interface IHostEnvironmentNavigationManager
     /// <param name="baseUri">The base URI.</param>
     /// <param name="uri">The absolute URI.</param>
     void Initialize(string baseUri, string uri);
+
+    /// <summary>
+    /// Initializes the <see cref="NavigationManager" />.
+    /// </summary>
+    /// <param name="baseUri">The base URI.</param>
+    /// <param name="uri">The absolute URI.</param>
+    /// <param name="onNavigateTo">A delegate that points to a method handling navigation events. </param>
+    void Initialize(string baseUri, string uri, Func<string, Task> onNavigateTo) =>
+        Initialize(baseUri, uri);
 }
diff --git a/src/Components/Components/src/Routing/NotFoundEventArgs.cs b/src/Components/Components/src/Routing/NotFoundEventArgs.cs
new file mode 100644
index 000000000000..438d2d316dff
--- /dev/null
+++ b/src/Components/Components/src/Routing/NotFoundEventArgs.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Routing;
+
+/// <summary>
+/// <see cref="EventArgs" /> for <see cref="NavigationManager.OnNotFound" />.
+/// </summary>
+public sealed class NotFoundEventArgs : EventArgs
+{
+    /// <summary>
+    /// Gets the path of NotFoundPage. If the path is set, it indicates that a subscriber has handled the rendering of the NotFound contents.
+    /// </summary>
+    public string? Path { get; set; }
+}
diff --git a/src/Components/Components/src/Routing/RouteTable.cs b/src/Components/Components/src/Routing/RouteTable.cs
index 2d4c9335cc87..f56beec826b9 100644
--- a/src/Components/Components/src/Routing/RouteTable.cs
+++ b/src/Components/Components/src/Routing/RouteTable.cs
@@ -4,6 +4,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Routing.Tree;
 
 namespace Microsoft.AspNetCore.Components.Routing;
@@ -13,6 +14,14 @@ internal sealed class RouteTable(TreeRouter treeRouter)
     private readonly TreeRouter _router = treeRouter;
     private static readonly ConcurrentDictionary<(Type, string), InboundRouteEntry> _routeEntryCache = new();
 
+    static RouteTable()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += _routeEntryCache.Clear;
+        }
+    }
+
     public TreeRouter? TreeRouter => _router;
 
     [UnconditionalSuppressMessage(
diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs
index 934a41613096..ecb69fe2cf63 100644
--- a/src/Components/Components/src/Routing/Router.cs
+++ b/src/Components/Components/src/Routing/Router.cs
@@ -3,13 +3,15 @@
 
 #nullable disable warnings
 
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Reflection.Metadata;
 using System.Runtime.ExceptionServices;
 using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Components.Routing;
 
@@ -27,6 +29,7 @@ static readonly IReadOnlyDictionary<string, object> _emptyParametersDictionary
     string _locationAbsolute;
     bool _navigationInterceptionEnabled;
     ILogger<Router> _logger;
+    string _notFoundPageRoute;
 
     private string _updateScrollPositionForHashLastLocation;
     private bool _updateScrollPositionForHash;
@@ -68,8 +71,16 @@ static readonly IReadOnlyDictionary<string, object> _emptyParametersDictionary
     /// Gets or sets the content to display when no match is found for the requested route.
     /// </summary>
     [Parameter]
+    [Obsolete("NotFound is deprecated. Use NotFoundPage instead.")]
     public RenderFragment NotFound { get; set; }
 
+    /// <summary>
+    /// Gets or sets the page content to display when no match is found for the requested route.
+    /// </summary>
+    [Parameter]
+    [DynamicallyAccessedMembers(LinkerFlags.Component)]
+    public Type? NotFoundPage { get; set; }
+
     /// <summary>
     /// Gets or sets the content to display when a match is found for the requested route.
     /// </summary>
@@ -92,7 +103,7 @@ static readonly IReadOnlyDictionary<string, object> _emptyParametersDictionary
     /// over wildcards.
     /// <para>This property is obsolete and configuring it does nothing.</para>
     /// </summary>
-    [Obsolete("This property is obsolete and configuring it has not effect.")]
+    [Obsolete("This property is obsolete and configuring it has no effect.")]
     [Parameter] public bool PreferExactMatches { get; set; }
 
     private RouteTable Routes { get; set; }
@@ -105,6 +116,7 @@ public void Attach(RenderHandle renderHandle)
         _baseUri = NavigationManager.BaseUri;
         _locationAbsolute = NavigationManager.Uri;
         NavigationManager.LocationChanged += OnLocationChanged;
+        NavigationManager.OnNotFound += OnNotFound;
         RoutingStateProvider = ServiceProvider.GetService<IRoutingStateProvider>();
 
         if (HotReloadManager.Default.MetadataUpdateSupported)
@@ -131,6 +143,34 @@ public async Task SetParametersAsync(ParameterView parameters)
             throw new InvalidOperationException($"The {nameof(Router)} component requires a value for the parameter {nameof(Found)}.");
         }
 
+        if (NotFoundPage != null)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            if (NotFound != null)
+            {
+                throw new InvalidOperationException($"Setting {nameof(NotFound)} and {nameof(NotFoundPage)} properties simultaneously is not supported. Use either {nameof(NotFound)} or {nameof(NotFoundPage)}.");
+            }
+#pragma warning restore CS0618 // Type or member is obsolete
+            if (!typeof(IComponent).IsAssignableFrom(NotFoundPage))
+            {
+                throw new InvalidOperationException($"The type {NotFoundPage.FullName} " +
+                    $"does not implement {typeof(IComponent).FullName}.");
+            }
+
+            var routeAttributes = NotFoundPage.GetCustomAttributes(typeof(RouteAttribute), inherit: true);
+            if (routeAttributes.Length == 0)
+            {
+                throw new InvalidOperationException($"The type {NotFoundPage.FullName} " +
+                    $"does not have a {typeof(RouteAttribute).FullName} applied to it.");
+            }
+
+            var routeAttribute = (RouteAttribute)routeAttributes[0];
+            if (routeAttribute.Template != null)
+            {
+                _notFoundPageRoute = routeAttribute.Template;
+            }
+        }
+
         if (!_onNavigateCalled)
         {
             _onNavigateCalled = true;
@@ -146,6 +186,7 @@ public async Task SetParametersAsync(ParameterView parameters)
     public void Dispose()
     {
         NavigationManager.LocationChanged -= OnLocationChanged;
+        NavigationManager.OnNotFound -= OnNotFound;
         if (HotReloadManager.Default.MetadataUpdateSupported)
         {
             HotReloadManager.Default.OnDeltaApplied -= ClearRouteCaches;
@@ -195,10 +236,13 @@ internal virtual void Refresh(bool isNavigationIntercepted)
         var relativePath = NavigationManager.ToBaseRelativePath(_locationAbsolute.AsSpan());
         var locationPathSpan = TrimQueryOrHash(relativePath);
         var locationPath = $"/{locationPathSpan}";
+        ComponentsActivityHandle activityHandle;
 
         // In order to avoid routing twice we check for RouteData
         if (RoutingStateProvider?.RouteData is { } endpointRouteData)
         {
+            activityHandle = RecordDiagnostics(endpointRouteData.PageType.FullName, endpointRouteData.Template);
+
             // Other routers shouldn't provide RouteData, this is specific to our router component
             // and must abide by our syntax and behaviors.
             // Other routers must create their own abstractions to flow data from their SSR routing
@@ -209,6 +253,8 @@ internal virtual void Refresh(bool isNavigationIntercepted)
             // - Convert constrained parameters with (int, double, etc) to the target type.
             endpointRouteData = RouteTable.ProcessParameters(endpointRouteData);
             _renderHandle.Render(Found(endpointRouteData));
+
+            _renderHandle.ComponentActivitySource?.StopNavigateActivity(activityHandle, null);
             return;
         }
 
@@ -225,6 +271,8 @@ internal virtual void Refresh(bool isNavigationIntercepted)
                     $"does not implement {typeof(IComponent).FullName}.");
             }
 
+            activityHandle = RecordDiagnostics(context.Handler.FullName, context.Entry.RoutePattern.RawText);
+
             Log.NavigatingToComponent(_logger, context.Handler, locationPath, _baseUri);
 
             var routeData = new RouteData(
@@ -244,19 +292,40 @@ internal virtual void Refresh(bool isNavigationIntercepted)
         {
             if (!isNavigationIntercepted)
             {
+                activityHandle = RecordDiagnostics("NotFound", "NotFound");
+
                 Log.DisplayingNotFound(_logger, locationPath, _baseUri);
 
                 // We did not find a Component that matches the route.
                 // Only show the NotFound content if the application developer programatically got us here i.e we did not
                 // intercept the navigation. In all other cases, force a browser navigation since this could be non-Blazor content.
-                _renderHandle.Render(NotFound ?? DefaultNotFoundContent);
+                RenderNotFound();
             }
             else
             {
+                activityHandle = RecordDiagnostics("External", "External");
+
                 Log.NavigatingToExternalUri(_logger, _locationAbsolute, locationPath, _baseUri);
                 NavigationManager.NavigateTo(_locationAbsolute, forceLoad: true);
             }
         }
+        _renderHandle.ComponentActivitySource?.StopNavigateActivity(activityHandle, null);
+    }
+
+    private ComponentsActivityHandle RecordDiagnostics(string componentType, string template)
+    {
+        ComponentsActivityHandle activityHandle = default;
+        if (_renderHandle.ComponentActivitySource != null)
+        {
+            activityHandle = _renderHandle.ComponentActivitySource.StartNavigateActivity(componentType, template);
+        }
+
+        if (_renderHandle.ComponentMetrics != null && _renderHandle.ComponentMetrics.IsNavigationEnabled)
+        {
+            _renderHandle.ComponentMetrics.Navigation(componentType, template);
+        }
+
+        return activityHandle;
     }
 
     private static void DefaultNotFoundContent(RenderTreeBuilder builder)
@@ -320,6 +389,83 @@ private void OnLocationChanged(object sender, LocationChangedEventArgs args)
         }
     }
 
+    private void OnNotFound(object sender, NotFoundEventArgs args)
+    {
+        bool renderContentIsProvided = NotFoundPage != null || args.Path != null;
+        if (_renderHandle.IsInitialized && renderContentIsProvided)
+        {
+            if (!string.IsNullOrEmpty(args.Path))
+            {
+                // The path can be set by a subscriber not defined in blazor framework.
+                _renderHandle.Render(builder => RenderComponentByRoute(builder, args.Path));
+            }
+            else
+            {
+                // Having the path set signals to the endpoint renderer that router handled rendering.
+                args.Path = _notFoundPageRoute;
+                RenderNotFound();
+            }
+            Log.DisplayingNotFound(_logger, args.Path);
+        }
+    }
+
+    internal void RenderComponentByRoute(RenderTreeBuilder builder, string route)
+    {
+        var componentType = FindComponentTypeByRoute(route);
+
+        if (componentType is null)
+        {
+            throw new InvalidOperationException($"No component found for route '{route}'. " +
+                $"Ensure the route matches a component with a [Route] attribute.");
+        }
+
+        builder.OpenComponent<RouteView>(0);
+        builder.AddAttribute(1, nameof(RouteView.RouteData),
+            new RouteData(componentType, new Dictionary<string, object>()));
+        builder.CloseComponent();
+    }
+
+    [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+    internal Type? FindComponentTypeByRoute(string route)
+    {
+        RefreshRouteTable();
+        var normalizedRoute = route.StartsWith('/') ? route : $"/{route}";
+
+        var context = new RouteContext(normalizedRoute);
+        Routes.Route(context);
+
+        if (context.Handler is not null && typeof(IComponent).IsAssignableFrom(context.Handler))
+        {
+            return context.Handler;
+        }
+
+        return null;
+    }
+
+    private void RenderNotFound()
+    {
+        _renderHandle.Render(builder =>
+        {
+            if (NotFoundPage != null)
+            {
+                builder.OpenComponent<RouteView>(0);
+                builder.AddAttribute(1, nameof(RouteView.RouteData),
+                    new RouteData(NotFoundPage, _emptyParametersDictionary));
+                builder.CloseComponent();
+            }
+#pragma warning disable CS0618 // Type or member is obsolete
+            else if (NotFound != null)
+            {
+                NotFound(builder);
+            }
+#pragma warning restore CS0618 // Type or member is obsolete
+            else
+            {
+                DefaultNotFoundContent(builder);
+            }
+        });
+    }
+
     async Task IHandleAfterRender.OnAfterRenderAsync()
     {
         if (!_navigationInterceptionEnabled)
@@ -337,6 +483,7 @@ async Task IHandleAfterRender.OnAfterRenderAsync()
 
     private static partial class Log
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         [LoggerMessage(1, LogLevel.Debug, $"Displaying {nameof(NotFound)} because path '{{Path}}' with base URI '{{BaseUri}}' does not match any component route", EventName = "DisplayingNotFound")]
         internal static partial void DisplayingNotFound(ILogger logger, string path, string baseUri);
 
@@ -345,5 +492,9 @@ private static partial class Log
 
         [LoggerMessage(3, LogLevel.Debug, "Navigating to non-component URI '{ExternalUri}' in response to path '{Path}' with base URI '{BaseUri}'", EventName = "NavigatingToExternalUri")]
         internal static partial void NavigatingToExternalUri(ILogger logger, string externalUri, string path, string baseUri);
+
+        [LoggerMessage(4, LogLevel.Debug, $"Displaying contents of {{displayedContentPath}} on request", EventName = "DisplayingNotFoundOnRequest")]
+        internal static partial void DisplayingNotFound(ILogger logger, string displayedContentPath);
+#pragma warning restore CS0618 // Type or member is obsolete
     }
 }
diff --git a/src/Components/Components/src/Routing/SupplyParameterFromQueryValueProvider.cs b/src/Components/Components/src/Routing/SupplyParameterFromQueryValueProvider.cs
index 12422f013246..9e1968a48c3b 100644
--- a/src/Components/Components/src/Routing/SupplyParameterFromQueryValueProvider.cs
+++ b/src/Components/Components/src/Routing/SupplyParameterFromQueryValueProvider.cs
@@ -23,7 +23,7 @@ internal sealed class SupplyParameterFromQueryValueProvider(NavigationManager na
     public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
         => parameterInfo.Attribute is SupplyParameterFromQueryAttribute;
 
-    public object? GetCurrentValue(in CascadingParameterInfo parameterInfo)
+    public object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
     {
         TryUpdateUri();
 
diff --git a/src/Components/Components/test/CascadingParameterStateTest.cs b/src/Components/Components/test/CascadingParameterStateTest.cs
index e055b9c70801..42e361bf7ae0 100644
--- a/src/Components/Components/test/CascadingParameterStateTest.cs
+++ b/src/Components/Components/test/CascadingParameterStateTest.cs
@@ -352,7 +352,7 @@ public void FindCascadingParameters_CanOverrideNonNullValueWithNull()
             {
                 Assert.Equal(nameof(ComponentWithCascadingParams.CascadingParam1), match.ParameterInfo.PropertyName);
                 Assert.Same(states[1].Component, match.ValueSupplier);
-                Assert.Null(match.ValueSupplier.GetCurrentValue(match.ParameterInfo));
+                Assert.Null(match.ValueSupplier.GetCurrentValue(null, match.ParameterInfo));
             });
     }
 
@@ -486,7 +486,7 @@ class SupplyParameterWithSingleDeliveryComponent(bool isFixed) : ComponentBase,
         public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
             => parameterInfo.Attribute is SupplyParameterWithSingleDeliveryAttribute;
 
-        public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
+        public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
             => throw new NotImplementedException();
 
         public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
diff --git a/src/Components/Components/test/CascadingParameterTest.cs b/src/Components/Components/test/CascadingParameterTest.cs
index 411ed14a5e07..a083b43091d6 100644
--- a/src/Components/Components/test/CascadingParameterTest.cs
+++ b/src/Components/Components/test/CascadingParameterTest.cs
@@ -885,7 +885,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
             => parameterInfo.Attribute is SingleDeliveryCascadingParameterAttribute;
 
-        public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
+        public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
             => new SingleDeliveryValue(Text);
 
         public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
@@ -1053,7 +1053,7 @@ bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterI
             return true;
         }
 
-        object ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo cascadingParameterState)
+        object ICascadingValueSupplier.GetCurrentValue(object key, in CascadingParameterInfo cascadingParameterState)
         {
             return Value;
         }
diff --git a/src/Components/Components/test/ComponentBaseTest.cs b/src/Components/Components/test/ComponentBaseTest.cs
index b8a928a0ec41..c525dfccc1ac 100644
--- a/src/Components/Components/test/ComponentBaseTest.cs
+++ b/src/Components/Components/test/ComponentBaseTest.cs
@@ -372,6 +372,126 @@ public async Task DoesNotRenderAfterOnInitAsyncTaskIsCancelledUsingCancellationT
         Assert.NotEmpty(renderer.Batches);
     }
 
+    [Fact]
+    public async Task ErrorBoundaryHandlesOnInitializedAsyncReturnFaultedTask()
+    {
+        // Arrange
+        var renderer = new TestRenderer();
+        TestErrorBoundary capturedBoundary = null;
+
+        // Create root component that wraps the TestComponentErrorBuildRenderTree in an TestErrorBoundary
+        var rootComponent = new TestComponent();
+        rootComponent.ChildContent = builder =>
+        {
+            builder.OpenComponent<TestErrorBoundary>(0);
+            builder.AddComponentParameter(1, nameof(TestErrorBoundary.ChildContent), (RenderFragment)(childBuilder =>
+            {
+                childBuilder.OpenComponent<TestComponentErrorBuildRenderTree>(0);
+                childBuilder.AddComponentParameter(1, nameof(TestComponentErrorBuildRenderTree.FaultedTaskOnInitializedAsync), true);
+                childBuilder.CloseComponent();
+            }));
+            builder.AddComponentReferenceCapture(2, inst => capturedBoundary = (TestErrorBoundary)inst);
+            builder.CloseComponent();
+        };
+
+        // Act
+        var rootComponentId = renderer.AssignRootComponentId(rootComponent);
+        await renderer.RenderRootComponentAsync(rootComponentId);
+
+        // Assert
+        Assert.NotNull(capturedBoundary);
+        Assert.NotNull(capturedBoundary!.ReceivedException);
+        Assert.Equal(typeof(InvalidTimeZoneException), capturedBoundary!.ReceivedException.GetType());
+    }
+
+    [Fact]
+    public async Task ErrorBoundaryHandlesCallOnParametersSetAsyncReturnFaultedTask()
+    {
+        // Arrange
+        var renderer = new TestRenderer();
+        TestErrorBoundary capturedBoundary = null;
+
+        // Create root component that wraps the TestComponentErrorBuildRenderTree in an TestErrorBoundary
+        var rootComponent = new TestComponent();
+        rootComponent.ChildContent = builder =>
+        {
+            builder.OpenComponent<TestErrorBoundary>(0);
+            builder.AddComponentParameter(1, nameof(TestErrorBoundary.ChildContent), (RenderFragment)(childBuilder =>
+            {
+                childBuilder.OpenComponent<TestComponentErrorBuildRenderTree>(0);
+                childBuilder.AddComponentParameter(1, nameof(TestComponentErrorBuildRenderTree.FaultedTaskOnParametersSetAsync), true);
+                childBuilder.CloseComponent();
+            }));
+            builder.AddComponentReferenceCapture(2, inst => capturedBoundary = (TestErrorBoundary)inst);
+            builder.CloseComponent();
+        };
+
+        // Act
+        var rootComponentId = renderer.AssignRootComponentId(rootComponent);
+        await renderer.RenderRootComponentAsync(rootComponentId);
+
+        // Assert
+        Assert.NotNull(capturedBoundary);
+        Assert.NotNull(capturedBoundary!.ReceivedException);
+        Assert.Equal(typeof(InvalidTimeZoneException), capturedBoundary!.ReceivedException.GetType());
+    }
+
+    [Fact]
+    public async Task ComponentBaseDoesntRenderWhenOnInitializedAsyncFaultedTask()
+    {
+        // Arrange
+        var renderer = new TestRenderer();
+        renderer.ShouldHandleExceptions = true;
+        TestComponentErrorBuildRenderTree testComponentErrorBuildRenderTree = null;
+
+        // Create root component that wraps the TestComponentErrorBuildRenderTree in an TestErrorBoundary
+        var rootComponent = new TestComponent();
+        rootComponent.ChildContent = builder =>
+        {
+            builder.OpenComponent<TestComponentErrorBuildRenderTree>(0);
+            builder.AddComponentParameter(1, nameof(TestComponentErrorBuildRenderTree.FaultedTaskOnInitializedAsync), true);
+            builder.AddComponentReferenceCapture(2, inst => testComponentErrorBuildRenderTree = (TestComponentErrorBuildRenderTree)inst);
+            builder.CloseComponent();
+        };
+
+        // Act
+        var rootComponentId = renderer.AssignRootComponentId(rootComponent);
+        await renderer.RenderRootComponentAsync(rootComponentId);
+
+        // Assert
+        Assert.IsType<InvalidTimeZoneException>(renderer.HandledExceptions[0]);
+        Assert.NotNull(testComponentErrorBuildRenderTree);
+        Assert.Equal(0, testComponentErrorBuildRenderTree.StateHasChangedCalled);
+    }
+
+    [Fact]
+    public async Task ComponentBaseDoesntRenderWhenOnSetParametersSetAsyncFaultedTask()
+    {
+        // Arrange
+        var renderer = new TestRenderer();
+        renderer.ShouldHandleExceptions = true;
+        TestComponentErrorBuildRenderTree testComponentErrorBuildRenderTree = null;
+
+        // Create root component that wraps the TestComponentErrorBuildRenderTree in an TestErrorBoundary
+        var rootComponent = new TestComponent();
+        rootComponent.ChildContent = builder =>
+        {
+            builder.OpenComponent<TestComponentErrorBuildRenderTree>(0);
+            builder.AddComponentParameter(1, nameof(TestComponentErrorBuildRenderTree.FaultedTaskOnParametersSetAsync), true);
+            builder.AddComponentReferenceCapture(2, inst => testComponentErrorBuildRenderTree = (TestComponentErrorBuildRenderTree)inst);
+            builder.CloseComponent();
+        };
+
+        // Act
+        var rootComponentId = renderer.AssignRootComponentId(rootComponent);
+        await renderer.RenderRootComponentAsync(rootComponentId);
+
+        // Assert
+        Assert.IsType<InvalidTimeZoneException>(renderer.HandledExceptions[0]);
+        Assert.NotNull(testComponentErrorBuildRenderTree);
+        Assert.Equal(0, testComponentErrorBuildRenderTree.StateHasChangedCalled);
+    }
+
     [Fact]
     public async Task DoesNotRenderAfterOnParametersSetAsyncTaskIsCanceled()
     {
@@ -491,11 +611,20 @@ private class TestComponent : ComponentBase
 
         public int Counter { get; set; }
 
+        public RenderFragment ChildContent { get; set; }
+
         protected override void BuildRenderTree(RenderTreeBuilder builder)
         {
-            builder.OpenElement(0, "p");
-            builder.AddContent(1, Counter);
-            builder.CloseElement();
+            if (ChildContent != null)
+            {
+                builder.AddContent(0, ChildContent);
+            }
+            else
+            {
+                builder.OpenElement(0, "p");
+                builder.AddContent(1, Counter);
+                builder.CloseElement();
+            }
         }
 
         protected override void OnInitialized()
@@ -570,4 +699,65 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
             }
         }
     }
+
+    private class TestErrorBoundary : ErrorBoundaryBase
+    {
+        public Exception ReceivedException => CurrentException;
+
+        protected override Task OnErrorAsync(Exception exception)
+        {
+            return Task.CompletedTask;
+        }
+
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            if (CurrentException == null)
+            {
+                builder.AddContent(0, ChildContent);
+            }
+            else
+            {
+                builder.OpenElement(2, "div");
+                builder.AddAttribute(3, "class", "blazor-error-boundary");
+                builder.CloseElement();
+            }
+        }
+    }
+
+    private class TestComponentErrorBuildRenderTree : ComponentBase
+    {
+        [Parameter] public bool FaultedTaskOnInitializedAsync { get; set; } = false;
+        [Parameter] public bool FaultedTaskOnParametersSetAsync { get; set; } = false;
+
+        public int StateHasChangedCalled { get; set; } = 0;
+
+        protected new void StateHasChanged()
+        {
+            StateHasChangedCalled++;
+            base.StateHasChanged();
+        }
+
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            throw new InvalidOperationException("Error in BuildRenderTree");
+        }
+
+        protected override Task OnInitializedAsync()
+        {
+            if (FaultedTaskOnInitializedAsync)
+            {
+                return Task.FromException(new InvalidTimeZoneException());
+            }
+            return Task.CompletedTask;
+        }
+
+        protected override Task OnParametersSetAsync()
+        {
+            if (FaultedTaskOnParametersSetAsync)
+            {
+                return Task.FromException(new InvalidTimeZoneException());
+            }
+            return Task.CompletedTask;
+        }
+    }
 }
diff --git a/src/Components/Components/test/ComponentsActivitySourceTest.cs b/src/Components/Components/test/ComponentsActivitySourceTest.cs
new file mode 100644
index 000000000000..cccb3fb79170
--- /dev/null
+++ b/src/Components/Components/test/ComponentsActivitySourceTest.cs
@@ -0,0 +1,202 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using Microsoft.AspNetCore.Components.Infrastructure;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class ComponentsActivitySourceTest
+{
+    private readonly ActivityListener _listener;
+    private readonly List<Activity> _activities;
+
+    public ComponentsActivitySourceTest()
+    {
+        _activities = new List<Activity>();
+        _listener = new ActivityListener
+        {
+            ShouldListenTo = source => source.Name == ComponentsActivitySource.Name,
+            Sample = (ref ActivityCreationOptions<ActivityContext> options) => ActivitySamplingResult.AllData,
+            ActivityStarted = activity => _activities.Add(activity),
+            ActivityStopped = activity => { }
+        };
+        ActivitySource.AddActivityListener(_listener);
+    }
+
+    [Fact]
+    public void Constructor_CreatesActivitySourceCorrectly()
+    {
+        // Arrange & Act
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+
+        // Assert
+        Assert.NotNull(componentsActivitySource);
+    }
+
+    [Fact]
+    public void StartRouteActivity_CreatesAndStartsActivity()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+        var componentType = "TestComponent";
+        var route = "/test-route";
+
+        // First set up a circuit context
+        linkstore.SetActivityContext(ComponentsActivityLinkStore.Circuit, new ActivityContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded), new KeyValuePair<string, object>("aspnetcore.components.circuit.id", "test-circuit-id"));
+
+        // Act
+        var activityHandle = componentsActivitySource.StartNavigateActivity(componentType, route);
+        var activity = activityHandle.Activity;
+
+        // Assert
+        Assert.NotNull(activity);
+        Assert.Equal(ComponentsActivitySource.OnRouteName, activity.OperationName);
+        Assert.Equal($"Route {route} -> {componentType}", activity.DisplayName);
+        Assert.Equal(ActivityKind.Internal, activity.Kind);
+        Assert.True(activity.IsAllDataRequested);
+        Assert.Equal(componentType, activity.GetTagItem("aspnetcore.components.type"));
+        Assert.Equal(route, activity.GetTagItem("aspnetcore.components.route"));
+        Assert.False(activity.IsStopped);
+
+        componentsActivitySource.StopNavigateActivity(activityHandle, null);
+        Assert.True(activity.IsStopped);
+        Assert.Equal("test-circuit-id", activity.GetTagItem("aspnetcore.components.circuit.id"));
+        Assert.Single(activity.Links);
+
+    }
+
+    [Fact]
+    public void StartEventActivity_CreatesAndStartsActivity()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+        var componentType = "TestComponent";
+        var methodName = "OnClick";
+        var attributeName = "onclick";
+
+        // First set up a circuit and route context
+        linkstore.SetActivityContext(ComponentsActivityLinkStore.Circuit, default, new KeyValuePair<string, object>("aspnetcore.components.circuit.id", "test-circuit-id"));
+        componentsActivitySource.StartNavigateActivity("ParentComponent", "/parent");
+
+        // Act
+        var activityHandle = ComponentsActivitySource.StartHandleEventActivity(componentType, methodName, attributeName);
+        var activity = activityHandle.Activity;
+
+        // Assert
+        Assert.NotNull(activity);
+        Assert.Equal(ComponentsActivitySource.OnEventName, activity.OperationName);
+        Assert.Equal($"Event {attributeName} -> {componentType}.{methodName}", activity.DisplayName);
+        Assert.Equal(ActivityKind.Internal, activity.Kind);
+        Assert.True(activity.IsAllDataRequested);
+        Assert.Equal(componentType, activity.GetTagItem("aspnetcore.components.type"));
+        Assert.Equal(methodName, activity.GetTagItem("code.function.name"));
+        Assert.Equal(attributeName, activity.GetTagItem("aspnetcore.components.attribute.name"));
+        Assert.False(activity.IsStopped);
+
+        componentsActivitySource.StopNavigateActivity(activityHandle, null);
+        Assert.True(activity.IsStopped);
+        Assert.Equal("test-circuit-id", activity.GetTagItem("aspnetcore.components.circuit.id"));
+        Assert.Empty(activity.Links);
+    }
+
+    [Fact]
+    public void FailEventActivity_SetsErrorStatusAndStopsActivity()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+        var activityHandle = ComponentsActivitySource.StartHandleEventActivity("TestComponent", "OnClick", "onclick");
+        var activity = activityHandle.Activity;
+        var exception = new InvalidOperationException("Test exception");
+
+        // Act
+        componentsActivitySource.StopHandleEventActivity(activityHandle, exception);
+
+        // Assert
+        Assert.True(activity!.IsStopped);
+        Assert.Equal(ActivityStatusCode.Error, activity.Status);
+        Assert.Equal(exception.GetType().FullName, activity.GetTagItem("error.type"));
+    }
+
+    [Fact]
+    public async Task CaptureEventStopAsync_StopsActivityOnSuccessfulTask()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+        var activityHandle = ComponentsActivitySource.StartHandleEventActivity("TestComponent", "OnClick", "onclick");
+        var activity = activityHandle.Activity;
+        var task = Task.CompletedTask;
+
+        // Act
+        await componentsActivitySource.CaptureHandleEventStopAsync(task, activityHandle);
+
+        // Assert
+        Assert.True(activity!.IsStopped);
+        Assert.Equal(ActivityStatusCode.Unset, activity.Status);
+    }
+
+    [Fact]
+    public async Task CaptureEventStopAsync_FailsActivityOnException()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+        var activityHandle = ComponentsActivitySource.StartHandleEventActivity("TestComponent", "OnClick", "onclick");
+        var activity = activityHandle.Activity;
+        var exception = new InvalidOperationException("Test exception");
+        var task = Task.FromException(exception);
+
+        // Act
+        await componentsActivitySource.CaptureHandleEventStopAsync(task, activityHandle);
+
+        // Assert
+        Assert.True(activity!.IsStopped);
+        Assert.Equal(ActivityStatusCode.Error, activity.Status);
+        Assert.Equal(exception.GetType().FullName, activity.GetTagItem("error.type"));
+    }
+
+    [Fact]
+    public void StartRouteActivity_HandlesNullValues()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+
+        // Act
+        var activityHandle = componentsActivitySource.StartNavigateActivity(null, null);
+        var activity = activityHandle.Activity;
+
+        // Assert
+        Assert.NotNull(activity);
+        Assert.Equal("Route [unknown path] -> [unknown component]", activity.DisplayName);
+    }
+
+    [Fact]
+    public void StartEventActivity_HandlesNullValues()
+    {
+        // Arrange
+        var componentsActivitySource = new ComponentsActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        componentsActivitySource.Init(linkstore);
+
+        // Act
+        var activityHandle = ComponentsActivitySource.StartHandleEventActivity(null, null, null);
+        var activity = activityHandle.Activity;
+
+        // Assert
+        Assert.NotNull(activity);
+        Assert.Equal("Event [unknown attribute] -> [unknown component].[unknown method]", activity.DisplayName);
+    }
+}
diff --git a/src/Components/Components/test/ComponentsMetricsTest.cs b/src/Components/Components/test/ComponentsMetricsTest.cs
new file mode 100644
index 000000000000..195b2d316efa
--- /dev/null
+++ b/src/Components/Components/test/ComponentsMetricsTest.cs
@@ -0,0 +1,533 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.InternalTesting;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class ComponentsMetricsTest
+{
+    private readonly TestMeterFactory _meterFactory;
+
+    public ComponentsMetricsTest()
+    {
+        _meterFactory = new TestMeterFactory();
+    }
+
+    [Fact]
+    public void Constructor_CreatesMetersCorrectly()
+    {
+        // Arrange & Act
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+
+        // Assert
+        Assert.Equal(2, _meterFactory.Meters.Count);
+        Assert.Contains(_meterFactory.Meters, m => m.Name == ComponentsMetrics.MeterName);
+        Assert.Contains(_meterFactory.Meters, m => m.Name == ComponentsMetrics.LifecycleMeterName);
+    }
+
+    [Fact]
+    public void Navigation_RecordsMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var navigationCounter = new MetricCollector<long>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.navigate");
+
+        // Act
+        componentsMetrics.Navigation("TestComponent", "/test-route");
+
+        // Assert
+        var measurements = navigationCounter.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.Equal(1, measurements[0].Value);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.Equal("/test-route", Assert.Contains("aspnetcore.components.route", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void IsNavigationEnabled_ReturnsCorrectState()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+
+        // Create a collector to ensure the meter is enabled
+        using var navigationCounter = new MetricCollector<long>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.navigate");
+
+        // Act & Assert
+        Assert.True(componentsMetrics.IsNavigationEnabled);
+    }
+
+    [Fact]
+    public async Task CaptureEventDuration_RecordsSuccessMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Small delay to ensure measureable duration
+        await componentsMetrics.CaptureEventDuration(Task.CompletedTask, startTimestamp,
+            "TestComponent", "OnClick", "onclick");
+
+        // Assert
+        var measurements = eventDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", measurements[0].Tags));
+        Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", measurements[0].Tags));
+        Assert.DoesNotContain("error.type", measurements[0].Tags);
+    }
+
+    [Fact]
+    public async Task CaptureEventDuration_RecordsErrorMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Small delay to ensure measureable duration
+        await componentsMetrics.CaptureEventDuration(Task.FromException(new InvalidOperationException()),
+            startTimestamp, "TestComponent", "OnClick", "onclick");
+
+        // Assert
+        var measurements = eventDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", measurements[0].Tags));
+        Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", measurements[0].Tags));
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void FailEventSync_RecordsErrorMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+        var exception = new InvalidOperationException();
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        componentsMetrics.FailEventSync(exception, startTimestamp,
+            "TestComponent", "OnClick", "onclick");
+
+        // Assert
+        var measurements = eventDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", measurements[0].Tags));
+        Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", measurements[0].Tags));
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void IsEventEnabled_ReturnsCorrectState()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+
+        // Create a collector to ensure the meter is enabled
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+
+        // Act & Assert
+        Assert.True(componentsMetrics.IsEventEnabled);
+    }
+
+    [Fact]
+    public async Task CaptureParametersDuration_RecordsSuccessMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Small delay to ensure measureable duration
+        await componentsMetrics.CaptureParametersDuration(Task.CompletedTask, startTimestamp, "TestComponent");
+
+        // Assert
+        var measurements = parametersDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.DoesNotContain("error.type", measurements[0].Tags);
+    }
+
+    [Fact]
+    public async Task CaptureParametersDuration_RecordsErrorMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Small delay to ensure measureable duration
+        await componentsMetrics.CaptureParametersDuration(Task.FromException(new InvalidOperationException()),
+            startTimestamp, "TestComponent");
+
+        // Assert
+        var measurements = parametersDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void FailParametersSync_RecordsErrorMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+        var exception = new InvalidOperationException();
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        componentsMetrics.FailParametersSync(exception, startTimestamp, "TestComponent");
+
+        // Assert
+        var measurements = parametersDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void IsParametersEnabled_ReturnsCorrectState()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+
+        // Create a collector to ensure the meter is enabled
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+
+        // Act & Assert
+        Assert.True(componentsMetrics.IsParametersEnabled);
+    }
+
+    [Fact]
+    public async Task CaptureBatchDuration_RecordsSuccessMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var batchDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Small delay to ensure measureable duration
+        await componentsMetrics.CaptureBatchDuration(Task.CompletedTask, startTimestamp, 25);
+
+        // Assert
+        var measurements = batchDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.DoesNotContain("error.type", measurements[0].Tags);
+    }
+
+    [Fact]
+    public async Task CaptureBatchDuration_RecordsErrorMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var batchDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Small delay to ensure measureable duration
+        await componentsMetrics.CaptureBatchDuration(Task.FromException(new InvalidOperationException()),
+            startTimestamp, 25);
+
+        // Assert
+        var measurements = batchDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void FailBatchSync_RecordsErrorMetric()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var batchDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.duration");
+        var exception = new InvalidOperationException();
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        componentsMetrics.FailBatchSync(exception, startTimestamp);
+
+        // Assert
+        var measurements = batchDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value > 0);
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public void IsBatchEnabled_ReturnsCorrectState()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+
+        // Create a collector to ensure the meter is enabled
+        using var batchDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.duration");
+
+        // Act & Assert
+        Assert.True(componentsMetrics.IsBatchEnabled);
+    }
+
+    [Fact]
+    public async Task ComponentLifecycle_RecordsAllMetricsCorrectly()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var navigationCounter = new MetricCollector<long>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.navigate");
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+        using var batchDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.duration");
+        using var batchSizeHistogram = new MetricCollector<int>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.size");
+
+        // Act - Simulate a component lifecycle
+        // 1. Navigation
+        componentsMetrics.Navigation("TestComponent", "/test-route");
+
+        // 2. Parameters update
+        var startTimestamp1 = Stopwatch.GetTimestamp();
+        await Task.Delay(10);
+        await componentsMetrics.CaptureParametersDuration(Task.CompletedTask, startTimestamp1, "TestComponent");
+
+        // 3. Event handler
+        var startTimestamp2 = Stopwatch.GetTimestamp();
+        await Task.Delay(10);
+        await componentsMetrics.CaptureEventDuration(Task.CompletedTask, startTimestamp2,
+            "TestComponent", "OnClick", "onclick");
+
+        // 4. Rendering batch
+        var startTimestamp3 = Stopwatch.GetTimestamp();
+        await Task.Delay(10);
+        await componentsMetrics.CaptureBatchDuration(Task.CompletedTask, startTimestamp3, 15);
+
+        // Assert
+        var navigationMeasurements = navigationCounter.GetMeasurementSnapshot();
+        var eventMeasurements = eventDurationHistogram.GetMeasurementSnapshot();
+        var parametersMeasurements = parametersDurationHistogram.GetMeasurementSnapshot();
+        var batchMeasurements = batchDurationHistogram.GetMeasurementSnapshot();
+        var batchSizeMeasurements = batchSizeHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(navigationMeasurements);
+        Assert.Single(eventMeasurements);
+        Assert.Single(parametersMeasurements);
+        Assert.Single(batchMeasurements);
+        Assert.Single(batchSizeMeasurements);
+
+        // Check navigation
+        Assert.Equal(1, navigationMeasurements[0].Value);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", navigationMeasurements[0].Tags));
+        Assert.Equal("/test-route", Assert.Contains("aspnetcore.components.route", navigationMeasurements[0].Tags));
+
+        // Check event duration
+        Assert.True(eventMeasurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", eventMeasurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", eventMeasurements[0].Tags));
+        Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", eventMeasurements[0].Tags));
+
+        // Check parameters duration
+        Assert.True(parametersMeasurements[0].Value > 0);
+        Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", parametersMeasurements[0].Tags));
+
+        // Check batch duration
+        Assert.True(batchMeasurements[0].Value > 0);
+        Assert.True(batchSizeMeasurements[0].Value > 0);
+    }
+
+    [Fact]
+    public void Dispose_DisposesAllMeters()
+    {
+        // This test verifies that disposing ComponentsMetrics properly disposes its meters
+        // Since we can't easily test disposal directly, we'll verify meters are created and assume
+        // the dispose method works as expected
+
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+
+        // Act - We're not actually asserting anything here, just ensuring no exceptions are thrown
+        componentsMetrics.Dispose();
+
+        // Assert - MeterFactory.Create was called twice in constructor
+        Assert.Equal(2, _meterFactory.Meters.Count);
+    }
+
+    [Fact]
+    public void Navigation_WithNullValues_OmitsTags()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var navigationCounter = new MetricCollector<long>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.navigate");
+
+        // Act
+        componentsMetrics.Navigation(null, null);
+
+        // Assert
+        var measurements = navigationCounter.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.Equal(1, measurements[0].Value);
+        Assert.DoesNotContain("aspnetcore.components.type", measurements[0].Tags);
+        Assert.DoesNotContain("aspnetcore.components.route", measurements[0].Tags);
+    }
+
+    [Fact]
+    public async Task CaptureEventDuration_WithNullValues_OmitsTags()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await componentsMetrics.CaptureEventDuration(Task.CompletedTask, startTimestamp, null, null, null);
+
+        // Assert
+        var measurements = eventDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value >= 0);
+        Assert.DoesNotContain("aspnetcore.components.type", measurements[0].Tags);
+        Assert.DoesNotContain("code.function.name", measurements[0].Tags);
+        Assert.DoesNotContain("aspnetcore.components.attribute.name", measurements[0].Tags);
+        Assert.DoesNotContain("error.type", measurements[0].Tags);
+    }
+
+    [Fact]
+    public void FailEventSync_WithNullValues_OmitsTags()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var eventDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.MeterName, "aspnetcore.components.handle_event.duration");
+        var exception = new InvalidOperationException();
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        componentsMetrics.FailEventSync(exception, startTimestamp, null, null, null);
+
+        // Assert
+        var measurements = eventDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value >= 0);
+        Assert.DoesNotContain("aspnetcore.components.type", measurements[0].Tags);
+        Assert.DoesNotContain("code.function.name", measurements[0].Tags);
+        Assert.DoesNotContain("aspnetcore.components.attribute.name", measurements[0].Tags);
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public async Task CaptureParametersDuration_WithNullValues_OmitsTags()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await componentsMetrics.CaptureParametersDuration(Task.CompletedTask, startTimestamp, null);
+
+        // Assert
+        var measurements = parametersDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value >= 0);
+        Assert.DoesNotContain("aspnetcore.components.type", measurements[0].Tags);
+        Assert.DoesNotContain("error.type", measurements[0].Tags);
+    }
+
+    [Fact]
+    public void FailParametersSync_WithNullValues_OmitsTags()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var parametersDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.update_parameters.duration");
+        var exception = new InvalidOperationException();
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        componentsMetrics.FailParametersSync(exception, startTimestamp, null);
+
+        // Assert
+        var measurements = parametersDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value >= 0);
+        Assert.DoesNotContain("aspnetcore.components.type", measurements[0].Tags);
+        Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
+    }
+
+    [Fact]
+    public async Task CaptureBatchDuration_WithoutException_OmitsErrorTag()
+    {
+        // Arrange
+        var componentsMetrics = new ComponentsMetrics(_meterFactory);
+        using var batchDurationHistogram = new MetricCollector<double>(_meterFactory,
+            ComponentsMetrics.LifecycleMeterName, "aspnetcore.components.render_diff.duration");
+
+        // Act
+        var startTimestamp = Stopwatch.GetTimestamp();
+        await componentsMetrics.CaptureBatchDuration(Task.CompletedTask, startTimestamp, 25);
+
+        // Assert
+        var measurements = batchDurationHistogram.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.True(measurements[0].Value >= 0);
+        Assert.DoesNotContain("error.type", measurements[0].Tags);
+    }
+}
diff --git a/src/Components/Components/test/EventCallbackTest.cs b/src/Components/Components/test/EventCallbackTest.cs
index faa6909d04ca..89fc904b72ac 100644
--- a/src/Components/Components/test/EventCallbackTest.cs
+++ b/src/Components/Components/test/EventCallbackTest.cs
@@ -271,6 +271,24 @@ await Assert.ThrowsAsync<ArgumentException>(() =>
         });
     }
 
+    [Fact]
+    public void EventCallbackOf_Equals_WhenANewDelegateIsCreated()
+    {
+        // Arrange
+        var component = new EventCountingComponent();
+
+        var delegate_1 = (EventArgs _) => { };
+        var delegate_2 = (MulticastDelegate)MulticastDelegate.CreateDelegate(typeof(Action<EventArgs>), delegate_1.Target, delegate_1.Method);
+        var eventcallback_1 = new EventCallback(component, delegate_1);
+        var eventcallback_2 = new EventCallback(component, delegate_2);
+
+        // Act
+        var result = eventcallback_1.Equals(eventcallback_2);
+
+        // Assert
+        Assert.True(result);
+    }
+
     [Fact]
     public async Task EventCallbackOfT_Action_Null()
     {
@@ -415,6 +433,24 @@ public async Task EventCallbackOfT_FuncTTask_Arg()
         Assert.Equal(1, component.Count);
     }
 
+    [Fact]
+    public void EventCallbackOfT_Equals_WhenANewDelegateIsCreated()
+    {
+        // Arrange
+        var component = new EventCountingComponent();
+
+        var delegate_1 = (EventArgs _) => { };
+        var delegate_2 = (MulticastDelegate)MulticastDelegate.CreateDelegate(typeof(Action<EventArgs>), delegate_1.Target, delegate_1.Method);
+        var eventcallback_1 = new EventCallback<EventArgs>(component, delegate_1);
+        var eventcallback_2 = new EventCallback<EventArgs>(component, delegate_2);
+
+        // Act
+        var result = eventcallback_1.Equals(eventcallback_2);
+
+        // Assert
+        Assert.True(result);
+    }
+
     private class EventCountingComponent : IComponent, IHandleEvent
     {
         public int Count;
diff --git a/src/Components/Components/test/IPersistentComponentStateSerializerTests.cs b/src/Components/Components/test/IPersistentComponentStateSerializerTests.cs
new file mode 100644
index 000000000000..d8c1311fec9a
--- /dev/null
+++ b/src/Components/Components/test/IPersistentComponentStateSerializerTests.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Text;
+using System.Text.Json;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Components;
diff --git a/src/Components/Components/test/LayoutViewTest.cs b/src/Components/Components/test/LayoutViewTest.cs
index ff4971690f4e..e8c103912243 100644
--- a/src/Components/Components/test/LayoutViewTest.cs
+++ b/src/Components/Components/test/LayoutViewTest.cs
@@ -178,7 +178,7 @@ public void CanChangeContentWithSameLayout()
         // Assert
         Assert.Equal(2, _renderer.Batches.Count);
         var batch = _renderer.Batches[1];
-        Assert.Equal(0, batch.DisposedComponentIDs.Count);
+        Assert.Empty(batch.DisposedComponentIDs);
         Assert.Collection(batch.DiffsInOrder,
             diff => Assert.Empty(diff.Edits), // LayoutView rerendered, but with no changes
             diff => Assert.Empty(diff.Edits), // RootLayout rerendered, but with no changes
@@ -220,7 +220,7 @@ public void CanChangeLayout()
         Assert.True(setParametersTask2.IsCompletedSuccessfully);
         Assert.Equal(2, _renderer.Batches.Count);
         var batch = _renderer.Batches[1];
-        Assert.Equal(1, batch.DisposedComponentIDs.Count); // Disposes NestedLayout
+        Assert.Single(batch.DisposedComponentIDs); // Disposes NestedLayout
         Assert.Collection(batch.DiffsInOrder,
             diff => Assert.Empty(diff.Edits), // LayoutView rerendered, but with no changes
             diff =>
diff --git a/src/Components/Components/test/Lifetime/ComponentApplicationStateTest.cs b/src/Components/Components/test/Lifetime/ComponentApplicationStateTest.cs
deleted file mode 100644
index bed42d42dfbf..000000000000
--- a/src/Components/Components/test/Lifetime/ComponentApplicationStateTest.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Text.Json;
-
-namespace Microsoft.AspNetCore.Components;
-
-public class ComponentApplicationStateTest
-{
-    [Fact]
-    public void InitializeExistingState_SetupsState()
-    {
-        // Arrange
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
-        var existingState = new Dictionary<string, byte[]>
-        {
-            ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(new byte[] { 1, 2, 3, 4 })
-        };
-
-        // Act
-        applicationState.InitializeExistingState(existingState);
-
-        // Assert
-        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var existing));
-        Assert.Equal(new byte[] { 1, 2, 3, 4 }, existing);
-    }
-
-    [Fact]
-    public void InitializeExistingState_ThrowsIfAlreadyInitialized()
-    {
-        // Arrange
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
-        var existingState = new Dictionary<string, byte[]>
-        {
-            ["MyState"] = new byte[] { 1, 2, 3, 4 }
-        };
-
-        applicationState.InitializeExistingState(existingState);
-
-        // Act & Assert
-        Assert.Throws<InvalidOperationException>(() => applicationState.InitializeExistingState(existingState));
-    }
-
-    [Fact]
-    public void TryRetrieveState_ReturnsStateWhenItExists()
-    {
-        // Arrange
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
-        var existingState = new Dictionary<string, byte[]>
-        {
-            ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(new byte[] { 1, 2, 3, 4 })
-        };
-
-        // Act
-        applicationState.InitializeExistingState(existingState);
-
-        // Assert
-        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var existing));
-        Assert.Equal(new byte[] { 1, 2, 3, 4 }, existing);
-        Assert.False(applicationState.TryTakeFromJson<byte[]>("MyState", out var gone));
-    }
-
-    [Fact]
-    public void PersistState_SavesDataToTheStoreAsync()
-    {
-        // Arrange
-        var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
-        {
-            PersistingState = true
-        };
-        var myState = new byte[] { 1, 2, 3, 4 };
-
-        // Act
-        applicationState.PersistAsJson("MyState", myState);
-
-        // Assert
-        Assert.True(currentState.TryGetValue("MyState", out var stored));
-        Assert.Equal(myState, JsonSerializer.Deserialize<byte[]>(stored));
-    }
-
-    [Fact]
-    public void PersistState_ThrowsForDuplicateKeys()
-    {
-        // Arrange
-        var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
-        {
-            PersistingState = true
-        };
-        var myState = new byte[] { 1, 2, 3, 4 };
-
-        applicationState.PersistAsJson("MyState", myState);
-
-        // Act & Assert
-        Assert.Throws<ArgumentException>(() => applicationState.PersistAsJson("MyState", myState));
-    }
-
-    [Fact]
-    public void PersistAsJson_SerializesTheDataToJsonAsync()
-    {
-        // Arrange
-        var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
-        {
-            PersistingState = true
-        };
-        var myState = new byte[] { 1, 2, 3, 4 };
-
-        // Act
-        applicationState.PersistAsJson("MyState", myState);
-
-        // Assert
-        Assert.True(currentState.TryGetValue("MyState", out var stored));
-        Assert.Equal(myState, JsonSerializer.Deserialize<byte[]>(stored));
-    }
-
-    [Fact]
-    public void PersistAsJson_NullValueAsync()
-    {
-        // Arrange
-        var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
-        {
-            PersistingState = true
-        };
-
-        // Act
-        applicationState.PersistAsJson<byte[]>("MyState", null);
-
-        // Assert
-        Assert.True(currentState.TryGetValue("MyState", out var stored));
-        Assert.Null(JsonSerializer.Deserialize<byte[]>(stored));
-    }
-
-    [Fact]
-    public void TryRetrieveFromJson_DeserializesTheDataFromJson()
-    {
-        // Arrange
-        var myState = new byte[] { 1, 2, 3, 4 };
-        var serialized = JsonSerializer.SerializeToUtf8Bytes(myState);
-        var existingState = new Dictionary<string, byte[]>() { ["MyState"] = serialized };
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
-
-        applicationState.InitializeExistingState(existingState);
-
-        // Act
-        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var stored));
-
-        // Assert
-        Assert.Equal(myState, stored);
-        Assert.False(applicationState.TryTakeFromJson<byte[]>("MyState", out _));
-    }
-
-    [Fact]
-    public void TryRetrieveFromJson_NullValue()
-    {
-        // Arrange
-        var serialized = JsonSerializer.SerializeToUtf8Bytes<byte[]>(null);
-        var existingState = new Dictionary<string, byte[]>() { ["MyState"] = serialized };
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
-
-        applicationState.InitializeExistingState(existingState);
-
-        // Act
-        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var stored));
-
-        // Assert
-        Assert.Null(stored);
-        Assert.False(applicationState.TryTakeFromJson<byte[]>("MyState", out _));
-    }
-}
diff --git a/src/Components/Components/test/Lifetime/ComponentStatePersistenceManagerTest.cs b/src/Components/Components/test/Lifetime/ComponentStatePersistenceManagerTest.cs
deleted file mode 100644
index 02b104d41f43..000000000000
--- a/src/Components/Components/test/Lifetime/ComponentStatePersistenceManagerTest.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Buffers;
-using System.Collections;
-using System.Text.Json;
-using Microsoft.AspNetCore.Components.Infrastructure;
-using Microsoft.AspNetCore.Components.RenderTree;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Logging.Testing;
-
-namespace Microsoft.AspNetCore.Components;
-
-public class ComponentStatePersistenceManagerTest
-{
-    [Fact]
-    public async Task RestoreStateAsync_InitializesStateWithDataFromTheProvidedStore()
-    {
-        // Arrange
-        var data = new byte[] { 0, 1, 2, 3, 4 };
-        var state = new Dictionary<string, byte[]>
-        {
-            ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(data)
-        };
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-
-        // Act
-        await lifetime.RestoreStateAsync(store);
-
-        // Assert
-        Assert.True(lifetime.State.TryTakeFromJson<byte[]>("MyState", out var retrieved));
-        Assert.Empty(state);
-        Assert.Equal(data, retrieved);
-    }
-
-    [Fact]
-    public async Task RestoreStateAsync_ThrowsOnDoubleInitialization()
-    {
-        // Arrange
-        var state = new Dictionary<string, byte[]>
-        {
-            ["MyState"] = [0, 1, 2, 3, 4]
-        };
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-
-        await lifetime.RestoreStateAsync(store);
-
-        // Assert
-        await Assert.ThrowsAsync<InvalidOperationException>(() => lifetime.RestoreStateAsync(store));
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_ThrowsWhenCallbackRenerModeCannotBeInferred()
-    {
-        // Arrange
-        var state = new Dictionary<string, byte[]>();
-        var store = new CompositeTestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-
-        var renderer = new TestRenderer();
-        var data = new byte[] { 1, 2, 3, 4 };
-
-        lifetime.State.RegisterOnPersisting(() =>
-        {
-            lifetime.State.PersistAsJson("MyState", new byte[] { 1, 2, 3, 4 });
-            return Task.CompletedTask;
-        });
-
-        // Act
-        // Assert
-        await Assert.ThrowsAsync<InvalidOperationException>(() => lifetime.PersistStateAsync(store, renderer));
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_SavesPersistedStateToTheStore()
-    {
-        // Arrange
-        var state = new Dictionary<string, byte[]>();
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-
-        var renderer = new TestRenderer();
-        var data = new byte[] { 1, 2, 3, 4 };
-
-        lifetime.State.RegisterOnPersisting(() =>
-        {
-            lifetime.State.PersistAsJson("MyState", new byte[] { 1, 2, 3, 4 });
-            return Task.CompletedTask;
-        }, new TestRenderMode());
-
-        // Act
-        await lifetime.PersistStateAsync(store, renderer);
-
-        // Assert
-        Assert.True(store.State.TryGetValue("MyState", out var persisted));
-        Assert.Equal(data, JsonSerializer.Deserialize<byte[]>(persisted.ToArray()));
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_InvokesPauseCallbacksDuringPersist()
-    {
-        // Arrange
-        var state = new Dictionary<string, byte[]>();
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-        var renderer = new TestRenderer();
-        var data = new byte[] { 1, 2, 3, 4 };
-        var invoked = false;
-
-        lifetime.State.RegisterOnPersisting(() => { invoked = true; return default; }, new TestRenderMode());
-
-        // Act
-        await lifetime.PersistStateAsync(store, renderer);
-
-        // Assert
-        Assert.True(invoked);
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_FiresCallbacksInParallel()
-    {
-        // Arrange
-        var state = new Dictionary<string, byte[]>();
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-        var renderer = new TestRenderer();
-
-        var sequence = new List<int> { };
-
-        var tcs = new TaskCompletionSource();
-        var tcs2 = new TaskCompletionSource();
-
-        lifetime.State.RegisterOnPersisting(async () => { sequence.Add(1); await tcs.Task; sequence.Add(3); }, new TestRenderMode());
-        lifetime.State.RegisterOnPersisting(async () => { sequence.Add(2); await tcs2.Task; sequence.Add(4); }, new TestRenderMode());
-
-        // Act
-        var persistTask = lifetime.PersistStateAsync(store, renderer);
-        tcs.SetResult();
-        tcs2.SetResult();
-
-        await persistTask;
-
-        // Assert
-        Assert.Equal(new[] { 1, 2, 3, 4 }, sequence);
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_CallbacksAreRemovedWhenSubscriptionsAreDisposed()
-    {
-        // Arrange
-        var state = new Dictionary<string, byte[]>();
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
-        var renderer = new TestRenderer();
-
-        var sequence = new List<int> { };
-
-        var tcs = new TaskCompletionSource();
-        var tcs2 = new TaskCompletionSource();
-
-        var subscription1 = lifetime.State.RegisterOnPersisting(async () => { sequence.Add(1); await tcs.Task; sequence.Add(3); });
-        var subscription2 = lifetime.State.RegisterOnPersisting(async () => { sequence.Add(2); await tcs2.Task; sequence.Add(4); });
-
-        // Act
-        subscription1.Dispose();
-        subscription2.Dispose();
-
-        var persistTask = lifetime.PersistStateAsync(store, renderer);
-        tcs.SetResult();
-        tcs2.SetResult();
-
-        await persistTask;
-
-        // Assert
-        Assert.Empty(sequence);
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_ContinuesInvokingPauseCallbacksDuringPersistIfACallbackThrows()
-    {
-        // Arrange
-        var sink = new TestSink();
-        var loggerFactory = new TestLoggerFactory(sink, true);
-        var logger = loggerFactory.CreateLogger<ComponentStatePersistenceManager>();
-        var state = new Dictionary<string, byte[]>();
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(logger);
-        var renderer = new TestRenderer();
-        var data = new byte[] { 1, 2, 3, 4 };
-        var invoked = false;
-
-        lifetime.State.RegisterOnPersisting(() => throw new InvalidOperationException(), new TestRenderMode());
-        lifetime.State.RegisterOnPersisting(() => { invoked = true; return Task.CompletedTask; }, new TestRenderMode());
-
-        // Act
-        await lifetime.PersistStateAsync(store, renderer);
-
-        // Assert
-        Assert.True(invoked);
-        var log = Assert.Single(sink.Writes);
-        Assert.Equal(LogLevel.Error, log.LogLevel);
-    }
-
-    [Fact]
-    public async Task PersistStateAsync_ContinuesInvokingPauseCallbacksDuringPersistIfACallbackThrowsAsynchonously()
-    {
-        // Arrange
-        var sink = new TestSink();
-        var loggerFactory = new TestLoggerFactory(sink, true);
-        var logger = loggerFactory.CreateLogger<ComponentStatePersistenceManager>();
-        var state = new Dictionary<string, byte[]>();
-        var store = new TestStore(state);
-        var lifetime = new ComponentStatePersistenceManager(logger);
-        var renderer = new TestRenderer();
-        var invoked = false;
-        var tcs = new TaskCompletionSource();
-
-        lifetime.State.RegisterOnPersisting(async () => { await tcs.Task; throw new InvalidOperationException(); }, new TestRenderMode());
-        lifetime.State.RegisterOnPersisting(() => { invoked = true; return Task.CompletedTask; }, new TestRenderMode());
-
-        // Act
-        var persistTask = lifetime.PersistStateAsync(store, renderer);
-        tcs.SetResult();
-
-        await persistTask;
-
-        // Assert
-        Assert.True(invoked);
-        var log = Assert.Single(sink.Writes);
-        Assert.Equal(LogLevel.Error, log.LogLevel);
-    }
-
-    private class TestRenderer : Renderer
-    {
-        public TestRenderer() : base(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
-        {
-        }
-
-        private readonly Dispatcher _dispatcher = Dispatcher.CreateDefault();
-
-        public override Dispatcher Dispatcher => _dispatcher;
-
-        protected override void HandleException(Exception exception)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    private class TestStore : IPersistentComponentStateStore
-    {
-        public TestStore(IDictionary<string, byte[]> initialState)
-        {
-            State = initialState;
-        }
-
-        public IDictionary<string, byte[]> State { get; set; }
-
-        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
-        {
-            return Task.FromResult(State);
-        }
-
-        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
-        {
-            // We copy the data here because it's no longer available after this call completes.
-            State = state.ToDictionary(k => k.Key, v => v.Value);
-            return Task.CompletedTask;
-        }
-    }
-
-    private class CompositeTestStore : IPersistentComponentStateStore,  IEnumerable<IPersistentComponentStateStore>
-    {
-        public CompositeTestStore(IDictionary<string, byte[]> initialState)
-        {
-            State = initialState;
-        }
-
-        public IDictionary<string, byte[]> State { get; set; }
-
-        public IEnumerator<IPersistentComponentStateStore> GetEnumerator()
-        {
-            yield return new TestStore(State);
-            yield return new TestStore(State);
-        }
-
-        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
-        {
-            return Task.FromResult(State);
-        }
-
-        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
-        {
-            // We copy the data here because it's no longer available after this call completes.
-            State = state.ToDictionary(k => k.Key, v => v.Value);
-            return Task.CompletedTask;
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-
-    private class TestRenderMode : IComponentRenderMode
-    {
-
-    }
-}
diff --git a/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj b/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj
index 8f414c52f80c..732ebbb65892 100644
--- a/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj
+++ b/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj
@@ -8,9 +8,11 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
     <Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
   </ItemGroup>
 
diff --git a/src/Components/Components/test/NavigationManagerTest.cs b/src/Components/Components/test/NavigationManagerTest.cs
index 67f0c6a1b1ce..3f6e680d0c8b 100644
--- a/src/Components/Components/test/NavigationManagerTest.cs
+++ b/src/Components/Components/test/NavigationManagerTest.cs
@@ -1,7 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Diagnostics;
+using System.Net.Http;
+using System.Text;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.InternalTesting;
 
@@ -223,7 +226,9 @@ public void LocationChangingHandlers_CanContinueTheNavigationSynchronously_WhenO
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         static ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -250,7 +255,9 @@ public void LocationChangingHandlers_CanContinueTheNavigationSynchronously_WhenM
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(initialHandlerCount, completedHandlerCount);
 
         ValueTask HandleLocationChanging(LocationChangingContext context)
@@ -276,7 +283,9 @@ public void LocationChangingHandlers_CanContinueTheNavigationAsynchronously_When
         Assert.False(navigation1.IsCompleted);
         tcs.SetResult();
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         async ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -328,7 +337,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_WhenOne
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         static ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -357,7 +368,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_WhenMul
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(expectedInvokedHandlerCount, invokedHandlerCount);
 
         ValueTask HandleLocationChanging_AllowNavigation(LocationChangingContext context)
@@ -391,7 +404,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_BeforeR
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.True(currentContext.DidPreventNavigation);
         Assert.True(currentContext.CancellationToken.IsCancellationRequested);
         Assert.False(isHandlerCompleted);
@@ -428,7 +443,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_BeforeR
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.True(currentContext.DidPreventNavigation);
         Assert.True(currentContext.CancellationToken.IsCancellationRequested);
         Assert.False(isFirstHandlerCompleted);
@@ -455,7 +472,7 @@ ValueTask HandleLocationChanging_AllowNavigation(LocationChangingContext context
     }
 
     [Fact]
-    public async void LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenOneHandlerIsRegistered()
+    public async Task LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenOneHandlerIsRegistered()
     {
         // Arrange
         var baseUri = "scheme://host/";
@@ -479,7 +496,7 @@ static async ValueTask HandleLocationChanging(LocationChangingContext context)
     }
 
     [Fact]
-    public async void LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenMultipleHandlersAreRegistered()
+    public async Task LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenMultipleHandlersAreRegistered()
     {
         // Arrange
         var baseUri = "scheme://host/";
@@ -503,7 +520,9 @@ public async void LocationChangingHandlers_CanCancelTheNavigationAsynchronously_
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(blockNavigationHandlerCount, canceledBlockNavigationHandlerCount);
 
         async ValueTask HandleLocationChanging_BlockNavigation(LocationChangingContext context)
@@ -556,11 +575,13 @@ public async Task LocationChangingHandlers_AreCanceledBySuccessiveNavigations_Wh
         await tcs.Task.WaitAsync(Timeout);
 
         // Assert
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.IsCompletedSuccessfully);
         Assert.False(navigation1.Result);
 
         Assert.True(navigation2.IsCompletedSuccessfully);
         Assert.True(navigation2.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         async ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -615,6 +636,7 @@ public async Task LocationChangingHandlers_AreCanceledBySuccessiveNavigations_Wh
         await tcs.Task.WaitAsync(Timeout);
 
         // Assert
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.IsCompletedSuccessfully);
         Assert.False(navigation1.Result);
 
@@ -623,6 +645,7 @@ public async Task LocationChangingHandlers_AreCanceledBySuccessiveNavigations_Wh
 
         Assert.True(navigation3.IsCompletedSuccessfully);
         Assert.True(navigation3.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         Assert.Equal(expectedCanceledHandlerCount, canceledHandlerCount);
         Assert.Equal(0, completedHandlerCount);
@@ -848,6 +871,22 @@ async ValueTask HandleLocationChanging(LocationChangingContext context)
         }
     }
 
+    [Fact]
+    public void OnNotFoundSubscriptionIsTriggeredWhenNotFoundCalled()
+    {
+        // Arrange
+        var baseUri = "scheme://host/";
+        var testNavManager = new TestNavigationManager(baseUri);
+        bool notFoundTriggered = false;
+        testNavManager.OnNotFound += (sender, args) => notFoundTriggered = true;
+
+        // Simulate a component triggered NotFound
+        testNavManager.NotFound();
+
+        // Assert
+        Assert.True(notFoundTriggered, "The OnNotFound event was not triggered as expected.");
+    }
+ 
     private class TestNavigationManager : NavigationManager
     {
         public TestNavigationManager()
diff --git a/src/Components/Components/test/OwningComponentBaseTest.cs b/src/Components/Components/test/OwningComponentBaseTest.cs
index 7bd68ad750c7..ae9a2b4a67ac 100644
--- a/src/Components/Components/test/OwningComponentBaseTest.cs
+++ b/src/Components/Components/test/OwningComponentBaseTest.cs
@@ -29,6 +29,69 @@ public void CreatesScopeAndService()
         Assert.Equal(1, counter.DisposedCount);
     }
 
+    [Fact]
+    public async Task DisposeAsyncReleasesScopeAndService()
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<Counter>();
+        services.AddTransient<MyService>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var counter = serviceProvider.GetRequiredService<Counter>();
+        var renderer = new TestRenderer(serviceProvider);
+        var component1 = (MyOwningComponent)renderer.InstantiateComponent<MyOwningComponent>();
+
+        Assert.NotNull(component1.MyService);
+        Assert.Equal(1, counter.CreatedCount);
+        Assert.Equal(0, counter.DisposedCount);
+        Assert.False(component1.IsDisposedPublic);
+
+        await ((IAsyncDisposable)component1).DisposeAsync();
+        Assert.Equal(1, counter.CreatedCount);
+        Assert.Equal(1, counter.DisposedCount);
+        Assert.True(component1.IsDisposedPublic);
+    }
+
+    [Fact]
+    public void ThrowsWhenAccessingScopedServicesAfterDispose()
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<Counter>();
+        services.AddTransient<MyService>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var renderer = new TestRenderer(serviceProvider);
+        var component1 = (MyOwningComponent)renderer.InstantiateComponent<MyOwningComponent>();
+
+        // Access service first to create scope
+        var service = component1.MyService;
+
+        ((IDisposable)component1).Dispose();
+
+        // Should throw when trying to access services after disposal
+        Assert.Throws<ObjectDisposedException>(() => component1.MyService);
+    }
+
+    [Fact]
+    public async Task ThrowsWhenAccessingScopedServicesAfterDisposeAsync()
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton<Counter>();
+        services.AddTransient<MyService>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var renderer = new TestRenderer(serviceProvider);
+        var component1 = (MyOwningComponent)renderer.InstantiateComponent<MyOwningComponent>();
+
+        // Access service first to create scope
+        var service = component1.MyService;
+
+        await ((IAsyncDisposable)component1).DisposeAsync();
+
+        // Should throw when trying to access services after disposal
+        Assert.Throws<ObjectDisposedException>(() => component1.MyService);
+    }
+
     private class Counter
     {
         public int CreatedCount { get; set; }
@@ -51,5 +114,8 @@ public MyService(Counter counter)
     private class MyOwningComponent : OwningComponentBase<MyService>
     {
         public MyService MyService => Service;
+
+        // Expose IsDisposed for testing
+        public bool IsDisposedPublic => IsDisposed;
     }
 }
diff --git a/src/Components/Components/test/ParameterViewTest.Assignment.cs b/src/Components/Components/test/ParameterViewTest.Assignment.cs
index 01111a9d45a3..827f0e4694ae 100644
--- a/src/Components/Components/test/ParameterViewTest.Assignment.cs
+++ b/src/Components/Components/test/ParameterViewTest.Assignment.cs
@@ -790,7 +790,7 @@ public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
             throw new NotImplementedException();
         }
 
-        public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
+        public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
         {
             return _value;
         }
diff --git a/src/Components/Components/test/ParameterViewTest.cs b/src/Components/Components/test/ParameterViewTest.cs
index e4a358d491cc..0d5a2a46a3b6 100644
--- a/src/Components/Components/test/ParameterViewTest.cs
+++ b/src/Components/Components/test/ParameterViewTest.cs
@@ -609,7 +609,7 @@ public TestCascadingValue(object value)
         public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
             => throw new NotImplementedException();
 
-        public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
+        public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
             => _value;
 
         public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
diff --git a/src/Components/Components/test/PersistentState/ComponentStatePersistenceManagerTest.cs b/src/Components/Components/test/PersistentState/ComponentStatePersistenceManagerTest.cs
new file mode 100644
index 000000000000..34046eaf2342
--- /dev/null
+++ b/src/Components/Components/test/PersistentState/ComponentStatePersistenceManagerTest.cs
@@ -0,0 +1,592 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Collections;
+using System.Text.Json;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class ComponentStatePersistenceManagerTest
+{
+    [Fact]
+    public void Constructor_InitializesPersistentServicesRegistry()
+    {
+        // Arrange
+        var serviceProvider = new ServiceCollection()
+            .AddScoped(sp => new TestStore([]))
+            .AddPersistentService<TestStore>(Mock.Of<IComponentRenderMode>())
+            .BuildServiceProvider();
+
+        // Act
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            serviceProvider);
+        persistenceManager.SetPlatformRenderMode(new TestRenderMode());
+
+        // Assert
+        Assert.NotNull(persistenceManager.ServicesRegistry);
+        Assert.Empty(persistenceManager.RegisteredCallbacks);
+    }
+
+    [Fact]
+    public async Task RestoreStateAsync_InitializesStateWithDataFromTheProvidedStore()
+    {
+        // Arrange
+        var data = new byte[] { 0, 1, 2, 3, 4 };
+        var state = new Dictionary<string, byte[]>
+        {
+            ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(data)
+        };
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        // Act
+        await persistenceManager.RestoreStateAsync(store);
+
+        // Assert
+        Assert.True(persistenceManager.State.TryTakeFromJson<byte[]>("MyState", out var retrieved));
+        Assert.Empty(state);
+        Assert.Equal(data, retrieved);
+    }
+
+    [Fact]
+    public async Task RestoreStateAsync_ThrowsOnDoubleInitialization()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>
+        {
+            ["MyState"] = [0, 1, 2, 3, 4]
+        };
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        await persistenceManager.RestoreStateAsync(store);
+
+        // Assert
+        await Assert.ThrowsAsync<InvalidOperationException>(() => persistenceManager.RestoreStateAsync(store));
+    }
+
+    private IServiceProvider CreateServiceProvider() =>
+        new ServiceCollection().BuildServiceProvider();
+
+    [Fact]
+    public async Task PersistStateAsync_ThrowsWhenCallbackRenerModeCannotBeInferred()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new CompositeTestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        var renderer = new TestRenderer();
+        var data = new byte[] { 1, 2, 3, 4 };
+
+        persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            persistenceManager.State.PersistAsJson("MyState", new byte[] { 1, 2, 3, 4 });
+            return Task.CompletedTask;
+        });
+
+        // Act
+        // Assert
+        await Assert.ThrowsAsync<InvalidOperationException>(() => persistenceManager.PersistStateAsync(store, renderer));
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_PersistsRegistry()
+    {
+        // Arrange
+        var serviceProvider = new ServiceCollection()
+            .AddScoped(sp => new TestStore([]))
+            .AddPersistentService<TestStore>(new TestRenderMode())
+            .BuildServiceProvider();
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            serviceProvider);
+        persistenceManager.SetPlatformRenderMode(new TestRenderMode());
+        var testStore = new TestStore([]);
+
+        await persistenceManager.RestoreStateAsync(new TestStore([]), RestoreContext.InitialValue);
+
+        // Act
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        // Assert
+        var persisted = Assert.Single(testStore.State);
+        Assert.True(testStore.State.TryGetValue(typeof(PersistentServicesRegistry).FullName, out var registrations));
+        var registration = Assert.Single(JsonSerializer.Deserialize<PersistentService[]>(registrations, JsonSerializerOptions.Web));
+        Assert.Equal(typeof(TestStore).Assembly.GetName().Name, registration.Assembly);
+        Assert.Equal(typeof(TestStore).FullName, registration.FullTypeName);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_SavesPersistedStateToTheStore()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        var renderer = new TestRenderer();
+        var data = new byte[] { 1, 2, 3, 4 };
+
+        persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            persistenceManager.State.PersistAsJson("MyState", new byte[] { 1, 2, 3, 4 });
+            return Task.CompletedTask;
+        }, new TestRenderMode());
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        Assert.True(store.State.TryGetValue("MyState", out var persisted));
+        Assert.Equal(data, JsonSerializer.Deserialize<byte[]>(persisted.ToArray()));
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_InvokesPauseCallbacksDuringPersist()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+        var data = new byte[] { 1, 2, 3, 4 };
+        var invoked = false;
+
+        persistenceManager.State.RegisterOnPersisting(() => { invoked = true; return default; }, new TestRenderMode());
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        Assert.True(invoked);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_FiresCallbacksInParallel()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+
+        var sequence = new List<int> { };
+
+        var tcs = new TaskCompletionSource();
+        var tcs2 = new TaskCompletionSource();
+
+        persistenceManager.State.RegisterOnPersisting(async () => { sequence.Add(1); await tcs.Task; sequence.Add(3); }, new TestRenderMode());
+        persistenceManager.State.RegisterOnPersisting(async () => { sequence.Add(2); await tcs2.Task; sequence.Add(4); }, new TestRenderMode());
+
+        // Act
+        var persistTask = persistenceManager.PersistStateAsync(store, renderer);
+        tcs.SetResult();
+        tcs2.SetResult();
+
+        await persistTask;
+
+        // Assert
+        Assert.Equal(new[] { 2, 1, 3, 4 }, sequence);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_CallbacksAreRemovedWhenSubscriptionsAreDisposed()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+
+        var sequence = new List<int> { };
+
+        var tcs = new TaskCompletionSource();
+        var tcs2 = new TaskCompletionSource();
+
+        var subscription1 = persistenceManager.State.RegisterOnPersisting(async () => { sequence.Add(1); await tcs.Task; sequence.Add(3); });
+        var subscription2 = persistenceManager.State.RegisterOnPersisting(async () => { sequence.Add(2); await tcs2.Task; sequence.Add(4); });
+
+        // Act
+        subscription1.Dispose();
+        subscription2.Dispose();
+
+        var persistTask = persistenceManager.PersistStateAsync(store, renderer);
+        tcs.SetResult();
+        tcs2.SetResult();
+
+        await persistTask;
+
+        // Assert
+        Assert.Empty(sequence);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_ContinuesInvokingPauseCallbacksDuringPersistIfACallbackThrows()
+    {
+        // Arrange
+        var sink = new TestSink();
+        var loggerFactory = new TestLoggerFactory(sink, true);
+        var logger = loggerFactory.CreateLogger<ComponentStatePersistenceManager>();
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            logger,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+        var data = new byte[] { 1, 2, 3, 4 };
+        var invoked = false;
+
+        persistenceManager.State.RegisterOnPersisting(() => throw new InvalidOperationException(), new TestRenderMode());
+        persistenceManager.State.RegisterOnPersisting(() => { invoked = true; return Task.CompletedTask; }, new TestRenderMode());
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        Assert.True(invoked);
+        var log = Assert.Single(sink.Writes);
+        Assert.Equal(LogLevel.Error, log.LogLevel);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_ContinuesInvokingPauseCallbacksDuringPersistIfACallbackThrowsAsynchonously()
+    {
+        // Arrange
+        var sink = new TestSink();
+        var loggerFactory = new TestLoggerFactory(sink, true);
+        var logger = loggerFactory.CreateLogger<ComponentStatePersistenceManager>();
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            logger,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+        var invoked = false;
+        var tcs = new TaskCompletionSource();
+
+        persistenceManager.State.RegisterOnPersisting(async () => { await tcs.Task; throw new InvalidOperationException(); }, new TestRenderMode());
+        persistenceManager.State.RegisterOnPersisting(() => { invoked = true; return Task.CompletedTask; }, new TestRenderMode());
+
+        // Act
+        var persistTask = persistenceManager.PersistStateAsync(store, renderer);
+        tcs.SetResult();
+
+        await persistTask;
+
+        // Assert
+        Assert.True(invoked);
+        var log = Assert.Single(sink.Writes);
+        Assert.Equal(LogLevel.Error, log.LogLevel);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_InvokesAllCallbacksEvenIfACallbackIsRemovedAsPartOfRunningIt()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+
+        var executionSequence = new List<int>();
+
+        persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            executionSequence.Add(1);
+            return Task.CompletedTask;
+        }, new TestRenderMode());
+
+        PersistingComponentStateSubscription subscription2 = default;
+        subscription2 = persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            executionSequence.Add(2);
+            subscription2.Dispose();
+            return Task.CompletedTask;
+        }, new TestRenderMode());
+
+        var tcs = new TaskCompletionSource();
+        persistenceManager.State.RegisterOnPersisting(async () =>
+        {
+            executionSequence.Add(3);
+            await tcs.Task;
+            executionSequence.Add(4);
+        }, new TestRenderMode());
+
+        // Act
+        var persistTask = persistenceManager.PersistStateAsync(store, renderer);
+        tcs.SetResult(); // Allow the async callback to complete
+        await persistTask;
+
+        // Assert
+        Assert.Contains(3, executionSequence);
+        Assert.Contains(2, executionSequence);
+        Assert.Contains(1, executionSequence);
+        Assert.Contains(4, executionSequence);
+
+        Assert.Equal(4, executionSequence.Count);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_InvokesAllCallbacksWhenFirstCallbackUnregistersItself()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+        var renderer = new TestRenderer();
+
+        var executionSequence = new List<int>();
+
+        // Register the first callback that will unregister itself - this is the key test case
+        // where the first callback removes itself from the collection during iteration
+        PersistingComponentStateSubscription firstSubscription = default;
+        firstSubscription = persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            executionSequence.Add(1);
+            firstSubscription.Dispose(); // Remove itself from the collection
+            return Task.CompletedTask;
+        }, new TestRenderMode());
+
+        // Register additional callbacks to ensure they still get executed
+        persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            executionSequence.Add(2);
+            return Task.CompletedTask;
+        }, new TestRenderMode());
+
+        persistenceManager.State.RegisterOnPersisting(() =>
+        {
+            executionSequence.Add(3);
+            return Task.CompletedTask;
+        }, new TestRenderMode());
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        // All callbacks should be executed even though the first one removed itself
+        Assert.Contains(1, executionSequence);
+        Assert.Contains(2, executionSequence);
+        Assert.Contains(3, executionSequence);
+        Assert.Equal(3, executionSequence.Count);
+    }
+
+    [Fact]
+    public async Task RestoreStateAsync_ValidatesOnlySupportUpdatesWhenRestoreContextValueUpdate()
+    {
+        var store = new TestStore([]);
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        // First restore should work (initialize state)
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
+
+        // Second restore with non-ValueUpdate context should throw
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue));
+
+        Assert.Equal("State already initialized.", exception.Message);
+    }
+
+    [Fact]
+    public async Task RestoreStateAsync_ValidatesRegisteredUpdateCallbacksAreInvokedOnValueUpdates()
+    {
+        var store = new TestStore([]);
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            CreateServiceProvider());
+
+        var callbackInvoked = false;
+
+        // First restore to initialize state
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
+
+        // Register a callback for value updates through the state object
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = true };
+        persistenceManager.State.RegisterOnRestoring(() => { callbackInvoked = true; }, options);
+        // RegisterOnRestoring will invoke the callback immediately, so we reset it
+        callbackInvoked = false;
+
+        // Second restore with ValueUpdate context should invoke callbacks
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.ValueUpdate);
+
+        Assert.True(callbackInvoked);
+    }
+
+    [Theory]
+    [MemberData(nameof(RestoreContexts))]
+    public async Task RestoreStateAsync_RestoresServicesForDifferentContexts(RestoreContext context)
+    {
+        // Arrange
+        var componentRenderMode = new TestRenderMode();
+        var (serviceProvider, persistenceManager) = CreatePersistenceManagerWithService(componentRenderMode);
+
+        var service = serviceProvider.GetRequiredService<TestPersistentService>();
+        service.TestProperty = "Test Value";
+
+        var store = new TestStore([]);
+        await persistenceManager.RestoreStateAsync(store, RestoreContext.InitialValue);
+        await persistenceManager.PersistStateAsync(store, new TestRenderer());
+
+        // Act - Create new service provider and persistence manager
+        var (newServiceProvider, newPersistenceManager) = CreatePersistenceManagerWithService(componentRenderMode);
+
+        // Restore with the specified context
+        await newPersistenceManager.RestoreStateAsync(store, context);
+
+        // Assert
+        var restoredService = newServiceProvider.GetRequiredService<TestPersistentService>();
+        Assert.Equal("Test Value", restoredService.TestProperty);
+
+        static (IServiceProvider serviceProvider, ComponentStatePersistenceManager persistenceManager) CreatePersistenceManagerWithService(IComponentRenderMode renderMode)
+        {
+            var serviceProvider = new ServiceCollection()
+                .AddScoped<TestPersistentService>()
+                .AddPersistentService<TestPersistentService>(renderMode)
+                .BuildServiceProvider();
+
+            var persistenceManager = new ComponentStatePersistenceManager(
+                NullLogger<ComponentStatePersistenceManager>.Instance,
+                serviceProvider);
+            persistenceManager.SetPlatformRenderMode(renderMode);
+
+            return (serviceProvider, persistenceManager);
+        }
+    }
+
+    public static IEnumerable<object[]> RestoreContexts()
+    {
+        yield return new object[] { RestoreContext.InitialValue };
+        yield return new object[] { RestoreContext.ValueUpdate };
+        yield return new object[] { RestoreContext.LastSnapshot };
+    }
+
+    private class TestPersistentService
+    {
+        [PersistentState(AllowUpdates = true)]
+        public string TestProperty { get; set; } = string.Empty;
+    }
+
+    private class TestRenderer : Renderer
+    {
+        public TestRenderer() : base(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
+        {
+        }
+
+        private readonly Dispatcher _dispatcher = Dispatcher.CreateDefault();
+
+        public override Dispatcher Dispatcher => _dispatcher;
+
+        protected override void HandleException(Exception exception)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    private class TestStore(Dictionary<string, byte[]> initialState) : IPersistentComponentStateStore
+    {
+        public IDictionary<string, byte[]> State { get; set; } = initialState;
+
+        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
+        {
+            return Task.FromResult(State);
+        }
+
+        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
+        {
+            // We copy the data here because it's no longer available after this call completes.
+            State = state.ToDictionary(k => k.Key, v => v.Value);
+            return Task.CompletedTask;
+        }
+    }
+
+    private class CompositeTestStore(Dictionary<string, byte[]> initialState)
+        : IPersistentComponentStateStore, IEnumerable<IPersistentComponentStateStore>
+    {
+        public Dictionary<string, byte[]> State { get; set; } = initialState;
+
+        public IEnumerator<IPersistentComponentStateStore> GetEnumerator()
+        {
+            yield return new TestStore(State);
+            yield return new TestStore(State);
+        }
+
+        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
+        {
+            return Task.FromResult(State as IDictionary<string, byte[]>);
+        }
+
+        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
+        {
+            // We copy the data here because it's no longer available after this call completes.
+            State = state.ToDictionary(k => k.Key, v => v.Value);
+            return Task.CompletedTask;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+
+    private class TestRenderMode : IComponentRenderMode
+    {
+    }
+
+    private class PersistentService : IPersistentServiceRegistration
+    {
+        public string Assembly { get; set; }
+
+        public string FullTypeName { get; set; }
+
+        public IComponentRenderMode GetRenderModeOrDefault() => null;
+    }
+}
+
+static file class ComponentStatePersistenceManagerExtensions
+{
+    public static IServiceCollection AddPersistentService<TPersistentService>(this IServiceCollection services, IComponentRenderMode renderMode)
+    {
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<TPersistentService>(
+            services,
+            renderMode);
+        return services;
+    }
+}
diff --git a/src/Components/Components/test/PersistentState/PersistentComponentStateTest.cs b/src/Components/Components/test/PersistentState/PersistentComponentStateTest.cs
new file mode 100644
index 000000000000..a346e84645f8
--- /dev/null
+++ b/src/Components/Components/test/PersistentState/PersistentComponentStateTest.cs
@@ -0,0 +1,287 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class PersistentComponentStateTest
+{
+    [Fact]
+    public void InitializeExistingState_SetupsState()
+    {
+        // Arrange
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        var existingState = new Dictionary<string, byte[]>
+        {
+            ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(new byte[] { 1, 2, 3, 4 })
+        };
+
+        // Act
+        applicationState.InitializeExistingState(existingState, RestoreContext.InitialValue);
+
+        // Assert
+        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var existing));
+        Assert.Equal(new byte[] { 1, 2, 3, 4 }, existing);
+    }
+
+    [Fact]
+    public void InitializeExistingState_ThrowsIfAlreadyInitialized()
+    {
+        // Arrange
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        var existingState = new Dictionary<string, byte[]>
+        {
+            ["MyState"] = new byte[] { 1, 2, 3, 4 }
+        };
+
+        applicationState.InitializeExistingState(existingState, RestoreContext.InitialValue);
+
+        // Act & Assert
+        Assert.Throws<InvalidOperationException>(() => applicationState.InitializeExistingState(existingState, null));
+    }
+
+    [Fact]
+    public void RegisterOnPersisting_ThrowsIfCalledDuringOnPersisting()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var applicationState = new PersistentComponentState(currentState, [], [])
+        {
+            PersistingState = true
+        };
+
+        // Act & Assert
+        Assert.Throws<InvalidOperationException>(() => applicationState.RegisterOnPersisting(() => Task.CompletedTask));
+    }
+
+    [Fact]
+    public void TryRetrieveState_ReturnsStateWhenItExists()
+    {
+        // Arrange
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        var existingState = new Dictionary<string, byte[]>
+        {
+            ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(new byte[] { 1, 2, 3, 4 })
+        };
+
+        // Act
+        applicationState.InitializeExistingState(existingState, RestoreContext.InitialValue);
+
+        // Assert
+        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var existing));
+        Assert.Equal(new byte[] { 1, 2, 3, 4 }, existing);
+        Assert.False(applicationState.TryTakeFromJson<byte[]>("MyState", out var gone));
+    }
+
+    [Fact]
+    public void PersistState_SavesDataToTheStoreAsync()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var applicationState = new PersistentComponentState(currentState, [], [])
+        {
+            PersistingState = true
+        };
+        var myState = new byte[] { 1, 2, 3, 4 };
+
+        // Act
+        applicationState.PersistAsJson("MyState", myState);
+
+        // Assert
+        Assert.True(currentState.TryGetValue("MyState", out var stored));
+        Assert.Equal(myState, JsonSerializer.Deserialize<byte[]>(stored));
+    }
+
+    [Fact]
+    public void PersistState_ThrowsForDuplicateKeys()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var applicationState = new PersistentComponentState(currentState, [], [])
+        {
+            PersistingState = true
+        };
+        var myState = new byte[] { 1, 2, 3, 4 };
+
+        applicationState.PersistAsJson("MyState", myState);
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => applicationState.PersistAsJson("MyState", myState));
+    }
+
+    [Fact]
+    public void PersistAsJson_SerializesTheDataToJsonAsync()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var applicationState = new PersistentComponentState(currentState, [], [])
+        {
+            PersistingState = true
+        };
+        var myState = new byte[] { 1, 2, 3, 4 };
+
+        // Act
+        applicationState.PersistAsJson("MyState", myState);
+
+        // Assert
+        Assert.True(currentState.TryGetValue("MyState", out var stored));
+        Assert.Equal(myState, JsonSerializer.Deserialize<byte[]>(stored));
+    }
+
+    [Fact]
+    public void PersistAsJson_NullValueAsync()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var applicationState = new PersistentComponentState(currentState, [], [])
+        {
+            PersistingState = true
+        };
+
+        // Act
+        applicationState.PersistAsJson<byte[]>("MyState", null);
+
+        // Assert
+        Assert.True(currentState.TryGetValue("MyState", out var stored));
+        Assert.Null(JsonSerializer.Deserialize<byte[]>(stored));
+    }
+
+    [Fact]
+    public void TryRetrieveFromJson_DeserializesTheDataFromJson()
+    {
+        // Arrange
+        var myState = new byte[] { 1, 2, 3, 4 };
+        var serialized = JsonSerializer.SerializeToUtf8Bytes(myState);
+        var existingState = new Dictionary<string, byte[]>() { ["MyState"] = serialized };
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+
+        applicationState.InitializeExistingState(existingState, RestoreContext.InitialValue);
+
+        // Act
+        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var stored));
+
+        // Assert
+        Assert.Equal(myState, stored);
+        Assert.False(applicationState.TryTakeFromJson<byte[]>("MyState", out _));
+    }
+
+    [Fact]
+    public void TryRetrieveFromJson_NullValue()
+    {
+        // Arrange
+        var serialized = JsonSerializer.SerializeToUtf8Bytes<byte[]>(null);
+        var existingState = new Dictionary<string, byte[]>() { ["MyState"] = serialized };
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+
+        applicationState.InitializeExistingState(existingState, RestoreContext.InitialValue);
+
+        // Act
+        Assert.True(applicationState.TryTakeFromJson<byte[]>("MyState", out var stored));
+
+        // Assert
+        Assert.Null(stored);
+        Assert.False(applicationState.TryTakeFromJson<byte[]>("MyState", out _));
+    }
+
+    [Fact]
+    public void RegisterOnRestoring_InvokesCallbackWhenShouldRestoreMatches()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var callbacks = new List<RestoreComponentStateRegistration>();
+        var applicationState = new PersistentComponentState(currentState, [], callbacks);
+        applicationState.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+
+        var callbackInvoked = false;
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = false };
+
+        // Act
+        var subscription = applicationState.RegisterOnRestoring(() => { callbackInvoked = true; }, options);
+
+        // Assert
+        Assert.True(callbackInvoked);
+    }
+
+    [Fact]
+    public void RegisterOnRestoring_DoesNotInvokeCallbackWhenShouldRestoreDoesNotMatch()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var callbacks = new List<RestoreComponentStateRegistration>();
+        var applicationState = new PersistentComponentState(currentState, [], callbacks);
+        applicationState.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+
+        var callbackInvoked = false;
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.SkipInitialValue, AllowUpdates = false };
+
+        // Act
+        var subscription = applicationState.RegisterOnRestoring(() => { callbackInvoked = true; }, options);
+
+        // Assert
+        Assert.False(callbackInvoked);
+    }
+
+    [Fact]
+    public void RegisterOnRestoring_ReturnsDefaultSubscriptionWhenNotAllowingUpdates()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var callbacks = new List<RestoreComponentStateRegistration>();
+        var applicationState = new PersistentComponentState(currentState, [], callbacks);
+        applicationState.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = false };
+
+        // Act
+        var subscription = applicationState.RegisterOnRestoring(() => { }, options);
+
+        // Assert
+        Assert.Equal(default, subscription);
+        Assert.Empty(callbacks);
+    }
+
+    [Fact]
+    public void RegisterOnRestoring_ReturnsRestoringSubscriptionWhenAllowsUpdates()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var callbacks = new List<RestoreComponentStateRegistration>();
+        var applicationState = new PersistentComponentState(currentState, [], callbacks);
+        applicationState.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = true };
+
+        // Act
+        var subscription = applicationState.RegisterOnRestoring(() => { }, options);
+
+        // Assert
+        Assert.NotEqual(default, subscription);
+        Assert.Single(callbacks);
+    }
+
+    [Fact]
+    public void RegisterOnRestoring_SubscriptionCanBeDisposed()
+    {
+        // Arrange
+        var currentState = new Dictionary<string, byte[]>();
+        var callbacks = new List<RestoreComponentStateRegistration>();
+        var applicationState = new PersistentComponentState(currentState, [], callbacks);
+        applicationState.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.Default, AllowUpdates = true };
+        var subscription = applicationState.RegisterOnRestoring(() => { }, options);
+
+        Assert.Single(callbacks);
+
+        // Act
+        subscription.Dispose();
+
+        // Assert
+        Assert.Empty(callbacks);
+    }
+}
diff --git a/src/Components/Components/test/PersistentState/PersistentServicesRegistryTest.cs b/src/Components/Components/test/PersistentState/PersistentServicesRegistryTest.cs
new file mode 100644
index 000000000000..0fae4c1ebaf4
--- /dev/null
+++ b/src/Components/Components/test/PersistentState/PersistentServicesRegistryTest.cs
@@ -0,0 +1,665 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.PersistentState;
+
+public class PersistentServicesRegistryTest
+{
+    [Fact]
+    public async Task PersistStateAsync_PersistsServiceProperties()
+    {
+        // Arrange
+        var state = "myState";
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<TestService>()
+            .AddPersistentService<TestService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var testService = scope.GetService<TestService>();
+        testService.State = state;
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        var registry = persistenceManager.ServicesRegistry;
+
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+        var componentState = new PersistentComponentState(testStore.State, [], []);
+
+        var secondScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var secondManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            secondScope);
+
+        await secondManager.RestoreStateAsync(new TestStore(testStore.State));
+
+        // Assert
+        var service = secondScope.GetRequiredService<TestService>();
+        Assert.Equal(state, service.State);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_PersistsBaseServiceProperties()
+    {
+        // Arrange
+        var state = "myState";
+        var componentRenderMode = new TestRenderMode();
+        var serviceProviderOne = new ServiceCollection()
+            .AddScoped<BaseService, DerivedOne>()
+            .AddPersistentService<BaseService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var serviceProviderTwo = new ServiceCollection()
+            .AddScoped<BaseService, DerivedTwo>()
+            .AddPersistentService<BaseService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProviderOne.CreateAsyncScope().ServiceProvider;
+        var derivedOne = scope.GetService<BaseService>() as DerivedOne;
+        derivedOne.State = state;
+
+        var persistenceManagerOne = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManagerOne.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManagerOne.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+
+        await persistenceManagerOne.PersistStateAsync(testStore, new TestRenderer());
+
+        var scopeTwo = serviceProviderTwo.CreateAsyncScope().ServiceProvider;
+        var persistenceManagerTwo = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scopeTwo);
+
+        await persistenceManagerTwo.RestoreStateAsync(new TestStore(testStore.State));
+
+        // Assert
+        var derivedTwo = scopeTwo.GetRequiredService<BaseService>() as DerivedTwo;
+        Assert.Equal(state, derivedTwo.State);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_PersistsBaseClassPropertiesInDerivedInstance()
+    {
+        // Arrange
+        var state = "baseState";
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<BaseServiceWithProperty, DerivedService>()
+            .AddPersistentService<BaseServiceWithProperty>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var derivedService = serviceProvider.GetService<BaseServiceWithProperty>() as DerivedService;
+        derivedService.State = state;
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            serviceProvider.CreateAsyncScope().ServiceProvider);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        var secondManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            serviceProvider.CreateAsyncScope().ServiceProvider);
+
+        await secondManager.RestoreStateAsync(new TestStore(testStore.State));
+
+        // Assert
+        var restoredService = serviceProvider.GetRequiredService<BaseServiceWithProperty>() as DerivedService;
+        Assert.Equal(state, restoredService.State);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_DoesNotPersistNullServiceProperties()
+    {
+        // Arrange
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<TestService>()
+            .AddPersistentService<TestService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var testService = scope.GetService<TestService>();
+        testService.State = null;
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+
+        // Act
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        // Assert
+        var kvp = Assert.Single(testStore.State);
+        Assert.Equal(typeof(PersistentServicesRegistry).FullName, kvp.Key);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_DoesNotThrowIfServiceNotResolvedDuringRestore()
+    {
+        // Arrange
+        var state = "myState";
+        var componentRenderMode = new TestRenderMode();
+        var serviceProviderOne = new ServiceCollection()
+            .AddScoped<BaseService, DerivedOne>()
+            .AddPersistentService<BaseService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProviderOne.CreateAsyncScope().ServiceProvider;
+        var derivedOne = scope.GetService<BaseService>() as DerivedOne;
+        derivedOne.State = state;
+
+        var persistenceManagerOne = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManagerOne.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManagerOne.PersistStateAsync(testStore, new TestRenderer());
+
+        var serviceProviderTwo = new ServiceCollection()
+            .BuildServiceProvider();
+
+        var scopeTwo = serviceProviderTwo.CreateAsyncScope().ServiceProvider;
+        var persistenceManagerTwo = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scopeTwo);
+
+        // Act & Assert
+        var exception = await Record.ExceptionAsync(() => persistenceManagerTwo.RestoreStateAsync(new TestStore(testStore.State)));
+        Assert.Null(exception);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_RestoresStateForPersistedRegistrations()
+    {
+        // Arrange
+        var state = "myState";
+        var componentRenderMode = new TestRenderMode();
+        var serviceProviderOne = new ServiceCollection()
+            .AddScoped<BaseService, DerivedOne>()
+            .AddPersistentService<BaseService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var serviceProviderTwo = new ServiceCollection()
+            .AddScoped<BaseService, DerivedTwo>()
+            .BuildServiceProvider();
+
+        var scope = serviceProviderOne.CreateAsyncScope().ServiceProvider;
+        var derivedOne = scope.GetService<BaseService>() as DerivedOne;
+        derivedOne.State = state;
+
+        var persistenceManagerOne = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManagerOne.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManagerOne.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+
+        await persistenceManagerOne.PersistStateAsync(testStore, new TestRenderer());
+
+        var scopeTwo = serviceProviderTwo.CreateAsyncScope().ServiceProvider;
+        var persistenceManagerTwo = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scopeTwo);
+
+        await persistenceManagerTwo.RestoreStateAsync(new TestStore(testStore.State), RestoreContext.InitialValue);
+
+        // Assert
+        var derivedTwo = scopeTwo.GetRequiredService<BaseService>() as DerivedTwo;
+        Assert.Equal(state, derivedTwo.State);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_DoesNotThrow_WhenTypeCantBeFoundForPersistedRegistrations()
+    {
+        // Arrange
+        var componentRenderMode = new TestRenderMode();
+        var serviceProviderOne = new ServiceCollection()
+            .AddSingleton<IPersistentServiceRegistration>(new TestPersistentRegistration { Assembly = "FakeAssembly", FullTypeName = "FakeType" })
+            .BuildServiceProvider();
+
+        var serviceProviderTwo = new ServiceCollection()
+            .BuildServiceProvider();
+
+        var scope = serviceProviderOne.CreateAsyncScope().ServiceProvider;
+
+        var persistenceManagerOne = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManagerOne.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManagerOne.PersistStateAsync(testStore, new TestRenderer());
+
+        var scopeTwo = serviceProviderTwo.CreateAsyncScope().ServiceProvider;
+        var persistenceManagerTwo = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scopeTwo);
+
+        var exception = await Record.ExceptionAsync(async () => await persistenceManagerTwo.RestoreStateAsync(new TestStore(testStore.State)));
+        Assert.Null(exception);
+    }
+
+    [Fact]
+    public void ResolveRegistrations_RemovesDuplicateRegistrations()
+    {
+        // Arrange
+        var serviceProvider = new ServiceCollection()
+            .AddSingleton<RegisteredPersistentServiceRegistrationCollection>()
+            .AddSingleton<IPersistentServiceRegistration>(new TestPersistentRegistration { Assembly = "Assembly1", FullTypeName = "Type1" })
+            .AddSingleton<IPersistentServiceRegistration>(new TestPersistentRegistration { Assembly = "Assembly1", FullTypeName = "Type1" }) // Duplicate
+            .AddSingleton<IPersistentServiceRegistration>(new TestPersistentRegistration { Assembly = "Assembly2", FullTypeName = "Type2" })
+            .BuildServiceProvider();
+
+        var registry = new PersistentServicesRegistry(serviceProvider);
+
+        // Act
+        var registrations = registry.Registrations;
+
+        // Assert
+        Assert.Equal(2, registrations.Count);
+        Assert.Contains(registrations, r => r.Assembly == "Assembly1" && r.FullTypeName == "Type1");
+        Assert.Contains(registrations, r => r.Assembly == "Assembly2" && r.FullTypeName == "Type2");
+    }
+
+    private class TestStore : IPersistentComponentStateStore
+    {
+        public IDictionary<string, byte[]> State { get; set; }
+
+        public TestStore(IDictionary<string, byte[]> initialState)
+        {
+            State = initialState;
+        }
+
+        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
+        {
+            return Task.FromResult(State);
+        }
+
+        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
+        {
+            State = state.ToDictionary(k => k.Key, v => v.Value);
+            return Task.CompletedTask;
+        }
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_PersistsMultipleServicesWithDifferentStates()
+    {
+        // Arrange
+        var state1 = "state1";
+        var state2 = "state2";
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<TestService>()
+            .AddScoped<AnotherTestService>()
+            .AddPersistentService<TestService>(componentRenderMode)
+            .AddPersistentService<AnotherTestService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var testService = scope.GetService<TestService>();
+        var anotherTestService = scope.GetService<AnotherTestService>();
+        testService.State = state1;
+        anotherTestService.State = state2;
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        var secondScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var secondManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            secondScope);
+
+        await secondManager.RestoreStateAsync(new TestStore(testStore.State));
+
+        // Assert
+        var restoredTestService = secondScope.GetRequiredService<TestService>();
+        var restoredAnotherTestService = secondScope.GetRequiredService<AnotherTestService>();
+        Assert.Equal(state1, restoredTestService.State);
+        Assert.Equal(state2, restoredAnotherTestService.State);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_PersistsServiceWithComplexState()
+    {
+        // Arrange
+        var customer = new Customer
+        {
+            Name = "John Doe",
+            Addresses =
+            [
+                new Address { Street = "123 Main St", ZipCode = "12345" },
+                new Address { Street = "456 Elm St", ZipCode = "67890" }
+            ]
+        };
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<CustomerService>()
+            .AddPersistentService<CustomerService>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var customerService = scope.GetService<CustomerService>();
+        customerService.Customer = customer;
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        var secondScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var secondManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            secondScope);
+
+        await secondManager.RestoreStateAsync(new TestStore(testStore.State));
+
+        // Assert
+        var restoredCustomerService = secondScope.GetRequiredService<CustomerService>();
+        Assert.Equal(customer.Name, restoredCustomerService.Customer.Name);
+        Assert.Equal(customer.Addresses.Count, restoredCustomerService.Customer.Addresses.Count);
+        for (var i = 0; i < customer.Addresses.Count; i++)
+        {
+            Assert.Equal(customer.Addresses[i].Street, restoredCustomerService.Customer.Addresses[i].Street);
+            Assert.Equal(customer.Addresses[i].ZipCode, restoredCustomerService.Customer.Addresses[i].ZipCode);
+        }
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_RespectsSkipInitialValueBehavior()
+    {
+        // Arrange
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<ServiceWithSkipInitialValue>()
+            .AddPersistentService<ServiceWithSkipInitialValue>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var service = scope.GetRequiredService<ServiceWithSkipInitialValue>();
+        service.SkipInitialValueProperty = "TestValue";
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        // Act - Restore with InitialValue context
+        var initialValueScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var initialValueManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            initialValueScope);
+
+        await initialValueManager.RestoreStateAsync(new TestStore(testStore.State), RestoreContext.InitialValue);
+        var restoredService = initialValueScope.GetRequiredService<ServiceWithSkipInitialValue>();
+
+        // Assert - Property should be null because it was skipped during InitialValue restore
+        Assert.Null(restoredService.SkipInitialValueProperty);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_RespectsSkipLastSnapshotBehavior()
+    {
+        // Arrange
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<ServiceWithSkipLastSnapshot>()
+            .AddPersistentService<ServiceWithSkipLastSnapshot>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var service = scope.GetRequiredService<ServiceWithSkipLastSnapshot>();
+        service.SkipLastSnapshotProperty = "TestValue";
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var testStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+        await persistenceManager.PersistStateAsync(testStore, new TestRenderer());
+
+        // Act - Restore with LastSnapshot context
+        var lastSnapshotScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var lastSnapshotManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            lastSnapshotScope);
+
+        await lastSnapshotManager.RestoreStateAsync(new TestStore(testStore.State), RestoreContext.LastSnapshot);
+        var restoredService = lastSnapshotScope.GetRequiredService<ServiceWithSkipLastSnapshot>();
+
+        // Assert - Property should be null because it was skipped during LastSnapshot restore
+        Assert.Null(restoredService.SkipLastSnapshotProperty);
+    }
+
+    [Fact]
+    public async Task PersistStateAsync_RespectsAllowUpdatesBehavior()
+    {
+        // Arrange
+        var componentRenderMode = new TestRenderMode();
+        var serviceProvider = new ServiceCollection()
+            .AddScoped<ServiceWithAllowUpdates>()
+            .AddPersistentService<ServiceWithAllowUpdates>(componentRenderMode)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var service = scope.GetRequiredService<ServiceWithAllowUpdates>();
+        service.AllowUpdatesProperty = "InitialValue";
+
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            scope);
+        persistenceManager.SetPlatformRenderMode(componentRenderMode);
+        var initialStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await persistenceManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+        await persistenceManager.PersistStateAsync(initialStore, new TestRenderer());
+
+        // Create updated state
+        var updatedScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var updatedService = updatedScope.GetRequiredService<ServiceWithAllowUpdates>();
+        updatedService.AllowUpdatesProperty = "UpdatedValue";
+
+        var updatedManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            updatedScope);
+        var updatedStore = new TestStore(new Dictionary<string, byte[]>());
+
+        await updatedManager.RestoreStateAsync(new TestStore(new Dictionary<string, byte[]>()), RestoreContext.InitialValue);
+        await updatedManager.PersistStateAsync(updatedStore, new TestRenderer());
+
+        // Act - First restore with InitialValue, then update with ValueUpdate context
+        var targetScope = serviceProvider.CreateAsyncScope().ServiceProvider;
+        var targetManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            targetScope);
+
+        await targetManager.RestoreStateAsync(new TestStore(initialStore.State), RestoreContext.InitialValue);
+        var restoredService = targetScope.GetRequiredService<ServiceWithAllowUpdates>();
+        Assert.Equal("InitialValue", restoredService.AllowUpdatesProperty);
+
+        // Update with ValueUpdate context
+        await targetManager.RestoreStateAsync(new TestStore(updatedStore.State), RestoreContext.ValueUpdate);
+
+        // Assert - Property should be updated because AllowUpdates is true
+        Assert.Equal("UpdatedValue", restoredService.AllowUpdatesProperty);
+    }
+
+    private class ServiceWithSkipInitialValue
+    {
+        [PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
+        public string SkipInitialValueProperty { get; set; }
+    }
+
+    private class ServiceWithSkipLastSnapshot
+    {
+        [PersistentState(RestoreBehavior = RestoreBehavior.SkipLastSnapshot)]
+        public string SkipLastSnapshotProperty { get; set; }
+    }
+
+    private class ServiceWithAllowUpdates
+    {
+        [PersistentState(AllowUpdates = true)]
+        public string AllowUpdatesProperty { get; set; }
+    }
+
+    private class AnotherTestService
+    {
+        [PersistentState]
+        public string State { get; set; }
+    }
+
+    private class CustomerService
+    {
+        [PersistentState]
+        public Customer Customer { get; set; }
+    }
+
+    private class Customer
+    {
+        public string Name { get; set; }
+        public List<Address> Addresses { get; set; }
+    }
+
+    private class Address
+    {
+        public string Street { get; set; }
+        public string ZipCode { get; set; }
+    }
+
+    private class TestRenderMode : IComponentRenderMode
+    {
+    }
+
+    private class TestService
+    {
+        [PersistentState]
+        public string State { get; set; }
+    }
+
+    private class BaseTestService
+    {
+        public string BaseState { get; }
+
+        public BaseTestService(string baseState)
+        {
+            BaseState = baseState;
+        }
+    }
+
+    private class DerivedTestService : BaseTestService
+    {
+        public string DerivedState { get; }
+
+        public DerivedTestService(string baseState, string derivedState)
+            : base(baseState)
+        {
+            DerivedState = derivedState;
+        }
+    }
+
+    private class TestRenderer : Renderer
+    {
+        public TestRenderer() : base(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
+        {
+        }
+
+        private readonly Dispatcher _dispatcher = Dispatcher.CreateDefault();
+
+        public override Dispatcher Dispatcher => _dispatcher;
+
+        protected override void HandleException(Exception exception)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    private class BaseService
+    {
+    }
+
+    private class DerivedOne : BaseService
+    {
+        [PersistentState]
+        public string State { get; set; }
+    }
+
+    private class DerivedTwo : BaseService
+    {
+        [PersistentState]
+        public string State { get; set; }
+    }
+
+    private class BaseServiceWithProperty
+    {
+        [PersistentState]
+        public string State { get; set; }
+    }
+
+    private class DerivedService : BaseServiceWithProperty
+    {
+    }
+
+    private class TestPersistentRegistration : IPersistentServiceRegistration
+    {
+        public string Assembly { get; set; }
+        public string FullTypeName { get; set; }
+
+        public IComponentRenderMode GetRenderModeOrDefault() => null;
+    }
+}
+
+static file class ComponentStatePersistenceManagerExtensions
+{
+    public static IServiceCollection AddPersistentService<TPersistentService>(this IServiceCollection services, IComponentRenderMode renderMode)
+    {
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<TPersistentService>(
+            services,
+            renderMode);
+        return services;
+    }
+}
diff --git a/src/Components/Components/test/PersistentState/RestoreContextTest.cs b/src/Components/Components/test/PersistentState/RestoreContextTest.cs
new file mode 100644
index 000000000000..c4ca50e65fd7
--- /dev/null
+++ b/src/Components/Components/test/PersistentState/RestoreContextTest.cs
@@ -0,0 +1,105 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+public class RestoreContextTest
+{
+    [Theory]
+    [InlineData(RestoreBehavior.Default)]
+    [InlineData(RestoreBehavior.SkipLastSnapshot)]
+    public void ShouldRestore_InitialValueContext_WithDefaultOrSkipLastSnapshot(RestoreBehavior behavior)
+    {
+        var options = new RestoreOptions { RestoreBehavior = behavior };
+
+        var result = RestoreContext.InitialValue.ShouldRestore(options);
+
+        Assert.True(result);
+    }
+
+    [Fact]
+    public void ShouldRestore_InitialValueContext_WithSkipInitialValue()
+    {
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.SkipInitialValue };
+
+        var result = RestoreContext.InitialValue.ShouldRestore(options);
+
+        Assert.False(result);
+    }
+
+    [Theory]
+    [InlineData(RestoreBehavior.Default, true, true)]
+    [InlineData(RestoreBehavior.Default, false, true)]
+    [InlineData(RestoreBehavior.SkipInitialValue, true, false)]
+    [InlineData(RestoreBehavior.SkipInitialValue, false, false)]
+    public void ShouldRestore_InitialValueContext_ShouldRestore_IsIndependentOfAllowUpdates(RestoreBehavior behavior, bool allowUpdates, bool expectedResult)
+    {
+        var options = new RestoreOptions { RestoreBehavior = behavior, AllowUpdates = allowUpdates };
+
+        var result = RestoreContext.InitialValue.ShouldRestore(options);
+
+        Assert.Equal(expectedResult, result);
+    }
+
+    [Theory]
+    [InlineData(RestoreBehavior.Default)]
+    [InlineData(RestoreBehavior.SkipInitialValue)]
+    public void ShouldRestore_LastSnapshotContext_WithDefaultOrSkipInitialValue(RestoreBehavior behavior)
+    {
+        var options = new RestoreOptions { RestoreBehavior = behavior };
+
+        var result = RestoreContext.LastSnapshot.ShouldRestore(options);
+
+        Assert.True(result);
+    }
+
+    [Fact]
+    public void ShouldRestore_LastSnapshotContext_WithSkipLastSnapshot()
+    {
+        var options = new RestoreOptions { RestoreBehavior = RestoreBehavior.SkipLastSnapshot };
+
+        var result = RestoreContext.LastSnapshot.ShouldRestore(options);
+
+        Assert.False(result);
+    }
+
+    [Theory]
+    [InlineData(RestoreBehavior.Default, true, true)]
+    [InlineData(RestoreBehavior.Default, false, true)]
+    [InlineData(RestoreBehavior.SkipLastSnapshot, true, false)]
+    [InlineData(RestoreBehavior.SkipLastSnapshot, false, false)]
+    public void ShouldRestore_LastSnapshotContext_ShouldRestore_IsIndependentOfAllowUpdates(RestoreBehavior behavior, bool allowUpdates, bool expectedResult)
+    {
+        var options = new RestoreOptions { RestoreBehavior = behavior, AllowUpdates = allowUpdates };
+
+        var result = RestoreContext.LastSnapshot.ShouldRestore(options);
+
+        Assert.Equal(expectedResult, result);
+    }
+
+    [Theory]
+    [InlineData(RestoreBehavior.Default)]
+    [InlineData(RestoreBehavior.SkipInitialValue)]
+    [InlineData(RestoreBehavior.SkipLastSnapshot)]
+    public void ShouldRestore_ValueUpdateContext_WithoutAllowUpdates(RestoreBehavior behavior)
+    {
+        var options = new RestoreOptions { RestoreBehavior = behavior };
+
+        var result = RestoreContext.ValueUpdate.ShouldRestore(options);
+
+        Assert.False(result);
+    }
+
+    [Theory]
+    [InlineData(RestoreBehavior.Default)]
+    [InlineData(RestoreBehavior.SkipInitialValue)]
+    [InlineData(RestoreBehavior.SkipLastSnapshot)]
+    public void ShouldRestore_ValueUpdateContext_WithAllowUpdates(RestoreBehavior behavior)
+    {
+        var options = new RestoreOptions { AllowUpdates = true, RestoreBehavior = behavior };
+
+        var result = RestoreContext.ValueUpdate.ShouldRestore(options);
+
+        Assert.True(result);
+    }
+}
diff --git a/src/Components/Components/test/PersistentStateValueProviderKeyResolverTests.cs b/src/Components/Components/test/PersistentStateValueProviderKeyResolverTests.cs
new file mode 100644
index 000000000000..2af1c97ce0d4
--- /dev/null
+++ b/src/Components/Components/test/PersistentStateValueProviderKeyResolverTests.cs
@@ -0,0 +1,428 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class PersistentStateValueProviderKeyResolverTests
+{
+    public static TheoryData<object, object> ValidKeyTypesData => new TheoryData<object, object>
+    {
+        { true, false },
+        { 'A', 'B' },
+        { (sbyte)42, (sbyte)-42 },
+        { (byte)240, (byte)15 },
+        { (short)12345, (short)-12345 },
+        { (ushort)54321, (ushort)12345 },
+        { 42, -42 },
+        { (uint)3000000000, (uint)1000000000 },
+        { 9223372036854775807L, -9223372036854775808L },
+        { (ulong)18446744073709551615UL, (ulong)1 },
+        { 3.14159f, -3.14159f },
+        { Math.PI, -Math.PI },
+        { 123456.789m, -123456.789m },
+        { new DateTime(2023, 1, 1), new DateTime(2023, 12, 31) },
+        { new DateTimeOffset(2023, 1, 1, 0, 0, 0, TimeSpan.FromSeconds(0)), new DateTimeOffset(2023, 12, 31, 0, 0, 0, TimeSpan.FromSeconds(0)) },
+        { "key1", "key2" },
+        // Include a very long key to validate logic around growing buffers
+        { new string('a', 10000), new string('b', 10000) },
+        { Guid.NewGuid(), Guid.NewGuid() },
+        { new DateOnly(2023, 1, 1), new DateOnly(2023, 12, 31) },
+        { new TimeOnly(12, 34, 56), new TimeOnly(23, 45, 56) },
+    };
+
+    public static TheoryData<object, object> InvalidKeyTypesData => new TheoryData<object, object>
+    {
+        { new object(), new object() },
+        { new TestComponent(), new TestComponent() }
+    };
+
+    [Fact]
+    public async Task PersistAsync_CanPersistMultipleComponentsOfSameType_WhenParentProvidesDifferentKeys()
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            new ServiceCollection().BuildServiceProvider());
+
+        persistenceManager.State.InitializeExistingState(state, RestoreContext.InitialValue);
+
+        var renderer = new TestRenderer();
+        var component1 = new TestComponent { State = "state1" };
+        var component2 = new TestComponent { State = "state2" };
+
+        var parentComponent = new ParentComponent();
+
+        var componentStates = CreateComponentState(renderer, [(component1, "key1"), (component2, "key2")], parentComponent);
+        var componentState1 = componentStates[0];
+        var componentState2 = componentStates[1];
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        var provider = new PersistentStateValueProvider(persistenceManager.State, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        provider.Subscribe(componentState1, cascadingParameterInfo);
+        provider.Subscribe(componentState2, cascadingParameterInfo);
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        Assert.NotEmpty(store.State);
+
+        // Check that keys are different for different component instances with different keys
+        var key1 = PersistentStateValueProviderKeyResolver.ComputeKey(componentState1, cascadingParameterInfo.PropertyName);
+        var key2 = PersistentStateValueProviderKeyResolver.ComputeKey(componentState2, cascadingParameterInfo.PropertyName);
+
+        Assert.NotEqual(key1, key2);
+
+        // Verify both states were persisted correctly
+        var newState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        newState.InitializeExistingState(store.State, null);
+
+        Assert.True(newState.TryTakeFromJson<string>(key1, out var retrievedValue1));
+        Assert.Equal("state1", retrievedValue1);
+
+        Assert.True(newState.TryTakeFromJson<string>(key2, out var retrievedValue2));
+        Assert.Equal("state2", retrievedValue2);
+    }
+
+    [Theory]
+    [MemberData(nameof(ValidKeyTypesData))]
+    public async Task PersistAsync_CanPersistMultipleComponentsOfSameType_SupportsDifferentKeyTypes(
+        object componentKey1,
+        object componentKey2)
+    {
+        // Arrange
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            new ServiceCollection().BuildServiceProvider());
+
+        await persistenceManager.RestoreStateAsync(new TestStore([]), RestoreContext.InitialValue);
+
+        var renderer = new TestRenderer();
+        var component1 = new TestComponent { State = "state1" };
+        var component2 = new TestComponent { State = "state2" };
+
+        var parentComponent = new ParentComponent();
+
+        var componentStates = CreateComponentState(renderer, [(component1, componentKey1), (component2, componentKey2)], parentComponent);
+        var componentState1 = componentStates[0];
+        var componentState2 = componentStates[1];
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        var provider = new PersistentStateValueProvider(persistenceManager.State, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        provider.Subscribe(componentState1, cascadingParameterInfo);
+        provider.Subscribe(componentState2, cascadingParameterInfo);
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        Assert.NotEmpty(store.State);
+
+        // Check that keys are different for different component instances with different keys
+        var key1 = PersistentStateValueProviderKeyResolver.ComputeKey(componentState1, cascadingParameterInfo.PropertyName);
+        var key2 = PersistentStateValueProviderKeyResolver.ComputeKey(componentState2, cascadingParameterInfo.PropertyName);
+
+        Assert.NotEqual(key1, key2);
+
+        // Verify both states were persisted correctly
+        var newState = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        newState.InitializeExistingState(store.State, null);
+
+        Assert.True(newState.TryTakeFromJson<string>(key1, out var retrievedValue1));
+        Assert.Equal("state1", retrievedValue1);
+
+        Assert.True(newState.TryTakeFromJson<string>(key2, out var retrievedValue2));
+        Assert.Equal("state2", retrievedValue2);
+    }
+
+    [Fact]
+    public async Task PersistenceFails_IfMultipleComponentsOfSameType_TryToPersistDataWithoutParentComponents()
+    {
+        // Arrange
+        var (logger, sink) = CreateTestLogger();
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            logger,
+            new ServiceCollection().BuildServiceProvider());
+
+        persistenceManager.State.InitializeExistingState(state, RestoreContext.InitialValue);
+
+        var renderer = new TestRenderer();
+        var component1 = new TestComponent { State = "state1" };
+        var component2 = new TestComponent { State = "state2" };
+
+        var componentStates = CreateComponentState(renderer, [(component1, null), (component2, null)], null);
+        var componentState1 = componentStates[0];
+        var componentState2 = componentStates[1];
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        var provider = new PersistentStateValueProvider(persistenceManager.State, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        provider.Subscribe(componentState1, cascadingParameterInfo);
+        provider.Subscribe(componentState2, cascadingParameterInfo);
+
+        // Check that keys are the same for multiple component instances without keys
+        var key1 = PersistentStateValueProviderKeyResolver.ComputeKey(componentState1, cascadingParameterInfo.PropertyName);
+        var key2 = PersistentStateValueProviderKeyResolver.ComputeKey(componentState2, cascadingParameterInfo.PropertyName);
+
+        Assert.Equal(key1, key2);
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        var messages = sink.Writes.Where(x => x.LogLevel >= LogLevel.Warning).ToList();
+        Assert.Single(messages);
+    }
+
+    private static (ILogger<ComponentStatePersistenceManager> logger, TestSink testLoggerSink) CreateTestLogger()
+    {
+        var testLoggerSink = new TestSink();
+        var loggerFactory = new TestLoggerFactory(testLoggerSink, enabled: true);
+        var logger = loggerFactory.CreateLogger<ComponentStatePersistenceManager>();
+        return (logger, testLoggerSink);
+    }
+
+    [Fact]
+    public async Task PersistentceFails_IfMultipleComponentsOfSameType_TryToPersistDataWithParentComponentOfSameType()
+    {
+        // Arrange
+        var (logger, sink) = CreateTestLogger();
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            logger,
+            new ServiceCollection().BuildServiceProvider());
+
+        persistenceManager.State.InitializeExistingState(state, RestoreContext.InitialValue);
+
+        var renderer = new TestRenderer();
+        var component1 = new TestComponent { State = "state1" };
+        var component2 = new TestComponent { State = "state2" };
+
+        var parentComponent = new TestComponent();
+
+        var componentStates = CreateComponentState(renderer, [(component1, null), (component2, null)], parentComponent);
+        var componentState1 = componentStates[0];
+        var componentState2 = componentStates[1];
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        var provider = new PersistentStateValueProvider(persistenceManager.State, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        provider.Subscribe(componentState1, cascadingParameterInfo);
+        provider.Subscribe(componentState2, cascadingParameterInfo);
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        var messages = sink.Writes.Where(x => x.LogLevel >= LogLevel.Warning).ToList();
+        Assert.Single(messages);
+    }
+
+    [Fact]
+    public async Task PersistenceFails_MultipleComponentsUseTheSameKey()
+    {
+        // Arrange
+        var (logger, sink) = CreateTestLogger();
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            logger,
+            new ServiceCollection().BuildServiceProvider());
+
+        persistenceManager.State.InitializeExistingState(state, RestoreContext.InitialValue);
+
+        var renderer = new TestRenderer();
+        var component1 = new TestComponent { State = "state1" };
+        var component2 = new TestComponent { State = "state2" };
+
+        var parentComponent = new ParentComponent();
+
+        var componentStates = CreateComponentState(renderer, [(component1, "key1"), (component2, "key1")], parentComponent);
+        var componentState1 = componentStates[0];
+        var componentState2 = componentStates[1];
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        var provider = new PersistentStateValueProvider(persistenceManager.State, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        provider.Subscribe(componentState1, cascadingParameterInfo);
+        provider.Subscribe(componentState2, cascadingParameterInfo);
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        var messages = sink.Writes.Where(x => x.LogLevel >= LogLevel.Warning).ToList();
+        Assert.Single(messages);
+    }
+
+    [Theory]
+    [MemberData(nameof(InvalidKeyTypesData))]
+    public async Task PersistenceFails_MultipleComponentsUseInvalidKeyTypes(object componentKeyType1, object componentKeyType2)
+    {
+        // Arrange
+        var (logger, sink) = CreateTestLogger();
+        var state = new Dictionary<string, byte[]>();
+        var store = new TestStore(state);
+        var persistenceManager = new ComponentStatePersistenceManager(
+            logger,
+            new ServiceCollection().BuildServiceProvider());
+
+        persistenceManager.State.InitializeExistingState(state, RestoreContext.InitialValue);
+
+        var renderer = new TestRenderer();
+        var component1 = new TestComponent { State = "state1" };
+        var component2 = new TestComponent { State = "state2" };
+
+        var parentComponent = new ParentComponent();
+
+        var componentStates = CreateComponentState(renderer, [(component1, componentKeyType1), (component2, componentKeyType2)], parentComponent);
+        var componentState1 = componentStates[0];
+        var componentState2 = componentStates[1];
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        var provider = new PersistentStateValueProvider(persistenceManager.State, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        provider.Subscribe(componentState1, cascadingParameterInfo);
+        provider.Subscribe(componentState2, cascadingParameterInfo);
+
+        // Act
+        await persistenceManager.PersistStateAsync(store, renderer);
+
+        // Assert
+        var messages = sink.Writes.Where(x => x.LogLevel >= LogLevel.Warning).ToList();
+        Assert.Single(messages);
+    }
+
+    private static CascadingParameterInfo CreateCascadingParameterInfo(string propertyName, Type propertyType)
+    {
+        return new CascadingParameterInfo(
+            new PersistentStateAttribute(),
+            propertyName,
+            propertyType);
+    }
+
+    private static List<ComponentState> CreateComponentState(
+        TestRenderer renderer,
+        List<(IComponent, object)> components,
+        IComponent parentComponent = null)
+    {
+        var i = 1;
+        var parentComponentState = parentComponent != null ? new ComponentState(renderer, i++, parentComponent, null) : null;
+        var currentRenderTree = parentComponentState?.CurrentRenderTree;
+        var result = new List<ComponentState>();
+        foreach (var (component, key) in components)
+        {
+            var componentState = new ComponentState(renderer, i++, component, parentComponentState);
+            if (currentRenderTree != null && key != null)
+            {
+                // Open component based on the actual component type
+                if (component is TestComponent)
+                {
+                    currentRenderTree.OpenComponent<TestComponent>(0);
+                }
+                else if (component is ValueTypeTestComponent)
+                {
+                    currentRenderTree.OpenComponent<ValueTypeTestComponent>(0);
+                }
+                else
+                {
+                    currentRenderTree.OpenComponent<IComponent>(0);
+                }
+
+                var frames = currentRenderTree.GetFrames();
+                frames.Array[frames.Count - 1].ComponentStateField = componentState;
+                if (key != null)
+                {
+                    currentRenderTree.SetKey(key);
+                }
+                currentRenderTree.CloseComponent();
+            }
+
+            result.Add(componentState);
+        }
+
+        return result;
+    }
+
+    private class TestRenderer() : Renderer(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
+    {
+        public override Dispatcher Dispatcher => Dispatcher.CreateDefault();
+
+        protected override void HandleException(Exception exception) => throw new NotImplementedException();
+        protected override Task UpdateDisplayAsync(in RenderBatch renderBatch) => throw new NotImplementedException();
+    }
+
+    private class TestComponent : IComponent
+    {
+        [PersistentState]
+        public string State { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class ValueTypeTestComponent : IComponent
+    {
+        [PersistentState]
+        public int IntValue { get; set; }
+
+        [PersistentState]
+        public int? NullableIntValue { get; set; }
+
+        [PersistentState]
+        public (string, int) TupleValue { get; set; }
+
+        [PersistentState]
+        public (string, int)? NullableTupleValue { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class TestStore(Dictionary<string, byte[]> initialState) : IPersistentComponentStateStore
+    {
+        public IDictionary<string, byte[]> State { get; set; } = initialState;
+
+        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
+        {
+            return Task.FromResult(State);
+        }
+
+        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
+        {
+            // We copy the data here because it's no longer available after this call completes.
+            State = state.ToDictionary(k => k.Key, v => v.Value);
+            return Task.CompletedTask;
+        }
+    }
+
+    private class ParentComponent : IComponent
+    {
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Components/Components/test/PersistentStateValueProviderTests.cs b/src/Components/Components/test/PersistentStateValueProviderTests.cs
new file mode 100644
index 000000000000..65413bd335da
--- /dev/null
+++ b/src/Components/Components/test/PersistentStateValueProviderTests.cs
@@ -0,0 +1,204 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class PersistentStateValueProviderTests
+{
+    [Fact]
+    public void CanRestoreState_ForComponentWithProperties()
+    {
+        // Arrange
+        var state = new PersistentComponentState(
+            new Dictionary<string, byte[]>(),
+            [],
+            []);
+
+        var provider = new PersistentStateValueProvider(state, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+        var renderer = new TestRenderer();
+        var component = new TestComponent();
+        var componentStates = CreateComponentState(renderer, [(component, null)], null);
+        var componentState = componentStates.First();
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        InitializeState(state,
+        new List<(ComponentState, string, string)>
+        {
+            (componentState, cascadingParameterInfo.PropertyName, "state")
+        });
+
+        provider.Subscribe(componentState, cascadingParameterInfo);
+
+        // Act
+        var result = provider.GetCurrentValue(componentState, cascadingParameterInfo);
+
+        // Assert
+        Assert.Equal("state", result);
+    }
+
+    [Fact]
+    public void Subscribe_RegistersPersistenceCallback()
+    {
+        // Arrange
+        var state = new PersistentComponentState(
+            new Dictionary<string, byte[]>(),
+            [],
+            []);
+
+        InitializeState(state, []);
+
+        var provider = new PersistentStateValueProvider(state, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+        var renderer = new TestRenderer();
+        var component = new TestComponent();
+        var componentStates = CreateComponentState(renderer, [(component, null)], null);
+        var componentState = componentStates.First();
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        // Act
+        provider.Subscribe(componentState, cascadingParameterInfo);
+
+        // Assert
+        Assert.Single(provider.Subscriptions);
+    }
+
+    [Fact]
+    public void Unsubscribe_RemovesCallbackFromRegisteredCallbacks()
+    {
+        // Arrange
+        var state = new PersistentComponentState(
+            new Dictionary<string, byte[]>(),
+            [],
+            []);
+
+        InitializeState(state, []);
+
+        var provider = new PersistentStateValueProvider(state, NullLogger<PersistentStateValueProvider>.Instance, new ServiceCollection().BuildServiceProvider());
+
+        var renderer = new TestRenderer();
+        var component = new TestComponent();
+        var componentStates = CreateComponentState(renderer, [(component, null)], null);
+        var componentState = componentStates.First();
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        provider.Subscribe(componentState, cascadingParameterInfo);
+
+        // Act
+        provider.Unsubscribe(componentState, cascadingParameterInfo);
+
+        // Assert
+        Assert.Empty(provider.Subscriptions);
+    }
+
+    private static void InitializeState(PersistentComponentState state, List<(ComponentState componentState, string propertyName, string value)> items)
+    {
+        var dictionary = new Dictionary<string, byte[]>();
+        foreach (var item in items)
+        {
+            var key = PersistentStateValueProviderKeyResolver.ComputeKey(item.componentState, item.propertyName);
+            dictionary[key] = JsonSerializer.SerializeToUtf8Bytes(item.value, JsonSerializerOptions.Web);
+        }
+        state.InitializeExistingState(dictionary, RestoreContext.InitialValue);
+    }
+
+    private static CascadingParameterInfo CreateCascadingParameterInfo(string propertyName, Type propertyType)
+    {
+        return new CascadingParameterInfo(
+            new PersistentStateAttribute(),
+            propertyName,
+            propertyType);
+    }
+
+    private static List<ComponentState> CreateComponentState(
+        TestRenderer renderer,
+        List<(IComponent, object)> components,
+        IComponent parentComponent = null)
+    {
+        var i = 1;
+        var parentComponentState = parentComponent != null ? new ComponentState(renderer, i++, parentComponent, null) : null;
+        var currentRenderTree = parentComponentState?.CurrentRenderTree;
+        var result = new List<ComponentState>();
+        foreach (var (component, key) in components)
+        {
+            var componentState = new ComponentState(renderer, i++, component, parentComponentState);
+            if (currentRenderTree != null && key != null)
+            {
+                // Open component based on the actual component type
+                if (component is TestComponent)
+                {
+                    currentRenderTree.OpenComponent<TestComponent>(0);
+                }
+                else if (component is ValueTypeTestComponent)
+                {
+                    currentRenderTree.OpenComponent<ValueTypeTestComponent>(0);
+                }
+                else
+                {
+                    currentRenderTree.OpenComponent<IComponent>(0);
+                }
+
+                var frames = currentRenderTree.GetFrames();
+                frames.Array[frames.Count - 1].ComponentStateField = componentState;
+                if (key != null)
+                {
+                    currentRenderTree.SetKey(key);
+                }
+                currentRenderTree.CloseComponent();
+            }
+
+            result.Add(componentState);
+        }
+
+        return result;
+    }
+
+    private class TestRenderer() : Renderer(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
+    {
+        public override Dispatcher Dispatcher => Dispatcher.CreateDefault();
+
+        protected override void HandleException(Exception exception) => throw new NotImplementedException();
+        protected override Task UpdateDisplayAsync(in RenderBatch renderBatch) => throw new NotImplementedException();
+    }
+
+    private class TestComponent : IComponent
+    {
+        [PersistentState]
+        public string State { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class ValueTypeTestComponent : IComponent
+    {
+        [PersistentState]
+        public int IntValue { get; set; }
+
+        [PersistentState]
+        public int? NullableIntValue { get; set; }
+
+        [PersistentState]
+        public (string, int) TupleValue { get; set; }
+
+        [PersistentState]
+        public (string, int)? NullableTupleValue { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class ParentComponent : IComponent
+    {
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Components/Components/test/PersistentValueProviderComponentSubscriptionTests.cs b/src/Components/Components/test/PersistentValueProviderComponentSubscriptionTests.cs
new file mode 100644
index 000000000000..fe0be71cfa25
--- /dev/null
+++ b/src/Components/Components/test/PersistentValueProviderComponentSubscriptionTests.cs
@@ -0,0 +1,711 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Runtime.ExceptionServices;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Components;
+
+public class PersistentValueProviderComponentSubscriptionTests
+{
+    [Fact]
+    public void Constructor_CreatesSubscription_AndRegistersCallbacks()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "test-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        // Act
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Assert - Constructor should complete without throwing
+        Assert.NotNull(subscription);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_ReturnsNull_WhenNotInitialized()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "test-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Null(result);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_RestoresFromPersistentState_OnFirstCall()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "initial-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate the state with serialized data
+        var key = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(TestComponent.State));
+        initialState[key] = JsonSerializer.SerializeToUtf8Bytes("persisted-value", JsonSerializerOptions.Web);
+        state.InitializeExistingState(initialState, RestoreContext.LastSnapshot);
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Equal("persisted-value", result);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_ReturnsCurrentPropertyValue_AfterInitialization()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "current-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Initialize by calling once
+        subscription.GetOrComputeLastValue();
+
+        // Change the component's property value
+        component.State = "updated-value";
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Equal("updated-value", result);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_CanRestoreValueTypes()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new ValueTypeTestComponent { IntValue = 42 };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate the state with serialized data
+        var key = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(ValueTypeTestComponent.IntValue));
+        initialState[key] = JsonSerializer.SerializeToUtf8Bytes(123, JsonSerializerOptions.Web);
+        state.InitializeExistingState(initialState, RestoreContext.LastSnapshot);
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(ValueTypeTestComponent.IntValue), typeof(int));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Equal(123, result);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_CanRestoreNullableValueTypes()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new ValueTypeTestComponent { NullableIntValue = 42 };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate the state with serialized data
+        var key = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(ValueTypeTestComponent.NullableIntValue));
+        initialState[key] = JsonSerializer.SerializeToUtf8Bytes((int?)456, JsonSerializerOptions.Web);
+        state.InitializeExistingState(initialState, RestoreContext.LastSnapshot);
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(ValueTypeTestComponent.NullableIntValue), typeof(int?));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Equal(456, result);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void Dispose_DisposesSubscriptions()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "test-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act & Assert - Should not throw
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_ReturnsNull_WhenSkipInitialValueAndInitialContext()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "initial-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate the state with serialized data that should be skipped
+        var key = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(TestComponent.State));
+        initialState[key] = JsonSerializer.SerializeToUtf8Bytes("persisted-value", JsonSerializerOptions.Web);
+        state.InitializeExistingState(initialState, RestoreContext.InitialValue);
+
+        var cascadingParameterInfo = CreateCascadingParameterInfoWithBehavior(
+            nameof(TestComponent.State),
+            typeof(string),
+            RestoreBehavior.SkipInitialValue);
+
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Null(result);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public async Task GetOrComputeLastValue_FollowsCorrectValueTransitionSequence()
+    {
+        // Arrange
+        var appState = new Dictionary<string, byte[]>();
+        var manager = new ComponentStatePersistenceManager(NullLogger<ComponentStatePersistenceManager>.Instance);
+        var state = manager.State;
+        var serviceProvider = PersistentStateProviderServiceCollectionExtensions.AddSupplyValueFromPersistentComponentStateProvider(new ServiceCollection())
+            .AddSingleton(manager)
+            .AddSingleton(manager.State)
+            .AddFakeLogging()
+            .BuildServiceProvider();
+        var renderer = new TestRenderer(serviceProvider);
+        var provider = (PersistentStateValueProvider)renderer.ServiceProviderCascadingValueSuppliers.Single();
+        var component = new TestComponent { State = "initial-property-value" };
+        var componentId = renderer.AssignRootComponentId(component);
+        var componentState = renderer.GetComponentState(component);
+
+        // Pre-populate the state with serialized data
+        var key = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(TestComponent.State));
+        appState[key] = JsonSerializer.SerializeToUtf8Bytes("first-persisted-value", JsonSerializerOptions.Web);
+        await manager.RestoreStateAsync(new TestStore(appState), RestoreContext.InitialValue);
+
+        await renderer.Dispatcher.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId, ParameterView.Empty));
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+
+        // Act & Assert - First call: Returns restored value from state
+        Assert.Equal("first-persisted-value", provider.GetCurrentValue(componentState, cascadingParameterInfo));
+
+        // Change the component's property value
+        component.State = "updated-property-value";
+
+        // Second call: Returns the component's property value
+        var result2 = provider.GetCurrentValue(componentState, cascadingParameterInfo);
+        Assert.Equal("updated-property-value", result2);
+
+        appState.Clear();
+        var newState = new Dictionary<string, byte[]>
+        {
+            [key] = JsonSerializer.SerializeToUtf8Bytes("second-restored-value", JsonSerializerOptions.Web)
+        };
+        // Simulate invoking the callback with a value update.
+        await renderer.Dispatcher.InvokeAsync(() => manager.RestoreStateAsync(new TestStore(newState), RestoreContext.ValueUpdate));
+        Assert.Equal("second-restored-value", provider.GetCurrentValue(componentState, cascadingParameterInfo));
+
+        component.State = "another-updated-value";
+        // Other calls: Returns the updated value from state
+        Assert.Equal("another-updated-value", provider.GetCurrentValue(componentState, cascadingParameterInfo));
+        component.State = "final-updated-value";
+        Assert.Equal("final-updated-value", provider.GetCurrentValue(componentState, cascadingParameterInfo));
+        Assert.Equal("final-updated-value", provider.GetCurrentValue(componentState, cascadingParameterInfo));
+    }
+
+    [Fact]
+    public void GetOrComputeLastValue_UsesCustomSerializer_ForRestoration()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new CustomSerializerTestComponent { CustomValue = new CustomData { Value = "initial" } };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate the state with custom serialized data
+        var key = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(CustomSerializerTestComponent.CustomValue));
+        var customSerializer = new TestCustomDataSerializer();
+        var testData = new CustomData { Value = "restored-custom" };
+        var writer = new ArrayBufferWriter<byte>();
+        customSerializer.Persist(testData, writer);
+        initialState[key] = writer.WrittenSpan.ToArray();
+        state.InitializeExistingState(initialState, RestoreContext.LastSnapshot);
+
+        var cascadingParameterInfo = CreateCascadingParameterInfo(
+            nameof(CustomSerializerTestComponent.CustomValue),
+            typeof(CustomData));
+
+        var serviceProvider = new ServiceCollection()
+            .AddSingleton<PersistentComponentStateSerializer<CustomData>, TestCustomDataSerializer>()
+            .BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        // Act
+        var result = subscription.GetOrComputeLastValue();
+
+        // Assert
+        var customDataResult = Assert.IsType<CustomData>(result);
+        Assert.Equal("restored-custom", customDataResult.Value);
+        subscription.Dispose();
+    }
+
+    [Fact]
+    public void CanPersistAndRestore_MultipleProperties_OnSameComponent()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new MultiplePropertiesComponent
+        {
+            StringValue = "initial-string",
+            IntValue = 42,
+            BoolValue = true
+        };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate state for all properties
+        var stringKey = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(MultiplePropertiesComponent.StringValue));
+        var intKey = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(MultiplePropertiesComponent.IntValue));
+        var boolKey = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(MultiplePropertiesComponent.BoolValue));
+
+        initialState[stringKey] = JsonSerializer.SerializeToUtf8Bytes("restored-string", JsonSerializerOptions.Web);
+        initialState[intKey] = JsonSerializer.SerializeToUtf8Bytes(123, JsonSerializerOptions.Web);
+        initialState[boolKey] = JsonSerializer.SerializeToUtf8Bytes(false, JsonSerializerOptions.Web);
+        state.InitializeExistingState(initialState, RestoreContext.LastSnapshot);
+
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        // Create subscriptions for each property
+        var stringSubscription = new PersistentValueProviderComponentSubscription(
+            state, componentState,
+            CreateCascadingParameterInfo(nameof(MultiplePropertiesComponent.StringValue), typeof(string)),
+            serviceProvider, logger);
+
+        var intSubscription = new PersistentValueProviderComponentSubscription(
+            state, componentState,
+            CreateCascadingParameterInfo(nameof(MultiplePropertiesComponent.IntValue), typeof(int)),
+            serviceProvider, logger);
+
+        var boolSubscription = new PersistentValueProviderComponentSubscription(
+            state, componentState,
+            CreateCascadingParameterInfo(nameof(MultiplePropertiesComponent.BoolValue), typeof(bool)),
+            serviceProvider, logger);
+
+        // Act
+        var stringResult = stringSubscription.GetOrComputeLastValue();
+        var intResult = intSubscription.GetOrComputeLastValue();
+        var boolResult = boolSubscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Equal("restored-string", stringResult);
+        Assert.Equal(123, intResult);
+        Assert.Equal(false, boolResult);
+
+        // Cleanup
+        stringSubscription.Dispose();
+        intSubscription.Dispose();
+        boolSubscription.Dispose();
+    }
+
+    [Fact]
+    public void CanPersistAndRestore_DifferentPropertyTypes_OnSameComponent()
+    {
+        // Arrange
+        var initialState = new Dictionary<string, byte[]>();
+        var state = new PersistentComponentState(initialState, [], []);
+        var renderer = new TestRenderer();
+        var component = new ValueTypeTestComponent
+        {
+            IntValue = 42,
+            NullableIntValue = 100
+        };
+        var componentState = CreateComponentState(renderer, component, null, null);
+
+        // Pre-populate state for different property types
+        var intKey = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(ValueTypeTestComponent.IntValue));
+        var nullableIntKey = PersistentStateValueProviderKeyResolver.ComputeKey(componentState, nameof(ValueTypeTestComponent.NullableIntValue));
+
+        initialState[intKey] = JsonSerializer.SerializeToUtf8Bytes(999, JsonSerializerOptions.Web);
+        initialState[nullableIntKey] = JsonSerializer.SerializeToUtf8Bytes((int?)777, JsonSerializerOptions.Web);
+        state.InitializeExistingState(initialState, RestoreContext.LastSnapshot);
+
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        // Create subscriptions for different property types
+        var intSubscription = new PersistentValueProviderComponentSubscription(
+            state, componentState,
+            CreateCascadingParameterInfo(nameof(ValueTypeTestComponent.IntValue), typeof(int)),
+            serviceProvider, logger);
+
+        var nullableIntSubscription = new PersistentValueProviderComponentSubscription(
+            state, componentState,
+            CreateCascadingParameterInfo(nameof(ValueTypeTestComponent.NullableIntValue), typeof(int?)),
+            serviceProvider, logger);
+
+        // Act
+        var intResult = intSubscription.GetOrComputeLastValue();
+        var nullableIntResult = nullableIntSubscription.GetOrComputeLastValue();
+
+        // Assert
+        Assert.Equal(999, intResult);
+        Assert.Equal(777, nullableIntResult);
+
+        // Cleanup
+        intSubscription.Dispose();
+        nullableIntSubscription.Dispose();
+    }
+
+    private static CascadingParameterInfo CreateCascadingParameterInfo(string propertyName, Type propertyType)
+    {
+        return new CascadingParameterInfo(
+            new PersistentStateAttribute(),
+            propertyName,
+            propertyType);
+    }
+
+    private static CascadingParameterInfo CreateCascadingParameterInfoWithBehavior(
+        string propertyName,
+        Type propertyType,
+        RestoreBehavior restoreBehavior,
+        bool allowUpdates = false)
+    {
+        return new CascadingParameterInfo(
+            new PersistentStateAttribute
+            {
+                RestoreBehavior = restoreBehavior,
+                AllowUpdates = allowUpdates
+            },
+            propertyName,
+            propertyType);
+    }
+
+    private static ComponentState CreateComponentState(
+        TestRenderer renderer,
+        IComponent component,
+        IComponent parentComponent,
+        object key)
+    {
+        var parentComponentState = parentComponent != null
+            ? new ComponentState(renderer, 1, parentComponent, null)
+            : null;
+        var componentState = new ComponentState(renderer, 2, component, parentComponentState);
+
+        if (parentComponentState != null && parentComponentState.CurrentRenderTree != null && key != null)
+        {
+            var currentRenderTree = parentComponentState.CurrentRenderTree;
+
+            // Open component based on the actual component type
+            if (component is TestComponent)
+            {
+                currentRenderTree.OpenComponent<TestComponent>(0);
+            }
+            else if (component is ValueTypeTestComponent)
+            {
+                currentRenderTree.OpenComponent<ValueTypeTestComponent>(0);
+            }
+            else
+            {
+                currentRenderTree.OpenComponent<IComponent>(0);
+            }
+
+            var frames = currentRenderTree.GetFrames();
+            frames.Array[frames.Count - 1].ComponentStateField = componentState;
+            currentRenderTree.SetKey(key);
+            currentRenderTree.CloseComponent();
+        }
+
+        return componentState;
+    }
+
+    private class TestRenderer(IServiceProvider serviceProvider) : Renderer(serviceProvider, NullLoggerFactory.Instance)
+    {
+        public TestRenderer() : this(new ServiceCollection().BuildServiceProvider()) { }
+
+        public override Dispatcher Dispatcher => new TestDispatcher();
+
+        protected override void HandleException(Exception exception) => ExceptionDispatchInfo.Capture(exception);
+        protected override Task UpdateDisplayAsync(in RenderBatch renderBatch) => throw new NotImplementedException();
+    }
+
+    private class TestDispatcher : Dispatcher
+    {
+        public override bool CheckAccess() => true;
+        public override Task InvokeAsync(Action workItem)
+        {
+            workItem();
+            return Task.CompletedTask;
+        }
+
+        public override Task InvokeAsync(Func<Task> workItem)
+        {
+            return workItem();
+        }
+        public override Task<TResult> InvokeAsync<TResult>(Func<TResult> workItem)
+        {
+            return Task.FromResult(workItem());
+        }
+        public override Task<TResult> InvokeAsync<TResult>(Func<Task<TResult>> workItem)
+        {
+            return workItem();
+        }
+    }
+
+    private class TestComponent : IComponent
+    {
+        [PersistentState(AllowUpdates = true)]
+        public string State { get; set; }
+
+        public void Attach(RenderHandle renderHandle)
+        {            
+        }
+
+        public Task SetParametersAsync(ParameterView parameters)
+        {
+            parameters.SetParameterProperties(this);
+            return Task.CompletedTask;
+        }
+    }
+
+    private class ValueTypeTestComponent : IComponent
+    {
+        [PersistentState]
+        public int IntValue { get; set; }
+
+        [PersistentState]
+        public int? NullableIntValue { get; set; }
+
+        [PersistentState]
+        public (string, int) TupleValue { get; set; }
+
+        [PersistentState]
+        public (string, int)? NullableTupleValue { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class MultiplePropertiesComponent : IComponent
+    {
+        [PersistentState]
+        public string StringValue { get; set; }
+
+        [PersistentState]
+        public int IntValue { get; set; }
+
+        [PersistentState]
+        public bool BoolValue { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class CustomSerializerTestComponent : IComponent
+    {
+        [PersistentState]
+        public CustomData CustomValue { get; set; }
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class CustomData
+    {
+        public string Value { get; set; }
+    }
+
+    private class TestCustomDataSerializer : PersistentComponentStateSerializer<CustomData>
+    {
+        public override void Persist(CustomData value, IBufferWriter<byte> writer)
+        {
+            var json = JsonSerializer.SerializeToUtf8Bytes($"CUSTOM:{value.Value}");
+            writer.Write(json);
+        }
+
+        public override CustomData Restore(ReadOnlySequence<byte> data)
+        {
+            var json = JsonSerializer.Deserialize<string>(data.ToArray());
+            var value = json.StartsWith("CUSTOM:", StringComparison.Ordinal) ? json.Substring(7) : json;
+            return new CustomData { Value = value };
+        }
+    }
+
+    private class ParentComponent : IComponent
+    {
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class TestStore(IDictionary<string, byte[]> state) : IPersistentComponentStateStore
+    {
+        public Task<IDictionary<string, byte[]>> GetPersistedStateAsync() => Task.FromResult(state);
+        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state) => throw new NotImplementedException();
+    }
+
+    private class ComponentWithPrivateProperty : IComponent
+    {
+        [PersistentState]
+        private string PrivateValue { get; set; } = "initial";
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    private class ComponentWithPrivateGetter : IComponent
+    {
+        [PersistentState]
+        public string PropertyWithPrivateGetter { private get; set; } = "initial";
+
+        public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+        public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+    }
+
+    [Fact]
+    public void Constructor_ThrowsClearException_ForPrivateProperty()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new ComponentWithPrivateProperty();
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo("PrivateValue", typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        // Act & Assert
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+            new PersistentValueProviderComponentSubscription(
+                state, componentState, cascadingParameterInfo, serviceProvider, logger));
+
+        // Should throw a clear error about needing a public property with public getter
+        Assert.Contains("A public property", exception.Message);
+        Assert.Contains("with a public getter wasn't found", exception.Message);
+    }
+
+    [Fact]
+    public void Constructor_ThrowsClearException_ForPrivateGetter()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new ComponentWithPrivateGetter();
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(ComponentWithPrivateGetter.PropertyWithPrivateGetter), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        // Act & Assert
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+            new PersistentValueProviderComponentSubscription(
+                state, componentState, cascadingParameterInfo, serviceProvider, logger));
+
+        // Should throw a clear error about needing a public property with public getter
+        Assert.Contains("A public property", exception.Message);
+        Assert.Contains("with a public getter wasn't found", exception.Message);
+    }
+
+    [Fact]
+    public void Constructor_WorksCorrectly_ForPublicProperty()
+    {
+        // Arrange
+        var state = new PersistentComponentState(new Dictionary<string, byte[]>(), [], []);
+        state.InitializeExistingState(new Dictionary<string, byte[]>(), RestoreContext.InitialValue);
+        var renderer = new TestRenderer();
+        var component = new TestComponent { State = "test-value" };
+        var componentState = CreateComponentState(renderer, component, null, null);
+        var cascadingParameterInfo = CreateCascadingParameterInfo(nameof(TestComponent.State), typeof(string));
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var logger = NullLogger.Instance;
+
+        // Act & Assert - Should not throw
+        var subscription = new PersistentValueProviderComponentSubscription(
+            state, componentState, cascadingParameterInfo, serviceProvider, logger);
+
+        Assert.NotNull(subscription);
+        subscription.Dispose();
+    }
+}
diff --git a/src/Components/Components/test/RenderTreeDiffBuilderTest.cs b/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
index aebcfcd4b692..4d495f690b47 100644
--- a/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
+++ b/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
@@ -1736,6 +1736,9 @@ public void SkipsUpdatingParametersOnChildComponentsIfAllAreDefinitelyImmutableA
         // Arrange: Populate old and new with equivalent content
         RenderFragment fragmentWillNotChange = builder => throw new NotImplementedException();
         var dateTimeWillNotChange = DateTime.Now;
+        var dateOnlyWillNotChange = DateOnly.FromDateTime(dateTimeWillNotChange);
+        var timeOnlyWillNotChange = TimeOnly.FromDateTime(dateTimeWillNotChange);
+
         foreach (var tree in new[] { oldTree, newTree })
         {
             tree.OpenComponent<CaptureSetParametersComponent>(0);
@@ -1758,6 +1761,8 @@ public void SkipsUpdatingParametersOnChildComponentsIfAllAreDefinitelyImmutableA
             tree.AddComponentParameter(1, "MyEnum", StringComparison.OrdinalIgnoreCase);
             tree.AddComponentParameter(1, "MyEventCallback", EventCallback.Empty);
             tree.AddComponentParameter(1, "MyEventCallbackOfT", EventCallback<int>.Empty);
+            tree.AddComponentParameter(1, "MyDateOnly", dateOnlyWillNotChange);
+            tree.AddComponentParameter(1, "MyTimeOnly", timeOnlyWillNotChange);
             tree.CloseComponent();
         }
 
diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs
index a71ff665d740..90d46f746d03 100644
--- a/src/Components/Components/test/RendererTest.cs
+++ b/src/Components/Components/test/RendererTest.cs
@@ -4,6 +4,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Globalization;
+using System.Reflection;
 using System.Runtime.ExceptionServices;
 using Microsoft.AspNetCore.Components.CompilerServices;
 using Microsoft.AspNetCore.Components.HotReload;
@@ -3065,8 +3066,8 @@ public void QueuedRenderIsSkippedIfComponentWasAlreadyDisposedInSameBatch()
         // Assert: correct render result
         Assert.True(renderTask.IsCompletedSuccessfully);
         var newBatch = renderer.Batches.Skip(1).Single();
-        Assert.Equal(1, newBatch.DisposedComponentIDs.Count);
-        Assert.Equal(1, newBatch.DiffsByComponentId.Count);
+        Assert.Single(newBatch.DisposedComponentIDs);
+        Assert.Single(newBatch.DiffsByComponentId);
         Assert.Collection(newBatch.DiffsByComponentId[componentId].Single().Edits,
             edit =>
             {
@@ -3433,7 +3434,7 @@ public void DoesNotCallOnAfterRenderForComponentsNotRendered()
         // Assert: Only the re-rendered component was notified of "after render"
         var batch2 = renderer.Batches.Skip(1).Single();
         Assert.Equal(2, batch2.DiffsInOrder.Count); // Parent and first child
-        Assert.Equal(1, batch2.DisposedComponentIDs.Count); // Third child
+        Assert.Single(batch2.DisposedComponentIDs); // Third child
         Assert.Equal(2, childComponents[0].OnAfterRenderCallCount); // Retained and re-rendered
         Assert.Equal(1, childComponents[1].OnAfterRenderCallCount); // Retained and not re-rendered
         Assert.Equal(1, childComponents[2].OnAfterRenderCallCount); // Disposed
@@ -5027,6 +5028,40 @@ public async Task DisposingRenderer_UnsubsribesFromHotReloadManager()
         Assert.False(hotReloadManager.IsSubscribedTo);
     }
 
+    [Fact]
+    public async Task HotReload_ReRenderPreservesAsyncLocalValues()
+    {
+        await using var renderer = new TestRenderer();
+
+        var hotReloadManager = new HotReloadManager { MetadataUpdateSupported = true };
+        renderer.HotReloadManager = hotReloadManager;
+        HotReloadManager.Default.MetadataUpdateSupported = true;
+
+        var component = new AsyncLocalCaptureComponent();
+
+        // Establish AsyncLocal value before registering hot reload handler / rendering.
+        ServiceAccessor.TestAsyncLocal.Value = "AmbientValue";
+
+        var componentId = renderer.AssignRootComponentId(component);
+        await renderer.Dispatcher.InvokeAsync(() => renderer.RenderRootComponentAsync(componentId));
+
+        // Sanity: initial render should not have captured a hot-reload value yet.
+        Assert.Null(component.HotReloadValue);
+
+        // Simulate hot reload delta applied from a fresh thread (different ExecutionContext) so the AsyncLocal value is lost.
+        var expected = ServiceAccessor.TestAsyncLocal.Value;
+        var thread = new Thread(() =>
+        {
+            // Simulate environment where the ambient value is not present on the hot reload thread.
+            ServiceAccessor.TestAsyncLocal.Value = null;
+            hotReloadManager.TriggerOnDeltaApplied();
+        });
+        thread.Start();
+        thread.Join();
+
+        Assert.Equal(expected, component.HotReloadValue);
+    }
+
     [Fact]
     public void ThrowsForUnknownRenderMode_OnComponentType()
     {
@@ -5180,6 +5215,34 @@ protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
             => Task.CompletedTask;
     }
 
+    private class ServiceAccessor
+    {
+        public static AsyncLocal<string> TestAsyncLocal = new AsyncLocal<string>();
+    }
+
+    private class AsyncLocalCaptureComponent : IComponent
+    {
+        private bool _initialized;
+        private RenderHandle _renderHandle;
+        public string HotReloadValue { get; private set; }
+
+        public void Attach(RenderHandle renderHandle) => _renderHandle = renderHandle;
+
+        public Task SetParametersAsync(ParameterView parameters)
+        {
+            if (!_initialized)
+            {
+                _initialized = true; // First (normal) render, don't capture.
+            }
+            else
+            {
+                // Hot reload re-render path.
+                HotReloadValue = ServiceAccessor.TestAsyncLocal.Value;
+            }
+            return Task.CompletedTask;
+        }
+    }
+
     private class TestComponent : IComponent, IDisposable
     {
         private RenderHandle _renderHandle;
diff --git a/src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs b/src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs
index e0f0d984899d..33e6cc1e0e40 100644
--- a/src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs
+++ b/src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Globalization;
+using Microsoft.AspNetCore.InternalTesting;
 
 namespace Microsoft.AspNetCore.Components.Rendering;
 
@@ -156,6 +157,7 @@ public async Task Post_CanRunAsynchronously_CaptureExecutionContext()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61639")]
     public async Task Post_CanRunAsynchronously_WhenBusy_Exception()
     {
         // Arrange
diff --git a/src/Components/Components/test/ResourceAssetCollectionTest.cs b/src/Components/Components/test/ResourceAssetCollectionTest.cs
index fa1ed1c09f09..04502d37640b 100644
--- a/src/Components/Components/test/ResourceAssetCollectionTest.cs
+++ b/src/Components/Components/test/ResourceAssetCollectionTest.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
 namespace Microsoft.AspNetCore.Components;
 
 public class ResourceAssetCollectionTest
@@ -17,7 +20,7 @@ public void CanCreateResourceCollection()
         var collectionAsReadOnlyList = resourceAssetCollection as IReadOnlyList<ResourceAsset>;
 
         // Assert
-        Assert.Equal(1, collectionAsReadOnlyList.Count);
+        Assert.Single(collectionAsReadOnlyList);
         Assert.Equal("image1.jpg", collectionAsReadOnlyList[0].Url);
     }
 
@@ -85,4 +88,68 @@ [new ResourceAssetProperty("label", "image2.jpg")]),
         Assert.False(isContentSpecificUrl1);
         Assert.True(isContentSpecificUrl2);
     }
+
+    [Fact]
+    public void ResourceAsset_CanSerializeAndDeserialize_WithoutRespectRequiredConstructorParameters()
+    {
+        // Arrange
+        var originalAsset = new ResourceAsset("test-url", null);
+        var options = new JsonSerializerOptions { WriteIndented = true };
+
+        // Act
+        var json = JsonSerializer.Serialize(originalAsset, options);
+        var deserializedAsset = JsonSerializer.Deserialize<ResourceAsset>(json, options);
+
+        // Assert
+        Assert.NotNull(deserializedAsset);
+        Assert.Equal("test-url", deserializedAsset.Url);
+        Assert.Null(deserializedAsset.Properties);
+    }
+
+    [Fact]
+    public void ResourceAsset_CanSerializeAndDeserialize_WithRespectRequiredConstructorParameters()
+    {
+        // Arrange
+        var originalAsset = new ResourceAsset("test-url", null);
+        var options = new JsonSerializerOptions 
+        { 
+            WriteIndented = true,
+            RespectRequiredConstructorParameters = true
+        };
+
+        // Act
+        var json = JsonSerializer.Serialize(originalAsset, options);
+        var deserializedAsset = JsonSerializer.Deserialize<ResourceAsset>(json, options);
+
+        // Assert
+        Assert.NotNull(deserializedAsset);
+        Assert.Equal("test-url", deserializedAsset.Url);
+        Assert.Null(deserializedAsset.Properties);
+    }
+
+    [Fact] 
+    public void ResourceAsset_WithSourceGenerationContext_CanSerializeAndDeserializeWithRespectRequiredConstructorParameters()
+    {
+        // Arrange - this test simulates the context from ResourceCollectionUrlEndpoint
+        var originalAsset = new ResourceAsset("test-url", null);
+        var assets = new List<ResourceAsset> { originalAsset };
+        
+        // Use a custom JsonSerializerOptions that mimics the source-generated context behavior
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
+            WriteIndented = false,
+            RespectRequiredConstructorParameters = true
+        };
+
+        // Act
+        var json = JsonSerializer.Serialize<IReadOnlyList<ResourceAsset>>(assets, options);
+        var deserializedAssets = JsonSerializer.Deserialize<IReadOnlyList<ResourceAsset>>(json, options);
+
+        // Assert
+        Assert.NotNull(deserializedAssets);
+        Assert.Single(deserializedAssets);
+        Assert.Equal("test-url", deserializedAssets[0].Url);
+        Assert.Null(deserializedAssets[0].Properties);
+    }
 }
diff --git a/src/Components/Components/test/Routing/RouterTest.cs b/src/Components/Components/test/Routing/RouterTest.cs
index 2e8a05bd9145..e3c7f5dafaae 100644
--- a/src/Components/Components/test/Routing/RouterTest.cs
+++ b/src/Components/Components/test/Routing/RouterTest.cs
@@ -1,8 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable CS0618 // Type or member is obsolete
+
 using System.Reflection;
 using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -111,7 +114,7 @@ public async Task AlreadyCanceledOnNavigateAsyncDoesNothing()
                 Assert.True(true);
                 return;
             }
-            Assert.True(false, "OnUpdateDisplay called more than once.");
+            Assert.Fail("OnUpdateDisplay called more than once.");
         };
         _router.OnNavigateAsync = new EventCallback<NavigationContext>(null, OnNavigateAsync);
 
@@ -164,7 +167,7 @@ public async Task RefreshesOnceOnCancelledOnNavigateAsync()
                 Assert.True(true);
                 return;
             }
-            Assert.True(false, "OnUpdateDisplay called more than once.");
+            Assert.Fail("OnUpdateDisplay called more than once.");
         };
         _router.OnNavigateAsync = new EventCallback<NavigationContext>(null, OnNavigateAsync);
 
@@ -265,6 +268,226 @@ await _renderer.Dispatcher.InvokeAsync(() =>
         Assert.Equal("Not found", renderedFrame.TextContent);
     }
 
+    [Fact]
+    public async Task ThrowsExceptionWhenBothNotFoundAndNotFoundPageAreSet()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+        services.AddSingleton<NavigationManager>(_navigationManager);
+        services.AddSingleton<INavigationInterception, TestNavigationInterception>();
+        services.AddSingleton<IScrollToLocationHash, TestScrollToLocationHash>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var renderer = new TestRenderer(serviceProvider);
+        renderer.ShouldHandleExceptions = true;
+        var router = (Router)renderer.InstantiateComponent<Router>();
+        router.AppAssembly = Assembly.GetExecutingAssembly();
+        router.Found = routeData => (builder) => builder.AddContent(0, $"Rendering route matching {routeData.PageType}");
+        renderer.AssignRootComponentId(router);
+
+        var parameters = new Dictionary<string, object>
+        {
+            { nameof(Router.AppAssembly), typeof(RouterTest).Assembly },
+            { nameof(Router.NotFound), (RenderFragment)(builder => builder.AddContent(0, "Custom not found")) },
+            { nameof(Router.NotFoundPage), typeof(NotFoundTestComponent) }
+        };
+
+        // Act & Assert
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+            await renderer.Dispatcher.InvokeAsync(() =>
+                router.SetParametersAsync(ParameterView.FromDictionary(parameters))));
+
+        Assert.Contains("Setting NotFound and NotFoundPage properties simultaneously is not supported", exception.Message);
+        Assert.Contains("Use either NotFound or NotFoundPage", exception.Message);
+    }
+
+    [Fact]
+    public async Task OnNotFound_WithNotFoundPageSet_UsesNotFoundPage()
+    {
+        // Create a new router instance for this test to control Attach() timing
+        var services = new ServiceCollection();
+        var testNavManager = new TestNavigationManager();
+        services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+        services.AddSingleton<NavigationManager>(testNavManager);
+        services.AddSingleton<INavigationInterception, TestNavigationInterception>();
+        services.AddSingleton<IScrollToLocationHash, TestScrollToLocationHash>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var testRenderer = new TestRenderer(serviceProvider);
+        testRenderer.ShouldHandleExceptions = true;
+        var testRouter = (Router)testRenderer.InstantiateComponent<Router>();
+        testRouter.AppAssembly = Assembly.GetExecutingAssembly();
+        testRouter.Found = routeData => (builder) => builder.AddContent(0, $"Rendering route matching {routeData.PageType}");
+
+        var parameters = new Dictionary<string, object>
+        {
+            { nameof(Router.AppAssembly), typeof(RouterTest).Assembly },
+            { nameof(Router.NotFoundPage), typeof(NotFoundTestComponent) }
+        };
+
+        // Assign the root component ID which will call Attach()
+        testRenderer.AssignRootComponentId(testRouter);
+
+        // Act
+        await testRenderer.Dispatcher.InvokeAsync(() =>
+            testRouter.SetParametersAsync(ParameterView.FromDictionary(parameters)));
+
+        // Trigger the NavigationManager's OnNotFound event
+        await testRenderer.Dispatcher.InvokeAsync(() => testNavManager.TriggerNotFound());
+
+        // Assert
+        var lastBatch = testRenderer.Batches.Last();
+        var renderedFrame = lastBatch.ReferenceFrames.First();
+        Assert.Equal(RenderTreeFrameType.Component, renderedFrame.FrameType);
+        Assert.Equal(typeof(RouteView), renderedFrame.ComponentType);
+
+        // Verify that the RouteData contains the NotFoundTestComponent
+        var routeViewFrame = lastBatch.ReferenceFrames.Skip(1).First();
+        Assert.Equal(RenderTreeFrameType.Attribute, routeViewFrame.FrameType);
+        var routeData = (RouteData)routeViewFrame.AttributeValue;
+        Assert.Equal(typeof(NotFoundTestComponent), routeData.PageType);
+    }
+
+    [Fact]
+    public async Task OnNotFound_WithArgsPathSet_RendersComponentByRoute()
+    {
+        // Create a new router instance for this test to control Attach() timing
+        var services = new ServiceCollection();
+        var testNavManager = new TestNavigationManager();
+        services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+        services.AddSingleton<NavigationManager>(testNavManager);
+        services.AddSingleton<INavigationInterception, TestNavigationInterception>();
+        services.AddSingleton<IScrollToLocationHash, TestScrollToLocationHash>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var testRenderer = new TestRenderer(serviceProvider);
+        testRenderer.ShouldHandleExceptions = true;
+        var testRouter = (Router)testRenderer.InstantiateComponent<Router>();
+        testRouter.AppAssembly = Assembly.GetExecutingAssembly();
+        testRouter.Found = routeData => (builder) => builder.AddContent(0, $"Rendering route matching {routeData.PageType}");
+
+        var parameters = new Dictionary<string, object>
+        {
+            { nameof(Router.AppAssembly), typeof(RouterTest).Assembly }
+        };
+
+        // Subscribe to OnNotFound event BEFORE router attaches and set args.Path
+        testNavManager.OnNotFound += (sender, args) =>
+        {
+            args.Path = "/jan"; // Point to an existing route
+        };
+
+        // Assign the root component ID which will call Attach()
+        testRenderer.AssignRootComponentId(testRouter);
+
+        // Act
+        await testRenderer.Dispatcher.InvokeAsync(() =>
+            testRouter.SetParametersAsync(ParameterView.FromDictionary(parameters)));
+
+        // Trigger the NavigationManager's OnNotFound event
+        await testRenderer.Dispatcher.InvokeAsync(() => testNavManager.TriggerNotFound());
+
+        // Assert
+        var lastBatch = testRenderer.Batches.Last();
+        var renderedFrame = lastBatch.ReferenceFrames.First();
+        Assert.Equal(RenderTreeFrameType.Component, renderedFrame.FrameType);
+        Assert.Equal(typeof(RouteView), renderedFrame.ComponentType);
+
+        // Verify that the RouteData contains the correct component type
+        var routeViewFrame = lastBatch.ReferenceFrames.Skip(1).First();
+        Assert.Equal(RenderTreeFrameType.Attribute, routeViewFrame.FrameType);
+        var routeData = (RouteData)routeViewFrame.AttributeValue;
+        Assert.Equal(typeof(JanComponent), routeData.PageType);
+    }
+
+    [Fact]
+    public async Task OnNotFound_WithBothNotFoundPageAndArgsPath_PreferArgs()
+    {
+        // Create a new router instance for this test to control Attach() timing
+        var services = new ServiceCollection();
+        var testNavManager = new TestNavigationManager();
+        services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+        services.AddSingleton<NavigationManager>(testNavManager);
+        services.AddSingleton<INavigationInterception, TestNavigationInterception>();
+        services.AddSingleton<IScrollToLocationHash, TestScrollToLocationHash>();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var testRenderer = new TestRenderer(serviceProvider);
+        testRenderer.ShouldHandleExceptions = true;
+        var testRouter = (Router)testRenderer.InstantiateComponent<Router>();
+        testRouter.AppAssembly = Assembly.GetExecutingAssembly();
+        testRouter.Found = routeData => (builder) => builder.AddContent(0, $"Rendering route matching {routeData.PageType}");
+
+        var parameters = new Dictionary<string, object>
+        {
+            { nameof(Router.AppAssembly), typeof(RouterTest).Assembly },
+            { nameof(Router.NotFoundPage), typeof(NotFoundTestComponent) }
+        };
+
+        // Subscribe to OnNotFound event BEFORE router attaches and sets up its own subscription
+        testNavManager.OnNotFound += (sender, args) =>
+        {
+            args.Path = "/jan"; // This should take precedence over NotFoundPage
+        };
+
+        // Now assign the root component ID which will call Attach()
+        testRenderer.AssignRootComponentId(testRouter);
+
+        await testRenderer.Dispatcher.InvokeAsync(() =>
+            testRouter.SetParametersAsync(ParameterView.FromDictionary(parameters)));
+
+        // trigger the NavigationManager's OnNotFound event
+        await testRenderer.Dispatcher.InvokeAsync(() => testNavManager.TriggerNotFound());
+
+        // The Router should have rendered using RenderComponentByRoute (args.Path) instead of NotFoundPage
+        var lastBatch = testRenderer.Batches.Last();
+        var renderedFrame = lastBatch.ReferenceFrames.First();
+        Assert.Equal(RenderTreeFrameType.Component, renderedFrame.FrameType);
+        Assert.Equal(typeof(RouteView), renderedFrame.ComponentType);
+
+        // Verify that the RouteData contains the JanComponent (from args.Path), not NotFoundTestComponent
+        var routeViewFrame = lastBatch.ReferenceFrames.Skip(1).First();
+        Assert.Equal(RenderTreeFrameType.Attribute, routeViewFrame.FrameType);
+        var routeData = (RouteData)routeViewFrame.AttributeValue;
+        Assert.Equal(typeof(JanComponent), routeData.PageType);
+    }
+
+    [Fact]
+    public async Task FindComponentTypeByRoute_WithValidRoute_ReturnsComponentType()
+    {
+        var parameters = new Dictionary<string, object>
+        {
+            { nameof(Router.AppAssembly), typeof(RouterTest).Assembly }
+        };
+
+        await _renderer.Dispatcher.InvokeAsync(() =>
+            _router.SetParametersAsync(ParameterView.FromDictionary(parameters)));
+
+        var result = _router.FindComponentTypeByRoute("/jan");
+        Assert.Equal(typeof(JanComponent), result);
+    }
+
+    [Fact]
+    public async Task RenderComponentByRoute_WithInvalidRoute_ThrowsException()
+    {
+        var parameters = new Dictionary<string, object>
+        {
+            { nameof(Router.AppAssembly), typeof(RouterTest).Assembly }
+        };
+
+        await _renderer.Dispatcher.InvokeAsync(() =>
+            _router.SetParametersAsync(ParameterView.FromDictionary(parameters)));
+
+        var builder = new RenderTreeBuilder();
+
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+        {
+            _router.RenderComponentByRoute(builder, "/nonexistent-route");
+        });
+        Assert.Contains("No component found for route '/nonexistent-route'", exception.Message);
+    }
+
     internal class TestNavigationManager : NavigationManager
     {
         public TestNavigationManager() =>
@@ -275,6 +498,11 @@ public void NotifyLocationChanged(string uri, bool intercepted, string state = n
             Uri = uri;
             NotifyLocationChanged(intercepted);
         }
+
+        public void TriggerNotFound()
+        {
+            base.NotFound();
+        }
     }
 
     internal sealed class TestNavigationInterception : INavigationInterception
@@ -306,4 +534,8 @@ public class MatchAnythingComponent : ComponentBase { }
 
     [Route("a/b/c")]
     public class MultiSegmentRouteComponent : ComponentBase { }
+
+    [Route("not-found")]
+    public class NotFoundTestComponent : ComponentBase { }
+
 }
diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf
index 854164ba02f3..da9756cc39ed 100644
--- a/src/Components/ComponentsNoDeps.slnf
+++ b/src/Components/ComponentsNoDeps.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Components\\Analyzers\\src\\Microsoft.AspNetCore.Components.Analyzers.csproj",
       "src\\Components\\Analyzers\\test\\Microsoft.AspNetCore.Components.Analyzers.Tests.csproj",
@@ -15,6 +15,7 @@
       "src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
       "src\\Components\\Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
       "src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
+      "src\\Components\\Samples\\BlazorUnitedApp.Client\\BlazorUnitedApp.Client.csproj",
       "src\\Components\\Samples\\BlazorUnitedApp\\BlazorUnitedApp.csproj",
       "src\\Components\\Server\\src\\Microsoft.AspNetCore.Components.Server.csproj",
       "src\\Components\\Server\\test\\Microsoft.AspNetCore.Components.Server.Tests.csproj",
@@ -44,6 +45,7 @@
       "src\\Components\\WebView\\WebView\\test\\Microsoft.AspNetCore.Components.WebView.Test.csproj",
       "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
       "src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj",
+      "src\\Components\\benchmarkapps\\BlazingPizza.Server\\BlazingPizza.Server.csproj",
       "src\\Components\\benchmarkapps\\Wasm.Performance\\ConsoleHost\\Wasm.Performance.ConsoleHost.csproj",
       "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj",
       "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
@@ -51,6 +53,7 @@
       "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj",
       "src\\Components\\test\\testassets\\Components.TestServer\\Components.TestServer.csproj",
       "src\\Components\\test\\testassets\\Components.WasmMinimal\\Components.WasmMinimal.csproj",
+      "src\\Components\\test\\testassets\\Components.WasmRemoteAuthentication\\Components.WasmRemoteAuthentication.csproj",
       "src\\Components\\test\\testassets\\ComponentsApp.App\\ComponentsApp.App.csproj",
       "src\\Components\\test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj",
       "src\\Components\\test\\testassets\\GlobalizationWasmApp\\GlobalizationWasmApp.csproj",
@@ -59,4 +62,4 @@
       "src\\Components\\test\\testassets\\TestContentPackage\\TestContentPackage.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj b/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
index 4c5ae75fa8a4..ff095e9c9421 100644
--- a/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
+++ b/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj
@@ -18,9 +18,12 @@
     </ResolveStaticWebAssetsInputsDependsOn>
   </PropertyGroup>
 
-  <Target Name="IncludeCompileJsOutput" BeforeTargets="ResolveJSModuleStaticWebAssets">
+  <Target Name="IncludeCompileJsOutput" BeforeTargets="ResolveJSModuleStaticWebAssets;ResolveJsInitializerModuleStaticWebAssets">
     <ItemGroup>
       <_JsBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" />
+      <_JsBuildOutput>
+        <RelativePath>%(_JsBuildOutput.RecursiveDir)%(Filename)%(Extension)</RelativePath>
+      </_JsBuildOutput>
     </ItemGroup>
 
     <DefineStaticWebAssets Condition="'@(_JsBuildOutput)' != ''"
@@ -52,4 +55,11 @@
     </ItemGroup>
   </Target>
 
+  <!-- Exclude JavaScript configuration files from being packaged as Content -->
+  <ItemGroup>
+    <Content Remove="js\babel.config.json" />
+    <Content Remove="js\package.json" />
+    <Content Remove="js\tsconfig.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/CustomElements/src/js/package.json b/src/Components/CustomElements/src/js/package.json
index 1a0f6c53fbfb..952782ecdec4 100644
--- a/src/Components/CustomElements/src/js/package.json
+++ b/src/Components/CustomElements/src/js/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "microsoft.components.customelements",
+  "name": "@microsoft/microsoft.components.customelements",
   "scripts": {
     "clean": "rimraf ./dist/Debug ./dist/Release",
     "prebuild": "npm run clean",
diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props
index 45dda95456a2..84597f2f45f6 100644
--- a/src/Components/Directory.Build.props
+++ b/src/Components/Directory.Build.props
@@ -18,4 +18,13 @@
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
   </PropertyGroup>
 
+  <!-- Workaround to add Blazor framework static assets without requiring a package reference -->
+  <PropertyGroup>
+    <UseBlazorFrameworkDebugAssets>true</UseBlazorFrameworkDebugAssets>
+    <BlazorFrameworkStaticWebAssetRoot Condition="'$(Configuration)' == 'Debug'">$(RepoRoot)src\Components\Web.JS\dist\Debug</BlazorFrameworkStaticWebAssetRoot>
+    <BlazorFrameworkStaticWebAssetRoot Condition="'$(Configuration)' == 'Release'">$(RepoRoot)src\Components\Web.JS\dist\Release</BlazorFrameworkStaticWebAssetRoot>
+  </PropertyGroup>
+
+  <Import Project="$(RepoRoot)\src\Assets\build\Microsoft.AspNetCore.App.Internal.Assets.targets" />
+
 </Project>
diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets
index 9daad5570fdc..03b9ef363c40 100644
--- a/src/Components/Directory.Build.targets
+++ b/src/Components/Directory.Build.targets
@@ -1,21 +1,11 @@
 <Project>
-  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(BuildNodeJS)' != 'false'">
     <BlazorWebAssemblyJSPath
         Condition=" '$(Configuration)' == 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Debug\blazor.webassembly.js</BlazorWebAssemblyJSPath>
     <BlazorWebAssemblyJSPath
         Condition=" '$(Configuration)' != 'Debug' ">$(RepoRoot)src\Components\Web.JS\dist\Release\blazor.webassembly.js</BlazorWebAssemblyJSPath>
     <BlazorWebAssemblyJSMapPath>$(BlazorWebAssemblyJSPath).map</BlazorWebAssemblyJSMapPath>
-
-    <_BlazorDevServerPath>$(ArtifactsDir)bin/Microsoft.AspNetCore.Components.WebAssembly.DevServer/$(Configuration)/$(DefaultNetCoreTargetFramework)/blazor-devserver.dll</_BlazorDevServerPath>
-    <RunCommand>dotnet</RunCommand>
-    <_RunExtraArguments Condition="'$(WasmEnableThreads)' == 'true'">--apply-cop-headers</_RunExtraArguments>
-    <RunArguments>exec &quot;$(_BlazorDevServerPath)&quot; --applicationpath &quot;$(TargetPath)&quot; $(_RunExtraArguments) $(AdditionalRunArguments)</RunArguments>
   </PropertyGroup>
 
-  <Target Name="_CheckBlazorWebAssemblyJSPath" AfterTargets="ResolveProjectReferences"
-    Condition=" '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' AND !EXISTS('$(BlazorWebAssemblyJSPath)') ">
-    <Error Text="'$(BlazorWebAssemblyJSPath)' does not exist. Enable NodeJS to build this project." />
-  </Target>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/Components/Endpoints/src/Assets/ResourcePreloader.cs b/src/Components/Endpoints/src/Assets/ResourcePreloader.cs
new file mode 100644
index 000000000000..ffe6e2f785c9
--- /dev/null
+++ b/src/Components/Endpoints/src/Assets/ResourcePreloader.cs
@@ -0,0 +1,76 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Endpoints;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// Represents a component that renders preload link elements for resources.
+/// </summary>
+public sealed class ResourcePreloader : IComponent
+{
+    private RenderHandle renderHandle;
+    private List<PreloadAsset>? assets;
+
+    [Inject]
+    internal ResourcePreloadService? Service { get; set; }
+
+    void IComponent.Attach(RenderHandle renderHandle)
+    {
+        this.renderHandle = renderHandle;
+    }
+
+    Task IComponent.SetParametersAsync(ParameterView parameters)
+    {
+        Service?.SetPreloadingHandler(PreloadAssets);
+        renderHandle.Render(RenderPreloadAssets);
+        return Task.CompletedTask;
+    }
+
+    private void PreloadAssets(List<PreloadAsset> assets)
+    {
+        if (this.assets != null)
+        {
+            return;
+        }
+
+        this.assets = assets;
+        renderHandle.Render(RenderPreloadAssets);
+    }
+
+    private void RenderPreloadAssets(RenderTreeBuilder builder)
+    {
+        if (assets == null)
+        {
+            return;
+        }
+
+        for (var i = 0; i < assets.Count; i ++)
+        {
+            var asset = assets[i];
+            builder.OpenElement(0, "link");
+            builder.SetKey(assets[i]);
+            builder.AddAttribute(1, "href", asset.Url);
+            builder.AddAttribute(2, "rel", asset.PreloadRel);
+            if (!string.IsNullOrEmpty(asset.PreloadAs))
+            {
+                builder.AddAttribute(3, "as", asset.PreloadAs);
+            }
+            if (!string.IsNullOrEmpty(asset.PreloadPriority))
+            {
+                builder.AddAttribute(4, "fetchpriority", asset.PreloadPriority);
+            }
+            if (!string.IsNullOrEmpty(asset.PreloadCrossorigin))
+            {
+                builder.AddAttribute(5, "crossorigin", asset.PreloadCrossorigin);
+            }
+            if (!string.IsNullOrEmpty(asset.Integrity))
+            {
+                builder.AddAttribute(6, "integrity", asset.Integrity);
+            }
+            builder.CloseElement();
+        }
+    }
+}
diff --git a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs
index d4ca799ba4bc..7ce2a54419b0 100644
--- a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs
+++ b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs
@@ -10,9 +10,6 @@
 using Microsoft.AspNetCore.Components.Endpoints.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Routing.Patterns;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
@@ -23,8 +20,8 @@ internal class RazorComponentEndpointDataSource<[DynamicallyAccessedMembers(Comp
     private readonly object _lock = new();
     private readonly List<Action<EndpointBuilder>> _conventions = [];
     private readonly List<Action<EndpointBuilder>> _finallyConventions = [];
+    private readonly List<Action<ComponentApplicationBuilder>> _componentApplicationBuilderActions = [];
     private readonly RazorComponentDataSourceOptions _options = new();
-    private readonly ComponentApplicationBuilder _builder;
     private readonly IEndpointRouteBuilder _endpointRouteBuilder;
     private readonly ResourceCollectionResolver _resourceCollectionResolver;
     private readonly RenderModeEndpointProvider[] _renderModeEndpointProviders;
@@ -35,33 +32,29 @@ internal class RazorComponentEndpointDataSource<[DynamicallyAccessedMembers(Comp
     private IChangeToken _changeToken;
     private IDisposable? _disposableChangeToken;   // THREADING: protected by _lock
 
-    public Func<IDisposable, IDisposable> SetDisposableChangeTokenAction = disposableChangeToken => disposableChangeToken;
-
     // Internal for testing.
-    internal ComponentApplicationBuilder Builder => _builder;
     internal List<Action<EndpointBuilder>> Conventions => _conventions;
+    internal List<Action<ComponentApplicationBuilder>> ComponentApplicationBuilderActions => _componentApplicationBuilderActions;
+    internal CancellationTokenSource ChangeTokenSource => _cancellationTokenSource;
 
     public RazorComponentEndpointDataSource(
-        ComponentApplicationBuilder builder,
         IEnumerable<RenderModeEndpointProvider> renderModeEndpointProviders,
         IEndpointRouteBuilder endpointRouteBuilder,
         RazorComponentEndpointFactory factory,
         HotReloadService? hotReloadService = null)
     {
-        _builder = builder;
         _endpointRouteBuilder = endpointRouteBuilder;
         _resourceCollectionResolver = new ResourceCollectionResolver(endpointRouteBuilder);
         _renderModeEndpointProviders = renderModeEndpointProviders.ToArray();
         _factory = factory;
         _hotReloadService = hotReloadService;
-        HotReloadService.ClearCacheEvent += OnHotReloadClearCache;
         DefaultBuilder = new RazorComponentsEndpointConventionBuilder(
             _lock,
-            builder,
             endpointRouteBuilder,
             _options,
             _conventions,
-            _finallyConventions);
+            _finallyConventions,
+            _componentApplicationBuilderActions);
 
         _cancellationTokenSource = new CancellationTokenSource();
         _changeToken = new CancellationChangeToken(_cancellationTokenSource.Token);
@@ -109,8 +102,20 @@ private void UpdateEndpoints()
 
         lock (_lock)
         {
+            _disposableChangeToken?.Dispose();
+            _disposableChangeToken = null;
+
             var endpoints = new List<Endpoint>();
-            var context = _builder.Build();
+
+            var componentApplicationBuilder = new ComponentApplicationBuilder();
+
+            foreach (var action in ComponentApplicationBuilderActions)
+            {
+                action?.Invoke(componentApplicationBuilder);
+            }
+
+            var context = componentApplicationBuilder.Build();
+
             var configuredRenderModesMetadata = new ConfiguredRenderModesMetadata(
                 [.. Options.ConfiguredRenderModes]);
 
@@ -171,8 +176,7 @@ private void UpdateEndpoints()
             oldCancellationTokenSource?.Dispose();
             if (_hotReloadService is { MetadataUpdateSupported: true })
             {
-                _disposableChangeToken?.Dispose();
-                _disposableChangeToken = SetDisposableChangeTokenAction(ChangeToken.OnChange(_hotReloadService.GetChangeToken, UpdateEndpoints));
+                _disposableChangeToken = ChangeToken.OnChange(_hotReloadService.GetChangeToken, UpdateEndpoints);
             }
         }
     }
@@ -180,7 +184,6 @@ private void UpdateEndpoints()
     private void AddBlazorWebEndpoints(List<Endpoint> endpoints)
     {
         List<EndpointBuilder> blazorWebEndpoints = [
-            ..GetBlazorWebJsEndpoint(_endpointRouteBuilder),
             OpaqueRedirection.GetBlazorOpaqueRedirectionEndpoint()];
 
         foreach (var endpoint in blazorWebEndpoints)
@@ -199,65 +202,6 @@ private void AddBlazorWebEndpoints(List<Endpoint> endpoints)
         }
     }
 
-    private static IEnumerable<EndpointBuilder> GetBlazorWebJsEndpoint(IEndpointRouteBuilder endpoints)
-    {
-        var app = endpoints.CreateApplicationBuilder();
-
-        var options = new StaticFileOptions
-        {
-            FileProvider = new ManifestEmbeddedFileProvider(typeof(RazorComponentsEndpointRouteBuilderExtensions).Assembly),
-            OnPrepareResponse = CacheHeaderSettings.SetCacheHeaders
-        };
-
-        app.Use(next => context =>
-        {
-            // Set endpoint to null so the static files middleware will handle the request.
-            context.SetEndpoint(null);
-
-            return next(context);
-        });
-
-        app.UseStaticFiles(options);
-
-        var requestDelegate = app.Build();
-
-        var blazorWebJsBuilder = new RouteEndpointBuilder(
-            requestDelegate,
-            RoutePatternFactory.Parse("/_framework/blazor.web.js"),
-            int.MinValue)
-        {
-            DisplayName = "Blazor web static files"
-        };
-
-        var allowedHttpMethods = new HttpMethodMetadata([HttpMethods.Get, HttpMethods.Head]);
-        blazorWebJsBuilder.Metadata.Add(allowedHttpMethods);
-
-#if !DEBUG
-        return [blazorWebJsBuilder];
-#else
-        // We only need to serve the sourcemap when working on the framework, not in the distributed packages
-        var blazorWebJsDebugBuilder = new RouteEndpointBuilder(
-            requestDelegate,
-            RoutePatternFactory.Parse("/_framework/blazor.web.js.map"),
-            int.MinValue)
-        {
-            DisplayName = "Blazor web static files sourcemap"
-        };
-        blazorWebJsDebugBuilder.Metadata.Add(allowedHttpMethods);
-
-        return [blazorWebJsBuilder, blazorWebJsDebugBuilder];
-#endif
-    }
-
-    public void OnHotReloadClearCache(Type[]? types)
-    {
-        lock (_lock)
-        {
-            _disposableChangeToken?.Dispose();
-            _disposableChangeToken = null;
-        }
-    }
-
     public override IChangeToken GetChangeToken()
     {
         Initialize();
diff --git a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs
index 84327f3f6d54..a8f178a4fc25 100644
--- a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs
+++ b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs
@@ -17,9 +17,14 @@ internal class RazorComponentEndpointDataSourceFactory(
 {
     public RazorComponentEndpointDataSource<TRootComponent> CreateDataSource<[DynamicallyAccessedMembers(Component)] TRootComponent>(IEndpointRouteBuilder endpoints)
     {
-        var builder = ComponentApplicationBuilder.GetBuilder<TRootComponent>() ??
-            DefaultRazorComponentApplication<TRootComponent>.Instance.GetBuilder();
+        var dataSource = new RazorComponentEndpointDataSource<TRootComponent>(providers, endpoints, factory, hotReloadService);
 
-        return new RazorComponentEndpointDataSource<TRootComponent>(builder, providers, endpoints, factory, hotReloadService);
+        dataSource.ComponentApplicationBuilderActions.Add(builder =>
+        {
+            var assembly = typeof(TRootComponent).Assembly;
+            IRazorComponentApplication.GetBuilderForAssembly(builder, assembly);
+        });
+
+        return dataSource;
     }
 }
diff --git a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs
index 04b1daa9e952..46808fbfdfb0 100644
--- a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs
+++ b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs
@@ -18,27 +18,25 @@ public sealed class RazorComponentsEndpointConventionBuilder : IEndpointConventi
     private readonly RazorComponentDataSourceOptions _options;
     private readonly List<Action<EndpointBuilder>> _conventions;
     private readonly List<Action<EndpointBuilder>> _finallyConventions;
+    private readonly List<Action<ComponentApplicationBuilder>> _componentApplicationBuilderActions;
 
     internal RazorComponentsEndpointConventionBuilder(
         object @lock,
-        ComponentApplicationBuilder builder,
         IEndpointRouteBuilder endpointRouteBuilder,
         RazorComponentDataSourceOptions options,
         List<Action<EndpointBuilder>> conventions,
-        List<Action<EndpointBuilder>> finallyConventions)
+        List<Action<EndpointBuilder>> finallyConventions,
+        List<Action<ComponentApplicationBuilder>> componentApplicationBuilderActions)
     {
         _lock = @lock;
-        ApplicationBuilder = builder;
         EndpointRouteBuilder = endpointRouteBuilder;
         _options = options;
         _conventions = conventions;
         _finallyConventions = finallyConventions;
+        _componentApplicationBuilderActions = componentApplicationBuilderActions;
     }
 
-    /// <summary>
-    /// Gets the <see cref="ComponentApplicationBuilder"/> that is used to build the endpoints.
-    /// </summary>
-    internal ComponentApplicationBuilder ApplicationBuilder { get; }
+    internal List<Action<ComponentApplicationBuilder>> ComponentApplicationBuilderActions => _componentApplicationBuilderActions;
 
     internal string? ManifestPath { get => _options.ManifestPath; set => _options.ManifestPath = value; }
 
diff --git a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs
index fd0a6aec0c4d..7cc4fa4dc764 100644
--- a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs
+++ b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs
@@ -30,7 +30,7 @@ public static RazorComponentsEndpointConventionBuilder AddAdditionalAssemblies(
 
         foreach (var assembly in assemblies)
         {
-            builder.ApplicationBuilder.AddAssembly(assembly);
+            builder.ComponentApplicationBuilderActions.Add(b => b.AddAssembly(assembly));
         }
         return builder;
     }
diff --git a/src/Components/Endpoints/src/Builder/ResourceCollectionConvention.cs b/src/Components/Endpoints/src/Builder/ResourceCollectionConvention.cs
index 2415687031ec..7606ff07abd7 100644
--- a/src/Components/Endpoints/src/Builder/ResourceCollectionConvention.cs
+++ b/src/Components/Endpoints/src/Builder/ResourceCollectionConvention.cs
@@ -49,6 +49,7 @@ public void ApplyConvention(EndpointBuilder eb)
         if (_collection != null && _collectionImportMap != null)
         {
             eb.Metadata.Add(_collection);
+            eb.Metadata.Add(new ResourcePreloadCollection(_collection));
 
             if (_collectionUrl != null)
             {
diff --git a/src/Components/Endpoints/src/Builder/ResourcePreloadCollection.cs b/src/Components/Endpoints/src/Builder/ResourcePreloadCollection.cs
new file mode 100644
index 000000000000..869682856251
--- /dev/null
+++ b/src/Components/Endpoints/src/Builder/ResourcePreloadCollection.cs
@@ -0,0 +1,114 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Components.Endpoints;
+
+internal class ResourcePreloadCollection
+{
+    private readonly Dictionary<string, List<PreloadAsset>> _storage = new();
+
+    public ResourcePreloadCollection(ResourceAssetCollection assets)
+    {
+        foreach (var asset in assets)
+        {
+            if (asset.Properties == null)
+            {
+                continue;
+            }
+
+            // Use preloadgroup property to identify assets that should be preloaded
+            string? group = null;
+            foreach (var property in asset.Properties)
+            {
+                if (property.Name.Equals("preloadgroup", StringComparison.OrdinalIgnoreCase))
+                {
+                    group = property.Value ?? string.Empty;
+                    break;
+                }
+            }
+
+            if (group == null)
+            {
+                continue;
+            }
+
+            var preloadAsset = CreateAsset(asset.Url, asset.Properties);
+            if (!_storage.TryGetValue(group, out var groupHeaders))
+            {
+                groupHeaders = _storage[group] = new List<PreloadAsset>();
+            }
+
+            groupHeaders.Add(preloadAsset);
+        }
+
+        foreach (var group in _storage)
+        {
+            group.Value.Sort((a, b) => a.PreloadOrder.CompareTo(b.PreloadOrder));
+        }
+    }
+
+    private static PreloadAsset CreateAsset(string url, IEnumerable<ResourceAssetProperty> properties)
+    {
+        var resourceAsset = new PreloadAsset(url);
+        foreach (var property in properties)
+        {
+            if (property.Name.Equals("label", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.Label = property.Value;
+            }
+            else if (property.Name.Equals("integrity", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.Integrity = property.Value;
+            }
+            else if (property.Name.Equals("preloadgroup", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.PreloadGroup = property.Value;
+            }
+            else if (property.Name.Equals("preloadrel", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.PreloadRel = property.Value;
+            }
+            else if (property.Name.Equals("preloadas", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.PreloadAs = property.Value;
+            }
+            else if (property.Name.Equals("preloadpriority", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.PreloadPriority = property.Value;
+            }
+            else if (property.Name.Equals("preloadcrossorigin", StringComparison.OrdinalIgnoreCase))
+            {
+                resourceAsset.PreloadCrossorigin = property.Value;
+            }
+            else if (property.Name.Equals("preloadorder", StringComparison.OrdinalIgnoreCase))
+            {
+                if (!int.TryParse(property.Value, out int order))
+                {
+                    order = 0;
+                }
+
+                resourceAsset.PreloadOrder = order;
+            }
+        }
+
+        return resourceAsset;
+    }
+
+    public bool TryGetAssets(string group, [MaybeNullWhen(false)] out List<PreloadAsset> assets)
+        => _storage.TryGetValue(group, out assets);
+}
+
+internal sealed class PreloadAsset(string url)
+{
+    public string Url { get; } = url;
+    public string? Label { get; set; }
+    public string? Integrity { get; set; }
+    public string? PreloadGroup { get; set; }
+    public string? PreloadRel { get; set; }
+    public string? PreloadAs { get; set; }
+    public string? PreloadPriority { get; set; }
+    public string? PreloadCrossorigin { get; set; }
+    public int PreloadOrder { get; set; }
+}
diff --git a/src/Components/Endpoints/src/Builder/ResourcePreloadService.cs b/src/Components/Endpoints/src/Builder/ResourcePreloadService.cs
new file mode 100644
index 000000000000..a5f073f409a9
--- /dev/null
+++ b/src/Components/Endpoints/src/Builder/ResourcePreloadService.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Endpoints;
+
+internal class ResourcePreloadService
+{
+    private Action<List<PreloadAsset>>? handler;
+
+    public void SetPreloadingHandler(Action<List<PreloadAsset>> handler)
+        => this.handler = handler;
+
+    public void Preload(List<PreloadAsset> assets)
+        => this.handler?.Invoke(assets);
+}
diff --git a/src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs b/src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs
index e9bb98f2d1c2..5c2d42fedd24 100644
--- a/src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs
+++ b/src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs
@@ -2,16 +2,47 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.Routing;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Components.Endpoints;
 
 internal sealed class HttpNavigationManager : NavigationManager, IHostEnvironmentNavigationManager
 {
+    private const string _disableThrowNavigationException = "Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException";
+
+    [FeatureSwitchDefinition(_disableThrowNavigationException)]
+    private static bool _throwNavigationException =>
+        !AppContext.TryGetSwitch(_disableThrowNavigationException, out var switchValue) || !switchValue;
+
+    private Func<string, Task>? _onNavigateTo;
+
     void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri) => Initialize(baseUri, uri);
 
+    void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri, Func<string, Task> onNavigateTo)
+    {
+        _onNavigateTo = onNavigateTo;
+        Initialize(baseUri, uri);
+    }
+
     protected override void NavigateToCore(string uri, NavigationOptions options)
     {
         var absoluteUriString = ToAbsoluteUri(uri).AbsoluteUri;
-        throw new NavigationException(absoluteUriString);
+        if (_throwNavigationException)
+        {
+            throw new NavigationException(absoluteUriString);
+        }
+        else
+        {
+            _ = PerformNavigationAsync();
+        }
+
+        async Task PerformNavigationAsync()
+        {
+            if (_onNavigateTo == null)
+            {
+                throw new InvalidOperationException($"'{GetType().Name}' method for endpoint-based navigation has not been initialized.");
+            }
+            await _onNavigateTo(absoluteUriString);
+        }
     }
 }
diff --git a/src/Components/Endpoints/src/DependencyInjection/RazorComponentsRazorComponentBuilderExtensions.cs b/src/Components/Endpoints/src/DependencyInjection/RazorComponentsRazorComponentBuilderExtensions.cs
new file mode 100644
index 000000000000..7c927d0f721e
--- /dev/null
+++ b/src/Components/Endpoints/src/DependencyInjection/RazorComponentsRazorComponentBuilderExtensions.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Internal;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Provides methods for configuring a Razor components based application.
+/// </summary>
+public static class RazorComponentsRazorComponentBuilderExtensions
+{
+    /// <summary>
+    /// Registers a persistent service with the specified render mode in the Razor components builder.
+    /// </summary>
+    /// <typeparam name="TPersistentService">The service to be registered for state management.</typeparam>
+    /// <param name="builder">The <see cref="IRazorComponentsBuilder"/>.</param>
+    /// <param name="renderMode">The <see cref="IComponentRenderMode"/> that determines to which render modes the state should be persisted.</param>
+    /// <returns>The <see cref="IRazorComponentsBuilder"/>.</returns>
+    public static IRazorComponentsBuilder RegisterPersistentService<[DynamicallyAccessedMembers(LinkerFlags.JsonSerialized)] TPersistentService>(
+        this IRazorComponentsBuilder builder,
+        IComponentRenderMode renderMode)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<TPersistentService>(
+            builder.Services,
+            renderMode);
+
+        return builder;
+    }
+}
diff --git a/src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs b/src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs
index 0a10d83538ca..dc365194fcbe 100644
--- a/src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs
+++ b/src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs
@@ -62,7 +62,7 @@ public static IRazorComponentsBuilder AddRazorComponents(this IServiceCollection
         services.TryAddScoped<INavigationInterception, UnsupportedNavigationInterception>();
         services.TryAddScoped<IScrollToLocationHash, UnsupportedScrollToLocationHash>();
         services.TryAddScoped<ComponentStatePersistenceManager>();
-        services.TryAddScoped<PersistentComponentState>(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
+        services.TryAddScoped(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
         services.TryAddScoped<IErrorBoundaryLogger, PrerenderingErrorBoundaryLogger>();
         services.TryAddEnumerable(
             ServiceDescriptor.Singleton<IPostConfigureOptions<RazorComponentsServiceOptions>, DefaultRazorComponentsServiceOptionsConfiguration>());
@@ -70,13 +70,22 @@ public static IRazorComponentsBuilder AddRazorComponents(this IServiceCollection
         services.TryAddScoped<IRoutingStateProvider>(sp => sp.GetRequiredService<EndpointRoutingStateProvider>());
         services.TryAddScoped<AuthenticationStateProvider, ServerAuthenticationStateProvider>();
         services.AddSupplyValueFromQueryProvider();
+        services.AddSupplyValueFromPersistentComponentStateProvider();
         services.TryAddCascadingValue(sp => sp.GetRequiredService<EndpointHtmlRenderer>().HttpContext);
+        services.TryAddScoped<WebAssemblySettingsEmitter>();
+        services.TryAddScoped<ResourcePreloadService>();
 
         services.TryAddScoped<ResourceCollectionProvider>();
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<ResourceCollectionProvider>(services, RenderMode.InteractiveWebAssembly);
+
+        ComponentsMetricsServiceCollectionExtensions.AddComponentsMetrics(services);
+        ComponentsMetricsServiceCollectionExtensions.AddComponentsTracing(services);
 
         // Form handling
         services.AddSupplyValueFromFormProvider();
         services.TryAddScoped<AntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
+        services.TryAddScoped(sp => (EndpointAntiforgeryStateProvider)sp.GetRequiredService<AntiforgeryStateProvider>());
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<AntiforgeryStateProvider>(services, RenderMode.InteractiveAuto);
         services.TryAddScoped<HttpContextFormDataProvider>();
         services.TryAddScoped<IFormValueMapper, HttpContextFormValueMapper>();
 
diff --git a/src/Components/Endpoints/src/DependencyInjection/UnsupportedJavaScriptRuntime.cs b/src/Components/Endpoints/src/DependencyInjection/UnsupportedJavaScriptRuntime.cs
index 3c7af336b23a..028e9da2684b 100644
--- a/src/Components/Endpoints/src/DependencyInjection/UnsupportedJavaScriptRuntime.cs
+++ b/src/Components/Endpoints/src/DependencyInjection/UnsupportedJavaScriptRuntime.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop;
+using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.AspNetCore.Components.Endpoints;
 
@@ -9,9 +11,27 @@ internal sealed class UnsupportedJavaScriptRuntime : IJSRuntime
 {
     private const string Message = "JavaScript interop calls cannot be issued during server-side static rendering, because the page has not yet loaded in the browser. Statically-rendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during static rendering.";
 
-    public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object?[]? args)
+    public ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken, object?[]? args)
         => throw new InvalidOperationException(Message);
 
-    ValueTask<TValue> IJSRuntime.InvokeAsync<TValue>(string identifier, object?[]? args)
+    ValueTask<TValue> IJSRuntime.InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, object?[]? args)
+        => throw new InvalidOperationException(Message);
+
+    public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object?[]? args)
+        => throw new InvalidOperationException(Message);
+
+    public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
+        => throw new InvalidOperationException(Message);
+
+    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+        => throw new InvalidOperationException(Message);
+
+    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken)
+        => throw new InvalidOperationException(Message);
+
+    public ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => throw new InvalidOperationException(Message);
+
+    public ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value, CancellationToken cancellationToken)
         => throw new InvalidOperationException(Message);
 }
diff --git a/src/Components/Endpoints/src/DependencyInjection/WebAssemblySettingsEmitter.cs b/src/Components/Endpoints/src/DependencyInjection/WebAssemblySettingsEmitter.cs
new file mode 100644
index 000000000000..87ae37d74f7f
--- /dev/null
+++ b/src/Components/Endpoints/src/DependencyInjection/WebAssemblySettingsEmitter.cs
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Hosting;
+
+namespace Microsoft.AspNetCore.Components.Endpoints;
+
+internal record WebAssemblySettings(string EnvironmentName, Dictionary<string, string> EnvironmentVariables);
+
+internal class WebAssemblySettingsEmitter(IHostEnvironment hostEnvironment)
+{
+    private bool wasEmittedAlready;
+
+    private const string dotnetModifiableAssembliesName = "DOTNET_MODIFIABLE_ASSEMBLIES";
+    private const string aspnetcoreBrowserToolsName = "__ASPNETCORE_BROWSER_TOOLS";
+
+    private static readonly string? s_dotnetModifiableAssemblies = GetNonEmptyEnvironmentVariableValue(dotnetModifiableAssembliesName);
+    private static readonly string? s_aspnetcoreBrowserTools = GetNonEmptyEnvironmentVariableValue(aspnetcoreBrowserToolsName);
+
+    private static string? GetNonEmptyEnvironmentVariableValue(string name)
+        => Environment.GetEnvironmentVariable(name) is { Length: > 0 } value ? value : null;
+
+    public bool TryGetSettingsOnce([NotNullWhen(true)] out WebAssemblySettings? settings)
+    {
+        if (wasEmittedAlready)
+        {
+            settings = default;
+            return false;
+        }
+
+        var environmentVariables = new Dictionary<string, string>();
+
+        // DOTNET_MODIFIABLE_ASSEMBLIES is used by the runtime to initialize hot-reload specific environment variables and is configured
+        // by the launching process (dotnet-watch / Visual Studio).
+        // Always add the header if the environment variable is set, regardless of the kind of environment.
+        if (s_dotnetModifiableAssemblies != null)
+        {
+            environmentVariables[dotnetModifiableAssembliesName] = s_dotnetModifiableAssemblies;
+        }
+
+        // See https://github.com/dotnet/aspnetcore/issues/37357#issuecomment-941237000
+        // Translate the _ASPNETCORE_BROWSER_TOOLS environment configured by the browser tools agent in to a HTTP response header.
+        if (s_aspnetcoreBrowserTools != null)
+        {
+            environmentVariables[aspnetcoreBrowserToolsName] = s_aspnetcoreBrowserTools;
+        }
+
+        wasEmittedAlready = true;
+        settings = new (hostEnvironment.EnvironmentName, environmentVariables);
+        return true;
+    }
+}
diff --git a/src/Components/Endpoints/src/Directory.Build.targets b/src/Components/Endpoints/src/Directory.Build.targets
index 09953b9b6c9d..35886951b6aa 100644
--- a/src/Components/Endpoints/src/Directory.Build.targets
+++ b/src/Components/Endpoints/src/Directory.Build.targets
@@ -1,6 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-  <!-- Workaround target import for project references to Microsoft.Extensions.FileProviders.Embedded -->
-  <Import
-    Project="$(RepoRoot)src\FileProviders\Embedded\src\build\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.targets" />
 </Project>
diff --git a/src/Components/Endpoints/src/FormMapping/BrowserFileFromFormFile.cs b/src/Components/Endpoints/src/FormMapping/BrowserFileFromFormFile.cs
index f0300d75cc4f..d6943c8637a3 100644
--- a/src/Components/Endpoints/src/FormMapping/BrowserFileFromFormFile.cs
+++ b/src/Components/Endpoints/src/FormMapping/BrowserFileFromFormFile.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Components.Endpoints.FormMapping;
 
 internal sealed class BrowserFileFromFormFile(IFormFile formFile) : IBrowserFile
 {
-    public string Name => formFile.Name;
+    public string Name => formFile.FileName;
 
     public DateTimeOffset LastModified => DateTimeOffset.Parse(formFile.Headers.LastModified.ToString(), CultureInfo.InvariantCulture);
 
diff --git a/src/Components/Endpoints/src/FormMapping/Converters/NullableConverter.cs b/src/Components/Endpoints/src/FormMapping/Converters/NullableConverter.cs
index 58bd47c60396..205f114b732f 100644
--- a/src/Components/Endpoints/src/FormMapping/Converters/NullableConverter.cs
+++ b/src/Components/Endpoints/src/FormMapping/Converters/NullableConverter.cs
@@ -14,6 +14,15 @@ public bool CanConvertSingleValue() => _nonNullableConverter is ISingleValueConv
 
     public bool TryConvertValue(ref FormDataReader reader, string value, out T? result)
     {
+        if (string.IsNullOrEmpty(value) && IsSupportedUnderlyingType(typeof(T)))
+        {
+            // Form post sends empty string for a form field that does not have a value,
+            // in case of nullable value types, that should be treated as null and
+            // should not be parsed for its underlying type
+            result = null;
+            return true;
+        }
+
         var converter = (ISingleValueConverter<T>)_nonNullableConverter;
 
         if (converter.TryConvertValue(ref reader, value, out var converted))
@@ -30,17 +39,30 @@ public bool TryConvertValue(ref FormDataReader reader, string value, out T? resu
 
     [RequiresDynamicCode(FormMappingHelpers.RequiresDynamicCodeMessage)]
     [RequiresUnreferencedCode(FormMappingHelpers.RequiresUnreferencedCodeMessage)]
-    internal override bool TryRead(ref FormDataReader context, Type type, FormDataMapperOptions options, out T? result, out bool found)
+    internal override bool TryRead(ref FormDataReader reader, Type type, FormDataMapperOptions options, out T? result, out bool found)
     {
-        if (!(_nonNullableConverter.TryRead(ref context, type, options, out var innerResult, out found) && found))
+        // Do not call non-nullable converter's TryRead method, it will fail to parse empty
+        // string. Call the TryConvertValue method above (similar to ParsableConverter) so
+        // that it can handle the empty string correctly
+        found = reader.TryGetValue(out var value);
+        if (!found)
         {
-            result = null;
-            return false;
+            result = default;
+            return true;
         }
         else
         {
-            result = innerResult;
-            return true;
+            return TryConvertValue(ref reader, value!, out result!);
         }
     }
+
+    private static bool IsSupportedUnderlyingType(Type type)
+    {
+        return Type.GetTypeCode(type) != TypeCode.Object || IsSupportedUnderlyingObjectType(type);
+    }
+
+    private static bool IsSupportedUnderlyingObjectType(Type type)
+    {
+        return type == typeof(DateOnly) || type == typeof(TimeOnly) || type == typeof(DateTimeOffset);
+    }
 }
diff --git a/src/Components/Endpoints/src/FormMapping/Factories/ComplexTypeConverterFactory.cs b/src/Components/Endpoints/src/FormMapping/Factories/ComplexTypeConverterFactory.cs
index 09df61c18329..7f5ec9973c75 100644
--- a/src/Components/Endpoints/src/FormMapping/Factories/ComplexTypeConverterFactory.cs
+++ b/src/Components/Endpoints/src/FormMapping/Factories/ComplexTypeConverterFactory.cs
@@ -27,7 +27,7 @@ public bool CanConvert(Type type, FormDataMapperOptions options)
 
     // We are going to compile a function that maps all the properties for the type.
     // Beware that the code below is not the actual exact code, just a simplification to understand what is happening at a high level.
-    // The general flow is as follows. For a type like Address { Street, City, Country, ZipCode }
+    // The general flow is as follows. For a type like Address { Street, City, CountryRegion, ZipCode }
     // we will generate a function that looks like:
     // public bool TryRead(ref FormDataReader reader, Type type, FormDataSerializerOptions options, out Address? result, out bool found)
     // {
@@ -35,11 +35,11 @@ public bool CanConvert(Type type, FormDataMapperOptions options)
     //     bool succeeded = true;
     //     string street;
     //     string city;
-    //     string country;
+    //     string countryRegion;
     //     string zipCode;
     //     FormDataConveter<string> streetConverter;
     //     FormDataConveter<string> cityConverter;
-    //     FormDataConveter<string> countryConverter;
+    //     FormDataConveter<string> countryRegionConverter;
     //     FormDataConveter<string> zipCodeConverter;
 
     //     var streetConverter = options.ResolveConverter(typeof(string));
@@ -54,11 +54,11 @@ public bool CanConvert(Type type, FormDataMapperOptions options)
     //     found ||= foundProperty;
     //     reader.PopPrefix("City");
     //
-    //     var countryConverter = options.ResolveConverter(typeof(string));
-    //     reader.PushPrefix("Country");
-    //     succeeded &= countryConverter.TryRead(ref reader, typeof(string), options, out street, out foundProperty);
+    //     var countryRegionConverter = options.ResolveConverter(typeof(string));
+    //     reader.PushPrefix("CountryRegion");
+    //     succeeded &= countryRegionConverter.TryRead(ref reader, typeof(string), options, out street, out foundProperty);
     //     found ||= foundProperty;
-    //     reader.PopPrefix("Country");
+    //     reader.PopPrefix("CountryRegion");
     //
     //     var zipCodeConverter = options.ResolveConverter(typeof(string));
     //     reader.PushPrefix("ZipCode");
@@ -71,7 +71,7 @@ public bool CanConvert(Type type, FormDataMapperOptions options)
     //         result = new Address();
     //         result.Street = street;
     //         result.City = city;
-    //         result.Country = country;
+    //         result.CountryRegion = countryRegion;
     //         result.ZipCode = zipCode;
     //     }
     //     else
diff --git a/src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs b/src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs
index 5df713d111c7..8a0a00df13d1 100644
--- a/src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs
+++ b/src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs
@@ -7,13 +7,15 @@
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Forms;
 
-internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery, PersistentComponentState state) : DefaultAntiforgeryStateProvider(state)
+internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery) : DefaultAntiforgeryStateProvider()
 {
     private HttpContext? _context;
+    private bool _canGenerateToken;
 
     internal void SetRequestContext(HttpContext context)
     {
         _context = context;
+        _canGenerateToken = true;
     }
 
     public override AntiforgeryRequestToken? GetAntiforgeryToken()
@@ -21,19 +23,26 @@ internal void SetRequestContext(HttpContext context)
         if (_context == null)
         {
             // We're in an interactive context. Use the token persisted during static rendering.
-            return base.GetAntiforgeryToken();
+            return _currentToken;
         }
 
-        // We already have a callback setup to generate the token when the response starts if needed.
-        // If we need the tokens before we start streaming the response, we'll generate and store them;
-        // otherwise we'll just retrieve them.
-        // In case there are no tokens available, we are going to return null and no-op.
-        var tokens = !_context.Response.HasStarted ? antiforgery.GetAndStoreTokens(_context) : antiforgery.GetTokens(_context);
-        if (tokens.RequestToken is null)
+        if (_currentToken == null && _canGenerateToken)
         {
-            return null;
+            // We already have a callback setup to generate the token when the response starts if needed.
+            // If we need the tokens before we start streaming the response, we'll generate and store them;
+            // otherwise we'll just retrieve them.
+            // In case there are no tokens available, we are going to return null and no-op.
+            var tokens = !_context.Response.HasStarted ? antiforgery.GetAndStoreTokens(_context) : antiforgery.GetTokens(_context);
+            if (tokens.RequestToken is null)
+            {
+                return null;
+            }
+
+            _currentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);
         }
 
-        return new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);
+        return _currentToken;
     }
+
+    internal void DisableTokenGeneration() => _canGenerateToken = false;
 }
diff --git a/src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj b/src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj
index f88a64780683..de0329c94e63 100644
--- a/src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj
+++ b/src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj
@@ -8,18 +8,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS0436</NoWarn>
     <IsPackable>false</IsPackable>
-    <EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
     <Nullable>enable</Nullable>
     <DefineConstants>$(DefineConstants);COMPONENTS</DefineConstants>
   </PropertyGroup>
 
-  <!-- This workaround is required when referencing FileProviders.Embedded as a project -->
-  <PropertyGroup>
-    <_FileProviderTaskAssembly>$(ArtifactsDir)bin\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task\$(Configuration)\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll</_FileProviderTaskAssembly>
-  </PropertyGroup>
-
-  <UsingTask AssemblyFile="$(_FileProviderTaskAssembly)" TaskName="Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.GenerateEmbeddedResourcesManifest" />
-
   <ItemGroup>
     <EmbeddedResource Update="FormMapping\FormDataResources.resx" ExcludeFromManifest="true" />
     <EmbeddedResource Update="Resources.resx" ExcludeFromManifest="true" />
@@ -31,6 +23,8 @@
     <Compile Include="$(SharedSourceRoot)Components\ServerComponentSerializationSettings.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(SharedSourceRoot)Components\ServerComponent.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(SharedSourceRoot)Components\ResourceCollectionResolver.cs" LinkBase="Assets" />
+    <Compile Include="$(SharedSourceRoot)Components\ServerComponentSerializer.cs" LinkBase="DependencyInjection" />
+    <Compile Include="$(SharedSourceRoot)Components\ServerComponentInvocationSequence.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(RepoRoot)src\Shared\Components\ComponentParameter.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(RepoRoot)src\Shared\Components\PrerenderComponentApplicationStore.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(RepoRoot)src\Shared\Components\ProtectedPrerenderComponentApplicationStore.cs" LinkBase="DependencyInjection" />
@@ -39,6 +33,8 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\ResourceCollectionProvider.cs" Link="Shared\ResourceCollectionProvider.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\DefaultAntiforgeryStateProvider.cs" LinkBase="Forms" />
     <Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Components\ComponentsActivityLinkStore.cs" LinkBase="Shared" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
 
     <Compile Include="$(SharedSourceRoot)PropertyHelper\**\*.cs" />
 
@@ -48,6 +44,7 @@
     <Reference Include="Microsoft.AspNetCore.Antiforgery" />
     <Reference Include="Microsoft.AspNetCore.Components.Authorization" />
     <Reference Include="Microsoft.AspNetCore.Components.Web" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
     <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
     <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
@@ -57,31 +54,8 @@
     <Reference Include="Microsoft.AspNetCore.Routing" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.AspNetCore.StaticAssets" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <BlazorWebJSFilename>blazor.web.js</BlazorWebJSFilename>
-    <!-- Microsoft.AspNetCore.Components.Web.JS.npmproj always capitalizes the directory name. -->
-    <BlazorWebJSFile Condition=" '$(Configuration)' == 'Debug' ">..\..\Web.JS\dist\Debug\$(BlazorWebJSFilename)</BlazorWebJSFile>
-    <BlazorWebJSFile Condition=" '$(Configuration)' != 'Debug' ">..\..\Web.JS\dist\Release\$(BlazorWebJSFilename)</BlazorWebJSFile>
-  </PropertyGroup>
-
-  <!-- blazor.web.js should exist after eng/Npm.Workspace.nodeproj builds. Fall back if not. -->
-  <Target Name="_CheckBlazorWebJSPath" AfterTargets="ResolveProjectReferences" Condition=" !EXISTS('$(BlazorWebJSFile)') ">
-    <Warning Text="'$(BlazorWebJSFile)' does not exist. Falling back to checked-in copy." />
-    <PropertyGroup>
-      <BlazorWebJSFile>..\..\Web.JS\dist\Release\$(BlazorWebJSFilename)</BlazorWebJSFile>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_AddEmbeddedBlazorWebJS" AfterTargets="_CheckBlazorWebJSPath">
-    <ItemGroup>
-      <EmbeddedResource Include="$(BlazorWebJSFile)" LogicalName="_framework/$(BlazorWebJSFilename)" />
-      <EmbeddedResource Include="$(BlazorWebJSFile).map" LogicalName="_framework/$(BlazorWebJSFilename).map" Condition="Exists('$(BlazorWebJSFile).map')" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.Endpoints.Microbenchmarks" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.Endpoints.Tests" />
diff --git a/src/Components/Endpoints/src/PublicAPI.Shipped.txt b/src/Components/Endpoints/src/PublicAPI.Shipped.txt
index ffbad3d28b64..6e93e89dadda 100644
--- a/src/Components/Endpoints/src/PublicAPI.Shipped.txt
+++ b/src/Components/Endpoints/src/PublicAPI.Shipped.txt
@@ -35,10 +35,27 @@ Microsoft.AspNetCore.Components.Endpoints.RazorComponentsServiceOptions.Temporar
 Microsoft.AspNetCore.Components.Endpoints.RootComponentMetadata
 Microsoft.AspNetCore.Components.Endpoints.RootComponentMetadata.RootComponentMetadata(System.Type! rootComponentType) -> void
 Microsoft.AspNetCore.Components.Endpoints.RootComponentMetadata.Type.get -> System.Type!
+Microsoft.AspNetCore.Components.ImportMap
+Microsoft.AspNetCore.Components.ImportMap.AdditionalAttributes.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
+Microsoft.AspNetCore.Components.ImportMap.AdditionalAttributes.set -> void
+Microsoft.AspNetCore.Components.ImportMap.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext?
+Microsoft.AspNetCore.Components.ImportMap.HttpContext.set -> void
+Microsoft.AspNetCore.Components.ImportMap.ImportMap() -> void
+Microsoft.AspNetCore.Components.ImportMap.ImportMapDefinition.get -> Microsoft.AspNetCore.Components.ImportMapDefinition?
+Microsoft.AspNetCore.Components.ImportMap.ImportMapDefinition.set -> void
+Microsoft.AspNetCore.Components.ImportMapDefinition
+Microsoft.AspNetCore.Components.ImportMapDefinition.ImportMapDefinition(System.Collections.Generic.IReadOnlyDictionary<string!, string!>? imports, System.Collections.Generic.IReadOnlyDictionary<string!, System.Collections.Generic.IReadOnlyDictionary<string!, string!>!>? scopes, System.Collections.Generic.IReadOnlyDictionary<string!, string!>? integrity) -> void
+Microsoft.AspNetCore.Components.ImportMapDefinition.Imports.get -> System.Collections.Generic.IReadOnlyDictionary<string!, string!>?
+Microsoft.AspNetCore.Components.ImportMapDefinition.Integrity.get -> System.Collections.Generic.IReadOnlyDictionary<string!, string!>?
+Microsoft.AspNetCore.Components.ImportMapDefinition.Scopes.get -> System.Collections.Generic.IReadOnlyDictionary<string!, System.Collections.Generic.IReadOnlyDictionary<string!, string!>!>?
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode.Infer = 1 -> Microsoft.AspNetCore.Components.PersistedStateSerializationMode
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode.Server = 2 -> Microsoft.AspNetCore.Components.PersistedStateSerializationMode
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode.WebAssembly = 3 -> Microsoft.AspNetCore.Components.PersistedStateSerializationMode
+Microsoft.AspNetCore.Components.Routing.RazorComponentsEndpointHttpContextExtensions
+Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider
+Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.ServerAuthenticationStateProvider() -> void
+Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void
 Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult
 Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.ComponentType.get -> System.Type!
 Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.ContentType.get -> string?
@@ -59,7 +76,14 @@ Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult<TComponent>.RazorComp
 Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder
 Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder.Services.get -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 Microsoft.Extensions.DependencyInjection.RazorComponentsServiceCollectionExtensions
+override Microsoft.AspNetCore.Components.ImportMapDefinition.ToString() -> string!
+override Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>!
 static Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilderExtensions.AddAdditionalAssemblies(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, params System.Reflection.Assembly![]! assemblies) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
+static Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilderExtensions.WithStaticAssets(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, string? manifestPath = null) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.RazorComponentsEndpointRouteBuilderExtensions.MapRazorComponents<TRootComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
 static Microsoft.AspNetCore.Components.Endpoints.Infrastructure.ComponentEndpointConventionBuilderHelper.AddRenderMode(Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> void
+static Microsoft.AspNetCore.Components.Endpoints.Infrastructure.ComponentEndpointConventionBuilderHelper.GetEndpointRouteBuilder(Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder) -> Microsoft.AspNetCore.Routing.IEndpointRouteBuilder!
+static Microsoft.AspNetCore.Components.ImportMapDefinition.Combine(params Microsoft.AspNetCore.Components.ImportMapDefinition![]! sources) -> Microsoft.AspNetCore.Components.ImportMapDefinition!
+static Microsoft.AspNetCore.Components.ImportMapDefinition.FromResourceCollection(Microsoft.AspNetCore.Components.ResourceAssetCollection! assets) -> Microsoft.AspNetCore.Components.ImportMapDefinition!
+static Microsoft.AspNetCore.Components.Routing.RazorComponentsEndpointHttpContextExtensions.AcceptsInteractiveRouting(this Microsoft.AspNetCore.Http.HttpContext! context) -> bool
 static Microsoft.Extensions.DependencyInjection.RazorComponentsServiceCollectionExtensions.AddRazorComponents(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.Endpoints.RazorComponentsServiceOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder!
diff --git a/src/Components/Endpoints/src/PublicAPI.Unshipped.txt b/src/Components/Endpoints/src/PublicAPI.Unshipped.txt
index 83071d81d258..424ca155339b 100644
--- a/src/Components/Endpoints/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Endpoints/src/PublicAPI.Unshipped.txt
@@ -1,25 +1,5 @@
 #nullable enable
-Microsoft.AspNetCore.Components.ImportMap
-Microsoft.AspNetCore.Components.ImportMap.AdditionalAttributes.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
-Microsoft.AspNetCore.Components.ImportMap.AdditionalAttributes.set -> void
-Microsoft.AspNetCore.Components.ImportMap.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext?
-Microsoft.AspNetCore.Components.ImportMap.HttpContext.set -> void
-Microsoft.AspNetCore.Components.ImportMap.ImportMap() -> void
-Microsoft.AspNetCore.Components.ImportMap.ImportMapDefinition.get -> Microsoft.AspNetCore.Components.ImportMapDefinition?
-Microsoft.AspNetCore.Components.ImportMap.ImportMapDefinition.set -> void
-Microsoft.AspNetCore.Components.ImportMapDefinition
-Microsoft.AspNetCore.Components.ImportMapDefinition.ImportMapDefinition(System.Collections.Generic.IReadOnlyDictionary<string!, string!>? imports, System.Collections.Generic.IReadOnlyDictionary<string!, System.Collections.Generic.IReadOnlyDictionary<string!, string!>!>? scopes, System.Collections.Generic.IReadOnlyDictionary<string!, string!>? integrity) -> void
-Microsoft.AspNetCore.Components.ImportMapDefinition.Imports.get -> System.Collections.Generic.IReadOnlyDictionary<string!, string!>?
-Microsoft.AspNetCore.Components.ImportMapDefinition.Integrity.get -> System.Collections.Generic.IReadOnlyDictionary<string!, string!>?
-Microsoft.AspNetCore.Components.ImportMapDefinition.Scopes.get -> System.Collections.Generic.IReadOnlyDictionary<string!, System.Collections.Generic.IReadOnlyDictionary<string!, string!>!>?
-Microsoft.AspNetCore.Components.Routing.RazorComponentsEndpointHttpContextExtensions
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.ServerAuthenticationStateProvider() -> void
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void
-override Microsoft.AspNetCore.Components.ImportMapDefinition.ToString() -> string!
-override Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>!
-static Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilderExtensions.WithStaticAssets(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, string? manifestPath = null) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
-static Microsoft.AspNetCore.Components.Endpoints.Infrastructure.ComponentEndpointConventionBuilderHelper.GetEndpointRouteBuilder(Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder) -> Microsoft.AspNetCore.Routing.IEndpointRouteBuilder!
-static Microsoft.AspNetCore.Components.ImportMapDefinition.Combine(params Microsoft.AspNetCore.Components.ImportMapDefinition![]! sources) -> Microsoft.AspNetCore.Components.ImportMapDefinition!
-static Microsoft.AspNetCore.Components.ImportMapDefinition.FromResourceCollection(Microsoft.AspNetCore.Components.ResourceAssetCollection! assets) -> Microsoft.AspNetCore.Components.ImportMapDefinition!
-static Microsoft.AspNetCore.Components.Routing.RazorComponentsEndpointHttpContextExtensions.AcceptsInteractiveRouting(this Microsoft.AspNetCore.Http.HttpContext! context) -> bool
+Microsoft.AspNetCore.Components.ResourcePreloader
+Microsoft.AspNetCore.Components.ResourcePreloader.ResourcePreloader() -> void
+Microsoft.Extensions.DependencyInjection.RazorComponentsRazorComponentBuilderExtensions
+static Microsoft.Extensions.DependencyInjection.RazorComponentsRazorComponentBuilderExtensions.RegisterPersistentService<TPersistentService>(this Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder! builder, Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder!
diff --git a/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs b/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
index 7a76a43098d4..22119d0522c9 100644
--- a/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
+++ b/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
@@ -6,7 +6,10 @@
 using System.Text;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Components.Endpoints.Forms;
 using Microsoft.AspNetCore.Components.Endpoints.Rendering;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
@@ -21,10 +24,12 @@ internal partial class RazorComponentEndpointInvoker : IRazorComponentEndpointIn
 {
     private readonly EndpointHtmlRenderer _renderer;
     private readonly ILogger<RazorComponentEndpointInvoker> _logger;
+    private readonly ComponentsActivityLinkStore _activityLinkStore;
 
     public RazorComponentEndpointInvoker(EndpointHtmlRenderer renderer, ILogger<RazorComponentEndpointInvoker> logger)
     {
         _renderer = renderer;
+        _activityLinkStore = new ComponentsActivityLinkStore(renderer);
         _logger = logger;
     }
 
@@ -39,12 +44,19 @@ private async Task RenderComponentCore(HttpContext context)
     {
         context.Response.ContentType = RazorComponentResultExecutor.DefaultContentType;
         var isErrorHandler = context.Features.Get<IExceptionHandlerFeature>() is not null;
+        var hasStatusCodePage = context.Features.Get<IStatusCodePagesFeature>() is not null;
+        var isReExecuted = context.Features.Get<IStatusCodeReExecuteFeature>() is not null;
+        var httpActivityContext = context.Features.Get<IHttpActivityFeature>()?.Activity.Context ?? default;
         if (isErrorHandler)
         {
             Log.InteractivityDisabledForErrorHandling(_logger);
         }
-        _renderer.InitializeStreamingRenderingFraming(context, isErrorHandler);
-        EndpointHtmlRenderer.MarkAsAllowingEnhancedNavigation(context);
+        _renderer.InitializeStreamingRenderingFraming(context, isErrorHandler, isReExecuted);
+        if (!isReExecuted)
+        {
+            // re-executed pages have Headers already set up
+            EndpointHtmlRenderer.MarkAsAllowingEnhancedNavigation(context);
+        }
 
         var endpoint = context.GetEndpoint() ?? throw new InvalidOperationException($"An endpoint must be set on the '{nameof(HttpContext)}'.");
 
@@ -66,15 +78,12 @@ private async Task RenderComponentCore(HttpContext context)
             return;
         }
 
-        context.Response.OnStarting(() =>
+        if (httpActivityContext != default)
         {
-            // Generate the antiforgery tokens before we start streaming the response, as it needs
-            // to set the cookie header.
-            antiforgery!.GetAndStoreTokens(context);
-            return Task.CompletedTask;
-        });
+            _activityLinkStore.SetActivityContext(ComponentsActivityLinkStore.Http, httpActivityContext, null);
+        }
 
-        await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
+        await _renderer.InitializeStandardComponentServicesAsync(
             context,
             componentType: pageComponent,
             handler: result.HandlerName,
@@ -85,6 +94,8 @@ await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
         await using var writer = new HttpResponseStreamWriter(context.Response.Body, Encoding.UTF8, defaultBufferSize, ArrayPool<byte>.Shared, ArrayPool<char>.Shared);
         using var bufferWriter = new BufferedTextWriter(writer);
 
+        bool isErrorHandlerOrReExecuted = isErrorHandler || isReExecuted;
+
         // Note that we always use Static rendering mode for the top-level output from a RazorComponentResult,
         // because you never want to serialize the invocation of RazorComponentResultHost. Instead, that host
         // component takes care of switching into your desired render mode when it produces its own output.
@@ -92,10 +103,10 @@ await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
             context,
             rootComponent,
             ParameterView.Empty,
-            waitForQuiescence: result.IsPost || isErrorHandler);
+            waitForQuiescence: result.IsPost || isErrorHandlerOrReExecuted);
 
         Task quiesceTask;
-        if (!result.IsPost)
+        if (!result.IsPost || isReExecuted)
         {
             quiesceTask = htmlContent.QuiescenceTask;
         }
@@ -119,6 +130,11 @@ await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
             }
         }
 
+        if (_renderer.NotFoundEventArgs != null)
+        {
+            _renderer.SetNotFoundWhenResponseNotStarted();
+        }
+
         if (!quiesceTask.IsCompleted)
         {
             // An incomplete QuiescenceTask indicates there may be streaming rendering updates.
@@ -126,8 +142,17 @@ await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
             var bufferingFeature = context.Features.GetRequiredFeature<IHttpResponseBodyFeature>();
             bufferingFeature.DisableBuffering();
 
+            // Store the tokens if not emitted already in case we stream a form in the response.
+            antiforgery!.GetAndStoreTokens(context);
+
             context.Response.Headers.ContentEncoding = "identity";
         }
+        else if (endpoint.Metadata.GetMetadata<ConfiguredRenderModesMetadata>()?.ConfiguredRenderModes.Length == 0)
+        {
+            // Disable token generation on EndpointAntiforgeryStateProvider if we are not streaming.
+            var provider = (EndpointAntiforgeryStateProvider)context.RequestServices.GetRequiredService<AntiforgeryStateProvider>();
+            provider.DisableTokenGeneration();
+        }
 
         // Importantly, we must not yield this thread (which holds exclusive access to the renderer sync context)
         // in between the first call to htmlContent.WriteTo and the point where we start listening for subsequent
@@ -138,6 +163,10 @@ await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
         if (!quiesceTask.IsCompletedSuccessfully)
         {
             await _renderer.SendStreamingUpdatesAsync(context, quiesceTask, bufferWriter);
+            if (_renderer.NotFoundEventArgs != null)
+            {
+                await _renderer.SetNotFoundWhenResponseHasStarted();
+            }
         }
         else
         {
@@ -145,12 +174,23 @@ await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
         }
 
         // Emit comment containing state.
-        if (!isErrorHandler)
+        if (!isErrorHandlerOrReExecuted)
         {
             var componentStateHtmlContent = await _renderer.PrerenderPersistedStateAsync(context);
             componentStateHtmlContent.WriteTo(bufferWriter, HtmlEncoder.Default);
         }
 
+        if (context.Response.StatusCode == StatusCodes.Status404NotFound &&
+            !isReExecuted &&
+            string.IsNullOrEmpty(_renderer.NotFoundEventArgs?.Path))
+        {
+            // Router did not handle the NotFound event, otherwise this would not be empty.
+            // Don't flush the response if we have an unhandled 404 rendering
+            // This will allow the StatusCodePages middleware to re-execute the request
+            context.Response.ContentType = null;
+            return;
+        }
+
         // Invoke FlushAsync to ensure any buffered content is asynchronously written to the underlying
         // response asynchronously. In the absence of this line, the buffer gets synchronously written to the
         // response as part of the Dispose which has a perf impact.
diff --git a/src/Components/Endpoints/src/Rendering/EndpointComponentState.cs b/src/Components/Endpoints/src/Rendering/EndpointComponentState.cs
index 5ff3e11be8fe..6c03d0585f2f 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointComponentState.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointComponentState.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Reflection.Metadata;
 using Microsoft.AspNetCore.Components.Endpoints;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 
@@ -16,9 +17,20 @@ internal sealed class EndpointComponentState : ComponentState
 {
     private static readonly ConcurrentDictionary<Type, StreamRenderingAttribute?> _streamRenderingAttributeByComponentType = new();
 
+    static EndpointComponentState()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += _streamRenderingAttributeByComponentType.Clear;
+        }
+    }
+
+    private readonly EndpointHtmlRenderer _renderer;
     public EndpointComponentState(Renderer renderer, int componentId, IComponent component, ComponentState? parentComponentState)
         : base(renderer, componentId, component, parentComponentState)
     {
+        _renderer = (EndpointHtmlRenderer)renderer;
+
         var streamRenderingAttribute = _streamRenderingAttributeByComponentType.GetOrAdd(component.GetType(),
             type => type.GetCustomAttribute<StreamRenderingAttribute>());
 
@@ -35,6 +47,22 @@ public EndpointComponentState(Renderer renderer, int componentId, IComponent com
 
     public bool StreamRendering { get; }
 
+    protected override object? GetComponentKey()
+    {
+        if (ParentComponentState != null && ParentComponentState.Component is SSRRenderModeBoundary boundary)
+        {
+            var (sequence, key) = _renderer.GetSequenceAndKey(ParentComponentState);
+            var marker = boundary.GetComponentMarkerKey(sequence, key);
+            if (!marker.Equals(default))
+            {
+                return marker.Serialized();
+            }
+        }
+
+        // Fall back to the default implementation
+        return base.GetComponentKey();
+    }
+
     /// <summary>
     /// MetadataUpdateHandler event. This is invoked by the hot reload host via reflection.
     /// </summary>
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
index cd47eb63590f..a06d3e66d622 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
@@ -1,11 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Components.Endpoints.Rendering;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using System.Buffers;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -74,6 +79,68 @@ private Task ReturnErrorResponse(string detailedMessage)
             : Task.CompletedTask;
     }
 
+    internal void SetNotFoundWhenResponseNotStarted()
+    {
+        _httpContext.Response.StatusCode = StatusCodes.Status404NotFound;
+
+        // When the application triggers a NotFound event, we continue rendering the current batch.
+        // However, after completing this batch, we do not want to process any further UI updates,
+        // as we are going to return a 404 status and discard the UI updates generated so far.
+        SignalRendererToFinishRendering();
+    }
+
+    internal async Task SetNotFoundWhenResponseHasStarted()
+    {
+        if (string.IsNullOrEmpty(_notFoundUrl))
+        {
+            var baseUri = $"{_httpContext.Request.Scheme}://{_httpContext.Request.Host}{_httpContext.Request.PathBase}/";
+            _notFoundUrl = GetNotFoundUrl(baseUri, NotFoundEventArgs);
+        }
+        var defaultBufferSize = 16 * 1024;
+        await using var writer = new HttpResponseStreamWriter(_httpContext.Response.Body, Encoding.UTF8, defaultBufferSize, ArrayPool<byte>.Shared, ArrayPool<char>.Shared);
+        using var bufferWriter = new BufferedTextWriter(writer);
+        HandleNotFoundAfterResponseStarted(bufferWriter, _httpContext, _notFoundUrl);
+        await bufferWriter.FlushAsync();
+
+        // When the application triggers a NotFound event, we continue rendering the current batch.
+        // However, after completing this batch, we do not want to process any further UI updates,
+        // as we are going to return a 404 status and discard the UI updates generated so far.
+        SignalRendererToFinishRendering();
+    }
+
+    private string GetNotFoundUrl(string baseUri, NotFoundEventArgs? args)
+    {
+        string? path = args?.Path;
+        if (string.IsNullOrEmpty(path))
+        {
+            var pathFormat = _httpContext.Items[nameof(StatusCodePagesOptions)] as string;
+            if (string.IsNullOrEmpty(pathFormat))
+            {
+                throw new InvalidOperationException($"The {nameof(Router.NotFoundPage)} route must be specified or re-execution middleware has to be set to render not found content.");
+            }
+
+            path = pathFormat;
+        }
+        return $"{baseUri}{path.TrimStart('/')}";
+    }
+
+    private async Task OnNavigateTo(string uri)
+    {
+        if (_httpContext.Response.HasStarted)
+        {
+            var defaultBufferSize = 16 * 1024;
+            await using var writer = new HttpResponseStreamWriter(_httpContext.Response.Body, Encoding.UTF8, defaultBufferSize, ArrayPool<byte>.Shared, ArrayPool<char>.Shared);
+            using var bufferWriter = new BufferedTextWriter(writer);
+            HandleNavigationAfterResponseStarted(bufferWriter, _httpContext, uri);
+            await bufferWriter.FlushAsync();
+        }
+        else
+        {
+            await HandleNavigationBeforeResponseStarted(_httpContext, uri);
+        }
+        SignalRendererToFinishRendering();
+    }
+
     private void UpdateNamedSubmitEvents(in RenderBatch renderBatch)
     {
         if (renderBatch.NamedEventChanges is { } changes)
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Prerendering.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Prerendering.cs
index e331fd5707c2..ec8407b17a96 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Prerendering.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Prerendering.cs
@@ -5,9 +5,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web.HtmlRendering;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.AspNetCore.Components.Endpoints;
@@ -166,7 +168,50 @@ private async Task WaitForResultReady(bool waitForQuiescence, PrerenderedCompone
         }
         else if (_nonStreamingPendingTasks.Count > 0)
         {
-            await WaitForNonStreamingPendingTasks();
+            if (_isReExecuted)
+            {
+                HandleNonStreamingTasks();
+            }
+            else
+            {
+                await WaitForNonStreamingPendingTasks();
+            }
+        }
+    }
+
+    public void HandleNonStreamingTasks()
+    {
+        if (NonStreamingPendingTasksCompletion == null)
+        {
+            foreach (var task in _nonStreamingPendingTasks)
+            {
+                _ = GetErrorHandledTask(task);
+            }
+
+            // Clear the pending tasks since we are handling them
+            _nonStreamingPendingTasks.Clear();
+
+            NonStreamingPendingTasksCompletion = Task.CompletedTask;
+        }
+    }
+
+    private async Task GetErrorHandledTask(Task taskToHandle)
+    {
+        try
+        {
+            await taskToHandle;
+        }
+        catch (Exception ex)
+        {
+            // Ignore errors due to task cancellations.
+            if (!taskToHandle.IsCanceled)
+            {
+                _logger.LogError(
+                    ex,
+                    "An exception occurred during non-streaming rendering. " +
+                    "This exception will be ignored because the response " +
+                    "is being discarded and the request is being re-executed.");
+            }
         }
     }
 
@@ -184,9 +229,16 @@ async Task Execute()
                 // Clear all pending work.
                 _nonStreamingPendingTasks.Clear();
 
-                // new work might be added before we check again as a result of waiting for all
-                // the child components to finish executing SetParametersAsync
-                await pendingWork;
+                try
+                {
+                    // new work might be added before we check again as a result of waiting for all
+                    // the child components to finish executing SetParametersAsync
+                    await pendingWork;
+                }
+                catch (NavigationException navigationException)
+                {
+                    await HandleNavigationException(_httpContext, navigationException);
+                }
             }
         }
     }
@@ -206,7 +258,15 @@ public static ValueTask<PrerenderedComponentHtmlContent> HandleNavigationExcepti
                 "response and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.",
                 navigationException);
         }
-        else if (IsPossibleExternalDestination(httpContext.Request, navigationException.Location)
+        else
+        {
+            return HandleNavigationBeforeResponseStarted(httpContext, navigationException.Location);
+        }
+    }
+
+    private static ValueTask<PrerenderedComponentHtmlContent> HandleNavigationBeforeResponseStarted(HttpContext httpContext, string destinationLocation)
+    {
+        if (IsPossibleExternalDestination(httpContext.Request, destinationLocation)
             && IsProgressivelyEnhancedNavigation(httpContext.Request))
         {
             // For progressively-enhanced nav, we prefer to use opaque redirections for external URLs rather than
@@ -214,12 +274,12 @@ public static ValueTask<PrerenderedComponentHtmlContent> HandleNavigationExcepti
             // duplicated request. The client can't rely on receiving this header, though, since non-Blazor endpoints
             // wouldn't return it.
             httpContext.Response.Headers.Add("blazor-enhanced-nav-redirect-location",
-                OpaqueRedirection.CreateProtectedRedirectionUrl(httpContext, navigationException.Location));
+                OpaqueRedirection.CreateProtectedRedirectionUrl(httpContext, destinationLocation));
             return new ValueTask<PrerenderedComponentHtmlContent>(PrerenderedComponentHtmlContent.Empty);
         }
         else
         {
-            httpContext.Response.Redirect(navigationException.Location);
+            httpContext.Response.Redirect(destinationLocation);
             return new ValueTask<PrerenderedComponentHtmlContent>(PrerenderedComponentHtmlContent.Empty);
         }
     }
@@ -246,6 +306,42 @@ internal static ServerComponentInvocationSequence GetOrCreateInvocationId(HttpCo
         return (ServerComponentInvocationSequence)result!;
     }
 
+    internal (int sequence, object? key) GetSequenceAndKey(ComponentState boundaryComponentState)
+    {
+        if (boundaryComponentState is null || boundaryComponentState.Component is not SSRRenderModeBoundary boundary)
+        {
+            throw new InvalidOperationException(
+                "The parent component state must be an SSRRenderModeBoundary to get the sequence and key.");
+        }
+
+        // The boundary is at the root (not supported, but we handle it gracefully)
+        if (boundaryComponentState.ParentComponentState is null)
+        {
+            return (0, null);
+        }
+
+        // Grab the parent of the boundary component. We need to find the SSRRenderModeBoundary component marker frame
+        // within it. As when we do `@rendermode="InteractiveServer" @key="some-key" the sequence we are interested in
+        // is the one on the SSRRenderModeBoundary component marker frame, not the one on the nested component frame.
+        // Same for the key.
+        var targetState = boundaryComponentState.ParentComponentState;
+        var frames = GetCurrentRenderTreeFrames(targetState.ComponentId);
+        for (var i = 0; i < frames.Count; i++)
+        {
+            ref var frame = ref frames.Array[i];
+            if (frame.FrameType == RenderTreeFrameType.Component &&
+                frame.Component is SSRRenderModeBoundary candidate &&
+                ReferenceEquals(candidate, boundary))
+            {
+                // This is the component marker frame, so we can use its sequence and key
+                return (frame.Sequence, frame.ComponentKey);
+            }
+        }
+
+        throw new InvalidOperationException(
+            "The parent component state does not have a valid SSRRenderModeBoundary component marker frame.");
+    }
+
     // An implementation of IHtmlContent that holds a reference to a component until we're ready to emit it as HTML to the response.
     // We don't construct the actual HTML until we receive the call to WriteTo.
     public class PrerenderedComponentHtmlContent : IHtmlAsyncContent
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs
index f7fd6a8860f8..50728a8c3271 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.Streaming.cs
@@ -22,11 +22,13 @@ internal partial class EndpointHtmlRenderer
     private HashSet<int>? _visitedComponentIdsInCurrentStreamingBatch;
     private string? _ssrFramingCommentMarkup;
     private bool _isHandlingErrors;
+    private bool _isReExecuted;
 
-    public void InitializeStreamingRenderingFraming(HttpContext httpContext, bool isErrorHandler)
+    public void InitializeStreamingRenderingFraming(HttpContext httpContext, bool isErrorHandler, bool isReExecuted)
     {
         _isHandlingErrors = isErrorHandler;
-        if (IsProgressivelyEnhancedNavigation(httpContext.Request))
+        _isReExecuted = isReExecuted;
+        if (!isReExecuted && IsProgressivelyEnhancedNavigation(httpContext.Request))
         {
             var id = Guid.NewGuid().ToString();
             httpContext.Response.Headers.Add(_streamingRenderingFramingHeaderName, id);
@@ -223,16 +225,27 @@ private static void HandleExceptionAfterResponseStarted(HttpContext httpContext,
         writer.Write("</template><blazor-ssr-end></blazor-ssr-end></blazor-ssr>");
     }
 
+    private static void HandleNotFoundAfterResponseStarted(TextWriter writer, HttpContext httpContext, string notFoundUrl)
+    {
+        writer.Write("<blazor-ssr><template type=\"not-found\"");
+        WriteResponseTemplate(writer, httpContext, notFoundUrl, useEnhancedNav: true);
+    }
+
     private static void HandleNavigationAfterResponseStarted(TextWriter writer, HttpContext httpContext, string destinationUrl)
     {
         writer.Write("<blazor-ssr><template type=\"redirection\"");
+        bool useEnhancedNav = IsProgressivelyEnhancedNavigation(httpContext.Request);
+        WriteResponseTemplate(writer, httpContext, destinationUrl, useEnhancedNav);
+    }
 
-        if (string.Equals(httpContext.Request.Method, "POST", StringComparison.OrdinalIgnoreCase))
+    private static void WriteResponseTemplate(TextWriter writer, HttpContext httpContext, string destinationUrl, bool useEnhancedNav)
+    {
+        if (HttpMethods.IsPost(httpContext.Request.Method))
         {
             writer.Write(" from=\"form-post\"");
         }
 
-        if (IsProgressivelyEnhancedNavigation(httpContext.Request))
+        if (useEnhancedNav)
         {
             writer.Write(" enhanced=\"true\"");
         }
@@ -271,6 +284,15 @@ private void WriteComponentHtml(int componentId, TextWriter output, bool allowBo
                 _httpContext.Response.Headers.CacheControl = "no-cache, no-store, max-age=0";
             }
 
+            if (marker.Type is ComponentMarker.WebAssemblyMarkerType or ComponentMarker.AutoMarkerType)
+            {
+                if (_httpContext.RequestServices.GetRequiredService<WebAssemblySettingsEmitter>().TryGetSettingsOnce(out var settings))
+                {
+                    var settingsJson = JsonSerializer.Serialize(settings, ServerComponentSerializationSettings.JsonSerializationOptions);
+                    output.Write($"<!--Blazor-WebAssembly:{settingsJson}-->");
+                }
+            }
+
             var serializedStartRecord = JsonSerializer.Serialize(marker, ServerComponentSerializationSettings.JsonSerializationOptions);
             output.Write("<!--Blazor:");
             output.Write(serializedStartRecord);
@@ -302,7 +324,7 @@ private void WriteComponentHtml(int componentId, TextWriter output, bool allowBo
         }
     }
 
-    private static bool IsProgressivelyEnhancedNavigation(HttpRequest request)
+    internal static bool IsProgressivelyEnhancedNavigation(HttpRequest request)
     {
         // For enhanced nav, the Blazor JS code controls the "accept" header precisely, so we can be very specific about the format
         var accept = request.Headers.Accept;
diff --git a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
index e66ca88536a9..4d95f68c0fc5 100644
--- a/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
+++ b/src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Routing;
@@ -42,6 +43,8 @@ internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrer
     private Task? _servicesInitializedTask;
     private HttpContext _httpContext = default!; // Always set at the start of an inbound call
     private ResourceAssetCollection? _resourceCollection;
+    private bool _rendererIsStopped;
+    private readonly ILogger _logger;
 
     // The underlying Renderer always tracks the pending tasks representing *full* quiescence, i.e.,
     // when everything (regardless of streaming SSR) is fully complete. In this subclass we also track
@@ -49,16 +52,20 @@ internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrer
     // wait for the non-streaming tasks (these ones), then start streaming until full quiescence.
     private readonly List<Task> _nonStreamingPendingTasks = new();
 
+    private string _notFoundUrl = string.Empty;
+
     public EndpointHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory)
         : base(serviceProvider, loggerFactory)
     {
         _services = serviceProvider;
         _options = serviceProvider.GetRequiredService<IOptions<RazorComponentsServiceOptions>>().Value;
+        _logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Components.RenderTree.Renderer");
     }
 
     internal HttpContext? HttpContext => _httpContext;
+    internal NotFoundEventArgs? NotFoundEventArgs { get; private set; }
 
-    private void SetHttpContext(HttpContext httpContext)
+    internal void SetHttpContext(HttpContext httpContext)
     {
         if (_httpContext is null)
         {
@@ -70,14 +77,19 @@ private void SetHttpContext(HttpContext httpContext)
         }
     }
 
-    internal static async Task InitializeStandardComponentServicesAsync(
+    internal async Task InitializeStandardComponentServicesAsync(
         HttpContext httpContext,
         [DynamicallyAccessedMembers(Component)] Type? componentType = null,
         string? handler = null,
         IFormCollection? form = null)
     {
-        var navigationManager = (IHostEnvironmentNavigationManager)httpContext.RequestServices.GetRequiredService<NavigationManager>();
-        navigationManager?.Initialize(GetContextBaseUri(httpContext.Request), GetFullUri(httpContext.Request));
+        var navigationManager = httpContext.RequestServices.GetRequiredService<NavigationManager>();
+        ((IHostEnvironmentNavigationManager)navigationManager)?.Initialize(
+            GetContextBaseUri(httpContext.Request), 
+            GetFullUri(httpContext.Request), 
+            uri => GetErrorHandledTask(OnNavigateTo(uri)));
+
+        navigationManager?.OnNotFound += (sender, args) => NotFoundEventArgs = args;
 
         var authenticationStateProvider = httpContext.RequestServices.GetService<AuthenticationStateProvider>();
         if (authenticationStateProvider is IHostEnvironmentAuthenticationStateProvider hostEnvironmentAuthenticationStateProvider)
@@ -113,7 +125,8 @@ internal static async Task InitializeStandardComponentServicesAsync(
         // It's important that this is initialized since a component might try to restore state during prerendering
         // (which will obviously not work, but should not fail)
         var componentApplicationLifetime = httpContext.RequestServices.GetRequiredService<ComponentStatePersistenceManager>();
-        await componentApplicationLifetime.RestoreStateAsync(new PrerenderComponentApplicationStore());
+        componentApplicationLifetime.SetPlatformRenderMode(RenderMode.InteractiveAuto);
+        await componentApplicationLifetime.RestoreStateAsync(new PrerenderComponentApplicationStore(), RestoreContext.InitialValue);
 
         if (componentType != null)
         {
@@ -139,7 +152,7 @@ private static void InitializeResourceCollection(HttpContext httpContext)
         var resourceCollectionProvider = resourceCollectionUrl != null ? httpContext.RequestServices.GetService<ResourceCollectionProvider>() : null;
         if (resourceCollectionUrl != null && resourceCollectionProvider != null)
         {
-            resourceCollectionProvider.SetResourceCollectionUrl(resourceCollectionUrl.Url);
+            resourceCollectionProvider.ResourceCollectionUrl = resourceCollectionUrl.Url;
             resourceCollectionProvider.SetResourceCollection(resourceCollection ?? ResourceAssetCollection.Empty);
         }
     }
@@ -155,6 +168,11 @@ protected override ComponentState CreateComponentState(int componentId, ICompone
 
     protected override void AddPendingTask(ComponentState? componentState, Task task)
     {
+        if (_isReExecuted)
+        {
+            return;
+        }
+
         var streamRendering = componentState is null
             ? false
             : ((EndpointComponentState)componentState).StreamRendering;
@@ -168,6 +186,22 @@ protected override void AddPendingTask(ComponentState? componentState, Task task
         base.AddPendingTask(componentState, task);
     }
 
+    // For testing purposes only
+    internal void SignalRendererToFinishRendering()
+    {
+        // sets a deferred stop on the renderer, which will have an effect after the current batch is completed
+        _rendererIsStopped = true;
+    }
+
+    protected override void ProcessPendingRender()
+    {
+        if (_rendererIsStopped)
+        {
+            return;
+        }
+        base.ProcessPendingRender();
+    }
+
     // For tests only
     internal Task? NonStreamingPendingTasksCompletion;
 
@@ -175,7 +209,7 @@ protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
     {
         UpdateNamedSubmitEvents(in renderBatch);
 
-        if (_streamingUpdatesWriter is { } writer)
+        if (_streamingUpdatesWriter is { } writer && !_rendererIsStopped)
         {
             // Important: SendBatchAsStreamingUpdate *must* be invoked synchronously
             // before any 'await' in this method. That's enforced by the compiler
diff --git a/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs b/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs
index e3d498d139bd..1febaa8f4af5 100644
--- a/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs
+++ b/src/Components/Endpoints/src/Rendering/SSRRenderModeBoundary.cs
@@ -28,6 +28,7 @@ internal class SSRRenderModeBoundary : IComponent
     private RenderHandle _renderHandle;
     private IReadOnlyDictionary<string, object?>? _latestParameters;
     private ComponentMarkerKey? _markerKey;
+    private readonly HttpContext _httpContext;
 
     public IComponentRenderMode RenderMode { get; }
 
@@ -38,6 +39,7 @@ public SSRRenderModeBoundary(
     {
         AssertRenderModeIsConfigured(httpContext, componentType, renderMode);
 
+        _httpContext = httpContext;
         _componentType = componentType;
         RenderMode = renderMode;
         _prerender = renderMode switch
@@ -106,6 +108,12 @@ public Task SetParametersAsync(ParameterView parameters)
 
         ValidateParameters(_latestParameters);
 
+        if (RenderMode is InteractiveWebAssemblyRenderMode)
+        {
+            // Preload WebAssembly assets when using WebAssembly (not Auto) mode
+            PreloadWebAssemblyAssets();
+        }
+
         if (_prerender)
         {
             _renderHandle.Render(Prerender);
@@ -114,6 +122,21 @@ public Task SetParametersAsync(ParameterView parameters)
         return Task.CompletedTask;
     }
 
+    private void PreloadWebAssemblyAssets()
+    {
+        if (EndpointHtmlRenderer.IsProgressivelyEnhancedNavigation(_httpContext.Request))
+        {
+            return;
+        }
+
+        var preloads = _httpContext.GetEndpoint()?.Metadata.GetMetadata<ResourcePreloadCollection>();
+        if (preloads != null && preloads.TryGetAssets("webassembly", out var preloadAssets))
+        {
+            var service = _httpContext.RequestServices.GetRequiredService<ResourcePreloadService>();
+            service.Preload(preloadAssets);
+        }
+    }
+
     private void ValidateParameters(IReadOnlyDictionary<string, object?> latestParameters)
     {
         foreach (var (name, value) in latestParameters)
@@ -194,7 +217,12 @@ private ComponentMarkerKey GenerateMarkerKey(int sequence, object? componentKey)
         var sequenceString = sequence.ToString(CultureInfo.InvariantCulture);
 
         var locationHash = $"{componentTypeNameHash}:{sequenceString}";
-        var formattedComponentKey = (componentKey as IFormattable)?.ToString(null, CultureInfo.InvariantCulture) ?? string.Empty;
+        var formattedComponentKey = componentKey switch
+        {
+            string str => str,
+            IFormattable formattable => formattable.ToString(null, CultureInfo.InvariantCulture),
+            _ => string.Empty
+        };
 
         return new()
         {
@@ -202,4 +230,14 @@ private ComponentMarkerKey GenerateMarkerKey(int sequence, object? componentKey)
             FormattedComponentKey = formattedComponentKey,
         };
     }
+
+    /// <summary>
+    /// Gets the ComponentMarkerKey for this boundary if it has been computed.
+    /// This is used for state persistence across render modes.
+    /// </summary>
+    /// <returns>The ComponentMarkerKey if available, null otherwise.</returns>
+    internal ComponentMarkerKey GetComponentMarkerKey(int sequence, object? componentKey)
+    {
+        return _markerKey ??= GenerateMarkerKey(sequence, componentKey);
+    }
 }
diff --git a/src/Components/Endpoints/src/Results/RazorComponentResultExecutor.cs b/src/Components/Endpoints/src/Results/RazorComponentResultExecutor.cs
index 8f22818c7a27..3f092c15626a 100644
--- a/src/Components/Endpoints/src/Results/RazorComponentResultExecutor.cs
+++ b/src/Components/Endpoints/src/Results/RazorComponentResultExecutor.cs
@@ -48,7 +48,8 @@ private static Task RenderComponentToResponse(
         return endpointHtmlRenderer.Dispatcher.InvokeAsync(async () =>
         {
             var isErrorHandler = httpContext.Features.Get<IExceptionHandlerFeature>() is not null;
-            endpointHtmlRenderer.InitializeStreamingRenderingFraming(httpContext, isErrorHandler);
+            var isReExecuted = httpContext.Features.Get<IStatusCodeReExecuteFeature>() is not null;
+            endpointHtmlRenderer.InitializeStreamingRenderingFraming(httpContext, isErrorHandler, isReExecuted);
             EndpointHtmlRenderer.MarkAsAllowingEnhancedNavigation(httpContext);
 
             // We could pool these dictionary instances if we wanted, and possibly even the ParameterView
diff --git a/src/Components/Endpoints/test/Binding/FormDataMapperTests.cs b/src/Components/Endpoints/test/Binding/FormDataMapperTests.cs
index 823c97143d9d..353ee3ce4da2 100644
--- a/src/Components/Endpoints/test/Binding/FormDataMapperTests.cs
+++ b/src/Components/Endpoints/test/Binding/FormDataMapperTests.cs
@@ -2024,7 +2024,7 @@ public void CanDeserialize_ComplexType_CanSerializerBrowserFile()
 
         // Assert
         var browserFile = Assert.IsAssignableFrom<IBrowserFile>(result);
-        Assert.Equal("file", browserFile.Name);
+        Assert.Equal("file.txt", browserFile.Name);
         Assert.Equal(expectedString.Length, browserFile.Size);
         var buffer = new byte[browserFile.Size];
         browserFile.OpenReadStream().Read(buffer);
@@ -2059,18 +2059,18 @@ public void CanDeserialize_ComplexType_CanSerializerIReadOnlyListBrowserFile()
         var browserFiles = Assert.IsAssignableFrom<IReadOnlyList<IBrowserFile>>(result);
         // First file
         var browserFile1 = browserFiles[0];
-        Assert.Equal("file", browserFile1.Name);
+        Assert.Equal("file1.txt", browserFile1.Name);
         Assert.Equal(expectedString1.Length, browserFile1.Size);
         var buffer1 = new byte[browserFile1.Size];
         browserFile1.OpenReadStream().Read(buffer1);
         Assert.Equal(expectedString1, Encoding.UTF8.GetString(buffer1, 0, buffer1.Length));
         // Second files
-        var browserFile2 = browserFiles[0];
-        Assert.Equal("file", browserFile2.Name);
-        Assert.Equal(expectedString1.Length, browserFile2.Size);
+        var browserFile2 = browserFiles[1];
+        Assert.Equal("file2.txt", browserFile2.Name);
+        Assert.Equal(expectedString2.Length, browserFile2.Size);
         var buffer2 = new byte[browserFile2.Size];
-        browserFile1.OpenReadStream().Read(buffer2);
-        Assert.Equal(expectedString1, Encoding.UTF8.GetString(buffer2, 0, buffer2.Length));
+        browserFile2.OpenReadStream().Read(buffer2);
+        Assert.Equal(expectedString2, Encoding.UTF8.GetString(buffer2, 0, buffer2.Length));
     }
 
     [Fact]
diff --git a/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs b/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs
index 4945d46e37e2..e1a5116ee0be 100644
--- a/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs
+++ b/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs
@@ -74,7 +74,7 @@ public void WithStaticAssets_AddsResourceCollection_ToEndpoints_NamedManifest()
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("named.css", list[0].Url);
         });
     }
@@ -95,7 +95,7 @@ public void WithStaticAssets_AddsDefaultResourceCollection_ToEndpoints_ByDefault
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("default.css", list[0].Url);
         });
     }
@@ -117,7 +117,7 @@ public void WithStaticAssets_AddsResourceCollection_ToEndpoints_DefaultManifest(
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("default.css", list[0].Url);
         });
     }
@@ -139,7 +139,7 @@ public void WithStaticAssets_AddsDefaultResourceCollectionToEndpoints_WhenNoMani
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("default.css", list[0].Url);
         });
     }
@@ -162,7 +162,7 @@ public void WithStaticAssets_AddsMatchingResourceCollectionToEndpoints_WhenExpli
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("named.css", list[0].Url);
         });
     }
@@ -188,7 +188,7 @@ public void WithStaticAssets_AddsCollectionFromGroup_WhenMappedInsideAnEndpointG
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("named.css", list[0].Url);
         });
     }
@@ -217,7 +217,6 @@ public void WithStaticAssets_DoesNotAddResourceCollectionFromGroup_WhenMappingNo
     }
 
     [Theory]
-    [InlineData("/_framework/blazor.web.js")]
     [InlineData("/_framework/opaque-redirect")]
     public void MapRazorComponents_CanAddConventions_ToBlazorWebEndpoints(string frameworkEndpoint)
     {
@@ -246,7 +245,7 @@ public void MapRazorComponents_CanAddConventions_ToBlazorWebEndpoints(string fra
     private RazorComponentsEndpointConventionBuilder CreateRazorComponentsAppBuilder(IEndpointRouteBuilder endpointBuilder)
     {
         var builder = endpointBuilder.MapRazorComponents<App>();
-        builder.ApplicationBuilder.AddLibrary(new AssemblyComponentLibraryDescriptor(
+        builder.ComponentApplicationBuilderActions.Add(b => b.AddLibrary(new AssemblyComponentLibraryDescriptor(
             "App",
             [new PageComponentBuilder {
                 PageType = typeof(App),
@@ -254,7 +253,7 @@ [new PageComponentBuilder {
                 AssemblyName = "App",
             }],
             []
-        ));
+        )));
         return builder;
     }
 
diff --git a/src/Components/Endpoints/test/EndpointHtmlRendererTest.cs b/src/Components/Endpoints/test/EndpointHtmlRendererTest.cs
index 1144c4360a89..7fa40b2cd010 100644
--- a/src/Components/Endpoints/test/EndpointHtmlRendererTest.cs
+++ b/src/Components/Endpoints/test/EndpointHtmlRendererTest.cs
@@ -1,10 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Net.Http;
+using System;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Components.Endpoints.Forms;
 using Microsoft.AspNetCore.Components.Endpoints.Tests.TestComponents;
 using Microsoft.AspNetCore.Components.Forms;
@@ -12,6 +13,8 @@
 using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Reflection;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.DataProtection;
@@ -34,6 +37,7 @@ public class EndpointHtmlRendererTest
 {
     private const string MarkerPrefix = "<!--Blazor:";
     private const string PrerenderedComponentPattern = "^<!--Blazor:(?<preamble>.*?)-->(?<content>.+?)<!--Blazor:(?<epilogue>.*?)-->$";
+    private const string WebAssemblyOptionsPattern = "^<!--Blazor-WebAssembly:(.*?)-->";
     private const string ComponentPattern = "^<!--Blazor:(.*?)-->$";
 
     private static readonly IDataProtectionProvider _dataprotectorProvider = new EphemeralDataProtectionProvider();
@@ -46,6 +50,26 @@ public EndpointHtmlRendererTest()
         renderer = GetEndpointHtmlRenderer();
     }
 
+    [Fact]
+    public async Task DoesNotRenderAfterRendererStopped()
+    {
+        var httpContext = GetHttpContext();
+        var writer = new StringWriter();
+
+        var component = new StoppingRendererComponent();
+        var id = renderer.AssignRootComponentId(component);
+        var initialRenderOperation = renderer.Dispatcher.InvokeAsync(
+            () => renderer.RenderRootComponentAsync(id, ParameterView.Empty));
+
+        renderer.SignalRendererToFinishRendering();
+        component.TaskCompletionSource.SetResult(false);
+        await initialRenderOperation;
+        int initialRenderCount = renderer.RenderCount;
+
+        await renderer.Dispatcher.InvokeAsync(() => renderer.RenderRootComponentAsync(id, ParameterView.Empty));
+        Assert.Equal(initialRenderCount, renderer.RenderCount);
+    }
+
     [Fact]
     public async Task CanRender_ParameterlessComponent_ClientMode()
     {
@@ -57,6 +81,7 @@ public async Task CanRender_ParameterlessComponent_ClientMode()
         var result = await renderer.PrerenderComponentAsync(httpContext, typeof(SimpleComponent), new InteractiveWebAssemblyRenderMode(prerender: false), ParameterView.Empty);
         await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
         var content = writer.ToString();
+        content = AssertAndStripWebAssemblyOptions(content);
         var match = Regex.Match(content, ComponentPattern);
 
         // Assert
@@ -69,6 +94,72 @@ public async Task CanRender_ParameterlessComponent_ClientMode()
         Assert.Empty(httpContext.Items);
     }
 
+    [Fact]
+    public async Task CanPreload_WebAssembly_ResourceAssets()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var writer = new StringWriter();
+
+        httpContext.SetEndpoint(
+            new Endpoint(
+                ctx => Task.CompletedTask,
+                new EndpointMetadataCollection([
+                    new ResourcePreloadCollection(
+                        new ResourceAssetCollection([
+                            new ResourceAsset("second.js", [
+                                new ResourceAssetProperty("preloadrel", "preload"),
+                                new ResourceAssetProperty("preloadas", "script"),
+                                new ResourceAssetProperty("preloadpriority", "high"),
+                                new ResourceAssetProperty("preloadcrossorigin", "anonymous"),
+                                new ResourceAssetProperty("integrity", "abcd"),
+                                new ResourceAssetProperty("preloadorder", "2"),
+                                new ResourceAssetProperty("preloadgroup", "webassembly")
+                            ]),
+                            new ResourceAsset("first.js", [
+                                new ResourceAssetProperty("preloadrel", "preload"),
+                                new ResourceAssetProperty("preloadas", "script"),
+                                new ResourceAssetProperty("preloadpriority", "high"),
+                                new ResourceAssetProperty("preloadcrossorigin", "anonymous"),
+                                new ResourceAssetProperty("integrity", "abcd"),
+                                new ResourceAssetProperty("preloadorder", "1"),
+                                new ResourceAssetProperty("preloadgroup", "webassembly")
+                            ]),
+                            new ResourceAsset("preload-nowebassembly.js", [
+                                new ResourceAssetProperty("preloadrel", "preload"),
+                                new ResourceAssetProperty("preloadas", "script"),
+                                new ResourceAssetProperty("preloadpriority", "high"),
+                                new ResourceAssetProperty("preloadcrossorigin", "anonymous"),
+                                new ResourceAssetProperty("integrity", "abcd"),
+                                new ResourceAssetProperty("preloadorder", "1"),
+                                new ResourceAssetProperty("preloadgroup", "abcd")
+                            ]),
+                            new ResourceAsset("nopreload.js", [
+                                new ResourceAssetProperty("integrity", "abcd")
+                            ])
+                        ])
+                    )
+                ]),
+                "TestEndpoint"
+            )
+        );
+
+        // Act
+        var result = await renderer.PrerenderComponentAsync(httpContext, typeof(WebAssemblyPreloadWrapper), null, ParameterView.Empty);
+        await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
+
+        // Assert
+        var output = writer.ToString();
+
+        Assert.Contains("href=\"first.js\"", output);
+        Assert.Contains("href=\"second.js\"", output);
+        Assert.DoesNotContain("nopreload.js", output);
+        Assert.Contains("rel=\"preload\"", output);
+        Assert.Contains("as=\"script\"", output);
+        Assert.Contains("fetchpriority=\"high\"", output);
+        Assert.Contains("integrity=\"abcd\"", output);
+    }
+
     [Fact]
     public async Task CanPrerender_ParameterlessComponent_ClientMode()
     {
@@ -80,6 +171,7 @@ public async Task CanPrerender_ParameterlessComponent_ClientMode()
         var result = await renderer.PrerenderComponentAsync(httpContext, typeof(SimpleComponent), RenderMode.InteractiveWebAssembly, ParameterView.Empty);
         await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
         var content = writer.ToString();
+        content = AssertAndStripWebAssemblyOptions(content);
         var match = Regex.Match(content, PrerenderedComponentPattern, RegexOptions.Multiline);
 
         // Assert
@@ -123,6 +215,7 @@ public async Task CanRender_ComponentWithParameters_ClientMode()
             }));
         await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
         var content = writer.ToString();
+        content = AssertAndStripWebAssemblyOptions(content);
         var match = Regex.Match(content, ComponentPattern);
 
         // Assert
@@ -160,6 +253,7 @@ public async Task CanRender_ComponentWithNullParameters_ClientMode()
             }));
         await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
         var content = writer.ToString();
+        content = AssertAndStripWebAssemblyOptions(content);
         var match = Regex.Match(content, ComponentPattern);
 
         // Assert
@@ -195,6 +289,7 @@ public async Task CanPrerender_ComponentWithParameters_ClientMode()
             }));
         await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
         var content = writer.ToString();
+        content = AssertAndStripWebAssemblyOptions(content);
         var match = Regex.Match(content, PrerenderedComponentPattern, RegexOptions.Multiline);
 
         // Assert
@@ -244,6 +339,7 @@ public async Task CanPrerender_ComponentWithNullParameters_ClientMode()
             }));
         await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
         var content = writer.ToString();
+        content = AssertAndStripWebAssemblyOptions(content);
         var match = Regex.Match(content, PrerenderedComponentPattern, RegexOptions.Multiline);
 
         // Assert
@@ -750,9 +846,12 @@ public async Task Rendering_ComponentWithJsInteropThrows()
             exception.Message);
     }
 
-    [Fact]
-    public async Task UriHelperRedirect_ThrowsInvalidOperationException_WhenResponseHasAlreadyStarted()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task UriHelperRedirect_ThrowsInvalidOperationException_WhenResponseHasAlreadyStarted(bool allowException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: !allowException);
         // Arrange
         var ctx = new DefaultHttpContext();
         ctx.Request.Scheme = "http";
@@ -760,25 +859,49 @@ public async Task UriHelperRedirect_ThrowsInvalidOperationException_WhenResponse
         ctx.Request.PathBase = "/base";
         ctx.Request.Path = "/path";
         ctx.Request.QueryString = new QueryString("?query=value");
+        ctx.Response.Body = new MemoryStream();
         var responseMock = new Mock<IHttpResponseFeature>();
         responseMock.Setup(r => r.HasStarted).Returns(true);
         ctx.Features.Set(responseMock.Object);
         var httpContext = GetHttpContext(ctx);
+        string redirectUri = "http://localhost/redirect";
 
         // Act
-        var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () => await renderer.PrerenderComponentAsync(
-            httpContext,
-            typeof(RedirectComponent),
-            null,
-            ParameterView.FromDictionary(new Dictionary<string, object>
-            {
-                { "RedirectUri", "http://localhost/redirect" }
-            })));
+        if (allowException)
+        {
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () => await renderer.PrerenderComponentAsync(
+                httpContext,
+                typeof(RedirectComponent),
+                null,
+                ParameterView.FromDictionary(new Dictionary<string, object>
+                {
+                    { "RedirectUri", redirectUri }
+                })));
 
-        Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " +
-                        "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" +
-                        "response and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.",
-            exception.Message);
+            Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " +
+                            "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" +
+                            "response and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.",
+                exception.Message);
+        }
+        else
+        {
+            await renderer.PrerenderComponentAsync(
+                httpContext,
+                typeof(RedirectComponent),
+                null,
+                ParameterView.FromDictionary(new Dictionary<string, object>
+                {
+                    { "RedirectUri", redirectUri }
+                }));
+            // read the custom element from the response body
+            httpContext.Response.Body.Position = 0;
+            var reader = new StreamReader(httpContext.Response.Body);
+            var output = await reader.ReadToEndAsync();
+
+            // Assert that the output contains expected navigation instructions.
+            var pattern = "^<blazor-ssr><template type=\"redirection\".*>.*<\\/template><blazor-ssr-end><\\/blazor-ssr-end><\\/blazor-ssr>$";
+            Assert.Matches(pattern, output);
+        }
     }
 
     [Fact]
@@ -808,6 +931,26 @@ await renderer.PrerenderComponentAsync(
         Assert.Equal("http://localhost/redirect", ctx.Response.Headers.Location);
     }
 
+    [Fact]
+    public async Task Renderer_WhenNoNotFoundPathProvided_Throws()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var responseMock = new Mock<IHttpResponseFeature>();
+        responseMock.Setup(r => r.HasStarted).Returns(true);
+        responseMock.Setup(r => r.Headers).Returns(new HeaderDictionary());
+        httpContext.Features.Set(responseMock.Object);
+        var renderer = GetEndpointHtmlRenderer();
+        httpContext.Items[nameof(StatusCodePagesOptions)] = null; // simulate missing re-execution route
+
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+            await renderer.SetNotFoundResponseAsync(httpContext, new NotFoundEventArgs())
+        );
+        string expectedError = $"The {nameof(Router.NotFoundPage)} route must be specified or re-execution middleware has to be set to render not found content.";
+
+        Assert.Equal(expectedError, exception.Message);
+    }
+
     [Fact]
     public async Task CanRender_AsyncComponent()
     {
@@ -823,7 +966,7 @@ public async Task CanRender_AsyncComponent()
     }
 
     [Fact]
-    public async void Duplicate_NamedEventHandlers_AcrossComponents_ThowsOnDispatch()
+    public async Task Duplicate_NamedEventHandlers_AcrossComponents_ThowsOnDispatch()
     {
         // Arrange
         var expectedError = @"There is more than one named submit event with the name 'default'. Ensure named submit events have unique names, or are in scopes with distinct names. The following components use this name:
@@ -1063,6 +1206,7 @@ public async Task RenderMode_CanRenderInteractiveComponents()
         var lines = content.Replace("\r\n", "\n").Split('\n');
         var serverMarkerMatch = Regex.Match(lines[0], PrerenderedComponentPattern);
         var serverNonPrerenderedMarkerMatch = Regex.Match(lines[1], ComponentPattern);
+        lines[2] = AssertAndStripWebAssemblyOptions(lines[2]);
         var webAssemblyMarkerMatch = Regex.Match(lines[2], PrerenderedComponentPattern);
         var webAssemblyNonPrerenderedMarkerMatch = Regex.Match(lines[3], ComponentPattern);
 
@@ -1167,6 +1311,8 @@ public async Task DoesNotEmitNestedRenderModeBoundaries()
         var numMarkers = Regex.Matches(content, MarkerPrefix).Count;
         Assert.Equal(2, numMarkers); // A start and an end marker
 
+        content = AssertAndStripWebAssemblyOptions(content);
+
         var match = Regex.Match(content, PrerenderedComponentPattern, RegexOptions.Singleline);
         Assert.True(match.Success);
         var preamble = match.Groups["preamble"].Value;
@@ -1498,6 +1644,14 @@ await renderer.Dispatcher.InvokeAsync(() => renderer.RenderRootComponentAsync(
         }
     }
 
+    private string AssertAndStripWebAssemblyOptions(string content)
+    {
+        var wasmOptionsMatch = Regex.Match(content, WebAssemblyOptionsPattern);
+        Assert.True(wasmOptionsMatch.Success);
+        content = content.Substring(wasmOptionsMatch.Groups[0].Length);
+        return content;
+    }
+
     private class NamedEventHandlerComponent : ComponentBase
     {
         [Parameter]
@@ -1640,13 +1794,36 @@ private TestEndpointHtmlRenderer GetEndpointHtmlRenderer(IServiceProvider servic
 
     private class TestEndpointHtmlRenderer : EndpointHtmlRenderer
     {
+        private bool _rendererIsStopped = false;
+        private int _renderCount;
+
         public TestEndpointHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory) : base(serviceProvider, loggerFactory)
         {
         }
 
-        internal int TestAssignRootComponentId(IComponent component)
+        protected override void ProcessPendingRender()
+        {
+            if (_rendererIsStopped)
+            {
+                return;
+            }
+            base.ProcessPendingRender();
+
+            _renderCount++;
+        }
+
+        public int RenderCount => _renderCount;
+
+        public new void SignalRendererToFinishRendering()
+        {
+            _rendererIsStopped = true;
+            base.SignalRendererToFinishRendering();
+        }
+
+        public async Task SetNotFoundResponseAsync(HttpContext httpContext, NotFoundEventArgs args)
         {
-            return base.AssignRootComponentId(component);
+            SetHttpContext(httpContext);
+            await SetNotFoundWhenResponseHasStarted();
         }
     }
 
@@ -1681,6 +1858,8 @@ private static ServiceCollection CreateDefaultServiceCollection()
         services.AddSingleton<AntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
         services.AddSingleton<ICascadingValueSupplier>(_ => new SupplyParameterFromFormValueProvider(null, ""));
         services.AddScoped<ResourceCollectionProvider>();
+        services.AddScoped<ResourcePreloadService>();
+        services.AddSingleton(new WebAssemblySettingsEmitter(new TestEnvironment(Environments.Development)));
         return services;
     }
 
diff --git a/src/Components/Endpoints/test/FormMapping/BrowserFileFromFormFileTests.cs b/src/Components/Endpoints/test/FormMapping/BrowserFileFromFormFileTests.cs
new file mode 100644
index 000000000000..26e84a170747
--- /dev/null
+++ b/src/Components/Endpoints/test/FormMapping/BrowserFileFromFormFileTests.cs
@@ -0,0 +1,105 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Components.Endpoints.FormMapping;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components.Endpoints.Tests.FormMapping;
+
+public class BrowserFileFromFormFileTests
+{
+    [Fact]
+    public void Name_ReturnsFormFileFileName_NotFormFileName()
+    {
+        // Arrange
+        const string expectedFileName = "document.pdf";
+        const string formFieldName = "fileInput";
+        
+        var mockFormFile = new Mock<IFormFile>();
+        mockFormFile.Setup(x => x.FileName).Returns(expectedFileName);
+        mockFormFile.Setup(x => x.Name).Returns(formFieldName);
+        
+        var browserFile = new BrowserFileFromFormFile(mockFormFile.Object);
+        
+        // Act
+        var actualName = browserFile.Name;
+        
+        // Assert
+        Assert.Equal(expectedFileName, actualName);
+        Assert.NotEqual(formFieldName, actualName);
+    }
+
+    [Fact]
+    public void TryRead_IBrowserFile_ReturnsCorrectFileName()
+    {
+        // Arrange
+        const string prefixName = "fileInput";
+        const string expectedFileName = "upload.txt";
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        
+        var mockFormFile = new Mock<IFormFile>();
+        mockFormFile.Setup(x => x.FileName).Returns(expectedFileName);
+        mockFormFile.Setup(x => x.Name).Returns(prefixName);
+        
+        var formFileCollection = new Mock<IFormFileCollection>();
+        formFileCollection.Setup(x => x.GetFile(prefixName)).Returns(mockFormFile.Object);
+
+        var buffer = prefixName.ToCharArray().AsMemory();
+        var reader = new FormDataReader(new Dictionary<FormKey, StringValues>(), culture, buffer, formFileCollection.Object);
+        reader.PushPrefix(prefixName);
+
+        var converter = new FileConverter<IBrowserFile>();
+
+        // Act
+        var result = converter.TryRead(ref reader, typeof(IBrowserFile), default!, out var browserFile, out var found);
+
+        // Assert
+        Assert.True(result);
+        Assert.True(found);
+        Assert.NotNull(browserFile);
+        Assert.Equal(expectedFileName, browserFile.Name);
+    }
+
+    [Fact]
+    public void TryRead_IBrowserFileList_ReturnsCorrectFileNames()
+    {
+        // Arrange
+        const string prefixName = "fileInputs";
+        const string expectedFileName1 = "file1.txt";
+        const string expectedFileName2 = "file2.jpg";
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        
+        var mockFormFile1 = new Mock<IFormFile>();
+        mockFormFile1.Setup(x => x.FileName).Returns(expectedFileName1);
+        mockFormFile1.Setup(x => x.Name).Returns(prefixName);
+        
+        var mockFormFile2 = new Mock<IFormFile>();
+        mockFormFile2.Setup(x => x.FileName).Returns(expectedFileName2);
+        mockFormFile2.Setup(x => x.Name).Returns(prefixName);
+        
+        var formFiles = new List<IFormFile> { mockFormFile1.Object, mockFormFile2.Object };
+        var formFileCollection = new Mock<IFormFileCollection>();
+        formFileCollection.Setup(x => x.GetFiles(prefixName)).Returns(formFiles);
+
+        var buffer = prefixName.ToCharArray().AsMemory();
+        var reader = new FormDataReader(new Dictionary<FormKey, StringValues>(), culture, buffer, formFileCollection.Object);
+        reader.PushPrefix(prefixName);
+
+        var converter = new FileConverter<IReadOnlyList<IBrowserFile>>();
+
+        // Act
+        var result = converter.TryRead(ref reader, typeof(IReadOnlyList<IBrowserFile>), default!, out var browserFiles, out var found);
+
+        // Assert
+        Assert.True(result);
+        Assert.True(found);
+        Assert.NotNull(browserFiles);
+        Assert.Equal(2, browserFiles.Count);
+        Assert.Equal(expectedFileName1, browserFiles[0].Name);
+        Assert.Equal(expectedFileName2, browserFiles[1].Name);
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Endpoints/test/FormMapping/Converters/NullableConverterTests.cs b/src/Components/Endpoints/test/FormMapping/Converters/NullableConverterTests.cs
new file mode 100644
index 000000000000..7294fedcb6cd
--- /dev/null
+++ b/src/Components/Endpoints/test/FormMapping/Converters/NullableConverterTests.cs
@@ -0,0 +1,240 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using Microsoft.AspNetCore.Components.Endpoints.FormMapping;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Components.Endpoints.Tests.FormMapping;
+
+public class NullableConverterTests
+{
+    [Fact]
+    public void TryConvertValue_ForDateOnlyReturnsTrueWithNullForEmptyString()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+        var reader = new FormDataReader(default, culture, default);
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, string.Empty, out var result);
+
+        Assert.True(returnValue);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void TryConvertValue_ForDateOnlyReturnsTrueWithDateForRealDateValue()
+    {
+        var date = new DateOnly(2023, 11, 30);
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+        var reader = new FormDataReader(default, culture, default);
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, date.ToString(culture), out var result);
+
+        Assert.True(returnValue);
+        Assert.Equal(date, result);
+    }
+
+    [Fact]
+    public void TryConvertValue_ForDateOnlyReturnsFalseWithNullForBadDateValue()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+        var reader = new FormDataReader(default, culture, default)
+        {
+            ErrorHandler = (_, __, ___) => { }
+        };
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, "bad date", out var result);
+
+        Assert.False(returnValue);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void TryRead_ForDateOnlyReturnsFalseWithNullForNoValue()
+    {
+        const string prefixName = "field";
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var dictionary = new Dictionary<FormKey, StringValues>();
+        var buffer = prefixName.ToCharArray().AsMemory();
+        var reader = new FormDataReader(dictionary, culture, buffer);
+        reader.PushPrefix(prefixName);
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+
+        var returnValue = nullableConverter.TryRead(ref reader, typeof(DateOnly?), default, out var result, out var found);
+
+        Assert.False(found);
+        Assert.True(returnValue);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void TryRead_ForDateOnlyReturnsTrueWithNullForEmptyString()
+    {
+        const string prefixName = "field";
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var dictionary = new Dictionary<FormKey, StringValues>()
+        {
+            { new FormKey(prefixName.AsMemory()), (StringValues)string.Empty }
+        };
+        var buffer = prefixName.ToCharArray().AsMemory();
+        var reader = new FormDataReader(dictionary, culture, buffer);
+        reader.PushPrefix(prefixName);
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+
+        var returnValue = nullableConverter.TryRead(ref reader, typeof(DateOnly?), default, out var result, out var found);
+
+        Assert.True(found);
+        Assert.True(returnValue);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void TryRead_ForDateOnlyReturnsTrueWithDateForRealDateValue()
+    {
+        const string prefixName = "field";
+        var date = new DateOnly(2023, 11, 30);
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var dictionary = new Dictionary<FormKey, StringValues>()
+        {
+            { new FormKey(prefixName.AsMemory()), (StringValues)date.ToString(culture) }
+        };
+        var buffer = prefixName.ToCharArray().AsMemory();
+        var reader = new FormDataReader(dictionary, culture, buffer);
+        reader.PushPrefix(prefixName);
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+
+        var returnValue = nullableConverter.TryRead(ref reader, typeof(DateOnly?), default, out var result, out var found);
+
+        Assert.True(found);
+        Assert.True(returnValue);
+        Assert.Equal(date, result);
+    }
+
+    [Fact]
+    public void TryRead_ForDateOnlyReturnsFalseWithNullForBadDateValue()
+    {
+        const string prefixName = "field";
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var dictionary = new Dictionary<FormKey, StringValues>()
+        {
+            { new FormKey(prefixName.AsMemory()), (StringValues)"bad date" }
+        };
+        var buffer = prefixName.ToCharArray().AsMemory();
+        var reader = new FormDataReader(dictionary, culture, buffer)
+        {
+            ErrorHandler = (_, __, ___) => { }
+        };
+        reader.PushPrefix(prefixName);
+
+        var nullableConverter = new NullableConverter<DateOnly>(new ParsableConverter<DateOnly>());
+
+        var returnValue = nullableConverter.TryRead(ref reader, typeof(DateOnly?), default, out var result, out var found);
+
+        Assert.True(found);
+        Assert.False(returnValue);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void TryConvertValue_ForCustomParsableStruct_UsesParsableImplementation_ForEmptyString()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<ParsableTestStruct>(new ParsableConverter<ParsableTestStruct>());
+        var reader = new FormDataReader(default, culture, default);
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, string.Empty, out var result);
+
+        Assert.True(returnValue);
+        Assert.NotNull(result);
+        Assert.True(result.Value.WasEmptyOrNull);
+    }
+
+    [Fact]
+    public void TryConvertValue_ForCustomParsableStruct_UsesParsableImplementation_ForNull()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<ParsableTestStruct>(new ParsableConverter<ParsableTestStruct>());
+        var reader = new FormDataReader(default, culture, default);
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, null, out var result);
+
+        Assert.True(returnValue);
+        Assert.NotNull(result);
+        Assert.True(result.Value.WasEmptyOrNull);
+    }
+
+    [Fact]
+    public void TryConvertValue_ForCustomParsableStruct_UsesParsableImplementation_ForGoodValue()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<ParsableTestStruct>(new ParsableConverter<ParsableTestStruct>());
+        var reader = new FormDataReader(default, culture, default)
+        {
+            ErrorHandler = (_, __, ___) => { }
+        };
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, "good value", out var result);
+
+        Assert.True(returnValue);
+        Assert.False(result.Value.WasEmptyOrNull);
+    }
+
+    [Fact]
+    public void TryConvertValue_ForCustomParsableStruct_UsesParsableImplementation_ForBadValue()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+
+        var nullableConverter = new NullableConverter<ParsableTestStruct>(new ParsableConverter<ParsableTestStruct>());
+        var reader = new FormDataReader(default, culture, default)
+        {
+            ErrorHandler = (_, __, ___) => { }
+        };
+
+        var returnValue = nullableConverter.TryConvertValue(ref reader, "bad value", out var result);
+
+        Assert.False(returnValue);
+    }
+
+    private struct ParsableTestStruct : IParsable<ParsableTestStruct>
+    {
+        public bool WasEmptyOrNull { get; set; }
+
+        public static ParsableTestStruct Parse(string s, IFormatProvider provider) => throw new NotImplementedException();
+
+        public static bool TryParse([NotNullWhen(true)] string s, IFormatProvider provider, [MaybeNullWhen(false)] out ParsableTestStruct result)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                result = new ParsableTestStruct { WasEmptyOrNull = true };
+                return true;
+            }
+            else if (s == "good value")
+            {
+                result = new ParsableTestStruct { WasEmptyOrNull = false };
+                return true;
+            }
+            else
+            {
+                result = new();
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Components/Endpoints/test/HotReloadServiceTests.cs b/src/Components/Endpoints/test/HotReloadServiceTests.cs
index 011056c2e7c6..a8e2280d77e9 100644
--- a/src/Components/Endpoints/test/HotReloadServiceTests.cs
+++ b/src/Components/Endpoints/test/HotReloadServiceTests.cs
@@ -23,9 +23,8 @@ public class HotReloadServiceTests
     public void UpdatesEndpointsWhenHotReloadChangeTokenTriggered()
     {
         // Arrange
-        var builder = CreateBuilder(typeof(ServerComponent));
         var services = CreateServices(typeof(MockEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
+        var endpointDataSource = CreateDataSource<App>(services, ConfigureServerComponentBuilder);
         var invoked = false;
 
         // Act
@@ -41,9 +40,8 @@ public void UpdatesEndpointsWhenHotReloadChangeTokenTriggered()
     public void AddNewEndpointWhenDataSourceChanges()
     {
         // Arrange
-        var builder = CreateBuilder(typeof(ServerComponent));
         var services = CreateServices(typeof(MockEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
+        var endpointDataSource = CreateDataSource<App>(services, ConfigureServerComponentBuilder);
 
         // Assert - 1
         var endpoint = Assert.IsType<RouteEndpoint>(
@@ -52,15 +50,17 @@ public void AddNewEndpointWhenDataSourceChanges()
         Assert.Equal("/server", endpoint.RoutePattern.RawText);
 
         // Act - 2
-        endpointDataSource.Builder.Pages.AddFromLibraryInfo("TestAssembly2", new[]
-        {
-            new PageComponentBuilder
+        endpointDataSource.ComponentApplicationBuilderActions.Add(
+            b => b.Pages.AddFromLibraryInfo("TestAssembly2", new[]
             {
-                AssemblyName = "TestAssembly2",
-                PageType = typeof(StaticComponent),
-                RouteTemplates = new List<string> { "/app/test" }
-            }
-        });
+                new PageComponentBuilder
+                {
+                    AssemblyName = "TestAssembly2",
+                    PageType = typeof(StaticComponent),
+                    RouteTemplates = new List<string> { "/app/test" }
+                }
+            }));
+
         HotReloadService.UpdateApplication(null);
 
         // Assert - 2
@@ -76,9 +76,8 @@ public void AddNewEndpointWhenDataSourceChanges()
     public void RemovesEndpointWhenDataSourceChanges()
     {
         // Arrange
-        var builder = CreateBuilder(typeof(ServerComponent));
         var services = CreateServices(typeof(MockEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
+        var endpointDataSource = CreateDataSource<App>(services, ConfigureServerComponentBuilder);
 
         // Assert - 1
         var endpoint = Assert.IsType<RouteEndpoint>(Assert.Single(endpointDataSource.Endpoints,
@@ -87,7 +86,7 @@ public void RemovesEndpointWhenDataSourceChanges()
         Assert.Equal("/server", endpoint.RoutePattern.RawText);
 
         // Act - 2
-        endpointDataSource.Builder.RemoveLibrary("TestAssembly");
+        endpointDataSource.ComponentApplicationBuilderActions.Add(b => b.RemoveLibrary("TestAssembly"));
         endpointDataSource.Options.ConfiguredRenderModes.Clear();
         HotReloadService.UpdateApplication(null);
 
@@ -100,9 +99,8 @@ public void RemovesEndpointWhenDataSourceChanges()
     public void ModifiesEndpointWhenDataSourceChanges()
     {
         // Arrange
-        var builder = CreateBuilder(typeof(ServerComponent));
         var services = CreateServices(typeof(MockEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
+        var endpointDataSource = CreateDataSource<App>(services, ConfigureServerComponentBuilder);
 
         // Assert - 1
         var endpoint = Assert.IsType<RouteEndpoint>(Assert.Single(endpointDataSource.Endpoints, e => e.Metadata.GetMetadata<RootComponentMetadata>() != null));
@@ -124,9 +122,8 @@ public void ModifiesEndpointWhenDataSourceChanges()
     public void NotifiesCompositeEndpointDataSource()
     {
         // Arrange
-        var builder = CreateBuilder(typeof(ServerComponent));
         var services = CreateServices(typeof(MockEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
+        var endpointDataSource = CreateDataSource<App>(services, ConfigureServerComponentBuilder);
         var compositeEndpointDataSource = new CompositeEndpointDataSource(
             new[] { endpointDataSource });
 
@@ -137,7 +134,7 @@ public void NotifiesCompositeEndpointDataSource()
         Assert.Equal("/server", compositeEndpoint.RoutePattern.RawText);
 
         // Act - 2
-        endpointDataSource.Builder.Pages.RemoveFromAssembly("TestAssembly");
+        endpointDataSource.ComponentApplicationBuilderActions.Add(b => b.Pages.RemoveFromAssembly("TestAssembly"));
         endpointDataSource.Options.ConfiguredRenderModes.Clear();
         HotReloadService.UpdateApplication(null);
 
@@ -148,37 +145,14 @@ public void NotifiesCompositeEndpointDataSource()
         Assert.Empty(compositePageEndpoints);
     }
 
-    private sealed class WrappedChangeTokenDisposable : IDisposable
-    {
-        public bool IsDisposed { get; private set; }
-        private readonly IDisposable _innerDisposable;
-
-        public WrappedChangeTokenDisposable(IDisposable innerDisposable)
-        { 
-            _innerDisposable = innerDisposable;
-        }
-
-        public void Dispose()
-        { 
-             IsDisposed = true;
-             _innerDisposable.Dispose();
-        }
-    }
-
     [Fact]
     public void ConfirmChangeTokenDisposedHotReload()
     {
         // Arrange
-        var builder = CreateBuilder(typeof(ServerComponent));
         var services = CreateServices(typeof(MockEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
-
-        WrappedChangeTokenDisposable wrappedChangeTokenDisposable = null;
-
-        endpointDataSource.SetDisposableChangeTokenAction = (IDisposable disposableChangeToken) => {
-            wrappedChangeTokenDisposable = new WrappedChangeTokenDisposable(disposableChangeToken); 
-            return wrappedChangeTokenDisposable;
-        };
+        var endpointDataSource = CreateDataSource<App>(services, ConfigureServerComponentBuilder, null);
+        var changeTokenSource = endpointDataSource.ChangeTokenSource;
+        var changeToken = endpointDataSource.GetChangeToken();
 
         var endpoint = Assert.IsType<RouteEndpoint>(Assert.Single(endpointDataSource.Endpoints, e => e.Metadata.GetMetadata<RootComponentMetadata>() != null));
         Assert.Equal("/server", endpoint.RoutePattern.RawText);
@@ -187,18 +161,21 @@ public void ConfirmChangeTokenDisposedHotReload()
         // Make a modification and then perform a hot reload.
         endpointDataSource.Conventions.Add(builder =>
             builder.Metadata.Add(new TestMetadata()));
+
         HotReloadService.UpdateApplication(null);
         HotReloadService.ClearCache(null);
 
         // Confirm the change token is disposed after ClearCache
-        Assert.True(wrappedChangeTokenDisposable.IsDisposed);
+        Assert.True(changeToken.HasChanged);
+        Assert.Throws<ObjectDisposedException>(() => changeTokenSource.Token);
     }
 
     private class TestMetadata { }
 
-    private ComponentApplicationBuilder CreateBuilder(params Type[] types)
+    private class TestAssembly : Assembly;
+
+    private static void ConfigureBuilder(ComponentApplicationBuilder builder, params Type[] types)
     {
-        var builder = new ComponentApplicationBuilder();
         builder.AddLibrary(new AssemblyComponentLibraryDescriptor(
             "TestAssembly",
             Array.Empty<PageComponentBuilder>(),
@@ -208,8 +185,11 @@ private ComponentApplicationBuilder CreateBuilder(params Type[] types)
                 ComponentType = t,
                 RenderMode = t.GetCustomAttribute<RenderModeAttribute>()
             }).ToArray()));
+    }
 
-        return builder;
+    private static void ConfigureServerComponentBuilder(ComponentApplicationBuilder builder)
+    {
+        ConfigureBuilder(builder, typeof(ServerComponent));
     }
 
     private IServiceProvider CreateServices(params Type[] types)
@@ -227,16 +207,21 @@ private IServiceProvider CreateServices(params Type[] types)
     }
 
     private static RazorComponentEndpointDataSource<TComponent> CreateDataSource<TComponent>(
-        ComponentApplicationBuilder builder,
         IServiceProvider services,
-        IComponentRenderMode[] renderModes = null)
+        Action<ComponentApplicationBuilder> configureBuilder = null,
+        IComponentRenderMode[] renderModes = null,
+        HotReloadService hotReloadService = null)
     {
         var result = new RazorComponentEndpointDataSource<TComponent>(
-            builder,
             new[] { new MockEndpointProvider() },
             new TestEndpointRouteBuilder(services),
             new RazorComponentEndpointFactory(),
-            new HotReloadService() { MetadataUpdateSupported = true });
+            hotReloadService ?? new HotReloadService() { MetadataUpdateSupported = true });
+
+        if (configureBuilder is not null)
+        {
+            result.ComponentApplicationBuilderActions.Add(configureBuilder);
+        }
 
         if (renderModes != null)
         {
diff --git a/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs b/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs
index 840a865accd2..26a154b2cb11 100644
--- a/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs
+++ b/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs
@@ -24,31 +24,33 @@ public class RazorComponentEndpointDataSourceTest
     public void RegistersEndpoints()
     {
         var endpointDataSource = CreateDataSource<App>();
+        endpointDataSource.ComponentApplicationBuilderActions.Add(builder =>
+        {
+            var assembly = typeof(App).Assembly;
+            IRazorComponentApplication.GetBuilderForAssembly(builder, assembly);
+        });
 
         var endpoints = endpointDataSource.Endpoints;
 
-#if DEBUG
-        Assert.Equal(5, endpoints.Count);
-#else
-        Assert.Equal(4, endpoints.Count);
-#endif
+        Assert.Equal(3, endpoints.Count);
     }
 
     [Fact]
     public void NoDiscoveredModesDefaultsToStatic()
     {
-
-        var builder = CreateBuilder();
         var services = CreateServices(typeof(ServerEndpointProvider));
-        var endpointDataSource = CreateDataSource<App>(builder, services);
+        var endpointDataSource = CreateDataSource<App>(services);
+
+        endpointDataSource.ComponentApplicationBuilderActions.Add(builder =>
+        {
+            builder.AddLibrary(new AssemblyComponentLibraryDescriptor(
+                "TestAssembly",
+                Array.Empty<PageComponentBuilder>(), Array.Empty<ComponentBuilder>()));
+        });
 
         var endpoints = endpointDataSource.Endpoints;
 
-#if DEBUG
-        Assert.Equal(3, endpoints.Count);
-#else
-        Assert.Equal(2, endpoints.Count);
-#endif
+        Assert.Single(endpoints);
     }
 
     // renderModes, providers, components, expectedEndpoints
@@ -207,22 +209,6 @@ public void NoDiscoveredModesDefaultsToStatic()
             },
         };
 
-    private ComponentApplicationBuilder CreateBuilder(params Type[] types)
-    {
-        var builder = new ComponentApplicationBuilder();
-        builder.AddLibrary(new AssemblyComponentLibraryDescriptor(
-            "TestAssembly",
-            Array.Empty<PageComponentBuilder>(),
-            types.Select(t => new ComponentBuilder
-            {
-                AssemblyName = "TestAssembly",
-                ComponentType = t,
-                RenderMode = t.GetCustomAttribute<RenderModeAttribute>()
-            }).ToArray()));
-
-        return builder;
-    }
-
     private IServiceProvider CreateServices(params Type[] types)
     {
         var services = new ServiceCollection();
@@ -238,12 +224,10 @@ private IServiceProvider CreateServices(params Type[] types)
     }
 
     private RazorComponentEndpointDataSource<TComponent> CreateDataSource<TComponent>(
-        ComponentApplicationBuilder builder = null,
         IServiceProvider services = null,
         IComponentRenderMode[] renderModes = null)
     {
         var result = new RazorComponentEndpointDataSource<TComponent>(
-            builder ?? DefaultRazorComponentApplication<TComponent>.Instance.GetBuilder(),
             services?.GetService<IEnumerable<RenderModeEndpointProvider>>() ?? Enumerable.Empty<RenderModeEndpointProvider>(),
             new TestEndpointRouteBuilder(services ?? CreateServices()),
             new RazorComponentEndpointFactory(),
diff --git a/src/Components/Endpoints/test/RazorComponentResultTest.cs b/src/Components/Endpoints/test/RazorComponentResultTest.cs
index 6c0f0e96d116..cbeb6712402a 100644
--- a/src/Components/Endpoints/test/RazorComponentResultTest.cs
+++ b/src/Components/Endpoints/test/RazorComponentResultTest.cs
@@ -34,7 +34,7 @@ public void AcceptsDictionaryParameters()
     {
         var paramsDict = new Dictionary<string, object> { { "First", 123 } };
         var result = new RazorComponentResult(typeof(SimpleComponent), paramsDict);
-        Assert.Equal(1, result.Parameters.Count);
+        Assert.Single(result.Parameters);
         Assert.Equal(123, result.Parameters["First"]);
         Assert.Same(paramsDict, result.Parameters);
     }
@@ -168,7 +168,7 @@ public async Task EmitsEachComponentOnlyOncePerStreamingUpdate_WhenAnAncestorAls
         Assert.Equal(
             expectedInitialHtml,
             MaskComponentIds(GetStringContent(responseBody)));
-        
+
         // Act/Assert 2: When loading completes, it emits a streaming batch update in which the
         // child is present only within the parent markup, not as a separate entry
         tcs.SetResult();
diff --git a/src/Components/Endpoints/test/RazorComponentsServiceCollectionExtensionsTest.cs b/src/Components/Endpoints/test/RazorComponentsServiceCollectionExtensionsTest.cs
index fe8784b759c4..40efccecb1bf 100644
--- a/src/Components/Endpoints/test/RazorComponentsServiceCollectionExtensionsTest.cs
+++ b/src/Components/Endpoints/test/RazorComponentsServiceCollectionExtensionsTest.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Forms.Mapping;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Hosting;
@@ -92,7 +93,12 @@ private Dictionary<Type, Type[]> MultiRegistrationServiceTypes
                 {
                     typeof(SupplyParameterFromFormValueProvider),
                     typeof(SupplyParameterFromQueryValueProvider),
-                }
+                },
+                [typeof(IPersistentServiceRegistration)] = new[]
+                {
+                    typeof(ResourceCollectionProvider),
+                    typeof(AntiforgeryStateProvider),
+                },
             };
         }
     }
@@ -128,15 +134,11 @@ private void AssertAllImplementationTypesAreDistinct(
 
         if (implementationTypes.Length == 0)
         {
-            Assert.True(
-                false,
-                $"Could not find an implementation type for {serviceType}");
+            Assert.Fail($"Could not find an implementation type for {serviceType}");
         }
         else if (implementationTypes.Length != implementationTypes.Distinct().Count())
         {
-            Assert.True(
-                false,
-                $"Found duplicate implementation types for {serviceType}. Implementation types: {string.Join(", ", implementationTypes.Select(x => x.ToString()))}");
+            Assert.Fail($"Found duplicate implementation types for {serviceType}. Implementation types: {string.Join(", ", implementationTypes.Select(x => x.ToString()))}");
         }
     }
 
diff --git a/src/Components/Endpoints/test/SSRRenderModeBoundaryTest.cs b/src/Components/Endpoints/test/SSRRenderModeBoundaryTest.cs
index a5db11e45c06..f521373db15f 100644
--- a/src/Components/Endpoints/test/SSRRenderModeBoundaryTest.cs
+++ b/src/Components/Endpoints/test/SSRRenderModeBoundaryTest.cs
@@ -96,6 +96,33 @@ public Task SetParametersAsync(ParameterView parameters)
             => throw new NotImplementedException();
     }
 
+    public static IEnumerable<object[]> ComponentKeyTestData()
+    {
+        yield return new object[] { "test-string-key", "test-string-key" };
+        yield return new object[] { 42, "42" };
+        yield return new object[] { Guid.Parse("12345678-1234-1234-1234-123456789012"), "12345678-1234-1234-1234-123456789012" };
+        yield return new object[] { 123.45, "123.45" };
+        yield return new object[] { new DateTime(2023, 12, 25, 10, 30, 0, DateTimeKind.Utc), "12/25/2023 10:30:00" };
+        yield return new object[] { null, string.Empty };
+        yield return new object[] { new object(), string.Empty };
+    }
+
+    [Theory]
+    [MemberData(nameof(ComponentKeyTestData))]
+    public void GetComponentMarkerKey_WorksWithVariousKeyTypes(object componentKey, string expectedFormattedKey)
+    {
+        // Arrange
+        var httpContext = new DefaultHttpContext();
+        var boundary = new SSRRenderModeBoundary(httpContext, typeof(TestComponent), new InteractiveServerRenderMode());
+
+        // Act
+        var markerKey = boundary.GetComponentMarkerKey(1, componentKey);
+
+        // Assert
+        Assert.Equal(expectedFormattedKey, markerKey.FormattedComponentKey);
+        Assert.NotEmpty(markerKey.LocationHash);
+    }
+
     class ServerRenderModeSubclass : InteractiveServerRenderMode { }
     class WebAssemblyRenderModeSubclass : InteractiveWebAssemblyRenderMode { }
     class AutoRenderModeSubclass : InteractiveAutoRenderMode { }
diff --git a/src/Components/Endpoints/test/TestComponents/StoppingRendererComponent.razor b/src/Components/Endpoints/test/TestComponents/StoppingRendererComponent.razor
new file mode 100644
index 000000000000..521257c5d11b
--- /dev/null
+++ b/src/Components/Endpoints/test/TestComponents/StoppingRendererComponent.razor
@@ -0,0 +1,17 @@
+<h1>Hello from StoppingRendererComponent</h1>
+<p>State is @_state</p>
+
+@code {
+    private bool _state = true;
+
+    // expose a TCS so the test can control when OnInitializedAsync completes
+    public TaskCompletionSource<bool> TaskCompletionSource = new TaskCompletionSource<bool>();
+
+    protected override async Task OnInitializedAsync()
+    {
+        // wait until the test signals
+        var result = await TaskCompletionSource.Task;
+        _state = result;
+        StateHasChanged();
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Endpoints/test/TestComponents/WebAssemblyPreloadComponent.razor b/src/Components/Endpoints/test/TestComponents/WebAssemblyPreloadComponent.razor
new file mode 100644
index 000000000000..d2e9b8acd99c
--- /dev/null
+++ b/src/Components/Endpoints/test/TestComponents/WebAssemblyPreloadComponent.razor
@@ -0,0 +1 @@
+<h3>WebAssemblyPreloadComponent</h3>
diff --git a/src/Components/Endpoints/test/TestComponents/WebAssemblyPreloadWrapper.razor b/src/Components/Endpoints/test/TestComponents/WebAssemblyPreloadWrapper.razor
new file mode 100644
index 000000000000..9494b0df50e9
--- /dev/null
+++ b/src/Components/Endpoints/test/TestComponents/WebAssemblyPreloadWrapper.razor
@@ -0,0 +1,4 @@
+@using Microsoft.AspNetCore.Components.Web
+<ResourcePreloader />
+
+<WebAssemblyPreloadComponent @rendermode="@(new InteractiveWebAssemblyRenderMode(prerender: true))" />
diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
index 2fb2a68b6d0d..559c2881127d 100644
--- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
+++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
@@ -7,6 +7,9 @@
 using System.Reflection;
 using System.Reflection.Metadata;
 using System.Runtime.InteropServices;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Validation;
 
 [assembly: MetadataUpdateHandler(typeof(Microsoft.AspNetCore.Components.Forms.EditContextDataAnnotationsExtensions))]
 
@@ -15,7 +18,7 @@ namespace Microsoft.AspNetCore.Components.Forms;
 /// <summary>
 /// Extension methods to add DataAnnotations validation to an <see cref="EditContext"/>.
 /// </summary>
-public static class EditContextDataAnnotationsExtensions
+public static partial class EditContextDataAnnotationsExtensions
 {
     /// <summary>
     /// Adds DataAnnotations validation support to the <see cref="EditContext"/>.
@@ -52,25 +55,38 @@ public static IDisposable EnableDataAnnotationsValidation(this EditContext editC
 
     private static event Action? OnClearCache;
 
+#pragma warning disable IDE0051 // Remove unused private members
     private static void ClearCache(Type[]? _)
     {
         OnClearCache?.Invoke();
     }
+#pragma warning restore IDE0051 // Remove unused private members
 
-    private sealed class DataAnnotationsEventSubscriptions : IDisposable
+    private sealed partial class DataAnnotationsEventSubscriptions : IDisposable
     {
         private static readonly ConcurrentDictionary<(Type ModelType, string FieldName), PropertyInfo?> _propertyInfoCache = new();
 
         private readonly EditContext _editContext;
         private readonly IServiceProvider? _serviceProvider;
         private readonly ValidationMessageStore _messages;
+        private readonly ValidationOptions? _validationOptions;
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        private readonly IValidatableInfo? _validatorTypeInfo;
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        private readonly Dictionary<string, FieldIdentifier> _validationPathToFieldIdentifierMapping = new();
 
+        [UnconditionalSuppressMessage("Trimming", "IL2066", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")]
         public DataAnnotationsEventSubscriptions(EditContext editContext, IServiceProvider serviceProvider)
         {
             _editContext = editContext ?? throw new ArgumentNullException(nameof(editContext));
             _serviceProvider = serviceProvider;
             _messages = new ValidationMessageStore(_editContext);
-
+            _validationOptions = _serviceProvider?.GetService<IOptions<ValidationOptions>>()?.Value;
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+            _validatorTypeInfo = _validationOptions != null && _validationOptions.TryGetValidatableTypeInfo(_editContext.Model.GetType(), out var typeInfo)
+                ? typeInfo
+                : null;
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
             _editContext.OnFieldChanged += OnFieldChanged;
             _editContext.OnValidationRequested += OnValidationRequested;
 
@@ -110,6 +126,18 @@ private void OnFieldChanged(object? sender, FieldChangedEventArgs eventArgs)
         private void OnValidationRequested(object? sender, ValidationRequestedEventArgs e)
         {
             var validationContext = new ValidationContext(_editContext.Model, _serviceProvider, items: null);
+
+            if (!TryValidateTypeInfo(validationContext))
+            {
+                ValidateWithDefaultValidator(validationContext);
+            }
+
+            _editContext.NotifyValidationStateChanged();
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Model types are expected to be defined in assemblies that do not get trimmed.")]
+        private void ValidateWithDefaultValidator(ValidationContext validationContext)
+        {
             var validationResults = new List<ValidationResult>();
             Validator.TryValidateObject(_editContext.Model, validationContext, validationResults, true);
 
@@ -134,8 +162,62 @@ private void OnValidationRequested(object? sender, ValidationRequestedEventArgs
                     _messages.Add(new FieldIdentifier(_editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
                 }
             }
+        }
 
-            _editContext.NotifyValidationStateChanged();
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        private bool TryValidateTypeInfo(ValidationContext validationContext)
+        {
+            if (_validatorTypeInfo is null)
+            {
+                return false;
+            }
+
+            var validateContext = new ValidateContext
+            {
+                ValidationOptions = _validationOptions!,
+                ValidationContext = validationContext,
+            };
+            try
+            {
+                validateContext.OnValidationError += AddMapping;
+
+                var validationTask = _validatorTypeInfo.ValidateAsync(_editContext.Model, validateContext, CancellationToken.None);
+                if (!validationTask.IsCompleted)
+                {
+                    throw new InvalidOperationException("Async validation is not supported");
+                }
+
+                var validationErrors = validateContext.ValidationErrors;
+
+                // Transfer results to the ValidationMessageStore
+                _messages.Clear();
+
+                if (validationErrors is not null && validationErrors.Count > 0)
+                {
+                    foreach (var (fieldKey, messages) in validationErrors)
+                    {
+                        var fieldIdentifier = _validationPathToFieldIdentifierMapping[fieldKey];
+                        _messages.Add(fieldIdentifier, messages);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            finally
+            {
+                validateContext.OnValidationError -= AddMapping;
+                _validationPathToFieldIdentifierMapping.Clear();
+            }
+
+            return true;
+
+        }
+        private void AddMapping(ValidationErrorContext context)
+        {
+            _validationPathToFieldIdentifierMapping[context.Path] =
+                new FieldIdentifier(context.Container ?? _editContext.Model, context.Name);
         }
 
         public void Dispose()
diff --git a/src/Components/Forms/src/FieldIdentifier.cs b/src/Components/Forms/src/FieldIdentifier.cs
index 1ff67d80c610..5764b018e4ce 100644
--- a/src/Components/Forms/src/FieldIdentifier.cs
+++ b/src/Components/Forms/src/FieldIdentifier.cs
@@ -20,7 +20,10 @@ namespace Microsoft.AspNetCore.Components.Forms;
 
     static FieldIdentifier()
     {
-        HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
     }
 
     /// <summary>
diff --git a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj
index 654c4ac2d3fe..c92fe86008f3 100644
--- a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj
+++ b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components" />
+    <Reference Include="Microsoft.Extensions.Validation" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/Forms/test/ReverseStringBuilderTest.cs b/src/Components/Forms/test/ReverseStringBuilderTest.cs
index df2209305bb1..d3013b2544ab 100644
--- a/src/Components/Forms/test/ReverseStringBuilderTest.cs
+++ b/src/Components/Forms/test/ReverseStringBuilderTest.cs
@@ -92,6 +92,24 @@ public void ToString_Works_AfterExceedingStackAllocatedBuffer()
         Assert.Equal(1, builder.SequenceSegmentCount);
     }
 
+    [Fact]
+    public void ToString_Works_AfterExceedingStackAllocatedBuffer_WithUnusedSpaceInInitialBuffer()
+    {
+        const int InitialBufferSize = 64;
+        var builder = new ReverseStringBuilder(stackalloc char[InitialBufferSize]);
+
+        var firstChunk = new string('A', InitialBufferSize - 10);
+        var secondChunk = new string('B', 20);
+
+        builder.InsertFront(firstChunk);
+        builder.InsertFront(secondChunk);
+
+        var expected = secondChunk + firstChunk;
+        var actual = builder.ToString();
+
+        Assert.Equal(expected, actual);
+    }
+
     [Fact]
     public void ToString_Works_AfterExpandingIntoMultipleBuffersFromEstimatedStringSize()
     {
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter/src/PACKAGE.md b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter/src/PACKAGE.md
new file mode 100644
index 000000000000..0b4a08b777c0
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter/src/PACKAGE.md
@@ -0,0 +1,29 @@
+## About
+
+`Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter` provides an Entity Framework Core (EF Core) adapter for the [`Microsoft.AspNetCore.Components.QuickGrid`](https://www.nuget.org/packages/Microsoft.AspNetCore.Components.QuickGrid) package.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter
+```
+
+### Configuration
+
+To register an EF-aware `IAsyncQueryExecutor` implementation, call `AddQuickGridEntityFrameworkAdapter` on the service collection in `Program.cs`:
+
+```csharp
+builder.Services.AddQuickGridEntityFrameworkAdapter();
+```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/blazor/components/quickgrid#entity-framework-core-ef-core-data-source) on using EF Core with `QuickGrid`.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/GridSort.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/GridSort.cs
index 0e891b2e206f..281616065ecf 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/GridSort.cs
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/GridSort.cs
@@ -135,7 +135,16 @@ private List<SortedProperty> BuildPropertyList(bool ascending)
     // Not sure we really want this level of complexity, but it converts expressions like @(c => c.Medals.Gold) to "Medals.Gold"
     private static string ToPropertyName(LambdaExpression expression)
     {
-        if (expression.Body is not MemberExpression body)
+        var expressionBody = expression.Body;
+
+        // Handle UnaryExpressions that can occur due to implicit conversions, such as nullable value types
+        if (expressionBody.NodeType == ExpressionType.Convert ||
+            expressionBody.NodeType == ExpressionType.ConvertChecked)
+        {
+            expressionBody = ((UnaryExpression)expressionBody).Operand;
+        }
+
+        if (expressionBody is not MemberExpression body)
         {
             throw new ArgumentException(ExpressionNotRepresentableMessage);
         }
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj
index 6d43b9828a95..8603bc6d164e 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj
@@ -23,4 +23,8 @@
     <Reference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.QuickGrid.Tests" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PACKAGE.md b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PACKAGE.md
new file mode 100644
index 000000000000..020df4e0f702
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PACKAGE.md
@@ -0,0 +1,45 @@
+## About
+
+`Microsoft.AspNetCore.Components.QuickGrid` provides a simple and convenient data grid component for common grid rendering scenarios.
+
+## Key Features
+
+* Pagination
+* Filtering
+* Sorting
+* Virtualization
+* Support for in-memory `IQueryable`, EF Core `IQueryable`, and remote data sources
+* Configurable column properties
+* Customizable styling
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Components.QuickGrid`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Components.QuickGrid
+```
+
+### Usage
+
+For various `QuickGrid` demonstrations, see the [QuickGrid for Blazor sample app](https://aspnet.github.io/quickgridsamples).
+
+## Main Types
+
+* `QuickGrid<TGridItem>`: The component that displays the grid
+* `TemplateColumn`: Represents a column whose cells render a supplied template
+* `PropertyColumn`: Represents a column whose cells display a single value
+* `Paginator`: A component that provides a user interface for `PaginationState`
+* `PaginationState`: Holds state to represent pagination in a `QuickGrid<TGridItem>`
+* `GridSort<TGridItem>`: Represents a sort order specification used within `QuickGrid<TGridItem>`
+* `GridItemsProvider<TGridItem>`: A callback that provides data for a `QuickGrid<TGridItem>`
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/blazor/components/quickgrid) on the Blazor `QuickGrid` component.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Components.QuickGrid` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Shipped.txt b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Shipped.txt
index 412b0191d4fc..1b580b50deff 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Shipped.txt
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Shipped.txt
@@ -110,6 +110,8 @@ Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.ItemSize.get -> f
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.ItemSize.set -> void
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.ItemsProvider.get -> Microsoft.AspNetCore.Components.QuickGrid.GridItemsProvider<TGridItem>?
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.ItemsProvider.set -> void
+Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.OverscanCount.get -> int
+Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.OverscanCount.set -> void
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.Pagination.get -> Microsoft.AspNetCore.Components.QuickGrid.PaginationState?
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.Pagination.set -> void
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.QuickGrid() -> void
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt
index df5bddfc6bfc..a5806f90a9db 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt
@@ -1,3 +1,4 @@
 #nullable enable
-Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.OverscanCount.get -> int
-Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.OverscanCount.set -> void
+Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.HideColumnOptionsAsync() -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.RowClass.get -> System.Func<TGridItem, string?>?
+Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.RowClass.set -> void
\ No newline at end of file
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor
index f1fce0c434ce..5228ed1d2b00 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor
@@ -10,7 +10,7 @@
         @{ FinishCollectingColumns(); }
         <ColumnsCollectedNotifier TGridItem="TGridItem" />
 
-        <table theme="@Theme" aria-rowcount="@(_ariaBodyRowCount + 1)" @ref="_tableReference" @onclosecolumnoptions="CloseColumnOptions" @attributes="AdditionalAttributes" class="@GridClass()">
+        <table theme="@Theme" aria-rowcount="@(_ariaBodyRowCount + 1)" @ref="_tableReference" @onclosecolumnoptions="HideColumnOptionsAsync" @attributes="AdditionalAttributes" class="@GridClass()">
             <thead>
                 <tr>
                     @_renderColumnHeaders
@@ -65,7 +65,8 @@
 
     private void RenderRow(RenderTreeBuilder __builder, int rowIndex, TGridItem item)
     {
-        <tr @key="@(ItemKey(item))" aria-rowindex="@rowIndex">
+        var rowClass = RowClass?.Invoke(item);
+        <tr @key="@(ItemKey(item))" aria-rowindex="@rowIndex" class="@rowClass">
             @foreach (var col in _columns)
             {
                 <td class="@ColumnClass(col)" @key="@col">@{ col.CellContent(__builder, item); }</td>
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.cs
index 3edf9b93c740..fa20650559b8 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.cs
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.cs
@@ -104,6 +104,11 @@ public partial class QuickGrid<TGridItem> : IAsyncDisposable
     /// </summary>
     [Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
 
+    /// <summary>
+    /// Optional. A callback to be invoked for each rendered row to specify a CSS class.
+    /// </summary>
+    [Parameter] public Func<TGridItem, string?>? RowClass { get; set; }
+
     [Inject] private IServiceProvider Services { get; set; } = default!;
     [Inject] private IJSRuntime JS { get; set; } = default!;
 
@@ -147,6 +152,9 @@ public partial class QuickGrid<TGridItem> : IAsyncDisposable
     // If the PaginationState mutates, it raises this event. We use it to trigger a re-render.
     private readonly EventCallbackSubscriber<PaginationState> _currentPageItemsChanged;
 
+    // If the QuickGrid is disposed while the JS module is being loaded, we need to avoid calling JS methods
+    private bool _wasDisposed;
+
     /// <summary>
     /// Constructs an instance of <see cref="QuickGrid{TGridItem}"/>.
     /// </summary>
@@ -201,6 +209,12 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender)
         {
             _jsModule = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/Microsoft.AspNetCore.Components.QuickGrid/QuickGrid.razor.js");
+            if (_wasDisposed)
+            {
+                // If the component has been disposed while JS module was being loaded, we don't need to continue
+                await _jsModule.DisposeAsync();
+                return;
+            }
             _jsEventDisposable = await _jsModule.InvokeAsync<IJSObjectReference>("init", _tableReference);
         }
 
@@ -272,6 +286,16 @@ public Task ShowColumnOptionsAsync(ColumnBase<TGridItem> column)
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// Closes the <see cref="ColumnBase{TGridItem}.ColumnOptions"/> UI that was previously displayed.
+    /// </summary>
+    public Task HideColumnOptionsAsync()
+    {
+        _displayOptionsForColumn = null;
+        StateHasChanged();
+        return Task.CompletedTask;
+    }
+
     /// <summary>
     /// Instructs the grid to re-fetch and render the current data from the supplied data source
     /// (either <see cref="Items"/> or <see cref="ItemsProvider"/>).
@@ -419,6 +443,7 @@ private string GridClass()
     /// <inheritdoc />
     public async ValueTask DisposeAsync()
     {
+        _wasDisposed = true;
         _currentPageItemsChanged.Dispose();
 
         try
@@ -440,9 +465,4 @@ public async ValueTask DisposeAsync()
             // the client disconnected. This is not an error.
         }
     }
-
-    private void CloseColumnOptions()
-    {
-        _displayOptionsForColumn = null;
-    }
 }
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.css b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.css
index e08d86d1991c..4747ec263339 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.css
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor.css
@@ -80,6 +80,23 @@ td.col-justify-end {
     text-align: right;
 }
 
+.col-justify-start .col-options {
+    left: 0;
+    right: unset;
+}
+
+td.col-justify-start {
+    text-align: left;
+}
+
+td.col-justify-right {
+    text-align: right;
+}
+
+td.col-justify-left {
+    text-align: left;
+}
+
 /* Unfortunately we can't use the :dir pseudoselector due to lack of browser support. Instead we have to rely on
     the developer setting <html dir="rtl"> to detect if we're in RTL mode. */
 html[dir=rtl] td.col-justify-end {
@@ -91,6 +108,10 @@ html[dir=rtl] .col-options {
     right: 0;
 }
 
+html[dir=rtl] td.col-justify-start {
+    text-align: right;
+}
+
 html[dir=rtl] .col-justify-end .col-options {
     right: unset;
     left: 0;
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/FailingQuickGrid.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/FailingQuickGrid.cs
new file mode 100644
index 000000000000..d7715af78e57
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/FailingQuickGrid.cs
@@ -0,0 +1,85 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.QuickGrid;
+using Microsoft.JSInterop;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Components.QuickGrid.Tests;
+
+/// <summary>
+/// A QuickGrid implementation that simulates the behavior before the race condition fix.
+/// This class intentionally does NOT set _disposeBool during disposal to simulate the race condition.
+/// </summary>
+/// <typeparam name="TGridItem">The type of data represented by each row in the grid.</typeparam>
+internal class FailingQuickGrid<TGridItem> : QuickGrid<TGridItem>, IAsyncDisposable
+{
+    [Inject] private IJSRuntime JS { get; set; } = default!;
+
+    private readonly TaskCompletionSource _onAfterRenderCompleted = new();
+
+    public bool DisposeAsyncWasCalled { get; private set; }
+
+    /// <summary>
+    /// Task that completes when OnAfterRenderAsync has finished executing.
+    /// This allows tests to wait deterministically for the race condition to occur.
+    /// </summary>
+    public Task OnAfterRenderCompleted => _onAfterRenderCompleted.Task;
+
+    /// <summary>
+    /// Intentionally does NOT call base.DisposeAsync() to prevent _disposeBool from being set.
+    /// This simulates the behavior before the fix was implemented.
+    /// </summary>
+    public new async ValueTask DisposeAsync()
+    {
+        DisposeAsyncWasCalled = true;
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Explicit interface implementation to ensure our disposal method is called.
+    /// </summary>
+    async ValueTask IAsyncDisposable.DisposeAsync()
+    {
+        await DisposeAsync();
+    }
+
+    /// <summary>
+    /// Check if _disposeBool is false, proving we didn't call base.DisposeAsync().
+    /// This is used by tests to verify that our simulation is working correctly.
+    /// </summary>
+    public bool IsWasDisposedFalse()
+    {
+        var field = typeof(QuickGrid<TGridItem>).GetField("_wasDisposed", BindingFlags.NonPublic | BindingFlags.Instance);
+        return field?.GetValue(this) is false;
+    }
+
+    /// <summary>
+    /// Override OnAfterRenderAsync to simulate the race condition by NOT checking _disposeBool.
+    /// This exactly replicates the code path that existed before the race condition fix.
+    /// </summary>
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        try
+        {
+            if (firstRender)
+            {
+                if (JS != null)
+                {
+                    // Import the JS module (this will trigger our TestJsRuntime's import logic)
+                    var jsModule = await JS.InvokeAsync<IJSObjectReference>("import",
+                        "./_content/Microsoft.AspNetCore.Components.QuickGrid/QuickGrid.razor.js");
+                    await jsModule.InvokeAsync<IJSObjectReference>("init", new object());
+                }
+            }
+        }
+        finally
+        {
+            if (firstRender)
+            {
+                _onAfterRenderCompleted.TrySetResult();
+            }
+        }
+    }
+}
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridRaceConditionTest.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridRaceConditionTest.cs
new file mode 100644
index 000000000000..ffa4e6d3b409
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridRaceConditionTest.cs
@@ -0,0 +1,200 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.QuickGrid;
+using Microsoft.AspNetCore.Components.Test.Helpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.JSInterop;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Components.QuickGrid.Tests;
+
+public class GridRaceConditionTest
+{
+
+    [Fact]
+    public async Task CanCorrectlyDisposeAsync()
+    {
+        var moduleLoadCompletion = new TaskCompletionSource();
+        var moduleImportStarted = new TaskCompletionSource();
+        var testJsRuntime = new TestJsRuntime(moduleLoadCompletion, moduleImportStarted);
+        var serviceProvider = new ServiceCollection()
+            .AddSingleton<IJSRuntime>(testJsRuntime)
+            .BuildServiceProvider();
+        var renderer = new TestRenderer(serviceProvider);
+
+        var testComponent = new SimpleTestComponent();
+
+        var componentId = renderer.AssignRootComponentId(testComponent);
+        renderer.RenderRootComponent(componentId);
+
+        // Wait until JS import has started but not completed
+        await moduleImportStarted.Task;
+
+        // Dispose component while JS module loading is pending
+        testJsRuntime.MarkDisposed();
+        await renderer.DisposeAsync();
+
+        // Complete the JS module loading
+        moduleLoadCompletion.SetResult();
+
+        // Wait until after OnAfterRenderAsync has completed to test the disposal of the jsModule
+        var notFailingGrid = testComponent.NotFailingGrid;
+        await notFailingGrid.OnAfterRenderCompleted;
+
+        // Assert that init was not called after disposal and JsModule was disposed of
+        Assert.False(testJsRuntime.InitWasCalledAfterDisposal,
+            "Init should not be called on a disposed component.");
+        Assert.True(testJsRuntime.JsModuleDisposed);
+    }
+
+    [Fact]
+    public async Task FailingQuickGridCallsInitAfterDisposal()
+    {
+        var moduleLoadCompletion = new TaskCompletionSource();
+        var moduleImportStarted = new TaskCompletionSource();
+        var testJsRuntime = new TestJsRuntime(moduleLoadCompletion, moduleImportStarted);
+        var serviceProvider = new ServiceCollection()
+            .AddSingleton<IJSRuntime>(testJsRuntime)
+            .BuildServiceProvider();
+        var renderer = new TestRenderer(serviceProvider);
+
+        var testComponent = new FailingGridTestComponent();
+
+        var componentId = renderer.AssignRootComponentId(testComponent);
+        renderer.RenderRootComponent(componentId);
+
+        // Wait until JS import has started but not completed
+        await moduleImportStarted.Task;
+
+        // Dispose component while JS module loading is pending
+        testJsRuntime.MarkDisposed();
+        await renderer.DisposeAsync();
+
+        // Complete the JS module loading - this allows the FailingQuickGrid's OnAfterRenderAsync to continue
+        // and demonstrate the race condition by calling init after disposal
+        moduleLoadCompletion.SetResult();
+
+        // Wait until after OnAfterRenderAsync has completed, to make sure jsmodule import started and the reported issue is reproduced
+        var failingGrid = testComponent.FailingQuickGrid;
+        await failingGrid.OnAfterRenderCompleted;
+
+        // Assert that init WAS called after disposal
+        // The FailingQuickGrid's OnAfterRenderAsync should have called init despite being disposed
+        // The FailingQuickGrid should not have disposed of JsModule 
+        Assert.True(testJsRuntime.InitWasCalledAfterDisposal,
+            $"FailingQuickGrid should call init after disposal, demonstrating the race condition bug. " +
+            $"InitWasCalledAfterDisposal: {testJsRuntime.InitWasCalledAfterDisposal}, " +
+            $"DisposeAsyncWasCalled: {failingGrid.DisposeAsyncWasCalled}, " +
+            $"_disposeBool is false: {failingGrid.IsWasDisposedFalse()}");
+        Assert.False(testJsRuntime.JsModuleDisposed);
+    }
+}
+
+internal class Person
+{
+    public int Id { get; set; }
+    public string Name { get; set; } = string.Empty;
+}
+
+internal abstract class BaseTestComponent<TGrid> : ComponentBase
+    where TGrid : ComponentBase
+{
+    [Inject] public IJSRuntime JSRuntime { get; set; } = default!;
+
+    protected TGrid _grid;
+    public TGrid Grid => _grid;
+
+    private readonly List<Person> _people = [
+        new() { Id = 1, Name = "John" },
+        new() { Id = 2, Name = "Jane" }
+    ];
+
+    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        builder.OpenComponent<TGrid>(0);
+        builder.AddAttribute(1, "Items", _people.AsQueryable());
+        builder.AddAttribute(2, "ChildContent", (RenderFragment)(b =>
+        {
+            b.OpenComponent<PropertyColumn<Person, int>>(0);
+            b.AddAttribute(1, "Property", (System.Linq.Expressions.Expression<Func<Person, int>>)(p => p.Id));
+            b.CloseComponent();
+        }));
+        builder.AddComponentReferenceCapture(3, component => _grid = (TGrid)component);
+        builder.CloseComponent();
+    }
+}
+
+internal class SimpleTestComponent : BaseTestComponent<NotFailingGrid<Person>>
+{
+    public NotFailingGrid<Person> NotFailingGrid => Grid;
+}
+
+internal class FailingGridTestComponent : BaseTestComponent<FailingQuickGrid<Person>>
+{
+    public FailingQuickGrid<Person> FailingQuickGrid => Grid;
+}
+
+internal class TestJsRuntime(TaskCompletionSource moduleCompletion, TaskCompletionSource importStarted) : IJSRuntime
+{
+    private readonly TaskCompletionSource _moduleCompletion = moduleCompletion;
+    private readonly TaskCompletionSource _importStarted = importStarted;
+    private bool _disposed;
+
+    public bool JsModuleDisposed { get; private set; }
+
+    public bool InitWasCalledAfterDisposal { get; private set; }
+
+    public async ValueTask<TValue> InvokeAsync<TValue>(string identifier, object[] args = null)
+    {
+        if (identifier == "import" && args?.Length > 0 && args[0] is string modulePath &&
+            modulePath == "./_content/Microsoft.AspNetCore.Components.QuickGrid/QuickGrid.razor.js")
+        {
+            // Signal that import has started
+            _importStarted.TrySetResult();
+
+            // Wait for test to control when import completes
+            await _moduleCompletion.Task;
+            return (TValue)(object)new TestJSObjectReference(this);
+        }
+        throw new InvalidOperationException($"Unexpected JS call: {identifier}");
+    }
+
+    public void MarkDisposed() => _disposed = true;
+
+    public void MarkJsModuleDisposed() => JsModuleDisposed = true;
+
+    public void RecordInitCall()
+    {
+        if (_disposed)
+        {
+            InitWasCalledAfterDisposal = true;
+        }
+    }
+
+    public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args) =>
+        InvokeAsync<TValue>(identifier, args);
+}
+
+internal class TestJSObjectReference(TestJsRuntime jsRuntime) : IJSObjectReference
+{
+    private readonly TestJsRuntime _jsRuntime = jsRuntime;
+
+    public ValueTask<TValue> InvokeAsync<TValue>(string identifier, object[] args)
+    {
+        if (identifier == "init")
+        {
+            _jsRuntime.RecordInitCall();
+        }
+        return default!;
+    }
+
+    public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args) =>
+        InvokeAsync<TValue>(identifier, args);
+
+    public ValueTask DisposeAsync() {
+        _jsRuntime.MarkJsModuleDisposed();
+        return default!;
+    }
+}
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridSortTest.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridSortTest.cs
new file mode 100644
index 000000000000..ec7a91d7fcdf
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridSortTest.cs
@@ -0,0 +1,182 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Components.QuickGrid.Tests;
+
+public class GridSortTest
+{
+    // Test model classes
+    private class TestEntity
+    {
+        public string Name { get; set; } = string.Empty;
+        public int Age { get; set; }
+        public DateTime? NullableDate { get; set; }
+        public int? NullableInt { get; set; }
+        public TestChild Child { get; set; } = new();
+    }
+
+    private class TestChild
+    {
+        public string ChildName { get; set; } = string.Empty;
+        public DateTime? ChildNullableDate { get; set; }
+    }
+
+    [Fact]
+    public void ToPropertyName_SimpleProperty_ReturnsPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> expression = x => x.Name;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("Name", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NullableProperty_ReturnsPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, DateTime?>> expression = x => x.NullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("NullableDate", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NullableInt_ReturnsPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, int?>> expression = x => x.NullableInt;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("NullableInt", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NestedProperty_ReturnsNestedPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> expression = x => x.Child.ChildName;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("Child.ChildName", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NestedNullableProperty_ReturnsNestedPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, DateTime?>> expression = x => x.Child.ChildNullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("Child.ChildNullableDate", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_DescendingSort_ReturnsCorrectDirection()
+    {
+        // Arrange
+        Expression<Func<TestEntity, DateTime?>> expression = x => x.NullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByDescending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("NullableDate", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Descending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_MultipleSort_ReturnsAllProperties()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> firstExpression = x => x.Name;
+        Expression<Func<TestEntity, DateTime?>> secondExpression = x => x.NullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(firstExpression)
+            .ThenDescending(secondExpression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Equal(2, propertyList.Count);
+        
+        var firstProperty = propertyList.First();
+        Assert.Equal("Name", firstProperty.PropertyName);
+        Assert.Equal(SortDirection.Ascending, firstProperty.Direction);
+        
+        var secondProperty = propertyList.Last();
+        Assert.Equal("NullableDate", secondProperty.PropertyName);
+        Assert.Equal(SortDirection.Descending, secondProperty.Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_InvalidExpression_ThrowsArgumentException()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> invalidExpression = x => x.Name.ToUpper(CultureInfo.InvariantCulture);
+
+        // Act & Assert
+        var gridSort = GridSort<TestEntity>.ByAscending(invalidExpression);
+        var exception = Assert.Throws<ArgumentException>(() => gridSort.ToPropertyList(ascending: true));
+        Assert.Contains("The supplied expression can't be represented as a property name for sorting", exception.Message);
+    }
+
+    [Fact]
+    public void ToPropertyName_MethodCallExpression_ThrowsArgumentException()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> invalidExpression = x => x.Name.Substring(0, 1);
+
+        // Act & Assert
+        var gridSort = GridSort<TestEntity>.ByAscending(invalidExpression);
+        var exception = Assert.Throws<ArgumentException>(() => gridSort.ToPropertyList(ascending: true));
+        Assert.Contains("The supplied expression can't be represented as a property name for sorting", exception.Message);
+    }
+
+    [Fact]
+    public void ToPropertyName_ConstantExpression_ThrowsArgumentException()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> invalidExpression = x => "constant";
+
+        // Act & Assert
+        var gridSort = GridSort<TestEntity>.ByAscending(invalidExpression);
+        var exception = Assert.Throws<ArgumentException>(() => gridSort.ToPropertyList(ascending: true));
+        Assert.Contains("The supplied expression can't be represented as a property name for sorting", exception.Message);
+    }
+}
\ No newline at end of file
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj
new file mode 100644
index 000000000000..21eb671ff544
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <RootNamespace>Microsoft.AspNetCore.Components.QuickGrid.Tests</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Components.QuickGrid" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/NotFailingQuickGrid.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/NotFailingQuickGrid.cs
new file mode 100644
index 000000000000..b84d8c7b66fd
--- /dev/null
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/NotFailingQuickGrid.cs
@@ -0,0 +1,43 @@
+// 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.Collections.Generic;
+using System.Text;
+using Microsoft.JSInterop;
+
+namespace Microsoft.AspNetCore.Components.QuickGrid.Tests;
+/// <summary>
+/// A QuickGrid implementation that uses the same implementation of the basic QuickGrid with the additions of the OnAfterRenderCompleted task.
+/// </summary>
+/// /// <typeparam name="TGridItem">The type of data represented by each row in the grid.</typeparam>
+internal class NotFailingGrid<TGridItem> : QuickGrid<TGridItem>
+{
+    [Inject] private IJSRuntime JS { get; set; } = default!;
+
+    private readonly TaskCompletionSource _onAfterRenderCompleted = new();
+
+    /// <summary>
+    /// Task that completes when OnAfterRenderAsync has finished executing.
+    /// This allows tests to wait deterministically for the race condition to occur.
+    /// </summary>
+    public Task OnAfterRenderCompleted => _onAfterRenderCompleted.Task;
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        try
+        {
+            if (firstRender)
+            {
+                await base.OnAfterRenderAsync(firstRender);
+            }
+        }
+        finally
+        {
+            if (firstRender)
+            {
+                _onAfterRenderCompleted.TrySetResult();
+            }
+        }
+    }
+}
diff --git a/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj b/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj
index a9a7bc04f7ad..3de34000e0fc 100644
--- a/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj
+++ b/src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
-    <Reference Include="System.Net.Http.Json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/Samples/BlazorUnitedApp/App.razor b/src/Components/Samples/BlazorUnitedApp/App.razor
index 2310b92b1848..e04f7fc9e8e4 100644
--- a/src/Components/Samples/BlazorUnitedApp/App.razor
+++ b/src/Components/Samples/BlazorUnitedApp/App.razor
@@ -15,6 +15,6 @@
 </head>
 <body>
     <Routes />
-    <script src="_framework/blazor.web.js"></script>
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 </html>
diff --git a/src/Components/Server/src/Builder/ComponentEndpointConventionBuilder.cs b/src/Components/Server/src/Builder/ComponentEndpointConventionBuilder.cs
index 402f8cbc2781..dd26550d25f6 100644
--- a/src/Components/Server/src/Builder/ComponentEndpointConventionBuilder.cs
+++ b/src/Components/Server/src/Builder/ComponentEndpointConventionBuilder.cs
@@ -11,18 +11,15 @@ public sealed class ComponentEndpointConventionBuilder : IHubEndpointConventionB
     private readonly IEndpointConventionBuilder _hubEndpoint;
     private readonly IEndpointConventionBuilder _disconnectEndpoint;
     private readonly IEndpointConventionBuilder _jsInitializersEndpoint;
-    private readonly IEndpointConventionBuilder _blazorEndpoint;
 
     internal ComponentEndpointConventionBuilder(
         IEndpointConventionBuilder hubEndpoint,
         IEndpointConventionBuilder disconnectEndpoint,
-        IEndpointConventionBuilder jsInitializersEndpoint,
-        IEndpointConventionBuilder blazorEndpoint)
+        IEndpointConventionBuilder jsInitializersEndpoint)
     {
         _hubEndpoint = hubEndpoint;
         _disconnectEndpoint = disconnectEndpoint;
         _jsInitializersEndpoint = jsInitializersEndpoint;
-        _blazorEndpoint = blazorEndpoint;
     }
 
     /// <summary>
@@ -34,7 +31,6 @@ public void Add(Action<EndpointBuilder> convention)
         _hubEndpoint.Add(convention);
         _disconnectEndpoint.Add(convention);
         _jsInitializersEndpoint.Add(convention);
-        _blazorEndpoint.Add(convention);
     }
 
     /// <inheritdoc/>
@@ -43,6 +39,5 @@ public void Finally(Action<EndpointBuilder> finalConvention)
         _hubEndpoint.Finally(finalConvention);
         _disconnectEndpoint.Finally(finalConvention);
         _jsInitializersEndpoint.Finally(finalConvention);
-        _blazorEndpoint.Finally(finalConvention);
     }
 }
diff --git a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
index 0173fda4315d..26cca2322d0f 100644
--- a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
+++ b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
@@ -2,12 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.Server;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -88,41 +85,6 @@ public static ComponentEndpointConventionBuilder MapBlazorHub(
             endpoints.CreateApplicationBuilder().UseMiddleware<CircuitJavaScriptInitializationMiddleware>().Build())
             .WithDisplayName("Blazor initializers");
 
-        var blazorEndpoint = GetBlazorEndpoint(endpoints);
-
-        return new ComponentEndpointConventionBuilder(hubEndpoint, disconnectEndpoint, jsInitializersEndpoint, blazorEndpoint);
-    }
-
-    private static IEndpointConventionBuilder GetBlazorEndpoint(IEndpointRouteBuilder endpoints)
-    {
-        var options = new StaticFileOptions
-        {
-            FileProvider = new ManifestEmbeddedFileProvider(typeof(ComponentEndpointRouteBuilderExtensions).Assembly),
-            OnPrepareResponse = CacheHeaderSettings.SetCacheHeaders
-        };
-
-        var app = endpoints.CreateApplicationBuilder();
-        app.Use(next => context =>
-        {
-            // Set endpoint to null so the static files middleware will handle the request.
-            context.SetEndpoint(null);
-
-            return next(context);
-        });
-        app.UseStaticFiles(options);
-
-        var blazorEndpoint = endpoints.Map("/_framework/blazor.server.js", app.Build())
-            .WithDisplayName("Blazor static files");
-
-        blazorEndpoint.Add((builder) => ((RouteEndpointBuilder)builder).Order = int.MinValue);
-
-#if DEBUG
-        // We only need to serve the sourcemap when working on the framework, not in the distributed packages
-        endpoints.Map("/_framework/blazor.server.js.map", app.Build())
-            .WithDisplayName("Blazor static files sourcemap")
-            .Add((builder) => ((RouteEndpointBuilder)builder).Order = int.MinValue);
-#endif
-
-        return blazorEndpoint;
+        return new ComponentEndpointConventionBuilder(hubEndpoint, disconnectEndpoint, jsInitializersEndpoint);
     }
 }
diff --git a/src/Components/Server/src/CircuitOptions.cs b/src/Components/Server/src/CircuitOptions.cs
index ec5443f01c9d..d9904e5a3699 100644
--- a/src/Components/Server/src/CircuitOptions.cs
+++ b/src/Components/Server/src/CircuitOptions.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Caching.Hybrid;
+
 namespace Microsoft.AspNetCore.Components.Server;
 
 /// <summary>
@@ -44,6 +46,45 @@ public sealed class CircuitOptions
     /// </value>
     public TimeSpan DisconnectedCircuitRetentionPeriod { get; set; } = TimeSpan.FromMinutes(3);
 
+    /// <summary>
+    /// Gets or sets a value that determines the maximum number of persisted circuits state that
+    /// are retained in memory by the server when no distributed cache is configured.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// When using a distributed cache like <see cref="HybridCache"/> this value is ignored
+    /// and the configuration from <see cref="Extensions.DependencyInjection.MemoryCacheServiceCollectionExtensions.AddMemoryCache(Extensions.DependencyInjection.IServiceCollection)"/>
+    /// is used instead.
+    /// </para>
+    /// <para>
+    /// To explicitly control the in memory cache limits when using a distributed cache. Setup a separate instance in <see cref="HybridPersistenceCache"/> with
+    /// the desired configuration.
+    /// </para>
+    /// </remarks>
+    public int PersistedCircuitInMemoryMaxRetained { get; set; } = 1000;
+
+    /// <summary>
+    /// Gets or sets the duration for which a persisted circuit is retained in memory.
+    /// </summary>
+    /// <remarks>
+    /// When using a <see cref="HybridCache"/> based implementation this value
+    /// is used for the local cache retention period.
+    /// </remarks>
+    public TimeSpan PersistedCircuitInMemoryRetentionPeriod { get; set; } = TimeSpan.FromHours(2);
+
+    /// <summary>
+    /// Gets or sets the duration for which a persisted circuit is retained in the distributed cache.
+    /// </summary>
+    /// <remarks>
+    /// This setting is ignored when using an in-memory cache implementation.
+    /// </remarks>
+    public TimeSpan? PersistedCircuitDistributedRetentionPeriod { get; set; } = TimeSpan.FromHours(8);
+
+    /// <summary>
+    /// Gets or sets the <see cref="HybridCache"/> instance to use for persisting circuit state across servers.
+    /// </summary>
+    public HybridCache? HybridPersistenceCache { get; set; }
+
     /// <summary>
     /// Gets or sets a value that determines whether or not to send detailed exception messages to JavaScript when an unhandled exception
     /// happens on the circuit or when a .NET method invocation through JS interop results in an exception.
diff --git a/src/Components/Server/src/Circuits/CircuitActivitySource.cs b/src/Components/Server/src/Circuits/CircuitActivitySource.cs
new file mode 100644
index 000000000000..01e793082693
--- /dev/null
+++ b/src/Components/Server/src/Circuits/CircuitActivitySource.cs
@@ -0,0 +1,92 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+using System.Diagnostics;
+using Microsoft.AspNetCore.Components.Infrastructure.Server;
+
+internal class CircuitActivitySource
+{
+    internal const string Name = "Microsoft.AspNetCore.Components.Server.Circuits";
+    internal const string OnCircuitName = $"{Name}.StartCircuit";
+
+    private ComponentsActivityLinkStore? _activityLinkStore;
+
+    private static ActivitySource ActivitySource { get; } = new ActivitySource(Name);
+
+    public void Init(ComponentsActivityLinkStore store)
+    {
+        _activityLinkStore = store;
+    }
+
+    public CircuitActivityHandle StartCircuitActivity(string circuitId, ActivityContext httpActivityContext)
+    {
+        var activity = ActivitySource.CreateActivity(OnCircuitName, ActivityKind.Internal, parentId: null, null, null);
+        if (activity is not null)
+        {
+            var signalRActivity = Activity.Current;
+            activity.DisplayName = $"Circuit {circuitId ?? ""}";
+            Activity.Current = null; // do not inherit the parent activity
+            activity.Start();
+
+            if (activity.IsAllDataRequested)
+            {
+                if (circuitId != null)
+                {
+                    activity.SetTag("aspnetcore.components.circuit.id", circuitId);
+
+                    // store self link
+                    _activityLinkStore.SetActivityContext(ComponentsActivityLinkStore.Circuit, activity.Context,
+                        new KeyValuePair<string, object?>("aspnetcore.components.circuit.id", circuitId));
+                }
+                if (httpActivityContext != default)
+                {
+                    // add the http link
+                    activity.AddLink(new ActivityLink(httpActivityContext));
+                }
+                if (signalRActivity != null && signalRActivity.Source.Name == "Microsoft.AspNetCore.SignalR.Server")
+                {
+                    // add the SignalR link
+                    activity.AddLink(new ActivityLink(signalRActivity.Context));
+                }
+            }
+            return new CircuitActivityHandle { Previous = signalRActivity, Activity = activity };
+        }
+        return default;
+    }
+
+    // We call this at the end of circuit creation, rather than at the end of the circuit lifecycle
+    // because long-lived traces are difficult to work with in the telemetry UIs
+    public void StopCircuitActivity(CircuitActivityHandle activityHandle, Exception? ex)
+    {
+        var activity = activityHandle.Activity;
+        if (activity != null && !activity.IsStopped)
+        {
+            if (ex != null)
+            {
+                activity.SetTag("error.type", ex.GetType().FullName);
+                activity.SetStatus(ActivityStatusCode.Error);
+            }
+            if (activity.IsAllDataRequested)
+            {
+                _activityLinkStore.AddActivityContexts(ComponentsActivityLinkStore.Circuit, activity);
+            }
+            activityHandle.Activity.Stop();
+
+            if (Activity.Current == null && activityHandle.Previous != null && !activityHandle.Previous.IsStopped)
+            {
+                Activity.Current = activityHandle.Previous;
+            }
+        }
+    }
+}
+
+/// <summary>
+/// Named tuple for restoring the previous activity after stopping the current one.
+/// </summary>
+internal struct CircuitActivityHandle
+{
+    public Activity? Previous;
+    public Activity? Activity;
+}
diff --git a/src/Components/Server/src/Circuits/CircuitClientProxy.cs b/src/Components/Server/src/Circuits/CircuitClientProxy.cs
index ef1d93951816..9ff717f3f2d5 100644
--- a/src/Components/Server/src/Circuits/CircuitClientProxy.cs
+++ b/src/Components/Server/src/Circuits/CircuitClientProxy.cs
@@ -5,14 +5,14 @@
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits;
 
-internal sealed class CircuitClientProxy : IClientProxy
+internal sealed class CircuitClientProxy : ISingleClientProxy
 {
     public CircuitClientProxy()
     {
         Connected = false;
     }
 
-    public CircuitClientProxy(IClientProxy clientProxy, string connectionId)
+    public CircuitClientProxy(ISingleClientProxy clientProxy, string connectionId)
     {
         Transfer(clientProxy, connectionId);
     }
@@ -21,9 +21,9 @@ public CircuitClientProxy(IClientProxy clientProxy, string connectionId)
 
     public string ConnectionId { get; private set; }
 
-    public IClientProxy Client { get; private set; }
+    public ISingleClientProxy Client { get; private set; }
 
-    public void Transfer(IClientProxy clientProxy, string connectionId)
+    public void Transfer(ISingleClientProxy clientProxy, string connectionId)
     {
         Client = clientProxy ?? throw new ArgumentNullException(nameof(clientProxy));
         ConnectionId = connectionId ?? throw new ArgumentNullException(nameof(connectionId));
@@ -44,4 +44,13 @@ public Task SendCoreAsync(string method, object[] args, CancellationToken cancel
 
         return Client.SendCoreAsync(method, args, cancellationToken);
     }
+
+    public Task<T> InvokeCoreAsync<T>(string method, object[] args, CancellationToken cancellationToken = default)
+    {
+        if (Client == null)
+        {
+            throw new InvalidOperationException($"{nameof(InvokeCoreAsync)} cannot be invoked with an offline client.");
+        }
+        return Client.InvokeCoreAsync<T>(method, args, cancellationToken);
+    }
 }
diff --git a/src/Components/Server/src/Circuits/CircuitFactory.cs b/src/Components/Server/src/Circuits/CircuitFactory.cs
index 92526e87ad3c..0c086f054c03 100644
--- a/src/Components/Server/src/Circuits/CircuitFactory.cs
+++ b/src/Components/Server/src/Circuits/CircuitFactory.cs
@@ -3,9 +3,9 @@
 
 using System.Linq;
 using System.Security.Claims;
-using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -20,11 +20,13 @@ internal sealed partial class CircuitFactory : ICircuitFactory
     private readonly CircuitIdFactory _circuitIdFactory;
     private readonly CircuitOptions _options;
     private readonly ILogger _logger;
+    private readonly CircuitMetrics _circuitMetrics;
 
     public CircuitFactory(
         IServiceScopeFactory scopeFactory,
         ILoggerFactory loggerFactory,
         CircuitIdFactory circuitIdFactory,
+        CircuitMetrics circuitMetrics,
         IOptions<CircuitOptions> options)
     {
         _scopeFactory = scopeFactory;
@@ -32,6 +34,8 @@ public CircuitFactory(
         _circuitIdFactory = circuitIdFactory;
         _options = options.Value;
         _logger = _loggerFactory.CreateLogger<CircuitFactory>();
+
+        _circuitMetrics = circuitMetrics;
     }
 
     public async ValueTask<CircuitHost> CreateCircuitHostAsync(
@@ -50,6 +54,8 @@ public async ValueTask<CircuitHost> CreateCircuitHostAsync(
         var navigationManager = (RemoteNavigationManager)scope.ServiceProvider.GetRequiredService<NavigationManager>();
         var navigationInterception = (RemoteNavigationInterception)scope.ServiceProvider.GetRequiredService<INavigationInterception>();
         var scrollToLocationHash = (RemoteScrollToLocationHash)scope.ServiceProvider.GetRequiredService<IScrollToLocationHash>();
+        var circuitActivitySource = scope.ServiceProvider.GetRequiredService<CircuitActivitySource>();
+
         if (client.Connected)
         {
             navigationManager.AttachJsRuntime(jsRuntime);
@@ -69,8 +75,8 @@ public async ValueTask<CircuitHost> CreateCircuitHostAsync(
             // This is the case on Blazor Web scenarios, which will initialize the state
             // when the first set of components is provided via an UpdateRootComponents call.
             var appLifetime = scope.ServiceProvider.GetRequiredService<ComponentStatePersistenceManager>();
-            await appLifetime.RestoreStateAsync(store);
-            RestoreAntiforgeryToken(scope);
+            appLifetime.SetPlatformRenderMode(RenderMode.InteractiveServer);
+            await appLifetime.RestoreStateAsync(store, RestoreContext.InitialValue);
         }
 
         var serverComponentDeserializer = scope.ServiceProvider.GetRequiredService<IServerComponentDeserializer>();
@@ -86,6 +92,8 @@ public async ValueTask<CircuitHost> CreateCircuitHostAsync(
             jsComponentInterop,
             resourceCollection);
 
+        circuitActivitySource.Init(new Infrastructure.Server.ComponentsActivityLinkStore(renderer));
+
         // In Blazor Server we have already restored the app state, so we can get the handlers from DI.
         // In Blazor Web the state is provided in the first call to UpdateRootComponents, so we need to
         // delay creating the handlers until then. Otherwise, a handler would be able to access the state
@@ -104,6 +112,8 @@ public async ValueTask<CircuitHost> CreateCircuitHostAsync(
             jsRuntime,
             navigationManager,
             circuitHandlers,
+            _circuitMetrics,
+            circuitActivitySource,
             _loggerFactory.CreateLogger<CircuitHost>());
         Log.CreatedCircuit(_logger, circuitHost);
 
@@ -114,15 +124,6 @@ public async ValueTask<CircuitHost> CreateCircuitHostAsync(
         return circuitHost;
     }
 
-    private static void RestoreAntiforgeryToken(AsyncServiceScope scope)
-    {
-        // GetAntiforgeryToken makes sure the antiforgery token is restored from persitent component
-        // state and is available on the circuit whether or not is used by a component on the first
-        // render.
-        var antiforgery = scope.ServiceProvider.GetService<AntiforgeryStateProvider>();
-        _ = antiforgery?.GetAntiforgeryToken();
-    }
-
     private static partial class Log
     {
         [LoggerMessage(1, LogLevel.Debug, "Created circuit {CircuitId} for connection {ConnectionId}", EventName = "CreatedCircuit")]
diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs
index 82eb2ffa524c..b02317a4f12b 100644
--- a/src/Components/Server/src/Circuits/CircuitHost.cs
+++ b/src/Components/Server/src/Circuits/CircuitHost.cs
@@ -1,12 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -23,11 +24,16 @@ internal partial class CircuitHost : IAsyncDisposable
     private readonly CircuitOptions _options;
     private readonly RemoteNavigationManager _navigationManager;
     private readonly ILogger _logger;
+    private readonly CircuitMetrics _circuitMetrics;
+    private readonly CircuitActivitySource _circuitActivitySource;
     private Func<Func<Task>, Task> _dispatchInboundActivity;
     private CircuitHandler[] _circuitHandlers;
     private bool _initialized;
     private bool _isFirstUpdate = true;
+    private bool _onConnectionDownFired;
     private bool _disposed;
+    private long _startTime;
+    private PersistedCircuitState _persistedCircuitState;
 
     // This event is fired when there's an unrecoverable exception coming from the circuit, and
     // it need so be torn down. The registry listens to this even so that the circuit can
@@ -47,6 +53,8 @@ public CircuitHost(
         RemoteJSRuntime jsRuntime,
         RemoteNavigationManager navigationManager,
         CircuitHandler[] circuitHandlers,
+        CircuitMetrics circuitMetrics,
+        CircuitActivitySource circuitActivitySource,
         ILogger logger)
     {
         CircuitId = circuitId;
@@ -64,6 +72,8 @@ public CircuitHost(
         JSRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime));
         _navigationManager = navigationManager ?? throw new ArgumentNullException(nameof(navigationManager));
         _circuitHandlers = circuitHandlers ?? throw new ArgumentNullException(nameof(circuitHandlers));
+        _circuitMetrics = circuitMetrics;
+        _circuitActivitySource = circuitActivitySource;
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
         Services = scope.ServiceProvider;
@@ -98,9 +108,11 @@ public CircuitHost(
 
     public IServiceProvider Services { get; }
 
+    internal bool HasPendingPersistedCircuitState => _persistedCircuitState != null;
+
     // InitializeAsync is used in a fire-and-forget context, so it's responsible for its own
     // error handling.
-    public Task InitializeAsync(ProtectedPrerenderComponentApplicationStore store, CancellationToken cancellationToken)
+    public Task InitializeAsync(ProtectedPrerenderComponentApplicationStore store, ActivityContext httpActivityContext, CancellationToken cancellationToken)
     {
         Log.InitializationStarted(_logger);
 
@@ -111,12 +123,17 @@ public Task InitializeAsync(ProtectedPrerenderComponentApplicationStore store, C
                 throw new InvalidOperationException("The circuit host is already initialized.");
             }
 
+            CircuitActivityHandle activityHandle = default;
+
             try
             {
                 _initialized = true; // We're ready to accept incoming JSInterop calls from here on
 
+                activityHandle = _circuitActivitySource.StartCircuitActivity(CircuitId.Id, httpActivityContext);
+                _startTime = (_circuitMetrics != null && _circuitMetrics.IsDurationEnabled()) ? Stopwatch.GetTimestamp() : 0;
+
                 // We only run the handlers in case we are in a Blazor Server scenario, which renders
-                // the components inmediately during start.
+                // the components immediately during start.
                 // On Blazor Web scenarios we delay running these handlers until the first UpdateRootComponents call
                 // We do this so that the handlers can have access to the restored application state.
                 if (Descriptors.Count > 0)
@@ -157,9 +174,13 @@ public Task InitializeAsync(ProtectedPrerenderComponentApplicationStore store, C
                 _isFirstUpdate = Descriptors.Count == 0;
 
                 Log.InitializationSucceeded(_logger);
+
+                _circuitActivitySource.StopCircuitActivity(activityHandle, null);
             }
             catch (Exception ex)
             {
+                _circuitActivitySource.StopCircuitActivity(activityHandle, ex);
+
                 // Report errors asynchronously. InitializeAsync is designed not to throw.
                 Log.InitializationFailed(_logger, ex);
                 UnhandledException?.Invoke(this, new UnhandledExceptionEventArgs(ex, isTerminating: false));
@@ -230,6 +251,7 @@ await Renderer.Dispatcher.InvokeAsync(async () =>
     private async Task OnCircuitOpenedAsync(CancellationToken cancellationToken)
     {
         Log.CircuitOpened(_logger, CircuitId);
+        _circuitMetrics?.OnCircuitOpened();
 
         Renderer.Dispatcher.AssertAccess();
 
@@ -258,7 +280,9 @@ private async Task OnCircuitOpenedAsync(CancellationToken cancellationToken)
 
     public async Task OnConnectionUpAsync(CancellationToken cancellationToken)
     {
+        _onConnectionDownFired = false;
         Log.ConnectionUp(_logger, CircuitId, Client.ConnectionId);
+        _circuitMetrics?.OnConnectionUp();
 
         Renderer.Dispatcher.AssertAccess();
 
@@ -287,7 +311,14 @@ public async Task OnConnectionUpAsync(CancellationToken cancellationToken)
 
     public async Task OnConnectionDownAsync(CancellationToken cancellationToken)
     {
+        if (_onConnectionDownFired)
+        {
+            return;
+        }
+
+        _onConnectionDownFired = true;
         Log.ConnectionDown(_logger, CircuitId, Client.ConnectionId);
+        _circuitMetrics?.OnConnectionDown();
 
         Renderer.Dispatcher.AssertAccess();
 
@@ -317,6 +348,7 @@ public async Task OnConnectionDownAsync(CancellationToken cancellationToken)
     private async Task OnCircuitDownAsync(CancellationToken cancellationToken)
     {
         Log.CircuitClosed(_logger, CircuitId);
+        _circuitMetrics?.OnCircuitDown(_startTime, Stopwatch.GetTimestamp());
 
         List<Exception> exceptions = null;
 
@@ -728,7 +760,8 @@ private async Task TryNotifyClientErrorAsync(IClientProxy client, string error,
 
     internal Task UpdateRootComponents(
         RootComponentOperationBatch operationBatch,
-        ProtectedPrerenderComponentApplicationStore store,
+        IClearableStore store,
+        bool isRestore,
         CancellationToken cancellation)
     {
         Log.UpdateRootComponentsStarted(_logger);
@@ -739,6 +772,8 @@ internal Task UpdateRootComponents(
             var shouldWaitForQuiescence = false;
             var operations = operationBatch.Operations;
             var batchId = operationBatch.BatchId;
+            var postRemovalTask = Task.CompletedTask;
+            TaskCompletionSource? taskCompletionSource = null;
             try
             {
                 if (Descriptors.Count > 0)
@@ -748,19 +783,41 @@ internal Task UpdateRootComponents(
                     throw new InvalidOperationException("UpdateRootComponents is not supported when components have" +
                         " been provided during circuit start up.");
                 }
+
+                if (store != null)
+                {
+                    shouldClearStore = true;
+                    // We only do this if we have no root components. Otherwise, the state would have been
+                    // provided during the start up process
+                    var persistenceManager = _scope.ServiceProvider.GetRequiredService<ComponentStatePersistenceManager>();
+                    if (_isFirstUpdate)
+                    {
+                        persistenceManager.SetPlatformRenderMode(RenderMode.InteractiveServer);
+                    }
+
+                    // Use the appropriate scenario based on whether this is a restore operation
+                    var context = (isRestore, _isFirstUpdate) switch
+                    {
+                        (_, false) => RestoreContext.ValueUpdate,
+                        (true, _) => RestoreContext.LastSnapshot,
+                        (false, _) => RestoreContext.InitialValue
+                    };
+                    if (context == RestoreContext.ValueUpdate)
+                    {
+                        taskCompletionSource = new();
+                        postRemovalTask = EnqueueRestore(taskCompletionSource, persistenceManager, context, store);
+                    }
+                    else
+                    {
+                        // Trigger the restore of the state right away.
+                        await persistenceManager.RestoreStateAsync(store, context);
+                    }
+                }
+
                 if (_isFirstUpdate)
                 {
                     _isFirstUpdate = false;
                     shouldWaitForQuiescence = true;
-                    if (store != null)
-                    {
-                        shouldClearStore = true;
-                        // We only do this if we have no root components. Otherwise, the state would have been
-                        // provided during the start up process
-                        var appLifetime = _scope.ServiceProvider.GetRequiredService<ComponentStatePersistenceManager>();
-                        await appLifetime.RestoreStateAsync(store);
-                        RestoreAntiforgeryToken(_scope);
-                    }
 
                     // Retrieve the circuit handlers at this point.
                     _circuitHandlers = [.. _scope.ServiceProvider.GetServices<CircuitHandler>().OrderBy(h => h.Order)];
@@ -778,7 +835,10 @@ internal Task UpdateRootComponents(
                     }
                 }
 
-                await PerformRootComponentOperations(operations, shouldWaitForQuiescence);
+                var operationsTask = PerformRootComponentOperations(operations, shouldWaitForQuiescence, postRemovalTask);
+                taskCompletionSource?.SetResult();
+
+                await operationsTask;
 
                 await Client.SendAsync("JS.EndUpdateRootComponents", batchId);
 
@@ -798,26 +858,30 @@ internal Task UpdateRootComponents(
                     // At this point all components have successfully produced an initial render and we can clear the contents of the component
                     // application state store. This ensures the memory that was not used during the initial render of these components gets
                     // reclaimed since no-one else is holding on to it any longer.
-                    store.ExistingState.Clear();
+                    store.Clear();
                 }
             }
         });
     }
 
-    private static void RestoreAntiforgeryToken(AsyncServiceScope scope)
+    private static async Task EnqueueRestore(
+        TaskCompletionSource taskCompletionSource,
+        ComponentStatePersistenceManager manager,
+        RestoreContext context,
+        IPersistentComponentStateStore store)
     {
-        // GetAntiforgeryToken makes sure the antiforgery token is restored from persitent component
-        // state and is available on the circuit whether or not is used by a component on the first
-        // render.
-        var antiforgery = scope.ServiceProvider.GetService<AntiforgeryStateProvider>();
-        _ = antiforgery?.GetAntiforgeryToken();
+        await taskCompletionSource.Task;
+        await manager.RestoreStateAsync(store, context);
     }
 
     private async ValueTask PerformRootComponentOperations(
         RootComponentOperation[] operations,
-        bool shouldWaitForQuiescence)
+        bool shouldWaitForQuiescence,
+        Task postStateTask)
     {
         var webRootComponentManager = Renderer.GetOrCreateWebRootComponentManager();
+        webRootComponentManager.SetCurrentUpdateTask(postStateTask);
+
         var pendingTasks = shouldWaitForQuiescence
             ? new Task[operations.Length]
             : null;
@@ -837,10 +901,8 @@ await HandleInboundActivityAsync(() =>
                             operation.Descriptor.ComponentType,
                             operation.Marker.Value.Key,
                             operation.Descriptor.Parameters);
-                        if (pendingTasks != null)
-                        {
-                            pendingTasks[i] = task;
-                        }
+
+                        pendingTasks?[i] = task;
                         break;
                     case RootComponentOperationType.Update:
                         // We don't need to await component updates as any unhandled exception will be reported and terminate the circuit.
@@ -865,6 +927,42 @@ await HandleInboundActivityAsync(() =>
         }
     }
 
+    internal void AttachPersistedState(PersistedCircuitState persistedCircuitState)
+    {
+        if (_persistedCircuitState != null)
+        {
+            throw new InvalidOperationException("Persisted state has already been attached to this circuit.");
+        }
+
+        _persistedCircuitState = persistedCircuitState;
+    }
+
+    internal PersistedCircuitState TakePersistedCircuitState()
+    {
+        var result = _persistedCircuitState;
+        _persistedCircuitState = null;
+        return result;
+    }
+
+    internal async Task<bool> SendPersistedStateToClient(string rootComponents, string applicationState, CancellationToken cancellation)
+    {
+        try
+        {
+            var succeded = await Client.InvokeAsync<bool>(
+                "JS.SavePersistedState",
+                CircuitId.Secret,
+                rootComponents,
+                applicationState,
+                cancellationToken: cancellation);
+            return succeded;
+        }
+        catch (Exception ex)
+        {
+            Log.FailedToSaveStateToClient(_logger, CircuitId, ex);
+            return false;
+        }
+    }
+
     private static partial class Log
     {
         // 100s used for lifecycle stuff
@@ -1020,5 +1118,8 @@ public static void BeginInvokeDotNetFailed(ILogger logger, string callId, string
 
         [LoggerMessage(219, LogLevel.Error, "Location change to '{URI}' in circuit '{CircuitId}' failed.", EventName = "LocationChangeFailedInCircuit")]
         public static partial void LocationChangeFailedInCircuit(ILogger logger, string uri, CircuitId circuitId, Exception exception);
+
+        [LoggerMessage(220, LogLevel.Debug, "Failed to save state to client in circuit '{CircuitId}'.", EventName = "FailedToSaveStateToClient")]
+        public static partial void FailedToSaveStateToClient(ILogger logger, CircuitId circuitId, Exception exception);
     }
 }
diff --git a/src/Components/Server/src/Circuits/CircuitMetrics.cs b/src/Components/Server/src/Circuits/CircuitMetrics.cs
new file mode 100644
index 000000000000..2d7c84dea66a
--- /dev/null
+++ b/src/Components/Server/src/Circuits/CircuitMetrics.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+internal sealed class CircuitMetrics : IDisposable
+{
+    public const string MeterName = "Microsoft.AspNetCore.Components.Server.Circuits";
+
+    private readonly Meter _meter;
+    private readonly UpDownCounter<long> _circuitActiveCounter;
+    private readonly UpDownCounter<long> _circuitConnectedCounter;
+    private readonly Histogram<double> _circuitDuration;
+
+    public CircuitMetrics(IMeterFactory meterFactory)
+    {
+        Debug.Assert(meterFactory != null);
+
+        _meter = meterFactory.Create(MeterName);
+
+        _circuitActiveCounter = _meter.CreateUpDownCounter<long>(
+            "aspnetcore.components.circuit.active",
+            unit: "{circuit}",
+            description: "Number of active circuits in memory.");
+
+        _circuitConnectedCounter = _meter.CreateUpDownCounter<long>(
+            "aspnetcore.components.circuit.connected",
+            unit: "{circuit}",
+            description: "Number of circuits connected to client.");
+
+        _circuitDuration = _meter.CreateHistogram<double>(
+            "aspnetcore.components.circuit.duration",
+            unit: "s",
+            description: "Duration of circuit lifetime and their total count.",
+            advice: new InstrumentAdvice<double> { HistogramBucketBoundaries = MetricsConstants.BlazorCircuitSecondsBucketBoundaries });
+    }
+
+    public void OnCircuitOpened()
+    {
+        if (_circuitActiveCounter.Enabled)
+        {
+            _circuitActiveCounter.Add(1);
+        }
+    }
+
+    public void OnConnectionUp()
+    {
+        if (_circuitConnectedCounter.Enabled)
+        {
+            _circuitConnectedCounter.Add(1);
+        }
+    }
+
+    public void OnConnectionDown()
+    {
+        if (_circuitConnectedCounter.Enabled)
+        {
+            _circuitConnectedCounter.Add(-1);
+        }
+    }
+
+    public void OnCircuitDown(long startTimestamp, long currentTimestamp)
+    {
+        if (_circuitActiveCounter.Enabled)
+        {
+            _circuitActiveCounter.Add(-1);
+        }
+
+        if (_circuitDuration.Enabled)
+        {
+            var duration = Stopwatch.GetElapsedTime(startTimestamp, currentTimestamp);
+            _circuitDuration.Record(duration.TotalSeconds);
+        }
+    }
+
+    public bool IsDurationEnabled() => _circuitDuration.Enabled;
+
+    public void Dispose()
+    {
+        _meter.Dispose();
+    }
+}
diff --git a/src/Components/Server/src/Circuits/CircuitPersistenceManager.cs b/src/Components/Server/src/Circuits/CircuitPersistenceManager.cs
new file mode 100644
index 000000000000..0d9d0be4f252
--- /dev/null
+++ b/src/Components/Server/src/Circuits/CircuitPersistenceManager.cs
@@ -0,0 +1,235 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Components.Endpoints;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+internal partial class CircuitPersistenceManager(
+    IOptions<CircuitOptions> circuitOptions,
+    ServerComponentSerializer serverComponentSerializer,
+    ICircuitPersistenceProvider circuitPersistenceProvider,
+    IDataProtectionProvider dataProtectionProvider)
+{
+    public async Task PauseCircuitAsync(CircuitHost circuit, bool saveStateToClient = false, CancellationToken cancellation = default)
+    {
+        await circuit.Renderer.Dispatcher.InvokeAsync(async () =>
+        {
+            var renderer = circuit.Renderer;
+            var persistenceManager = circuit.Services.GetRequiredService<ComponentStatePersistenceManager>();
+            var collector = new CircuitPersistenceManagerCollector(circuitOptions, serverComponentSerializer, circuit.Renderer);
+            using var subscription = persistenceManager.State.RegisterOnPersisting(
+                collector.PersistRootComponents,
+                RenderMode.InteractiveServer);
+
+            await persistenceManager.PersistStateAsync(collector, renderer);
+
+            if (saveStateToClient)
+            {
+                await SaveStateToClient(circuit, collector.PersistedCircuitState, cancellation);
+            }
+            else
+            {
+                await circuitPersistenceProvider.PersistCircuitAsync(
+                    circuit.CircuitId,
+                    collector.PersistedCircuitState,
+                    cancellation);
+            }
+        });
+    }
+
+    internal async Task SaveStateToClient(CircuitHost circuit, PersistedCircuitState state, CancellationToken cancellation = default)
+    {
+        var (rootComponents, applicationState) = await ToProtectedStateAsync(state);
+        if (!await circuit.SendPersistedStateToClient(rootComponents, applicationState, cancellation))
+        {
+            try
+            {
+                await circuitPersistenceProvider.PersistCircuitAsync(
+                    circuit.CircuitId,
+                    state,
+                    cancellation);
+            }
+            catch (Exception)
+            {
+                // At this point, we give up as we haven't been able to save the state to the client nor the server.
+                return;
+            }
+        }
+    }
+
+    internal async Task<(string rootComponents, string applicationState)> ToProtectedStateAsync(PersistedCircuitState state)
+    {
+        // Root components descriptors are already protected and serialized as JSON, we just convert the bytes to a string.
+        var rootComponents = Encoding.UTF8.GetString(state.RootComponents);
+
+        // The application state we protect in the same way we do for prerendering.
+        var store = new ProtectedPrerenderComponentApplicationStore(dataProtectionProvider);
+        await store.PersistStateAsync(state.ApplicationState);
+
+        return (rootComponents, store.PersistedState);
+    }
+
+    internal PersistedCircuitState FromProtectedState(string rootComponents, string applicationState)
+    {
+        var rootComponentsBytes = Encoding.UTF8.GetBytes(rootComponents);
+        var prerenderedState = new ProtectedPrerenderComponentApplicationStore(applicationState, dataProtectionProvider);
+        var state = new PersistedCircuitState
+        {
+            RootComponents = rootComponentsBytes,
+            ApplicationState = prerenderedState.ExistingState
+        };
+
+        return state;
+    }
+
+    internal ProtectedPrerenderComponentApplicationStore ToComponentApplicationStore(Dictionary<string, byte[]> applicationState)
+    {
+        return new ProtectedPrerenderComponentApplicationStore(applicationState, dataProtectionProvider);
+    }
+
+    public async Task<PersistedCircuitState> ResumeCircuitAsync(CircuitId circuitId, CancellationToken cancellation = default)
+    {
+        return await circuitPersistenceProvider.RestoreCircuitAsync(circuitId, cancellation);
+    }
+
+    // We are going to construct a RootComponentOperationBatch but we are going to replace the descriptors from the client with the
+    // descriptors that we have persisted when pausing the circuit.
+    // The way pausing and resuming works is that when the client starts the resume process, it 'simulates' that an SSR has happened and
+    // queues an 'Add' operation for each server-side component that is on the document.
+    // That ends up calling UpdateRootComponents with the old descriptors and no application state.
+    // On the server side, we replace the descriptors with the ones that we have persisted. We can't use the original descriptors because
+    // those have a lifetime of ~ 5 minutes, after which we are not able to unprotect them anymore.
+    internal static RootComponentOperationBatch ToRootComponentOperationBatch(
+        IServerComponentDeserializer serverComponentDeserializer,
+        byte[] rootComponents,
+        string serializedComponentOperations)
+    {
+        // Deserialize the existing batch the client has sent but ignore the markers
+        if (!serverComponentDeserializer.TryDeserializeRootComponentOperations(
+            serializedComponentOperations,
+            out var batch,
+            deserializeDescriptors: false))
+        {
+            return null;
+        }
+
+        var persistedMarkers = TryDeserializeMarkers(rootComponents);
+
+        if (persistedMarkers == null)
+        {
+            return null;
+        }
+
+        if (batch.Operations.Length != persistedMarkers.Count)
+        {
+            return null;
+        }
+
+        // Ensure that all operations in the batch are `Add` operations.
+        for (var i = 0; i < batch.Operations.Length; i++)
+        {
+            var operation = batch.Operations[i];
+            if (operation.Type != RootComponentOperationType.Add)
+            {
+                return null;
+            }
+
+            // Retrieve the marker from the persisted root components, replace it and deserialize the descriptor
+            if (!persistedMarkers.TryGetValue(operation.SsrComponentId, out var marker))
+            {
+                return null;
+            }
+            operation.Marker = marker;
+
+            if (!serverComponentDeserializer.TryDeserializeWebRootComponentDescriptor(operation.Marker.Value, out var descriptor))
+            {
+                return null;
+            }
+
+            operation.Descriptor = descriptor;
+        }
+
+        return batch;
+
+        static Dictionary<int, ComponentMarker> TryDeserializeMarkers(byte[] rootComponents)
+        {
+            if (rootComponents == null || rootComponents.Length == 0)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonSerializer.Deserialize<Dictionary<int, ComponentMarker>>(
+                    rootComponents,
+                    JsonSerializerOptionsProvider.Options);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+
+    private class CircuitPersistenceManagerCollector(
+        IOptions<CircuitOptions> circuitOptions,
+        ServerComponentSerializer serverComponentSerializer,
+        RemoteRenderer renderer)
+        : IPersistentComponentStateStore
+    {
+        internal PersistedCircuitState PersistedCircuitState { get; private set; }
+
+        public Task PersistRootComponents()
+        {
+            var persistedComponents = new Dictionary<int, ComponentMarker>();
+            var components = renderer.GetOrCreateWebRootComponentManager().GetRootComponents();
+            var invocation = new ServerComponentInvocationSequence();
+            foreach (var (id, componentKey, (componentType, parameters)) in components)
+            {
+                var distributedRetention = circuitOptions.Value.PersistedCircuitInMemoryRetentionPeriod;
+                var localRetention = circuitOptions.Value.PersistedCircuitInMemoryRetentionPeriod;
+                var maxRetention = distributedRetention > localRetention ? distributedRetention : localRetention;
+
+                var marker = ComponentMarker.Create(ComponentMarker.ServerMarkerType, prerendered: false, componentKey);
+                serverComponentSerializer.SerializeInvocation(ref marker, invocation, componentType, parameters, maxRetention);
+                persistedComponents.Add(id, marker);
+            }
+
+            PersistedCircuitState = new PersistedCircuitState
+            {
+                RootComponents = JsonSerializer.SerializeToUtf8Bytes(
+                    persistedComponents,
+                    CircuitPersistenceManagerSerializerContext.Default.DictionaryInt32ComponentMarker)
+            };
+
+            return Task.CompletedTask;
+        }
+
+        // This store only support serializing the state
+        Task<IDictionary<string, byte[]>> IPersistentComponentStateStore.GetPersistedStateAsync() => throw new NotImplementedException();
+
+        // During the persisting phase the state is captured into a Dictionary<string, byte[]>, our implementation registers
+        // a callback so that it can run at the same time as the other components' state is persisted.
+        // We then are called to save the persisted state, at which point, we extract the component records
+        // and store them separately from the other state.
+        Task IPersistentComponentStateStore.PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
+        {
+            PersistedCircuitState.ApplicationState = state;
+            return Task.CompletedTask;
+        }
+    }
+
+    [JsonSerializable(typeof(Dictionary<int, ComponentMarker>))]
+    internal partial class CircuitPersistenceManagerSerializerContext : JsonSerializerContext
+    {
+    }
+}
diff --git a/src/Components/Server/src/Circuits/CircuitRegistry.cs b/src/Components/Server/src/Circuits/CircuitRegistry.cs
index f686011da2a9..c26ca6d27160 100644
--- a/src/Components/Server/src/Circuits/CircuitRegistry.cs
+++ b/src/Components/Server/src/Circuits/CircuitRegistry.cs
@@ -41,16 +41,19 @@ internal partial class CircuitRegistry
     private readonly CircuitOptions _options;
     private readonly ILogger _logger;
     private readonly CircuitIdFactory _circuitIdFactory;
+    private readonly CircuitPersistenceManager _circuitPersistenceManager;
     private readonly PostEvictionCallbackRegistration _postEvictionCallback;
 
     public CircuitRegistry(
         IOptions<CircuitOptions> options,
         ILogger<CircuitRegistry> logger,
-        CircuitIdFactory CircuitHostFactory)
+        CircuitIdFactory CircuitHostFactory,
+        CircuitPersistenceManager circuitPersistenceManager)
     {
         _options = options.Value;
         _logger = logger;
         _circuitIdFactory = CircuitHostFactory;
+        _circuitPersistenceManager = circuitPersistenceManager;
         ConnectedCircuits = new ConcurrentDictionary<CircuitId, CircuitHost>();
 
         DisconnectedCircuits = new MemoryCache(new MemoryCacheOptions
@@ -166,7 +169,7 @@ public void RegisterDisconnectedCircuit(CircuitHost circuitHost)
     // 1. If the circuit is not found return null
     // 2. If the circuit is found, but fails to connect, we need to dispose it here and return null
     // 3. If everything goes well, return the circuit.
-    public virtual async Task<CircuitHost> ConnectAsync(CircuitId circuitId, IClientProxy clientProxy, string connectionId, CancellationToken cancellationToken)
+    public virtual async Task<CircuitHost> ConnectAsync(CircuitId circuitId, ISingleClientProxy clientProxy, string connectionId, CancellationToken cancellationToken)
     {
         Log.CircuitConnectStarted(_logger, circuitId);
 
@@ -225,7 +228,7 @@ public virtual async Task<CircuitHost> ConnectAsync(CircuitId circuitId, IClient
         }
     }
 
-    protected virtual (CircuitHost circuitHost, bool previouslyConnected) ConnectCore(CircuitId circuitId, IClientProxy clientProxy, string connectionId)
+    protected virtual (CircuitHost circuitHost, bool previouslyConnected) ConnectCore(CircuitId circuitId, ISingleClientProxy clientProxy, string connectionId)
     {
         if (ConnectedCircuits.TryGetValue(circuitId, out var connectedCircuitHost))
         {
@@ -265,7 +268,7 @@ protected virtual void OnEntryEvicted(object key, object value, EvictionReason r
                 // Kick off the dispose in the background.
                 var disconnectedEntry = (DisconnectedCircuitEntry)value;
                 Log.CircuitEvicted(_logger, disconnectedEntry.CircuitHost.CircuitId, reason);
-                _ = DisposeCircuitEntry(disconnectedEntry);
+                _ = PauseAndDisposeCircuitEntry(disconnectedEntry);
                 break;
 
             case EvictionReason.Removed:
@@ -278,19 +281,87 @@ protected virtual void OnEntryEvicted(object key, object value, EvictionReason r
         }
     }
 
-    private async Task DisposeCircuitEntry(DisconnectedCircuitEntry entry)
+    private Task PauseAndDisposeCircuitEntry(DisconnectedCircuitEntry entry)
     {
         DisposeTokenSource(entry);
 
         try
         {
-            entry.CircuitHost.UnhandledException -= CircuitHost_UnhandledException;
-            await entry.CircuitHost.DisposeAsync();
+            if (!entry.CircuitHost.HasPendingPersistedCircuitState)
+            {
+                // Only pause and persist the circuit state if it has been active at some point,
+                // meaning that the client called UpdateRootComponents on it.
+                var circuitHost = entry.CircuitHost;
+                return PauseAndDisposeCircuitHost(circuitHost, saveStateToClient: false);
+            }
+            else
+            {
+                Log.PersistedCircuitStateDiscarded(_logger, entry.CircuitHost.CircuitId);
+            }
         }
         catch (Exception ex)
         {
             Log.UnhandledExceptionDisposingCircuitHost(_logger, ex);
         }
+
+        return Task.CompletedTask;
+    }
+
+    private async Task PauseAndDisposeCircuitHost(CircuitHost circuitHost, bool saveStateToClient)
+    {
+        await _circuitPersistenceManager.PauseCircuitAsync(circuitHost, saveStateToClient);
+        circuitHost.UnhandledException -= CircuitHost_UnhandledException;
+        circuitHost.Client.SetDisconnected();
+        await circuitHost.DisposeAsync();
+    }
+
+    internal async Task PauseCircuitAsync(
+    CircuitHost circuitHost,
+    string connectionId)
+    {
+        try
+        {
+            Log.CircuitPauseStarted(_logger, circuitHost.CircuitId, connectionId);
+
+            Task pauseTask;
+            lock (CircuitRegistryLock)
+            {
+                pauseTask = PauseCore(circuitHost, connectionId);
+            }
+            await pauseTask;
+        }
+        catch (Exception)
+        {
+            Log.CircuitPauseFailed(_logger, circuitHost.CircuitId, connectionId);
+        }
+    }
+
+    internal virtual Task PauseCore(CircuitHost circuitHost, string connectionId)
+    {
+        var circuitId = circuitHost.CircuitId;
+        if (!ConnectedCircuits.TryGetValue(circuitId, out circuitHost))
+        {
+            Log.CircuitNotActive(_logger, circuitId);
+
+            // Circuit should be in the connected state for pausing.
+            return Task.CompletedTask;
+        }
+
+        if (!string.Equals(circuitHost.Client.ConnectionId, connectionId, StringComparison.Ordinal))
+        {
+            // Circuit should be connected to the same connection for pausing.
+            Log.CircuitConnectedToDifferentConnection(_logger, circuitId, circuitHost.Client.ConnectionId);
+
+            // The circuit is associated with a different connection. One way this could happen is when
+            // the client reconnects with a new connection before the OnDisconnect for the older
+            // connection is executed. Do nothing
+            return Task.CompletedTask;
+        }
+
+        var removeResult = ConnectedCircuits.TryRemove(circuitId, out _);
+        Debug.Assert(removeResult, "This operation operates inside of a lock. We expect the previously inspected value to be still here.");
+
+        return PauseAndDisposeCircuitHost(circuitHost, saveStateToClient: true);
     }
 
     private void DisposeTokenSource(DisconnectedCircuitEntry entry)
@@ -413,5 +484,14 @@ public static void ExceptionDisposingTokenSource(ILogger logger, Exception excep
 
         [LoggerMessage(115, LogLevel.Debug, "Reconnect to circuit with id {CircuitId} succeeded.", EventName = "ReconnectionSucceeded")]
         public static partial void ReconnectionSucceeded(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(116, LogLevel.Debug, "Circuit {CircuitId} was not resumed. Persisted circuit state for {CircuitId} discarded.", EventName = "PersistedCircuitStateDiscarded")]
+        public static partial void PersistedCircuitStateDiscarded(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(117, LogLevel.Debug, "Pausing circuit with id {CircuitId} from connection {ConnectionId}.", EventName = "CircuitPauseStarted")]
+        public static partial void CircuitPauseStarted(ILogger logger, CircuitId circuitId, string connectionId);
+
+        [LoggerMessage(118, LogLevel.Debug, "Failed to pause circuit with id {CircuitId} from connection {ConnectionId}.", EventName = "CircuitPauseFailed")]
+        public static partial void CircuitPauseFailed(ILogger logger, CircuitId circuitId, string connectionId);
     }
 }
diff --git a/src/Components/Server/src/Circuits/DefaultHybridCache.cs b/src/Components/Server/src/Circuits/DefaultHybridCache.cs
new file mode 100644
index 000000000000..6531a388ae23
--- /dev/null
+++ b/src/Components/Server/src/Circuits/DefaultHybridCache.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+/// <summary>
+/// Default configuration for <see cref="CircuitOptions.HybridPersistenceCache"/>.
+/// </summary>
+internal sealed class DefaultHybridCache : IPostConfigureOptions<CircuitOptions>
+{
+    private readonly HybridCache? _hybridCache;
+
+    /// <summary>
+    /// Initializes a new instance of <see cref="DefaultHybridCache"/>.
+    /// </summary>
+    /// <param name="hybridCache">The <see cref="HybridCache"/> service, if available.</param>
+    public DefaultHybridCache(HybridCache? hybridCache = null)
+    {
+        _hybridCache = hybridCache;
+    }
+
+    /// <inheritdoc />
+    public void PostConfigure(string? name, CircuitOptions options)
+    {
+        // Only set the HybridPersistenceCache if it hasn't been explicitly configured
+        // and a HybridCache service is available
+        if (options.HybridPersistenceCache is null && _hybridCache is not null)
+        {
+            options.HybridPersistenceCache = _hybridCache;
+        }
+    }
+}
diff --git a/src/Components/Server/src/Circuits/DefaultInMemoryCircuitPersistenceProvider.cs b/src/Components/Server/src/Circuits/DefaultInMemoryCircuitPersistenceProvider.cs
new file mode 100644
index 000000000000..80679549690b
--- /dev/null
+++ b/src/Components/Server/src/Circuits/DefaultInMemoryCircuitPersistenceProvider.cs
@@ -0,0 +1,170 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+// Default implmentation of ICircuitPersistenceProvider that uses an in-memory cache
+internal sealed partial class DefaultInMemoryCircuitPersistenceProvider : ICircuitPersistenceProvider
+{
+    private readonly Lock _lock = new();
+    private readonly CircuitOptions _options;
+    private readonly MemoryCache _persistedCircuits;
+    private static readonly Task<PersistedCircuitState> _noMatch = Task.FromResult<PersistedCircuitState>(null);
+    private readonly ILogger<ICircuitPersistenceProvider> _logger;
+
+    public PostEvictionCallbackRegistration PostEvictionCallback { get; internal set; }
+
+    public DefaultInMemoryCircuitPersistenceProvider(
+        ISystemClock clock,
+        ILogger<ICircuitPersistenceProvider> logger,
+        IOptions<CircuitOptions> options)
+    {
+        _options = options.Value;
+        _persistedCircuits = new MemoryCache(new MemoryCacheOptions
+        {
+            SizeLimit = _options.PersistedCircuitInMemoryMaxRetained,
+            Clock = clock
+        });
+
+        PostEvictionCallback = new PostEvictionCallbackRegistration
+        {
+            EvictionCallback = OnEntryEvicted
+        };
+
+        _logger = logger;
+    }
+
+    public Task PersistCircuitAsync(CircuitId circuitId, PersistedCircuitState persistedCircuitState, CancellationToken cancellation = default)
+    {
+        Log.CircuitPauseStarted(_logger, circuitId);
+
+        lock (_lock)
+        {
+            PersistCore(circuitId, persistedCircuitState);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private void PersistCore(CircuitId circuitId, PersistedCircuitState persistedCircuitState)
+    {
+        var cancellationTokenSource = new CancellationTokenSource(_options.PersistedCircuitInMemoryRetentionPeriod);
+        var options = new MemoryCacheEntryOptions
+        {
+            Size = 1,
+            PostEvictionCallbacks = { PostEvictionCallback },
+            ExpirationTokens = { new CancellationChangeToken(cancellationTokenSource.Token) },
+        };
+
+        var persistedCircuitEntry = new PersistedCircuitEntry
+        {
+            State = persistedCircuitState,
+            TokenSource = cancellationTokenSource,
+            CircuitId = circuitId
+        };
+
+        _persistedCircuits.Set(circuitId.Secret, persistedCircuitEntry, options);
+    }
+
+    private void OnEntryEvicted(object key, object value, EvictionReason reason, object state)
+    {
+        switch (reason)
+        {
+            case EvictionReason.Expired:
+            case EvictionReason.TokenExpired:
+            // Happens after the circuit state times out, this is triggered by the CancellationTokenSource we register
+            // with the entry, which is what controls the expiration
+            case EvictionReason.Capacity:
+            // Happens when the cache is full
+                var persistedCircuitEntry = (PersistedCircuitEntry)value;
+                Log.CircuitStateEvicted(_logger, persistedCircuitEntry.CircuitId, reason);
+                break;
+
+            case EvictionReason.Removed:
+            // Happens when the entry is explicitly removed as part of resuming a circuit.
+                return;
+            default:
+                Debug.Fail($"Unexpected {nameof(EvictionReason)} {reason}");
+                break;
+        }
+    }
+
+    public Task<PersistedCircuitState> RestoreCircuitAsync(CircuitId circuitId, CancellationToken cancellation = default)
+    {
+        Log.CircuitResumeStarted(_logger, circuitId);
+
+        lock (_lock)
+        {
+            var state = RestoreCore(circuitId);
+            if (state == null)
+            {
+                Log.FailedToFindCircuitState(_logger, circuitId);
+                return _noMatch;
+            }
+
+            return Task.FromResult(state);
+        }
+    }
+
+    private PersistedCircuitState RestoreCore(CircuitId circuitId)
+    {
+        if (_persistedCircuits.TryGetValue(circuitId.Secret, out var value) && value is PersistedCircuitEntry entry)
+        {
+            DisposeTokenSource(entry);
+            _persistedCircuits.Remove(circuitId.Secret);
+            Log.CircuitStateFound(_logger, circuitId);
+            return entry.State;
+        }
+
+        return null;
+    }
+
+    private void DisposeTokenSource(PersistedCircuitEntry entry)
+    {
+        try
+        {
+            entry.TokenSource.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Log.ExceptionDisposingTokenSource(_logger, ex);
+        }
+    }
+
+    private class PersistedCircuitEntry
+    {
+        public PersistedCircuitState State { get; set; }
+
+        public CancellationTokenSource TokenSource { get; set; }
+
+        public CircuitId CircuitId { get; set; }
+    }
+
+    private static partial class Log
+    {
+        [LoggerMessage(101, LogLevel.Debug, "Circuit state evicted for circuit {CircuitId} due to {Reason}", EventName = "CircuitStateEvicted")]
+        public static partial void CircuitStateEvicted(ILogger logger, CircuitId circuitId, EvictionReason reason);
+
+        [LoggerMessage(102, LogLevel.Debug, "Resuming circuit with ID {CircuitId}", EventName = "CircuitResumeStarted")]
+        public static partial void CircuitResumeStarted(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(103, LogLevel.Debug, "Failed to find persisted circuit with ID {CircuitId}", EventName = "FailedToFindCircuitState")]
+        public static partial void FailedToFindCircuitState(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(104, LogLevel.Debug, "Circuit state found for circuit {CircuitId}", EventName = "CircuitStateFound")]
+        public static partial void CircuitStateFound(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(105, LogLevel.Error, "An exception occurred while disposing the token source.", EventName = "ExceptionDisposingTokenSource")]
+        public static partial void ExceptionDisposingTokenSource(ILogger logger, Exception exception);
+
+        [LoggerMessage(106, LogLevel.Debug, "Pausing circuit with ID {CircuitId}", EventName = "CircuitPauseStarted")]
+        public static partial void CircuitPauseStarted(ILogger logger, CircuitId circuitId);
+    }
+}
diff --git a/src/Components/Server/src/Circuits/HybridCacheCircuitPersistenceProvider.cs b/src/Components/Server/src/Circuits/HybridCacheCircuitPersistenceProvider.cs
new file mode 100644
index 000000000000..d97b392aa937
--- /dev/null
+++ b/src/Components/Server/src/Circuits/HybridCacheCircuitPersistenceProvider.cs
@@ -0,0 +1,131 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+// Implementation of ICircuitPersistenceProvider that uses HybridCache for distributed caching
+internal sealed partial class HybridCacheCircuitPersistenceProvider : ICircuitPersistenceProvider
+{
+    private static readonly Func<CancellationToken, ValueTask<PersistedCircuitState>> _failOnCreate =
+        static ct => throw new InvalidOperationException();
+
+    private static readonly string[] _tags = ["Microsoft.AspNetCore.Components.Server.PersistedCircuitState"];
+
+    private readonly SemaphoreSlim _lock = new(1, 1);
+    private readonly HybridCache _hybridCache;
+    private readonly ILogger<ICircuitPersistenceProvider> _logger;
+    private readonly HybridCacheEntryOptions _cacheWriteOptions;
+    private readonly HybridCacheEntryOptions _cacheReadOptions;
+
+    public HybridCacheCircuitPersistenceProvider(
+        HybridCache hybridCache,
+        ILogger<ICircuitPersistenceProvider> logger,
+        IOptions<CircuitOptions> options)
+    {
+        _hybridCache = hybridCache;
+        _logger = logger;
+        _cacheWriteOptions = new HybridCacheEntryOptions
+        {
+            Expiration = options.Value.PersistedCircuitDistributedRetentionPeriod,
+            LocalCacheExpiration = options.Value.PersistedCircuitInMemoryRetentionPeriod,
+        };
+        _cacheReadOptions = new HybridCacheEntryOptions
+        {
+            Flags = HybridCacheEntryFlags.DisableLocalCacheWrite |
+                    HybridCacheEntryFlags.DisableDistributedCacheWrite |
+                    HybridCacheEntryFlags.DisableUnderlyingData,
+        };
+    }
+
+    public async Task PersistCircuitAsync(CircuitId circuitId, PersistedCircuitState persistedCircuitState, CancellationToken cancellation = default)
+    {
+        Log.CircuitPauseStarted(_logger, circuitId);
+
+        try
+        {
+            await _lock.WaitAsync(cancellation);
+            await _hybridCache.SetAsync(circuitId.Secret, persistedCircuitState, _cacheWriteOptions, _tags, cancellation);
+        }
+        catch (Exception ex)
+        {
+            Log.ExceptionPersistingCircuit(_logger, circuitId, ex);
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    public async Task<PersistedCircuitState> RestoreCircuitAsync(CircuitId circuitId, CancellationToken cancellation = default)
+    {
+        Log.CircuitResumeStarted(_logger, circuitId);
+
+        try
+        {
+            await _lock.WaitAsync(cancellation);
+            var state = await _hybridCache.GetOrCreateAsync(
+                circuitId.Secret,
+                factory: _failOnCreate,
+                options: _cacheReadOptions,
+                _tags,
+                cancellation);
+
+            if (state == null)
+            {
+                Log.FailedToFindCircuitState(_logger, circuitId);
+                return null;
+            }
+
+            await _hybridCache.RemoveAsync(circuitId.Secret, cancellation);
+
+            Log.CircuitStateFound(_logger, circuitId);
+            return state;
+        }
+        catch (Exception ex)
+        {
+            Log.ExceptionRestoringCircuit(_logger, circuitId, ex);
+            return null;
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    private static partial class Log
+    {
+        [LoggerMessage(201, LogLevel.Debug, "Circuit state evicted for circuit {CircuitId} due to {Reason}", EventName = "CircuitStateEvicted")]
+        public static partial void CircuitStateEvicted(ILogger logger, CircuitId circuitId, string reason);
+
+        [LoggerMessage(202, LogLevel.Debug, "Resuming circuit with ID {CircuitId}", EventName = "CircuitResumeStarted")]
+        public static partial void CircuitResumeStarted(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(203, LogLevel.Debug, "Failed to find persisted circuit with ID {CircuitId}", EventName = "FailedToFindCircuitState")]
+        public static partial void FailedToFindCircuitState(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(204, LogLevel.Debug, "Circuit state found for circuit {CircuitId}", EventName = "CircuitStateFound")]
+        public static partial void CircuitStateFound(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(205, LogLevel.Error, "An exception occurred while disposing the token source.", EventName = "ExceptionDisposingTokenSource")]
+        public static partial void ExceptionDisposingTokenSource(ILogger logger, Exception exception);
+
+        [LoggerMessage(206, LogLevel.Debug, "Pausing circuit with ID {CircuitId}", EventName = "CircuitPauseStarted")]
+        public static partial void CircuitPauseStarted(ILogger logger, CircuitId circuitId);
+
+        [LoggerMessage(207, LogLevel.Error, "An exception occurred while persisting circuit {CircuitId}.", EventName = "ExceptionPersistingCircuit")]
+        public static partial void ExceptionPersistingCircuit(ILogger logger, CircuitId circuitId, Exception exception);
+
+        [LoggerMessage(208, LogLevel.Error, "An exception occurred while restoring circuit {CircuitId}.", EventName = "ExceptionRestoringCircuit")]
+        public static partial void ExceptionRestoringCircuit(ILogger logger, CircuitId circuitId, Exception exception);
+
+        [LoggerMessage(209, LogLevel.Error, "An exception occurred during expiration handling for circuit {CircuitId}.", EventName = "ExceptionDuringExpiration")]
+        public static partial void ExceptionDuringExpiration(ILogger logger, CircuitId circuitId, Exception exception);
+
+        [LoggerMessage(210, LogLevel.Error, "An exception occurred while removing expired circuit {CircuitId}.", EventName = "ExceptionRemovingExpiredCircuit")]
+        public static partial void ExceptionRemovingExpiredCircuit(ILogger logger, CircuitId circuitId, Exception exception);
+    }
+}
diff --git a/src/Components/Server/src/Circuits/ICircuitPersistenceProvider.cs b/src/Components/Server/src/Circuits/ICircuitPersistenceProvider.cs
new file mode 100644
index 000000000000..3149886347da
--- /dev/null
+++ b/src/Components/Server/src/Circuits/ICircuitPersistenceProvider.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+// Abstraction to support persisting and restoring circuit state
+internal interface ICircuitPersistenceProvider
+{
+    Task PersistCircuitAsync(CircuitId circuitId, PersistedCircuitState persistedCircuitState, CancellationToken cancellation = default);
+
+    Task<PersistedCircuitState> RestoreCircuitAsync(CircuitId circuitId, CancellationToken cancellation = default);
+}
diff --git a/src/Components/Server/src/Circuits/IServerComponentDeserializer.cs b/src/Components/Server/src/Circuits/IServerComponentDeserializer.cs
index 524028a3f98a..b118a0cd6034 100644
--- a/src/Components/Server/src/Circuits/IServerComponentDeserializer.cs
+++ b/src/Components/Server/src/Circuits/IServerComponentDeserializer.cs
@@ -10,5 +10,7 @@ internal interface IServerComponentDeserializer
     bool TryDeserializeComponentDescriptorCollection(
         string serializedComponentRecords,
         out List<ComponentDescriptor> descriptors);
-    bool TryDeserializeRootComponentOperations(string serializedComponentOperations, [NotNullWhen(true)] out RootComponentOperationBatch? operationBatch);
+    bool TryDeserializeRootComponentOperations(string serializedComponentOperations, [NotNullWhen(true)] out RootComponentOperationBatch? operationBatch, bool deserializeDescriptors = true);
+
+    bool TryDeserializeWebRootComponentDescriptor(ComponentMarker record, [NotNullWhen(true)] out WebRootComponentDescriptor? result);
 }
diff --git a/src/Components/Server/src/Circuits/PersistedCircuitState.cs b/src/Components/Server/src/Circuits/PersistedCircuitState.cs
new file mode 100644
index 000000000000..e02536f925dc
--- /dev/null
+++ b/src/Components/Server/src/Circuits/PersistedCircuitState.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+internal class PersistedCircuitState
+{
+    public IReadOnlyDictionary<string, byte[]> ApplicationState { get; set; }
+
+    public byte[] RootComponents { get; set; }
+
+    private string GetDebuggerDisplay()
+    {
+        return $"ApplicationStateCount={ApplicationState?.Count ?? 0}, RootComponentsLength={RootComponents?.Length ?? 0} bytes";
+    }
+}
diff --git a/src/Components/Server/src/Circuits/RemoteComponentState.cs b/src/Components/Server/src/Circuits/RemoteComponentState.cs
new file mode 100644
index 000000000000..002834e122f6
--- /dev/null
+++ b/src/Components/Server/src/Circuits/RemoteComponentState.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+/// <summary>
+/// Specialized ComponentState for Server/Remote rendering that supports ComponentMarkerKey for state persistence.
+/// </summary>
+internal sealed class RemoteComponentState : ComponentState
+{
+    public RemoteComponentState(
+        RemoteRenderer renderer,
+        int componentId,
+        IComponent component,
+        ComponentState? parentComponentState)
+        : base(renderer, componentId, component, parentComponentState)
+    {
+    }
+
+    protected override object? GetComponentKey()
+    {
+        var markerKey = ((RemoteRenderer)Renderer).GetMarkerKey(this);
+
+        // If we have a ComponentMarkerKey, return it for state persistence consistency
+        if (markerKey != default)
+        {
+            return markerKey.Serialized();
+        }
+
+        // Fall back to the default implementation
+        return base.GetComponentKey();
+    }
+}
diff --git a/src/Components/Server/src/Circuits/RemoteJSDataStream.cs b/src/Components/Server/src/Circuits/RemoteJSDataStream.cs
index 75c432a9ec74..d1cdf0724832 100644
--- a/src/Components/Server/src/Circuits/RemoteJSDataStream.cs
+++ b/src/Components/Server/src/Circuits/RemoteJSDataStream.cs
@@ -181,28 +181,14 @@ public override void Write(byte[] buffer, int offset, int count)
 
     public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
     {
-        var linkedCancellationToken = GetLinkedCancellationToken(_streamCancellationToken, cancellationToken);
-        return await _pipeReaderStream.ReadAsync(buffer.AsMemory(offset, count), linkedCancellationToken);
+        using var linkedCts = ValueLinkedCancellationTokenSource.Create(_streamCancellationToken, cancellationToken);
+        return await _pipeReaderStream.ReadAsync(buffer.AsMemory(offset, count), linkedCts.Token);
     }
 
     public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
     {
-        var linkedCancellationToken = GetLinkedCancellationToken(_streamCancellationToken, cancellationToken);
-        return await _pipeReaderStream.ReadAsync(buffer, linkedCancellationToken);
-    }
-
-    private static CancellationToken GetLinkedCancellationToken(CancellationToken a, CancellationToken b)
-    {
-        if (a.CanBeCanceled && b.CanBeCanceled)
-        {
-            return CancellationTokenSource.CreateLinkedTokenSource(a, b).Token;
-        }
-        else if (a.CanBeCanceled)
-        {
-            return a;
-        }
-
-        return b;
+        using var linkedCts = ValueLinkedCancellationTokenSource.Create(_streamCancellationToken, cancellationToken);
+        return await _pipeReaderStream.ReadAsync(buffer, linkedCts.Token);
     }
 
     private async Task ThrowOnTimeout()
@@ -243,4 +229,45 @@ protected override void Dispose(bool disposing)
 
         _disposed = true;
     }
+
+    // A helper for creating and disposing linked CancellationTokenSources
+    // without allocating, when possible.
+    // Internal for testing.
+    internal readonly struct ValueLinkedCancellationTokenSource : IDisposable
+    {
+        private readonly CancellationTokenSource? _linkedCts;
+
+        public readonly CancellationToken Token;
+
+        // For testing.
+        internal bool HasLinkedCancellationTokenSource => _linkedCts is not null;
+
+        public static ValueLinkedCancellationTokenSource Create(
+            CancellationToken token1, CancellationToken token2)
+        {
+            if (!token1.CanBeCanceled)
+            {
+                return new(linkedCts: null, token2);
+            }
+
+            if (!token2.CanBeCanceled)
+            {
+                return new(linkedCts: null, token1);
+            }
+
+            var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(token1, token2);
+            return new(linkedCts, linkedCts.Token);
+        }
+
+        private ValueLinkedCancellationTokenSource(CancellationTokenSource? linkedCts, CancellationToken token)
+        {
+            _linkedCts = linkedCts;
+            Token = token;
+        }
+
+        public void Dispose()
+        {
+            _linkedCts?.Dispose();
+        }
+    }
 }
diff --git a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
index 34c76baada6f..c9346439f1b0 100644
--- a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
+++ b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
@@ -18,7 +18,7 @@ internal partial class RemoteJSRuntime : JSRuntime
     private readonly CircuitOptions _options;
     private readonly ILogger<RemoteJSRuntime> _logger;
     private CircuitClientProxy _clientProxy;
-    private readonly ConcurrentDictionary<long, DotNetStreamReference> _pendingDotNetToJSStreams = new();
+    private readonly ConcurrentDictionary<long, CancelableDotNetStreamReference> _pendingDotNetToJSStreams = new();
     private bool _permanentlyDisconnected;
     private readonly long _maximumIncomingBytes;
     private int _byteArraysToBeRevivedTotalBytes;
@@ -105,6 +105,21 @@ protected override void SendByteArray(int id, byte[] data)
     }
 
     protected override void BeginInvokeJS(long asyncHandle, string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+    {
+        var invocationInfo = new JSInvocationInfo
+        {
+            AsyncHandle = asyncHandle,
+            TargetInstanceId = targetInstanceId,
+            Identifier = identifier,
+            CallType = JSCallType.FunctionCall,
+            ResultType = resultType,
+            ArgsJson = argsJson,
+        };
+
+        BeginInvokeJS(invocationInfo);
+    }
+
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
         if (_clientProxy is null)
         {
@@ -123,9 +138,16 @@ protected override void BeginInvokeJS(long asyncHandle, string identifier, strin
             }
         }
 
-        Log.BeginInvokeJS(_logger, asyncHandle, identifier);
+        Log.BeginInvokeJS(_logger, invocationInfo.AsyncHandle, invocationInfo.Identifier);
 
-        _clientProxy.SendAsync("JS.BeginInvokeJS", asyncHandle, identifier, argsJson, (int)resultType, targetInstanceId);
+        _clientProxy.SendAsync(
+            "JS.BeginInvokeJS",
+            invocationInfo.AsyncHandle,
+            invocationInfo.Identifier,
+            invocationInfo.ArgsJson,
+            (int)invocationInfo.ResultType,
+            invocationInfo.TargetInstanceId,
+            (int)invocationInfo.CallType);
     }
 
     protected override void ReceiveByteArray(int id, byte[] data)
@@ -152,7 +174,8 @@ protected override void ReceiveByteArray(int id, byte[] data)
 
     protected override async Task TransmitStreamAsync(long streamId, DotNetStreamReference dotNetStreamReference)
     {
-        if (!_pendingDotNetToJSStreams.TryAdd(streamId, dotNetStreamReference))
+        var cancelableStreamReference = new CancelableDotNetStreamReference(dotNetStreamReference);
+        if (!_pendingDotNetToJSStreams.TryAdd(streamId, cancelableStreamReference))
         {
             throw new ArgumentException($"The stream {streamId} is already pending.");
         }
@@ -160,13 +183,18 @@ protected override async Task TransmitStreamAsync(long streamId, DotNetStreamRef
         // SignalR only supports streaming being initiated from the JS side, so we have to ask it to
         // start the stream. We'll give it a maximum of 10 seconds to do so, after which we give up
         // and discard it.
-        var cancellationToken = new CancellationTokenSource(TimeSpan.FromSeconds(10)).Token;
-        cancellationToken.Register(() =>
+        CancellationTokenSource cancellationTokenSource = new(TimeSpan.FromSeconds(10));
+
+        // Store CTS to dispose later.
+        cancelableStreamReference.CancellationTokenSource = cancellationTokenSource;
+
+        cancellationTokenSource.Token.Register(() =>
         {
             // If by now the stream hasn't been claimed for sending, stop tracking it
-            if (_pendingDotNetToJSStreams.TryRemove(streamId, out var timedOutStream) && !timedOutStream.LeaveOpen)
+            if (_pendingDotNetToJSStreams.TryRemove(streamId, out var timedOutCancelableStreamReference))
             {
-                timedOutStream.Stream.Dispose();
+                timedOutCancelableStreamReference.StreamReference.Dispose();
+                timedOutCancelableStreamReference.CancellationTokenSource?.Dispose();
             }
         });
 
@@ -175,8 +203,13 @@ protected override async Task TransmitStreamAsync(long streamId, DotNetStreamRef
 
     public bool TryClaimPendingStreamForSending(long streamId, out DotNetStreamReference pendingStream)
     {
-        if (_pendingDotNetToJSStreams.TryRemove(streamId, out pendingStream))
+        if (_pendingDotNetToJSStreams.TryRemove(streamId, out var cancelableStreamReference))
         {
+            pendingStream = cancelableStreamReference.StreamReference;
+
+            // Dispose CTS for claimed Stream.
+            cancelableStreamReference.CancellationTokenSource?.Dispose();
+
             return true;
         }
 
@@ -193,6 +226,18 @@ public void MarkPermanentlyDisconnected()
     protected override async Task<Stream> ReadJSDataAsStreamAsync(IJSStreamReference jsStreamReference, long totalLength, CancellationToken cancellationToken = default)
         => await RemoteJSDataStream.CreateRemoteJSDataStreamAsync(this, jsStreamReference, totalLength, _maximumIncomingBytes, _options.JSInteropDefaultCallTimeout, cancellationToken);
 
+    private class CancelableDotNetStreamReference
+    {
+        public CancelableDotNetStreamReference(DotNetStreamReference streamReference)
+        {
+            StreamReference = streamReference;
+        }
+
+        public CancellationTokenSource? CancellationTokenSource { get; set; }
+
+        public DotNetStreamReference StreamReference { get; }
+    }
+
     public static partial class Log
     {
         [LoggerMessage(1, LogLevel.Debug, "Begin invoke JS interop '{AsyncHandle}': '{FunctionIdentifier}'", EventName = "BeginInvokeJS")]
diff --git a/src/Components/Server/src/Circuits/RemoteNavigationManager.cs b/src/Components/Server/src/Circuits/RemoteNavigationManager.cs
index a2a148945ee1..2100ef3a7a16 100644
--- a/src/Components/Server/src/Circuits/RemoteNavigationManager.cs
+++ b/src/Components/Server/src/Circuits/RemoteNavigationManager.cs
@@ -17,6 +17,12 @@ internal sealed partial class RemoteNavigationManager : NavigationManager, IHost
     private readonly ILogger<RemoteNavigationManager> _logger;
     private IJSRuntime _jsRuntime;
     private bool? _navigationLockStateBeforeJsRuntimeAttached;
+    private const string _disableThrowNavigationException = "Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException";
+
+    [FeatureSwitchDefinition(_disableThrowNavigationException)]
+    private static bool _throwNavigationException =>
+        !AppContext.TryGetSwitch(_disableThrowNavigationException, out var switchValue) || !switchValue;
+    private Func<string, Task>? _onNavigateTo;
 
     public event EventHandler<Exception>? UnhandledException;
 
@@ -45,6 +51,19 @@ public RemoteNavigationManager(ILogger<RemoteNavigationManager> logger)
         NotifyLocationChanged(isInterceptedLink: false);
     }
 
+    /// <summary>
+    /// Initializes the <see cref="NavigationManager" />.
+    /// </summary>
+    /// <param name="baseUri">The base URI.</param>
+    /// <param name="uri">The absolute URI.</param>
+    /// <param name="onNavigateTo">A delegate that points to a method handling navigation events. </param>
+    public void Initialize(string baseUri, string uri, Func<string, Task> onNavigateTo)
+    {
+        _onNavigateTo += onNavigateTo;
+        base.Initialize(baseUri, uri);
+        NotifyLocationChanged(isInterceptedLink: false);
+    }
+
     /// <summary>
     /// Initializes the <see cref="RemoteNavigationManager"/>.
     /// </summary>
@@ -88,7 +107,16 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
         if (_jsRuntime == null)
         {
             var absoluteUriString = ToAbsoluteUri(uri).AbsoluteUri;
-            throw new NavigationException(absoluteUriString);
+            if (_throwNavigationException)
+            {
+                throw new NavigationException(absoluteUriString);
+            }
+            if (_onNavigateTo == null)
+            {
+                throw new InvalidOperationException($"'{GetType().Name}' method for endpoint-based navigation has not been initialized.");
+            }
+            _ = _onNavigateTo(absoluteUriString);
+            return;
         }
 
         _ = PerformNavigationAsync();
@@ -129,7 +157,16 @@ public override void Refresh(bool forceReload = false)
         if (_jsRuntime == null)
         {
             var absoluteUriString = ToAbsoluteUri(Uri).AbsoluteUri;
-            throw new NavigationException(absoluteUriString);
+            if (_throwNavigationException)
+            {
+                throw new NavigationException(absoluteUriString);
+            }
+            if (_onNavigateTo == null)
+            {
+                throw new InvalidOperationException($"'{GetType().Name}' method for endpoint-based navigation has not been initialized.");
+            }
+            _ = _onNavigateTo(absoluteUriString);
+            return;
         }
 
         _ = RefreshAsync();
@@ -197,6 +234,9 @@ public static void RequestingNavigation(ILogger logger, string uri, NavigationOp
         [LoggerMessage(5, LogLevel.Error, "Failed to refresh", EventName = "RefreshFailed")]
         public static partial void RefreshFailed(ILogger logger, Exception exception);
 
+        [LoggerMessage(1, LogLevel.Debug, "Requesting not found", EventName = "RequestingNotFound")]
+        public static partial void RequestingNotFound(ILogger logger);
+
         [LoggerMessage(6, LogLevel.Debug, "Navigation completed when changing the location to {Uri}", EventName = "NavigationCompleted")]
         public static partial void NavigationCompleted(ILogger logger, string uri);
 
diff --git a/src/Components/Server/src/Circuits/RemoteRenderer.cs b/src/Components/Server/src/Circuits/RemoteRenderer.cs
index 31b29206212b..8e161697abdb 100644
--- a/src/Components/Server/src/Circuits/RemoteRenderer.cs
+++ b/src/Components/Server/src/Circuits/RemoteRenderer.cs
@@ -4,6 +4,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.SignalR;
@@ -313,6 +314,18 @@ protected override IComponent ResolveComponentForRenderMode([DynamicallyAccessed
             _ => throw new NotSupportedException($"Cannot create a component of type '{componentType}' because its render mode '{renderMode}' is not supported by interactive server-side rendering."),
         };
 
+    protected override ComponentState CreateComponentState(int componentId, IComponent component, ComponentState? parentComponentState)
+    {
+        return new RemoteComponentState(this, componentId, component, parentComponentState);
+    }
+
+    internal ComponentMarkerKey GetMarkerKey(RemoteComponentState remoteComponentState)
+    {
+        return remoteComponentState.ParentComponentState != null ?
+            default :
+            _webRootComponentManager!.GetRootComponentKey(remoteComponentState.ComponentId);
+    }
+
     private void ProcessPendingBatch(string? errorMessageOrNull, UnacknowledgedRenderBatch entry)
     {
         var elapsedTime = entry.ValueStopwatch.GetElapsedTime();
diff --git a/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs b/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs
index 44053eee9ae9..eaebd8856968 100644
--- a/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs
+++ b/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs
@@ -59,7 +59,7 @@ internal sealed partial class ServerComponentDeserializer : IServerComponentDese
 {
     private readonly IDataProtector _dataProtector;
     private readonly ILogger<ServerComponentDeserializer> _logger;
-    private readonly RootComponentTypeCache _rootComponentTypeCache;
+    private readonly RootTypeCache _RootTypeCache;
     private readonly ComponentParameterDeserializer _parametersDeserializer;
 
     // The following fields are only used in TryDeserializeSingleComponentDescriptor.
@@ -72,7 +72,7 @@ internal sealed partial class ServerComponentDeserializer : IServerComponentDese
     public ServerComponentDeserializer(
         IDataProtectionProvider dataProtectionProvider,
         ILogger<ServerComponentDeserializer> logger,
-        RootComponentTypeCache rootComponentTypeCache,
+        RootTypeCache RootTypeCache,
         ComponentParameterDeserializer parametersDeserializer)
     {
         // When we protect the data we use a time-limited data protector with the
@@ -87,7 +87,7 @@ public ServerComponentDeserializer(
             .ToTimeLimitedDataProtector();
 
         _logger = logger;
-        _rootComponentTypeCache = rootComponentTypeCache;
+        _RootTypeCache = RootTypeCache;
         _parametersDeserializer = parametersDeserializer;
     }
 
@@ -206,8 +206,8 @@ public bool TryDeserializeWebRootComponentDescriptor(ComponentMarker record, [No
     private bool TryDeserializeComponentTypeAndParameters(ServerComponent serverComponent, [NotNullWhen(true)] out Type? componentType, out ParameterView parameters)
     {
         parameters = default;
-        componentType = _rootComponentTypeCache
-            .GetRootComponent(serverComponent.AssemblyName, serverComponent.TypeName);
+        componentType = _RootTypeCache
+            .GetRootType(serverComponent.AssemblyName, serverComponent.TypeName);
 
         if (componentType == null)
         {
@@ -291,7 +291,10 @@ private bool TryDeserializeServerComponent(ComponentMarker record, out ServerCom
         return (componentDescriptor, serverComponent);
     }
 
-    public bool TryDeserializeRootComponentOperations(string serializedComponentOperations, [NotNullWhen(true)] out RootComponentOperationBatch? result)
+    public bool TryDeserializeRootComponentOperations(
+        string serializedComponentOperations,
+        [NotNullWhen(true)] out RootComponentOperationBatch? result,
+        bool deserializeMarkers = true)
     {
         int[]? seenComponentIdsStorage = null;
         try
@@ -329,6 +332,13 @@ public bool TryDeserializeRootComponentOperations(string serializedComponentOper
                     return false;
                 }
 
+                if (!deserializeMarkers)
+                {
+                    // If we are not deserializing markers, we can skip the rest of the processing.
+                    operation.Descriptor = null;
+                    continue;
+                }
+
                 if (!TryDeserializeWebRootComponentDescriptor(operation.Marker.Value, out var descriptor))
                 {
                     result = null;
diff --git a/src/Components/Server/src/ComponentHub.cs b/src/Components/Server/src/ComponentHub.cs
index b3308f17bfd7..7455ef8c6f85 100644
--- a/src/Components/Server/src/ComponentHub.cs
+++ b/src/Components/Server/src/ComponentHub.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 
@@ -41,6 +42,7 @@ internal sealed partial class ComponentHub : Hub
     private readonly ICircuitFactory _circuitFactory;
     private readonly CircuitIdFactory _circuitIdFactory;
     private readonly CircuitRegistry _circuitRegistry;
+    private readonly CircuitPersistenceManager _circuitPersistenceManager;
     private readonly ICircuitHandleRegistry _circuitHandleRegistry;
     private readonly ILogger _logger;
 
@@ -50,6 +52,7 @@ public ComponentHub(
         ICircuitFactory circuitFactory,
         CircuitIdFactory circuitIdFactory,
         CircuitRegistry circuitRegistry,
+        CircuitPersistenceManager circuitPersistenceProvider,
         ICircuitHandleRegistry circuitHandleRegistry,
         ILogger<ComponentHub> logger)
     {
@@ -58,6 +61,7 @@ public ComponentHub(
         _circuitFactory = circuitFactory;
         _circuitIdFactory = circuitIdFactory;
         _circuitRegistry = circuitRegistry;
+        _circuitPersistenceManager = circuitPersistenceProvider;
         _circuitHandleRegistry = circuitHandleRegistry;
         _logger = logger;
     }
@@ -137,7 +141,8 @@ public async ValueTask<string> StartCircuit(string baseUri, string uri, string s
             // SignalR message loop (we'd get a deadlock if any of the initialization
             // logic relied on receiving a subsequent message from SignalR), and it will
             // take care of its own errors anyway.
-            _ = circuitHost.InitializeAsync(store, Context.ConnectionAborted);
+            var httpActivityContext = Context.GetHttpContext().Features.Get<IHttpActivityFeature>()?.Activity.Context ?? default;
+            _ = circuitHost.InitializeAsync(store, httpActivityContext, Context.ConnectionAborted);
 
             // It's safe to *publish* the circuit now because nothing will be able
             // to run inside it until after InitializeAsync completes.
@@ -169,23 +174,38 @@ public async Task UpdateRootComponents(string serializedComponentOperations, str
             return;
         }
 
-        if (!_serverComponentSerializer.TryDeserializeRootComponentOperations(
-            serializedComponentOperations,
-            out var operations))
+        RootComponentOperationBatch operations;
+        ProtectedPrerenderComponentApplicationStore store;
+        var persistedState = circuitHost.TakePersistedCircuitState();
+        if (persistedState != null)
         {
-            // There was an error, so kill the circuit.
-            await _circuitRegistry.TerminateAsync(circuitHost.CircuitId);
-            await NotifyClientError(Clients.Caller, "The list of component operations is not valid.");
-            Context.Abort();
+            operations = CircuitPersistenceManager.ToRootComponentOperationBatch(
+                _serverComponentSerializer,
+                persistedState.RootComponents,
+                serializedComponentOperations);
 
-            return;
+            store = new ProtectedPrerenderComponentApplicationStore(persistedState.ApplicationState, _dataProtectionProvider);
         }
+        else
+        {
+            if (!_serverComponentSerializer.TryDeserializeRootComponentOperations(
+            serializedComponentOperations,
+            out operations))
+            {
+                // There was an error, so kill the circuit.
+                await _circuitRegistry.TerminateAsync(circuitHost.CircuitId);
+                await NotifyClientError(Clients.Caller, "The list of component operations is not valid.");
+                Context.Abort();
+
+                return;
+            }
 
-        var store = !string.IsNullOrEmpty(applicationState) ?
-            new ProtectedPrerenderComponentApplicationStore(applicationState, _dataProtectionProvider) :
-            new ProtectedPrerenderComponentApplicationStore(_dataProtectionProvider);
+            store = !string.IsNullOrEmpty(applicationState) ?
+                new ProtectedPrerenderComponentApplicationStore(applicationState, _dataProtectionProvider) :
+                new ProtectedPrerenderComponentApplicationStore(_dataProtectionProvider);
+        }
 
-        _ = circuitHost.UpdateRootComponents(operations, store, Context.ConnectionAborted);
+        _ = circuitHost.UpdateRootComponents(operations, store, persistedState != null, Context.ConnectionAborted);
     }
 
     public async ValueTask<bool> ConnectCircuit(string circuitIdSecret)
@@ -217,6 +237,198 @@ public async ValueTask<bool> ConnectCircuit(string circuitIdSecret)
         return false;
     }
 
+    // This method drives the resumption of a circuit that has been previously paused and ejected out of memory.
+    // Resuming a circuit is very similar to starting a new circuit.
+    // We receive an existing circuit ID to look up the existing circuit state.
+    // We receive the base URI and the URI to perform the same checks that we do during start circuit.
+    // Upon resuming a circuit ID, its ID changes. This has some ramifications:
+    // * When a circuit is paused, the old circuit is gone. There's no way to bring it back.
+    // * Resuming a circuit means to essentially create a new circuit. One that "starts" from where the previous one "paused".
+    // * When a circuit is "paused" it might be stored either in the browser (the client holds all state) during "graceful pauses" or
+    //   it can be stored in cache storage during "ungraceful pauses".
+    // * For the circuit to successfully resume, this call needs to succeed (returning a new circuit ID).
+    //   * Retrieving and deleting the state for the old circuit is part of this process
+    //   * Once we retrieve the state, we delete it, and we check that it's no longer there before we try to resume
+    //     the new circuit
+    //   * No other connection can get here while we are inside ResumeCircuit (SignalR only processes one message at a time, and we don't work if you change this setting).
+    // * In the unlikely event that the connection breaks, there are two things that could happen:
+    //   * If the client was the one providing the circuit state, it could potentially resume elsewhere (for example another server).
+    //     * In that case this circuit won't do anything. We don't consider the circuit fully resumed until we have attached and triggered a render
+    //       into the DOM. If a failure happens before that, we directly discard the new circuit and its state.
+    //   * If the state was stored on the server, then the state is gone after we retrieve it from the cache. Even if a client were to connect to
+    //     two separate server instances (for example, server A, B, where it starts resuming on A, something fails and tries to start resuming on B)
+    //     the state would either be ignored in one case or lost.
+    //   * Two things can happen:
+    //     * Both A and B are somehow able to read the same state.
+    //       * Even if A gets the state, it doesn't complete the "resume" handshake, so its state gets discarded
+    //       and not saved again.
+    //       * B might complete the handshake and then the circuit will resume on B.
+    //     * A deletes the state before B is able to read it. Then "resumption" fails, as the circuit state is gone.
+
+    // On the server we are going to have a public method on Circuit.cs to trigger pausing a circuit from the server
+    // that returns the root components and application state as strings data-protected by the data protection provider.
+    // Those can be then passed to this method for resuming the circuit.
+    public async ValueTask<string> ResumeCircuit(
+        string circuitIdSecret,
+        string baseUri,
+        string uri,
+        string rootComponents,
+        string applicationState)
+    {
+        // TryParseCircuitId will not throw.
+        if (!_circuitIdFactory.TryParseCircuitId(circuitIdSecret, out var circuitId))
+        {
+            // Invalid id.
+            Log.ResumeInvalidCircuitId(_logger, circuitIdSecret);
+            return null;
+        }
+
+        var circuitHost = _circuitHandleRegistry.GetCircuit(Context.Items, CircuitKey);
+        if (circuitHost != null)
+        {
+            // This is an error condition and an attempt to bind multiple circuits to a single connection.
+            // We can reject this and terminate the connection.
+            Log.CircuitAlreadyInitialized(_logger, circuitHost.CircuitId);
+            await NotifyClientError(Clients.Caller, $"The circuit host '{circuitHost.CircuitId}' has already been initialized.");
+            Context.Abort();
+            return null;
+        }
+
+        if (baseUri == null ||
+            uri == null ||
+            !Uri.TryCreate(baseUri, UriKind.Absolute, out _) ||
+            !Uri.TryCreate(uri, UriKind.Absolute, out _))
+        {
+            // We do some really minimal validation here to prevent obviously wrong data from getting in
+            // without duplicating too much logic.
+            //
+            // This is an error condition attempting to initialize the circuit in a way that would fail.
+            // We can reject this and terminate the connection.
+            Log.InvalidInputData(_logger);
+            await NotifyClientError(Clients.Caller, "The uris provided are invalid.");
+            Context.Abort();
+            return null;
+        }
+
+        PersistedCircuitState? persistedCircuitState;
+        if (RootComponentIsEmpty(rootComponents) && string.IsNullOrEmpty(applicationState))
+        {
+            persistedCircuitState = await _circuitPersistenceManager.ResumeCircuitAsync(circuitId, Context.ConnectionAborted);
+            if (persistedCircuitState == null)
+            {
+                Log.InvalidInputData(_logger);
+                await NotifyClientError(Clients.Caller, "The circuit state could not be retrieved. It may have been deleted or expired.");
+                Context.Abort();
+                return null;
+            }
+        }
+        else if (!RootComponentIsEmpty(rootComponents) && !string.IsNullOrEmpty(applicationState))
+        {
+            persistedCircuitState = _circuitPersistenceManager.FromProtectedState(rootComponents, applicationState);
+            if (persistedCircuitState == null)
+            {
+                // If we couldn't deserialize the persisted state, signal that.
+                Log.InvalidInputData(_logger);
+                await NotifyClientError(Clients.Caller, "The root components or application state provided are invalid.");
+                Context.Abort();
+                return null;
+            }
+        }
+        else
+        {
+            Log.InvalidInputData(_logger);
+            await NotifyClientError(
+                Clients.Caller,
+                RootComponentIsEmpty(rootComponents) ?
+                "The root components provided are invalid." :
+                "The application state provided is invalid."
+            );
+            Context.Abort();
+            return null;
+        }
+
+        try
+        {
+            var circuitClient = new CircuitClientProxy(Clients.Caller, Context.ConnectionId);
+            var resourceCollection = Context.GetHttpContext().GetEndpoint()?.Metadata.GetMetadata<ResourceAssetCollection>();
+            circuitHost = await _circuitFactory.CreateCircuitHostAsync(
+                [],
+                circuitClient,
+                baseUri,
+                uri,
+                Context.User,
+                store: null,
+                resourceCollection);
+
+            var httpActivityContext = Context.GetHttpContext().Features.Get<IHttpActivityFeature>()?.Activity.Context ?? default;
+
+            // Fire-and-forget the initialization process, because we can't block the
+            // SignalR message loop (we'd get a deadlock if any of the initialization
+            // logic relied on receiving a subsequent message from SignalR), and it will
+            // take care of its own errors anyway.
+            _ = circuitHost.InitializeAsync(store: null, httpActivityContext, Context.ConnectionAborted);
+
+            circuitHost.AttachPersistedState(persistedCircuitState);
+
+            // It's safe to *publish* the circuit now because nothing will be able
+            // to run inside it until after InitializeAsync completes.
+            _circuitRegistry.Register(circuitHost);
+            _circuitHandleRegistry.SetCircuit(Context.Items, CircuitKey, circuitHost);
+
+            // Returning the secret here so the client can reconnect.
+            //
+            // Logging the secret and circuit ID here so we can associate them with just logs (if TRACE level is on).
+            Log.CreatedCircuit(_logger, circuitHost.CircuitId, circuitHost.CircuitId.Secret, Context.ConnectionId);
+
+            return circuitHost.CircuitId.Secret;
+        }
+        catch (Exception ex)
+        {
+            // If the circuit fails to initialize synchronously we can notify the client immediately
+            // and shut down the connection.
+            Log.CircuitInitializationFailed(_logger, ex);
+            await NotifyClientError(Clients.Caller, "The circuit failed to initialize.");
+            Context.Abort();
+            return null;
+        }
+
+        static bool RootComponentIsEmpty(string rootComponents) =>
+            string.IsNullOrEmpty(rootComponents) || rootComponents == "[]";
+    }
+
+    // Client initiated pauses work as follows:
+    // * The client calls PauseCircuit, we dissasociate the circuit from the connection.
+    // * We trigger the circuit pause to collect the current root components and dispose the current circuit.
+    // * We push the current root components and application state to the client.
+    //   * If that succeeds, the client receives the state and we are done.
+    //   * If that fails, we will fall back to the server-side cache storage.
+    // * The client will disconnect after receiving the state or after a 30s timeout.
+    //   * From that point on, it can choose to resume the circuit by calling ResumeCircuit with or without the state
+    //     depending on whether the transfer was successful.
+    // * Most of the time we expect the state push to succeed, if that fails, the possibilites are:
+    //   * Client tries to resume before the state has been saved to the server-side cache storage.
+    //     * Resumption fails as the state is not there.
+    //     * The state eventually makes it to the server-side cache storage, but the client will have already given up and
+    //       the state will eventually go away by virtue of the cache expiration policy on it.
+    //   * The state has been saved to the server-side cache storage. This is what we expect to happen most of the time in the
+    //     rare event that the client push fails.
+    //     * This case becomes equivalent to the "ungraceful pause" case, where the client has no state and the server has the state.
+    public async ValueTask<bool> PauseCircuit()
+    {
+        var circuitHost = await GetActiveCircuitAsync();
+        if (circuitHost == null)
+        {
+            return false;
+        }
+
+        _ = _circuitRegistry.PauseCircuitAsync(circuitHost, Context.ConnectionId);
+
+        // This only signals that pausing the circuit has started.
+        // The client will receive the root components and application state in a separate message
+        // from the server.
+        return true;
+    }
+
     public async ValueTask BeginInvokeDotNetFromJS(string callId, string assemblyName, string methodIdentifier, long dotNetObjectId, string argsJson)
     {
         var circuitHost = await GetActiveCircuitAsync();
@@ -406,6 +618,9 @@ public static void CreatedCircuit(ILogger logger, CircuitId circuitId, string ci
         [LoggerMessage(8, LogLevel.Debug, "ConnectAsync received an invalid circuit id '{CircuitIdSecret}'", EventName = "InvalidCircuitId")]
         private static partial void InvalidCircuitIdCore(ILogger logger, string circuitIdSecret);
 
+        [LoggerMessage(9, LogLevel.Debug, "ResumeCircuit received an invalid circuit id '{CircuitIdSecret}'", EventName = "ResumeInvalidCircuitId")]
+        private static partial void ResumeInvalidCircuitIdCore(ILogger logger, string circuitIdSecret);
+
         public static void InvalidCircuitId(ILogger logger, string circuitSecret)
         {
             // Redact the secret unless tracing is on.
@@ -416,5 +631,16 @@ public static void InvalidCircuitId(ILogger logger, string circuitSecret)
 
             InvalidCircuitIdCore(logger, circuitSecret);
         }
+
+        public static void ResumeInvalidCircuitId(ILogger logger, string circuitSecret)
+        {
+            // Redact the secret unless tracing is on.
+            if (!logger.IsEnabled(LogLevel.Trace))
+            {
+                circuitSecret = "(redacted)";
+            }
+
+            ResumeInvalidCircuitIdCore(logger, circuitSecret);
+        }
     }
 }
diff --git a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
index 66b77af81143..47e00958895f 100644
--- a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
+++ b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Server;
@@ -13,6 +14,8 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.SignalR.Protocol;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.JSInterop;
 
@@ -60,20 +63,44 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         // Here we add a bunch of services that don't vary in any way based on the
         // user's configuration. So even if the user has multiple independent server-side
         // Components entrypoints, this lot is the same and repeated registrations are a no-op.
+
+        services.TryAddSingleton<CircuitMetrics>();
         services.TryAddSingleton<ICircuitFactory, CircuitFactory>();
         services.TryAddSingleton<ICircuitHandleRegistry, CircuitHandleRegistry>();
-        services.TryAddSingleton<RootComponentTypeCache>();
+        services.TryAddSingleton<RootTypeCache>();
         services.TryAddSingleton<ComponentParameterDeserializer>();
         services.TryAddSingleton<ComponentParametersTypeCache>();
         services.TryAddSingleton<CircuitIdFactory>();
+        services.TryAddSingleton<ServerComponentSerializer>();
         services.TryAddScoped<IServerComponentDeserializer, ServerComponentDeserializer>();
         services.TryAddScoped<IErrorBoundaryLogger, RemoteErrorBoundaryLogger>();
         services.TryAddScoped<AntiforgeryStateProvider, DefaultAntiforgeryStateProvider>();
 
         services.TryAddScoped(s => s.GetRequiredService<ICircuitAccessor>().Circuit);
         services.TryAddScoped<ICircuitAccessor, DefaultCircuitAccessor>();
-
+        services.TryAddSingleton<ISystemClock, SystemClock>();
         services.TryAddSingleton<CircuitRegistry>();
+        services.TryAddSingleton<CircuitPersistenceManager>();
+
+        // Register the circuit persistence provider conditionally based on HybridCache availability
+        services.TryAddSingleton<ICircuitPersistenceProvider>(serviceProvider =>
+        {
+            var circuitOptions = serviceProvider.GetRequiredService<IOptions<CircuitOptions>>();
+            if (circuitOptions.Value.HybridPersistenceCache is not null)
+            {
+                var logger = serviceProvider.GetRequiredService<ILogger<ICircuitPersistenceProvider>>();
+                return new HybridCacheCircuitPersistenceProvider(circuitOptions.Value.HybridPersistenceCache, logger, circuitOptions);
+            }
+            else
+            {
+                var logger = serviceProvider.GetRequiredService<ILogger<ICircuitPersistenceProvider>>();
+                var clock = serviceProvider.GetRequiredService<ISystemClock>();
+                return new DefaultInMemoryCircuitPersistenceProvider(clock, logger, circuitOptions);
+            }
+        });
+
+        // Register the configurator for HybridCache
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<CircuitOptions>, DefaultHybridCache>());
 
         // Standard blazor hosting services implementations
         //
@@ -87,6 +114,8 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<CircuitOptions>, CircuitOptionsJSInteropDetailedErrorsConfiguration>());
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<CircuitOptions>, CircuitOptionsJavaScriptInitializersConfiguration>());
 
+        services.TryAddScoped<CircuitActivitySource>();
+
         if (configure != null)
         {
             services.Configure(configure);
diff --git a/src/Components/Server/src/Directory.Build.targets b/src/Components/Server/src/Directory.Build.targets
index 09953b9b6c9d..35886951b6aa 100644
--- a/src/Components/Server/src/Directory.Build.targets
+++ b/src/Components/Server/src/Directory.Build.targets
@@ -1,6 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-  <!-- Workaround target import for project references to Microsoft.Extensions.FileProviders.Embedded -->
-  <Import
-    Project="$(RepoRoot)src\FileProviders\Embedded\src\build\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.targets" />
 </Project>
diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
index 00079c99d6be..216f05e54134 100644
--- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
+++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
@@ -9,7 +9,6 @@
     <NoWarn>$(NoWarn);CS0436</NoWarn>
     <DefineConstants>$(DefineConstants);ENABLE_UNSAFE_MSGPACK;SPAN_BUILTIN;MESSAGEPACK_INTERNAL;COMPONENTS_SERVER</DefineConstants>
     <IsPackable>false</IsPackable>
-    <EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
     <Nullable>annotations</Nullable>
   </PropertyGroup>
 
@@ -21,15 +20,15 @@
     <Reference Include="Microsoft.AspNetCore.SignalR" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.Extensions.Caching.Memory" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <!-- Required for S.T.J source generation -->
-    <Reference Include="System.Text.Json" PrivateAssets="All" />
+    <Reference Include="System.Text.Json" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
 
     <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
     <Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
-    <Compile Include="$(SharedSourceRoot)\PooledArrayBufferWriter.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)PooledArrayBufferWriter.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Components\ComponentsActivityLinkStore.cs" LinkBase="Shared" />
 
     <!-- Add a project dependency without reference output assemblies to enforce build order -->
     <!-- Applying workaround for https://github.com/microsoft/msbuild/issues/2661 and https://github.com/dotnet/sdk/issues/952 -->
@@ -39,14 +38,8 @@
     <MessagePackRoot>$(RepoRoot)src\submodules\MessagePack-CSharp\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\</MessagePackRoot>
   </PropertyGroup>
 
-  <!-- This workaround is required when referencing FileProviders.Embedded as a project -->
-  <PropertyGroup>
-    <_FileProviderTaskAssembly>$(ArtifactsDir)bin\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task\$(Configuration)\netstandard2.0\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.dll</_FileProviderTaskAssembly>
-  </PropertyGroup>
-
-  <UsingTask AssemblyFile="$(_FileProviderTaskAssembly)" TaskName="Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.GenerateEmbeddedResourcesManifest" />
-
   <ItemGroup>
+    <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="Circuits" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RenderBatchWriter.cs" LinkBase="Circuits" />
@@ -58,9 +51,11 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperation.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperationBatch.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperationType.cs" />
-    <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentTypeCache.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\RootTypeCache.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\DefaultAntiforgeryStateProvider.cs" LinkBase="Forms" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\WebRendererId.cs" />
+    <Compile Include="$(SharedSourceRoot)Components\ServerComponentSerializer.cs" LinkBase="DependencyInjection" />
+    <Compile Include="$(SharedSourceRoot)Components\ServerComponentInvocationSequence.cs" LinkBase="DependencyInjection" />
 
     <Compile Include="..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
     <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
@@ -98,28 +93,6 @@
     <Compile Include="$(RepoRoot)src\Shared\Components\ProtectedPrerenderComponentApplicationStore.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <BlazorServerJSFilename>blazor.server.js</BlazorServerJSFilename>
-    <!-- Microsoft.AspNetCore.Components.Web.JS.npmproj always capitalizes the directory name. -->
-    <BlazorServerJSFile Condition=" '$(Configuration)' == 'Debug' ">..\..\Web.JS\dist\Debug\$(BlazorServerJSFilename)</BlazorServerJSFile>
-    <BlazorServerJSFile Condition=" '$(Configuration)' != 'Debug' ">..\..\Web.JS\dist\Release\$(BlazorServerJSFilename)</BlazorServerJSFile>
-  </PropertyGroup>
-
-  <!-- blazor.server.js should exist after eng/Npm.Workspace.nodeproj builds. Fall back if not. -->
-  <Target Name="_CheckBlazorServerJSPath" AfterTargets="ResolveProjectReferences" Condition=" !EXISTS('$(BlazorServerJSFile)') ">
-    <Warning Text="'$(BlazorServerJSFile)' does not exist. Falling back to checked-in copy." />
-    <PropertyGroup>
-      <BlazorServerJSFile>..\..\Web.JS\dist\Release\$(BlazorServerJSFilename)</BlazorServerJSFile>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_AddEmbeddedBlazor" AfterTargets="_CheckBlazorServerJSPath">
-    <ItemGroup>
-      <EmbeddedResource Include="$(BlazorServerJSFile)" LogicalName="_framework/$(BlazorServerJSFilename)" />
-      <EmbeddedResource Include="$(BlazorServerJSFile).map" LogicalName="_framework/$(BlazorServerJSFilename).map" Condition="Exists('$(BlazorServerJSFile).map')" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Blazor.DevServer" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.Server.Tests" />
diff --git a/src/Components/Server/src/PublicAPI.Shipped.txt b/src/Components/Server/src/PublicAPI.Shipped.txt
index 73d9c9f6fa7a..32aa747a67f0 100644
--- a/src/Components/Server/src/PublicAPI.Shipped.txt
+++ b/src/Components/Server/src/PublicAPI.Shipped.txt
@@ -46,20 +46,29 @@ Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage.ProtectedSessionS
 Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage.ProtectedSessionStorage.ProtectedSessionStorage(Microsoft.JSInterop.IJSRuntime! jsRuntime, Microsoft.AspNetCore.DataProtection.IDataProtectionProvider! dataProtectionProvider) -> void
 Microsoft.AspNetCore.Components.Server.RevalidatingServerAuthenticationStateProvider
 Microsoft.AspNetCore.Components.Server.RevalidatingServerAuthenticationStateProvider.RevalidatingServerAuthenticationStateProvider(Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.ServerAuthenticationStateProvider() -> void
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void
+Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
+Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.ServerAuthenticationStateProvider() -> void (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
+Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ConfigureWebSocketAcceptContext.get -> System.Func<Microsoft.AspNetCore.Http.HttpContext!, Microsoft.AspNetCore.Http.WebSocketAcceptContext!, System.Threading.Tasks.Task!>?
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ConfigureWebSocketAcceptContext.set -> void
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ContentSecurityFrameAncestorsPolicy.get -> string?
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ContentSecurityFrameAncestorsPolicy.set -> void
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.DisableWebSocketCompression.get -> bool
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.DisableWebSocketCompression.set -> void
+Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ServerComponentsEndpointOptions() -> void
 Microsoft.Extensions.DependencyInjection.ComponentServiceCollectionExtensions
 Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder
 Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder.Services.get -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 Microsoft.Extensions.DependencyInjection.ServerRazorComponentsBuilderExtensions
 Microsoft.Extensions.DependencyInjection.ServerSideBlazorBuilderExtensions
-override Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>!
+override Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
 static Microsoft.AspNetCore.Builder.ComponentEndpointRouteBuilderExtensions.MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints) -> Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.ComponentEndpointRouteBuilderExtensions.MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! path) -> Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.ComponentEndpointRouteBuilderExtensions.MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! path, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions!>! configureOptions) -> Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.ComponentEndpointRouteBuilderExtensions.MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions!>! configureOptions) -> Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.ServerRazorComponentsEndpointConventionBuilderExtensions.AddInteractiveServerRenderMode(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
+static Microsoft.AspNetCore.Builder.ServerRazorComponentsEndpointConventionBuilderExtensions.AddInteractiveServerRenderMode(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, System.Action<Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions!>! configure) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
 static Microsoft.Extensions.DependencyInjection.ComponentServiceCollectionExtensions.AddServerSideBlazor(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder!
 static Microsoft.Extensions.DependencyInjection.ServerRazorComponentsBuilderExtensions.AddInteractiveServerComponents(this Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder! builder, System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder!
 static Microsoft.Extensions.DependencyInjection.ServerSideBlazorBuilderExtensions.AddCircuitOptions(this Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder! builder, System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions!>! configure) -> Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder!
diff --git a/src/Components/Server/src/PublicAPI.Unshipped.txt b/src/Components/Server/src/PublicAPI.Unshipped.txt
index f16893dc154c..210a9b4fdd3c 100644
--- a/src/Components/Server/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Server/src/PublicAPI.Unshipped.txt
@@ -1,18 +1,9 @@
 #nullable enable
-*REMOVED*Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider
-*REMOVED*Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.ServerAuthenticationStateProvider() -> void
-*REMOVED*Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void
-*REMOVED*override Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>!
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.ServerAuthenticationStateProvider() -> void (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
-Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.SetAuthenticationState(System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! authenticationStateTask) -> void (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ConfigureWebSocketAcceptContext.get -> System.Func<Microsoft.AspNetCore.Http.HttpContext!, Microsoft.AspNetCore.Http.WebSocketAcceptContext!, System.Threading.Tasks.Task!>?
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ConfigureWebSocketAcceptContext.set -> void
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ContentSecurityFrameAncestorsPolicy.get -> string?
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ContentSecurityFrameAncestorsPolicy.set -> void
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.DisableWebSocketCompression.get -> bool
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.DisableWebSocketCompression.set -> void
-Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions.ServerComponentsEndpointOptions() -> void
-override Microsoft.AspNetCore.Components.Server.ServerAuthenticationStateProvider.GetAuthenticationStateAsync() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>! (forwarded, contained in Microsoft.AspNetCore.Components.Endpoints)
-static Microsoft.AspNetCore.Builder.ServerRazorComponentsEndpointConventionBuilderExtensions.AddInteractiveServerRenderMode(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, System.Action<Microsoft.AspNetCore.Components.Server.ServerComponentsEndpointOptions!>! configure) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
+Microsoft.AspNetCore.Components.Server.CircuitOptions.HybridPersistenceCache.get -> Microsoft.Extensions.Caching.Hybrid.HybridCache?
+Microsoft.AspNetCore.Components.Server.CircuitOptions.HybridPersistenceCache.set -> void
+Microsoft.AspNetCore.Components.Server.CircuitOptions.PersistedCircuitDistributedRetentionPeriod.get -> System.TimeSpan?
+Microsoft.AspNetCore.Components.Server.CircuitOptions.PersistedCircuitDistributedRetentionPeriod.set -> void
+Microsoft.AspNetCore.Components.Server.CircuitOptions.PersistedCircuitInMemoryMaxRetained.get -> int
+Microsoft.AspNetCore.Components.Server.CircuitOptions.PersistedCircuitInMemoryMaxRetained.set -> void
+Microsoft.AspNetCore.Components.Server.CircuitOptions.PersistedCircuitInMemoryRetentionPeriod.get -> System.TimeSpan
+Microsoft.AspNetCore.Components.Server.CircuitOptions.PersistedCircuitInMemoryRetentionPeriod.set -> void
diff --git a/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs b/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs
index ecf4c858745b..d0a1e418ba40 100644
--- a/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs
+++ b/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs
@@ -3,9 +3,11 @@
 
 using System.Net.Http;
 using Microsoft.AspNetCore.Components.Server.Circuits;
+using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using Moq;
 
 namespace Microsoft.AspNetCore.Components.Server;
 
@@ -23,7 +25,8 @@ public async Task DisconnectMiddleware_OnlyAccepts_PostRequests(string httpMetho
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         var middleware = new CircuitDisconnectMiddleware(
             NullLogger<CircuitDisconnectMiddleware>.Instance,
@@ -51,7 +54,8 @@ public async Task Returns400BadRequest_ForInvalidContentTypes(string contentType
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         var middleware = new CircuitDisconnectMiddleware(
             NullLogger<CircuitDisconnectMiddleware>.Instance,
@@ -78,7 +82,8 @@ public async Task Returns400BadRequest_IfNoCircuitIdOnForm()
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         var middleware = new CircuitDisconnectMiddleware(
             NullLogger<CircuitDisconnectMiddleware>.Instance,
@@ -105,7 +110,8 @@ public async Task Returns400BadRequest_InvalidCircuitId()
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         var middleware = new CircuitDisconnectMiddleware(
             NullLogger<CircuitDisconnectMiddleware>.Instance,
@@ -138,7 +144,8 @@ public async Task Returns200OK_NonExistingCircuit()
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         var middleware = new CircuitDisconnectMiddleware(
             NullLogger<CircuitDisconnectMiddleware>.Instance,
@@ -173,7 +180,8 @@ public async Task GracefullyTerminates_ConnectedCircuit()
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         registry.Register(testCircuitHost);
 
@@ -210,7 +218,8 @@ public async Task GracefullyTerminates_DisconnectedCircuit()
         var registry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
+            circuitIdFactory,
+            CreatePersistenceManager());
 
         registry.Register(circuitHost);
         await registry.DisconnectAsync(circuitHost, "1234");
@@ -236,4 +245,14 @@ public async Task GracefullyTerminates_DisconnectedCircuit()
         // Assert
         Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
     }
+
+    private static CircuitPersistenceManager CreatePersistenceManager()
+    {
+        var circuitPersistenceManager = new CircuitPersistenceManager(
+            Options.Create(new CircuitOptions()),
+            new Endpoints.ServerComponentSerializer(new EphemeralDataProtectionProvider()),
+            Mock.Of<ICircuitPersistenceProvider>(),
+            new EphemeralDataProtectionProvider());
+        return circuitPersistenceManager;
+    }
 }
diff --git a/src/Components/Server/test/Circuits/CircuitActivitySourceTest.cs b/src/Components/Server/test/Circuits/CircuitActivitySourceTest.cs
new file mode 100644
index 000000000000..6901387c9b81
--- /dev/null
+++ b/src/Components/Server/test/Circuits/CircuitActivitySourceTest.cs
@@ -0,0 +1,103 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.InternalTesting;
+using Moq;
+using Microsoft.AspNetCore.Components.Infrastructure.Server;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+public class CircuitActivitySourceTest
+{
+    private readonly ActivityListener _listener;
+    private readonly List<Activity> _activities;
+
+    public CircuitActivitySourceTest()
+    {
+        _activities = new List<Activity>();
+        _listener = new ActivityListener
+        {
+            ShouldListenTo = source => source.Name == CircuitActivitySource.Name,
+            Sample = (ref ActivityCreationOptions<ActivityContext> options) => ActivitySamplingResult.AllData,
+            ActivityStarted = activity => _activities.Add(activity),
+            ActivityStopped = activity => { }
+        };
+        ActivitySource.AddActivityListener(_listener);
+    }
+
+    [Fact]
+    public void StartCircuitActivity_CreatesAndStartsActivity()
+    {
+        // Arrange
+        var circuitActivitySource = new CircuitActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        circuitActivitySource.Init(linkstore);
+        var circuitId = "test-circuit-id";
+        var httpContext = new ActivityContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded);
+
+        // Act
+        var activityHandle = circuitActivitySource.StartCircuitActivity(circuitId, httpContext);
+        var activity = activityHandle.Activity;
+
+        // Assert
+        Assert.NotNull(activity);
+        Assert.Equal(CircuitActivitySource.OnCircuitName, activity.OperationName);
+        Assert.Equal($"Circuit {circuitId}", activity.DisplayName);
+        Assert.Equal(ActivityKind.Internal, activity.Kind);
+        Assert.True(activity.IsAllDataRequested);
+        Assert.Equal(circuitId, activity.GetTagItem("aspnetcore.components.circuit.id"));
+        Assert.Contains(activity.Links, link => link.Context == httpContext);
+        Assert.False(activity.IsStopped);
+
+        circuitActivitySource.StopCircuitActivity(activityHandle, null);
+        Assert.True(activity.IsStopped);
+    }
+
+    [Fact]
+    public void FailCircuitActivity_SetsErrorStatusAndStopsActivity()
+    {
+        // Arrange
+        var circuitActivitySource = new CircuitActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        circuitActivitySource.Init(linkstore);
+        var circuitId = "test-circuit-id";
+        var httpContext = default(ActivityContext);
+        var activityHandle = circuitActivitySource.StartCircuitActivity(circuitId, httpContext);
+        var activity = activityHandle.Activity;
+        var exception = new InvalidOperationException("Test exception");
+
+        // Act
+        circuitActivitySource.StopCircuitActivity(activityHandle, exception);
+
+        // Assert
+        Assert.True(activity!.IsStopped);
+        Assert.Equal(ActivityStatusCode.Error, activity.Status);
+        Assert.Equal(exception.GetType().FullName, activity.GetTagItem("error.type"));
+    }
+
+    [Fact]
+    public void StartCircuitActivity_HandlesNullValues()
+    {
+        // Arrange
+        var circuitActivitySource = new CircuitActivitySource();
+        var linkstore = new ComponentsActivityLinkStore(null);
+        circuitActivitySource.Init(linkstore);
+
+        // Act
+        var activityHandle = circuitActivitySource.StartCircuitActivity(null, default);
+        var activity = activityHandle.Activity;
+
+        // Assert
+        Assert.NotNull(activity);
+        Assert.Equal("Circuit ", activity.DisplayName);
+    }
+
+}
diff --git a/src/Components/Server/test/Circuits/CircuitClientProxyTest.cs b/src/Components/Server/test/Circuits/CircuitClientProxyTest.cs
index fc8e211b4f11..1cc20f18d195 100644
--- a/src/Components/Server/test/Circuits/CircuitClientProxyTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitClientProxyTest.cs
@@ -13,7 +13,7 @@ public async Task SendCoreAsync_WithoutTransfer()
     {
         // Arrange
         bool? isCancelled = null;
-        var clientProxy = new Mock<IClientProxy>();
+        var clientProxy = new Mock<ISingleClientProxy>();
         clientProxy.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string _, object[] __, CancellationToken token) =>
             {
@@ -34,13 +34,13 @@ public async Task SendCoreAsync_WithoutTransfer()
     public void Transfer_SetsConnected()
     {
         // Arrange
-        var clientProxy = Mock.Of<IClientProxy>(
+        var clientProxy = Mock.Of<ISingleClientProxy>(
             c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()) == Task.CompletedTask);
         var circuitClient = new CircuitClientProxy(clientProxy, "connection0");
         circuitClient.SetDisconnected();
 
         // Act
-        circuitClient.Transfer(Mock.Of<IClientProxy>(), "connection1");
+        circuitClient.Transfer(Mock.Of<ISingleClientProxy>(), "connection1");
 
         // Assert
         Assert.True(circuitClient.Connected);
diff --git a/src/Components/Server/test/Circuits/CircuitHostTest.cs b/src/Components/Server/test/Circuits/CircuitHostTest.cs
index b1d2e5fe0a4d..670ba4427247 100644
--- a/src/Components/Server/test/Circuits/CircuitHostTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitHostTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Reflection;
 using System.Text.Json;
@@ -193,7 +194,7 @@ public async Task InitializeAsync_InvokesHandlers()
         var circuitHost = TestCircuitHost.Create(handlers: new[] { handler1.Object, handler2.Object });
 
         // Act
-        await circuitHost.InitializeAsync(new ProtectedPrerenderComponentApplicationStore(Mock.Of<IDataProtectionProvider>()), cancellationToken);
+        await circuitHost.InitializeAsync(new ProtectedPrerenderComponentApplicationStore(Mock.Of<IDataProtectionProvider>()), default, cancellationToken);
 
         // Assert
         handler1.VerifyAll();
@@ -236,7 +237,7 @@ public async Task InitializeAsync_RendersRootComponentsInParallel()
         // Act
         object initializeException = null;
         circuitHost.UnhandledException += (sender, eventArgs) => initializeException = eventArgs.ExceptionObject;
-        var initializeTask = circuitHost.InitializeAsync(new ProtectedPrerenderComponentApplicationStore(Mock.Of<IDataProtectionProvider>()), cancellationToken);
+        var initializeTask = circuitHost.InitializeAsync(new ProtectedPrerenderComponentApplicationStore(Mock.Of<IDataProtectionProvider>()), default, cancellationToken);
         await initializeTask.WaitAsync(initializeTimeout);
 
         // Assert: This was not reached only because an exception was thrown in InitializeAsync()
@@ -258,7 +259,7 @@ public async Task InitializeAsync_ReportsOwnAsyncExceptions()
             .Returns(tcs.Task)
             .Verifiable();
 
-        var circuitHost = TestCircuitHost.Create(handlers: new[] { handler.Object }, descriptors: [new ComponentDescriptor() ]);
+        var circuitHost = TestCircuitHost.Create(handlers: new[] { handler.Object }, descriptors: [new ComponentDescriptor()]);
         circuitHost.UnhandledException += (sender, errorInfo) =>
         {
             Assert.Same(circuitHost, sender);
@@ -266,7 +267,7 @@ public async Task InitializeAsync_ReportsOwnAsyncExceptions()
         };
 
         // Act
-        var initializeAsyncTask = circuitHost.InitializeAsync(new ProtectedPrerenderComponentApplicationStore(Mock.Of<IDataProtectionProvider>()), new CancellationToken());
+        var initializeAsyncTask = circuitHost.InitializeAsync(new ProtectedPrerenderComponentApplicationStore(Mock.Of<IDataProtectionProvider>()), default, new CancellationToken());
 
         // Assert: No synchronous exceptions
         handler.VerifyAll();
@@ -411,6 +412,114 @@ await circuitHost.HandleInboundActivityAsync(() =>
         Assert.True(wasHandlerFuncInvoked);
     }
 
+    [Fact]
+    public async Task SendPersistedStateToClient_WithSuccessfulInvocation_ReturnsTrue()
+    {
+        // Arrange
+        var mockClientProxy = new Mock<ISingleClientProxy>();
+        mockClientProxy
+            .Setup(c => c.InvokeCoreAsync<bool>(
+                "JS.SavePersistedState",
+                It.IsAny<object[]>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(true);
+
+        var client = new CircuitClientProxy(mockClientProxy.Object, "connection-id");
+        var circuitHost = TestCircuitHost.Create(clientProxy: client);
+
+        var rootComponents = "mock-root-components";
+        var applicationState = "mock-application-state";
+        var cancellationToken = new CancellationToken();
+
+        // Act
+        var result = await circuitHost.SendPersistedStateToClient(rootComponents, applicationState, cancellationToken);
+
+        // Assert
+        Assert.True(result);
+        mockClientProxy.Verify(
+            c => c.InvokeCoreAsync<bool>(
+                "JS.SavePersistedState",
+                It.Is<object[]>(args => args[0].Equals(circuitHost.CircuitId.Secret) &&
+                                        args[1].Equals(rootComponents) &&
+                                        args[2].Equals(applicationState)),
+                cancellationToken),
+            Times.Once);
+    }
+
+    [Fact]
+    public async Task SendPersistedStateToClient_WithFailedInvocation_ReturnsFalse()
+    {
+        // Arrange
+        var mockClientProxy = new Mock<ISingleClientProxy>();
+        mockClientProxy
+            .Setup(c => c.InvokeCoreAsync<bool>(
+                "JS.SavePersistedState",
+                It.IsAny<object[]>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(false);
+
+        var client = new CircuitClientProxy(mockClientProxy.Object, "connection-id");
+        var circuitHost = TestCircuitHost.Create(clientProxy: client);
+
+        var rootComponents = "mock-root-components";
+        var applicationState = "mock-application-state";
+        var cancellationToken = new CancellationToken();
+
+        // Act
+        var result = await circuitHost.SendPersistedStateToClient(rootComponents, applicationState, cancellationToken);
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public async Task SendPersistedStateToClient_WithException_LogsAndReturnsFalse()
+    {
+        // Arrange
+        var expectedException = new InvalidOperationException("Test exception");
+        var mockClientProxy = new Mock<ISingleClientProxy>();
+        mockClientProxy
+            .Setup(c => c.InvokeCoreAsync<bool>(
+                "JS.SavePersistedState",
+                It.IsAny<object[]>(),
+                It.IsAny<CancellationToken>()))
+            .ThrowsAsync(expectedException);
+
+        var client = new CircuitClientProxy(mockClientProxy.Object, "connection-id");
+        var circuitHost = TestCircuitHost.Create(clientProxy: client);
+
+        var rootComponents = "mock-root-components";
+        var applicationState = "mock-application-state";
+        var cancellationToken = new CancellationToken();
+
+        // Act
+        var result = await circuitHost.SendPersistedStateToClient(rootComponents, applicationState, cancellationToken);
+
+        // Assert
+        Assert.False(result);
+        mockClientProxy.Verify(
+            c => c.InvokeCoreAsync<bool>(
+                "JS.SavePersistedState",
+                It.IsAny<object[]>(),
+                It.IsAny<CancellationToken>()),
+            Times.Once);
+    }
+
+    [Fact]
+    public async Task SendPersistedStateToClient_WithDisconnectedClient_ReturnsFalse()
+    {
+        // Arrange
+        var client = new CircuitClientProxy(); // Creates a disconnected client
+        var circuitHost = TestCircuitHost.Create(clientProxy: client);
+
+        var rootComponents = "mock-root-components";
+        var applicationState = "mock-application-state";
+        var cancellationToken = new CancellationToken();
+
+        // Act & Assert
+        Assert.False(await circuitHost.SendPersistedStateToClient(rootComponents, applicationState, cancellationToken));
+    }
+
     [Fact]
     public async Task UpdateRootComponents_CanAddNewRootComponent()
     {
@@ -584,6 +693,95 @@ public async Task UpdateRootComponents_CanRemoveExistingRootComponent()
             ((TestRemoteRenderer)circuitHost.Renderer).GetTestComponentState(0));
     }
 
+    [Fact]
+    public async Task UpdateRootComponents_ValidatesOperationSequencingDuringValueUpdateRestore()
+    {
+        // Arrange
+        var testRenderer = GetRemoteRenderer();
+        var circuitHost = TestCircuitHost.Create(
+            remoteRenderer: testRenderer);
+
+        // Set up initial components for subsequent operations
+        await AddComponentAsync<DynamicallyAddedComponent>(circuitHost, 0, new Dictionary<string, object>
+        {
+            [nameof(DynamicallyAddedComponent.Message)] = "Component 0"
+        });
+        await AddComponentAsync<DynamicallyAddedComponent>(circuitHost, 1, new Dictionary<string, object>
+        {
+            [nameof(DynamicallyAddedComponent.Message)] = "Component 1"
+        });
+
+        Assert.Equal(2, testRenderer.GetOrCreateWebRootComponentManager().GetRootComponents().Count());
+        var store = new TestComponentApplicationStore(
+            new Dictionary<string, byte[]> { ["test"] = [1, 2, 3] });
+
+        var operations = new RootComponentOperation[]
+        {
+            new()
+            {
+                Type = RootComponentOperationType.Add,
+                SsrComponentId = 2,
+                Marker = CreateMarker(typeof(DynamicallyAddedComponent), "2", new Dictionary<string, object>
+                {
+                    [nameof(DynamicallyAddedComponent.Message)] = "New Component 2"
+                }),
+                Descriptor = new(
+                    componentType: typeof(DynamicallyAddedComponent),
+                    parameters: CreateWebRootComponentParameters(new Dictionary<string, object>
+                    {
+                        [nameof(DynamicallyAddedComponent.Message)] = "New Component 2"
+                    })),
+            },
+
+            new()
+            {
+                Type = RootComponentOperationType.Remove,
+                SsrComponentId = 0,
+            },
+
+            new()
+            {
+                Type = RootComponentOperationType.Update,
+                SsrComponentId = 1,
+                Marker = CreateMarker(typeof(DynamicallyAddedComponent), "1", new Dictionary<string, object>
+                {
+                    [nameof(DynamicallyAddedComponent.Message)] = "Replaced Component 1"
+                }),
+                Descriptor = new(
+                    componentType: typeof(DynamicallyAddedComponent),
+                    parameters: CreateWebRootComponentParameters(new Dictionary<string, object>
+                    {
+                        [nameof(DynamicallyAddedComponent.Message)] = "Replaced Component 1"
+                    })),
+            },
+        };
+
+        var batch = new RootComponentOperationBatch
+        {
+            BatchId = 1,
+            Operations = operations
+        };
+
+        var updateTask = circuitHost.UpdateRootComponents(batch, store, false, CancellationToken.None);
+        Assert.Equal(2, testRenderer.GetOrCreateWebRootComponentManager().GetRootComponents().Count());
+        var dynamicallyAddedComponent1 = Assert.IsType<DynamicallyAddedComponent>(testRenderer.GetTestComponentState(3).Component);
+        dynamicallyAddedComponent1.Updated = new ManualResetEvent(false);
+        Assert.Equal("Default message", dynamicallyAddedComponent1.Message);
+        var dynamicallyAddedComponent2 = Assert.IsType<DynamicallyAddedComponent>(testRenderer.GetTestComponentState(2).Component);
+        dynamicallyAddedComponent2.Updated = new ManualResetEvent(false);
+        Assert.Equal("Default message", dynamicallyAddedComponent2.Message);
+        store.Continue();
+        await updateTask;
+
+        dynamicallyAddedComponent1.Updated.WaitOne();
+        dynamicallyAddedComponent2.Updated.WaitOne();
+
+        Assert.Equal("Replaced Component 1", Assert.IsType<DynamicallyAddedComponent>(testRenderer.GetTestComponentState(3).Component).Message);
+        Assert.Equal("New Component 2", Assert.IsType<DynamicallyAddedComponent>(testRenderer.GetTestComponentState(2).Component).Message);
+
+        Assert.Equal(2, testRenderer.GetOrCreateWebRootComponentManager().GetRootComponents().Count());
+    }
+
     private async Task AddComponentAsync<TComponent>(CircuitHost circuitHost, int ssrComponentId, Dictionary<string, object> parameters = null, string componentKey = "")
         where TComponent : IComponent
     {
@@ -598,7 +796,7 @@ private async Task AddComponentAsync<TComponent>(CircuitHost circuitHost, int ss
         };
 
         // Add component
-        await circuitHost.UpdateRootComponents(new() { Operations = [addOperation] }, null, CancellationToken.None);
+        await circuitHost.UpdateRootComponents(new() { Operations = [addOperation] }, null, false, CancellationToken.None);
     }
 
     private async Task UpdateComponentAsync<TComponent>(CircuitHost circuitHost, int ssrComponentId, Dictionary<string, object> parameters = null, string componentKey = "")
@@ -614,7 +812,7 @@ private async Task UpdateComponentAsync<TComponent>(CircuitHost circuitHost, int
         };
 
         // Update component
-        await circuitHost.UpdateRootComponents(new() { Operations = [updateOperation] }, null, CancellationToken.None);
+        await circuitHost.UpdateRootComponents(new() { Operations = [updateOperation] }, null, false, CancellationToken.None);
     }
 
     private async Task RemoveComponentAsync(CircuitHost circuitHost, int ssrComponentId)
@@ -626,7 +824,7 @@ private async Task RemoveComponentAsync(CircuitHost circuitHost, int ssrComponen
         };
 
         // Remove component
-        await circuitHost.UpdateRootComponents(new() { Operations = [removeOperation] }, null, CancellationToken.None);
+        await circuitHost.UpdateRootComponents(new() { Operations = [removeOperation] }, null, false, CancellationToken.None);
     }
 
     private ProtectedPrerenderComponentApplicationStore CreateStore()
@@ -636,7 +834,7 @@ private ProtectedPrerenderComponentApplicationStore CreateStore()
 
     private ServerComponentDeserializer CreateDeserializer()
     {
-        return new ServerComponentDeserializer(_ephemeralDataProtectionProvider, NullLogger<ServerComponentDeserializer>.Instance, new RootComponentTypeCache(), new ComponentParameterDeserializer(NullLogger<ComponentParameterDeserializer>.Instance, new ComponentParametersTypeCache()));
+        return new ServerComponentDeserializer(_ephemeralDataProtectionProvider, NullLogger<ServerComponentDeserializer>.Instance, new RootTypeCache(), new ComponentParameterDeserializer(NullLogger<ComponentParameterDeserializer>.Instance, new ComponentParametersTypeCache()));
     }
 
     private static TestRemoteRenderer GetRemoteRenderer()
@@ -645,7 +843,7 @@ private static TestRemoteRenderer GetRemoteRenderer()
         serviceCollection.AddSingleton(new Mock<IJSRuntime>().Object);
         return new TestRemoteRenderer(
             serviceCollection.BuildServiceProvider(),
-            Mock.Of<IClientProxy>());
+            Mock.Of<ISingleClientProxy>());
     }
 
     private static void SetupMockInboundActivityHandlers(MockSequence sequence, params Mock<CircuitHandler>[] circuitHandlers)
@@ -704,7 +902,7 @@ private static WebRootComponentParameters CreateWebRootComponentParameters(IDict
 
     private class TestRemoteRenderer : RemoteRenderer
     {
-        public TestRemoteRenderer(IServiceProvider serviceProvider, IClientProxy client)
+        public TestRemoteRenderer(IServiceProvider serviceProvider, ISingleClientProxy client)
             : base(
                   serviceProvider,
                   NullLoggerFactory.Instance,
@@ -714,7 +912,7 @@ public TestRemoteRenderer(IServiceProvider serviceProvider, IClientProxy client)
                   NullLogger.Instance,
                   CreateJSRuntime(new CircuitOptions()),
                   new CircuitJSComponentInterop(new CircuitOptions()))
-        {
+        {            
         }
 
         public ComponentState GetTestComponentState(int id)
@@ -851,11 +1049,17 @@ public bool TryDeserializeComponentDescriptorCollection(string serializedCompone
             return true;
         }
 
-        public bool TryDeserializeRootComponentOperations(string serializedComponentOperations, out RootComponentOperationBatch operationBatch)
+        public bool TryDeserializeRootComponentOperations(string serializedComponentOperations, out RootComponentOperationBatch operationBatch, bool deserializeDescriptors = true)
         {
             operationBatch = default;
             return true;
         }
+
+        public bool TryDeserializeWebRootComponentDescriptor(ComponentMarker record, [NotNullWhen(true)] out WebRootComponentDescriptor result)
+        {
+            result = default;
+            return true;
+        }
     }
 
     private class DynamicallyAddedComponent : IComponent, IDisposable
@@ -866,6 +1070,8 @@ private class DynamicallyAddedComponent : IComponent, IDisposable
         [Parameter]
         public string Message { get; set; } = "Default message";
 
+        public ManualResetEvent Updated { get; set; }
+
         private void Render(RenderTreeBuilder builder)
         {
             builder.AddContent(0, Message);
@@ -884,6 +1090,7 @@ public Task SetParametersAsync(ParameterView parameters)
             }
 
             TriggerRender();
+            Updated?.Set();
             return Task.CompletedTask;
         }
 
@@ -936,4 +1143,20 @@ public void TriggerRender()
             Assert.True(task.IsCompletedSuccessfully);
         }
     }
+
+    private class TestComponentApplicationStore(Dictionary<string, byte[]> dictionary) : IPersistentComponentStateStore, IClearableStore
+    {
+        private readonly TaskCompletionSource _tcs = new();
+
+        public void Clear() => dictionary.Clear();
+
+        public async Task<IDictionary<string, byte[]>> GetPersistedStateAsync()
+        {
+            await _tcs.Task;
+            return dictionary;
+        }
+
+        public Task PersistStateAsync(IReadOnlyDictionary<string, byte[]> state) => throw new NotImplementedException();
+        internal void Continue() => _tcs.SetResult();
+    }
 }
diff --git a/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs b/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs
index fd8c950dc6fd..4c89b7ec182a 100644
--- a/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits;
 
-public class circuitIdFactoryTest
+public class CircuitIdFactoryTest
 {
     [Fact]
     public void CreateCircuitId_Generates_NewRandomId()
diff --git a/src/Components/Server/test/Circuits/CircuitMetricsTest.cs b/src/Components/Server/test/Circuits/CircuitMetricsTest.cs
new file mode 100644
index 000000000000..b1e3ae3c44a2
--- /dev/null
+++ b/src/Components/Server/test/Circuits/CircuitMetricsTest.cs
@@ -0,0 +1,190 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.InternalTesting;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits;
+
+public class CircuitMetricsTest
+{
+    private readonly TestMeterFactory _meterFactory;
+
+    public CircuitMetricsTest()
+    {
+        _meterFactory = new TestMeterFactory();
+    }
+
+    [Fact]
+    public void Constructor_CreatesMetersCorrectly()
+    {
+        // Arrange & Act
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+
+        // Assert
+        Assert.Single(_meterFactory.Meters);
+        Assert.Equal(CircuitMetrics.MeterName, _meterFactory.Meters[0].Name);
+    }
+
+    [Fact]
+    public void OnCircuitOpened_IncreasesCounters()
+    {
+        // Arrange
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+        using var activeCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.active");
+
+        // Act
+        circuitMetrics.OnCircuitOpened();
+
+        // Assert
+        var activeMeasurements = activeCircuitCounter.GetMeasurementSnapshot();
+
+        Assert.Single(activeMeasurements);
+        Assert.Equal(1, activeMeasurements[0].Value);
+    }
+
+    [Fact]
+    public void OnConnectionUp_IncreasesConnectedCounter()
+    {
+        // Arrange
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+        using var connectedCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.connected");
+
+        // Act
+        circuitMetrics.OnConnectionUp();
+
+        // Assert
+        var measurements = connectedCircuitCounter.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.Equal(1, measurements[0].Value);
+    }
+
+    [Fact]
+    public void OnConnectionDown_DecreasesConnectedCounter()
+    {
+        // Arrange
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+        using var connectedCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.connected");
+
+        // Act
+        circuitMetrics.OnConnectionDown();
+
+        // Assert
+        var measurements = connectedCircuitCounter.GetMeasurementSnapshot();
+
+        Assert.Single(measurements);
+        Assert.Equal(-1, measurements[0].Value);
+    }
+
+    [Fact]
+    public async Task OnCircuitDown_UpdatesCountersAndRecordsDuration()
+    {
+        // Arrange
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+        using var activeCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.active");
+        using var connectedCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.connected");
+        using var circuitDurationCollector = new MetricCollector<double>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.duration");
+
+        // Act
+        var startTime = Stopwatch.GetTimestamp();
+        await Task.Delay(10); // Add a small delay to ensure a measurable duration
+        var endTime = Stopwatch.GetTimestamp();
+        circuitMetrics.OnCircuitDown(startTime, endTime);
+
+        // Assert
+        var activeMeasurements = activeCircuitCounter.GetMeasurementSnapshot();
+        var durationMeasurements = circuitDurationCollector.GetMeasurementSnapshot();
+
+        Assert.Single(activeMeasurements);
+        Assert.Equal(-1, activeMeasurements[0].Value);
+
+        Assert.Single(durationMeasurements);
+        Assert.True(durationMeasurements[0].Value > 0);
+    }
+
+    [Fact]
+    public void IsDurationEnabled_ReturnsMeterEnabledState()
+    {
+        // Arrange
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+
+        // Create a collector to ensure the meter is enabled
+        using var circuitDurationCollector = new MetricCollector<double>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.duration");
+
+        // Act & Assert
+        Assert.True(circuitMetrics.IsDurationEnabled());
+    }
+
+    [Fact]
+    public void FullCircuitLifecycle_RecordsAllMetricsCorrectly()
+    {
+        // Arrange
+        var circuitMetrics = new CircuitMetrics(_meterFactory);
+        using var activeCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.active");
+        using var connectedCircuitCounter = new MetricCollector<long>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.connected");
+        using var circuitDurationCollector = new MetricCollector<double>(_meterFactory,
+            CircuitMetrics.MeterName, "aspnetcore.components.circuit.duration");
+
+        // Act - Simulating a full circuit lifecycle
+        var startTime = Stopwatch.GetTimestamp();
+
+        // 1. Circuit opens
+        circuitMetrics.OnCircuitOpened();
+
+        // 2. Connection established
+        circuitMetrics.OnConnectionUp();
+
+        // 3. Connection drops
+        circuitMetrics.OnConnectionDown();
+
+        // 4. Connection re-established
+        circuitMetrics.OnConnectionUp();
+
+        // 5. Connection drops
+        circuitMetrics.OnConnectionDown();
+
+        // 6. Circuit closes
+        Thread.Sleep(10); // Add a small delay to ensure a measurable duration
+        var endTime = Stopwatch.GetTimestamp();
+        circuitMetrics.OnCircuitDown(startTime, endTime);
+
+        // Assert
+        var activeMeasurements = activeCircuitCounter.GetMeasurementSnapshot();
+        var connectedMeasurements = connectedCircuitCounter.GetMeasurementSnapshot();
+        var durationMeasurements = circuitDurationCollector.GetMeasurementSnapshot();
+
+        // Active circuit count should have 2 measurements (1 for open, -1 for close)
+        Assert.Equal(2, activeMeasurements.Count);
+        Assert.Equal(1, activeMeasurements[0].Value);
+        Assert.Equal(-1, activeMeasurements[1].Value);
+
+        // Connected circuit count should have 4 measurements (connecting, disconnecting, reconnecting, closing)
+        Assert.Equal(4, connectedMeasurements.Count);
+        Assert.Equal(1, connectedMeasurements[0].Value);
+        Assert.Equal(-1, connectedMeasurements[1].Value);
+        Assert.Equal(1, connectedMeasurements[2].Value);
+        Assert.Equal(-1, connectedMeasurements[3].Value);
+
+        // Duration should have 1 measurement with a positive value
+        Assert.Single(durationMeasurements);
+        Assert.True(durationMeasurements[0].Value > 0);
+    }
+}
diff --git a/src/Components/Server/test/Circuits/CircuitPersistenceManagerTest.cs b/src/Components/Server/test/Circuits/CircuitPersistenceManagerTest.cs
new file mode 100644
index 000000000000..6bd9be6e9a7d
--- /dev/null
+++ b/src/Components/Server/test/Circuits/CircuitPersistenceManagerTest.cs
@@ -0,0 +1,668 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Globalization;
+using System.Text;
+using System.Text.Json;
+using Microsoft.AspNetCore.Components.Endpoints;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Server.Circuits;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components.Server.Tests.Circuits;
+
+public class CircuitPersistenceManagerTest
+{
+    // Pause circuit registers with PersistentComponentStatemanager to persist root components.
+    // Do not try to generate code after this line.
+
+    [Fact]
+    public async Task PauseCircuitAsync_PersistsRootComponents_WithTheirParameters()
+    {
+        // Arrange
+        var dataProtectionProvider = new EphemeralDataProtectionProvider();
+        var deserializer = CreateDeserializer(dataProtectionProvider);
+
+        var options = Options.Create(new CircuitOptions());
+        var components = new[]
+        {
+            (RootComponentType: typeof(RootComponent), Parameters: new Dictionary<string, object>
+            {
+                ["Count"] = 42
+            })
+        };
+
+        var circuitHost = await CreateCircuitHostAsync(
+            options,
+            dataProtectionProvider,
+            deserializer,
+            components);
+
+        var circuitPersistenceProvider = new TestCircuitPersistenceProvider();
+        var circuitPersistenceManager = new CircuitPersistenceManager(
+            options,
+            new ServerComponentSerializer(dataProtectionProvider),
+            circuitPersistenceProvider,
+            dataProtectionProvider);
+
+        // Act
+        await circuitPersistenceManager.PauseCircuitAsync(circuitHost);
+
+        // Assert
+        Assert.NotNull(circuitPersistenceProvider.State);
+        var state = circuitPersistenceProvider.State;
+        Assert.Equal(2, state.ApplicationState.Count);
+
+        AssertRootComponents(
+            deserializer,
+            [
+                (
+                    Id: 1,
+                    Key: new ComponentMarkerKey("1", typeof(RootComponent).FullName!),
+                    (
+                        typeof(RootComponent),
+                        new Dictionary<string, object>
+                        {
+                            ["Count"] = 42
+                        }
+                    )
+                )
+            ],
+            state.RootComponents);
+    }
+
+    [Fact]
+    public async Task PauseCircuitAsync_CanPersistMultipleComponents_WithTheirParameters()
+    {
+        // Arrange
+        var dataProtectionProvider = new EphemeralDataProtectionProvider();
+        var deserializer = CreateDeserializer(dataProtectionProvider);
+        var options = Options.Create(new CircuitOptions());
+        var components = new[]
+        {
+            (RootComponentType: typeof(RootComponent), Parameters: new Dictionary<string, object>
+            {
+                ["Count"] = 42
+            }),
+            (RootComponentType: typeof(SecondRootComponent), Parameters: new Dictionary<string, object>
+            {
+                ["Count"] = 100
+            })
+        };
+        var circuitHost = await CreateCircuitHostAsync(
+            options,
+            dataProtectionProvider,
+            deserializer,
+            components);
+        var circuitPersistenceProvider = new TestCircuitPersistenceProvider();
+        var circuitPersistenceManager = new CircuitPersistenceManager(
+            options,
+            new ServerComponentSerializer(dataProtectionProvider),
+            circuitPersistenceProvider,
+            dataProtectionProvider);
+        // Act
+        await circuitPersistenceManager.PauseCircuitAsync(circuitHost);
+        // Assert
+        Assert.NotNull(circuitPersistenceProvider.State);
+        var state = circuitPersistenceProvider.State;
+        Assert.Equal(3, state.ApplicationState.Count);
+        AssertRootComponents(
+            deserializer,
+            [
+                (
+                    Id: 1,
+                    Key: new ComponentMarkerKey("1", typeof(RootComponent).FullName!),
+                    (
+                        typeof(RootComponent),
+                        new Dictionary<string, object>
+                        {
+                            ["Count"] = 42
+                        }
+                    )
+                ),
+                (
+                    Id: 2,
+                    Key: new ComponentMarkerKey("2", typeof(SecondRootComponent).FullName!),
+                    (
+                        typeof(SecondRootComponent),
+                        new Dictionary<string, object>
+                        {
+                            ["Count"] = 100
+                        }
+                    )
+                )
+            ],
+            state.RootComponents);
+    }
+
+    [Fact]
+    public async Task SaveStateToClient_PersistsStateToServer_WhenSendingToClientFails()
+    {
+        // Arrange
+        var dataProtectionProvider = new EphemeralDataProtectionProvider();
+        var deserializer = CreateDeserializer(dataProtectionProvider);
+        var options = Options.Create(new CircuitOptions());
+        var components = new[]
+        {
+            (RootComponentType: typeof(RootComponent), Parameters: new Dictionary<string, object>
+            {
+                ["Count"] = 42
+            })
+        };
+
+        var mockClientProxy = new Mock<ISingleClientProxy>();
+        mockClientProxy.Setup(c => c.InvokeCoreAsync<bool>(
+            It.IsAny<string>(),
+            It.IsAny<object[]>(),
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(false); // Simulate client failure
+
+        var client = new CircuitClientProxy(mockClientProxy.Object, Guid.NewGuid().ToString());
+        var circuitHost = await CreateCircuitHostAsync(
+            options,
+            dataProtectionProvider,
+            deserializer,
+            components,
+            client);
+
+        var circuitPersistenceProvider = new TestCircuitPersistenceProvider();
+        var circuitPersistenceManager = new CircuitPersistenceManager(
+            options,
+            new ServerComponentSerializer(dataProtectionProvider),
+            circuitPersistenceProvider,
+            dataProtectionProvider);
+
+        var store = new CircuitPersistenceManagerStore();
+
+        // Create a minimal persisted state for testing
+        var persistedState = new PersistedCircuitState
+        {
+            ApplicationState = new Dictionary<string, byte[]> { ["test"] = [1, 2, 3] },
+            RootComponents = [1, 2, 3, 4]
+        };
+
+        // Act
+        await circuitPersistenceManager.SaveStateToClient(
+            circuitHost,
+            persistedState,
+            default);
+
+        // Assert
+        Assert.NotNull(circuitPersistenceProvider.State);
+        Assert.Same(persistedState, circuitPersistenceProvider.State);
+
+        // Verify that InvokeAsync was called to attempt client-side storage
+        mockClientProxy.Verify(c => c.InvokeCoreAsync<bool>(
+            "JS.SavePersistedState",
+            It.IsAny<object[]>(),
+            It.IsAny<CancellationToken>()),
+            Times.Once);
+    }
+
+    [Fact]
+    public async Task SaveStateToClient_CatchesException_WhenPersistingToServerFails()
+    {
+        // Arrange
+        var dataProtectionProvider = new EphemeralDataProtectionProvider();
+        var deserializer = CreateDeserializer(dataProtectionProvider);
+        var options = Options.Create(new CircuitOptions());
+        var components = new[]
+        {
+            (RootComponentType: typeof(RootComponent), Parameters: new Dictionary<string, object>
+            {
+                ["Count"] = 42
+            })
+        };
+
+        var mockClientProxy = new Mock<ISingleClientProxy>();
+        mockClientProxy.Setup(c => c.InvokeCoreAsync<bool>(
+            It.IsAny<string>(),
+            It.IsAny<object[]>(),
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(false); // Simulate client failure
+
+        var client = new CircuitClientProxy(mockClientProxy.Object, Guid.NewGuid().ToString());
+        var circuitHost = await CreateCircuitHostAsync(
+            options,
+            dataProtectionProvider,
+            deserializer,
+            components,
+            client);
+
+        // Create a circuit persistence provider that throws an exception when PersistCircuitAsync is called
+        var circuitPersistenceProvider = new Mock<ICircuitPersistenceProvider>();
+        circuitPersistenceProvider
+            .Setup(p => p.PersistCircuitAsync(It.IsAny<CircuitId>(), It.IsAny<PersistedCircuitState>(), It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new InvalidOperationException("Failed to persist circuit"));
+
+        var circuitPersistenceManager = new CircuitPersistenceManager(
+            options,
+            new ServerComponentSerializer(dataProtectionProvider),
+            circuitPersistenceProvider.Object,
+            dataProtectionProvider);
+
+        var persistedState = new PersistedCircuitState
+        {
+            ApplicationState = new Dictionary<string, byte[]> { ["test"] = [1, 2, 3] },
+            RootComponents = [1, 2, 3, 4]
+        };
+
+        // Act - This should not throw even though both client and server persistence fail
+        await circuitPersistenceManager.SaveStateToClient(
+            circuitHost,
+            persistedState,
+            default);
+
+        // Assert
+        // Verify that InvokeAsync was called to attempt client-side storage
+        mockClientProxy.Verify(c => c.InvokeCoreAsync<bool>(
+            "JS.SavePersistedState",
+            It.IsAny<object[]>(),
+            It.IsAny<CancellationToken>()),
+            Times.Once);
+
+        // Verify that PersistCircuitAsync was called when client-side storage failed
+        circuitPersistenceProvider.Verify(p => p.PersistCircuitAsync(
+            It.IsAny<CircuitId>(),
+            It.IsAny<PersistedCircuitState>(),
+            It.IsAny<CancellationToken>()),
+            Times.Once);
+    }
+
+    [Fact]
+    public void ToRootComponentOperationBatch_WorksFor_EmptyBatch()
+    {
+        var deserializer = SetupMockDeserializer();
+
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. "{}"u8], "ops");
+        Assert.NotNull(result);
+    }
+
+    [Fact]
+    public void ToRootComponentOperationBatch_Fails_IfDeserializingClientOperations_Fails()
+    {
+        var deserializer = SetupMockDeserializer(fail: true);
+        deserializer
+            .Setup(d =>
+                d.TryDeserializeRootComponentOperations(
+                    It.IsAny<string>(),
+                    out It.Ref<RootComponentOperationBatch>.IsAny,
+                    false))
+            .Returns(false);
+
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. "{}"u8], "ops");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void ToRootComponentOperationBatch_Fails_IfDeserializingPersistedRootComponents_Fails()
+    {
+        var deserializer = SetupMockDeserializer();
+
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. "invalid-json"u8], "ops");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void Fails_IfDifferentNumberOfRootComponentsAndOperations()
+    {
+        var deserializer = SetupMockDeserializer(
+            new RootComponentOperationBatch
+            {
+                BatchId = 1,
+                Operations = [new RootComponentOperation { Type = RootComponentOperationType.Add, SsrComponentId = 1 }]
+            });
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. "{}"u8], "ops");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void Fails_IfMarkerForOperationNotFound()
+    {
+        var deserializer = SetupMockDeserializer(
+            new RootComponentOperationBatch
+            {
+                BatchId = 1,
+                Operations = [new RootComponentOperation { Type = RootComponentOperationType.Add, SsrComponentId = 1 }]
+            });
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. """{ "2": {} }"""u8], "ops");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void Fails_IfUnableToDeserialize_PersistedComponentStateMarker()
+    {
+        var deserializer = SetupMockDeserializer(
+            new RootComponentOperationBatch
+            {
+                BatchId = 1,
+                Operations = [new RootComponentOperation { Type = RootComponentOperationType.Add, SsrComponentId = 1 }]
+            }, fail: false, deserializeMarker: false);
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. """{ "1": {} }"""u8], "ops");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void Fails_WorksWhen_RootComponentsAndOperations_MatchAndCanBeDeserialized()
+    {
+        var deserializer = SetupMockDeserializer(
+            new RootComponentOperationBatch
+            {
+                BatchId = 1,
+                Operations = [new RootComponentOperation { Type = RootComponentOperationType.Add, SsrComponentId = 1 }]
+            }, fail: false, deserializeMarker: true);
+        var result = CircuitPersistenceManager.ToRootComponentOperationBatch(deserializer.Object, [.. """{ "1": {} }"""u8], "ops");
+        Assert.NotNull(result);
+    }
+
+    private void AssertRootComponents(
+        ServerComponentDeserializer deserializer,
+        (int Id, ComponentMarkerKey Key, (Type ComponentType, Dictionary<string, object> Parameters))[] expected, byte[] rootComponents)
+    {
+        var actual = JsonSerializer.Deserialize<Dictionary<int, ComponentMarker>>(rootComponents, SerializerOptions);
+        Assert.NotNull(actual);
+        Assert.Equal(expected.Length, actual.Count);
+        foreach (var (id, key, (componentType, parameters)) in expected)
+        {
+            Assert.True(actual.TryGetValue(id, out var marker), $"Expected marker with ID {id} not found.");
+            Assert.Equal(key.LocationHash, marker.Key.Value.LocationHash);
+            Assert.Equal(key.FormattedComponentKey, marker.Key.Value.FormattedComponentKey);
+            Assert.True(deserializer.TryDeserializeWebRootComponentDescriptor(marker, out var descriptor), $"Failed to deserialize marker with ID {id}.");
+            Assert.NotNull(descriptor);
+            Assert.Equal(componentType, descriptor.ComponentType);
+            var actualParameters = descriptor.Parameters.Parameters.ToDictionary();
+            Assert.NotNull(actualParameters);
+            Assert.Equal(parameters.Count, actualParameters.Count);
+            foreach (var (paramKey, paramValue) in parameters)
+            {
+                Assert.True(actualParameters.TryGetValue(paramKey, out var actualValue), $"Expected parameter '{paramKey}' not found.");
+                Assert.Equal(paramValue, actualValue);
+            }
+        }
+    }
+
+    private async Task<CircuitHost> CreateCircuitHostAsync(
+        IOptions<CircuitOptions> options,
+        EphemeralDataProtectionProvider dataProtectionProvider,
+        ServerComponentDeserializer deserializer,
+        (Type RootComponentType, Dictionary<string, object> Parameters)[] components = null,
+        CircuitClientProxy client = null)
+    {
+        components ??= [];
+        var circuitId = new CircuitIdFactory(dataProtectionProvider).CreateCircuitId();
+
+        var jsRuntime = new RemoteJSRuntime(
+            options,
+            Options.Create(new HubOptions<ComponentHub>()),
+            NullLoggerFactory.Instance.CreateLogger<RemoteJSRuntime>());
+
+        var serviceProvider = new ServiceCollection()
+            .AddSingleton(dataProtectionProvider)
+            .AddSingleton<ServerComponentSerializer>()
+            .AddSupplyValueFromPersistentComponentStateProvider()
+            .AddFakeLogging()
+            .AddSingleton(
+                sp => new ComponentStatePersistenceManager(
+                    NullLoggerFactory.Instance.CreateLogger<ComponentStatePersistenceManager>(),
+                    sp))
+            .AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State)
+            .AddSingleton<IJSRuntime>(jsRuntime)
+            .BuildServiceProvider();
+
+        var scope = serviceProvider.CreateAsyncScope();
+
+        client ??= new CircuitClientProxy(Mock.Of<ISingleClientProxy>(), Guid.NewGuid().ToString());
+
+        var renderer = new RemoteRenderer(
+            scope.ServiceProvider,
+            NullLoggerFactory.Instance,
+            options.Value,
+            client,
+            deserializer,
+                NullLoggerFactory.Instance.CreateLogger<RemoteRenderer>(),
+                jsRuntime,
+                new CircuitJSComponentInterop(options.Value));
+
+        var navigationManager = new RemoteNavigationManager(
+            NullLoggerFactory.Instance.CreateLogger<RemoteNavigationManager>());
+        var circuitHandlers = Array.Empty<CircuitHandler>();
+        var circuitMetrics = new CircuitMetrics(new TestMeterFactory());
+        var componentsActivitySource = new CircuitActivitySource();
+        var logger = NullLoggerFactory.Instance.CreateLogger<CircuitHost>();
+
+        var circuitHost = new CircuitHost(
+            circuitId,
+            scope,
+            options.Value,
+            client,
+            renderer,
+            [],
+            jsRuntime,
+            navigationManager,
+            circuitHandlers,
+            circuitMetrics,
+            componentsActivitySource,
+            logger);
+
+        await circuitHost.InitializeAsync(
+        null,
+        default,
+        default);
+
+        var store = new ProtectedPrerenderComponentApplicationStore(dataProtectionProvider);
+        await circuitHost.UpdateRootComponents(
+            CreateBatch(components, deserializer, dataProtectionProvider),
+            store,
+            false,
+            default);
+
+        return circuitHost;
+    }
+
+    private static ServerComponentDeserializer CreateDeserializer(EphemeralDataProtectionProvider dataProtectionProvider) => new ServerComponentDeserializer(
+                    dataProtectionProvider,
+                    NullLoggerFactory.Instance.CreateLogger<ServerComponentDeserializer>(),
+                    new RootTypeCache(),
+                    new ComponentParameterDeserializer(
+                        NullLoggerFactory.Instance.CreateLogger<ComponentParameterDeserializer>(),
+                        new ComponentParametersTypeCache()));
+
+    private static Mock<IServerComponentDeserializer> SetupMockDeserializer(
+    RootComponentOperationBatch batchResult = default,
+    bool fail = false,
+    bool deserializeMarker = false)
+    {
+        var deserializer = new Mock<IServerComponentDeserializer>();
+        batchResult = fail ?
+            default :
+            batchResult == default ?
+                new RootComponentOperationBatch
+                {
+                    Operations = [],
+                    BatchId = 1
+                } :
+                batchResult;
+
+        deserializer
+            .Setup(d =>
+                d.TryDeserializeRootComponentOperations(
+                    It.IsAny<string>(),
+                    out It.Ref<RootComponentOperationBatch>.IsAny,
+                    false))
+            .Callback((string serializedOps, out RootComponentOperationBatch batch, bool value) =>
+            {
+                batch = batchResult;
+            })
+            .Returns(!fail);
+
+        if (deserializeMarker)
+        {
+            deserializer.Setup(deserializer =>
+                deserializer.TryDeserializeWebRootComponentDescriptor(
+                    It.IsAny<ComponentMarker>(),
+                    out It.Ref<WebRootComponentDescriptor>.IsAny))
+                .Callback((ComponentMarker marker, out WebRootComponentDescriptor descriptor) =>
+                {
+                    descriptor = new WebRootComponentDescriptor(typeof(RootComponent), new WebRootComponentParameters());
+                })
+                .Returns(true);
+        }
+        return deserializer;
+    }
+
+    private static RootComponentOperationBatch CreateBatch(
+        (Type RootComponentType, Dictionary<string, object> Parameters)[] components,
+        ServerComponentDeserializer deserializer,
+        EphemeralDataProtectionProvider dataProtectionProvider)
+    {
+        var invocation = new ServerComponentInvocationSequence();
+        var serializer = new ServerComponentSerializer(dataProtectionProvider);
+        var markers = new List<ComponentMarker>();
+        for (var i = 0; i < components.Length; i++)
+        {
+            var (rootComponentType, parameters) = components[i];
+            var key = new ComponentMarkerKey((i + 1).ToString(CultureInfo.InvariantCulture), rootComponentType.FullName!);
+            var marker = ComponentMarker.Create(ComponentMarker.ServerMarkerType, false, key);
+            serializer.SerializeInvocation(
+                ref marker,
+                invocation,
+                rootComponentType,
+                ParameterView.FromDictionary(parameters),
+                TimeSpan.FromDays(365));
+            markers.Add(marker);
+        }
+
+        var batch = new RootComponentOperationBatch
+        {
+            BatchId = 1,
+            Operations = [.. markers.Select((c, i) =>
+                new RootComponentOperation
+                {
+                    Type = RootComponentOperationType.Add,
+                    SsrComponentId = i + 1,
+                    Marker = c
+                })]
+        };
+
+        var batchJson = JsonSerializer.Serialize(batch, ServerComponentSerializationSettings.JsonSerializationOptions);
+
+        deserializer.TryDeserializeRootComponentOperations(batchJson, out batch);
+
+        return batch;
+    }
+
+    private class TestCircuitPersistenceProvider : ICircuitPersistenceProvider
+    {
+        public PersistedCircuitState State { get; private set; }
+
+        public Task<PersistedCircuitState> RestoreCircuitAsync(CircuitId circuitId, CancellationToken cancellation = default)
+        {
+            return Task.FromResult(new PersistedCircuitState());
+        }
+
+        public Task PersistCircuitAsync(CircuitId circuitId, PersistedCircuitState state, CancellationToken cancellation = default)
+        {
+            State = state;
+            return Task.CompletedTask;
+        }
+    }
+
+    public class RootComponent : IComponent
+    {
+        private RenderHandle _renderHandle;
+
+        public void Attach(RenderHandle renderHandle)
+        {
+            _renderHandle = renderHandle;
+        }
+
+        [PersistentState]
+        public string Persisted { get; set; }
+
+        [Parameter]
+        public int Count { get; set; }
+
+        public Task SetParametersAsync(ParameterView parameters)
+        {
+            parameters.SetParameterProperties(this);
+            Persisted ??= Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture);
+
+            _renderHandle.Render(rtb =>
+            {
+                rtb.OpenElement(0, "div");
+                rtb.AddContent(1, $"Persisted: {Persisted}, Count: {Count}");
+                rtb.CloseElement();
+            });
+
+            return Task.CompletedTask;
+        }
+    }
+
+    public class SecondRootComponent : IComponent
+    {
+        private RenderHandle _renderHandle;
+
+        public void Attach(RenderHandle renderHandle)
+        {
+            _renderHandle = renderHandle;
+        }
+
+        [PersistentState]
+        public string Persisted { get; set; }
+
+        [Parameter]
+        public int Count { get; set; }
+
+        public Task SetParametersAsync(ParameterView parameters)
+        {
+            parameters.SetParameterProperties(this);
+            Persisted ??= Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture);
+
+            _renderHandle.Render(rtb =>
+            {
+                rtb.OpenElement(0, "div");
+                rtb.AddContent(1, $"Persisted: {Persisted}, Count: {Count}");
+                rtb.CloseElement();
+            });
+
+            return Task.CompletedTask;
+        }
+    }
+
+    private static readonly JsonSerializerOptions SerializerOptions = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        PropertyNameCaseInsensitive = true,
+    };
+
+    private class CircuitPersistenceManagerStore : IPersistentComponentStateStore
+    {
+        internal PersistedCircuitState PersistedCircuitState { get; private set; }
+
+        Task<IDictionary<string, byte[]>> IPersistentComponentStateStore.GetPersistedStateAsync() =>
+            throw new NotImplementedException();
+
+        Task IPersistentComponentStateStore.PersistStateAsync(IReadOnlyDictionary<string, byte[]> state)
+        {
+            PersistedCircuitState = new PersistedCircuitState
+            {
+                ApplicationState = new Dictionary<string, byte[]>(state),
+                RootComponents = null
+            };
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs
index 9a30f3eca81b..6bde65073a60 100644
--- a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs
@@ -1,11 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.AspNetCore.SignalR;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
 using Moq;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits;
@@ -37,7 +42,7 @@ public async Task ConnectAsync_TransfersClientOnActiveCircuit()
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
         registry.Register(circuitHost);
 
-        var newClient = Mock.Of<IClientProxy>();
+        var newClient = Mock.Of<ISingleClientProxy>();
         var newConnectionId = "new-id";
 
         // Act
@@ -62,7 +67,7 @@ public async Task ConnectAsync_MakesInactiveCircuitActive()
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
         registry.RegisterDisconnectedCircuit(circuitHost);
 
-        var newClient = Mock.Of<IClientProxy>();
+        var newClient = Mock.Of<ISingleClientProxy>();
         var newConnectionId = "new-id";
 
         // Act
@@ -88,7 +93,7 @@ public async Task ConnectAsync_InvokesCircuitHandlers_WhenCircuitWasPreviouslyDi
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), handlers: new[] { handler.Object });
         registry.RegisterDisconnectedCircuit(circuitHost);
 
-        var newClient = Mock.Of<IClientProxy>();
+        var newClient = Mock.Of<ISingleClientProxy>();
         var newConnectionId = "new-id";
 
         // Act
@@ -112,7 +117,7 @@ public async Task ConnectAsync_InvokesCircuitHandlers_WhenCircuitWasConsideredCo
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), handlers: new[] { handler.Object });
         registry.Register(circuitHost);
 
-        var newClient = Mock.Of<IClientProxy>();
+        var newClient = Mock.Of<ISingleClientProxy>();
         var newConnectionId = "new-id";
 
         // Act
@@ -137,7 +142,7 @@ public async Task ConnectAsync_InvokesCircuitHandlers_DisposesCircuitOnFailure()
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), handlers: new[] { handler.Object });
         registry.Register(circuitHost);
 
-        var newClient = Mock.Of<IClientProxy>();
+        var newClient = Mock.Of<ISingleClientProxy>();
         var newConnectionId = "new-id";
 
         // Act
@@ -234,7 +239,7 @@ public async Task Connect_WhileDisconnectIsInProgress()
 
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
         registry.Register(circuitHost);
-        var client = Mock.Of<IClientProxy>();
+        var client = Mock.Of<ISingleClientProxy>();
         var newId = "new-connection";
 
         // Act
@@ -263,6 +268,115 @@ public async Task Connect_WhileDisconnectIsInProgress()
         Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
     }
 
+    [Fact]
+    public async Task Connect_WhilePersistingEvictedCircuit_IsInProgress()
+    {
+        // Arrange
+        var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
+        var options = new CircuitOptions
+        {
+            DisconnectedCircuitMaxRetained = 0, // This will automatically trigger eviction.
+        };
+
+        var persistenceCompletionSource = new TaskCompletionSource();
+        var circuitPersistenceProvider = new TestCircuitPersistenceProvider()
+        {
+            Persisting = persistenceCompletionSource.Task,
+        };
+
+        var registry = new TestCircuitRegistry(circuitIdFactory, options, circuitPersistenceProvider);
+        registry.BeforeDisconnect = new ManualResetEventSlim();
+
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.AddSingleton(sp => new ComponentStatePersistenceManager(
+            NullLoggerFactory.Instance.CreateLogger<ComponentStatePersistenceManager>(),
+            sp));
+        serviceCollection.AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
+        var serviceProvider = serviceCollection.BuildServiceProvider();
+
+        var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), serviceProvider.CreateAsyncScope());
+        registry.Register(circuitHost);
+        var client = Mock.Of<ISingleClientProxy>();
+        var newId = "new-connection";
+
+        // Act
+        var disconnect = Task.Run(() =>
+        {
+            var task = registry.DisconnectAsync(circuitHost, circuitHost.Client.ConnectionId);
+            return task;
+        });
+
+        var connect = Task.Run(async () =>
+        {
+            var connectCore = registry.ConnectAsync(circuitHost.CircuitId, client, newId, default);
+            await connectCore;
+        });
+
+        registry.BeforeDisconnect.Set();
+
+        await Task.WhenAll(disconnect, connect);
+        persistenceCompletionSource.SetResult();
+        circuitPersistenceProvider.AfterPersist.Wait(TimeSpan.FromSeconds(10));
+        // Assert
+        // We expect the reconnect to fail since the circuit has already been evicted and persisted.
+        Assert.Empty(registry.ConnectedCircuits.Values);
+        Assert.True(circuitPersistenceProvider.PersistCalled);
+        Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
+    }
+
+    [Fact]
+    public async Task Disconnect_DoesNotPersistCircuits_WithPendingState()
+    {
+        // Arrange
+        var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
+        var options = new CircuitOptions
+        {
+            DisconnectedCircuitMaxRetained = 0, // This will automatically trigger eviction.
+        };
+
+        var circuitPersistenceProvider = new TestCircuitPersistenceProvider();
+
+        var registry = new TestCircuitRegistry(circuitIdFactory, options, circuitPersistenceProvider);
+        registry.BeforeDisconnect = new ManualResetEventSlim();
+
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.AddSingleton(sp => new ComponentStatePersistenceManager(
+            NullLoggerFactory.Instance.CreateLogger<ComponentStatePersistenceManager>(),
+            sp));
+        serviceCollection.AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
+        var serviceProvider = serviceCollection.BuildServiceProvider();
+
+        var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), serviceProvider.CreateAsyncScope());
+        registry.Register(circuitHost);
+        circuitHost.AttachPersistedState(new PersistedCircuitState());
+        var client = Mock.Of<ISingleClientProxy>();
+        var newId = "new-connection";
+
+        // Act
+        var disconnect = Task.Run(() =>
+        {
+            var task = registry.DisconnectAsync(circuitHost, circuitHost.Client.ConnectionId);
+            return task;
+        });
+
+        var connect = Task.Run(async () =>
+        {
+            var connectCore = registry.ConnectAsync(circuitHost.CircuitId, client, newId, default);
+            await connectCore;
+        });
+
+        registry.BeforeDisconnect.Set();
+
+        await Task.WhenAll(disconnect, connect);
+        circuitPersistenceProvider.AfterPersist.Wait(TimeSpan.FromSeconds(10));
+
+        // Assert
+        // We expect the reconnect to fail since the circuit has already been evicted and persisted.
+        Assert.Empty(registry.ConnectedCircuits.Values);
+        Assert.False(circuitPersistenceProvider.PersistCalled);
+        Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
+    }
+
     [Fact]
     public async Task DisconnectWhenAConnectIsInProgress()
     {
@@ -273,7 +387,7 @@ public async Task DisconnectWhenAConnectIsInProgress()
         registry.BeforeConnect = new ManualResetEventSlim();
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
         registry.Register(circuitHost);
-        var client = Mock.Of<IClientProxy>();
+        var client = Mock.Of<ISingleClientProxy>();
         var oldId = circuitHost.Client.ConnectionId;
         var newId = "new-connection";
 
@@ -339,7 +453,7 @@ public async Task ReconnectBeforeTimeoutDoesNotGetEntryToBeEvicted()
         var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
 
         registry.RegisterDisconnectedCircuit(circuitHost);
-        await registry.ConnectAsync(circuitHost.CircuitId, Mock.Of<IClientProxy>(), "new-connection", default);
+        await registry.ConnectAsync(circuitHost.CircuitId, Mock.Of<ISingleClientProxy>(), "new-connection", default);
 
         // Act
         await Task.Run(() => tcs.Task.TimeoutAfter(TimeSpan.FromSeconds(10)));
@@ -351,19 +465,124 @@ public async Task ReconnectBeforeTimeoutDoesNotGetEntryToBeEvicted()
         Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out var _));
     }
 
+    [Fact]
+    public async Task PauseCircuitAsync_DoesNothing_IfCircuitIsDisconnected()
+    {
+        // Arrange
+        var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
+        var (registry, persistenceProvider) = CreateRegistryWithProvider(circuitIdFactory);
+        var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
+
+        registry.RegisterDisconnectedCircuit(circuitHost);
+
+        // Act
+        await registry.PauseCircuitAsync(circuitHost, circuitHost.Client.ConnectionId);
+
+        // Assert
+        Assert.Empty(registry.ConnectedCircuits);
+        Assert.True(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
+        Assert.False(persistenceProvider.PersistCalled);
+    }
+
+    [Fact]
+    public async Task ConnectAsync_ReturnsNull_ForPausedCircuit()
+    {
+        // Arrange
+        var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
+        var circuitOptions = new CircuitOptions { DisconnectedCircuitMaxRetained = 0 }; // Ensure eviction
+        var persistenceProvider = new TestCircuitPersistenceProvider();
+        var registry = new TestCircuitRegistry(circuitIdFactory, circuitOptions, persistenceProvider)
+        {
+            BeforePause = new ManualResetEventSlim(),
+            PauseInvoked = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+            BeforeConnect = new ManualResetEventSlim(),
+        };
+
+        var scope = new ServiceCollection()
+                .AddSingleton(sp => new ComponentStatePersistenceManager(NullLoggerFactory.Instance.CreateLogger<ComponentStatePersistenceManager>(), sp))
+                .AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State)
+                .BuildServiceProvider()
+                .CreateAsyncScope();
+
+        var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId(), scope);
+        registry.Register(circuitHost);
+        var originalConnectionId = circuitHost.Client.ConnectionId;
+
+        var newClient = Mock.Of<ISingleClientProxy>();
+        var newConnectionId = originalConnectionId;
+
+        // Act
+        var pauseTask = Task.Run(() =>
+        {
+            var pauseTask = registry.PauseCircuitAsync(circuitHost, originalConnectionId);
+            return pauseTask;
+        });
+
+        var connectTask = Task.Run(async () =>
+        {
+            await registry.PauseInvoked.Task; // Wait for PauseCore to be entered and waiting on BeforePauseTcs
+            // At this point, PauseCircuitAsync holds the main CircuitRegistryLock and its PauseCore is blocked.
+            // ConnectAsync will block on the CircuitRegistryLock until PauseCircuitAsync releases it.
+            var connectResultAttempt = registry.ConnectAsync(circuitHost.CircuitId, newClient, newConnectionId, default);
+            return await connectResultAttempt;
+        });
+
+        await registry.PauseInvoked.Task;
+        registry.BeforeConnect.Set();
+        registry.BeforePause.Set();
+
+        await Task.WhenAll(pauseTask, connectTask);
+        var connectResult = await connectTask;
+
+        // Assert
+        Assert.True(persistenceProvider.PersistCalled, "Persistence provider should have been called during pause.");
+        Assert.Null(connectResult);
+        Assert.False(registry.ConnectedCircuits.ContainsKey(circuitHost.CircuitId), "Circuit should not be in connected circuits.");
+        Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _), "Circuit should be evicted from disconnected circuits.");
+    }
+
+    [Fact]
+    public async Task PauseCircuitAsync_DoesNothing_IfConnectionIdIsDifferent()
+    {
+        // Arrange
+        var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
+        var (registry, persistenceProvider) = CreateRegistryWithProvider(circuitIdFactory);
+        var circuitHost = TestCircuitHost.Create(circuitIdFactory.CreateCircuitId());
+        registry.Register(circuitHost);
+        var differentConnectionId = "different-connection-id";
+        Assert.NotEqual(differentConnectionId, circuitHost.Client.ConnectionId);
+
+        // Act
+        await registry.PauseCircuitAsync(circuitHost, differentConnectionId);
+
+        // Assert
+        Assert.True(registry.ConnectedCircuits.TryGetValue(circuitHost.CircuitId, out var connectedCircuit));
+        Assert.Same(circuitHost, connectedCircuit);
+        Assert.False(persistenceProvider.PersistCalled);
+    }
+
     private class TestCircuitRegistry : CircuitRegistry
     {
-        public TestCircuitRegistry(CircuitIdFactory factory, CircuitOptions circuitOptions = null)
-            : base(Options.Create(circuitOptions ?? new CircuitOptions()), NullLogger<CircuitRegistry>.Instance, factory)
+        public TestCircuitRegistry(
+            CircuitIdFactory factory,
+            CircuitOptions circuitOptions = null,
+            TestCircuitPersistenceProvider persistenceProvider = null)
+            : base(
+                  Options.Create(circuitOptions ?? new CircuitOptions()),
+                  NullLogger<CircuitRegistry>.Instance,
+                  factory,
+                  CreatePersistenceManager(circuitOptions ?? new CircuitOptions(), persistenceProvider ?? new TestCircuitPersistenceProvider()))
         {
         }
 
         public ManualResetEventSlim BeforeConnect { get; set; }
         public ManualResetEventSlim BeforeDisconnect { get; set; }
+        public ManualResetEventSlim BeforePause { get; set; }
 
         public Action OnAfterEntryEvicted { get; set; }
+        public TaskCompletionSource PauseInvoked { get; internal set; }
 
-        protected override (CircuitHost, bool) ConnectCore(CircuitId circuitId, IClientProxy clientProxy, string connectionId)
+        protected override (CircuitHost, bool) ConnectCore(CircuitId circuitId, ISingleClientProxy clientProxy, string connectionId)
         {
             if (BeforeConnect != null)
             {
@@ -383,6 +602,19 @@ protected override bool DisconnectCore(CircuitHost circuitHost, string connectio
             return base.DisconnectCore(circuitHost, connectionId);
         }
 
+        // In the actual CircuitRegistry, PauseCore is not virtual. We simulate its behavior for testing concurrency.
+        // This method will be called by PauseCircuitAsync in TestCircuitRegistry due to normal method resolution.
+        internal override Task PauseCore(CircuitHost circuitHost, string connectionId)
+        {
+            PauseInvoked.SetResult();
+            if (BeforePause != null)
+            {
+                Assert.True(BeforePause.Wait(TimeSpan.FromSeconds(10)), "BeforePauseTcs failed to be set");
+            }
+            var result = base.PauseCore(circuitHost, connectionId);
+            return result;
+        }
+
         protected override void OnEntryEvicted(object key, object value, EvictionReason reason, object state)
         {
             base.OnEntryEvicted(key, value, reason, state);
@@ -390,11 +622,60 @@ protected override void OnEntryEvicted(object key, object value, EvictionReason
         }
     }
 
+    private class TestCircuitPersistenceProvider : ICircuitPersistenceProvider
+    {
+        public Task Persisting { get; set; }
+        public ManualResetEventSlim AfterPersist { get; set; } = new ManualResetEventSlim();
+        public bool PersistCalled { get; internal set; }
+
+        public async Task PersistCircuitAsync(CircuitId circuitId, PersistedCircuitState persistedCircuitState, CancellationToken cancellation = default)
+        {
+            PersistCalled = true;
+            if (Persisting != null)
+            {
+                await Persisting;
+            }
+            AfterPersist.Set();
+        }
+
+        public Task<PersistedCircuitState> RestoreCircuitAsync(CircuitId circuitId, CancellationToken cancellation = default)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    private static CircuitPersistenceManager CreatePersistenceManager(
+        CircuitOptions circuitOptions,
+        TestCircuitPersistenceProvider persistenceProvider)
+    {
+        var manager = new CircuitPersistenceManager(
+            Options.Create(circuitOptions),
+            new Endpoints.ServerComponentSerializer(new EphemeralDataProtectionProvider()),
+            persistenceProvider, // Ensure the passed provider is used
+            new EphemeralDataProtectionProvider());
+
+        return manager;
+    }
+
     private static CircuitRegistry CreateRegistry(CircuitIdFactory factory = null)
     {
         return new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            factory ?? TestCircuitIdFactory.CreateTestFactory());
+            factory ?? TestCircuitIdFactory.CreateTestFactory(),
+            CreatePersistenceManager(new CircuitOptions(), new TestCircuitPersistenceProvider()));
+    }
+
+    private static (CircuitRegistry Registry, TestCircuitPersistenceProvider Provider) CreateRegistryWithProvider(CircuitIdFactory factory = null, CircuitOptions circuitOptions = null)
+    {
+        var options = circuitOptions ?? new CircuitOptions();
+        var provider = new TestCircuitPersistenceProvider();
+        var persistenceManager = CreatePersistenceManager(options, provider);
+        var registry = new CircuitRegistry(
+            Options.Create(options),
+            NullLogger<CircuitRegistry>.Instance,
+            factory ?? TestCircuitIdFactory.CreateTestFactory(),
+            persistenceManager);
+        return (registry, provider);
     }
 }
diff --git a/src/Components/Server/test/Circuits/ComponentHubTest.cs b/src/Components/Server/test/Circuits/ComponentHubTest.cs
index 9d98dc1bf7c2..6582f7d40a7d 100644
--- a/src/Components/Server/test/Circuits/ComponentHubTest.cs
+++ b/src/Components/Server/test/Circuits/ComponentHubTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 using System.Text.RegularExpressions;
@@ -100,10 +101,195 @@ public async Task CannotInvokeOnLocationChangingBeforeInitialization()
         mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", new[] { errorMessage }, It.IsAny<CancellationToken>()), Times.Once());
     }
 
-    private static (Mock<ISingleClientProxy>, ComponentHub) InitializeComponentHub()
+    [Fact]
+    public async Task CannotCallUpdateRootComponentsBeforeInitialization()
+    {
+        var (mockClientProxy, hub) = InitializeComponentHub();
+        await hub.UpdateRootComponents("""{ batchId: 1, operations: [] }""", "");
+        var errorMessage = "Circuit not initialized.";
+        mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", new[] { errorMessage }, It.IsAny<CancellationToken>()), Times.Once());
+    }
+
+    [Fact]
+    public async Task CanCallUpdateRootComponents()
+    {
+        var called = false;
+        var deserializer = new TestServerComponentDeserializer();
+        deserializer.OnTryDeserializeTestComponentOperations =
+            (serializedComponentOperations, out operationsWithDescriptors, deserializeDescriptors) =>
+            {
+                called = true;
+                operationsWithDescriptors = new RootComponentOperationBatch
+                {
+                    BatchId = 1,
+                    Operations = []
+                };
+                return true;
+            };
+        var (mockClientProxy, hub) = InitializeComponentHub(deserializer);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "[]", null);
+        Assert.NotNull(circuitSecret);
+        await hub.UpdateRootComponents("""{ batchId: 1, operations: [] }""", "");
+        Assert.True(called);
+    }
+
+    [Fact]
+    public async Task CanCallUpdateRootComponentsOnResumedCircuit()
+    {
+        var deserializer = new TestServerComponentDeserializer();
+        deserializer.OnTryDeserializeTestComponentOperations =
+            (serializedComponentOperations, out operationsWithDescriptors, deserializeDescriptors) =>
+            {
+                operationsWithDescriptors = new RootComponentOperationBatch
+                {
+                    BatchId = 1,
+                    Operations = []
+                };
+                return true;
+            };
+
+        var handleRegistryMock = new Mock<ICircuitHandleRegistry>();
+        CircuitHost lastCircuit = null;
+        handleRegistryMock.Setup(m => m.SetCircuit(It.IsAny<IDictionary<object, object>>(), It.IsAny<object>(), It.IsAny<CircuitHost>()))
+            .Callback<IDictionary<object, object>, object, CircuitHost>((circuitHandles, circuitKey, circuitHost) =>
+            {
+                lastCircuit = circuitHost;
+            });
+        handleRegistryMock.Setup(m => m.GetCircuit(It.IsAny<IDictionary<object, object>>(), It.IsAny<object>()))
+            .Returns(() => lastCircuit);
+        handleRegistryMock.Setup(m => m.GetCircuitHandle(It.IsAny<IDictionary<object, object>>(), It.IsAny<object>()))
+            .Returns(() => lastCircuit.Handle);
+
+        var providerMock = new Mock<ICircuitPersistenceProvider>();
+        providerMock.Setup(m => m.RestoreCircuitAsync(It.IsAny<CircuitId>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new PersistedCircuitState
+            {
+                RootComponents = [.. """{}"""u8],
+                ApplicationState = ReadOnlyDictionary<string, byte[]>.Empty
+            });
+
+        var (mockClientProxy, hub) = InitializeComponentHub(deserializer, handleRegistryMock.Object, providerMock.Object);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "[]", null);
+        lastCircuit = null;
+        var result = await hub.ResumeCircuit(circuitSecret, "https://localhost:5000", "https://localhost:5000/subdir", "[]", "");
+        await hub.UpdateRootComponents("""{ batchId: 1, operations: [] }""", "");
+        Assert.False(lastCircuit.HasPendingPersistedCircuitState);
+    }
+
+    [Fact]
+    public async Task CannotCallResumeCircuitWithInvalidId()
+    {
+        var (mockClientProxy, hub) = InitializeComponentHub();
+        var invalidCircuitId = "invalid-circuit-id";
+        var result = await hub.ResumeCircuit(invalidCircuitId, null, null, null, null);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task CannotResumeConnectedCircuit()
+    {
+        var (mockClientProxy, hub) = InitializeComponentHub();
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "{}", null);
+        Assert.NotNull(circuitSecret);
+        var result = await hub.ResumeCircuit(circuitSecret, null, null, null, null);
+        Assert.Null(result);
+        var errorMessage = "The circuit host '.*?' has already been initialized.";
+        mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", It.Is<object[]>(s => Regex.Match((string)s[0], errorMessage).Success), It.IsAny<CancellationToken>()), Times.Once());
+    }
+
+    [Fact]
+    public async Task CannotResumeInvalidUrls()
     {
+        var handleRegistryMock = new Mock<ICircuitHandleRegistry>();
+        var (mockClientProxy, hub) = InitializeComponentHub(null, handleRegistryMock.Object);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "{}", null);
+        var result = await hub.ResumeCircuit(circuitSecret, null, null, null, null);
+        Assert.Null(result);
+        var errorMessage = "The uris provided are invalid.";
+        mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", new[] { errorMessage }, It.IsAny<CancellationToken>()), Times.Once());
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    public async Task CannotResumeWithRootComponentsButWithoutAppState(string appState)
+    {
+        var handleRegistryMock = new Mock<ICircuitHandleRegistry>();
+        var (mockClientProxy, hub) = InitializeComponentHub(null, handleRegistryMock.Object);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "{}", null);
+        var result = await hub.ResumeCircuit(circuitSecret, "https://localhost:5000", "https://localhost:5000/subdir", "unused", appState);
+        Assert.Null(result);
+        var errorMessage = "The application state provided is invalid.";
+        mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", new[] { errorMessage }, It.IsAny<CancellationToken>()), Times.Once());
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("[]")]
+    public async Task CannotResumeWithAppStateButWithoutRootComponents(string rootComponents)
+    {
+        var handleRegistryMock = new Mock<ICircuitHandleRegistry>();
+        var (mockClientProxy, hub) = InitializeComponentHub(null, handleRegistryMock.Object);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "{}", null);
+        var result = await hub.ResumeCircuit(circuitSecret, "https://localhost:5000", "https://localhost:5000/subdir", rootComponents, "app-state");
+        Assert.Null(result);
+        var errorMessage = "The root components provided are invalid.";
+        mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", new[] { errorMessage }, It.IsAny<CancellationToken>()), Times.Once());
+    }
+
+    [Fact]
+    public async Task CannotResumeAppWhenPersistedComponentStateIsNotAvailable()
+    {
+        var handleRegistryMock = new Mock<ICircuitHandleRegistry>();
+        var (mockClientProxy, hub) = InitializeComponentHub(null, handleRegistryMock.Object);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "{}", null);
+        var result = await hub.ResumeCircuit(circuitSecret, "https://localhost:5000", "https://localhost:5000/subdir", "[]", "");
+        Assert.Null(result);
+        var errorMessage = "The circuit state could not be retrieved. It may have been deleted or expired.";
+        mockClientProxy.Verify(m => m.SendCoreAsync("JS.Error", new[] { errorMessage }, It.IsAny<CancellationToken>()), Times.Once());
+    }
+
+    [Fact]
+    public async Task CanResumeAppWhenPersistedComponentStateIsAvailable()
+    {
+        var handleRegistryMock = new Mock<ICircuitHandleRegistry>();
+        CircuitHost lastCircuit = null;
+        handleRegistryMock.Setup(m => m.SetCircuit(It.IsAny<IDictionary<object, object>>(), It.IsAny<object>(), It.IsAny<CircuitHost>()))
+            .Callback<IDictionary<object, object>, object, CircuitHost>((circuitHandles, circuitKey, circuitHost) =>
+            {
+                lastCircuit = circuitHost;
+            });
+        var providerMock = new Mock<ICircuitPersistenceProvider>();
+        providerMock.Setup(m => m.RestoreCircuitAsync(It.IsAny<CircuitId>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new PersistedCircuitState
+            {
+                RootComponents = [],
+                ApplicationState = ReadOnlyDictionary<string, byte[]>.Empty,
+            });
+
+        var (mockClientProxy, hub) = InitializeComponentHub(null, handleRegistryMock.Object, providerMock.Object);
+        var circuitSecret = await hub.StartCircuit("https://localhost:5000", "https://localhost:5000/subdir", "{}", null);
+        var result = await hub.ResumeCircuit(circuitSecret, "https://localhost:5000", "https://localhost:5000/subdir", "[]", "");
+        Assert.NotNull(result);
+        Assert.NotEqual(circuitSecret, result);
+        Assert.True(lastCircuit.HasPendingPersistedCircuitState);
+    }
+
+    private static (Mock<ISingleClientProxy>, ComponentHub) InitializeComponentHub(
+        TestServerComponentDeserializer deserializer = null,
+        ICircuitHandleRegistry handleRegistry = null,
+        ICircuitPersistenceProvider provider = null)
+    {
+        deserializer ??= new TestServerComponentDeserializer();
         var ephemeralDataProtectionProvider = new EphemeralDataProtectionProvider();
-        var circuitIdFactory = new CircuitIdFactory(ephemeralDataProtectionProvider);
+        var circuitPersistenceManager = new CircuitPersistenceManager(
+            Options.Create(new CircuitOptions()),
+            new Endpoints.ServerComponentSerializer(ephemeralDataProtectionProvider),
+            provider ?? Mock.Of<ICircuitPersistenceProvider>(),
+            ephemeralDataProtectionProvider);
+
+        var circuitIdFactory = TestCircuitIdFactory.Instance;
         var circuitFactory = new TestCircuitFactory(
             new Mock<IServiceScopeFactory>().Object,
             NullLoggerFactory.Instance,
@@ -112,15 +298,15 @@ private static (Mock<ISingleClientProxy>, ComponentHub) InitializeComponentHub()
         var circuitRegistry = new CircuitRegistry(
             Options.Create(new CircuitOptions()),
             NullLogger<CircuitRegistry>.Instance,
-            circuitIdFactory);
-        var serializer = new TestServerComponentDeserializer();
-        var circuitHandleRegistry = new TestCircuitHandleRegistry();
+            circuitIdFactory, circuitPersistenceManager);
+        var circuitHandleRegistry = handleRegistry ?? new TestCircuitHandleRegistry();
         var hub = new ComponentHub(
-            serializer: serializer,
+            serializer: deserializer,
             dataProtectionProvider: ephemeralDataProtectionProvider,
             circuitFactory: circuitFactory,
             circuitIdFactory: circuitIdFactory,
             circuitRegistry: circuitRegistry,
+            circuitPersistenceProvider: circuitPersistenceManager,
             circuitHandleRegistry: circuitHandleRegistry,
             logger: NullLogger<ComponentHub>.Instance);
 
@@ -131,6 +317,8 @@ private static (Mock<ISingleClientProxy>, ComponentHub) InitializeComponentHub()
         mockCaller.Setup(x => x.Caller).Returns(mockClientProxy.Object);
         hub.Clients = mockCaller.Object;
         var mockContext = new Mock<HubCallerContext>();
+        var items = new Dictionary<object, object>();
+        mockContext.Setup(x => x.Items).Returns(items);
         var feature = new FeatureCollection();
         var httpContextFeature = new Mock<IHttpContextFeature>();
         httpContextFeature.Setup(x => x.HttpContext).Returns(() => new DefaultHttpContext());
@@ -145,20 +333,19 @@ private static (Mock<ISingleClientProxy>, ComponentHub) InitializeComponentHub()
     private class TestCircuitHandleRegistry : ICircuitHandleRegistry
     {
         private bool circuitSet = false;
+        private CircuitHost _circuitHost;
+        private CircuitHandle _circuitHandle;
 
         public CircuitHandle GetCircuitHandle(IDictionary<object, object> circuitHandles, object circuitKey)
         {
-            return null;
+            return _circuitHandle;
         }
 
         public CircuitHost GetCircuit(IDictionary<object, object> circuitHandles, object circuitKey)
         {
             if (circuitSet)
             {
-                var serviceScope = new Mock<IServiceScope>();
-                var circuitHost = TestCircuitHost.Create(
-                    serviceScope: new AsyncServiceScope(serviceScope.Object));
-                return circuitHost;
+                return _circuitHost;
             }
             return null;
         }
@@ -166,21 +353,42 @@ public CircuitHost GetCircuit(IDictionary<object, object> circuitHandles, object
         public void SetCircuit(IDictionary<object, object> circuitHandles, object circuitKey, CircuitHost circuitHost)
         {
             circuitSet = true;
+            _circuitHost = circuitHost;
+            _circuitHandle = new CircuitHandle { CircuitHost = circuitHost };
+
             return;
         }
     }
 
     private class TestServerComponentDeserializer : IServerComponentDeserializer
     {
+        public delegate bool TestTryDeserializeRootComponentOperations(string serializedComponentOperations, out RootComponentOperationBatch operationsWithDescriptors, bool deserializeDescriptors = true);
+        public delegate bool TestTryDeserializeWebRootComponentDescriptor(ComponentMarker record, [NotNullWhen(true)] out WebRootComponentDescriptor result);
+
+        public TestTryDeserializeRootComponentOperations OnTryDeserializeTestComponentOperations { get; set; }
+
         public bool TryDeserializeComponentDescriptorCollection(string serializedComponentRecords, out List<ComponentDescriptor> descriptors)
         {
             descriptors = default;
             return true;
         }
 
-        public bool TryDeserializeRootComponentOperations(string serializedComponentOperations, out RootComponentOperationBatch operationsWithDescriptors)
+        public bool TryDeserializeRootComponentOperations(string serializedComponentOperations, out RootComponentOperationBatch operationsWithDescriptors, bool deserializeDescriptors = true)
         {
-            operationsWithDescriptors = default;
+            if (OnTryDeserializeTestComponentOperations != null)
+            {
+                return OnTryDeserializeTestComponentOperations(serializedComponentOperations, out operationsWithDescriptors, deserializeDescriptors);
+            }
+            else
+            {
+                operationsWithDescriptors = default;
+                return true;
+            }
+        }
+
+        public bool TryDeserializeWebRootComponentDescriptor(ComponentMarker record, [NotNullWhen(true)] out WebRootComponentDescriptor result)
+        {
+            result = default;
             return true;
         }
     }
@@ -205,8 +413,13 @@ public ValueTask<CircuitHost> CreateCircuitHostAsync(
             IPersistentComponentStateStore store,
             ResourceAssetCollection resourceCollection)
         {
+            var clientProxy = new CircuitClientProxy(Mock.Of<ISingleClientProxy>(), "123");
+
             var serviceScope = new Mock<IServiceScope>();
-            var circuitHost = TestCircuitHost.Create(serviceScope: new AsyncServiceScope(serviceScope.Object));
+            var circuitHost = TestCircuitHost.Create(
+                circuitId: TestCircuitIdFactory.Instance.CreateCircuitId(),
+                serviceScope: new AsyncServiceScope(serviceScope.Object),
+                clientProxy: clientProxy);
             return ValueTask.FromResult(circuitHost);
         }
     }
diff --git a/src/Components/Server/test/Circuits/DefaultInMemoryCircuitPersistenceProviderTest.cs b/src/Components/Server/test/Circuits/DefaultInMemoryCircuitPersistenceProviderTest.cs
new file mode 100644
index 000000000000..26abca17d1fe
--- /dev/null
+++ b/src/Components/Server/test/Circuits/DefaultInMemoryCircuitPersistenceProviderTest.cs
@@ -0,0 +1,184 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Server.Circuits;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Components.Server.Tests.Circuits;
+
+public class DefaultInMemoryCircuitPersistenceProviderTest
+{
+    [Fact]
+    public async Task PersistCircuitAsync_StoresCircuitState()
+    {
+        // Arrange
+        var clock = new TestSystemClock();
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var persistedState = new PersistedCircuitState();
+        var provider = CreateProvider(clock);
+
+        // Act
+        await provider.PersistCircuitAsync(circuitId, persistedState);
+
+        // Assert
+        var result = await provider.RestoreCircuitAsync(circuitId);
+        Assert.Same(persistedState, result);
+    }
+
+    [Fact]
+    public async Task RestoreCircuitAsync_ReturnsNull_WhenCircuitDoesNotExist()
+    {
+        // Arrange
+        var clock = new TestSystemClock();
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var provider = CreateProvider(clock);
+
+        // Act
+        var result = await provider.RestoreCircuitAsync(circuitId);
+
+        // Assert
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task RestoreCircuitAsync_RemovesCircuitFromCache()
+    {
+        // Arrange
+        var clock = new TestSystemClock();
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var persistedState = new PersistedCircuitState();
+        var provider = CreateProvider(clock);
+
+        await provider.PersistCircuitAsync(circuitId, persistedState);
+
+        // Act
+        var firstResult = await provider.RestoreCircuitAsync(circuitId);
+        var secondResult = await provider.RestoreCircuitAsync(circuitId);
+
+        // Assert
+        Assert.Same(persistedState, firstResult);
+        Assert.Null(secondResult); // Second attempt should return null as the entry should be removed
+    }
+
+    [Fact]
+    public async Task CircuitStateIsEvictedAfterConfiguredTimeout()
+    {
+        // Arrange
+        var clock = new TestSystemClock();
+        var circuitOptions = new CircuitOptions
+        {
+            PersistedCircuitInMemoryRetentionPeriod = TimeSpan.FromSeconds(2)
+        };
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var persistedState = new PersistedCircuitState();
+        var provider = CreateProvider(clock, circuitOptions);
+        var postEvictionCallback = provider.PostEvictionCallback.EvictionCallback;
+        var callbackRan = new TaskCompletionSource();
+        provider.PostEvictionCallback = new PostEvictionCallbackRegistration
+        {
+            EvictionCallback = (key, value, reason, state) =>
+            {
+                callbackRan.SetResult();
+                postEvictionCallback(key, value, reason, state);
+            }
+        };
+
+        await provider.PersistCircuitAsync(circuitId, persistedState);
+
+        // Act - advance the clock past the retention period
+        clock.UtcNow = clock.UtcNow.AddSeconds(2);
+
+        // Allow time for the timer to fire and the eviction to occur
+        await callbackRan.Task;
+
+        // Assert
+        var result = await provider.RestoreCircuitAsync(circuitId);
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task CircuitStatesAreLimitedByConfiguredCapacity()
+    {
+        // Arrange
+        var clock = new TestSystemClock();
+        var circuitOptions = new CircuitOptions
+        {
+            PersistedCircuitInMemoryMaxRetained = 2 // Only allow 2 circuits to be stored
+        };
+        var provider = CreateProvider(clock, circuitOptions);
+        var factory = TestCircuitIdFactory.CreateTestFactory();
+
+        var evictedKeys = new List<string>();
+        var evictionTcs = new TaskCompletionSource();
+        var postEvictionCallback = provider.PostEvictionCallback.EvictionCallback;
+        provider.PostEvictionCallback = new PostEvictionCallbackRegistration
+        {
+            EvictionCallback = (key, value, reason, state) =>
+            {
+                evictedKeys.Add((string)key);
+                evictionTcs.TrySetResult();
+                postEvictionCallback(key, value, reason, state);
+            }
+        };
+
+        var circuitId1 = factory.CreateCircuitId();
+        var circuitId2 = factory.CreateCircuitId();
+        var circuitId3 = factory.CreateCircuitId();
+        var circuitIds = new Dictionary<string, CircuitId>
+        {
+            [circuitId1.Secret] = circuitId1,
+            [circuitId2.Secret] = circuitId2,
+            [circuitId3.Secret] = circuitId3
+        };
+
+        var state1 = new PersistedCircuitState();
+        var state2 = new PersistedCircuitState();
+        var state3 = new PersistedCircuitState();
+
+        // Act - persist 3 circuits when capacity is 2
+        await provider.PersistCircuitAsync(circuitId1, state1);
+        await provider.PersistCircuitAsync(circuitId2, state2);
+        await provider.PersistCircuitAsync(circuitId3, state3);
+
+        // Wait for eviction to occur
+        await evictionTcs.Task;
+
+        // Assert
+        var evicted = Assert.Single(evictedKeys);
+        var evictedId = circuitIds[evicted];
+
+        circuitIds.Remove(evicted);
+
+        var evictedResults = await provider.RestoreCircuitAsync(evictedId);
+        Assert.Null(evictedResults);
+
+        var nonEvictedResults = await Task.WhenAll(circuitIds.Select(ne => provider.RestoreCircuitAsync(ne.Value)));
+
+        Assert.Collection(nonEvictedResults,
+            Assert.NotNull,
+            Assert.NotNull);
+    }
+
+    private static DefaultInMemoryCircuitPersistenceProvider CreateProvider(
+        ISystemClock clock,
+        CircuitOptions options = null)
+    {
+        return new DefaultInMemoryCircuitPersistenceProvider(
+            clock,
+            NullLogger<ICircuitPersistenceProvider>.Instance,
+            Options.Create(options ?? new CircuitOptions()));
+    }
+
+    private class TestSystemClock : ISystemClock
+    {
+        public TestSystemClock()
+        {
+            UtcNow = new DateTimeOffset(2020, 1, 1, 0, 0, 0, TimeSpan.Zero);
+        }
+
+        public DateTimeOffset UtcNow { get; set; }
+    }
+}
diff --git a/src/Components/Server/test/Circuits/HybridCacheCircuitPersistenceProviderTest.cs b/src/Components/Server/test/Circuits/HybridCacheCircuitPersistenceProviderTest.cs
new file mode 100644
index 000000000000..ade8e56eb769
--- /dev/null
+++ b/src/Components/Server/test/Circuits/HybridCacheCircuitPersistenceProviderTest.cs
@@ -0,0 +1,107 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Server.Circuits;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Hybrid;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+
+namespace Microsoft.AspNetCore.Components.Server.Tests.Circuits;
+
+public class HybridCacheCircuitPersistenceProviderTest
+{
+    [Fact]
+    public async Task CanPersistAndRestoreState()
+    {
+        // Arrange
+        var hybridCache = CreateHybridCache();
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var persistedState = new PersistedCircuitState()
+        {
+            RootComponents = [1, 2, 3],
+            ApplicationState = new Dictionary<string, byte[]> {
+                { "key1", new byte[] { 4, 5, 6 } },
+                { "key2", new byte[] { 7, 8, 9 } }
+            }
+        };
+        var provider = CreateProvider(hybridCache);
+
+        // Act
+        await provider.PersistCircuitAsync(circuitId, persistedState);
+
+        // Assert
+        var result = await provider.RestoreCircuitAsync(circuitId);
+        Assert.NotNull(result);
+        Assert.Equal(persistedState.RootComponents, result.RootComponents);
+        Assert.Equal(persistedState.ApplicationState, result.ApplicationState);
+    }
+
+    [Fact]
+    public async Task RestoreCircuitAsync_ReturnsNull_WhenCircuitDoesNotExist()
+    {
+        // Arrange
+        var hybridCache = CreateHybridCache();
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var provider = CreateProvider(hybridCache);
+        var cacheKey = circuitId.Secret;
+
+        // Act
+        var result = await provider.RestoreCircuitAsync(circuitId);
+
+        // Assert
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task RestoreCircuitAsync_RemovesCircuitFromCache()
+    {
+        // Arrange
+        var hybridCache = CreateHybridCache();
+        var circuitId = TestCircuitIdFactory.CreateTestFactory().CreateCircuitId();
+        var persistedState = new PersistedCircuitState()
+        {
+            RootComponents = [1, 2, 3],
+            ApplicationState = new Dictionary<string, byte[]> {
+                { "key1", new byte[] { 4, 5, 6 } },
+                { "key2", new byte[] { 7, 8, 9 } }
+            }
+        };
+
+        var provider = CreateProvider(hybridCache);
+        var cacheKey = circuitId.Secret;
+
+        await provider.PersistCircuitAsync(circuitId, persistedState);
+
+        // Act
+        var result1 = await provider.RestoreCircuitAsync(circuitId);
+        var result2 = await provider.RestoreCircuitAsync(circuitId);
+
+        // Assert
+        Assert.NotNull(result1);
+        Assert.Equal(persistedState.RootComponents, result1.RootComponents);
+        Assert.Equal(persistedState.ApplicationState, result1.ApplicationState);
+
+        Assert.Null(result2); // Circuit should be removed after first restore
+    }
+
+    private HybridCache CreateHybridCache()
+    {
+        return new ServiceCollection()
+            .AddHybridCache().Services
+            .BuildServiceProvider()
+            .GetRequiredService<HybridCache>();
+    }
+
+    private static HybridCacheCircuitPersistenceProvider CreateProvider(
+        HybridCache hybridCache,
+        CircuitOptions options = null)
+    {
+        return new HybridCacheCircuitPersistenceProvider(
+            hybridCache,
+            NullLogger<ICircuitPersistenceProvider>.Instance,
+            Options.Create(options ?? new CircuitOptions()));
+    }
+}
diff --git a/src/Components/Server/test/Circuits/RemoteJSDataStreamTest.cs b/src/Components/Server/test/Circuits/RemoteJSDataStreamTest.cs
index dac28c3acea4..e737cedbe7c3 100644
--- a/src/Components/Server/test/Circuits/RemoteJSDataStreamTest.cs
+++ b/src/Components/Server/test/Circuits/RemoteJSDataStreamTest.cs
@@ -287,6 +287,61 @@ public async Task ReceiveData_ReceivesDataThenTimesout_StreamDisposed()
         Assert.False(success);
     }
 
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void ValueLinkedCts_Works_WhenOneTokenCannotBeCanceled(bool isToken1Cancelable)
+    {
+        var cts = new CancellationTokenSource();
+        var token1 = isToken1Cancelable ? cts.Token : CancellationToken.None;
+        var token2 = isToken1Cancelable ? CancellationToken.None : cts.Token;
+
+        using var linkedCts = RemoteJSDataStream.ValueLinkedCancellationTokenSource.Create(token1, token2);
+
+        Assert.False(linkedCts.HasLinkedCancellationTokenSource);
+        Assert.False(linkedCts.Token.IsCancellationRequested);
+
+        cts.Cancel();
+
+        Assert.True(linkedCts.Token.IsCancellationRequested);
+    }
+
+    [Fact]
+    public void ValueLinkedCts_Works_WhenBothTokensCannotBeCanceled()
+    {
+        using var linkedCts = RemoteJSDataStream.ValueLinkedCancellationTokenSource.Create(
+            CancellationToken.None,
+            CancellationToken.None);
+
+        Assert.False(linkedCts.HasLinkedCancellationTokenSource);
+        Assert.False(linkedCts.Token.IsCancellationRequested);
+    }
+
+    [Theory]
+    [InlineData(false, true)]
+    [InlineData(true, false)]
+    [InlineData(true, true)]
+    public void ValueLinkedCts_Works_WhenBothTokensCanBeCanceled(bool shouldCancelToken1, bool shouldCancelToken2)
+    {
+        var cts1 = new CancellationTokenSource();
+        var cts2 = new CancellationTokenSource();
+        using var linkedCts = RemoteJSDataStream.ValueLinkedCancellationTokenSource.Create(cts1.Token, cts2.Token);
+
+        Assert.True(linkedCts.HasLinkedCancellationTokenSource);
+        Assert.False(linkedCts.Token.IsCancellationRequested);
+
+        if (shouldCancelToken1)
+        {
+            cts1.Cancel();
+        }
+        if (shouldCancelToken2)
+        {
+            cts2.Cancel();
+        }
+
+        Assert.True(linkedCts.Token.IsCancellationRequested);
+    }
+
     private static async Task<RemoteJSDataStream> CreateRemoteJSDataStreamAsync(TestRemoteJSRuntime jsRuntime = null)
     {
         var jsStreamReference = Mock.Of<IJSStreamReference>();
diff --git a/src/Components/Server/test/Circuits/RemoteRendererTest.cs b/src/Components/Server/test/Circuits/RemoteRendererTest.cs
index 9ca641979610..92839155eb42 100644
--- a/src/Components/Server/test/Circuits/RemoteRendererTest.cs
+++ b/src/Components/Server/test/Circuits/RemoteRendererTest.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -126,6 +127,7 @@ public async Task ProducesNewBatch_WhenABatchGetsAcknowledged()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61807")]
     public async Task ProcessBufferedRenderBatches_WritesRenders()
     {
         // Arrange
@@ -137,7 +139,7 @@ public async Task ProcessBufferedRenderBatches_WritesRenders()
         var secondBatchTCS = new TaskCompletionSource();
         var thirdBatchTCS = new TaskCompletionSource();
 
-        var initialClient = new Mock<IClientProxy>();
+        var initialClient = new Mock<ISingleClientProxy>();
         initialClient.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string name, object[] value, CancellationToken token) => renderIds.Add((long)value[0]))
             .Returns(firstBatchTCS.Task);
@@ -150,7 +152,7 @@ public async Task ProcessBufferedRenderBatches_WritesRenders()
             builder.CloseElement();
         });
 
-        var client = new Mock<IClientProxy>();
+        var client = new Mock<ISingleClientProxy>();
         client.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string name, object[] value, CancellationToken token) => renderIds.Add((long)value[0]))
             .Returns<string, object[], CancellationToken>((n, v, t) => (long)v[0] == 3 ? secondBatchTCS.Task : thirdBatchTCS.Task);
@@ -183,7 +185,9 @@ public async Task ProcessBufferedRenderBatches_WritesRenders()
 
         // Assert
         Assert.Equal(new long[] { 2, 3, 4 }, renderIds);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(task.Wait(3000), "One or more render batches weren't acknowledged");
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         await task;
     }
@@ -195,7 +199,7 @@ public async Task OnRenderCompletedAsync_DoesNotThrowWhenReceivedDuplicateAcks()
         var serviceProvider = CreateServiceProvider();
         var firstBatchTCS = new TaskCompletionSource();
         var secondBatchTCS = new TaskCompletionSource();
-        var offlineClient = new CircuitClientProxy(new Mock<IClientProxy>(MockBehavior.Strict).Object, "offline-client");
+        var offlineClient = new CircuitClientProxy(new Mock<ISingleClientProxy>(MockBehavior.Strict).Object, "offline-client");
         offlineClient.SetDisconnected();
         var renderer = GetRemoteRenderer(serviceProvider, offlineClient);
         RenderFragment initialContent = (builder) =>
@@ -206,7 +210,7 @@ public async Task OnRenderCompletedAsync_DoesNotThrowWhenReceivedDuplicateAcks()
         };
         var trigger = new Trigger();
         var renderIds = new List<long>();
-        var onlineClient = new Mock<IClientProxy>();
+        var onlineClient = new Mock<ISingleClientProxy>();
         onlineClient.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string name, object[] value, CancellationToken token) => renderIds.Add((long)value[1]))
             .Returns<string, object[], CancellationToken>((n, v, t) => (long)v[1] == 2 ? firstBatchTCS.Task : secondBatchTCS.Task);
@@ -258,7 +262,7 @@ public async Task OnRenderCompletedAsync_DoesNotThrowWhenThereAreNoPendingBatche
         var serviceProvider = CreateServiceProvider();
         var firstBatchTCS = new TaskCompletionSource();
         var secondBatchTCS = new TaskCompletionSource();
-        var offlineClient = new CircuitClientProxy(new Mock<IClientProxy>(MockBehavior.Strict).Object, "offline-client");
+        var offlineClient = new CircuitClientProxy(new Mock<ISingleClientProxy>(MockBehavior.Strict).Object, "offline-client");
         offlineClient.SetDisconnected();
         var renderer = GetRemoteRenderer(serviceProvider, offlineClient);
         RenderFragment initialContent = (builder) =>
@@ -269,7 +273,7 @@ public async Task OnRenderCompletedAsync_DoesNotThrowWhenThereAreNoPendingBatche
         };
         var trigger = new Trigger();
         var renderIds = new List<long>();
-        var onlineClient = new Mock<IClientProxy>();
+        var onlineClient = new Mock<ISingleClientProxy>();
         onlineClient.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string name, object[] value, CancellationToken token) => renderIds.Add((long)value[1]))
             .Returns<string, object[], CancellationToken>((n, v, t) => (long)v[1] == 2 ? firstBatchTCS.Task : secondBatchTCS.Task);
@@ -323,7 +327,7 @@ public async Task ConsumesAllPendingBatchesWhenReceivingAHigherSequenceBatchId()
         var secondBatchTCS = new TaskCompletionSource();
         var renderIds = new List<long>();
 
-        var onlineClient = new Mock<IClientProxy>();
+        var onlineClient = new Mock<ISingleClientProxy>();
         onlineClient.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string name, object[] value, CancellationToken token) => renderIds.Add((long)value[1]))
             .Returns<string, object[], CancellationToken>((n, v, t) => (long)v[1] == 2 ? firstBatchTCS.Task : secondBatchTCS.Task);
@@ -380,7 +384,7 @@ public async Task ThrowsIfWeReceivedAnAcknowledgeForANeverProducedBatch()
         var secondBatchTCS = new TaskCompletionSource();
         var renderIds = new List<long>();
 
-        var onlineClient = new Mock<IClientProxy>();
+        var onlineClient = new Mock<ISingleClientProxy>();
         onlineClient.Setup(c => c.SendCoreAsync(It.IsAny<string>(), It.IsAny<object[]>(), It.IsAny<CancellationToken>()))
             .Callback((string name, object[] value, CancellationToken token) => renderIds.Add((long)value[1]))
             .Returns<string, object[], CancellationToken>((n, v, t) => (long)v[1] == 2 ? firstBatchTCS.Task : secondBatchTCS.Task);
@@ -644,7 +648,7 @@ private TestRemoteRenderer GetRemoteRenderer(IServiceProvider serviceProvider, C
         var serverComponentDeserializer = new ServerComponentDeserializer(
             _ephemeralDataProtectionProvider,
             NullLogger<ServerComponentDeserializer>.Instance,
-            new RootComponentTypeCache(),
+            new RootTypeCache(),
             new ComponentParameterDeserializer(
                 NullLogger<ComponentParameterDeserializer>.Instance,
                 new ComponentParametersTypeCache()));
@@ -765,7 +769,13 @@ public Task SetParametersAsync(ParameterView parameters)
         public void TriggerRender()
         {
             var task = _renderHandle.Dispatcher.InvokeAsync(() => _renderHandle.Render(_renderFragment));
-            Assert.True(task.IsCompletedSuccessfully);
+
+            // Log the task state for debugging purposes.
+            var status = task.Status;
+            var innerException = task.Exception?.InnerException;
+            var message = $"Render task should succeed synchronously.\nStatus: '{status}'\nInner exception: '{innerException}'";
+
+            Assert.True(task.IsCompletedSuccessfully, message);
         }
     }
 
diff --git a/src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProviderTest.cs b/src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProviderTest.cs
index 0bc62316ebf7..483fc9f667d6 100644
--- a/src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProviderTest.cs
+++ b/src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProviderTest.cs
@@ -173,9 +173,11 @@ public async Task SuppliesCancellationTokenThatSignalsWhenRevalidationLoopIsBein
         Assert.Equal("different user", (await provider.GetAuthenticationStateAsync()).User.Identity.Name);
 
         // Subsequent revalidation can complete successfully
+        // We are checking all new logs because the revalidation loop iteration
+        // may happen multiple times (this made the test flaky in the past)
         await provider.NextValidateAuthenticationStateAsyncCall;
-        Assert.Collection(provider.RevalidationCallLog.Skip(1),
-             call => Assert.Equal("different user", call.AuthenticationState.User.Identity.Name));
+        Assert.All(provider.RevalidationCallLog.Skip(1),
+            call => Assert.Equal("different user", call.AuthenticationState.User.Identity.Name));
     }
 
     [Fact]
diff --git a/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs b/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs
index d9adcd29ba33..0d04a3135dfe 100644
--- a/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs
+++ b/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs
@@ -156,7 +156,7 @@ public void CanParseMultipleMarkersWithAndWithoutParameters()
     public void DoesNotParseOutOfOrderMarkers()
     {
         // Arrange
-        var markers = SerializeMarkers(CreateMarkers(typeof(TestComponent), typeof(TestComponent)).Reverse().ToArray());
+        var markers = SerializeMarkers(Enumerable.Reverse(CreateMarkers(typeof(TestComponent), typeof(TestComponent))).ToArray());
         var serverComponentDeserializer = CreateServerComponentDeserializer();
 
         // Act & assert
@@ -436,7 +436,7 @@ private ServerComponentDeserializer CreateServerComponentDeserializer()
         return new ServerComponentDeserializer(
             _ephemeralDataProtectionProvider,
             NullLogger<ServerComponentDeserializer>.Instance,
-            new RootComponentTypeCache(),
+            new RootTypeCache(),
             new ComponentParameterDeserializer(NullLogger<ComponentParameterDeserializer>.Instance, new ComponentParametersTypeCache()));
     }
 
diff --git a/src/Components/Server/test/Circuits/TestCircuitHost.cs b/src/Components/Server/test/Circuits/TestCircuitHost.cs
index c0b09cb45189..558503aa2ffd 100644
--- a/src/Components/Server/test/Circuits/TestCircuitHost.cs
+++ b/src/Components/Server/test/Circuits/TestCircuitHost.cs
@@ -1,6 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -13,8 +17,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits;
 
 internal class TestCircuitHost : CircuitHost
 {
-    private TestCircuitHost(CircuitId circuitId, AsyncServiceScope scope, CircuitOptions options, CircuitClientProxy client, RemoteRenderer renderer, IReadOnlyList<ComponentDescriptor> descriptors, RemoteJSRuntime jsRuntime, RemoteNavigationManager navigationManager, CircuitHandler[] circuitHandlers, ILogger logger)
-        : base(circuitId, scope, options, client, renderer, descriptors, jsRuntime, navigationManager, circuitHandlers, logger)
+    private TestCircuitHost(CircuitId circuitId, AsyncServiceScope scope, CircuitOptions options, CircuitClientProxy client, RemoteRenderer renderer, IReadOnlyList<ComponentDescriptor> descriptors, RemoteJSRuntime jsRuntime, RemoteNavigationManager navigationManager, CircuitHandler[] circuitHandlers, CircuitMetrics circuitMetrics, CircuitActivitySource circuitActivitySource, ILogger logger)
+        : base(circuitId, scope, options, client, renderer, descriptors, jsRuntime, navigationManager, circuitHandlers, circuitMetrics, circuitActivitySource, logger)
     {
     }
 
@@ -26,20 +30,29 @@ public static CircuitHost Create(
         CircuitHandler[] handlers = null,
         CircuitClientProxy clientProxy = null)
     {
-        serviceScope = serviceScope ?? new AsyncServiceScope(Mock.Of<IServiceScope>());
-        clientProxy = clientProxy ?? new CircuitClientProxy(Mock.Of<IClientProxy>(), Guid.NewGuid().ToString());
+        clientProxy = clientProxy ?? new CircuitClientProxy(Mock.Of<ISingleClientProxy>(), Guid.NewGuid().ToString());
         var jsRuntime = new RemoteJSRuntime(Options.Create(new CircuitOptions()), Options.Create(new HubOptions<ComponentHub>()), Mock.Of<ILogger<RemoteJSRuntime>>());
         var navigationManager = new RemoteNavigationManager(Mock.Of<ILogger<RemoteNavigationManager>>());
-        var serviceProvider = new Mock<IServiceProvider>();
-        serviceProvider
-            .Setup(services => services.GetService(typeof(IJSRuntime)))
-            .Returns(jsRuntime);
+        var componentsActivitySource = new ComponentsActivitySource();
+        var circuitActivitySource = new CircuitActivitySource();
+        var persistenceManager = new ComponentStatePersistenceManager(
+            NullLogger<ComponentStatePersistenceManager>.Instance,
+            new ServiceCollection().BuildServiceProvider());
+        var serviceProvider = new ServiceCollection()
+            .AddSingleton<IJSRuntime>(jsRuntime)
+            .AddSingleton(componentsActivitySource)
+            .AddSingleton(persistenceManager)
+            .AddSingleton(circuitActivitySource)
+            .BuildServiceProvider();
+        serviceScope ??= serviceProvider.CreateAsyncScope();
+
         var serverComponentDeserializer = Mock.Of<IServerComponentDeserializer>();
+        var circuitMetrics = new CircuitMetrics(new TestMeterFactory());
 
         if (remoteRenderer == null)
         {
             remoteRenderer = new RemoteRenderer(
-                serviceProvider.Object,
+                serviceProvider,
                 NullLoggerFactory.Instance,
                 new CircuitOptions(),
                 clientProxy,
@@ -48,6 +61,8 @@ public static CircuitHost Create(
                 jsRuntime,
                 new CircuitJSComponentInterop(new CircuitOptions()));
         }
+        var linkstore = new Infrastructure.Server.ComponentsActivityLinkStore(remoteRenderer);
+        circuitActivitySource.Init(linkstore);
 
         handlers ??= Array.Empty<CircuitHandler>();
         return new TestCircuitHost(
@@ -60,6 +75,8 @@ public static CircuitHost Create(
             jsRuntime,
             navigationManager,
             handlers,
+            circuitMetrics,
+            circuitActivitySource,
             NullLogger<CircuitHost>.Instance);
     }
 }
diff --git a/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs b/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs
index ffe7bc20dc62..32b286b522a0 100644
--- a/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs
+++ b/src/Components/Server/test/Circuits/TestCircuitIdFactory.cs
@@ -7,6 +7,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits;
 
 internal class TestCircuitIdFactory
 {
+    public static CircuitIdFactory Instance { get; } = CreateTestFactory();
+
     public static CircuitIdFactory CreateTestFactory()
     {
         return new CircuitIdFactory(new EphemeralDataProtectionProvider());
diff --git a/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs b/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs
index fc5e66e2479c..5d28dae0be1a 100644
--- a/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs
+++ b/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs
@@ -85,12 +85,11 @@ public void MapBlazorHub_AppliesFinalConventionToEachBuilder()
         Assert.True(called);
         // Final conventions are applied to each of the builders
         // in the Blazor component hub
-        Assert.Equal(5, buildersAffected.Count);
+        Assert.Equal(4, buildersAffected.Count);
         Assert.Contains("/_blazor/negotiate", buildersAffected);
         Assert.Contains("/_blazor", buildersAffected);
         Assert.Contains("Blazor disconnect", buildersAffected);
         Assert.Contains("Blazor initializers", buildersAffected);
-        Assert.Contains("Blazor static files", buildersAffected);
     }
 
     [Fact]
diff --git a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj
index 487cc73b8990..2ed7219f993f 100644
--- a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj
+++ b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -7,6 +7,8 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.Server" />
     <Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
+    <Reference Include="Microsoft.Extensions.Caching.Hybrid" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -14,13 +16,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
+
     <Compile Include="$(SignalRTestBase)HubMessageHelpers.cs" LinkBase="BlazorPack" />
     <Compile Include="$(SignalRTestBase)MessagePackHubProtocolTestBase.cs" LinkBase="BlazorPack" />
     <Compile Include="$(SignalRTestBase)TestBinder.cs" LinkBase="BlazorPack" />
     <Compile Include="$(SignalRTestBase)TestHubMessageEqualityComparer.cs" LinkBase="BlazorPack" />
 
-    <Compile Include="$(RepoRoot)src\Components\Endpoints\src\DependencyInjection\ServerComponentSerializer.cs" LinkBase="Endpoints" />
-    <Compile Include="$(RepoRoot)src\Components\Endpoints\src\DependencyInjection\ServerComponentInvocationSequence.cs" LinkBase="Endpoints" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Server/test/ProtectedBrowserStorageTest.cs b/src/Components/Server/test/ProtectedBrowserStorageTest.cs
index 89da1b351874..0b0c7d426bde 100644
--- a/src/Components/Server/test/ProtectedBrowserStorageTest.cs
+++ b/src/Components/Server/test/ProtectedBrowserStorageTest.cs
@@ -352,19 +352,54 @@ private static string ProtectionPrefix(string purpose)
 
     class TestJSRuntime : IJSRuntime
     {
-        public List<(string Identifier, object[] Args)> Invocations { get; }
-            = new List<(string Identifier, object[] Args)>();
+        public List<(string Identifier, object[] Args, JSCallType CallType)> Invocations { get; } = [];
 
         public object NextInvocationResult { get; set; }
 
         public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args)
         {
-            Invocations.Add((identifier, args));
+            Invocations.Add((identifier, args, JSCallType.FunctionCall));
             return (ValueTask<TValue>)NextInvocationResult;
         }
 
         public ValueTask<TValue> InvokeAsync<TValue>(string identifier, object[] args)
             => InvokeAsync<TValue>(identifier, cancellationToken: CancellationToken.None, args: args);
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object[] args)
+        {
+            Invocations.Add((identifier, args, JSCallType.ConstructorCall));
+            return (ValueTask<IJSObjectReference>)NextInvocationResult;
+        }
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object[] args)
+        {
+            Invocations.Add((identifier, args, JSCallType.ConstructorCall));
+            return (ValueTask<IJSObjectReference>)NextInvocationResult;
+        }
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier)
+        {
+            Invocations.Add((identifier, [], JSCallType.GetValue));
+            return (ValueTask<TValue>)NextInvocationResult;
+        }
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken)
+        {
+            Invocations.Add((identifier, [], JSCallType.GetValue));
+            return (ValueTask<TValue>)NextInvocationResult;
+        }
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value)
+        {
+            Invocations.Add((identifier, [value], JSCallType.SetValue));
+            return ValueTask.CompletedTask;
+        }
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+        {
+            Invocations.Add((identifier, [value], JSCallType.SetValue));
+            return ValueTask.CompletedTask;
+        }
     }
 
     class TestProtectedBrowserStorage : ProtectedBrowserStorage
diff --git a/src/Components/Shared.JS/tsconfig.json b/src/Components/Shared.JS/tsconfig.json
index 042fb6b1cdd6..c45bdc70ab1a 100644
--- a/src/Components/Shared.JS/tsconfig.json
+++ b/src/Components/Shared.JS/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "target": "ES2022",
+    "target": "ES2024",
     "module": "ESNext",
-    "lib": [ "DOM", "ES2022" ],
+    "lib": [ "DOM", "ES2024" ],
     "strict": true,
     "forceConsistentCasingInFileNames": true
   }
diff --git a/src/Components/Shared/src/DefaultAntiforgeryStateProvider.cs b/src/Components/Shared/src/DefaultAntiforgeryStateProvider.cs
index 6a3d926a73a2..b1cd18e8ce0e 100644
--- a/src/Components/Shared/src/DefaultAntiforgeryStateProvider.cs
+++ b/src/Components/Shared/src/DefaultAntiforgeryStateProvider.cs
@@ -1,39 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Components.Web;
-
 namespace Microsoft.AspNetCore.Components.Forms;
 
-internal class DefaultAntiforgeryStateProvider : AntiforgeryStateProvider, IDisposable
+internal class DefaultAntiforgeryStateProvider : AntiforgeryStateProvider
 {
-    private const string PersistenceKey = $"__internal__{nameof(AntiforgeryRequestToken)}";
-    private readonly PersistingComponentStateSubscription _subscription;
-    private readonly AntiforgeryRequestToken? _currentToken;
+    protected AntiforgeryRequestToken? _currentToken;
 
-    [UnconditionalSuppressMessage(
-    "Trimming",
-    "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code",
-    Justification = $"{nameof(DefaultAntiforgeryStateProvider)} uses the {nameof(PersistentComponentState)} APIs to deserialize the token, which are already annotated.")]
-    public DefaultAntiforgeryStateProvider(PersistentComponentState state)
+    [PersistentState]
+    public AntiforgeryRequestToken? CurrentToken
     {
-        // Automatically flow the Request token to server/wasm through
-        // persistent component state. This guarantees that the antiforgery
-        // token is available on the interactive components, even when they
-        // don't have access to the request.
-        _subscription = state.RegisterOnPersisting(() =>
-        {
-            state.PersistAsJson(PersistenceKey, GetAntiforgeryToken());
-            return Task.CompletedTask;
-        }, RenderMode.InteractiveAuto);
-
-        state.TryTakeFromJson(PersistenceKey, out _currentToken);
+        get => _currentToken ??= GetAntiforgeryToken();
+        set => _currentToken = value;
     }
 
     /// <inheritdoc />
     public override AntiforgeryRequestToken? GetAntiforgeryToken() => _currentToken;
-
-    /// <inheritdoc />
-    public void Dispose() => _subscription.Dispose();
 }
diff --git a/src/Components/Shared/src/ExpressionFormatting/ExpressionFormatter.cs b/src/Components/Shared/src/ExpressionFormatting/ExpressionFormatter.cs
index 73eea91e128d..fa2febd3754e 100644
--- a/src/Components/Shared/src/ExpressionFormatting/ExpressionFormatter.cs
+++ b/src/Components/Shared/src/ExpressionFormatting/ExpressionFormatter.cs
@@ -14,7 +14,10 @@ internal static class ExpressionFormatter
 {
     static ExpressionFormatter()
     {
-        HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
     }
 
     internal const int StackAllocBufferSize = 128;
diff --git a/src/Components/Shared/src/ExpressionFormatting/ReverseStringBuilder.cs b/src/Components/Shared/src/ExpressionFormatting/ReverseStringBuilder.cs
index 223942c9ad9f..8cedb6b715a6 100644
--- a/src/Components/Shared/src/ExpressionFormatting/ReverseStringBuilder.cs
+++ b/src/Components/Shared/src/ExpressionFormatting/ReverseStringBuilder.cs
@@ -17,7 +17,7 @@ internal ref struct ReverseStringBuilder
     private SequenceSegment? _fallbackSequenceSegment;
 
     // For testing.
-    internal int SequenceSegmentCount => _fallbackSequenceSegment?.Count() ?? 0;
+    internal readonly int SequenceSegmentCount => _fallbackSequenceSegment?.Count() ?? 0;
 
     public ReverseStringBuilder(int conservativeEstimatedStringLength)
     {
@@ -33,7 +33,7 @@ public ReverseStringBuilder(Span<char> initialBuffer)
         _nextEndIndex = _currentBuffer.Length;
     }
 
-    public bool Empty => _nextEndIndex == _currentBuffer.Length;
+    public readonly bool Empty => _nextEndIndex == _currentBuffer.Length;
 
     public void InsertFront(scoped ReadOnlySpan<char> span)
     {
@@ -60,13 +60,13 @@ public void InsertFront(scoped ReadOnlySpan<char> span)
             var newBuffer = s_arrayPool.Rent(sizeToRent);
             _fallbackSequenceSegment = new(newBuffer);
 
-            _nextEndIndex = newBuffer.Length - _currentBuffer.Length;
-            _currentBuffer.CopyTo(newBuffer.AsSpan()[_nextEndIndex..]);
-            _currentBuffer = newBuffer;
+            var newEndIndex = newBuffer.Length - _currentBuffer.Length + _nextEndIndex;
+            _currentBuffer[_nextEndIndex..].CopyTo(newBuffer.AsSpan(newEndIndex));
+            newEndIndex -= span.Length;
+            span.CopyTo(newBuffer.AsSpan(newEndIndex));
 
-            startIndex = _nextEndIndex - span.Length;
-            span.CopyTo(_currentBuffer[startIndex..]);
-            _nextEndIndex = startIndex;
+            _currentBuffer = newBuffer;
+            _nextEndIndex = newEndIndex;
         }
         else
         {
diff --git a/src/Components/Shared/src/HotReloadManager.cs b/src/Components/Shared/src/HotReloadManager.cs
index b760a65004b9..f3ca59cf2651 100644
--- a/src/Components/Shared/src/HotReloadManager.cs
+++ b/src/Components/Shared/src/HotReloadManager.cs
@@ -25,4 +25,7 @@ internal sealed class HotReloadManager
     /// MetadataUpdateHandler event. This is invoked by the hot reload host via reflection.
     /// </summary>
     public static void UpdateApplication(Type[]? _) => Default.OnDeltaApplied?.Invoke();
+
+    // For testing purposes only
+    internal void TriggerOnDeltaApplied() => OnDeltaApplied?.Invoke();
 }
diff --git a/src/Components/Shared/src/JsonSerializerOptionsProvider.cs b/src/Components/Shared/src/JsonSerializerOptionsProvider.cs
index b8b60805feed..334c0927f4f6 100644
--- a/src/Components/Shared/src/JsonSerializerOptionsProvider.cs
+++ b/src/Components/Shared/src/JsonSerializerOptionsProvider.cs
@@ -11,5 +11,6 @@ internal static class JsonSerializerOptionsProvider
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         PropertyNameCaseInsensitive = true,
+        IncludeFields = true,
     };
 }
diff --git a/src/Components/Shared/src/ResourceCollectionProvider.cs b/src/Components/Shared/src/ResourceCollectionProvider.cs
index 78ebef9d13d2..2084abdb3e53 100644
--- a/src/Components/Shared/src/ResourceCollectionProvider.cs
+++ b/src/Components/Shared/src/ResourceCollectionProvider.cs
@@ -11,36 +11,27 @@ namespace Microsoft.AspNetCore.Components;
 
 internal class ResourceCollectionProvider
 {
-    private const string ResourceCollectionUrlKey = "__ResourceCollectionUrl";
     private string? _url;
-    private ResourceAssetCollection? _resourceCollection;
-    private readonly PersistentComponentState _state;
-    private readonly IJSRuntime _jsRuntime;
 
-    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Strings are not trimmed")]
-    public ResourceCollectionProvider(PersistentComponentState state, IJSRuntime jsRuntime)
+    [PersistentState]
+    public string? ResourceCollectionUrl
     {
-        _state = state;
-        _jsRuntime = jsRuntime;
-        _ = _state.TryTakeFromJson(ResourceCollectionUrlKey, out _url);
+        get => _url;
+        set
+        {
+            if (_url != null)
+            {
+                throw new InvalidOperationException("The resource collection URL has already been set.");
+            }
+            _url = value;
+        }
     }
 
-    [MemberNotNull(nameof(_url))]
-    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Strings are not trimmed")]
-    internal void SetResourceCollectionUrl(string url)
+    private ResourceAssetCollection? _resourceCollection;
+    private readonly IJSRuntime _jsRuntime;
+    public ResourceCollectionProvider(IJSRuntime jsRuntime)
     {
-        if (_url != null)
-        {
-            throw new InvalidOperationException("The resource collection URL has already been set.");
-        }
-        _url = url;
-        PersistingComponentStateSubscription registration = default;
-        registration = _state.RegisterOnPersisting(() =>
-        {
-            _state.PersistAsJson(ResourceCollectionUrlKey, _url);
-            registration.Dispose();
-            return Task.CompletedTask;
-        }, RenderMode.InteractiveWebAssembly);
+        _jsRuntime = jsRuntime;
     }
 
     internal async Task<ResourceAssetCollection> GetResourceCollection()
diff --git a/src/Components/Shared/src/RootComponentOperation.cs b/src/Components/Shared/src/RootComponentOperation.cs
index 0248481edae3..7bdfa2b1fa2b 100644
--- a/src/Components/Shared/src/RootComponentOperation.cs
+++ b/src/Components/Shared/src/RootComponentOperation.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+using System.Linq;
 using System.Text.Json.Serialization;
 
 namespace Microsoft.AspNetCore.Components;
@@ -22,6 +24,7 @@ internal sealed class RootComponentOperation
     public WebRootComponentDescriptor? Descriptor { get; set; }
 }
 
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 internal sealed class WebRootComponentDescriptor(
     Type componentType,
     WebRootComponentParameters parameters)
@@ -29,4 +32,10 @@ internal sealed class WebRootComponentDescriptor(
     public Type ComponentType { get; } = componentType;
 
     public WebRootComponentParameters Parameters { get; } = parameters;
+
+    private string GetDebuggerDisplay()
+    {
+        var parameters = string.Join(", ", Parameters.Parameters.ToDictionary().Select(p => $"{p.Key}: {p.Value}"));
+        return $"{ComponentType.FullName}({parameters})";
+    }
 }
diff --git a/src/Components/Shared/src/RootComponentOperationBatch.cs b/src/Components/Shared/src/RootComponentOperationBatch.cs
index 31d969364338..b5410c17c525 100644
--- a/src/Components/Shared/src/RootComponentOperationBatch.cs
+++ b/src/Components/Shared/src/RootComponentOperationBatch.cs
@@ -1,11 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+
 namespace Microsoft.AspNetCore.Components;
 
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 internal sealed class RootComponentOperationBatch
 {
     public long BatchId { get; set; }
 
     public required RootComponentOperation[] Operations { get; set; }
+
+    private string GetDebuggerDisplay()
+    {
+        return $"{nameof(RootComponentOperationBatch)}: {BatchId}, Operations Count: {Operations.Length}";
+    }
 }
diff --git a/src/Components/Shared/src/RootComponentTypeCache.cs b/src/Components/Shared/src/RootTypeCache.cs
similarity index 80%
rename from src/Components/Shared/src/RootComponentTypeCache.cs
rename to src/Components/Shared/src/RootTypeCache.cs
index ce4ceba5104e..016ab5acd814 100644
--- a/src/Components/Shared/src/RootComponentTypeCache.cs
+++ b/src/Components/Shared/src/RootTypeCache.cs
@@ -1,18 +1,41 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Components.HotReload;
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
+#if COMPONENTS
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+#else
 namespace Microsoft.AspNetCore.Components;
+#endif
 
 // A cache for root component types
-internal sealed class RootComponentTypeCache
+internal sealed class RootTypeCache : IDisposable
 {
     private readonly ConcurrentDictionary<Key, Type?> _typeToKeyLookUp = new();
 
-    public Type? GetRootComponent(string assembly, string type)
+    public RootTypeCache()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
+    internal void ClearCache() => _typeToKeyLookUp.Clear();
+
+    public void Dispose()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied -= ClearCache;
+        }
+    }
+
+    public Type? GetRootType(string assembly, string type)
     {
         var key = new Key(assembly, type);
         if (_typeToKeyLookUp.TryGetValue(key, out var resolvedType))
diff --git a/src/Components/Shared/src/WebRootComponentManager.cs b/src/Components/Shared/src/WebRootComponentManager.cs
index 8720cdd11105..1d52a56e6af0 100644
--- a/src/Components/Shared/src/WebRootComponentManager.cs
+++ b/src/Components/Shared/src/WebRootComponentManager.cs
@@ -31,6 +31,7 @@ public WebRootComponentManager GetOrCreateWebRootComponentManager()
     public sealed class WebRootComponentManager(Renderer renderer)
     {
         private readonly Dictionary<int, WebRootComponent> _webRootComponents = new();
+        private Task _currentUpdateTask = Task.CompletedTask;
 
         public async Task AddRootComponentAsync(
             int ssrComponentId,
@@ -52,7 +53,7 @@ public async Task AddRootComponentAsync(
 
             var component = WebRootComponent.Create(renderer, componentType, ssrComponentId, key, parameters);
             _webRootComponents.Add(ssrComponentId, component);
-
+            await _currentUpdateTask;
             await component.RenderAsync(renderer);
         }
 
@@ -63,7 +64,7 @@ public Task UpdateRootComponentAsync(
             WebRootComponentParameters newParameters)
         {
             var component = GetRequiredWebRootComponent(ssrComponentId);
-            return component.UpdateAsync(renderer, newComponentType, newKey, newParameters);
+            return component.UpdateAsync(renderer, newComponentType, newKey, newParameters, _currentUpdateTask);
         }
 
         public void RemoveRootComponent(int ssrComponentId)
@@ -83,6 +84,35 @@ private WebRootComponent GetRequiredWebRootComponent(int ssrComponentId)
             return component;
         }
 
+#if COMPONENTS_SERVER
+        internal IEnumerable<(int id, ComponentMarkerKey key, (Type componentType, ParameterView parameters))> GetRootComponents()
+        {
+            foreach (var (id, (_, key, type, parameters)) in _webRootComponents)
+            {
+                yield return (id, key, (type, parameters));
+            }
+        }
+
+#endif
+        internal ComponentMarkerKey GetRootComponentKey(int componentId)
+        {
+            foreach (var (_, candidate) in _webRootComponents)
+            {
+                var (id, key, _, _) = candidate;
+                if (id == componentId)
+                {
+                    return key;
+                }
+            }
+
+            return default;
+        }
+
+        internal void SetCurrentUpdateTask(Task postStateTask)
+        {
+            _currentUpdateTask = postStateTask;
+        }
+
         private sealed class WebRootComponent
         {
             [DynamicallyAccessedMembers(Component)]
@@ -125,11 +155,24 @@ private WebRootComponent(
                 _latestParameters = initialParameters;
             }
 
+            public void Deconstruct(
+                out int interactiveComponentId,
+                out ComponentMarkerKey key,
+                out Type componentType,
+                out ParameterView parameters)
+            {
+                interactiveComponentId = _interactiveComponentId;
+                key = _key;
+                componentType = _componentType;
+                parameters = _latestParameters.Parameters;
+            }
+
             public Task UpdateAsync(
                 Renderer renderer,
                 [DynamicallyAccessedMembers(Component)] Type newComponentType,
                 ComponentMarkerKey? newKey,
-                WebRootComponentParameters newParameters)
+                WebRootComponentParameters newParameters,
+                Task currentUpdateTask)
             {
                 if (_componentType != newComponentType)
                 {
@@ -153,7 +196,7 @@ public Task UpdateAsync(
                     // We can supply new parameters if the key has a @key value, because that means the client
                     // opted in to dynamic parameter updates.
                     _latestParameters = newParameters;
-                    return RenderAsync(renderer);
+                    return RenderAsync(renderer, currentUpdateTask);
                 }
                 else
                 {
@@ -171,13 +214,21 @@ public Task UpdateAsync(
                         renderer.RemoveRootComponent(_interactiveComponentId);
                         _interactiveComponentId = renderer.AddRootComponent(_componentType, _ssrComponentIdString);
                         _latestParameters = newParameters;
-                        return RenderAsync(renderer);
+                        return RenderAsync(renderer, currentUpdateTask);
                     }
                 }
             }
 
             public Task RenderAsync(Renderer renderer)
-                => renderer.RenderRootComponentAsync(_interactiveComponentId, _latestParameters.Parameters);
+            {
+                return renderer.RenderRootComponentAsync(_interactiveComponentId, _latestParameters.Parameters);
+            }
+
+            public async Task RenderAsync(Renderer renderer, Task updateTask)
+            {
+                await updateTask;
+                await renderer.RenderRootComponentAsync(_interactiveComponentId, _latestParameters.Parameters);
+            }
 
             public void Remove(Renderer renderer)
             {
diff --git a/src/Components/Web.JS/.gitignore b/src/Components/Web.JS/.gitignore
index ab3d00a89cc0..afce87ca650e 100644
--- a/src/Components/Web.JS/.gitignore
+++ b/src/Components/Web.JS/.gitignore
@@ -1,4 +1,2 @@
 node_modules/
-dist/Debug/
-dist/Release/blazor.webassembly.js
-dist/Release/blazor.webview.js
+dist/
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
deleted file mode 100644
index 24e89e80d28b..000000000000
--- a/src/Components/Web.JS/dist/Release/blazor.server.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";var e,t,n;!function(e){const t=[],n="__jsObjectId",o="__dotNetObject",r="__byte[]",i="__dotNetStream",s="__jsStreamReferenceLength";let a,c;class l{constructor(e){this._jsObject=e,this._cachedFunctions=new Map}findFunction(e){const t=this._cachedFunctions.get(e);if(t)return t;let n,o=this._jsObject;if(e.split(".").forEach((t=>{if(!(t in o))throw new Error(`Could not find '${e}' ('${t}' was undefined).`);n=o,o=o[t]})),o instanceof Function)return o=o.bind(n),this._cachedFunctions.set(e,o),o;throw new Error(`The value '${e}' is not a function.`)}getWrappedObject(){return this._jsObject}}const h=0,d={[h]:new l(window)};d[0]._cachedFunctions.set("import",(e=>("string"==typeof e&&e.startsWith("./")&&(e=new URL(e.substr(2),document.baseURI).toString()),import(e))));let u,p=1;function f(e){t.push(e)}function g(e){if(e&&"object"==typeof e){d[p]=new l(e);const t={[n]:p};return p++,t}throw new Error(`Cannot create a JSObjectReference from the value '${e}'.`)}function m(e){let t=-1;if(e instanceof ArrayBuffer&&(e=new Uint8Array(e)),e instanceof Blob)t=e.size;else{if(!(e.buffer instanceof ArrayBuffer))throw new Error("Supplied value is not a typed array or blob.");if(void 0===e.byteLength)throw new Error(`Cannot create a JSStreamReference from the value '${e}' as it doesn't have a byteLength.`);t=e.byteLength}const o={[s]:t};try{const t=g(e);o[n]=t[n]}catch(t){throw new Error(`Cannot create a JSStreamReference from the value '${e}'.`)}return o}function y(e,n){c=e;const o=n?JSON.parse(n,((e,n)=>t.reduce(((t,n)=>n(e,t)),n))):null;return c=void 0,o}function v(){if(void 0===a)throw new Error("No call dispatcher has been set.");if(null===a)throw new Error("There are multiple .NET runtimes present, so a default dispatcher could not be resolved. Use DotNetObject to invoke .NET instance methods.");return a}e.attachDispatcher=function(e){const t=new w(e);return void 0===a?a=t:a&&(a=null),t},e.attachReviver=f,e.invokeMethod=function(e,t,...n){return v().invokeDotNetStaticMethod(e,t,...n)},e.invokeMethodAsync=function(e,t,...n){return v().invokeDotNetStaticMethodAsync(e,t,...n)},e.createJSObjectReference=g,e.createJSStreamReference=m,e.disposeJSObjectReference=function(e){const t=e&&e[n];"number"==typeof t&&S(t)},function(e){e[e.Default=0]="Default",e[e.JSObjectReference=1]="JSObjectReference",e[e.JSStreamReference=2]="JSStreamReference",e[e.JSVoidResult=3]="JSVoidResult"}(u=e.JSCallResultType||(e.JSCallResultType={}));class w{constructor(e){this._dotNetCallDispatcher=e,this._byteArraysToBeRevived=new Map,this._pendingDotNetToJSStreams=new Map,this._pendingAsyncCalls={},this._nextAsyncCallId=1}getDotNetCallDispatcher(){return this._dotNetCallDispatcher}invokeJSFromDotNet(e,t,n,o){const r=y(this,t),i=k(b(e,o)(...r||[]),n);return null==i?null:D(this,i)}beginInvokeJSFromDotNet(e,t,n,o,r){const i=new Promise((e=>{const o=y(this,n);e(b(t,r)(...o||[]))}));e&&i.then((t=>D(this,[e,!0,k(t,o)]))).then((t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!0,t)),(t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!1,JSON.stringify([e,!1,_(t)]))))}endInvokeDotNetFromJS(e,t,n){const o=t?y(this,n):new Error(n);this.completePendingCall(parseInt(e,10),t,o)}invokeDotNetStaticMethod(e,t,...n){return this.invokeDotNetMethod(e,t,null,n)}invokeDotNetStaticMethodAsync(e,t,...n){return this.invokeDotNetMethodAsync(e,t,null,n)}invokeDotNetMethod(e,t,n,o){if(this._dotNetCallDispatcher.invokeDotNetFromJS){const r=D(this,o),i=this._dotNetCallDispatcher.invokeDotNetFromJS(e,t,n,r);return i?y(this,i):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeDotNetMethodAsync instead.")}invokeDotNetMethodAsync(e,t,n,o){if(e&&n)throw new Error(`For instance method calls, assemblyName should be null. Received '${e}'.`);const r=this._nextAsyncCallId++,i=new Promise(((e,t)=>{this._pendingAsyncCalls[r]={resolve:e,reject:t}}));try{const i=D(this,o);this._dotNetCallDispatcher.beginInvokeDotNetFromJS(r,e,t,n,i)}catch(e){this.completePendingCall(r,!1,e)}return i}receiveByteArray(e,t){this._byteArraysToBeRevived.set(e,t)}processByteArray(e){const t=this._byteArraysToBeRevived.get(e);return t?(this._byteArraysToBeRevived.delete(e),t):null}supplyDotNetStream(e,t){if(this._pendingDotNetToJSStreams.has(e)){const n=this._pendingDotNetToJSStreams.get(e);this._pendingDotNetToJSStreams.delete(e),n.resolve(t)}else{const n=new I;n.resolve(t),this._pendingDotNetToJSStreams.set(e,n)}}getDotNetStreamPromise(e){let t;if(this._pendingDotNetToJSStreams.has(e))t=this._pendingDotNetToJSStreams.get(e).streamPromise,this._pendingDotNetToJSStreams.delete(e);else{const n=new I;this._pendingDotNetToJSStreams.set(e,n),t=n.streamPromise}return t}completePendingCall(e,t,n){if(!this._pendingAsyncCalls.hasOwnProperty(e))throw new Error(`There is no pending async call with ID ${e}.`);const o=this._pendingAsyncCalls[e];delete this._pendingAsyncCalls[e],t?o.resolve(n):o.reject(n)}}function _(e){return e instanceof Error?`${e.message}\n${e.stack}`:e?e.toString():"null"}function b(e,t){const n=d[t];if(n)return n.findFunction(e);throw new Error(`JS object instance with ID ${t} does not exist (has it been disposed?).`)}function S(e){delete d[e]}e.findJSFunction=b,e.disposeJSObjectReferenceById=S;class E{constructor(e,t){this._id=e,this._callDispatcher=t}invokeMethod(e,...t){return this._callDispatcher.invokeDotNetMethod(null,e,this._id,t)}invokeMethodAsync(e,...t){return this._callDispatcher.invokeDotNetMethodAsync(null,e,this._id,t)}dispose(){this._callDispatcher.invokeDotNetMethodAsync(null,"__Dispose",this._id,null).catch((e=>console.error(e)))}serializeAsArg(){return{[o]:this._id}}}e.DotNetObject=E,f((function(e,t){if(t&&"object"==typeof t){if(t.hasOwnProperty(o))return new E(t[o],c);if(t.hasOwnProperty(n)){const e=t[n],o=d[e];if(o)return o.getWrappedObject();throw new Error(`JS object instance with Id '${e}' does not exist. It may have been disposed.`)}if(t.hasOwnProperty(r)){const e=t[r],n=c.processByteArray(e);if(void 0===n)throw new Error(`Byte array index '${e}' does not exist.`);return n}if(t.hasOwnProperty(i)){const e=t[i],n=c.getDotNetStreamPromise(e);return new C(n)}}return t}));class C{constructor(e){this._streamPromise=e}stream(){return this._streamPromise}async arrayBuffer(){return new Response(await this.stream()).arrayBuffer()}}class I{constructor(){this.streamPromise=new Promise(((e,t)=>{this.resolve=e,this.reject=t}))}}function k(e,t){switch(t){case u.Default:return e;case u.JSObjectReference:return g(e);case u.JSStreamReference:return m(e);case u.JSVoidResult:return null;default:throw new Error(`Invalid JS call result type '${t}'.`)}}let T=0;function D(e,t){T=0,c=e;const n=JSON.stringify(t,R);return c=void 0,n}function R(e,t){if(t instanceof E)return t.serializeAsArg();if(t instanceof Uint8Array){c.getDotNetCallDispatcher().sendByteArray(T,t);const e={[r]:T};return T++,e}return t}}(e||(e={})),function(e){e[e.prependFrame=1]="prependFrame",e[e.removeFrame=2]="removeFrame",e[e.setAttribute=3]="setAttribute",e[e.removeAttribute=4]="removeAttribute",e[e.updateText=5]="updateText",e[e.stepIn=6]="stepIn",e[e.stepOut=7]="stepOut",e[e.updateMarkup=8]="updateMarkup",e[e.permutationListEntry=9]="permutationListEntry",e[e.permutationListEnd=10]="permutationListEnd"}(t||(t={})),function(e){e[e.element=1]="element",e[e.text=2]="text",e[e.attribute=3]="attribute",e[e.component=4]="component",e[e.region=5]="region",e[e.elementReferenceCapture=6]="elementReferenceCapture",e[e.markup=8]="markup",e[e.namedEvent=10]="namedEvent"}(n||(n={}));class o{constructor(e,t){this.componentId=e,this.fieldValue=t}static fromEvent(e,t){const n=t.target;if(n instanceof Element){const t=function(e){return e instanceof HTMLInputElement?e.type&&"checkbox"===e.type.toLowerCase()?{value:e.checked}:{value:e.value}:e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement?{value:e.value}:null}(n);if(t)return new o(e,t.value)}return null}}const r=new Map,i=new Map,s=[];function a(e){return r.get(e)}function c(e){const t=r.get(e);return t?.browserEventName||e}function l(e,t){e.forEach((e=>r.set(e,t)))}function h(e){const t=[];for(let n=0;n<e.length;n++){const o=e[n];t.push({identifier:o.identifier,clientX:o.clientX,clientY:o.clientY,screenX:o.screenX,screenY:o.screenY,pageX:o.pageX,pageY:o.pageY})}return t}function d(e){return{detail:e.detail,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY,offsetX:e.offsetX,offsetY:e.offsetY,pageX:e.pageX,pageY:e.pageY,movementX:e.movementX,movementY:e.movementY,button:e.button,buttons:e.buttons,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey,type:e.type}}l(["input","change"],{createEventArgs:function(e){const t=e.target;if(function(e){return-1!==u.indexOf(e.getAttribute("type"))}(t)){const e=function(e){const t=e.value,n=e.type;switch(n){case"date":case"month":case"week":return t;case"datetime-local":return 16===t.length?t+":00":t;case"time":return 5===t.length?t+":00":t}throw new Error(`Invalid element type '${n}'.`)}(t);return{value:e}}if(function(e){return e instanceof HTMLSelectElement&&"select-multiple"===e.type}(t)){const e=t;return{value:Array.from(e.options).filter((e=>e.selected)).map((e=>e.value))}}{const e=function(e){return!!e&&"INPUT"===e.tagName&&"checkbox"===e.getAttribute("type")}(t);return{value:e?!!t.checked:t.value}}}}),l(["copy","cut","paste"],{createEventArgs:e=>({type:e.type})}),l(["drag","dragend","dragenter","dragleave","dragover","dragstart","drop"],{createEventArgs:e=>{return{...d(t=e),dataTransfer:t.dataTransfer?{dropEffect:t.dataTransfer.dropEffect,effectAllowed:t.dataTransfer.effectAllowed,files:Array.from(t.dataTransfer.files).map((e=>e.name)),items:Array.from(t.dataTransfer.items).map((e=>({kind:e.kind,type:e.type}))),types:t.dataTransfer.types}:null};var t}}),l(["focus","blur","focusin","focusout"],{createEventArgs:e=>({type:e.type})}),l(["keydown","keyup","keypress"],{createEventArgs:e=>{return{key:(t=e).key,code:t.code,location:t.location,repeat:t.repeat,ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type,isComposing:t.isComposing};var t}}),l(["contextmenu","click","mouseover","mouseout","mousemove","mousedown","mouseup","mouseleave","mouseenter","dblclick"],{createEventArgs:e=>d(e)}),l(["error"],{createEventArgs:e=>{return{message:(t=e).message,filename:t.filename,lineno:t.lineno,colno:t.colno,type:t.type};var t}}),l(["loadstart","timeout","abort","load","loadend","progress"],{createEventArgs:e=>{return{lengthComputable:(t=e).lengthComputable,loaded:t.loaded,total:t.total,type:t.type};var t}}),l(["touchcancel","touchend","touchmove","touchenter","touchleave","touchstart"],{createEventArgs:e=>{return{detail:(t=e).detail,touches:h(t.touches),targetTouches:h(t.targetTouches),changedTouches:h(t.changedTouches),ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type};var t}}),l(["gotpointercapture","lostpointercapture","pointercancel","pointerdown","pointerenter","pointerleave","pointermove","pointerout","pointerover","pointerup"],{createEventArgs:e=>{return{...d(t=e),pointerId:t.pointerId,width:t.width,height:t.height,pressure:t.pressure,tiltX:t.tiltX,tiltY:t.tiltY,pointerType:t.pointerType,isPrimary:t.isPrimary};var t}}),l(["wheel","mousewheel"],{createEventArgs:e=>{return{...d(t=e),deltaX:t.deltaX,deltaY:t.deltaY,deltaZ:t.deltaZ,deltaMode:t.deltaMode};var t}}),l(["cancel","close","toggle"],{createEventArgs:()=>({})});const u=["date","datetime-local","month","time","week"],p=new Map;let f,g,m=0;const y={async add(e,t,n){if(!n)throw new Error("initialParameters must be an object, even if empty.");const o="__bl-dynamic-root:"+(++m).toString();p.set(o,e);const r=await _().invokeMethodAsync("AddRootComponent",t,o),i=new w(r,g[t]);return await i.setParameters(n),i}};class v{invoke(e){return this._callback(e)}setCallback(t){this._selfJSObjectReference||(this._selfJSObjectReference=e.createJSObjectReference(this)),this._callback=t}getJSObjectReference(){return this._selfJSObjectReference}dispose(){this._selfJSObjectReference&&e.disposeJSObjectReference(this._selfJSObjectReference)}}class w{constructor(e,t){this._jsEventCallbackWrappers=new Map,this._componentId=e;for(const e of t)"eventcallback"===e.type&&this._jsEventCallbackWrappers.set(e.name.toLowerCase(),new v)}setParameters(e){const t={},n=Object.entries(e||{}),o=n.length;for(const[e,o]of n){const n=this._jsEventCallbackWrappers.get(e.toLowerCase());n&&o?(n.setCallback(o),t[e]=n.getJSObjectReference()):t[e]=o}return _().invokeMethodAsync("SetRootComponentParameters",this._componentId,o,t)}async dispose(){if(null!==this._componentId){await _().invokeMethodAsync("RemoveRootComponent",this._componentId),this._componentId=null;for(const e of this._jsEventCallbackWrappers.values())e.dispose()}}}function _(){if(!f)throw new Error("Dynamic root components have not been enabled in this application.");return f}const b=new Map,S=[],E=new Map;function C(t,n,o,r){if(b.has(t))throw new Error(`Interop methods are already registered for renderer ${t}`);b.set(t,n),o&&r&&Object.keys(o).length>0&&function(t,n,o){if(f)throw new Error("Dynamic root components have already been enabled.");f=t,g=n;for(const[t,r]of Object.entries(o)){const o=e.findJSFunction(t,0);for(const e of r)o(e,n[e])}}(k(t),o,r),E.get(t)?.[0]?.(),function(e){for(const t of S)t(e)}(t)}function I(e,t,n){return T(e,t.eventHandlerId,(()=>k(e).invokeMethodAsync("DispatchEventAsync",t,n)))}function k(e){const t=b.get(e);if(!t)throw new Error(`No interop methods are registered for renderer ${e}`);return t}let T=(e,t,n)=>n();const D=M(["abort","blur","cancel","canplay","canplaythrough","change","close","cuechange","durationchange","emptied","ended","error","focus","load","loadeddata","loadedmetadata","loadend","loadstart","mouseenter","mouseleave","pointerenter","pointerleave","pause","play","playing","progress","ratechange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeupdate","toggle","unload","volumechange","waiting","DOMNodeInsertedIntoDocument","DOMNodeRemovedFromDocument"]),R={submit:!0},x=M(["click","dblclick","mousedown","mousemove","mouseup"]);class A{static{this.nextEventDelegatorId=0}constructor(e){this.browserRendererId=e,this.afterClickCallbacks=[];const t=++A.nextEventDelegatorId;this.eventsCollectionKey=`_blazorEvents_${t}`,this.eventInfoStore=new P(this.onGlobalEvent.bind(this))}setListener(e,t,n,o){const r=this.getEventHandlerInfosForElement(e,!0),i=r.getHandler(t);if(i)this.eventInfoStore.update(i.eventHandlerId,n);else{const i={element:e,eventName:t,eventHandlerId:n,renderingComponentId:o};this.eventInfoStore.add(i),r.setHandler(t,i)}}getHandler(e){return this.eventInfoStore.get(e)}removeListener(e){const t=this.eventInfoStore.remove(e);if(t){const e=t.element,n=this.getEventHandlerInfosForElement(e,!1);n&&n.removeHandler(t.eventName)}}notifyAfterClick(e){this.afterClickCallbacks.push(e),this.eventInfoStore.addGlobalListener("click")}setStopPropagation(e,t,n){this.getEventHandlerInfosForElement(e,!0).stopPropagation(t,n)}setPreventDefault(e,t,n){this.getEventHandlerInfosForElement(e,!0).preventDefault(t,n)}onGlobalEvent(e){if(!(e.target instanceof Element))return;this.dispatchGlobalEventToAllElements(e.type,e);const t=(n=e.type,i.get(n));var n;t&&t.forEach((t=>this.dispatchGlobalEventToAllElements(t,e))),"click"===e.type&&this.afterClickCallbacks.forEach((t=>t(e)))}dispatchGlobalEventToAllElements(e,t){const n=t.composedPath();let r=n.shift(),i=null,s=!1;const c=Object.prototype.hasOwnProperty.call(D,e);let l=!1;for(;r;){const u=r,p=this.getEventHandlerInfosForElement(u,!1);if(p){const n=p.getHandler(e);if(n&&(h=u,d=t.type,!((h instanceof HTMLButtonElement||h instanceof HTMLInputElement||h instanceof HTMLTextAreaElement||h instanceof HTMLSelectElement)&&Object.prototype.hasOwnProperty.call(x,d)&&h.disabled))){if(!s){const n=a(e);i=n?.createEventArgs?n.createEventArgs(t):{},s=!0}Object.prototype.hasOwnProperty.call(R,t.type)&&t.preventDefault(),I(this.browserRendererId,{eventHandlerId:n.eventHandlerId,eventName:e,eventFieldInfo:o.fromEvent(n.renderingComponentId,t)},i)}p.stopPropagation(e)&&(l=!0),p.preventDefault(e)&&t.preventDefault()}r=c||l?void 0:n.shift()}var h,d}getEventHandlerInfosForElement(e,t){return Object.prototype.hasOwnProperty.call(e,this.eventsCollectionKey)?e[this.eventsCollectionKey]:t?e[this.eventsCollectionKey]=new N:null}}class P{constructor(e){this.globalListener=e,this.infosByEventHandlerId={},this.countByEventName={},s.push(this.handleEventNameAliasAdded.bind(this))}add(e){if(this.infosByEventHandlerId[e.eventHandlerId])throw new Error(`Event ${e.eventHandlerId} is already tracked`);this.infosByEventHandlerId[e.eventHandlerId]=e,this.addGlobalListener(e.eventName)}get(e){return this.infosByEventHandlerId[e]}addGlobalListener(e){if(e=c(e),Object.prototype.hasOwnProperty.call(this.countByEventName,e))this.countByEventName[e]++;else{this.countByEventName[e]=1;const t=Object.prototype.hasOwnProperty.call(D,e);document.addEventListener(e,this.globalListener,t)}}update(e,t){if(Object.prototype.hasOwnProperty.call(this.infosByEventHandlerId,t))throw new Error(`Event ${t} is already tracked`);const n=this.infosByEventHandlerId[e];delete this.infosByEventHandlerId[e],n.eventHandlerId=t,this.infosByEventHandlerId[t]=n}remove(e){const t=this.infosByEventHandlerId[e];if(t){delete this.infosByEventHandlerId[e];const n=c(t.eventName);0==--this.countByEventName[n]&&(delete this.countByEventName[n],document.removeEventListener(n,this.globalListener))}return t}handleEventNameAliasAdded(e,t){if(Object.prototype.hasOwnProperty.call(this.countByEventName,e)){const n=this.countByEventName[e];delete this.countByEventName[e],document.removeEventListener(e,this.globalListener),this.addGlobalListener(t),this.countByEventName[t]+=n-1}}}class N{constructor(){this.handlers={},this.preventDefaultFlags=null,this.stopPropagationFlags=null}getHandler(e){return Object.prototype.hasOwnProperty.call(this.handlers,e)?this.handlers[e]:null}setHandler(e,t){this.handlers[e]=t}removeHandler(e){delete this.handlers[e]}preventDefault(e,t){return void 0!==t&&(this.preventDefaultFlags=this.preventDefaultFlags||{},this.preventDefaultFlags[e]=t),!!this.preventDefaultFlags&&this.preventDefaultFlags[e]}stopPropagation(e,t){return void 0!==t&&(this.stopPropagationFlags=this.stopPropagationFlags||{},this.stopPropagationFlags[e]=t),!!this.stopPropagationFlags&&this.stopPropagationFlags[e]}}function M(e){const t={};return e.forEach((e=>{t[e]=!0})),t}const U=Symbol(),B=Symbol(),L=Symbol();function $(e,t){if(U in e)return e;const n=[];if(e.childNodes.length>0){if(!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");e.childNodes.forEach((t=>{const o=$(t,!0);o[B]=e,n.push(o)}))}return e[U]=n,e}function O(e){const t=J(e);for(;t.length;)j(e,0)}function F(e,t){const n=document.createComment("!");return H(n,e,t),n}function H(e,t,n){const o=e;let r=e;if(e instanceof Comment){const t=J(o);if(t?.length>0){const t=G(o),n=new Range;n.setStartBefore(e),n.setEndAfter(t),r=n.extractContents()}}const i=W(o);if(i){const e=J(i),t=Array.prototype.indexOf.call(e,o);e.splice(t,1),delete o[B]}const s=J(t);if(n<s.length){const e=s[n];e.parentNode.insertBefore(r,e),s.splice(n,0,o)}else Y(r,t),s.push(o);o[B]=t,U in o||(o[U]=[])}function j(e,t){const n=J(e).splice(t,1)[0];if(n instanceof Comment){const e=J(n);if(e)for(;e.length>0;)j(n,0)}const o=n;o.parentNode.removeChild(o)}function W(e){return e[B]||null}function z(e,t){return J(e)[t]}function q(e){const t=X(e);return"http://www.w3.org/2000/svg"===t.namespaceURI&&"foreignObject"!==t.tagName}function J(e){return e[U]}function V(e){const t=J(W(e));return t[Array.prototype.indexOf.call(t,e)+1]||null}function K(e,t){const n=J(e);t.forEach((e=>{e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=G(e.moveRangeStart)})),t.forEach((t=>{const o=document.createComment("marker");t.moveToBeforeMarker=o;const r=n[t.toSiblingIndex+1];r?r.parentNode.insertBefore(o,r):Y(o,e)})),t.forEach((e=>{const t=e.moveToBeforeMarker,n=t.parentNode,o=e.moveRangeStart,r=e.moveRangeEnd;let i=o;for(;i;){const e=i.nextSibling;if(n.insertBefore(i,t),i===r)break;i=e}n.removeChild(t)})),t.forEach((e=>{n[e.toSiblingIndex]=e.moveRangeStart}))}function X(e){if(e instanceof Element||e instanceof DocumentFragment)return e;if(e instanceof Comment)return e.parentNode;throw new Error("Not a valid logical element")}function Y(e,t){if(t instanceof Element||t instanceof DocumentFragment)t.appendChild(e);else{if(!(t instanceof Comment))throw new Error(`Cannot append node because the parent is not a valid logical element. Parent: ${t}`);{const n=V(t);n?n.parentNode.insertBefore(e,n):Y(e,W(t))}}}function G(e){if(e instanceof Element||e instanceof DocumentFragment)return e;const t=V(e);if(t)return t.previousSibling;{const t=W(e);return t instanceof Element||t instanceof DocumentFragment?t.lastChild:G(t)}}function Q(e){return`_bl_${e}`}const Z="__internalId";e.attachReviver(((e,t)=>t&&"object"==typeof t&&Object.prototype.hasOwnProperty.call(t,Z)&&"string"==typeof t[Z]?function(e){const t=`[${Q(e)}]`;return document.querySelector(t)}(t[Z]):t));const ee="_blazorDeferredValue";function te(e){return"select-multiple"===e.type}function ne(e,t){e.value=t||""}function oe(e,t){e instanceof HTMLSelectElement?te(e)?function(e,t){t||=[];for(let n=0;n<e.options.length;n++)e.options[n].selected=-1!==t.indexOf(e.options[n].value)}(e,t):ne(e,t):e.value=t}function re(e){const t=function(e){for(;e;){if(e instanceof HTMLSelectElement)return e;e=e.parentElement}return null}(e);if(!function(e){return!!e&&ee in e}(t))return!1;if(te(t))e.selected=-1!==t._blazorDeferredValue.indexOf(e.value);else{if(t._blazorDeferredValue!==e.value)return!1;ne(t,e.value),delete t._blazorDeferredValue}return!0}const ie=document.createElement("template"),se=document.createElementNS("http://www.w3.org/2000/svg","g"),ae=new Set,ce=Symbol(),le=Symbol();class he{constructor(e){this.rootComponentIds=new Set,this.childComponentLocations={},this.eventDelegator=new A(e),this.eventDelegator.notifyAfterClick((e=>{Ie()&&function(e,t){if(0!==e.button||function(e){return e.ctrlKey||e.shiftKey||e.altKey||e.metaKey}(e))return;if(e.defaultPrevented)return;const n=function(e){const t=e.composedPath&&e.composedPath();if(t)for(let e=0;e<t.length;e++){const n=t[e];if(n instanceof HTMLAnchorElement||n instanceof SVGAElement)return n}return null}(e);if(n&&function(e){const t=e.getAttribute("target");return(!t||"_self"===t)&&e.hasAttribute("href")&&!e.hasAttribute("download")}(n)){const t=Ce(n.getAttribute("href"));_e(t)&&(e.preventDefault(),Ue(t,!0,!1))}}(e)}))}getRootComponentCount(){return this.rootComponentIds.size}attachRootComponentToLogicalElement(e,t,n){if(function(e){return e[ce]}(t))throw new Error(`Root component '${e}' could not be attached because its target element is already associated with a root component`);n&&(t=F(t,J(t).length)),de(t,!0),this.attachComponentToElement(e,t),this.rootComponentIds.add(e),ae.add(t)}updateComponent(e,t,n,o){const r=this.childComponentLocations[t];if(!r)throw new Error(`No element is currently associated with component ${t}`);ae.delete(r)&&(O(r),r instanceof Comment&&(r.textContent="!"));const i=X(r)?.getRootNode(),s=i&&i.activeElement;this.applyEdits(e,t,r,0,n,o),s instanceof HTMLElement&&i&&i.activeElement!==s&&s.focus()}disposeComponent(e){if(this.rootComponentIds.delete(e)){const t=this.childComponentLocations[e];de(t,!1),!0===t[le]?ae.add(t):O(t)}delete this.childComponentLocations[e]}disposeEventHandler(e){this.eventDelegator.removeListener(e)}attachComponentToElement(e,t){this.childComponentLocations[e]=t}applyEdits(e,n,o,r,i,s){let a,c=0,l=r;const h=e.arrayBuilderSegmentReader,d=e.editReader,u=e.frameReader,p=h.values(i),f=h.offset(i),g=f+h.count(i);for(let i=f;i<g;i++){const h=e.diffReader.editsEntry(p,i),f=d.editType(h);switch(f){case t.prependFrame:{const t=d.newTreeIndex(h),r=e.referenceFramesEntry(s,t),i=d.siblingIndex(h);this.insertFrame(e,n,o,l+i,s,r,t);break}case t.removeFrame:j(o,l+d.siblingIndex(h));break;case t.setAttribute:{const t=d.newTreeIndex(h),r=e.referenceFramesEntry(s,t),i=z(o,l+d.siblingIndex(h));if(!(i instanceof Element))throw new Error("Cannot set attribute on non-element child");this.applyAttribute(e,n,i,r);break}case t.removeAttribute:{const e=z(o,l+d.siblingIndex(h));if(!(e instanceof Element))throw new Error("Cannot remove attribute from non-element child");{const t=d.removedAttributeName(h);this.setOrRemoveAttributeOrProperty(e,t,null)}break}case t.updateText:{const t=d.newTreeIndex(h),n=e.referenceFramesEntry(s,t),r=z(o,l+d.siblingIndex(h));if(!(r instanceof Text))throw new Error("Cannot set text content on non-text child");r.textContent=u.textContent(n);break}case t.updateMarkup:{const t=d.newTreeIndex(h),n=e.referenceFramesEntry(s,t),r=d.siblingIndex(h);j(o,l+r),this.insertMarkup(e,o,l+r,n);break}case t.stepIn:o=z(o,l+d.siblingIndex(h)),c++,l=0;break;case t.stepOut:o=W(o),c--,l=0===c?r:0;break;case t.permutationListEntry:a=a||[],a.push({fromSiblingIndex:l+d.siblingIndex(h),toSiblingIndex:l+d.moveToSiblingIndex(h)});break;case t.permutationListEnd:K(o,a),a=void 0;break;default:throw new Error(`Unknown edit type: ${f}`)}}}insertFrame(e,t,o,r,i,s,a){const c=e.frameReader,l=c.frameType(s);switch(l){case n.element:return this.insertElement(e,t,o,r,i,s,a),1;case n.text:return this.insertText(e,o,r,s),1;case n.attribute:throw new Error("Attribute frames should only be present as leading children of element frames.");case n.component:return this.insertComponent(e,o,r,s),1;case n.region:return this.insertFrameRange(e,t,o,r,i,a+1,a+c.subtreeLength(s));case n.elementReferenceCapture:if(o instanceof Element)return h=o,d=c.elementReferenceCaptureId(s),h.setAttribute(Q(d),""),0;throw new Error("Reference capture frames can only be children of element frames.");case n.markup:return this.insertMarkup(e,o,r,s),1;case n.namedEvent:return 0;default:throw new Error(`Unknown frame type: ${l}`)}var h,d}insertElement(e,t,o,r,i,s,a){const c=e.frameReader,l=c.elementName(s),h="svg"===l||q(o)?document.createElementNS("http://www.w3.org/2000/svg",l):document.createElement(l),d=$(h);let u=!1;const p=a+c.subtreeLength(s);for(let s=a+1;s<p;s++){const a=e.referenceFramesEntry(i,s);if(c.frameType(a)!==n.attribute){H(h,o,r),u=!0,this.insertFrameRange(e,t,d,0,i,s,p);break}this.applyAttribute(e,t,h,a)}var f;u||H(h,o,r),(f=h)instanceof HTMLOptionElement?re(f):ee in f&&oe(f,f[ee])}insertComponent(e,t,n,o){const r=F(t,n),i=e.frameReader.componentId(o);this.attachComponentToElement(i,r)}insertText(e,t,n,o){const r=e.frameReader.textContent(o);H(document.createTextNode(r),t,n)}insertMarkup(e,t,n,o){const r=F(t,n),i=(s=e.frameReader.markupContent(o),q(t)?(se.innerHTML=s||" ",se):(ie.innerHTML=s||" ",ie.content.querySelectorAll("script").forEach((e=>{const t=document.createElement("script");t.textContent=e.textContent,e.getAttributeNames().forEach((n=>{t.setAttribute(n,e.getAttribute(n))})),e.parentNode.replaceChild(t,e)})),ie.content));var s;let a=0;for(;i.firstChild;)H(i.firstChild,r,a++)}applyAttribute(e,t,n,o){const r=e.frameReader,i=r.attributeName(o),s=r.attributeEventHandlerId(o);if(s){const e=pe(i);return void this.eventDelegator.setListener(n,e,s,t)}const a=r.attributeValue(o);this.setOrRemoveAttributeOrProperty(n,i,a)}insertFrameRange(e,t,n,o,r,i,s){const a=o;for(let a=i;a<s;a++){const i=e.referenceFramesEntry(r,a);o+=this.insertFrame(e,t,n,o,r,i,a),a+=ue(e,i)}return o-a}setOrRemoveAttributeOrProperty(e,t,n){(function(e,t,n){switch(t){case"value":return function(e,t){switch(t&&"INPUT"===e.tagName&&(t=function(e,t){switch(t.getAttribute("type")){case"time":return 8!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,5);case"datetime-local":return 19!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,16);default:return e}}(t,e)),e.tagName){case"INPUT":case"SELECT":case"TEXTAREA":return t&&e instanceof HTMLSelectElement&&te(e)&&(t=JSON.parse(t)),oe(e,t),e[ee]=t,!0;case"OPTION":return t||""===t?e.setAttribute("value",t):e.removeAttribute("value"),re(e),!0;default:return!1}}(e,n);case"checked":return function(e,t){return"INPUT"===e.tagName&&(e.checked=null!==t,!0)}(e,n);default:return!1}})(e,t,n)||(t.startsWith("__internal_")?this.applyInternalAttribute(e,t.substring(11),n):null!==n?e.setAttribute(t,n):e.removeAttribute(t))}applyInternalAttribute(e,t,n){if(t.startsWith("stopPropagation_")){const o=pe(t.substring(16));this.eventDelegator.setStopPropagation(e,o,null!==n)}else{if(!t.startsWith("preventDefault_"))throw new Error(`Unsupported internal attribute '${t}'`);{const o=pe(t.substring(15));this.eventDelegator.setPreventDefault(e,o,null!==n)}}}}function de(e,t){e[ce]=t}function ue(e,t){const o=e.frameReader;switch(o.frameType(t)){case n.component:case n.element:case n.region:return o.subtreeLength(t)-1;default:return 0}}function pe(e){if(e.startsWith("on"))return e.substring(2);throw new Error(`Attribute should be an event name, but doesn't start with 'on'. Value: '${e}'`)}const fe={};let ge,me,ye,ve,we=!1;function _e(e){const t=(n=document.baseURI).substring(0,n.lastIndexOf("/"));var n;const o=e.charAt(t.length);return e.startsWith(t)&&(""===o||"/"===o||"?"===o||"#"===o)}function be(e){document.getElementById(e)?.scrollIntoView()}function Se(){return void 0!==me}function Ee(e,t){if(!me)throw new Error("No enhanced programmatic navigation handler has been attached");me(e,t)}function Ce(e){return ve=ve||document.createElement("a"),ve.href=e,ve.href}function Ie(){return void 0!==ge}function ke(){return ge}let Te=!1,De=0,Re=0;const xe=new Map;let Ae=async function(e){$e();const t=je();if(t?.hasLocationChangingEventListeners){const n=e.state?._index??0,o=e.state?.userState,r=n-De,i=location.href;if(await Le(-r),!await Oe(i,o,!1,t))return;await Le(r)}await Fe(!0)},Pe=null;const Ne={listenForNavigationEvents:function(e,t,n){xe.set(e,{rendererId:e,hasLocationChangingEventListeners:!1,locationChanged:t,locationChanging:n}),Te||(Te=!0,window.addEventListener("popstate",He),De=history.state?._index??0,ye=(e,t)=>{Fe(t,e)})},enableNavigationInterception:function(e){if(void 0!==ge&&ge!==e)throw new Error("Only one interactive runtime may enable navigation interception at a time.");ge=e},setHasLocationChangingListeners:function(e,t){const n=xe.get(e);if(!n)throw new Error(`Renderer with ID '${e}' is not listening for navigation events`);n.hasLocationChangingEventListeners=t},endLocationChanging:function(e,t){Pe&&e===Re&&(Pe(t),Pe=null)},navigateTo:function(e,t){Me(e,t,!0)},refresh:function(e){!e&&Se()?Ee(location.href,!0):location.reload()},getBaseURI:()=>document.baseURI,getLocationHref:()=>location.href,scrollToElement:be};function Me(e,t,n=!1){const o=Ce(e);!t.forceLoad&&_e(o)?We()?Ue(o,!1,t.replaceHistoryEntry,t.historyEntryState,n):Ee(o,t.replaceHistoryEntry):function(e,t){if(location.href===e){const t=e+"?";history.replaceState(null,"",t),location.replace(e)}else t?location.replace(e):location.href=e}(e,t.replaceHistoryEntry)}async function Ue(e,t,n,o=void 0,r=!1){if($e(),function(e){const t=new URL(e);return""!==t.hash&&location.origin===t.origin&&location.pathname===t.pathname&&location.search===t.search}(e))return Be(e,n,o),void function(e){const t=e.indexOf("#");t!==e.length-1&&be(e.substring(t+1))}(e);const i=je();(r||!i?.hasLocationChangingEventListeners||await Oe(e,o,t,i))&&(we=!0,Be(e,n,o),await Fe(t))}function Be(e,t,n=void 0){t?history.replaceState({userState:n,_index:De},"",e):(De++,history.pushState({userState:n,_index:De},"",e))}function Le(e){return new Promise((t=>{const n=Ae;Ae=()=>{Ae=n,t()},history.go(e)}))}function $e(){Pe&&(Pe(!1),Pe=null)}function Oe(e,t,n,o){return new Promise((r=>{$e(),Re++,Pe=r,o.locationChanging(Re,e,t,n)}))}async function Fe(e,t){const n=t??location.href;await Promise.all(Array.from(xe,(async([t,o])=>{var r;r=t,b.has(r)&&await o.locationChanged(n,history.state?.userState,e)})))}async function He(e){Ae&&We()&&await Ae(e),De=history.state?._index??0}function je(){const e=ke();if(void 0!==e)return xe.get(e)}function We(){return Ie()||!Se()}const ze={focus:function(e,t){if(e instanceof HTMLElement)e.focus({preventScroll:t});else{if(!(e instanceof SVGElement))throw new Error("Unable to focus an invalid element.");if(!e.hasAttribute("tabindex"))throw new Error("Unable to focus an SVG element that does not have a tabindex.");e.focus({preventScroll:t})}},focusBySelector:function(e){const t=document.querySelector(e);t&&(t.hasAttribute("tabindex")||(t.tabIndex=-1),t.focus({preventScroll:!0}))}},qe={init:function(e,t,n,o=50){const r=Ve(t);(r||document.documentElement).style.overflowAnchor="none";const i=document.createRange();u(n.parentElement)&&(t.style.display="table-row",n.style.display="table-row");const s=new IntersectionObserver((function(o){o.forEach((o=>{if(!o.isIntersecting)return;i.setStartAfter(t),i.setEndBefore(n);const r=i.getBoundingClientRect().height,s=o.rootBounds?.height;o.target===t?e.invokeMethodAsync("OnSpacerBeforeVisible",o.intersectionRect.top-o.boundingClientRect.top,r,s):o.target===n&&n.offsetHeight>0&&e.invokeMethodAsync("OnSpacerAfterVisible",o.boundingClientRect.bottom-o.intersectionRect.bottom,r,s)}))}),{root:r,rootMargin:`${o}px`});s.observe(t),s.observe(n);const a=d(t),c=d(n),{observersByDotNetObjectId:l,id:h}=Ke(e);function d(e){const t={attributes:!0},n=new MutationObserver(((n,o)=>{u(e.parentElement)&&(o.disconnect(),e.style.display="table-row",o.observe(e,t)),s.unobserve(e),s.observe(e)}));return n.observe(e,t),n}function u(e){return null!==e&&(e instanceof HTMLTableElement&&""===e.style.display||"table"===e.style.display||e instanceof HTMLTableSectionElement&&""===e.style.display||"table-row-group"===e.style.display)}l[h]={intersectionObserver:s,mutationObserverBefore:a,mutationObserverAfter:c}},dispose:function(e){const{observersByDotNetObjectId:t,id:n}=Ke(e),o=t[n];o&&(o.intersectionObserver.disconnect(),o.mutationObserverBefore.disconnect(),o.mutationObserverAfter.disconnect(),e.dispose(),delete t[n])}},Je=Symbol();function Ve(e){return e&&e!==document.body&&e!==document.documentElement?"visible"!==getComputedStyle(e).overflowY?e:Ve(e.parentElement):null}function Ke(e){const t=e._callDispatcher,n=e._id;return t[Je]??={},{observersByDotNetObjectId:t[Je],id:n}}const Xe={getAndRemoveExistingTitle:function(){const e=document.head?document.head.getElementsByTagName("title"):[];if(0===e.length)return null;let t=null;for(let n=e.length-1;n>=0;n--){const o=e[n],r=o.previousSibling;r instanceof Comment&&null!==W(r)||(null===t&&(t=o.textContent),o.parentNode?.removeChild(o))}return t}},Ye={init:function(e,t){t._blazorInputFileNextFileId=0,t.addEventListener("click",(function(){t.value=""})),t.addEventListener("change",(function(){t._blazorFilesById={};const n=Array.prototype.map.call(t.files,(function(e){const n={id:++t._blazorInputFileNextFileId,lastModified:new Date(e.lastModified).toISOString(),name:e.name,size:e.size,contentType:e.type,readPromise:void 0,arrayBuffer:void 0,blob:e};return t._blazorFilesById[n.id]=n,n}));e.invokeMethodAsync("NotifyChange",n)}))},toImageFile:async function(e,t,n,o,r){const i=Ge(e,t),s=await new Promise((function(e){const t=new Image;t.onload=function(){URL.revokeObjectURL(t.src),e(t)},t.onerror=function(){t.onerror=null,URL.revokeObjectURL(t.src)},t.src=URL.createObjectURL(i.blob)})),a=await new Promise((function(e){const t=Math.min(1,o/s.width),i=Math.min(1,r/s.height),a=Math.min(t,i),c=document.createElement("canvas");c.width=Math.round(s.width*a),c.height=Math.round(s.height*a),c.getContext("2d")?.drawImage(s,0,0,c.width,c.height),c.toBlob(e,n)})),c={id:++e._blazorInputFileNextFileId,lastModified:i.lastModified,name:i.name,size:a?.size||0,contentType:n,blob:a||i.blob};return e._blazorFilesById[c.id]=c,c},readFileData:async function(e,t){return Ge(e,t).blob}};function Ge(e,t){const n=e._blazorFilesById[t];if(!n)throw new Error(`There is no file with ID ${t}. The file list may have changed. See https://aka.ms/aspnet/blazor-input-file-multiple-selections.`);return n}const Qe=new Set;function Ze(e){e.preventDefault(),e.returnValue=!0}async function et(e,t,n){return e instanceof Blob?await async function(e,t,n){const o=e.slice(t,t+n),r=await o.arrayBuffer();return new Uint8Array(r)}(e,t,n):function(e,t,n){return new Uint8Array(e.buffer,e.byteOffset+t,n)}(e,t,n)}const tt={navigateTo:function(e,t,n=!1){Me(e,t instanceof Object?t:{forceLoad:t,replaceHistoryEntry:n})},registerCustomEventType:function(e,t){if(!t)throw new Error("The options parameter is required.");if(r.has(e))throw new Error(`The event '${e}' is already registered.`);if(t.browserEventName){const n=i.get(t.browserEventName);n?n.push(e):i.set(t.browserEventName,[e]),s.forEach((n=>n(e,t.browserEventName)))}r.set(e,t)},rootComponents:y,runtime:{},_internal:{navigationManager:Ne,domWrapper:ze,Virtualize:qe,PageTitle:Xe,InputFile:Ye,NavigationLock:{enableNavigationPrompt:function(e){0===Qe.size&&window.addEventListener("beforeunload",Ze),Qe.add(e)},disableNavigationPrompt:function(e){Qe.delete(e),0===Qe.size&&window.removeEventListener("beforeunload",Ze)}},getJSDataStreamChunk:et,attachWebRendererInterop:C}};var nt;function ot(e){const t={...rt,...e};return e&&e.reconnectionOptions&&(t.reconnectionOptions={...rt.reconnectionOptions,...e.reconnectionOptions}),t}window.Blazor=tt,function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(nt||(nt={}));const rt={configureSignalR:e=>{},logLevel:nt.Warning,initializers:void 0,circuitHandlers:[],reconnectionOptions:{maxRetries:30,retryIntervalMilliseconds:function(e,t){return t&&e>=t?null:e<10?0:e<20?5e3:3e4},dialogId:"components-reconnect-modal"}};(class e{static{this.instance=new e}log(e,t){}});let it=class{constructor(e){this.minLevel=e}log(e,t){if(e>=this.minLevel){const n=`[${(new Date).toISOString()}] ${nt[e]}: ${t}`;switch(e){case nt.Critical:case nt.Error:console.error(n);break;case nt.Warning:console.warn(n);break;case nt.Information:console.info(n);break;default:console.log(n)}}}};const st=/^\s*Blazor-Server-Component-State:(?<state>[a-zA-Z0-9+/=]+)$/;function at(e){return ct(e,st)}function ct(e,t,n="state"){if(e.nodeType===Node.COMMENT_NODE){const o=e.textContent||"",r=t.exec(o),i=r&&r.groups&&r.groups[n];return i&&e.parentNode?.removeChild(e),i}if(!e.hasChildNodes())return;const o=e.childNodes;for(let e=0;e<o.length;e++){const r=ct(o[e],t,n);if(r)return r}}function lt(e,t){const n=[],o=new mt(e.childNodes);for(;o.next()&&o.currentElement;){const e=dt(o,t);if(e)n.push(e);else if(o.currentElement.hasChildNodes()){const e=lt(o.currentElement,t);for(let t=0;t<e.length;t++){const o=e[t];n.push(o)}}}return n}const ht=new RegExp(/^\s*Blazor:[^{]*(?<descriptor>.*)$/);function dt(e,t){const n=e.currentElement;var o,r,i;if(n&&n.nodeType===Node.COMMENT_NODE&&n.textContent){const s=ht.exec(n.textContent),a=s&&s.groups&&s.groups.descriptor;if(!a)return;!function(e){if(e.parentNode instanceof Document)throw new Error("Root components cannot be marked as interactive. The <html> element must be rendered statically so that scripts are not evaluated multiple times.")}(n);try{const s=function(e){const t=JSON.parse(e),{type:n}=t;if("server"!==n&&"webassembly"!==n&&"auto"!==n)throw new Error(`Invalid component type '${n}'.`);return t}(a),c=function(e,t,n){const{prerenderId:o}=e;if(o){for(;n.next()&&n.currentElement;){const e=n.currentElement;if(e.nodeType!==Node.COMMENT_NODE)continue;if(!e.textContent)continue;const t=ht.exec(e.textContent),r=t&&t[1];if(r)return gt(r,o),e}throw new Error(`Could not find an end component comment for '${t}'.`)}}(s,n,e);if(t!==s.type)return;switch(s.type){case"webassembly":return r=n,i=c,ft(o=s),{...o,uniqueId:ut++,start:r,end:i};case"server":return function(e,t,n){return pt(e),{...e,uniqueId:ut++,start:t,end:n}}(s,n,c);case"auto":return function(e,t,n){return pt(e),ft(e),{...e,uniqueId:ut++,start:t,end:n}}(s,n,c)}}catch(e){throw new Error(`Found malformed component comment at ${n.textContent}`)}}}let ut=0;function pt(e){const{descriptor:t,sequence:n}=e;if(!t)throw new Error("descriptor must be defined when using a descriptor.");if(void 0===n)throw new Error("sequence must be defined when using a descriptor.");if(!Number.isInteger(n))throw new Error(`Error parsing the sequence '${n}' for component '${JSON.stringify(e)}'`)}function ft(e){const{assembly:t,typeName:n}=e;if(!t)throw new Error("assembly must be defined when using a descriptor.");if(!n)throw new Error("typeName must be defined when using a descriptor.");e.parameterDefinitions=e.parameterDefinitions&&atob(e.parameterDefinitions),e.parameterValues=e.parameterValues&&atob(e.parameterValues)}function gt(e,t){const n=JSON.parse(e);if(1!==Object.keys(n).length)throw new Error(`Invalid end of component comment: '${e}'`);const o=n.prerenderId;if(!o)throw new Error(`End of component comment must have a value for the prerendered property: '${e}'`);if(o!==t)throw new Error(`End of component comment prerendered property must match the start comment prerender id: '${t}', '${o}'`)}class mt{constructor(e){this.childNodes=e,this.currentIndex=-1,this.length=e.length}next(){return this.currentIndex++,this.currentIndex<this.length?(this.currentElement=this.childNodes[this.currentIndex],!0):(this.currentElement=void 0,!1)}}class yt extends Error{constructor(e,t){const n=new.target.prototype;super(`${e}: Status code '${t}'`),this.statusCode=t,this.__proto__=n}}class vt extends Error{constructor(e="A timeout occurred."){const t=new.target.prototype;super(e),this.__proto__=t}}class wt extends Error{constructor(e="An abort occurred."){const t=new.target.prototype;super(e),this.__proto__=t}}class _t extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.transport=t,this.errorType="UnsupportedTransportError",this.__proto__=n}}class bt extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.transport=t,this.errorType="DisabledTransportError",this.__proto__=n}}class St extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.transport=t,this.errorType="FailedToStartTransportError",this.__proto__=n}}class Et extends Error{constructor(e){const t=new.target.prototype;super(e),this.errorType="FailedToNegotiateWithServerError",this.__proto__=t}}class Ct extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.innerErrors=t,this.__proto__=n}}class It{constructor(e,t,n){this.statusCode=e,this.statusText=t,this.content=n}}class kt{get(e,t){return this.send({...t,method:"GET",url:e})}post(e,t){return this.send({...t,method:"POST",url:e})}delete(e,t){return this.send({...t,method:"DELETE",url:e})}getCookieString(e){return""}}var Tt;!function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(Tt||(Tt={}));class Dt{constructor(){}log(e,t){}}Dt.instance=new Dt;const Rt="9.0.0-dev";class xt{static isRequired(e,t){if(null==e)throw new Error(`The '${t}' argument is required.`)}static isNotEmpty(e,t){if(!e||e.match(/^\s*$/))throw new Error(`The '${t}' argument should not be empty.`)}static isIn(e,t,n){if(!(e in t))throw new Error(`Unknown ${n} value: ${e}.`)}}class At{static get isBrowser(){return"object"==typeof window&&"object"==typeof window.document}static get isWebWorker(){return"object"==typeof self&&"importScripts"in self}static get isReactNative(){return"object"==typeof window&&void 0===window.document}static get isNode(){return"undefined"!=typeof process&&process.release&&"node"===process.release.name}}function Pt(e,t){let n="";return Nt(e)?(n=`Binary data of length ${e.byteLength}`,t&&(n+=`. Content: '${function(e){const t=new Uint8Array(e);let n="";return t.forEach((e=>{n+=`0x${e<16?"0":""}${e.toString(16)} `})),n.substr(0,n.length-1)}(e)}'`)):"string"==typeof e&&(n=`String data of length ${e.length}`,t&&(n+=`. Content: '${e}'`)),n}function Nt(e){return e&&"undefined"!=typeof ArrayBuffer&&(e instanceof ArrayBuffer||e.constructor&&"ArrayBuffer"===e.constructor.name)}async function Mt(e,t,n,o,r,i){const s={},[a,c]=Lt();s[a]=c,e.log(Tt.Trace,`(${t} transport) sending data. ${Pt(r,i.logMessageContent)}.`);const l=Nt(r)?"arraybuffer":"text",h=await n.post(o,{content:r,headers:{...s,...i.headers},responseType:l,timeout:i.timeout,withCredentials:i.withCredentials});e.log(Tt.Trace,`(${t} transport) request complete. Response status: ${h.statusCode}.`)}class Ut{constructor(e,t){this._subject=e,this._observer=t}dispose(){const e=this._subject.observers.indexOf(this._observer);e>-1&&this._subject.observers.splice(e,1),0===this._subject.observers.length&&this._subject.cancelCallback&&this._subject.cancelCallback().catch((e=>{}))}}class Bt{constructor(e){this._minLevel=e,this.out=console}log(e,t){if(e>=this._minLevel){const n=`[${(new Date).toISOString()}] ${Tt[e]}: ${t}`;switch(e){case Tt.Critical:case Tt.Error:this.out.error(n);break;case Tt.Warning:this.out.warn(n);break;case Tt.Information:this.out.info(n);break;default:this.out.log(n)}}}}function Lt(){return["X-SignalR-User-Agent",$t(Rt,"","Browser",void 0)]}function $t(e,t,n,o){let r="Microsoft SignalR/";const i=e.split(".");return r+=`${i[0]}.${i[1]}`,r+=` (${e}; `,r+=t&&""!==t?`${t}; `:"Unknown OS; ",r+=`${n}`,r+=o?`; ${o}`:"; Unknown Runtime Version",r+=")",r}function Ot(e){return e.stack?e.stack:e.message?e.message:`${e}`}class Ft extends kt{constructor(e){if(super(),this._logger=e,"undefined"==typeof fetch){const e="function"==typeof __webpack_require__?__non_webpack_require__:require;this._jar=new(e("tough-cookie").CookieJar),"undefined"==typeof fetch?this._fetchType=e("node-fetch"):this._fetchType=fetch,this._fetchType=e("fetch-cookie")(this._fetchType,this._jar)}else this._fetchType=fetch.bind(function(){if("undefined"!=typeof globalThis)return globalThis;if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("could not find global")}());if("undefined"==typeof AbortController){const e="function"==typeof __webpack_require__?__non_webpack_require__:require;this._abortControllerType=e("abort-controller")}else this._abortControllerType=AbortController}async send(e){if(e.abortSignal&&e.abortSignal.aborted)throw new wt;if(!e.method)throw new Error("No method defined.");if(!e.url)throw new Error("No url defined.");const t=new this._abortControllerType;let n;e.abortSignal&&(e.abortSignal.onabort=()=>{t.abort(),n=new wt});let o,r=null;if(e.timeout){const o=e.timeout;r=setTimeout((()=>{t.abort(),this._logger.log(Tt.Warning,"Timeout from HTTP request."),n=new vt}),o)}""===e.content&&(e.content=void 0),e.content&&(e.headers=e.headers||{},Nt(e.content)?e.headers["Content-Type"]="application/octet-stream":e.headers["Content-Type"]="text/plain;charset=UTF-8");try{o=await this._fetchType(e.url,{body:e.content,cache:"no-cache",credentials:!0===e.withCredentials?"include":"same-origin",headers:{"X-Requested-With":"XMLHttpRequest",...e.headers},method:e.method,mode:"cors",redirect:"follow",signal:t.signal})}catch(e){if(n)throw n;throw this._logger.log(Tt.Warning,`Error from HTTP request. ${e}.`),e}finally{r&&clearTimeout(r),e.abortSignal&&(e.abortSignal.onabort=null)}if(!o.ok){const e=await Ht(o,"text");throw new yt(e||o.statusText,o.status)}const i=Ht(o,e.responseType),s=await i;return new It(o.status,o.statusText,s)}getCookieString(e){return""}}function Ht(e,t){let n;switch(t){case"arraybuffer":n=e.arrayBuffer();break;case"text":default:n=e.text();break;case"blob":case"document":case"json":throw new Error(`${t} is not supported.`)}return n}class jt extends kt{constructor(e){super(),this._logger=e}send(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new wt):e.method?e.url?new Promise(((t,n)=>{const o=new XMLHttpRequest;o.open(e.method,e.url,!0),o.withCredentials=void 0===e.withCredentials||e.withCredentials,o.setRequestHeader("X-Requested-With","XMLHttpRequest"),""===e.content&&(e.content=void 0),e.content&&(Nt(e.content)?o.setRequestHeader("Content-Type","application/octet-stream"):o.setRequestHeader("Content-Type","text/plain;charset=UTF-8"));const r=e.headers;r&&Object.keys(r).forEach((e=>{o.setRequestHeader(e,r[e])})),e.responseType&&(o.responseType=e.responseType),e.abortSignal&&(e.abortSignal.onabort=()=>{o.abort(),n(new wt)}),e.timeout&&(o.timeout=e.timeout),o.onload=()=>{e.abortSignal&&(e.abortSignal.onabort=null),o.status>=200&&o.status<300?t(new It(o.status,o.statusText,o.response||o.responseText)):n(new yt(o.response||o.responseText||o.statusText,o.status))},o.onerror=()=>{this._logger.log(Tt.Warning,`Error from HTTP request. ${o.status}: ${o.statusText}.`),n(new yt(o.statusText,o.status))},o.ontimeout=()=>{this._logger.log(Tt.Warning,"Timeout from HTTP request."),n(new vt)},o.send(e.content)})):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))}}class Wt extends kt{constructor(e){if(super(),"undefined"!=typeof fetch)this._httpClient=new Ft(e);else{if("undefined"==typeof XMLHttpRequest)throw new Error("No usable HttpClient found.");this._httpClient=new jt(e)}}send(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new wt):e.method?e.url?this._httpClient.send(e):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))}getCookieString(e){return this._httpClient.getCookieString(e)}}class zt{static write(e){return`${e}${zt.RecordSeparator}`}static parse(e){if(e[e.length-1]!==zt.RecordSeparator)throw new Error("Message is incomplete.");const t=e.split(zt.RecordSeparator);return t.pop(),t}}zt.RecordSeparatorCode=30,zt.RecordSeparator=String.fromCharCode(zt.RecordSeparatorCode);class qt{writeHandshakeRequest(e){return zt.write(JSON.stringify(e))}parseHandshakeResponse(e){let t,n;if(Nt(e)){const o=new Uint8Array(e),r=o.indexOf(zt.RecordSeparatorCode);if(-1===r)throw new Error("Message is incomplete.");const i=r+1;t=String.fromCharCode.apply(null,Array.prototype.slice.call(o.slice(0,i))),n=o.byteLength>i?o.slice(i).buffer:null}else{const o=e,r=o.indexOf(zt.RecordSeparator);if(-1===r)throw new Error("Message is incomplete.");const i=r+1;t=o.substring(0,i),n=o.length>i?o.substring(i):null}const o=zt.parse(t),r=JSON.parse(o[0]);if(r.type)throw new Error("Expected a handshake response from the server.");return[n,r]}}var Jt,Vt;!function(e){e[e.Invocation=1]="Invocation",e[e.StreamItem=2]="StreamItem",e[e.Completion=3]="Completion",e[e.StreamInvocation=4]="StreamInvocation",e[e.CancelInvocation=5]="CancelInvocation",e[e.Ping=6]="Ping",e[e.Close=7]="Close",e[e.Ack=8]="Ack",e[e.Sequence=9]="Sequence"}(Jt||(Jt={}));class Kt{constructor(){this.observers=[]}next(e){for(const t of this.observers)t.next(e)}error(e){for(const t of this.observers)t.error&&t.error(e)}complete(){for(const e of this.observers)e.complete&&e.complete()}subscribe(e){return this.observers.push(e),new Ut(this,e)}}class Xt{constructor(e,t,n){this._bufferSize=1e5,this._messages=[],this._totalMessageCount=0,this._waitForSequenceMessage=!1,this._nextReceivingSequenceId=1,this._latestReceivedSequenceId=0,this._bufferedByteCount=0,this._reconnectInProgress=!1,this._protocol=e,this._connection=t,this._bufferSize=n}async _send(e){const t=this._protocol.writeMessage(e);let n=Promise.resolve();if(this._isInvocationMessage(e)){this._totalMessageCount++;let e=()=>{},o=()=>{};Nt(t)?this._bufferedByteCount+=t.byteLength:this._bufferedByteCount+=t.length,this._bufferedByteCount>=this._bufferSize&&(n=new Promise(((t,n)=>{e=t,o=n}))),this._messages.push(new Yt(t,this._totalMessageCount,e,o))}try{this._reconnectInProgress||await this._connection.send(t)}catch{this._disconnected()}await n}_ack(e){let t=-1;for(let n=0;n<this._messages.length;n++){const o=this._messages[n];if(o._id<=e.sequenceId)t=n,Nt(o._message)?this._bufferedByteCount-=o._message.byteLength:this._bufferedByteCount-=o._message.length,o._resolver();else{if(!(this._bufferedByteCount<this._bufferSize))break;o._resolver()}}-1!==t&&(this._messages=this._messages.slice(t+1))}_shouldProcessMessage(e){if(this._waitForSequenceMessage)return e.type===Jt.Sequence&&(this._waitForSequenceMessage=!1,!0);if(!this._isInvocationMessage(e))return!0;const t=this._nextReceivingSequenceId;return this._nextReceivingSequenceId++,t<=this._latestReceivedSequenceId?(t===this._latestReceivedSequenceId&&this._ackTimer(),!1):(this._latestReceivedSequenceId=t,this._ackTimer(),!0)}_resetSequence(e){e.sequenceId>this._nextReceivingSequenceId?this._connection.stop(new Error("Sequence ID greater than amount of messages we've received.")):this._nextReceivingSequenceId=e.sequenceId}_disconnected(){this._reconnectInProgress=!0,this._waitForSequenceMessage=!0}async _resend(){const e=0!==this._messages.length?this._messages[0]._id:this._totalMessageCount+1;await this._connection.send(this._protocol.writeMessage({type:Jt.Sequence,sequenceId:e}));const t=this._messages;for(const e of t)await this._connection.send(e._message);this._reconnectInProgress=!1}_dispose(e){null!=e||(e=new Error("Unable to reconnect to server."));for(const t of this._messages)t._rejector(e)}_isInvocationMessage(e){switch(e.type){case Jt.Invocation:case Jt.StreamItem:case Jt.Completion:case Jt.StreamInvocation:case Jt.CancelInvocation:return!0;case Jt.Close:case Jt.Sequence:case Jt.Ping:case Jt.Ack:return!1}}_ackTimer(){void 0===this._ackTimerHandle&&(this._ackTimerHandle=setTimeout((async()=>{try{this._reconnectInProgress||await this._connection.send(this._protocol.writeMessage({type:Jt.Ack,sequenceId:this._latestReceivedSequenceId}))}catch{}clearTimeout(this._ackTimerHandle),this._ackTimerHandle=void 0}),1e3))}}class Yt{constructor(e,t,n,o){this._message=e,this._id=t,this._resolver=n,this._rejector=o}}!function(e){e.Disconnected="Disconnected",e.Connecting="Connecting",e.Connected="Connected",e.Disconnecting="Disconnecting",e.Reconnecting="Reconnecting"}(Vt||(Vt={}));class Gt{static create(e,t,n,o,r,i,s){return new Gt(e,t,n,o,r,i,s)}constructor(e,t,n,o,r,i,s){this._nextKeepAlive=0,this._freezeEventListener=()=>{this._logger.log(Tt.Warning,"The page is being frozen, this will likely lead to the connection being closed and messages being lost. For more information see the docs at https://learn.microsoft.com/aspnet/core/signalr/javascript-client#bsleep")},xt.isRequired(e,"connection"),xt.isRequired(t,"logger"),xt.isRequired(n,"protocol"),this.serverTimeoutInMilliseconds=null!=r?r:3e4,this.keepAliveIntervalInMilliseconds=null!=i?i:15e3,this._statefulReconnectBufferSize=null!=s?s:1e5,this._logger=t,this._protocol=n,this.connection=e,this._reconnectPolicy=o,this._handshakeProtocol=new qt,this.connection.onreceive=e=>this._processIncomingData(e),this.connection.onclose=e=>this._connectionClosed(e),this._callbacks={},this._methods={},this._closedCallbacks=[],this._reconnectingCallbacks=[],this._reconnectedCallbacks=[],this._invocationId=0,this._receivedHandshakeResponse=!1,this._connectionState=Vt.Disconnected,this._connectionStarted=!1,this._cachedPingMessage=this._protocol.writeMessage({type:Jt.Ping})}get state(){return this._connectionState}get connectionId(){return this.connection&&this.connection.connectionId||null}get baseUrl(){return this.connection.baseUrl||""}set baseUrl(e){if(this._connectionState!==Vt.Disconnected&&this._connectionState!==Vt.Reconnecting)throw new Error("The HubConnection must be in the Disconnected or Reconnecting state to change the url.");if(!e)throw new Error("The HubConnection url must be a valid url.");this.connection.baseUrl=e}start(){return this._startPromise=this._startWithStateTransitions(),this._startPromise}async _startWithStateTransitions(){if(this._connectionState!==Vt.Disconnected)return Promise.reject(new Error("Cannot start a HubConnection that is not in the 'Disconnected' state."));this._connectionState=Vt.Connecting,this._logger.log(Tt.Debug,"Starting HubConnection.");try{await this._startInternal(),At.isBrowser&&window.document.addEventListener("freeze",this._freezeEventListener),this._connectionState=Vt.Connected,this._connectionStarted=!0,this._logger.log(Tt.Debug,"HubConnection connected successfully.")}catch(e){return this._connectionState=Vt.Disconnected,this._logger.log(Tt.Debug,`HubConnection failed to start successfully because of error '${e}'.`),Promise.reject(e)}}async _startInternal(){this._stopDuringStartError=void 0,this._receivedHandshakeResponse=!1;const e=new Promise(((e,t)=>{this._handshakeResolver=e,this._handshakeRejecter=t}));await this.connection.start(this._protocol.transferFormat);try{let t=this._protocol.version;this.connection.features.reconnect||(t=1);const n={protocol:this._protocol.name,version:t};if(this._logger.log(Tt.Debug,"Sending handshake request."),await this._sendMessage(this._handshakeProtocol.writeHandshakeRequest(n)),this._logger.log(Tt.Information,`Using HubProtocol '${this._protocol.name}'.`),this._cleanupTimeout(),this._resetTimeoutPeriod(),this._resetKeepAliveInterval(),await e,this._stopDuringStartError)throw this._stopDuringStartError;!!this.connection.features.reconnect&&(this._messageBuffer=new Xt(this._protocol,this.connection,this._statefulReconnectBufferSize),this.connection.features.disconnected=this._messageBuffer._disconnected.bind(this._messageBuffer),this.connection.features.resend=()=>{if(this._messageBuffer)return this._messageBuffer._resend()}),this.connection.features.inherentKeepAlive||await this._sendMessage(this._cachedPingMessage)}catch(e){throw this._logger.log(Tt.Debug,`Hub handshake failed with error '${e}' during start(). Stopping HubConnection.`),this._cleanupTimeout(),this._cleanupPingTimer(),await this.connection.stop(e),e}}async stop(){const e=this._startPromise;this.connection.features.reconnect=!1,this._stopPromise=this._stopInternal(),await this._stopPromise;try{await e}catch(e){}}_stopInternal(e){if(this._connectionState===Vt.Disconnected)return this._logger.log(Tt.Debug,`Call to HubConnection.stop(${e}) ignored because it is already in the disconnected state.`),Promise.resolve();if(this._connectionState===Vt.Disconnecting)return this._logger.log(Tt.Debug,`Call to HttpConnection.stop(${e}) ignored because the connection is already in the disconnecting state.`),this._stopPromise;const t=this._connectionState;return this._connectionState=Vt.Disconnecting,this._logger.log(Tt.Debug,"Stopping HubConnection."),this._reconnectDelayHandle?(this._logger.log(Tt.Debug,"Connection stopped during reconnect delay. Done reconnecting."),clearTimeout(this._reconnectDelayHandle),this._reconnectDelayHandle=void 0,this._completeClose(),Promise.resolve()):(t===Vt.Connected&&this._sendCloseMessage(),this._cleanupTimeout(),this._cleanupPingTimer(),this._stopDuringStartError=e||new wt("The connection was stopped before the hub handshake could complete."),this.connection.stop(e))}async _sendCloseMessage(){try{await this._sendWithProtocol(this._createCloseMessage())}catch{}}stream(e,...t){const[n,o]=this._replaceStreamingParams(t),r=this._createStreamInvocation(e,t,o);let i;const s=new Kt;return s.cancelCallback=()=>{const e=this._createCancelInvocation(r.invocationId);return delete this._callbacks[r.invocationId],i.then((()=>this._sendWithProtocol(e)))},this._callbacks[r.invocationId]=(e,t)=>{t?s.error(t):e&&(e.type===Jt.Completion?e.error?s.error(new Error(e.error)):s.complete():s.next(e.item))},i=this._sendWithProtocol(r).catch((e=>{s.error(e),delete this._callbacks[r.invocationId]})),this._launchStreams(n,i),s}_sendMessage(e){return this._resetKeepAliveInterval(),this.connection.send(e)}_sendWithProtocol(e){return this._messageBuffer?this._messageBuffer._send(e):this._sendMessage(this._protocol.writeMessage(e))}send(e,...t){const[n,o]=this._replaceStreamingParams(t),r=this._sendWithProtocol(this._createInvocation(e,t,!0,o));return this._launchStreams(n,r),r}invoke(e,...t){const[n,o]=this._replaceStreamingParams(t),r=this._createInvocation(e,t,!1,o);return new Promise(((e,t)=>{this._callbacks[r.invocationId]=(n,o)=>{o?t(o):n&&(n.type===Jt.Completion?n.error?t(new Error(n.error)):e(n.result):t(new Error(`Unexpected message type: ${n.type}`)))};const o=this._sendWithProtocol(r).catch((e=>{t(e),delete this._callbacks[r.invocationId]}));this._launchStreams(n,o)}))}on(e,t){e&&t&&(e=e.toLowerCase(),this._methods[e]||(this._methods[e]=[]),-1===this._methods[e].indexOf(t)&&this._methods[e].push(t))}off(e,t){if(!e)return;e=e.toLowerCase();const n=this._methods[e];if(n)if(t){const o=n.indexOf(t);-1!==o&&(n.splice(o,1),0===n.length&&delete this._methods[e])}else delete this._methods[e]}onclose(e){e&&this._closedCallbacks.push(e)}onreconnecting(e){e&&this._reconnectingCallbacks.push(e)}onreconnected(e){e&&this._reconnectedCallbacks.push(e)}_processIncomingData(e){if(this._cleanupTimeout(),this._receivedHandshakeResponse||(e=this._processHandshakeResponse(e),this._receivedHandshakeResponse=!0),e){const t=this._protocol.parseMessages(e,this._logger);for(const e of t)if(!this._messageBuffer||this._messageBuffer._shouldProcessMessage(e))switch(e.type){case Jt.Invocation:this._invokeClientMethod(e).catch((e=>{this._logger.log(Tt.Error,`Invoke client method threw error: ${Ot(e)}`)}));break;case Jt.StreamItem:case Jt.Completion:{const t=this._callbacks[e.invocationId];if(t){e.type===Jt.Completion&&delete this._callbacks[e.invocationId];try{t(e)}catch(e){this._logger.log(Tt.Error,`Stream callback threw error: ${Ot(e)}`)}}break}case Jt.Ping:break;case Jt.Close:{this._logger.log(Tt.Information,"Close message received from server.");const t=e.error?new Error("Server returned an error on close: "+e.error):void 0;!0===e.allowReconnect?this.connection.stop(t):this._stopPromise=this._stopInternal(t);break}case Jt.Ack:this._messageBuffer&&this._messageBuffer._ack(e);break;case Jt.Sequence:this._messageBuffer&&this._messageBuffer._resetSequence(e);break;default:this._logger.log(Tt.Warning,`Invalid message type: ${e.type}.`)}}this._resetTimeoutPeriod()}_processHandshakeResponse(e){let t,n;try{[n,t]=this._handshakeProtocol.parseHandshakeResponse(e)}catch(e){const t="Error parsing handshake response: "+e;this._logger.log(Tt.Error,t);const n=new Error(t);throw this._handshakeRejecter(n),n}if(t.error){const e="Server returned handshake error: "+t.error;this._logger.log(Tt.Error,e);const n=new Error(e);throw this._handshakeRejecter(n),n}return this._logger.log(Tt.Debug,"Server handshake complete."),this._handshakeResolver(),n}_resetKeepAliveInterval(){this.connection.features.inherentKeepAlive||(this._nextKeepAlive=(new Date).getTime()+this.keepAliveIntervalInMilliseconds,this._cleanupPingTimer())}_resetTimeoutPeriod(){if(!(this.connection.features&&this.connection.features.inherentKeepAlive||(this._timeoutHandle=setTimeout((()=>this.serverTimeout()),this.serverTimeoutInMilliseconds),void 0!==this._pingServerHandle))){let e=this._nextKeepAlive-(new Date).getTime();e<0&&(e=0),this._pingServerHandle=setTimeout((async()=>{if(this._connectionState===Vt.Connected)try{await this._sendMessage(this._cachedPingMessage)}catch{this._cleanupPingTimer()}}),e)}}serverTimeout(){this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server."))}async _invokeClientMethod(e){const t=e.target.toLowerCase(),n=this._methods[t];if(!n)return this._logger.log(Tt.Warning,`No client method with the name '${t}' found.`),void(e.invocationId&&(this._logger.log(Tt.Warning,`No result given for '${t}' method and invocation ID '${e.invocationId}'.`),await this._sendWithProtocol(this._createCompletionMessage(e.invocationId,"Client didn't provide a result.",null))));const o=n.slice(),r=!!e.invocationId;let i,s,a;for(const n of o)try{const o=i;i=await n.apply(this,e.arguments),r&&i&&o&&(this._logger.log(Tt.Error,`Multiple results provided for '${t}'. Sending error to server.`),a=this._createCompletionMessage(e.invocationId,"Client provided multiple results.",null)),s=void 0}catch(e){s=e,this._logger.log(Tt.Error,`A callback for the method '${t}' threw error '${e}'.`)}a?await this._sendWithProtocol(a):r?(s?a=this._createCompletionMessage(e.invocationId,`${s}`,null):void 0!==i?a=this._createCompletionMessage(e.invocationId,null,i):(this._logger.log(Tt.Warning,`No result given for '${t}' method and invocation ID '${e.invocationId}'.`),a=this._createCompletionMessage(e.invocationId,"Client didn't provide a result.",null)),await this._sendWithProtocol(a)):i&&this._logger.log(Tt.Error,`Result given for '${t}' method but server is not expecting a result.`)}_connectionClosed(e){this._logger.log(Tt.Debug,`HubConnection.connectionClosed(${e}) called while in state ${this._connectionState}.`),this._stopDuringStartError=this._stopDuringStartError||e||new wt("The underlying connection was closed before the hub handshake could complete."),this._handshakeResolver&&this._handshakeResolver(),this._cancelCallbacksWithError(e||new Error("Invocation canceled due to the underlying connection being closed.")),this._cleanupTimeout(),this._cleanupPingTimer(),this._connectionState===Vt.Disconnecting?this._completeClose(e):this._connectionState===Vt.Connected&&this._reconnectPolicy?this._reconnect(e):this._connectionState===Vt.Connected&&this._completeClose(e)}_completeClose(e){if(this._connectionStarted){this._connectionState=Vt.Disconnected,this._connectionStarted=!1,this._messageBuffer&&(this._messageBuffer._dispose(null!=e?e:new Error("Connection closed.")),this._messageBuffer=void 0),At.isBrowser&&window.document.removeEventListener("freeze",this._freezeEventListener);try{this._closedCallbacks.forEach((t=>t.apply(this,[e])))}catch(t){this._logger.log(Tt.Error,`An onclose callback called with error '${e}' threw error '${t}'.`)}}}async _reconnect(e){const t=Date.now();let n=0,o=void 0!==e?e:new Error("Attempting to reconnect due to a unknown error."),r=this._getNextRetryDelay(n++,0,o);if(null===r)return this._logger.log(Tt.Debug,"Connection not reconnecting because the IRetryPolicy returned null on the first reconnect attempt."),void this._completeClose(e);if(this._connectionState=Vt.Reconnecting,e?this._logger.log(Tt.Information,`Connection reconnecting because of error '${e}'.`):this._logger.log(Tt.Information,"Connection reconnecting."),0!==this._reconnectingCallbacks.length){try{this._reconnectingCallbacks.forEach((t=>t.apply(this,[e])))}catch(t){this._logger.log(Tt.Error,`An onreconnecting callback called with error '${e}' threw error '${t}'.`)}if(this._connectionState!==Vt.Reconnecting)return void this._logger.log(Tt.Debug,"Connection left the reconnecting state in onreconnecting callback. Done reconnecting.")}for(;null!==r;){if(this._logger.log(Tt.Information,`Reconnect attempt number ${n} will start in ${r} ms.`),await new Promise((e=>{this._reconnectDelayHandle=setTimeout(e,r)})),this._reconnectDelayHandle=void 0,this._connectionState!==Vt.Reconnecting)return void this._logger.log(Tt.Debug,"Connection left the reconnecting state during reconnect delay. Done reconnecting.");try{if(await this._startInternal(),this._connectionState=Vt.Connected,this._logger.log(Tt.Information,"HubConnection reconnected successfully."),0!==this._reconnectedCallbacks.length)try{this._reconnectedCallbacks.forEach((e=>e.apply(this,[this.connection.connectionId])))}catch(e){this._logger.log(Tt.Error,`An onreconnected callback called with connectionId '${this.connection.connectionId}; threw error '${e}'.`)}return}catch(e){if(this._logger.log(Tt.Information,`Reconnect attempt failed because of error '${e}'.`),this._connectionState!==Vt.Reconnecting)return this._logger.log(Tt.Debug,`Connection moved to the '${this._connectionState}' from the reconnecting state during reconnect attempt. Done reconnecting.`),void(this._connectionState===Vt.Disconnecting&&this._completeClose());o=e instanceof Error?e:new Error(e.toString()),r=this._getNextRetryDelay(n++,Date.now()-t,o)}}this._logger.log(Tt.Information,`Reconnect retries have been exhausted after ${Date.now()-t} ms and ${n} failed attempts. Connection disconnecting.`),this._completeClose()}_getNextRetryDelay(e,t,n){try{return this._reconnectPolicy.nextRetryDelayInMilliseconds({elapsedMilliseconds:t,previousRetryCount:e,retryReason:n})}catch(n){return this._logger.log(Tt.Error,`IRetryPolicy.nextRetryDelayInMilliseconds(${e}, ${t}) threw error '${n}'.`),null}}_cancelCallbacksWithError(e){const t=this._callbacks;this._callbacks={},Object.keys(t).forEach((n=>{const o=t[n];try{o(null,e)}catch(t){this._logger.log(Tt.Error,`Stream 'error' callback called with '${e}' threw error: ${Ot(t)}`)}}))}_cleanupPingTimer(){this._pingServerHandle&&(clearTimeout(this._pingServerHandle),this._pingServerHandle=void 0)}_cleanupTimeout(){this._timeoutHandle&&clearTimeout(this._timeoutHandle)}_createInvocation(e,t,n,o){if(n)return 0!==o.length?{target:e,arguments:t,streamIds:o,type:Jt.Invocation}:{target:e,arguments:t,type:Jt.Invocation};{const n=this._invocationId;return this._invocationId++,0!==o.length?{target:e,arguments:t,invocationId:n.toString(),streamIds:o,type:Jt.Invocation}:{target:e,arguments:t,invocationId:n.toString(),type:Jt.Invocation}}}_launchStreams(e,t){if(0!==e.length){t||(t=Promise.resolve());for(const n in e)e[n].subscribe({complete:()=>{t=t.then((()=>this._sendWithProtocol(this._createCompletionMessage(n))))},error:e=>{let o;o=e instanceof Error?e.message:e&&e.toString?e.toString():"Unknown error",t=t.then((()=>this._sendWithProtocol(this._createCompletionMessage(n,o))))},next:e=>{t=t.then((()=>this._sendWithProtocol(this._createStreamItemMessage(n,e))))}})}}_replaceStreamingParams(e){const t=[],n=[];for(let o=0;o<e.length;o++){const r=e[o];if(this._isObservable(r)){const i=this._invocationId;this._invocationId++,t[i]=r,n.push(i.toString()),e.splice(o,1)}}return[t,n]}_isObservable(e){return e&&e.subscribe&&"function"==typeof e.subscribe}_createStreamInvocation(e,t,n){const o=this._invocationId;return this._invocationId++,0!==n.length?{target:e,arguments:t,invocationId:o.toString(),streamIds:n,type:Jt.StreamInvocation}:{target:e,arguments:t,invocationId:o.toString(),type:Jt.StreamInvocation}}_createCancelInvocation(e){return{invocationId:e,type:Jt.CancelInvocation}}_createStreamItemMessage(e,t){return{invocationId:e,item:t,type:Jt.StreamItem}}_createCompletionMessage(e,t,n){return t?{error:t,invocationId:e,type:Jt.Completion}:{invocationId:e,result:n,type:Jt.Completion}}_createCloseMessage(){return{type:Jt.Close}}}const Qt=[0,2e3,1e4,3e4,null];class Zt{constructor(e){this._retryDelays=void 0!==e?[...e,null]:Qt}nextRetryDelayInMilliseconds(e){return this._retryDelays[e.previousRetryCount]}}class en{}en.Authorization="Authorization",en.Cookie="Cookie";class tn extends kt{constructor(e,t){super(),this._innerClient=e,this._accessTokenFactory=t}async send(e){let t=!0;this._accessTokenFactory&&(!this._accessToken||e.url&&e.url.indexOf("/negotiate?")>0)&&(t=!1,this._accessToken=await this._accessTokenFactory()),this._setAuthorizationHeader(e);const n=await this._innerClient.send(e);return t&&401===n.statusCode&&this._accessTokenFactory?(this._accessToken=await this._accessTokenFactory(),this._setAuthorizationHeader(e),await this._innerClient.send(e)):n}_setAuthorizationHeader(e){e.headers||(e.headers={}),this._accessToken?e.headers[en.Authorization]=`Bearer ${this._accessToken}`:this._accessTokenFactory&&e.headers[en.Authorization]&&delete e.headers[en.Authorization]}getCookieString(e){return this._innerClient.getCookieString(e)}}var nn,on;!function(e){e[e.None=0]="None",e[e.WebSockets=1]="WebSockets",e[e.ServerSentEvents=2]="ServerSentEvents",e[e.LongPolling=4]="LongPolling"}(nn||(nn={})),function(e){e[e.Text=1]="Text",e[e.Binary=2]="Binary"}(on||(on={}));let rn=class{constructor(){this._isAborted=!1,this.onabort=null}abort(){this._isAborted||(this._isAborted=!0,this.onabort&&this.onabort())}get signal(){return this}get aborted(){return this._isAborted}};class sn{get pollAborted(){return this._pollAbort.aborted}constructor(e,t,n){this._httpClient=e,this._logger=t,this._pollAbort=new rn,this._options=n,this._running=!1,this.onreceive=null,this.onclose=null}async connect(e,t){if(xt.isRequired(e,"url"),xt.isRequired(t,"transferFormat"),xt.isIn(t,on,"transferFormat"),this._url=e,this._logger.log(Tt.Trace,"(LongPolling transport) Connecting."),t===on.Binary&&"undefined"!=typeof XMLHttpRequest&&"string"!=typeof(new XMLHttpRequest).responseType)throw new Error("Binary protocols over XmlHttpRequest not implementing advanced features are not supported.");const[n,o]=Lt(),r={[n]:o,...this._options.headers},i={abortSignal:this._pollAbort.signal,headers:r,timeout:1e5,withCredentials:this._options.withCredentials};t===on.Binary&&(i.responseType="arraybuffer");const s=`${e}&_=${Date.now()}`;this._logger.log(Tt.Trace,`(LongPolling transport) polling: ${s}.`);const a=await this._httpClient.get(s,i);200!==a.statusCode?(this._logger.log(Tt.Error,`(LongPolling transport) Unexpected response code: ${a.statusCode}.`),this._closeError=new yt(a.statusText||"",a.statusCode),this._running=!1):this._running=!0,this._receiving=this._poll(this._url,i)}async _poll(e,t){try{for(;this._running;)try{const n=`${e}&_=${Date.now()}`;this._logger.log(Tt.Trace,`(LongPolling transport) polling: ${n}.`);const o=await this._httpClient.get(n,t);204===o.statusCode?(this._logger.log(Tt.Information,"(LongPolling transport) Poll terminated by server."),this._running=!1):200!==o.statusCode?(this._logger.log(Tt.Error,`(LongPolling transport) Unexpected response code: ${o.statusCode}.`),this._closeError=new yt(o.statusText||"",o.statusCode),this._running=!1):o.content?(this._logger.log(Tt.Trace,`(LongPolling transport) data received. ${Pt(o.content,this._options.logMessageContent)}.`),this.onreceive&&this.onreceive(o.content)):this._logger.log(Tt.Trace,"(LongPolling transport) Poll timed out, reissuing.")}catch(e){this._running?e instanceof vt?this._logger.log(Tt.Trace,"(LongPolling transport) Poll timed out, reissuing."):(this._closeError=e,this._running=!1):this._logger.log(Tt.Trace,`(LongPolling transport) Poll errored after shutdown: ${e.message}`)}}finally{this._logger.log(Tt.Trace,"(LongPolling transport) Polling complete."),this.pollAborted||this._raiseOnClose()}}async send(e){return this._running?Mt(this._logger,"LongPolling",this._httpClient,this._url,e,this._options):Promise.reject(new Error("Cannot send until the transport is connected"))}async stop(){this._logger.log(Tt.Trace,"(LongPolling transport) Stopping polling."),this._running=!1,this._pollAbort.abort();try{await this._receiving,this._logger.log(Tt.Trace,`(LongPolling transport) sending DELETE request to ${this._url}.`);const e={},[t,n]=Lt();e[t]=n;const o={headers:{...e,...this._options.headers},timeout:this._options.timeout,withCredentials:this._options.withCredentials};let r;try{await this._httpClient.delete(this._url,o)}catch(e){r=e}r?r instanceof yt&&(404===r.statusCode?this._logger.log(Tt.Trace,"(LongPolling transport) A 404 response was returned from sending a DELETE request."):this._logger.log(Tt.Trace,`(LongPolling transport) Error sending a DELETE request: ${r}`)):this._logger.log(Tt.Trace,"(LongPolling transport) DELETE request accepted.")}finally{this._logger.log(Tt.Trace,"(LongPolling transport) Stop finished."),this._raiseOnClose()}}_raiseOnClose(){if(this.onclose){let e="(LongPolling transport) Firing onclose event.";this._closeError&&(e+=" Error: "+this._closeError),this._logger.log(Tt.Trace,e),this.onclose(this._closeError)}}}class an{constructor(e,t,n,o){this._httpClient=e,this._accessToken=t,this._logger=n,this._options=o,this.onreceive=null,this.onclose=null}async connect(e,t){return xt.isRequired(e,"url"),xt.isRequired(t,"transferFormat"),xt.isIn(t,on,"transferFormat"),this._logger.log(Tt.Trace,"(SSE transport) Connecting."),this._url=e,this._accessToken&&(e+=(e.indexOf("?")<0?"?":"&")+`access_token=${encodeURIComponent(this._accessToken)}`),new Promise(((n,o)=>{let r,i=!1;if(t===on.Text){if(At.isBrowser||At.isWebWorker)r=new this._options.EventSource(e,{withCredentials:this._options.withCredentials});else{const t=this._httpClient.getCookieString(e),n={};n.Cookie=t;const[o,i]=Lt();n[o]=i,r=new this._options.EventSource(e,{withCredentials:this._options.withCredentials,headers:{...n,...this._options.headers}})}try{r.onmessage=e=>{if(this.onreceive)try{this._logger.log(Tt.Trace,`(SSE transport) data received. ${Pt(e.data,this._options.logMessageContent)}.`),this.onreceive(e.data)}catch(e){return void this._close(e)}},r.onerror=e=>{i?this._close():o(new Error("EventSource failed to connect. The connection could not be found on the server, either the connection ID is not present on the server, or a proxy is refusing/buffering the connection. If you have multiple servers check that sticky sessions are enabled."))},r.onopen=()=>{this._logger.log(Tt.Information,`SSE connected to ${this._url}`),this._eventSource=r,i=!0,n()}}catch(e){return void o(e)}}else o(new Error("The Server-Sent Events transport only supports the 'Text' transfer format"))}))}async send(e){return this._eventSource?Mt(this._logger,"SSE",this._httpClient,this._url,e,this._options):Promise.reject(new Error("Cannot send until the transport is connected"))}stop(){return this._close(),Promise.resolve()}_close(e){this._eventSource&&(this._eventSource.close(),this._eventSource=void 0,this.onclose&&this.onclose(e))}}class cn{constructor(e,t,n,o,r,i){this._logger=n,this._accessTokenFactory=t,this._logMessageContent=o,this._webSocketConstructor=r,this._httpClient=e,this.onreceive=null,this.onclose=null,this._headers=i}async connect(e,t){let n;return xt.isRequired(e,"url"),xt.isRequired(t,"transferFormat"),xt.isIn(t,on,"transferFormat"),this._logger.log(Tt.Trace,"(WebSockets transport) Connecting."),this._accessTokenFactory&&(n=await this._accessTokenFactory()),new Promise(((o,r)=>{let i;e=e.replace(/^http/,"ws");const s=this._httpClient.getCookieString(e);let a=!1;if(At.isReactNative){const t={},[o,r]=Lt();t[o]=r,n&&(t[en.Authorization]=`Bearer ${n}`),s&&(t[en.Cookie]=s),i=new this._webSocketConstructor(e,void 0,{headers:{...t,...this._headers}})}else n&&(e+=(e.indexOf("?")<0?"?":"&")+`access_token=${encodeURIComponent(n)}`);i||(i=new this._webSocketConstructor(e)),t===on.Binary&&(i.binaryType="arraybuffer"),i.onopen=t=>{this._logger.log(Tt.Information,`WebSocket connected to ${e}.`),this._webSocket=i,a=!0,o()},i.onerror=e=>{let t=null;t="undefined"!=typeof ErrorEvent&&e instanceof ErrorEvent?e.error:"There was an error with the transport",this._logger.log(Tt.Information,`(WebSockets transport) ${t}.`)},i.onmessage=e=>{if(this._logger.log(Tt.Trace,`(WebSockets transport) data received. ${Pt(e.data,this._logMessageContent)}.`),this.onreceive)try{this.onreceive(e.data)}catch(e){return void this._close(e)}},i.onclose=e=>{if(a)this._close(e);else{let t=null;t="undefined"!=typeof ErrorEvent&&e instanceof ErrorEvent?e.error:"WebSocket failed to connect. The connection could not be found on the server, either the endpoint may not be a SignalR endpoint, the connection ID is not present on the server, or there is a proxy blocking WebSockets. If you have multiple servers check that sticky sessions are enabled.",r(new Error(t))}}}))}send(e){return this._webSocket&&this._webSocket.readyState===this._webSocketConstructor.OPEN?(this._logger.log(Tt.Trace,`(WebSockets transport) sending data. ${Pt(e,this._logMessageContent)}.`),this._webSocket.send(e),Promise.resolve()):Promise.reject("WebSocket is not in the OPEN state")}stop(){return this._webSocket&&this._close(void 0),Promise.resolve()}_close(e){this._webSocket&&(this._webSocket.onclose=()=>{},this._webSocket.onmessage=()=>{},this._webSocket.onerror=()=>{},this._webSocket.close(),this._webSocket=void 0),this._logger.log(Tt.Trace,"(WebSockets transport) socket closed."),this.onclose&&(!this._isCloseEvent(e)||!1!==e.wasClean&&1e3===e.code?e instanceof Error?this.onclose(e):this.onclose():this.onclose(new Error(`WebSocket closed with status code: ${e.code} (${e.reason||"no reason given"}).`)))}_isCloseEvent(e){return e&&"boolean"==typeof e.wasClean&&"number"==typeof e.code}}class ln{constructor(e,t={}){if(this._stopPromiseResolver=()=>{},this.features={},this._negotiateVersion=1,xt.isRequired(e,"url"),this._logger=function(e){return void 0===e?new Bt(Tt.Information):null===e?Dt.instance:void 0!==e.log?e:new Bt(e)}(t.logger),this.baseUrl=this._resolveUrl(e),(t=t||{}).logMessageContent=void 0!==t.logMessageContent&&t.logMessageContent,"boolean"!=typeof t.withCredentials&&void 0!==t.withCredentials)throw new Error("withCredentials option was not a 'boolean' or 'undefined' value");t.withCredentials=void 0===t.withCredentials||t.withCredentials,t.timeout=void 0===t.timeout?1e5:t.timeout,"undefined"==typeof WebSocket||t.WebSocket||(t.WebSocket=WebSocket),"undefined"==typeof EventSource||t.EventSource||(t.EventSource=EventSource),this._httpClient=new tn(t.httpClient||new Wt(this._logger),t.accessTokenFactory),this._connectionState="Disconnected",this._connectionStarted=!1,this._options=t,this.onreceive=null,this.onclose=null}async start(e){if(e=e||on.Binary,xt.isIn(e,on,"transferFormat"),this._logger.log(Tt.Debug,`Starting connection with transfer format '${on[e]}'.`),"Disconnected"!==this._connectionState)return Promise.reject(new Error("Cannot start an HttpConnection that is not in the 'Disconnected' state."));if(this._connectionState="Connecting",this._startInternalPromise=this._startInternal(e),await this._startInternalPromise,"Disconnecting"===this._connectionState){const e="Failed to start the HttpConnection before stop() was called.";return this._logger.log(Tt.Error,e),await this._stopPromise,Promise.reject(new wt(e))}if("Connected"!==this._connectionState){const e="HttpConnection.startInternal completed gracefully but didn't enter the connection into the connected state!";return this._logger.log(Tt.Error,e),Promise.reject(new wt(e))}this._connectionStarted=!0}send(e){return"Connected"!==this._connectionState?Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")):(this._sendQueue||(this._sendQueue=new hn(this.transport)),this._sendQueue.send(e))}async stop(e){return"Disconnected"===this._connectionState?(this._logger.log(Tt.Debug,`Call to HttpConnection.stop(${e}) ignored because the connection is already in the disconnected state.`),Promise.resolve()):"Disconnecting"===this._connectionState?(this._logger.log(Tt.Debug,`Call to HttpConnection.stop(${e}) ignored because the connection is already in the disconnecting state.`),this._stopPromise):(this._connectionState="Disconnecting",this._stopPromise=new Promise((e=>{this._stopPromiseResolver=e})),await this._stopInternal(e),void await this._stopPromise)}async _stopInternal(e){this._stopError=e;try{await this._startInternalPromise}catch(e){}if(this.transport){try{await this.transport.stop()}catch(e){this._logger.log(Tt.Error,`HttpConnection.transport.stop() threw error '${e}'.`),this._stopConnection()}this.transport=void 0}else this._logger.log(Tt.Debug,"HttpConnection.transport is undefined in HttpConnection.stop() because start() failed.")}async _startInternal(e){let t=this.baseUrl;this._accessTokenFactory=this._options.accessTokenFactory,this._httpClient._accessTokenFactory=this._accessTokenFactory;try{if(this._options.skipNegotiation){if(this._options.transport!==nn.WebSockets)throw new Error("Negotiation can only be skipped when using the WebSocket transport directly.");this.transport=this._constructTransport(nn.WebSockets),await this._startTransport(t,e)}else{let n=null,o=0;do{if(n=await this._getNegotiationResponse(t),"Disconnecting"===this._connectionState||"Disconnected"===this._connectionState)throw new wt("The connection was stopped during negotiation.");if(n.error)throw new Error(n.error);if(n.ProtocolVersion)throw new Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details.");if(n.url&&(t=n.url),n.accessToken){const e=n.accessToken;this._accessTokenFactory=()=>e,this._httpClient._accessToken=e,this._httpClient._accessTokenFactory=void 0}o++}while(n.url&&o<100);if(100===o&&n.url)throw new Error("Negotiate redirection limit exceeded.");await this._createTransport(t,this._options.transport,n,e)}this.transport instanceof sn&&(this.features.inherentKeepAlive=!0),"Connecting"===this._connectionState&&(this._logger.log(Tt.Debug,"The HttpConnection connected successfully."),this._connectionState="Connected")}catch(e){return this._logger.log(Tt.Error,"Failed to start the connection: "+e),this._connectionState="Disconnected",this.transport=void 0,this._stopPromiseResolver(),Promise.reject(e)}}async _getNegotiationResponse(e){const t={},[n,o]=Lt();t[n]=o;const r=this._resolveNegotiateUrl(e);this._logger.log(Tt.Debug,`Sending negotiation request: ${r}.`);try{const e=await this._httpClient.post(r,{content:"",headers:{...t,...this._options.headers},timeout:this._options.timeout,withCredentials:this._options.withCredentials});if(200!==e.statusCode)return Promise.reject(new Error(`Unexpected status code returned from negotiate '${e.statusCode}'`));const n=JSON.parse(e.content);return(!n.negotiateVersion||n.negotiateVersion<1)&&(n.connectionToken=n.connectionId),n.useStatefulReconnect&&!0!==this._options._useStatefulReconnect?Promise.reject(new Et("Client didn't negotiate Stateful Reconnect but the server did.")):n}catch(e){let t="Failed to complete negotiation with the server: "+e;return e instanceof yt&&404===e.statusCode&&(t+=" Either this is not a SignalR endpoint or there is a proxy blocking the connection."),this._logger.log(Tt.Error,t),Promise.reject(new Et(t))}}_createConnectUrl(e,t){return t?e+(-1===e.indexOf("?")?"?":"&")+`id=${t}`:e}async _createTransport(e,t,n,o){let r=this._createConnectUrl(e,n.connectionToken);if(this._isITransport(t))return this._logger.log(Tt.Debug,"Connection was provided an instance of ITransport, using that directly."),this.transport=t,await this._startTransport(r,o),void(this.connectionId=n.connectionId);const i=[],s=n.availableTransports||[];let a=n;for(const n of s){const s=this._resolveTransportOrError(n,t,o,!0===(null==a?void 0:a.useStatefulReconnect));if(s instanceof Error)i.push(`${n.transport} failed:`),i.push(s);else if(this._isITransport(s)){if(this.transport=s,!a){try{a=await this._getNegotiationResponse(e)}catch(e){return Promise.reject(e)}r=this._createConnectUrl(e,a.connectionToken)}try{return await this._startTransport(r,o),void(this.connectionId=a.connectionId)}catch(e){if(this._logger.log(Tt.Error,`Failed to start the transport '${n.transport}': ${e}`),a=void 0,i.push(new St(`${n.transport} failed: ${e}`,nn[n.transport])),"Connecting"!==this._connectionState){const e="Failed to select transport before stop() was called.";return this._logger.log(Tt.Debug,e),Promise.reject(new wt(e))}}}}return i.length>0?Promise.reject(new Ct(`Unable to connect to the server with any of the available transports. ${i.join(" ")}`,i)):Promise.reject(new Error("None of the transports supported by the client are supported by the server."))}_constructTransport(e){switch(e){case nn.WebSockets:if(!this._options.WebSocket)throw new Error("'WebSocket' is not supported in your environment.");return new cn(this._httpClient,this._accessTokenFactory,this._logger,this._options.logMessageContent,this._options.WebSocket,this._options.headers||{});case nn.ServerSentEvents:if(!this._options.EventSource)throw new Error("'EventSource' is not supported in your environment.");return new an(this._httpClient,this._httpClient._accessToken,this._logger,this._options);case nn.LongPolling:return new sn(this._httpClient,this._logger,this._options);default:throw new Error(`Unknown transport: ${e}.`)}}_startTransport(e,t){return this.transport.onreceive=this.onreceive,this.features.reconnect?this.transport.onclose=async n=>{let o=!1;if(this.features.reconnect){try{this.features.disconnected(),await this.transport.connect(e,t),await this.features.resend()}catch{o=!0}o&&this._stopConnection(n)}else this._stopConnection(n)}:this.transport.onclose=e=>this._stopConnection(e),this.transport.connect(e,t)}_resolveTransportOrError(e,t,n,o){const r=nn[e.transport];if(null==r)return this._logger.log(Tt.Debug,`Skipping transport '${e.transport}' because it is not supported by this client.`),new Error(`Skipping transport '${e.transport}' because it is not supported by this client.`);if(!function(e,t){return!e||!!(t&e)}(t,r))return this._logger.log(Tt.Debug,`Skipping transport '${nn[r]}' because it was disabled by the client.`),new bt(`'${nn[r]}' is disabled by the client.`,r);if(!(e.transferFormats.map((e=>on[e])).indexOf(n)>=0))return this._logger.log(Tt.Debug,`Skipping transport '${nn[r]}' because it does not support the requested transfer format '${on[n]}'.`),new Error(`'${nn[r]}' does not support ${on[n]}.`);if(r===nn.WebSockets&&!this._options.WebSocket||r===nn.ServerSentEvents&&!this._options.EventSource)return this._logger.log(Tt.Debug,`Skipping transport '${nn[r]}' because it is not supported in your environment.'`),new _t(`'${nn[r]}' is not supported in your environment.`,r);this._logger.log(Tt.Debug,`Selecting transport '${nn[r]}'.`);try{return this.features.reconnect=r===nn.WebSockets?o:void 0,this._constructTransport(r)}catch(e){return e}}_isITransport(e){return e&&"object"==typeof e&&"connect"in e}_stopConnection(e){if(this._logger.log(Tt.Debug,`HttpConnection.stopConnection(${e}) called while in state ${this._connectionState}.`),this.transport=void 0,e=this._stopError||e,this._stopError=void 0,"Disconnected"!==this._connectionState){if("Connecting"===this._connectionState)throw this._logger.log(Tt.Warning,`Call to HttpConnection.stopConnection(${e}) was ignored because the connection is still in the connecting state.`),new Error(`HttpConnection.stopConnection(${e}) was called while the connection is still in the connecting state.`);if("Disconnecting"===this._connectionState&&this._stopPromiseResolver(),e?this._logger.log(Tt.Error,`Connection disconnected with error '${e}'.`):this._logger.log(Tt.Information,"Connection disconnected."),this._sendQueue&&(this._sendQueue.stop().catch((e=>{this._logger.log(Tt.Error,`TransportSendQueue.stop() threw error '${e}'.`)})),this._sendQueue=void 0),this.connectionId=void 0,this._connectionState="Disconnected",this._connectionStarted){this._connectionStarted=!1;try{this.onclose&&this.onclose(e)}catch(t){this._logger.log(Tt.Error,`HttpConnection.onclose(${e}) threw error '${t}'.`)}}}else this._logger.log(Tt.Debug,`Call to HttpConnection.stopConnection(${e}) was ignored because the connection is already in the disconnected state.`)}_resolveUrl(e){if(0===e.lastIndexOf("https://",0)||0===e.lastIndexOf("http://",0))return e;if(!At.isBrowser)throw new Error(`Cannot resolve '${e}'.`);const t=window.document.createElement("a");return t.href=e,this._logger.log(Tt.Information,`Normalizing '${e}' to '${t.href}'.`),t.href}_resolveNegotiateUrl(e){const t=new URL(e);t.pathname.endsWith("/")?t.pathname+="negotiate":t.pathname+="/negotiate";const n=new URLSearchParams(t.searchParams);return n.has("negotiateVersion")||n.append("negotiateVersion",this._negotiateVersion.toString()),n.has("useStatefulReconnect")?"true"===n.get("useStatefulReconnect")&&(this._options._useStatefulReconnect=!0):!0===this._options._useStatefulReconnect&&n.append("useStatefulReconnect","true"),t.search=n.toString(),t.toString()}}class hn{constructor(e){this._transport=e,this._buffer=[],this._executing=!0,this._sendBufferedData=new dn,this._transportResult=new dn,this._sendLoopPromise=this._sendLoop()}send(e){return this._bufferData(e),this._transportResult||(this._transportResult=new dn),this._transportResult.promise}stop(){return this._executing=!1,this._sendBufferedData.resolve(),this._sendLoopPromise}_bufferData(e){if(this._buffer.length&&typeof this._buffer[0]!=typeof e)throw new Error(`Expected data to be of type ${typeof this._buffer} but was of type ${typeof e}`);this._buffer.push(e),this._sendBufferedData.resolve()}async _sendLoop(){for(;;){if(await this._sendBufferedData.promise,!this._executing){this._transportResult&&this._transportResult.reject("Connection stopped.");break}this._sendBufferedData=new dn;const e=this._transportResult;this._transportResult=void 0;const t="string"==typeof this._buffer[0]?this._buffer.join(""):hn._concatBuffers(this._buffer);this._buffer.length=0;try{await this._transport.send(t),e.resolve()}catch(t){e.reject(t)}}}static _concatBuffers(e){const t=e.map((e=>e.byteLength)).reduce(((e,t)=>e+t)),n=new Uint8Array(t);let o=0;for(const t of e)n.set(new Uint8Array(t),o),o+=t.byteLength;return n.buffer}}class dn{constructor(){this.promise=new Promise(((e,t)=>[this._resolver,this._rejecter]=[e,t]))}resolve(){this._resolver()}reject(e){this._rejecter(e)}}class un{constructor(){this.name="json",this.version=2,this.transferFormat=on.Text}parseMessages(e,t){if("string"!=typeof e)throw new Error("Invalid input for JSON hub protocol. Expected a string.");if(!e)return[];null===t&&(t=Dt.instance);const n=zt.parse(e),o=[];for(const e of n){const n=JSON.parse(e);if("number"!=typeof n.type)throw new Error("Invalid payload.");switch(n.type){case Jt.Invocation:this._isInvocationMessage(n);break;case Jt.StreamItem:this._isStreamItemMessage(n);break;case Jt.Completion:this._isCompletionMessage(n);break;case Jt.Ping:case Jt.Close:break;case Jt.Ack:this._isAckMessage(n);break;case Jt.Sequence:this._isSequenceMessage(n);break;default:t.log(Tt.Information,"Unknown message type '"+n.type+"' ignored.");continue}o.push(n)}return o}writeMessage(e){return zt.write(JSON.stringify(e))}_isInvocationMessage(e){this._assertNotEmptyString(e.target,"Invalid payload for Invocation message."),void 0!==e.invocationId&&this._assertNotEmptyString(e.invocationId,"Invalid payload for Invocation message.")}_isStreamItemMessage(e){if(this._assertNotEmptyString(e.invocationId,"Invalid payload for StreamItem message."),void 0===e.item)throw new Error("Invalid payload for StreamItem message.")}_isCompletionMessage(e){if(e.result&&e.error)throw new Error("Invalid payload for Completion message.");!e.result&&e.error&&this._assertNotEmptyString(e.error,"Invalid payload for Completion message."),this._assertNotEmptyString(e.invocationId,"Invalid payload for Completion message.")}_isAckMessage(e){if("number"!=typeof e.sequenceId)throw new Error("Invalid SequenceId for Ack message.")}_isSequenceMessage(e){if("number"!=typeof e.sequenceId)throw new Error("Invalid SequenceId for Sequence message.")}_assertNotEmptyString(e,t){if("string"!=typeof e||""===e)throw new Error(t)}}const pn={trace:Tt.Trace,debug:Tt.Debug,info:Tt.Information,information:Tt.Information,warn:Tt.Warning,warning:Tt.Warning,error:Tt.Error,critical:Tt.Critical,none:Tt.None};class fn{configureLogging(e){if(xt.isRequired(e,"logging"),function(e){return void 0!==e.log}(e))this.logger=e;else if("string"==typeof e){const t=function(e){const t=pn[e.toLowerCase()];if(void 0!==t)return t;throw new Error(`Unknown log level: ${e}`)}(e);this.logger=new Bt(t)}else this.logger=new Bt(e);return this}withUrl(e,t){return xt.isRequired(e,"url"),xt.isNotEmpty(e,"url"),this.url=e,this.httpConnectionOptions="object"==typeof t?{...this.httpConnectionOptions,...t}:{...this.httpConnectionOptions,transport:t},this}withHubProtocol(e){return xt.isRequired(e,"protocol"),this.protocol=e,this}withAutomaticReconnect(e){if(this.reconnectPolicy)throw new Error("A reconnectPolicy has already been set.");return e?Array.isArray(e)?this.reconnectPolicy=new Zt(e):this.reconnectPolicy=e:this.reconnectPolicy=new Zt,this}withServerTimeout(e){return xt.isRequired(e,"milliseconds"),this._serverTimeoutInMilliseconds=e,this}withKeepAliveInterval(e){return xt.isRequired(e,"milliseconds"),this._keepAliveIntervalInMilliseconds=e,this}withStatefulReconnect(e){return void 0===this.httpConnectionOptions&&(this.httpConnectionOptions={}),this.httpConnectionOptions._useStatefulReconnect=!0,this._statefulReconnectBufferSize=null==e?void 0:e.bufferSize,this}build(){const e=this.httpConnectionOptions||{};if(void 0===e.logger&&(e.logger=this.logger),!this.url)throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection.");const t=new ln(this.url,e);return Gt.create(t,this.logger||Dt.instance,this.protocol||new un,this.reconnectPolicy,this._serverTimeoutInMilliseconds,this._keepAliveIntervalInMilliseconds,this._statefulReconnectBufferSize)}}var gn;!function(e){e[e.Default=0]="Default",e[e.Server=1]="Server",e[e.WebAssembly=2]="WebAssembly",e[e.WebView=3]="WebView"}(gn||(gn={}));var mn,yn,vn,wn=4294967295;function _n(e,t,n){var o=Math.floor(n/4294967296),r=n;e.setUint32(t,o),e.setUint32(t+4,r)}function bn(e,t){return 4294967296*e.getInt32(t)+e.getUint32(t+4)}var Sn=("undefined"==typeof process||"never"!==(null===(mn=null===process||void 0===process?void 0:process.env)||void 0===mn?void 0:mn.TEXT_ENCODING))&&"undefined"!=typeof TextEncoder&&"undefined"!=typeof TextDecoder;function En(e){for(var t=e.length,n=0,o=0;o<t;){var r=e.charCodeAt(o++);if(4294967168&r)if(4294965248&r){if(r>=55296&&r<=56319&&o<t){var i=e.charCodeAt(o);56320==(64512&i)&&(++o,r=((1023&r)<<10)+(1023&i)+65536)}n+=4294901760&r?4:3}else n+=2;else n++}return n}var Cn=Sn?new TextEncoder:void 0,In=Sn?"undefined"!=typeof process&&"force"!==(null===(yn=null===process||void 0===process?void 0:process.env)||void 0===yn?void 0:yn.TEXT_ENCODING)?200:0:wn,kn=(null==Cn?void 0:Cn.encodeInto)?function(e,t,n){Cn.encodeInto(e,t.subarray(n))}:function(e,t,n){t.set(Cn.encode(e),n)};function Tn(e,t,n){for(var o=t,r=o+n,i=[],s="";o<r;){var a=e[o++];if(128&a)if(192==(224&a)){var c=63&e[o++];i.push((31&a)<<6|c)}else if(224==(240&a)){c=63&e[o++];var l=63&e[o++];i.push((31&a)<<12|c<<6|l)}else if(240==(248&a)){var h=(7&a)<<18|(c=63&e[o++])<<12|(l=63&e[o++])<<6|63&e[o++];h>65535&&(h-=65536,i.push(h>>>10&1023|55296),h=56320|1023&h),i.push(h)}else i.push(a);else i.push(a);i.length>=4096&&(s+=String.fromCharCode.apply(String,i),i.length=0)}return i.length>0&&(s+=String.fromCharCode.apply(String,i)),s}var Dn,Rn=Sn?new TextDecoder:null,xn=Sn?"undefined"!=typeof process&&"force"!==(null===(vn=null===process||void 0===process?void 0:process.env)||void 0===vn?void 0:vn.TEXT_DECODER)?200:0:wn,An=function(e,t){this.type=e,this.data=t},Pn=(Dn=function(e,t){return Dn=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])},Dn(e,t)},function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function n(){this.constructor=e}Dn(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),Nn=function(e){function t(n){var o=e.call(this,n)||this,r=Object.create(t.prototype);return Object.setPrototypeOf(o,r),Object.defineProperty(o,"name",{configurable:!0,enumerable:!1,value:t.name}),o}return Pn(t,e),t}(Error),Mn={type:-1,encode:function(e){var t,n,o,r;return e instanceof Date?function(e){var t,n=e.sec,o=e.nsec;if(n>=0&&o>=0&&n<=17179869183){if(0===o&&n<=4294967295){var r=new Uint8Array(4);return(t=new DataView(r.buffer)).setUint32(0,n),r}var i=n/4294967296,s=4294967295&n;return r=new Uint8Array(8),(t=new DataView(r.buffer)).setUint32(0,o<<2|3&i),t.setUint32(4,s),r}return r=new Uint8Array(12),(t=new DataView(r.buffer)).setUint32(0,o),_n(t,4,n),r}((o=1e6*((t=e.getTime())-1e3*(n=Math.floor(t/1e3))),{sec:n+(r=Math.floor(o/1e9)),nsec:o-1e9*r})):null},decode:function(e){var t=function(e){var t=new DataView(e.buffer,e.byteOffset,e.byteLength);switch(e.byteLength){case 4:return{sec:t.getUint32(0),nsec:0};case 8:var n=t.getUint32(0);return{sec:4294967296*(3&n)+t.getUint32(4),nsec:n>>>2};case 12:return{sec:bn(t,4),nsec:t.getUint32(0)};default:throw new Nn("Unrecognized data size for timestamp (expected 4, 8, or 12): ".concat(e.length))}}(e);return new Date(1e3*t.sec+t.nsec/1e6)}},Un=function(){function e(){this.builtInEncoders=[],this.builtInDecoders=[],this.encoders=[],this.decoders=[],this.register(Mn)}return e.prototype.register=function(e){var t=e.type,n=e.encode,o=e.decode;if(t>=0)this.encoders[t]=n,this.decoders[t]=o;else{var r=1+t;this.builtInEncoders[r]=n,this.builtInDecoders[r]=o}},e.prototype.tryToEncode=function(e,t){for(var n=0;n<this.builtInEncoders.length;n++)if(null!=(o=this.builtInEncoders[n])&&null!=(r=o(e,t)))return new An(-1-n,r);for(n=0;n<this.encoders.length;n++){var o,r;if(null!=(o=this.encoders[n])&&null!=(r=o(e,t)))return new An(n,r)}return e instanceof An?e:null},e.prototype.decode=function(e,t,n){var o=t<0?this.builtInDecoders[-1-t]:this.decoders[t];return o?o(e,t,n):new An(t,e)},e.defaultCodec=new e,e}();function Bn(e){return e instanceof Uint8Array?e:ArrayBuffer.isView(e)?new Uint8Array(e.buffer,e.byteOffset,e.byteLength):e instanceof ArrayBuffer?new Uint8Array(e):Uint8Array.from(e)}var Ln=function(){function e(e,t,n,o,r,i,s,a){void 0===e&&(e=Un.defaultCodec),void 0===t&&(t=void 0),void 0===n&&(n=100),void 0===o&&(o=2048),void 0===r&&(r=!1),void 0===i&&(i=!1),void 0===s&&(s=!1),void 0===a&&(a=!1),this.extensionCodec=e,this.context=t,this.maxDepth=n,this.initialBufferSize=o,this.sortKeys=r,this.forceFloat32=i,this.ignoreUndefined=s,this.forceIntegerToFloat=a,this.pos=0,this.view=new DataView(new ArrayBuffer(this.initialBufferSize)),this.bytes=new Uint8Array(this.view.buffer)}return e.prototype.reinitializeState=function(){this.pos=0},e.prototype.encodeSharedRef=function(e){return this.reinitializeState(),this.doEncode(e,1),this.bytes.subarray(0,this.pos)},e.prototype.encode=function(e){return this.reinitializeState(),this.doEncode(e,1),this.bytes.slice(0,this.pos)},e.prototype.doEncode=function(e,t){if(t>this.maxDepth)throw new Error("Too deep objects in depth ".concat(t));null==e?this.encodeNil():"boolean"==typeof e?this.encodeBoolean(e):"number"==typeof e?this.encodeNumber(e):"string"==typeof e?this.encodeString(e):this.encodeObject(e,t)},e.prototype.ensureBufferSizeToWrite=function(e){var t=this.pos+e;this.view.byteLength<t&&this.resizeBuffer(2*t)},e.prototype.resizeBuffer=function(e){var t=new ArrayBuffer(e),n=new Uint8Array(t),o=new DataView(t);n.set(this.bytes),this.view=o,this.bytes=n},e.prototype.encodeNil=function(){this.writeU8(192)},e.prototype.encodeBoolean=function(e){!1===e?this.writeU8(194):this.writeU8(195)},e.prototype.encodeNumber=function(e){Number.isSafeInteger(e)&&!this.forceIntegerToFloat?e>=0?e<128?this.writeU8(e):e<256?(this.writeU8(204),this.writeU8(e)):e<65536?(this.writeU8(205),this.writeU16(e)):e<4294967296?(this.writeU8(206),this.writeU32(e)):(this.writeU8(207),this.writeU64(e)):e>=-32?this.writeU8(224|e+32):e>=-128?(this.writeU8(208),this.writeI8(e)):e>=-32768?(this.writeU8(209),this.writeI16(e)):e>=-2147483648?(this.writeU8(210),this.writeI32(e)):(this.writeU8(211),this.writeI64(e)):this.forceFloat32?(this.writeU8(202),this.writeF32(e)):(this.writeU8(203),this.writeF64(e))},e.prototype.writeStringHeader=function(e){if(e<32)this.writeU8(160+e);else if(e<256)this.writeU8(217),this.writeU8(e);else if(e<65536)this.writeU8(218),this.writeU16(e);else{if(!(e<4294967296))throw new Error("Too long string: ".concat(e," bytes in UTF-8"));this.writeU8(219),this.writeU32(e)}},e.prototype.encodeString=function(e){if(e.length>In){var t=En(e);this.ensureBufferSizeToWrite(5+t),this.writeStringHeader(t),kn(e,this.bytes,this.pos),this.pos+=t}else t=En(e),this.ensureBufferSizeToWrite(5+t),this.writeStringHeader(t),function(e,t,n){for(var o=e.length,r=n,i=0;i<o;){var s=e.charCodeAt(i++);if(4294967168&s){if(4294965248&s){if(s>=55296&&s<=56319&&i<o){var a=e.charCodeAt(i);56320==(64512&a)&&(++i,s=((1023&s)<<10)+(1023&a)+65536)}4294901760&s?(t[r++]=s>>18&7|240,t[r++]=s>>12&63|128,t[r++]=s>>6&63|128):(t[r++]=s>>12&15|224,t[r++]=s>>6&63|128)}else t[r++]=s>>6&31|192;t[r++]=63&s|128}else t[r++]=s}}(e,this.bytes,this.pos),this.pos+=t},e.prototype.encodeObject=function(e,t){var n=this.extensionCodec.tryToEncode(e,this.context);if(null!=n)this.encodeExtension(n);else if(Array.isArray(e))this.encodeArray(e,t);else if(ArrayBuffer.isView(e))this.encodeBinary(e);else{if("object"!=typeof e)throw new Error("Unrecognized object: ".concat(Object.prototype.toString.apply(e)));this.encodeMap(e,t)}},e.prototype.encodeBinary=function(e){var t=e.byteLength;if(t<256)this.writeU8(196),this.writeU8(t);else if(t<65536)this.writeU8(197),this.writeU16(t);else{if(!(t<4294967296))throw new Error("Too large binary: ".concat(t));this.writeU8(198),this.writeU32(t)}var n=Bn(e);this.writeU8a(n)},e.prototype.encodeArray=function(e,t){var n=e.length;if(n<16)this.writeU8(144+n);else if(n<65536)this.writeU8(220),this.writeU16(n);else{if(!(n<4294967296))throw new Error("Too large array: ".concat(n));this.writeU8(221),this.writeU32(n)}for(var o=0,r=e;o<r.length;o++){var i=r[o];this.doEncode(i,t+1)}},e.prototype.countWithoutUndefined=function(e,t){for(var n=0,o=0,r=t;o<r.length;o++)void 0!==e[r[o]]&&n++;return n},e.prototype.encodeMap=function(e,t){var n=Object.keys(e);this.sortKeys&&n.sort();var o=this.ignoreUndefined?this.countWithoutUndefined(e,n):n.length;if(o<16)this.writeU8(128+o);else if(o<65536)this.writeU8(222),this.writeU16(o);else{if(!(o<4294967296))throw new Error("Too large map object: ".concat(o));this.writeU8(223),this.writeU32(o)}for(var r=0,i=n;r<i.length;r++){var s=i[r],a=e[s];this.ignoreUndefined&&void 0===a||(this.encodeString(s),this.doEncode(a,t+1))}},e.prototype.encodeExtension=function(e){var t=e.data.length;if(1===t)this.writeU8(212);else if(2===t)this.writeU8(213);else if(4===t)this.writeU8(214);else if(8===t)this.writeU8(215);else if(16===t)this.writeU8(216);else if(t<256)this.writeU8(199),this.writeU8(t);else if(t<65536)this.writeU8(200),this.writeU16(t);else{if(!(t<4294967296))throw new Error("Too large extension object: ".concat(t));this.writeU8(201),this.writeU32(t)}this.writeI8(e.type),this.writeU8a(e.data)},e.prototype.writeU8=function(e){this.ensureBufferSizeToWrite(1),this.view.setUint8(this.pos,e),this.pos++},e.prototype.writeU8a=function(e){var t=e.length;this.ensureBufferSizeToWrite(t),this.bytes.set(e,this.pos),this.pos+=t},e.prototype.writeI8=function(e){this.ensureBufferSizeToWrite(1),this.view.setInt8(this.pos,e),this.pos++},e.prototype.writeU16=function(e){this.ensureBufferSizeToWrite(2),this.view.setUint16(this.pos,e),this.pos+=2},e.prototype.writeI16=function(e){this.ensureBufferSizeToWrite(2),this.view.setInt16(this.pos,e),this.pos+=2},e.prototype.writeU32=function(e){this.ensureBufferSizeToWrite(4),this.view.setUint32(this.pos,e),this.pos+=4},e.prototype.writeI32=function(e){this.ensureBufferSizeToWrite(4),this.view.setInt32(this.pos,e),this.pos+=4},e.prototype.writeF32=function(e){this.ensureBufferSizeToWrite(4),this.view.setFloat32(this.pos,e),this.pos+=4},e.prototype.writeF64=function(e){this.ensureBufferSizeToWrite(8),this.view.setFloat64(this.pos,e),this.pos+=8},e.prototype.writeU64=function(e){this.ensureBufferSizeToWrite(8),function(e,t,n){var o=n/4294967296,r=n;e.setUint32(t,o),e.setUint32(t+4,r)}(this.view,this.pos,e),this.pos+=8},e.prototype.writeI64=function(e){this.ensureBufferSizeToWrite(8),_n(this.view,this.pos,e),this.pos+=8},e}();function $n(e){return"".concat(e<0?"-":"","0x").concat(Math.abs(e).toString(16).padStart(2,"0"))}var On=function(){function e(e,t){void 0===e&&(e=16),void 0===t&&(t=16),this.maxKeyLength=e,this.maxLengthPerKey=t,this.hit=0,this.miss=0,this.caches=[];for(var n=0;n<this.maxKeyLength;n++)this.caches.push([])}return e.prototype.canBeCached=function(e){return e>0&&e<=this.maxKeyLength},e.prototype.find=function(e,t,n){e:for(var o=0,r=this.caches[n-1];o<r.length;o++){for(var i=r[o],s=i.bytes,a=0;a<n;a++)if(s[a]!==e[t+a])continue e;return i.str}return null},e.prototype.store=function(e,t){var n=this.caches[e.length-1],o={bytes:e,str:t};n.length>=this.maxLengthPerKey?n[Math.random()*n.length|0]=o:n.push(o)},e.prototype.decode=function(e,t,n){var o=this.find(e,t,n);if(null!=o)return this.hit++,o;this.miss++;var r=Tn(e,t,n),i=Uint8Array.prototype.slice.call(e,t,t+n);return this.store(i,r),r},e}(),Fn=function(e,t){var n,o,r,i,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,o&&(r=2&i[0]?o.return:i[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,i[1])).done)return r;switch(o=0,r&&(i=[2&i[0],r.value]),i[0]){case 0:case 1:r=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,o=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!((r=(r=s.trys).length>0&&r[r.length-1])||6!==i[0]&&2!==i[0])){s=0;continue}if(3===i[0]&&(!r||i[1]>r[0]&&i[1]<r[3])){s.label=i[1];break}if(6===i[0]&&s.label<r[1]){s.label=r[1],r=i;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(i);break}r[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],o=0}finally{n=r=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}},Hn=function(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t,n=e[Symbol.asyncIterator];return n?n.call(e):(e="function"==typeof __values?__values(e):e[Symbol.iterator](),t={},o("next"),o("throw"),o("return"),t[Symbol.asyncIterator]=function(){return this},t);function o(n){t[n]=e[n]&&function(t){return new Promise((function(o,r){!function(e,t,n,o){Promise.resolve(o).then((function(t){e({value:t,done:n})}),t)}(o,r,(t=e[n](t)).done,t.value)}))}}},jn=function(e){return this instanceof jn?(this.v=e,this):new jn(e)},Wn=new DataView(new ArrayBuffer(0)),zn=new Uint8Array(Wn.buffer),qn=function(){try{Wn.getInt8(0)}catch(e){return e.constructor}throw new Error("never reached")}(),Jn=new qn("Insufficient data"),Vn=new On,Kn=function(){function e(e,t,n,o,r,i,s,a){void 0===e&&(e=Un.defaultCodec),void 0===t&&(t=void 0),void 0===n&&(n=wn),void 0===o&&(o=wn),void 0===r&&(r=wn),void 0===i&&(i=wn),void 0===s&&(s=wn),void 0===a&&(a=Vn),this.extensionCodec=e,this.context=t,this.maxStrLength=n,this.maxBinLength=o,this.maxArrayLength=r,this.maxMapLength=i,this.maxExtLength=s,this.keyDecoder=a,this.totalPos=0,this.pos=0,this.view=Wn,this.bytes=zn,this.headByte=-1,this.stack=[]}return e.prototype.reinitializeState=function(){this.totalPos=0,this.headByte=-1,this.stack.length=0},e.prototype.setBuffer=function(e){this.bytes=Bn(e),this.view=function(e){if(e instanceof ArrayBuffer)return new DataView(e);var t=Bn(e);return new DataView(t.buffer,t.byteOffset,t.byteLength)}(this.bytes),this.pos=0},e.prototype.appendBuffer=function(e){if(-1!==this.headByte||this.hasRemaining(1)){var t=this.bytes.subarray(this.pos),n=Bn(e),o=new Uint8Array(t.length+n.length);o.set(t),o.set(n,t.length),this.setBuffer(o)}else this.setBuffer(e)},e.prototype.hasRemaining=function(e){return this.view.byteLength-this.pos>=e},e.prototype.createExtraByteError=function(e){var t=this.view,n=this.pos;return new RangeError("Extra ".concat(t.byteLength-n," of ").concat(t.byteLength," byte(s) found at buffer[").concat(e,"]"))},e.prototype.decode=function(e){this.reinitializeState(),this.setBuffer(e);var t=this.doDecodeSync();if(this.hasRemaining(1))throw this.createExtraByteError(this.pos);return t},e.prototype.decodeMulti=function(e){return Fn(this,(function(t){switch(t.label){case 0:this.reinitializeState(),this.setBuffer(e),t.label=1;case 1:return this.hasRemaining(1)?[4,this.doDecodeSync()]:[3,3];case 2:return t.sent(),[3,1];case 3:return[2]}}))},e.prototype.decodeAsync=function(e){var t,n,o,r,i,s,a;return i=this,a=function(){var i,s,a,c,l,h,d,u;return Fn(this,(function(p){switch(p.label){case 0:i=!1,p.label=1;case 1:p.trys.push([1,6,7,12]),t=Hn(e),p.label=2;case 2:return[4,t.next()];case 3:if((n=p.sent()).done)return[3,5];if(a=n.value,i)throw this.createExtraByteError(this.totalPos);this.appendBuffer(a);try{s=this.doDecodeSync(),i=!0}catch(e){if(!(e instanceof qn))throw e}this.totalPos+=this.pos,p.label=4;case 4:return[3,2];case 5:return[3,12];case 6:return c=p.sent(),o={error:c},[3,12];case 7:return p.trys.push([7,,10,11]),n&&!n.done&&(r=t.return)?[4,r.call(t)]:[3,9];case 8:p.sent(),p.label=9;case 9:return[3,11];case 10:if(o)throw o.error;return[7];case 11:return[7];case 12:if(i){if(this.hasRemaining(1))throw this.createExtraByteError(this.totalPos);return[2,s]}throw h=(l=this).headByte,d=l.pos,u=l.totalPos,new RangeError("Insufficient data in parsing ".concat($n(h)," at ").concat(u," (").concat(d," in the current buffer)"))}}))},new((s=void 0)||(s=Promise))((function(e,t){function n(e){try{r(a.next(e))}catch(e){t(e)}}function o(e){try{r(a.throw(e))}catch(e){t(e)}}function r(t){var r;t.done?e(t.value):(r=t.value,r instanceof s?r:new s((function(e){e(r)}))).then(n,o)}r((a=a.apply(i,[])).next())}))},e.prototype.decodeArrayStream=function(e){return this.decodeMultiAsync(e,!0)},e.prototype.decodeStream=function(e){return this.decodeMultiAsync(e,!1)},e.prototype.decodeMultiAsync=function(e,t){return function(n,o,r){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var i,s=function(){var n,o,r,i,s,a,c,l,h;return Fn(this,(function(d){switch(d.label){case 0:n=t,o=-1,d.label=1;case 1:d.trys.push([1,13,14,19]),r=Hn(e),d.label=2;case 2:return[4,jn(r.next())];case 3:if((i=d.sent()).done)return[3,12];if(s=i.value,t&&0===o)throw this.createExtraByteError(this.totalPos);this.appendBuffer(s),n&&(o=this.readArraySize(),n=!1,this.complete()),d.label=4;case 4:d.trys.push([4,9,,10]),d.label=5;case 5:return[4,jn(this.doDecodeSync())];case 6:return[4,d.sent()];case 7:return d.sent(),0==--o?[3,8]:[3,5];case 8:return[3,10];case 9:if(!((a=d.sent())instanceof qn))throw a;return[3,10];case 10:this.totalPos+=this.pos,d.label=11;case 11:return[3,2];case 12:return[3,19];case 13:return c=d.sent(),l={error:c},[3,19];case 14:return d.trys.push([14,,17,18]),i&&!i.done&&(h=r.return)?[4,jn(h.call(r))]:[3,16];case 15:d.sent(),d.label=16;case 16:return[3,18];case 17:if(l)throw l.error;return[7];case 18:return[7];case 19:return[2]}}))}.apply(n,o||[]),a=[];return i={},c("next"),c("throw"),c("return"),i[Symbol.asyncIterator]=function(){return this},i;function c(e){s[e]&&(i[e]=function(t){return new Promise((function(n,o){a.push([e,t,n,o])>1||l(e,t)}))})}function l(e,t){try{(n=s[e](t)).value instanceof jn?Promise.resolve(n.value.v).then(h,d):u(a[0][2],n)}catch(e){u(a[0][3],e)}var n}function h(e){l("next",e)}function d(e){l("throw",e)}function u(e,t){e(t),a.shift(),a.length&&l(a[0][0],a[0][1])}}(this,arguments)},e.prototype.doDecodeSync=function(){e:for(;;){var e=this.readHeadByte(),t=void 0;if(e>=224)t=e-256;else if(e<192)if(e<128)t=e;else if(e<144){if(0!=(o=e-128)){this.pushMapState(o),this.complete();continue e}t={}}else if(e<160){if(0!=(o=e-144)){this.pushArrayState(o),this.complete();continue e}t=[]}else{var n=e-160;t=this.decodeUtf8String(n,0)}else if(192===e)t=null;else if(194===e)t=!1;else if(195===e)t=!0;else if(202===e)t=this.readF32();else if(203===e)t=this.readF64();else if(204===e)t=this.readU8();else if(205===e)t=this.readU16();else if(206===e)t=this.readU32();else if(207===e)t=this.readU64();else if(208===e)t=this.readI8();else if(209===e)t=this.readI16();else if(210===e)t=this.readI32();else if(211===e)t=this.readI64();else if(217===e)n=this.lookU8(),t=this.decodeUtf8String(n,1);else if(218===e)n=this.lookU16(),t=this.decodeUtf8String(n,2);else if(219===e)n=this.lookU32(),t=this.decodeUtf8String(n,4);else if(220===e){if(0!==(o=this.readU16())){this.pushArrayState(o),this.complete();continue e}t=[]}else if(221===e){if(0!==(o=this.readU32())){this.pushArrayState(o),this.complete();continue e}t=[]}else if(222===e){if(0!==(o=this.readU16())){this.pushMapState(o),this.complete();continue e}t={}}else if(223===e){if(0!==(o=this.readU32())){this.pushMapState(o),this.complete();continue e}t={}}else if(196===e){var o=this.lookU8();t=this.decodeBinary(o,1)}else if(197===e)o=this.lookU16(),t=this.decodeBinary(o,2);else if(198===e)o=this.lookU32(),t=this.decodeBinary(o,4);else if(212===e)t=this.decodeExtension(1,0);else if(213===e)t=this.decodeExtension(2,0);else if(214===e)t=this.decodeExtension(4,0);else if(215===e)t=this.decodeExtension(8,0);else if(216===e)t=this.decodeExtension(16,0);else if(199===e)o=this.lookU8(),t=this.decodeExtension(o,1);else if(200===e)o=this.lookU16(),t=this.decodeExtension(o,2);else{if(201!==e)throw new Nn("Unrecognized type byte: ".concat($n(e)));o=this.lookU32(),t=this.decodeExtension(o,4)}this.complete();for(var r=this.stack;r.length>0;){var i=r[r.length-1];if(0===i.type){if(i.array[i.position]=t,i.position++,i.position!==i.size)continue e;r.pop(),t=i.array}else{if(1===i.type){if("string"!=(s=typeof t)&&"number"!==s)throw new Nn("The type of key must be string or number but "+typeof t);if("__proto__"===t)throw new Nn("The key __proto__ is not allowed");i.key=t,i.type=2;continue e}if(i.map[i.key]=t,i.readCount++,i.readCount!==i.size){i.key=null,i.type=1;continue e}r.pop(),t=i.map}}return t}var s},e.prototype.readHeadByte=function(){return-1===this.headByte&&(this.headByte=this.readU8()),this.headByte},e.prototype.complete=function(){this.headByte=-1},e.prototype.readArraySize=function(){var e=this.readHeadByte();switch(e){case 220:return this.readU16();case 221:return this.readU32();default:if(e<160)return e-144;throw new Nn("Unrecognized array type byte: ".concat($n(e)))}},e.prototype.pushMapState=function(e){if(e>this.maxMapLength)throw new Nn("Max length exceeded: map length (".concat(e,") > maxMapLengthLength (").concat(this.maxMapLength,")"));this.stack.push({type:1,size:e,key:null,readCount:0,map:{}})},e.prototype.pushArrayState=function(e){if(e>this.maxArrayLength)throw new Nn("Max length exceeded: array length (".concat(e,") > maxArrayLength (").concat(this.maxArrayLength,")"));this.stack.push({type:0,size:e,array:new Array(e),position:0})},e.prototype.decodeUtf8String=function(e,t){var n;if(e>this.maxStrLength)throw new Nn("Max length exceeded: UTF-8 byte length (".concat(e,") > maxStrLength (").concat(this.maxStrLength,")"));if(this.bytes.byteLength<this.pos+t+e)throw Jn;var o,r=this.pos+t;return o=this.stateIsMapKey()&&(null===(n=this.keyDecoder)||void 0===n?void 0:n.canBeCached(e))?this.keyDecoder.decode(this.bytes,r,e):e>xn?function(e,t,n){var o=e.subarray(t,t+n);return Rn.decode(o)}(this.bytes,r,e):Tn(this.bytes,r,e),this.pos+=t+e,o},e.prototype.stateIsMapKey=function(){return this.stack.length>0&&1===this.stack[this.stack.length-1].type},e.prototype.decodeBinary=function(e,t){if(e>this.maxBinLength)throw new Nn("Max length exceeded: bin length (".concat(e,") > maxBinLength (").concat(this.maxBinLength,")"));if(!this.hasRemaining(e+t))throw Jn;var n=this.pos+t,o=this.bytes.subarray(n,n+e);return this.pos+=t+e,o},e.prototype.decodeExtension=function(e,t){if(e>this.maxExtLength)throw new Nn("Max length exceeded: ext length (".concat(e,") > maxExtLength (").concat(this.maxExtLength,")"));var n=this.view.getInt8(this.pos+t),o=this.decodeBinary(e,t+1);return this.extensionCodec.decode(o,n,this.context)},e.prototype.lookU8=function(){return this.view.getUint8(this.pos)},e.prototype.lookU16=function(){return this.view.getUint16(this.pos)},e.prototype.lookU32=function(){return this.view.getUint32(this.pos)},e.prototype.readU8=function(){var e=this.view.getUint8(this.pos);return this.pos++,e},e.prototype.readI8=function(){var e=this.view.getInt8(this.pos);return this.pos++,e},e.prototype.readU16=function(){var e=this.view.getUint16(this.pos);return this.pos+=2,e},e.prototype.readI16=function(){var e=this.view.getInt16(this.pos);return this.pos+=2,e},e.prototype.readU32=function(){var e=this.view.getUint32(this.pos);return this.pos+=4,e},e.prototype.readI32=function(){var e=this.view.getInt32(this.pos);return this.pos+=4,e},e.prototype.readU64=function(){var e,t,n=(e=this.view,t=this.pos,4294967296*e.getUint32(t)+e.getUint32(t+4));return this.pos+=8,n},e.prototype.readI64=function(){var e=bn(this.view,this.pos);return this.pos+=8,e},e.prototype.readF32=function(){var e=this.view.getFloat32(this.pos);return this.pos+=4,e},e.prototype.readF64=function(){var e=this.view.getFloat64(this.pos);return this.pos+=8,e},e}();class Xn{static write(e){let t=e.byteLength||e.length;const n=[];do{let e=127&t;t>>=7,t>0&&(e|=128),n.push(e)}while(t>0);t=e.byteLength||e.length;const o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer}static parse(e){const t=[],n=new Uint8Array(e),o=[0,7,14,21,28];for(let r=0;r<e.byteLength;){let i,s=0,a=0;do{i=n[r+s],a|=(127&i)<<o[s],s++}while(s<Math.min(5,e.byteLength-r)&&128&i);if(128&i&&s<5)throw new Error("Cannot read message size.");if(5===s&&i>7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=r+s+a))throw new Error("Incomplete message.");t.push(n.slice?n.slice(r+s,r+s+a):n.subarray(r+s,r+s+a)),r=r+s+a}return t}}const Yn=new Uint8Array([145,Jt.Ping]);class Gn{constructor(e){this.name="messagepack",this.version=2,this.transferFormat=on.Binary,this._errorResult=1,this._voidResult=2,this._nonVoidResult=3,e=e||{},this._encoder=new Ln(e.extensionCodec,e.context,e.maxDepth,e.initialBufferSize,e.sortKeys,e.forceFloat32,e.ignoreUndefined,e.forceIntegerToFloat),this._decoder=new Kn(e.extensionCodec,e.context,e.maxStrLength,e.maxBinLength,e.maxArrayLength,e.maxMapLength,e.maxExtLength)}parseMessages(e,t){if(!(n=e)||"undefined"==typeof ArrayBuffer||!(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer.");var n;null===t&&(t=Dt.instance);const o=Xn.parse(e),r=[];for(const e of o){const n=this._parseMessage(e,t);n&&r.push(n)}return r}writeMessage(e){switch(e.type){case Jt.Invocation:return this._writeInvocation(e);case Jt.StreamInvocation:return this._writeStreamInvocation(e);case Jt.StreamItem:return this._writeStreamItem(e);case Jt.Completion:return this._writeCompletion(e);case Jt.Ping:return Xn.write(Yn);case Jt.CancelInvocation:return this._writeCancelInvocation(e);case Jt.Close:return this._writeClose();case Jt.Ack:return this._writeAck(e);case Jt.Sequence:return this._writeSequence(e);default:throw new Error("Invalid message type.")}}_parseMessage(e,t){if(0===e.length)throw new Error("Invalid payload.");const n=this._decoder.decode(e);if(0===n.length||!(n instanceof Array))throw new Error("Invalid payload.");const o=n[0];switch(o){case Jt.Invocation:return this._createInvocationMessage(this._readHeaders(n),n);case Jt.StreamItem:return this._createStreamItemMessage(this._readHeaders(n),n);case Jt.Completion:return this._createCompletionMessage(this._readHeaders(n),n);case Jt.Ping:return this._createPingMessage(n);case Jt.Close:return this._createCloseMessage(n);case Jt.Ack:return this._createAckMessage(n);case Jt.Sequence:return this._createSequenceMessage(n);default:return t.log(Tt.Information,"Unknown message type '"+o+"' ignored."),null}}_createCloseMessage(e){if(e.length<2)throw new Error("Invalid payload for Close message.");return{allowReconnect:e.length>=3?e[2]:void 0,error:e[1],type:Jt.Close}}_createPingMessage(e){if(e.length<1)throw new Error("Invalid payload for Ping message.");return{type:Jt.Ping}}_createInvocationMessage(e,t){if(t.length<5)throw new Error("Invalid payload for Invocation message.");const n=t[2];return n?{arguments:t[4],headers:e,invocationId:n,streamIds:[],target:t[3],type:Jt.Invocation}:{arguments:t[4],headers:e,streamIds:[],target:t[3],type:Jt.Invocation}}_createStreamItemMessage(e,t){if(t.length<4)throw new Error("Invalid payload for StreamItem message.");return{headers:e,invocationId:t[2],item:t[3],type:Jt.StreamItem}}_createCompletionMessage(e,t){if(t.length<4)throw new Error("Invalid payload for Completion message.");const n=t[3];if(n!==this._voidResult&&t.length<5)throw new Error("Invalid payload for Completion message.");let o,r;switch(n){case this._errorResult:o=t[4];break;case this._nonVoidResult:r=t[4]}return{error:o,headers:e,invocationId:t[2],result:r,type:Jt.Completion}}_createAckMessage(e){if(e.length<1)throw new Error("Invalid payload for Ack message.");return{sequenceId:e[1],type:Jt.Ack}}_createSequenceMessage(e){if(e.length<1)throw new Error("Invalid payload for Sequence message.");return{sequenceId:e[1],type:Jt.Sequence}}_writeInvocation(e){let t;return t=e.streamIds?this._encoder.encode([Jt.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments,e.streamIds]):this._encoder.encode([Jt.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments]),Xn.write(t.slice())}_writeStreamInvocation(e){let t;return t=e.streamIds?this._encoder.encode([Jt.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments,e.streamIds]):this._encoder.encode([Jt.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments]),Xn.write(t.slice())}_writeStreamItem(e){const t=this._encoder.encode([Jt.StreamItem,e.headers||{},e.invocationId,e.item]);return Xn.write(t.slice())}_writeCompletion(e){const t=e.error?this._errorResult:void 0!==e.result?this._nonVoidResult:this._voidResult;let n;switch(t){case this._errorResult:n=this._encoder.encode([Jt.Completion,e.headers||{},e.invocationId,t,e.error]);break;case this._voidResult:n=this._encoder.encode([Jt.Completion,e.headers||{},e.invocationId,t]);break;case this._nonVoidResult:n=this._encoder.encode([Jt.Completion,e.headers||{},e.invocationId,t,e.result])}return Xn.write(n.slice())}_writeCancelInvocation(e){const t=this._encoder.encode([Jt.CancelInvocation,e.headers||{},e.invocationId]);return Xn.write(t.slice())}_writeClose(){const e=this._encoder.encode([Jt.Close,null]);return Xn.write(e.slice())}_writeAck(e){const t=this._encoder.encode([Jt.Ack,e.sequenceId]);return Xn.write(t.slice())}_writeSequence(e){const t=this._encoder.encode([Jt.Sequence,e.sequenceId]);return Xn.write(t.slice())}_readHeaders(e){const t=e[1];if("object"!=typeof t)throw new Error("Invalid headers.");return t}}const Qn="function"==typeof TextDecoder?new TextDecoder("utf-8"):null,Zn=Qn?Qn.decode.bind(Qn):function(e){let t=0;const n=e.length,o=[],r=[];for(;t<n;){const n=e[t++];if(0===n)break;if(128&n){if(192==(224&n)){const r=63&e[t++];o.push((31&n)<<6|r)}else if(224==(240&n)){const r=63&e[t++],i=63&e[t++];o.push((31&n)<<12|r<<6|i)}else if(240==(248&n)){let r=(7&n)<<18|(63&e[t++])<<12|(63&e[t++])<<6|63&e[t++];r>65535&&(r-=65536,o.push(r>>>10&1023|55296),r=56320|1023&r),o.push(r)}}else o.push(n);o.length>1024&&(r.push(String.fromCharCode.apply(null,o)),o.length=0)}return r.push(String.fromCharCode.apply(null,o)),r.join("")},eo=Math.pow(2,32),to=Math.pow(2,21)-1;function no(e,t){return e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24}function oo(e,t){return e[t]+(e[t+1]<<8)+(e[t+2]<<16)+(e[t+3]<<24>>>0)}function ro(e,t){const n=oo(e,t+4);if(n>to)throw new Error(`Cannot read uint64 with high order part ${n}, because the result would exceed Number.MAX_SAFE_INTEGER.`);return n*eo+oo(e,t)}class io{constructor(e){this.batchData=e;const t=new lo(e);this.arrayRangeReader=new ho(e),this.arrayBuilderSegmentReader=new uo(e),this.diffReader=new so(e),this.editReader=new ao(e,t),this.frameReader=new co(e,t)}updatedComponents(){return no(this.batchData,this.batchData.length-20)}referenceFrames(){return no(this.batchData,this.batchData.length-16)}disposedComponentIds(){return no(this.batchData,this.batchData.length-12)}disposedEventHandlerIds(){return no(this.batchData,this.batchData.length-8)}updatedComponentsEntry(e,t){const n=e+4*t;return no(this.batchData,n)}referenceFramesEntry(e,t){return e+20*t}disposedComponentIdsEntry(e,t){const n=e+4*t;return no(this.batchData,n)}disposedEventHandlerIdsEntry(e,t){const n=e+8*t;return ro(this.batchData,n)}}class so{constructor(e){this.batchDataUint8=e}componentId(e){return no(this.batchDataUint8,e)}edits(e){return e+4}editsEntry(e,t){return e+16*t}}class ao{constructor(e,t){this.batchDataUint8=e,this.stringReader=t}editType(e){return no(this.batchDataUint8,e)}siblingIndex(e){return no(this.batchDataUint8,e+4)}newTreeIndex(e){return no(this.batchDataUint8,e+8)}moveToSiblingIndex(e){return no(this.batchDataUint8,e+8)}removedAttributeName(e){const t=no(this.batchDataUint8,e+12);return this.stringReader.readString(t)}}class co{constructor(e,t){this.batchDataUint8=e,this.stringReader=t}frameType(e){return no(this.batchDataUint8,e)}subtreeLength(e){return no(this.batchDataUint8,e+4)}elementReferenceCaptureId(e){const t=no(this.batchDataUint8,e+4);return this.stringReader.readString(t)}componentId(e){return no(this.batchDataUint8,e+8)}elementName(e){const t=no(this.batchDataUint8,e+8);return this.stringReader.readString(t)}textContent(e){const t=no(this.batchDataUint8,e+4);return this.stringReader.readString(t)}markupContent(e){const t=no(this.batchDataUint8,e+4);return this.stringReader.readString(t)}attributeName(e){const t=no(this.batchDataUint8,e+4);return this.stringReader.readString(t)}attributeValue(e){const t=no(this.batchDataUint8,e+8);return this.stringReader.readString(t)}attributeEventHandlerId(e){return ro(this.batchDataUint8,e+12)}}class lo{constructor(e){this.batchDataUint8=e,this.stringTableStartIndex=no(e,e.length-4)}readString(e){if(-1===e)return null;{const n=no(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){let n=0,o=0;for(let r=0;r<4;r++){const i=e[t+r];if(n|=(127&i)<<o,i<128)break;o+=7}return n}(this.batchDataUint8,n),r=n+((t=o)<128?1:t<16384?2:t<2097152?3:4),i=new Uint8Array(this.batchDataUint8.buffer,this.batchDataUint8.byteOffset+r,o);return Zn(i)}var t}}class ho{constructor(e){this.batchDataUint8=e}count(e){return no(this.batchDataUint8,e)}values(e){return e+4}}class uo{constructor(e){this.batchDataUint8=e}offset(e){return 0}count(e){return no(this.batchDataUint8,e)}values(e){return e+4}}class po{constructor(e){this.nextBatchId=2,this.logger=e}async processBatch(e,t,n){if(e<this.nextBatchId)return await this.completeBatch(n,e),void this.logger.log(nt.Debug,`Batch ${e} already processed. Waiting for batch ${this.nextBatchId}.`);if(e>this.nextBatchId)return this.fatalError?(this.logger.log(nt.Debug,`Received a new batch ${e} but errored out on a previous batch ${this.nextBatchId-1}`),void await n.send("OnRenderCompleted",this.nextBatchId-1,this.fatalError.toString())):void this.logger.log(nt.Debug,`Waiting for batch ${this.nextBatchId}. Batch ${e} not processed.`);try{this.nextBatchId++,this.logger.log(nt.Debug,`Applying batch ${e}.`),function(e,t){const n=fe[e];if(!n)throw new Error(`There is no browser renderer with ID ${e}.`);const o=t.arrayRangeReader,r=t.updatedComponents(),i=o.values(r),s=o.count(r),a=t.referenceFrames(),c=o.values(a),l=t.diffReader;for(let e=0;e<s;e++){const o=t.updatedComponentsEntry(i,e),r=l.componentId(o),s=l.edits(o);n.updateComponent(t,r,s,c)}const h=t.disposedComponentIds(),d=o.values(h),u=o.count(h);for(let e=0;e<u;e++){const o=t.disposedComponentIdsEntry(d,e);n.disposeComponent(o)}const p=t.disposedEventHandlerIds(),f=o.values(p),g=o.count(p);for(let e=0;e<g;e++){const o=t.disposedEventHandlerIdsEntry(f,e);n.disposeEventHandler(o)}we&&(we=!1,window.scrollTo&&window.scrollTo(0,0))}(gn.Server,new io(t)),await this.completeBatch(n,e)}catch(t){throw this.fatalError=t.toString(),this.logger.log(nt.Error,`There was an error applying batch ${e}.`),n.send("OnRenderCompleted",e,t.toString()),t}}getLastBatchid(){return this.nextBatchId-1}async completeBatch(e,t){try{await e.send("OnRenderCompleted",t,null)}catch{this.logger.log(nt.Warning,`Failed to deliver completion notification for render '${t}'.`)}}}let fo,go,mo,yo,vo,wo,_o=!1;function bo(){const e=document.querySelector("#blazor-error-ui");e&&(e.style.display="block"),_o||(_o=!0,document.querySelectorAll("#blazor-error-ui .reload").forEach((e=>{e.onclick=function(e){location.reload(),e.preventDefault()}})),document.querySelectorAll("#blazor-error-ui .dismiss").forEach((e=>{e.onclick=function(e){const t=document.querySelector("#blazor-error-ui");t&&(t.style.display="none"),e.preventDefault()}})))}class So{constructor(t,n,o,r){this._firstUpdate=!0,this._renderingFailed=!1,this._disposed=!1,this._circuitId=void 0,this._applicationState=n,this._componentManager=t,this._options=o,this._logger=r,this._renderQueue=new po(this._logger),this._dispatcher=e.attachDispatcher(this)}start(){if(this.isDisposedOrDisposing())throw new Error("Cannot start a disposed circuit.");return this._startPromise||(this._startPromise=this.startCore()),this._startPromise}updateRootComponents(e){return this._firstUpdate?(this._firstUpdate=!1,this._connection?.send("UpdateRootComponents",e,this._applicationState)):this._connection?.send("UpdateRootComponents",e,"")}async startCore(){if(this._connection=await this.startConnection(),this._connection.state!==Vt.Connected)return!1;const e=JSON.stringify(this._componentManager.initialComponents.map((e=>{return t=e,{...t,start:void 0,end:void 0};var t})));if(this._circuitId=await this._connection.invoke("StartCircuit",Ne.getBaseURI(),Ne.getLocationHref(),e,this._applicationState||""),!this._circuitId)return!1;for(const e of this._options.circuitHandlers)e.onCircuitOpened&&e.onCircuitOpened();return!0}async startConnection(){const e=new Gn;e.name="blazorpack";const t=(new fn).withUrl("_blazor").withHubProtocol(e);this._options.configureSignalR(t);const n=t.build();n.on("JS.AttachComponent",((e,t)=>function(e,t,n,o){let r=fe[e];r||(r=new he(e),fe[e]=r),r.attachRootComponentToLogicalElement(n,t,!1)}(gn.Server,this.resolveElement(t),e))),n.on("JS.BeginInvokeJS",this._dispatcher.beginInvokeJSFromDotNet.bind(this._dispatcher)),n.on("JS.EndInvokeDotNet",this._dispatcher.endInvokeDotNetFromJS.bind(this._dispatcher)),n.on("JS.ReceiveByteArray",this._dispatcher.receiveByteArray.bind(this._dispatcher)),n.on("JS.BeginTransmitStream",(e=>{const t=new ReadableStream({start:t=>{n.stream("SendDotNetStreamToJS",e).subscribe({next:e=>t.enqueue(e),complete:()=>t.close(),error:e=>t.error(e)})}});this._dispatcher.supplyDotNetStream(e,t)})),n.on("JS.RenderBatch",(async(e,t)=>{this._logger.log(Tt.Debug,`Received render batch with id ${e} and ${t.byteLength} bytes.`),await this._renderQueue.processBatch(e,t,this._connection),this._componentManager.onAfterRenderBatch?.(gn.Server)})),n.on("JS.EndUpdateRootComponents",(e=>{this._componentManager.onAfterUpdateRootComponents?.(e)})),n.on("JS.EndLocationChanging",tt._internal.navigationManager.endLocationChanging),n.onclose((e=>{this._interopMethodsForReconnection=function(e){const t=b.get(e);if(!t)throw new Error(`Interop methods are not registered for renderer ${e}`);return b.delete(e),t}(gn.Server),this._disposed||this._renderingFailed||this._options.reconnectionHandler.onConnectionDown(this._options.reconnectionOptions,e)})),n.on("JS.Error",(e=>{this._renderingFailed=!0,this.unhandledError(e),bo()}));try{await n.start()}catch(e){if(this.unhandledError(e),"FailedToNegotiateWithServerError"===e.errorType)throw e;bo(),e.innerErrors&&(e.innerErrors.some((e=>"UnsupportedTransportError"===e.errorType&&e.transport===nn.WebSockets))?this._logger.log(Tt.Error,"Unable to connect, please ensure you are using an updated browser that supports WebSockets."):e.innerErrors.some((e=>"FailedToStartTransportError"===e.errorType&&e.transport===nn.WebSockets))?this._logger.log(Tt.Error,"Unable to connect, please ensure WebSockets are available. A VPN or proxy may be blocking the connection."):e.innerErrors.some((e=>"DisabledTransportError"===e.errorType&&e.transport===nn.LongPolling))&&this._logger.log(Tt.Error,"Unable to initiate a SignalR connection to the server. This might be because the server is not configured to support WebSockets. For additional details, visit https://aka.ms/blazor-server-websockets-error."))}return n.connection?.features?.inherentKeepAlive&&this._logger.log(Tt.Warning,"Failed to connect via WebSockets, using the Long Polling fallback transport. This may be due to a VPN or proxy blocking the connection. To troubleshoot this, visit https://aka.ms/blazor-server-using-fallback-long-polling."),n}async disconnect(){await(this._connection?.stop())}async reconnect(){if(!this._circuitId)throw new Error("Circuit host not initialized.");return this._connection.state===Vt.Connected||(this._connection=await this.startConnection(),this._interopMethodsForReconnection&&(C(gn.Server,this._interopMethodsForReconnection),this._interopMethodsForReconnection=void 0),!!await this._connection.invoke("ConnectCircuit",this._circuitId)&&(this._options.reconnectionHandler.onConnectionUp(),!0))}beginInvokeDotNetFromJS(e,t,n,o,r){this.throwIfDispatchingWhenDisposed(),this._connection.send("BeginInvokeDotNetFromJS",e?e.toString():null,t,n,o||0,r)}endInvokeJSFromDotNet(e,t,n){this.throwIfDispatchingWhenDisposed(),this._connection.send("EndInvokeJSFromDotNet",e,t,n)}sendByteArray(e,t){this.throwIfDispatchingWhenDisposed(),this._connection.send("ReceiveByteArray",e,t)}throwIfDispatchingWhenDisposed(){if(this._disposed)throw new Error("The circuit associated with this dispatcher is no longer available.")}sendLocationChanged(e,t,n){return this._connection.send("OnLocationChanged",e,t,n)}sendLocationChanging(e,t,n,o){return this._connection.send("OnLocationChanging",e,t,n,o)}sendJsDataStream(e,t,n){return function(e,t,n,o){setTimeout((async()=>{let r=5,i=(new Date).valueOf();try{const s=t instanceof Blob?t.size:t.byteLength;let a=0,c=0;for(;a<s;){const l=Math.min(o,s-a),h=await et(t,a,l);if(r--,r>1)await e.send("ReceiveJSDataChunk",n,c,h,null);else{if(!await e.invoke("ReceiveJSDataChunk",n,c,h,null))break;const t=(new Date).valueOf(),o=t-i;i=t,r=Math.max(1,Math.round(500/Math.max(1,o)))}a+=l,c++}}catch(t){await e.send("ReceiveJSDataChunk",n,-1,null,t.toString())}}),0)}(this._connection,e,t,n)}resolveElement(e){const t=function(e){const t=p.get(e);if(t)return p.delete(e),t}(e);if(t)return $(t,!0);const n=Number.parseInt(e);if(!Number.isNaN(n))return function(e){const{start:t,end:n}=e,o=t[L];if(o){if(o!==e)throw new Error("The start component comment was already associated with another component descriptor.");return t}const r=t.parentNode;if(!r)throw new Error(`Comment not connected to the DOM ${t.textContent}`);const i=$(r,!0),s=J(i);t[B]=i,t[L]=e;const a=$(t);if(n){const e=J(a),o=Array.prototype.indexOf.call(s,a)+1;let r=null;for(;r!==n;){const n=s.splice(o,1)[0];if(!n)throw new Error("Could not find the end component comment in the parent logical node list");n[B]=t,e.push(n),r=n}}return a}(this._componentManager.resolveRootComponent(n));throw new Error(`Invalid sequence number or identifier '${e}'.`)}getRootComponentManager(){return this._componentManager}unhandledError(e){this._logger.log(Tt.Error,e),this.disconnect()}getDisconnectFormData(){const e=new FormData,t=this._circuitId;return e.append("circuitId",t),e}didRenderingFail(){return this._renderingFailed}isDisposedOrDisposing(){return void 0!==this._disposePromise}sendDisconnectBeacon(){if(this._disposed)return;const e=this.getDisconnectFormData();this._disposed=navigator.sendBeacon("_blazor/disconnect",e)}dispose(){return this._disposePromise||(this._disposePromise=this.disposeCore()),this._disposePromise}async disposeCore(){if(!this._startPromise)return void(this._disposed=!0);await this._startPromise,this._disposed=!0,this._connection?.stop();const e=this.getDisconnectFormData();fetch("_blazor/disconnect",{method:"POST",body:e});for(const e of this._options.circuitHandlers)e.onCircuitClosed&&e.onCircuitClosed()}}class Eo{static{this.ReconnectOverlayClassName="components-reconnect-overlay"}static{this.ReconnectDialogClassName="components-reconnect-dialog"}static{this.ReconnectVisibleClassName="components-reconnect-visible"}static{this.RejoiningAnimationClassName="components-rejoining-animation"}static{this.AnimationRippleCount=2}constructor(e,t,n){this.document=t,this.logger=n,this.style=this.document.createElement("style"),this.style.innerHTML=Eo.Css,this.overlay=this.document.createElement("div"),this.overlay.className=Eo.ReconnectOverlayClassName,this.host=this.document.createElement("div"),this.host.id=e;const o=this.host.attachShadow({mode:"open"});this.dialog=t.createElement("div"),this.dialog.className=Eo.ReconnectDialogClassName,o.appendChild(this.style),o.appendChild(this.overlay),this.rejoiningAnimation=t.createElement("div"),this.rejoiningAnimation.className=Eo.RejoiningAnimationClassName;for(let e=0;e<Eo.AnimationRippleCount;e++){const e=t.createElement("div");this.rejoiningAnimation.appendChild(e)}this.status=t.createElement("p"),this.status.innerHTML="",this.reloadButton=t.createElement("button"),this.reloadButton.style.display="none",this.reloadButton.innerHTML="Retry",this.reloadButton.addEventListener("click",this.retry.bind(this)),this.dialog.appendChild(this.rejoiningAnimation),this.dialog.appendChild(this.status),this.dialog.appendChild(this.reloadButton),this.overlay.appendChild(this.dialog),this.retryWhenDocumentBecomesVisible=()=>{"visible"===this.document.visibilityState&&this.retry()}}show(){this.document.contains(this.host)||this.document.body.appendChild(this.host),this.reloadButton.style.display="none",this.rejoiningAnimation.style.display="block",this.status.innerHTML="Rejoining the server...",this.host.style.display="block",this.overlay.classList.add(Eo.ReconnectVisibleClassName)}update(e,t){if(1===e||0===t)this.status.innerHTML="Rejoining the server...";else{const e=1===t?"second":"seconds";this.status.innerHTML=`Rejoin failed... trying again in ${t} ${e}`}}hide(){this.host.style.display="none",this.overlay.classList.remove(Eo.ReconnectVisibleClassName)}failed(){this.reloadButton.style.display="block",this.rejoiningAnimation.style.display="none",this.status.innerHTML="Failed to rejoin.<br />Please retry or reload the page.",this.document.addEventListener("visibilitychange",this.retryWhenDocumentBecomesVisible)}rejected(){location.reload()}async retry(){this.document.removeEventListener("visibilitychange",this.retryWhenDocumentBecomesVisible),this.show();try{await tt.reconnect()||this.rejected()}catch(e){this.logger.log(nt.Error,e),this.failed()}}static{this.Css=`\n    .${this.ReconnectOverlayClassName} {\n      position: fixed;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      z-index: 10000;\n      display: none;\n      overflow: hidden;\n      animation: components-reconnect-fade-in;\n    }\n\n    .${this.ReconnectOverlayClassName}.${this.ReconnectVisibleClassName} {\n      display: block;\n    }\n\n    .${this.ReconnectOverlayClassName}::before {\n      content: '';\n      background-color: rgba(0, 0, 0, 0.4);\n      position: absolute;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      animation: components-reconnect-fadeInOpacity 0.5s ease-in-out;\n      opacity: 1;\n    }\n\n    .${this.ReconnectOverlayClassName} p {\n      margin: 0;\n      text-align: center;\n    }\n\n    .${this.ReconnectOverlayClassName} button {\n      border: 0;\n      background-color: #6b9ed2;\n      color: white;\n      padding: 4px 24px;\n      border-radius: 4px;\n    }\n\n    .${this.ReconnectOverlayClassName} button:hover {\n      background-color: #3b6ea2;\n    }\n\n    .${this.ReconnectOverlayClassName} button:active {\n      background-color: #6b9ed2;\n    }\n\n    .${this.ReconnectDialogClassName} {\n      position: relative;\n      background-color: white;\n      width: 20rem;\n      margin: 20vh auto;\n      padding: 2rem;\n      border-radius: 0.5rem;\n      box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3);\n      display: flex;\n      flex-direction: column;\n      align-items: center;\n      gap: 1rem;\n      opacity: 0;\n      animation: components-reconnect-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-fadeInOpacity 0.5s ease-out 0.3s;\n      animation-fill-mode: forwards;\n      z-index: 10001;\n    }\n\n    .${this.RejoiningAnimationClassName} {\n      display: block;\n      position: relative;\n      width: 80px;\n      height: 80px;\n    }\n\n    .${this.RejoiningAnimationClassName} div {\n      position: absolute;\n      border: 3px solid #0087ff;\n      opacity: 1;\n      border-radius: 50%;\n      animation: ${this.RejoiningAnimationClassName} 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite;\n    }\n\n    .${this.RejoiningAnimationClassName} div:nth-child(2) {\n      animation-delay: -0.5s;\n    }\n\n    @keyframes ${this.RejoiningAnimationClassName} {\n      0% {\n        top: 40px;\n        left: 40px;\n        width: 0;\n        height: 0;\n        opacity: 0;\n      }\n\n      4.9% {\n        top: 40px;\n        left: 40px;\n        width: 0;\n        height: 0;\n        opacity: 0;\n      }\n\n      5% {\n        top: 40px;\n        left: 40px;\n        width: 0;\n        height: 0;\n        opacity: 1;\n      }\n\n      100% {\n        top: 0px;\n        left: 0px;\n        width: 80px;\n        height: 80px;\n        opacity: 0;\n      }\n    }\n\n    @keyframes components-reconnect-fadeInOpacity {\n      0% {\n        opacity: 0;\n      }\n\n      100% {\n        opacity: 1;\n      }\n    }\n\n    @keyframes components-reconnect-slideUp {\n      0% {\n        transform: translateY(30px) scale(0.95);\n      }\n\n      100% {\n        transform: translateY(0);\n      }\n    }\n  `}}class Co{static{this.ShowClassName="components-reconnect-show"}static{this.HideClassName="components-reconnect-hide"}static{this.FailedClassName="components-reconnect-failed"}static{this.RejectedClassName="components-reconnect-rejected"}static{this.MaxRetriesId="components-reconnect-max-retries"}static{this.CurrentAttemptId="components-reconnect-current-attempt"}static{this.SecondsToNextAttemptId="components-seconds-to-next-attempt"}constructor(e,t,n){if(this.dialog=e,this.document=t,this.document=t,void 0!==n){const e=this.document.getElementById(Co.MaxRetriesId);e&&(e.innerText=n.toString())}}show(){this.removeClasses(),this.dialog.classList.add(Co.ShowClassName)}update(e,t){const n=this.document.getElementById(Co.CurrentAttemptId);n&&(n.innerText=e.toString());const o=this.document.getElementById(Co.SecondsToNextAttemptId);o&&(o.innerText=t.toString())}hide(){this.removeClasses(),this.dialog.classList.add(Co.HideClassName)}failed(){this.removeClasses(),this.dialog.classList.add(Co.FailedClassName)}rejected(){this.removeClasses(),this.dialog.classList.add(Co.RejectedClassName)}removeClasses(){this.dialog.classList.remove(Co.ShowClassName,Co.HideClassName,Co.FailedClassName,Co.RejectedClassName)}}class Io{constructor(e,t,n){this._currentReconnectionProcess=null,this._logger=e,this._reconnectionDisplay=t,this._reconnectCallback=n||tt.reconnect}onConnectionDown(e,t){if(!this._reconnectionDisplay){const t=document.getElementById(e.dialogId);this._reconnectionDisplay=t?new Co(t,document,e.maxRetries):new Eo(e.dialogId,document,this._logger)}this._currentReconnectionProcess||(this._currentReconnectionProcess=new ko(e,this._logger,this._reconnectCallback,this._reconnectionDisplay))}onConnectionUp(){this._currentReconnectionProcess&&(this._currentReconnectionProcess.dispose(),this._currentReconnectionProcess=null)}}class ko{static{this.MaximumFirstRetryInterval=3e3}constructor(e,t,n,o){this.logger=t,this.reconnectCallback=n,this.isDisposed=!1,this.reconnectDisplay=o,this.reconnectDisplay.show(),this.attemptPeriodicReconnection(e)}dispose(){this.isDisposed=!0,this.reconnectDisplay.hide()}async attemptPeriodicReconnection(e){for(let t=0;void 0===e.maxRetries||t<e.maxRetries;t++){let n;if("function"==typeof e.retryIntervalMilliseconds){const o=e.retryIntervalMilliseconds(t);if(null==o)break;n=o}else n=0===t&&e.retryIntervalMilliseconds>ko.MaximumFirstRetryInterval?ko.MaximumFirstRetryInterval:e.retryIntervalMilliseconds;if(await this.runTimer(n,1e3,(e=>{this.reconnectDisplay.update(t+1,Math.round(e/1e3))})),this.isDisposed)break;try{return await this.reconnectCallback()?void 0:void this.reconnectDisplay.rejected()}catch(e){this.logger.log(nt.Error,e)}}this.reconnectDisplay.failed()}async runTimer(e,t,n){if(e<=0)return void n(0);let o,r,i=Date.now();n(e);const s=()=>{if(this.isDisposed)return void r();const a=Date.now(),c=a-i;i=a;const l=Math.max(1,Math.floor(c/t)),h=t*l;if((e-=h)<Number.EPSILON)return n(0),void r();const d=Math.min(e,t-(c-h));n(e),o=setTimeout(s,d)},a=()=>{"visible"===document.visibilityState&&(clearTimeout(o),n(0),r())};o=setTimeout(s,t),document.addEventListener("visibilitychange",a),await new Promise((e=>r=e)),document.removeEventListener("visibilitychange",a)}}class To{constructor(e=!0,t,n,o=0){this.singleRuntime=e,this.logger=t,this.webRendererId=o,this.afterStartedCallbacks=[],n&&this.afterStartedCallbacks.push(...n)}async importInitializersAsync(e,t){await Promise.all(e.map((e=>async function(e,n){const o=function(e){const t=document.baseURI;return t.endsWith("/")?`${t}${e}`:`${t}/${e}`}(n),r=await import(o);if(void 0!==r){if(e.singleRuntime){const{beforeStart:n,afterStarted:o,beforeWebAssemblyStart:s,afterWebAssemblyStarted:a,beforeServerStart:c,afterServerStarted:l}=r;let h=n;e.webRendererId===gn.Server&&c&&(h=c),e.webRendererId===gn.WebAssembly&&s&&(h=s);let d=o;return e.webRendererId===gn.Server&&l&&(d=l),e.webRendererId===gn.WebAssembly&&a&&(d=a),i(e,h,d,t)}return function(e,t,n){const r=n[0],{beforeStart:s,afterStarted:a,beforeWebStart:c,afterWebStarted:l,beforeWebAssemblyStart:h,afterWebAssemblyStarted:d,beforeServerStart:u,afterServerStarted:p}=t,f=!(c||l||h||d||u||p||!s&&!a),g=f&&r.enableClassicInitializers;if(f&&!r.enableClassicInitializers)e.logger?.log(nt.Warning,`Initializer '${o}' will be ignored because multiple runtimes are available. Use 'before(Web|WebAssembly|Server)Start' and 'after(Web|WebAssembly|Server)Started' instead.`);else if(g)return i(e,s,a,n);if(function(e){e.webAssembly?e.webAssembly.initializers||(e.webAssembly.initializers={beforeStart:[],afterStarted:[]}):e.webAssembly={initializers:{beforeStart:[],afterStarted:[]}},e.circuit?e.circuit.initializers||(e.circuit.initializers={beforeStart:[],afterStarted:[]}):e.circuit={initializers:{beforeStart:[],afterStarted:[]}}}(r),h&&r.webAssembly.initializers.beforeStart.push(h),d&&r.webAssembly.initializers.afterStarted.push(d),u&&r.circuit.initializers.beforeStart.push(u),p&&r.circuit.initializers.afterStarted.push(p),l&&e.afterStartedCallbacks.push(l),c)return c(r)}(e,r,t)}function i(e,t,n,o){if(n&&e.afterStartedCallbacks.push(n),t)return t(...o)}}(this,e))))}async invokeAfterStartedCallbacks(e){const t=(n=this.webRendererId,E.get(n)?.[1]);var n;t&&await t,await Promise.all(this.afterStartedCallbacks.map((t=>t(e))))}}function Do(e){if(void 0!==wo)throw new Error("Blazor Server has already started.");return wo=new Promise(Ro.bind(null,e)),wo}async function Ro(e,t,n){await fo;const o=await async function(e){if(e.initializers)return await Promise.all(e.initializers.beforeStart.map((t=>t(e)))),new To(!1,void 0,e.initializers.afterStarted,gn.Server);const t=await fetch("_blazor/initializers",{method:"GET",credentials:"include",cache:"no-cache"}),n=await t.json(),o=new To(!0,void 0,void 0,gn.Server);return await o.importInitializersAsync(n,[e]),o}(yo);if(go=at(document)||"",vo=new it(yo.logLevel),mo=new So(e,go,yo,vo),vo.log(nt.Information,"Starting up Blazor server-side application."),tt.reconnect=async()=>!(mo.didRenderingFail()||!await mo.reconnect()&&(vo.log(nt.Information,"Reconnection attempt to the circuit was rejected by the server. This may indicate that the associated state is no longer available on the server."),1)),tt.defaultReconnectionHandler=new Io(vo),yo.reconnectionHandler=yo.reconnectionHandler||tt.defaultReconnectionHandler,tt._internal.navigationManager.listenForNavigationEvents(gn.Server,((e,t,n)=>mo.sendLocationChanged(e,t,n)),((e,t,n,o)=>mo.sendLocationChanging(e,t,n,o))),tt._internal.forceCloseConnection=()=>mo.disconnect(),tt._internal.sendJSDataStream=(e,t,n)=>mo.sendJsDataStream(e,t,n),!await mo.start())return vo.log(nt.Error,"Failed to start the circuit."),void t();const r=()=>{mo.sendDisconnectBeacon()};tt.disconnect=r,window.addEventListener("unload",r,{capture:!1,once:!0}),vo.log(nt.Information,"Blazor server-side application started."),o.invokeAfterStartedCallbacks(tt),t()}class xo{constructor(e){this.initialComponents=e}resolveRootComponent(e){return this.initialComponents[e]}}class Ao{constructor(){this._eventListeners=new Map}static create(e){const t=new Ao;return e.addEventListener=t.addEventListener.bind(t),e.removeEventListener=t.removeEventListener.bind(t),t}addEventListener(e,t){let n=this._eventListeners.get(e);n||(n=new Set,this._eventListeners.set(e,n)),n.add(t)}removeEventListener(e,t){this._eventListeners.get(e)?.delete(t)}dispatchEvent(e,t){const n=this._eventListeners.get(e);if(!n)return;const o={...t,type:e};for(const e of n)e(o)}}let Po=!1;function No(e){if(Po)throw new Error("Blazor has already started.");Po=!0;const t=ot(e);!function(e){if(yo)throw new Error("Circuit options have already been configured.");fo=async function(e){const t=await e;yo=ot(t)}(e)}(Promise.resolve(t||{})),Ao.create(tt);const n=function(e){return lt(e,"server").sort(((e,t)=>e.sequence-t.sequence))}(document);return Do(new xo(n))}tt.start=No,window.DotNet=e,document&&document.currentScript&&"false"!==document.currentScript.getAttribute("autostart")&&No()}();
diff --git a/src/Components/Web.JS/dist/Release/blazor.web.js b/src/Components/Web.JS/dist/Release/blazor.web.js
deleted file mode 100644
index 472cff74a6a5..000000000000
--- a/src/Components/Web.JS/dist/Release/blazor.web.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";var e;let t;var n,o;!function(e){const t=[],n="__jsObjectId",o="__dotNetObject",r="__byte[]",i="__dotNetStream",s="__jsStreamReferenceLength";let a,c;class l{constructor(e){this._jsObject=e,this._cachedFunctions=new Map}findFunction(e){const t=this._cachedFunctions.get(e);if(t)return t;let n,o=this._jsObject;if(e.split(".").forEach((t=>{if(!(t in o))throw new Error(`Could not find '${e}' ('${t}' was undefined).`);n=o,o=o[t]})),o instanceof Function)return o=o.bind(n),this._cachedFunctions.set(e,o),o;throw new Error(`The value '${e}' is not a function.`)}getWrappedObject(){return this._jsObject}}const h=0,d={[h]:new l(window)};d[0]._cachedFunctions.set("import",(e=>("string"==typeof e&&e.startsWith("./")&&(e=new URL(e.substr(2),document.baseURI).toString()),import(e))));let u,p=1;function f(e){t.push(e)}function g(e){if(e&&"object"==typeof e){d[p]=new l(e);const t={[n]:p};return p++,t}throw new Error(`Cannot create a JSObjectReference from the value '${e}'.`)}function m(e){let t=-1;if(e instanceof ArrayBuffer&&(e=new Uint8Array(e)),e instanceof Blob)t=e.size;else{if(!(e.buffer instanceof ArrayBuffer))throw new Error("Supplied value is not a typed array or blob.");if(void 0===e.byteLength)throw new Error(`Cannot create a JSStreamReference from the value '${e}' as it doesn't have a byteLength.`);t=e.byteLength}const o={[s]:t};try{const t=g(e);o[n]=t[n]}catch(t){throw new Error(`Cannot create a JSStreamReference from the value '${e}'.`)}return o}function y(e,n){c=e;const o=n?JSON.parse(n,((e,n)=>t.reduce(((t,n)=>n(e,t)),n))):null;return c=void 0,o}function v(){if(void 0===a)throw new Error("No call dispatcher has been set.");if(null===a)throw new Error("There are multiple .NET runtimes present, so a default dispatcher could not be resolved. Use DotNetObject to invoke .NET instance methods.");return a}e.attachDispatcher=function(e){const t=new w(e);return void 0===a?a=t:a&&(a=null),t},e.attachReviver=f,e.invokeMethod=function(e,t,...n){return v().invokeDotNetStaticMethod(e,t,...n)},e.invokeMethodAsync=function(e,t,...n){return v().invokeDotNetStaticMethodAsync(e,t,...n)},e.createJSObjectReference=g,e.createJSStreamReference=m,e.disposeJSObjectReference=function(e){const t=e&&e[n];"number"==typeof t&&S(t)},function(e){e[e.Default=0]="Default",e[e.JSObjectReference=1]="JSObjectReference",e[e.JSStreamReference=2]="JSStreamReference",e[e.JSVoidResult=3]="JSVoidResult"}(u=e.JSCallResultType||(e.JSCallResultType={}));class w{constructor(e){this._dotNetCallDispatcher=e,this._byteArraysToBeRevived=new Map,this._pendingDotNetToJSStreams=new Map,this._pendingAsyncCalls={},this._nextAsyncCallId=1}getDotNetCallDispatcher(){return this._dotNetCallDispatcher}invokeJSFromDotNet(e,t,n,o){const r=y(this,t),i=k(_(e,o)(...r||[]),n);return null==i?null:R(this,i)}beginInvokeJSFromDotNet(e,t,n,o,r){const i=new Promise((e=>{const o=y(this,n);e(_(t,r)(...o||[]))}));e&&i.then((t=>R(this,[e,!0,k(t,o)]))).then((t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!0,t)),(t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!1,JSON.stringify([e,!1,b(t)]))))}endInvokeDotNetFromJS(e,t,n){const o=t?y(this,n):new Error(n);this.completePendingCall(parseInt(e,10),t,o)}invokeDotNetStaticMethod(e,t,...n){return this.invokeDotNetMethod(e,t,null,n)}invokeDotNetStaticMethodAsync(e,t,...n){return this.invokeDotNetMethodAsync(e,t,null,n)}invokeDotNetMethod(e,t,n,o){if(this._dotNetCallDispatcher.invokeDotNetFromJS){const r=R(this,o),i=this._dotNetCallDispatcher.invokeDotNetFromJS(e,t,n,r);return i?y(this,i):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeDotNetMethodAsync instead.")}invokeDotNetMethodAsync(e,t,n,o){if(e&&n)throw new Error(`For instance method calls, assemblyName should be null. Received '${e}'.`);const r=this._nextAsyncCallId++,i=new Promise(((e,t)=>{this._pendingAsyncCalls[r]={resolve:e,reject:t}}));try{const i=R(this,o);this._dotNetCallDispatcher.beginInvokeDotNetFromJS(r,e,t,n,i)}catch(e){this.completePendingCall(r,!1,e)}return i}receiveByteArray(e,t){this._byteArraysToBeRevived.set(e,t)}processByteArray(e){const t=this._byteArraysToBeRevived.get(e);return t?(this._byteArraysToBeRevived.delete(e),t):null}supplyDotNetStream(e,t){if(this._pendingDotNetToJSStreams.has(e)){const n=this._pendingDotNetToJSStreams.get(e);this._pendingDotNetToJSStreams.delete(e),n.resolve(t)}else{const n=new I;n.resolve(t),this._pendingDotNetToJSStreams.set(e,n)}}getDotNetStreamPromise(e){let t;if(this._pendingDotNetToJSStreams.has(e))t=this._pendingDotNetToJSStreams.get(e).streamPromise,this._pendingDotNetToJSStreams.delete(e);else{const n=new I;this._pendingDotNetToJSStreams.set(e,n),t=n.streamPromise}return t}completePendingCall(e,t,n){if(!this._pendingAsyncCalls.hasOwnProperty(e))throw new Error(`There is no pending async call with ID ${e}.`);const o=this._pendingAsyncCalls[e];delete this._pendingAsyncCalls[e],t?o.resolve(n):o.reject(n)}}function b(e){return e instanceof Error?`${e.message}\n${e.stack}`:e?e.toString():"null"}function _(e,t){const n=d[t];if(n)return n.findFunction(e);throw new Error(`JS object instance with ID ${t} does not exist (has it been disposed?).`)}function S(e){delete d[e]}e.findJSFunction=_,e.disposeJSObjectReferenceById=S;class C{constructor(e,t){this._id=e,this._callDispatcher=t}invokeMethod(e,...t){return this._callDispatcher.invokeDotNetMethod(null,e,this._id,t)}invokeMethodAsync(e,...t){return this._callDispatcher.invokeDotNetMethodAsync(null,e,this._id,t)}dispose(){this._callDispatcher.invokeDotNetMethodAsync(null,"__Dispose",this._id,null).catch((e=>console.error(e)))}serializeAsArg(){return{[o]:this._id}}}e.DotNetObject=C,f((function(e,t){if(t&&"object"==typeof t){if(t.hasOwnProperty(o))return new C(t[o],c);if(t.hasOwnProperty(n)){const e=t[n],o=d[e];if(o)return o.getWrappedObject();throw new Error(`JS object instance with Id '${e}' does not exist. It may have been disposed.`)}if(t.hasOwnProperty(r)){const e=t[r],n=c.processByteArray(e);if(void 0===n)throw new Error(`Byte array index '${e}' does not exist.`);return n}if(t.hasOwnProperty(i)){const e=t[i],n=c.getDotNetStreamPromise(e);return new E(n)}}return t}));class E{constructor(e){this._streamPromise=e}stream(){return this._streamPromise}async arrayBuffer(){return new Response(await this.stream()).arrayBuffer()}}class I{constructor(){this.streamPromise=new Promise(((e,t)=>{this.resolve=e,this.reject=t}))}}function k(e,t){switch(t){case u.Default:return e;case u.JSObjectReference:return g(e);case u.JSStreamReference:return m(e);case u.JSVoidResult:return null;default:throw new Error(`Invalid JS call result type '${t}'.`)}}let T=0;function R(e,t){T=0,c=e;const n=JSON.stringify(t,A);return c=void 0,n}function A(e,t){if(t instanceof C)return t.serializeAsArg();if(t instanceof Uint8Array){c.getDotNetCallDispatcher().sendByteArray(T,t);const e={[r]:T};return T++,e}return t}}(e||(e={})),function(e){e[e.prependFrame=1]="prependFrame",e[e.removeFrame=2]="removeFrame",e[e.setAttribute=3]="setAttribute",e[e.removeAttribute=4]="removeAttribute",e[e.updateText=5]="updateText",e[e.stepIn=6]="stepIn",e[e.stepOut=7]="stepOut",e[e.updateMarkup=8]="updateMarkup",e[e.permutationListEntry=9]="permutationListEntry",e[e.permutationListEnd=10]="permutationListEnd"}(n||(n={})),function(e){e[e.element=1]="element",e[e.text=2]="text",e[e.attribute=3]="attribute",e[e.component=4]="component",e[e.region=5]="region",e[e.elementReferenceCapture=6]="elementReferenceCapture",e[e.markup=8]="markup",e[e.namedEvent=10]="namedEvent"}(o||(o={}));class r{constructor(e,t){this.componentId=e,this.fieldValue=t}static fromEvent(e,t){const n=t.target;if(n instanceof Element){const t=function(e){return e instanceof HTMLInputElement?e.type&&"checkbox"===e.type.toLowerCase()?{value:e.checked}:{value:e.value}:e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement?{value:e.value}:null}(n);if(t)return new r(e,t.value)}return null}}const i=new Map,s=new Map,a=[];function c(e){return i.get(e)}function l(e){const t=i.get(e);return t?.browserEventName||e}function h(e,t){e.forEach((e=>i.set(e,t)))}function d(e){const t=[];for(let n=0;n<e.length;n++){const o=e[n];t.push({identifier:o.identifier,clientX:o.clientX,clientY:o.clientY,screenX:o.screenX,screenY:o.screenY,pageX:o.pageX,pageY:o.pageY})}return t}function u(e){return{detail:e.detail,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY,offsetX:e.offsetX,offsetY:e.offsetY,pageX:e.pageX,pageY:e.pageY,movementX:e.movementX,movementY:e.movementY,button:e.button,buttons:e.buttons,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey,type:e.type}}h(["input","change"],{createEventArgs:function(e){const t=e.target;if(function(e){return-1!==p.indexOf(e.getAttribute("type"))}(t)){const e=function(e){const t=e.value,n=e.type;switch(n){case"date":case"month":case"week":return t;case"datetime-local":return 16===t.length?t+":00":t;case"time":return 5===t.length?t+":00":t}throw new Error(`Invalid element type '${n}'.`)}(t);return{value:e}}if(function(e){return e instanceof HTMLSelectElement&&"select-multiple"===e.type}(t)){const e=t;return{value:Array.from(e.options).filter((e=>e.selected)).map((e=>e.value))}}{const e=function(e){return!!e&&"INPUT"===e.tagName&&"checkbox"===e.getAttribute("type")}(t);return{value:e?!!t.checked:t.value}}}}),h(["copy","cut","paste"],{createEventArgs:e=>({type:e.type})}),h(["drag","dragend","dragenter","dragleave","dragover","dragstart","drop"],{createEventArgs:e=>{return{...u(t=e),dataTransfer:t.dataTransfer?{dropEffect:t.dataTransfer.dropEffect,effectAllowed:t.dataTransfer.effectAllowed,files:Array.from(t.dataTransfer.files).map((e=>e.name)),items:Array.from(t.dataTransfer.items).map((e=>({kind:e.kind,type:e.type}))),types:t.dataTransfer.types}:null};var t}}),h(["focus","blur","focusin","focusout"],{createEventArgs:e=>({type:e.type})}),h(["keydown","keyup","keypress"],{createEventArgs:e=>{return{key:(t=e).key,code:t.code,location:t.location,repeat:t.repeat,ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type,isComposing:t.isComposing};var t}}),h(["contextmenu","click","mouseover","mouseout","mousemove","mousedown","mouseup","mouseleave","mouseenter","dblclick"],{createEventArgs:e=>u(e)}),h(["error"],{createEventArgs:e=>{return{message:(t=e).message,filename:t.filename,lineno:t.lineno,colno:t.colno,type:t.type};var t}}),h(["loadstart","timeout","abort","load","loadend","progress"],{createEventArgs:e=>{return{lengthComputable:(t=e).lengthComputable,loaded:t.loaded,total:t.total,type:t.type};var t}}),h(["touchcancel","touchend","touchmove","touchenter","touchleave","touchstart"],{createEventArgs:e=>{return{detail:(t=e).detail,touches:d(t.touches),targetTouches:d(t.targetTouches),changedTouches:d(t.changedTouches),ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type};var t}}),h(["gotpointercapture","lostpointercapture","pointercancel","pointerdown","pointerenter","pointerleave","pointermove","pointerout","pointerover","pointerup"],{createEventArgs:e=>{return{...u(t=e),pointerId:t.pointerId,width:t.width,height:t.height,pressure:t.pressure,tiltX:t.tiltX,tiltY:t.tiltY,pointerType:t.pointerType,isPrimary:t.isPrimary};var t}}),h(["wheel","mousewheel"],{createEventArgs:e=>{return{...u(t=e),deltaX:t.deltaX,deltaY:t.deltaY,deltaZ:t.deltaZ,deltaMode:t.deltaMode};var t}}),h(["cancel","close","toggle"],{createEventArgs:()=>({})});const p=["date","datetime-local","month","time","week"],f=new Map;let g,m,y=0;const v={async add(e,t,n){if(!n)throw new Error("initialParameters must be an object, even if empty.");const o="__bl-dynamic-root:"+(++y).toString();f.set(o,e);const r=await S().invokeMethodAsync("AddRootComponent",t,o),i=new _(r,m[t]);return await i.setParameters(n),i}};function w(e){const t=f.get(e);if(t)return f.delete(e),t}class b{invoke(e){return this._callback(e)}setCallback(t){this._selfJSObjectReference||(this._selfJSObjectReference=e.createJSObjectReference(this)),this._callback=t}getJSObjectReference(){return this._selfJSObjectReference}dispose(){this._selfJSObjectReference&&e.disposeJSObjectReference(this._selfJSObjectReference)}}class _{constructor(e,t){this._jsEventCallbackWrappers=new Map,this._componentId=e;for(const e of t)"eventcallback"===e.type&&this._jsEventCallbackWrappers.set(e.name.toLowerCase(),new b)}setParameters(e){const t={},n=Object.entries(e||{}),o=n.length;for(const[e,o]of n){const n=this._jsEventCallbackWrappers.get(e.toLowerCase());n&&o?(n.setCallback(o),t[e]=n.getJSObjectReference()):t[e]=o}return S().invokeMethodAsync("SetRootComponentParameters",this._componentId,o,t)}async dispose(){if(null!==this._componentId){await S().invokeMethodAsync("RemoveRootComponent",this._componentId),this._componentId=null;for(const e of this._jsEventCallbackWrappers.values())e.dispose()}}}function S(){if(!g)throw new Error("Dynamic root components have not been enabled in this application.");return g}const C=new Map,E=[],I=new Map;function k(t,n,o,r){if(C.has(t))throw new Error(`Interop methods are already registered for renderer ${t}`);C.set(t,n),o&&r&&Object.keys(o).length>0&&function(t,n,o){if(g)throw new Error("Dynamic root components have already been enabled.");g=t,m=n;for(const[t,r]of Object.entries(o)){const o=e.findJSFunction(t,0);for(const e of r)o(e,n[e])}}(A(t),o,r),I.get(t)?.[0]?.(),function(e){for(const t of E)t(e)}(t)}function T(e){return C.has(e)}function R(e,t,n){return D(e,t.eventHandlerId,(()=>A(e).invokeMethodAsync("DispatchEventAsync",t,n)))}function A(e){const t=C.get(e);if(!t)throw new Error(`No interop methods are registered for renderer ${e}`);return t}let D=(e,t,n)=>n();const x=B(["abort","blur","cancel","canplay","canplaythrough","change","close","cuechange","durationchange","emptied","ended","error","focus","load","loadeddata","loadedmetadata","loadend","loadstart","mouseenter","mouseleave","pointerenter","pointerleave","pause","play","playing","progress","ratechange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeupdate","toggle","unload","volumechange","waiting","DOMNodeInsertedIntoDocument","DOMNodeRemovedFromDocument"]),N={submit:!0},M=B(["click","dblclick","mousedown","mousemove","mouseup"]);class P{static{this.nextEventDelegatorId=0}constructor(e){this.browserRendererId=e,this.afterClickCallbacks=[];const t=++P.nextEventDelegatorId;this.eventsCollectionKey=`_blazorEvents_${t}`,this.eventInfoStore=new L(this.onGlobalEvent.bind(this))}setListener(e,t,n,o){const r=this.getEventHandlerInfosForElement(e,!0),i=r.getHandler(t);if(i)this.eventInfoStore.update(i.eventHandlerId,n);else{const i={element:e,eventName:t,eventHandlerId:n,renderingComponentId:o};this.eventInfoStore.add(i),r.setHandler(t,i)}}getHandler(e){return this.eventInfoStore.get(e)}removeListener(e){const t=this.eventInfoStore.remove(e);if(t){const e=t.element,n=this.getEventHandlerInfosForElement(e,!1);n&&n.removeHandler(t.eventName)}}notifyAfterClick(e){this.afterClickCallbacks.push(e),this.eventInfoStore.addGlobalListener("click")}setStopPropagation(e,t,n){this.getEventHandlerInfosForElement(e,!0).stopPropagation(t,n)}setPreventDefault(e,t,n){this.getEventHandlerInfosForElement(e,!0).preventDefault(t,n)}onGlobalEvent(e){if(!(e.target instanceof Element))return;this.dispatchGlobalEventToAllElements(e.type,e);const t=(n=e.type,s.get(n));var n;t&&t.forEach((t=>this.dispatchGlobalEventToAllElements(t,e))),"click"===e.type&&this.afterClickCallbacks.forEach((t=>t(e)))}dispatchGlobalEventToAllElements(e,t){const n=t.composedPath();let o=n.shift(),i=null,s=!1;const a=Object.prototype.hasOwnProperty.call(x,e);let l=!1;for(;o;){const u=o,p=this.getEventHandlerInfosForElement(u,!1);if(p){const n=p.getHandler(e);if(n&&(h=u,d=t.type,!((h instanceof HTMLButtonElement||h instanceof HTMLInputElement||h instanceof HTMLTextAreaElement||h instanceof HTMLSelectElement)&&Object.prototype.hasOwnProperty.call(M,d)&&h.disabled))){if(!s){const n=c(e);i=n?.createEventArgs?n.createEventArgs(t):{},s=!0}Object.prototype.hasOwnProperty.call(N,t.type)&&t.preventDefault(),R(this.browserRendererId,{eventHandlerId:n.eventHandlerId,eventName:e,eventFieldInfo:r.fromEvent(n.renderingComponentId,t)},i)}p.stopPropagation(e)&&(l=!0),p.preventDefault(e)&&t.preventDefault()}o=a||l?void 0:n.shift()}var h,d}getEventHandlerInfosForElement(e,t){return Object.prototype.hasOwnProperty.call(e,this.eventsCollectionKey)?e[this.eventsCollectionKey]:t?e[this.eventsCollectionKey]=new U:null}}class L{constructor(e){this.globalListener=e,this.infosByEventHandlerId={},this.countByEventName={},a.push(this.handleEventNameAliasAdded.bind(this))}add(e){if(this.infosByEventHandlerId[e.eventHandlerId])throw new Error(`Event ${e.eventHandlerId} is already tracked`);this.infosByEventHandlerId[e.eventHandlerId]=e,this.addGlobalListener(e.eventName)}get(e){return this.infosByEventHandlerId[e]}addGlobalListener(e){if(e=l(e),Object.prototype.hasOwnProperty.call(this.countByEventName,e))this.countByEventName[e]++;else{this.countByEventName[e]=1;const t=Object.prototype.hasOwnProperty.call(x,e);document.addEventListener(e,this.globalListener,t)}}update(e,t){if(Object.prototype.hasOwnProperty.call(this.infosByEventHandlerId,t))throw new Error(`Event ${t} is already tracked`);const n=this.infosByEventHandlerId[e];delete this.infosByEventHandlerId[e],n.eventHandlerId=t,this.infosByEventHandlerId[t]=n}remove(e){const t=this.infosByEventHandlerId[e];if(t){delete this.infosByEventHandlerId[e];const n=l(t.eventName);0==--this.countByEventName[n]&&(delete this.countByEventName[n],document.removeEventListener(n,this.globalListener))}return t}handleEventNameAliasAdded(e,t){if(Object.prototype.hasOwnProperty.call(this.countByEventName,e)){const n=this.countByEventName[e];delete this.countByEventName[e],document.removeEventListener(e,this.globalListener),this.addGlobalListener(t),this.countByEventName[t]+=n-1}}}class U{constructor(){this.handlers={},this.preventDefaultFlags=null,this.stopPropagationFlags=null}getHandler(e){return Object.prototype.hasOwnProperty.call(this.handlers,e)?this.handlers[e]:null}setHandler(e,t){this.handlers[e]=t}removeHandler(e){delete this.handlers[e]}preventDefault(e,t){return void 0!==t&&(this.preventDefaultFlags=this.preventDefaultFlags||{},this.preventDefaultFlags[e]=t),!!this.preventDefaultFlags&&this.preventDefaultFlags[e]}stopPropagation(e,t){return void 0!==t&&(this.stopPropagationFlags=this.stopPropagationFlags||{},this.stopPropagationFlags[e]=t),!!this.stopPropagationFlags&&this.stopPropagationFlags[e]}}function B(e){const t={};return e.forEach((e=>{t[e]=!0})),t}const O=Symbol(),$=Symbol(),F=Symbol();function H(e){const{start:t,end:n}=e,o=t[F];if(o){if(o!==e)throw new Error("The start component comment was already associated with another component descriptor.");return t}const r=t.parentNode;if(!r)throw new Error(`Comment not connected to the DOM ${t.textContent}`);const i=W(r,!0),s=Y(i);t[$]=i,t[F]=e;const a=W(t);if(n){const e=Y(a),o=Array.prototype.indexOf.call(s,a)+1;let r=null;for(;r!==n;){const n=s.splice(o,1)[0];if(!n)throw new Error("Could not find the end component comment in the parent logical node list");n[$]=t,e.push(n),r=n}}return a}function W(e,t){if(O in e)return e;const n=[];if(e.childNodes.length>0){if(!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");e.childNodes.forEach((t=>{const o=W(t,!0);o[$]=e,n.push(o)}))}return e[O]=n,e}function j(e){const t=Y(e);for(;t.length;)J(e,0)}function z(e,t){const n=document.createComment("!");return q(n,e,t),n}function q(e,t,n){const o=e;let r=e;if(e instanceof Comment){const t=Y(o);if(t?.length>0){const t=oe(o),n=new Range;n.setStartBefore(e),n.setEndAfter(t),r=n.extractContents()}}const i=V(o);if(i){const e=Y(i),t=Array.prototype.indexOf.call(e,o);e.splice(t,1),delete o[$]}const s=Y(t);if(n<s.length){const e=s[n];e.parentNode.insertBefore(r,e),s.splice(n,0,o)}else ne(r,t),s.push(o);o[$]=t,O in o||(o[O]=[])}function J(e,t){const n=Y(e).splice(t,1)[0];if(n instanceof Comment){const e=Y(n);if(e)for(;e.length>0;)J(n,0)}const o=n;o.parentNode.removeChild(o)}function V(e){return e[$]||null}function K(e,t){return Y(e)[t]}function X(e){return e[F]||null}function G(e){const t=te(e);return"http://www.w3.org/2000/svg"===t.namespaceURI&&"foreignObject"!==t.tagName}function Y(e){return e[O]}function Q(e){const t=Y(V(e));return t[Array.prototype.indexOf.call(t,e)+1]||null}function Z(e){return O in e}function ee(e,t){const n=Y(e);t.forEach((e=>{e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=oe(e.moveRangeStart)})),t.forEach((t=>{const o=document.createComment("marker");t.moveToBeforeMarker=o;const r=n[t.toSiblingIndex+1];r?r.parentNode.insertBefore(o,r):ne(o,e)})),t.forEach((e=>{const t=e.moveToBeforeMarker,n=t.parentNode,o=e.moveRangeStart,r=e.moveRangeEnd;let i=o;for(;i;){const e=i.nextSibling;if(n.insertBefore(i,t),i===r)break;i=e}n.removeChild(t)})),t.forEach((e=>{n[e.toSiblingIndex]=e.moveRangeStart}))}function te(e){if(e instanceof Element||e instanceof DocumentFragment)return e;if(e instanceof Comment)return e.parentNode;throw new Error("Not a valid logical element")}function ne(e,t){if(t instanceof Element||t instanceof DocumentFragment)t.appendChild(e);else{if(!(t instanceof Comment))throw new Error(`Cannot append node because the parent is not a valid logical element. Parent: ${t}`);{const n=Q(t);n?n.parentNode.insertBefore(e,n):ne(e,V(t))}}}function oe(e){if(e instanceof Element||e instanceof DocumentFragment)return e;const t=Q(e);if(t)return t.previousSibling;{const t=V(e);return t instanceof Element||t instanceof DocumentFragment?t.lastChild:oe(t)}}function re(e){return`_bl_${e}`}const ie="__internalId";e.attachReviver(((e,t)=>t&&"object"==typeof t&&Object.prototype.hasOwnProperty.call(t,ie)&&"string"==typeof t[ie]?function(e){const t=`[${re(e)}]`;return document.querySelector(t)}(t[ie]):t));const se="_blazorDeferredValue";function ae(e){e instanceof HTMLOptionElement?de(e):se in e&&he(e,e[se])}function ce(e){return"select-multiple"===e.type}function le(e,t){e.value=t||""}function he(e,t){e instanceof HTMLSelectElement?ce(e)?function(e,t){t||=[];for(let n=0;n<e.options.length;n++)e.options[n].selected=-1!==t.indexOf(e.options[n].value)}(e,t):le(e,t):e.value=t}function de(e){const t=function(e){for(;e;){if(e instanceof HTMLSelectElement)return e;e=e.parentElement}return null}(e);if(!function(e){return!!e&&se in e}(t))return!1;if(ce(t))e.selected=-1!==t._blazorDeferredValue.indexOf(e.value);else{if(t._blazorDeferredValue!==e.value)return!1;le(t,e.value),delete t._blazorDeferredValue}return!0}const ue=document.createElement("template"),pe=document.createElementNS("http://www.w3.org/2000/svg","g"),fe=new Set,ge=Symbol(),me=Symbol();class ye{constructor(e){this.rootComponentIds=new Set,this.childComponentLocations={},this.eventDelegator=new P(e),this.eventDelegator.notifyAfterClick((e=>{He()&&Ne(e,(e=>{Ye(e,!0,!1)}))}))}getRootComponentCount(){return this.rootComponentIds.size}attachRootComponentToLogicalElement(e,t,n){if(we(t))throw new Error(`Root component '${e}' could not be attached because its target element is already associated with a root component`);n&&(t=z(t,Y(t).length)),ve(t,!0),this.attachComponentToElement(e,t),this.rootComponentIds.add(e),fe.add(t)}updateComponent(e,t,n,o){const r=this.childComponentLocations[t];if(!r)throw new Error(`No element is currently associated with component ${t}`);fe.delete(r)&&(j(r),r instanceof Comment&&(r.textContent="!"));const i=te(r)?.getRootNode(),s=i&&i.activeElement;this.applyEdits(e,t,r,0,n,o),s instanceof HTMLElement&&i&&i.activeElement!==s&&s.focus()}disposeComponent(e){if(this.rootComponentIds.delete(e)){const t=this.childComponentLocations[e];ve(t,!1),!0===t[me]?fe.add(t):j(t)}delete this.childComponentLocations[e]}disposeEventHandler(e){this.eventDelegator.removeListener(e)}attachComponentToElement(e,t){this.childComponentLocations[e]=t}applyEdits(e,t,o,r,i,s){let a,c=0,l=r;const h=e.arrayBuilderSegmentReader,d=e.editReader,u=e.frameReader,p=h.values(i),f=h.offset(i),g=f+h.count(i);for(let i=f;i<g;i++){const h=e.diffReader.editsEntry(p,i),f=d.editType(h);switch(f){case n.prependFrame:{const n=d.newTreeIndex(h),r=e.referenceFramesEntry(s,n),i=d.siblingIndex(h);this.insertFrame(e,t,o,l+i,s,r,n);break}case n.removeFrame:J(o,l+d.siblingIndex(h));break;case n.setAttribute:{const n=d.newTreeIndex(h),r=e.referenceFramesEntry(s,n),i=K(o,l+d.siblingIndex(h));if(!(i instanceof Element))throw new Error("Cannot set attribute on non-element child");this.applyAttribute(e,t,i,r);break}case n.removeAttribute:{const e=K(o,l+d.siblingIndex(h));if(!(e instanceof Element))throw new Error("Cannot remove attribute from non-element child");{const t=d.removedAttributeName(h);this.setOrRemoveAttributeOrProperty(e,t,null)}break}case n.updateText:{const t=d.newTreeIndex(h),n=e.referenceFramesEntry(s,t),r=K(o,l+d.siblingIndex(h));if(!(r instanceof Text))throw new Error("Cannot set text content on non-text child");r.textContent=u.textContent(n);break}case n.updateMarkup:{const t=d.newTreeIndex(h),n=e.referenceFramesEntry(s,t),r=d.siblingIndex(h);J(o,l+r),this.insertMarkup(e,o,l+r,n);break}case n.stepIn:o=K(o,l+d.siblingIndex(h)),c++,l=0;break;case n.stepOut:o=V(o),c--,l=0===c?r:0;break;case n.permutationListEntry:a=a||[],a.push({fromSiblingIndex:l+d.siblingIndex(h),toSiblingIndex:l+d.moveToSiblingIndex(h)});break;case n.permutationListEnd:ee(o,a),a=void 0;break;default:throw new Error(`Unknown edit type: ${f}`)}}}insertFrame(e,t,n,r,i,s,a){const c=e.frameReader,l=c.frameType(s);switch(l){case o.element:return this.insertElement(e,t,n,r,i,s,a),1;case o.text:return this.insertText(e,n,r,s),1;case o.attribute:throw new Error("Attribute frames should only be present as leading children of element frames.");case o.component:return this.insertComponent(e,n,r,s),1;case o.region:return this.insertFrameRange(e,t,n,r,i,a+1,a+c.subtreeLength(s));case o.elementReferenceCapture:if(n instanceof Element)return h=n,d=c.elementReferenceCaptureId(s),h.setAttribute(re(d),""),0;throw new Error("Reference capture frames can only be children of element frames.");case o.markup:return this.insertMarkup(e,n,r,s),1;case o.namedEvent:return 0;default:throw new Error(`Unknown frame type: ${l}`)}var h,d}insertElement(e,t,n,r,i,s,a){const c=e.frameReader,l=c.elementName(s),h="svg"===l||G(n)?document.createElementNS("http://www.w3.org/2000/svg",l):document.createElement(l),d=W(h);let u=!1;const p=a+c.subtreeLength(s);for(let s=a+1;s<p;s++){const a=e.referenceFramesEntry(i,s);if(c.frameType(a)!==o.attribute){q(h,n,r),u=!0,this.insertFrameRange(e,t,d,0,i,s,p);break}this.applyAttribute(e,t,h,a)}u||q(h,n,r),ae(h)}insertComponent(e,t,n,o){const r=z(t,n),i=e.frameReader.componentId(o);this.attachComponentToElement(i,r)}insertText(e,t,n,o){const r=e.frameReader.textContent(o);q(document.createTextNode(r),t,n)}insertMarkup(e,t,n,o){const r=z(t,n),i=(s=e.frameReader.markupContent(o),G(t)?(pe.innerHTML=s||" ",pe):(ue.innerHTML=s||" ",ue.content.querySelectorAll("script").forEach((e=>{const t=document.createElement("script");t.textContent=e.textContent,e.getAttributeNames().forEach((n=>{t.setAttribute(n,e.getAttribute(n))})),e.parentNode.replaceChild(t,e)})),ue.content));var s;let a=0;for(;i.firstChild;)q(i.firstChild,r,a++)}applyAttribute(e,t,n,o){const r=e.frameReader,i=r.attributeName(o),s=r.attributeEventHandlerId(o);if(s){const e=Se(i);return void this.eventDelegator.setListener(n,e,s,t)}const a=r.attributeValue(o);this.setOrRemoveAttributeOrProperty(n,i,a)}insertFrameRange(e,t,n,o,r,i,s){const a=o;for(let a=i;a<s;a++){const i=e.referenceFramesEntry(r,a);o+=this.insertFrame(e,t,n,o,r,i,a),a+=_e(e,i)}return o-a}setOrRemoveAttributeOrProperty(e,t,n){(function(e,t,n){switch(t){case"value":return function(e,t){switch(t&&"INPUT"===e.tagName&&(t=function(e,t){switch(t.getAttribute("type")){case"time":return 8!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,5);case"datetime-local":return 19!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,16);default:return e}}(t,e)),e.tagName){case"INPUT":case"SELECT":case"TEXTAREA":return t&&e instanceof HTMLSelectElement&&ce(e)&&(t=JSON.parse(t)),he(e,t),e[se]=t,!0;case"OPTION":return t||""===t?e.setAttribute("value",t):e.removeAttribute("value"),de(e),!0;default:return!1}}(e,n);case"checked":return function(e,t){return"INPUT"===e.tagName&&(e.checked=null!==t,!0)}(e,n);default:return!1}})(e,t,n)||(t.startsWith("__internal_")?this.applyInternalAttribute(e,t.substring(11),n):null!==n?e.setAttribute(t,n):e.removeAttribute(t))}applyInternalAttribute(e,t,n){if(t.startsWith("stopPropagation_")){const o=Se(t.substring(16));this.eventDelegator.setStopPropagation(e,o,null!==n)}else{if(!t.startsWith("preventDefault_"))throw new Error(`Unsupported internal attribute '${t}'`);{const o=Se(t.substring(15));this.eventDelegator.setPreventDefault(e,o,null!==n)}}}}function ve(e,t){e[ge]=t}function we(e){return e[ge]}function be(e,t){e[me]=t}function _e(e,t){const n=e.frameReader;switch(n.frameType(t)){case o.component:case o.element:case o.region:return n.subtreeLength(t)-1;default:return 0}}function Se(e){if(e.startsWith("on"))return e.substring(2);throw new Error(`Attribute should be an event name, but doesn't start with 'on'. Value: '${e}'`)}const Ce={};let Ee,Ie,ke,Te,Re=!1;function Ae(e,t,n,o){let r=Ce[e];r||(r=new ye(e),Ce[e]=r),r.attachRootComponentToLogicalElement(n,t,o)}function De(e){return Ce[e]}function xe(e,t){const n=Ce[e];if(!n)throw new Error(`There is no browser renderer with ID ${e}.`);const o=t.arrayRangeReader,r=t.updatedComponents(),i=o.values(r),s=o.count(r),a=t.referenceFrames(),c=o.values(a),l=t.diffReader;for(let e=0;e<s;e++){const o=t.updatedComponentsEntry(i,e),r=l.componentId(o),s=l.edits(o);n.updateComponent(t,r,s,c)}const h=t.disposedComponentIds(),d=o.values(h),u=o.count(h);for(let e=0;e<u;e++){const o=t.disposedComponentIdsEntry(d,e);n.disposeComponent(o)}const p=t.disposedEventHandlerIds(),f=o.values(p),g=o.count(p);for(let e=0;e<g;e++){const o=t.disposedEventHandlerIdsEntry(f,e);n.disposeEventHandler(o)}Re&&(Re=!1,window.scrollTo&&window.scrollTo(0,0))}function Ne(e,t){if(0!==e.button||function(e){return e.ctrlKey||e.shiftKey||e.altKey||e.metaKey}(e))return;if(e.defaultPrevented)return;const n=function(e){const t=e.composedPath&&e.composedPath();if(t)for(let e=0;e<t.length;e++){const n=t[e];if(n instanceof HTMLAnchorElement||n instanceof SVGAElement)return n}return null}(e);if(n&&function(e){const t=e.getAttribute("target");return(!t||"_self"===t)&&e.hasAttribute("href")&&!e.hasAttribute("download")}(n)){const o=Fe(n.getAttribute("href"));Me(o)&&(e.preventDefault(),t(o))}}function Me(e){const t=(n=document.baseURI).substring(0,n.lastIndexOf("/"));var n;const o=e.charAt(t.length);return e.startsWith(t)&&(""===o||"/"===o||"?"===o||"#"===o)}function Pe(e){const t=new URL(e);return""!==t.hash&&location.origin===t.origin&&location.pathname===t.pathname&&location.search===t.search}function Le(e,t){const n=new URL(e),o=new URL(t);return n.protocol===o.protocol&&n.host===o.host&&n.port===o.port&&n.pathname===o.pathname}function Ue(e){const t=e.indexOf("#");t!==e.length-1&&Be(e.substring(t+1))}function Be(e){document.getElementById(e)?.scrollIntoView()}function Oe(){return void 0!==Ie}function $e(e,t){if(!Ie)throw new Error("No enhanced programmatic navigation handler has been attached");Ie(e,t)}function Fe(e){return Te=Te||document.createElement("a"),Te.href=e,Te.href}function He(){return void 0!==Ee}function We(){return Ee}let je=!1,ze=0,qe=0;const Je=new Map;let Ve=async function(e){et();const t=rt();if(t?.hasLocationChangingEventListeners){const n=e.state?._index??0,o=e.state?.userState,r=n-ze,i=location.href;if(await Ze(-r),!await tt(i,o,!1,t))return;await Ze(r)}await nt(!0)},Ke=null;const Xe={listenForNavigationEvents:function(e,t,n){Je.set(e,{rendererId:e,hasLocationChangingEventListeners:!1,locationChanged:t,locationChanging:n}),je||(je=!0,window.addEventListener("popstate",ot),ze=history.state?._index??0,ke=(e,t)=>{nt(t,e)})},enableNavigationInterception:function(e){if(void 0!==Ee&&Ee!==e)throw new Error("Only one interactive runtime may enable navigation interception at a time.");Ee=e},setHasLocationChangingListeners:function(e,t){const n=Je.get(e);if(!n)throw new Error(`Renderer with ID '${e}' is not listening for navigation events`);n.hasLocationChangingEventListeners=t},endLocationChanging:function(e,t){Ke&&e===qe&&(Ke(t),Ke=null)},navigateTo:function(e,t){Ge(e,t,!0)},refresh:function(e){!e&&Oe()?$e(location.href,!0):location.reload()},getBaseURI:()=>document.baseURI,getLocationHref:()=>location.href,scrollToElement:Be};function Ge(e,t,n=!1){const o=Fe(e);!t.forceLoad&&Me(o)?it()?Ye(o,!1,t.replaceHistoryEntry,t.historyEntryState,n):$e(o,t.replaceHistoryEntry):function(e,t){if(location.href===e){const t=e+"?";history.replaceState(null,"",t),location.replace(e)}else t?location.replace(e):location.href=e}(e,t.replaceHistoryEntry)}async function Ye(e,t,n,o=void 0,r=!1){if(et(),Pe(e))return Qe(e,n,o),void Ue(e);const i=rt();(r||!i?.hasLocationChangingEventListeners||await tt(e,o,t,i))&&(Re=!0,Qe(e,n,o),await nt(t))}function Qe(e,t,n=void 0){t?history.replaceState({userState:n,_index:ze},"",e):(ze++,history.pushState({userState:n,_index:ze},"",e))}function Ze(e){return new Promise((t=>{const n=Ve;Ve=()=>{Ve=n,t()},history.go(e)}))}function et(){Ke&&(Ke(!1),Ke=null)}function tt(e,t,n,o){return new Promise((r=>{et(),qe++,Ke=r,o.locationChanging(qe,e,t,n)}))}async function nt(e,t){const n=t??location.href;await Promise.all(Array.from(Je,(async([t,o])=>{T(t)&&await o.locationChanged(n,history.state?.userState,e)})))}async function ot(e){Ve&&it()&&await Ve(e),ze=history.state?._index??0}function rt(){const e=We();if(void 0!==e)return Je.get(e)}function it(){return He()||!Oe()}const st={focus:function(e,t){if(e instanceof HTMLElement)e.focus({preventScroll:t});else{if(!(e instanceof SVGElement))throw new Error("Unable to focus an invalid element.");if(!e.hasAttribute("tabindex"))throw new Error("Unable to focus an SVG element that does not have a tabindex.");e.focus({preventScroll:t})}},focusBySelector:function(e){const t=document.querySelector(e);t&&(t.hasAttribute("tabindex")||(t.tabIndex=-1),t.focus({preventScroll:!0}))}},at={init:function(e,t,n,o=50){const r=lt(t);(r||document.documentElement).style.overflowAnchor="none";const i=document.createRange();u(n.parentElement)&&(t.style.display="table-row",n.style.display="table-row");const s=new IntersectionObserver((function(o){o.forEach((o=>{if(!o.isIntersecting)return;i.setStartAfter(t),i.setEndBefore(n);const r=i.getBoundingClientRect().height,s=o.rootBounds?.height;o.target===t?e.invokeMethodAsync("OnSpacerBeforeVisible",o.intersectionRect.top-o.boundingClientRect.top,r,s):o.target===n&&n.offsetHeight>0&&e.invokeMethodAsync("OnSpacerAfterVisible",o.boundingClientRect.bottom-o.intersectionRect.bottom,r,s)}))}),{root:r,rootMargin:`${o}px`});s.observe(t),s.observe(n);const a=d(t),c=d(n),{observersByDotNetObjectId:l,id:h}=ht(e);function d(e){const t={attributes:!0},n=new MutationObserver(((n,o)=>{u(e.parentElement)&&(o.disconnect(),e.style.display="table-row",o.observe(e,t)),s.unobserve(e),s.observe(e)}));return n.observe(e,t),n}function u(e){return null!==e&&(e instanceof HTMLTableElement&&""===e.style.display||"table"===e.style.display||e instanceof HTMLTableSectionElement&&""===e.style.display||"table-row-group"===e.style.display)}l[h]={intersectionObserver:s,mutationObserverBefore:a,mutationObserverAfter:c}},dispose:function(e){const{observersByDotNetObjectId:t,id:n}=ht(e),o=t[n];o&&(o.intersectionObserver.disconnect(),o.mutationObserverBefore.disconnect(),o.mutationObserverAfter.disconnect(),e.dispose(),delete t[n])}},ct=Symbol();function lt(e){return e&&e!==document.body&&e!==document.documentElement?"visible"!==getComputedStyle(e).overflowY?e:lt(e.parentElement):null}function ht(e){const t=e._callDispatcher,n=e._id;return t[ct]??={},{observersByDotNetObjectId:t[ct],id:n}}const dt={getAndRemoveExistingTitle:function(){const e=document.head?document.head.getElementsByTagName("title"):[];if(0===e.length)return null;let t=null;for(let n=e.length-1;n>=0;n--){const o=e[n],r=o.previousSibling;r instanceof Comment&&null!==V(r)||(null===t&&(t=o.textContent),o.parentNode?.removeChild(o))}return t}},ut={init:function(e,t){t._blazorInputFileNextFileId=0,t.addEventListener("click",(function(){t.value=""})),t.addEventListener("change",(function(){t._blazorFilesById={};const n=Array.prototype.map.call(t.files,(function(e){const n={id:++t._blazorInputFileNextFileId,lastModified:new Date(e.lastModified).toISOString(),name:e.name,size:e.size,contentType:e.type,readPromise:void 0,arrayBuffer:void 0,blob:e};return t._blazorFilesById[n.id]=n,n}));e.invokeMethodAsync("NotifyChange",n)}))},toImageFile:async function(e,t,n,o,r){const i=pt(e,t),s=await new Promise((function(e){const t=new Image;t.onload=function(){URL.revokeObjectURL(t.src),e(t)},t.onerror=function(){t.onerror=null,URL.revokeObjectURL(t.src)},t.src=URL.createObjectURL(i.blob)})),a=await new Promise((function(e){const t=Math.min(1,o/s.width),i=Math.min(1,r/s.height),a=Math.min(t,i),c=document.createElement("canvas");c.width=Math.round(s.width*a),c.height=Math.round(s.height*a),c.getContext("2d")?.drawImage(s,0,0,c.width,c.height),c.toBlob(e,n)})),c={id:++e._blazorInputFileNextFileId,lastModified:i.lastModified,name:i.name,size:a?.size||0,contentType:n,blob:a||i.blob};return e._blazorFilesById[c.id]=c,c},readFileData:async function(e,t){return pt(e,t).blob}};function pt(e,t){const n=e._blazorFilesById[t];if(!n)throw new Error(`There is no file with ID ${t}. The file list may have changed. See https://aka.ms/aspnet/blazor-input-file-multiple-selections.`);return n}const ft=new Set,gt={enableNavigationPrompt:function(e){0===ft.size&&window.addEventListener("beforeunload",mt),ft.add(e)},disableNavigationPrompt:function(e){ft.delete(e),0===ft.size&&window.removeEventListener("beforeunload",mt)}};function mt(e){e.preventDefault(),e.returnValue=!0}async function yt(e,t,n){return e instanceof Blob?await async function(e,t,n){const o=e.slice(t,t+n),r=await o.arrayBuffer();return new Uint8Array(r)}(e,t,n):function(e,t,n){return new Uint8Array(e.buffer,e.byteOffset+t,n)}(e,t,n)}const vt=new Map,wt={navigateTo:function(e,t,n=!1){Ge(e,t instanceof Object?t:{forceLoad:t,replaceHistoryEntry:n})},registerCustomEventType:function(e,t){if(!t)throw new Error("The options parameter is required.");if(i.has(e))throw new Error(`The event '${e}' is already registered.`);if(t.browserEventName){const n=s.get(t.browserEventName);n?n.push(e):s.set(t.browserEventName,[e]),a.forEach((n=>n(e,t.browserEventName)))}i.set(e,t)},rootComponents:v,runtime:{},_internal:{navigationManager:Xe,domWrapper:st,Virtualize:at,PageTitle:dt,InputFile:ut,NavigationLock:gt,getJSDataStreamChunk:yt,attachWebRendererInterop:k}};var bt;window.Blazor=wt,function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(bt||(bt={})),class e{static{this.instance=new e}log(e,t){}};let _t=class{constructor(e){this.minLevel=e}log(e,t){if(e>=this.minLevel){const n=`[${(new Date).toISOString()}] ${bt[e]}: ${t}`;switch(e){case bt.Critical:case bt.Error:console.error(n);break;case bt.Warning:console.warn(n);break;case bt.Information:console.info(n);break;default:console.log(n)}}}};function St(e,t){switch(t){case"webassembly":return Rt(e,"webassembly");case"server":return function(e){return Rt(e,"server").sort(((e,t)=>e.sequence-t.sequence))}(e);case"auto":return Rt(e,"auto")}}const Ct=/^\s*Blazor-Server-Component-State:(?<state>[a-zA-Z0-9+/=]+)$/,Et=/^\s*Blazor-WebAssembly-Component-State:(?<state>[a-zA-Z0-9+/=]+)$/,It=/^\s*Blazor-Web-Initializers:(?<initializers>[a-zA-Z0-9+/=]+)$/;function kt(e){return Tt(e,Ct)}function Tt(e,t,n="state"){if(e.nodeType===Node.COMMENT_NODE){const o=e.textContent||"",r=t.exec(o),i=r&&r.groups&&r.groups[n];return i&&e.parentNode?.removeChild(e),i}if(!e.hasChildNodes())return;const o=e.childNodes;for(let e=0;e<o.length;e++){const r=Tt(o[e],t,n);if(r)return r}}function Rt(e,t){const n=[],o=new Lt(e.childNodes);for(;o.next()&&o.currentElement;){const e=Dt(o,t);if(e)n.push(e);else if(o.currentElement.hasChildNodes()){const e=Rt(o.currentElement,t);for(let t=0;t<e.length;t++){const o=e[t];n.push(o)}}}return n}const At=new RegExp(/^\s*Blazor:[^{]*(?<descriptor>.*)$/);function Dt(e,t){const n=e.currentElement;var o,r,i;if(n&&n.nodeType===Node.COMMENT_NODE&&n.textContent){const s=At.exec(n.textContent),a=s&&s.groups&&s.groups.descriptor;if(!a)return;!function(e){if(e.parentNode instanceof Document)throw new Error("Root components cannot be marked as interactive. The <html> element must be rendered statically so that scripts are not evaluated multiple times.")}(n);try{const s=function(e){const t=JSON.parse(e),{type:n}=t;if("server"!==n&&"webassembly"!==n&&"auto"!==n)throw new Error(`Invalid component type '${n}'.`);return t}(a),c=function(e,t,n){const{prerenderId:o}=e;if(o){for(;n.next()&&n.currentElement;){const e=n.currentElement;if(e.nodeType!==Node.COMMENT_NODE)continue;if(!e.textContent)continue;const t=At.exec(e.textContent),r=t&&t[1];if(r)return Pt(r,o),e}throw new Error(`Could not find an end component comment for '${t}'.`)}}(s,n,e);if(t!==s.type)return;switch(s.type){case"webassembly":return r=n,i=c,Mt(o=s),{...o,uniqueId:xt++,start:r,end:i};case"server":return function(e,t,n){return Nt(e),{...e,uniqueId:xt++,start:t,end:n}}(s,n,c);case"auto":return function(e,t,n){return Nt(e),Mt(e),{...e,uniqueId:xt++,start:t,end:n}}(s,n,c)}}catch(e){throw new Error(`Found malformed component comment at ${n.textContent}`)}}}let xt=0;function Nt(e){const{descriptor:t,sequence:n}=e;if(!t)throw new Error("descriptor must be defined when using a descriptor.");if(void 0===n)throw new Error("sequence must be defined when using a descriptor.");if(!Number.isInteger(n))throw new Error(`Error parsing the sequence '${n}' for component '${JSON.stringify(e)}'`)}function Mt(e){const{assembly:t,typeName:n}=e;if(!t)throw new Error("assembly must be defined when using a descriptor.");if(!n)throw new Error("typeName must be defined when using a descriptor.");e.parameterDefinitions=e.parameterDefinitions&&atob(e.parameterDefinitions),e.parameterValues=e.parameterValues&&atob(e.parameterValues)}function Pt(e,t){const n=JSON.parse(e);if(1!==Object.keys(n).length)throw new Error(`Invalid end of component comment: '${e}'`);const o=n.prerenderId;if(!o)throw new Error(`End of component comment must have a value for the prerendered property: '${e}'`);if(o!==t)throw new Error(`End of component comment prerendered property must match the start comment prerender id: '${t}', '${o}'`)}class Lt{constructor(e){this.childNodes=e,this.currentIndex=-1,this.length=e.length}next(){return this.currentIndex++,this.currentIndex<this.length?(this.currentElement=this.childNodes[this.currentIndex],!0):(this.currentElement=void 0,!1)}}function Ut(e){return{...e,start:void 0,end:void 0}}function Bt(e,t){return e.type===t.type&&(n=e.key,o=t.key,!(!n||!o)&&n.locationHash===o.locationHash&&n.formattedComponentKey===o.formattedComponentKey);var n,o}class Ot extends Error{constructor(e,t){const n=new.target.prototype;super(`${e}: Status code '${t}'`),this.statusCode=t,this.__proto__=n}}class $t extends Error{constructor(e="A timeout occurred."){const t=new.target.prototype;super(e),this.__proto__=t}}class Ft extends Error{constructor(e="An abort occurred."){const t=new.target.prototype;super(e),this.__proto__=t}}class Ht extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.transport=t,this.errorType="UnsupportedTransportError",this.__proto__=n}}class Wt extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.transport=t,this.errorType="DisabledTransportError",this.__proto__=n}}class jt extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.transport=t,this.errorType="FailedToStartTransportError",this.__proto__=n}}class zt extends Error{constructor(e){const t=new.target.prototype;super(e),this.errorType="FailedToNegotiateWithServerError",this.__proto__=t}}class qt extends Error{constructor(e,t){const n=new.target.prototype;super(e),this.innerErrors=t,this.__proto__=n}}class Jt{constructor(e,t,n){this.statusCode=e,this.statusText=t,this.content=n}}class Vt{get(e,t){return this.send({...t,method:"GET",url:e})}post(e,t){return this.send({...t,method:"POST",url:e})}delete(e,t){return this.send({...t,method:"DELETE",url:e})}getCookieString(e){return""}}var Kt;!function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(Kt||(Kt={}));class Xt{constructor(){}log(e,t){}}Xt.instance=new Xt;const Gt="9.0.0-dev";class Yt{static isRequired(e,t){if(null==e)throw new Error(`The '${t}' argument is required.`)}static isNotEmpty(e,t){if(!e||e.match(/^\s*$/))throw new Error(`The '${t}' argument should not be empty.`)}static isIn(e,t,n){if(!(e in t))throw new Error(`Unknown ${n} value: ${e}.`)}}class Qt{static get isBrowser(){return"object"==typeof window&&"object"==typeof window.document}static get isWebWorker(){return"object"==typeof self&&"importScripts"in self}static get isReactNative(){return"object"==typeof window&&void 0===window.document}static get isNode(){return"undefined"!=typeof process&&process.release&&"node"===process.release.name}}function Zt(e,t){let n="";return en(e)?(n=`Binary data of length ${e.byteLength}`,t&&(n+=`. Content: '${function(e){const t=new Uint8Array(e);let n="";return t.forEach((e=>{n+=`0x${e<16?"0":""}${e.toString(16)} `})),n.substr(0,n.length-1)}(e)}'`)):"string"==typeof e&&(n=`String data of length ${e.length}`,t&&(n+=`. Content: '${e}'`)),n}function en(e){return e&&"undefined"!=typeof ArrayBuffer&&(e instanceof ArrayBuffer||e.constructor&&"ArrayBuffer"===e.constructor.name)}async function tn(e,t,n,o,r,i){const s={},[a,c]=rn();s[a]=c,e.log(Kt.Trace,`(${t} transport) sending data. ${Zt(r,i.logMessageContent)}.`);const l=en(r)?"arraybuffer":"text",h=await n.post(o,{content:r,headers:{...s,...i.headers},responseType:l,timeout:i.timeout,withCredentials:i.withCredentials});e.log(Kt.Trace,`(${t} transport) request complete. Response status: ${h.statusCode}.`)}class nn{constructor(e,t){this._subject=e,this._observer=t}dispose(){const e=this._subject.observers.indexOf(this._observer);e>-1&&this._subject.observers.splice(e,1),0===this._subject.observers.length&&this._subject.cancelCallback&&this._subject.cancelCallback().catch((e=>{}))}}class on{constructor(e){this._minLevel=e,this.out=console}log(e,t){if(e>=this._minLevel){const n=`[${(new Date).toISOString()}] ${Kt[e]}: ${t}`;switch(e){case Kt.Critical:case Kt.Error:this.out.error(n);break;case Kt.Warning:this.out.warn(n);break;case Kt.Information:this.out.info(n);break;default:this.out.log(n)}}}}function rn(){return["X-SignalR-User-Agent",sn(Gt,"","Browser",void 0)]}function sn(e,t,n,o){let r="Microsoft SignalR/";const i=e.split(".");return r+=`${i[0]}.${i[1]}`,r+=` (${e}; `,r+=t&&""!==t?`${t}; `:"Unknown OS; ",r+=`${n}`,r+=o?`; ${o}`:"; Unknown Runtime Version",r+=")",r}function an(e){return e.stack?e.stack:e.message?e.message:`${e}`}class cn extends Vt{constructor(e){if(super(),this._logger=e,"undefined"==typeof fetch){const e="function"==typeof __webpack_require__?__non_webpack_require__:require;this._jar=new(e("tough-cookie").CookieJar),"undefined"==typeof fetch?this._fetchType=e("node-fetch"):this._fetchType=fetch,this._fetchType=e("fetch-cookie")(this._fetchType,this._jar)}else this._fetchType=fetch.bind(function(){if("undefined"!=typeof globalThis)return globalThis;if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("could not find global")}());if("undefined"==typeof AbortController){const e="function"==typeof __webpack_require__?__non_webpack_require__:require;this._abortControllerType=e("abort-controller")}else this._abortControllerType=AbortController}async send(e){if(e.abortSignal&&e.abortSignal.aborted)throw new Ft;if(!e.method)throw new Error("No method defined.");if(!e.url)throw new Error("No url defined.");const t=new this._abortControllerType;let n;e.abortSignal&&(e.abortSignal.onabort=()=>{t.abort(),n=new Ft});let o,r=null;if(e.timeout){const o=e.timeout;r=setTimeout((()=>{t.abort(),this._logger.log(Kt.Warning,"Timeout from HTTP request."),n=new $t}),o)}""===e.content&&(e.content=void 0),e.content&&(e.headers=e.headers||{},en(e.content)?e.headers["Content-Type"]="application/octet-stream":e.headers["Content-Type"]="text/plain;charset=UTF-8");try{o=await this._fetchType(e.url,{body:e.content,cache:"no-cache",credentials:!0===e.withCredentials?"include":"same-origin",headers:{"X-Requested-With":"XMLHttpRequest",...e.headers},method:e.method,mode:"cors",redirect:"follow",signal:t.signal})}catch(e){if(n)throw n;throw this._logger.log(Kt.Warning,`Error from HTTP request. ${e}.`),e}finally{r&&clearTimeout(r),e.abortSignal&&(e.abortSignal.onabort=null)}if(!o.ok){const e=await ln(o,"text");throw new Ot(e||o.statusText,o.status)}const i=ln(o,e.responseType),s=await i;return new Jt(o.status,o.statusText,s)}getCookieString(e){return""}}function ln(e,t){let n;switch(t){case"arraybuffer":n=e.arrayBuffer();break;case"text":default:n=e.text();break;case"blob":case"document":case"json":throw new Error(`${t} is not supported.`)}return n}class hn extends Vt{constructor(e){super(),this._logger=e}send(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new Ft):e.method?e.url?new Promise(((t,n)=>{const o=new XMLHttpRequest;o.open(e.method,e.url,!0),o.withCredentials=void 0===e.withCredentials||e.withCredentials,o.setRequestHeader("X-Requested-With","XMLHttpRequest"),""===e.content&&(e.content=void 0),e.content&&(en(e.content)?o.setRequestHeader("Content-Type","application/octet-stream"):o.setRequestHeader("Content-Type","text/plain;charset=UTF-8"));const r=e.headers;r&&Object.keys(r).forEach((e=>{o.setRequestHeader(e,r[e])})),e.responseType&&(o.responseType=e.responseType),e.abortSignal&&(e.abortSignal.onabort=()=>{o.abort(),n(new Ft)}),e.timeout&&(o.timeout=e.timeout),o.onload=()=>{e.abortSignal&&(e.abortSignal.onabort=null),o.status>=200&&o.status<300?t(new Jt(o.status,o.statusText,o.response||o.responseText)):n(new Ot(o.response||o.responseText||o.statusText,o.status))},o.onerror=()=>{this._logger.log(Kt.Warning,`Error from HTTP request. ${o.status}: ${o.statusText}.`),n(new Ot(o.statusText,o.status))},o.ontimeout=()=>{this._logger.log(Kt.Warning,"Timeout from HTTP request."),n(new $t)},o.send(e.content)})):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))}}class dn extends Vt{constructor(e){if(super(),"undefined"!=typeof fetch)this._httpClient=new cn(e);else{if("undefined"==typeof XMLHttpRequest)throw new Error("No usable HttpClient found.");this._httpClient=new hn(e)}}send(e){return e.abortSignal&&e.abortSignal.aborted?Promise.reject(new Ft):e.method?e.url?this._httpClient.send(e):Promise.reject(new Error("No url defined.")):Promise.reject(new Error("No method defined."))}getCookieString(e){return this._httpClient.getCookieString(e)}}class un{static write(e){return`${e}${un.RecordSeparator}`}static parse(e){if(e[e.length-1]!==un.RecordSeparator)throw new Error("Message is incomplete.");const t=e.split(un.RecordSeparator);return t.pop(),t}}un.RecordSeparatorCode=30,un.RecordSeparator=String.fromCharCode(un.RecordSeparatorCode);class pn{writeHandshakeRequest(e){return un.write(JSON.stringify(e))}parseHandshakeResponse(e){let t,n;if(en(e)){const o=new Uint8Array(e),r=o.indexOf(un.RecordSeparatorCode);if(-1===r)throw new Error("Message is incomplete.");const i=r+1;t=String.fromCharCode.apply(null,Array.prototype.slice.call(o.slice(0,i))),n=o.byteLength>i?o.slice(i).buffer:null}else{const o=e,r=o.indexOf(un.RecordSeparator);if(-1===r)throw new Error("Message is incomplete.");const i=r+1;t=o.substring(0,i),n=o.length>i?o.substring(i):null}const o=un.parse(t),r=JSON.parse(o[0]);if(r.type)throw new Error("Expected a handshake response from the server.");return[n,r]}}var fn,gn;!function(e){e[e.Invocation=1]="Invocation",e[e.StreamItem=2]="StreamItem",e[e.Completion=3]="Completion",e[e.StreamInvocation=4]="StreamInvocation",e[e.CancelInvocation=5]="CancelInvocation",e[e.Ping=6]="Ping",e[e.Close=7]="Close",e[e.Ack=8]="Ack",e[e.Sequence=9]="Sequence"}(fn||(fn={}));class mn{constructor(){this.observers=[]}next(e){for(const t of this.observers)t.next(e)}error(e){for(const t of this.observers)t.error&&t.error(e)}complete(){for(const e of this.observers)e.complete&&e.complete()}subscribe(e){return this.observers.push(e),new nn(this,e)}}class yn{constructor(e,t,n){this._bufferSize=1e5,this._messages=[],this._totalMessageCount=0,this._waitForSequenceMessage=!1,this._nextReceivingSequenceId=1,this._latestReceivedSequenceId=0,this._bufferedByteCount=0,this._reconnectInProgress=!1,this._protocol=e,this._connection=t,this._bufferSize=n}async _send(e){const t=this._protocol.writeMessage(e);let n=Promise.resolve();if(this._isInvocationMessage(e)){this._totalMessageCount++;let e=()=>{},o=()=>{};en(t)?this._bufferedByteCount+=t.byteLength:this._bufferedByteCount+=t.length,this._bufferedByteCount>=this._bufferSize&&(n=new Promise(((t,n)=>{e=t,o=n}))),this._messages.push(new vn(t,this._totalMessageCount,e,o))}try{this._reconnectInProgress||await this._connection.send(t)}catch{this._disconnected()}await n}_ack(e){let t=-1;for(let n=0;n<this._messages.length;n++){const o=this._messages[n];if(o._id<=e.sequenceId)t=n,en(o._message)?this._bufferedByteCount-=o._message.byteLength:this._bufferedByteCount-=o._message.length,o._resolver();else{if(!(this._bufferedByteCount<this._bufferSize))break;o._resolver()}}-1!==t&&(this._messages=this._messages.slice(t+1))}_shouldProcessMessage(e){if(this._waitForSequenceMessage)return e.type===fn.Sequence&&(this._waitForSequenceMessage=!1,!0);if(!this._isInvocationMessage(e))return!0;const t=this._nextReceivingSequenceId;return this._nextReceivingSequenceId++,t<=this._latestReceivedSequenceId?(t===this._latestReceivedSequenceId&&this._ackTimer(),!1):(this._latestReceivedSequenceId=t,this._ackTimer(),!0)}_resetSequence(e){e.sequenceId>this._nextReceivingSequenceId?this._connection.stop(new Error("Sequence ID greater than amount of messages we've received.")):this._nextReceivingSequenceId=e.sequenceId}_disconnected(){this._reconnectInProgress=!0,this._waitForSequenceMessage=!0}async _resend(){const e=0!==this._messages.length?this._messages[0]._id:this._totalMessageCount+1;await this._connection.send(this._protocol.writeMessage({type:fn.Sequence,sequenceId:e}));const t=this._messages;for(const e of t)await this._connection.send(e._message);this._reconnectInProgress=!1}_dispose(e){null!=e||(e=new Error("Unable to reconnect to server."));for(const t of this._messages)t._rejector(e)}_isInvocationMessage(e){switch(e.type){case fn.Invocation:case fn.StreamItem:case fn.Completion:case fn.StreamInvocation:case fn.CancelInvocation:return!0;case fn.Close:case fn.Sequence:case fn.Ping:case fn.Ack:return!1}}_ackTimer(){void 0===this._ackTimerHandle&&(this._ackTimerHandle=setTimeout((async()=>{try{this._reconnectInProgress||await this._connection.send(this._protocol.writeMessage({type:fn.Ack,sequenceId:this._latestReceivedSequenceId}))}catch{}clearTimeout(this._ackTimerHandle),this._ackTimerHandle=void 0}),1e3))}}class vn{constructor(e,t,n,o){this._message=e,this._id=t,this._resolver=n,this._rejector=o}}!function(e){e.Disconnected="Disconnected",e.Connecting="Connecting",e.Connected="Connected",e.Disconnecting="Disconnecting",e.Reconnecting="Reconnecting"}(gn||(gn={}));class wn{static create(e,t,n,o,r,i,s){return new wn(e,t,n,o,r,i,s)}constructor(e,t,n,o,r,i,s){this._nextKeepAlive=0,this._freezeEventListener=()=>{this._logger.log(Kt.Warning,"The page is being frozen, this will likely lead to the connection being closed and messages being lost. For more information see the docs at https://learn.microsoft.com/aspnet/core/signalr/javascript-client#bsleep")},Yt.isRequired(e,"connection"),Yt.isRequired(t,"logger"),Yt.isRequired(n,"protocol"),this.serverTimeoutInMilliseconds=null!=r?r:3e4,this.keepAliveIntervalInMilliseconds=null!=i?i:15e3,this._statefulReconnectBufferSize=null!=s?s:1e5,this._logger=t,this._protocol=n,this.connection=e,this._reconnectPolicy=o,this._handshakeProtocol=new pn,this.connection.onreceive=e=>this._processIncomingData(e),this.connection.onclose=e=>this._connectionClosed(e),this._callbacks={},this._methods={},this._closedCallbacks=[],this._reconnectingCallbacks=[],this._reconnectedCallbacks=[],this._invocationId=0,this._receivedHandshakeResponse=!1,this._connectionState=gn.Disconnected,this._connectionStarted=!1,this._cachedPingMessage=this._protocol.writeMessage({type:fn.Ping})}get state(){return this._connectionState}get connectionId(){return this.connection&&this.connection.connectionId||null}get baseUrl(){return this.connection.baseUrl||""}set baseUrl(e){if(this._connectionState!==gn.Disconnected&&this._connectionState!==gn.Reconnecting)throw new Error("The HubConnection must be in the Disconnected or Reconnecting state to change the url.");if(!e)throw new Error("The HubConnection url must be a valid url.");this.connection.baseUrl=e}start(){return this._startPromise=this._startWithStateTransitions(),this._startPromise}async _startWithStateTransitions(){if(this._connectionState!==gn.Disconnected)return Promise.reject(new Error("Cannot start a HubConnection that is not in the 'Disconnected' state."));this._connectionState=gn.Connecting,this._logger.log(Kt.Debug,"Starting HubConnection.");try{await this._startInternal(),Qt.isBrowser&&window.document.addEventListener("freeze",this._freezeEventListener),this._connectionState=gn.Connected,this._connectionStarted=!0,this._logger.log(Kt.Debug,"HubConnection connected successfully.")}catch(e){return this._connectionState=gn.Disconnected,this._logger.log(Kt.Debug,`HubConnection failed to start successfully because of error '${e}'.`),Promise.reject(e)}}async _startInternal(){this._stopDuringStartError=void 0,this._receivedHandshakeResponse=!1;const e=new Promise(((e,t)=>{this._handshakeResolver=e,this._handshakeRejecter=t}));await this.connection.start(this._protocol.transferFormat);try{let t=this._protocol.version;this.connection.features.reconnect||(t=1);const n={protocol:this._protocol.name,version:t};if(this._logger.log(Kt.Debug,"Sending handshake request."),await this._sendMessage(this._handshakeProtocol.writeHandshakeRequest(n)),this._logger.log(Kt.Information,`Using HubProtocol '${this._protocol.name}'.`),this._cleanupTimeout(),this._resetTimeoutPeriod(),this._resetKeepAliveInterval(),await e,this._stopDuringStartError)throw this._stopDuringStartError;!!this.connection.features.reconnect&&(this._messageBuffer=new yn(this._protocol,this.connection,this._statefulReconnectBufferSize),this.connection.features.disconnected=this._messageBuffer._disconnected.bind(this._messageBuffer),this.connection.features.resend=()=>{if(this._messageBuffer)return this._messageBuffer._resend()}),this.connection.features.inherentKeepAlive||await this._sendMessage(this._cachedPingMessage)}catch(e){throw this._logger.log(Kt.Debug,`Hub handshake failed with error '${e}' during start(). Stopping HubConnection.`),this._cleanupTimeout(),this._cleanupPingTimer(),await this.connection.stop(e),e}}async stop(){const e=this._startPromise;this.connection.features.reconnect=!1,this._stopPromise=this._stopInternal(),await this._stopPromise;try{await e}catch(e){}}_stopInternal(e){if(this._connectionState===gn.Disconnected)return this._logger.log(Kt.Debug,`Call to HubConnection.stop(${e}) ignored because it is already in the disconnected state.`),Promise.resolve();if(this._connectionState===gn.Disconnecting)return this._logger.log(Kt.Debug,`Call to HttpConnection.stop(${e}) ignored because the connection is already in the disconnecting state.`),this._stopPromise;const t=this._connectionState;return this._connectionState=gn.Disconnecting,this._logger.log(Kt.Debug,"Stopping HubConnection."),this._reconnectDelayHandle?(this._logger.log(Kt.Debug,"Connection stopped during reconnect delay. Done reconnecting."),clearTimeout(this._reconnectDelayHandle),this._reconnectDelayHandle=void 0,this._completeClose(),Promise.resolve()):(t===gn.Connected&&this._sendCloseMessage(),this._cleanupTimeout(),this._cleanupPingTimer(),this._stopDuringStartError=e||new Ft("The connection was stopped before the hub handshake could complete."),this.connection.stop(e))}async _sendCloseMessage(){try{await this._sendWithProtocol(this._createCloseMessage())}catch{}}stream(e,...t){const[n,o]=this._replaceStreamingParams(t),r=this._createStreamInvocation(e,t,o);let i;const s=new mn;return s.cancelCallback=()=>{const e=this._createCancelInvocation(r.invocationId);return delete this._callbacks[r.invocationId],i.then((()=>this._sendWithProtocol(e)))},this._callbacks[r.invocationId]=(e,t)=>{t?s.error(t):e&&(e.type===fn.Completion?e.error?s.error(new Error(e.error)):s.complete():s.next(e.item))},i=this._sendWithProtocol(r).catch((e=>{s.error(e),delete this._callbacks[r.invocationId]})),this._launchStreams(n,i),s}_sendMessage(e){return this._resetKeepAliveInterval(),this.connection.send(e)}_sendWithProtocol(e){return this._messageBuffer?this._messageBuffer._send(e):this._sendMessage(this._protocol.writeMessage(e))}send(e,...t){const[n,o]=this._replaceStreamingParams(t),r=this._sendWithProtocol(this._createInvocation(e,t,!0,o));return this._launchStreams(n,r),r}invoke(e,...t){const[n,o]=this._replaceStreamingParams(t),r=this._createInvocation(e,t,!1,o);return new Promise(((e,t)=>{this._callbacks[r.invocationId]=(n,o)=>{o?t(o):n&&(n.type===fn.Completion?n.error?t(new Error(n.error)):e(n.result):t(new Error(`Unexpected message type: ${n.type}`)))};const o=this._sendWithProtocol(r).catch((e=>{t(e),delete this._callbacks[r.invocationId]}));this._launchStreams(n,o)}))}on(e,t){e&&t&&(e=e.toLowerCase(),this._methods[e]||(this._methods[e]=[]),-1===this._methods[e].indexOf(t)&&this._methods[e].push(t))}off(e,t){if(!e)return;e=e.toLowerCase();const n=this._methods[e];if(n)if(t){const o=n.indexOf(t);-1!==o&&(n.splice(o,1),0===n.length&&delete this._methods[e])}else delete this._methods[e]}onclose(e){e&&this._closedCallbacks.push(e)}onreconnecting(e){e&&this._reconnectingCallbacks.push(e)}onreconnected(e){e&&this._reconnectedCallbacks.push(e)}_processIncomingData(e){if(this._cleanupTimeout(),this._receivedHandshakeResponse||(e=this._processHandshakeResponse(e),this._receivedHandshakeResponse=!0),e){const t=this._protocol.parseMessages(e,this._logger);for(const e of t)if(!this._messageBuffer||this._messageBuffer._shouldProcessMessage(e))switch(e.type){case fn.Invocation:this._invokeClientMethod(e).catch((e=>{this._logger.log(Kt.Error,`Invoke client method threw error: ${an(e)}`)}));break;case fn.StreamItem:case fn.Completion:{const t=this._callbacks[e.invocationId];if(t){e.type===fn.Completion&&delete this._callbacks[e.invocationId];try{t(e)}catch(e){this._logger.log(Kt.Error,`Stream callback threw error: ${an(e)}`)}}break}case fn.Ping:break;case fn.Close:{this._logger.log(Kt.Information,"Close message received from server.");const t=e.error?new Error("Server returned an error on close: "+e.error):void 0;!0===e.allowReconnect?this.connection.stop(t):this._stopPromise=this._stopInternal(t);break}case fn.Ack:this._messageBuffer&&this._messageBuffer._ack(e);break;case fn.Sequence:this._messageBuffer&&this._messageBuffer._resetSequence(e);break;default:this._logger.log(Kt.Warning,`Invalid message type: ${e.type}.`)}}this._resetTimeoutPeriod()}_processHandshakeResponse(e){let t,n;try{[n,t]=this._handshakeProtocol.parseHandshakeResponse(e)}catch(e){const t="Error parsing handshake response: "+e;this._logger.log(Kt.Error,t);const n=new Error(t);throw this._handshakeRejecter(n),n}if(t.error){const e="Server returned handshake error: "+t.error;this._logger.log(Kt.Error,e);const n=new Error(e);throw this._handshakeRejecter(n),n}return this._logger.log(Kt.Debug,"Server handshake complete."),this._handshakeResolver(),n}_resetKeepAliveInterval(){this.connection.features.inherentKeepAlive||(this._nextKeepAlive=(new Date).getTime()+this.keepAliveIntervalInMilliseconds,this._cleanupPingTimer())}_resetTimeoutPeriod(){if(!(this.connection.features&&this.connection.features.inherentKeepAlive||(this._timeoutHandle=setTimeout((()=>this.serverTimeout()),this.serverTimeoutInMilliseconds),void 0!==this._pingServerHandle))){let e=this._nextKeepAlive-(new Date).getTime();e<0&&(e=0),this._pingServerHandle=setTimeout((async()=>{if(this._connectionState===gn.Connected)try{await this._sendMessage(this._cachedPingMessage)}catch{this._cleanupPingTimer()}}),e)}}serverTimeout(){this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server."))}async _invokeClientMethod(e){const t=e.target.toLowerCase(),n=this._methods[t];if(!n)return this._logger.log(Kt.Warning,`No client method with the name '${t}' found.`),void(e.invocationId&&(this._logger.log(Kt.Warning,`No result given for '${t}' method and invocation ID '${e.invocationId}'.`),await this._sendWithProtocol(this._createCompletionMessage(e.invocationId,"Client didn't provide a result.",null))));const o=n.slice(),r=!!e.invocationId;let i,s,a;for(const n of o)try{const o=i;i=await n.apply(this,e.arguments),r&&i&&o&&(this._logger.log(Kt.Error,`Multiple results provided for '${t}'. Sending error to server.`),a=this._createCompletionMessage(e.invocationId,"Client provided multiple results.",null)),s=void 0}catch(e){s=e,this._logger.log(Kt.Error,`A callback for the method '${t}' threw error '${e}'.`)}a?await this._sendWithProtocol(a):r?(s?a=this._createCompletionMessage(e.invocationId,`${s}`,null):void 0!==i?a=this._createCompletionMessage(e.invocationId,null,i):(this._logger.log(Kt.Warning,`No result given for '${t}' method and invocation ID '${e.invocationId}'.`),a=this._createCompletionMessage(e.invocationId,"Client didn't provide a result.",null)),await this._sendWithProtocol(a)):i&&this._logger.log(Kt.Error,`Result given for '${t}' method but server is not expecting a result.`)}_connectionClosed(e){this._logger.log(Kt.Debug,`HubConnection.connectionClosed(${e}) called while in state ${this._connectionState}.`),this._stopDuringStartError=this._stopDuringStartError||e||new Ft("The underlying connection was closed before the hub handshake could complete."),this._handshakeResolver&&this._handshakeResolver(),this._cancelCallbacksWithError(e||new Error("Invocation canceled due to the underlying connection being closed.")),this._cleanupTimeout(),this._cleanupPingTimer(),this._connectionState===gn.Disconnecting?this._completeClose(e):this._connectionState===gn.Connected&&this._reconnectPolicy?this._reconnect(e):this._connectionState===gn.Connected&&this._completeClose(e)}_completeClose(e){if(this._connectionStarted){this._connectionState=gn.Disconnected,this._connectionStarted=!1,this._messageBuffer&&(this._messageBuffer._dispose(null!=e?e:new Error("Connection closed.")),this._messageBuffer=void 0),Qt.isBrowser&&window.document.removeEventListener("freeze",this._freezeEventListener);try{this._closedCallbacks.forEach((t=>t.apply(this,[e])))}catch(t){this._logger.log(Kt.Error,`An onclose callback called with error '${e}' threw error '${t}'.`)}}}async _reconnect(e){const t=Date.now();let n=0,o=void 0!==e?e:new Error("Attempting to reconnect due to a unknown error."),r=this._getNextRetryDelay(n++,0,o);if(null===r)return this._logger.log(Kt.Debug,"Connection not reconnecting because the IRetryPolicy returned null on the first reconnect attempt."),void this._completeClose(e);if(this._connectionState=gn.Reconnecting,e?this._logger.log(Kt.Information,`Connection reconnecting because of error '${e}'.`):this._logger.log(Kt.Information,"Connection reconnecting."),0!==this._reconnectingCallbacks.length){try{this._reconnectingCallbacks.forEach((t=>t.apply(this,[e])))}catch(t){this._logger.log(Kt.Error,`An onreconnecting callback called with error '${e}' threw error '${t}'.`)}if(this._connectionState!==gn.Reconnecting)return void this._logger.log(Kt.Debug,"Connection left the reconnecting state in onreconnecting callback. Done reconnecting.")}for(;null!==r;){if(this._logger.log(Kt.Information,`Reconnect attempt number ${n} will start in ${r} ms.`),await new Promise((e=>{this._reconnectDelayHandle=setTimeout(e,r)})),this._reconnectDelayHandle=void 0,this._connectionState!==gn.Reconnecting)return void this._logger.log(Kt.Debug,"Connection left the reconnecting state during reconnect delay. Done reconnecting.");try{if(await this._startInternal(),this._connectionState=gn.Connected,this._logger.log(Kt.Information,"HubConnection reconnected successfully."),0!==this._reconnectedCallbacks.length)try{this._reconnectedCallbacks.forEach((e=>e.apply(this,[this.connection.connectionId])))}catch(e){this._logger.log(Kt.Error,`An onreconnected callback called with connectionId '${this.connection.connectionId}; threw error '${e}'.`)}return}catch(e){if(this._logger.log(Kt.Information,`Reconnect attempt failed because of error '${e}'.`),this._connectionState!==gn.Reconnecting)return this._logger.log(Kt.Debug,`Connection moved to the '${this._connectionState}' from the reconnecting state during reconnect attempt. Done reconnecting.`),void(this._connectionState===gn.Disconnecting&&this._completeClose());o=e instanceof Error?e:new Error(e.toString()),r=this._getNextRetryDelay(n++,Date.now()-t,o)}}this._logger.log(Kt.Information,`Reconnect retries have been exhausted after ${Date.now()-t} ms and ${n} failed attempts. Connection disconnecting.`),this._completeClose()}_getNextRetryDelay(e,t,n){try{return this._reconnectPolicy.nextRetryDelayInMilliseconds({elapsedMilliseconds:t,previousRetryCount:e,retryReason:n})}catch(n){return this._logger.log(Kt.Error,`IRetryPolicy.nextRetryDelayInMilliseconds(${e}, ${t}) threw error '${n}'.`),null}}_cancelCallbacksWithError(e){const t=this._callbacks;this._callbacks={},Object.keys(t).forEach((n=>{const o=t[n];try{o(null,e)}catch(t){this._logger.log(Kt.Error,`Stream 'error' callback called with '${e}' threw error: ${an(t)}`)}}))}_cleanupPingTimer(){this._pingServerHandle&&(clearTimeout(this._pingServerHandle),this._pingServerHandle=void 0)}_cleanupTimeout(){this._timeoutHandle&&clearTimeout(this._timeoutHandle)}_createInvocation(e,t,n,o){if(n)return 0!==o.length?{target:e,arguments:t,streamIds:o,type:fn.Invocation}:{target:e,arguments:t,type:fn.Invocation};{const n=this._invocationId;return this._invocationId++,0!==o.length?{target:e,arguments:t,invocationId:n.toString(),streamIds:o,type:fn.Invocation}:{target:e,arguments:t,invocationId:n.toString(),type:fn.Invocation}}}_launchStreams(e,t){if(0!==e.length){t||(t=Promise.resolve());for(const n in e)e[n].subscribe({complete:()=>{t=t.then((()=>this._sendWithProtocol(this._createCompletionMessage(n))))},error:e=>{let o;o=e instanceof Error?e.message:e&&e.toString?e.toString():"Unknown error",t=t.then((()=>this._sendWithProtocol(this._createCompletionMessage(n,o))))},next:e=>{t=t.then((()=>this._sendWithProtocol(this._createStreamItemMessage(n,e))))}})}}_replaceStreamingParams(e){const t=[],n=[];for(let o=0;o<e.length;o++){const r=e[o];if(this._isObservable(r)){const i=this._invocationId;this._invocationId++,t[i]=r,n.push(i.toString()),e.splice(o,1)}}return[t,n]}_isObservable(e){return e&&e.subscribe&&"function"==typeof e.subscribe}_createStreamInvocation(e,t,n){const o=this._invocationId;return this._invocationId++,0!==n.length?{target:e,arguments:t,invocationId:o.toString(),streamIds:n,type:fn.StreamInvocation}:{target:e,arguments:t,invocationId:o.toString(),type:fn.StreamInvocation}}_createCancelInvocation(e){return{invocationId:e,type:fn.CancelInvocation}}_createStreamItemMessage(e,t){return{invocationId:e,item:t,type:fn.StreamItem}}_createCompletionMessage(e,t,n){return t?{error:t,invocationId:e,type:fn.Completion}:{invocationId:e,result:n,type:fn.Completion}}_createCloseMessage(){return{type:fn.Close}}}const bn=[0,2e3,1e4,3e4,null];class _n{constructor(e){this._retryDelays=void 0!==e?[...e,null]:bn}nextRetryDelayInMilliseconds(e){return this._retryDelays[e.previousRetryCount]}}class Sn{}Sn.Authorization="Authorization",Sn.Cookie="Cookie";class Cn extends Vt{constructor(e,t){super(),this._innerClient=e,this._accessTokenFactory=t}async send(e){let t=!0;this._accessTokenFactory&&(!this._accessToken||e.url&&e.url.indexOf("/negotiate?")>0)&&(t=!1,this._accessToken=await this._accessTokenFactory()),this._setAuthorizationHeader(e);const n=await this._innerClient.send(e);return t&&401===n.statusCode&&this._accessTokenFactory?(this._accessToken=await this._accessTokenFactory(),this._setAuthorizationHeader(e),await this._innerClient.send(e)):n}_setAuthorizationHeader(e){e.headers||(e.headers={}),this._accessToken?e.headers[Sn.Authorization]=`Bearer ${this._accessToken}`:this._accessTokenFactory&&e.headers[Sn.Authorization]&&delete e.headers[Sn.Authorization]}getCookieString(e){return this._innerClient.getCookieString(e)}}var En,In;!function(e){e[e.None=0]="None",e[e.WebSockets=1]="WebSockets",e[e.ServerSentEvents=2]="ServerSentEvents",e[e.LongPolling=4]="LongPolling"}(En||(En={})),function(e){e[e.Text=1]="Text",e[e.Binary=2]="Binary"}(In||(In={}));let kn=class{constructor(){this._isAborted=!1,this.onabort=null}abort(){this._isAborted||(this._isAborted=!0,this.onabort&&this.onabort())}get signal(){return this}get aborted(){return this._isAborted}};class Tn{get pollAborted(){return this._pollAbort.aborted}constructor(e,t,n){this._httpClient=e,this._logger=t,this._pollAbort=new kn,this._options=n,this._running=!1,this.onreceive=null,this.onclose=null}async connect(e,t){if(Yt.isRequired(e,"url"),Yt.isRequired(t,"transferFormat"),Yt.isIn(t,In,"transferFormat"),this._url=e,this._logger.log(Kt.Trace,"(LongPolling transport) Connecting."),t===In.Binary&&"undefined"!=typeof XMLHttpRequest&&"string"!=typeof(new XMLHttpRequest).responseType)throw new Error("Binary protocols over XmlHttpRequest not implementing advanced features are not supported.");const[n,o]=rn(),r={[n]:o,...this._options.headers},i={abortSignal:this._pollAbort.signal,headers:r,timeout:1e5,withCredentials:this._options.withCredentials};t===In.Binary&&(i.responseType="arraybuffer");const s=`${e}&_=${Date.now()}`;this._logger.log(Kt.Trace,`(LongPolling transport) polling: ${s}.`);const a=await this._httpClient.get(s,i);200!==a.statusCode?(this._logger.log(Kt.Error,`(LongPolling transport) Unexpected response code: ${a.statusCode}.`),this._closeError=new Ot(a.statusText||"",a.statusCode),this._running=!1):this._running=!0,this._receiving=this._poll(this._url,i)}async _poll(e,t){try{for(;this._running;)try{const n=`${e}&_=${Date.now()}`;this._logger.log(Kt.Trace,`(LongPolling transport) polling: ${n}.`);const o=await this._httpClient.get(n,t);204===o.statusCode?(this._logger.log(Kt.Information,"(LongPolling transport) Poll terminated by server."),this._running=!1):200!==o.statusCode?(this._logger.log(Kt.Error,`(LongPolling transport) Unexpected response code: ${o.statusCode}.`),this._closeError=new Ot(o.statusText||"",o.statusCode),this._running=!1):o.content?(this._logger.log(Kt.Trace,`(LongPolling transport) data received. ${Zt(o.content,this._options.logMessageContent)}.`),this.onreceive&&this.onreceive(o.content)):this._logger.log(Kt.Trace,"(LongPolling transport) Poll timed out, reissuing.")}catch(e){this._running?e instanceof $t?this._logger.log(Kt.Trace,"(LongPolling transport) Poll timed out, reissuing."):(this._closeError=e,this._running=!1):this._logger.log(Kt.Trace,`(LongPolling transport) Poll errored after shutdown: ${e.message}`)}}finally{this._logger.log(Kt.Trace,"(LongPolling transport) Polling complete."),this.pollAborted||this._raiseOnClose()}}async send(e){return this._running?tn(this._logger,"LongPolling",this._httpClient,this._url,e,this._options):Promise.reject(new Error("Cannot send until the transport is connected"))}async stop(){this._logger.log(Kt.Trace,"(LongPolling transport) Stopping polling."),this._running=!1,this._pollAbort.abort();try{await this._receiving,this._logger.log(Kt.Trace,`(LongPolling transport) sending DELETE request to ${this._url}.`);const e={},[t,n]=rn();e[t]=n;const o={headers:{...e,...this._options.headers},timeout:this._options.timeout,withCredentials:this._options.withCredentials};let r;try{await this._httpClient.delete(this._url,o)}catch(e){r=e}r?r instanceof Ot&&(404===r.statusCode?this._logger.log(Kt.Trace,"(LongPolling transport) A 404 response was returned from sending a DELETE request."):this._logger.log(Kt.Trace,`(LongPolling transport) Error sending a DELETE request: ${r}`)):this._logger.log(Kt.Trace,"(LongPolling transport) DELETE request accepted.")}finally{this._logger.log(Kt.Trace,"(LongPolling transport) Stop finished."),this._raiseOnClose()}}_raiseOnClose(){if(this.onclose){let e="(LongPolling transport) Firing onclose event.";this._closeError&&(e+=" Error: "+this._closeError),this._logger.log(Kt.Trace,e),this.onclose(this._closeError)}}}class Rn{constructor(e,t,n,o){this._httpClient=e,this._accessToken=t,this._logger=n,this._options=o,this.onreceive=null,this.onclose=null}async connect(e,t){return Yt.isRequired(e,"url"),Yt.isRequired(t,"transferFormat"),Yt.isIn(t,In,"transferFormat"),this._logger.log(Kt.Trace,"(SSE transport) Connecting."),this._url=e,this._accessToken&&(e+=(e.indexOf("?")<0?"?":"&")+`access_token=${encodeURIComponent(this._accessToken)}`),new Promise(((n,o)=>{let r,i=!1;if(t===In.Text){if(Qt.isBrowser||Qt.isWebWorker)r=new this._options.EventSource(e,{withCredentials:this._options.withCredentials});else{const t=this._httpClient.getCookieString(e),n={};n.Cookie=t;const[o,i]=rn();n[o]=i,r=new this._options.EventSource(e,{withCredentials:this._options.withCredentials,headers:{...n,...this._options.headers}})}try{r.onmessage=e=>{if(this.onreceive)try{this._logger.log(Kt.Trace,`(SSE transport) data received. ${Zt(e.data,this._options.logMessageContent)}.`),this.onreceive(e.data)}catch(e){return void this._close(e)}},r.onerror=e=>{i?this._close():o(new Error("EventSource failed to connect. The connection could not be found on the server, either the connection ID is not present on the server, or a proxy is refusing/buffering the connection. If you have multiple servers check that sticky sessions are enabled."))},r.onopen=()=>{this._logger.log(Kt.Information,`SSE connected to ${this._url}`),this._eventSource=r,i=!0,n()}}catch(e){return void o(e)}}else o(new Error("The Server-Sent Events transport only supports the 'Text' transfer format"))}))}async send(e){return this._eventSource?tn(this._logger,"SSE",this._httpClient,this._url,e,this._options):Promise.reject(new Error("Cannot send until the transport is connected"))}stop(){return this._close(),Promise.resolve()}_close(e){this._eventSource&&(this._eventSource.close(),this._eventSource=void 0,this.onclose&&this.onclose(e))}}class An{constructor(e,t,n,o,r,i){this._logger=n,this._accessTokenFactory=t,this._logMessageContent=o,this._webSocketConstructor=r,this._httpClient=e,this.onreceive=null,this.onclose=null,this._headers=i}async connect(e,t){let n;return Yt.isRequired(e,"url"),Yt.isRequired(t,"transferFormat"),Yt.isIn(t,In,"transferFormat"),this._logger.log(Kt.Trace,"(WebSockets transport) Connecting."),this._accessTokenFactory&&(n=await this._accessTokenFactory()),new Promise(((o,r)=>{let i;e=e.replace(/^http/,"ws");const s=this._httpClient.getCookieString(e);let a=!1;if(Qt.isReactNative){const t={},[o,r]=rn();t[o]=r,n&&(t[Sn.Authorization]=`Bearer ${n}`),s&&(t[Sn.Cookie]=s),i=new this._webSocketConstructor(e,void 0,{headers:{...t,...this._headers}})}else n&&(e+=(e.indexOf("?")<0?"?":"&")+`access_token=${encodeURIComponent(n)}`);i||(i=new this._webSocketConstructor(e)),t===In.Binary&&(i.binaryType="arraybuffer"),i.onopen=t=>{this._logger.log(Kt.Information,`WebSocket connected to ${e}.`),this._webSocket=i,a=!0,o()},i.onerror=e=>{let t=null;t="undefined"!=typeof ErrorEvent&&e instanceof ErrorEvent?e.error:"There was an error with the transport",this._logger.log(Kt.Information,`(WebSockets transport) ${t}.`)},i.onmessage=e=>{if(this._logger.log(Kt.Trace,`(WebSockets transport) data received. ${Zt(e.data,this._logMessageContent)}.`),this.onreceive)try{this.onreceive(e.data)}catch(e){return void this._close(e)}},i.onclose=e=>{if(a)this._close(e);else{let t=null;t="undefined"!=typeof ErrorEvent&&e instanceof ErrorEvent?e.error:"WebSocket failed to connect. The connection could not be found on the server, either the endpoint may not be a SignalR endpoint, the connection ID is not present on the server, or there is a proxy blocking WebSockets. If you have multiple servers check that sticky sessions are enabled.",r(new Error(t))}}}))}send(e){return this._webSocket&&this._webSocket.readyState===this._webSocketConstructor.OPEN?(this._logger.log(Kt.Trace,`(WebSockets transport) sending data. ${Zt(e,this._logMessageContent)}.`),this._webSocket.send(e),Promise.resolve()):Promise.reject("WebSocket is not in the OPEN state")}stop(){return this._webSocket&&this._close(void 0),Promise.resolve()}_close(e){this._webSocket&&(this._webSocket.onclose=()=>{},this._webSocket.onmessage=()=>{},this._webSocket.onerror=()=>{},this._webSocket.close(),this._webSocket=void 0),this._logger.log(Kt.Trace,"(WebSockets transport) socket closed."),this.onclose&&(!this._isCloseEvent(e)||!1!==e.wasClean&&1e3===e.code?e instanceof Error?this.onclose(e):this.onclose():this.onclose(new Error(`WebSocket closed with status code: ${e.code} (${e.reason||"no reason given"}).`)))}_isCloseEvent(e){return e&&"boolean"==typeof e.wasClean&&"number"==typeof e.code}}class Dn{constructor(e,t={}){if(this._stopPromiseResolver=()=>{},this.features={},this._negotiateVersion=1,Yt.isRequired(e,"url"),this._logger=function(e){return void 0===e?new on(Kt.Information):null===e?Xt.instance:void 0!==e.log?e:new on(e)}(t.logger),this.baseUrl=this._resolveUrl(e),(t=t||{}).logMessageContent=void 0!==t.logMessageContent&&t.logMessageContent,"boolean"!=typeof t.withCredentials&&void 0!==t.withCredentials)throw new Error("withCredentials option was not a 'boolean' or 'undefined' value");t.withCredentials=void 0===t.withCredentials||t.withCredentials,t.timeout=void 0===t.timeout?1e5:t.timeout,"undefined"==typeof WebSocket||t.WebSocket||(t.WebSocket=WebSocket),"undefined"==typeof EventSource||t.EventSource||(t.EventSource=EventSource),this._httpClient=new Cn(t.httpClient||new dn(this._logger),t.accessTokenFactory),this._connectionState="Disconnected",this._connectionStarted=!1,this._options=t,this.onreceive=null,this.onclose=null}async start(e){if(e=e||In.Binary,Yt.isIn(e,In,"transferFormat"),this._logger.log(Kt.Debug,`Starting connection with transfer format '${In[e]}'.`),"Disconnected"!==this._connectionState)return Promise.reject(new Error("Cannot start an HttpConnection that is not in the 'Disconnected' state."));if(this._connectionState="Connecting",this._startInternalPromise=this._startInternal(e),await this._startInternalPromise,"Disconnecting"===this._connectionState){const e="Failed to start the HttpConnection before stop() was called.";return this._logger.log(Kt.Error,e),await this._stopPromise,Promise.reject(new Ft(e))}if("Connected"!==this._connectionState){const e="HttpConnection.startInternal completed gracefully but didn't enter the connection into the connected state!";return this._logger.log(Kt.Error,e),Promise.reject(new Ft(e))}this._connectionStarted=!0}send(e){return"Connected"!==this._connectionState?Promise.reject(new Error("Cannot send data if the connection is not in the 'Connected' State.")):(this._sendQueue||(this._sendQueue=new xn(this.transport)),this._sendQueue.send(e))}async stop(e){return"Disconnected"===this._connectionState?(this._logger.log(Kt.Debug,`Call to HttpConnection.stop(${e}) ignored because the connection is already in the disconnected state.`),Promise.resolve()):"Disconnecting"===this._connectionState?(this._logger.log(Kt.Debug,`Call to HttpConnection.stop(${e}) ignored because the connection is already in the disconnecting state.`),this._stopPromise):(this._connectionState="Disconnecting",this._stopPromise=new Promise((e=>{this._stopPromiseResolver=e})),await this._stopInternal(e),void await this._stopPromise)}async _stopInternal(e){this._stopError=e;try{await this._startInternalPromise}catch(e){}if(this.transport){try{await this.transport.stop()}catch(e){this._logger.log(Kt.Error,`HttpConnection.transport.stop() threw error '${e}'.`),this._stopConnection()}this.transport=void 0}else this._logger.log(Kt.Debug,"HttpConnection.transport is undefined in HttpConnection.stop() because start() failed.")}async _startInternal(e){let t=this.baseUrl;this._accessTokenFactory=this._options.accessTokenFactory,this._httpClient._accessTokenFactory=this._accessTokenFactory;try{if(this._options.skipNegotiation){if(this._options.transport!==En.WebSockets)throw new Error("Negotiation can only be skipped when using the WebSocket transport directly.");this.transport=this._constructTransport(En.WebSockets),await this._startTransport(t,e)}else{let n=null,o=0;do{if(n=await this._getNegotiationResponse(t),"Disconnecting"===this._connectionState||"Disconnected"===this._connectionState)throw new Ft("The connection was stopped during negotiation.");if(n.error)throw new Error(n.error);if(n.ProtocolVersion)throw new Error("Detected a connection attempt to an ASP.NET SignalR Server. This client only supports connecting to an ASP.NET Core SignalR Server. See https://aka.ms/signalr-core-differences for details.");if(n.url&&(t=n.url),n.accessToken){const e=n.accessToken;this._accessTokenFactory=()=>e,this._httpClient._accessToken=e,this._httpClient._accessTokenFactory=void 0}o++}while(n.url&&o<100);if(100===o&&n.url)throw new Error("Negotiate redirection limit exceeded.");await this._createTransport(t,this._options.transport,n,e)}this.transport instanceof Tn&&(this.features.inherentKeepAlive=!0),"Connecting"===this._connectionState&&(this._logger.log(Kt.Debug,"The HttpConnection connected successfully."),this._connectionState="Connected")}catch(e){return this._logger.log(Kt.Error,"Failed to start the connection: "+e),this._connectionState="Disconnected",this.transport=void 0,this._stopPromiseResolver(),Promise.reject(e)}}async _getNegotiationResponse(e){const t={},[n,o]=rn();t[n]=o;const r=this._resolveNegotiateUrl(e);this._logger.log(Kt.Debug,`Sending negotiation request: ${r}.`);try{const e=await this._httpClient.post(r,{content:"",headers:{...t,...this._options.headers},timeout:this._options.timeout,withCredentials:this._options.withCredentials});if(200!==e.statusCode)return Promise.reject(new Error(`Unexpected status code returned from negotiate '${e.statusCode}'`));const n=JSON.parse(e.content);return(!n.negotiateVersion||n.negotiateVersion<1)&&(n.connectionToken=n.connectionId),n.useStatefulReconnect&&!0!==this._options._useStatefulReconnect?Promise.reject(new zt("Client didn't negotiate Stateful Reconnect but the server did.")):n}catch(e){let t="Failed to complete negotiation with the server: "+e;return e instanceof Ot&&404===e.statusCode&&(t+=" Either this is not a SignalR endpoint or there is a proxy blocking the connection."),this._logger.log(Kt.Error,t),Promise.reject(new zt(t))}}_createConnectUrl(e,t){return t?e+(-1===e.indexOf("?")?"?":"&")+`id=${t}`:e}async _createTransport(e,t,n,o){let r=this._createConnectUrl(e,n.connectionToken);if(this._isITransport(t))return this._logger.log(Kt.Debug,"Connection was provided an instance of ITransport, using that directly."),this.transport=t,await this._startTransport(r,o),void(this.connectionId=n.connectionId);const i=[],s=n.availableTransports||[];let a=n;for(const n of s){const s=this._resolveTransportOrError(n,t,o,!0===(null==a?void 0:a.useStatefulReconnect));if(s instanceof Error)i.push(`${n.transport} failed:`),i.push(s);else if(this._isITransport(s)){if(this.transport=s,!a){try{a=await this._getNegotiationResponse(e)}catch(e){return Promise.reject(e)}r=this._createConnectUrl(e,a.connectionToken)}try{return await this._startTransport(r,o),void(this.connectionId=a.connectionId)}catch(e){if(this._logger.log(Kt.Error,`Failed to start the transport '${n.transport}': ${e}`),a=void 0,i.push(new jt(`${n.transport} failed: ${e}`,En[n.transport])),"Connecting"!==this._connectionState){const e="Failed to select transport before stop() was called.";return this._logger.log(Kt.Debug,e),Promise.reject(new Ft(e))}}}}return i.length>0?Promise.reject(new qt(`Unable to connect to the server with any of the available transports. ${i.join(" ")}`,i)):Promise.reject(new Error("None of the transports supported by the client are supported by the server."))}_constructTransport(e){switch(e){case En.WebSockets:if(!this._options.WebSocket)throw new Error("'WebSocket' is not supported in your environment.");return new An(this._httpClient,this._accessTokenFactory,this._logger,this._options.logMessageContent,this._options.WebSocket,this._options.headers||{});case En.ServerSentEvents:if(!this._options.EventSource)throw new Error("'EventSource' is not supported in your environment.");return new Rn(this._httpClient,this._httpClient._accessToken,this._logger,this._options);case En.LongPolling:return new Tn(this._httpClient,this._logger,this._options);default:throw new Error(`Unknown transport: ${e}.`)}}_startTransport(e,t){return this.transport.onreceive=this.onreceive,this.features.reconnect?this.transport.onclose=async n=>{let o=!1;if(this.features.reconnect){try{this.features.disconnected(),await this.transport.connect(e,t),await this.features.resend()}catch{o=!0}o&&this._stopConnection(n)}else this._stopConnection(n)}:this.transport.onclose=e=>this._stopConnection(e),this.transport.connect(e,t)}_resolveTransportOrError(e,t,n,o){const r=En[e.transport];if(null==r)return this._logger.log(Kt.Debug,`Skipping transport '${e.transport}' because it is not supported by this client.`),new Error(`Skipping transport '${e.transport}' because it is not supported by this client.`);if(!function(e,t){return!e||!!(t&e)}(t,r))return this._logger.log(Kt.Debug,`Skipping transport '${En[r]}' because it was disabled by the client.`),new Wt(`'${En[r]}' is disabled by the client.`,r);if(!(e.transferFormats.map((e=>In[e])).indexOf(n)>=0))return this._logger.log(Kt.Debug,`Skipping transport '${En[r]}' because it does not support the requested transfer format '${In[n]}'.`),new Error(`'${En[r]}' does not support ${In[n]}.`);if(r===En.WebSockets&&!this._options.WebSocket||r===En.ServerSentEvents&&!this._options.EventSource)return this._logger.log(Kt.Debug,`Skipping transport '${En[r]}' because it is not supported in your environment.'`),new Ht(`'${En[r]}' is not supported in your environment.`,r);this._logger.log(Kt.Debug,`Selecting transport '${En[r]}'.`);try{return this.features.reconnect=r===En.WebSockets?o:void 0,this._constructTransport(r)}catch(e){return e}}_isITransport(e){return e&&"object"==typeof e&&"connect"in e}_stopConnection(e){if(this._logger.log(Kt.Debug,`HttpConnection.stopConnection(${e}) called while in state ${this._connectionState}.`),this.transport=void 0,e=this._stopError||e,this._stopError=void 0,"Disconnected"!==this._connectionState){if("Connecting"===this._connectionState)throw this._logger.log(Kt.Warning,`Call to HttpConnection.stopConnection(${e}) was ignored because the connection is still in the connecting state.`),new Error(`HttpConnection.stopConnection(${e}) was called while the connection is still in the connecting state.`);if("Disconnecting"===this._connectionState&&this._stopPromiseResolver(),e?this._logger.log(Kt.Error,`Connection disconnected with error '${e}'.`):this._logger.log(Kt.Information,"Connection disconnected."),this._sendQueue&&(this._sendQueue.stop().catch((e=>{this._logger.log(Kt.Error,`TransportSendQueue.stop() threw error '${e}'.`)})),this._sendQueue=void 0),this.connectionId=void 0,this._connectionState="Disconnected",this._connectionStarted){this._connectionStarted=!1;try{this.onclose&&this.onclose(e)}catch(t){this._logger.log(Kt.Error,`HttpConnection.onclose(${e}) threw error '${t}'.`)}}}else this._logger.log(Kt.Debug,`Call to HttpConnection.stopConnection(${e}) was ignored because the connection is already in the disconnected state.`)}_resolveUrl(e){if(0===e.lastIndexOf("https://",0)||0===e.lastIndexOf("http://",0))return e;if(!Qt.isBrowser)throw new Error(`Cannot resolve '${e}'.`);const t=window.document.createElement("a");return t.href=e,this._logger.log(Kt.Information,`Normalizing '${e}' to '${t.href}'.`),t.href}_resolveNegotiateUrl(e){const t=new URL(e);t.pathname.endsWith("/")?t.pathname+="negotiate":t.pathname+="/negotiate";const n=new URLSearchParams(t.searchParams);return n.has("negotiateVersion")||n.append("negotiateVersion",this._negotiateVersion.toString()),n.has("useStatefulReconnect")?"true"===n.get("useStatefulReconnect")&&(this._options._useStatefulReconnect=!0):!0===this._options._useStatefulReconnect&&n.append("useStatefulReconnect","true"),t.search=n.toString(),t.toString()}}class xn{constructor(e){this._transport=e,this._buffer=[],this._executing=!0,this._sendBufferedData=new Nn,this._transportResult=new Nn,this._sendLoopPromise=this._sendLoop()}send(e){return this._bufferData(e),this._transportResult||(this._transportResult=new Nn),this._transportResult.promise}stop(){return this._executing=!1,this._sendBufferedData.resolve(),this._sendLoopPromise}_bufferData(e){if(this._buffer.length&&typeof this._buffer[0]!=typeof e)throw new Error(`Expected data to be of type ${typeof this._buffer} but was of type ${typeof e}`);this._buffer.push(e),this._sendBufferedData.resolve()}async _sendLoop(){for(;;){if(await this._sendBufferedData.promise,!this._executing){this._transportResult&&this._transportResult.reject("Connection stopped.");break}this._sendBufferedData=new Nn;const e=this._transportResult;this._transportResult=void 0;const t="string"==typeof this._buffer[0]?this._buffer.join(""):xn._concatBuffers(this._buffer);this._buffer.length=0;try{await this._transport.send(t),e.resolve()}catch(t){e.reject(t)}}}static _concatBuffers(e){const t=e.map((e=>e.byteLength)).reduce(((e,t)=>e+t)),n=new Uint8Array(t);let o=0;for(const t of e)n.set(new Uint8Array(t),o),o+=t.byteLength;return n.buffer}}class Nn{constructor(){this.promise=new Promise(((e,t)=>[this._resolver,this._rejecter]=[e,t]))}resolve(){this._resolver()}reject(e){this._rejecter(e)}}class Mn{constructor(){this.name="json",this.version=2,this.transferFormat=In.Text}parseMessages(e,t){if("string"!=typeof e)throw new Error("Invalid input for JSON hub protocol. Expected a string.");if(!e)return[];null===t&&(t=Xt.instance);const n=un.parse(e),o=[];for(const e of n){const n=JSON.parse(e);if("number"!=typeof n.type)throw new Error("Invalid payload.");switch(n.type){case fn.Invocation:this._isInvocationMessage(n);break;case fn.StreamItem:this._isStreamItemMessage(n);break;case fn.Completion:this._isCompletionMessage(n);break;case fn.Ping:case fn.Close:break;case fn.Ack:this._isAckMessage(n);break;case fn.Sequence:this._isSequenceMessage(n);break;default:t.log(Kt.Information,"Unknown message type '"+n.type+"' ignored.");continue}o.push(n)}return o}writeMessage(e){return un.write(JSON.stringify(e))}_isInvocationMessage(e){this._assertNotEmptyString(e.target,"Invalid payload for Invocation message."),void 0!==e.invocationId&&this._assertNotEmptyString(e.invocationId,"Invalid payload for Invocation message.")}_isStreamItemMessage(e){if(this._assertNotEmptyString(e.invocationId,"Invalid payload for StreamItem message."),void 0===e.item)throw new Error("Invalid payload for StreamItem message.")}_isCompletionMessage(e){if(e.result&&e.error)throw new Error("Invalid payload for Completion message.");!e.result&&e.error&&this._assertNotEmptyString(e.error,"Invalid payload for Completion message."),this._assertNotEmptyString(e.invocationId,"Invalid payload for Completion message.")}_isAckMessage(e){if("number"!=typeof e.sequenceId)throw new Error("Invalid SequenceId for Ack message.")}_isSequenceMessage(e){if("number"!=typeof e.sequenceId)throw new Error("Invalid SequenceId for Sequence message.")}_assertNotEmptyString(e,t){if("string"!=typeof e||""===e)throw new Error(t)}}const Pn={trace:Kt.Trace,debug:Kt.Debug,info:Kt.Information,information:Kt.Information,warn:Kt.Warning,warning:Kt.Warning,error:Kt.Error,critical:Kt.Critical,none:Kt.None};class Ln{configureLogging(e){if(Yt.isRequired(e,"logging"),function(e){return void 0!==e.log}(e))this.logger=e;else if("string"==typeof e){const t=function(e){const t=Pn[e.toLowerCase()];if(void 0!==t)return t;throw new Error(`Unknown log level: ${e}`)}(e);this.logger=new on(t)}else this.logger=new on(e);return this}withUrl(e,t){return Yt.isRequired(e,"url"),Yt.isNotEmpty(e,"url"),this.url=e,this.httpConnectionOptions="object"==typeof t?{...this.httpConnectionOptions,...t}:{...this.httpConnectionOptions,transport:t},this}withHubProtocol(e){return Yt.isRequired(e,"protocol"),this.protocol=e,this}withAutomaticReconnect(e){if(this.reconnectPolicy)throw new Error("A reconnectPolicy has already been set.");return e?Array.isArray(e)?this.reconnectPolicy=new _n(e):this.reconnectPolicy=e:this.reconnectPolicy=new _n,this}withServerTimeout(e){return Yt.isRequired(e,"milliseconds"),this._serverTimeoutInMilliseconds=e,this}withKeepAliveInterval(e){return Yt.isRequired(e,"milliseconds"),this._keepAliveIntervalInMilliseconds=e,this}withStatefulReconnect(e){return void 0===this.httpConnectionOptions&&(this.httpConnectionOptions={}),this.httpConnectionOptions._useStatefulReconnect=!0,this._statefulReconnectBufferSize=null==e?void 0:e.bufferSize,this}build(){const e=this.httpConnectionOptions||{};if(void 0===e.logger&&(e.logger=this.logger),!this.url)throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection.");const t=new Dn(this.url,e);return wn.create(t,this.logger||Xt.instance,this.protocol||new Mn,this.reconnectPolicy,this._serverTimeoutInMilliseconds,this._keepAliveIntervalInMilliseconds,this._statefulReconnectBufferSize)}}var Un;!function(e){e[e.Default=0]="Default",e[e.Server=1]="Server",e[e.WebAssembly=2]="WebAssembly",e[e.WebView=3]="WebView"}(Un||(Un={}));var Bn,On,$n,Fn=4294967295;function Hn(e,t,n){var o=Math.floor(n/4294967296),r=n;e.setUint32(t,o),e.setUint32(t+4,r)}function Wn(e,t){return 4294967296*e.getInt32(t)+e.getUint32(t+4)}var jn=("undefined"==typeof process||"never"!==(null===(Bn=null===process||void 0===process?void 0:process.env)||void 0===Bn?void 0:Bn.TEXT_ENCODING))&&"undefined"!=typeof TextEncoder&&"undefined"!=typeof TextDecoder;function zn(e){for(var t=e.length,n=0,o=0;o<t;){var r=e.charCodeAt(o++);if(4294967168&r)if(4294965248&r){if(r>=55296&&r<=56319&&o<t){var i=e.charCodeAt(o);56320==(64512&i)&&(++o,r=((1023&r)<<10)+(1023&i)+65536)}n+=4294901760&r?4:3}else n+=2;else n++}return n}var qn=jn?new TextEncoder:void 0,Jn=jn?"undefined"!=typeof process&&"force"!==(null===(On=null===process||void 0===process?void 0:process.env)||void 0===On?void 0:On.TEXT_ENCODING)?200:0:Fn,Vn=(null==qn?void 0:qn.encodeInto)?function(e,t,n){qn.encodeInto(e,t.subarray(n))}:function(e,t,n){t.set(qn.encode(e),n)};function Kn(e,t,n){for(var o=t,r=o+n,i=[],s="";o<r;){var a=e[o++];if(128&a)if(192==(224&a)){var c=63&e[o++];i.push((31&a)<<6|c)}else if(224==(240&a)){c=63&e[o++];var l=63&e[o++];i.push((31&a)<<12|c<<6|l)}else if(240==(248&a)){var h=(7&a)<<18|(c=63&e[o++])<<12|(l=63&e[o++])<<6|63&e[o++];h>65535&&(h-=65536,i.push(h>>>10&1023|55296),h=56320|1023&h),i.push(h)}else i.push(a);else i.push(a);i.length>=4096&&(s+=String.fromCharCode.apply(String,i),i.length=0)}return i.length>0&&(s+=String.fromCharCode.apply(String,i)),s}var Xn,Gn=jn?new TextDecoder:null,Yn=jn?"undefined"!=typeof process&&"force"!==(null===($n=null===process||void 0===process?void 0:process.env)||void 0===$n?void 0:$n.TEXT_DECODER)?200:0:Fn,Qn=function(e,t){this.type=e,this.data=t},Zn=(Xn=function(e,t){return Xn=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])},Xn(e,t)},function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function n(){this.constructor=e}Xn(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),eo=function(e){function t(n){var o=e.call(this,n)||this,r=Object.create(t.prototype);return Object.setPrototypeOf(o,r),Object.defineProperty(o,"name",{configurable:!0,enumerable:!1,value:t.name}),o}return Zn(t,e),t}(Error),to={type:-1,encode:function(e){var t,n,o,r;return e instanceof Date?function(e){var t,n=e.sec,o=e.nsec;if(n>=0&&o>=0&&n<=17179869183){if(0===o&&n<=4294967295){var r=new Uint8Array(4);return(t=new DataView(r.buffer)).setUint32(0,n),r}var i=n/4294967296,s=4294967295&n;return r=new Uint8Array(8),(t=new DataView(r.buffer)).setUint32(0,o<<2|3&i),t.setUint32(4,s),r}return r=new Uint8Array(12),(t=new DataView(r.buffer)).setUint32(0,o),Hn(t,4,n),r}((o=1e6*((t=e.getTime())-1e3*(n=Math.floor(t/1e3))),{sec:n+(r=Math.floor(o/1e9)),nsec:o-1e9*r})):null},decode:function(e){var t=function(e){var t=new DataView(e.buffer,e.byteOffset,e.byteLength);switch(e.byteLength){case 4:return{sec:t.getUint32(0),nsec:0};case 8:var n=t.getUint32(0);return{sec:4294967296*(3&n)+t.getUint32(4),nsec:n>>>2};case 12:return{sec:Wn(t,4),nsec:t.getUint32(0)};default:throw new eo("Unrecognized data size for timestamp (expected 4, 8, or 12): ".concat(e.length))}}(e);return new Date(1e3*t.sec+t.nsec/1e6)}},no=function(){function e(){this.builtInEncoders=[],this.builtInDecoders=[],this.encoders=[],this.decoders=[],this.register(to)}return e.prototype.register=function(e){var t=e.type,n=e.encode,o=e.decode;if(t>=0)this.encoders[t]=n,this.decoders[t]=o;else{var r=1+t;this.builtInEncoders[r]=n,this.builtInDecoders[r]=o}},e.prototype.tryToEncode=function(e,t){for(var n=0;n<this.builtInEncoders.length;n++)if(null!=(o=this.builtInEncoders[n])&&null!=(r=o(e,t)))return new Qn(-1-n,r);for(n=0;n<this.encoders.length;n++){var o,r;if(null!=(o=this.encoders[n])&&null!=(r=o(e,t)))return new Qn(n,r)}return e instanceof Qn?e:null},e.prototype.decode=function(e,t,n){var o=t<0?this.builtInDecoders[-1-t]:this.decoders[t];return o?o(e,t,n):new Qn(t,e)},e.defaultCodec=new e,e}();function oo(e){return e instanceof Uint8Array?e:ArrayBuffer.isView(e)?new Uint8Array(e.buffer,e.byteOffset,e.byteLength):e instanceof ArrayBuffer?new Uint8Array(e):Uint8Array.from(e)}var ro=function(){function e(e,t,n,o,r,i,s,a){void 0===e&&(e=no.defaultCodec),void 0===t&&(t=void 0),void 0===n&&(n=100),void 0===o&&(o=2048),void 0===r&&(r=!1),void 0===i&&(i=!1),void 0===s&&(s=!1),void 0===a&&(a=!1),this.extensionCodec=e,this.context=t,this.maxDepth=n,this.initialBufferSize=o,this.sortKeys=r,this.forceFloat32=i,this.ignoreUndefined=s,this.forceIntegerToFloat=a,this.pos=0,this.view=new DataView(new ArrayBuffer(this.initialBufferSize)),this.bytes=new Uint8Array(this.view.buffer)}return e.prototype.reinitializeState=function(){this.pos=0},e.prototype.encodeSharedRef=function(e){return this.reinitializeState(),this.doEncode(e,1),this.bytes.subarray(0,this.pos)},e.prototype.encode=function(e){return this.reinitializeState(),this.doEncode(e,1),this.bytes.slice(0,this.pos)},e.prototype.doEncode=function(e,t){if(t>this.maxDepth)throw new Error("Too deep objects in depth ".concat(t));null==e?this.encodeNil():"boolean"==typeof e?this.encodeBoolean(e):"number"==typeof e?this.encodeNumber(e):"string"==typeof e?this.encodeString(e):this.encodeObject(e,t)},e.prototype.ensureBufferSizeToWrite=function(e){var t=this.pos+e;this.view.byteLength<t&&this.resizeBuffer(2*t)},e.prototype.resizeBuffer=function(e){var t=new ArrayBuffer(e),n=new Uint8Array(t),o=new DataView(t);n.set(this.bytes),this.view=o,this.bytes=n},e.prototype.encodeNil=function(){this.writeU8(192)},e.prototype.encodeBoolean=function(e){!1===e?this.writeU8(194):this.writeU8(195)},e.prototype.encodeNumber=function(e){Number.isSafeInteger(e)&&!this.forceIntegerToFloat?e>=0?e<128?this.writeU8(e):e<256?(this.writeU8(204),this.writeU8(e)):e<65536?(this.writeU8(205),this.writeU16(e)):e<4294967296?(this.writeU8(206),this.writeU32(e)):(this.writeU8(207),this.writeU64(e)):e>=-32?this.writeU8(224|e+32):e>=-128?(this.writeU8(208),this.writeI8(e)):e>=-32768?(this.writeU8(209),this.writeI16(e)):e>=-2147483648?(this.writeU8(210),this.writeI32(e)):(this.writeU8(211),this.writeI64(e)):this.forceFloat32?(this.writeU8(202),this.writeF32(e)):(this.writeU8(203),this.writeF64(e))},e.prototype.writeStringHeader=function(e){if(e<32)this.writeU8(160+e);else if(e<256)this.writeU8(217),this.writeU8(e);else if(e<65536)this.writeU8(218),this.writeU16(e);else{if(!(e<4294967296))throw new Error("Too long string: ".concat(e," bytes in UTF-8"));this.writeU8(219),this.writeU32(e)}},e.prototype.encodeString=function(e){if(e.length>Jn){var t=zn(e);this.ensureBufferSizeToWrite(5+t),this.writeStringHeader(t),Vn(e,this.bytes,this.pos),this.pos+=t}else t=zn(e),this.ensureBufferSizeToWrite(5+t),this.writeStringHeader(t),function(e,t,n){for(var o=e.length,r=n,i=0;i<o;){var s=e.charCodeAt(i++);if(4294967168&s){if(4294965248&s){if(s>=55296&&s<=56319&&i<o){var a=e.charCodeAt(i);56320==(64512&a)&&(++i,s=((1023&s)<<10)+(1023&a)+65536)}4294901760&s?(t[r++]=s>>18&7|240,t[r++]=s>>12&63|128,t[r++]=s>>6&63|128):(t[r++]=s>>12&15|224,t[r++]=s>>6&63|128)}else t[r++]=s>>6&31|192;t[r++]=63&s|128}else t[r++]=s}}(e,this.bytes,this.pos),this.pos+=t},e.prototype.encodeObject=function(e,t){var n=this.extensionCodec.tryToEncode(e,this.context);if(null!=n)this.encodeExtension(n);else if(Array.isArray(e))this.encodeArray(e,t);else if(ArrayBuffer.isView(e))this.encodeBinary(e);else{if("object"!=typeof e)throw new Error("Unrecognized object: ".concat(Object.prototype.toString.apply(e)));this.encodeMap(e,t)}},e.prototype.encodeBinary=function(e){var t=e.byteLength;if(t<256)this.writeU8(196),this.writeU8(t);else if(t<65536)this.writeU8(197),this.writeU16(t);else{if(!(t<4294967296))throw new Error("Too large binary: ".concat(t));this.writeU8(198),this.writeU32(t)}var n=oo(e);this.writeU8a(n)},e.prototype.encodeArray=function(e,t){var n=e.length;if(n<16)this.writeU8(144+n);else if(n<65536)this.writeU8(220),this.writeU16(n);else{if(!(n<4294967296))throw new Error("Too large array: ".concat(n));this.writeU8(221),this.writeU32(n)}for(var o=0,r=e;o<r.length;o++){var i=r[o];this.doEncode(i,t+1)}},e.prototype.countWithoutUndefined=function(e,t){for(var n=0,o=0,r=t;o<r.length;o++)void 0!==e[r[o]]&&n++;return n},e.prototype.encodeMap=function(e,t){var n=Object.keys(e);this.sortKeys&&n.sort();var o=this.ignoreUndefined?this.countWithoutUndefined(e,n):n.length;if(o<16)this.writeU8(128+o);else if(o<65536)this.writeU8(222),this.writeU16(o);else{if(!(o<4294967296))throw new Error("Too large map object: ".concat(o));this.writeU8(223),this.writeU32(o)}for(var r=0,i=n;r<i.length;r++){var s=i[r],a=e[s];this.ignoreUndefined&&void 0===a||(this.encodeString(s),this.doEncode(a,t+1))}},e.prototype.encodeExtension=function(e){var t=e.data.length;if(1===t)this.writeU8(212);else if(2===t)this.writeU8(213);else if(4===t)this.writeU8(214);else if(8===t)this.writeU8(215);else if(16===t)this.writeU8(216);else if(t<256)this.writeU8(199),this.writeU8(t);else if(t<65536)this.writeU8(200),this.writeU16(t);else{if(!(t<4294967296))throw new Error("Too large extension object: ".concat(t));this.writeU8(201),this.writeU32(t)}this.writeI8(e.type),this.writeU8a(e.data)},e.prototype.writeU8=function(e){this.ensureBufferSizeToWrite(1),this.view.setUint8(this.pos,e),this.pos++},e.prototype.writeU8a=function(e){var t=e.length;this.ensureBufferSizeToWrite(t),this.bytes.set(e,this.pos),this.pos+=t},e.prototype.writeI8=function(e){this.ensureBufferSizeToWrite(1),this.view.setInt8(this.pos,e),this.pos++},e.prototype.writeU16=function(e){this.ensureBufferSizeToWrite(2),this.view.setUint16(this.pos,e),this.pos+=2},e.prototype.writeI16=function(e){this.ensureBufferSizeToWrite(2),this.view.setInt16(this.pos,e),this.pos+=2},e.prototype.writeU32=function(e){this.ensureBufferSizeToWrite(4),this.view.setUint32(this.pos,e),this.pos+=4},e.prototype.writeI32=function(e){this.ensureBufferSizeToWrite(4),this.view.setInt32(this.pos,e),this.pos+=4},e.prototype.writeF32=function(e){this.ensureBufferSizeToWrite(4),this.view.setFloat32(this.pos,e),this.pos+=4},e.prototype.writeF64=function(e){this.ensureBufferSizeToWrite(8),this.view.setFloat64(this.pos,e),this.pos+=8},e.prototype.writeU64=function(e){this.ensureBufferSizeToWrite(8),function(e,t,n){var o=n/4294967296,r=n;e.setUint32(t,o),e.setUint32(t+4,r)}(this.view,this.pos,e),this.pos+=8},e.prototype.writeI64=function(e){this.ensureBufferSizeToWrite(8),Hn(this.view,this.pos,e),this.pos+=8},e}();function io(e){return"".concat(e<0?"-":"","0x").concat(Math.abs(e).toString(16).padStart(2,"0"))}var so=function(){function e(e,t){void 0===e&&(e=16),void 0===t&&(t=16),this.maxKeyLength=e,this.maxLengthPerKey=t,this.hit=0,this.miss=0,this.caches=[];for(var n=0;n<this.maxKeyLength;n++)this.caches.push([])}return e.prototype.canBeCached=function(e){return e>0&&e<=this.maxKeyLength},e.prototype.find=function(e,t,n){e:for(var o=0,r=this.caches[n-1];o<r.length;o++){for(var i=r[o],s=i.bytes,a=0;a<n;a++)if(s[a]!==e[t+a])continue e;return i.str}return null},e.prototype.store=function(e,t){var n=this.caches[e.length-1],o={bytes:e,str:t};n.length>=this.maxLengthPerKey?n[Math.random()*n.length|0]=o:n.push(o)},e.prototype.decode=function(e,t,n){var o=this.find(e,t,n);if(null!=o)return this.hit++,o;this.miss++;var r=Kn(e,t,n),i=Uint8Array.prototype.slice.call(e,t,t+n);return this.store(i,r),r},e}(),ao=function(e,t){var n,o,r,i,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,o&&(r=2&i[0]?o.return:i[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,i[1])).done)return r;switch(o=0,r&&(i=[2&i[0],r.value]),i[0]){case 0:case 1:r=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,o=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!((r=(r=s.trys).length>0&&r[r.length-1])||6!==i[0]&&2!==i[0])){s=0;continue}if(3===i[0]&&(!r||i[1]>r[0]&&i[1]<r[3])){s.label=i[1];break}if(6===i[0]&&s.label<r[1]){s.label=r[1],r=i;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(i);break}r[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],o=0}finally{n=r=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}},co=function(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t,n=e[Symbol.asyncIterator];return n?n.call(e):(e="function"==typeof __values?__values(e):e[Symbol.iterator](),t={},o("next"),o("throw"),o("return"),t[Symbol.asyncIterator]=function(){return this},t);function o(n){t[n]=e[n]&&function(t){return new Promise((function(o,r){!function(e,t,n,o){Promise.resolve(o).then((function(t){e({value:t,done:n})}),t)}(o,r,(t=e[n](t)).done,t.value)}))}}},lo=function(e){return this instanceof lo?(this.v=e,this):new lo(e)},ho=new DataView(new ArrayBuffer(0)),uo=new Uint8Array(ho.buffer),po=function(){try{ho.getInt8(0)}catch(e){return e.constructor}throw new Error("never reached")}(),fo=new po("Insufficient data"),go=new so,mo=function(){function e(e,t,n,o,r,i,s,a){void 0===e&&(e=no.defaultCodec),void 0===t&&(t=void 0),void 0===n&&(n=Fn),void 0===o&&(o=Fn),void 0===r&&(r=Fn),void 0===i&&(i=Fn),void 0===s&&(s=Fn),void 0===a&&(a=go),this.extensionCodec=e,this.context=t,this.maxStrLength=n,this.maxBinLength=o,this.maxArrayLength=r,this.maxMapLength=i,this.maxExtLength=s,this.keyDecoder=a,this.totalPos=0,this.pos=0,this.view=ho,this.bytes=uo,this.headByte=-1,this.stack=[]}return e.prototype.reinitializeState=function(){this.totalPos=0,this.headByte=-1,this.stack.length=0},e.prototype.setBuffer=function(e){this.bytes=oo(e),this.view=function(e){if(e instanceof ArrayBuffer)return new DataView(e);var t=oo(e);return new DataView(t.buffer,t.byteOffset,t.byteLength)}(this.bytes),this.pos=0},e.prototype.appendBuffer=function(e){if(-1!==this.headByte||this.hasRemaining(1)){var t=this.bytes.subarray(this.pos),n=oo(e),o=new Uint8Array(t.length+n.length);o.set(t),o.set(n,t.length),this.setBuffer(o)}else this.setBuffer(e)},e.prototype.hasRemaining=function(e){return this.view.byteLength-this.pos>=e},e.prototype.createExtraByteError=function(e){var t=this.view,n=this.pos;return new RangeError("Extra ".concat(t.byteLength-n," of ").concat(t.byteLength," byte(s) found at buffer[").concat(e,"]"))},e.prototype.decode=function(e){this.reinitializeState(),this.setBuffer(e);var t=this.doDecodeSync();if(this.hasRemaining(1))throw this.createExtraByteError(this.pos);return t},e.prototype.decodeMulti=function(e){return ao(this,(function(t){switch(t.label){case 0:this.reinitializeState(),this.setBuffer(e),t.label=1;case 1:return this.hasRemaining(1)?[4,this.doDecodeSync()]:[3,3];case 2:return t.sent(),[3,1];case 3:return[2]}}))},e.prototype.decodeAsync=function(e){var t,n,o,r,i,s,a;return i=this,a=function(){var i,s,a,c,l,h,d,u;return ao(this,(function(p){switch(p.label){case 0:i=!1,p.label=1;case 1:p.trys.push([1,6,7,12]),t=co(e),p.label=2;case 2:return[4,t.next()];case 3:if((n=p.sent()).done)return[3,5];if(a=n.value,i)throw this.createExtraByteError(this.totalPos);this.appendBuffer(a);try{s=this.doDecodeSync(),i=!0}catch(e){if(!(e instanceof po))throw e}this.totalPos+=this.pos,p.label=4;case 4:return[3,2];case 5:return[3,12];case 6:return c=p.sent(),o={error:c},[3,12];case 7:return p.trys.push([7,,10,11]),n&&!n.done&&(r=t.return)?[4,r.call(t)]:[3,9];case 8:p.sent(),p.label=9;case 9:return[3,11];case 10:if(o)throw o.error;return[7];case 11:return[7];case 12:if(i){if(this.hasRemaining(1))throw this.createExtraByteError(this.totalPos);return[2,s]}throw h=(l=this).headByte,d=l.pos,u=l.totalPos,new RangeError("Insufficient data in parsing ".concat(io(h)," at ").concat(u," (").concat(d," in the current buffer)"))}}))},new((s=void 0)||(s=Promise))((function(e,t){function n(e){try{r(a.next(e))}catch(e){t(e)}}function o(e){try{r(a.throw(e))}catch(e){t(e)}}function r(t){var r;t.done?e(t.value):(r=t.value,r instanceof s?r:new s((function(e){e(r)}))).then(n,o)}r((a=a.apply(i,[])).next())}))},e.prototype.decodeArrayStream=function(e){return this.decodeMultiAsync(e,!0)},e.prototype.decodeStream=function(e){return this.decodeMultiAsync(e,!1)},e.prototype.decodeMultiAsync=function(e,t){return function(n,o,r){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var i,s=function(){var n,o,r,i,s,a,c,l,h;return ao(this,(function(d){switch(d.label){case 0:n=t,o=-1,d.label=1;case 1:d.trys.push([1,13,14,19]),r=co(e),d.label=2;case 2:return[4,lo(r.next())];case 3:if((i=d.sent()).done)return[3,12];if(s=i.value,t&&0===o)throw this.createExtraByteError(this.totalPos);this.appendBuffer(s),n&&(o=this.readArraySize(),n=!1,this.complete()),d.label=4;case 4:d.trys.push([4,9,,10]),d.label=5;case 5:return[4,lo(this.doDecodeSync())];case 6:return[4,d.sent()];case 7:return d.sent(),0==--o?[3,8]:[3,5];case 8:return[3,10];case 9:if(!((a=d.sent())instanceof po))throw a;return[3,10];case 10:this.totalPos+=this.pos,d.label=11;case 11:return[3,2];case 12:return[3,19];case 13:return c=d.sent(),l={error:c},[3,19];case 14:return d.trys.push([14,,17,18]),i&&!i.done&&(h=r.return)?[4,lo(h.call(r))]:[3,16];case 15:d.sent(),d.label=16;case 16:return[3,18];case 17:if(l)throw l.error;return[7];case 18:return[7];case 19:return[2]}}))}.apply(n,o||[]),a=[];return i={},c("next"),c("throw"),c("return"),i[Symbol.asyncIterator]=function(){return this},i;function c(e){s[e]&&(i[e]=function(t){return new Promise((function(n,o){a.push([e,t,n,o])>1||l(e,t)}))})}function l(e,t){try{(n=s[e](t)).value instanceof lo?Promise.resolve(n.value.v).then(h,d):u(a[0][2],n)}catch(e){u(a[0][3],e)}var n}function h(e){l("next",e)}function d(e){l("throw",e)}function u(e,t){e(t),a.shift(),a.length&&l(a[0][0],a[0][1])}}(this,arguments)},e.prototype.doDecodeSync=function(){e:for(;;){var e=this.readHeadByte(),t=void 0;if(e>=224)t=e-256;else if(e<192)if(e<128)t=e;else if(e<144){if(0!=(o=e-128)){this.pushMapState(o),this.complete();continue e}t={}}else if(e<160){if(0!=(o=e-144)){this.pushArrayState(o),this.complete();continue e}t=[]}else{var n=e-160;t=this.decodeUtf8String(n,0)}else if(192===e)t=null;else if(194===e)t=!1;else if(195===e)t=!0;else if(202===e)t=this.readF32();else if(203===e)t=this.readF64();else if(204===e)t=this.readU8();else if(205===e)t=this.readU16();else if(206===e)t=this.readU32();else if(207===e)t=this.readU64();else if(208===e)t=this.readI8();else if(209===e)t=this.readI16();else if(210===e)t=this.readI32();else if(211===e)t=this.readI64();else if(217===e)n=this.lookU8(),t=this.decodeUtf8String(n,1);else if(218===e)n=this.lookU16(),t=this.decodeUtf8String(n,2);else if(219===e)n=this.lookU32(),t=this.decodeUtf8String(n,4);else if(220===e){if(0!==(o=this.readU16())){this.pushArrayState(o),this.complete();continue e}t=[]}else if(221===e){if(0!==(o=this.readU32())){this.pushArrayState(o),this.complete();continue e}t=[]}else if(222===e){if(0!==(o=this.readU16())){this.pushMapState(o),this.complete();continue e}t={}}else if(223===e){if(0!==(o=this.readU32())){this.pushMapState(o),this.complete();continue e}t={}}else if(196===e){var o=this.lookU8();t=this.decodeBinary(o,1)}else if(197===e)o=this.lookU16(),t=this.decodeBinary(o,2);else if(198===e)o=this.lookU32(),t=this.decodeBinary(o,4);else if(212===e)t=this.decodeExtension(1,0);else if(213===e)t=this.decodeExtension(2,0);else if(214===e)t=this.decodeExtension(4,0);else if(215===e)t=this.decodeExtension(8,0);else if(216===e)t=this.decodeExtension(16,0);else if(199===e)o=this.lookU8(),t=this.decodeExtension(o,1);else if(200===e)o=this.lookU16(),t=this.decodeExtension(o,2);else{if(201!==e)throw new eo("Unrecognized type byte: ".concat(io(e)));o=this.lookU32(),t=this.decodeExtension(o,4)}this.complete();for(var r=this.stack;r.length>0;){var i=r[r.length-1];if(0===i.type){if(i.array[i.position]=t,i.position++,i.position!==i.size)continue e;r.pop(),t=i.array}else{if(1===i.type){if("string"!=(s=typeof t)&&"number"!==s)throw new eo("The type of key must be string or number but "+typeof t);if("__proto__"===t)throw new eo("The key __proto__ is not allowed");i.key=t,i.type=2;continue e}if(i.map[i.key]=t,i.readCount++,i.readCount!==i.size){i.key=null,i.type=1;continue e}r.pop(),t=i.map}}return t}var s},e.prototype.readHeadByte=function(){return-1===this.headByte&&(this.headByte=this.readU8()),this.headByte},e.prototype.complete=function(){this.headByte=-1},e.prototype.readArraySize=function(){var e=this.readHeadByte();switch(e){case 220:return this.readU16();case 221:return this.readU32();default:if(e<160)return e-144;throw new eo("Unrecognized array type byte: ".concat(io(e)))}},e.prototype.pushMapState=function(e){if(e>this.maxMapLength)throw new eo("Max length exceeded: map length (".concat(e,") > maxMapLengthLength (").concat(this.maxMapLength,")"));this.stack.push({type:1,size:e,key:null,readCount:0,map:{}})},e.prototype.pushArrayState=function(e){if(e>this.maxArrayLength)throw new eo("Max length exceeded: array length (".concat(e,") > maxArrayLength (").concat(this.maxArrayLength,")"));this.stack.push({type:0,size:e,array:new Array(e),position:0})},e.prototype.decodeUtf8String=function(e,t){var n;if(e>this.maxStrLength)throw new eo("Max length exceeded: UTF-8 byte length (".concat(e,") > maxStrLength (").concat(this.maxStrLength,")"));if(this.bytes.byteLength<this.pos+t+e)throw fo;var o,r=this.pos+t;return o=this.stateIsMapKey()&&(null===(n=this.keyDecoder)||void 0===n?void 0:n.canBeCached(e))?this.keyDecoder.decode(this.bytes,r,e):e>Yn?function(e,t,n){var o=e.subarray(t,t+n);return Gn.decode(o)}(this.bytes,r,e):Kn(this.bytes,r,e),this.pos+=t+e,o},e.prototype.stateIsMapKey=function(){return this.stack.length>0&&1===this.stack[this.stack.length-1].type},e.prototype.decodeBinary=function(e,t){if(e>this.maxBinLength)throw new eo("Max length exceeded: bin length (".concat(e,") > maxBinLength (").concat(this.maxBinLength,")"));if(!this.hasRemaining(e+t))throw fo;var n=this.pos+t,o=this.bytes.subarray(n,n+e);return this.pos+=t+e,o},e.prototype.decodeExtension=function(e,t){if(e>this.maxExtLength)throw new eo("Max length exceeded: ext length (".concat(e,") > maxExtLength (").concat(this.maxExtLength,")"));var n=this.view.getInt8(this.pos+t),o=this.decodeBinary(e,t+1);return this.extensionCodec.decode(o,n,this.context)},e.prototype.lookU8=function(){return this.view.getUint8(this.pos)},e.prototype.lookU16=function(){return this.view.getUint16(this.pos)},e.prototype.lookU32=function(){return this.view.getUint32(this.pos)},e.prototype.readU8=function(){var e=this.view.getUint8(this.pos);return this.pos++,e},e.prototype.readI8=function(){var e=this.view.getInt8(this.pos);return this.pos++,e},e.prototype.readU16=function(){var e=this.view.getUint16(this.pos);return this.pos+=2,e},e.prototype.readI16=function(){var e=this.view.getInt16(this.pos);return this.pos+=2,e},e.prototype.readU32=function(){var e=this.view.getUint32(this.pos);return this.pos+=4,e},e.prototype.readI32=function(){var e=this.view.getInt32(this.pos);return this.pos+=4,e},e.prototype.readU64=function(){var e,t,n=(e=this.view,t=this.pos,4294967296*e.getUint32(t)+e.getUint32(t+4));return this.pos+=8,n},e.prototype.readI64=function(){var e=Wn(this.view,this.pos);return this.pos+=8,e},e.prototype.readF32=function(){var e=this.view.getFloat32(this.pos);return this.pos+=4,e},e.prototype.readF64=function(){var e=this.view.getFloat64(this.pos);return this.pos+=8,e},e}();class yo{static write(e){let t=e.byteLength||e.length;const n=[];do{let e=127&t;t>>=7,t>0&&(e|=128),n.push(e)}while(t>0);t=e.byteLength||e.length;const o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer}static parse(e){const t=[],n=new Uint8Array(e),o=[0,7,14,21,28];for(let r=0;r<e.byteLength;){let i,s=0,a=0;do{i=n[r+s],a|=(127&i)<<o[s],s++}while(s<Math.min(5,e.byteLength-r)&&128&i);if(128&i&&s<5)throw new Error("Cannot read message size.");if(5===s&&i>7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=r+s+a))throw new Error("Incomplete message.");t.push(n.slice?n.slice(r+s,r+s+a):n.subarray(r+s,r+s+a)),r=r+s+a}return t}}const vo=new Uint8Array([145,fn.Ping]);class wo{constructor(e){this.name="messagepack",this.version=2,this.transferFormat=In.Binary,this._errorResult=1,this._voidResult=2,this._nonVoidResult=3,e=e||{},this._encoder=new ro(e.extensionCodec,e.context,e.maxDepth,e.initialBufferSize,e.sortKeys,e.forceFloat32,e.ignoreUndefined,e.forceIntegerToFloat),this._decoder=new mo(e.extensionCodec,e.context,e.maxStrLength,e.maxBinLength,e.maxArrayLength,e.maxMapLength,e.maxExtLength)}parseMessages(e,t){if(!(n=e)||"undefined"==typeof ArrayBuffer||!(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer.");var n;null===t&&(t=Xt.instance);const o=yo.parse(e),r=[];for(const e of o){const n=this._parseMessage(e,t);n&&r.push(n)}return r}writeMessage(e){switch(e.type){case fn.Invocation:return this._writeInvocation(e);case fn.StreamInvocation:return this._writeStreamInvocation(e);case fn.StreamItem:return this._writeStreamItem(e);case fn.Completion:return this._writeCompletion(e);case fn.Ping:return yo.write(vo);case fn.CancelInvocation:return this._writeCancelInvocation(e);case fn.Close:return this._writeClose();case fn.Ack:return this._writeAck(e);case fn.Sequence:return this._writeSequence(e);default:throw new Error("Invalid message type.")}}_parseMessage(e,t){if(0===e.length)throw new Error("Invalid payload.");const n=this._decoder.decode(e);if(0===n.length||!(n instanceof Array))throw new Error("Invalid payload.");const o=n[0];switch(o){case fn.Invocation:return this._createInvocationMessage(this._readHeaders(n),n);case fn.StreamItem:return this._createStreamItemMessage(this._readHeaders(n),n);case fn.Completion:return this._createCompletionMessage(this._readHeaders(n),n);case fn.Ping:return this._createPingMessage(n);case fn.Close:return this._createCloseMessage(n);case fn.Ack:return this._createAckMessage(n);case fn.Sequence:return this._createSequenceMessage(n);default:return t.log(Kt.Information,"Unknown message type '"+o+"' ignored."),null}}_createCloseMessage(e){if(e.length<2)throw new Error("Invalid payload for Close message.");return{allowReconnect:e.length>=3?e[2]:void 0,error:e[1],type:fn.Close}}_createPingMessage(e){if(e.length<1)throw new Error("Invalid payload for Ping message.");return{type:fn.Ping}}_createInvocationMessage(e,t){if(t.length<5)throw new Error("Invalid payload for Invocation message.");const n=t[2];return n?{arguments:t[4],headers:e,invocationId:n,streamIds:[],target:t[3],type:fn.Invocation}:{arguments:t[4],headers:e,streamIds:[],target:t[3],type:fn.Invocation}}_createStreamItemMessage(e,t){if(t.length<4)throw new Error("Invalid payload for StreamItem message.");return{headers:e,invocationId:t[2],item:t[3],type:fn.StreamItem}}_createCompletionMessage(e,t){if(t.length<4)throw new Error("Invalid payload for Completion message.");const n=t[3];if(n!==this._voidResult&&t.length<5)throw new Error("Invalid payload for Completion message.");let o,r;switch(n){case this._errorResult:o=t[4];break;case this._nonVoidResult:r=t[4]}return{error:o,headers:e,invocationId:t[2],result:r,type:fn.Completion}}_createAckMessage(e){if(e.length<1)throw new Error("Invalid payload for Ack message.");return{sequenceId:e[1],type:fn.Ack}}_createSequenceMessage(e){if(e.length<1)throw new Error("Invalid payload for Sequence message.");return{sequenceId:e[1],type:fn.Sequence}}_writeInvocation(e){let t;return t=e.streamIds?this._encoder.encode([fn.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments,e.streamIds]):this._encoder.encode([fn.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments]),yo.write(t.slice())}_writeStreamInvocation(e){let t;return t=e.streamIds?this._encoder.encode([fn.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments,e.streamIds]):this._encoder.encode([fn.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments]),yo.write(t.slice())}_writeStreamItem(e){const t=this._encoder.encode([fn.StreamItem,e.headers||{},e.invocationId,e.item]);return yo.write(t.slice())}_writeCompletion(e){const t=e.error?this._errorResult:void 0!==e.result?this._nonVoidResult:this._voidResult;let n;switch(t){case this._errorResult:n=this._encoder.encode([fn.Completion,e.headers||{},e.invocationId,t,e.error]);break;case this._voidResult:n=this._encoder.encode([fn.Completion,e.headers||{},e.invocationId,t]);break;case this._nonVoidResult:n=this._encoder.encode([fn.Completion,e.headers||{},e.invocationId,t,e.result])}return yo.write(n.slice())}_writeCancelInvocation(e){const t=this._encoder.encode([fn.CancelInvocation,e.headers||{},e.invocationId]);return yo.write(t.slice())}_writeClose(){const e=this._encoder.encode([fn.Close,null]);return yo.write(e.slice())}_writeAck(e){const t=this._encoder.encode([fn.Ack,e.sequenceId]);return yo.write(t.slice())}_writeSequence(e){const t=this._encoder.encode([fn.Sequence,e.sequenceId]);return yo.write(t.slice())}_readHeaders(e){const t=e[1];if("object"!=typeof t)throw new Error("Invalid headers.");return t}}const bo="function"==typeof TextDecoder?new TextDecoder("utf-8"):null,_o=bo?bo.decode.bind(bo):function(e){let t=0;const n=e.length,o=[],r=[];for(;t<n;){const n=e[t++];if(0===n)break;if(128&n){if(192==(224&n)){const r=63&e[t++];o.push((31&n)<<6|r)}else if(224==(240&n)){const r=63&e[t++],i=63&e[t++];o.push((31&n)<<12|r<<6|i)}else if(240==(248&n)){let r=(7&n)<<18|(63&e[t++])<<12|(63&e[t++])<<6|63&e[t++];r>65535&&(r-=65536,o.push(r>>>10&1023|55296),r=56320|1023&r),o.push(r)}}else o.push(n);o.length>1024&&(r.push(String.fromCharCode.apply(null,o)),o.length=0)}return r.push(String.fromCharCode.apply(null,o)),r.join("")},So=Math.pow(2,32),Co=Math.pow(2,21)-1;function Eo(e,t){return e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24}function Io(e,t){return e[t]+(e[t+1]<<8)+(e[t+2]<<16)+(e[t+3]<<24>>>0)}function ko(e,t){const n=Io(e,t+4);if(n>Co)throw new Error(`Cannot read uint64 with high order part ${n}, because the result would exceed Number.MAX_SAFE_INTEGER.`);return n*So+Io(e,t)}class To{constructor(e){this.batchData=e;const t=new xo(e);this.arrayRangeReader=new No(e),this.arrayBuilderSegmentReader=new Mo(e),this.diffReader=new Ro(e),this.editReader=new Ao(e,t),this.frameReader=new Do(e,t)}updatedComponents(){return Eo(this.batchData,this.batchData.length-20)}referenceFrames(){return Eo(this.batchData,this.batchData.length-16)}disposedComponentIds(){return Eo(this.batchData,this.batchData.length-12)}disposedEventHandlerIds(){return Eo(this.batchData,this.batchData.length-8)}updatedComponentsEntry(e,t){const n=e+4*t;return Eo(this.batchData,n)}referenceFramesEntry(e,t){return e+20*t}disposedComponentIdsEntry(e,t){const n=e+4*t;return Eo(this.batchData,n)}disposedEventHandlerIdsEntry(e,t){const n=e+8*t;return ko(this.batchData,n)}}class Ro{constructor(e){this.batchDataUint8=e}componentId(e){return Eo(this.batchDataUint8,e)}edits(e){return e+4}editsEntry(e,t){return e+16*t}}class Ao{constructor(e,t){this.batchDataUint8=e,this.stringReader=t}editType(e){return Eo(this.batchDataUint8,e)}siblingIndex(e){return Eo(this.batchDataUint8,e+4)}newTreeIndex(e){return Eo(this.batchDataUint8,e+8)}moveToSiblingIndex(e){return Eo(this.batchDataUint8,e+8)}removedAttributeName(e){const t=Eo(this.batchDataUint8,e+12);return this.stringReader.readString(t)}}class Do{constructor(e,t){this.batchDataUint8=e,this.stringReader=t}frameType(e){return Eo(this.batchDataUint8,e)}subtreeLength(e){return Eo(this.batchDataUint8,e+4)}elementReferenceCaptureId(e){const t=Eo(this.batchDataUint8,e+4);return this.stringReader.readString(t)}componentId(e){return Eo(this.batchDataUint8,e+8)}elementName(e){const t=Eo(this.batchDataUint8,e+8);return this.stringReader.readString(t)}textContent(e){const t=Eo(this.batchDataUint8,e+4);return this.stringReader.readString(t)}markupContent(e){const t=Eo(this.batchDataUint8,e+4);return this.stringReader.readString(t)}attributeName(e){const t=Eo(this.batchDataUint8,e+4);return this.stringReader.readString(t)}attributeValue(e){const t=Eo(this.batchDataUint8,e+8);return this.stringReader.readString(t)}attributeEventHandlerId(e){return ko(this.batchDataUint8,e+12)}}class xo{constructor(e){this.batchDataUint8=e,this.stringTableStartIndex=Eo(e,e.length-4)}readString(e){if(-1===e)return null;{const n=Eo(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){let n=0,o=0;for(let r=0;r<4;r++){const i=e[t+r];if(n|=(127&i)<<o,i<128)break;o+=7}return n}(this.batchDataUint8,n),r=n+((t=o)<128?1:t<16384?2:t<2097152?3:4),i=new Uint8Array(this.batchDataUint8.buffer,this.batchDataUint8.byteOffset+r,o);return _o(i)}var t}}class No{constructor(e){this.batchDataUint8=e}count(e){return Eo(this.batchDataUint8,e)}values(e){return e+4}}class Mo{constructor(e){this.batchDataUint8=e}offset(e){return 0}count(e){return Eo(this.batchDataUint8,e)}values(e){return e+4}}class Po{constructor(e){this.nextBatchId=2,this.logger=e}async processBatch(e,t,n){if(e<this.nextBatchId)return await this.completeBatch(n,e),void this.logger.log(bt.Debug,`Batch ${e} already processed. Waiting for batch ${this.nextBatchId}.`);if(e>this.nextBatchId)return this.fatalError?(this.logger.log(bt.Debug,`Received a new batch ${e} but errored out on a previous batch ${this.nextBatchId-1}`),void await n.send("OnRenderCompleted",this.nextBatchId-1,this.fatalError.toString())):void this.logger.log(bt.Debug,`Waiting for batch ${this.nextBatchId}. Batch ${e} not processed.`);try{this.nextBatchId++,this.logger.log(bt.Debug,`Applying batch ${e}.`),xe(Un.Server,new To(t)),await this.completeBatch(n,e)}catch(t){throw this.fatalError=t.toString(),this.logger.log(bt.Error,`There was an error applying batch ${e}.`),n.send("OnRenderCompleted",e,t.toString()),t}}getLastBatchid(){return this.nextBatchId-1}async completeBatch(e,t){try{await e.send("OnRenderCompleted",t,null)}catch{this.logger.log(bt.Warning,`Failed to deliver completion notification for render '${t}'.`)}}}let Lo=!1;function Uo(){const e=document.querySelector("#blazor-error-ui");e&&(e.style.display="block"),Lo||(Lo=!0,document.querySelectorAll("#blazor-error-ui .reload").forEach((e=>{e.onclick=function(e){location.reload(),e.preventDefault()}})),document.querySelectorAll("#blazor-error-ui .dismiss").forEach((e=>{e.onclick=function(e){const t=document.querySelector("#blazor-error-ui");t&&(t.style.display="none"),e.preventDefault()}})))}class Bo{constructor(t,n,o,r){this._firstUpdate=!0,this._renderingFailed=!1,this._disposed=!1,this._circuitId=void 0,this._applicationState=n,this._componentManager=t,this._options=o,this._logger=r,this._renderQueue=new Po(this._logger),this._dispatcher=e.attachDispatcher(this)}start(){if(this.isDisposedOrDisposing())throw new Error("Cannot start a disposed circuit.");return this._startPromise||(this._startPromise=this.startCore()),this._startPromise}updateRootComponents(e){return this._firstUpdate?(this._firstUpdate=!1,this._connection?.send("UpdateRootComponents",e,this._applicationState)):this._connection?.send("UpdateRootComponents",e,"")}async startCore(){if(this._connection=await this.startConnection(),this._connection.state!==gn.Connected)return!1;const e=JSON.stringify(this._componentManager.initialComponents.map((e=>Ut(e))));if(this._circuitId=await this._connection.invoke("StartCircuit",Xe.getBaseURI(),Xe.getLocationHref(),e,this._applicationState||""),!this._circuitId)return!1;for(const e of this._options.circuitHandlers)e.onCircuitOpened&&e.onCircuitOpened();return!0}async startConnection(){const e=new wo;e.name="blazorpack";const t=(new Ln).withUrl("_blazor").withHubProtocol(e);this._options.configureSignalR(t);const n=t.build();n.on("JS.AttachComponent",((e,t)=>Ae(Un.Server,this.resolveElement(t),e,!1))),n.on("JS.BeginInvokeJS",this._dispatcher.beginInvokeJSFromDotNet.bind(this._dispatcher)),n.on("JS.EndInvokeDotNet",this._dispatcher.endInvokeDotNetFromJS.bind(this._dispatcher)),n.on("JS.ReceiveByteArray",this._dispatcher.receiveByteArray.bind(this._dispatcher)),n.on("JS.BeginTransmitStream",(e=>{const t=new ReadableStream({start:t=>{n.stream("SendDotNetStreamToJS",e).subscribe({next:e=>t.enqueue(e),complete:()=>t.close(),error:e=>t.error(e)})}});this._dispatcher.supplyDotNetStream(e,t)})),n.on("JS.RenderBatch",(async(e,t)=>{this._logger.log(Kt.Debug,`Received render batch with id ${e} and ${t.byteLength} bytes.`),await this._renderQueue.processBatch(e,t,this._connection),this._componentManager.onAfterRenderBatch?.(Un.Server)})),n.on("JS.EndUpdateRootComponents",(e=>{this._componentManager.onAfterUpdateRootComponents?.(e)})),n.on("JS.EndLocationChanging",wt._internal.navigationManager.endLocationChanging),n.onclose((e=>{this._interopMethodsForReconnection=function(e){const t=C.get(e);if(!t)throw new Error(`Interop methods are not registered for renderer ${e}`);return C.delete(e),t}(Un.Server),this._disposed||this._renderingFailed||this._options.reconnectionHandler.onConnectionDown(this._options.reconnectionOptions,e)})),n.on("JS.Error",(e=>{this._renderingFailed=!0,this.unhandledError(e),Uo()}));try{await n.start()}catch(e){if(this.unhandledError(e),"FailedToNegotiateWithServerError"===e.errorType)throw e;Uo(),e.innerErrors&&(e.innerErrors.some((e=>"UnsupportedTransportError"===e.errorType&&e.transport===En.WebSockets))?this._logger.log(Kt.Error,"Unable to connect, please ensure you are using an updated browser that supports WebSockets."):e.innerErrors.some((e=>"FailedToStartTransportError"===e.errorType&&e.transport===En.WebSockets))?this._logger.log(Kt.Error,"Unable to connect, please ensure WebSockets are available. A VPN or proxy may be blocking the connection."):e.innerErrors.some((e=>"DisabledTransportError"===e.errorType&&e.transport===En.LongPolling))&&this._logger.log(Kt.Error,"Unable to initiate a SignalR connection to the server. This might be because the server is not configured to support WebSockets. For additional details, visit https://aka.ms/blazor-server-websockets-error."))}return n.connection?.features?.inherentKeepAlive&&this._logger.log(Kt.Warning,"Failed to connect via WebSockets, using the Long Polling fallback transport. This may be due to a VPN or proxy blocking the connection. To troubleshoot this, visit https://aka.ms/blazor-server-using-fallback-long-polling."),n}async disconnect(){await(this._connection?.stop())}async reconnect(){if(!this._circuitId)throw new Error("Circuit host not initialized.");return this._connection.state===gn.Connected||(this._connection=await this.startConnection(),this._interopMethodsForReconnection&&(k(Un.Server,this._interopMethodsForReconnection),this._interopMethodsForReconnection=void 0),!!await this._connection.invoke("ConnectCircuit",this._circuitId)&&(this._options.reconnectionHandler.onConnectionUp(),!0))}beginInvokeDotNetFromJS(e,t,n,o,r){this.throwIfDispatchingWhenDisposed(),this._connection.send("BeginInvokeDotNetFromJS",e?e.toString():null,t,n,o||0,r)}endInvokeJSFromDotNet(e,t,n){this.throwIfDispatchingWhenDisposed(),this._connection.send("EndInvokeJSFromDotNet",e,t,n)}sendByteArray(e,t){this.throwIfDispatchingWhenDisposed(),this._connection.send("ReceiveByteArray",e,t)}throwIfDispatchingWhenDisposed(){if(this._disposed)throw new Error("The circuit associated with this dispatcher is no longer available.")}sendLocationChanged(e,t,n){return this._connection.send("OnLocationChanged",e,t,n)}sendLocationChanging(e,t,n,o){return this._connection.send("OnLocationChanging",e,t,n,o)}sendJsDataStream(e,t,n){return function(e,t,n,o){setTimeout((async()=>{let r=5,i=(new Date).valueOf();try{const s=t instanceof Blob?t.size:t.byteLength;let a=0,c=0;for(;a<s;){const l=Math.min(o,s-a),h=await yt(t,a,l);if(r--,r>1)await e.send("ReceiveJSDataChunk",n,c,h,null);else{if(!await e.invoke("ReceiveJSDataChunk",n,c,h,null))break;const t=(new Date).valueOf(),o=t-i;i=t,r=Math.max(1,Math.round(500/Math.max(1,o)))}a+=l,c++}}catch(t){await e.send("ReceiveJSDataChunk",n,-1,null,t.toString())}}),0)}(this._connection,e,t,n)}resolveElement(e){const t=w(e);if(t)return W(t,!0);const n=Number.parseInt(e);if(!Number.isNaN(n))return H(this._componentManager.resolveRootComponent(n));throw new Error(`Invalid sequence number or identifier '${e}'.`)}getRootComponentManager(){return this._componentManager}unhandledError(e){this._logger.log(Kt.Error,e),this.disconnect()}getDisconnectFormData(){const e=new FormData,t=this._circuitId;return e.append("circuitId",t),e}didRenderingFail(){return this._renderingFailed}isDisposedOrDisposing(){return void 0!==this._disposePromise}sendDisconnectBeacon(){if(this._disposed)return;const e=this.getDisconnectFormData();this._disposed=navigator.sendBeacon("_blazor/disconnect",e)}dispose(){return this._disposePromise||(this._disposePromise=this.disposeCore()),this._disposePromise}async disposeCore(){if(!this._startPromise)return void(this._disposed=!0);await this._startPromise,this._disposed=!0,this._connection?.stop();const e=this.getDisconnectFormData();fetch("_blazor/disconnect",{method:"POST",body:e});for(const e of this._options.circuitHandlers)e.onCircuitClosed&&e.onCircuitClosed()}}function Oo(e){const t={...$o,...e};return e&&e.reconnectionOptions&&(t.reconnectionOptions={...$o.reconnectionOptions,...e.reconnectionOptions}),t}const $o={configureSignalR:e=>{},logLevel:bt.Warning,initializers:void 0,circuitHandlers:[],reconnectionOptions:{maxRetries:30,retryIntervalMilliseconds:function(e,t){return t&&e>=t?null:e<10?0:e<20?5e3:3e4},dialogId:"components-reconnect-modal"}};class Fo{static{this.ReconnectOverlayClassName="components-reconnect-overlay"}static{this.ReconnectDialogClassName="components-reconnect-dialog"}static{this.ReconnectVisibleClassName="components-reconnect-visible"}static{this.RejoiningAnimationClassName="components-rejoining-animation"}static{this.AnimationRippleCount=2}constructor(e,t,n){this.document=t,this.logger=n,this.style=this.document.createElement("style"),this.style.innerHTML=Fo.Css,this.overlay=this.document.createElement("div"),this.overlay.className=Fo.ReconnectOverlayClassName,this.host=this.document.createElement("div"),this.host.id=e;const o=this.host.attachShadow({mode:"open"});this.dialog=t.createElement("div"),this.dialog.className=Fo.ReconnectDialogClassName,o.appendChild(this.style),o.appendChild(this.overlay),this.rejoiningAnimation=t.createElement("div"),this.rejoiningAnimation.className=Fo.RejoiningAnimationClassName;for(let e=0;e<Fo.AnimationRippleCount;e++){const e=t.createElement("div");this.rejoiningAnimation.appendChild(e)}this.status=t.createElement("p"),this.status.innerHTML="",this.reloadButton=t.createElement("button"),this.reloadButton.style.display="none",this.reloadButton.innerHTML="Retry",this.reloadButton.addEventListener("click",this.retry.bind(this)),this.dialog.appendChild(this.rejoiningAnimation),this.dialog.appendChild(this.status),this.dialog.appendChild(this.reloadButton),this.overlay.appendChild(this.dialog),this.retryWhenDocumentBecomesVisible=()=>{"visible"===this.document.visibilityState&&this.retry()}}show(){this.document.contains(this.host)||this.document.body.appendChild(this.host),this.reloadButton.style.display="none",this.rejoiningAnimation.style.display="block",this.status.innerHTML="Rejoining the server...",this.host.style.display="block",this.overlay.classList.add(Fo.ReconnectVisibleClassName)}update(e,t){if(1===e||0===t)this.status.innerHTML="Rejoining the server...";else{const e=1===t?"second":"seconds";this.status.innerHTML=`Rejoin failed... trying again in ${t} ${e}`}}hide(){this.host.style.display="none",this.overlay.classList.remove(Fo.ReconnectVisibleClassName)}failed(){this.reloadButton.style.display="block",this.rejoiningAnimation.style.display="none",this.status.innerHTML="Failed to rejoin.<br />Please retry or reload the page.",this.document.addEventListener("visibilitychange",this.retryWhenDocumentBecomesVisible)}rejected(){location.reload()}async retry(){this.document.removeEventListener("visibilitychange",this.retryWhenDocumentBecomesVisible),this.show();try{await wt.reconnect()||this.rejected()}catch(e){this.logger.log(bt.Error,e),this.failed()}}static{this.Css=`\n    .${this.ReconnectOverlayClassName} {\n      position: fixed;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      z-index: 10000;\n      display: none;\n      overflow: hidden;\n      animation: components-reconnect-fade-in;\n    }\n\n    .${this.ReconnectOverlayClassName}.${this.ReconnectVisibleClassName} {\n      display: block;\n    }\n\n    .${this.ReconnectOverlayClassName}::before {\n      content: '';\n      background-color: rgba(0, 0, 0, 0.4);\n      position: absolute;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n      animation: components-reconnect-fadeInOpacity 0.5s ease-in-out;\n      opacity: 1;\n    }\n\n    .${this.ReconnectOverlayClassName} p {\n      margin: 0;\n      text-align: center;\n    }\n\n    .${this.ReconnectOverlayClassName} button {\n      border: 0;\n      background-color: #6b9ed2;\n      color: white;\n      padding: 4px 24px;\n      border-radius: 4px;\n    }\n\n    .${this.ReconnectOverlayClassName} button:hover {\n      background-color: #3b6ea2;\n    }\n\n    .${this.ReconnectOverlayClassName} button:active {\n      background-color: #6b9ed2;\n    }\n\n    .${this.ReconnectDialogClassName} {\n      position: relative;\n      background-color: white;\n      width: 20rem;\n      margin: 20vh auto;\n      padding: 2rem;\n      border-radius: 0.5rem;\n      box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3);\n      display: flex;\n      flex-direction: column;\n      align-items: center;\n      gap: 1rem;\n      opacity: 0;\n      animation: components-reconnect-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-fadeInOpacity 0.5s ease-out 0.3s;\n      animation-fill-mode: forwards;\n      z-index: 10001;\n    }\n\n    .${this.RejoiningAnimationClassName} {\n      display: block;\n      position: relative;\n      width: 80px;\n      height: 80px;\n    }\n\n    .${this.RejoiningAnimationClassName} div {\n      position: absolute;\n      border: 3px solid #0087ff;\n      opacity: 1;\n      border-radius: 50%;\n      animation: ${this.RejoiningAnimationClassName} 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite;\n    }\n\n    .${this.RejoiningAnimationClassName} div:nth-child(2) {\n      animation-delay: -0.5s;\n    }\n\n    @keyframes ${this.RejoiningAnimationClassName} {\n      0% {\n        top: 40px;\n        left: 40px;\n        width: 0;\n        height: 0;\n        opacity: 0;\n      }\n\n      4.9% {\n        top: 40px;\n        left: 40px;\n        width: 0;\n        height: 0;\n        opacity: 0;\n      }\n\n      5% {\n        top: 40px;\n        left: 40px;\n        width: 0;\n        height: 0;\n        opacity: 1;\n      }\n\n      100% {\n        top: 0px;\n        left: 0px;\n        width: 80px;\n        height: 80px;\n        opacity: 0;\n      }\n    }\n\n    @keyframes components-reconnect-fadeInOpacity {\n      0% {\n        opacity: 0;\n      }\n\n      100% {\n        opacity: 1;\n      }\n    }\n\n    @keyframes components-reconnect-slideUp {\n      0% {\n        transform: translateY(30px) scale(0.95);\n      }\n\n      100% {\n        transform: translateY(0);\n      }\n    }\n  `}}class Ho{static{this.ShowClassName="components-reconnect-show"}static{this.HideClassName="components-reconnect-hide"}static{this.FailedClassName="components-reconnect-failed"}static{this.RejectedClassName="components-reconnect-rejected"}static{this.MaxRetriesId="components-reconnect-max-retries"}static{this.CurrentAttemptId="components-reconnect-current-attempt"}static{this.SecondsToNextAttemptId="components-seconds-to-next-attempt"}constructor(e,t,n){if(this.dialog=e,this.document=t,this.document=t,void 0!==n){const e=this.document.getElementById(Ho.MaxRetriesId);e&&(e.innerText=n.toString())}}show(){this.removeClasses(),this.dialog.classList.add(Ho.ShowClassName)}update(e,t){const n=this.document.getElementById(Ho.CurrentAttemptId);n&&(n.innerText=e.toString());const o=this.document.getElementById(Ho.SecondsToNextAttemptId);o&&(o.innerText=t.toString())}hide(){this.removeClasses(),this.dialog.classList.add(Ho.HideClassName)}failed(){this.removeClasses(),this.dialog.classList.add(Ho.FailedClassName)}rejected(){this.removeClasses(),this.dialog.classList.add(Ho.RejectedClassName)}removeClasses(){this.dialog.classList.remove(Ho.ShowClassName,Ho.HideClassName,Ho.FailedClassName,Ho.RejectedClassName)}}class Wo{constructor(e,t,n){this._currentReconnectionProcess=null,this._logger=e,this._reconnectionDisplay=t,this._reconnectCallback=n||wt.reconnect}onConnectionDown(e,t){if(!this._reconnectionDisplay){const t=document.getElementById(e.dialogId);this._reconnectionDisplay=t?new Ho(t,document,e.maxRetries):new Fo(e.dialogId,document,this._logger)}this._currentReconnectionProcess||(this._currentReconnectionProcess=new jo(e,this._logger,this._reconnectCallback,this._reconnectionDisplay))}onConnectionUp(){this._currentReconnectionProcess&&(this._currentReconnectionProcess.dispose(),this._currentReconnectionProcess=null)}}class jo{static{this.MaximumFirstRetryInterval=3e3}constructor(e,t,n,o){this.logger=t,this.reconnectCallback=n,this.isDisposed=!1,this.reconnectDisplay=o,this.reconnectDisplay.show(),this.attemptPeriodicReconnection(e)}dispose(){this.isDisposed=!0,this.reconnectDisplay.hide()}async attemptPeriodicReconnection(e){for(let t=0;void 0===e.maxRetries||t<e.maxRetries;t++){let n;if("function"==typeof e.retryIntervalMilliseconds){const o=e.retryIntervalMilliseconds(t);if(null==o)break;n=o}else n=0===t&&e.retryIntervalMilliseconds>jo.MaximumFirstRetryInterval?jo.MaximumFirstRetryInterval:e.retryIntervalMilliseconds;if(await this.runTimer(n,1e3,(e=>{this.reconnectDisplay.update(t+1,Math.round(e/1e3))})),this.isDisposed)break;try{return await this.reconnectCallback()?void 0:void this.reconnectDisplay.rejected()}catch(e){this.logger.log(bt.Error,e)}}this.reconnectDisplay.failed()}async runTimer(e,t,n){if(e<=0)return void n(0);let o,r,i=Date.now();n(e);const s=()=>{if(this.isDisposed)return void r();const a=Date.now(),c=a-i;i=a;const l=Math.max(1,Math.floor(c/t)),h=t*l;if((e-=h)<Number.EPSILON)return n(0),void r();const d=Math.min(e,t-(c-h));n(e),o=setTimeout(s,d)},a=()=>{"visible"===document.visibilityState&&(clearTimeout(o),n(0),r())};o=setTimeout(s,t),document.addEventListener("visibilitychange",a),await new Promise((e=>r=e)),document.removeEventListener("visibilitychange",a)}}class zo{constructor(e=!0,t,n,o=0){this.singleRuntime=e,this.logger=t,this.webRendererId=o,this.afterStartedCallbacks=[],n&&this.afterStartedCallbacks.push(...n)}async importInitializersAsync(e,t){await Promise.all(e.map((e=>async function(e,n){const o=function(e){const t=document.baseURI;return t.endsWith("/")?`${t}${e}`:`${t}/${e}`}(n),r=await import(o);if(void 0!==r){if(e.singleRuntime){const{beforeStart:n,afterStarted:o,beforeWebAssemblyStart:s,afterWebAssemblyStarted:a,beforeServerStart:c,afterServerStarted:l}=r;let h=n;e.webRendererId===Un.Server&&c&&(h=c),e.webRendererId===Un.WebAssembly&&s&&(h=s);let d=o;return e.webRendererId===Un.Server&&l&&(d=l),e.webRendererId===Un.WebAssembly&&a&&(d=a),i(e,h,d,t)}return function(e,t,n){const r=n[0],{beforeStart:s,afterStarted:a,beforeWebStart:c,afterWebStarted:l,beforeWebAssemblyStart:h,afterWebAssemblyStarted:d,beforeServerStart:u,afterServerStarted:p}=t,f=!(c||l||h||d||u||p||!s&&!a),g=f&&r.enableClassicInitializers;if(f&&!r.enableClassicInitializers)e.logger?.log(bt.Warning,`Initializer '${o}' will be ignored because multiple runtimes are available. Use 'before(Web|WebAssembly|Server)Start' and 'after(Web|WebAssembly|Server)Started' instead.`);else if(g)return i(e,s,a,n);if(function(e){e.webAssembly?e.webAssembly.initializers||(e.webAssembly.initializers={beforeStart:[],afterStarted:[]}):e.webAssembly={initializers:{beforeStart:[],afterStarted:[]}},e.circuit?e.circuit.initializers||(e.circuit.initializers={beforeStart:[],afterStarted:[]}):e.circuit={initializers:{beforeStart:[],afterStarted:[]}}}(r),h&&r.webAssembly.initializers.beforeStart.push(h),d&&r.webAssembly.initializers.afterStarted.push(d),u&&r.circuit.initializers.beforeStart.push(u),p&&r.circuit.initializers.afterStarted.push(p),l&&e.afterStartedCallbacks.push(l),c)return c(r)}(e,r,t)}function i(e,t,n,o){if(n&&e.afterStartedCallbacks.push(n),t)return t(...o)}}(this,e))))}async invokeAfterStartedCallbacks(e){const t=(n=this.webRendererId,I.get(n)?.[1]);var n;t&&await t,await Promise.all(this.afterStartedCallbacks.map((t=>t(e))))}}let qo,Jo,Vo,Ko,Xo,Go,Yo;function Qo(e){if(void 0!==Go)throw new Error("Blazor Server has already started.");return Go=new Promise(Zo.bind(null,e)),Go}async function Zo(e,t,n){await qo;const o=await async function(e){if(e.initializers)return await Promise.all(e.initializers.beforeStart.map((t=>t(e)))),new zo(!1,void 0,e.initializers.afterStarted,Un.Server);const t=await fetch("_blazor/initializers",{method:"GET",credentials:"include",cache:"no-cache"}),n=await t.json(),o=new zo(!0,void 0,void 0,Un.Server);return await o.importInitializersAsync(n,[e]),o}(Ko);if(Jo=kt(document)||"",Xo=new _t(Ko.logLevel),Vo=new Bo(e,Jo,Ko,Xo),Xo.log(bt.Information,"Starting up Blazor server-side application."),wt.reconnect=async()=>!(Vo.didRenderingFail()||!await Vo.reconnect()&&(Xo.log(bt.Information,"Reconnection attempt to the circuit was rejected by the server. This may indicate that the associated state is no longer available on the server."),1)),wt.defaultReconnectionHandler=new Wo(Xo),Ko.reconnectionHandler=Ko.reconnectionHandler||wt.defaultReconnectionHandler,wt._internal.navigationManager.listenForNavigationEvents(Un.Server,((e,t,n)=>Vo.sendLocationChanged(e,t,n)),((e,t,n,o)=>Vo.sendLocationChanging(e,t,n,o))),wt._internal.forceCloseConnection=()=>Vo.disconnect(),wt._internal.sendJSDataStream=(e,t,n)=>Vo.sendJsDataStream(e,t,n),!await Vo.start())return Xo.log(bt.Error,"Failed to start the circuit."),void t();const r=()=>{Vo.sendDisconnectBeacon()};wt.disconnect=r,window.addEventListener("unload",r,{capture:!1,once:!0}),Xo.log(bt.Information,"Blazor server-side application started."),o.invokeAfterStartedCallbacks(wt),t()}async function er(){if(!Go)throw new Error("Cannot start the circuit until Blazor Server has started.");return!(!Vo||Vo.isDisposedOrDisposing())||(Yo?await Yo:(await Go,(!Vo||!Vo.didRenderingFail())&&(Vo&&Vo.isDisposedOrDisposing()&&(Jo=kt(document)||"",Vo=new Bo(Vo.getRootComponentManager(),Jo,Ko,Xo)),Yo=Vo.start(),async function(e){await e,Yo===e&&(Yo=void 0)}(Yo),Yo)))}function tr(e){if(Vo&&!Vo.isDisposedOrDisposing())return Vo.updateRootComponents(e);!async function(e){await Go,await er()&&Vo.updateRootComponents(e)}(e)}const nr=navigator,or=nr.userAgentData&&nr.userAgentData.brands,rr=or&&or.length>0?or.some((e=>"Google Chrome"===e.brand||"Microsoft Edge"===e.brand||"Chromium"===e.brand)):window.chrome,ir=nr.userAgentData?.platform??navigator.platform;function sr(e){return 0!==e.debugLevel&&(rr||navigator.userAgent.includes("Firefox"))}let ar,cr,lr,hr,dr=null;const ur={load:function(e,t){return async function(e,t){const{dotnet:n}=await async function(e){if("undefined"==typeof WebAssembly||!WebAssembly.validate)throw new Error("This browser does not support WebAssembly.");let t="_framework/dotnet.js";if(e.loadBootResource){const n="dotnetjs",o=e.loadBootResource(n,"dotnet.js",t,"","js-module-dotnet");if("string"==typeof o)t=o;else if(o)throw new Error(`For a ${n} resource, custom loaders must supply a URI string.`)}const n=new URL(t,document.baseURI).toString();return await import(n)}(e),o=function(e,t){const n={maxParallelDownloads:1e6,enableDownloadRetry:!1,applicationEnvironment:e.environment},o={...window.Module||{},onConfigLoaded:async n=>{n.environmentVariables||(n.environmentVariables={}),"sharded"===n.globalizationMode&&(n.environmentVariables.__BLAZOR_SHARDED_ICU="1"),wt._internal.getApplicationEnvironment=()=>n.applicationEnvironment,t?.(n),hr=await async function(e,t){if(e.initializers)return await Promise.all(e.initializers.beforeStart.map((t=>t(e)))),new zo(!1,void 0,e.initializers.afterStarted,Un.WebAssembly);{const n=[e,t.resources?.extensions??{}],o=new zo(!0,void 0,void 0,Un.WebAssembly),r=Object.keys(t?.resources?.libraryInitializers||{});return await o.importInitializersAsync(r,n),o}}(e,n)},onDownloadResourceProgress:pr,config:n,out:gr,err:mr};return o}(e,t);e.applicationCulture&&n.withApplicationCulture(e.applicationCulture),e.environment&&n.withApplicationEnvironment(e.environment),e.loadBootResource&&n.withResourceLoader(e.loadBootResource),n.withModuleConfig(o),e.configureRuntime&&e.configureRuntime(n),lr=await n.create()}(e,t)},start:function(){return async function(){if(!lr)throw new Error("The runtime must be loaded it gets configured.");const{setModuleImports:t,INTERNAL:n,getConfig:o,invokeLibraryInitializers:r}=lr;cr=n,function(e){const t=ir.match(/^Mac/i)?"Cmd":"Alt";sr(e)&&console.info(`Debugging hotkey: Shift+${t}+D (when application has focus)`),document.addEventListener("keydown",(t=>{t.shiftKey&&(t.metaKey||t.altKey)&&"KeyD"===t.code&&(sr(e)?navigator.userAgent.includes("Firefox")?async function(){const e=await fetch(`_framework/debug?url=${encodeURIComponent(location.href)}&isFirefox=true`);200!==e.status&&console.warn(await e.text())}():rr?function(){const e=document.createElement("a");e.href=`_framework/debug?url=${encodeURIComponent(location.href)}`,e.target="_blank",e.rel="noopener noreferrer",e.click()}():console.error("Currently, only Microsoft Edge (80+), Google Chrome, or Chromium, are supported for debugging."):console.error("Cannot start debugging, because the application was not compiled with debugging enabled."))}))}(o()),wt.runtime=lr,wt._internal.dotNetCriticalError=mr,t("blazor-internal",{Blazor:{_internal:wt._internal}});const i=await lr.getAssemblyExports("Microsoft.AspNetCore.Components.WebAssembly");return Object.assign(wt._internal,{dotNetExports:{...i.Microsoft.AspNetCore.Components.WebAssembly.Services.DefaultWebAssemblyJSRuntime}}),ar=e.attachDispatcher({beginInvokeDotNetFromJS:(e,t,n,o,r)=>{if(yr(),!o&&!t)throw new Error("Either assemblyName or dotNetObjectId must have a non null value.");const i=o?o.toString():t;wt._internal.dotNetExports.BeginInvokeDotNet(e?e.toString():null,i,n,r)},endInvokeJSFromDotNet:(e,t,n)=>{wt._internal.dotNetExports.EndInvokeJS(n)},sendByteArray:(e,t)=>{wt._internal.dotNetExports.ReceiveByteArrayFromJS(e,t)},invokeDotNetFromJS:(e,t,n,o)=>(yr(),wt._internal.dotNetExports.InvokeDotNet(e||null,t,n??0,o))}),{invokeLibraryInitializers:r}}()},callEntryPoint:async function(){try{await lr.runMain(lr.getConfig().mainAssemblyName,[])}catch(e){console.error(e),Uo()}},getArrayEntryPtr:function(e,t,n){const o=function(e){return e+12}(e)+4+t*n;return o},getObjectFieldsBaseAddress:function(e){return e+8},readInt16Field:function(e,t){return lr.getHeapI16(e+(t||0))},readInt32Field:function(e,t){return lr.getHeapI32(e+(t||0))},readUint64Field:function(e,t){return lr.getHeapU52(e+(t||0))},readObjectField:function(e,t){return lr.getHeapU32(e+(t||0))},readStringField:function(e,t,n){const o=lr.getHeapU32(e+(t||0));if(0===o)return null;if(n){const e=cr.monoObjectAsBoolOrNullUnsafe(o);if("boolean"==typeof e)return e?"":null}return cr.monoStringToStringUnsafe(o)},readStructField:function(e,t){return e+(t||0)},beginHeapLock:function(){return yr(),dr=vr.create(),dr},invokeWhenHeapUnlocked:function(e){dr?dr.enqueuePostReleaseAction(e):e()}};function pr(e,t){const n=e/t*100;document.documentElement.style.setProperty("--blazor-load-percentage",`${n}%`),document.documentElement.style.setProperty("--blazor-load-percentage-text",`"${Math.floor(n)}%"`)}const fr=["DEBUGGING ENABLED"],gr=e=>fr.indexOf(e)<0&&console.log(e),mr=e=>{console.error(e||"(null)"),Uo()};function yr(){if(dr)throw new Error("Assertion failed - heap is currently locked")}class vr{enqueuePostReleaseAction(e){this.postReleaseActions||(this.postReleaseActions=[]),this.postReleaseActions.push(e)}release(){if(dr!==this)throw new Error("Trying to release a lock which isn't current");for(cr.mono_wasm_gc_unlock(),dr=null;this.postReleaseActions?.length;)this.postReleaseActions.shift()(),yr()}static create(){return cr.mono_wasm_gc_lock(),new vr}}class wr{constructor(e){this.batchAddress=e,this.arrayRangeReader=br,this.arrayBuilderSegmentReader=_r,this.diffReader=Sr,this.editReader=Cr,this.frameReader=Er}updatedComponents(){return t.readStructField(this.batchAddress,0)}referenceFrames(){return t.readStructField(this.batchAddress,br.structLength)}disposedComponentIds(){return t.readStructField(this.batchAddress,2*br.structLength)}disposedEventHandlerIds(){return t.readStructField(this.batchAddress,3*br.structLength)}updatedComponentsEntry(e,t){return Ir(e,t,Sr.structLength)}referenceFramesEntry(e,t){return Ir(e,t,Er.structLength)}disposedComponentIdsEntry(e,n){const o=Ir(e,n,4);return t.readInt32Field(o)}disposedEventHandlerIdsEntry(e,n){const o=Ir(e,n,8);return t.readUint64Field(o)}}const br={structLength:8,values:e=>t.readObjectField(e,0),count:e=>t.readInt32Field(e,4)},_r={structLength:12,values:e=>{const n=t.readObjectField(e,0),o=t.getObjectFieldsBaseAddress(n);return t.readObjectField(o,0)},offset:e=>t.readInt32Field(e,4),count:e=>t.readInt32Field(e,8)},Sr={structLength:4+_r.structLength,componentId:e=>t.readInt32Field(e,0),edits:e=>t.readStructField(e,4),editsEntry:(e,t)=>Ir(e,t,Cr.structLength)},Cr={structLength:20,editType:e=>t.readInt32Field(e,0),siblingIndex:e=>t.readInt32Field(e,4),newTreeIndex:e=>t.readInt32Field(e,8),moveToSiblingIndex:e=>t.readInt32Field(e,8),removedAttributeName:e=>t.readStringField(e,16)},Er={structLength:36,frameType:e=>t.readInt16Field(e,4),subtreeLength:e=>t.readInt32Field(e,8),elementReferenceCaptureId:e=>t.readStringField(e,16),componentId:e=>t.readInt32Field(e,12),elementName:e=>t.readStringField(e,16),textContent:e=>t.readStringField(e,16),markupContent:e=>t.readStringField(e,16),attributeName:e=>t.readStringField(e,16),attributeValue:e=>t.readStringField(e,24,!0),attributeEventHandlerId:e=>t.readUint64Field(e,8)};function Ir(e,n,o){return t.getArrayEntryPtr(e,n,o)}class kr{constructor(e){this.componentManager=e}resolveRegisteredElement(e){const t=Number.parseInt(e);if(!Number.isNaN(t))return H(this.componentManager.resolveRootComponent(t))}getParameterValues(e){return this.componentManager.initialComponents[e].parameterValues}getParameterDefinitions(e){return this.componentManager.initialComponents[e].parameterDefinitions}getTypeName(e){return this.componentManager.initialComponents[e].typeName}getAssembly(e){return this.componentManager.initialComponents[e].assembly}getCount(){return this.componentManager.initialComponents.length}}let Tr,Rr,Ar,Dr,xr=!1,Nr=!1,Mr=!0,Pr=!1;const Lr=new Promise((e=>{Dr=e}));let Ur;const Br=new Promise((e=>{Ur=e}));let Or;const $r=new Promise((e=>{Or=e}));function Fr(e){if(Tr)throw new Error("WebAssembly options have already been configured.");!async function(e){const t=await e;Tr=t,Or()}(e)}function Hr(e){if(void 0!==Ar)throw new Error("Blazor WebAssembly has already started.");return Ar=new Promise(Wr.bind(null,e)),Ar}async function Wr(e,n,o){(function(){if(window.parent!==window&&!window.opener&&window.frameElement){const e=window.sessionStorage&&window.sessionStorage["Microsoft.AspNetCore.Components.WebAssembly.Authentication.CachedAuthSettings"],t=e&&JSON.parse(e);return t&&t.redirect_uri&&location.href.startsWith(t.redirect_uri)}return!1})()&&await new Promise((()=>{}));const r=jr();!function(e){const t=D;D=(e,n,o)=>{((e,t,n)=>{const o=De(e);o?.eventDelegator.getHandler(t)&&ur.invokeWhenHeapUnlocked(n)})(e,n,(()=>t(e,n,o)))}}(),wt._internal.applyHotReload=(e,t,n,o,r)=>{ar.invokeDotNetStaticMethod("Microsoft.AspNetCore.Components.WebAssembly","ApplyHotReloadDelta",e,t,n,o,r??null)},wt._internal.getApplyUpdateCapabilities=()=>ar.invokeDotNetStaticMethod("Microsoft.AspNetCore.Components.WebAssembly","GetApplyUpdateCapabilities"),wt._internal.invokeJSJson=zr,wt._internal.endInvokeDotNetFromJS=qr,wt._internal.receiveWebAssemblyDotNetDataStream=Jr,wt._internal.receiveByteArray=Vr;const i=(t=ur,t);wt.platform=i,wt._internal.renderBatch=(e,t)=>{const n=ur.beginHeapLock();try{xe(e,new wr(t))}finally{n.release()}},wt._internal.navigationManager.listenForNavigationEvents(Un.WebAssembly,(async(e,t,n)=>{await ar.invokeDotNetStaticMethodAsync("Microsoft.AspNetCore.Components.WebAssembly","NotifyLocationChanged",e,t,n)}),(async(e,t,n,o)=>{const r=await ar.invokeDotNetStaticMethodAsync("Microsoft.AspNetCore.Components.WebAssembly","NotifyLocationChangingAsync",t,n,o);wt._internal.navigationManager.endLocationChanging(e,r)}));const s=new kr(e);wt._internal.registeredComponents={getRegisteredComponentsCount:()=>s.getCount(),getAssembly:e=>s.getAssembly(e),getTypeName:e=>s.getTypeName(e),getParameterDefinitions:e=>s.getParameterDefinitions(e)||"",getParameterValues:e=>s.getParameterValues(e)||""},wt._internal.getPersistedState=()=>Tt(document,Et)||"",wt._internal.getInitialComponentsUpdate=()=>Br,wt._internal.updateRootComponents=e=>wt._internal.dotNetExports?.UpdateRootComponentsCore(e),wt._internal.endUpdateRootComponents=t=>e.onAfterUpdateRootComponents?.(t),wt._internal.attachRootComponentToElement=(e,t,n)=>{const o=s.resolveRegisteredElement(e);o?Ae(n,o,t,!1):function(e,t,n){const o="::before";let r=!1;if(e.endsWith("::after"))e=e.slice(0,-7),r=!0;else if(e.endsWith(o))throw new Error(`The '${o}' selector is not supported.`);const i=w(e)||document.querySelector(e);if(!i)throw new Error(`Could not find any element matching selector '${e}'.`);Ae(n,W(i,!0),t,r)}(e,t,n)};try{await r,await i.start()}catch(e){throw new Error(`Failed to start platform. Reason: ${e}`)}i.callEntryPoint(),hr.invokeAfterStartedCallbacks(wt),Nr=!0,n()}function jr(){return Rr??=(async()=>{await $r;const e=Tr??{},t=Tr?.configureRuntime;e.configureRuntime=e=>{t?.(e),Pr&&e.withEnvironmentVariable("__BLAZOR_WEBASSEMBLY_WAIT_FOR_ROOT_COMPONENTS","true")},await ur.load(e,Dr),xr=!0})(),Rr}function zr(e,t,n,o,r){return 0!==r?(ar.beginInvokeJSFromDotNet(r,e,o,n,t),null):ar.invokeJSFromDotNet(e,o,n,t)}function qr(e,t,n){ar.endInvokeDotNetFromJS(e,t,n)}function Jr(e,t,n,o){!function(e,t,n,o,r){let i=vt.get(t);if(!i){const n=new ReadableStream({start(e){vt.set(t,e),i=e}});e.supplyDotNetStream(t,n)}r?(i.error(r),vt.delete(t)):0===o?(i.close(),vt.delete(t)):i.enqueue(n.length===o?n:n.subarray(0,o))}(ar,e,t,n,o)}function Vr(e,t){ar.receiveByteArray(e,t)}function Kr(e,t){t.namespaceURI?e.setAttributeNS(t.namespaceURI,t.name,t.value):e.setAttribute(t.name,t.value)}const Xr="data-permanent";var Gr,Yr;!function(e){e[e.None=0]="None",e[e.Some=1]="Some",e[e.Infinite=2]="Infinite"}(Gr||(Gr={})),function(e){e.Keep="keep",e.Update="update",e.Insert="insert",e.Delete="delete"}(Yr||(Yr={}));class Qr{static create(e,t,n){return 0===t&&n===e.length?e:new Qr(e,t,n)}constructor(e,t,n){this.source=e,this.startIndex=t,this.length=n}item(e){return this.source.item(e+this.startIndex)}forEach(e,t){for(let t=0;t<this.length;t++)e(this.item(t),t,this)}}let Zr=null;function ei(e,t){si(t),ti(e,t)}function ti(e,t){let n;n=e instanceof Node?e:V(e.startExclusive)??e.startExclusive.parentNode;const o=Z(n)||Z(t);let r,i;o&&(W(n,!0),W(t,!0)),o?(r=new hi(n),i=new hi(t)):(r=n.childNodes,i=t.childNodes),e instanceof Node||(r=new li(r,e));const s=function(e,t,n){const o=function(e,t,n){const o=Math.min(e.length,t.length);for(let r=0;r<o;r++)if(n(e.item(r),t.item(r))!==Gr.None)return r;return o}(e,t,n);if(o===e.length&&o===t.length)return{skipCount:o};const r=function(e,t,n,o,r){let i=e.length-1,s=t.length-1,a=0;for(;i>=n&&s>=o&&r(e.item(i),t.item(s))===Gr.None;)i--,s--,a++;return a}(e,t,o,o,n),i=function(e){const t=[];let n=e.length-1,o=e[n]?.length-1;for(;n>0||o>0;){const r=0===n?Yr.Insert:0===o?Yr.Delete:e[n][o];switch(t.unshift(r),r){case Yr.Keep:case Yr.Update:n--,o--;break;case Yr.Insert:o--;break;case Yr.Delete:n--}}return t}(function(e,t,n){const o=[],r=[],i=e.length,s=t.length;if(0===i&&0===s)return[];for(let e=0;e<=i;e++)(o[e]=Array(s+1))[0]=e,r[e]=Array(s+1);const a=o[0];for(let e=1;e<=s;e++)a[e]=e;for(let a=1;a<=i;a++)for(let i=1;i<=s;i++){const s=n(e.item(a-1),t.item(i-1)),c=o[a-1][i]+1,l=o[a][i-1]+1;let h;switch(s){case Gr.None:h=o[a-1][i-1];break;case Gr.Some:h=o[a-1][i-1]+1;break;case Gr.Infinite:h=Number.MAX_VALUE}h<l&&h<c?(o[a][i]=h,r[a][i]=s===Gr.None?Yr.Keep:Yr.Update):l<c?(o[a][i]=l,r[a][i]=Yr.Insert):(o[a][i]=c,r[a][i]=Yr.Delete)}return r}(e=Qr.create(e,o,e.length-o-r),t=Qr.create(t,o,t.length-o-r),n));return{skipCount:o,edits:i}}(r,i,ii);let a,c;o?(a=new ci(r.item(0)),c=new ci(i.item(0))):(a=new ai(r.item(0)),c=new ai(i.item(0)));for(let e=0;e<s.skipCount;e++)ni(a.current,c.current),a.advance(),c.advance();if(s.edits){const t=s.edits,o=t.length;for(let e=0;e<o;e++){const o=t[e];switch(o){case Yr.Keep:ni(a.current,c.current),a.advance(),c.advance();break;case Yr.Update:oi(a.current,c.current),a.advance(),c.advance();break;case Yr.Delete:{const e=a.current;a.advance(),l=e,Z(h=n)?q(l,W(document.createDocumentFragment()),0):h.removeChild(l);break}case Yr.Insert:{const e=c.current;c.advance(),ri(e,a.current,n);break}default:throw new Error(`Unexpected operation: '${o}'`)}}const r=e instanceof Node?null:e.endExclusive;for(;a.current!==r;)ni(a.current,c.current),a.advance(),c.advance();if(c.current)throw new Error("Updating the DOM failed because the sets of trailing nodes had inconsistent lengths.")}var l,h}function ni(e,t){switch(e.nodeType){case Node.TEXT_NODE:break;case Node.COMMENT_NODE:{const n=e,o=t,r=X(n),i=X(o);if(!r!=!i)throw new Error("Not supported: merging component comment nodes with non-component comment nodes");r&&(function(e,t){if(!Bt(e,t))throw new Error(`Cannot merge mismatching component descriptors:\n${JSON.stringify(e)}\nand\n${JSON.stringify(t)}`);if(e.uniqueId=t.uniqueId,"webassembly"===e.type||"auto"===e.type){const n=t;e.parameterDefinitions=n.parameterDefinitions,e.parameterValues=n.parameterValues}if("server"===e.type||"auto"===e.type){const n=t;e.sequence=n.sequence,e.descriptor=n.descriptor}}(r,i),we(n)||ti(e,t));break}case Node.ELEMENT_NODE:{const o=(n=t)instanceof HTMLSelectElement?n.selectedIndex:n instanceof HTMLInputElement?"checkbox"===n.type||"radio"===n.type?n.checked:n.getAttribute("value")||"":n instanceof HTMLTextAreaElement?n.value:null;!function(e,t){if(!function(e,t){const n=e.length;if(n!==t.length)return!1;for(let o=0;o<n;o++){const n=t.item(o),r=e.item(o);if(n.name!==r.name||n.value!==r.value)return!1}return!0}(e.attributes,t.attributes)){(e instanceof HTMLLinkElement||e instanceof HTMLScriptElement)&&(e.integrity=t.integrity);const r=new Map;for(const t of e.attributes)r.set(t.name,t);for(const n of t.attributes){const t=n.namespaceURI?e.getAttributeNodeNS(n.namespaceURI,n.localName):e.getAttributeNode(n.name);t?(t.value!==n.value&&Kr(e,n),r.delete(t.name)):Kr(e,n)}for(const t of r.values())n=e,(o=t).namespaceURI?n.removeAttributeNS(o.namespaceURI,o.localName):n.removeAttribute(o.name)}var n,o}(e,t),ae(e),function(e){return e.hasAttribute(Xr)}(e)||ti(e,t),null!==o&&function(e,t){e instanceof HTMLTextAreaElement&&e.value!==t?e.value=t:e instanceof HTMLSelectElement&&e.selectedIndex!==t?e.selectedIndex=t:e instanceof HTMLInputElement&&("checkbox"===e.type||"radio"===e.type?e.checked!==t&&(e.checked=t):e.value!==t&&(e.value=t))}(e,o);break}case Node.DOCUMENT_TYPE_NODE:break;default:throw new Error(`Not implemented: matching nodes of type ${e.nodeType}`)}var n}function oi(e,t){switch(e.nodeType){case Node.TEXT_NODE:case Node.COMMENT_NODE:e.textContent=t.textContent;break;default:throw new Error(`Not implemented: substituting nodes of type ${e.nodeType}`)}}function ri(e,t,n){Z(n)?function(e,t,n){const o=Y(t);let r;if(n){if(r=Array.prototype.indexOf.call(o,n),r<0)throw new Error("Could not find logical element in the parent logical node list")}else r=o.length;q(e,t,r)}(e,n,t):n.insertBefore(e,t);const o=document.createNodeIterator(e,NodeFilter.SHOW_COMMENT);for(;o.nextNode();){const e=X(o.referenceNode);e&&Zr?.registerComponent(e)}}function ii(e,t){if(e.nodeType!==t.nodeType)return Gr.Infinite;if(Z(e)!==Z(t))return Gr.Infinite;switch(e.nodeType){case Node.TEXT_NODE:return e.textContent===t.textContent?Gr.None:Gr.Some;case Node.COMMENT_NODE:{const n=X(e),o=X(t);return n||o?n&&o&&Bt(n,o)?Gr.None:Gr.Infinite:e.textContent===t.textContent?Gr.None:Gr.Some}case Node.ELEMENT_NODE:return e.tagName!==t.tagName?Gr.Infinite:(n=t,e.getAttribute(Xr)!==n.getAttribute(Xr)?Gr.Infinite:Gr.None);case Node.DOCUMENT_TYPE_NODE:return Gr.None;default:return Gr.Infinite}var n}function si(e){const t=St(e,"server"),n=St(e,"webassembly"),o=St(e,"auto"),r=[];for(const e of[...t,...n,...o]){const t=X(e.start);if(t)r.push(t);else{H(e);const{start:t,end:n}=e;t.textContent="bl-root",n&&(n.textContent="/bl-root"),r.push(e)}}return r}class ai{constructor(e){this.current=e}advance(){if(!this.current)throw new Error("Cannot advance beyond the end of the sibling array");this.current=this.current.nextSibling}}class ci{constructor(e){this.current=e}advance(){if(!this.current)throw new Error("Cannot advance beyond the end of the logical children array");const e=Q(this.current);this.current=e}}class li{item(e){return this.siblings.item(this.startIndex+e)}forEach(e,t){for(let n=0;n<this.length;n++)e.call(t,this.item(n),n,this)}constructor(e,t){this.siblings=e,this.startIndex=Array.prototype.indexOf.call(this.siblings,t.startExclusive)+1,this.endIndexExcl=Array.prototype.indexOf.call(this.siblings,t.endExclusive),this.length=this.endIndexExcl-this.startIndex}}class hi{constructor(e){const t=Y(e);this.length=t.length,Object.assign(this,t)}item(e){return this[e]||null}forEach(e,t){for(let n=0;n<this.length;n++)e.call(t,this.item(n),n,this)}}const di="text/html; blazor-enhanced-nav=on";let ui,pi,fi,gi=location.href;function mi(e,t){t?history.replaceState(null,"",e):history.pushState(null,"",e),bi(e,!1)}function yi(e){He()||e.target instanceof Element&&!function(e){const t=e.closest("[data-enhance-nav]");if(t){const e=t.getAttribute("data-enhance-nav");return""===e||"true"===e.toLowerCase()}return!0}(e.target)||Ne(e,(e=>{const t=Pe(e);history.pushState(null,"",e),t?Ue(e):bi(e,!0)}))}function vi(e){He()||bi(location.href,!1)}function wi(e){if(He()||e.defaultPrevented)return;const t=e.target;if(t instanceof HTMLFormElement){if(!function(e){const t=e.getAttribute("data-enhance");return"string"==typeof t&&""===t||"true"===t?.toLowerCase()}(t))return;const n=e.submitter?.getAttribute("formmethod")||t.method;if("dialog"===n)return void console.warn('A form cannot be enhanced when its method is "dialog".');const o=e.submitter?.getAttribute("formtarget")||t.target;if(""!==o&&"_self"!==o)return void console.warn('A form cannot be enhanced when its target is different from the default value "_self".');e.preventDefault();const r=new URL(e.submitter?.getAttribute("formaction")||t.action,document.baseURI),i={method:n},s=new FormData(t),a=e.submitter?.getAttribute("name"),c=e.submitter.getAttribute("value");a&&c&&s.append(a,c);const l=new URLSearchParams(s).toString();if("get"===i.method)r.search=l,history.pushState(null,"",r.toString());else{const n=e.submitter?.getAttribute("formenctype")||t.enctype;"multipart/form-data"===n?i.body=s:(i.body=l,i.headers={"content-type":n,accept:di})}bi(r.toString(),!1,i)}}async function bi(e,t,n,o){fi=!0,ui?.abort(),function(e,t){ke?.(e,t)}(e,t),pi.enhancedNavigationStarted(),ui=new AbortController;const r=ui.signal,i=fetch(e,Object.assign({signal:r,mode:"no-cors",headers:{accept:di}},n));let s=null;if(await async function(e,t,n,o){let r;try{if(r=await e,!r.body)return void n(r,"");const t=r.headers.get("ssr-framing");if(!t){const e=await r.text();return void n(r,e)}let o=!0;await r.body.pipeThrough(new TextDecoderStream).pipeThrough(function(e){let t="";return new TransformStream({transform(n,o){if(t+=n,t.indexOf(e,t.length-n.length-e.length)>=0){const n=t.split(e);n.slice(0,-1).forEach((e=>o.enqueue(e))),t=n[n.length-1]}},flush(e){e.enqueue(t)}})}(`\x3c!--${t}--\x3e`)).pipeTo(new WritableStream({write(e){o?(o=!1,n(r,e)):(e=>{const t=document.createRange().createContextualFragment(e);for(;t.firstChild;)document.body.appendChild(t.firstChild)})(e)}}))}catch(e){if("AbortError"===e.name&&t.aborted)return;throw e}}(i,r,((t,r)=>{const i=!n?.method||"get"===n.method,a=t.status>=200&&t.status<300;if("opaque"===t.type){if(i)return void Si(e);throw new Error("Enhanced navigation does not support making a non-GET request to an endpoint that redirects to an external origin. Avoid enabling enhanced navigation for form posts that may perform external redirections.")}if(a&&"allow"!==t.headers.get("blazor-enhanced-nav")){if(i)return void Si(e);throw new Error("Enhanced navigation does not support making a non-GET request to a non-Blazor endpoint. Avoid enabling enhanced navigation for forms that post to a non-Blazor endpoint.")}(t.redirected||o)&&((o?"get"===o:i)?history.replaceState(null,"",t.url):t.url!==location.href&&history.pushState(null,"",t.url),e=t.url);const c=t.headers.get("blazor-enhanced-nav-redirect-location");if(c)return void location.replace(c);t.redirected||i||!a||(Le(t.url,gi)?location.href!==gi&&history.pushState(null,"",gi):s=`Cannot perform enhanced form submission that changes the URL (except via a redirection), because then back/forward would not work. Either remove this form's 'action' attribute, or change its method to 'get', or do not mark it as enhanced.\nOld URL: ${location.href}\nNew URL: ${t.url}`),gi=t.url;const l=t.headers.get("content-type");if(l?.startsWith("text/html")&&r){const e=(new DOMParser).parseFromString(r,"text/html");ei(document,e),pi.documentUpdated()}else l?.startsWith("text/")&&r?_i(r):a||r?i?Si(e):_i(`Error: ${n.method} request to ${e} returned non-HTML content of type ${l||"unspecified"}.`):_i(`Error: ${t.status} ${t.statusText}`)})),!r.aborted){const t=e.indexOf("#");if(t>=0){const n=e.substring(t+1),o=document.getElementById(n);o?.scrollIntoView()}if(fi=!1,pi.enhancedNavigationCompleted(),s)throw new Error(s)}}function _i(e){document.documentElement.textContent=e;const t=document.documentElement.style;t.fontFamily="consolas, monospace",t.whiteSpace="pre-wrap",t.padding="1rem"}function Si(e){history.replaceState(null,"",e+"?"),location.replace(e)}let Ci,Ei=!0;function Ii(e,t){Ci=t,e?.disableDomPreservation&&(Ei=!1),customElements.define("blazor-ssr-end",ki)}class ki extends HTMLElement{connectedCallback(){const e=this.parentNode;e.parentNode?.removeChild(e),e.childNodes.forEach((e=>{if(e instanceof HTMLTemplateElement){const t=e.getAttribute("blazor-component-id");if(t)"true"!==e.getAttribute("enhanced-nav")&&ui||function(e,t){const n=function(e){const t=`bl:${e}`,n=document.createNodeIterator(document,NodeFilter.SHOW_COMMENT);let o=null;for(;(o=n.nextNode())&&o.textContent!==t;);if(!o)return null;const r=`/bl:${e}`;let i=null;for(;(i=n.nextNode())&&i.textContent!==r;);return i?{startMarker:o,endMarker:i}:null}(e);if(n){const{startMarker:e,endMarker:o}=n;if(Ei)ei({startExclusive:e,endExclusive:o},t);else{const n=o.parentNode,r=new Range;for(r.setStart(e,e.textContent.length),r.setEnd(o,0),r.deleteContents();t.childNodes[0];)n.insertBefore(t.childNodes[0],o)}Ci.documentUpdated()}}(t,e.content);else switch(e.getAttribute("type")){case"redirection":const t=Fe(e.content.textContent),n="form-post"===e.getAttribute("from");"true"===e.getAttribute("enhanced")&&Me(t)?bi(t,!1,void 0,n?"post":"get"):n?t!==location.href&&location.assign(t):location.replace(t);break;case"error":_i(e.content.textContent||"Error")}}}))}}class Ti{constructor(e){var t;this._circuitInactivityTimeoutMs=e,this._rootComponentsBySsrComponentId=new Map,this._seenDescriptors=new Set,this._pendingOperationBatches={},this._nextOperationBatchId=1,this._nextSsrComponentId=1,this._didWebAssemblyFailToLoadQuickly=!1,this._isComponentRefreshPending=!1,this.initialComponents=[],t=()=>{this.rootComponentsMayRequireRefresh()},E.push(t)}onAfterRenderBatch(e){e===Un.Server&&this.circuitMayHaveNoRootComponents()}onDocumentUpdated(){this.rootComponentsMayRequireRefresh()}onEnhancedNavigationCompleted(){this.rootComponentsMayRequireRefresh()}registerComponent(e){if(this._seenDescriptors.has(e))return;"webassembly"===e.type?this.startLoadingWebAssemblyIfNotStarted():"auto"===e.type&&this.startLoadingWebAssemblyIfNotStarted(1);const t=this._nextSsrComponentId++;this._seenDescriptors.add(e),this._rootComponentsBySsrComponentId.set(t,{descriptor:e,ssrComponentId:t})}unregisterComponent(e){this._seenDescriptors.delete(e.descriptor),this._rootComponentsBySsrComponentId.delete(e.ssrComponentId),this.circuitMayHaveNoRootComponents()}async startLoadingWebAssemblyIfNotStarted(e){if(void 0!==Rr)return;Pr=!0;const t=jr(),n=await Lr;void 0!==e&&(n.maxParallelDownloads=e),function(e){if(!e.cacheBootResources)return!1;const t=Ri(e);if(!t)return!1;const n=window.localStorage.getItem(t.key);return t.value===n}(n)||this.onWebAssemblyFailedToLoadQuickly(),await t,function(e){const t=Ri(e);t&&window.localStorage.setItem(t.key,t.value)}(n),this.rootComponentsMayRequireRefresh()}onWebAssemblyFailedToLoadQuickly(){this._didWebAssemblyFailToLoadQuickly||(this._didWebAssemblyFailToLoadQuickly=!0,this.rootComponentsMayRequireRefresh())}startCircutIfNotStarted(){return void 0===Go?Qo(this):!Vo||Vo.isDisposedOrDisposing()?er():void 0}async startWebAssemblyIfNotStarted(){this.startLoadingWebAssemblyIfNotStarted(),void 0===Ar&&await Hr(this)}rootComponentsMayRequireRefresh(){this._isComponentRefreshPending||(this._isComponentRefreshPending=!0,setTimeout((()=>{this._isComponentRefreshPending=!1,this.refreshRootComponents(this._rootComponentsBySsrComponentId.values())}),0))}circuitMayHaveNoRootComponents(){if(this.rendererHasExistingOrPendingComponents(Un.Server,"server","auto"))return clearTimeout(this._circuitInactivityTimeoutId),void(this._circuitInactivityTimeoutId=void 0);void 0===this._circuitInactivityTimeoutId&&(this._circuitInactivityTimeoutId=setTimeout((()=>{this.rendererHasExistingOrPendingComponents(Un.Server,"server","auto")||(async function(){await(Vo?.dispose())}(),this._circuitInactivityTimeoutId=void 0)}),this._circuitInactivityTimeoutMs))}rendererHasComponents(e){const t=De(e);return void 0!==t&&t.getRootComponentCount()>0}rendererHasExistingOrPendingComponents(e,...t){if(this.rendererHasComponents(e))return!0;for(const{descriptor:{type:n},assignedRendererId:o}of this._rootComponentsBySsrComponentId.values()){if(o===e)return!0;if(void 0===o&&-1!==t.indexOf(n))return!0}return!1}refreshRootComponents(e){const t=new Map;for(const n of e){const e=this.determinePendingOperation(n);if(!e)continue;const o=n.assignedRendererId;if(!o)throw new Error("Descriptors must be assigned a renderer ID before getting used as root components");let r=t.get(o);r||(r=[],t.set(o,r)),r.push(e)}for(const[e,n]of t){const t={batchId:this._nextOperationBatchId++,operations:n};this._pendingOperationBatches[t.batchId]=t;const o=JSON.stringify(t);e===Un.Server?tr(o):this.updateWebAssemblyRootComponents(o)}this.circuitMayHaveNoRootComponents()}updateWebAssemblyRootComponents(e){Mr?(Ur(e),Mr=!1):function(e){if(!Ar)throw new Error("Blazor WebAssembly has not started.");if(!wt._internal.updateRootComponents)throw new Error("Blazor WebAssembly has not initialized.");Nr?wt._internal.updateRootComponents(e):async function(e){if(await Ar,!wt._internal.updateRootComponents)throw new Error("Blazor WebAssembly has not initialized.");wt._internal.updateRootComponents(e)}(e)}(e)}resolveRendererIdForDescriptor(e){switch("auto"===e.type?this.getAutoRenderMode():e.type){case"server":return this.startCircutIfNotStarted(),Un.Server;case"webassembly":return this.startWebAssemblyIfNotStarted(),Un.WebAssembly;case null:return null}}getAutoRenderMode(){return this.rendererHasExistingOrPendingComponents(Un.WebAssembly,"webassembly")?"webassembly":this.rendererHasExistingOrPendingComponents(Un.Server,"server")?"server":xr?"webassembly":this._didWebAssemblyFailToLoadQuickly?"server":null}determinePendingOperation(e){if(t=e.descriptor,document.contains(t.start)){if(void 0===e.assignedRendererId){if(fi||"loading"===document.readyState)return null;const t=this.resolveRendererIdForDescriptor(e.descriptor);return null===t?null:T(t)?(be(e.descriptor.start,!0),e.assignedRendererId=t,e.uniqueIdAtLastUpdate=e.descriptor.uniqueId,{type:"add",ssrComponentId:e.ssrComponentId,marker:Ut(e.descriptor)}):null}return T(e.assignedRendererId)?e.uniqueIdAtLastUpdate===e.descriptor.uniqueId?null:(e.uniqueIdAtLastUpdate=e.descriptor.uniqueId,{type:"update",ssrComponentId:e.ssrComponentId,marker:Ut(e.descriptor)}):null}return e.hasPendingRemoveOperation?null:void 0===e.assignedRendererId?(this.unregisterComponent(e),null):T(e.assignedRendererId)?(be(e.descriptor.start,!1),e.hasPendingRemoveOperation=!0,{type:"remove",ssrComponentId:e.ssrComponentId}):null;var t}resolveRootComponent(e){const t=this._rootComponentsBySsrComponentId.get(e);if(!t)throw new Error(`Could not resolve a root component with SSR component ID '${e}'.`);return t.descriptor}onAfterUpdateRootComponents(e){const t=this._pendingOperationBatches[e];delete this._pendingOperationBatches[e];for(const e of t.operations)switch(e.type){case"remove":{const t=this._rootComponentsBySsrComponentId.get(e.ssrComponentId);t&&this.unregisterComponent(t);break}}}}function Ri(e){const t=e.resources?.hash,n=e.mainAssemblyName;return t&&n?{key:`blazor-resource-hash:${n}`,value:t}:null}class Ai{constructor(){this._eventListeners=new Map}static create(e){const t=new Ai;return e.addEventListener=t.addEventListener.bind(t),e.removeEventListener=t.removeEventListener.bind(t),t}addEventListener(e,t){let n=this._eventListeners.get(e);n||(n=new Set,this._eventListeners.set(e,n)),n.add(t)}removeEventListener(e,t){this._eventListeners.get(e)?.delete(t)}dispatchEvent(e,t){const n=this._eventListeners.get(e);if(!n)return;const o={...t,type:e};for(const e of n)e(o)}}let Di=null,xi=location.href,Ni=!1;function Mi(){null!==document.activeElement&&document.activeElement!==document.body||document.querySelector("[autofocus]")||Bi()}function Pi(){Le(xi,location.href)||(Ni=!0),xi=location.href}function Li(){Ni&&Bi()}function Ui(){Ni=!1}function Bi(){const e=Di?.getAttribute("selector");e&&st.focusBySelector(e)}class Oi extends HTMLElement{connectedCallback(){Di=this}disconnectedCallback(){Di===this&&(Di=null)}}let $i,Fi=!1;function Hi(e){if(Fi)throw new Error("Blazor has already started.");Fi=!0,e=e||{},e.logLevel??=bt.Error,wt._internal.hotReloadApplied=()=>{Oe()&&$e(location.href,!0)},$i=new Ti(e?.ssr?.circuitInactivityTimeoutMs??2e3);const t=Ai.create(wt),n={enhancedNavigationStarted:()=>{t.dispatchEvent("enhancednavigationstart",{})},documentUpdated:()=>{$i.onDocumentUpdated(),t.dispatchEvent("enhancedload",{})},enhancedNavigationCompleted(){$i.onEnhancedNavigationCompleted(),t.dispatchEvent("enhancednavigationend",{})}};return Zr=$i,Ii(e?.ssr,n),e?.ssr?.disableDomPreservation||(pi=n,document.addEventListener("click",yi),document.addEventListener("submit",wi),window.addEventListener("popstate",vi),Ie=mi),function(e){customElements.define("blazor-focus-on-navigate",Oi),e.addEventListener("enhancednavigationstart",Pi),e.addEventListener("enhancednavigationend",Li),document.addEventListener("focusin",Ui),"loading"===document.readyState?document.addEventListener("DOMContentLoaded",Mi,{once:!0}):Mi()}(t),"loading"===document.readyState?document.addEventListener("DOMContentLoaded",Wi.bind(null,e)):Wi(e),Promise.resolve()}function Wi(e){const t=Oo(e?.circuit||{});e.circuit=t;const n=async function(e,t){const n=Tt(document,It,"initializers");if(!n)return new zo(!1,t);const o=JSON.parse(atob(n))??[],r=new zo(!1,t);return await r.importInitializersAsync(o,[e]),r}(e,new _t(t.logLevel));!function(e){if(Ko)throw new Error("Circuit options have already been configured.");qo=async function(e){const t=await e;Ko=Oo(t)}(e)}(ji(n,t)),Fr(ji(n,e?.webAssembly||{})),function(e){const t=si(document);for(const e of t)Zr?.registerComponent(e)}(),$i.onDocumentUpdated(),async function(e){const t=await e;await t.invokeAfterStartedCallbacks(wt)}(n)}async function ji(e,t){return await e,t}wt.start=Hi,window.DotNet=e,document&&document.currentScript&&"false"!==document.currentScript.getAttribute("autostart")&&Hi()}();
diff --git a/src/Components/Web.JS/dist/Release/blazor.webassembly.js b/src/Components/Web.JS/dist/Release/blazor.webassembly.js
deleted file mode 100644
index 931d70db651b..000000000000
--- a/src/Components/Web.JS/dist/Release/blazor.webassembly.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";var e;let t;var n,r;!function(e){const t=[],n="__jsObjectId",r="__dotNetObject",o="__byte[]",i="__dotNetStream",s="__jsStreamReferenceLength";let a,c;class l{constructor(e){this._jsObject=e,this._cachedFunctions=new Map}findFunction(e){const t=this._cachedFunctions.get(e);if(t)return t;let n,r=this._jsObject;if(e.split(".").forEach((t=>{if(!(t in r))throw new Error(`Could not find '${e}' ('${t}' was undefined).`);n=r,r=r[t]})),r instanceof Function)return r=r.bind(n),this._cachedFunctions.set(e,r),r;throw new Error(`The value '${e}' is not a function.`)}getWrappedObject(){return this._jsObject}}const u=0,d={[u]:new l(window)};d[0]._cachedFunctions.set("import",(e=>("string"==typeof e&&e.startsWith("./")&&(e=new URL(e.substr(2),document.baseURI).toString()),import(e))));let f,m=1;function h(e){t.push(e)}function p(e){if(e&&"object"==typeof e){d[m]=new l(e);const t={[n]:m};return m++,t}throw new Error(`Cannot create a JSObjectReference from the value '${e}'.`)}function g(e){let t=-1;if(e instanceof ArrayBuffer&&(e=new Uint8Array(e)),e instanceof Blob)t=e.size;else{if(!(e.buffer instanceof ArrayBuffer))throw new Error("Supplied value is not a typed array or blob.");if(void 0===e.byteLength)throw new Error(`Cannot create a JSStreamReference from the value '${e}' as it doesn't have a byteLength.`);t=e.byteLength}const r={[s]:t};try{const t=p(e);r[n]=t[n]}catch(t){throw new Error(`Cannot create a JSStreamReference from the value '${e}'.`)}return r}function b(e,n){c=e;const r=n?JSON.parse(n,((e,n)=>t.reduce(((t,n)=>n(e,t)),n))):null;return c=void 0,r}function y(){if(void 0===a)throw new Error("No call dispatcher has been set.");if(null===a)throw new Error("There are multiple .NET runtimes present, so a default dispatcher could not be resolved. Use DotNetObject to invoke .NET instance methods.");return a}e.attachDispatcher=function(e){const t=new v(e);return void 0===a?a=t:a&&(a=null),t},e.attachReviver=h,e.invokeMethod=function(e,t,...n){return y().invokeDotNetStaticMethod(e,t,...n)},e.invokeMethodAsync=function(e,t,...n){return y().invokeDotNetStaticMethodAsync(e,t,...n)},e.createJSObjectReference=p,e.createJSStreamReference=g,e.disposeJSObjectReference=function(e){const t=e&&e[n];"number"==typeof t&&S(t)},function(e){e[e.Default=0]="Default",e[e.JSObjectReference=1]="JSObjectReference",e[e.JSStreamReference=2]="JSStreamReference",e[e.JSVoidResult=3]="JSVoidResult"}(f=e.JSCallResultType||(e.JSCallResultType={}));class v{constructor(e){this._dotNetCallDispatcher=e,this._byteArraysToBeRevived=new Map,this._pendingDotNetToJSStreams=new Map,this._pendingAsyncCalls={},this._nextAsyncCallId=1}getDotNetCallDispatcher(){return this._dotNetCallDispatcher}invokeJSFromDotNet(e,t,n,r){const o=b(this,t),i=N(E(e,r)(...o||[]),n);return null==i?null:k(this,i)}beginInvokeJSFromDotNet(e,t,n,r,o){const i=new Promise((e=>{const r=b(this,n);e(E(t,o)(...r||[]))}));e&&i.then((t=>k(this,[e,!0,N(t,r)]))).then((t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!0,t)),(t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!1,JSON.stringify([e,!1,w(t)]))))}endInvokeDotNetFromJS(e,t,n){const r=t?b(this,n):new Error(n);this.completePendingCall(parseInt(e,10),t,r)}invokeDotNetStaticMethod(e,t,...n){return this.invokeDotNetMethod(e,t,null,n)}invokeDotNetStaticMethodAsync(e,t,...n){return this.invokeDotNetMethodAsync(e,t,null,n)}invokeDotNetMethod(e,t,n,r){if(this._dotNetCallDispatcher.invokeDotNetFromJS){const o=k(this,r),i=this._dotNetCallDispatcher.invokeDotNetFromJS(e,t,n,o);return i?b(this,i):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeDotNetMethodAsync instead.")}invokeDotNetMethodAsync(e,t,n,r){if(e&&n)throw new Error(`For instance method calls, assemblyName should be null. Received '${e}'.`);const o=this._nextAsyncCallId++,i=new Promise(((e,t)=>{this._pendingAsyncCalls[o]={resolve:e,reject:t}}));try{const i=k(this,r);this._dotNetCallDispatcher.beginInvokeDotNetFromJS(o,e,t,n,i)}catch(e){this.completePendingCall(o,!1,e)}return i}receiveByteArray(e,t){this._byteArraysToBeRevived.set(e,t)}processByteArray(e){const t=this._byteArraysToBeRevived.get(e);return t?(this._byteArraysToBeRevived.delete(e),t):null}supplyDotNetStream(e,t){if(this._pendingDotNetToJSStreams.has(e)){const n=this._pendingDotNetToJSStreams.get(e);this._pendingDotNetToJSStreams.delete(e),n.resolve(t)}else{const n=new I;n.resolve(t),this._pendingDotNetToJSStreams.set(e,n)}}getDotNetStreamPromise(e){let t;if(this._pendingDotNetToJSStreams.has(e))t=this._pendingDotNetToJSStreams.get(e).streamPromise,this._pendingDotNetToJSStreams.delete(e);else{const n=new I;this._pendingDotNetToJSStreams.set(e,n),t=n.streamPromise}return t}completePendingCall(e,t,n){if(!this._pendingAsyncCalls.hasOwnProperty(e))throw new Error(`There is no pending async call with ID ${e}.`);const r=this._pendingAsyncCalls[e];delete this._pendingAsyncCalls[e],t?r.resolve(n):r.reject(n)}}function w(e){return e instanceof Error?`${e.message}\n${e.stack}`:e?e.toString():"null"}function E(e,t){const n=d[t];if(n)return n.findFunction(e);throw new Error(`JS object instance with ID ${t} does not exist (has it been disposed?).`)}function S(e){delete d[e]}e.findJSFunction=E,e.disposeJSObjectReferenceById=S;class C{constructor(e,t){this._id=e,this._callDispatcher=t}invokeMethod(e,...t){return this._callDispatcher.invokeDotNetMethod(null,e,this._id,t)}invokeMethodAsync(e,...t){return this._callDispatcher.invokeDotNetMethodAsync(null,e,this._id,t)}dispose(){this._callDispatcher.invokeDotNetMethodAsync(null,"__Dispose",this._id,null).catch((e=>console.error(e)))}serializeAsArg(){return{[r]:this._id}}}e.DotNetObject=C,h((function(e,t){if(t&&"object"==typeof t){if(t.hasOwnProperty(r))return new C(t[r],c);if(t.hasOwnProperty(n)){const e=t[n],r=d[e];if(r)return r.getWrappedObject();throw new Error(`JS object instance with Id '${e}' does not exist. It may have been disposed.`)}if(t.hasOwnProperty(o)){const e=t[o],n=c.processByteArray(e);if(void 0===n)throw new Error(`Byte array index '${e}' does not exist.`);return n}if(t.hasOwnProperty(i)){const e=t[i],n=c.getDotNetStreamPromise(e);return new A(n)}}return t}));class A{constructor(e){this._streamPromise=e}stream(){return this._streamPromise}async arrayBuffer(){return new Response(await this.stream()).arrayBuffer()}}class I{constructor(){this.streamPromise=new Promise(((e,t)=>{this.resolve=e,this.reject=t}))}}function N(e,t){switch(t){case f.Default:return e;case f.JSObjectReference:return p(e);case f.JSStreamReference:return g(e);case f.JSVoidResult:return null;default:throw new Error(`Invalid JS call result type '${t}'.`)}}let R=0;function k(e,t){R=0,c=e;const n=JSON.stringify(t,D);return c=void 0,n}function D(e,t){if(t instanceof C)return t.serializeAsArg();if(t instanceof Uint8Array){c.getDotNetCallDispatcher().sendByteArray(R,t);const e={[o]:R};return R++,e}return t}}(e||(e={})),function(e){e[e.prependFrame=1]="prependFrame",e[e.removeFrame=2]="removeFrame",e[e.setAttribute=3]="setAttribute",e[e.removeAttribute=4]="removeAttribute",e[e.updateText=5]="updateText",e[e.stepIn=6]="stepIn",e[e.stepOut=7]="stepOut",e[e.updateMarkup=8]="updateMarkup",e[e.permutationListEntry=9]="permutationListEntry",e[e.permutationListEnd=10]="permutationListEnd"}(n||(n={})),function(e){e[e.element=1]="element",e[e.text=2]="text",e[e.attribute=3]="attribute",e[e.component=4]="component",e[e.region=5]="region",e[e.elementReferenceCapture=6]="elementReferenceCapture",e[e.markup=8]="markup",e[e.namedEvent=10]="namedEvent"}(r||(r={}));class o{constructor(e,t){this.componentId=e,this.fieldValue=t}static fromEvent(e,t){const n=t.target;if(n instanceof Element){const t=function(e){return e instanceof HTMLInputElement?e.type&&"checkbox"===e.type.toLowerCase()?{value:e.checked}:{value:e.value}:e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement?{value:e.value}:null}(n);if(t)return new o(e,t.value)}return null}}const i=new Map,s=new Map,a=[];function c(e){return i.get(e)}function l(e){const t=i.get(e);return t?.browserEventName||e}function u(e,t){e.forEach((e=>i.set(e,t)))}function d(e){const t=[];for(let n=0;n<e.length;n++){const r=e[n];t.push({identifier:r.identifier,clientX:r.clientX,clientY:r.clientY,screenX:r.screenX,screenY:r.screenY,pageX:r.pageX,pageY:r.pageY})}return t}function f(e){return{detail:e.detail,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY,offsetX:e.offsetX,offsetY:e.offsetY,pageX:e.pageX,pageY:e.pageY,movementX:e.movementX,movementY:e.movementY,button:e.button,buttons:e.buttons,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey,type:e.type}}u(["input","change"],{createEventArgs:function(e){const t=e.target;if(function(e){return-1!==m.indexOf(e.getAttribute("type"))}(t)){const e=function(e){const t=e.value,n=e.type;switch(n){case"date":case"month":case"week":return t;case"datetime-local":return 16===t.length?t+":00":t;case"time":return 5===t.length?t+":00":t}throw new Error(`Invalid element type '${n}'.`)}(t);return{value:e}}if(function(e){return e instanceof HTMLSelectElement&&"select-multiple"===e.type}(t)){const e=t;return{value:Array.from(e.options).filter((e=>e.selected)).map((e=>e.value))}}{const e=function(e){return!!e&&"INPUT"===e.tagName&&"checkbox"===e.getAttribute("type")}(t);return{value:e?!!t.checked:t.value}}}}),u(["copy","cut","paste"],{createEventArgs:e=>({type:e.type})}),u(["drag","dragend","dragenter","dragleave","dragover","dragstart","drop"],{createEventArgs:e=>{return{...f(t=e),dataTransfer:t.dataTransfer?{dropEffect:t.dataTransfer.dropEffect,effectAllowed:t.dataTransfer.effectAllowed,files:Array.from(t.dataTransfer.files).map((e=>e.name)),items:Array.from(t.dataTransfer.items).map((e=>({kind:e.kind,type:e.type}))),types:t.dataTransfer.types}:null};var t}}),u(["focus","blur","focusin","focusout"],{createEventArgs:e=>({type:e.type})}),u(["keydown","keyup","keypress"],{createEventArgs:e=>{return{key:(t=e).key,code:t.code,location:t.location,repeat:t.repeat,ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type,isComposing:t.isComposing};var t}}),u(["contextmenu","click","mouseover","mouseout","mousemove","mousedown","mouseup","mouseleave","mouseenter","dblclick"],{createEventArgs:e=>f(e)}),u(["error"],{createEventArgs:e=>{return{message:(t=e).message,filename:t.filename,lineno:t.lineno,colno:t.colno,type:t.type};var t}}),u(["loadstart","timeout","abort","load","loadend","progress"],{createEventArgs:e=>{return{lengthComputable:(t=e).lengthComputable,loaded:t.loaded,total:t.total,type:t.type};var t}}),u(["touchcancel","touchend","touchmove","touchenter","touchleave","touchstart"],{createEventArgs:e=>{return{detail:(t=e).detail,touches:d(t.touches),targetTouches:d(t.targetTouches),changedTouches:d(t.changedTouches),ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type};var t}}),u(["gotpointercapture","lostpointercapture","pointercancel","pointerdown","pointerenter","pointerleave","pointermove","pointerout","pointerover","pointerup"],{createEventArgs:e=>{return{...f(t=e),pointerId:t.pointerId,width:t.width,height:t.height,pressure:t.pressure,tiltX:t.tiltX,tiltY:t.tiltY,pointerType:t.pointerType,isPrimary:t.isPrimary};var t}}),u(["wheel","mousewheel"],{createEventArgs:e=>{return{...f(t=e),deltaX:t.deltaX,deltaY:t.deltaY,deltaZ:t.deltaZ,deltaMode:t.deltaMode};var t}}),u(["cancel","close","toggle"],{createEventArgs:()=>({})});const m=["date","datetime-local","month","time","week"],h=new Map;let p,g,b=0;const y={async add(e,t,n){if(!n)throw new Error("initialParameters must be an object, even if empty.");const r="__bl-dynamic-root:"+(++b).toString();h.set(r,e);const o=await E().invokeMethodAsync("AddRootComponent",t,r),i=new w(o,g[t]);return await i.setParameters(n),i}};class v{invoke(e){return this._callback(e)}setCallback(t){this._selfJSObjectReference||(this._selfJSObjectReference=e.createJSObjectReference(this)),this._callback=t}getJSObjectReference(){return this._selfJSObjectReference}dispose(){this._selfJSObjectReference&&e.disposeJSObjectReference(this._selfJSObjectReference)}}class w{constructor(e,t){this._jsEventCallbackWrappers=new Map,this._componentId=e;for(const e of t)"eventcallback"===e.type&&this._jsEventCallbackWrappers.set(e.name.toLowerCase(),new v)}setParameters(e){const t={},n=Object.entries(e||{}),r=n.length;for(const[e,r]of n){const n=this._jsEventCallbackWrappers.get(e.toLowerCase());n&&r?(n.setCallback(r),t[e]=n.getJSObjectReference()):t[e]=r}return E().invokeMethodAsync("SetRootComponentParameters",this._componentId,r,t)}async dispose(){if(null!==this._componentId){await E().invokeMethodAsync("RemoveRootComponent",this._componentId),this._componentId=null;for(const e of this._jsEventCallbackWrappers.values())e.dispose()}}}function E(){if(!p)throw new Error("Dynamic root components have not been enabled in this application.");return p}const S=new Map,C=[],A=new Map;function I(e,t,n){return R(e,t.eventHandlerId,(()=>N(e).invokeMethodAsync("DispatchEventAsync",t,n)))}function N(e){const t=S.get(e);if(!t)throw new Error(`No interop methods are registered for renderer ${e}`);return t}let R=(e,t,n)=>n();const k=O(["abort","blur","cancel","canplay","canplaythrough","change","close","cuechange","durationchange","emptied","ended","error","focus","load","loadeddata","loadedmetadata","loadend","loadstart","mouseenter","mouseleave","pointerenter","pointerleave","pause","play","playing","progress","ratechange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeupdate","toggle","unload","volumechange","waiting","DOMNodeInsertedIntoDocument","DOMNodeRemovedFromDocument"]),D={submit:!0},_=O(["click","dblclick","mousedown","mousemove","mouseup"]);class T{static{this.nextEventDelegatorId=0}constructor(e){this.browserRendererId=e,this.afterClickCallbacks=[];const t=++T.nextEventDelegatorId;this.eventsCollectionKey=`_blazorEvents_${t}`,this.eventInfoStore=new F(this.onGlobalEvent.bind(this))}setListener(e,t,n,r){const o=this.getEventHandlerInfosForElement(e,!0),i=o.getHandler(t);if(i)this.eventInfoStore.update(i.eventHandlerId,n);else{const i={element:e,eventName:t,eventHandlerId:n,renderingComponentId:r};this.eventInfoStore.add(i),o.setHandler(t,i)}}getHandler(e){return this.eventInfoStore.get(e)}removeListener(e){const t=this.eventInfoStore.remove(e);if(t){const e=t.element,n=this.getEventHandlerInfosForElement(e,!1);n&&n.removeHandler(t.eventName)}}notifyAfterClick(e){this.afterClickCallbacks.push(e),this.eventInfoStore.addGlobalListener("click")}setStopPropagation(e,t,n){this.getEventHandlerInfosForElement(e,!0).stopPropagation(t,n)}setPreventDefault(e,t,n){this.getEventHandlerInfosForElement(e,!0).preventDefault(t,n)}onGlobalEvent(e){if(!(e.target instanceof Element))return;this.dispatchGlobalEventToAllElements(e.type,e);const t=(n=e.type,s.get(n));var n;t&&t.forEach((t=>this.dispatchGlobalEventToAllElements(t,e))),"click"===e.type&&this.afterClickCallbacks.forEach((t=>t(e)))}dispatchGlobalEventToAllElements(e,t){const n=t.composedPath();let r=n.shift(),i=null,s=!1;const a=Object.prototype.hasOwnProperty.call(k,e);let l=!1;for(;r;){const f=r,m=this.getEventHandlerInfosForElement(f,!1);if(m){const n=m.getHandler(e);if(n&&(u=f,d=t.type,!((u instanceof HTMLButtonElement||u instanceof HTMLInputElement||u instanceof HTMLTextAreaElement||u instanceof HTMLSelectElement)&&Object.prototype.hasOwnProperty.call(_,d)&&u.disabled))){if(!s){const n=c(e);i=n?.createEventArgs?n.createEventArgs(t):{},s=!0}Object.prototype.hasOwnProperty.call(D,t.type)&&t.preventDefault(),I(this.browserRendererId,{eventHandlerId:n.eventHandlerId,eventName:e,eventFieldInfo:o.fromEvent(n.renderingComponentId,t)},i)}m.stopPropagation(e)&&(l=!0),m.preventDefault(e)&&t.preventDefault()}r=a||l?void 0:n.shift()}var u,d}getEventHandlerInfosForElement(e,t){return Object.prototype.hasOwnProperty.call(e,this.eventsCollectionKey)?e[this.eventsCollectionKey]:t?e[this.eventsCollectionKey]=new L:null}}class F{constructor(e){this.globalListener=e,this.infosByEventHandlerId={},this.countByEventName={},a.push(this.handleEventNameAliasAdded.bind(this))}add(e){if(this.infosByEventHandlerId[e.eventHandlerId])throw new Error(`Event ${e.eventHandlerId} is already tracked`);this.infosByEventHandlerId[e.eventHandlerId]=e,this.addGlobalListener(e.eventName)}get(e){return this.infosByEventHandlerId[e]}addGlobalListener(e){if(e=l(e),Object.prototype.hasOwnProperty.call(this.countByEventName,e))this.countByEventName[e]++;else{this.countByEventName[e]=1;const t=Object.prototype.hasOwnProperty.call(k,e);document.addEventListener(e,this.globalListener,t)}}update(e,t){if(Object.prototype.hasOwnProperty.call(this.infosByEventHandlerId,t))throw new Error(`Event ${t} is already tracked`);const n=this.infosByEventHandlerId[e];delete this.infosByEventHandlerId[e],n.eventHandlerId=t,this.infosByEventHandlerId[t]=n}remove(e){const t=this.infosByEventHandlerId[e];if(t){delete this.infosByEventHandlerId[e];const n=l(t.eventName);0==--this.countByEventName[n]&&(delete this.countByEventName[n],document.removeEventListener(n,this.globalListener))}return t}handleEventNameAliasAdded(e,t){if(Object.prototype.hasOwnProperty.call(this.countByEventName,e)){const n=this.countByEventName[e];delete this.countByEventName[e],document.removeEventListener(e,this.globalListener),this.addGlobalListener(t),this.countByEventName[t]+=n-1}}}class L{constructor(){this.handlers={},this.preventDefaultFlags=null,this.stopPropagationFlags=null}getHandler(e){return Object.prototype.hasOwnProperty.call(this.handlers,e)?this.handlers[e]:null}setHandler(e,t){this.handlers[e]=t}removeHandler(e){delete this.handlers[e]}preventDefault(e,t){return void 0!==t&&(this.preventDefaultFlags=this.preventDefaultFlags||{},this.preventDefaultFlags[e]=t),!!this.preventDefaultFlags&&this.preventDefaultFlags[e]}stopPropagation(e,t){return void 0!==t&&(this.stopPropagationFlags=this.stopPropagationFlags||{},this.stopPropagationFlags[e]=t),!!this.stopPropagationFlags&&this.stopPropagationFlags[e]}}function O(e){const t={};return e.forEach((e=>{t[e]=!0})),t}const M=Symbol(),x=Symbol(),P=Symbol();function B(e,t){if(M in e)return e;const n=[];if(e.childNodes.length>0){if(!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");e.childNodes.forEach((t=>{const r=B(t,!0);r[x]=e,n.push(r)}))}return e[M]=n,e}function H(e){const t=K(e);for(;t.length;)z(e,0)}function j(e,t){const n=document.createComment("!");return J(n,e,t),n}function J(e,t,n){const r=e;let o=e;if(e instanceof Comment){const t=K(r);if(t?.length>0){const t=G(r),n=new Range;n.setStartBefore(e),n.setEndAfter(t),o=n.extractContents()}}const i=$(r);if(i){const e=K(i),t=Array.prototype.indexOf.call(e,r);e.splice(t,1),delete r[x]}const s=K(t);if(n<s.length){const e=s[n];e.parentNode.insertBefore(o,e),s.splice(n,0,r)}else q(o,t),s.push(r);r[x]=t,M in r||(r[M]=[])}function z(e,t){const n=K(e).splice(t,1)[0];if(n instanceof Comment){const e=K(n);if(e)for(;e.length>0;)z(n,0)}const r=n;r.parentNode.removeChild(r)}function $(e){return e[x]||null}function W(e,t){return K(e)[t]}function U(e){const t=Y(e);return"http://www.w3.org/2000/svg"===t.namespaceURI&&"foreignObject"!==t.tagName}function K(e){return e[M]}function V(e){const t=K($(e));return t[Array.prototype.indexOf.call(t,e)+1]||null}function X(e,t){const n=K(e);t.forEach((e=>{e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=G(e.moveRangeStart)})),t.forEach((t=>{const r=document.createComment("marker");t.moveToBeforeMarker=r;const o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):q(r,e)})),t.forEach((e=>{const t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd;let i=r;for(;i;){const e=i.nextSibling;if(n.insertBefore(i,t),i===o)break;i=e}n.removeChild(t)})),t.forEach((e=>{n[e.toSiblingIndex]=e.moveRangeStart}))}function Y(e){if(e instanceof Element||e instanceof DocumentFragment)return e;if(e instanceof Comment)return e.parentNode;throw new Error("Not a valid logical element")}function q(e,t){if(t instanceof Element||t instanceof DocumentFragment)t.appendChild(e);else{if(!(t instanceof Comment))throw new Error(`Cannot append node because the parent is not a valid logical element. Parent: ${t}`);{const n=V(t);n?n.parentNode.insertBefore(e,n):q(e,$(t))}}}function G(e){if(e instanceof Element||e instanceof DocumentFragment)return e;const t=V(e);if(t)return t.previousSibling;{const t=$(e);return t instanceof Element||t instanceof DocumentFragment?t.lastChild:G(t)}}function Z(e){return`_bl_${e}`}const Q="__internalId";e.attachReviver(((e,t)=>t&&"object"==typeof t&&Object.prototype.hasOwnProperty.call(t,Q)&&"string"==typeof t[Q]?function(e){const t=`[${Z(e)}]`;return document.querySelector(t)}(t[Q]):t));const ee="_blazorDeferredValue";function te(e){return"select-multiple"===e.type}function ne(e,t){e.value=t||""}function re(e,t){e instanceof HTMLSelectElement?te(e)?function(e,t){t||=[];for(let n=0;n<e.options.length;n++)e.options[n].selected=-1!==t.indexOf(e.options[n].value)}(e,t):ne(e,t):e.value=t}function oe(e){const t=function(e){for(;e;){if(e instanceof HTMLSelectElement)return e;e=e.parentElement}return null}(e);if(!function(e){return!!e&&ee in e}(t))return!1;if(te(t))e.selected=-1!==t._blazorDeferredValue.indexOf(e.value);else{if(t._blazorDeferredValue!==e.value)return!1;ne(t,e.value),delete t._blazorDeferredValue}return!0}const ie=document.createElement("template"),se=document.createElementNS("http://www.w3.org/2000/svg","g"),ae=new Set,ce=Symbol(),le=Symbol();class ue{constructor(e){this.rootComponentIds=new Set,this.childComponentLocations={},this.eventDelegator=new T(e),this.eventDelegator.notifyAfterClick((e=>{Ne()&&function(e,t){if(0!==e.button||function(e){return e.ctrlKey||e.shiftKey||e.altKey||e.metaKey}(e))return;if(e.defaultPrevented)return;const n=function(e){const t=e.composedPath&&e.composedPath();if(t)for(let e=0;e<t.length;e++){const n=t[e];if(n instanceof HTMLAnchorElement||n instanceof SVGAElement)return n}return null}(e);if(n&&function(e){const t=e.getAttribute("target");return(!t||"_self"===t)&&e.hasAttribute("href")&&!e.hasAttribute("download")}(n)){const t=Ie(n.getAttribute("href"));Ee(t)&&(e.preventDefault(),xe(t,!0,!1))}}(e)}))}getRootComponentCount(){return this.rootComponentIds.size}attachRootComponentToLogicalElement(e,t,n){if(function(e){return e[ce]}(t))throw new Error(`Root component '${e}' could not be attached because its target element is already associated with a root component`);n&&(t=j(t,K(t).length)),de(t,!0),this.attachComponentToElement(e,t),this.rootComponentIds.add(e),ae.add(t)}updateComponent(e,t,n,r){const o=this.childComponentLocations[t];if(!o)throw new Error(`No element is currently associated with component ${t}`);ae.delete(o)&&(H(o),o instanceof Comment&&(o.textContent="!"));const i=Y(o)?.getRootNode(),s=i&&i.activeElement;this.applyEdits(e,t,o,0,n,r),s instanceof HTMLElement&&i&&i.activeElement!==s&&s.focus()}disposeComponent(e){if(this.rootComponentIds.delete(e)){const t=this.childComponentLocations[e];de(t,!1),!0===t[le]?ae.add(t):H(t)}delete this.childComponentLocations[e]}disposeEventHandler(e){this.eventDelegator.removeListener(e)}attachComponentToElement(e,t){this.childComponentLocations[e]=t}applyEdits(e,t,r,o,i,s){let a,c=0,l=o;const u=e.arrayBuilderSegmentReader,d=e.editReader,f=e.frameReader,m=u.values(i),h=u.offset(i),p=h+u.count(i);for(let i=h;i<p;i++){const u=e.diffReader.editsEntry(m,i),h=d.editType(u);switch(h){case n.prependFrame:{const n=d.newTreeIndex(u),o=e.referenceFramesEntry(s,n),i=d.siblingIndex(u);this.insertFrame(e,t,r,l+i,s,o,n);break}case n.removeFrame:z(r,l+d.siblingIndex(u));break;case n.setAttribute:{const n=d.newTreeIndex(u),o=e.referenceFramesEntry(s,n),i=W(r,l+d.siblingIndex(u));if(!(i instanceof Element))throw new Error("Cannot set attribute on non-element child");this.applyAttribute(e,t,i,o);break}case n.removeAttribute:{const e=W(r,l+d.siblingIndex(u));if(!(e instanceof Element))throw new Error("Cannot remove attribute from non-element child");{const t=d.removedAttributeName(u);this.setOrRemoveAttributeOrProperty(e,t,null)}break}case n.updateText:{const t=d.newTreeIndex(u),n=e.referenceFramesEntry(s,t),o=W(r,l+d.siblingIndex(u));if(!(o instanceof Text))throw new Error("Cannot set text content on non-text child");o.textContent=f.textContent(n);break}case n.updateMarkup:{const t=d.newTreeIndex(u),n=e.referenceFramesEntry(s,t),o=d.siblingIndex(u);z(r,l+o),this.insertMarkup(e,r,l+o,n);break}case n.stepIn:r=W(r,l+d.siblingIndex(u)),c++,l=0;break;case n.stepOut:r=$(r),c--,l=0===c?o:0;break;case n.permutationListEntry:a=a||[],a.push({fromSiblingIndex:l+d.siblingIndex(u),toSiblingIndex:l+d.moveToSiblingIndex(u)});break;case n.permutationListEnd:X(r,a),a=void 0;break;default:throw new Error(`Unknown edit type: ${h}`)}}}insertFrame(e,t,n,o,i,s,a){const c=e.frameReader,l=c.frameType(s);switch(l){case r.element:return this.insertElement(e,t,n,o,i,s,a),1;case r.text:return this.insertText(e,n,o,s),1;case r.attribute:throw new Error("Attribute frames should only be present as leading children of element frames.");case r.component:return this.insertComponent(e,n,o,s),1;case r.region:return this.insertFrameRange(e,t,n,o,i,a+1,a+c.subtreeLength(s));case r.elementReferenceCapture:if(n instanceof Element)return u=n,d=c.elementReferenceCaptureId(s),u.setAttribute(Z(d),""),0;throw new Error("Reference capture frames can only be children of element frames.");case r.markup:return this.insertMarkup(e,n,o,s),1;case r.namedEvent:return 0;default:throw new Error(`Unknown frame type: ${l}`)}var u,d}insertElement(e,t,n,o,i,s,a){const c=e.frameReader,l=c.elementName(s),u="svg"===l||U(n)?document.createElementNS("http://www.w3.org/2000/svg",l):document.createElement(l),d=B(u);let f=!1;const m=a+c.subtreeLength(s);for(let s=a+1;s<m;s++){const a=e.referenceFramesEntry(i,s);if(c.frameType(a)!==r.attribute){J(u,n,o),f=!0,this.insertFrameRange(e,t,d,0,i,s,m);break}this.applyAttribute(e,t,u,a)}var h;f||J(u,n,o),(h=u)instanceof HTMLOptionElement?oe(h):ee in h&&re(h,h[ee])}insertComponent(e,t,n,r){const o=j(t,n),i=e.frameReader.componentId(r);this.attachComponentToElement(i,o)}insertText(e,t,n,r){const o=e.frameReader.textContent(r);J(document.createTextNode(o),t,n)}insertMarkup(e,t,n,r){const o=j(t,n),i=(s=e.frameReader.markupContent(r),U(t)?(se.innerHTML=s||" ",se):(ie.innerHTML=s||" ",ie.content.querySelectorAll("script").forEach((e=>{const t=document.createElement("script");t.textContent=e.textContent,e.getAttributeNames().forEach((n=>{t.setAttribute(n,e.getAttribute(n))})),e.parentNode.replaceChild(t,e)})),ie.content));var s;let a=0;for(;i.firstChild;)J(i.firstChild,o,a++)}applyAttribute(e,t,n,r){const o=e.frameReader,i=o.attributeName(r),s=o.attributeEventHandlerId(r);if(s){const e=me(i);return void this.eventDelegator.setListener(n,e,s,t)}const a=o.attributeValue(r);this.setOrRemoveAttributeOrProperty(n,i,a)}insertFrameRange(e,t,n,r,o,i,s){const a=r;for(let a=i;a<s;a++){const i=e.referenceFramesEntry(o,a);r+=this.insertFrame(e,t,n,r,o,i,a),a+=fe(e,i)}return r-a}setOrRemoveAttributeOrProperty(e,t,n){(function(e,t,n){switch(t){case"value":return function(e,t){switch(t&&"INPUT"===e.tagName&&(t=function(e,t){switch(t.getAttribute("type")){case"time":return 8!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,5);case"datetime-local":return 19!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,16);default:return e}}(t,e)),e.tagName){case"INPUT":case"SELECT":case"TEXTAREA":return t&&e instanceof HTMLSelectElement&&te(e)&&(t=JSON.parse(t)),re(e,t),e[ee]=t,!0;case"OPTION":return t||""===t?e.setAttribute("value",t):e.removeAttribute("value"),oe(e),!0;default:return!1}}(e,n);case"checked":return function(e,t){return"INPUT"===e.tagName&&(e.checked=null!==t,!0)}(e,n);default:return!1}})(e,t,n)||(t.startsWith("__internal_")?this.applyInternalAttribute(e,t.substring(11),n):null!==n?e.setAttribute(t,n):e.removeAttribute(t))}applyInternalAttribute(e,t,n){if(t.startsWith("stopPropagation_")){const r=me(t.substring(16));this.eventDelegator.setStopPropagation(e,r,null!==n)}else{if(!t.startsWith("preventDefault_"))throw new Error(`Unsupported internal attribute '${t}'`);{const r=me(t.substring(15));this.eventDelegator.setPreventDefault(e,r,null!==n)}}}}function de(e,t){e[ce]=t}function fe(e,t){const n=e.frameReader;switch(n.frameType(t)){case r.component:case r.element:case r.region:return n.subtreeLength(t)-1;default:return 0}}function me(e){if(e.startsWith("on"))return e.substring(2);throw new Error(`Attribute should be an event name, but doesn't start with 'on'. Value: '${e}'`)}const he={};let pe,ge,be,ye,ve=!1;function we(e,t,n,r){let o=he[e];o||(o=new ue(e),he[e]=o),o.attachRootComponentToLogicalElement(n,t,r)}function Ee(e){const t=(n=document.baseURI).substring(0,n.lastIndexOf("/"));var n;const r=e.charAt(t.length);return e.startsWith(t)&&(""===r||"/"===r||"?"===r||"#"===r)}function Se(e){document.getElementById(e)?.scrollIntoView()}function Ce(){return void 0!==ge}function Ae(e,t){if(!ge)throw new Error("No enhanced programmatic navigation handler has been attached");ge(e,t)}function Ie(e){return ye=ye||document.createElement("a"),ye.href=e,ye.href}function Ne(){return void 0!==pe}function Re(){return pe}let ke=!1,De=0,_e=0;const Te=new Map;let Fe=async function(e){He();const t=$e();if(t?.hasLocationChangingEventListeners){const n=e.state?._index??0,r=e.state?.userState,o=n-De,i=location.href;if(await Be(-o),!await je(i,r,!1,t))return;await Be(o)}await Je(!0)},Le=null;const Oe={listenForNavigationEvents:function(e,t,n){Te.set(e,{rendererId:e,hasLocationChangingEventListeners:!1,locationChanged:t,locationChanging:n}),ke||(ke=!0,window.addEventListener("popstate",ze),De=history.state?._index??0,be=(e,t)=>{Je(t,e)})},enableNavigationInterception:function(e){if(void 0!==pe&&pe!==e)throw new Error("Only one interactive runtime may enable navigation interception at a time.");pe=e},setHasLocationChangingListeners:function(e,t){const n=Te.get(e);if(!n)throw new Error(`Renderer with ID '${e}' is not listening for navigation events`);n.hasLocationChangingEventListeners=t},endLocationChanging:function(e,t){Le&&e===_e&&(Le(t),Le=null)},navigateTo:function(e,t){Me(e,t,!0)},refresh:function(e){!e&&Ce()?Ae(location.href,!0):location.reload()},getBaseURI:()=>document.baseURI,getLocationHref:()=>location.href,scrollToElement:Se};function Me(e,t,n=!1){const r=Ie(e);!t.forceLoad&&Ee(r)?We()?xe(r,!1,t.replaceHistoryEntry,t.historyEntryState,n):Ae(r,t.replaceHistoryEntry):function(e,t){if(location.href===e){const t=e+"?";history.replaceState(null,"",t),location.replace(e)}else t?location.replace(e):location.href=e}(e,t.replaceHistoryEntry)}async function xe(e,t,n,r=void 0,o=!1){if(He(),function(e){const t=new URL(e);return""!==t.hash&&location.origin===t.origin&&location.pathname===t.pathname&&location.search===t.search}(e))return Pe(e,n,r),void function(e){const t=e.indexOf("#");t!==e.length-1&&Se(e.substring(t+1))}(e);const i=$e();(o||!i?.hasLocationChangingEventListeners||await je(e,r,t,i))&&(ve=!0,Pe(e,n,r),await Je(t))}function Pe(e,t,n=void 0){t?history.replaceState({userState:n,_index:De},"",e):(De++,history.pushState({userState:n,_index:De},"",e))}function Be(e){return new Promise((t=>{const n=Fe;Fe=()=>{Fe=n,t()},history.go(e)}))}function He(){Le&&(Le(!1),Le=null)}function je(e,t,n,r){return new Promise((o=>{He(),_e++,Le=o,r.locationChanging(_e,e,t,n)}))}async function Je(e,t){const n=t??location.href;await Promise.all(Array.from(Te,(async([t,r])=>{var o;o=t,S.has(o)&&await r.locationChanged(n,history.state?.userState,e)})))}async function ze(e){Fe&&We()&&await Fe(e),De=history.state?._index??0}function $e(){const e=Re();if(void 0!==e)return Te.get(e)}function We(){return Ne()||!Ce()}const Ue={focus:function(e,t){if(e instanceof HTMLElement)e.focus({preventScroll:t});else{if(!(e instanceof SVGElement))throw new Error("Unable to focus an invalid element.");if(!e.hasAttribute("tabindex"))throw new Error("Unable to focus an SVG element that does not have a tabindex.");e.focus({preventScroll:t})}},focusBySelector:function(e){const t=document.querySelector(e);t&&(t.hasAttribute("tabindex")||(t.tabIndex=-1),t.focus({preventScroll:!0}))}},Ke={init:function(e,t,n,r=50){const o=Xe(t);(o||document.documentElement).style.overflowAnchor="none";const i=document.createRange();f(n.parentElement)&&(t.style.display="table-row",n.style.display="table-row");const s=new IntersectionObserver((function(r){r.forEach((r=>{if(!r.isIntersecting)return;i.setStartAfter(t),i.setEndBefore(n);const o=i.getBoundingClientRect().height,s=r.rootBounds?.height;r.target===t?e.invokeMethodAsync("OnSpacerBeforeVisible",r.intersectionRect.top-r.boundingClientRect.top,o,s):r.target===n&&n.offsetHeight>0&&e.invokeMethodAsync("OnSpacerAfterVisible",r.boundingClientRect.bottom-r.intersectionRect.bottom,o,s)}))}),{root:o,rootMargin:`${r}px`});s.observe(t),s.observe(n);const a=d(t),c=d(n),{observersByDotNetObjectId:l,id:u}=Ye(e);function d(e){const t={attributes:!0},n=new MutationObserver(((n,r)=>{f(e.parentElement)&&(r.disconnect(),e.style.display="table-row",r.observe(e,t)),s.unobserve(e),s.observe(e)}));return n.observe(e,t),n}function f(e){return null!==e&&(e instanceof HTMLTableElement&&""===e.style.display||"table"===e.style.display||e instanceof HTMLTableSectionElement&&""===e.style.display||"table-row-group"===e.style.display)}l[u]={intersectionObserver:s,mutationObserverBefore:a,mutationObserverAfter:c}},dispose:function(e){const{observersByDotNetObjectId:t,id:n}=Ye(e),r=t[n];r&&(r.intersectionObserver.disconnect(),r.mutationObserverBefore.disconnect(),r.mutationObserverAfter.disconnect(),e.dispose(),delete t[n])}},Ve=Symbol();function Xe(e){return e&&e!==document.body&&e!==document.documentElement?"visible"!==getComputedStyle(e).overflowY?e:Xe(e.parentElement):null}function Ye(e){const t=e._callDispatcher,n=e._id;return t[Ve]??={},{observersByDotNetObjectId:t[Ve],id:n}}const qe={getAndRemoveExistingTitle:function(){const e=document.head?document.head.getElementsByTagName("title"):[];if(0===e.length)return null;let t=null;for(let n=e.length-1;n>=0;n--){const r=e[n],o=r.previousSibling;o instanceof Comment&&null!==$(o)||(null===t&&(t=r.textContent),r.parentNode?.removeChild(r))}return t}},Ge={init:function(e,t){t._blazorInputFileNextFileId=0,t.addEventListener("click",(function(){t.value=""})),t.addEventListener("change",(function(){t._blazorFilesById={};const n=Array.prototype.map.call(t.files,(function(e){const n={id:++t._blazorInputFileNextFileId,lastModified:new Date(e.lastModified).toISOString(),name:e.name,size:e.size,contentType:e.type,readPromise:void 0,arrayBuffer:void 0,blob:e};return t._blazorFilesById[n.id]=n,n}));e.invokeMethodAsync("NotifyChange",n)}))},toImageFile:async function(e,t,n,r,o){const i=Ze(e,t),s=await new Promise((function(e){const t=new Image;t.onload=function(){URL.revokeObjectURL(t.src),e(t)},t.onerror=function(){t.onerror=null,URL.revokeObjectURL(t.src)},t.src=URL.createObjectURL(i.blob)})),a=await new Promise((function(e){const t=Math.min(1,r/s.width),i=Math.min(1,o/s.height),a=Math.min(t,i),c=document.createElement("canvas");c.width=Math.round(s.width*a),c.height=Math.round(s.height*a),c.getContext("2d")?.drawImage(s,0,0,c.width,c.height),c.toBlob(e,n)})),c={id:++e._blazorInputFileNextFileId,lastModified:i.lastModified,name:i.name,size:a?.size||0,contentType:n,blob:a||i.blob};return e._blazorFilesById[c.id]=c,c},readFileData:async function(e,t){return Ze(e,t).blob}};function Ze(e,t){const n=e._blazorFilesById[t];if(!n)throw new Error(`There is no file with ID ${t}. The file list may have changed. See https://aka.ms/aspnet/blazor-input-file-multiple-selections.`);return n}const Qe=new Set,et={enableNavigationPrompt:function(e){0===Qe.size&&window.addEventListener("beforeunload",tt),Qe.add(e)},disableNavigationPrompt:function(e){Qe.delete(e),0===Qe.size&&window.removeEventListener("beforeunload",tt)}};function tt(e){e.preventDefault(),e.returnValue=!0}const nt=new Map,rt={navigateTo:function(e,t,n=!1){Me(e,t instanceof Object?t:{forceLoad:t,replaceHistoryEntry:n})},registerCustomEventType:function(e,t){if(!t)throw new Error("The options parameter is required.");if(i.has(e))throw new Error(`The event '${e}' is already registered.`);if(t.browserEventName){const n=s.get(t.browserEventName);n?n.push(e):s.set(t.browserEventName,[e]),a.forEach((n=>n(e,t.browserEventName)))}i.set(e,t)},rootComponents:y,runtime:{},_internal:{navigationManager:Oe,domWrapper:Ue,Virtualize:Ke,PageTitle:qe,InputFile:Ge,NavigationLock:et,getJSDataStreamChunk:async function(e,t,n){return e instanceof Blob?await async function(e,t,n){const r=e.slice(t,t+n),o=await r.arrayBuffer();return new Uint8Array(o)}(e,t,n):function(e,t,n){return new Uint8Array(e.buffer,e.byteOffset+t,n)}(e,t,n)},attachWebRendererInterop:function(t,n,r,o){if(S.has(t))throw new Error(`Interop methods are already registered for renderer ${t}`);S.set(t,n),r&&o&&Object.keys(r).length>0&&function(t,n,r){if(p)throw new Error("Dynamic root components have already been enabled.");p=t,g=n;for(const[t,o]of Object.entries(r)){const r=e.findJSFunction(t,0);for(const e of o)r(e,n[e])}}(N(t),r,o),A.get(t)?.[0]?.(),function(e){for(const t of C)t(e)}(t)}}};window.Blazor=rt;const ot=navigator,it=ot.userAgentData&&ot.userAgentData.brands,st=it&&it.length>0?it.some((e=>"Google Chrome"===e.brand||"Microsoft Edge"===e.brand||"Chromium"===e.brand)):window.chrome,at=ot.userAgentData?.platform??navigator.platform;function ct(e){return 0!==e.debugLevel&&(st||navigator.userAgent.includes("Firefox"))}let lt=!1;function ut(){const e=document.querySelector("#blazor-error-ui");e&&(e.style.display="block"),lt||(lt=!0,document.querySelectorAll("#blazor-error-ui .reload").forEach((e=>{e.onclick=function(e){location.reload(),e.preventDefault()}})),document.querySelectorAll("#blazor-error-ui .dismiss").forEach((e=>{e.onclick=function(e){const t=document.querySelector("#blazor-error-ui");t&&(t.style.display="none"),e.preventDefault()}})))}var dt,ft;!function(e){e[e.Default=0]="Default",e[e.Server=1]="Server",e[e.WebAssembly=2]="WebAssembly",e[e.WebView=3]="WebView"}(dt||(dt={})),function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(ft||(ft={}));class mt{constructor(e=!0,t,n,r=0){this.singleRuntime=e,this.logger=t,this.webRendererId=r,this.afterStartedCallbacks=[],n&&this.afterStartedCallbacks.push(...n)}async importInitializersAsync(e,t){await Promise.all(e.map((e=>async function(e,n){const r=function(e){const t=document.baseURI;return t.endsWith("/")?`${t}${e}`:`${t}/${e}`}(n),o=await import(r);if(void 0!==o){if(e.singleRuntime){const{beforeStart:n,afterStarted:r,beforeWebAssemblyStart:s,afterWebAssemblyStarted:a,beforeServerStart:c,afterServerStarted:l}=o;let u=n;e.webRendererId===dt.Server&&c&&(u=c),e.webRendererId===dt.WebAssembly&&s&&(u=s);let d=r;return e.webRendererId===dt.Server&&l&&(d=l),e.webRendererId===dt.WebAssembly&&a&&(d=a),i(e,u,d,t)}return function(e,t,n){const o=n[0],{beforeStart:s,afterStarted:a,beforeWebStart:c,afterWebStarted:l,beforeWebAssemblyStart:u,afterWebAssemblyStarted:d,beforeServerStart:f,afterServerStarted:m}=t,h=!(c||l||u||d||f||m||!s&&!a),p=h&&o.enableClassicInitializers;if(h&&!o.enableClassicInitializers)e.logger?.log(ft.Warning,`Initializer '${r}' will be ignored because multiple runtimes are available. Use 'before(Web|WebAssembly|Server)Start' and 'after(Web|WebAssembly|Server)Started' instead.`);else if(p)return i(e,s,a,n);if(function(e){e.webAssembly?e.webAssembly.initializers||(e.webAssembly.initializers={beforeStart:[],afterStarted:[]}):e.webAssembly={initializers:{beforeStart:[],afterStarted:[]}},e.circuit?e.circuit.initializers||(e.circuit.initializers={beforeStart:[],afterStarted:[]}):e.circuit={initializers:{beforeStart:[],afterStarted:[]}}}(o),u&&o.webAssembly.initializers.beforeStart.push(u),d&&o.webAssembly.initializers.afterStarted.push(d),f&&o.circuit.initializers.beforeStart.push(f),m&&o.circuit.initializers.afterStarted.push(m),l&&e.afterStartedCallbacks.push(l),c)return c(o)}(e,o,t)}function i(e,t,n,r){if(n&&e.afterStartedCallbacks.push(n),t)return t(...r)}}(this,e))))}async invokeAfterStartedCallbacks(e){const t=(n=this.webRendererId,A.get(n)?.[1]);var n;t&&await t,await Promise.all(this.afterStartedCallbacks.map((t=>t(e))))}}let ht,pt,gt,bt,yt=null;const vt={load:function(e,t){return async function(e,t){const{dotnet:n}=await async function(e){if("undefined"==typeof WebAssembly||!WebAssembly.validate)throw new Error("This browser does not support WebAssembly.");let t="_framework/dotnet.js";if(e.loadBootResource){const n="dotnetjs",r=e.loadBootResource(n,"dotnet.js",t,"","js-module-dotnet");if("string"==typeof r)t=r;else if(r)throw new Error(`For a ${n} resource, custom loaders must supply a URI string.`)}const n=new URL(t,document.baseURI).toString();return await import(n)}(e),r=function(e,t){const n={maxParallelDownloads:1e6,enableDownloadRetry:!1,applicationEnvironment:e.environment},r={...window.Module||{},onConfigLoaded:async n=>{n.environmentVariables||(n.environmentVariables={}),"sharded"===n.globalizationMode&&(n.environmentVariables.__BLAZOR_SHARDED_ICU="1"),rt._internal.getApplicationEnvironment=()=>n.applicationEnvironment,t?.(n),bt=await async function(e,t){if(e.initializers)return await Promise.all(e.initializers.beforeStart.map((t=>t(e)))),new mt(!1,void 0,e.initializers.afterStarted,dt.WebAssembly);{const n=[e,t.resources?.extensions??{}],r=new mt(!0,void 0,void 0,dt.WebAssembly),o=Object.keys(t?.resources?.libraryInitializers||{});return await r.importInitializersAsync(o,n),r}}(e,n)},onDownloadResourceProgress:wt,config:n,out:St,err:Ct};return r}(e,t);e.applicationCulture&&n.withApplicationCulture(e.applicationCulture),e.environment&&n.withApplicationEnvironment(e.environment),e.loadBootResource&&n.withResourceLoader(e.loadBootResource),n.withModuleConfig(r),e.configureRuntime&&e.configureRuntime(n),gt=await n.create()}(e,t)},start:function(){return async function(){if(!gt)throw new Error("The runtime must be loaded it gets configured.");const{setModuleImports:t,INTERNAL:n,getConfig:r,invokeLibraryInitializers:o}=gt;pt=n,function(e){const t=at.match(/^Mac/i)?"Cmd":"Alt";ct(e)&&console.info(`Debugging hotkey: Shift+${t}+D (when application has focus)`),document.addEventListener("keydown",(t=>{t.shiftKey&&(t.metaKey||t.altKey)&&"KeyD"===t.code&&(ct(e)?navigator.userAgent.includes("Firefox")?async function(){const e=await fetch(`_framework/debug?url=${encodeURIComponent(location.href)}&isFirefox=true`);200!==e.status&&console.warn(await e.text())}():st?function(){const e=document.createElement("a");e.href=`_framework/debug?url=${encodeURIComponent(location.href)}`,e.target="_blank",e.rel="noopener noreferrer",e.click()}():console.error("Currently, only Microsoft Edge (80+), Google Chrome, or Chromium, are supported for debugging."):console.error("Cannot start debugging, because the application was not compiled with debugging enabled."))}))}(r()),rt.runtime=gt,rt._internal.dotNetCriticalError=Ct,t("blazor-internal",{Blazor:{_internal:rt._internal}});const i=await gt.getAssemblyExports("Microsoft.AspNetCore.Components.WebAssembly");return Object.assign(rt._internal,{dotNetExports:{...i.Microsoft.AspNetCore.Components.WebAssembly.Services.DefaultWebAssemblyJSRuntime}}),ht=e.attachDispatcher({beginInvokeDotNetFromJS:(e,t,n,r,o)=>{if(At(),!r&&!t)throw new Error("Either assemblyName or dotNetObjectId must have a non null value.");const i=r?r.toString():t;rt._internal.dotNetExports.BeginInvokeDotNet(e?e.toString():null,i,n,o)},endInvokeJSFromDotNet:(e,t,n)=>{rt._internal.dotNetExports.EndInvokeJS(n)},sendByteArray:(e,t)=>{rt._internal.dotNetExports.ReceiveByteArrayFromJS(e,t)},invokeDotNetFromJS:(e,t,n,r)=>(At(),rt._internal.dotNetExports.InvokeDotNet(e||null,t,n??0,r))}),{invokeLibraryInitializers:o}}()},callEntryPoint:async function(){try{await gt.runMain(gt.getConfig().mainAssemblyName,[])}catch(e){console.error(e),ut()}},getArrayEntryPtr:function(e,t,n){const r=function(e){return e+12}(e)+4+t*n;return r},getObjectFieldsBaseAddress:function(e){return e+8},readInt16Field:function(e,t){return gt.getHeapI16(e+(t||0))},readInt32Field:function(e,t){return gt.getHeapI32(e+(t||0))},readUint64Field:function(e,t){return gt.getHeapU52(e+(t||0))},readObjectField:function(e,t){return gt.getHeapU32(e+(t||0))},readStringField:function(e,t,n){const r=gt.getHeapU32(e+(t||0));if(0===r)return null;if(n){const e=pt.monoObjectAsBoolOrNullUnsafe(r);if("boolean"==typeof e)return e?"":null}return pt.monoStringToStringUnsafe(r)},readStructField:function(e,t){return e+(t||0)},beginHeapLock:function(){return At(),yt=It.create(),yt},invokeWhenHeapUnlocked:function(e){yt?yt.enqueuePostReleaseAction(e):e()}};function wt(e,t){const n=e/t*100;document.documentElement.style.setProperty("--blazor-load-percentage",`${n}%`),document.documentElement.style.setProperty("--blazor-load-percentage-text",`"${Math.floor(n)}%"`)}const Et=["DEBUGGING ENABLED"],St=e=>Et.indexOf(e)<0&&console.log(e),Ct=e=>{console.error(e||"(null)"),ut()};function At(){if(yt)throw new Error("Assertion failed - heap is currently locked")}class It{enqueuePostReleaseAction(e){this.postReleaseActions||(this.postReleaseActions=[]),this.postReleaseActions.push(e)}release(){if(yt!==this)throw new Error("Trying to release a lock which isn't current");for(pt.mono_wasm_gc_unlock(),yt=null;this.postReleaseActions?.length;)this.postReleaseActions.shift()(),At()}static create(){return pt.mono_wasm_gc_lock(),new It}}class Nt{constructor(e){this.batchAddress=e,this.arrayRangeReader=Rt,this.arrayBuilderSegmentReader=kt,this.diffReader=Dt,this.editReader=_t,this.frameReader=Tt}updatedComponents(){return t.readStructField(this.batchAddress,0)}referenceFrames(){return t.readStructField(this.batchAddress,Rt.structLength)}disposedComponentIds(){return t.readStructField(this.batchAddress,2*Rt.structLength)}disposedEventHandlerIds(){return t.readStructField(this.batchAddress,3*Rt.structLength)}updatedComponentsEntry(e,t){return Ft(e,t,Dt.structLength)}referenceFramesEntry(e,t){return Ft(e,t,Tt.structLength)}disposedComponentIdsEntry(e,n){const r=Ft(e,n,4);return t.readInt32Field(r)}disposedEventHandlerIdsEntry(e,n){const r=Ft(e,n,8);return t.readUint64Field(r)}}const Rt={structLength:8,values:e=>t.readObjectField(e,0),count:e=>t.readInt32Field(e,4)},kt={structLength:12,values:e=>{const n=t.readObjectField(e,0),r=t.getObjectFieldsBaseAddress(n);return t.readObjectField(r,0)},offset:e=>t.readInt32Field(e,4),count:e=>t.readInt32Field(e,8)},Dt={structLength:4+kt.structLength,componentId:e=>t.readInt32Field(e,0),edits:e=>t.readStructField(e,4),editsEntry:(e,t)=>Ft(e,t,_t.structLength)},_t={structLength:20,editType:e=>t.readInt32Field(e,0),siblingIndex:e=>t.readInt32Field(e,4),newTreeIndex:e=>t.readInt32Field(e,8),moveToSiblingIndex:e=>t.readInt32Field(e,8),removedAttributeName:e=>t.readStringField(e,16)},Tt={structLength:36,frameType:e=>t.readInt16Field(e,4),subtreeLength:e=>t.readInt32Field(e,8),elementReferenceCaptureId:e=>t.readStringField(e,16),componentId:e=>t.readInt32Field(e,12),elementName:e=>t.readStringField(e,16),textContent:e=>t.readStringField(e,16),markupContent:e=>t.readStringField(e,16),attributeName:e=>t.readStringField(e,16),attributeValue:e=>t.readStringField(e,24,!0),attributeEventHandlerId:e=>t.readUint64Field(e,8)};function Ft(e,n,r){return t.getArrayEntryPtr(e,n,r)}const Lt=/^\s*Blazor-WebAssembly-Component-State:(?<state>[a-zA-Z0-9+/=]+)$/;function Ot(e){return Mt(e,Lt)}function Mt(e,t,n="state"){if(e.nodeType===Node.COMMENT_NODE){const r=e.textContent||"",o=t.exec(r),i=o&&o.groups&&o.groups[n];return i&&e.parentNode?.removeChild(e),i}if(!e.hasChildNodes())return;const r=e.childNodes;for(let e=0;e<r.length;e++){const o=Mt(r[e],t,n);if(o)return o}}function xt(e,t){const n=[],r=new Vt(e.childNodes);for(;r.next()&&r.currentElement;){const e=Bt(r,t);if(e)n.push(e);else if(r.currentElement.hasChildNodes()){const e=xt(r.currentElement,t);for(let t=0;t<e.length;t++){const r=e[t];n.push(r)}}}return n}const Pt=new RegExp(/^\s*Blazor:[^{]*(?<descriptor>.*)$/);function Bt(e,t){const n=e.currentElement;var r,o,i;if(n&&n.nodeType===Node.COMMENT_NODE&&n.textContent){const s=Pt.exec(n.textContent),a=s&&s.groups&&s.groups.descriptor;if(!a)return;!function(e){if(e.parentNode instanceof Document)throw new Error("Root components cannot be marked as interactive. The <html> element must be rendered statically so that scripts are not evaluated multiple times.")}(n);try{const s=function(e){const t=JSON.parse(e),{type:n}=t;if("server"!==n&&"webassembly"!==n&&"auto"!==n)throw new Error(`Invalid component type '${n}'.`);return t}(a),c=function(e,t,n){const{prerenderId:r}=e;if(r){for(;n.next()&&n.currentElement;){const e=n.currentElement;if(e.nodeType!==Node.COMMENT_NODE)continue;if(!e.textContent)continue;const t=Pt.exec(e.textContent),o=t&&t[1];if(o)return Kt(o,r),e}throw new Error(`Could not find an end component comment for '${t}'.`)}}(s,n,e);if(t!==s.type)return;switch(s.type){case"webassembly":return o=n,i=c,Ut(r=s),{...r,uniqueId:$t++,start:o,end:i};case"server":return function(e,t,n){return Wt(e),{...e,uniqueId:$t++,start:t,end:n}}(s,n,c);case"auto":return function(e,t,n){return Wt(e),Ut(e),{...e,uniqueId:$t++,start:t,end:n}}(s,n,c)}}catch(e){throw new Error(`Found malformed component comment at ${n.textContent}`)}}}let Ht,jt,Jt,zt,$t=0;function Wt(e){const{descriptor:t,sequence:n}=e;if(!t)throw new Error("descriptor must be defined when using a descriptor.");if(void 0===n)throw new Error("sequence must be defined when using a descriptor.");if(!Number.isInteger(n))throw new Error(`Error parsing the sequence '${n}' for component '${JSON.stringify(e)}'`)}function Ut(e){const{assembly:t,typeName:n}=e;if(!t)throw new Error("assembly must be defined when using a descriptor.");if(!n)throw new Error("typeName must be defined when using a descriptor.");e.parameterDefinitions=e.parameterDefinitions&&atob(e.parameterDefinitions),e.parameterValues=e.parameterValues&&atob(e.parameterValues)}function Kt(e,t){const n=JSON.parse(e);if(1!==Object.keys(n).length)throw new Error(`Invalid end of component comment: '${e}'`);const r=n.prerenderId;if(!r)throw new Error(`End of component comment must have a value for the prerendered property: '${e}'`);if(r!==t)throw new Error(`End of component comment prerendered property must match the start comment prerender id: '${t}', '${r}'`)}class Vt{constructor(e){this.childNodes=e,this.currentIndex=-1,this.length=e.length}next(){return this.currentIndex++,this.currentIndex<this.length?(this.currentElement=this.childNodes[this.currentIndex],!0):(this.currentElement=void 0,!1)}}class Xt{constructor(e){this.componentManager=e}resolveRegisteredElement(e){const t=Number.parseInt(e);if(!Number.isNaN(t))return function(e){const{start:t,end:n}=e,r=t[P];if(r){if(r!==e)throw new Error("The start component comment was already associated with another component descriptor.");return t}const o=t.parentNode;if(!o)throw new Error(`Comment not connected to the DOM ${t.textContent}`);const i=B(o,!0),s=K(i);t[x]=i,t[P]=e;const a=B(t);if(n){const e=K(a),r=Array.prototype.indexOf.call(s,a)+1;let o=null;for(;o!==n;){const n=s.splice(r,1)[0];if(!n)throw new Error("Could not find the end component comment in the parent logical node list");n[x]=t,e.push(n),o=n}}return a}(this.componentManager.resolveRootComponent(t))}getParameterValues(e){return this.componentManager.initialComponents[e].parameterValues}getParameterDefinitions(e){return this.componentManager.initialComponents[e].parameterDefinitions}getTypeName(e){return this.componentManager.initialComponents[e].typeName}getAssembly(e){return this.componentManager.initialComponents[e].assembly}getCount(){return this.componentManager.initialComponents.length}}new Promise((e=>{zt=e}));const Yt=new Promise((e=>{}));let qt;const Gt=new Promise((e=>{qt=e}));function Zt(e){if(Ht)throw new Error("WebAssembly options have already been configured.");!async function(e){const t=await e;Ht=t,qt()}(e)}function Qt(e){if(void 0!==Jt)throw new Error("Blazor WebAssembly has already started.");return Jt=new Promise(en.bind(null,e)),Jt}async function en(e,n,r){(function(){if(window.parent!==window&&!window.opener&&window.frameElement){const e=window.sessionStorage&&window.sessionStorage["Microsoft.AspNetCore.Components.WebAssembly.Authentication.CachedAuthSettings"],t=e&&JSON.parse(e);return t&&t.redirect_uri&&location.href.startsWith(t.redirect_uri)}return!1})()&&await new Promise((()=>{}));const o=tn();!function(e){const t=R;R=(e,n,r)=>{((e,t,n)=>{const r=function(e){return he[e]}(e);r?.eventDelegator.getHandler(t)&&vt.invokeWhenHeapUnlocked(n)})(e,n,(()=>t(e,n,r)))}}(),rt._internal.applyHotReload=(e,t,n,r,o)=>{ht.invokeDotNetStaticMethod("Microsoft.AspNetCore.Components.WebAssembly","ApplyHotReloadDelta",e,t,n,r,o??null)},rt._internal.getApplyUpdateCapabilities=()=>ht.invokeDotNetStaticMethod("Microsoft.AspNetCore.Components.WebAssembly","GetApplyUpdateCapabilities"),rt._internal.invokeJSJson=nn,rt._internal.endInvokeDotNetFromJS=rn,rt._internal.receiveWebAssemblyDotNetDataStream=on,rt._internal.receiveByteArray=sn;const i=(t=vt,t);rt.platform=i,rt._internal.renderBatch=(e,t)=>{const n=vt.beginHeapLock();try{!function(e,t){const n=he[e];if(!n)throw new Error(`There is no browser renderer with ID ${e}.`);const r=t.arrayRangeReader,o=t.updatedComponents(),i=r.values(o),s=r.count(o),a=t.referenceFrames(),c=r.values(a),l=t.diffReader;for(let e=0;e<s;e++){const r=t.updatedComponentsEntry(i,e),o=l.componentId(r),s=l.edits(r);n.updateComponent(t,o,s,c)}const u=t.disposedComponentIds(),d=r.values(u),f=r.count(u);for(let e=0;e<f;e++){const r=t.disposedComponentIdsEntry(d,e);n.disposeComponent(r)}const m=t.disposedEventHandlerIds(),h=r.values(m),p=r.count(m);for(let e=0;e<p;e++){const r=t.disposedEventHandlerIdsEntry(h,e);n.disposeEventHandler(r)}ve&&(ve=!1,window.scrollTo&&window.scrollTo(0,0))}(e,new Nt(t))}finally{n.release()}},rt._internal.navigationManager.listenForNavigationEvents(dt.WebAssembly,(async(e,t,n)=>{await ht.invokeDotNetStaticMethodAsync("Microsoft.AspNetCore.Components.WebAssembly","NotifyLocationChanged",e,t,n)}),(async(e,t,n,r)=>{const o=await ht.invokeDotNetStaticMethodAsync("Microsoft.AspNetCore.Components.WebAssembly","NotifyLocationChangingAsync",t,n,r);rt._internal.navigationManager.endLocationChanging(e,o)}));const s=new Xt(e);rt._internal.registeredComponents={getRegisteredComponentsCount:()=>s.getCount(),getAssembly:e=>s.getAssembly(e),getTypeName:e=>s.getTypeName(e),getParameterDefinitions:e=>s.getParameterDefinitions(e)||"",getParameterValues:e=>s.getParameterValues(e)||""},rt._internal.getPersistedState=()=>Ot(document)||"",rt._internal.getInitialComponentsUpdate=()=>Yt,rt._internal.updateRootComponents=e=>rt._internal.dotNetExports?.UpdateRootComponentsCore(e),rt._internal.endUpdateRootComponents=t=>e.onAfterUpdateRootComponents?.(t),rt._internal.attachRootComponentToElement=(e,t,n)=>{const r=s.resolveRegisteredElement(e);r?we(n,r,t,!1):function(e,t,n){const r="::before";let o=!1;if(e.endsWith("::after"))e=e.slice(0,-7),o=!0;else if(e.endsWith(r))throw new Error(`The '${r}' selector is not supported.`);const i=function(e){const t=h.get(e);if(t)return h.delete(e),t}(e)||document.querySelector(e);if(!i)throw new Error(`Could not find any element matching selector '${e}'.`);we(n,B(i,!0),t,o)}(e,t,n)};try{await o,await i.start()}catch(e){throw new Error(`Failed to start platform. Reason: ${e}`)}i.callEntryPoint(),bt.invokeAfterStartedCallbacks(rt),n()}function tn(){return jt??=(async()=>{await Gt;const e=Ht??{},t=Ht?.configureRuntime;e.configureRuntime=e=>{t?.(e)},await vt.load(e,zt)})(),jt}function nn(e,t,n,r,o){return 0!==o?(ht.beginInvokeJSFromDotNet(o,e,r,n,t),null):ht.invokeJSFromDotNet(e,r,n,t)}function rn(e,t,n){ht.endInvokeDotNetFromJS(e,t,n)}function on(e,t,n,r){!function(e,t,n,r,o){let i=nt.get(t);if(!i){const n=new ReadableStream({start(e){nt.set(t,e),i=e}});e.supplyDotNetStream(t,n)}o?(i.error(o),nt.delete(t)):0===r?(i.close(),nt.delete(t)):i.enqueue(n.length===r?n:n.subarray(0,r))}(ht,e,t,n,r)}function sn(e,t){ht.receiveByteArray(e,t)}class an{constructor(e){this.initialComponents=e}resolveRootComponent(e){return this.initialComponents[e]}}class cn{constructor(){this._eventListeners=new Map}static create(e){const t=new cn;return e.addEventListener=t.addEventListener.bind(t),e.removeEventListener=t.removeEventListener.bind(t),t}addEventListener(e,t){let n=this._eventListeners.get(e);n||(n=new Set,this._eventListeners.set(e,n)),n.add(t)}removeEventListener(e,t){this._eventListeners.get(e)?.delete(t)}dispatchEvent(e,t){const n=this._eventListeners.get(e);if(!n)return;const r={...t,type:e};for(const e of n)e(r)}}let ln=!1;async function un(e){if(ln)throw new Error("Blazor has already started.");ln=!0,Zt(Promise.resolve(e||{})),cn.create(rt);const t=xt(document,"webassembly"),n=new an(t);await Qt(n)}rt.start=un,window.DotNet=e,document&&document.currentScript&&"false"!==document.currentScript.getAttribute("autostart")&&un().catch(Ct)}();
diff --git a/src/Components/Web.JS/dist/Release/blazor.webview.js b/src/Components/Web.JS/dist/Release/blazor.webview.js
deleted file mode 100644
index ba5785a206c9..000000000000
--- a/src/Components/Web.JS/dist/Release/blazor.webview.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){"use strict";var t,n,r;!function(e){const t=[],n="__jsObjectId",r="__dotNetObject",o="__byte[]",a="__dotNetStream",i="__jsStreamReferenceLength";let s,c;class l{constructor(e){this._jsObject=e,this._cachedFunctions=new Map}findFunction(e){const t=this._cachedFunctions.get(e);if(t)return t;let n,r=this._jsObject;if(e.split(".").forEach((t=>{if(!(t in r))throw new Error(`Could not find '${e}' ('${t}' was undefined).`);n=r,r=r[t]})),r instanceof Function)return r=r.bind(n),this._cachedFunctions.set(e,r),r;throw new Error(`The value '${e}' is not a function.`)}getWrappedObject(){return this._jsObject}}const u=0,d={[u]:new l(window)};d[0]._cachedFunctions.set("import",(e=>("string"==typeof e&&e.startsWith("./")&&(e=new URL(e.substr(2),document.baseURI).toString()),import(e))));let h,f=1;function m(e){t.push(e)}function p(e){if(e&&"object"==typeof e){d[f]=new l(e);const t={[n]:f};return f++,t}throw new Error(`Cannot create a JSObjectReference from the value '${e}'.`)}function b(e){let t=-1;if(e instanceof ArrayBuffer&&(e=new Uint8Array(e)),e instanceof Blob)t=e.size;else{if(!(e.buffer instanceof ArrayBuffer))throw new Error("Supplied value is not a typed array or blob.");if(void 0===e.byteLength)throw new Error(`Cannot create a JSStreamReference from the value '${e}' as it doesn't have a byteLength.`);t=e.byteLength}const r={[i]:t};try{const t=p(e);r[n]=t[n]}catch(t){throw new Error(`Cannot create a JSStreamReference from the value '${e}'.`)}return r}function g(e,n){c=e;const r=n?JSON.parse(n,((e,n)=>t.reduce(((t,n)=>n(e,t)),n))):null;return c=void 0,r}function v(){if(void 0===s)throw new Error("No call dispatcher has been set.");if(null===s)throw new Error("There are multiple .NET runtimes present, so a default dispatcher could not be resolved. Use DotNetObject to invoke .NET instance methods.");return s}e.attachDispatcher=function(e){const t=new y(e);return void 0===s?s=t:s&&(s=null),t},e.attachReviver=m,e.invokeMethod=function(e,t,...n){return v().invokeDotNetStaticMethod(e,t,...n)},e.invokeMethodAsync=function(e,t,...n){return v().invokeDotNetStaticMethodAsync(e,t,...n)},e.createJSObjectReference=p,e.createJSStreamReference=b,e.disposeJSObjectReference=function(e){const t=e&&e[n];"number"==typeof t&&S(t)},function(e){e[e.Default=0]="Default",e[e.JSObjectReference=1]="JSObjectReference",e[e.JSStreamReference=2]="JSStreamReference",e[e.JSVoidResult=3]="JSVoidResult"}(h=e.JSCallResultType||(e.JSCallResultType={}));class y{constructor(e){this._dotNetCallDispatcher=e,this._byteArraysToBeRevived=new Map,this._pendingDotNetToJSStreams=new Map,this._pendingAsyncCalls={},this._nextAsyncCallId=1}getDotNetCallDispatcher(){return this._dotNetCallDispatcher}invokeJSFromDotNet(e,t,n,r){const o=g(this,t),a=A(E(e,r)(...o||[]),n);return null==a?null:R(this,a)}beginInvokeJSFromDotNet(e,t,n,r,o){const a=new Promise((e=>{const r=g(this,n);e(E(t,o)(...r||[]))}));e&&a.then((t=>R(this,[e,!0,A(t,r)]))).then((t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!0,t)),(t=>this._dotNetCallDispatcher.endInvokeJSFromDotNet(e,!1,JSON.stringify([e,!1,w(t)]))))}endInvokeDotNetFromJS(e,t,n){const r=t?g(this,n):new Error(n);this.completePendingCall(parseInt(e,10),t,r)}invokeDotNetStaticMethod(e,t,...n){return this.invokeDotNetMethod(e,t,null,n)}invokeDotNetStaticMethodAsync(e,t,...n){return this.invokeDotNetMethodAsync(e,t,null,n)}invokeDotNetMethod(e,t,n,r){if(this._dotNetCallDispatcher.invokeDotNetFromJS){const o=R(this,r),a=this._dotNetCallDispatcher.invokeDotNetFromJS(e,t,n,o);return a?g(this,a):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeDotNetMethodAsync instead.")}invokeDotNetMethodAsync(e,t,n,r){if(e&&n)throw new Error(`For instance method calls, assemblyName should be null. Received '${e}'.`);const o=this._nextAsyncCallId++,a=new Promise(((e,t)=>{this._pendingAsyncCalls[o]={resolve:e,reject:t}}));try{const a=R(this,r);this._dotNetCallDispatcher.beginInvokeDotNetFromJS(o,e,t,n,a)}catch(e){this.completePendingCall(o,!1,e)}return a}receiveByteArray(e,t){this._byteArraysToBeRevived.set(e,t)}processByteArray(e){const t=this._byteArraysToBeRevived.get(e);return t?(this._byteArraysToBeRevived.delete(e),t):null}supplyDotNetStream(e,t){if(this._pendingDotNetToJSStreams.has(e)){const n=this._pendingDotNetToJSStreams.get(e);this._pendingDotNetToJSStreams.delete(e),n.resolve(t)}else{const n=new D;n.resolve(t),this._pendingDotNetToJSStreams.set(e,n)}}getDotNetStreamPromise(e){let t;if(this._pendingDotNetToJSStreams.has(e))t=this._pendingDotNetToJSStreams.get(e).streamPromise,this._pendingDotNetToJSStreams.delete(e);else{const n=new D;this._pendingDotNetToJSStreams.set(e,n),t=n.streamPromise}return t}completePendingCall(e,t,n){if(!this._pendingAsyncCalls.hasOwnProperty(e))throw new Error(`There is no pending async call with ID ${e}.`);const r=this._pendingAsyncCalls[e];delete this._pendingAsyncCalls[e],t?r.resolve(n):r.reject(n)}}function w(e){return e instanceof Error?`${e.message}\n${e.stack}`:e?e.toString():"null"}function E(e,t){const n=d[t];if(n)return n.findFunction(e);throw new Error(`JS object instance with ID ${t} does not exist (has it been disposed?).`)}function S(e){delete d[e]}e.findJSFunction=E,e.disposeJSObjectReferenceById=S;class I{constructor(e,t){this._id=e,this._callDispatcher=t}invokeMethod(e,...t){return this._callDispatcher.invokeDotNetMethod(null,e,this._id,t)}invokeMethodAsync(e,...t){return this._callDispatcher.invokeDotNetMethodAsync(null,e,this._id,t)}dispose(){this._callDispatcher.invokeDotNetMethodAsync(null,"__Dispose",this._id,null).catch((e=>console.error(e)))}serializeAsArg(){return{[r]:this._id}}}e.DotNetObject=I,m((function(e,t){if(t&&"object"==typeof t){if(t.hasOwnProperty(r))return new I(t[r],c);if(t.hasOwnProperty(n)){const e=t[n],r=d[e];if(r)return r.getWrappedObject();throw new Error(`JS object instance with Id '${e}' does not exist. It may have been disposed.`)}if(t.hasOwnProperty(o)){const e=t[o],n=c.processByteArray(e);if(void 0===n)throw new Error(`Byte array index '${e}' does not exist.`);return n}if(t.hasOwnProperty(a)){const e=t[a],n=c.getDotNetStreamPromise(e);return new C(n)}}return t}));class C{constructor(e){this._streamPromise=e}stream(){return this._streamPromise}async arrayBuffer(){return new Response(await this.stream()).arrayBuffer()}}class D{constructor(){this.streamPromise=new Promise(((e,t)=>{this.resolve=e,this.reject=t}))}}function A(e,t){switch(t){case h.Default:return e;case h.JSObjectReference:return p(e);case h.JSStreamReference:return b(e);case h.JSVoidResult:return null;default:throw new Error(`Invalid JS call result type '${t}'.`)}}let N=0;function R(e,t){N=0,c=e;const n=JSON.stringify(t,k);return c=void 0,n}function k(e,t){if(t instanceof I)return t.serializeAsArg();if(t instanceof Uint8Array){c.getDotNetCallDispatcher().sendByteArray(N,t);const e={[o]:N};return N++,e}return t}}(t||(t={})),function(e){e[e.prependFrame=1]="prependFrame",e[e.removeFrame=2]="removeFrame",e[e.setAttribute=3]="setAttribute",e[e.removeAttribute=4]="removeAttribute",e[e.updateText=5]="updateText",e[e.stepIn=6]="stepIn",e[e.stepOut=7]="stepOut",e[e.updateMarkup=8]="updateMarkup",e[e.permutationListEntry=9]="permutationListEntry",e[e.permutationListEnd=10]="permutationListEnd"}(n||(n={})),function(e){e[e.element=1]="element",e[e.text=2]="text",e[e.attribute=3]="attribute",e[e.component=4]="component",e[e.region=5]="region",e[e.elementReferenceCapture=6]="elementReferenceCapture",e[e.markup=8]="markup",e[e.namedEvent=10]="namedEvent"}(r||(r={}));class o{constructor(e,t){this.componentId=e,this.fieldValue=t}static fromEvent(e,t){const n=t.target;if(n instanceof Element){const t=function(e){return e instanceof HTMLInputElement?e.type&&"checkbox"===e.type.toLowerCase()?{value:e.checked}:{value:e.value}:e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement?{value:e.value}:null}(n);if(t)return new o(e,t.value)}return null}}const a=new Map,i=new Map,s=[];function c(e){return a.get(e)}function l(e){const t=a.get(e);return t?.browserEventName||e}function u(e,t){e.forEach((e=>a.set(e,t)))}function d(e){const t=[];for(let n=0;n<e.length;n++){const r=e[n];t.push({identifier:r.identifier,clientX:r.clientX,clientY:r.clientY,screenX:r.screenX,screenY:r.screenY,pageX:r.pageX,pageY:r.pageY})}return t}function h(e){return{detail:e.detail,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY,offsetX:e.offsetX,offsetY:e.offsetY,pageX:e.pageX,pageY:e.pageY,movementX:e.movementX,movementY:e.movementY,button:e.button,buttons:e.buttons,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey,type:e.type}}u(["input","change"],{createEventArgs:function(e){const t=e.target;if(function(e){return-1!==f.indexOf(e.getAttribute("type"))}(t)){const e=function(e){const t=e.value,n=e.type;switch(n){case"date":case"month":case"week":return t;case"datetime-local":return 16===t.length?t+":00":t;case"time":return 5===t.length?t+":00":t}throw new Error(`Invalid element type '${n}'.`)}(t);return{value:e}}if(function(e){return e instanceof HTMLSelectElement&&"select-multiple"===e.type}(t)){const e=t;return{value:Array.from(e.options).filter((e=>e.selected)).map((e=>e.value))}}{const e=function(e){return!!e&&"INPUT"===e.tagName&&"checkbox"===e.getAttribute("type")}(t);return{value:e?!!t.checked:t.value}}}}),u(["copy","cut","paste"],{createEventArgs:e=>({type:e.type})}),u(["drag","dragend","dragenter","dragleave","dragover","dragstart","drop"],{createEventArgs:e=>{return{...h(t=e),dataTransfer:t.dataTransfer?{dropEffect:t.dataTransfer.dropEffect,effectAllowed:t.dataTransfer.effectAllowed,files:Array.from(t.dataTransfer.files).map((e=>e.name)),items:Array.from(t.dataTransfer.items).map((e=>({kind:e.kind,type:e.type}))),types:t.dataTransfer.types}:null};var t}}),u(["focus","blur","focusin","focusout"],{createEventArgs:e=>({type:e.type})}),u(["keydown","keyup","keypress"],{createEventArgs:e=>{return{key:(t=e).key,code:t.code,location:t.location,repeat:t.repeat,ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type,isComposing:t.isComposing};var t}}),u(["contextmenu","click","mouseover","mouseout","mousemove","mousedown","mouseup","mouseleave","mouseenter","dblclick"],{createEventArgs:e=>h(e)}),u(["error"],{createEventArgs:e=>{return{message:(t=e).message,filename:t.filename,lineno:t.lineno,colno:t.colno,type:t.type};var t}}),u(["loadstart","timeout","abort","load","loadend","progress"],{createEventArgs:e=>{return{lengthComputable:(t=e).lengthComputable,loaded:t.loaded,total:t.total,type:t.type};var t}}),u(["touchcancel","touchend","touchmove","touchenter","touchleave","touchstart"],{createEventArgs:e=>{return{detail:(t=e).detail,touches:d(t.touches),targetTouches:d(t.targetTouches),changedTouches:d(t.changedTouches),ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,altKey:t.altKey,metaKey:t.metaKey,type:t.type};var t}}),u(["gotpointercapture","lostpointercapture","pointercancel","pointerdown","pointerenter","pointerleave","pointermove","pointerout","pointerover","pointerup"],{createEventArgs:e=>{return{...h(t=e),pointerId:t.pointerId,width:t.width,height:t.height,pressure:t.pressure,tiltX:t.tiltX,tiltY:t.tiltY,pointerType:t.pointerType,isPrimary:t.isPrimary};var t}}),u(["wheel","mousewheel"],{createEventArgs:e=>{return{...h(t=e),deltaX:t.deltaX,deltaY:t.deltaY,deltaZ:t.deltaZ,deltaMode:t.deltaMode};var t}}),u(["cancel","close","toggle"],{createEventArgs:()=>({})});const f=["date","datetime-local","month","time","week"],m=new Map;let p,b,g=0;const v={async add(e,t,n){if(!n)throw new Error("initialParameters must be an object, even if empty.");const r="__bl-dynamic-root:"+(++g).toString();m.set(r,e);const o=await E().invokeMethodAsync("AddRootComponent",t,r),a=new w(o,b[t]);return await a.setParameters(n),a}};class y{invoke(e){return this._callback(e)}setCallback(e){this._selfJSObjectReference||(this._selfJSObjectReference=t.createJSObjectReference(this)),this._callback=e}getJSObjectReference(){return this._selfJSObjectReference}dispose(){this._selfJSObjectReference&&t.disposeJSObjectReference(this._selfJSObjectReference)}}class w{constructor(e,t){this._jsEventCallbackWrappers=new Map,this._componentId=e;for(const e of t)"eventcallback"===e.type&&this._jsEventCallbackWrappers.set(e.name.toLowerCase(),new y)}setParameters(e){const t={},n=Object.entries(e||{}),r=n.length;for(const[e,r]of n){const n=this._jsEventCallbackWrappers.get(e.toLowerCase());n&&r?(n.setCallback(r),t[e]=n.getJSObjectReference()):t[e]=r}return E().invokeMethodAsync("SetRootComponentParameters",this._componentId,r,t)}async dispose(){if(null!==this._componentId){await E().invokeMethodAsync("RemoveRootComponent",this._componentId),this._componentId=null;for(const e of this._jsEventCallbackWrappers.values())e.dispose()}}}function E(){if(!p)throw new Error("Dynamic root components have not been enabled in this application.");return p}const S=new Map,I=[],C=new Map;function D(e,t,n){return N(e,t.eventHandlerId,(()=>A(e).invokeMethodAsync("DispatchEventAsync",t,n)))}function A(e){const t=S.get(e);if(!t)throw new Error(`No interop methods are registered for renderer ${e}`);return t}let N=(e,t,n)=>n();const R=x(["abort","blur","cancel","canplay","canplaythrough","change","close","cuechange","durationchange","emptied","ended","error","focus","load","loadeddata","loadedmetadata","loadend","loadstart","mouseenter","mouseleave","pointerenter","pointerleave","pause","play","playing","progress","ratechange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeupdate","toggle","unload","volumechange","waiting","DOMNodeInsertedIntoDocument","DOMNodeRemovedFromDocument"]),k={submit:!0},T=x(["click","dblclick","mousedown","mousemove","mouseup"]);class _{static{this.nextEventDelegatorId=0}constructor(e){this.browserRendererId=e,this.afterClickCallbacks=[];const t=++_.nextEventDelegatorId;this.eventsCollectionKey=`_blazorEvents_${t}`,this.eventInfoStore=new O(this.onGlobalEvent.bind(this))}setListener(e,t,n,r){const o=this.getEventHandlerInfosForElement(e,!0),a=o.getHandler(t);if(a)this.eventInfoStore.update(a.eventHandlerId,n);else{const a={element:e,eventName:t,eventHandlerId:n,renderingComponentId:r};this.eventInfoStore.add(a),o.setHandler(t,a)}}getHandler(e){return this.eventInfoStore.get(e)}removeListener(e){const t=this.eventInfoStore.remove(e);if(t){const e=t.element,n=this.getEventHandlerInfosForElement(e,!1);n&&n.removeHandler(t.eventName)}}notifyAfterClick(e){this.afterClickCallbacks.push(e),this.eventInfoStore.addGlobalListener("click")}setStopPropagation(e,t,n){this.getEventHandlerInfosForElement(e,!0).stopPropagation(t,n)}setPreventDefault(e,t,n){this.getEventHandlerInfosForElement(e,!0).preventDefault(t,n)}onGlobalEvent(e){if(!(e.target instanceof Element))return;this.dispatchGlobalEventToAllElements(e.type,e);const t=(n=e.type,i.get(n));var n;t&&t.forEach((t=>this.dispatchGlobalEventToAllElements(t,e))),"click"===e.type&&this.afterClickCallbacks.forEach((t=>t(e)))}dispatchGlobalEventToAllElements(e,t){const n=t.composedPath();let r=n.shift(),a=null,i=!1;const s=Object.prototype.hasOwnProperty.call(R,e);let l=!1;for(;r;){const h=r,f=this.getEventHandlerInfosForElement(h,!1);if(f){const n=f.getHandler(e);if(n&&(u=h,d=t.type,!((u instanceof HTMLButtonElement||u instanceof HTMLInputElement||u instanceof HTMLTextAreaElement||u instanceof HTMLSelectElement)&&Object.prototype.hasOwnProperty.call(T,d)&&u.disabled))){if(!i){const n=c(e);a=n?.createEventArgs?n.createEventArgs(t):{},i=!0}Object.prototype.hasOwnProperty.call(k,t.type)&&t.preventDefault(),D(this.browserRendererId,{eventHandlerId:n.eventHandlerId,eventName:e,eventFieldInfo:o.fromEvent(n.renderingComponentId,t)},a)}f.stopPropagation(e)&&(l=!0),f.preventDefault(e)&&t.preventDefault()}r=s||l?void 0:n.shift()}var u,d}getEventHandlerInfosForElement(e,t){return Object.prototype.hasOwnProperty.call(e,this.eventsCollectionKey)?e[this.eventsCollectionKey]:t?e[this.eventsCollectionKey]=new L:null}}class O{constructor(e){this.globalListener=e,this.infosByEventHandlerId={},this.countByEventName={},s.push(this.handleEventNameAliasAdded.bind(this))}add(e){if(this.infosByEventHandlerId[e.eventHandlerId])throw new Error(`Event ${e.eventHandlerId} is already tracked`);this.infosByEventHandlerId[e.eventHandlerId]=e,this.addGlobalListener(e.eventName)}get(e){return this.infosByEventHandlerId[e]}addGlobalListener(e){if(e=l(e),Object.prototype.hasOwnProperty.call(this.countByEventName,e))this.countByEventName[e]++;else{this.countByEventName[e]=1;const t=Object.prototype.hasOwnProperty.call(R,e);document.addEventListener(e,this.globalListener,t)}}update(e,t){if(Object.prototype.hasOwnProperty.call(this.infosByEventHandlerId,t))throw new Error(`Event ${t} is already tracked`);const n=this.infosByEventHandlerId[e];delete this.infosByEventHandlerId[e],n.eventHandlerId=t,this.infosByEventHandlerId[t]=n}remove(e){const t=this.infosByEventHandlerId[e];if(t){delete this.infosByEventHandlerId[e];const n=l(t.eventName);0==--this.countByEventName[n]&&(delete this.countByEventName[n],document.removeEventListener(n,this.globalListener))}return t}handleEventNameAliasAdded(e,t){if(Object.prototype.hasOwnProperty.call(this.countByEventName,e)){const n=this.countByEventName[e];delete this.countByEventName[e],document.removeEventListener(e,this.globalListener),this.addGlobalListener(t),this.countByEventName[t]+=n-1}}}class L{constructor(){this.handlers={},this.preventDefaultFlags=null,this.stopPropagationFlags=null}getHandler(e){return Object.prototype.hasOwnProperty.call(this.handlers,e)?this.handlers[e]:null}setHandler(e,t){this.handlers[e]=t}removeHandler(e){delete this.handlers[e]}preventDefault(e,t){return void 0!==t&&(this.preventDefaultFlags=this.preventDefaultFlags||{},this.preventDefaultFlags[e]=t),!!this.preventDefaultFlags&&this.preventDefaultFlags[e]}stopPropagation(e,t){return void 0!==t&&(this.stopPropagationFlags=this.stopPropagationFlags||{},this.stopPropagationFlags[e]=t),!!this.stopPropagationFlags&&this.stopPropagationFlags[e]}}function x(e){const t={};return e.forEach((e=>{t[e]=!0})),t}const F=Symbol(),M=Symbol();function P(e,t){if(F in e)return e;const n=[];if(e.childNodes.length>0){if(!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");e.childNodes.forEach((t=>{const r=P(t,!0);r[M]=e,n.push(r)}))}return e[F]=n,e}function B(e){const t=W(e);for(;t.length;)J(e,0)}function H(e,t){const n=document.createComment("!");return j(n,e,t),n}function j(e,t,n){const r=e;let o=e;if(e instanceof Comment){const t=W(r);if(t?.length>0){const t=G(r),n=new Range;n.setStartBefore(e),n.setEndAfter(t),o=n.extractContents()}}const a=U(r);if(a){const e=W(a),t=Array.prototype.indexOf.call(e,r);e.splice(t,1),delete r[M]}const i=W(t);if(n<i.length){const e=i[n];e.parentNode.insertBefore(o,e),i.splice(n,0,r)}else Y(o,t),i.push(r);r[M]=t,F in r||(r[F]=[])}function J(e,t){const n=W(e).splice(t,1)[0];if(n instanceof Comment){const e=W(n);if(e)for(;e.length>0;)J(n,0)}const r=n;r.parentNode.removeChild(r)}function U(e){return e[M]||null}function $(e,t){return W(e)[t]}function z(e){const t=X(e);return"http://www.w3.org/2000/svg"===t.namespaceURI&&"foreignObject"!==t.tagName}function W(e){return e[F]}function K(e){const t=W(U(e));return t[Array.prototype.indexOf.call(t,e)+1]||null}function V(e,t){const n=W(e);t.forEach((e=>{e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=G(e.moveRangeStart)})),t.forEach((t=>{const r=document.createComment("marker");t.moveToBeforeMarker=r;const o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):Y(r,e)})),t.forEach((e=>{const t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd;let a=r;for(;a;){const e=a.nextSibling;if(n.insertBefore(a,t),a===o)break;a=e}n.removeChild(t)})),t.forEach((e=>{n[e.toSiblingIndex]=e.moveRangeStart}))}function X(e){if(e instanceof Element||e instanceof DocumentFragment)return e;if(e instanceof Comment)return e.parentNode;throw new Error("Not a valid logical element")}function Y(e,t){if(t instanceof Element||t instanceof DocumentFragment)t.appendChild(e);else{if(!(t instanceof Comment))throw new Error(`Cannot append node because the parent is not a valid logical element. Parent: ${t}`);{const n=K(t);n?n.parentNode.insertBefore(e,n):Y(e,U(t))}}}function G(e){if(e instanceof Element||e instanceof DocumentFragment)return e;const t=K(e);if(t)return t.previousSibling;{const t=U(e);return t instanceof Element||t instanceof DocumentFragment?t.lastChild:G(t)}}function q(e){return`_bl_${e}`}const Z="__internalId";t.attachReviver(((e,t)=>t&&"object"==typeof t&&Object.prototype.hasOwnProperty.call(t,Z)&&"string"==typeof t[Z]?function(e){const t=`[${q(e)}]`;return document.querySelector(t)}(t[Z]):t));const Q="_blazorDeferredValue";function ee(e){return"select-multiple"===e.type}function te(e,t){e.value=t||""}function ne(e,t){e instanceof HTMLSelectElement?ee(e)?function(e,t){t||=[];for(let n=0;n<e.options.length;n++)e.options[n].selected=-1!==t.indexOf(e.options[n].value)}(e,t):te(e,t):e.value=t}function re(e){const t=function(e){for(;e;){if(e instanceof HTMLSelectElement)return e;e=e.parentElement}return null}(e);if(!function(e){return!!e&&Q in e}(t))return!1;if(ee(t))e.selected=-1!==t._blazorDeferredValue.indexOf(e.value);else{if(t._blazorDeferredValue!==e.value)return!1;te(t,e.value),delete t._blazorDeferredValue}return!0}const oe=document.createElement("template"),ae=document.createElementNS("http://www.w3.org/2000/svg","g"),ie=new Set,se=Symbol(),ce=Symbol();class le{constructor(e){this.rootComponentIds=new Set,this.childComponentLocations={},this.eventDelegator=new _(e),this.eventDelegator.notifyAfterClick((e=>{Ce()&&function(e,t){if(0!==e.button||function(e){return e.ctrlKey||e.shiftKey||e.altKey||e.metaKey}(e))return;if(e.defaultPrevented)return;const n=function(e){const t=e.composedPath&&e.composedPath();if(t)for(let e=0;e<t.length;e++){const n=t[e];if(n instanceof HTMLAnchorElement||n instanceof SVGAElement)return n}return null}(e);if(n&&function(e){const t=e.getAttribute("target");return(!t||"_self"===t)&&e.hasAttribute("href")&&!e.hasAttribute("download")}(n)){const t=Ie(n.getAttribute("href"));ye(t)&&(e.preventDefault(),xe(t,!0,!1))}}(e)}))}getRootComponentCount(){return this.rootComponentIds.size}attachRootComponentToLogicalElement(e,t,n){if(function(e){return e[se]}(t))throw new Error(`Root component '${e}' could not be attached because its target element is already associated with a root component`);n&&(t=H(t,W(t).length)),ue(t,!0),this.attachComponentToElement(e,t),this.rootComponentIds.add(e),ie.add(t)}updateComponent(e,t,n,r){const o=this.childComponentLocations[t];if(!o)throw new Error(`No element is currently associated with component ${t}`);ie.delete(o)&&(B(o),o instanceof Comment&&(o.textContent="!"));const a=X(o)?.getRootNode(),i=a&&a.activeElement;this.applyEdits(e,t,o,0,n,r),i instanceof HTMLElement&&a&&a.activeElement!==i&&i.focus()}disposeComponent(e){if(this.rootComponentIds.delete(e)){const t=this.childComponentLocations[e];ue(t,!1),!0===t[ce]?ie.add(t):B(t)}delete this.childComponentLocations[e]}disposeEventHandler(e){this.eventDelegator.removeListener(e)}attachComponentToElement(e,t){this.childComponentLocations[e]=t}applyEdits(e,t,r,o,a,i){let s,c=0,l=o;const u=e.arrayBuilderSegmentReader,d=e.editReader,h=e.frameReader,f=u.values(a),m=u.offset(a),p=m+u.count(a);for(let a=m;a<p;a++){const u=e.diffReader.editsEntry(f,a),m=d.editType(u);switch(m){case n.prependFrame:{const n=d.newTreeIndex(u),o=e.referenceFramesEntry(i,n),a=d.siblingIndex(u);this.insertFrame(e,t,r,l+a,i,o,n);break}case n.removeFrame:J(r,l+d.siblingIndex(u));break;case n.setAttribute:{const n=d.newTreeIndex(u),o=e.referenceFramesEntry(i,n),a=$(r,l+d.siblingIndex(u));if(!(a instanceof Element))throw new Error("Cannot set attribute on non-element child");this.applyAttribute(e,t,a,o);break}case n.removeAttribute:{const e=$(r,l+d.siblingIndex(u));if(!(e instanceof Element))throw new Error("Cannot remove attribute from non-element child");{const t=d.removedAttributeName(u);this.setOrRemoveAttributeOrProperty(e,t,null)}break}case n.updateText:{const t=d.newTreeIndex(u),n=e.referenceFramesEntry(i,t),o=$(r,l+d.siblingIndex(u));if(!(o instanceof Text))throw new Error("Cannot set text content on non-text child");o.textContent=h.textContent(n);break}case n.updateMarkup:{const t=d.newTreeIndex(u),n=e.referenceFramesEntry(i,t),o=d.siblingIndex(u);J(r,l+o),this.insertMarkup(e,r,l+o,n);break}case n.stepIn:r=$(r,l+d.siblingIndex(u)),c++,l=0;break;case n.stepOut:r=U(r),c--,l=0===c?o:0;break;case n.permutationListEntry:s=s||[],s.push({fromSiblingIndex:l+d.siblingIndex(u),toSiblingIndex:l+d.moveToSiblingIndex(u)});break;case n.permutationListEnd:V(r,s),s=void 0;break;default:throw new Error(`Unknown edit type: ${m}`)}}}insertFrame(e,t,n,o,a,i,s){const c=e.frameReader,l=c.frameType(i);switch(l){case r.element:return this.insertElement(e,t,n,o,a,i,s),1;case r.text:return this.insertText(e,n,o,i),1;case r.attribute:throw new Error("Attribute frames should only be present as leading children of element frames.");case r.component:return this.insertComponent(e,n,o,i),1;case r.region:return this.insertFrameRange(e,t,n,o,a,s+1,s+c.subtreeLength(i));case r.elementReferenceCapture:if(n instanceof Element)return u=n,d=c.elementReferenceCaptureId(i),u.setAttribute(q(d),""),0;throw new Error("Reference capture frames can only be children of element frames.");case r.markup:return this.insertMarkup(e,n,o,i),1;case r.namedEvent:return 0;default:throw new Error(`Unknown frame type: ${l}`)}var u,d}insertElement(e,t,n,o,a,i,s){const c=e.frameReader,l=c.elementName(i),u="svg"===l||z(n)?document.createElementNS("http://www.w3.org/2000/svg",l):document.createElement(l),d=P(u);let h=!1;const f=s+c.subtreeLength(i);for(let i=s+1;i<f;i++){const s=e.referenceFramesEntry(a,i);if(c.frameType(s)!==r.attribute){j(u,n,o),h=!0,this.insertFrameRange(e,t,d,0,a,i,f);break}this.applyAttribute(e,t,u,s)}var m;h||j(u,n,o),(m=u)instanceof HTMLOptionElement?re(m):Q in m&&ne(m,m[Q])}insertComponent(e,t,n,r){const o=H(t,n),a=e.frameReader.componentId(r);this.attachComponentToElement(a,o)}insertText(e,t,n,r){const o=e.frameReader.textContent(r);j(document.createTextNode(o),t,n)}insertMarkup(e,t,n,r){const o=H(t,n),a=(i=e.frameReader.markupContent(r),z(t)?(ae.innerHTML=i||" ",ae):(oe.innerHTML=i||" ",oe.content.querySelectorAll("script").forEach((e=>{const t=document.createElement("script");t.textContent=e.textContent,e.getAttributeNames().forEach((n=>{t.setAttribute(n,e.getAttribute(n))})),e.parentNode.replaceChild(t,e)})),oe.content));var i;let s=0;for(;a.firstChild;)j(a.firstChild,o,s++)}applyAttribute(e,t,n,r){const o=e.frameReader,a=o.attributeName(r),i=o.attributeEventHandlerId(r);if(i){const e=he(a);return void this.eventDelegator.setListener(n,e,i,t)}const s=o.attributeValue(r);this.setOrRemoveAttributeOrProperty(n,a,s)}insertFrameRange(e,t,n,r,o,a,i){const s=r;for(let s=a;s<i;s++){const a=e.referenceFramesEntry(o,s);r+=this.insertFrame(e,t,n,r,o,a,s),s+=de(e,a)}return r-s}setOrRemoveAttributeOrProperty(e,t,n){(function(e,t,n){switch(t){case"value":return function(e,t){switch(t&&"INPUT"===e.tagName&&(t=function(e,t){switch(t.getAttribute("type")){case"time":return 8!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,5);case"datetime-local":return 19!==e.length||!e.endsWith("00")&&t.hasAttribute("step")?e:e.substring(0,16);default:return e}}(t,e)),e.tagName){case"INPUT":case"SELECT":case"TEXTAREA":return t&&e instanceof HTMLSelectElement&&ee(e)&&(t=JSON.parse(t)),ne(e,t),e[Q]=t,!0;case"OPTION":return t||""===t?e.setAttribute("value",t):e.removeAttribute("value"),re(e),!0;default:return!1}}(e,n);case"checked":return function(e,t){return"INPUT"===e.tagName&&(e.checked=null!==t,!0)}(e,n);default:return!1}})(e,t,n)||(t.startsWith("__internal_")?this.applyInternalAttribute(e,t.substring(11),n):null!==n?e.setAttribute(t,n):e.removeAttribute(t))}applyInternalAttribute(e,t,n){if(t.startsWith("stopPropagation_")){const r=he(t.substring(16));this.eventDelegator.setStopPropagation(e,r,null!==n)}else{if(!t.startsWith("preventDefault_"))throw new Error(`Unsupported internal attribute '${t}'`);{const r=he(t.substring(15));this.eventDelegator.setPreventDefault(e,r,null!==n)}}}}function ue(e,t){e[se]=t}function de(e,t){const n=e.frameReader;switch(n.frameType(t)){case r.component:case r.element:case r.region:return n.subtreeLength(t)-1;default:return 0}}function he(e){if(e.startsWith("on"))return e.substring(2);throw new Error(`Attribute should be an event name, but doesn't start with 'on'. Value: '${e}'`)}const fe={};let me,pe,be,ge,ve=!1;function ye(e){const t=(n=document.baseURI).substring(0,n.lastIndexOf("/"));var n;const r=e.charAt(t.length);return e.startsWith(t)&&(""===r||"/"===r||"?"===r||"#"===r)}function we(e){document.getElementById(e)?.scrollIntoView()}function Ee(){return void 0!==pe}function Se(e,t){if(!pe)throw new Error("No enhanced programmatic navigation handler has been attached");pe(e,t)}function Ie(e){return ge=ge||document.createElement("a"),ge.href=e,ge.href}function Ce(){return void 0!==me}function De(){return me}let Ae=!1,Ne=0,Re=0;const ke=new Map;let Te=async function(e){Pe();const t=Je();if(t?.hasLocationChangingEventListeners){const n=e.state?._index??0,r=e.state?.userState,o=n-Ne,a=location.href;if(await Me(-o),!await Be(a,r,!1,t))return;await Me(o)}await He(!0)},_e=null;const Oe={listenForNavigationEvents:function(e,t,n){ke.set(e,{rendererId:e,hasLocationChangingEventListeners:!1,locationChanged:t,locationChanging:n}),Ae||(Ae=!0,window.addEventListener("popstate",je),Ne=history.state?._index??0,be=(e,t)=>{He(t,e)})},enableNavigationInterception:function(e){if(void 0!==me&&me!==e)throw new Error("Only one interactive runtime may enable navigation interception at a time.");me=e},setHasLocationChangingListeners:function(e,t){const n=ke.get(e);if(!n)throw new Error(`Renderer with ID '${e}' is not listening for navigation events`);n.hasLocationChangingEventListeners=t},endLocationChanging:function(e,t){_e&&e===Re&&(_e(t),_e=null)},navigateTo:function(e,t){Le(e,t,!0)},refresh:function(e){!e&&Ee()?Se(location.href,!0):location.reload()},getBaseURI:()=>document.baseURI,getLocationHref:()=>location.href,scrollToElement:we};function Le(e,t,n=!1){const r=Ie(e);!t.forceLoad&&ye(r)?Ue()?xe(r,!1,t.replaceHistoryEntry,t.historyEntryState,n):Se(r,t.replaceHistoryEntry):function(e,t){if(location.href===e){const t=e+"?";history.replaceState(null,"",t),location.replace(e)}else t?location.replace(e):location.href=e}(e,t.replaceHistoryEntry)}async function xe(e,t,n,r=void 0,o=!1){if(Pe(),function(e){const t=new URL(e);return""!==t.hash&&location.origin===t.origin&&location.pathname===t.pathname&&location.search===t.search}(e))return Fe(e,n,r),void function(e){const t=e.indexOf("#");t!==e.length-1&&we(e.substring(t+1))}(e);const a=Je();(o||!a?.hasLocationChangingEventListeners||await Be(e,r,t,a))&&(ve=!0,Fe(e,n,r),await He(t))}function Fe(e,t,n=void 0){t?history.replaceState({userState:n,_index:Ne},"",e):(Ne++,history.pushState({userState:n,_index:Ne},"",e))}function Me(e){return new Promise((t=>{const n=Te;Te=()=>{Te=n,t()},history.go(e)}))}function Pe(){_e&&(_e(!1),_e=null)}function Be(e,t,n,r){return new Promise((o=>{Pe(),Re++,_e=o,r.locationChanging(Re,e,t,n)}))}async function He(e,t){const n=t??location.href;await Promise.all(Array.from(ke,(async([t,r])=>{var o;o=t,S.has(o)&&await r.locationChanged(n,history.state?.userState,e)})))}async function je(e){Te&&Ue()&&await Te(e),Ne=history.state?._index??0}function Je(){const e=De();if(void 0!==e)return ke.get(e)}function Ue(){return Ce()||!Ee()}const $e={focus:function(e,t){if(e instanceof HTMLElement)e.focus({preventScroll:t});else{if(!(e instanceof SVGElement))throw new Error("Unable to focus an invalid element.");if(!e.hasAttribute("tabindex"))throw new Error("Unable to focus an SVG element that does not have a tabindex.");e.focus({preventScroll:t})}},focusBySelector:function(e){const t=document.querySelector(e);t&&(t.hasAttribute("tabindex")||(t.tabIndex=-1),t.focus({preventScroll:!0}))}},ze={init:function(e,t,n,r=50){const o=Ke(t);(o||document.documentElement).style.overflowAnchor="none";const a=document.createRange();h(n.parentElement)&&(t.style.display="table-row",n.style.display="table-row");const i=new IntersectionObserver((function(r){r.forEach((r=>{if(!r.isIntersecting)return;a.setStartAfter(t),a.setEndBefore(n);const o=a.getBoundingClientRect().height,i=r.rootBounds?.height;r.target===t?e.invokeMethodAsync("OnSpacerBeforeVisible",r.intersectionRect.top-r.boundingClientRect.top,o,i):r.target===n&&n.offsetHeight>0&&e.invokeMethodAsync("OnSpacerAfterVisible",r.boundingClientRect.bottom-r.intersectionRect.bottom,o,i)}))}),{root:o,rootMargin:`${r}px`});i.observe(t),i.observe(n);const s=d(t),c=d(n),{observersByDotNetObjectId:l,id:u}=Ve(e);function d(e){const t={attributes:!0},n=new MutationObserver(((n,r)=>{h(e.parentElement)&&(r.disconnect(),e.style.display="table-row",r.observe(e,t)),i.unobserve(e),i.observe(e)}));return n.observe(e,t),n}function h(e){return null!==e&&(e instanceof HTMLTableElement&&""===e.style.display||"table"===e.style.display||e instanceof HTMLTableSectionElement&&""===e.style.display||"table-row-group"===e.style.display)}l[u]={intersectionObserver:i,mutationObserverBefore:s,mutationObserverAfter:c}},dispose:function(e){const{observersByDotNetObjectId:t,id:n}=Ve(e),r=t[n];r&&(r.intersectionObserver.disconnect(),r.mutationObserverBefore.disconnect(),r.mutationObserverAfter.disconnect(),e.dispose(),delete t[n])}},We=Symbol();function Ke(e){return e&&e!==document.body&&e!==document.documentElement?"visible"!==getComputedStyle(e).overflowY?e:Ke(e.parentElement):null}function Ve(e){const t=e._callDispatcher,n=e._id;return t[We]??={},{observersByDotNetObjectId:t[We],id:n}}const Xe={getAndRemoveExistingTitle:function(){const e=document.head?document.head.getElementsByTagName("title"):[];if(0===e.length)return null;let t=null;for(let n=e.length-1;n>=0;n--){const r=e[n],o=r.previousSibling;o instanceof Comment&&null!==U(o)||(null===t&&(t=r.textContent),r.parentNode?.removeChild(r))}return t}},Ye={init:function(e,t){t._blazorInputFileNextFileId=0,t.addEventListener("click",(function(){t.value=""})),t.addEventListener("change",(function(){t._blazorFilesById={};const n=Array.prototype.map.call(t.files,(function(e){const n={id:++t._blazorInputFileNextFileId,lastModified:new Date(e.lastModified).toISOString(),name:e.name,size:e.size,contentType:e.type,readPromise:void 0,arrayBuffer:void 0,blob:e};return t._blazorFilesById[n.id]=n,n}));e.invokeMethodAsync("NotifyChange",n)}))},toImageFile:async function(e,t,n,r,o){const a=Ge(e,t),i=await new Promise((function(e){const t=new Image;t.onload=function(){URL.revokeObjectURL(t.src),e(t)},t.onerror=function(){t.onerror=null,URL.revokeObjectURL(t.src)},t.src=URL.createObjectURL(a.blob)})),s=await new Promise((function(e){const t=Math.min(1,r/i.width),a=Math.min(1,o/i.height),s=Math.min(t,a),c=document.createElement("canvas");c.width=Math.round(i.width*s),c.height=Math.round(i.height*s),c.getContext("2d")?.drawImage(i,0,0,c.width,c.height),c.toBlob(e,n)})),c={id:++e._blazorInputFileNextFileId,lastModified:a.lastModified,name:a.name,size:s?.size||0,contentType:n,blob:s||a.blob};return e._blazorFilesById[c.id]=c,c},readFileData:async function(e,t){return Ge(e,t).blob}};function Ge(e,t){const n=e._blazorFilesById[t];if(!n)throw new Error(`There is no file with ID ${t}. The file list may have changed. See https://aka.ms/aspnet/blazor-input-file-multiple-selections.`);return n}const qe=new Set,Ze={enableNavigationPrompt:function(e){0===qe.size&&window.addEventListener("beforeunload",Qe),qe.add(e)},disableNavigationPrompt:function(e){qe.delete(e),0===qe.size&&window.removeEventListener("beforeunload",Qe)}};function Qe(e){e.preventDefault(),e.returnValue=!0}const et=new Map,tt={navigateTo:function(e,t,n=!1){Le(e,t instanceof Object?t:{forceLoad:t,replaceHistoryEntry:n})},registerCustomEventType:function(e,t){if(!t)throw new Error("The options parameter is required.");if(a.has(e))throw new Error(`The event '${e}' is already registered.`);if(t.browserEventName){const n=i.get(t.browserEventName);n?n.push(e):i.set(t.browserEventName,[e]),s.forEach((n=>n(e,t.browserEventName)))}a.set(e,t)},rootComponents:v,runtime:{},_internal:{navigationManager:Oe,domWrapper:$e,Virtualize:ze,PageTitle:Xe,InputFile:Ye,NavigationLock:Ze,getJSDataStreamChunk:async function(e,t,n){return e instanceof Blob?await async function(e,t,n){const r=e.slice(t,t+n),o=await r.arrayBuffer();return new Uint8Array(o)}(e,t,n):function(e,t,n){return new Uint8Array(e.buffer,e.byteOffset+t,n)}(e,t,n)},attachWebRendererInterop:function(e,n,r,o){if(S.has(e))throw new Error(`Interop methods are already registered for renderer ${e}`);S.set(e,n),r&&o&&Object.keys(r).length>0&&function(e,n,r){if(p)throw new Error("Dynamic root components have already been enabled.");p=e,b=n;for(const[e,o]of Object.entries(r)){const r=t.findJSFunction(e,0);for(const e of o)r(e,n[e])}}(A(e),r,o),C.get(e)?.[0]?.(),function(e){for(const t of I)t(e)}(e)}}};window.Blazor=tt;let nt=!1;const rt="function"==typeof TextDecoder?new TextDecoder("utf-8"):null,ot=rt?rt.decode.bind(rt):function(e){let t=0;const n=e.length,r=[],o=[];for(;t<n;){const n=e[t++];if(0===n)break;if(128&n){if(192==(224&n)){const o=63&e[t++];r.push((31&n)<<6|o)}else if(224==(240&n)){const o=63&e[t++],a=63&e[t++];r.push((31&n)<<12|o<<6|a)}else if(240==(248&n)){let o=(7&n)<<18|(63&e[t++])<<12|(63&e[t++])<<6|63&e[t++];o>65535&&(o-=65536,r.push(o>>>10&1023|55296),o=56320|1023&o),r.push(o)}}else r.push(n);r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")},at=Math.pow(2,32),it=Math.pow(2,21)-1;function st(e,t){return e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24}function ct(e,t){return e[t]+(e[t+1]<<8)+(e[t+2]<<16)+(e[t+3]<<24>>>0)}function lt(e,t){const n=ct(e,t+4);if(n>it)throw new Error(`Cannot read uint64 with high order part ${n}, because the result would exceed Number.MAX_SAFE_INTEGER.`);return n*at+ct(e,t)}class ut{constructor(e){this.batchData=e;const t=new mt(e);this.arrayRangeReader=new pt(e),this.arrayBuilderSegmentReader=new bt(e),this.diffReader=new dt(e),this.editReader=new ht(e,t),this.frameReader=new ft(e,t)}updatedComponents(){return st(this.batchData,this.batchData.length-20)}referenceFrames(){return st(this.batchData,this.batchData.length-16)}disposedComponentIds(){return st(this.batchData,this.batchData.length-12)}disposedEventHandlerIds(){return st(this.batchData,this.batchData.length-8)}updatedComponentsEntry(e,t){const n=e+4*t;return st(this.batchData,n)}referenceFramesEntry(e,t){return e+20*t}disposedComponentIdsEntry(e,t){const n=e+4*t;return st(this.batchData,n)}disposedEventHandlerIdsEntry(e,t){const n=e+8*t;return lt(this.batchData,n)}}class dt{constructor(e){this.batchDataUint8=e}componentId(e){return st(this.batchDataUint8,e)}edits(e){return e+4}editsEntry(e,t){return e+16*t}}class ht{constructor(e,t){this.batchDataUint8=e,this.stringReader=t}editType(e){return st(this.batchDataUint8,e)}siblingIndex(e){return st(this.batchDataUint8,e+4)}newTreeIndex(e){return st(this.batchDataUint8,e+8)}moveToSiblingIndex(e){return st(this.batchDataUint8,e+8)}removedAttributeName(e){const t=st(this.batchDataUint8,e+12);return this.stringReader.readString(t)}}class ft{constructor(e,t){this.batchDataUint8=e,this.stringReader=t}frameType(e){return st(this.batchDataUint8,e)}subtreeLength(e){return st(this.batchDataUint8,e+4)}elementReferenceCaptureId(e){const t=st(this.batchDataUint8,e+4);return this.stringReader.readString(t)}componentId(e){return st(this.batchDataUint8,e+8)}elementName(e){const t=st(this.batchDataUint8,e+8);return this.stringReader.readString(t)}textContent(e){const t=st(this.batchDataUint8,e+4);return this.stringReader.readString(t)}markupContent(e){const t=st(this.batchDataUint8,e+4);return this.stringReader.readString(t)}attributeName(e){const t=st(this.batchDataUint8,e+4);return this.stringReader.readString(t)}attributeValue(e){const t=st(this.batchDataUint8,e+8);return this.stringReader.readString(t)}attributeEventHandlerId(e){return lt(this.batchDataUint8,e+12)}}class mt{constructor(e){this.batchDataUint8=e,this.stringTableStartIndex=st(e,e.length-4)}readString(e){if(-1===e)return null;{const n=st(this.batchDataUint8,this.stringTableStartIndex+4*e),r=function(e,t){let n=0,r=0;for(let o=0;o<4;o++){const a=e[t+o];if(n|=(127&a)<<r,a<128)break;r+=7}return n}(this.batchDataUint8,n),o=n+((t=r)<128?1:t<16384?2:t<2097152?3:4),a=new Uint8Array(this.batchDataUint8.buffer,this.batchDataUint8.byteOffset+o,r);return ot(a)}var t}}class pt{constructor(e){this.batchDataUint8=e}count(e){return st(this.batchDataUint8,e)}values(e){return e+4}}class bt{constructor(e){this.batchDataUint8=e}offset(e){return 0}count(e){return st(this.batchDataUint8,e)}values(e){return e+4}}const gt="__bwv:";let vt=!1;function yt(e,t){Dt("OnRenderCompleted",e,t)}function wt(e,t,n,r,o){Dt("BeginInvokeDotNet",e?e.toString():null,t,n,r||0,o)}function Et(e,t,n){Dt("EndInvokeJS",e,t,n)}function St(e,t){const n=function(e){const t=new Array(e.length);for(let n=0;n<e.length;n++)t[n]=String.fromCharCode(e[n]);return btoa(t.join(""))}(t);Dt("ReceiveByteArrayFromJS",e,n)}function It(e,t,n){return Dt("OnLocationChanged",e,t,n),Promise.resolve()}function Ct(e,t,n,r){return Dt("OnLocationChanging",e,t,n,r),Promise.resolve()}function Dt(e,...t){const n=function(e,t){return vt?null:`${gt}${JSON.stringify([e,...t])}`}(e,t);n&&window.external.sendMessage(n)}var At,Nt;function Rt(t,n){const r=kt(n);e.dispatcher.receiveByteArray(t,r)}function kt(e){const t=atob(e),n=t.length,r=new Uint8Array(n);for(let e=0;e<n;e++)r[e]=t.charCodeAt(e);return r}!function(e){e[e.Default=0]="Default",e[e.Server=1]="Server",e[e.WebAssembly=2]="WebAssembly",e[e.WebView=3]="WebView"}(At||(At={})),function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(Nt||(Nt={}));class Tt{constructor(e=!0,t,n,r=0){this.singleRuntime=e,this.logger=t,this.webRendererId=r,this.afterStartedCallbacks=[],n&&this.afterStartedCallbacks.push(...n)}async importInitializersAsync(e,t){await Promise.all(e.map((e=>async function(e,n){const r=function(e){const t=document.baseURI;return t.endsWith("/")?`${t}${e}`:`${t}/${e}`}(n),o=await import(r);if(void 0!==o){if(e.singleRuntime){const{beforeStart:n,afterStarted:r,beforeWebAssemblyStart:i,afterWebAssemblyStarted:s,beforeServerStart:c,afterServerStarted:l}=o;let u=n;e.webRendererId===At.Server&&c&&(u=c),e.webRendererId===At.WebAssembly&&i&&(u=i);let d=r;return e.webRendererId===At.Server&&l&&(d=l),e.webRendererId===At.WebAssembly&&s&&(d=s),a(e,u,d,t)}return function(e,t,n){const o=n[0],{beforeStart:i,afterStarted:s,beforeWebStart:c,afterWebStarted:l,beforeWebAssemblyStart:u,afterWebAssemblyStarted:d,beforeServerStart:h,afterServerStarted:f}=t,m=!(c||l||u||d||h||f||!i&&!s),p=m&&o.enableClassicInitializers;if(m&&!o.enableClassicInitializers)e.logger?.log(Nt.Warning,`Initializer '${r}' will be ignored because multiple runtimes are available. Use 'before(Web|WebAssembly|Server)Start' and 'after(Web|WebAssembly|Server)Started' instead.`);else if(p)return a(e,i,s,n);if(function(e){e.webAssembly?e.webAssembly.initializers||(e.webAssembly.initializers={beforeStart:[],afterStarted:[]}):e.webAssembly={initializers:{beforeStart:[],afterStarted:[]}},e.circuit?e.circuit.initializers||(e.circuit.initializers={beforeStart:[],afterStarted:[]}):e.circuit={initializers:{beforeStart:[],afterStarted:[]}}}(o),u&&o.webAssembly.initializers.beforeStart.push(u),d&&o.webAssembly.initializers.afterStarted.push(d),h&&o.circuit.initializers.beforeStart.push(h),f&&o.circuit.initializers.afterStarted.push(f),l&&e.afterStartedCallbacks.push(l),c)return c(o)}(e,o,t)}function a(e,t,n,r){if(n&&e.afterStartedCallbacks.push(n),t)return t(...r)}}(this,e))))}async invokeAfterStartedCallbacks(e){const t=(n=this.webRendererId,C.get(n)?.[1]);var n;t&&await t,await Promise.all(this.afterStartedCallbacks.map((t=>t(e))))}}let _t=!1;async function Ot(){if(_t)throw new Error("Blazor has already started.");_t=!0,e.dispatcher=t.attachDispatcher({beginInvokeDotNetFromJS:wt,endInvokeJSFromDotNet:Et,sendByteArray:St});const n=await async function(){const e=await fetch("_framework/blazor.modules.json",{method:"GET",credentials:"include",cache:"no-cache"}),t=await e.json(),n=new Tt;return await n.importInitializersAsync(t,[]),n}();(function(){const t={AttachToDocument:(e,t)=>{!function(e,t,n){const r="::before";let o=!1;if(e.endsWith("::after"))e=e.slice(0,-7),o=!0;else if(e.endsWith(r))throw new Error(`The '${r}' selector is not supported.`);const a=function(e){const t=m.get(e);if(t)return m.delete(e),t}(e)||document.querySelector(e);if(!a)throw new Error(`Could not find any element matching selector '${e}'.`);!function(e,t,n,r){let o=fe[e];o||(o=new le(e),fe[e]=o),o.attachRootComponentToLogicalElement(n,t,r)}(n,P(a,!0),t,o)}(t,e,At.WebView)},RenderBatch:(e,t)=>{try{const n=kt(t);(function(e,t){const n=fe[e];if(!n)throw new Error(`There is no browser renderer with ID ${e}.`);const r=t.arrayRangeReader,o=t.updatedComponents(),a=r.values(o),i=r.count(o),s=t.referenceFrames(),c=r.values(s),l=t.diffReader;for(let e=0;e<i;e++){const r=t.updatedComponentsEntry(a,e),o=l.componentId(r),i=l.edits(r);n.updateComponent(t,o,i,c)}const u=t.disposedComponentIds(),d=r.values(u),h=r.count(u);for(let e=0;e<h;e++){const r=t.disposedComponentIdsEntry(d,e);n.disposeComponent(r)}const f=t.disposedEventHandlerIds(),m=r.values(f),p=r.count(f);for(let e=0;e<p;e++){const r=t.disposedEventHandlerIdsEntry(m,e);n.disposeEventHandler(r)}ve&&(ve=!1,window.scrollTo&&window.scrollTo(0,0))})(At.WebView,new ut(n)),yt(e,null)}catch(t){yt(e,t.toString())}},NotifyUnhandledException:(e,t)=>{vt=!0,console.error(`${e}\n${t}`),function(){const e=document.querySelector("#blazor-error-ui");e&&(e.style.display="block"),nt||(nt=!0,document.querySelectorAll("#blazor-error-ui .reload").forEach((e=>{e.onclick=function(e){location.reload(),e.preventDefault()}})),document.querySelectorAll("#blazor-error-ui .dismiss").forEach((e=>{e.onclick=function(e){const t=document.querySelector("#blazor-error-ui");t&&(t.style.display="none"),e.preventDefault()}})))}()},BeginInvokeJS:e.dispatcher.beginInvokeJSFromDotNet.bind(e.dispatcher),EndInvokeDotNet:e.dispatcher.endInvokeDotNetFromJS.bind(e.dispatcher),SendByteArrayToJS:Rt,Navigate:Oe.navigateTo,Refresh:Oe.refresh,SetHasLocationChangingListeners:e=>{Oe.setHasLocationChangingListeners(At.WebView,e)},EndLocationChanging:Oe.endLocationChanging};window.external.receiveMessage((e=>{const n=function(e){if(vt||!e||!e.startsWith(gt))return null;const t=e.substring(gt.length),[n,...r]=JSON.parse(t);return{messageType:n,args:r}}(e);if(n){if(!Object.prototype.hasOwnProperty.call(t,n.messageType))throw new Error(`Unsupported IPC message type '${n.messageType}'`);t[n.messageType].apply(null,n.args)}}))})(),tt._internal.receiveWebViewDotNetDataStream=Lt,Oe.enableNavigationInterception(At.WebView),Oe.listenForNavigationEvents(At.WebView,It,Ct),Dt("AttachPage",Oe.getBaseURI(),Oe.getLocationHref()),await n.invokeAfterStartedCallbacks(tt)}function Lt(t,n,r,o){!function(e,t,n,r,o){let a=et.get(t);if(!a){const n=new ReadableStream({start(e){et.set(t,e),a=e}});e.supplyDotNetStream(t,n)}o?(a.error(o),et.delete(t)):0===r?(a.close(),et.delete(t)):a.enqueue(n.length===r?n:n.subarray(0,r))}(e.dispatcher,t,n,r,o)}e.dispatcher=void 0,tt.start=Ot,window.DotNet=t,document&&document.currentScript&&"false"!==document.currentScript.getAttribute("autostart")&&Ot()}({});
diff --git a/src/Components/Web.JS/package.json b/src/Components/Web.JS/package.json
index 3a0208f0701e..1ecbff22adba 100644
--- a/src/Components/Web.JS/package.json
+++ b/src/Components/Web.JS/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "microsoft.aspnetcore.components.web.js",
+  "name": "@microsoft/microsoft.aspnetcore.components.web.js",
   "private": true,
   "version": "0.0.1",
   "description": "",
@@ -24,13 +24,13 @@
     "@babel/preset-env": "^7.23.6",
     "@babel/preset-typescript": "^7.23.3",
     "@microsoft/dotnet-js-interop": "*",
+    "@microsoft/dotnet-runtime": "*",
     "@microsoft/signalr": "*",
     "@microsoft/signalr-protocol-msgpack": "*",
     "@types/jsdom": "^16.2.14",
     "@typescript-eslint/eslint-plugin": "^5.26.0",
     "@typescript-eslint/parser": "^5.26.0",
     "babel-jest": "^29.7.0",
-    "dotnet-runtime": "*",
     "eslint": "^8.16.0",
     "eslint-plugin-header": "^3.1.1",
     "jest": "^29.7.0",
diff --git a/src/Components/Web.JS/rollup.config.mjs b/src/Components/Web.JS/rollup.config.mjs
index 9367cf969234..03430b19b42c 100644
--- a/src/Components/Web.JS/rollup.config.mjs
+++ b/src/Components/Web.JS/rollup.config.mjs
@@ -13,15 +13,24 @@ export default createBaseConfig({
     'blazor.webview': './src/Boot.WebView.ts',
   },
   dir: __dirname,
-  updateConfig: (config, environment, _, input) => {
-    if (environment === 'development') {
-      if (input.includes("WebView")) {
-        config.output.sourcemap = 'inline';
-      } else {
-        config.output.sourcemap = true;
+  updateConfig: (config, environment, output, input) => {
+    config.plugins.push({
+      name: 'Resolve dotnet.js dynamic import',
+      resolveDynamicImport(source, importer) {
+        if (source === './dotnet.js') {
+          return { id: './dotnet.js', moduleSideEffects: false, external: 'relative' };
+        }
+        return null;
       }
+    });
+
+    if (input.includes("WebView")) {
+      config.output.sourcemap = 'inline';
+    } else if (environment === 'production' && (output === 'blazor.web' || output === 'blazor.webassembly')) {
+      // Generate sourcemaps but don't emit sourcemap link comments for production bundles
+      config.output.sourcemap = 'hidden';
     } else {
-      config.output.sourcemap = false;
+      config.output.sourcemap = true;
     }
   }
 });
diff --git a/src/Components/Web.JS/src/Boot.Server.Common.ts b/src/Components/Web.JS/src/Boot.Server.Common.ts
index f8b60ccb055d..6f8d20d19d05 100644
--- a/src/Components/Web.JS/src/Boot.Server.Common.ts
+++ b/src/Components/Web.JS/src/Boot.Server.Common.ts
@@ -67,6 +67,34 @@ async function startServerCore(components: RootComponentManager<ServerComponentD
     return true;
   };
 
+  Blazor.pauseCircuit = async () => {
+    if (circuit.didRenderingFail()) {
+      // We can't pause after a failure, so exit early.
+      return false;
+    }
+
+    if (!(await circuit.pause())) {
+      logger.log(LogLevel.Information, 'Pause attempt to the circuit was rejected by the server. This may indicate that the associated state is no longer available on the server.');
+      return false;
+    }
+
+    return true;
+  };
+
+  Blazor.resumeCircuit = async () => {
+    if (circuit.didRenderingFail()) {
+      // We can't resume after a failure, so exit early.
+      return false;
+    }
+
+    if (!(await circuit.resume())) {
+      logger.log(LogLevel.Information, 'Resume attempt to the circuit was rejected by the server. This may indicate that the associated state is no longer available on the server.');
+      return false;
+    }
+
+    return true;
+  };
+
   Blazor.defaultReconnectionHandler = new DefaultReconnectionHandler(logger);
   options.reconnectionHandler = options.reconnectionHandler || Blazor.defaultReconnectionHandler;
 
@@ -93,7 +121,7 @@ async function startServerCore(components: RootComponentManager<ServerComponentD
 
   Blazor.disconnect = cleanup;
 
-  window.addEventListener('unload', cleanup, { capture: false, once: true });
+  window.addEventListener('pagehide', cleanup, { capture: false, once: true });
 
   logger.log(LogLevel.Information, 'Blazor server-side application started.');
 
@@ -158,16 +186,16 @@ export function isCircuitAvailable(): boolean {
   return circuit && !circuit.isDisposedOrDisposing();
 }
 
-export function updateServerRootComponents(operations: string): Promise<void> | undefined {
+export function updateServerRootComponents(operations: string, serverState: string): Promise<void> | undefined {
   if (circuit && !circuit.isDisposedOrDisposing()) {
-    return circuit.updateRootComponents(operations);
+    return circuit.updateRootComponents(operations, serverState);
   } else {
-    scheduleWhenReady(operations);
+    scheduleWhenReady(operations, serverState);
   }
 }
-async function scheduleWhenReady(operations: string) {
+async function scheduleWhenReady(operations: string, serverState: string) {
   await serverStartPromise;
   if (await startCircuit()) {
-    return circuit.updateRootComponents(operations);
+    return circuit.updateRootComponents(operations, serverState);
   }
 }
diff --git a/src/Components/Web.JS/src/Boot.Web.ts b/src/Components/Web.JS/src/Boot.Web.ts
index 50e5bb94f793..df605ceebc52 100644
--- a/src/Components/Web.JS/src/Boot.Web.ts
+++ b/src/Components/Web.JS/src/Boot.Web.ts
@@ -26,6 +26,7 @@ import { LogLevel } from './Platform/Logging/Logger';
 import { resolveOptions } from './Platform/Circuits/CircuitStartOptions';
 import { JSInitializer } from './JSInitializers/JSInitializers';
 import { enableFocusOnNavigate } from './Rendering/FocusOnNavigate';
+import { WebAssemblyStartOptions } from './Platform/WebAssemblyStartOptions';
 
 let started = false;
 let rootComponentManager: WebRootComponentManager;
@@ -91,10 +92,11 @@ function onInitialDomContentLoaded(options: Partial<WebStartOptions>) {
   // so we do the same here.
   const initialCircuitOptions = resolveOptions(options?.circuit || {});
   options.circuit = initialCircuitOptions;
+  options.webAssembly = options.webAssembly || ({} as WebAssemblyStartOptions);
   const logger = new ConsoleLogger(initialCircuitOptions.logLevel);
   const initializersPromise = fetchAndInvokeInitializers(options, logger);
   setCircuitOptions(resolveConfiguredOptions(initializersPromise, initialCircuitOptions));
-  setWebAssemblyOptions(resolveConfiguredOptions(initializersPromise, options?.webAssembly || {}));
+  setWebAssemblyOptions(resolveConfiguredOptions(initializersPromise, options.webAssembly));
 
   registerAllComponentDescriptors(document);
   rootComponentManager.onDocumentUpdated();
diff --git a/src/Components/Web.JS/src/Boot.WebAssembly.Common.ts b/src/Components/Web.JS/src/Boot.WebAssembly.Common.ts
index 3f3b27ee74de..46311e7f1c8f 100644
--- a/src/Components/Web.JS/src/Boot.WebAssembly.Common.ts
+++ b/src/Components/Web.JS/src/Boot.WebAssembly.Common.ts
@@ -11,10 +11,11 @@ import { SharedMemoryRenderBatch } from './Rendering/RenderBatch/SharedMemoryRen
 import { Pointer } from './Platform/Platform';
 import { WebAssemblyStartOptions } from './Platform/WebAssemblyStartOptions';
 import { addDispatchEventMiddleware } from './Rendering/WebRendererInteropMethods';
-import { WebAssemblyComponentDescriptor, discoverWebAssemblyPersistedState } from './Services/ComponentDescriptorDiscovery';
+import { WebAssemblyComponentDescriptor, WebAssemblyServerOptions, discoverWebAssemblyPersistedState } from './Services/ComponentDescriptorDiscovery';
 import { receiveDotNetDataStream } from './StreamingInterop';
 import { WebAssemblyComponentAttacher } from './Platform/WebAssemblyComponentAttacher';
-import { MonoConfig } from 'dotnet-runtime';
+import { DotNet } from '@microsoft/dotnet-js-interop';
+import { MonoConfig } from '@microsoft/dotnet-runtime';
 import { RootComponentManager } from './Services/RootComponentManager';
 import { WebRendererId } from './Rendering/WebRendererId';
 
@@ -68,23 +69,23 @@ export function setWebAssemblyOptions(initializersReady: Promise<Partial<WebAsse
   }
 }
 
-export function startWebAssembly(components: RootComponentManager<WebAssemblyComponentDescriptor>): Promise<void> {
+export function startWebAssembly(components: RootComponentManager<WebAssemblyComponentDescriptor>, options: WebAssemblyServerOptions | undefined): Promise<void> {
   if (startPromise !== undefined) {
     throw new Error('Blazor WebAssembly has already started.');
   }
 
-  startPromise = new Promise(startCore.bind(null, components));
+  startPromise = new Promise(startCore.bind(null, components, options));
 
   return startPromise;
 }
 
-async function startCore(components: RootComponentManager<WebAssemblyComponentDescriptor>, resolve, _) {
+async function startCore(components: RootComponentManager<WebAssemblyComponentDescriptor>, options: WebAssemblyServerOptions | undefined, resolve, _) {
   if (inAuthRedirectIframe()) {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     await new Promise(() => { }); // See inAuthRedirectIframe for explanation
   }
 
-  const platformLoadPromise = loadWebAssemblyPlatformIfNotStarted();
+  const platformLoadPromise = loadWebAssemblyPlatformIfNotStarted(options);
 
   addDispatchEventMiddleware((browserRendererId, eventHandlerId, continuation) => {
     // It's extremely unusual, but an event can be raised while we're in the middle of synchronously applying a
@@ -97,12 +98,6 @@ async function startCore(components: RootComponentManager<WebAssemblyComponentDe
     }
   });
 
-  Blazor._internal.applyHotReload = (id: string, metadataDelta: string, ilDelta: string, pdbDelta: string | undefined, updatedTypes?: number[]) => {
-    dispatcher.invokeDotNetStaticMethod('Microsoft.AspNetCore.Components.WebAssembly', 'ApplyHotReloadDelta', id, metadataDelta, ilDelta, pdbDelta, updatedTypes ?? null);
-  };
-
-  Blazor._internal.getApplyUpdateCapabilities = () => dispatcher.invokeDotNetStaticMethod('Microsoft.AspNetCore.Components.WebAssembly', 'GetApplyUpdateCapabilities');
-
   // Configure JS interop
   Blazor._internal.invokeJSJson = invokeJSJson;
   Blazor._internal.endInvokeDotNetFromJS = endInvokeDotNetFromJS;
@@ -161,8 +156,9 @@ async function startCore(components: RootComponentManager<WebAssemblyComponentDe
 
   Blazor._internal.getInitialComponentsUpdate = () => initialUpdatePromise;
 
-  Blazor._internal.updateRootComponents = (operations: string) =>
-    Blazor._internal.dotNetExports?.UpdateRootComponentsCore(operations);
+  Blazor._internal.updateRootComponents = (operations: string, webAssemblyState: string) => {
+    Blazor._internal.dotNetExports?.UpdateRootComponentsCore(operations, webAssemblyState);
+  };
 
   Blazor._internal.endUpdateRootComponents = (batchId: number) =>
     components.onAfterUpdateRootComponents?.(batchId);
@@ -201,13 +197,19 @@ export function waitForBootConfigLoaded(): Promise<MonoConfig> {
   return bootConfigPromise;
 }
 
-export function loadWebAssemblyPlatformIfNotStarted(): Promise<void> {
+export function loadWebAssemblyPlatformIfNotStarted(serverOptions: WebAssemblyServerOptions | undefined): Promise<void> {
   platformLoadPromise ??= (async () => {
     await initializersPromise;
     const finalOptions = options ?? {};
+    if (!finalOptions.environment) {
+      finalOptions.environment = serverOptions?.environmentName ?? undefined;
+    }
     const existingConfig = options?.configureRuntime;
     finalOptions.configureRuntime = (config) => {
       existingConfig?.(config);
+      if (serverOptions?.environmentVariables) {
+        config.withEnvironmentVariables(serverOptions.environmentVariables);
+      }
       if (waitForRootComponents) {
         config.withEnvironmentVariable('__BLAZOR_WEBASSEMBLY_WAIT_FOR_ROOT_COMPONENTS', 'true');
       }
@@ -226,7 +228,7 @@ export function hasLoadedWebAssemblyPlatform(): boolean {
   return loadedWebAssemblyPlatform;
 }
 
-export function updateWebAssemblyRootComponents(operations: string): void {
+export function updateWebAssemblyRootComponents(operations: string, webAssemblyState: string): void {
   if (!startPromise) {
     throw new Error('Blazor WebAssembly has not started.');
   }
@@ -236,28 +238,28 @@ export function updateWebAssemblyRootComponents(operations: string): void {
   }
 
   if (!started) {
-    scheduleAfterStarted(operations);
+    scheduleAfterStarted(operations, webAssemblyState);
   } else {
-    Blazor._internal.updateRootComponents(operations);
+    Blazor._internal.updateRootComponents(operations, webAssemblyState);
   }
 }
 
-async function scheduleAfterStarted(operations: string): Promise<void> {
+async function scheduleAfterStarted(operations: string, webAssemblyState: string): Promise<void> {
   await startPromise;
 
   if (!Blazor._internal.updateRootComponents) {
     throw new Error('Blazor WebAssembly has not initialized.');
   }
 
-  Blazor._internal.updateRootComponents(operations);
+  Blazor._internal.updateRootComponents(operations, webAssemblyState);
 }
 
-function invokeJSJson(identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number): string | null {
+function invokeJSJson(identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number, callType: number): string | null {
   if (asyncHandle !== 0) {
-    dispatcher.beginInvokeJSFromDotNet(asyncHandle, identifier, argsJson, resultType, targetInstanceId);
+    dispatcher.beginInvokeJSFromDotNet(asyncHandle, identifier, argsJson, resultType, targetInstanceId, callType);
     return null;
   } else {
-    return dispatcher.invokeJSFromDotNet(identifier, argsJson, resultType, targetInstanceId);
+    return dispatcher.invokeJSFromDotNet(identifier, argsJson, resultType, targetInstanceId, callType);
   }
 }
 
diff --git a/src/Components/Web.JS/src/Boot.WebAssembly.ts b/src/Components/Web.JS/src/Boot.WebAssembly.ts
index ca1523f60f1c..a1b106b924c2 100644
--- a/src/Components/Web.JS/src/Boot.WebAssembly.ts
+++ b/src/Components/Web.JS/src/Boot.WebAssembly.ts
@@ -6,7 +6,7 @@ import { Blazor } from './GlobalExports';
 import { shouldAutoStart } from './BootCommon';
 import { WebAssemblyStartOptions } from './Platform/WebAssemblyStartOptions';
 import { setWebAssemblyOptions, startWebAssembly } from './Boot.WebAssembly.Common';
-import { WebAssemblyComponentDescriptor, discoverComponents } from './Services/ComponentDescriptorDiscovery';
+import { WebAssemblyComponentDescriptor, discoverComponents, discoverWebAssemblyOptions } from './Services/ComponentDescriptorDiscovery';
 import { DotNet } from '@microsoft/dotnet-js-interop';
 import { InitialRootComponentsList } from './Services/InitialRootComponentsList';
 import { JSEventRegistry } from './Services/JSEventRegistry';
@@ -24,8 +24,10 @@ async function boot(options?: Partial<WebAssemblyStartOptions>): Promise<void> {
 
   JSEventRegistry.create(Blazor);
   const webAssemblyComponents = discoverComponents(document, 'webassembly') as WebAssemblyComponentDescriptor[];
+  const webAssemblyOptions = discoverWebAssemblyOptions(document);
+
   const components = new InitialRootComponentsList(webAssemblyComponents);
-  await startWebAssembly(components);
+  await startWebAssembly(components, webAssemblyOptions);
 }
 
 Blazor.start = boot;
diff --git a/src/Components/Web.JS/src/GlobalExports.ts b/src/Components/Web.JS/src/GlobalExports.ts
index c3194481528b..4e3bf21e6fe4 100644
--- a/src/Components/Web.JS/src/GlobalExports.ts
+++ b/src/Components/Web.JS/src/GlobalExports.ts
@@ -17,7 +17,7 @@ import { getNextChunk } from './StreamingInterop';
 import { RootComponentsFunctions } from './Rendering/JSRootComponents';
 import { attachWebRendererInterop } from './Rendering/WebRendererInteropMethods';
 import { WebStartOptions } from './Platform/WebStartOptions';
-import { RuntimeAPI } from 'dotnet-runtime';
+import { RuntimeAPI } from '@microsoft/dotnet-runtime';
 import { JSEventRegistry } from './Services/JSEventRegistry';
 
 // TODO: It's kind of hard to tell which .NET platform(s) some of these APIs are relevant to.
@@ -38,6 +38,8 @@ export interface IBlazor {
   removeEventListener?: typeof JSEventRegistry.prototype.removeEventListener;
   disconnect?: () => void;
   reconnect?: (existingConnection?: HubConnection) => Promise<boolean>;
+  pauseCircuit?: () => Promise<boolean>;
+  resumeCircuit?: () => Promise<boolean>;
   defaultReconnectionHandler?: DefaultReconnectionHandler;
   start?: ((userOptions?: Partial<CircuitStartOptions>) => Promise<void>) | ((options?: Partial<WebAssemblyStartOptions>) => Promise<void>) | ((options?: Partial<WebStartOptions>) => Promise<void>);
   platform?: Platform;
@@ -52,12 +54,12 @@ export interface IBlazor {
     forceCloseConnection?: () => Promise<void>;
     InputFile?: typeof InputFile;
     NavigationLock: typeof NavigationLock;
-    invokeJSJson?: (identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number) => string | null;
+    invokeJSJson?: (identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number, callType: number) => string | null;
     endInvokeDotNetFromJS?: (callId: string, success: boolean, resultJsonOrErrorMessage: string) => void;
     receiveByteArray?: (id: number, data: Uint8Array) => void;
     getPersistedState?: () => string;
     getInitialComponentsUpdate?: () => Promise<string>;
-    updateRootComponents?: (operations: string) => void;
+    updateRootComponents?: (operations: string, webAssemblyState: string) => void;
     endUpdateRootComponents?: (batchId: number) => void;
     attachRootComponentToElement?: (arg0: any, arg1: any, arg2: any, arg3: any) => void;
     registeredComponents?: {
@@ -85,12 +87,11 @@ export interface IBlazor {
       EndInvokeJS: (argsJson: string) => void;
       BeginInvokeDotNet: (callId: string | null, assemblyNameOrDotNetObjectId: string, methodIdentifier: string, argsJson: string) => void;
       ReceiveByteArrayFromJS: (id: number, data: Uint8Array) => void;
-      UpdateRootComponentsCore: (operationsJson: string) => void;
+      UpdateRootComponentsCore: (operationsJson: string, appState: string) => void;
     }
 
     // APIs invoked by hot reload
-    applyHotReload?: (id: string, metadataDelta: string, ilDelta: string, pdbDelta: string | undefined, updatedTypes?: number[]) => void;
-    getApplyUpdateCapabilities?: () => string;
+
     hotReloadApplied?: () => void;
   }
 }
diff --git a/src/Components/Web.JS/src/JSInitializers/JSInitializers.Server.ts b/src/Components/Web.JS/src/JSInitializers/JSInitializers.Server.ts
index 57f8ffdf6494..2faa949097be 100644
--- a/src/Components/Web.JS/src/JSInitializers/JSInitializers.Server.ts
+++ b/src/Components/Web.JS/src/JSInitializers/JSInitializers.Server.ts
@@ -3,7 +3,7 @@
 
 import { CircuitStartOptions } from '../Platform/Circuits/CircuitStartOptions';
 import { WebRendererId } from '../Rendering/WebRendererId';
-import { JSInitializer } from './JSInitializers';
+import { JSAsset, JSInitializer } from './JSInitializers';
 
 export async function fetchAndInvokeInitializers(options: Partial<CircuitStartOptions>) : Promise<JSInitializer> {
   if (options.initializers) {
@@ -19,7 +19,9 @@ export async function fetchAndInvokeInitializers(options: Partial<CircuitStartOp
     cache: 'no-cache',
   });
 
-  const initializers: string[] = await jsInitializersResponse.json();
+  const initializers = (await jsInitializersResponse.json()).map(name => ({
+    name,
+  })) as JSAsset[];
   const jsInitializer = new JSInitializer(/* singleRuntime: */ true, undefined, undefined, WebRendererId.Server);
   await jsInitializer.importInitializersAsync(initializers, [options]);
   return jsInitializer;
diff --git a/src/Components/Web.JS/src/JSInitializers/JSInitializers.Web.ts b/src/Components/Web.JS/src/JSInitializers/JSInitializers.Web.ts
index b72e012ac98d..c997676f35c2 100644
--- a/src/Components/Web.JS/src/JSInitializers/JSInitializers.Web.ts
+++ b/src/Components/Web.JS/src/JSInitializers/JSInitializers.Web.ts
@@ -4,14 +4,16 @@
 import { Logger } from '../Platform/Logging/Logger';
 import { WebStartOptions } from '../Platform/WebStartOptions';
 import { discoverWebInitializers } from '../Services/ComponentDescriptorDiscovery';
-import { JSInitializer } from './JSInitializers';
+import { JSAsset, JSInitializer } from './JSInitializers';
 
 export async function fetchAndInvokeInitializers(options: Partial<WebStartOptions>, logger: Logger) : Promise<JSInitializer> {
   const initializersElement = discoverWebInitializers(document);
   if (!initializersElement) {
     return new JSInitializer(false, logger);
   }
-  const initializers: string[] = JSON.parse(atob(initializersElement)) as string[] ?? [];
+  const initializers = (JSON.parse(atob(initializersElement)) as string[] ?? []).map(name => ({
+    name,
+  })) as JSAsset[];
   const jsInitializer = new JSInitializer(false, logger);
   await jsInitializer.importInitializersAsync(initializers, [options]);
   return jsInitializer;
diff --git a/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebAssembly.ts b/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebAssembly.ts
index 81d8a0d80490..5860073e2c8b 100644
--- a/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebAssembly.ts
+++ b/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebAssembly.ts
@@ -1,10 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { MonoConfig } from 'dotnet-runtime';
+import { MonoConfig } from '@microsoft/dotnet-runtime';
 import { WebAssemblyStartOptions } from '../Platform/WebAssemblyStartOptions';
 import { WebRendererId } from '../Rendering/WebRendererId';
-import { JSInitializer } from './JSInitializers';
+import { JSAsset, JSInitializer } from './JSInitializers';
 
 export async function fetchAndInvokeInitializers(options: Partial<WebAssemblyStartOptions>, loadedConfig: MonoConfig): Promise<JSInitializer> {
   if (options.initializers) {
@@ -20,7 +20,22 @@ export async function fetchAndInvokeInitializers(options: Partial<WebAssemblySta
       undefined,
       WebRendererId.WebAssembly
     );
-    const initializers = Object.keys((loadedConfig?.resources?.['libraryInitializers']) || {});
+
+    const configInitializers = loadedConfig?.resources?.['libraryInitializers'];
+    let initializers : JSAsset[];
+    if (!configInitializers) {
+      initializers = [];
+    }
+    else if ("length" in configInitializers) {
+      // New boot config schema.
+      initializers = configInitializers;
+    } else {
+      // Old boot config schema.
+      initializers = Object.keys(configInitializers).map(name => ({
+        name,
+      })) as JSAsset[];
+    }
+
     await jsInitializer.importInitializersAsync(initializers, initializerArguments);
     return jsInitializer;
   }
diff --git a/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebView.ts b/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebView.ts
index 0b46064ef5ea..4344474ae848 100644
--- a/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebView.ts
+++ b/src/Components/Web.JS/src/JSInitializers/JSInitializers.WebView.ts
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { JSInitializer } from './JSInitializers';
+import { JSAsset, JSInitializer } from './JSInitializers';
 
 export async function fetchAndInvokeInitializers() : Promise<JSInitializer> {
   const jsInitializersResponse = await fetch('_framework/blazor.modules.json', {
@@ -10,7 +10,9 @@ export async function fetchAndInvokeInitializers() : Promise<JSInitializer> {
     cache: 'no-cache',
   });
 
-  const initializers: string[] = await jsInitializersResponse.json();
+  const initializers = (await jsInitializersResponse.json()).map(name => ({
+    name,
+  })) as JSAsset[];
   const jsInitializer = new JSInitializer();
   await jsInitializer.importInitializersAsync(initializers, []);
   return jsInitializer;
diff --git a/src/Components/Web.JS/src/JSInitializers/JSInitializers.ts b/src/Components/Web.JS/src/JSInitializers/JSInitializers.ts
index 5ab4bc7950be..174cff653b2d 100644
--- a/src/Components/Web.JS/src/JSInitializers/JSInitializers.ts
+++ b/src/Components/Web.JS/src/JSInitializers/JSInitializers.ts
@@ -24,6 +24,11 @@ export type BlazorInitializer = {
   afterServerStarted: AfterBlazorServerStartedCallback,
 };
 
+export type JSAsset = {
+    moduleExports?: any | Promise<any>,
+    name?: string; // actually URL
+}
+
 export class JSInitializer {
   private afterStartedCallbacks: AfterBlazorStartedCallback[] = [];
 
@@ -38,21 +43,25 @@ export class JSInitializer {
     }
   }
 
-  async importInitializersAsync(initializerFiles: string[], initializerArguments: unknown[]): Promise<void> {
+  async importInitializersAsync(initializerFiles: JSAsset[], initializerArguments: unknown[]): Promise<void> {
     // This code is not called on WASM, because library intializers are imported by runtime.
 
     await Promise.all(initializerFiles.map(f => importAndInvokeInitializer(this, f)));
 
     function adjustPath(path: string): string {
-      // This is the same we do in JS interop with the import callback
-      const base = document.baseURI;
-      path = base.endsWith('/') ? `${base}${path}` : `${base}/${path}`;
-      return path;
+      // Use URL constructor to properly resolve relative paths, avoiding issues with query parameters
+      // This is the same mechanism as for import dotnet.js in MonoPlatform.ts
+      return new URL(path, document.baseURI).toString();
     }
 
-    async function importAndInvokeInitializer(jsInitializer: JSInitializer, path: string): Promise<void> {
-      const adjustedPath = adjustPath(path);
-      const initializer = await import(/* webpackIgnore: true */ adjustedPath) as Partial<BlazorInitializer>;
+    async function importAndInvokeInitializer(jsInitializer: JSInitializer, asset: JSAsset): Promise<void> {
+      let adjustedPath;
+      if (!asset.moduleExports) {
+        adjustedPath = adjustPath(asset.name!);
+        asset.moduleExports = await import(/* webpackIgnore: true */ adjustedPath);
+      }
+
+      const initializer = asset.moduleExports as Partial<BlazorInitializer>;
       if (initializer === undefined) {
         return;
       }
diff --git a/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts b/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
index 7788f9d4358f..cc2a536a4129 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
@@ -3,7 +3,7 @@
 
 import { internalFunctions as navigationManagerFunctions } from '../../Services/NavigationManager';
 import { toLogicalRootCommentElement, LogicalElement, toLogicalElement } from '../../Rendering/LogicalElements';
-import { ServerComponentDescriptor, descriptorToMarker } from '../../Services/ComponentDescriptorDiscovery';
+import { ServerComponentDescriptor, descriptorToMarker, discoverServerPersistedState } from '../../Services/ComponentDescriptorDiscovery';
 import { HttpTransportType, HubConnection, HubConnectionBuilder, HubConnectionState, LogLevel } from '@microsoft/signalr';
 import { getAndRemovePendingRootComponentContainer } from '../../Rendering/JSRootComponents';
 import { RootComponentManager } from '../../Services/RootComponentManager';
@@ -20,6 +20,7 @@ import { attachWebRendererInterop, detachWebRendererInterop } from '../../Render
 import { sendJSDataStream } from './CircuitStreamingInterop';
 
 export class CircuitManager implements DotNet.DotNetCallDispatcher {
+
   private readonly _componentManager: RootComponentManager<ServerComponentDescriptor>;
 
   private _applicationState: string;
@@ -28,7 +29,7 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
 
   private readonly _logger: ConsoleLogger;
 
-  private readonly _renderQueue: RenderQueue;
+  private _renderQueue: RenderQueue;
 
   private readonly _dispatcher: DotNet.ICallDispatcher;
 
@@ -40,14 +41,22 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
 
   private _startPromise?: Promise<boolean>;
 
-  private _firstUpdate = true;
-
   private _renderingFailed = false;
 
   private _disposePromise?: Promise<void>;
 
   private _disposed = false;
 
+  private _pausingState = new CircuitState<boolean>('pausing', false, false);
+
+  private _resumingState = new CircuitState<boolean>('resuming', false, false);
+
+  private _disconnectingState = new CircuitState<void>('disconnecting');
+
+  private _persistedCircuitState?: { components: string, applicationState: string };
+
+  private _isFirstRender = true;
+
   public constructor(
     componentManager: RootComponentManager<ServerComponentDescriptor>,
     appState: string,
@@ -75,13 +84,12 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     return this._startPromise;
   }
 
-  public updateRootComponents(operations: string): Promise<void> | undefined {
-    if (this._firstUpdate) {
-      // Only send the application state on the first update.
-      this._firstUpdate = false;
+  public updateRootComponents(operations: string, serverState: string): Promise<void> | undefined {
+    if (this._isFirstRender) {
+      this._isFirstRender = false;
       return this._connection?.send('UpdateRootComponents', operations, this._applicationState);
     } else {
-      return this._connection?.send('UpdateRootComponents', operations, '');
+      return this._connection?.send('UpdateRootComponents', operations, serverState);
     }
   }
 
@@ -106,7 +114,7 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     }
 
     for (const handler of this._options.circuitHandlers) {
-      if (handler.onCircuitOpened){
+      if (handler.onCircuitOpened) {
         handler.onCircuitOpened();
       }
     }
@@ -131,6 +139,17 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     connection.on('JS.EndInvokeDotNet', this._dispatcher.endInvokeDotNetFromJS.bind(this._dispatcher));
     connection.on('JS.ReceiveByteArray', this._dispatcher.receiveByteArray.bind(this._dispatcher));
 
+    connection.on('JS.SavePersistedState', (circuitId: string, components: string, applicationState: string) => {
+      if (!this._circuitId) {
+        throw new Error('Circuit host not initialized.');
+      }
+      if (circuitId !== this._circuitId) {
+        throw new Error(`Received persisted state for circuit ID '${circuitId}', but the current circuit ID is '${this._circuitId}'.`);
+      }
+      this._persistedCircuitState = { components, applicationState };
+      return true;
+    });
+
     connection.on('JS.BeginTransmitStream', (streamId: number) => {
       const readableStream = new ReadableStream({
         start: (controller) => {
@@ -159,7 +178,13 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     connection.onclose(error => {
       this._interopMethodsForReconnection = detachWebRendererInterop(WebRendererId.Server);
 
-      if (!this._disposed && !this._renderingFailed) {
+      const pausingWasInProgress = this._pausingState.isInprogress();
+      if (!pausingWasInProgress) {
+        // Mark the state as 'paused' since the connection got closed without us starting the pause process.
+        this._pausingState.transitionTo(true);
+      }
+
+      if (!this._disposed && !this._renderingFailed && !pausingWasInProgress) {
         this._options.reconnectionHandler!.onConnectionDown(this._options.reconnectionOptions, error);
       }
     });
@@ -204,7 +229,30 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
   }
 
   public async disconnect(): Promise<void> {
-    await this._connection?.stop();
+    if (!this._circuitId) {
+      throw new Error('Circuit host not initialized.');
+    }
+
+    if (this._disconnectingState.isInprogress()) {
+      this._logger.log(LogLevel.Trace, 'Waiting for the circuit to finish disconnecting...');
+      return this._disconnectingState.currentProgress();
+    }
+
+    try {
+      this._disconnectingState.reset();
+      const disconnectingPromise = this._disconnectingState.currentProgress();
+
+      this._logger.log(LogLevel.Trace, 'Disconnecting the circuit...');
+
+      await this._connection!.stop();
+
+      this._disconnectingState.complete();
+      return disconnectingPromise;
+    } catch (error) {
+      this._logger.log(LogLevel.Error, `Failed to disconnect the circuit: ${error}`);
+      this._disconnectingState.fail(error);
+      throw error;
+    }
   }
 
   public async reconnect(): Promise<boolean> {
@@ -232,6 +280,141 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     return true;
   }
 
+  public async pause(remote?: boolean): Promise<boolean> {
+    if (!this._circuitId) {
+      this._logger.log(LogLevel.Error, 'Circuit host not initialized.');
+      return false;
+    }
+
+    if (this._connection!.state !== HubConnectionState.Connected) {
+      this._logger.log(LogLevel.Trace, 'Pause can only be triggered on connected circuits.');
+      return false;
+    }
+
+    if (this._resumingState.isInprogress()) {
+      this._logger.log(LogLevel.Trace, 'Circuit is currently resuming...');
+      return false;
+    }
+
+    if (this._pausingState.isInprogress()) {
+      this._logger.log(LogLevel.Trace, 'Waiting for the circuit to finish pausing...');
+      return this._pausingState.currentProgress();
+    }
+
+    if (this._pausingState.lastValue() === true) {
+      // If the circuit is already paused, we don't need to do anything.
+      this._logger.log(LogLevel.Trace, 'Circuit is already paused.');
+      return true;
+    }
+
+    this._pausingState.reset();
+    const pausingPromise = this._pausingState.currentProgress();
+
+    try {
+      this._logger.log(LogLevel.Trace, 'Pausing the circuit...');
+
+      // Notify the reconnection handler that we are pausing the circuit.
+      // This is used to trigger the UI display.
+      this._options.reconnectionHandler?.onConnectionDown(this._options.reconnectionOptions, undefined, true, remote);
+
+      // Indicate to the server that we want to pause the circuit.
+      // The server will initiate the pause on the circuit associated with the current connection.
+      const paused = await this._connection!.invoke<boolean>('PauseCircuit')!;
+      this._pausingState.complete(paused);
+    } catch (error) {
+      this._logger.log(LogLevel.Error, `Failed to pause the circuit: ${error}`);
+      this._pausingState.fail(error);
+    }
+
+    await this.disconnect();
+
+    return pausingPromise;
+  }
+
+  public async resume(): Promise<boolean> {
+    if (!this._circuitId) {
+      this._logger.log(LogLevel.Error, 'Circuit host not initialized.');
+      throw new Error('Circuit host not initialized.');
+    }
+
+    if (this._disconnectingState.isInprogress()) {
+      // The handler might run before the `onclose` handler gets a chance to run.
+      this._logger.log(LogLevel.Trace, 'Circuit is disconnecting, cannot resume.');
+      await this._disconnectingState.currentProgress();
+    }
+
+    if (this._pausingState.isInprogress()) {
+      this._logger.log(LogLevel.Trace, 'Waiting for the circuit to finish pausing...');
+      return false;
+    }
+
+    if (!this._pausingState.lastValue()) {
+      // If the circuit is not paused, we cannot resume it.
+      this._logger.log(LogLevel.Trace, 'Circuit is not paused.');
+      return false;
+    }
+
+    if (this._connection!.state !== HubConnectionState.Connected) {
+      this._logger.log(LogLevel.Trace, 'Reestablishing SignalR connection...');
+      this._connection = await this.startConnection();
+    }
+
+    if (this._resumingState.isInprogress()) {
+      // If we are already resuming, wait for the current resume operation to complete.
+      this._logger.log(LogLevel.Trace, 'Waiting for the circuit to finish resuming...');
+      return this._resumingState.currentProgress();
+    }
+
+    this._resumingState.reset();
+    const resumingPromise = this._resumingState.currentProgress();
+
+    try {
+      // When we get here we know the circuit is gone for good.
+      // Signal that we are about to start a new circuit so that
+      // any existing handlers can perform the necessary cleanup.
+      for (const handler of this._options.circuitHandlers) {
+        if (handler.onCircuitClosed) {
+          handler.onCircuitClosed();
+        }
+      }
+
+      const persistedCircuitState = this._persistedCircuitState;
+      this._persistedCircuitState = undefined;
+
+      const newCircuitId = await this._connection!.invoke<string>(
+        'ResumeCircuit',
+        this._circuitId,
+        navigationManagerFunctions.getBaseURI(),
+        navigationManagerFunctions.getLocationHref(),
+        persistedCircuitState?.components ?? '[]',
+        persistedCircuitState?.applicationState ?? '',
+      );
+      if (!newCircuitId) {
+        this._resumingState.complete(false);
+        return resumingPromise;
+      }
+
+      this._pausingState.transitionTo(false);
+      this._resumingState.complete(true);
+
+      this._circuitId = newCircuitId;
+      this._renderQueue = new RenderQueue(this._logger);
+      for (const handler of this._options.circuitHandlers) {
+        if (handler.onCircuitOpened) {
+          handler.onCircuitOpened();
+        }
+      }
+
+      this._options.reconnectionHandler!.onConnectionUp();
+      this._componentManager.onComponentReload?.(WebRendererId.Server);
+      return resumingPromise;
+    } catch (error) {
+      this._logger.log(LogLevel.Error, `Failed to resume the circuit: ${error}`);
+      this._resumingState.fail(error);
+      return resumingPromise;
+    }
+  }
+
   // Implements DotNet.DotNetCallDispatcher
   public beginInvokeDotNetFromJS(callId: number, assemblyName: string | null, methodIdentifier: string, dotNetObjectId: number | null, argsJson: string): void {
     this.throwIfDispatchingWhenDisposed();
@@ -359,3 +542,87 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     }
   }
 }
+
+class CircuitState<T> {
+
+  public constructor(
+    private _stateName: string,
+    _initialValue?: T,
+    private _resetValue?: T
+  ) {
+    this._lastValue = _initialValue;
+  }
+
+  private _promise?: Promise<T>;
+
+  private _resolve?: (value: T | PromiseLike<T>) => void;
+
+  private _reject?: (reason: any) => void;
+
+  private _lastValue?: T;
+
+  public reset(): void {
+    if (this._promise) {
+      throw new Error(`Circuit state ${this._stateName} is already in progress`);
+    }
+
+    const { promise, resolve, reject } = Promise.withResolvers<T>();
+    this._promise = promise;
+    this._resolve = resolve;
+    this._reject = reject;
+    this._lastValue = this._resetValue;
+  }
+
+  public complete(value: T): void {
+    if (!this._resolve) {
+      throw new Error(`Circuit state ${this._stateName} not initialized`);
+    }
+
+    const resolve = this._resolve;
+    this._lastValue = value;
+
+    this._promise = undefined;
+    this._resolve = undefined;
+    this._reject = undefined;
+
+    resolve(value);
+  }
+
+  public fail(reason: any): void {
+    if (!this._reject) {
+      throw new Error(`Circuit state ${this._stateName} not initialized`);
+    }
+
+    const reject = this._reject;
+
+    this._promise = undefined;
+    this._resolve = undefined;
+    this._reject = undefined;
+
+    reject(reason);
+  }
+
+  public isInprogress(): boolean {
+    return !!this._promise;
+  }
+
+  public currentProgress(): Promise<T> {
+    if (!this.isInprogress()) {
+      throw new Error(`Circuit state ${this._stateName} is not in progress`);
+    }
+
+    return this._promise!;
+  }
+
+  public transitionTo(newState: T): void {
+    if (this._promise) {
+      throw new Error(`Circuit state ${this._stateName} is in progress`);
+    }
+
+    this._lastValue = newState;
+  }
+
+  public lastValue() {
+    return this._lastValue;
+  }
+}
diff --git a/src/Components/Web.JS/src/Platform/Circuits/CircuitStartOptions.ts b/src/Components/Web.JS/src/Platform/Circuits/CircuitStartOptions.ts
index ac94b7a2d781..674effaceace 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/CircuitStartOptions.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/CircuitStartOptions.ts
@@ -45,7 +45,7 @@ export interface CircuitHandler {
 }
 
 export interface ReconnectionHandler {
-  onConnectionDown(options: ReconnectionOptions, error?: Error): void;
+  onConnectionDown(options: ReconnectionOptions, error?: Error, isClientPause?: boolean, remotePause?: boolean): void;
   onConnectionUp(): void;
 }
 
diff --git a/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts b/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
index 5d28d5a5905a..a14aa03363c7 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
@@ -3,7 +3,7 @@
 
 import { Blazor } from '../../GlobalExports';
 import { LogLevel, Logger } from '../Logging/Logger';
-import { ReconnectDisplay } from './ReconnectDisplay';
+import { ReconnectDisplay, ReconnectDisplayUpdateOptions, ReconnectOptions } from './ReconnectDisplay';
 
 export class DefaultReconnectDisplay implements ReconnectDisplay {
   static readonly ReconnectOverlayClassName = 'components-reconnect-overlay';
@@ -28,8 +28,14 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
 
   reloadButton: HTMLButtonElement;
 
+  resumeButton: HTMLButtonElement;
+
   status: HTMLParagraphElement;
 
+  reconnect = true;
+
+  remote = false;
+
   retryWhenDocumentBecomesVisible: () => void;
 
   constructor(dialogId: string, private readonly document: Document, private readonly logger: Logger) {
@@ -64,9 +70,15 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
     this.reloadButton.innerHTML = 'Retry';
     this.reloadButton.addEventListener('click', this.retry.bind(this));
 
+    this.resumeButton = document.createElement('button');
+    this.resumeButton.style.display = 'none';
+    this.resumeButton.innerHTML = 'Resume';
+    this.resumeButton.addEventListener('click', this.resume.bind(this));
+
     this.dialog.appendChild(this.rejoiningAnimation);
     this.dialog.appendChild(this.status);
     this.dialog.appendChild(this.reloadButton);
+    this.dialog.appendChild(this.resumeButton);
 
     this.overlay.appendChild(this.dialog);
 
@@ -77,11 +89,13 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
     };
   }
 
-  show(): void {
+  show(options?: ReconnectDisplayUpdateOptions): void {
     if (!this.document.contains(this.host)) {
       this.document.body.appendChild(this.host);
     }
 
+    this.reconnect = options?.type === 'reconnect';
+
     this.reloadButton.style.display = 'none';
     this.rejoiningAnimation.style.display = 'block';
     this.status.innerHTML = 'Rejoining the server...';
@@ -89,12 +103,21 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
     this.overlay.classList.add(DefaultReconnectDisplay.ReconnectVisibleClassName);
   }
 
-  update(currentAttempt: number, secondsToNextAttempt: number): void {
-    if (currentAttempt === 1 || secondsToNextAttempt === 0) {
-      this.status.innerHTML = 'Rejoining the server...';
+  update(options: ReconnectDisplayUpdateOptions): void {
+    this.reconnect = options.type === 'reconnect';
+    if (this.reconnect) {
+      const { currentAttempt, secondsToNextAttempt } = options as ReconnectOptions;
+      if (currentAttempt === 1 || secondsToNextAttempt === 0) {
+        this.status.innerHTML = 'Rejoining the server...';
+      } else {
+        const unitText = secondsToNextAttempt === 1 ? 'second' : 'seconds';
+        this.status.innerHTML = `Rejoin failed... trying again in ${secondsToNextAttempt} ${unitText}`;
+      }
     } else {
-      const unitText = secondsToNextAttempt === 1 ? 'second' : 'seconds';
-      this.status.innerHTML = `Rejoin failed... trying again in ${secondsToNextAttempt} ${unitText}`;
+      this.reloadButton.style.display = 'none';
+      this.rejoiningAnimation.style.display = 'none';
+      this.status.innerHTML = 'The session has been paused by the server.';
+      this.resumeButton.style.display = 'block';
     }
   }
 
@@ -104,10 +127,16 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
   }
 
   failed(): void {
-    this.reloadButton.style.display = 'block';
     this.rejoiningAnimation.style.display = 'none';
-    this.status.innerHTML = 'Failed to rejoin.<br />Please retry or reload the page.';
-    this.document.addEventListener('visibilitychange', this.retryWhenDocumentBecomesVisible);
+    if (this.reconnect) {
+      this.reloadButton.style.display = 'block';
+      this.status.innerHTML = 'Failed to rejoin.<br />Please retry or reload the page.';
+      this.document.addEventListener('visibilitychange', this.retryWhenDocumentBecomesVisible);
+    } else {
+      this.status.innerHTML = 'Failed to resume the session.<br />Please reload the page.';
+      this.resumeButton.style.display = 'none';
+      this.reloadButton.style.display = 'none';
+    }
   }
 
   rejected(): void {
@@ -127,7 +156,29 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
       // - exception to mean we didn't reach the server (this can be sync or async)
       const successful = await Blazor.reconnect!();
       if (!successful) {
-        this.rejected();
+        // Try to resume the circuit if the reconnect failed
+        this.update({ type: 'pause', remote: this.remote });
+        const resumeSuccessful = await Blazor.resumeCircuit!();
+        if (!resumeSuccessful) {
+          this.rejected();
+        }
+      }
+    } catch (err: unknown) {
+      // We got an exception, server is currently unavailable
+      this.logger.log(LogLevel.Error, err as Error);
+      this.failed();
+    }
+  }
+
+  private async resume() {
+    try {
+      // reconnect will asynchronously return:
+      // - true to mean success
+      // - false to mean we reached the server, but it rejected the connection (e.g., unknown circuit ID)
+      // - exception to mean we didn't reach the server (this can be sync or async)
+      const successful = await Blazor.resumeCircuit!();
+      if (!successful) {
+        this.failed();
       }
     } catch (err: unknown) {
       // We got an exception, server is currently unavailable
diff --git a/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectionHandler.ts b/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectionHandler.ts
index 58750dce46e6..31528e850a41 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectionHandler.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectionHandler.ts
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 import { ReconnectionHandler, ReconnectionOptions } from './CircuitStartOptions';
-import { ReconnectDisplay } from './ReconnectDisplay';
+import { ReconnectDisplay, ReconnectDisplayUpdateOptions } from './ReconnectDisplay';
 import { DefaultReconnectDisplay } from './DefaultReconnectDisplay';
 import { UserSpecifiedDisplay } from './UserSpecifiedDisplay';
 import { Logger, LogLevel } from '../Logging/Logger';
@@ -13,17 +13,20 @@ export class DefaultReconnectionHandler implements ReconnectionHandler {
 
   private readonly _reconnectCallback: () => Promise<boolean>;
 
+  private readonly _resumeCallback: () => Promise<boolean>;
+
   private _currentReconnectionProcess: ReconnectionProcess | null = null;
 
   private _reconnectionDisplay?: ReconnectDisplay;
 
-  constructor(logger: Logger, overrideDisplay?: ReconnectDisplay, reconnectCallback?: () => Promise<boolean>) {
+  constructor(logger: Logger, overrideDisplay?: ReconnectDisplay, reconnectCallback?: () => Promise<boolean>, resumeCallback?: () => Promise<boolean>) {
     this._logger = logger;
     this._reconnectionDisplay = overrideDisplay;
     this._reconnectCallback = reconnectCallback || Blazor.reconnect!;
+    this._resumeCallback = resumeCallback || Blazor.resumeCircuit!;
   }
 
-  onConnectionDown(options: ReconnectionOptions, _error?: Error): void {
+  onConnectionDown(options: ReconnectionOptions, _error?: Error, isClientPause?: boolean, remotePause?: boolean): void {
     if (!this._reconnectionDisplay) {
       const modal = document.getElementById(options.dialogId);
       this._reconnectionDisplay = modal
@@ -32,7 +35,15 @@ export class DefaultReconnectionHandler implements ReconnectionHandler {
     }
 
     if (!this._currentReconnectionProcess) {
-      this._currentReconnectionProcess = new ReconnectionProcess(options, this._logger, this._reconnectCallback, this._reconnectionDisplay);
+      this._currentReconnectionProcess = new ReconnectionProcess(
+        options,
+        this._logger,
+        this._reconnectCallback,
+        this._resumeCallback,
+        this._reconnectionDisplay,
+        isClientPause,
+        remotePause,
+      );
     }
   }
 
@@ -51,10 +62,31 @@ class ReconnectionProcess {
 
   isDisposed = false;
 
-  constructor(options: ReconnectionOptions, private logger: Logger, private reconnectCallback: () => Promise<boolean>, display: ReconnectDisplay) {
+  constructor(
+    options: ReconnectionOptions,
+    private logger: Logger,
+    private reconnectCallback: () => Promise<boolean>,
+    private resumeCallback: () => Promise<boolean>,
+    display: ReconnectDisplay,
+    private isGracefulPause?: boolean,
+    private isRemote: boolean = false,
+  ) {
     this.reconnectDisplay = display;
-    this.reconnectDisplay.show();
-    this.attemptPeriodicReconnection(options);
+    const displayOptions: ReconnectDisplayUpdateOptions = {
+      type: isGracefulPause ? 'pause' : 'reconnect',
+      remote: this.isRemote,
+      currentAttempt: 0,
+      secondsToNextAttempt: 0,
+    };
+    this.reconnectDisplay.show(displayOptions);
+    if (!this.isGracefulPause) {
+      this.attemptPeriodicReconnection(options);
+    } else {
+      this.reconnectDisplay.update({
+        type: 'pause',
+        remote: this.isRemote,
+      });
+    }
   }
 
   public dispose() {
@@ -65,7 +97,7 @@ class ReconnectionProcess {
   async attemptPeriodicReconnection(options: ReconnectionOptions) {
     for (let i = 0; options.maxRetries === undefined || i < options.maxRetries; i++) {
       let retryInterval: number;
-      if (typeof(options.retryIntervalMilliseconds) === 'function') {
+      if (typeof (options.retryIntervalMilliseconds) === 'function') {
         const computedRetryInterval = options.retryIntervalMilliseconds(i);
         if (computedRetryInterval === null || computedRetryInterval === undefined) {
           break;
@@ -78,7 +110,7 @@ class ReconnectionProcess {
       }
 
       await this.runTimer(retryInterval, /* intervalMs */ 1000, remainingMs => {
-        this.reconnectDisplay.update(i + 1, Math.round(remainingMs / 1000));
+        this.reconnectDisplay.update({ type: 'reconnect', currentAttempt: i + 1, secondsToNextAttempt: Math.round(remainingMs / 1000) });
       });
 
       if (this.isDisposed) {
@@ -92,8 +124,15 @@ class ReconnectionProcess {
         // - exception to mean we didn't reach the server (this can be sync or async)
         const result = await this.reconnectCallback();
         if (!result) {
+          // Try to resume the circuit if the reconnect failed
           // If the server responded and refused to reconnect, stop auto-retrying.
-          this.reconnectDisplay.rejected();
+          this.reconnectDisplay.update({ type: 'pause', remote: true });
+          const resumeResult = await this.resumeCallback();
+          if (resumeResult) {
+            return;
+          }
+
+          this.reconnectDisplay.failed();
           return;
         }
         return;
diff --git a/src/Components/Web.JS/src/Platform/Circuits/ReconnectDisplay.ts b/src/Components/Web.JS/src/Platform/Circuits/ReconnectDisplay.ts
index d2d084169b5e..efa09b259cca 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/ReconnectDisplay.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/ReconnectDisplay.ts
@@ -2,9 +2,22 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 export interface ReconnectDisplay {
-  show(): void;
-  update(currentAttempt: number, secondsToNextAttempt: number): void;
+  show(options: ReconnectDisplayUpdateOptions): void;
+  update(options: ReconnectDisplayUpdateOptions): void;
   hide(): void;
   failed(): void;
   rejected(): void;
 }
+
+export type ReconnectDisplayUpdateOptions = ReconnectOptions | PauseOptions;
+
+export type PauseOptions = {
+  type: 'pause',
+  remote: boolean
+};
+
+export type ReconnectOptions = {
+  type: 'reconnect',
+  currentAttempt: number,
+  secondsToNextAttempt: number
+};
diff --git a/src/Components/Web.JS/src/Platform/Circuits/ReconnectStateChangedEvent.ts b/src/Components/Web.JS/src/Platform/Circuits/ReconnectStateChangedEvent.ts
new file mode 100644
index 000000000000..986886098272
--- /dev/null
+++ b/src/Components/Web.JS/src/Platform/Circuits/ReconnectStateChangedEvent.ts
@@ -0,0 +1,6 @@
+export interface ReconnectStateChangedEvent {
+  state: "show" | "hide" | "retrying" | "failed" | "resume-failed" | "paused" | "rejected";
+  currentAttempt?: number;
+  secondsToNextAttempt?: number;
+  remote?: boolean;
+}
diff --git a/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts b/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
index e179d921cf3c..01106b9a6665 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
@@ -1,14 +1,22 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { ReconnectDisplay } from './ReconnectDisplay';
+import { ReconnectDisplay, ReconnectDisplayUpdateOptions } from './ReconnectDisplay';
+import { ReconnectStateChangedEvent } from './ReconnectStateChangedEvent';
+
 export class UserSpecifiedDisplay implements ReconnectDisplay {
   static readonly ShowClassName = 'components-reconnect-show';
 
   static readonly HideClassName = 'components-reconnect-hide';
 
+  static readonly RetryingClassName = 'components-reconnect-retrying';
+
   static readonly FailedClassName = 'components-reconnect-failed';
 
+  static readonly PausedClassName = 'components-reconnect-paused';
+
+  static readonly ResumeFailedClassName = 'components-reconnect-resume-failed';
+
   static readonly RejectedClassName = 'components-reconnect-rejected';
 
   static readonly MaxRetriesId = 'components-reconnect-max-retries';
@@ -17,6 +25,10 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
 
   static readonly SecondsToNextAttemptId = 'components-seconds-to-next-attempt';
 
+  static readonly ReconnectStateChangedEventName = 'components-reconnect-state-changed';
+
+  private reconnect = false;
+
   constructor(private dialog: HTMLElement, private readonly document: Document, maxRetries?: number) {
     this.document = document;
 
@@ -32,38 +44,76 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
   show(): void {
     this.removeClasses();
     this.dialog.classList.add(UserSpecifiedDisplay.ShowClassName);
+    this.dispatchReconnectStateChangedEvent({ state: 'show' });
   }
 
-  update(currentAttempt: number, secondsToNextAttempt: number): void {
-    const currentAttemptElement = this.document.getElementById(UserSpecifiedDisplay.CurrentAttemptId);
+  update(options: ReconnectDisplayUpdateOptions): void {
+    this.reconnect = options.type === 'reconnect';
+    if (options.type === 'reconnect') {
+      const { currentAttempt, secondsToNextAttempt } = options;
+      const currentAttemptElement = this.document.getElementById(UserSpecifiedDisplay.CurrentAttemptId);
 
-    if (currentAttemptElement) {
-      currentAttemptElement.innerText = currentAttempt.toString();
-    }
+      if (currentAttemptElement) {
+        currentAttemptElement.innerText = currentAttempt.toString();
+      }
 
-    const secondsToNextAttemptElement = this.document.getElementById(UserSpecifiedDisplay.SecondsToNextAttemptId);
+      const secondsToNextAttemptElement = this.document.getElementById(UserSpecifiedDisplay.SecondsToNextAttemptId);
 
-    if (secondsToNextAttemptElement) {
-      secondsToNextAttemptElement.innerText = secondsToNextAttempt.toString();
+      if (secondsToNextAttemptElement) {
+        secondsToNextAttemptElement.innerText = secondsToNextAttempt.toString();
+      }
+
+      if (currentAttempt > 1 && secondsToNextAttempt > 0) {
+        this.dialog.classList.add(UserSpecifiedDisplay.RetryingClassName);
+      }
+
+      this.dispatchReconnectStateChangedEvent({ state: 'retrying', currentAttempt, secondsToNextAttempt });
+    }
+    if (options.type === 'pause') {
+      const remote = options.remote;
+      this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.RetryingClassName);
+      this.dialog.classList.add(UserSpecifiedDisplay.PausedClassName);
+      this.dispatchReconnectStateChangedEvent({ state: 'paused', remote: remote });
     }
   }
 
   hide(): void {
     this.removeClasses();
     this.dialog.classList.add(UserSpecifiedDisplay.HideClassName);
+    this.dispatchReconnectStateChangedEvent({ state: 'hide' });
   }
 
   failed(): void {
     this.removeClasses();
-    this.dialog.classList.add(UserSpecifiedDisplay.FailedClassName);
+    if (this.reconnect) {
+      this.dialog.classList.add(UserSpecifiedDisplay.FailedClassName);
+      this.dispatchReconnectStateChangedEvent({ state: 'failed' });
+    } else {
+      this.dialog.classList.add(UserSpecifiedDisplay.ResumeFailedClassName);
+      this.dispatchReconnectStateChangedEvent({ state: 'resume-failed' });
+    }
   }
 
   rejected(): void {
     this.removeClasses();
     this.dialog.classList.add(UserSpecifiedDisplay.RejectedClassName);
+    this.dispatchReconnectStateChangedEvent({ state: 'rejected' });
   }
 
   private removeClasses() {
-    this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.HideClassName, UserSpecifiedDisplay.FailedClassName, UserSpecifiedDisplay.RejectedClassName);
+    this.dialog.classList.remove(
+      UserSpecifiedDisplay.ShowClassName,
+      UserSpecifiedDisplay.HideClassName,
+      UserSpecifiedDisplay.RetryingClassName,
+      UserSpecifiedDisplay.FailedClassName,
+      UserSpecifiedDisplay.RejectedClassName,
+      UserSpecifiedDisplay.PausedClassName,
+      UserSpecifiedDisplay.ResumeFailedClassName
+    );
+  }
+
+  private dispatchReconnectStateChangedEvent(eventData: ReconnectStateChangedEvent) {
+    const event = new CustomEvent(UserSpecifiedDisplay.ReconnectStateChangedEventName, { detail: eventData });
+    this.dialog.dispatchEvent(event);
   }
 }
diff --git a/src/Components/Web.JS/src/Platform/Mono/MonoDebugger.ts b/src/Components/Web.JS/src/Platform/Mono/MonoDebugger.ts
index 8272eb9aa44e..0ae89acaa9ca 100644
--- a/src/Components/Web.JS/src/Platform/Mono/MonoDebugger.ts
+++ b/src/Components/Web.JS/src/Platform/Mono/MonoDebugger.ts
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { MonoConfig } from 'dotnet-runtime';
+import { MonoConfig } from '@microsoft/dotnet-runtime';
 
 const navigatorUA = navigator as MonoNavigatorUserAgent;
 const brands = navigatorUA.userAgentData && navigatorUA.userAgentData.brands;
diff --git a/src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts b/src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
index 8b31c404b74b..1465e5f79cc8 100644
--- a/src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
+++ b/src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
@@ -10,7 +10,7 @@ import { showErrorNotification } from '../../BootErrors';
 import { Platform, System_Array, Pointer, System_Object, System_String, HeapLock, PlatformApi } from '../Platform';
 import { WebAssemblyBootResourceType, WebAssemblyStartOptions } from '../WebAssemblyStartOptions';
 import { Blazor } from '../../GlobalExports';
-import { DotnetModuleConfig, MonoConfig, ModuleAPI, RuntimeAPI, GlobalizationMode } from 'dotnet-runtime';
+import { DotnetModuleConfig, MonoConfig, ModuleAPI, RuntimeAPI, GlobalizationMode } from '@microsoft/dotnet-runtime';
 import { fetchAndInvokeInitializers } from '../../JSInitializers/JSInitializers.WebAssembly';
 import { JSInitializer } from '../../JSInitializers/JSInitializers';
 
@@ -116,31 +116,34 @@ async function importDotnetJs(startOptions: Partial<WebAssemblyStartOptions>): P
     throw new Error('This browser does not support WebAssembly.');
   }
 
-  let src = '_framework/dotnet.js';
 
   // Allow overriding the URI from which the dotnet.*.js file is loaded
   if (startOptions.loadBootResource) {
     const resourceType: WebAssemblyBootResourceType = 'dotnetjs';
-    const customSrc = startOptions.loadBootResource(resourceType, 'dotnet.js', src, '', 'js-module-dotnet');
+    const customSrc = startOptions.loadBootResource(resourceType, 'dotnet.js', '_framework/dotnet.js', '', 'js-module-dotnet');
     if (typeof (customSrc) === 'string') {
-      src = customSrc;
+      const absoluteSrc = (new URL(customSrc, document.baseURI)).toString();
+      return await import(/* webpackIgnore: true */ absoluteSrc);
     } else if (customSrc) {
       // Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
       throw new Error(`For a ${resourceType} resource, custom loaders must supply a URI string.`);
     }
   }
 
-  const absoluteSrc = (new URL(src, document.baseURI)).toString();
-  return await import(/* webpackIgnore: true */ absoluteSrc);
+  // @ts-ignore: This dynamic import is handled at runtime and does not need a type declaration.
+  return await import(/* webpackIgnore: true */ "./dotnet.js");
 }
 
 function prepareRuntimeConfig(options: Partial<WebAssemblyStartOptions>, onConfigLoadedCallback?: (loadedConfig: MonoConfig) => void): DotnetModuleConfig {
   const config: MonoConfig = {
     maxParallelDownloads: 1000000, // disable throttling parallel downloads
     enableDownloadRetry: false, // disable retry downloads
-    applicationEnvironment: options.environment,
   };
 
+  if (options.environment) {
+    config.applicationEnvironment = options.environment;
+  }
+
   const onConfigLoaded = async (loadedConfig: MonoConfig) => {
     if (!loadedConfig.environmentVariables) {
       loadedConfig.environmentVariables = {};
diff --git a/src/Components/Web.JS/src/Platform/Platform.ts b/src/Components/Web.JS/src/Platform/Platform.ts
index 728bd330b33d..8587e9204039 100644
--- a/src/Components/Web.JS/src/Platform/Platform.ts
+++ b/src/Components/Web.JS/src/Platform/Platform.ts
@@ -3,9 +3,9 @@
 
 /* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { MonoObject, MonoString, MonoArray } from 'dotnet-runtime/dotnet-legacy';
+import { MonoObject, MonoString, MonoArray } from '@microsoft/dotnet-runtime/dotnet-legacy';
 import { WebAssemblyStartOptions } from './WebAssemblyStartOptions';
-import { MonoConfig } from 'dotnet-runtime';
+import { MonoConfig } from '@microsoft/dotnet-runtime';
 
 export interface Platform {
   load(options: Partial<WebAssemblyStartOptions>, onConfigLoaded?: (loadedConfig: MonoConfig) => void): Promise<void>;
diff --git a/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts b/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts
index 6eec9e2b9a1e..bb01684cf545 100644
--- a/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts
+++ b/src/Components/Web.JS/src/Platform/WebAssemblyStartOptions.ts
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { DotnetHostBuilder, AssetBehaviors } from 'dotnet-runtime';
+import { DotnetHostBuilder, AssetBehaviors } from '@microsoft/dotnet-runtime';
 import { IBlazor } from '../GlobalExports';
 
 export interface WebAssemblyStartOptions {
diff --git a/src/Components/Web.JS/src/Rendering/BrowserRenderer.ts b/src/Components/Web.JS/src/Rendering/BrowserRenderer.ts
index 7496dd552286..6cd526a49e61 100644
--- a/src/Components/Web.JS/src/Rendering/BrowserRenderer.ts
+++ b/src/Components/Web.JS/src/Rendering/BrowserRenderer.ts
@@ -3,7 +3,7 @@
 
 import { RenderBatch, ArrayBuilderSegment, RenderTreeEdit, RenderTreeFrame, EditType, FrameType, ArrayValues } from './RenderBatch/RenderBatch';
 import { EventDelegator } from './Events/EventDelegator';
-import { LogicalElement, PermutationListEntry, toLogicalElement, insertLogicalChild, removeLogicalChild, getLogicalParent, getLogicalChild, createAndInsertLogicalContainer, isSvgElement, permuteLogicalChildren, getClosestDomElement, emptyLogicalElement, getLogicalChildrenArray } from './LogicalElements';
+import { LogicalElement, PermutationListEntry, toLogicalElement, insertLogicalChild, removeLogicalChild, getLogicalParent, getLogicalChild, createAndInsertLogicalContainer, isSvgElement, permuteLogicalChildren, getClosestDomElement, emptyLogicalElement, getLogicalChildrenArray, depthFirstNodeTreeTraversal } from './LogicalElements';
 import { applyCaptureIdToElement } from './ElementReferenceCapture';
 import { attachToEventDelegator as attachNavigationManagerToEventDelegator } from '../Services/NavigationManager';
 import { applyAnyDeferredValue, tryApplySpecialProperty } from './DomSpecialPropertyUtil';
@@ -63,6 +63,7 @@ export class BrowserRenderer {
 
     // On the first render for each root component, clear any existing content (e.g., prerendered)
     if (elementsToClearOnRootComponentRender.delete(element)) {
+      this.detachEventHandlersFromElement(element);
       emptyLogicalElement(element);
 
       if (element instanceof Comment) {
@@ -109,6 +110,14 @@ export class BrowserRenderer {
     this.childComponentLocations[componentId] = element;
   }
 
+  private detachEventHandlersFromElement(element: LogicalElement): void {
+    for (const childNode of depthFirstNodeTreeTraversal(element)) {
+      if (childNode instanceof Element) {
+        this.eventDelegator.removeListenersForElement(childNode as Element);
+      }
+    }
+  }
+
   private applyEdits(batch: RenderBatch, componentId: number, parent: LogicalElement, childIndex: number, edits: ArrayBuilderSegment<RenderTreeEdit>, referenceFrames: ArrayValues<RenderTreeFrame>) {
     let currentDepth = 0;
     let childIndexAtCurrentDepth = childIndex;
@@ -376,7 +385,7 @@ export class BrowserRenderer {
   }
 }
 
-function markAsInteractiveRootComponentElement(element: LogicalElement, isInteractive: boolean) {
+export function markAsInteractiveRootComponentElement(element: LogicalElement, isInteractive: boolean) {
   element[interactiveRootComponentPropname] = isInteractive;
 }
 
@@ -388,6 +397,10 @@ export function setShouldPreserveContentOnInteractiveComponentDisposal(element:
   element[preserveContentOnDisposalPropname] = shouldPreserve;
 }
 
+export function setClearContentOnRootComponentRerender(element: LogicalElement): void {
+  elementsToClearOnRootComponentRender.add(element);
+}
+
 function shouldPreserveContentOnInteractiveComponentDisposal(element: LogicalElement): boolean {
   return element[preserveContentOnDisposalPropname] === true;
 }
diff --git a/src/Components/Web.JS/src/Rendering/DomMerging/DomSync.ts b/src/Components/Web.JS/src/Rendering/DomMerging/DomSync.ts
index 49585f8b03e9..b86ff3bd8d03 100644
--- a/src/Components/Web.JS/src/Rendering/DomMerging/DomSync.ts
+++ b/src/Components/Web.JS/src/Rendering/DomMerging/DomSync.ts
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { AutoComponentDescriptor, ComponentDescriptor, ServerComponentDescriptor, WebAssemblyComponentDescriptor, canMergeDescriptors, discoverComponents, mergeDescriptors } from '../../Services/ComponentDescriptorDiscovery';
+import { AutoComponentDescriptor, ComponentDescriptor, ServerComponentDescriptor, WebAssemblyComponentDescriptor, WebAssemblyServerOptions, canMergeDescriptors, discoverComponents, discoverWebAssemblyOptions, mergeDescriptors } from '../../Services/ComponentDescriptorDiscovery';
 import { isInteractiveRootComponentElement } from '../BrowserRenderer';
 import { applyAnyDeferredValue } from '../DomSpecialPropertyUtil';
 import { LogicalElement, getLogicalChildrenArray, getLogicalNextSibling, getLogicalParent, getLogicalRootDescriptor, insertLogicalChild, insertLogicalChildBefore, isLogicalElement, toLogicalElement, toLogicalRootCommentElement } from '../LogicalElements';
@@ -13,6 +13,7 @@ let descriptorHandler: DescriptorHandler | null = null;
 
 export interface DescriptorHandler {
   registerComponent(descriptor: ComponentDescriptor): void;
+  setWebAssemblyOptions(options: WebAssemblyServerOptions | undefined): void;
 }
 
 export function attachComponentDescriptorHandler(handler: DescriptorHandler) {
@@ -21,6 +22,8 @@ export function attachComponentDescriptorHandler(handler: DescriptorHandler) {
 
 export function registerAllComponentDescriptors(root: Node) {
   const descriptors = upgradeComponentCommentsToLogicalRootComments(root);
+  const webAssemblyOptions = discoverWebAssemblyOptions(root);
+  descriptorHandler?.setWebAssemblyOptions(webAssemblyOptions);
 
   for (const descriptor of descriptors) {
     descriptorHandler?.registerComponent(descriptor);
@@ -168,7 +171,7 @@ function treatAsMatch(destination: Node, source: Node) {
       }
 
       if (destinationRootDescriptor) {
-        // Update the existing descriptor with hte new descriptor's data
+        // Update the existing descriptor with the new descriptor's data
         mergeDescriptors(destinationRootDescriptor, sourceRootDescriptor);
 
         const isDestinationInteractive = isInteractiveRootComponentElement(destinationAsLogicalElement);
diff --git a/src/Components/Web.JS/src/Rendering/Events/EventDelegator.ts b/src/Components/Web.JS/src/Rendering/Events/EventDelegator.ts
index 064b6e5ff340..b0fd5e7fe793 100644
--- a/src/Components/Web.JS/src/Rendering/Events/EventDelegator.ts
+++ b/src/Components/Web.JS/src/Rendering/Events/EventDelegator.ts
@@ -3,7 +3,7 @@
 
 import { EventFieldInfo } from './EventFieldInfo';
 import { eventNameAliasRegisteredCallbacks, getBrowserEventName, getEventNameAliases, getEventTypeOptions } from './EventTypes';
-import { dispatchEvent } from '../WebRendererInteropMethods';
+import { isRendererAttached, dispatchEvent } from '../WebRendererInteropMethods';
 
 const nonBubblingEvents = toLookup([
   'abort',
@@ -113,6 +113,19 @@ export class EventDelegator {
     }
   }
 
+  public removeListenersForElement(element: Element): void {
+    // This method gets called whenever the .NET-side code reports that a certain element
+    // has been disposed. We remove all event handlers for that element.
+    const infosForElement = this.getEventHandlerInfosForElement(element, false);
+    if (infosForElement) {
+      for (const handlerInfo of infosForElement.enumerateHandlers()) {
+        this.eventInfoStore.remove(handlerInfo.eventHandlerId);
+      }
+
+      delete element[this.eventsCollectionKey];
+    }
+  }
+
   public notifyAfterClick(callback: (event: MouseEvent) => void): void {
     // This is extremely special-case. It's needed so that navigation link click interception
     // can be sure to run *after* our synthetic bubbling process. If a need arises, we can
@@ -123,12 +136,30 @@ export class EventDelegator {
 
   public setStopPropagation(element: Element, eventName: string, value: boolean): void {
     const infoForElement = this.getEventHandlerInfosForElement(element, true)!;
+    const currentValue = infoForElement.stopPropagation(eventName);
     infoForElement.stopPropagation(eventName, value);
+
+    if (!currentValue && value) {
+      this.eventInfoStore.addGlobalListener(eventName);
+    } else if (currentValue && !value) {
+      this.eventInfoStore.decrementCountByEventName(eventName);
+    }
   }
 
   public setPreventDefault(element: Element, eventName: string, value: boolean): void {
     const infoForElement = this.getEventHandlerInfosForElement(element, true)!;
+    const currentValue = infoForElement.preventDefault(eventName);
     infoForElement.preventDefault(eventName, value);
+
+    if (!currentValue && value) {
+      // To ensure that preventDefault works for wheel and touch events,,
+      // we need to register a listener with the passive mode explicitly disabled.
+      // Note that this does not change behavior for other events as those
+      // use active mode by default.
+      this.eventInfoStore.addActiveGlobalListener(eventName);
+    } else if (currentValue && !value) {
+      this.eventInfoStore.decrementCountByEventName(eventName);
+    }
   }
 
   private onGlobalEvent(evt: Event) {
@@ -136,6 +167,11 @@ export class EventDelegator {
       return;
     }
 
+    if (!isRendererAttached(this.browserRendererId)) {
+      // when connection closed, it will detachWebRendererInterop, so we need to check if the renderer is still attached
+      return;
+    }
+
     // Always dispatch to any listeners for the original underlying browser event name
     this.dispatchGlobalEventToAllElements(evt.type, evt);
 
@@ -261,6 +297,25 @@ class EventInfoStore {
     }
   }
 
+  public addActiveGlobalListener(eventName: string) {
+    // If this event name is an alias, update the global listener for the corresponding browser event
+    eventName = getBrowserEventName(eventName);
+
+    // If the listener for this event is already registered, we recreate it to ensure
+    // that it is using the active mode.
+    if (Object.prototype.hasOwnProperty.call(this.countByEventName, eventName)) {
+      this.countByEventName[eventName]++;
+      document.removeEventListener(eventName, this.globalListener);
+    } else {
+      this.countByEventName[eventName] = 1;
+    }
+
+    // To make delegation work with non-bubbling events, register a 'capture' listener.
+    // We preserve the non-bubbling behavior by only dispatching such events to the targeted element.
+    const useCapture = Object.prototype.hasOwnProperty.call(nonBubblingEvents, eventName);
+    document.addEventListener(eventName, this.globalListener, { capture: useCapture, passive: false });
+  }
+
   public update(oldEventHandlerId: number, newEventHandlerId: number) {
     if (Object.prototype.hasOwnProperty.call(this.infosByEventHandlerId, newEventHandlerId)) {
       // Should never happen, but we want to know if it does
@@ -281,16 +336,19 @@ class EventInfoStore {
 
       // If this event name is an alias, update the global listener for the corresponding browser event
       const eventName = getBrowserEventName(info.eventName);
-
-      if (--this.countByEventName[eventName] === 0) {
-        delete this.countByEventName[eventName];
-        document.removeEventListener(eventName, this.globalListener);
-      }
+      this.decrementCountByEventName(eventName);
     }
 
     return info;
   }
 
+  public decrementCountByEventName(eventName: string) {
+    if (--this.countByEventName[eventName] === 0) {
+      delete this.countByEventName[eventName];
+      document.removeEventListener(eventName, this.globalListener);
+    }
+  }
+
   private handleEventNameAliasAdded(aliasEventName, browserEventName) {
     // If an event name alias gets registered later, we need to update the global listener
     // registrations to match. This makes it equivalent to the alias having been registered
@@ -321,6 +379,14 @@ class EventHandlerInfosForElement {
 
   private stopPropagationFlags: { [eventName: string]: boolean } | null = null;
 
+  public *enumerateHandlers() : IterableIterator<EventHandlerInfo> {
+    for (const eventName in this.handlers) {
+      if (Object.prototype.hasOwnProperty.call(this.handlers, eventName)) {
+        yield this.handlers[eventName];
+      }
+    }
+  }
+
   public getHandler(eventName: string): EventHandlerInfo | null {
     return Object.prototype.hasOwnProperty.call(this.handlers, eventName) ? this.handlers[eventName] : null;
   }
diff --git a/src/Components/Web.JS/src/Rendering/LogicalElements.ts b/src/Components/Web.JS/src/Rendering/LogicalElements.ts
index a6e904febf04..d963499c5a75 100644
--- a/src/Components/Web.JS/src/Rendering/LogicalElements.ts
+++ b/src/Components/Web.JS/src/Rendering/LogicalElements.ts
@@ -250,6 +250,16 @@ export function isLogicalElement(element: Node): boolean {
   return logicalChildrenPropname in element;
 }
 
+// This function returns all the descendants of the logical element before yielding the element
+// itself.
+export function *depthFirstNodeTreeTraversal(element: LogicalElement): Iterable<LogicalElement> {
+  const children = getLogicalChildrenArray(element);
+  for (const child of children) {
+    yield* depthFirstNodeTreeTraversal(child);
+  }
+  yield element;
+}
+
 export function permuteLogicalChildren(parent: LogicalElement, permutationList: PermutationListEntry[]): void {
   // The permutationList must represent a valid permutation, i.e., the list of 'from' indices
   // is distinct, and the list of 'to' indices is a permutation of it. The algorithm here
diff --git a/src/Components/Web.JS/src/Rendering/Renderer.ts b/src/Components/Web.JS/src/Rendering/Renderer.ts
index 976e5a9c75d1..a5619de92702 100644
--- a/src/Components/Web.JS/src/Rendering/Renderer.ts
+++ b/src/Components/Web.JS/src/Rendering/Renderer.ts
@@ -95,7 +95,7 @@ export function resetScrollAfterNextBatch(): void {
   shouldResetScrollAfterNextBatch = true;
 }
 
-function resetScrollIfNeeded() {
+export function resetScrollIfNeeded() {
   if (shouldResetScrollAfterNextBatch) {
     shouldResetScrollAfterNextBatch = false;
 
diff --git a/src/Components/Web.JS/src/Rendering/StreamingRendering.ts b/src/Components/Web.JS/src/Rendering/StreamingRendering.ts
index 06c650c2f99c..7ac02952068e 100644
--- a/src/Components/Web.JS/src/Rendering/StreamingRendering.ts
+++ b/src/Components/Web.JS/src/Rendering/StreamingRendering.ts
@@ -45,35 +45,16 @@ class BlazorStreamingUpdate extends HTMLElement {
             insertStreamingContentIntoDocument(componentId, node.content);
           }
         } else {
+          const isEnhancedNav = node.getAttribute('enhanced') === 'true';
           switch (node.getAttribute('type')) {
             case 'redirection':
-              // We use 'replace' here because it's closest to the non-progressively-enhanced behavior, and will make the most sense
-              // if the async delay was very short, as the user would not perceive having been on the intermediate page.
-              const destinationUrl = toAbsoluteUri(node.content.textContent!);
-              const isFormPost = node.getAttribute('from') === 'form-post';
-              const isEnhancedNav = node.getAttribute('enhanced') === 'true';
-              if (isEnhancedNav && isWithinBaseUriSpace(destinationUrl)) {
-                // At this point the destinationUrl might be an opaque URL so we don't know whether it's internal/external or
-                // whether it's even going to the same URL we're currently on. So we don't know how to update the history.
-                // Defer that until the redirection is resolved by performEnhancedPageLoad.
-                const treatAsRedirectionFromMethod = isFormPost ? 'post' : 'get';
-                const fetchOptions = undefined;
-                performEnhancedPageLoad(destinationUrl, /* interceptedLink */ false, fetchOptions, treatAsRedirectionFromMethod);
-              } else {
-                if (isFormPost) {
-                  // The URL is not yet updated. Push a whole new entry so that 'back' goes back to the pre-redirection location.
-                  // WARNING: The following check to avoid duplicating history entries won't work if the redirection is to an opaque URL.
-                  // We could change the server-side logic to return URLs in plaintext if they match the current request URL already,
-                  // but it's arguably easier to understand that history non-duplication only works for enhanced nav, which is also the
-                  // case for non-streaming responses.
-                  if (destinationUrl !== location.href) {
-                    location.assign(destinationUrl);
-                  }
-                } else {
-                  // The URL was already updated on the original link click. Replace so that 'back' goes to the pre-redirection location.
-                  location.replace(destinationUrl);
-                }
-              }
+              redirect(node, true, isEnhancedNav);
+              break;
+            case 'not-found':
+              // not-found template has enhanced nav set to true by default,
+              // check for the options to avoid overriding user settings
+              const useEnhancedNav = isEnhancedNav && enableDomPreservation;
+              redirect(node, false, useEnhancedNav);
               break;
             case 'error':
               // This is kind of brutal but matches what happens without progressive enhancement
@@ -86,6 +67,35 @@ class BlazorStreamingUpdate extends HTMLElement {
   }
 }
 
+function redirect(node: HTMLTemplateElement, changeUrl: boolean, isEnhancedNav: boolean): void {
+  // We use 'replace' here because it's closest to the non-progressively-enhanced behavior, and will make the most sense
+ // if the async delay was very short, as the user would not perceive having been on the intermediate page.
+ const destinationUrl = toAbsoluteUri(node.content.textContent!);
+ const isFormPost = node.getAttribute('from') === 'form-post';
+ if (isEnhancedNav && isWithinBaseUriSpace(destinationUrl)) {
+   // At this point the destinationUrl might be an opaque URL so we don't know whether it's internal/external or
+   // whether it's even going to the same URL we're currently on. So we don't know how to update the history.
+   // Defer that until the redirection is resolved by performEnhancedPageLoad.
+   const treatAsRedirectionFromMethod = isFormPost ? 'post' : 'get';
+   const fetchOptions = undefined;
+   performEnhancedPageLoad(destinationUrl, /* interceptedLink */ false, fetchOptions, treatAsRedirectionFromMethod, changeUrl);
+ } else {
+   if (isFormPost) {
+     // The URL is not yet updated. Push a whole new entry so that 'back' goes back to the pre-redirection location.
+     // WARNING: The following check to avoid duplicating history entries won't work if the redirection is to an opaque URL.
+     // We could change the server-side logic to return URLs in plaintext if they match the current request URL already,
+     // but it's arguably easier to understand that history non-duplication only works for enhanced nav, which is also the
+     // case for non-streaming responses.
+     if (destinationUrl !== location.href) {
+       location.assign(destinationUrl);
+     }
+   } else {
+     // The URL was already updated on the original link click. Replace so that 'back' goes to the pre-redirection location.
+     location.replace(destinationUrl);
+   }
+  }
+}
+
 function insertStreamingContentIntoDocument(componentIdAsString: string, docFrag: DocumentFragment): void {
   const markers = findStreamingMarkers(componentIdAsString);
   if (markers) {
diff --git a/src/Components/Web.JS/src/Services/ComponentDescriptorDiscovery.ts b/src/Components/Web.JS/src/Services/ComponentDescriptorDiscovery.ts
index f306b676a0d4..4fb4e39d8fc2 100644
--- a/src/Components/Web.JS/src/Services/ComponentDescriptorDiscovery.ts
+++ b/src/Components/Web.JS/src/Services/ComponentDescriptorDiscovery.ts
@@ -15,6 +15,16 @@ export function discoverComponents(root: Node, type: 'webassembly' | 'server' |
 const blazorServerStateCommentRegularExpression = /^\s*Blazor-Server-Component-State:(?<state>[a-zA-Z0-9+/=]+)$/;
 const blazorWebAssemblyStateCommentRegularExpression = /^\s*Blazor-WebAssembly-Component-State:(?<state>[a-zA-Z0-9+/=]+)$/;
 const blazorWebInitializerCommentRegularExpression = /^\s*Blazor-Web-Initializers:(?<initializers>[a-zA-Z0-9+/=]+)$/;
+const blazorWebAssemblyOptionsCommentRegularExpression = /^\s*Blazor-WebAssembly:[^{]*(?<options>.*)$/;
+
+export function discoverWebAssemblyOptions(root: Node): WebAssemblyServerOptions | undefined {
+  const optionsJson = discoverBlazorComment(root, blazorWebAssemblyOptionsCommentRegularExpression, 'options');
+  if (!optionsJson) {
+    return undefined;
+  }
+  const options = JSON.parse(optionsJson);
+  return options;
+}
 
 export function discoverServerPersistedState(node: Node): string | null | undefined {
   return discoverBlazorComment(node, blazorServerStateCommentRegularExpression);
@@ -339,6 +349,11 @@ export type ServerComponentDescriptor = ServerComponentMarker & DescriptorData;
 export type WebAssemblyComponentDescriptor = WebAssemblyComponentMarker & DescriptorData;
 export type AutoComponentDescriptor = AutoComponentMarker & DescriptorData;
 
+export type WebAssemblyServerOptions = {
+  environmentName: string,
+  environmentVariables: { [i: string]: string; }
+};
+
 type DescriptorData = {
   uniqueId: number;
   start: Comment;
diff --git a/src/Components/Web.JS/src/Services/NavigationEnhancement.ts b/src/Components/Web.JS/src/Services/NavigationEnhancement.ts
index 6d50f8d292e8..c39a00bd0337 100644
--- a/src/Components/Web.JS/src/Services/NavigationEnhancement.ts
+++ b/src/Components/Web.JS/src/Services/NavigationEnhancement.ts
@@ -2,7 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 import { synchronizeDomContent } from '../Rendering/DomMerging/DomSync';
-import { attachProgrammaticEnhancedNavigationHandler, handleClickForNavigationInterception, hasInteractiveRouter, isForSamePath, isSamePageWithHash, notifyEnhancedNavigationListeners, performScrollToElementOnTheSamePage } from './NavigationUtils';
+import { attachProgrammaticEnhancedNavigationHandler, handleClickForNavigationInterception, hasInteractiveRouter, isForSamePath, notifyEnhancedNavigationListeners, performScrollToElementOnTheSamePage, isSamePageWithHash } from './NavigationUtils';
+import { resetScrollAfterNextBatch, resetScrollIfNeeded } from '../Rendering/Renderer';
 
 /*
 In effect, we have two separate client-side navigation mechanisms:
@@ -70,13 +71,19 @@ export function detachProgressivelyEnhancedNavigationListener() {
   window.removeEventListener('popstate', onPopState);
 }
 
-function performProgrammaticEnhancedNavigation(absoluteInternalHref: string, replace: boolean) {
+function performProgrammaticEnhancedNavigation(absoluteInternalHref: string, replace: boolean) : void {
+  const originalLocation = location.href;
+
   if (replace) {
     history.replaceState(null, /* ignored title */ '', absoluteInternalHref);
   } else {
     history.pushState(null, /* ignored title */ '', absoluteInternalHref);
   }
 
+  if (!isForSamePath(absoluteInternalHref, originalLocation)) {
+    resetScrollAfterNextBatch();
+  }
+
   performEnhancedPageLoad(absoluteInternalHref, /* interceptedLink */ false);
 }
 
@@ -90,13 +97,20 @@ function onDocumentClick(event: MouseEvent) {
   }
 
   handleClickForNavigationInterception(event, absoluteInternalHref => {
-    const shouldScrollToHash = isSamePageWithHash(absoluteInternalHref);
+    const originalLocation = location.href;
+
+    const shouldScrollToHash = isSamePageWithHash(originalLocation, absoluteInternalHref);
     history.pushState(null, /* ignored title */ '', absoluteInternalHref);
 
     if (shouldScrollToHash) {
       performScrollToElementOnTheSamePage(absoluteInternalHref);
     } else {
+      let isSelfNavigation = isForSamePath(absoluteInternalHref, originalLocation);
       performEnhancedPageLoad(absoluteInternalHref, /* interceptedLink */ true);
+      if (!isSelfNavigation) {
+        resetScrollAfterNextBatch();
+        resetScrollIfNeeded();
+      }
     }
   });
 }
@@ -106,6 +120,12 @@ function onPopState(state: PopStateEvent) {
     return;
   }
 
+  if (state.state == null && isSamePageWithHash(currentContentUrl, location.href)) {
+    currentContentUrl = location.href;
+    return;
+  }
+
+  // load the new page
   performEnhancedPageLoad(location.href, /* interceptedLink */ false);
 }
 
@@ -144,7 +164,7 @@ function onDocumentSubmit(event: SubmitEvent) {
     const formData = new FormData(formElem);
 
     const submitterName = event.submitter?.getAttribute('name');
-    const submitterValue = event.submitter!.getAttribute('value');
+    const submitterValue = event.submitter?.getAttribute('value');
     if (submitterName && submitterValue) {
       formData.append(submitterName, submitterValue);
     }
@@ -177,7 +197,7 @@ function onDocumentSubmit(event: SubmitEvent) {
   }
 }
 
-export async function performEnhancedPageLoad(internalDestinationHref: string, interceptedLink: boolean, fetchOptions?: RequestInit, treatAsRedirectionFromMethod?: 'get' | 'post') {
+export async function performEnhancedPageLoad(internalDestinationHref: string, interceptedLink: boolean, fetchOptions?: RequestInit, treatAsRedirectionFromMethod?: 'get' | 'post', changeUrl: boolean = true) {
   performingEnhancedPageLoad = true;
 
   // First, stop any preceding enhanced page load
@@ -242,7 +262,7 @@ export async function performEnhancedPageLoad(internalDestinationHref: string, i
       // For 301/302/etc redirections to internal URLs, the browser will already have followed the chain of redirections
       // to the end, and given us the final content. We do still need to update the current URL to match the final location,
       // then let the rest of enhanced nav logic run to patch the new content into the DOM.
-      if (response.redirected || treatAsRedirectionFromMethod) {
+      if (changeUrl && (response.redirected || treatAsRedirectionFromMethod)) {
         const treatAsGet = treatAsRedirectionFromMethod ? (treatAsRedirectionFromMethod === 'get') : isGetRequest;
         if (treatAsGet) {
           // For gets, the intermediate (redirecting) URL is already in the address bar, so we have to use 'replace'
@@ -259,12 +279,12 @@ export async function performEnhancedPageLoad(internalDestinationHref: string, i
 
       // For enhanced nav redirecting to an external URL, we'll get a special Blazor-specific redirection command
       const externalRedirectionUrl = response.headers.get('blazor-enhanced-nav-redirect-location');
-      if (externalRedirectionUrl) {
+      if (changeUrl && externalRedirectionUrl) {
         location.replace(externalRedirectionUrl);
         return;
       }
 
-      if (!response.redirected && !isGetRequest && isSuccessResponse) {
+      if (changeUrl && !response.redirected && !isGetRequest && isSuccessResponse) {
         // If this is the result of a form post that didn't trigger a redirection.
         if (!isForSamePath(response.url, currentContentUrl)) {
           // In this case we don't want to push the currentContentUrl to the history stack because we don't know if this is a location
@@ -281,7 +301,9 @@ export async function performEnhancedPageLoad(internalDestinationHref: string, i
       }
 
       // Set the currentContentUrl to the location of the last completed navigation.
-      currentContentUrl = response.url;
+      if (changeUrl) {
+        currentContentUrl = response.url;
+      }
 
       const responseContentType = response.headers.get('content-type');
       if (responseContentType?.startsWith('text/html') && initialContent) {
@@ -438,6 +460,7 @@ function enhancedNavigationIsEnabledForForm(form: HTMLFormElement): boolean {
 function retryEnhancedNavAsFullPageLoad(internalDestinationHref: string) {
   // The ? trick here is the same workaround as described in #10839, and without it, the user
   // would not be able to use the back button afterwards.
+  console.warn(`Enhanced navigation failed for destination ${internalDestinationHref}. Falling back to full page load.`);
   history.replaceState(null, '', internalDestinationHref + '?');
   location.replace(internalDestinationHref);
 }
diff --git a/src/Components/Web.JS/src/Services/NavigationManager.ts b/src/Components/Web.JS/src/Services/NavigationManager.ts
index 47104cea3646..8e2de809505a 100644
--- a/src/Components/Web.JS/src/Services/NavigationManager.ts
+++ b/src/Components/Web.JS/src/Services/NavigationManager.ts
@@ -4,7 +4,7 @@
 import '@microsoft/dotnet-js-interop';
 import { resetScrollAfterNextBatch } from '../Rendering/Renderer';
 import { EventDelegator } from '../Rendering/Events/EventDelegator';
-import { attachEnhancedNavigationListener, getInteractiveRouterRendererId, handleClickForNavigationInterception, hasInteractiveRouter, hasProgrammaticEnhancedNavigationHandler, isSamePageWithHash, isWithinBaseUriSpace, performProgrammaticEnhancedNavigation, performScrollToElementOnTheSamePage, scrollToElement, setHasInteractiveRouter, toAbsoluteUri } from './NavigationUtils';
+import { attachEnhancedNavigationListener, getInteractiveRouterRendererId, handleClickForNavigationInterception, hasInteractiveRouter, hasProgrammaticEnhancedNavigationHandler, isForSamePath, isSamePageWithHash, isWithinBaseUriSpace, performProgrammaticEnhancedNavigation, performScrollToElementOnTheSamePage, scrollToElement, setHasInteractiveRouter, toAbsoluteUri } from './NavigationUtils';
 import { WebRendererId } from '../Rendering/WebRendererId';
 import { isRendererAttached } from '../Rendering/WebRendererInteropMethods';
 
@@ -150,7 +150,7 @@ function performExternalNavigation(uri: string, replace: boolean) {
 async function performInternalNavigation(absoluteInternalHref: string, interceptedLink: boolean, replace: boolean, state: string | undefined = undefined, skipLocationChangingCallback = false) {
   ignorePendingNavigation();
 
-  if (isSamePageWithHash(absoluteInternalHref)) {
+  if (isSamePageWithHash(location.href, absoluteInternalHref)) {
     saveToBrowserHistory(absoluteInternalHref, replace, state);
     performScrollToElementOnTheSamePage(absoluteInternalHref);
     return;
@@ -169,7 +169,9 @@ async function performInternalNavigation(absoluteInternalHref: string, intercept
   // position, so reset it.
   // To avoid ugly flickering effects, we don't want to change the scroll position until
   // we render the new page. As a best approximation, wait until the next batch.
-  resetScrollAfterNextBatch();
+  if (!isForSamePath(absoluteInternalHref, location.href)) {
+    resetScrollAfterNextBatch();
+  }
 
   saveToBrowserHistory(absoluteInternalHref, replace, state);
 
diff --git a/src/Components/Web.JS/src/Services/NavigationUtils.ts b/src/Components/Web.JS/src/Services/NavigationUtils.ts
index bc58636c39c6..9976eafc898c 100644
--- a/src/Components/Web.JS/src/Services/NavigationUtils.ts
+++ b/src/Components/Web.JS/src/Services/NavigationUtils.ts
@@ -47,9 +47,11 @@ export function isWithinBaseUriSpace(href: string) {
   && (nextChar === '' || nextChar === '/' || nextChar === '?' || nextChar === '#');
 }
 
-export function isSamePageWithHash(absoluteHref: string): boolean {
-  const url = new URL(absoluteHref);
-  return url.hash !== '' && location.origin === url.origin && location.pathname === url.pathname && location.search === url.search;
+export function isSamePageWithHash(oldUrl: string, newUrl: string): boolean {
+  const a = new URL(oldUrl);
+  const b = new URL(newUrl);
+  return a.origin === b.origin && a.pathname === b.pathname
+    && a.search === b.search && b.hash !== '';
 }
 
 export function isForSamePath(url1: string, url2: string) {
diff --git a/src/Components/Web.JS/src/Services/RootComponentManager.ts b/src/Components/Web.JS/src/Services/RootComponentManager.ts
index 17aa2576ac9c..8f0fe573342f 100644
--- a/src/Components/Web.JS/src/Services/RootComponentManager.ts
+++ b/src/Components/Web.JS/src/Services/RootComponentManager.ts
@@ -7,5 +7,6 @@ export interface RootComponentManager<InitialComponentsDescriptorType> {
   initialComponents: InitialComponentsDescriptorType[];
   onAfterRenderBatch?(browserRendererId: number): void;
   onAfterUpdateRootComponents?(batchId: number): void;
+  onComponentReload?(browserRendererId: number): void;
   resolveRootComponent(ssrComponentId: number): ComponentDescriptor;
 }
diff --git a/src/Components/Web.JS/src/Services/WebRootComponentManager.ts b/src/Components/Web.JS/src/Services/WebRootComponentManager.ts
index b1e3e3de814d..bc5f5b233592 100644
--- a/src/Components/Web.JS/src/Services/WebRootComponentManager.ts
+++ b/src/Components/Web.JS/src/Services/WebRootComponentManager.ts
@@ -1,17 +1,17 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { ComponentDescriptor, ComponentMarker, descriptorToMarker } from './ComponentDescriptorDiscovery';
+import { ComponentDescriptor, ComponentMarker, descriptorToMarker, discoverServerPersistedState, discoverWebAssemblyPersistedState, WebAssemblyServerOptions } from './ComponentDescriptorDiscovery';
 import { isRendererAttached, registerRendererAttachedListener } from '../Rendering/WebRendererInteropMethods';
 import { WebRendererId } from '../Rendering/WebRendererId';
 import { DescriptorHandler } from '../Rendering/DomMerging/DomSync';
 import { disposeCircuit, hasStartedServer, isCircuitAvailable, startCircuit, startServer, updateServerRootComponents } from '../Boot.Server.Common';
 import { hasLoadedWebAssemblyPlatform, hasStartedLoadingWebAssemblyPlatform, hasStartedWebAssembly, isFirstUpdate, loadWebAssemblyPlatformIfNotStarted, resolveInitialUpdate, setWaitForRootComponents, startWebAssembly, updateWebAssemblyRootComponents, waitForBootConfigLoaded } from '../Boot.WebAssembly.Common';
-import { MonoConfig } from 'dotnet-runtime';
+import { MonoConfig } from '@microsoft/dotnet-runtime';
 import { RootComponentManager } from './RootComponentManager';
 import { getRendererer } from '../Rendering/Renderer';
 import { isPageLoading } from './NavigationEnhancement';
-import { setShouldPreserveContentOnInteractiveComponentDisposal } from '../Rendering/BrowserRenderer';
+import { markAsInteractiveRootComponentElement, setClearContentOnRootComponentRerender, setShouldPreserveContentOnInteractiveComponentDisposal } from '../Rendering/BrowserRenderer';
 import { LogicalElement } from '../Rendering/LogicalElements';
 
 type RootComponentOperationBatch = {
@@ -38,7 +38,7 @@ type RootComponentRemoveOperation = {
   ssrComponentId: number;
 };
 
-type RootComponentInfo = {
+export type RootComponentInfo = {
   descriptor: ComponentDescriptor;
   ssrComponentId: number;
   assignedRendererId?: WebRendererId;
@@ -63,6 +63,8 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
 
   private _circuitInactivityTimeoutId: any;
 
+  private _webAssemblyOptions: WebAssemblyServerOptions | undefined;
+
   // Implements RootComponentManager.
   // An empty array becuase all root components managed
   // by WebRootComponentManager are added and removed dynamically.
@@ -91,7 +93,12 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
   public onEnhancedNavigationCompleted() {
     // Root components may now be ready for activation if they had been previously
     // skipped for activation due to an enhanced navigation being underway.
-    this.rootComponentsMayRequireRefresh();
+    // Only look for state after the page has finished loading.
+    this.rootComponentsMayRequireRefresh(true);
+  }
+
+  public setWebAssemblyOptions(webAssemblyOptions: WebAssemblyServerOptions | undefined): void {
+    this._webAssemblyOptions = webAssemblyOptions;
   }
 
   public registerComponent(descriptor: ComponentDescriptor) {
@@ -132,7 +139,7 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
 
     setWaitForRootComponents();
 
-    const loadWebAssemblyPromise = loadWebAssemblyPlatformIfNotStarted();
+    const loadWebAssemblyPromise = loadWebAssemblyPlatformIfNotStarted(this._webAssemblyOptions);
     const bootConfig = await waitForBootConfigLoaded();
 
     if (maxParallelDownloadsOverride !== undefined) {
@@ -182,7 +189,7 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
     this.startLoadingWebAssemblyIfNotStarted();
 
     if (!hasStartedWebAssembly()) {
-      await startWebAssembly(this);
+      await startWebAssembly(this, this._webAssemblyOptions);
     }
   }
 
@@ -190,7 +197,7 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
   // should be reflected in an interactive component renderer.
   // Examples include component descriptors updating, document content changing,
   // or an interactive renderer attaching for the first time.
-  private rootComponentsMayRequireRefresh() {
+  private rootComponentsMayRequireRefresh(discoverNewState = false) {
     if (this._isComponentRefreshPending) {
       return;
     }
@@ -200,10 +207,10 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
     // The following timeout allows us to liberally call this function without
     // taking the small performance hit from requent repeated calls to
     // refreshRootComponents.
-    setTimeout(() => {
+    queueMicrotask(() => {
       this._isComponentRefreshPending = false;
-      this.refreshRootComponents(this._rootComponentsBySsrComponentId.values());
-    }, 0);
+      this.refreshRootComponents(this._rootComponentsBySsrComponentId.values(), discoverNewState);
+    });
   }
 
   private circuitMayHaveNoRootComponents() {
@@ -261,10 +268,16 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
     return false;
   }
 
-  private refreshRootComponents(components: Iterable<RootComponentInfo>) {
+  private refreshRootComponents(components: Iterable<RootComponentInfo>, discoverNewState = false) {
     const operationsByRendererId = new Map<WebRendererId, RootComponentOperation[]>();
-
+    const rendererIds: Set<WebRendererId> = new Set<WebRendererId>();
     for (const component of components) {
+      if (discoverNewState && component.assignedRendererId !== undefined) {
+        // Capture the renderer IDs for the available components to determine the
+        // effective render modes in the document for discovering new persisted state.
+        rendererIds.add(component.assignedRendererId);
+      }
+
       const operation = this.determinePendingOperation(component);
       if (!operation) {
         continue;
@@ -284,6 +297,35 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
       operations.push(operation);
     }
 
+    let serverState = '';
+    let webAssemblyState = '';
+    if (discoverNewState) {
+      for (const rendererId of rendererIds) {
+        if (rendererId === WebRendererId.Server) {
+          // We have server components. Try to discover the persisted state for them
+          // and if there are no updates on this batch, push an empty set of operations
+          // to ensure we send the state over. Same for wasm below.
+          serverState = discoverServerPersistedState(document) || '';
+          if (serverState && serverState !== '') {
+            const ops = operationsByRendererId.get(WebRendererId.Server);
+            if (!ops) {
+              operationsByRendererId.set(WebRendererId.Server, []);
+            }
+          }
+        } else if (rendererId === WebRendererId.WebAssembly) {
+          webAssemblyState = discoverWebAssemblyPersistedState(document) || '';
+          if (webAssemblyState && webAssemblyState !== '') {
+            const ops = operationsByRendererId.get(WebRendererId.WebAssembly);
+            if (!ops) {
+              operationsByRendererId.set(WebRendererId.WebAssembly, []);
+            }
+          }
+        } else {
+          throw new Error(`Unexpected renderer ID '${rendererId}' encountered while discovering new state.`);
+        }
+      }
+    }
+
     for (const [rendererId, operations] of operationsByRendererId) {
       const batch: RootComponentOperationBatch = {
         batchId: this._nextOperationBatchId++,
@@ -293,20 +335,20 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
       const batchJson = JSON.stringify(batch);
 
       if (rendererId === WebRendererId.Server) {
-        updateServerRootComponents(batchJson);
+        updateServerRootComponents(batchJson, serverState);
       } else {
-        this.updateWebAssemblyRootComponents(batchJson);
+        this.updateWebAssemblyRootComponents(batchJson, webAssemblyState);
       }
     }
 
     this.circuitMayHaveNoRootComponents();
   }
 
-  private updateWebAssemblyRootComponents(operationsJson: string) {
+  private updateWebAssemblyRootComponents(operationsJson: string, webAssemblyState: string) {
     if (isFirstUpdate()) {
       resolveInitialUpdate(operationsJson);
     } else {
-      updateWebAssemblyRootComponents(operationsJson);
+      updateWebAssemblyRootComponents(operationsJson, webAssemblyState);
     }
   }
 
@@ -457,6 +499,18 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
       }
     }
   }
+
+  public onComponentReload(browserRendererId: number): void {
+    for (const [_, value] of this._rootComponentsBySsrComponentId.entries()) {
+      if (value.assignedRendererId === browserRendererId) {
+        value.assignedRendererId = undefined;
+        markAsInteractiveRootComponentElement(value.descriptor.start as unknown as LogicalElement, false);
+        setClearContentOnRootComponentRerender(value.descriptor.start as unknown as LogicalElement);
+      }
+    }
+
+    this.rootComponentsMayRequireRefresh();
+  }
 }
 
 function isDescriptorInDocument(descriptor: ComponentDescriptor): boolean {
@@ -464,10 +518,6 @@ function isDescriptorInDocument(descriptor: ComponentDescriptor): boolean {
 }
 
 function areWebAssemblyResourcesLikelyCached(config: MonoConfig): boolean {
-  if (!config.cacheBootResources) {
-    return false;
-  }
-
   const hash = getWebAssemblyResourceHash(config);
   if (!hash) {
     return false;
diff --git a/src/Components/Web/src/Forms/Editor.cs b/src/Components/Web/src/Forms/Editor.cs
index d73c1641a1c0..f52aa4668354 100644
--- a/src/Components/Web/src/Forms/Editor.cs
+++ b/src/Components/Web/src/Forms/Editor.cs
@@ -56,7 +56,7 @@ protected override void OnParametersSet()
     bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterInfo) =>
         parameterInfo.PropertyType == typeof(HtmlFieldPrefix);
 
-    object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
+    object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
     {
         return ((ICascadingValueSupplier)this).CanSupplyValue(parameterInfo) ? _value : null;
     }
diff --git a/src/Components/Web/src/Forms/HtmlFieldPrefix.cs b/src/Components/Web/src/Forms/HtmlFieldPrefix.cs
index 73138d57f870..2397c8ef4948 100644
--- a/src/Components/Web/src/Forms/HtmlFieldPrefix.cs
+++ b/src/Components/Web/src/Forms/HtmlFieldPrefix.cs
@@ -20,7 +20,7 @@ public HtmlFieldPrefix Combine(LambdaExpression other)
         var restLength = _rest?.Length ?? 0;
         var length = restLength + 1;
         var expressions = new LambdaExpression[length];
-        for (var i = 0; i < restLength - 1; i++)
+        for (var i = 0; i < restLength; i++)
         {
             expressions[i] = _rest![i];
         }
diff --git a/src/Components/Web/src/Forms/InputDate.cs b/src/Components/Web/src/Forms/InputDate.cs
index b738268aab95..4498dd539b48 100644
--- a/src/Components/Web/src/Forms/InputDate.cs
+++ b/src/Components/Web/src/Forms/InputDate.cs
@@ -12,10 +12,10 @@ namespace Microsoft.AspNetCore.Components.Forms;
 /// An input component for editing date values.
 /// The supported types for the date value are:
 /// <list type="bullet">
-/// <item><see cref="DateTime"/></item>
-/// <item><see cref="DateTimeOffset"/></item>
-/// <item><see cref="DateOnly"/></item>
-/// <item><see cref="TimeOnly"/></item>
+/// <item><description><see cref="DateTime"/></description></item>
+/// <item><description><see cref="DateTimeOffset"/></description></item>
+/// <item><description><see cref="DateOnly"/></description></item>
+/// <item><description><see cref="TimeOnly"/></description></item>
 /// </list>
 /// </summary>
 public class InputDate<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TValue> : InputBase<TValue>
diff --git a/src/Components/Web/src/Forms/InputHidden.cs b/src/Components/Web/src/Forms/InputHidden.cs
new file mode 100644
index 000000000000..d2f95d1b6272
--- /dev/null
+++ b/src/Components/Web/src/Forms/InputHidden.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components.Forms;
+
+/// <summary>
+/// An hidden input component for storing <see cref="string"/> values.
+/// </summary>
+public class InputHidden : InputBase<string?>
+{
+    /// <summary>
+    /// Gets or sets the associated <see cref="ElementReference"/>.
+    /// <para>
+    /// May be <see langword="null"/> if accessed before the component is rendered.
+    /// </para>
+    /// </summary>
+    [DisallowNull] public ElementReference? Element { get; protected set; }
+
+    /// <inheritdoc />
+    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        builder.OpenElement(0, "input");
+        builder.AddAttribute(1, "type", "hidden");
+        builder.AddMultipleAttributes(2, AdditionalAttributes);
+        builder.AddAttributeIfNotNullOrEmpty(3, "name", NameAttributeValue);
+        builder.AddAttributeIfNotNullOrEmpty(4, "class", CssClass);
+        builder.AddAttribute(5, "value", CurrentValueAsString);
+        builder.AddAttribute(6, "onchange", EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString));
+        builder.SetUpdatesAttributeName("value");
+        builder.AddElementReferenceCapture(7, __inputReference => Element = __inputReference);
+        builder.CloseElement();
+    }
+
+    /// <inheritdoc />
+    protected override bool TryParseValueFromString(string? value, out string? result, [NotNullWhen(false)] out string? validationErrorMessage)
+    {
+        result = value;
+        validationErrorMessage = null;
+        return true;
+    }
+}
diff --git a/src/Components/Web/src/Forms/Mapping/FormMappingScope.cs b/src/Components/Web/src/Forms/Mapping/FormMappingScope.cs
index 53b31b3c2ade..bed3086eaa1a 100644
--- a/src/Components/Web/src/Forms/Mapping/FormMappingScope.cs
+++ b/src/Components/Web/src/Forms/Mapping/FormMappingScope.cs
@@ -83,8 +83,8 @@ bool ICascadingValueSupplier.IsFixed
     bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterInfo)
         => _cascadingValueSupplier!.CanSupplyValue(parameterInfo);
 
-    object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
-        => _cascadingValueSupplier!.GetCurrentValue(in parameterInfo);
+    object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
+        => _cascadingValueSupplier!.GetCurrentValue(key, in parameterInfo);
 
     void ICascadingValueSupplier.Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
         => throw new NotSupportedException();
diff --git a/src/Components/Web/src/Forms/Mapping/SupplyParameterFromFormValueProvider.cs b/src/Components/Web/src/Forms/Mapping/SupplyParameterFromFormValueProvider.cs
index 7346db4ba896..803341187816 100644
--- a/src/Components/Web/src/Forms/Mapping/SupplyParameterFromFormValueProvider.cs
+++ b/src/Components/Web/src/Forms/Mapping/SupplyParameterFromFormValueProvider.cs
@@ -46,7 +46,7 @@ public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
         return false;
     }
 
-    public object? GetCurrentValue(in CascadingParameterInfo parameterInfo)
+    public object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
     {
         // We supply a FormMappingContext
         if (parameterInfo.Attribute is CascadingParameterAttribute && parameterInfo.PropertyType == typeof(FormMappingContext))
diff --git a/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.HtmlWriting.cs b/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.HtmlWriting.cs
index 9cbc12e2aecd..c48b1d798b15 100644
--- a/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.HtmlWriting.cs
+++ b/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.HtmlWriting.cs
@@ -252,7 +252,7 @@ protected bool TryCreateScopeQualifiedEventName(int componentId, string assigned
             componentState.Renderer,
             componentState);
 
-        return (FormMappingContext?)supplier?.GetCurrentValue(_findFormMappingContext);
+        return (FormMappingContext?)supplier?.GetCurrentValue(null, _findFormMappingContext);
     }
 
     private static bool TryFindEnclosingElementFrame(ArrayRange<RenderTreeFrame> frames, int frameIndex, out int result)
diff --git a/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.cs b/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.cs
index 104dcb930d66..a77b3e98c4ec 100644
--- a/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.cs
+++ b/src/Components/Web/src/HtmlRendering/StaticHtmlRenderer.cs
@@ -21,7 +21,6 @@ public partial class StaticHtmlRenderer : Renderer
 {
     private static readonly RendererInfo _componentPlatform = new RendererInfo("Static", isInteractive: false);
 
-    private static readonly Task CanceledRenderTask = Task.FromCanceled(new CancellationToken(canceled: true));
     private readonly NavigationManager? _navigationManager;
 
     /// <summary>
diff --git a/src/Components/Web/src/Internal/IInternalWebJSInProcessRuntime.cs b/src/Components/Web/src/Internal/IInternalWebJSInProcessRuntime.cs
index dc3383f45ced..a68fb052932a 100644
--- a/src/Components/Web/src/Internal/IInternalWebJSInProcessRuntime.cs
+++ b/src/Components/Web/src/Internal/IInternalWebJSInProcessRuntime.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.Web.Internal;
 
@@ -17,4 +18,10 @@ public interface IInternalWebJSInProcessRuntime
     /// For internal framework use only.
     /// </summary>
     string InvokeJS(string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId);
+
+    /// <summary>
+    /// For internal framework use only.
+    /// </summary>
+    string InvokeJS(in JSInvocationInfo invocationInfo)
+        => throw new NotImplementedException();
 }
diff --git a/src/Components/Web/src/JSComponents/JSComponentInterop.cs b/src/Components/Web/src/JSComponents/JSComponentInterop.cs
index 5596a8c4bc7a..9df1c3288f71 100644
--- a/src/Components/Web/src/JSComponents/JSComponentInterop.cs
+++ b/src/Components/Web/src/JSComponents/JSComponentInterop.cs
@@ -87,7 +87,7 @@ protected internal void SetRootComponentParameters(int componentId, int paramete
             throw new ArgumentOutOfRangeException($"{nameof(parameterCount)} must be between 0 and {MaxParameters}.");
         }
 
-        var componentType = Renderer.GetRootComponentType(componentId);
+        var componentType = Renderer.GetRootTypeType(componentId);
         var parameterViewBuilder = new ParameterViewBuilder(parameterCount);
 
         var parametersJsonEnumerator = parametersJson.EnumerateObject();
diff --git a/src/Components/Web/src/PublicAPI.Shipped.txt b/src/Components/Web/src/PublicAPI.Shipped.txt
index c137dbac5717..ac01a1916c34 100644
--- a/src/Components/Web/src/PublicAPI.Shipped.txt
+++ b/src/Components/Web/src/PublicAPI.Shipped.txt
@@ -342,6 +342,8 @@ Microsoft.AspNetCore.Components.Web.InteractiveWebAssemblyRenderMode
 Microsoft.AspNetCore.Components.Web.InteractiveWebAssemblyRenderMode.InteractiveWebAssemblyRenderMode() -> void
 Microsoft.AspNetCore.Components.Web.InteractiveWebAssemblyRenderMode.InteractiveWebAssemblyRenderMode(bool prerender) -> void
 Microsoft.AspNetCore.Components.Web.InteractiveWebAssemblyRenderMode.Prerender.get -> bool
+Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime
+Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime.InvokeJS(string! identifier, string? argsJson, Microsoft.JSInterop.JSCallResultType resultType, long targetInstanceId) -> string!
 Microsoft.AspNetCore.Components.Web.JSComponentConfigurationExtensions
 Microsoft.AspNetCore.Components.Web.JSComponentConfigurationStore
 Microsoft.AspNetCore.Components.Web.JSComponentConfigurationStore.JSComponentConfigurationStore() -> void
@@ -352,6 +354,8 @@ Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.Code.get -> string!
 Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.Code.set -> void
 Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.CtrlKey.get -> bool
 Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.CtrlKey.set -> void
+Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.IsComposing.get -> bool
+Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.IsComposing.set -> void
 Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.Key.get -> string!
 Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.Key.set -> void
 Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.KeyboardEventArgs() -> void
@@ -503,6 +507,8 @@ Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.ItemSize.ge
 Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.ItemSize.set -> void
 Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.ItemsProvider.get -> Microsoft.AspNetCore.Components.Web.Virtualization.ItemsProviderDelegate<TItem>?
 Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.ItemsProvider.set -> void
+Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.MaxItemCount.get -> int
+Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.MaxItemCount.set -> void
 Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.OverscanCount.get -> int
 Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.OverscanCount.set -> void
 Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.Placeholder.get -> Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.Web.Virtualization.PlaceholderContext>?
@@ -558,8 +564,10 @@ override Microsoft.AspNetCore.Components.Forms.ValidationSummary.BuildRenderTree
 override Microsoft.AspNetCore.Components.Forms.ValidationSummary.OnParametersSet() -> void
 override Microsoft.AspNetCore.Components.HtmlRendering.Infrastructure.StaticHtmlRenderer.Dispatcher.get -> Microsoft.AspNetCore.Components.Dispatcher!
 override Microsoft.AspNetCore.Components.HtmlRendering.Infrastructure.StaticHtmlRenderer.HandleException(System.Exception! exception) -> void
+override Microsoft.AspNetCore.Components.HtmlRendering.Infrastructure.StaticHtmlRenderer.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
 override Microsoft.AspNetCore.Components.HtmlRendering.Infrastructure.StaticHtmlRenderer.UpdateDisplayAsync(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch renderBatch) -> System.Threading.Tasks.Task!
 override Microsoft.AspNetCore.Components.RenderTree.WebRenderer.Dispose(bool disposing) -> void
+override Microsoft.AspNetCore.Components.Routing.FocusOnNavigate.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
 override Microsoft.AspNetCore.Components.Routing.FocusOnNavigate.OnAfterRenderAsync(bool firstRender) -> System.Threading.Tasks.Task!
 override Microsoft.AspNetCore.Components.Routing.FocusOnNavigate.OnParametersSet() -> void
 override Microsoft.AspNetCore.Components.Routing.NavLink.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
diff --git a/src/Components/Web/src/PublicAPI.Unshipped.txt b/src/Components/Web/src/PublicAPI.Unshipped.txt
index 551aa355b90b..5b85eaf45fdc 100644
--- a/src/Components/Web/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Web/src/PublicAPI.Unshipped.txt
@@ -1,9 +1,9 @@
 #nullable enable
-Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime
-Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime.InvokeJS(string! identifier, string? argsJson, Microsoft.JSInterop.JSCallResultType resultType, long targetInstanceId) -> string!
-Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.IsComposing.get -> bool
-Microsoft.AspNetCore.Components.Web.KeyboardEventArgs.IsComposing.set -> void
-Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.MaxItemCount.get -> int
-Microsoft.AspNetCore.Components.Web.Virtualization.Virtualize<TItem>.MaxItemCount.set -> void
-override Microsoft.AspNetCore.Components.HtmlRendering.Infrastructure.StaticHtmlRenderer.RendererInfo.get -> Microsoft.AspNetCore.Components.RendererInfo!
-override Microsoft.AspNetCore.Components.Routing.FocusOnNavigate.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
+Microsoft.AspNetCore.Components.Forms.InputHidden
+Microsoft.AspNetCore.Components.Forms.InputHidden.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
+Microsoft.AspNetCore.Components.Forms.InputHidden.Element.set -> void
+Microsoft.AspNetCore.Components.Forms.InputHidden.InputHidden() -> void
+Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime.InvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> string!
+override Microsoft.AspNetCore.Components.Forms.InputHidden.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
+override Microsoft.AspNetCore.Components.Forms.InputHidden.TryParseValueFromString(string? value, out string? result, out string? validationErrorMessage) -> bool
+virtual Microsoft.AspNetCore.Components.Routing.NavLink.ShouldMatch(string! uriAbsolute) -> bool
\ No newline at end of file
diff --git a/src/Components/Web/src/Routing/NavLink.cs b/src/Components/Web/src/Routing/NavLink.cs
index 043019404559..e3462e5a0f97 100644
--- a/src/Components/Web/src/Routing/NavLink.cs
+++ b/src/Components/Web/src/Routing/NavLink.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.Diagnostics;
 using System.Globalization;
 using Microsoft.AspNetCore.Components.Rendering;
 
@@ -13,6 +12,9 @@ namespace Microsoft.AspNetCore.Components.Routing;
 /// </summary>
 public class NavLink : ComponentBase, IDisposable
 {
+    private const string EnableMatchAllForQueryStringAndFragmentSwitchKey = "Microsoft.AspNetCore.Components.Routing.NavLink.EnableMatchAllForQueryStringAndFragment";
+    private static readonly bool _enableMatchAllForQueryStringAndFragment = AppContext.TryGetSwitch(EnableMatchAllForQueryStringAndFragmentSwitchKey, out var switchValue) && switchValue;
+
     private const string DefaultActiveClass = "active";
 
     private bool _isActive;
@@ -106,37 +108,87 @@ private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
         }
     }
 
-    private bool ShouldMatch(string currentUriAbsolute)
+    /// <summary>
+    /// Determines whether the current URI should match the link.
+    /// </summary>
+    /// <param name="uriAbsolute">The absolute URI of the current location.</param>
+    /// <returns>True if the link should be highlighted as active; otherwise, false.</returns>
+    protected virtual bool ShouldMatch(string uriAbsolute)
     {
         if (_hrefAbsolute == null)
         {
             return false;
         }
 
-        if (EqualsHrefExactlyOrIfTrailingSlashAdded(currentUriAbsolute))
+        var uriAbsoluteSpan = uriAbsolute.AsSpan();
+        var hrefAbsoluteSpan = _hrefAbsolute.AsSpan();
+        if (EqualsHrefExactlyOrIfTrailingSlashAdded(uriAbsoluteSpan, hrefAbsoluteSpan))
         {
             return true;
         }
 
         if (Match == NavLinkMatch.Prefix
-            && IsStrictlyPrefixWithSeparator(currentUriAbsolute, _hrefAbsolute))
+            && IsStrictlyPrefixWithSeparator(uriAbsolute, _hrefAbsolute))
         {
             return true;
         }
 
-        return false;
+        if (_enableMatchAllForQueryStringAndFragment || Match != NavLinkMatch.All)
+        {
+            return false;
+        }
+
+        var uriWithoutQueryAndFragment = GetUriIgnoreQueryAndFragment(uriAbsoluteSpan);
+        if (EqualsHrefExactlyOrIfTrailingSlashAdded(uriWithoutQueryAndFragment, hrefAbsoluteSpan))
+        {
+            return true;
+        }
+        hrefAbsoluteSpan = GetUriIgnoreQueryAndFragment(hrefAbsoluteSpan);
+        return EqualsHrefExactlyOrIfTrailingSlashAdded(uriWithoutQueryAndFragment, hrefAbsoluteSpan);
     }
 
-    private bool EqualsHrefExactlyOrIfTrailingSlashAdded(string currentUriAbsolute)
+    private static ReadOnlySpan<char> GetUriIgnoreQueryAndFragment(ReadOnlySpan<char> uri)
     {
-        Debug.Assert(_hrefAbsolute != null);
+        if (uri.IsEmpty)
+        {
+            return ReadOnlySpan<char>.Empty;
+        }
 
-        if (string.Equals(currentUriAbsolute, _hrefAbsolute, StringComparison.OrdinalIgnoreCase))
+        var queryStartPos = uri.IndexOf('?');
+        var fragmentStartPos = uri.IndexOf('#');
+
+        if (queryStartPos < 0 && fragmentStartPos < 0)
+        {
+            return uri;
+        }
+
+        int minPos;
+        if (queryStartPos < 0)
+        {
+            minPos = fragmentStartPos;
+        }
+        else if (fragmentStartPos < 0)
+        {
+            minPos = queryStartPos;
+        }
+        else
+        {
+            minPos = Math.Min(queryStartPos, fragmentStartPos);
+        }
+
+        return uri.Slice(0, minPos);
+    }
+
+    private static readonly CaseInsensitiveCharComparer CaseInsensitiveComparer = new CaseInsensitiveCharComparer();
+
+    private static bool EqualsHrefExactlyOrIfTrailingSlashAdded(ReadOnlySpan<char> currentUriAbsolute, ReadOnlySpan<char> hrefAbsolute)
+    {
+        if (currentUriAbsolute.SequenceEqual(hrefAbsolute, CaseInsensitiveComparer))
         {
             return true;
         }
 
-        if (currentUriAbsolute.Length == _hrefAbsolute.Length - 1)
+        if (currentUriAbsolute.Length == hrefAbsolute.Length - 1)
         {
             // Special case: highlight links to http://host/path/ even if you're
             // at http://host/path (with no trailing slash)
@@ -146,8 +198,8 @@ private bool EqualsHrefExactlyOrIfTrailingSlashAdded(string currentUriAbsolute)
             // which in turn is because it's common for servers to return the same page
             // for http://host/vdir as they do for host://host/vdir/ as it's no
             // good to display a blank page in that case.
-            if (_hrefAbsolute[_hrefAbsolute.Length - 1] == '/'
-                && _hrefAbsolute.StartsWith(currentUriAbsolute, StringComparison.OrdinalIgnoreCase))
+            if (hrefAbsolute[hrefAbsolute.Length - 1] == '/' &&
+                currentUriAbsolute.SequenceEqual(hrefAbsolute.Slice(0, hrefAbsolute.Length - 1), CaseInsensitiveComparer))
             {
                 return true;
             }
@@ -199,7 +251,7 @@ private static bool IsStrictlyPrefixWithSeparator(string value, string prefix)
 
     private static bool IsUnreservedCharacter(char c)
     {
-        // Checks whether it is an unreserved character according to 
+        // Checks whether it is an unreserved character according to
         // https://datatracker.ietf.org/doc/html/rfc3986#section-2.3
         // Those are characters that are allowed in a URI but do not have a reserved
         // purpose (e.g. they do not separate the components of the URI)
@@ -209,4 +261,17 @@ private static bool IsUnreservedCharacter(char c)
                 c == '_' ||
                 c == '~';
     }
+
+    private class CaseInsensitiveCharComparer : IEqualityComparer<char>
+    {
+        public bool Equals(char x, char y)
+        {
+            return char.ToLowerInvariant(x) == char.ToLowerInvariant(y);
+        }
+
+        public int GetHashCode(char obj)
+        {
+            return char.ToLowerInvariant(obj).GetHashCode();
+        }
+    }
 }
diff --git a/src/Components/Web/src/Virtualization/Virtualize.cs b/src/Components/Web/src/Virtualization/Virtualize.cs
index da5de296d8c6..8e2d84f2f11b 100644
--- a/src/Components/Web/src/Virtualization/Virtualize.cs
+++ b/src/Components/Web/src/Virtualization/Virtualize.cs
@@ -223,7 +223,8 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
         builder.OpenElement(0, SpacerElement);
         builder.AddAttribute(1, "style", GetSpacerStyle(_itemsBefore));
-        builder.AddElementReferenceCapture(2, elementReference => _spacerBefore = elementReference);
+        builder.AddAttribute(2, "aria-hidden", "true");
+        builder.AddElementReferenceCapture(3, elementReference => _spacerBefore = elementReference);
         builder.CloseElement();
 
         var lastItemIndex = Math.Min(_itemsBefore + _visibleItemCapacity, _itemCount);
@@ -283,8 +284,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         var itemsAfter = Math.Max(0, _itemCount - _visibleItemCapacity - _itemsBefore);
 
         builder.OpenElement(7, SpacerElement);
-        builder.AddAttribute(8, "style", GetSpacerStyle(itemsAfter, _unusedItemCapacity));
-        builder.AddElementReferenceCapture(9, elementReference => _spacerAfter = elementReference);
+        builder.AddAttribute(8, "aria-hidden", "true");
+        builder.AddAttribute(9, "style", GetSpacerStyle(itemsAfter, _unusedItemCapacity));
+        builder.AddElementReferenceCapture(10, elementReference => _spacerAfter = elementReference);
 
         builder.CloseElement();
     }
@@ -360,6 +362,10 @@ private void CalcualteItemDistribution(
             _ => MaxItemCount
         };
 
+        // Count the OverscanCount as used capacity, so we don't end up in a situation where
+        // the user has set a very low MaxItemCount and we end up in an infinite loading loop.
+        maxItemCount += OverscanCount * 2;
+
         itemsInSpacer = Math.Max(0, (int)Math.Floor(spacerSize / _itemSize) - OverscanCount);
         visibleItemCapacity = (int)Math.Ceiling(containerSize / _itemSize) + 2 * OverscanCount;
         unusedItemCapacity = Math.Max(0, visibleItemCapacity - maxItemCount);
diff --git a/src/Components/Web/test/Forms/InputBaseTest.cs b/src/Components/Web/test/Forms/InputBaseTest.cs
index 25901cc7321f..5f2ae4ce135a 100644
--- a/src/Components/Web/test/Forms/InputBaseTest.cs
+++ b/src/Components/Web/test/Forms/InputBaseTest.cs
@@ -451,7 +451,7 @@ public async Task AriaAttributeIsRenderedWhenTheValidationStateIsInvalidOnFirstR
         var component = (TestInputComponent<string>)componentFrame1.Component;
         Assert.Equal("invalid", component.CssClass);
         Assert.NotNull(component.AdditionalAttributes);
-        Assert.Equal(1, component.AdditionalAttributes.Count);
+        Assert.Single(component.AdditionalAttributes);
         //Check for "true" see https://www.w3.org/TR/wai-aria-1.1/#aria-invalid
         Assert.Equal("true", component.AdditionalAttributes["aria-invalid"]);
     }
@@ -486,7 +486,7 @@ public async Task UserSpecifiedAriaValueIsNotChangedIfInvalid()
         var component = (TestInputComponent<string>)componentFrame1.Component;
         Assert.Equal("invalid", component.CssClass);
         Assert.NotNull(component.AdditionalAttributes);
-        Assert.Equal(1, component.AdditionalAttributes.Count);
+        Assert.Single(component.AdditionalAttributes);
         Assert.Equal("userSpecifiedValue", component.AdditionalAttributes["aria-invalid"]);
     }
 
diff --git a/src/Components/Web/test/Forms/InputHiddenTest.cs b/src/Components/Web/test/Forms/InputHiddenTest.cs
new file mode 100644
index 000000000000..73cf7d5414f8
--- /dev/null
+++ b/src/Components/Web/test/Forms/InputHiddenTest.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Forms;
+
+public class InputHiddenTest
+{
+    [Fact]
+    public async Task InputElementIsAssignedSuccessfully()
+    {
+        // Arrange
+        var model = new TestModel();
+        var rootComponent = new TestInputHostComponent<string, InputHidden>
+        {
+            EditContext = new EditContext(model),
+            ValueExpression = () => model.StringProperty,
+        };
+
+        // Act
+        var inputHiddenComponent = await InputRenderer.RenderAndGetComponent(rootComponent);
+
+        // Assert
+        Assert.NotNull(inputHiddenComponent.Element);
+    }
+
+    private class TestModel
+    {
+        public string StringProperty { get; set; }
+    }
+}
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json b/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json
index 615dbb4a39a5..9d8c0d3c75af 100644
--- a/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json
+++ b/src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "microsoft.msal.components.webassembly",
+  "name": "@microsoft/microsoft.msal.components.webassembly",
   "private": true,
   "scripts": {
     "clean": "rimraf ./dist/Debug ./dist/Release",
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/PACKAGE.md b/src/Components/WebAssembly/Authentication.Msal/src/PACKAGE.md
new file mode 100644
index 000000000000..fbe8963121de
--- /dev/null
+++ b/src/Components/WebAssembly/Authentication.Msal/src/PACKAGE.md
@@ -0,0 +1,21 @@
+## About
+
+`Microsoft.Authentication.WebAssembly.Msal` provides client-side authentication using Microsoft Authentication Library (MSAL) for Blazor apps running under WebAssembly.
+
+## How to Use
+
+To use `Microsoft.Authentication.WebAssembly.Msal`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.Authentication.WebAssembly.Msal
+```
+
+### Usage
+
+For usage examples and documentation, refer to the [offical documentation](https://learn.microsoft.com/aspnet/core/blazor/security/webassembly) on Blazor WebAssembly security and identity.
+
+## Feedback &amp; Contributing
+
+`Microsoft.Authentication.WebAssembly.Msal` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
index f719a274c732..a320af38fa9c 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
@@ -21,7 +21,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
-    <Reference Include="System.Text.Json" />
 
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" IsImplicitlyDefined="true" AllowExplicitReference="true" />
   </ItemGroup>
@@ -29,7 +28,7 @@
   <!--  We include this here to ensure that the shared framework is built before we leverage it when running
   the dev server. -->
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/Components/WebAssembly/DevServer/src/PACKAGE.md b/src/Components/WebAssembly/DevServer/src/PACKAGE.md
new file mode 100644
index 000000000000..387c183e1a30
--- /dev/null
+++ b/src/Components/WebAssembly/DevServer/src/PACKAGE.md
@@ -0,0 +1,25 @@
+## About
+
+`Microsoft.AspNetCore.Components.WebAssembly.DevServer` provides a development server for use when building Blazor WebAssembly standalone applications.
+
+## How to use
+
+To use `Microsoft.AspNetCore.Components.WebAssembly.DevServer`, add the package to your project:
+
+```shell
+dotnet add package Microsoft.AspNetCore.Components.WebAssembly.DevServer
+```
+
+Make sure that the newly-added `<PackageReference />` in the `.csproj` file includes `PrivateAssets="all"`:
+
+```xml
+<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="..." PrivateAssets="all" />
+```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/en-us/aspnet/core/blazor/debug#packages) on debugging Blazor WebAssembly applications.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Components.WebAssembly.DevServer` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/WebAssembly/DevServer/src/Server/Startup.cs b/src/Components/WebAssembly/DevServer/src/Server/Startup.cs
index 046031a29f79..4be74f8b19d6 100644
--- a/src/Components/WebAssembly/DevServer/src/Server/Startup.cs
+++ b/src/Components/WebAssembly/DevServer/src/Server/Startup.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.DevServer.Server;
 
@@ -42,7 +43,7 @@ public static void Configure(IApplicationBuilder app, IConfiguration configurati
             else if (applyCopHeaders && ctx.Request.Path.StartsWithSegments("/_framework") && !ctx.Request.Path.StartsWithSegments("/_framework/blazor.server.js") && !ctx.Request.Path.StartsWithSegments("/_framework/blazor.web.js"))
             {
                 var fileExtension = Path.GetExtension(ctx.Request.Path);
-                if (string.Equals(fileExtension, ".js", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(fileExtension, ".js", StringComparison.OrdinalIgnoreCase) || string.Equals(fileExtension, ".mjs", StringComparison.OrdinalIgnoreCase))
                 {
                     // Browser multi-threaded runtime requires cross-origin policy headers to enable SharedArrayBuffer.
                     ApplyCrossOriginPolicyHeaders(ctx);
@@ -69,6 +70,14 @@ public static void Configure(IApplicationBuilder app, IConfiguration configurati
             {
                 OnPrepareResponse = fileContext =>
                 {
+                    // Avoid caching index.html during development.
+                    // When hot reload is enabled, a middleware injects a hot reload script into the response HTML.
+                    // We don't want the browser to bypass this injection by using a cached response that doesn't
+                    // contain the injected script. In the future, if script injection is removed in favor of a
+                    // different mechanism, we can delete this comment and the line below it.
+                    // See also: https://github.com/dotnet/aspnetcore/issues/45213
+                    fileContext.Context.Response.Headers[HeaderNames.CacheControl] = "no-store";
+
                     if (applyCopHeaders)
                     {
                         // Browser multi-threaded runtime requires cross-origin policy headers to enable SharedArrayBuffer.
diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
index 9758c3a7ba71..86b74ad8275a 100644
--- a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
+++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
@@ -1,6 +1,6 @@
 {
   "runtimeOptions": {
-    "tfm": "net9.0",
+    "tfm": "net10.0",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
       "version": "${FrameworkVersion}"
diff --git a/src/Components/WebAssembly/Directory.Build.props b/src/Components/WebAssembly/Directory.Build.props
index 1deee2397b98..b64f9033fc9a 100644
--- a/src/Components/WebAssembly/Directory.Build.props
+++ b/src/Components/WebAssembly/Directory.Build.props
@@ -4,4 +4,10 @@
     <!-- Avoid source build issues with WebAssembly -->
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
+  <PropertyGroup>
+    <WasmPreloadAssets>false</WasmPreloadAssets>
+  </PropertyGroup>
+  <PropertyGroup>
+    <BlazorCacheBootResources>false</BlazorCacheBootResources>
+  </PropertyGroup>
 </Project>
diff --git a/src/Components/WebAssembly/JSInterop/src/InternalCalls.cs b/src/Components/WebAssembly/JSInterop/src/InternalCalls.cs
index 0b35b9509204..4ad543a146ce 100644
--- a/src/Components/WebAssembly/JSInterop/src/InternalCalls.cs
+++ b/src/Components/WebAssembly/JSInterop/src/InternalCalls.cs
@@ -23,7 +23,8 @@ public static partial string InvokeJSJson(
         [JSMarshalAs<JSType.Number>] long targetInstanceId,
         int resultType,
         string argsJson,
-        [JSMarshalAs<JSType.Number>] long asyncHandle);
+        [JSMarshalAs<JSType.Number>] long asyncHandle,
+        int callType);
 
     [JSImport("Blazor._internal.endInvokeDotNetFromJS", "blazor-internal")]
     public static partial void EndInvokeDotNetFromJS(
diff --git a/src/Components/WebAssembly/JSInterop/src/PublicAPI.Shipped.txt b/src/Components/WebAssembly/JSInterop/src/PublicAPI.Shipped.txt
index 00d726a42be1..7a868e7c891d 100644
--- a/src/Components/WebAssembly/JSInterop/src/PublicAPI.Shipped.txt
+++ b/src/Components/WebAssembly/JSInterop/src/PublicAPI.Shipped.txt
@@ -1,15 +1,7 @@
 #nullable enable
-~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, TResult>(string identifier, T0 arg0, T1 arg1) -> TResult
-~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, TResult>(string identifier, T0 arg0) -> TResult
-~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<TResult>(string identifier) -> TResult
 ~override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.BeginInvokeJS(long asyncHandle, string identifier, string argsJson, Microsoft.JSInterop.JSCallResultType resultType, long targetInstanceId) -> void
 ~override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeJS(string identifier, string argsJson, Microsoft.JSInterop.JSCallResultType resultType, long targetInstanceId) -> string
 Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime
-Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string! identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, TResult>(string! identifier, T0 arg0, T1 arg1) -> TResult
-Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, TResult>(string! identifier, T0 arg0) -> TResult
-Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<TResult>(string! identifier) -> TResult
 Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.WebAssemblyJSRuntime() -> void
 override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.BeginInvokeJS(long asyncHandle, string! identifier, string? argsJson, Microsoft.JSInterop.JSCallResultType resultType, long targetInstanceId) -> void
 override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.EndInvokeDotNet(Microsoft.JSInterop.Infrastructure.DotNetInvocationInfo callInfo, in Microsoft.JSInterop.Infrastructure.DotNetInvocationResult dispatchResult) -> void
diff --git a/src/Components/WebAssembly/JSInterop/src/PublicAPI.Unshipped.txt b/src/Components/WebAssembly/JSInterop/src/PublicAPI.Unshipped.txt
index 9f03b1a9685f..b92576acb036 100644
--- a/src/Components/WebAssembly/JSInterop/src/PublicAPI.Unshipped.txt
+++ b/src/Components/WebAssembly/JSInterop/src/PublicAPI.Unshipped.txt
@@ -1,9 +1,3 @@
 #nullable enable
-*REMOVED*~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-*REMOVED*~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, TResult>(string identifier, T0 arg0, T1 arg1) -> TResult
-*REMOVED*~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, TResult>(string identifier, T0 arg0) -> TResult
-*REMOVED*~Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<TResult>(string identifier) -> TResult
-*REMOVED*Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string! identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-*REMOVED*Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, T1, TResult>(string! identifier, T0 arg0, T1 arg1) -> TResult
-*REMOVED*Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<T0, TResult>(string! identifier, T0 arg0) -> TResult
-*REMOVED*Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeUnmarshalled<TResult>(string! identifier) -> TResult
+override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.BeginInvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> void
+override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> string!
diff --git a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSObjectReferenceJsonConverter.cs b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSObjectReferenceJsonConverter.cs
index ff294cef2648..38ff95ea0c74 100644
--- a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSObjectReferenceJsonConverter.cs
+++ b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSObjectReferenceJsonConverter.cs
@@ -26,6 +26,12 @@ public override bool CanConvert(Type typeToConvert)
     public override IJSObjectReference? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = JSObjectReferenceJsonWorker.ReadJSObjectReferenceIdentifier(ref reader);
+
+        if (id == -1)
+        {
+            return null;
+        }
+
         return new WebAssemblyJSObjectReference(_jsRuntime, id);
     }
 
diff --git a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
index 21f62b89f369..827d36dc8ac6 100644
--- a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
+++ b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
@@ -24,10 +24,30 @@ protected WebAssemblyJSRuntime()
 
     /// <inheritdoc />
     protected override string InvokeJS(string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+    {
+        return InternalCalls.InvokeJSJson(
+            identifier,
+            targetInstanceId,
+            (int)resultType,
+            argsJson ?? "[]",
+            0,
+            (int)JSCallType.FunctionCall
+        );
+    }
+
+    /// <inheritdoc />
+    protected override string InvokeJS(in JSInvocationInfo invocationInfo)
     {
         try
         {
-            return InternalCalls.InvokeJSJson(identifier, targetInstanceId, (int)resultType, argsJson ?? "[]", 0);
+            return InternalCalls.InvokeJSJson(
+                invocationInfo.Identifier,
+                invocationInfo.TargetInstanceId,
+                (int)invocationInfo.ResultType,
+                invocationInfo.ArgsJson,
+                invocationInfo.AsyncHandle,
+                (int)invocationInfo.CallType
+            );
         }
         catch (Exception ex)
         {
@@ -38,7 +58,27 @@ protected override string InvokeJS(string identifier, [StringSyntax(StringSyntax
     /// <inheritdoc />
     protected override void BeginInvokeJS(long asyncHandle, string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId)
     {
-        InternalCalls.InvokeJSJson(identifier, targetInstanceId, (int)resultType, argsJson ?? "[]", asyncHandle);
+        InternalCalls.InvokeJSJson(
+            identifier,
+            targetInstanceId,
+            (int)resultType,
+            argsJson ?? "[]",
+            asyncHandle,
+            (int)JSCallType.FunctionCall
+        );
+    }
+
+    /// <inheritdoc />
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
+    {
+        InternalCalls.InvokeJSJson(
+            invocationInfo.Identifier,
+            invocationInfo.TargetInstanceId,
+            (int)invocationInfo.ResultType,
+            invocationInfo.ArgsJson,
+            invocationInfo.AsyncHandle,
+            (int)invocationInfo.CallType
+        );
     }
 
     /// <inheritdoc />
diff --git a/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj b/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj
index 03bdbe317a10..e855db9a45be 100644
--- a/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj
+++ b/src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
-    <Reference Include="System.Net.Http.Json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/WebAssembly/Server/src/Builder/WebAssemblyRazorComponentsEndpointConventionBuilderExtensions.cs b/src/Components/WebAssembly/Server/src/Builder/WebAssemblyRazorComponentsEndpointConventionBuilderExtensions.cs
index 8c075b4769a8..b35b43bc39c1 100644
--- a/src/Components/WebAssembly/Server/src/Builder/WebAssemblyRazorComponentsEndpointConventionBuilderExtensions.cs
+++ b/src/Components/WebAssembly/Server/src/Builder/WebAssemblyRazorComponentsEndpointConventionBuilderExtensions.cs
@@ -59,7 +59,6 @@ public static RazorComponentsEndpointConventionBuilder AddInteractiveWebAssembly
         var descriptors = StaticAssetsEndpointDataSourceHelper.ResolveStaticAssetDescriptors(endpointBuilder, options.StaticAssetsManifestPath);
         if (descriptors != null && descriptors.Count > 0)
         {
-            ComponentWebAssemblyConventions.AddBlazorWebAssemblyConventions(descriptors, environment);
             return builder;
         }
 
diff --git a/src/Components/WebAssembly/Server/src/ComponentWebAssemblyConventions.cs b/src/Components/WebAssembly/Server/src/ComponentWebAssemblyConventions.cs
deleted file mode 100644
index 427b7135fd57..000000000000
--- a/src/Components/WebAssembly/Server/src/ComponentWebAssemblyConventions.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.StaticAssets;
-
-namespace Microsoft.AspNetCore.Components.WebAssembly.Server;
-
-internal static class ComponentWebAssemblyConventions
-{
-    private static readonly string? s_dotnetModifiableAssemblies = GetNonEmptyEnvironmentVariableValue("DOTNET_MODIFIABLE_ASSEMBLIES");
-    private static readonly string? s_aspnetcoreBrowserTools = GetNonEmptyEnvironmentVariableValue("__ASPNETCORE_BROWSER_TOOLS");
-
-    private static string? GetNonEmptyEnvironmentVariableValue(string name)
-        => Environment.GetEnvironmentVariable(name) is { Length: > 0 } value ? value : null;
-
-    internal static void AddBlazorWebAssemblyConventions(
-        IReadOnlyList<StaticAssetDescriptor> descriptors,
-        IWebHostEnvironment webHostEnvironment)
-    {
-        var headers = new List<StaticAssetResponseHeader>
-        {
-            new("Blazor-Environment", webHostEnvironment.EnvironmentName)
-        };
-
-        // DOTNET_MODIFIABLE_ASSEMBLIES is used by the runtime to initialize hot-reload specific environment variables and is configured
-        // by the launching process (dotnet-watch / Visual Studio).
-        // Always add the header if the environment variable is set, regardless of the kind of environment.
-        if (s_dotnetModifiableAssemblies != null)
-        {
-            headers.Add(new("DOTNET-MODIFIABLE-ASSEMBLIES", s_dotnetModifiableAssemblies));
-        }
-
-        // See https://github.com/dotnet/aspnetcore/issues/37357#issuecomment-941237000
-        // Translate the _ASPNETCORE_BROWSER_TOOLS environment configured by the browser tools agent in to a HTTP response header.
-        if (s_aspnetcoreBrowserTools != null)
-        {
-            headers.Add(new("ASPNETCORE-BROWSER-TOOLS", s_aspnetcoreBrowserTools));
-        }
-
-        for (var i = 0; i < descriptors.Count; i++)
-        {
-            var descriptor = descriptors[i];
-            if (descriptor.AssetPath.StartsWith("_framework/", StringComparison.OrdinalIgnoreCase))
-            {
-                descriptor.ResponseHeaders = [
-                    ..descriptor.ResponseHeaders,
-                    ..headers];
-            }
-        }
-    }
-}
diff --git a/src/Components/WebAssembly/Server/src/ComponentsWebAssemblyApplicationBuilderExtensions.cs b/src/Components/WebAssembly/Server/src/ComponentsWebAssemblyApplicationBuilderExtensions.cs
index 7cf70b7d02d8..0504c3f8b983 100644
--- a/src/Components/WebAssembly/Server/src/ComponentsWebAssemblyApplicationBuilderExtensions.cs
+++ b/src/Components/WebAssembly/Server/src/ComponentsWebAssemblyApplicationBuilderExtensions.cs
@@ -110,7 +110,7 @@ private static StaticFileOptions CreateStaticFilesOptions(IFileProvider webRootF
             var fileExtension = Path.GetExtension(requestPath.Value);
             if (string.Equals(fileExtension, ".gz") || string.Equals(fileExtension, ".br"))
             {
-                // When we are serving framework files (under _framework/ we perform content negotiation
+                // When we are serving framework files (under _framework/) we perform content negotiation
                 // on the accept encoding and replace the path with <<original>>.gz|br if we can serve gzip or brotli content
                 // respectively.
                 // Here we simply calculate the original content type by removing the extension and apply it
diff --git a/src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj b/src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj
index a3d0e160329e..b3f42e28fe8a 100644
--- a/src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj
+++ b/src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.Endpoints" />
+    <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.AspNetCore.StaticAssets" />
     <Reference Include="Microsoft.NETCore.BrowserDebugHost.Transport" GeneratePathProperty="true" PrivateAssets="All" />
diff --git a/src/Components/WebAssembly/Server/src/PACKAGE.md b/src/Components/WebAssembly/Server/src/PACKAGE.md
new file mode 100644
index 000000000000..44685c6debd8
--- /dev/null
+++ b/src/Components/WebAssembly/Server/src/PACKAGE.md
@@ -0,0 +1,58 @@
+## About
+
+`Microsoft.AspNetCore.Components.WebAssembly.Server` provides runtime server features for ASP.NET Core Blazor applications that have a client running under WebAssembly.
+
+## Key Features
+
+* Provides the ability to statically render components that utilize WebAssembly interactivity
+* Enables debugging functionality for code running in WebAssembly
+* Allows serialization and transmission of server-side authentication state for use during WebAssembly interactivity
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Components.WebAssembly.Server`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Components.WebAssembly.Server
+```
+
+### Configuration
+
+To enable WebAssembly interactivity in a Blazor Web app, configure it in your app's `Program.cs`:
+
+```csharp
+builder.Services.AddRazorComponents()
+    .AddInteractiveWebAssemblyComponents();
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+
+app.UseAntiforgery();
+app.MapStaticAssets();
+app.MapRazorComponents<App>()
+    .AddInteractiveWebAssemblyRenderMode()
+    .AddAdditionalAssemblies(typeof(BlazorWebApp.Client._Imports).Assembly);
+```
+
+Make sure to update the call to `AddAdditionalAssemblies` with any client assemblies that should be included in the Blazor application.
+
+## Main Types
+
+The main types provided by this package are:
+
+* `WebAssemblyComponentsEndpointOptions`: Provides options for configuring interactive WebAssembly components
+* `AuthenticationStateSerializationOptions`: Provides options for configuring the JSON serialization of the `AuthenticationState` to the WebAssembly client
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/blazor) on Blazor.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Components.WebAssembly.Server` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/WebAssembly/Server/src/PublicAPI.Shipped.txt b/src/Components/WebAssembly/Server/src/PublicAPI.Shipped.txt
index 853b023e8399..63591709c1d6 100644
--- a/src/Components/WebAssembly/Server/src/PublicAPI.Shipped.txt
+++ b/src/Components/WebAssembly/Server/src/PublicAPI.Shipped.txt
@@ -7,6 +7,12 @@
 Microsoft.AspNetCore.Builder.ComponentsWebAssemblyApplicationBuilderExtensions
 Microsoft.AspNetCore.Builder.WebAssemblyNetDebugProxyAppBuilderExtensions
 Microsoft.AspNetCore.Builder.WebAssemblyRazorComponentsEndpointConventionBuilderExtensions
+Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions
+Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.AuthenticationStateSerializationOptions() -> void
+Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializationCallback.get -> System.Func<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!, System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData?>>!
+Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializationCallback.set -> void
+Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializeAllClaims.get -> bool
+Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializeAllClaims.set -> void
 Microsoft.AspNetCore.Components.WebAssembly.Server.TargetPickerUi
 Microsoft.AspNetCore.Components.WebAssembly.Server.TargetPickerUi.Display(Microsoft.AspNetCore.Http.HttpContext! context) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.WebAssembly.Server.TargetPickerUi.DisplayFirefox(Microsoft.AspNetCore.Http.HttpContext! context) -> System.Threading.Tasks.Task!
@@ -14,10 +20,13 @@ Microsoft.AspNetCore.Components.WebAssembly.Server.TargetPickerUi.TargetPickerUi
 Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions
 Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.PathPrefix.get -> Microsoft.AspNetCore.Http.PathString
 Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.PathPrefix.set -> void
+Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.StaticAssetsManifestPath.get -> string?
+Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.StaticAssetsManifestPath.set -> void
 Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.WebAssemblyComponentsEndpointOptions() -> void
 Microsoft.Extensions.DependencyInjection.WebAssemblyRazorComponentsBuilderExtensions
 static Microsoft.AspNetCore.Builder.ComponentsWebAssemblyApplicationBuilderExtensions.UseBlazorFrameworkFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder! applicationBuilder) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 static Microsoft.AspNetCore.Builder.ComponentsWebAssemblyApplicationBuilderExtensions.UseBlazorFrameworkFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder! builder, Microsoft.AspNetCore.Http.PathString pathPrefix) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 static Microsoft.AspNetCore.Builder.WebAssemblyNetDebugProxyAppBuilderExtensions.UseWebAssemblyDebugging(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app) -> void
 static Microsoft.AspNetCore.Builder.WebAssemblyRazorComponentsEndpointConventionBuilderExtensions.AddInteractiveWebAssemblyRenderMode(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions!>? callback = null) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
+static Microsoft.Extensions.DependencyInjection.WebAssemblyRazorComponentsBuilderExtensions.AddAuthenticationStateSerialization(this Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder! builder, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder!
 static Microsoft.Extensions.DependencyInjection.WebAssemblyRazorComponentsBuilderExtensions.AddInteractiveWebAssemblyComponents(this Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder! builder) -> Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder!
diff --git a/src/Components/WebAssembly/Server/src/PublicAPI.Unshipped.txt b/src/Components/WebAssembly/Server/src/PublicAPI.Unshipped.txt
index 9b1af1ef2d1e..7dc5c58110bf 100644
--- a/src/Components/WebAssembly/Server/src/PublicAPI.Unshipped.txt
+++ b/src/Components/WebAssembly/Server/src/PublicAPI.Unshipped.txt
@@ -1,10 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions
-Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.AuthenticationStateSerializationOptions() -> void
-Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializationCallback.get -> System.Func<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!, System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData?>>!
-Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializationCallback.set -> void
-Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializeAllClaims.get -> bool
-Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions.SerializeAllClaims.set -> void
-Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.StaticAssetsManifestPath.get -> string?
-Microsoft.AspNetCore.Components.WebAssembly.Server.WebAssemblyComponentsEndpointOptions.StaticAssetsManifestPath.set -> void
-static Microsoft.Extensions.DependencyInjection.WebAssemblyRazorComponentsBuilderExtensions.AddAuthenticationStateSerialization(this Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder! builder, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Server.AuthenticationStateSerializationOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder!
diff --git a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs
index 7ec8a74362e8..9f489ea9a161 100644
--- a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs
+++ b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs
@@ -10,6 +10,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 using System.Dynamic;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Server;
@@ -366,9 +367,31 @@ private string GetDevToolsUrlWithProxy(BrowserTab tabToDebug)
     {
         var underlyingV8Endpoint = new Uri(tabToDebug.WebSocketDebuggerUrl);
         var proxyEndpoint = new Uri(_debugProxyUrl);
-        var devToolsUrlAbsolute = new Uri(_browserHost + tabToDebug.DevtoolsFrontendUrl);
+        var devToolsUrlAbsolute = new Uri(new Uri(_browserHost), relativeUri: NormalizeDevtoolsFrontendUrl(tabToDebug.DevtoolsFrontendUrl));
         var devToolsUrlWithProxy = $"{devToolsUrlAbsolute.Scheme}://{devToolsUrlAbsolute.Authority}{devToolsUrlAbsolute.AbsolutePath}?{underlyingV8Endpoint.Scheme}={proxyEndpoint.Authority}{underlyingV8Endpoint.PathAndQuery}";
         return devToolsUrlWithProxy;
+
+        static string NormalizeDevtoolsFrontendUrl(string devtoolsFrontendUrl)
+        {
+            // Currently frontend url can be:
+            // - absolute (since v135 of chrome and edge)
+            //      chrome example: https://chrome-devtools-frontend.appspot.com/serve_rev/@031848bc6ad02b97854f3d6154d3aefd0434756a/inspector.html?ws=localhost:9222/devtools/page/719FE9D3B43570193235446E0AB36859
+            //      edge example: https://aka.ms/docs-landing-page/serve_rev/@4e2c41645f24197463afa2ab6aa999352ee8255c/inspector.html?ws=localhost:9222/devtools/page/3A4D56E09776321628432588FC9299F4
+            // - relative (managed as fallback for brosers with prior version)
+            //      example: /devtools/inspector.html?ws=localhost:9222/devtools/page/DAB7FB6187B554E10B0BD18821265734
+            // The absolute url can't be used as-is because is not valid for debugging and cannot be made relative because of lack "devtools" segment
+            // before "inspector.html" but we can keep the query string and append to the default "devtools/inspector.html" browser devtools page
+
+            const string DefaultBrowserDevToolsPagePath = "devtools/inspector.html";
+
+            if (devtoolsFrontendUrl.AsSpan().TrimStart('/').StartsWith(DefaultBrowserDevToolsPagePath))
+            {
+                return devtoolsFrontendUrl;
+            }
+
+            UriHelper.FromAbsolute(devtoolsFrontendUrl, out _, out _, out _, out var query, out _);
+            return $"{DefaultBrowserDevToolsPagePath}{query}";
+        }
     }
 
     private string GetLaunchChromeInstructions(string targetApplicationUrl)
diff --git a/src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs b/src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs
index 0dfb50ef840a..d783bede44f5 100644
--- a/src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs
+++ b/src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Endpoints.Infrastructure;
 using Microsoft.AspNetCore.Components.WebAssembly.Server;
+using Microsoft.AspNetCore.Components.WebAssembly.Services;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -24,6 +25,7 @@ public static IRazorComponentsBuilder AddInteractiveWebAssemblyComponents(this I
         ArgumentNullException.ThrowIfNull(builder, nameof(builder));
 
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<RenderModeEndpointProvider, WebAssemblyEndpointProvider>());
+        builder.Services.TryAddScoped<LazyAssemblyLoader>();
 
         return builder;
     }
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json b/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json
index 9e65eac7567f..dcef7f8ce791 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "components.authentication",
+  "name": "@microsoft/components.authentication",
   "private": true,
   "scripts": {
     "clean": "rimraf ./dist/Debug ./dist/Release",
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteUserAccount.cs b/src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteUserAccount.cs
index c1fd843e9442..c2de13dd20f0 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteUserAccount.cs
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteUserAccount.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 /// A user account.
 /// </summary>
 /// <remarks>
-/// The information in this type will be use to produce a <see cref="System.Security.Claims.ClaimsPrincipal"/> for the application.
+/// The information in this type will be used to produce a <see cref="System.Security.Claims.ClaimsPrincipal"/> for the application.
 /// </remarks>
 public class RemoteUserAccount
 {
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/PACKAGE.md b/src/Components/WebAssembly/WebAssembly.Authentication/src/PACKAGE.md
new file mode 100644
index 000000000000..5aded6a0ed22
--- /dev/null
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/PACKAGE.md
@@ -0,0 +1,21 @@
+## About
+
+`Microsoft.AspNetCore.Components.WebAssembly.Authentication` provides client-side authentication for Blazor apps running under WebAssembly.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Components.WebAssembly.Authentication`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Components.WebAssembly.Authentication
+```
+
+### Usage
+
+For usage examples and documentation, refer to the [offical documentation](https://learn.microsoft.com/aspnet/core/blazor/security/webassembly) on Blazor WebAssembly security and identity.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Components.WebAssembly.Authentication` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Shipped.txt b/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Shipped.txt
index 3ce1e11f08d3..30d69b11b605 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Shipped.txt
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Shipped.txt
@@ -44,6 +44,10 @@ Microsoft.AspNetCore.Components.WebAssembly.Authentication.ApiAuthorizationProvi
 Microsoft.AspNetCore.Components.WebAssembly.Authentication.ApiAuthorizationProviderOptions.ApiAuthorizationProviderOptions() -> void
 Microsoft.AspNetCore.Components.WebAssembly.Authentication.ApiAuthorizationProviderOptions.ConfigurationEndpoint.get -> string?
 Microsoft.AspNetCore.Components.WebAssembly.Authentication.ApiAuthorizationProviderOptions.ConfigurationEndpoint.set -> void
+Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions
+Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions.AuthenticationStateDeserializationOptions() -> void
+Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions.DeserializationCallback.get -> System.Func<Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData?, System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>!>!
+Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions.DeserializationCallback.set -> void
 Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthorizationMessageHandler
 Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthorizationMessageHandler.AuthorizationMessageHandler(Microsoft.AspNetCore.Components.WebAssembly.Authentication.IAccessTokenProvider! provider, Microsoft.AspNetCore.Components.NavigationManager! navigation) -> void
 Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthorizationMessageHandler.ConfigureHandler(System.Collections.Generic.IEnumerable<string!>! authorizedUrls, System.Collections.Generic.IEnumerable<string!>? scopes = null, string? returnUrl = null) -> Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthorizationMessageHandler!
@@ -228,6 +232,7 @@ static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationService
 static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddApiAuthorization<TRemoteAuthenticationState, TAccount>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteAuthenticationOptions<Microsoft.AspNetCore.Components.WebAssembly.Authentication.ApiAuthorizationProviderOptions!>!>! configure) -> Microsoft.Extensions.DependencyInjection.IRemoteAuthenticationBuilder<TRemoteAuthenticationState!, TAccount!>!
 static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddApiAuthorization<TRemoteAuthenticationState>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IRemoteAuthenticationBuilder<TRemoteAuthenticationState!, Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteUserAccount!>!
 static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddApiAuthorization<TRemoteAuthenticationState>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteAuthenticationOptions<Microsoft.AspNetCore.Components.WebAssembly.Authentication.ApiAuthorizationProviderOptions!>!>! configure) -> Microsoft.Extensions.DependencyInjection.IRemoteAuthenticationBuilder<TRemoteAuthenticationState!, Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteUserAccount!>!
+static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddAuthenticationStateDeserialization(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddOidcAuthentication(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteAuthenticationOptions<Microsoft.AspNetCore.Components.WebAssembly.Authentication.OidcProviderOptions!>!>! configure) -> Microsoft.Extensions.DependencyInjection.IRemoteAuthenticationBuilder<Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteAuthenticationState!, Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteUserAccount!>!
 static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddOidcAuthentication<TRemoteAuthenticationState, TAccount>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteAuthenticationOptions<Microsoft.AspNetCore.Components.WebAssembly.Authentication.OidcProviderOptions!>!>! configure) -> Microsoft.Extensions.DependencyInjection.IRemoteAuthenticationBuilder<TRemoteAuthenticationState!, TAccount!>!
 static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddOidcAuthentication<TRemoteAuthenticationState>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteAuthenticationOptions<Microsoft.AspNetCore.Components.WebAssembly.Authentication.OidcProviderOptions!>!>! configure) -> Microsoft.Extensions.DependencyInjection.IRemoteAuthenticationBuilder<TRemoteAuthenticationState!, Microsoft.AspNetCore.Components.WebAssembly.Authentication.RemoteUserAccount!>!
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Unshipped.txt b/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Unshipped.txt
index e6de697cb73c..7dc5c58110bf 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Unshipped.txt
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/PublicAPI.Unshipped.txt
@@ -1,6 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions
-Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions.AuthenticationStateDeserializationOptions() -> void
-Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions.DeserializationCallback.get -> System.Func<Microsoft.AspNetCore.Components.Authorization.AuthenticationStateData?, System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Authorization.AuthenticationState!>!>!
-Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions.DeserializationCallback.set -> void
-static Microsoft.Extensions.DependencyInjection.WebAssemblyAuthenticationServiceCollectionExtensions.AddAuthenticationStateDeserialization(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Authentication.AuthenticationStateDeserializationOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Services/SignOutSessionStateManager.cs b/src/Components/WebAssembly/WebAssembly.Authentication/src/Services/SignOutSessionStateManager.cs
index c0fe3cab7307..74b61cb7aca2 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Services/SignOutSessionStateManager.cs
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Services/SignOutSessionStateManager.cs
@@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 public class SignOutSessionStateManager
 {
     private readonly IJSRuntime _jsRuntime;
-    private static readonly JsonSerializerOptions _serializationOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
 
     /// <summary>
     /// Initialize a new instance of <see cref="SignOutSessionStateManager"/>.
@@ -35,7 +34,7 @@ public virtual ValueTask SetSignOutState()
         return _jsRuntime.InvokeVoidAsync(
             "sessionStorage.setItem",
             "Microsoft.AspNetCore.Components.WebAssembly.Authentication.SignOutState",
-            JsonSerializer.Serialize(SignOutState.Instance, _serializationOptions));
+            JsonSerializer.Serialize(SignOutState.Instance, JsonSerializerOptions.Web));
     }
 
     /// <summary>
@@ -71,7 +70,7 @@ private async ValueTask<SignOutState> GetSignOutState()
     [DynamicDependency(JsonSerialized, typeof(SignOutState))]
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "The correct members will be preserved by the above DynamicDependency.")]
     // This should use JSON source generation
-    private static SignOutState DeserializeSignOutState(string result) => JsonSerializer.Deserialize<SignOutState>(result, _serializationOptions);
+    private static SignOutState DeserializeSignOutState(string result) => JsonSerializer.Deserialize<SignOutState>(result, JsonSerializerOptions.Web);
 
     private ValueTask ClearSignOutState()
     {
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/AuthorizationMessageHandlerTests.cs b/src/Components/WebAssembly/WebAssembly.Authentication/test/AuthorizationMessageHandlerTests.cs
index db724a7296c5..a5133679aa93 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/test/AuthorizationMessageHandlerTests.cs
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/AuthorizationMessageHandlerTests.cs
@@ -190,7 +190,7 @@ public async Task UsesCustomScopesAndReturnUrlWhenProvided()
         _ = await new HttpClient(handler).GetAsync("https://localhost:5001/weather");
 
         // Assert
-        Assert.Equal(1, tokenProvider.Invocations.Count);
+        Assert.Single(tokenProvider.Invocations);
     }
 }
 
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj
index 3fe158db76c6..01092f99d71d 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj
@@ -9,7 +9,6 @@
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" />
     <Reference Include="Microsoft.CodeAnalysis.CSharp" />
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticationServiceTests.cs b/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticationServiceTests.cs
index 79f3bb98b680..5d00fb83b04c 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticationServiceTests.cs
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticationServiceTests.cs
@@ -543,6 +543,24 @@ public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToke
             return new ValueTask<TValue>((TValue)GetInvocationResult(identifier));
         }
 
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier)
+            => throw new NotImplementedException();
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object[] args)
+            => throw new NotImplementedException();
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object[] args)
+            => throw new NotImplementedException();
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value)
+            => throw new NotImplementedException();
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
+
         private object GetInvocationResult(string identifier)
         {
             switch (identifier)
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs b/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs
index 68ce23ac5ffe..edf7b0e79160 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs
@@ -34,7 +34,7 @@ public async Task AuthenticationManager_Throws_ForInvalidAction()
         });
 
         // Act & assert
-        await Assert.ThrowsAsync<InvalidOperationException>(() => remoteAuthenticator.SetParametersAsync(parameters));
+        await Assert.ThrowsAsync<NullReferenceException>(() => remoteAuthenticator.SetParametersAsync(parameters));
     }
 
     [Fact]
@@ -777,6 +777,7 @@ public override ValueTask SetSignOutState()
     private class TestJsRuntime : IJSRuntime
     {
         public (string identifier, object[] args) LastInvocation { get; set; }
+
         public ValueTask<TValue> InvokeAsync<TValue>(string identifier, object[] args)
         {
             LastInvocation = (identifier, args);
@@ -788,6 +789,24 @@ public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToke
             LastInvocation = (identifier, args);
             return default;
         }
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object[] args)
+            => throw new NotImplementedException();
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object[] args)
+            => throw new NotImplementedException();
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier)
+            => throw new NotImplementedException();
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value)
+            => throw new NotImplementedException();
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
     }
 
     public class TestRemoteAuthenticatorView : RemoteAuthenticatorViewCore<RemoteAuthenticationState>
diff --git a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyCultureProvider.cs b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyCultureProvider.cs
index 060bd827b93f..99d1476dc10d 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyCultureProvider.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyCultureProvider.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.Linq;
 using System.Runtime.InteropServices.JavaScript;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -62,7 +63,7 @@ public virtual async ValueTask LoadCurrentCultureResourcesAsync()
             throw new PlatformNotSupportedException("This method is only supported in the browser.");
         }
 
-        var culturesToLoad = GetCultures(CultureInfo.CurrentCulture);
+        var culturesToLoad = GetCultures(CultureInfo.CurrentCulture, CultureInfo.CurrentUICulture);
 
         if (culturesToLoad.Length == 0)
         {
@@ -72,30 +73,47 @@ public virtual async ValueTask LoadCurrentCultureResourcesAsync()
         await WebAssemblyCultureProviderInterop.LoadSatelliteAssemblies(culturesToLoad);
     }
 
-    internal static string[] GetCultures(CultureInfo cultureInfo)
+    internal static string[] GetCultures(CultureInfo cultureInfo, CultureInfo? uiCultureInfo = null)
     {
-        var culturesToLoad = new List<string>();
-
         // Once WASM is ready, we have to use .NET's assembly loading to load additional assemblies.
         // First calculate all possible cultures that the application might want to load. We do this by
         // starting from the current culture and walking up the graph of parents.
         // At the end of the the walk, we'll have a list of culture names that look like
         // [ "fr-FR", "fr" ]
-        while (cultureInfo != null && cultureInfo != CultureInfo.InvariantCulture)
-        {
-            culturesToLoad.Add(cultureInfo.Name);
 
-            if (cultureInfo.Parent == cultureInfo)
+        var culturesToLoad = GetCultureHierarchy(cultureInfo);
+        if (cultureInfo != uiCultureInfo)
+        {
+            foreach (var culture in GetCultureHierarchy(uiCultureInfo))
             {
-                break;
+                if (!culturesToLoad.Contains(culture))
+                {
+                    culturesToLoad = culturesToLoad.Append(culture);
+                }
+                // If the culture is in the list, we can break because we found the common parent.
+                else
+                {
+                    break;
+                }
             }
-
-            cultureInfo = cultureInfo.Parent;
         }
 
         return culturesToLoad.ToArray();
     }
 
+    private static IEnumerable<string> GetCultureHierarchy(CultureInfo? culture)
+    {
+        while (culture != CultureInfo.InvariantCulture && culture != null)
+        {
+            yield return culture.Name;
+            if (culture == culture.Parent)
+            {
+                break;
+            }
+            culture = culture.Parent;
+        }
+    }
+
     private partial class WebAssemblyCultureProviderInterop
     {
         [JSImport("INTERNAL.loadSatelliteAssemblies")]
diff --git a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHost.cs b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHost.cs
index a36bb957ccce..afc21cf445ab 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHost.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHost.cs
@@ -2,11 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection.Metadata;
-using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.Web.Infrastructure;
-using Microsoft.AspNetCore.Components.WebAssembly.HotReload;
 using Microsoft.AspNetCore.Components.WebAssembly.Infrastructure;
 using Microsoft.AspNetCore.Components.WebAssembly.Rendering;
 using Microsoft.AspNetCore.Components.WebAssembly.Services;
@@ -136,14 +134,8 @@ internal async Task RunAsyncCore(CancellationToken cancellationToken, WebAssembl
             new PrerenderComponentApplicationStore(_persistedState) :
             new PrerenderComponentApplicationStore();
 
-        await manager.RestoreStateAsync(store);
-
-        RestoreAntiforgeryToken();
-
-        if (MetadataUpdater.IsSupported)
-        {
-            await WebAssemblyHotReload.InitializeAsync();
-        }
+        manager.SetPlatformRenderMode(RenderMode.InteractiveWebAssembly);
+        await manager.RestoreStateAsync(store, RestoreContext.InitialValue);
 
         var tcs = new TaskCompletionSource();
         using (cancellationToken.Register(() => tcs.TrySetResult()))
@@ -233,11 +225,4 @@ private static void AddWebRootComponents(WebAssemblyRenderer renderer, RootCompo
 
         renderer.NotifyEndUpdateRootComponents(operationBatch.BatchId);
     }
-
-    private void RestoreAntiforgeryToken()
-    {
-        // The act of instantiating the DefaultAntiforgeryStateProvider will automatically
-        // retrieve the antiforgery token from the persistent state
-        _scope.ServiceProvider.GetRequiredService<AntiforgeryStateProvider>();
-    }
 }
diff --git a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs
index 8bee06649691..c9971669d6c0 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs
@@ -28,8 +28,9 @@ public sealed class WebAssemblyHostBuilder
 {
     private readonly IInternalJSImportMethods _jsMethods;
     private Func<IServiceProvider> _createServiceProvider;
-    private RootComponentTypeCache? _rootComponentCache;
+    private RootTypeCache? _rootComponentCache;
     private string? _persistedState;
+    private ServiceProviderOptions? _serviceProviderOptions;
 
     /// <summary>
     /// Creates an instance of <see cref="WebAssemblyHostBuilder"/> using the most common
@@ -91,7 +92,16 @@ internal WebAssemblyHostBuilder(IInternalJSImportMethods jsMethods)
 
         _createServiceProvider = () =>
         {
-            return Services.BuildServiceProvider(validateScopes: WebAssemblyHostEnvironmentExtensions.IsDevelopment(hostEnvironment));
+            var isDevelopment = WebAssemblyHostEnvironmentExtensions.IsDevelopment(hostEnvironment);
+
+            // Use custom options if provided, otherwise use defaults
+            var options = _serviceProviderOptions ?? new ServiceProviderOptions
+            {
+                ValidateScopes = isDevelopment,
+                ValidateOnBuild = isDevelopment
+            };
+
+            return Services.BuildServiceProvider(options);
         };
     }
 
@@ -136,11 +146,11 @@ private void InitializeRegisteredRootComponents()
             registeredComponents[i].PrerenderId = i.ToString(CultureInfo.InvariantCulture);
         }
 
-        _rootComponentCache = new RootComponentTypeCache();
+        _rootComponentCache = new RootTypeCache();
         var componentDeserializer = WebAssemblyComponentParameterDeserializer.Instance;
         foreach (var registeredComponent in registeredComponents)
         {
-            var componentType = _rootComponentCache.GetRootComponent(registeredComponent.Assembly!, registeredComponent.TypeName!);
+            var componentType = _rootComponentCache.GetRootType(registeredComponent.Assembly!, registeredComponent.TypeName!);
             if (componentType is null)
             {
                 throw new InvalidOperationException(
@@ -276,6 +286,17 @@ public void ConfigureContainer<TBuilder>(IServiceProviderFactory<TBuilder> facto
         };
     }
 
+    // In WebAssemblyHostBuilder class:
+    /// <summary>
+    /// Configures the service provider options for this host builder.
+    /// </summary>
+    /// <param name="options">The service provider options to use.</param>
+    public WebAssemblyHostBuilder UseServiceProviderOptions(ServiceProviderOptions options)
+    {
+        _serviceProviderOptions = options ?? throw new ArgumentNullException(nameof(options));
+        return this;
+    }
+
     /// <summary>
     /// Builds a <see cref="WebAssemblyHost"/> instance based on the configuration of this builder.
     /// </summary>
@@ -300,18 +321,21 @@ internal void InitializeDefaultServices()
         Services.AddSingleton<NavigationManager>(WebAssemblyNavigationManager.Instance);
         Services.AddSingleton<INavigationInterception>(WebAssemblyNavigationInterception.Instance);
         Services.AddSingleton<IScrollToLocationHash>(WebAssemblyScrollToLocationHash.Instance);
-        Services.AddSingleton<IInternalJSImportMethods>(_jsMethods);
+        Services.AddSingleton(_jsMethods);
         Services.AddSingleton(new LazyAssemblyLoader(DefaultWebAssemblyJSRuntime.Instance));
-        Services.AddSingleton<RootComponentTypeCache>(_ => _rootComponentCache ?? new());
+        Services.AddSingleton(_ => _rootComponentCache ?? new());
         Services.AddSingleton<ComponentStatePersistenceManager>();
-        Services.AddSingleton<PersistentComponentState>(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
-        Services.AddSingleton<AntiforgeryStateProvider, DefaultAntiforgeryStateProvider>();
+        Services.AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
+        Services.AddSupplyValueFromPersistentComponentStateProvider();
         Services.AddSingleton<IErrorBoundaryLogger, WebAssemblyErrorBoundaryLogger>();
         Services.AddSingleton<ResourceCollectionProvider>();
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<ResourceCollectionProvider>(Services, RenderMode.InteractiveWebAssembly);
         Services.AddLogging(builder =>
         {
             builder.AddProvider(new WebAssemblyConsoleLoggerProvider(DefaultWebAssemblyJSRuntime.Instance));
         });
+        Services.AddSingleton<AntiforgeryStateProvider, DefaultAntiforgeryStateProvider>();
+        RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<AntiforgeryStateProvider>(Services, RenderMode.InteractiveWebAssembly);
         Services.AddSupplyValueFromQueryProvider();
     }
 }
diff --git a/src/Components/WebAssembly/WebAssembly/src/Hosting/WebassemblyHostBuilderExtensions.cs b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebassemblyHostBuilderExtensions.cs
new file mode 100644
index 000000000000..edfad727a34d
--- /dev/null
+++ b/src/Components/WebAssembly/WebAssembly/src/Hosting/WebassemblyHostBuilderExtensions.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+/// <summary>
+/// Extension methods for configuring a <see cref="WebAssemblyHostBuilder"/>.
+/// </summary>
+public static class WebAssemblyHostBuilderExtensions
+{
+    /// <summary>
+    /// Configures the default service provider for the WebAssembly host.
+    /// </summary>
+    /// <param name="builder">The <see cref="WebAssemblyHostBuilder"/> to configure.</param>
+    /// <param name="configure">A callback used to configure the <see cref="ServiceProviderOptions"/>.</param>
+    /// <returns>The <see cref="WebAssemblyHostBuilder"/>.</returns>
+    public static WebAssemblyHostBuilder UseDefaultServiceProvider(
+        this WebAssemblyHostBuilder builder,
+        Action<ServiceProviderOptions> configure)
+    {
+        return builder.UseDefaultServiceProvider((env, options) => configure(options));
+    }
+
+    /// <summary>
+    /// Configures the default service provider for the WebAssembly host.
+    /// </summary>
+    /// <param name="builder">The <see cref="WebAssemblyHostBuilder"/> to configure.</param>
+    /// <param name="configure">A callback used to configure the <see cref="ServiceProviderOptions"/> with access to the host environment.</param>
+    /// <returns>The <see cref="WebAssemblyHostBuilder"/>.</returns>
+    public static WebAssemblyHostBuilder UseDefaultServiceProvider(
+        this WebAssemblyHostBuilder builder,
+        Action<IWebAssemblyHostEnvironment, ServiceProviderOptions> configure)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(configure);
+
+        var options = new ServiceProviderOptions();
+        configure(builder.HostEnvironment, options);
+
+        return builder.UseServiceProviderOptions(options);
+    }
+}
diff --git a/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs b/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs
deleted file mode 100644
index 76606a3264e7..000000000000
--- a/src/Components/WebAssembly/WebAssembly/src/HotReload/HotReloadAgent.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-// Based on the implementation in https://raw.githubusercontent.com/dotnet/sdk/aad0424c0bfaa60c8bd136a92fd131e53d14561a/src/BuiltInTools/DotNetDeltaApplier/HotReloadAgent.cs
-
-using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Metadata;
-
-namespace Microsoft.Extensions.HotReload;
-
-internal sealed class HotReloadAgent : IDisposable
-{
-    /// Flags for hot reload handler Types like MVC's HotReloadService.
-    private const DynamicallyAccessedMemberTypes HotReloadHandlerLinkerFlags = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
-
-    private readonly Action<string> _log;
-    private readonly AssemblyLoadEventHandler _assemblyLoad;
-    private readonly ConcurrentDictionary<Guid, List<UpdateDelta>> _deltas = new();
-    private readonly ConcurrentDictionary<Assembly, Assembly> _appliedAssemblies = new();
-    private volatile UpdateHandlerActions? _handlerActions;
-
-    public HotReloadAgent(Action<string> log)
-    {
-        _log = log;
-        _assemblyLoad = OnAssemblyLoad;
-        AppDomain.CurrentDomain.AssemblyLoad += _assemblyLoad;
-    }
-
-    private void OnAssemblyLoad(object? _, AssemblyLoadEventArgs eventArgs)
-    {
-        _handlerActions = null;
-        var loadedAssembly = eventArgs.LoadedAssembly;
-        var moduleId = TryGetModuleId(loadedAssembly);
-        if (moduleId is null)
-        {
-            return;
-        }
-
-        if (_deltas.TryGetValue(moduleId.Value, out var updateDeltas) && _appliedAssemblies.TryAdd(loadedAssembly, loadedAssembly))
-        {
-            // A delta for this specific Module exists and we haven't called ApplyUpdate on this instance of Assembly as yet.
-            ApplyDeltas(loadedAssembly, updateDeltas);
-        }
-    }
-
-    internal sealed class UpdateHandlerActions
-    {
-        public List<Action<Type[]?>> ClearCache { get; } = new();
-        public List<Action<Type[]?>> UpdateApplication { get; } = new();
-    }
-
-    [UnconditionalSuppressMessage("Trimmer", "IL2072",
-        Justification = "The handlerType passed to GetHandlerActions is preserved by MetadataUpdateHandlerAttribute with DynamicallyAccessedMemberTypes.All.")]
-    private UpdateHandlerActions GetMetadataUpdateHandlerActions()
-    {
-        // We need to execute MetadataUpdateHandlers in a well-defined order. For v1, the strategy that is used is to topologically
-        // sort assemblies so that handlers in a dependency are executed before the dependent (e.g. the reflection cache action
-        // in System.Private.CoreLib is executed before System.Text.Json clears it's own cache.)
-        // This would ensure that caches and updates more lower in the application stack are up to date
-        // before ones higher in the stack are recomputed.
-        var sortedAssemblies = TopologicalSort(AppDomain.CurrentDomain.GetAssemblies());
-        var handlerActions = new UpdateHandlerActions();
-        foreach (var assembly in sortedAssemblies)
-        {
-            foreach (var attr in assembly.GetCustomAttributesData())
-            {
-                // Look up the attribute by name rather than by type. This would allow netstandard targeting libraries to
-                // define their own copy without having to cross-compile.
-                if (attr.AttributeType.FullName != "System.Reflection.Metadata.MetadataUpdateHandlerAttribute")
-                {
-                    continue;
-                }
-
-                IList<CustomAttributeTypedArgument> ctorArgs = attr.ConstructorArguments;
-                if (ctorArgs.Count != 1 ||
-                    ctorArgs[0].Value is not Type handlerType)
-                {
-                    _log($"'{attr}' found with invalid arguments.");
-                    continue;
-                }
-
-                GetHandlerActions(handlerActions, handlerType);
-            }
-        }
-
-        return handlerActions;
-    }
-
-    internal void GetHandlerActions(
-        UpdateHandlerActions handlerActions,
-        [DynamicallyAccessedMembers(HotReloadHandlerLinkerFlags)] Type handlerType)
-    {
-        bool methodFound = false;
-
-        if (GetUpdateMethod(handlerType, "ClearCache") is MethodInfo clearCache)
-        {
-            handlerActions.ClearCache.Add(CreateAction(clearCache));
-            methodFound = true;
-        }
-
-        if (GetUpdateMethod(handlerType, "UpdateApplication") is MethodInfo updateApplication)
-        {
-            handlerActions.UpdateApplication.Add(CreateAction(updateApplication));
-            methodFound = true;
-        }
-
-        if (!methodFound)
-        {
-            _log($"No invokable methods found on metadata handler type '{handlerType}'. " +
-                $"Allowed methods are ClearCache, UpdateApplication");
-        }
-
-        Action<Type[]?> CreateAction(MethodInfo update)
-        {
-            Action<Type[]?> action = update.CreateDelegate<Action<Type[]?>>();
-            return types =>
-            {
-                try
-                {
-                    action(types);
-                }
-                catch (Exception ex)
-                {
-                    _log($"Exception from '{action}': {ex}");
-                }
-            };
-        }
-
-        MethodInfo? GetUpdateMethod([DynamicallyAccessedMembers(HotReloadHandlerLinkerFlags)] Type handlerType, string name)
-        {
-            if (handlerType.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, new[] { typeof(Type[]) }) is MethodInfo updateMethod &&
-                updateMethod.ReturnType == typeof(void))
-            {
-                return updateMethod;
-            }
-
-            foreach (MethodInfo method in handlerType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance))
-            {
-                if (method.Name == name)
-                {
-                    _log($"Type '{handlerType}' has method '{method}' that does not match the required signature.");
-                    break;
-                }
-            }
-
-            return null;
-        }
-    }
-
-    internal static List<Assembly> TopologicalSort(Assembly[] assemblies)
-    {
-        var sortedAssemblies = new List<Assembly>(assemblies.Length);
-
-        var visited = new HashSet<string>(StringComparer.Ordinal);
-
-        foreach (var assembly in assemblies)
-        {
-            Visit(assemblies, assembly, sortedAssemblies, visited);
-        }
-
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Hot reload is only expected to work when trimming is disabled.")]
-        static void Visit(Assembly[] assemblies, Assembly assembly, List<Assembly> sortedAssemblies, HashSet<string> visited)
-        {
-            var assemblyIdentifier = assembly.GetName().Name!;
-            if (!visited.Add(assemblyIdentifier))
-            {
-                return;
-            }
-
-            foreach (var dependencyName in assembly.GetReferencedAssemblies())
-            {
-                var dependency = Array.Find(assemblies, a => a.GetName().Name == dependencyName.Name);
-                if (dependency is not null)
-                {
-                    Visit(assemblies, dependency, sortedAssemblies, visited);
-                }
-            }
-
-            sortedAssemblies.Add(assembly);
-        }
-
-        return sortedAssemblies;
-    }
-
-    public void ApplyDeltas(IReadOnlyList<UpdateDelta> deltas)
-    {
-        for (var i = 0; i < deltas.Count; i++)
-        {
-            var item = deltas[i];
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                if (TryGetModuleId(assembly) is Guid moduleId && moduleId == item.ModuleId)
-                {
-                    MetadataUpdater.ApplyUpdate(assembly, item.MetadataDelta, item.ILDelta, item.PdbBytes ?? ReadOnlySpan<byte>.Empty);
-                }
-            }
-
-            // Additionally stash the deltas away so it may be applied to assemblies loaded later.
-            var cachedDeltas = _deltas.GetOrAdd(item.ModuleId, static _ => new());
-            cachedDeltas.Add(item);
-        }
-
-        try
-        {
-            // Defer discovering metadata updata handlers until after hot reload deltas have been applied.
-            // This should give enough opportunity for AppDomain.GetAssemblies() to be sufficiently populated.
-            _handlerActions ??= GetMetadataUpdateHandlerActions();
-            var handlerActions = _handlerActions;
-
-            Type[]? updatedTypes = GetMetadataUpdateTypes(deltas);
-
-            handlerActions.ClearCache.ForEach(a => a(updatedTypes));
-            handlerActions.UpdateApplication.ForEach(a => a(updatedTypes));
-
-            _log("Deltas applied.");
-        }
-        catch (Exception ex)
-        {
-            _log(ex.ToString());
-        }
-    }
-
-    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Hot reload is only expected to work when trimming is disabled.")]
-    private static Type[] GetMetadataUpdateTypes(IReadOnlyList<UpdateDelta> deltas)
-    {
-        List<Type>? types = null;
-
-        foreach (var delta in deltas)
-        {
-            var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => TryGetModuleId(assembly) is Guid moduleId && moduleId == delta.ModuleId);
-            if (assembly is null)
-            {
-                continue;
-            }
-
-            var assemblyTypes = assembly.GetTypes();
-
-            foreach (var updatedType in delta.UpdatedTypes ?? Array.Empty<int>())
-            {
-                var type = assemblyTypes.FirstOrDefault(t => t.MetadataToken == updatedType);
-                if (type != null)
-                {
-                    types ??= new();
-                    types.Add(type);
-                }
-            }
-        }
-
-        return types?.ToArray() ?? Type.EmptyTypes;
-    }
-
-    public void ApplyDeltas(Assembly assembly, IReadOnlyList<UpdateDelta> deltas)
-    {
-        try
-        {
-            foreach (var item in deltas)
-            {
-                MetadataUpdater.ApplyUpdate(assembly, item.MetadataDelta, item.ILDelta, ReadOnlySpan<byte>.Empty);
-            }
-
-            _log("Deltas applied.");
-        }
-        catch (Exception ex)
-        {
-            _log(ex.ToString());
-        }
-    }
-
-    public void Dispose()
-    {
-        AppDomain.CurrentDomain.AssemblyLoad -= _assemblyLoad;
-    }
-
-    private static Guid? TryGetModuleId(Assembly loadedAssembly)
-    {
-        try
-        {
-            return loadedAssembly.Modules.FirstOrDefault()?.ModuleVersionId;
-        }
-        catch
-        {
-            // Assembly.Modules might throw. See https://github.com/dotnet/aspnetcore/issues/33152
-        }
-
-        return default;
-    }
-}
diff --git a/src/Components/WebAssembly/WebAssembly/src/HotReload/UpdateDelta.cs b/src/Components/WebAssembly/WebAssembly/src/HotReload/UpdateDelta.cs
deleted file mode 100644
index 6b8ee89cf58f..000000000000
--- a/src/Components/WebAssembly/WebAssembly/src/HotReload/UpdateDelta.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Microsoft.Extensions.HotReload;
-
-internal sealed class UpdateDelta
-{
-    public Guid ModuleId { get; set; }
-
-    public byte[] MetadataDelta { get; set; } = default!;
-
-    public byte[] ILDelta { get; set; } = default!;
-
-    public byte[]? PdbBytes { get; set; }
-
-    public int[]? UpdatedTypes { get; set; }
-}
diff --git a/src/Components/WebAssembly/WebAssembly/src/HotReload/WebAssemblyHotReload.cs b/src/Components/WebAssembly/WebAssembly/src/HotReload/WebAssemblyHotReload.cs
deleted file mode 100644
index 8d3bcbd52e87..000000000000
--- a/src/Components/WebAssembly/WebAssembly/src/HotReload/WebAssemblyHotReload.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using System.Runtime.InteropServices.JavaScript;
-using Microsoft.Extensions.HotReload;
-using Microsoft.JSInterop;
-
-namespace Microsoft.AspNetCore.Components.WebAssembly.HotReload;
-
-/// <summary>
-/// Contains methods called by interop. Intended for framework use only, not supported for use in application
-/// code.
-/// </summary>
-[EditorBrowsable(EditorBrowsableState.Never)]
-public static partial class WebAssemblyHotReload
-{
-    private const string BlazorHotReloadModuleName = "blazor-hotreload";
-
-    private static HotReloadAgent? _hotReloadAgent;
-    private static readonly UpdateDelta[] _updateDeltas = new[]
-    {
-        new UpdateDelta(),
-    };
-
-    internal static async Task InitializeAsync()
-    {
-        if (Environment.GetEnvironmentVariable("__ASPNETCORE_BROWSER_TOOLS") == "true" &&
-            OperatingSystem.IsBrowser())
-        {
-            // Attempt to read previously applied hot reload deltas if the ASP.NET Core browser tools are available (indicated by the presence of the Environment variable).
-            // The agent is injected in to the hosted app and can serve this script that can provide results from local-storage.
-            // See https://github.com/dotnet/aspnetcore/issues/37357#issuecomment-941237000
-            await JSHost.ImportAsync(BlazorHotReloadModuleName, "/_framework/blazor-hotreload.js");
-            await ReceiveHotReloadAsync();
-        }
-    }
-
-    /// <summary>
-    /// For framework use only.
-    /// </summary>
-    [JSInvokable(nameof(ApplyHotReloadDelta))]
-    public static void ApplyHotReloadDelta(string moduleIdString, byte[] metadataDelta, byte[] ilDelta, byte[] pdbBytes, int[]? updatedTypes)
-    {
-        // Analyzer has a bug where it doesn't handle ConditionalAttribute: https://github.com/dotnet/roslyn/issues/63464
-#pragma warning disable IDE0200 // Remove unnecessary lambda expression
-        Interlocked.CompareExchange(ref _hotReloadAgent, new HotReloadAgent(m => Debug.WriteLine(m)), null);
-#pragma warning restore IDE0200 // Remove unnecessary lambda expression
-
-        var moduleId = Guid.Parse(moduleIdString, CultureInfo.InvariantCulture);
-
-        _updateDeltas[0].ModuleId = moduleId;
-        _updateDeltas[0].MetadataDelta = metadataDelta;
-        _updateDeltas[0].ILDelta = ilDelta;
-        _updateDeltas[0].PdbBytes = pdbBytes;
-        _updateDeltas[0].UpdatedTypes = updatedTypes;
-
-        _hotReloadAgent.ApplyDeltas(_updateDeltas);
-    }
-
-    /// <summary>
-    /// For framework use only.
-    /// </summary>
-    [JSInvokable(nameof(GetApplyUpdateCapabilities))]
-    public static string GetApplyUpdateCapabilities()
-    {
-        var method = typeof(System.Reflection.Metadata.MetadataUpdater).GetMethod("GetCapabilities", BindingFlags.NonPublic | BindingFlags.Static, Type.EmptyTypes);
-        if (method is null)
-        {
-            return string.Empty;
-        }
-        return (string)method.Invoke(obj: null, parameters: null)!;
-    }
-
-    [JSImport("receiveHotReloadAsync", BlazorHotReloadModuleName)]
-    private static partial Task ReceiveHotReloadAsync();
-}
diff --git a/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj b/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj
index de7bfc87167c..ba479f5352f7 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj
+++ b/src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\BrowserNavigationManagerInterop.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\PullFromJSDataStream.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\TransmitDataStreamToJS.cs" />
@@ -33,7 +34,7 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperation.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperationBatch.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperationType.cs" />
-    <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentTypeCache.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\RootTypeCache.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\WebRendererId.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\WebRootComponentManager.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\WebRootComponentParameters.cs" />
@@ -62,10 +63,6 @@
     <Content Include="targets\*.props" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\" />
   </ItemGroup>
 
-  <Target Name="_CheckBlazorServerJSPath" BeforeTargets="GenerateNuspec" DependsOnTargets="ResolveProjectReferences" Condition=" '$(IsPackable)' == 'true' ">
-    <Error Text="'$(BlazorWebAssemblyJSFile)' does not exist. Enable NodeJS to pack this project." Condition=" !EXISTS('$(BlazorWebAssemblyJSFile)') " />
-  </Target>
-
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
   </ItemGroup>
diff --git a/src/Components/WebAssembly/WebAssembly/src/PACKAGE.md b/src/Components/WebAssembly/WebAssembly/src/PACKAGE.md
new file mode 100644
index 000000000000..c4e78ab78048
--- /dev/null
+++ b/src/Components/WebAssembly/WebAssembly/src/PACKAGE.md
@@ -0,0 +1,11 @@
+## About
+
+`Microsoft.AspNetCore.Components.WebAssembly` provides support for building client-side single-page applications (SPAs) with Blazor running under WebAssembly.
+
+## How to Use
+
+To get started with Blazor, see the [official documentation](https://learn.microsoft.com/aspnet/core/blazor).
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Components.WebAssembly` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Shipped.txt b/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Shipped.txt
index 089a8b288779..61755ac3eb86 100644
--- a/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Shipped.txt
+++ b/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Shipped.txt
@@ -107,13 +107,14 @@ static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnviro
 static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions.IsEnvironment(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment! hostingEnvironment, string! environmentName) -> bool
 static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions.IsProduction(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment! hostingEnvironment) -> bool
 static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostEnvironmentExtensions.IsStaging(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment! hostingEnvironment) -> bool
-static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDelta(string! moduleIdString, byte[]! metadataDelta, byte[]! ilDelta, byte[]! pdbBytes) -> void
+static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDelta(string! moduleIdString, byte[]! metadataDelta, byte[]! ilDelta, byte[]! pdbBytes, int[]? updatedTypes) -> void
 static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.GetApplyUpdateCapabilities() -> string!
 static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestCache(this System.Net.Http.HttpRequestMessage! requestMessage, Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCache requestCache) -> System.Net.Http.HttpRequestMessage!
 static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestCredentials(this System.Net.Http.HttpRequestMessage! requestMessage, Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestCredentials requestCredentials) -> System.Net.Http.HttpRequestMessage!
 static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestIntegrity(this System.Net.Http.HttpRequestMessage! requestMessage, string! integrity) -> System.Net.Http.HttpRequestMessage!
 static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestMode(this System.Net.Http.HttpRequestMessage! requestMessage, Microsoft.AspNetCore.Components.WebAssembly.Http.BrowserRequestMode requestMode) -> System.Net.Http.HttpRequestMessage!
 static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestOption(this System.Net.Http.HttpRequestMessage! requestMessage, string! name, object! value) -> System.Net.Http.HttpRequestMessage!
+static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestStreamingEnabled(this System.Net.Http.HttpRequestMessage! requestMessage, bool streamingEnabled) -> System.Net.Http.HttpRequestMessage!
 static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserResponseStreamingEnabled(this System.Net.Http.HttpRequestMessage! requestMessage, bool streamingEnabled) -> System.Net.Http.HttpRequestMessage!
 static Microsoft.AspNetCore.Components.WebAssembly.Infrastructure.JSInteropMethods.NotifyLocationChanged(string! uri, bool isInterceptedLink) -> void
 static Microsoft.AspNetCore.Components.WebAssembly.Infrastructure.JSInteropMethods.NotifyLocationChanged(string! uri, string? state, bool isInterceptedLink) -> void
diff --git a/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Unshipped.txt b/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Unshipped.txt
index adb79668cc5b..7cfa4804d26b 100644
--- a/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Unshipped.txt
+++ b/src/Components/WebAssembly/WebAssembly/src/PublicAPI.Unshipped.txt
@@ -1,4 +1,8 @@
 #nullable enable
-*REMOVED*static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDelta(string! moduleIdString, byte[]! metadataDelta, byte[]! ilDelta, byte[]! pdbBytes) -> void
-static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDelta(string! moduleIdString, byte[]! metadataDelta, byte[]! ilDelta, byte[]! pdbBytes, int[]? updatedTypes) -> void
-static Microsoft.AspNetCore.Components.WebAssembly.Http.WebAssemblyHttpRequestMessageExtensions.SetBrowserRequestStreamingEnabled(this System.Net.Http.HttpRequestMessage! requestMessage, bool streamingEnabled) -> System.Net.Http.HttpRequestMessage!
+Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder.UseServiceProviderOptions(Microsoft.Extensions.DependencyInjection.ServiceProviderOptions! options) -> Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder!
+Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilderExtensions
+static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilderExtensions.UseDefaultServiceProvider(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder! builder, System.Action<Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment!, Microsoft.Extensions.DependencyInjection.ServiceProviderOptions!>! configure) -> Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder!
+static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilderExtensions.UseDefaultServiceProvider(this Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder! builder, System.Action<Microsoft.Extensions.DependencyInjection.ServiceProviderOptions!>! configure) -> Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder!
+*REMOVED*Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload
+*REMOVED*static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.ApplyHotReloadDelta(string! moduleIdString, byte[]! metadataDelta, byte[]! ilDelta, byte[]! pdbBytes, int[]? updatedTypes) -> void
+*REMOVED*static Microsoft.AspNetCore.Components.WebAssembly.HotReload.WebAssemblyHotReload.GetApplyUpdateCapabilities() -> string!
diff --git a/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyComponentState.cs b/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyComponentState.cs
new file mode 100644
index 000000000000..fde903ed2872
--- /dev/null
+++ b/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyComponentState.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components.WebAssembly.Rendering;
+
+/// <summary>
+/// Specialized ComponentState for WebAssembly rendering that supports ComponentMarkerKey for state persistence.
+/// </summary>
+internal sealed class WebAssemblyComponentState : ComponentState
+{
+    private readonly WebAssemblyRenderer _renderer;
+
+    public WebAssemblyComponentState(
+        WebAssemblyRenderer renderer,
+        int componentId,
+        IComponent component,
+        ComponentState? parentComponentState)
+        : base(renderer, componentId, component, parentComponentState)
+    {
+        _renderer = renderer;
+    }
+
+    protected override object? GetComponentKey()
+    {
+        var markerKey = _renderer.GetMarkerKey(this);
+
+        // If we have a ComponentMarkerKey, return it for state persistence consistency
+        if (markerKey != default)
+        {
+            return markerKey.Serialized();
+        }
+
+        // Fall back to the default implementation
+        return base.GetComponentKey();
+    }
+}
diff --git a/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs b/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs
index d71cd1d63fcb..242e28ed7ba2 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs
@@ -4,6 +4,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.JavaScript;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.Web.Infrastructure;
@@ -25,6 +27,7 @@ internal sealed partial class WebAssemblyRenderer : WebRenderer
     private readonly Dispatcher _dispatcher;
     private readonly ResourceAssetCollection _resourceCollection;
     private readonly IInternalJSImportMethods _jsMethods;
+    private readonly ComponentStatePersistenceManager _componentStatePersistenceManager;
     private static readonly RendererInfo _componentPlatform = new("WebAssembly", isInteractive: true);
 
     public WebAssemblyRenderer(IServiceProvider serviceProvider, ResourceAssetCollection resourceCollection, ILoggerFactory loggerFactory, JSComponentInterop jsComponentInterop)
@@ -32,6 +35,7 @@ public WebAssemblyRenderer(IServiceProvider serviceProvider, ResourceAssetCollec
     {
         _logger = loggerFactory.CreateLogger<WebAssemblyRenderer>();
         _jsMethods = serviceProvider.GetRequiredService<IInternalJSImportMethods>();
+        _componentStatePersistenceManager = serviceProvider.GetRequiredService<ComponentStatePersistenceManager>();
 
         // if SynchronizationContext.Current is null, it means we are on the single-threaded runtime
         _dispatcher = WebAssemblyDispatcher._mainSynchronizationContext == null
@@ -45,9 +49,20 @@ public WebAssemblyRenderer(IServiceProvider serviceProvider, ResourceAssetCollec
     }
 
     [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "These are root components which belong to the user and are in assemblies that don't get trimmed.")]
-    private void OnUpdateRootComponents(RootComponentOperationBatch batch)
+    private void OnUpdateRootComponents(RootComponentOperationBatch batch, string appState)
     {
         var webRootComponentManager = GetOrCreateWebRootComponentManager();
+        TaskCompletionSource? taskCompletionSource = null;
+        var stateUpdateTask = Task.CompletedTask;
+        var store = !string.IsNullOrEmpty(appState) ? new PrerenderComponentApplicationStore(appState) : null;
+        if (store != null)
+        {
+            taskCompletionSource = new TaskCompletionSource();
+            stateUpdateTask = EnqueueRestore(taskCompletionSource.Task, _componentStatePersistenceManager, store);
+        }
+
+        webRootComponentManager.SetCurrentUpdateTask(stateUpdateTask);
+
         for (var i = 0; i < batch.Operations.Length; i++)
         {
             var operation = batch.Operations[i];
@@ -72,10 +87,21 @@ private void OnUpdateRootComponents(RootComponentOperationBatch batch)
                     break;
             }
         }
+        taskCompletionSource?.SetResult();
+        store?.ExistingState.Clear();
 
         NotifyEndUpdateRootComponents(batch.BatchId);
     }
 
+    private static async Task EnqueueRestore(
+        Task task,
+        ComponentStatePersistenceManager componentStatePersistenceManager,
+        PrerenderComponentApplicationStore store)
+    {
+        await task;
+        await componentStatePersistenceManager.RestoreStateAsync(store, RestoreContext.ValueUpdate);
+    }
+
     protected override IComponentRenderMode? GetComponentRenderMode(IComponent component) => RenderMode.InteractiveWebAssembly;
 
     public void NotifyEndUpdateRootComponents(long batchId)
@@ -191,6 +217,18 @@ protected override IComponent ResolveComponentForRenderMode([DynamicallyAccessed
             _ => throw new NotSupportedException($"Cannot create a component of type '{componentType}' because its render mode '{renderMode}' is not supported by WebAssembly rendering."),
         };
 
+    protected override ComponentState CreateComponentState(int componentId, IComponent component, ComponentState? parentComponentState)
+    {
+        return new WebAssemblyComponentState(this, componentId, component, parentComponentState);
+    }
+
+    internal ComponentMarkerKey GetMarkerKey(WebAssemblyComponentState webAssemblyComponentState)
+    {
+        return webAssemblyComponentState.ParentComponentState != null ?
+            default :
+            _webRootComponentManager!.GetRootComponentKey(webAssemblyComponentState.ComponentId);
+    }
+
     private static partial class Log
     {
         [LoggerMessage(100, LogLevel.Critical, "Unhandled exception rendering component: {Message}", EventName = "ExceptionRenderingComponent")]
diff --git a/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs b/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs
index 6d0ce0b78110..f55739f2bdda 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs
@@ -20,17 +20,18 @@ internal sealed partial class DefaultWebAssemblyJSRuntime : WebAssemblyJSRuntime
 {
     public static readonly DefaultWebAssemblyJSRuntime Instance = new();
 
-    private readonly RootComponentTypeCache _rootComponentCache = new();
+    private readonly RootTypeCache _rootComponentCache = new();
 
     public ElementReferenceContext ElementReferenceContext { get; }
 
-    public event Action<RootComponentOperationBatch>? OnUpdateRootComponents;
+    public event Action<RootComponentOperationBatch, string>? OnUpdateRootComponents;
 
     [DynamicDependency(nameof(InvokeDotNet))]
     [DynamicDependency(nameof(EndInvokeJS))]
     [DynamicDependency(nameof(BeginInvokeDotNet))]
     [DynamicDependency(nameof(ReceiveByteArrayFromJS))]
     [DynamicDependency(nameof(UpdateRootComponentsCore))]
+    [DynamicDependency(JsonSerialized, typeof(KeyValuePair<,>))]
     private DefaultWebAssemblyJSRuntime()
     {
         ElementReferenceContext = new WebElementReferenceContext(this);
@@ -94,12 +95,12 @@ public static void BeginInvokeDotNet(string? callId, string assemblyNameOrDotNet
 
     [SupportedOSPlatform("browser")]
     [JSExport]
-    public static void UpdateRootComponentsCore(string operationsJson)
+    public static void UpdateRootComponentsCore(string operationsJson, string appState)
     {
         try
         {
             var operations = DeserializeOperations(operationsJson);
-            Instance.OnUpdateRootComponents?.Invoke(operations);
+            Instance.OnUpdateRootComponents?.Invoke(operations, appState);
         }
         catch (Exception ex)
         {
@@ -130,7 +131,7 @@ internal static RootComponentOperationBatch DeserializeOperations(string operati
                 throw new InvalidOperationException($"The component operation of type '{operation.Type}' requires a '{nameof(operation.Marker)}' to be specified.");
             }
 
-            var componentType = Instance._rootComponentCache.GetRootComponent(operation.Marker!.Value.Assembly!, operation.Marker.Value.TypeName!)
+            var componentType = Instance._rootComponentCache.GetRootType(operation.Marker!.Value.Assembly!, operation.Marker.Value.TypeName!)
                 ?? throw new InvalidOperationException($"Root component type '{operation.Marker.Value.TypeName}' could not be found in the assembly '{operation.Marker.Value.Assembly}'.");
             var parameters = DeserializeComponentParameters(operation.Marker.Value);
             operation.Descriptor = new(componentType, parameters);
@@ -168,4 +169,7 @@ protected override Task TransmitStreamAsync(long streamId, DotNetStreamReference
 
     string IInternalWebJSInProcessRuntime.InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
         => InvokeJS(identifier, argsJson, resultType, targetInstanceId);
+
+    string IInternalWebJSInProcessRuntime.InvokeJS(in JSInvocationInfo invocationInfo)
+        => InvokeJS(invocationInfo);
 }
diff --git a/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs b/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs
index 4e4d0dc943ee..22ad7d18fffc 100644
--- a/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs
+++ b/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs
@@ -24,6 +24,21 @@ public void GetCultures_ReturnsCultureClosure(string cultureName, string[] expec
         Assert.Equal(expected, actual);
     }
 
+    [Theory]
+    [InlineData("fr-FR", "tzm-Latn-DZ", new[] { "fr-FR", "fr", "tzm-Latn-DZ", "tzm-Latn", "tzm" })]
+    [InlineData("en-US", "en-GB", new[] { "en-US", "en", "en-GB" })]
+    [InlineData("fr-FR", null, new[] { "fr-FR", "fr" })]
+    public void GetCultures_ReturnCultureClosureWithUICulture(string cultureName, string uiCultureName, string[] expected)
+    {
+        // Arrange
+        var culture = cultureName != null ? new CultureInfo(cultureName) : null;
+        var uiCulture = uiCultureName != null ? new CultureInfo(uiCultureName) : null;
+        // Act
+        var actual = WebAssemblyCultureProvider.GetCultures(culture, uiCulture);
+        // Assert
+        Assert.Equal(expected, actual);
+    }
+
     [Fact]
     public void ThrowIfCultureChangeIsUnsupported_ThrowsIfCulturesAreDifferentAndICUShardingIsUsed()
     {
diff --git a/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostBuilderTest.cs b/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostBuilderTest.cs
index 2dec1e6bc51b..901712a21240 100644
--- a/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostBuilderTest.cs
+++ b/src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostBuilderTest.cs
@@ -98,12 +98,9 @@ public void Build_InDevelopment_ConfiguresWithServiceProviderWithScopeValidation
         builder.Services.AddScoped<StringBuilder>();
         builder.Services.AddSingleton<TestServiceThatTakesStringBuilder>();
 
-        // Act
-        var host = builder.Build();
-
-        // Assert
-        Assert.NotNull(host.Services.GetRequiredService<StringBuilder>());
-        Assert.Throws<InvalidOperationException>(() => host.Services.GetRequiredService<TestServiceThatTakesStringBuilder>());
+        // Act & Assert
+        var exception = Assert.Throws<AggregateException>(() => builder.Build());
+        Assert.Contains("Cannot consume scoped service", exception.Message);
     }
 
     [Fact]
@@ -248,4 +245,69 @@ public void Builder_SupportsConfiguringLogging()
         Assert.Equal<ILoggerProvider>(provider.Object, loggerProvider);
 
     }
+
+    [Fact]
+    public void UseDefaultServiceProvider_DetectsCircularDependencies()
+    {
+        // Arrange
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods());
+
+        // Add a circular dependency
+        builder.Services.AddScoped<CircularServiceA>();
+        builder.Services.AddScoped<CircularServiceB>();
+
+        // Act
+        builder.UseDefaultServiceProvider(options =>
+        {
+            options.ValidateOnBuild = true;
+        });
+
+        // Assert
+        var exception = Assert.Throws<AggregateException>(() => builder.Build());
+        Assert.Contains("circular dependency", exception.Message.ToLowerInvariant());
+    }
+
+    [Fact]
+    public void UseDefaultServiceProvider_EnvironmentOverload_WorksCorrectly()
+    {
+        // Arrange
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(environment: "Development"));
+
+        // Act
+        builder.UseDefaultServiceProvider((env, options) =>
+        {
+            options.ValidateOnBuild = env.IsDevelopment();
+        });
+
+        var host = builder.Build();
+
+        // Assert
+        Assert.NotNull(host);
+    }
+
+    [Fact]
+    public void DefaultServiceProviderOptions_InDevelopment_ValidatesOnBuild()
+    {
+        // Arrange
+        var builder = new WebAssemblyHostBuilder(new TestInternalJSImportMethods(environment: "Development"));
+
+        // Add a circular dependency - should throw due to default ValidateOnBuild=true in development
+        builder.Services.AddScoped<CircularServiceA>();
+        builder.Services.AddScoped<CircularServiceB>();
+
+        // Act & Assert
+        var exception = Assert.Throws<AggregateException>(() => builder.Build());
+        Assert.Contains("circular dependency", exception.Message.ToLowerInvariant());
+    }
+
+    // Helper classes for testing circular dependencies
+    private class CircularServiceA
+    {
+        public CircularServiceA(CircularServiceB serviceB) { }
+    }
+
+    private class CircularServiceB
+    {
+        public CircularServiceB(CircularServiceA serviceA) { }
+    }
 }
diff --git a/src/Components/WebAssembly/WebAssembly/test/JSObjectReferenceJsonConverterTest.cs b/src/Components/WebAssembly/WebAssembly/test/JSObjectReferenceJsonConverterTest.cs
index 65aeb2acf662..0467e1ac326e 100644
--- a/src/Components/WebAssembly/WebAssembly/test/JSObjectReferenceJsonConverterTest.cs
+++ b/src/Components/WebAssembly/WebAssembly/test/JSObjectReferenceJsonConverterTest.cs
@@ -44,4 +44,17 @@ public void Read_ReadsJson_IJSInProcessObjectReference()
         // Assert
         Assert.Equal(expectedId, deserialized?.Id);
     }
+
+    [Fact]
+    public void Read_ReturnsNull_WhenIdIsMinusOne()
+    {
+        // Arrange
+        var json = "{\"__jsObjectId\":-1}";
+
+        // Act
+        var deserialized = JsonSerializer.Deserialize<IJSObjectReference>(json, JsonSerializerOptions);
+
+        // Assert
+        Assert.Null(deserialized);
+    }
 }
diff --git a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj
index e5a906e46f4e..2f9ac20c7c09 100644
--- a/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj
+++ b/src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj
@@ -7,7 +7,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <Reference Include="Microsoft.CodeAnalysis.CSharp" />
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebAssembly/WebAssembly/test/PullFromJSDataStreamTest.cs b/src/Components/WebAssembly/WebAssembly/test/PullFromJSDataStreamTest.cs
index 59eafab522be..bfe0f0f7a55a 100644
--- a/src/Components/WebAssembly/WebAssembly/test/PullFromJSDataStreamTest.cs
+++ b/src/Components/WebAssembly/WebAssembly/test/PullFromJSDataStreamTest.cs
@@ -118,7 +118,7 @@ public TestJSRuntime(byte[] data = default)
             _data = data;
         }
 
-        public virtual ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, CancellationToken cancellationToken, object[] args)
+        public virtual ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args)
         {
             Assert.Equal("Blazor._internal.getJSDataStreamChunk", identifier);
             if (typeof(TValue) != typeof(byte[]))
@@ -130,10 +130,26 @@ public TestJSRuntime(byte[] data = default)
             return ValueTask.FromResult((TValue)(object)_data.Skip((int)offset).Take(bytesToRead).ToArray());
         }
 
-        public async ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, object[] args)
-        {
-            return await InvokeAsync<TValue>(identifier, CancellationToken.None, args);
-        }
+        public async ValueTask<TValue> InvokeAsync<TValue>(string identifier, object[] args)
+            => await InvokeAsync<TValue>(identifier, CancellationToken.None, args);
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object[] args)
+            => throw new NotImplementedException();
+
+        public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object[] args)
+            => throw new NotImplementedException();
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier)
+            => throw new NotImplementedException();
+
+        public ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value)
+            => throw new NotImplementedException();
+
+        public ValueTask SetValueAsync<TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+            => throw new NotImplementedException();
     }
 
     class TestJSRuntime_ProvidesInsufficientData : TestJSRuntime
@@ -142,7 +158,7 @@ public TestJSRuntime_ProvidesInsufficientData(byte[] data) : base(data)
         {
         }
 
-        public override ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, CancellationToken cancellationToken, object[] args)
+        public override ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args)
         {
             var offset = (long)args[1];
             var bytesToRead = (int)args[2];
@@ -156,7 +172,7 @@ public TestJSRuntime_ProvidesExcessData(byte[] data) : base(data)
         {
         }
 
-        public override ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, CancellationToken cancellationToken, object[] args)
+        public override ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args)
         {
             var offset = (long)args[1];
             var bytesToRead = (int)args[2];
diff --git a/src/Components/WebAssembly/WebAssembly/test/WebAssemblyHotReloadTest.cs b/src/Components/WebAssembly/WebAssembly/test/WebAssemblyHotReloadTest.cs
deleted file mode 100644
index 525cb3c7ac0e..000000000000
--- a/src/Components/WebAssembly/WebAssembly/test/WebAssemblyHotReloadTest.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Components.RenderTree;
-using Microsoft.Extensions.HotReload;
-
-namespace Microsoft.AspNetCore.Components.WebAssembly.HotReload;
-
-public class WebAssemblyHotReloadTest
-{
-    [Fact]
-    public void WebAssemblyHotReload_DiscoversMetadataHandlers_FromHot()
-    {
-        // Arrange
-        var hotReloadManager = typeof(Renderer).Assembly.GetType("Microsoft.AspNetCore.Components.HotReload.HotReloadManager");
-        Assert.NotNull(hotReloadManager);
-
-        var handlerActions = new HotReloadAgent.UpdateHandlerActions();
-        var logs = new List<string>();
-        var hotReloadAgent = new HotReloadAgent(logs.Add);
-
-        // Act
-        hotReloadAgent.GetHandlerActions(handlerActions, hotReloadManager);
-
-        // Assert
-        Assert.Empty(handlerActions.ClearCache);
-        Assert.Single(handlerActions.UpdateApplication);
-    }
-}
diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj b/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj
index 5ac505c35e96..227013061d9a 100644
--- a/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj
+++ b/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <WasmEnableHotReload>false</WasmEnableHotReload>
     <StaticWebAssetBasePath>/app</StaticWebAssetBasePath>
   </PropertyGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
-    <Reference Include="System.Net.Http.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
index c43a347a6150..382d39138d8c 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <WasmEnableHotReload>false</WasmEnableHotReload>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html
index aef98e3b9c2f..491777ba039b 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html
@@ -16,7 +16,7 @@
     <script>
         Blazor.start({
             loadBootResource: function (type, name, defaultUri, integrity) {
-                return type === 'dotnetjs'
+                return type === 'dotnetjs' || type === 'manifest'
                     ? `${defaultUri}?customizedbootresource=true`
                     : fetch(defaultUri, { integrity: integrity, cache: 'no-cache', headers: { 'customizedbootresource': 'true' } });
             },
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs
index dcd1f2c94325..0dfd3e43bead 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs
@@ -9,11 +9,14 @@ public class BootResourceRequestLog
 {
     private readonly ConcurrentBag<string> _requestPaths = new ConcurrentBag<string>();
 
-    public IReadOnlyCollection<string> RequestPaths => _requestPaths;
+    public IReadOnlyCollection<string> RequestPathsWithNewContent => _requestPaths;
 
-    public void AddRequest(HttpRequest request)
+    public void AddRequest(string originalRequestPath, HttpResponse response)
     {
-        _requestPaths.Add(request.Path);
+        if (response.StatusCode != StatusCodes.Status304NotModified)
+        {
+            _requestPaths.Add(originalRequestPath);
+        }
     }
 
     public void Clear()
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj
index eba5ab363e14..3b727d71c2b8 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj
@@ -14,8 +14,6 @@
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
     <Reference Include="Microsoft.AspNetCore.Diagnostics" />
     <Reference Include="Microsoft.AspNetCore.Mvc" />
-    <!-- Avoid MSB3277 warnings due to dependencies brought in through Microsoft.AspNetCore.Blazor targeting netstandard2.0. -->
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs
index 7225c954e2b8..bf75aad5012d 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs
@@ -24,17 +24,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, BootReso
     {
         var mapAlternativePathApp = Configuration.GetValue<bool>("UseAlternativeBasePath");
         var mapAllApps = Configuration.GetValue<bool>("MapAllApps");
-        app.Use((context, next) =>
+        app.Use(async (context, next) =>
         {
+            string originalRequestPath = context.Request.Path;
+            await next(context);
+
             // This is used by E2E tests to verify that the correct resources were fetched,
             // and that it was possible to override the loading mechanism
             if (context.Request.Query.ContainsKey("customizedbootresource")
-            || context.Request.Headers.ContainsKey("customizedbootresource")
-            || context.Request.Path.Value.EndsWith("/blazor.boot.json", StringComparison.Ordinal))
+            || context.Request.Headers.ContainsKey("customizedbootresource"))
             {
-                bootResourceRequestLog.AddRequest(context.Request);
+                bootResourceRequestLog.AddRequest(originalRequestPath, context.Response);
             }
-            return next(context);
         });
 
         if (env.IsDevelopment())
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
index 16dac3192520..71201aa021ee 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
@@ -1,5 +1,5 @@
 @page "/"
 
-<h1>Hello, world!</h1>
+<h1 id="session-storage-anchor">Hello, world!</h1>
 
 Welcome to your new app.
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj b/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj
index 93e3e9453bce..c43a347a6150 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/StandaloneApp.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
-    <Reference Include="System.Net.Http.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebAssembly/testassets/ThreadingApp.Server/Components/App.razor b/src/Components/WebAssembly/testassets/ThreadingApp.Server/Components/App.razor
index a7282a80e382..0c9090c40ff3 100644
--- a/src/Components/WebAssembly/testassets/ThreadingApp.Server/Components/App.razor
+++ b/src/Components/WebAssembly/testassets/ThreadingApp.Server/Components/App.razor
@@ -19,7 +19,7 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    <script src="_framework/blazor.web.js"></script>
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 
 </html>
diff --git a/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj b/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj
index 7dce100846f6..e9e9491848e3 100644
--- a/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj
+++ b/src/Components/WebAssembly/testassets/ThreadingApp/ThreadingApp.csproj
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
-    <Reference Include="System.Net.Http.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj
index f1be7bc53587..793e251088b9 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj
+++ b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Server/Wasm.Prerendered.Server.csproj
@@ -21,8 +21,6 @@
     <Reference Include="Microsoft.AspNetCore.ResponseCompression" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
-    <!-- Avoid MSB3277 warnings due to dependencies brought in through Microsoft.AspNetCore.Blazor targeting netstandard2.0. -->
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj b/src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj
index a1e10bdc677c..b006f79206a7 100644
--- a/src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj
+++ b/src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj
@@ -5,6 +5,8 @@
     <OutputType>Exe</OutputType>
     <IsShippingPackage>false</IsShippingPackage>
     <SignAssembly>false</SignAssembly>
+    <_WebViewAssetsBasePath>..\..\..\..\..\Web.JS\dist\Release\</_WebViewAssetsBasePath>
+    <_BlazorModulesFilePath>..\..\..\..\WebView\src\blazor.modules.json</_BlazorModulesFilePath>
   </PropertyGroup>
 
   <Import Project="..\..\..\..\WebView\src\buildTransitive\Microsoft.AspNetCore.Components.WebView.props" />
diff --git a/src/Components/WebView/WebView/src/ComponentsWebViewServiceCollectionExtensions.cs b/src/Components/WebView/WebView/src/ComponentsWebViewServiceCollectionExtensions.cs
index 678d0284ccce..460727f62051 100644
--- a/src/Components/WebView/WebView/src/ComponentsWebViewServiceCollectionExtensions.cs
+++ b/src/Components/WebView/WebView/src/ComponentsWebViewServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebView.Services;
@@ -28,6 +29,8 @@ public static IServiceCollection AddBlazorWebView(this IServiceCollection servic
         services.TryAddScoped<IScrollToLocationHash, WebViewScrollToLocationHash>();
         services.TryAddScoped<NavigationManager, WebViewNavigationManager>();
         services.TryAddScoped<IErrorBoundaryLogger, WebViewErrorBoundaryLogger>();
+        services.TryAddScoped<ComponentStatePersistenceManager>();
+        services.TryAddScoped<PersistentComponentState>(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
         services.AddSupplyValueFromQueryProvider();
 
         return services;
diff --git a/src/Components/WebView/WebView/src/FileExtensionContentTypeProvider.cs b/src/Components/WebView/WebView/src/FileExtensionContentTypeProvider.cs
index eff1aa662bf5..dd965039c55a 100644
--- a/src/Components/WebView/WebView/src/FileExtensionContentTypeProvider.cs
+++ b/src/Components/WebView/WebView/src/FileExtensionContentTypeProvider.cs
@@ -58,6 +58,7 @@ public FileExtensionContentTypeProvider()
                 { ".atom", "application/atom+xml" },
                 { ".au", "audio/basic" },
                 { ".avi", "video/x-msvideo" },
+                { ".avif", "image/avif" },
                 { ".axs", "application/olescript" },
                 { ".bas", "text/plain" },
                 { ".bcpio", "application/x-bcpio" },
diff --git a/src/Components/WebView/WebView/src/IpcSender.cs b/src/Components/WebView/WebView/src/IpcSender.cs
index 60edbd12a8c0..0df2f54f5fc8 100644
--- a/src/Components/WebView/WebView/src/IpcSender.cs
+++ b/src/Components/WebView/WebView/src/IpcSender.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.ExceptionServices;
 using Microsoft.AspNetCore.Components.RenderTree;
-using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.WebView;
 
@@ -49,9 +49,17 @@ public void AttachToDocument(int componentId, string selector)
         DispatchMessageWithErrorHandling(IpcCommon.Serialize(IpcCommon.OutgoingMessageType.AttachToDocument, componentId, selector));
     }
 
-    public void BeginInvokeJS(long taskId, string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+    public void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
-        DispatchMessageWithErrorHandling(IpcCommon.Serialize(IpcCommon.OutgoingMessageType.BeginInvokeJS, taskId, identifier, argsJson, resultType, targetInstanceId));
+        DispatchMessageWithErrorHandling(IpcCommon.Serialize(
+            IpcCommon.OutgoingMessageType.BeginInvokeJS,
+            invocationInfo.AsyncHandle,
+            invocationInfo.Identifier,
+            invocationInfo.ArgsJson,
+            invocationInfo.ResultType,
+            invocationInfo.TargetInstanceId,
+            invocationInfo.CallType
+        ));
     }
 
     public void EndInvokeDotNet(string callId, bool success, string invocationResultOrError)
diff --git a/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj b/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
index 36045adf9ebd..b7885017574a 100644
--- a/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
+++ b/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <Description>Build desktop applications with Blazor and a webview.</Description>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
     <EmbeddedFilesManifestFileName>Microsoft.Extensions.FileProviders.Embedded.Manifest.xml</EmbeddedFilesManifestFileName>
     <IsShippingPackage>true</IsShippingPackage>
     <DefineConstants>$(DefineConstants);BLAZOR_WEBVIEW</DefineConstants>
@@ -63,19 +62,15 @@
     <BlazorWebViewJSFile Condition=" '$(Configuration)' != 'Debug' ">..\..\..\Web.JS\dist\Release\$(BlazorWebViewJSFilename)</BlazorWebViewJSFile>
   </PropertyGroup>
 
-  <!-- blazor.webview.js should exist after eng/Npm.Workspace.nodeproj builds. Fall back if not. -->
+  <!-- blazor.webview.js should exist after eng/Npm.Workspace.nodeproj builds. Warn if not. -->
   <Target Name="_CheckBlazorWebViewJSPath" AfterTargets="ResolveProjectReferences" Condition=" !EXISTS('$(BlazorWebViewJSFile)') ">
-    <Warning Text="'$(BlazorWebViewJSFile)' does not exist. Falling back to checked-in copy." />
-    <PropertyGroup>
-      <BlazorWebViewJSFile>..\..\..\Web.JS\dist\Release\$(BlazorWebViewJSFilename)</BlazorWebViewJSFile>
-    </PropertyGroup>
+    <Warning Text="'$(BlazorWebViewJSFile)' does not exist and won't be included in the build." />
   </Target>
 
   <Target Name="_AddEmbeddedBlazorWebView" BeforeTargets="_CalculateEmbeddedFilesManifestInputs" DependsOnTargets="_CheckBlazorWebViewJSPath">
     <ItemGroup>
-      <EmbeddedResource Include="blazor.modules.json" LogicalName="_framework/blazor.modules.json" />
-      <EmbeddedResource Include="$(BlazorWebViewJSFile)" LogicalName="_framework/$(BlazorWebViewJSFilename)" />
-      <EmbeddedResource Include="$(BlazorWebViewJSFile).map" LogicalName="_framework/$(BlazorWebViewJSFilename).map" Condition="Exists('$(BlazorWebViewJSFile).map')" />
+      <Content Include="$(BlazorWebViewJSFile)" Condition="EXISTS('$(BlazorWebViewJSFile)')" Pack="true" PackagePath="staticwebassets/$(BlazorWebViewJSFilename)" />
+      <Content Include="blazor.modules.json" Pack="true" PackagePath="staticwebassets/blazor.modules.json" />
     </ItemGroup>
   </Target>
 
diff --git a/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs b/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
index 6633bbb4bc5b..7295575068cf 100644
--- a/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
+++ b/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
@@ -29,13 +29,28 @@ public void AttachToWebView(IpcSender ipcSender)
     public JsonSerializerOptions ReadJsonSerializerOptions() => JsonSerializerOptions;
 
     protected override void BeginInvokeJS(long taskId, string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+    {
+        var invocationInfo = new JSInvocationInfo
+        {
+            AsyncHandle = taskId,
+            Identifier = identifier,
+            ArgsJson = argsJson,
+            CallType = JSCallType.FunctionCall,
+            ResultType = resultType,
+            TargetInstanceId = targetInstanceId,
+        };
+
+        BeginInvokeJS(invocationInfo);
+    }
+
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
         if (_ipcSender is null)
         {
             throw new InvalidOperationException("Cannot invoke JavaScript outside of a WebView context.");
         }
 
-        _ipcSender.BeginInvokeJS(taskId, identifier, argsJson, resultType, targetInstanceId);
+        _ipcSender.BeginInvokeJS(invocationInfo);
     }
 
     protected override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
diff --git a/src/Components/WebView/WebView/src/StaticContentProvider.cs b/src/Components/WebView/WebView/src/StaticContentProvider.cs
index a2283943a182..8fb7fd80cc8b 100644
--- a/src/Components/WebView/WebView/src/StaticContentProvider.cs
+++ b/src/Components/WebView/WebView/src/StaticContentProvider.cs
@@ -12,8 +12,6 @@ internal sealed class StaticContentProvider
     private readonly Uri _appBaseUri;
     private readonly string _hostPageRelativePath;
     private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new();
-    private static readonly ManifestEmbeddedFileProvider _manifestProvider =
-        new ManifestEmbeddedFileProvider(typeof(StaticContentProvider).Assembly);
 
     public StaticContentProvider(IFileProvider fileProvider, Uri appBaseUri, string hostPageRelativePath)
     {
@@ -34,8 +32,7 @@ public bool TryGetResponseContent(string requestUri, bool allowFallbackOnHostPag
             // If there's no match, fall back on serving embedded framework content
             string contentType;
             var found = TryGetFromFileProvider(relativePath, out content, out contentType)
-                || (allowFallbackOnHostPage && TryGetFromFileProvider(_hostPageRelativePath, out content, out contentType))
-                || TryGetFrameworkFile(relativePath, out content, out contentType);
+                || (allowFallbackOnHostPage && TryGetFromFileProvider(_hostPageRelativePath, out content, out contentType));
 
             if (found)
             {
@@ -83,23 +80,6 @@ private bool TryGetFromFileProvider(string relativePath, out Stream content, out
         return false;
     }
 
-    private static bool TryGetFrameworkFile(string relativePath, out Stream content, out string contentType)
-    {
-        // We're not trying to simulate everything a real webserver does. We don't need to
-        // support querystring parameters, for example. It's enough to require an exact match.
-        var file = _manifestProvider.GetFileInfo(relativePath);
-        if (file.Exists)
-        {
-            content = file.CreateReadStream();
-            contentType = GetResponseContentTypeOrDefault(relativePath);
-            return true;
-        }
-
-        content = default;
-        contentType = default;
-        return false;
-    }
-
     private static string GetResponseContentTypeOrDefault(string path)
         => ContentTypeProvider.TryGetContentType(path, out var matchedContentType)
         ? matchedContentType
diff --git a/src/Components/WebView/WebView/src/build/Microsoft.AspNetCore.Components.WebView.props b/src/Components/WebView/WebView/src/build/Microsoft.AspNetCore.Components.WebView.props
index f43c2047fb31..a623b88b4049 100644
--- a/src/Components/WebView/WebView/src/build/Microsoft.AspNetCore.Components.WebView.props
+++ b/src/Components/WebView/WebView/src/build/Microsoft.AspNetCore.Components.WebView.props
@@ -1,5 +1,56 @@
 <Project>
   <PropertyGroup>
-    <JSModuleManifestRelativePath>_framework/blazor.modules.json</JSModuleManifestRelativePath>    
+    <JSModuleManifestRelativePath>_framework/blazor.modules.json</JSModuleManifestRelativePath>
+    <CompressionEnabled>false</CompressionEnabled>
   </PropertyGroup>
+  <PropertyGroup>
+    <ResolveStaticWebAssetsInputsDependsOn>
+      $(ResolveStaticWebAssetsInputsDependsOn);
+      _AddBlazorWebViewAssets;
+    </ResolveStaticWebAssetsInputsDependsOn>
+  </PropertyGroup>
+
+  <Target Name="_AddBlazorWebViewAssets" DependsOnTargets="GenerateJSModuleManifestBuildStaticWebAssets">
+    <PropertyGroup>
+      <_WebViewAssetsBasePath Condition="'$(_WebViewAssetsBasePath)' == ''">$(MSBuildThisFileDirectory)..\staticwebassets\</_WebViewAssetsBasePath>
+      <_BlazorWebViewJsPath>$(_WebViewAssetsBasePath)blazor.webview.js</_BlazorWebViewJsPath>
+      <_BlazorWebViewModulesJsonPath>$(_WebViewAssetsBasePath)blazor.modules.json</_BlazorWebViewModulesJsonPath>
+    </PropertyGroup>
+    <ItemGroup>
+      <_WebViewAssetCandidates Include="$(_BlazorWebViewJsPath)">
+        <RelativePath>_framework/blazor.webview.js</RelativePath>
+      </_WebViewAssetCandidates>
+      <_WebViewAssetCandidates Include="$(_BlazorWebViewModulesJsonPath)" Condition="'@(_ExistingBuildJSModules)' == ''">
+        <RelativePath>_framework/blazor.modules.json</RelativePath>
+      </_WebViewAssetCandidates>
+
+      <_MissingWebViewAssetCandidates
+        Include="@(_WebViewAssetCandidates)"
+        Condition="!EXISTS('%(Identity)')" />
+      <_WebViewAssetCandidates Remove="@(_MissingWebViewAssetCandidates)" />
+    </ItemGroup>
+
+    <Message
+      Importance="High"
+      Condition="'@(_MissingWebViewAssetCandidates->Count())' != '0'"
+      Text="WebView asset '%(_MissingWebViewAssetCandidates.Identity)' could not be found and won't be included in the project." />
+
+    <DefineStaticWebAssets
+      CandidateAssets="@(_WebViewAssetCandidates)"
+      SourceId="$(PackageId)"
+      ContentRoot="$(_WebViewAssetsBasePath)"
+      SourceType="Discovered"
+      AssetKind="All"
+      AssetMode="All"
+      AssetRole="Primary"
+      FingerprintCandidates="true"
+      BasePath="/">
+      <Output TaskParameter="Assets" ItemName="_WebViewFrameworkStaticWebAsset" />
+    </DefineStaticWebAssets>
+
+    <ItemGroup>
+      <StaticWebAsset Include="@(_WebViewFrameworkStaticWebAsset)" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/Components/WebView/WebView/test/ComponentsWebViewServiceCollectionExtensionsTests.cs b/src/Components/WebView/WebView/test/ComponentsWebViewServiceCollectionExtensionsTests.cs
new file mode 100644
index 000000000000..fade84f452df
--- /dev/null
+++ b/src/Components/WebView/WebView/test/ComponentsWebViewServiceCollectionExtensionsTests.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Components.WebView;
+
+public class ComponentsWebViewServiceCollectionExtensionsTests
+{
+    [Fact]
+    public void AddBlazorWebView_RegistersPersistentComponentStateServices()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddBlazorWebView();
+        var serviceProvider = services.BuildServiceProvider();
+
+        // Assert
+        var persistenceManager = serviceProvider.GetService<ComponentStatePersistenceManager>();
+        var persistentState = serviceProvider.GetService<PersistentComponentState>();
+
+        Assert.NotNull(persistenceManager);
+        Assert.NotNull(persistentState);
+        Assert.Same(persistenceManager.State, persistentState);
+    }
+
+    [Fact]
+    public void AddBlazorWebView_RegistersServicesAsScoped()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddBlazorWebView();
+
+        // Assert
+        var persistenceManagerDescriptor = services.FirstOrDefault(s => s.ServiceType == typeof(ComponentStatePersistenceManager));
+        var persistentStateDescriptor = services.FirstOrDefault(s => s.ServiceType == typeof(PersistentComponentState));
+
+        Assert.NotNull(persistenceManagerDescriptor);
+        Assert.NotNull(persistentStateDescriptor);
+        Assert.Equal(ServiceLifetime.Scoped, persistenceManagerDescriptor.Lifetime);
+        Assert.Equal(ServiceLifetime.Scoped, persistentStateDescriptor.Lifetime);
+    }
+}
\ No newline at end of file
diff --git a/src/Components/WebView/WebView/test/Infrastructure/AssertHelpers.cs b/src/Components/WebView/WebView/test/Infrastructure/AssertHelpers.cs
index 1a1338d13b28..3a625353eeee 100644
--- a/src/Components/WebView/WebView/test/Infrastructure/AssertHelpers.cs
+++ b/src/Components/WebView/WebView/test/Infrastructure/AssertHelpers.cs
@@ -1,7 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+using System.Text.Json;
 using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.WebView;
 
@@ -11,7 +14,7 @@ internal static void IsAttachWebRendererInteropMessage(string message)
     {
         Assert.True(IpcCommon.TryDeserializeOutgoing(message, out var messageType, out var args));
         Assert.Equal(IpcCommon.OutgoingMessageType.BeginInvokeJS, messageType);
-        Assert.Equal(5, args.Count);
+        Assert.Equal(6, args.Count);
         Assert.Equal("Blazor._internal.attachWebRendererInterop", args[1].GetString());
     }
 
diff --git a/src/Components/benchmarkapps/Wasm.Performance/README.md b/src/Components/benchmarkapps/Wasm.Performance/README.md
index 7c5520304c10..db9c0996eb9e 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/README.md
+++ b/src/Components/benchmarkapps/Wasm.Performance/README.md
@@ -7,7 +7,7 @@ See https://github.com/aspnet/Benchmarks#benchmarks for usage guidance on using
 
 The TestApp is a regular BlazorWASM project and can be run using `dotnet run`. The Driver is an app that uses Playwright to launch a browser and run the test app, reporting benchmark results in Crank's protocol format. You generally do not need to run the Driver locally, you can do so if needed via `dotnet run`.
 
-The benchmark app can also be run using [Crank](https://github.com/dotnet/crank?tab=readme-ov-file). To run the benchmark app in the Benchmark server, follow the Crank installation steps and then run:
+The benchmark app can also be run using [Crank](https://github.com/dotnet/crank?tab=readme-ov-file). To run the benchmark app in the Benchmark server, follow the Crank installation steps, connect to the VPN and then run:
 
 ```
 crank --config https://github.com/dotnet/aspnetcore/blob/main/src/Components/benchmarkapps/Wasm.Performance/benchmarks.compose.json?raw=true --config https://github.com/aspnet/Benchmarks/blob/main/scenarios/aspnet.profiles.yml?raw=true --scenario blazorwasmbenchmark --profile aspnet-perf-lin
diff --git a/src/Components/benchmarkapps/Wasm.Performance/dockerfile b/src/Components/benchmarkapps/Wasm.Performance/dockerfile
index 0b83910ff3ee..77b82df53363 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/dockerfile
+++ b/src/Components/benchmarkapps/Wasm.Performance/dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:latest AS build
 
 ENV StressRunDuration=0
 ARG DEBIAN_FRONTEND=noninteractive
@@ -29,8 +29,7 @@ RUN .dotnet/dotnet publish -c Release -r linux-x64 --sc true -o /app ./src/Compo
 RUN chmod +x /app/Wasm.Performance.Driver
 
 WORKDIR /app
-
-FROM mcr.microsoft.com/playwright/dotnet:v1.45.1-jammy-amd64 AS final
+FROM mcr.microsoft.com/playwright/dotnet:v1.54.0-jammy-amd64 AS final
 COPY --from=build ./app ./
 COPY ./exec.sh ./
 
diff --git a/src/Components/dotnet-runtime-js/dotnet.d.ts b/src/Components/dotnet-runtime-js/dotnet.d.ts
index 1fc6e2952fe2..07428895e9d4 100644
--- a/src/Components/dotnet-runtime-js/dotnet.d.ts
+++ b/src/Components/dotnet-runtime-js/dotnet.d.ts
@@ -1,7 +1,7 @@
 //! Licensed to the .NET Foundation under one or more agreements.
 //! The .NET Foundation licenses this file to you under the MIT license.
 //!
-//! This is generated file, see src/mono/wasm/runtime/rollup.config.js
+//! This is generated file, see src/mono/browser/runtime/rollup.config.js
 
 //! This is not considered public API with backward compatibility guarantees. 
 
@@ -18,26 +18,9 @@ declare interface Int32Ptr extends NativePointer {
     __brand: "Int32Ptr";
 }
 declare interface EmscriptenModule {
-    /** @deprecated Please use growableHeapI8() instead.*/
-    HEAP8: Int8Array;
-    /** @deprecated Please use growableHeapI16() instead.*/
-    HEAP16: Int16Array;
-    /** @deprecated Please use growableHeapI32() instead. */
-    HEAP32: Int32Array;
-    /** @deprecated Please use growableHeapI64() instead. */
-    HEAP64: BigInt64Array;
-    /** @deprecated Please use growableHeapU8() instead. */
-    HEAPU8: Uint8Array;
-    /** @deprecated Please use growableHeapU16() instead. */
-    HEAPU16: Uint16Array;
-    /** @deprecated Please use growableHeapU32() instead */
-    HEAPU32: Uint32Array;
-    /** @deprecated Please use growableHeapF32() instead */
-    HEAPF32: Float32Array;
-    /** @deprecated Please use growableHeapF64() instead. */
-    HEAPF64: Float64Array;
     _malloc(size: number): VoidPtr;
     _free(ptr: VoidPtr): void;
+    _sbrk(size: number): VoidPtr;
     out(message: string): void;
     err(message: string): void;
     ccall<T>(ident: string, returnType?: string | null, argTypes?: string[], args?: any[], opts?: any): T;
@@ -49,6 +32,7 @@ declare interface EmscriptenModule {
     UTF8ToString(ptr: CharPtr, maxBytesToRead?: number): string;
     UTF8ArrayToString(u8Array: Uint8Array, idx?: number, maxBytesToRead?: number): string;
     stringToUTF8Array(str: string, heap: Uint8Array, outIdx: number, maxBytesToWrite: number): void;
+    lengthBytesUTF8(str: string): number;
     FS_createPath(parent: string, path: string, canRead?: boolean, canWrite?: boolean): string;
     FS_createDataFile(parent: string, name: string, data: TypedArray, canRead: boolean, canWrite: boolean, canOwn?: boolean): string;
     addFunction(fn: Function, signature: string): number;
@@ -72,26 +56,83 @@ type InstantiateWasmCallBack = (imports: WebAssembly.Imports, successCallback: I
 declare type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
 
 interface DotnetHostBuilder {
+    /**
+     * @param config default values for the runtime configuration. It will be merged with the default values.
+     * Note that if you provide resources and don't provide custom configSrc URL, the dotnet.boot.js will be downloaded and applied by default.
+     */
     withConfig(config: MonoConfig): DotnetHostBuilder;
+    /**
+     * @param configSrc URL to the configuration file. ./dotnet.boot.js is a default config file location.
+     */
     withConfigSrc(configSrc: string): DotnetHostBuilder;
+    /**
+     * "command line" arguments for the Main() method.
+     * @param args
+     */
     withApplicationArguments(...args: string[]): DotnetHostBuilder;
+    /**
+     * Sets the environment variable for the "process"
+     */
     withEnvironmentVariable(name: string, value: string): DotnetHostBuilder;
+    /**
+     * Sets the environment variables for the "process"
+     */
     withEnvironmentVariables(variables: {
         [i: string]: string;
     }): DotnetHostBuilder;
+    /**
+     * Sets the "current directory" for the "process" on the virtual file system.
+     */
     withVirtualWorkingDirectory(vfsPath: string): DotnetHostBuilder;
+    /**
+     * @param enabled if "true", writes diagnostic messages during runtime startup and execution to the browser console.
+     */
     withDiagnosticTracing(enabled: boolean): DotnetHostBuilder;
+    /**
+     * @param level
+     * level > 0 enables debugging and sets the logging level to debug
+     * level == 0 disables debugging and enables interpreter optimizations
+     * level < 0 enables debugging and disables debug logging.
+     */
     withDebugging(level: number): DotnetHostBuilder;
+    /**
+     * @param mainAssemblyName Sets the name of the assembly with the Main() method. Default is the same as the .csproj name.
+     */
     withMainAssembly(mainAssemblyName: string): DotnetHostBuilder;
+    /**
+     * Supply "command line" arguments for the Main() method from browser query arguments named "arg". Eg. `index.html?arg=A&arg=B&arg=C`.
+     * @param args
+     */
     withApplicationArgumentsFromQuery(): DotnetHostBuilder;
+    /**
+     * Sets application environment, such as "Development", "Staging", "Production", etc.
+     */
     withApplicationEnvironment(applicationEnvironment?: string): DotnetHostBuilder;
+    /**
+     * Sets application culture. This is a name specified in the BCP 47 format. See https://tools.ietf.org/html/bcp47
+     */
     withApplicationCulture(applicationCulture?: string): DotnetHostBuilder;
     /**
      * Overrides the built-in boot resource loading mechanism so that boot resources can be fetched
      * from a custom source, such as an external CDN.
      */
     withResourceLoader(loadBootResource?: LoadBootResourceCallback): DotnetHostBuilder;
+    /**
+     * Downloads all the assets but doesn't create the runtime instance.
+     */
+    download(): Promise<void>;
+    /**
+     * Starts the runtime and returns promise of the API object.
+     */
     create(): Promise<RuntimeAPI>;
+    /**
+     * Runs the Main() method of the application and exits the runtime.
+     * You can provide "command line" arguments for the Main() method using
+     * - dotnet.withApplicationArguments(["A", "B", "C"])
+     * - dotnet.withApplicationArgumentsFromQuery()
+     * Note: after the runtime exits, it would reject all further calls to the API.
+     * You can use runMain() if you want to keep the runtime alive.
+     */
     run(): Promise<number>;
 }
 type MonoConfig = {
@@ -129,6 +170,18 @@ type MonoConfig = {
      * Gets a value that determines whether to enable caching of the 'resources' inside a CacheStorage instance within the browser.
      */
     cacheBootResources?: boolean;
+    /**
+     * Delay of the purge of the cached resources in milliseconds. Default is 10000 (10 seconds).
+     */
+    cachedResourcesPurgeDelay?: number;
+    /**
+     * Configures use of the `integrity` directive for fetching assets
+     */
+    disableIntegrityCheck?: boolean;
+    /**
+     * Configures use of the `no-cache` directive for fetching assets
+     */
+    disableNoCacheFetch?: boolean;
     /**
     * Enables diagnostic log messages during startup
     */
@@ -139,14 +192,34 @@ type MonoConfig = {
     environmentVariables?: {
         [i: string]: string;
     };
+    /**
+     * Subset of runtimeconfig.json
+     */
+    runtimeConfig?: {
+        runtimeOptions?: {
+            configProperties?: {
+                [i: string]: string | number | boolean;
+            };
+        };
+    };
     /**
      * initial number of workers to add to the emscripten pthread pool
      */
-    pthreadPoolSize?: number;
+    pthreadPoolInitialSize?: number;
     /**
-     * If true, the snapshot of runtime's memory will be stored in the browser and used for faster startup next time. Default is false.
+     * number of unused workers kept in the emscripten pthread pool after startup
      */
-    startupMemoryCache?: boolean;
+    pthreadPoolUnusedSize?: number;
+    /**
+     * If true, a list of the methods optimized by the interpreter will be saved and used for faster startup
+     *  on future runs of the application
+     */
+    interpreterPgo?: boolean;
+    /**
+     * Configures how long to wait before saving the interpreter PGO list. If your application takes
+     *  a while to start you should adjust this value.
+     */
+    interpreterPgoSaveDelay?: number;
     /**
      * application environment
      */
@@ -169,17 +242,31 @@ type MonoConfig = {
     extensions?: {
         [name: string]: any;
     };
+    /**
+     * This is initial working directory for the runtime on the virtual file system. Default is "/".
+     */
+    virtualWorkingDirectory?: string;
+    /**
+     * This is the arguments to the Main() method of the program when called with dotnet.run() Default is [].
+     * Note: RuntimeAPI.runMain() and RuntimeAPI.runMainAndExit() will replace this value, if they provide it.
+     */
+    applicationArguments?: string[];
 };
 type ResourceExtensions = {
     [extensionName: string]: ResourceList;
 };
 interface ResourceGroups {
     hash?: string;
+    fingerprinting?: {
+        [name: string]: string;
+    };
+    coreAssembly?: ResourceList;
     assembly?: ResourceList;
     lazyAssembly?: ResourceList;
+    corePdb?: ResourceList;
     pdb?: ResourceList;
     jsModuleWorker?: ResourceList;
-    jsModuleGlobalization?: ResourceList;
+    jsModuleDiagnostics?: ResourceList;
     jsModuleNative: ResourceList;
     jsModuleRuntime: ResourceList;
     wasmSymbols?: ResourceList;
@@ -191,6 +278,9 @@ interface ResourceGroups {
     modulesAfterConfigLoaded?: ResourceList;
     modulesAfterRuntimeReady?: ResourceList;
     extensions?: ResourceExtensions;
+    coreVfs?: {
+        [virtualPath: string]: ResourceList;
+    };
     vfs?: {
         [virtualPath: string]: ResourceList;
     };
@@ -208,22 +298,36 @@ type ResourceList = {
  * @param name The name of the resource to be loaded.
  * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
  * @param integrity The integrity string representing the expected content in the response.
+ * @param behavior The detailed behavior/type of the resource to be loaded.
  * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
  * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
  */
-type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
-interface ResourceRequest {
-    name: string;
-    behavior: AssetBehaviors;
-    resolvedUrl?: string;
-    hash?: string | null | "";
-}
+type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | Promise<BootModule> | null | undefined;
+type BootModule = {
+    config: MonoConfig;
+};
 interface LoadingResource {
     name: string;
     url: string;
     response: Promise<Response>;
 }
-interface AssetEntry extends ResourceRequest {
+interface AssetEntry {
+    /**
+     * the name of the asset, including extension.
+     */
+    name: string;
+    /**
+     * determines how the asset will be handled once loaded
+     */
+    behavior: AssetBehaviors;
+    /**
+     * this should be absolute url to the asset
+     */
+    resolvedUrl?: string;
+    /**
+     * the integrity hash of the asset (if any)
+     */
+    hash?: string | null | "";
     /**
      * If specified, overrides the path of the asset in the virtual filesystem and similar data structures once downloaded.
      */
@@ -244,7 +348,12 @@ interface AssetEntry extends ResourceRequest {
      * If provided, runtime doesn't have to fetch the data.
      * Runtime would set the buffer to null after instantiation to free the memory.
      */
-    buffer?: ArrayBuffer;
+    buffer?: ArrayBuffer | Promise<ArrayBuffer>;
+    /**
+     * If provided, runtime doesn't have to import it's JavaScript modules.
+     * This will not work for multi-threaded runtime.
+     */
+    moduleExports?: any | Promise<any>;
     /**
      * It's metadata + fetch-like Promise<Response>
      * If provided, the runtime doesn't have to initiate the download. It would just await the response.
@@ -253,7 +362,7 @@ interface AssetEntry extends ResourceRequest {
 }
 type SingleAssetBehaviors = 
 /**
- * The binary of the dotnet runtime.
+ * The binary of the .NET runtime.
  */
 "dotnetwasm"
 /**
@@ -264,6 +373,10 @@ type SingleAssetBehaviors =
  * The javascript module for threads.
  */
  | "js-module-threads"
+/**
+ * The javascript module for diagnostic server and client.
+ */
+ | "js-module-diagnostics"
 /**
  * The javascript module for runtime.
  */
@@ -273,13 +386,13 @@ type SingleAssetBehaviors =
  */
  | "js-module-native"
 /**
- * The javascript module for hybrid globalization.
+ * Typically dotnet.boot.js
  */
- | "js-module-globalization"
+ | "manifest"
 /**
- * Typically blazor.boot.json
+ * The debugging symbols
  */
- | "manifest";
+ | "symbols";
 type AssetBehaviors = SingleAssetBehaviors | 
 /**
  * Load asset as a managed resource assembly.
@@ -308,11 +421,7 @@ type AssetBehaviors = SingleAssetBehaviors |
 /**
  * The javascript module that came from nuget package .
  */
- | "js-module-library-initializer"
-/**
- * The javascript module for threads.
- */
- | "symbols";
+ | "js-module-library-initializer";
 declare const enum GlobalizationMode {
     /**
      * Load sharded ICU data.
@@ -329,14 +438,9 @@ declare const enum GlobalizationMode {
     /**
      * Use user defined icu file.
      */
-    Custom = "custom",
-    /**
-     * Operate in hybrid globalization mode with small ICU files, using native platform functions.
-     */
-    Hybrid = "hybrid"
+    Custom = "custom"
 }
 type DotnetModuleConfig = {
-    disableDotnet6Compatibility?: boolean;
     config?: MonoConfig;
     configSrc?: string;
     onConfigLoaded?: (config: MonoConfig) => void | Promise<void>;
@@ -345,57 +449,237 @@ type DotnetModuleConfig = {
     imports?: any;
     exports?: string[];
 } & Partial<EmscriptenModule>;
-type APIType = {
-    runMain: (mainAssemblyName: string, args: string[]) => Promise<number>;
-    runMainAndExit: (mainAssemblyName: string, args: string[]) => Promise<number>;
+type RunAPIType = {
+    /**
+     * Runs the Main() method of the application.
+     * Note: this will keep the .NET runtime alive and the APIs will be available for further calls.
+     * @param mainAssemblyName name of the assembly with the Main() method. Optional. Default is the same as the .csproj name.
+     * @param args command line arguments for the Main() method. Optional.
+     * @returns exit code of the Main() method.
+     */
+    runMain: (mainAssemblyName?: string, args?: string[]) => Promise<number>;
+    /**
+     * Runs the Main() method of the application and exits the runtime.
+     * Note: after the runtime exits, it would reject all further calls to the API.
+     * @param mainAssemblyName name of the assembly with the Main() method. Optional. Default is the same as the .csproj name.
+     * @param args command line arguments for the Main() method. Optional.
+     * @returns exit code of the Main() method.
+     */
+    runMainAndExit: (mainAssemblyName?: string, args?: string[]) => Promise<number>;
+    /**
+     * Exits the runtime.
+     * Note: after the runtime exits, it would reject all further calls to the API.
+     * @param code "process" exit code.
+     * @param reason could be a string or an Error object.
+     */
+    exit: (code: number, reason?: any) => void;
+    /**
+     * Sets the environment variable for the "process"
+     * @param name
+     * @param value
+     */
     setEnvironmentVariable: (name: string, value: string) => void;
+    /**
+     * Returns the [JSExport] methods of the assembly with the given name
+     * @param assemblyName
+     */
     getAssemblyExports(assemblyName: string): Promise<any>;
+    /**
+     * Provides functions which could be imported by the managed code using [JSImport]
+     * @param moduleName maps to the second parameter of [JSImport]
+     * @param moduleImports object with functions which could be imported by the managed code. The keys map to the first parameter of [JSImport]
+     */
     setModuleImports(moduleName: string, moduleImports: any): void;
+    /**
+     * Returns the configuration object used to start the runtime.
+     */
     getConfig: () => MonoConfig;
+    /**
+     * Executes scripts which were loaded during runtime bootstrap.
+     * You can register the scripts using MonoConfig.resources.modulesAfterConfigLoaded and MonoConfig.resources.modulesAfterRuntimeReady.
+     */
     invokeLibraryInitializers: (functionName: string, args: any[]) => Promise<void>;
+};
+type MemoryAPIType = {
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapB32: (offset: NativePointer, value: number | boolean) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
+    setHeapB8: (offset: NativePointer, value: number | boolean) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapU8: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapU16: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapU32: (offset: NativePointer, value: NativePointer | number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapI8: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapI16: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapI32: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapI52: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapU52: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapI64Big: (offset: NativePointer, value: bigint) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapF32: (offset: NativePointer, value: number) => void;
+    /**
+     * Writes to the WASM linear memory
+     */
     setHeapF64: (offset: NativePointer, value: number) => void;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapB32: (offset: NativePointer) => boolean;
+    /**
+     * Reads from the WASM linear memory
+     */
+    getHeapB8: (offset: NativePointer) => boolean;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapU8: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapU16: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapU32: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapI8: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapI16: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapI32: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapI52: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapU52: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapI64Big: (offset: NativePointer) => bigint;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapF32: (offset: NativePointer) => number;
+    /**
+     * Reads from the WASM linear memory
+     */
     getHeapF64: (offset: NativePointer) => number;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewI8: () => Int8Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewI16: () => Int16Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewI32: () => Int32Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewI64Big: () => BigInt64Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewU8: () => Uint8Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewU16: () => Uint16Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewU32: () => Uint32Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewF32: () => Float32Array;
+    /**
+     * Returns a short term view of the WASM linear memory. Don't store the reference, don't use it after await.
+     */
     localHeapViewF64: () => Float64Array;
 };
-type RuntimeAPI = {
+type DiagnosticsAPIType = {
+    /**
+     * creates diagnostic trace file. Default is 60 seconds.
+     * It could be opened in PerfView or Visual Studio as is.
+     */
+    collectCpuSamples: (options?: DiagnosticCommandOptions) => Promise<Uint8Array[]>;
+    /**
+     * creates diagnostic trace file. Default is 60 seconds.
+     * It could be opened in PerfView or Visual Studio as is.
+     * It could be summarized by `dotnet-trace report xxx.nettrace topN -n 10`
+     */
+    collectPerfCounters: (options?: DiagnosticCommandOptions) => Promise<Uint8Array[]>;
     /**
-     * @deprecated Please use API object instead. See also MONOType in dotnet-legacy.d.ts
+     * creates diagnostic trace file.
+     * It could be opened in PerfView as is.
+     * It could be converted for Visual Studio using `dotnet-gcdump convert`.
      */
-    MONO: any;
+    collectGcDump: (options?: DiagnosticCommandOptions) => Promise<Uint8Array[]>;
     /**
-     * @deprecated Please use API object instead. See also BINDINGType in dotnet-legacy.d.ts
+     * changes DOTNET_DiagnosticPorts and makes a new connection to WebSocket on that URL.
      */
-    BINDING: any;
+    connectDSRouter(url: string): void;
+};
+type DiagnosticCommandProviderV2 = {
+    keywords: [number, number];
+    logLevel: number;
+    provider_name: string;
+    arguments: string | null;
+};
+type DiagnosticCommandOptions = {
+    durationSeconds?: number;
+    intervalSeconds?: number;
+    skipDownload?: boolean;
+    circularBufferMB?: number;
+    extraProviders?: DiagnosticCommandProviderV2[];
+};
+type APIType = RunAPIType & MemoryAPIType & DiagnosticsAPIType;
+type RuntimeAPI = {
     INTERNAL: any;
     Module: EmscriptenModule;
     runtimeId: number;
@@ -403,10 +687,19 @@ type RuntimeAPI = {
         productVersion: string;
         gitHash: string;
         buildConfiguration: string;
+        wasmEnableThreads: boolean;
+        wasmEnableSIMD: boolean;
+        wasmEnableExceptionHandling: boolean;
     };
 } & APIType;
 type ModuleAPI = {
+    /**
+     * The builder for the .NET runtime.
+     */
     dotnet: DotnetHostBuilder;
+    /**
+     * Terminates the runtime "process" and reject all further calls to the API.
+     */
     exit: (code: number, reason?: any) => void;
 };
 type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
@@ -446,4 +739,4 @@ declare global {
 }
 declare const createDotnetRuntime: CreateDotnetRuntimeType;
 
-export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
+export { type AssetBehaviors, type AssetEntry, type CreateDotnetRuntimeType, type DotnetHostBuilder, type DotnetModuleConfig, type EmscriptenModule, GlobalizationMode, type IMemoryView, type ModuleAPI, type MonoConfig, type RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
diff --git a/src/Components/dotnet-runtime-js/package.json b/src/Components/dotnet-runtime-js/package.json
index 6171c56b2ced..1f9fd0b83dc1 100644
--- a/src/Components/dotnet-runtime-js/package.json
+++ b/src/Components/dotnet-runtime-js/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "dotnet-runtime",
+  "name": "@microsoft/dotnet-runtime",
   "private": true,
   "description": ".NET is a developer platform with tools and libraries for building any type of app, including web, mobile, desktop, games, IoT, cloud, and microservices.",
   "repository": {
diff --git a/src/Components/test/E2ETest/Infrastructure/ServerFixtures/BlazorWasmTestAppFixture.cs b/src/Components/test/E2ETest/Infrastructure/ServerFixtures/BlazorWasmTestAppFixture.cs
index 48273b47af8c..88d3a2e46093 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerFixtures/BlazorWasmTestAppFixture.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerFixtures/BlazorWasmTestAppFixture.cs
@@ -25,6 +25,8 @@ public class BlazorWasmTestAppFixture<TProgram> : WebHostServerFixture
     public string PathBase { get; set; }
     public string ContentRoot { get; private set; }
 
+    public bool RequiresMultithreadingHeaders { get; set; }
+
     protected override IHost CreateWebHost()
     {
         if (TestTrimmedOrMultithreadingApps)
@@ -61,7 +63,7 @@ protected override IHost CreateWebHost()
             args.Add(Environment);
         }
 
-        if (WebAssemblyTestHelper.MultithreadingIsEnabled())
+        if (RequiresMultithreadingHeaders || WebAssemblyTestHelper.MultithreadingIsEnabled())
         {
             args.Add("--apply-cop-headers");
         }
diff --git a/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs b/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs
index 1b4ce4d6231f..2baa92792a72 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs
@@ -36,9 +36,15 @@ public override void Dispose()
 
     private async ValueTask DisposeCore()
     {
-        // This can be null if creating the webhost throws, we don't want to throw here and hide
-        // the original exception.
-        Host?.Dispose();
-        await Host?.StopAsync();
+        try
+        {
+            await Host?.StopAsync();
+            // This can be null if creating the webhost throws, we don't want to throw here and hide
+            // the original exception.
+            Host?.Dispose();
+        }
+        catch
+        {
+        }
     }
 }
diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 841cecb32695..315b80cd2248 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
@@ -31,6 +32,12 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
+    public override async Task DisposeAsync()
+    {
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
+        await base.DisposeAsync();
+    }
+
     protected override void InitializeAsyncCore()
     {
         // Clear logs - we check these during tests in some cases.
diff --git a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
index e7b2771f6514..fd24da459497 100644
--- a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
+++ b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using OpenQA.Selenium;
+using OpenQA.Selenium.Support.UI;
 
 namespace Microsoft.AspNetCore.Components.E2ETest;
 
@@ -14,4 +15,53 @@ public static void Navigate(this IWebDriver browser, Uri baseUri, string relativ
         browser.Navigate().GoToUrl("about:blank");
         browser.Navigate().GoToUrl(absoluteUrl);
     }
+
+    public static void WaitForElementToBeVisible(this IWebDriver browser, By by, int timeoutInSeconds = 5)
+    {
+        var wait = new DefaultWait<IWebDriver>(browser)
+        {
+            Timeout = TimeSpan.FromSeconds(timeoutInSeconds),
+            PollingInterval = TimeSpan.FromMilliseconds(100)
+        };
+        wait.IgnoreExceptionTypes(typeof(NoSuchElementException), typeof(StaleElementReferenceException));
+        wait.Until(driver =>
+        {
+            try
+            {
+                var element = driver.FindElement(by);
+                return element.Displayed;
+            }
+            catch (StaleElementReferenceException)
+            {
+                // Retry finding the element
+                return false;
+            }
+        });
+    }
+
+    public static long GetElementPositionWithRetry(this IWebDriver browser, string elementId, int retryCount = 3, int delayBetweenRetriesMs = 100)
+    {
+        string log = "";
+
+        for (int i = 0; i < retryCount; i++)
+        {
+            try
+            {
+                browser.WaitForElementToBeVisible(By.Id(elementId));
+                var element = browser.FindElement(By.Id(elementId));
+                return element.Location.Y;
+            }
+            catch (Exception ex)
+            {
+                log += $"Attempt {i + 1}: - {ex.Message}. ";
+            }
+
+            if (i < retryCount - 1)
+            {
+                Thread.Sleep(delayBetweenRetriesMs);
+            }
+        }
+
+        throw new Exception($"Failed to get position for element '{elementId}' after {retryCount} retries. Debug log: {log}");
+    }
 }
diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
index 8e256261983c..b147f6bc4877 100644
--- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
+++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -1,16 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!--
       Skip building and running the Components E2E tests in CI unless explicitly configured otherwise via
       EXECUTE_COMPONENTS_E2E_TESTS. At least build the Components E2E tests locally unless SkipTestBuild is set.
     -->
     <_BuildAndTest>false</_BuildAndTest>
-    <_BuildAndTest
-        Condition=" '$(ContinuousIntegrationBuild)' == 'true' AND '$(EXECUTE_COMPONENTS_E2E_TESTS)' == 'true' ">true</_BuildAndTest>
-    <_BuildAndTest
-        Condition=" '$(ContinuousIntegrationBuild)' != 'true' AND '$(SkipTestBuild)' != 'true' ">true</_BuildAndTest>
+    <_BuildAndTest Condition=" '$(ContinuousIntegrationBuild)' == 'true' AND '$(EXECUTE_COMPONENTS_E2E_TESTS)' == 'true' ">true</_BuildAndTest>
+    <_BuildAndTest Condition=" '$(ContinuousIntegrationBuild)' != 'true' AND '$(SkipTestBuild)' != 'true' ">true</_BuildAndTest>
     <ExcludeFromBuild Condition=" !$(_BuildAndTest) ">true</ExcludeFromBuild>
     <SkipTests Condition=" !$(_BuildAndTest) ">true</SkipTests>
+
+    <!-- disable inline boot config for these tests -->
+    <WasmInlineBootConfig>false</WasmInlineBootConfig>
   </PropertyGroup>
 
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
@@ -64,39 +65,19 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestTrimmedOrMultithreadingApps)' == 'true'">
-    <ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Wasm.Performance.TestApp\" />
-
-    <ProjectReference
-      Include="..\testassets\BasicTestApp\BasicTestApp.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\BasicTestApp\" />
-
-    <ProjectReference
-      Include="..\testassets\GlobalizationWasmApp\GlobalizationWasmApp.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\GlobalizationWasmApp\;" />
-
-    <ProjectReference
-      Include="..\..\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\StandaloneApp\;" />
-
-    <ProjectReference
-      Include="..\..\WebAssembly\testassets\Wasm.Prerendered.Server\Wasm.Prerendered.Server.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Wasm.Prerendered.Server\;" />
-
-    <ProjectReference
-      Include="..\..\WebAssembly\testassets\ThreadingApp\ThreadingApp.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=false;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\ThreadingApp\;" />
-
-    <ProjectReference
-      Include="..\testassets\Components.TestServer\Components.TestServer.csproj"
-      Targets="Build;Publish"
-      Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Components.TestServer\;" />
+    <ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Wasm.Performance.TestApp\" />
+
+    <ProjectReference Include="..\testassets\BasicTestApp\BasicTestApp.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\BasicTestApp\" />
+
+    <ProjectReference Include="..\testassets\GlobalizationWasmApp\GlobalizationWasmApp.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\GlobalizationWasmApp\;" />
+
+    <ProjectReference Include="..\..\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\StandaloneApp\;" />
+
+    <ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Prerendered.Server\Wasm.Prerendered.Server.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Wasm.Prerendered.Server\;" />
+
+    <ProjectReference Include="..\..\WebAssembly\testassets\ThreadingApp\ThreadingApp.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=false;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\ThreadingApp\;" />
+
+    <ProjectReference Include="..\testassets\Components.TestServer\Components.TestServer.csproj" Targets="Build;Publish" Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Components.TestServer\;" />
   </ItemGroup>
 
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
index 91c2b580fe60..5fe0f8a2ee37 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
@@ -41,7 +41,7 @@ public void ComponentMethods_HaveCircuitContext_OnInitialPageLoad()
     // Internal for reuse in Blazor Web tests
     internal static void TestCircuitContextCore(IWebDriver browser)
     {
-        browser.Equal("Circuit Context", () => browser.Exists(By.TagName("h1")).Text);
+        browser.Equal("Circuit Context", () => browser.Exists(By.Id("circuit-context-title")).Text);
 
         browser.Click(By.Id("trigger-click-event-button"));
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
index ff7e56f9a363..37ecf327872a 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
@@ -40,7 +40,7 @@ protected override void InitializeAsyncCore()
     {
         Navigate(ServerPathBase);
         Browser.MountTestComponent<GracefulTermination>();
-        Browser.Equal("Graceful Termination", () => Browser.Exists(By.TagName("h1")).Text);
+        Browser.Equal("Graceful Termination", () => Browser.Exists(By.Id("graceful-termination-title")).Text);
 
         GracefulDisconnectCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         Sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
index 023ad77eadf4..759a67070ebf 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
@@ -49,7 +49,7 @@ public void CanModifyHeadDuringAndAfterPrerendering()
 
         // Check that head metadata can be changed after prerendering.
         Browser.Equal("Updated title 1", () => Browser.Title);
-        Browser.Equal("Updated description 1", () => Browser.FindElement(By.Id("meta-description")).GetAttribute("content"));
+        Browser.Equal("Updated description 1", () => Browser.FindElement(By.Id("meta-description")).GetDomAttribute("content"));
     }
 
     private void BeginInteractivity()
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
index f8f3e84cc9c9..5d1575c6ab59 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
@@ -70,7 +70,7 @@ public void CanRenderMultipleRootComponents()
         Assert.Single(greets, "Hello Abraham");
         Assert.Equal(2, greets.Where(g => g == "Hello Blue fish").Count());
         Assert.Equal(3, greets.Where(g => string.Equals("Hello", g)).Count()); // 3 server prerendered without parameters
-        var content = Browser.Exists(By.Id("test-container")).GetAttribute("innerHTML");
+        var content = Browser.Exists(By.Id("test-container")).GetDomProperty("innerHTML");
         var markers = ReadMarkers(content);
         var componentSequence = markers.Select(m => m.Item1.PrerenderId != null).ToArray();
         var expectedComponentSequence = new bool[]
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/NavigationLockPrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/NavigationLockPrerenderingTest.cs
index 6c310a87c253..645a29cc7bfa 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/NavigationLockPrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/NavigationLockPrerenderingTest.cs
@@ -21,6 +21,9 @@ public NavigationLockPrerenderingTest(
     {
     }
 
+    public override Task InitializeAsync()
+        => InitializeAsync(BrowserFixture.RoutingTestContext);
+
     [Fact]
     [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57153")]
     public void NavigationIsLockedAfterPrerendering()
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
index 6bc0635946f8..3de6df8da5db 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
@@ -56,13 +56,13 @@ public void CanUseJSInteropFromOnAfterRenderAsync()
 
         // Prerendered output can't use JSInterop
         Browser.Equal("No value yet", () => Browser.Exists(By.Id("val-get-by-interop")).Text);
-        Browser.Equal(string.Empty, () => Browser.Exists(By.Id("val-set-by-interop")).GetAttribute("value"));
+        Browser.Equal(string.Empty, () => Browser.Exists(By.Id("val-set-by-interop")).GetDomProperty("value"));
 
         BeginInteractivity();
 
         // Once connected, we can
         Browser.Equal("Hello from interop call", () => Browser.Exists(By.Id("val-get-by-interop")).Text);
-        Browser.Equal("Hello from interop call", () => Browser.Exists(By.Id("val-set-by-interop")).GetAttribute("value"));
+        Browser.Equal("Hello from interop call", () => Browser.Exists(By.Id("val-set-by-interop")).GetDomProperty("value"));
     }
 
     [Fact]
@@ -97,24 +97,6 @@ public void CanReadUrlHashOnlyOnceConnected()
             () => Browser.Exists(By.TagName("strong")).Text);
     }
 
-    [Theory]
-    [InlineData("base/relative", "prerendered/base/relative")]
-    [InlineData("/root/relative", "/root/relative")]
-    [InlineData("http://absolute/url", "http://absolute/url")]
-    public async Task CanRedirectDuringPrerendering(string destinationParam, string expectedRedirectionLocation)
-    {
-        var requestUri = new Uri(
-            _serverFixture.RootUri,
-            "prerendered/prerendered-redirection?destination=" + destinationParam);
-
-        var httpClient = new HttpClient(new HttpClientHandler { AllowAutoRedirect = false });
-        var response = await httpClient.GetAsync(requestUri);
-
-        var expectedUri = new Uri(_serverFixture.RootUri, expectedRedirectionLocation);
-        Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
-        Assert.Equal(expectedUri, response.Headers.Location);
-    }
-
     [Theory]
     [InlineData(null, null)]
     [InlineData(null, "Bert")]
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerReconnectionCustomUITest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerReconnectionCustomUITest.cs
new file mode 100644
index 000000000000..b7e127ebd83a
--- /dev/null
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerReconnectionCustomUITest.cs
@@ -0,0 +1,84 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using BasicTestApp.Reconnection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests;
+using Microsoft.AspNetCore.E2ETesting;
+using Microsoft.AspNetCore.Hosting;
+using OpenQA.Selenium;
+using TestServer;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests;
+
+public class ServerReconnectionCustomUITest : ServerTestBase<BasicTestAppServerSiteFixture<ServerStartup>>
+{
+    public ServerReconnectionCustomUITest(
+        BrowserFixture browserFixture,
+        BasicTestAppServerSiteFixture<ServerStartup> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+        /// Setting this query parameter causes <see cref="ReconnectionComponent"/> to include the custom reconnect dialog.
+        Navigate($"{ServerPathBase}?useCustomReconnectModal=true");
+        Browser.MountTestComponent<ReconnectionComponent>();
+        Browser.Exists(By.Id("count"));
+    }
+
+    /// <summary>
+    /// Tests that the custom reconnect is displayed when the server circuit is disconnected.
+    /// This UI is provided statically by a Razor component instead being generated by the default
+    /// JS fallback code (see 'DefaultReconnectDisplay.ts').
+    /// </summary>
+    [Fact]
+    public void ReconnectionUI_CustomDialog_IsDisplayed()
+    {
+        Browser.Exists(By.Id("increment")).Click();
+
+        var js = (IJavaScriptExecutor)Browser;
+        js.ExecuteScript("Blazor._internal.forceCloseConnection()");
+
+        // We should see the 'reconnecting' UI appear
+        Browser.Equal("block", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+        Browser.NotEqual(null, () => Browser.Exists(By.Id("components-reconnect-modal")).GetAttribute("open"));
+
+        // The reconnect modal should not be a 'div' element created by the fallback JS code
+        Browser.Equal("dialog", () => Browser.Exists(By.Id("components-reconnect-modal")).TagName);
+
+        // Then it should disappear
+        Browser.Equal("none", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+        Browser.Equal(null, () => Browser.Exists(By.Id("components-reconnect-modal")).GetAttribute("open"));
+
+        Browser.Exists(By.Id("increment")).Click();
+
+        // Can dispatch events after reconnect
+        Browser.Equal("2", () => Browser.Exists(By.Id("count")).Text);
+    }
+
+    /// <summary>
+    /// Tests that when the custom reconnect UI is used, there are no style-related CSP errors.
+    /// </summary>
+    [Fact]
+    public void ReconnectionUI_WorksWith_StrictStyleCspPolicy()
+    {
+        var js = (IJavaScriptExecutor)Browser;
+        js.ExecuteScript("Blazor._internal.forceCloseConnection()");
+
+        // We should see the 'reconnecting' UI appear
+        Browser.Equal("block", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+
+        // Check that there is no CSP-related error in the browser console
+        var cspErrorMessage = "violates the following Content Security Policy directive: \"style-src";
+        var logs = Browser.Manage().Logs.GetLog(LogType.Browser);
+        var styleErrors = logs.Where(log => log.Message.Contains(cspErrorMessage));
+
+        Assert.Empty(styleErrors);
+    }
+}
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerResumeTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerResumeTests.cs
new file mode 100644
index 000000000000..1b76f3adf2ad
--- /dev/null
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerResumeTests.cs
@@ -0,0 +1,250 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.Tasks;
+using BasicTestApp.Reconnection;
+using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using OpenQA.Selenium.BiDi;
+using TestServer;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests;
+
+public class ServerResumeTests : ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<Root>>>
+{
+    public ServerResumeTests(
+        BrowserFixture browserFixture,
+        BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<Root>> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+        serverFixture.AdditionalArguments.AddRange("--DisableReconnectionCache", "true");
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+        Navigate(TestUrl);
+        Browser.Exists(By.Id("render-mode-interactive"));
+    }
+
+    public string TestUrl { get; set; } = "/subdir/persistent-state/disconnection";
+
+    public bool UseShadowRoot { get; set; } = true;
+
+    [Fact]
+    public void CanResumeCircuitAfterDisconnection()
+    {
+        // Initial state: NonPersistedCounter should be 5
+        Browser.Equal("5", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        // Increment both counters
+        Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
+        Browser.Exists(By.Id("increment-non-persisted-counter")).Click();
+
+        Browser.Equal("1", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        Browser.Equal("6", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        var javascript = (IJavaScriptExecutor)Browser;
+        javascript.ExecuteScript("window.replaceReconnectCallback()");
+
+        TriggerReconnectAndInteract(javascript);
+
+        // After first reconnection:
+        // - Persistent counter should be incremented
+        // - Non-persisted counter should be reset to 0
+        Browser.Equal("2", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        Browser.Equal("0", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        // Increment non-persisted counter again
+        Browser.Exists(By.Id("increment-non-persisted-counter")).Click();
+        Browser.Equal("1", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        javascript.ExecuteScript("resetReconnect()");
+
+        TriggerReconnectAndInteract(javascript);
+
+        // After second reconnection:
+        Browser.Equal("3", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        Browser.Equal("0", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+    }
+
+    [Fact]
+    public void CanResumeCircuitFromJavaScript()
+    {
+        // Initial state: NonPersistedCounter should be 5
+        Browser.Equal("5", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        // Increment both counters
+        Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
+        Browser.Exists(By.Id("increment-non-persisted-counter")).Click();
+
+        Browser.Equal("1", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        Browser.Equal("6", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        var javascript = (IJavaScriptExecutor)Browser;
+        TriggerClientPauseAndInteract(javascript);
+
+        // After first reconnection:
+        Browser.Equal("2", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        Browser.Equal("0", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        // Increment non-persisted counter again
+        Browser.Exists(By.Id("increment-non-persisted-counter")).Click();
+        Browser.Equal("1", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+
+        TriggerClientPauseAndInteract(javascript);
+
+        // After second reconnection:
+        Browser.Equal("3", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        Browser.Equal("0", () => Browser.Exists(By.Id("non-persisted-counter")).Text);
+    }
+
+    [Fact]
+    public void CanResumeUngracefullyPauseGracefullyPauseUngracefullyAgain()
+    {
+        Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
+
+        Browser.Equal("1", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        var javascript = (IJavaScriptExecutor)Browser;
+        javascript.ExecuteScript("window.replaceReconnectCallback()");
+        TriggerReconnectAndInteract(javascript);
+
+        // Can dispatch events after reconnect
+        Browser.Equal("2", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+
+        TriggerClientPauseAndInteract(javascript);
+
+        // Ensure that reconnection events are repeatable
+        Browser.Equal("3", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+
+        javascript.ExecuteScript("resetReconnect()");
+
+        TriggerReconnectAndInteract(javascript);
+
+        // Can dispatch events after reconnect
+        Browser.Equal("4", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+    }
+
+    [Fact]
+    public void CanPauseGracefullyUngracefulPauseGracefullyPauseAgain()
+    {
+        Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
+
+        Browser.Equal("1", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+        var javascript = (IJavaScriptExecutor)Browser;
+        javascript.ExecuteScript("window.replaceReconnectCallback()");
+        TriggerClientPauseAndInteract(javascript);
+
+        // Can dispatch events after reconnect
+        Browser.Equal("2", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+
+        TriggerReconnectAndInteract(javascript);
+
+        // Ensure that reconnection events are repeatable
+        Browser.Equal("3", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+
+        TriggerClientPauseAndInteract(javascript);
+
+        // Can dispatch events after reconnect
+        Browser.Equal("4", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+    }
+
+    private void TriggerReconnectAndInteract(IJavaScriptExecutor javascript)
+    {
+        var previousText = Browser.Exists(By.Id("persistent-counter-render")).Text;
+
+        javascript.ExecuteScript("Blazor._internal.forceCloseConnection()");
+        Browser.Equal("block", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+
+        javascript.ExecuteScript("triggerReconnect()");
+
+        // Then it should disappear
+        Browser.Equal("none", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+
+        var newText = Browser.Exists(By.Id("persistent-counter-render")).Text;
+        Assert.NotEqual(previousText, newText);
+
+        Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
+    }
+
+    private void TriggerClientPauseAndInteract(IJavaScriptExecutor javascript)
+    {
+        var previousText = Browser.Exists(By.Id("persistent-counter-render")).Text;
+        javascript.ExecuteScript("Blazor.pauseCircuit()");
+        Browser.Equal("block", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+
+        // Retry button should be hidden
+        Browser.Equal(
+            (false, true),
+            () => Browser.Exists(
+                () =>
+                {
+                    var buttons = UseShadowRoot ?
+                        Browser.Exists(By.Id("components-reconnect-modal"))
+                            .GetShadowRoot()
+                            .FindElements(By.CssSelector(".components-reconnect-dialog button")) :
+                        Browser.Exists(By.Id("components-reconnect-modal"))
+                            .FindElements(By.CssSelector(".components-reconnect-container button"));
+
+                    Assert.Equal(2, buttons.Count);
+                    return (buttons[0].Displayed, buttons[1].Displayed);
+                },
+                TimeSpan.FromSeconds(1)));
+
+        Browser.Exists(
+                () =>
+                {
+                    var buttons = UseShadowRoot ?
+                        Browser.Exists(By.Id("components-reconnect-modal"))
+                            .GetShadowRoot()
+                            .FindElements(By.CssSelector(".components-reconnect-dialog button")) :
+                        Browser.Exists(By.Id("components-reconnect-modal"))
+                            .FindElements(By.CssSelector(".components-reconnect-container button"));
+                    return buttons[1];
+                },
+                TimeSpan.FromSeconds(1)).Click();
+
+        // Then it should disappear
+        Browser.Equal("none", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
+
+        var newText = Browser.Exists(By.Id("persistent-counter-render")).Text;
+        Assert.NotEqual(previousText, newText);
+
+        Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
+    }
+}
+
+public class CustomUIServerResumeTests : ServerResumeTests
+{
+    public CustomUIServerResumeTests(
+        BrowserFixture browserFixture,
+        BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<Root>> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+        TestUrl = "/subdir/persistent-state/disconnection?custom-reconnect-ui=true";
+        UseShadowRoot = false; // Custom UI does not use shadow DOM
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+        base.InitializeAsyncCore();
+        Browser.Exists(By.CssSelector("#components-reconnect-modal[data-nosnippet]"));
+    }
+}
+
+public class HybridCacheServerResumeTests : ServerResumeTests
+{
+    public HybridCacheServerResumeTests(
+        BrowserFixture browserFixture,
+        BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<Root>> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+        serverFixture.AdditionalArguments.AddRange("--UseHybridCache", "true");
+    }
+}
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs
index 25812209add8..8468ea27ef5b 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs
@@ -104,11 +104,11 @@ public void EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails()
 
         Assert.True(logs.Count > 0);
 
-        Assert.Matches(ParseErrorMessage(), logs[0].Message);
+        Assert.Matches(ParseErrorMessageRegex, logs[0].Message);
     }
 
     [GeneratedRegex(@"security - Refused to frame 'http://\d+\.\d+\.\d+\.\d+:\d+/' because an ancestor violates the following Content Security Policy directive: ""frame-ancestors 'none'"".")]
-    private static partial Regex ParseErrorMessage();
+    private static partial Regex ParseErrorMessageRegex { get; }
 }
 
 public partial class DefaultConfigurationWebSocketCompressionTests : AllowedWebSocketCompressionTests
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/AddValidationIntegrationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/AddValidationIntegrationTest.cs
new file mode 100644
index 000000000000..75aee6f07d08
--- /dev/null
+++ b/src/Components/test/E2ETest/ServerRenderingTests/AddValidationIntegrationTest.cs
@@ -0,0 +1,61 @@
+// 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.Collections.Generic;
+using System.Text;
+using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using TestServer;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
+
+public class AddValidationIntegrationTest : ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<Root>>>
+{
+    public AddValidationIntegrationTest(BrowserFixture browserFixture, BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<Root>> serverFixture, ITestOutputHelper output) : base(browserFixture, serverFixture, output)
+    {
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+        Navigate("subdir/forms/add-validation-form");
+        Browser.Exists(By.Id("is-interactive"));
+    }
+
+    [Fact]
+    public void FormWithNestedValidation_Works()
+    {
+        Browser.Exists(By.Id("submit-form")).Click();
+
+        Browser.Exists(By.Id("is-invalid"));
+
+        // Validation summary
+        var messageElements = Browser.FindElements(By.CssSelector(".validation-errors > .validation-message"));
+
+        var messages = messageElements.Select(element => element.Text)
+            .ToList();
+
+        var expected = new[]
+        {
+            "Order Name is required.",
+            "Full Name is required.",
+            "Email is required.",
+            "Street is required.",
+            "Zip Code is required.",
+            "Product Name is required."
+        };
+
+        Assert.Equal(expected, messages);
+
+        // Individual field messages
+        var individual = Browser.FindElements(By.CssSelector(".mb-3 > .validation-message"))
+            .Select(element => element.Text)
+            .ToList();
+
+        Assert.Equal(expected, individual);
+    }
+}
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/BlazorWebJsInitializersTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/BlazorWebJsInitializersTest.cs
index b91b97302b8b..b6e0386d2739 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/BlazorWebJsInitializersTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/BlazorWebJsInitializersTest.cs
@@ -28,17 +28,22 @@ public override Task InitializeAsync()
 
     [Theory]
     [MemberData(nameof(InitializerTestData))]
-    public void InitializersRunsModernCallbacksByDefaultWhenPresent(bool streaming, bool webassembly, bool server, List<string> expectedInvokedCallbacks)
+    public void InitializersRunsModernCallbacksByDefaultWhenPresent(bool streaming, bool webassembly, bool server, string[] expectedInvokedCallbacks)
     {
         var url = $"{ServerPathBase}/initializers?streaming={streaming}&wasm={webassembly}&server={server}";
         Navigate(url);
 
+        if (webassembly)
+        {
+            ((IJavaScriptExecutor)Browser).ExecuteScript("sessionStorage.setItem('block-webassembly-settings', 'true')");
+        }
+
         foreach (var callback in expectedInvokedCallbacks)
         {
             Browser.Exists(By.Id(callback));
         }
 
-        Browser.Equal(expectedInvokedCallbacks.Count, () => Browser.FindElements(By.CssSelector("#initializers-content > p")).Count);
+        Browser.Equal(expectedInvokedCallbacks.Length, () => Browser.FindElements(By.CssSelector("#initializers-content > p")).Count);
 
         if (server)
         {
@@ -49,13 +54,18 @@ public void InitializersRunsModernCallbacksByDefaultWhenPresent(bool streaming,
 
     [Theory]
     [MemberData(nameof(InitializerTestData))]
-    public void InitializersRunsClassicInitializersWhenEnabled(bool streaming, bool webassembly, bool server, List<string> expectedInvokedCallbacks)
+    public void InitializersRunsClassicInitializersWhenEnabled(bool streaming, bool webassembly, bool server, string[] expectedInvokedCallbacks)
     {
         EnableClassicInitializers(Browser);
         List<string> expectedCallbacks = ["classic-before-start", "classic-after-started", ..expectedInvokedCallbacks];
         var url = $"{ServerPathBase}/initializers?streaming={streaming}&wasm={webassembly}&server={server}";
         Navigate(url);
 
+        if (webassembly)
+        {
+            ((IJavaScriptExecutor)Browser).ExecuteScript("sessionStorage.setItem('block-webassembly-settings', 'true')");
+        }
+
         foreach (var callback in expectedCallbacks)
         {
             Browser.Exists(By.Id(callback));
@@ -76,18 +86,18 @@ private void EnableClassicInitializers(IWebDriver browser)
         ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('enable-classic-initializers', 'true')");
     }
 
-    public static TheoryData<bool, bool, bool, List<string>> InitializerTestData()
+    public static TheoryData<bool, bool, bool, string[]> InitializerTestData()
     {
-        var result = new TheoryData<bool, bool, bool, List<string>>
+        var result = new TheoryData<bool, bool, bool, string[]>
         {
             { false, false, false, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started","modern-before-web-start", "modern-after-web-started"] },
             { false, false, true, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-server-start", "classic-and-modern-after-server-started", "classic-and-modern-circuit-opened", "modern-before-web-start", "modern-after-web-started", "modern-before-server-start", "modern-after-server-started", "modern-circuit-opened" ] },
-            { false, true, false, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
-            { false, true, true, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-server-start", "classic-and-modern-circuit-opened", "classic-and-modern-after-server-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-server-start", "modern-circuit-opened", "modern-after-server-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
+            { false, true, false, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "server--classic-and-modern-before-web-assembly-start", "server--classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
+            { false, true, true, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-server-start", "classic-and-modern-circuit-opened", "classic-and-modern-after-server-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "server--classic-and-modern-before-web-assembly-start", "server--classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-server-start", "modern-circuit-opened", "modern-after-server-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
             { true, false, false, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started","modern-before-web-start", "modern-after-web-started"] },
             { true, false, true, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-server-start", "classic-and-modern-after-server-started", "classic-and-modern-circuit-opened", "modern-before-web-start", "modern-after-web-started", "modern-before-server-start", "modern-after-server-started", "modern-circuit-opened" ] },
-            { true, true, false, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
-            { true, true, true, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-server-start", "classic-and-modern-circuit-opened", "classic-and-modern-after-server-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-server-start", "modern-circuit-opened", "modern-after-server-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
+            { true, true, false, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "server--classic-and-modern-before-web-assembly-start", "server--classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
+            { true, true, true, ["classic-and-modern-before-web-start", "classic-and-modern-after-web-started", "classic-and-modern-before-server-start", "classic-and-modern-circuit-opened", "classic-and-modern-after-server-started", "classic-and-modern-before-web-assembly-start", "classic-and-modern-after-web-assembly-started", "server--classic-and-modern-before-web-assembly-start", "server--classic-and-modern-after-web-assembly-started", "modern-before-web-start", "modern-after-web-started", "modern-before-server-start", "modern-circuit-opened", "modern-after-server-started", "modern-before-web-assembly-start", "modern-after-web-assembly-started"] },
         };
 
         return result;
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 94b6b80f53a1..c11a30786c2e 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -1,14 +1,20 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using System.Threading.Tasks;
+using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
-using TestServer;
-using Xunit.Abstractions;
-using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
+using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.DevTools;
 using OpenQA.Selenium.Support.Extensions;
+using TestServer;
+using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
@@ -68,6 +74,10 @@ public void CanNavigateToNonHtmlResponse()
         Navigate($"{ServerPathBase}/nav");
         Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("Non-HTML page")).Click();
         Browser.Equal("Hello, this is plain text", () => Browser.Exists(By.TagName("html")).Text);
+
+        //Check if the fall back because of the non-html response sends a warning
+        var logs = Browser.GetBrowserLogs(LogLevel.Warning);
+        Assert.Contains(logs, log => log.Message.Contains("Enhanced navigation failed for destination") && log.Message.Contains("Falling back to full page load.") && !log.Message.Contains("Error"));
     }
 
     [Fact]
@@ -182,8 +192,42 @@ public void CanScrollToHashWithoutPerformingFullNavigation()
         Browser.True(() => Browser.GetScrollY() > 500);
         Browser.True(() => Browser
             .Exists(By.Id("uri-on-page-load"))
-            .GetAttribute("data-value")
+            .GetDomAttribute("data-value")
+            .EndsWith("scroll-to-hash", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void NonEnhancedNavCanScrollToHashWithoutFetchingPageAnchor()
+    {
+        Navigate($"{ServerPathBase}/nav/scroll-to-hash");
+        var originalTextElem = Browser.Exists(By.CssSelector("#anchor #text"));
+        Browser.Equal("Text", () => originalTextElem.Text);
+
+        Browser.Exists(By.CssSelector("#anchor #scroll-anchor")).Click();
+        Browser.True(() => Browser.GetScrollY() > 500);
+        Browser.True(() => Browser
+            .Exists(By.CssSelector("#anchor #uri-on-page-load"))
+            .GetDomAttribute("data-value")
             .EndsWith("scroll-to-hash", StringComparison.Ordinal));
+
+        Browser.Equal("Text", () => originalTextElem.Text);
+    }
+
+    [Fact]
+    public void NonEnhancedNavCanScrollToHashWithoutFetchingPageNavLink()
+    {
+        Navigate($"{ServerPathBase}/nav/scroll-to-hash");
+        var originalTextElem = Browser.Exists(By.CssSelector("#navlink #text"));
+        Browser.Equal("Text", () => originalTextElem.Text);
+
+        Browser.Exists(By.CssSelector("#navlink #scroll-anchor")).Click();
+        Browser.True(() => Browser.GetScrollY() > 500);
+        Browser.True(() => Browser
+            .Exists(By.CssSelector("#navlink #uri-on-page-load"))
+            .GetDomAttribute("data-value")
+            .EndsWith("scroll-to-hash", StringComparison.Ordinal));
+
+        Browser.Equal("Text", () => originalTextElem.Text);
     }
 
     [Theory]
@@ -308,6 +352,9 @@ public void RefreshCanFallBackOnFullPageReload(string renderMode)
         Browser.Navigate().Refresh();
         Browser.Equal("Page with interactive components that navigate", () => Browser.Exists(By.TagName("h1")).Text);
 
+        // if we don't clean up the suppression, all subsequent navigations will be suppressed by default
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this, skipNavigation: true);
+
         // Normally, you shouldn't store references to elements because they could become stale references
         // after the page re-renders. However, we want to explicitly test that the element becomes stale
         // across renders to ensure that a full page reload occurs.
@@ -460,6 +507,11 @@ public void EnhancedNavNotUsedForNonBlazorDestinations()
         Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("Non-Blazor HTML page")).Click();
         Browser.Equal("This is a non-Blazor endpoint", () => Browser.Exists(By.TagName("h1")).Text);
         Assert.Equal("undefined", Browser.ExecuteJavaScript<string>("return typeof Blazor")); // Blazor JS is NOT loaded
+
+        //Check if the fall back because of the non-blazor endpoint navigation sends a warning
+        var logs = Browser.GetBrowserLogs(LogLevel.Warning);
+        Assert.Contains(logs, log => log.Message.Contains("Enhanced navigation failed for destination") && log.Message.Contains("Falling back to full page load.") && !log.Message.Contains("Error"));
+
     }
 
     [Theory]
@@ -662,6 +714,209 @@ public void CanUpdateHrefOnLinkTagWithIntegrity()
         Browser.Equal("rgba(0, 0, 255, 1)", () => originalH1Elem.GetCssValue("color"));
     }
 
+    [Theory]
+    [InlineData(false, false, false)]
+    [InlineData(false, true, false)]
+    [InlineData(true, true, false)]
+    [InlineData(true, false, false)]
+    // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
+    [InlineData(false, true, true)]
+    [InlineData(true, true, true)]
+    // [InlineData(true, false, true)] programmatic navigation doesn't work without enhanced navigation
+    public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enableStreaming, bool useEnhancedNavigation, bool programmaticNavigation)
+    {
+        // This test checks if the navigation to another path moves the scroll to the top of the page,
+        // or to the beginning of a fragment, regardless of the previous scroll position
+        string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
+        string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation);
+        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
+
+        // "landing" page: scroll maximally down and go to "next" page - we should land at the top of that page
+        AssertWeAreOnLandingPage();
+
+        // staleness check is used to assert enhanced navigation is enabled/disabled, as requested
+        var elementForStalenessCheckOnNextPage = Browser.Exists(By.TagName("html"));
+
+        var button1Id = $"do{buttonKeyword}-navigation";
+        var button1Pos = Browser.GetElementPositionWithRetry(button1Id);
+        Browser.SetScrollY(button1Pos);
+        Browser.Exists(By.Id(button1Id)).Click();
+
+        // "next" page: check if we landed at 0, then navigate to "landing"
+        AssertWeAreOnNextPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        string fragmentId = "some-content";
+        Browser.WaitForElementToBeVisible(By.Id(fragmentId));
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnNextPage);
+        Assert.Equal(0, Browser.GetScrollY());
+        var elementForStalenessCheckOnLandingPage = Browser.Exists(By.TagName("html"));
+        var fragmentScrollPosition = Browser.GetElementPositionWithRetry(fragmentId);
+        Browser.Exists(By.Id(button1Id)).Click();
+
+        // "landing" page: navigate to a fragment on another page - we should land at the beginning of the fragment
+        AssertWeAreOnLandingPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnLandingPage);
+
+        var button2Id = $"do{buttonKeyword}-navigation-with-fragment";
+        Browser.Exists(By.Id(button2Id)).Click();
+        AssertWeAreOnNextPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnNextPage);
+        var expectedFragmentScrollPosition = fragmentScrollPosition;
+        Assert.Equal(expectedFragmentScrollPosition, Browser.GetScrollY());
+    }
+
+    [Theory]
+    [InlineData(false, false, false)]
+    [InlineData(false, true, false)]
+    [InlineData(true, true, false)]
+    [InlineData(true, false, false)]
+    // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
+    [InlineData(false, true, true)]
+    [InlineData(true, true, true)]
+    // [InlineData(true, false, true)] programmatic navigation doesn't work without enhanced navigation
+    public void EnhancedNavigationScrollBehavesSameAsBrowserOnBackwardsForwardsAction(bool enableStreaming, bool useEnhancedNavigation, bool programmaticNavigation)
+    {
+        // This test checks if the scroll position is preserved after backwards/forwards action
+        string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
+        string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation);
+        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
+
+        // "landing" page: scroll to pos1, navigate away
+        AssertWeAreOnLandingPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+
+        // staleness check is used to assert enhanced navigation is enabled/disabled, as requested
+        var elementForStalenessCheckOnNextPage = Browser.Exists(By.TagName("html"));
+
+        var buttonId = $"do{buttonKeyword}-navigation";
+        Browser.WaitForElementToBeVisible(By.Id(buttonId));
+        var landingPagePos1 = Browser.GetElementPositionWithRetry(buttonId) - 100;
+        Browser.SetScrollY(landingPagePos1);
+        Browser.Exists(By.Id(buttonId)).Click();
+
+        // "next" page: scroll to pos1, navigate away
+        AssertWeAreOnNextPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        Browser.WaitForElementToBeVisible(By.Id(buttonId));
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnNextPage);
+        var elementForStalenessCheckOnLandingPage = Browser.Exists(By.TagName("html"));
+        var nextPagePos1 = Browser.GetElementPositionWithRetry(buttonId) - 100;
+        // make sure we are expecting different scroll positions on the 1st and the 2nd page
+        Assert.NotEqual(landingPagePos1, nextPagePos1);
+        Browser.SetScrollY(nextPagePos1);
+        Browser.Exists(By.Id(buttonId)).Click();
+
+        // "landing" page: scroll to pos2, go backwards
+        AssertWeAreOnLandingPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnLandingPage);
+        var landingPagePos2 = 500;
+        Browser.SetScrollY(landingPagePos2);
+        Browser.Navigate().Back();
+
+        // "next" page: check if we landed on pos1, move the scroll to pos2, go backwards
+        AssertWeAreOnNextPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnNextPage);
+        AssertScrollPositionCorrect(useEnhancedNavigation, nextPagePos1);
+
+        var nextPagePos2 = 600;
+        Browser.SetScrollY(nextPagePos2);
+        Browser.Navigate().Back();
+
+        // "landing" page: check if we landed on pos1, move the scroll to pos3, go forwards
+        AssertWeAreOnLandingPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnLandingPage);
+        AssertScrollPositionCorrect(useEnhancedNavigation, landingPagePos1);
+        var landingPagePos3 = 700;
+        Browser.SetScrollY(landingPagePos3);
+        Browser.Navigate().Forward();
+
+        // "next" page: check if we landed on pos1, go forwards
+        AssertWeAreOnNextPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnNextPage);
+        AssertScrollPositionCorrect(useEnhancedNavigation, nextPagePos2);
+        Browser.Navigate().Forward();
+
+        // "scroll" page: check if we landed on pos2
+        AssertWeAreOnLandingPage();
+        WaitStreamingRendersFullPage(enableStreaming);
+        AssertEnhancedNavigation(useEnhancedNavigation, elementForStalenessCheckOnLandingPage);
+        AssertScrollPositionCorrect(useEnhancedNavigation, landingPagePos2);
+    }
+
+    private void AssertScrollPositionCorrect(bool useEnhancedNavigation, long previousScrollPosition)
+    {
+        // from some reason, scroll position sometimes differs by 1 pixel between enhanced and browser's navigation
+        // browser's navigation is not precisely going backwards/forwards to the previous state
+        var currentScrollPosition = Browser.GetScrollY();
+        string messagePart = useEnhancedNavigation ? $"{previousScrollPosition}" : $"{previousScrollPosition} or {previousScrollPosition - 1}";
+        bool isPreciselyWhereItWasLeft = currentScrollPosition == previousScrollPosition;
+        bool isPixelLowerThanItWasLeft = currentScrollPosition == (previousScrollPosition - 1);
+        bool success = useEnhancedNavigation
+            ? isPreciselyWhereItWasLeft
+            : (isPreciselyWhereItWasLeft || isPixelLowerThanItWasLeft);
+        Assert.True(success, $"The expected scroll position was {messagePart}, but it was found at {currentScrollPosition}.");
+    }
+
+    private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement elementForStalenessCheck, int retryCount = 3, int delayBetweenRetriesMs = 1000)
+    {
+        bool enhancedNavigationDetected = false;
+        string logging = "";
+        string isNavigationSuppressed = "";
+        for (int i = 0; i < retryCount; i++)
+        {
+            try
+            {
+                enhancedNavigationDetected = !IsElementStale(elementForStalenessCheck);
+                Assert.Equal(useEnhancedNavigation, enhancedNavigationDetected);
+                return;
+            }
+            catch (XunitException)
+            {
+                var logs = Browser.GetBrowserLogs(LogLevel.Warning);
+                logging += $"{string.Join(", ", logs.Select(l => l.Message))}\n";
+                isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
+
+                logging += $" isNavigationSuppressed: {isNavigationSuppressed}\n";
+                // Maybe the check was done too early to change the DOM ref, retry
+            }
+
+            Thread.Sleep(delayBetweenRetriesMs);
+        }
+        string expectedNavigation = useEnhancedNavigation ? "enhanced navigation" : "full page load";
+        string isStale = enhancedNavigationDetected ? "is not stale" : "is stale";
+        throw new Exception($"Expected to use {expectedNavigation} because 'suppress-enhanced-navigation' is set to {isNavigationSuppressed} but the element from previous path {isStale}. logging={logging}");
+    }
+
+    private void AssertWeAreOnLandingPage()
+    {
+        string infoName = "test-info-1";
+        Browser.WaitForElementToBeVisible(By.Id(infoName), timeoutInSeconds: 30);
+        Browser.Equal("Scroll tests landing page", () => Browser.Exists(By.Id(infoName)).Text);
+    }
+
+    private void AssertWeAreOnNextPage()
+    {
+        string infoName = "test-info-2";
+        Browser.WaitForElementToBeVisible(By.Id(infoName), timeoutInSeconds: 30);
+        Browser.Equal("Scroll tests next page", () => Browser.Exists(By.Id(infoName)).Text);
+    }
+
+    private void WaitStreamingRendersFullPage(bool enableStreaming)
+    {
+        if (enableStreaming)
+        {
+            Browser.WaitForElementToBeVisible(By.Id("some-content"));
+        }
+    }
+
     private void AssertEnhancedUpdateCountEquals(long count)
         => Browser.Equal(count, () => ((IJavaScriptExecutor)Browser).ExecuteScript("return window.enhancedPageUpdateCount;"));
 
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 27de50df3bc3..ffd0287063a0 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -11,6 +11,8 @@ namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
 public static class EnhancedNavigationTestUtil
 {
+    private static bool _isSuppressed;
+
     public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
@@ -20,16 +22,79 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
 
             if (!skipNavigation)
             {
-                // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
-                // localStorage. But some tests are already in the right place and need to avoid extra navigation.
-                fixture.Navigate($"{fixture.ServerPathBase}/");
-                browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
+                NavigateToOrigin(fixture);
+            }
+
+            try
+            {
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
             }
 
             ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('suppress-enhanced-navigation', 'true')");
+
+            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
+            Assert.True(suppressEnhancedNavigation is not null && (string)suppressEnhancedNavigation == "true",
+                "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
+            _isSuppressed = true;
+        }
+    }
+
+    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
+        where TServerFixture : ServerFixture
+    {
+        if (!_isSuppressed)
+        {
+            return;
+        }
+
+        var browser = fixture.Browser;
+
+        try
+        {
+            // First, ensure we're on the correct origin to access sessionStorage
+            try
+            {
+                // Check if we can access sessionStorage from current location
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch
+            {
+                if (skipNavigation)
+                {
+                    throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.");
+                }
+                NavigateToOrigin(fixture);
+            }
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation')");
+        }
+        catch (WebDriverException ex) when (ex.Message.Contains("invalid session id"))
+        {
+            // Browser session is no longer valid (e.g., browser was closed)
+            // Session storage is automatically cleared when browser closes, so cleanup is already done
+            // This is expected in some tests, so we silently return
+            return;
+        }
+        finally
+        {
+            _isSuppressed = false;
         }
     }
 
+    private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+        where TServerFixture : ServerFixture
+    {
+        // Navigate to the test origin to ensure the browser is on the correct state to access sessionStorage
+        fixture.Navigate($"{fixture.ServerPathBase}/");
+        fixture.Browser.Exists(By.Id("session-storage-anchor"));
+    }
+
     public static long GetScrollY(this IWebDriver browser)
         => Convert.ToInt64(((IJavaScriptExecutor)browser).ExecuteScript("return window.scrollY"), CultureInfo.CurrentCulture);
+
+    public static long SetScrollY(this IWebDriver browser, long value)
+        => Convert.ToInt64(((IJavaScriptExecutor)browser).ExecuteScript($"window.scrollTo(0, {value})"), CultureInfo.CurrentCulture);
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FocusOnNavigateTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FocusOnNavigateTest.cs
index 2a0dd3acf350..a5599eab306f 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FocusOnNavigateTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/FocusOnNavigateTest.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
@@ -29,21 +30,21 @@ public override Task InitializeAsync()
     public void FocusIsMoved_AfterInitialPageLoad_WhenNoElementHasFocus()
     {
         Navigate($"{ServerPathBase}/focus-on-navigate/static");
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-navigate") is not null);
+        Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-navigate") is not null);
     }
 
     [Fact]
     public void FocusIsPreserved_AfterInitialPageLoad_WhenAnyElementHasFocus()
     {
         Navigate($"{ServerPathBase}/focus-on-navigate/static-with-other-focused-element");
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-load") is not null);
+        Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-load") is not null);
     }
 
     [Fact]
     public void FocusIsPreserved_AfterInitialPageLoad_WhenAutofocusedElementIsPresent()
     {
         Navigate($"{ServerPathBase}/focus-on-navigate/autofocus");
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("autofocus") is not null);
+        Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("autofocus") is not null);
     }
 
     [Fact]
@@ -59,7 +60,10 @@ public void FocusIsMoved_OnEnhancedNavigation_WhenAnyElementMatchesSelector()
     {
         Navigate($"{ServerPathBase}/focus-on-navigate");
         Browser.Click(By.LinkText("Statically rendered"));
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-navigate") is not null);
+        Browser.True(
+            () => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-navigate") is not null,
+            TimeSpan.FromSeconds(5)
+        );
     }
 
     [Fact]
@@ -67,11 +71,23 @@ public void FocusIsPreserved_OnEnhancedFormPost_WhenAnyElementMatchesSelector()
     {
         Navigate($"{ServerPathBase}/focus-on-navigate");
         Browser.Click(By.LinkText("Form submission"));
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "value-to-submit");
-        Browser.FindElement(By.Id("value-to-submit")).ReplaceText("Some value");
-        Browser.Click(By.Id("submit-button"));
+        string valueToSubmit = "value-to-submit";
+        AssertFocusPreserved(valueToSubmit);
+        Browser.FindElement(By.Id(valueToSubmit)).ReplaceText("Some value");
+        string submitButtonId = "submit-button";
+        Browser.Click(By.Id(submitButtonId));
         Browser.Equal("Some value", () => Browser.FindElement(By.Id("submitted-value")).Text);
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "submit-button");
+        AssertFocusPreserved(submitButtonId);
+    }
+
+    private void AssertFocusPreserved(string elementId)
+    {
+        Browser.WaitForElementToBeVisible(By.Id(elementId));
+        Browser.True(
+            () => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == elementId,
+            TimeSpan.FromSeconds(5),
+            $"Expected element with id '{elementId}' to be focused, but found '{Browser.SwitchTo().ActiveElement().GetDomAttribute("id")}' instead."
+        );
     }
 
     [Fact]
@@ -87,7 +103,7 @@ public void FocusIsMoved_AfterStreaming_WhenElementMatchesSelector()
         tcs.SetResult();
 
         Browser.Equal("Complete", () => Browser.FindElement(By.Id("streaming-status")).Text);
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-navigate") is not null);
+        Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-navigate") is not null);
     }
 
     [Fact]
@@ -101,11 +117,11 @@ public void FocusIsPreserved_AfterStreaming_WhenElementMatchesSelector()
         Browser.True(() => Browser.SwitchTo().ActiveElement().TagName == "body");
 
         Browser.Click(By.Id("focusable-input"));
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "focusable-input");
+        Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == "focusable-input");
 
         tcs.SetResult();
 
         Browser.Equal("Complete", () => Browser.FindElement(By.Id("streaming-status")).Text);
-        Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "focusable-input");
+        Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == "focusable-input");
     }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/AntiforgeryTests.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/AntiforgeryTests.cs
index 12defa51dc5a..ad1777e4f950 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/AntiforgeryTests.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/AntiforgeryTests.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using TestServer;
 using Xunit.Abstractions;
@@ -45,7 +46,6 @@ public void CanUseAntiforgeryAfterInitialRender(string target)
         var submit = Browser.Exists(By.Id("submit"));
         submit.Click();
 
-        var result = Browser.Exists(By.Id("result"));
-        Browser.Equal("Test", () => result.Text);
+        Browser.Equal("Test", () => Browser.FindElement(By.Id("result")).Text);
     }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
index 4b35b0c5eed0..d6dc438db468 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
@@ -49,6 +49,20 @@ public void CanDispatchToTheDefaultForm(bool suppressEnhancedNavigation)
         DispatchToFormCore(dispatchToForm);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void CanDispatchToTheDefaultFormWithReExecutionMiddleware(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "reexecution/forms/default-form",
+            FormCssSelector = "form",
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Fact]
     public void PlainFormIsNotEnhancedByDefault()
     {
@@ -90,6 +104,23 @@ public void CanBindParameterToTheDefaultForm(bool suppressEnhancedNavigation)
         DispatchToFormCore(dispatchToForm);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void InputHiddenCanStoreData(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "forms/default-form-input-hidden",
+            FormCssSelector = "form",
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+
+        Browser.Equal("stranger", () => Browser.Exists(By.Id("hidden")).GetDomProperty("value"));
+        Browser.Equal("Hello stranger!", () => Browser.Exists(By.Id("pass")).Text);
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
@@ -108,7 +139,7 @@ public void DataAnnotationsWorkForForms(bool suppressEnhancedNavigation)
             {
                 var error = Assert.Single(errors);
                 Assert.Equal("Name is too long", error.Text);
-                Assert.Equal("John", Browser.FindElement(By.CssSelector("input[name='Parameter.FirstName']")).GetAttribute("value"));
+                Assert.Equal("John", Browser.FindElement(By.CssSelector("input[name='Parameter.FirstName']")).GetDomProperty("value"));
             },
         };
         DispatchToFormCore(dispatchToForm);
@@ -151,7 +182,7 @@ public void MultipleParametersMultipleFormsDoNotConflict(bool suppressEnhancedNa
             {
                 var error = Assert.Single(errors);
                 Assert.Equal("The value 'abc' is not valid for 'Id'.", error.Text);
-                Assert.Equal("abc", Browser.FindElement(By.CssSelector("form[name=bind-integer] input[name=Id]")).GetAttribute("value"));
+                Assert.Equal("abc", Browser.FindElement(By.CssSelector("form[name=bind-integer] input[name=Id]")).GetDomProperty("value"));
             },
             SuppressEnhancedNavigation = suppressEnhancedNavigation,
         };
@@ -266,8 +297,8 @@ public void CanDisplayErrorsFromMultipleParametersToTheDefaultForm(bool suppress
                     {
                         Assert.Equal("The value 'invalid' is not valid for 'OtherParameter'.", error.Text);
                     });
-                Assert.Equal("abcd", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetAttribute("value"));
-                Assert.Equal("invalid", Browser.FindElement(By.CssSelector("input[name=OtherParameter]")).GetAttribute("value"));
+                Assert.Equal("abcd", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetDomProperty("value"));
+                Assert.Equal("invalid", Browser.FindElement(By.CssSelector("input[name=OtherParameter]")).GetDomProperty("value"));
             },
             SuppressEnhancedNavigation = suppressEnhancedNavigation,
         };
@@ -295,7 +326,7 @@ public void CanHandleBindingErrorsBindParameterToTheDefaultForm(bool suppressEnh
                     {
                         Assert.Equal("The value 'abc' is not valid for 'Parameter'.", error.Text);
                     });
-                Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetAttribute("value"));
+                Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetDomProperty("value"));
             }
         };
         DispatchToFormCore(dispatchToForm);
@@ -332,7 +363,7 @@ public void CanBindComplexTypeToDefaultForm(bool suppressEnhancedNavigation)
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -389,7 +420,7 @@ public void CanBreakFormIntoMultipleComponents(bool suppressEnhancedNavigation)
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -440,7 +471,7 @@ public void CanBreakFormIntoMultipleComponentsDisplaysErrorsCorrectly(bool suppr
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -478,7 +509,7 @@ public void CanDisplayBindingErrorsComplexTypeToDefaultForm(bool suppressEnhance
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -513,7 +544,7 @@ public void CanBindDictionaryToDefaultForm(bool suppressEnhancedNavigation)
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -552,7 +583,7 @@ public void CanDisplayBindingErrorsDictionaryToDefaultForm(bool suppressEnhanced
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -596,7 +627,7 @@ public void CanBindCollectionsToDefaultForm(bool suppressEnhancedNavigation)
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -645,7 +676,7 @@ public void CanDisplayBindingErrorsCollectionsToDefaultForm(bool suppressEnhance
         {
             // Verify the same form element is still in the page
             // We wouldn't be allowed to read the attribute if the element is stale
-            Assert.NotEmpty(form.GetAttribute("action"));
+            Assert.NotEmpty(form.GetDomAttribute("action"));
         }
     }
 
@@ -671,7 +702,7 @@ public void CanHandleBindingErrorsBindParameterToNamedForm(bool suppressEnhanced
                     {
                         Assert.Equal("The value 'abc' is not valid for 'Parameter'.", error.Text);
                     });
-                Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetAttribute("value"));
+                Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetDomProperty("value"));
             }
         };
         DispatchToFormCore(dispatchToForm);
@@ -772,6 +803,29 @@ public void CanDispatchToFormDefinedInNonPageComponent(bool suppressEnhancedNavi
         DispatchToFormCore(dispatchToForm);
     }
 
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("01/01/2000")]
+    public void FormWithNullableDateTime(string value)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "forms/with-nullable-datetime",
+            FormCssSelector = "form[id=nullable]",
+            ExpectedHandlerValue = "nullable-datetime-testform",
+            InputFieldId = "Id",
+            InputFieldCssSelector = "form[id=nullable] input[id=datetime]",
+            InputFieldValue = value,
+            AssertErrors = errors =>
+            {
+                Assert.Empty(errors);
+            },
+        };
+
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Fact]
     public void CanRenderAmbiguousForms()
     {
@@ -868,6 +922,21 @@ public async Task CanModifyTheHttpResponseDuringEventHandling()
         Assert.Equal("ModifyHttpContext", cookie.Value);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void FormNoAntiforgeryReturnBadRequestWithReExecutionMiddleware(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "reexecution/forms/no-antiforgery",
+            FormCssSelector = "form",
+            ShouldCauseBadRequest = true,
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
@@ -950,6 +1019,21 @@ public void FormNoHandlerReturnBadRequest(bool suppressEnhancedNavigation)
         DispatchToFormCore(dispatchToForm);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void FormNoHandlerReturnBadRequestWithReExecutionMiddleware(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "reexecution/forms/no-handler",
+            FormCssSelector = "form",
+            ShouldCauseBadRequest = true,
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
@@ -978,14 +1062,14 @@ public void CanUsePlainForm(bool suppressEnhancedNavigation)
         Browser.Exists(By.Id("send")).Click();
         Browser.Exists(By.Id("pass"));
 
-        Browser.Equal("StringViaExplicitPropertyName value", () => Browser.Exists(By.CssSelector("#StringViaExplicitPropertyName input")).GetAttribute("value"));
-        Browser.Equal("StringViaOverriddenName value", () => Browser.Exists(By.CssSelector("#StringViaOverriddenName input")).GetAttribute("value"));
-        Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaOverriddenNameUnmatched input")).GetAttribute("value"));
-        Browser.Equal("StringViaExpression value", () => Browser.Exists(By.CssSelector("#StringViaExpression input")).GetAttribute("value"));
-        Browser.Equal("StringViaExpressionWithHandler value", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithHandler input")).GetAttribute("value"));
-        Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithUnmatchedHandler input")).GetAttribute("value"));
-        Browser.Equal("PersonName value", () => Browser.Exists(By.CssSelector("#PersonName input")).GetAttribute("value"));
-        Browser.Equal("123", () => Browser.Exists(By.CssSelector("#PersonAge input")).GetAttribute("value"));
+        Browser.Equal("StringViaExplicitPropertyName value", () => Browser.Exists(By.CssSelector("#StringViaExplicitPropertyName input")).GetDomProperty("value"));
+        Browser.Equal("StringViaOverriddenName value", () => Browser.Exists(By.CssSelector("#StringViaOverriddenName input")).GetDomProperty("value"));
+        Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaOverriddenNameUnmatched input")).GetDomProperty("value"));
+        Browser.Equal("StringViaExpression value", () => Browser.Exists(By.CssSelector("#StringViaExpression input")).GetDomProperty("value"));
+        Browser.Equal("StringViaExpressionWithHandler value", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithHandler input")).GetDomProperty("value"));
+        Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithUnmatchedHandler input")).GetDomProperty("value"));
+        Browser.Equal("PersonName value", () => Browser.Exists(By.CssSelector("#PersonName input")).GetDomProperty("value"));
+        Browser.Equal("123", () => Browser.Exists(By.CssSelector("#PersonAge input")).GetDomProperty("value"));
     }
 
     [Fact]
@@ -1160,15 +1244,15 @@ public void CanMutateDataSuppliedFromForm(bool suppressEnhancedNavigation)
         // Remember that the rendercount would be reset to zero since this is SSR, so
         // receiving 2 here shows we did render twice on this cycle
         Browser.Exists(By.Id("mutate-and-notify")).Click();
-        Browser.Equal("Abc Modified", () => Browser.Exists(By.Id("simple-value")).GetAttribute("value"));
-        Browser.Equal("Def Modified", () => Browser.Exists(By.Id("complex-value")).GetAttribute("value"));
+        Browser.Equal("Abc Modified", () => Browser.Exists(By.Id("simple-value")).GetDomProperty("value"));
+        Browser.Equal("Def Modified", () => Browser.Exists(By.Id("complex-value")).GetDomProperty("value"));
         Browser.Equal("2", () => Browser.Exists(By.Id("render-count")).Text);
         Browser.Exists(By.Id("received-notification"));
 
         // Can perform a submit that replaces the received object entirely
         Browser.Exists(By.Id("clear-and-notify")).Click();
-        Browser.Equal("", () => Browser.Exists(By.Id("simple-value")).GetAttribute("value"));
-        Browser.Equal("", () => Browser.Exists(By.Id("complex-value")).GetAttribute("value"));
+        Browser.Equal("", () => Browser.Exists(By.Id("simple-value")).GetDomProperty("value"));
+        Browser.Equal("", () => Browser.Exists(By.Id("complex-value")).GetDomProperty("value"));
         Browser.Equal("2", () => Browser.Exists(By.Id("render-count")).Text);
         Browser.Exists(By.Id("received-notification"));
     }
@@ -1251,7 +1335,6 @@ public void PostingFormWithErrorsDoesNotExceedMaximumErrors()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54447")]
     public void CanBindToFormWithFiles()
     {
         var profilePicture = TempFile.Create(_tempDirectory, "txt", "This is a profile picture.");
@@ -1282,12 +1365,12 @@ public void CanBindToFormWithFiles()
         Assert.Equal($"Profile Picture: {profilePicture.Name}", Browser.Exists(By.Id("profile-picture")).Text);
         Assert.Equal("Documents: 2", Browser.Exists(By.Id("documents")).Text);
         Assert.Equal("Images: 3", Browser.Exists(By.Id("images")).Text);
-        Assert.Equal("Header Photo: Model.HeaderPhoto", Browser.Exists(By.Id("header-photo")).Text);
+        Assert.Equal($"Header Photo: {headerPhoto.Name}", Browser.Exists(By.Id("header-photo")).Text);
         Assert.Equal("Total: 7", Browser.Exists(By.Id("form-collection")).Text);
     }
 
     [Theory]
-    [InlineData(true)]
+    // [InlineData(true)] QuarantinedTest: https://github.com/dotnet/aspnetcore/issues/61882
     [InlineData(false)]
     public void CanUseFormWithMethodGet(bool suppressEnhancedNavigation)
     {
@@ -1355,11 +1438,12 @@ public void RadioButtonGetsResetAfterSubmittingEnhancedForm()
 
         Browser.Exists(By.Id("submit-button")).Click();
 
-        Assert.False(Browser.Exists(By.Id("checkbox")).Selected);
-        Assert.False(Browser.Exists(By.Id("radio-button")).Selected);
+        WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected);
+        WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected);
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60067")]
     public void SubmitButtonFormactionAttributeOverridesEnhancedFormAction()
     {
         GoTo("forms/form-submit-button-with-formaction");
@@ -1466,7 +1550,6 @@ public void SubmitButtonFormenctypeAttributeOverridesEnhancedFormEnctype()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54757")]
     public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry()
     {
         Navigate("about:blank");
@@ -1489,7 +1572,6 @@ public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54757")]
     public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry_Streaming()
     {
         Navigate("about:blank");
@@ -1499,14 +1581,14 @@ public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry
 
         // Submit the form
         Browser.FindElement(By.Id("some-text")).SendKeys("test string");
-        Browser.Equal("test string", () => Browser.FindElement(By.Id("some-text")).GetAttribute("value"));
+        Browser.Equal("test string", () => Browser.FindElement(By.Id("some-text")).GetDomProperty("value"));
         Browser.Exists(By.Id("submit-button")).Click();
 
         // Wait for the async/streaming process to complete. We know this happened
         // if the loading indicator says we're done, and the textbox was cleared
         // due to the refresh
         Browser.Equal("False", () => Browser.FindElement(By.Id("loading-indicator")).Text);
-        Browser.Equal("", () => Browser.FindElement(By.Id("some-text")).GetAttribute("value"));
+        Browser.Equal("", () => Browser.FindElement(By.Id("some-text")).GetDomProperty("value"));
 
         // Checking that the history entry was not pushed
         Browser.Navigate().Back();
@@ -1536,7 +1618,7 @@ private void DispatchToFormCore(DispatchToForm dispatch)
         if (dispatch.ExpectedHandlerValue != null)
         {
             var handlerInput = form.FindElement(By.CssSelector("input[type=hidden][name=_handler]"));
-            Assert.Equal(dispatch.ExpectedHandlerValue, handlerInput.GetAttribute("value"));
+            Assert.Equal(dispatch.ExpectedHandlerValue, handlerInput.GetDomProperty("value"));
         }
 
         if (!dispatch.DispatchEvent)
@@ -1596,13 +1678,13 @@ private void DispatchToFormCore(DispatchToForm dispatch)
             if (!dispatch.FormIsEnhanced)
             {
                 // Verify the same form element is *not* still in the page
-                Assert.Throws<StaleElementReferenceException>(() => form.GetAttribute("method"));
+                Browser.True(() => IsElementStale(form));
             }
             else if (!dispatch.SuppressEnhancedNavigation)
             {
                 // Verify the same form element is still in the page
                 // We wouldn't be allowed to read the attribute if the element is stale
-                Assert.Equal("post", form.GetAttribute("method"));
+                Assert.Equal("post", form.GetDomAttribute("method"), ignoreCase: true);
             }
         }
     }
@@ -1648,6 +1730,19 @@ private void GoTo(string relativePath)
         Navigate($"{ServerPathBase}/{relativePath}");
     }
 
+    private static bool IsElementStale(IWebElement element)
+    {
+        try
+        {
+            _ = element.Enabled;
+            return false;
+        }
+        catch (StaleElementReferenceException)
+        {
+            return true;
+        }
+    }
+
     private struct TempFile
     {
         public string Name { get; }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/NamedFormNoParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/NamedFormNoParentBindingContextTest.cs
index 0848a2793641..6034600f7e8b 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/NamedFormNoParentBindingContextTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/NamedFormNoParentBindingContextTest.cs
@@ -32,7 +32,7 @@ public void CanDispatchToNamedFormNoParentBindingContext()
         Browser.Exists(By.Id("ready"));
 
         var form = Browser.Exists(By.CssSelector("form"));
-        Browser.Equal("named-form-handler", () => form.FindElement(By.CssSelector("input[name=_handler]")).GetAttribute("value"));
+        Browser.Equal("named-form-handler", () => form.FindElement(By.CssSelector("input[name=_handler]")).GetDomProperty("value"));
 
         Browser.Click(By.Id("send"));
         Browser.Exists(By.Id("pass"));
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs
index ec3fdc9fae3b..c2c4e6c66340 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs
@@ -1053,6 +1053,17 @@ public void CanPersistPrerenderedState_Server()
         Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-server")).Text);
     }
 
+    [Fact]
+    public void CanPersistPrerenderedStateDeclaratively_Server()
+    {
+        Navigate($"{ServerPathBase}/persist-state?server=true&declarative=true");
+
+        Browser.Equal("restored", () => Browser.FindElement(By.Id("server")).Text);
+        Browser.Equal("42", () => Browser.FindElement(By.Id("custom-server")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-server")).Text);
+        Browser.Equal("prerender-disabled-not-restored", () => Browser.FindElement(By.Id("prerendering-disabled-server")).Text);
+    }
+
     [Fact]
     public void CanPersistPrerenderedState_WebAssembly()
     {
@@ -1062,6 +1073,17 @@ public void CanPersistPrerenderedState_WebAssembly()
         Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-wasm")).Text);
     }
 
+    [Fact]
+    public void CanPersistPrerenderedStateDeclaratively_WebAssembly()
+    {
+        Navigate($"{ServerPathBase}/persist-state?wasm=true&declarative=true");
+
+        Browser.Equal("restored", () => Browser.FindElement(By.Id("wasm")).Text);
+        Browser.Equal("42", () => Browser.FindElement(By.Id("custom-wasm")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-wasm")).Text);
+        Browser.Equal("prerender-disabled-not-restored", () => Browser.FindElement(By.Id("prerendering-disabled-wasm")).Text);
+    }
+
     [Fact]
     public void CanPersistPrerenderedState_Auto_PersistsOnWebAssembly()
     {
@@ -1071,6 +1093,17 @@ public void CanPersistPrerenderedState_Auto_PersistsOnWebAssembly()
         Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-auto")).Text);
     }
 
+    [Fact]
+    public void CanPersistPrerenderedStateDeclaratively_Auto_PersistsOnWebAssembly()
+    {
+        Navigate($"{ServerPathBase}/persist-state?auto=true&declarative=true");
+
+        Browser.Equal("restored", () => Browser.FindElement(By.Id("auto")).Text);
+        Browser.Equal("42", () => Browser.FindElement(By.Id("custom-auto")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-auto")).Text);
+        Browser.Equal("prerender-disabled-not-restored", () => Browser.FindElement(By.Id("prerendering-disabled-auto")).Text);
+    }
+
     [Fact]
     public void CanPersistPrerenderedState_Auto_PersistsOnServer()
     {
@@ -1084,6 +1117,65 @@ public void CanPersistPrerenderedState_Auto_PersistsOnServer()
         Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto")).Text);
     }
 
+    [Theory]
+    [InlineData("server", "Server state", "Auto state", "not restored")]
+    [InlineData("auto", "Server state", "Auto state", "not restored")]
+    public void CanPersistPrerenderedState_ServicesState_PersistsOnServer(string mode, string expectedServerState, string expectedAutoState, string expectedWebAssemblyState)
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+        if (mode == "auto")
+        {
+            BlockWebAssemblyResourceLoad();
+        }
+
+        Navigate($"{ServerPathBase}/persist-services-state?mode={mode}");
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode")).Text);
+        Browser.Equal(expectedServerState, () => Browser.FindElement(By.Id("server-state")).Text);
+
+        Browser.Equal(expectedAutoState, () => Browser.FindElement(By.Id("auto-state")).Text);
+        Browser.Equal(expectedWebAssemblyState, () => Browser.FindElement(By.Id("wasm-state")).Text);
+
+        Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-server-state")).Text);
+        Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-auto-state")).Text);
+        Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-wasm-state")).Text);
+    }
+
+    [Theory]
+    [InlineData("auto", "not restored", "Auto state", "WebAssembly state")]
+    [InlineData("wasm", "not restored", "Auto state", "WebAssembly state")]
+    public void CanPersistPrerenderedState_ServicesState_PersistsOnWasm(string mode, string expectedServerState, string expectedAutoState, string expectedWebAssemblyState)
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+
+        Navigate($"{ServerPathBase}/persist-services-state?mode={mode}");
+
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode")).Text);
+        Browser.Equal(expectedServerState, () => Browser.FindElement(By.Id("server-state")).Text);
+        Browser.Equal(expectedAutoState, () => Browser.FindElement(By.Id("auto-state")).Text);
+        Browser.Equal(expectedWebAssemblyState, () => Browser.FindElement(By.Id("wasm-state")).Text);
+
+        Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-server-state")).Text);
+        Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-auto-state")).Text);
+        Browser.Equal("not restored", () => Browser.FindElement(By.Id("filtered-wasm-state")).Text);
+    }
+
+    [Fact]
+    public void CanPersistPrerenderedStateDeclaratively_Auto_PersistsOnServer()
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+        BlockWebAssemblyResourceLoad();
+
+        Navigate($"{ServerPathBase}/persist-state?auto=true&declarative=true");
+
+        Browser.Equal("restored", () => Browser.FindElement(By.Id("auto")).Text);
+        Browser.Equal("42", () => Browser.FindElement(By.Id("custom-auto")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto")).Text);
+        Browser.Equal("prerender-disabled-not-restored", () => Browser.FindElement(By.Id("prerendering-disabled-auto")).Text);
+    }
+
     [Fact]
     public void CanPersistState_AllRenderModesAtTheSameTime()
     {
@@ -1272,4 +1364,175 @@ private void ClearBrowserLogs()
     {
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
+
+    [Fact]
+    public void CanPersistMultiplePrerenderedStateDeclaratively_Server()
+    {
+        Navigate($"{ServerPathBase}/persist-multiple-state-declaratively?server=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("server-1")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-server-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("server-2")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-server-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultiplePrerenderedStateDeclaratively_WebAssembly()
+    {
+        Navigate($"{ServerPathBase}/persist-multiple-state-declaratively?wasm=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("wasm-1")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-wasm-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("wasm-2")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-wasm-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultiplePrerenderedStateDeclaratively_Auto_PersistsOnServer()
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+        BlockWebAssemblyResourceLoad();
+
+        Navigate($"{ServerPathBase}/persist-multiple-state-declaratively?auto=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("auto-1")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("auto-2")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultiplePrerenderedStateDeclaratively_Auto_PersistsOnWebAssembly()
+    {
+        Navigate($"{ServerPathBase}/persist-multiple-state-declaratively?auto=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("auto-1")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-auto-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("auto-2")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-auto-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultipleRootPrerenderedStateDeclaratively_WebAssembly()
+    {
+        Navigate($"{ServerPathBase}/persist-multiple-root-component-state-declaratively?wasm=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("wasm-1")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-wasm-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("wasm-2")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-wasm-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultipleRootPrerenderedStateDeclaratively_Server()
+    {
+        Navigate($"{ServerPathBase}/persist-multiple-root-component-state-declaratively?server=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("server-1")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-server-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("server-2")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-server-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultipleRootPrerenderedStateDeclaratively_Auto_PersistsOnServer()
+    {
+        Navigate(ServerPathBase);
+        Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
+        BlockWebAssemblyResourceLoad();
+
+        Navigate($"{ServerPathBase}/persist-multiple-root-component-state-declaratively?auto=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("auto-1")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("auto-2")).Text);
+        Browser.Equal("Server", () => Browser.FindElement(By.Id("render-mode-auto-2")).Text);
+    }
+
+    [Fact]
+    public void CanPersistMultipleRootPrerenderedStateDeclaratively_Auto_PersistsOnWebAssembly()
+    {
+        Navigate($"{ServerPathBase}/persist-multiple-root-component-state-declaratively?auto=true");
+
+        Browser.Equal("restored 1", () => Browser.FindElement(By.Id("auto-1")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-auto-1")).Text);
+
+        Browser.Equal("restored 2", () => Browser.FindElement(By.Id("auto-2")).Text);
+        Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-auto-2")).Text);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void NavigatesWithInteractivityByRequestRedirection(bool controlFlowByException)
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: !controlFlowByException);
+        Navigate($"{ServerPathBase}/routing/ssr-navigate-to");
+        Browser.Equal("Click submit to navigate to home", () => Browser.Exists(By.Id("test-info")).Text);
+        Browser.Click(By.Id("redirectButton"));
+        Browser.Equal("Routing test cases", () => Browser.Exists(By.Id("test-info")).Text);
+    }
+
+    [Theory]
+    // prerendering (SSR) is tested in NoInteractivityTest
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void ProgrammaticNavigationToNotExistingPathReExecutesTo404(string renderMode)
+    {
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found?renderMode={renderMode}&navigate-programmatically=true");
+        Assert404ReExecuted();
+    }
+
+    [Theory]
+    // prerendering (SSR) is tested in NoInteractivityTest
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void LinkNavigationToNotExistingPathReExecutesTo404(string renderMode)
+    {
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found?renderMode={renderMode}");
+        Browser.Click(By.Id("link-to-not-existing-page"));
+        Assert404ReExecuted();
+    }
+
+    [Theory]
+    // prerendering (SSR) is tested in NoInteractivityTest
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void BrowserNavigationToNotExistingPathReExecutesTo404(string renderMode)
+    {
+        // non-existing path has to have re-execution middleware set up
+        // so it has to have "reexecution" prefix. Otherwise middleware mapping
+        // will not be activated, see configuration in Startup
+        Navigate($"{ServerPathBase}/reexecution/not-existing-page?renderMode={renderMode}");
+        Assert404ReExecuted();
+    }
+
+    [Fact]
+    public void BrowserNavigationToNotExistingPathReExecutesTo404_Interactive()
+    {
+        // non-existing path has to have re-execution middleware set up
+        // so it has to have "interactive-reexecution" prefix. Otherwise middleware mapping
+        // will not be activated, see configuration in Startup
+        Navigate($"{ServerPathBase}/interactive-reexecution/not-existing-page");
+        Assert404ReExecuted();
+        AssertReExecutedPageIsInteractive();
+    }
+
+    private void AssertReExecutedPageIsInteractive()
+    {
+        Browser.Equal("Current count: 0", () => Browser.FindElement(By.CssSelector("[role='status']")).Text);
+        Browser.Click(By.Id("increment-button"));
+        Browser.Equal("Current count: 1", () => Browser.FindElement(By.CssSelector("[role='status']")).Text);
+    }
+
+    private void Assert404ReExecuted() =>
+        Browser.Equal("Welcome On Page Re-executed After Not Found Event", () => Browser.Exists(By.Id("test-info")).Text);
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index b0f887da31df..a6421eb94689 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
@@ -63,4 +65,372 @@ public void CanUseServerAuthenticationStateByDefault()
         Browser.Equal("True", () => Browser.FindElement(By.Id("is-in-test-role-1")).Text);
         Browser.Equal("True", () => Browser.FindElement(By.Id("is-in-test-role-2")).Text);
     }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    public void NavigatesWithoutInteractivityByRequestRedirection(bool controlFlowByException, bool isStreaming)
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: !controlFlowByException);
+        string streaming = isStreaming ? $"streaming-" : "";
+        Navigate($"{ServerPathBase}/routing/ssr-{streaming}navigate-to");
+        Browser.Equal("Click submit to navigate to home", () => Browser.Exists(By.Id("test-info")).Text);
+        Browser.Click(By.Id("redirectButton"));
+        Browser.Equal("Routing test cases", () => Browser.Exists(By.Id("test-info")).Text);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void ProgrammaticNavigationToNotExistingPath_ReExecutesTo404(bool streaming)
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
+        string streamingPath = streaming ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found-ssr{streamingPath}?navigate-programmatically=true");
+        AssertReExecutionPageRendered();
+    }
+
+    [Fact]
+    public void ProgrammaticNavigationToNotExistingPath_AfterAsyncOperation_ReExecutesTo404()
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found-ssr?doAsync=true&navigate-programmatically=true");
+        AssertReExecutionPageRendered();
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void LinkNavigationToNotExistingPath_ReExecutesTo404(bool streaming)
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
+        string streamingPath = streaming ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/reexecution/redirection-not-found-ssr{streamingPath}");
+        Browser.Click(By.Id("link-to-not-existing-page"));
+        AssertReExecutionPageRendered();
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void BrowserNavigationToNotExistingPath_ReExecutesTo404(bool streaming)
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", isEnabled: true);
+        // non-existing path has to have re-execution middleware set up
+        // so it has to have "reexecution" prefix. Otherwise middleware mapping
+        // will not be activated, see configuration in Startup
+        string streamingPath = streaming ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/reexecution/not-existing-page-ssr{streamingPath}");
+        AssertReExecutionPageRendered();
+    }
+
+    private void AssertReExecutionPageRendered() =>
+        Browser.Equal("Welcome On Page Re-executed After Not Found Event", () => Browser.Exists(By.Id("test-info")).Text);
+
+    private void AssertBrowserDefaultNotFoundViewRendered()
+    {
+        var mainMessage = Browser.FindElement(By.Id("main-message"));
+
+        Browser.True(
+            () => mainMessage.FindElement(By.CssSelector("p")).Text
+            .Contains("No webpage was found for the web address:", StringComparison.OrdinalIgnoreCase)
+        );
+    }
+
+    private void AssertLandingPageRendered() =>
+        Browser.Equal("Any content", () => Browser.Exists(By.Id("test-info")).Text);
+
+    private void AssertNotFoundPageRendered()
+    {
+        Browser.Equal("Welcome On Custom Not Found Page", () => Browser.FindElement(By.Id("test-info")).Text);
+        // custom page should have a custom layout
+        Browser.Equal("About", () => Browser.FindElement(By.Id("about-link")).Text);
+    }
+
+    private void AssertNotFoundContentNotRendered(bool responseHasStarted)
+    {
+        if (!responseHasStarted)
+        {
+            AssertBrowserDefaultNotFoundViewRendered();
+        }
+        // otherwise, the render view does not differ from the original page
+    }
+
+    private void AssertUrlNotChanged(string expectedUrl) =>
+        Browser.True(() => Browser.Url.Contains(expectedUrl), $"Expected URL to contain '{expectedUrl}', but found '{Browser.Url}'");
+
+    private void AssertUrlChanged(string urlPart) =>
+        Browser.False(() => Browser.Url.Contains(urlPart), $"Expected URL not to contain '{urlPart}', but found '{Browser.Url}'");
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnInitialization_ResponseNotStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+
+        bool notFoundContentForRenderingProvided = hasCustomNotFoundPageSet || hasReExecutionMiddleware;
+        if (notFoundContentForRenderingProvided)
+        {
+            AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered(responseHasStarted: false);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    // This tests the application subscribing to OnNotFound event and setting NotFoundEventArgs.Path, opposed to the framework doing it for the app.
+    public void NotFoundSetOnInitialization_ApplicationSubscribesToNotFoundEventToSetNotFoundPath_SSR (bool streaming, bool customRouter)
+    {
+        string streamingPath = streaming ? "-streaming" : "";
+        string testUrl = $"{ServerPathBase}/set-not-found-ssr{streamingPath}?useCustomRouter={customRouter}&appSetsEventArgsPath=true";
+        Navigate(testUrl);
+
+        bool onlyReExecutionCouldRenderNotFoundPage = !streaming && customRouter;
+        if (onlyReExecutionCouldRenderNotFoundPage)
+        {
+            AssertLandingPageRendered();
+        }
+        else
+        {
+            AssertNotFoundPageRendered();
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnInitialization_AfterAsyncOperation_ResponseNotStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr?doAsync=true&useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+
+        bool notFoundContentForRenderingProvided = hasCustomNotFoundPageSet || hasReExecutionMiddleware;
+        if (notFoundContentForRenderingProvided)
+        {
+            AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered(responseHasStarted: false);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    // our custom router does not support NotFoundPage to simulate the most probable custom router behavior
+    public void NotFoundSetOnInitialization_ResponseNotStarted_CustomRouter_SSR(bool hasReExecutionMiddleware)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr?useCustomRouter=true";
+        Navigate(testUrl);
+
+        if (hasReExecutionMiddleware)
+        {
+            AssertReExecutionPageRendered();
+        }
+        else
+        {
+            // Apps that don't support re-execution and don't have blazor's router,
+            // cannot render custom NotFound contents.
+            // The browser will display default 404 page.
+            AssertNotFoundContentNotRendered(responseHasStarted: false);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnInitialization_ResponseStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+        bool notFoundContentForRenderingProvided = hasCustomNotFoundPageSet || hasReExecutionMiddleware;
+        if (notFoundContentForRenderingProvided)
+        {
+            AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered(responseHasStarted: true);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    public void NotFoundSetOnInitialization_ResponseStarted_EnhancedNavigationDisabled_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true, skipNavigation: true);
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+        AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        AssertUrlChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    // our custom router does not support NotFoundPage to simulate the most probable custom router behavior
+    public void NotFoundSetOnInitialization_ResponseStarted_CustomRouter_SSR(bool hasReExecutionMiddleware)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomRouter=true";
+        Navigate(testUrl);
+
+        if (hasReExecutionMiddleware)
+        {
+            AssertReExecutionPageRendered();
+        }
+        else
+        {
+            // Apps that don't support re-execution and don't have blazor's router,
+            // cannot render custom NotFound contents.
+            // The browser will display default 404 page.
+            AssertNotFoundContentNotRendered(responseHasStarted: true);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    private void AssertNotFoundRendered(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        if (hasCustomNotFoundPageSet)
+        {
+            AssertNotFoundPageRendered();
+        }
+        else if (hasReExecutionMiddleware)
+        {
+            AssertReExecutionPageRendered();
+        }
+        else
+        {
+            throw new InvalidOperationException("NotFound page will not be rendered without re-execution middleware or custom NotFoundPage set. Use AssertNotFoundNotRendered in this case.");
+        }
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnFormSubmit_ResponseNotStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/post-not-found-ssr?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+        Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
+
+        bool notFoundContentForRenderingProvided = hasCustomNotFoundPageSet || hasReExecutionMiddleware;
+        if (notFoundContentForRenderingProvided)
+        {
+            AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered(responseHasStarted: false);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnFormSubmit_AfterAsyncOperation_ResponseNotStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/post-not-found-ssr?doAsync=true&useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+        Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
+
+        bool notFoundContentForRenderingProvided = hasCustomNotFoundPageSet || hasReExecutionMiddleware;
+        if (notFoundContentForRenderingProvided)
+        {
+            AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered(responseHasStarted: false);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Fact]
+    public void NotFoundSetOnFormSubmit_ResponseNotStarted_CustomRouter_SSR()
+    {
+        string testUrl = $"{ServerPathBase}/reexecution/post-not-found-ssr?useCustomRouter=true";
+        Navigate(testUrl);
+        Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
+
+        AssertReExecutionPageRendered();
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public void NotFoundSetOnFormSubmit_ResponseStarted_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
+    {
+        string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
+        string testUrl = $"{ServerPathBase}{reexecution}/post-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
+        Navigate(testUrl);
+        Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
+
+        bool notFoundContentForRenderingProvided = hasCustomNotFoundPageSet || hasReExecutionMiddleware;
+        if (notFoundContentForRenderingProvided)
+        {
+            AssertNotFoundRendered(hasReExecutionMiddleware, hasCustomNotFoundPageSet);
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered(responseHasStarted: true);
+        }
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Fact]
+    public void NotFoundSetOnFormSubmit_ResponseStarted_CustomRouter_SSR()
+    {
+        string testUrl = $"{ServerPathBase}/reexecution/post-not-found-ssr-streaming?useCustomRouter=true";
+        Navigate(testUrl);
+        Browser.FindElement(By.Id("not-found-form")).FindElement(By.TagName("button")).Click();
+
+        AssertReExecutionPageRendered();
+        AssertUrlNotChanged(testUrl);
+    }
+
+    [Fact]
+    public void StatusCodePagesWithReExecution()
+    {
+        Navigate($"{ServerPathBase}/reexecution/trigger-404");
+        Browser.Equal("Re-executed page", () => Browser.Title);
+    }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index f3b70bc87509..0f9b419fb847 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -32,9 +32,13 @@ public override async Task InitializeAsync()
         Browser.Equal("Redirections", () => _originalH1Element.Text);
     }
 
-    [Fact]
-    public void RedirectStreamingGetToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingGetToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         Browser.Exists(By.LinkText("Streaming GET with internal redirection")).Click();
         AssertElementRemoved(_originalH1Element);
         Browser.Equal("Scroll to hash", () => Browser.Exists(By.TagName("h1")).Text);
@@ -47,16 +51,23 @@ public void RedirectStreamingGetToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectStreamingGetToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingGetToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.LinkText("Streaming GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-    [Fact]
-    public void RedirectStreamingPostToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingPostToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         Browser.Exists(By.CssSelector("#form-streaming-internal button")).Click();
         AssertElementRemoved(_originalH1Element);
         Browser.Equal("Scroll to hash", () => Browser.Exists(By.TagName("h1")).Text);
@@ -69,16 +80,23 @@ public void RedirectStreamingPostToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectStreamingPostToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingPostToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.CssSelector("#form-streaming-external button")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedGetToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedGetToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // Note that for enhanced nav we can't preserve the hash part of the URL, as it
         // gets discarded when the browser follows a 'fetch' redirection. This is not solvable
         // unless we are willing to make the server return extra information so that the
@@ -95,16 +113,23 @@ public void RedirectEnhancedGetToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedGetToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedGetToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.LinkText("Enhanced GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedPostToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedPostToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // See above for why enhanced nav doesn't support preserving the hash
         Browser.Exists(By.CssSelector("#form-enhanced-internal button")).Click();
         Browser.Equal("Scroll to hash", () => _originalH1Element.Text);
@@ -116,16 +141,23 @@ public void RedirectEnhancedPostToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedPostToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedPostToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.CssSelector("#form-enhanced-external button")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-    [Fact]
-    public void RedirectStreamingEnhancedGetToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingEnhancedGetToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // See above for why enhanced nav doesn't support preserving the hash
         Browser.Exists(By.LinkText("Streaming enhanced GET with internal redirection")).Click();
         Browser.Equal("Scroll to hash", () => _originalH1Element.Text);
@@ -137,16 +169,25 @@ public void RedirectStreamingEnhancedGetToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectStreamingEnhancedGetToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         Browser.Exists(By.LinkText("Streaming enhanced GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
+    
 
-    [Fact]
-    public void RedirectStreamingEnhancedPostToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingEnhancedPostToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // See above for why enhanced nav doesn't support preserving the hash
         Browser.Exists(By.CssSelector("#form-streaming-enhanced-internal button")).Click();
         Browser.Equal("Scroll to hash", () => _originalH1Element.Text);
@@ -158,16 +199,24 @@ public void RedirectStreamingEnhancedPostToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectStreamingEnhancedPostToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectStreamingEnhancedPostToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         Browser.Exists(By.CssSelector("#form-streaming-enhanced-external button")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedNonBlazorGetToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedNonBlazorGetToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // See above for why enhanced nav doesn't support preserving the hash
         Browser.Exists(By.LinkText("Enhanced GET to non-Blazor endpoint with internal redirection")).Click();
         Browser.Equal("Scroll to hash", () => _originalH1Element.Text);
@@ -179,16 +228,24 @@ public void RedirectEnhancedNonBlazorGetToInternal()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedNonBlazorGetToExternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedNonBlazorGetToExternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         Browser.Exists(By.LinkText("Enhanced GET to non-Blazor endpoint with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-    [Fact]
-    public void RedirectEnhancedNonBlazorPostToInternal()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedNonBlazorPostToInternal(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // See above for why enhanced nav doesn't support preserving the hash
         Browser.Exists(By.CssSelector("#form-nonblazor-enhanced-internal button")).Click();
         Browser.Equal("Scroll to hash", () => _originalH1Element.Text);
@@ -205,9 +262,13 @@ public void RedirectEnhancedNonBlazorPostToInternal()
     // response to something like a 200 that the 'fetch' is allowed to read (embedding the
     // destination URL).
 
-    [Fact]
-    public void RedirectEnhancedGetToInternalWithErrorBoundary()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void RedirectEnhancedGetToInternalWithErrorBoundary(bool disableThrowNavigationException)
     {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
+
         // This test verifies that redirection works even if an ErrorBoundary wraps
         // a component throwing a NavigationException.
 
@@ -221,6 +282,18 @@ public void RedirectEnhancedGetToInternalWithErrorBoundary()
         Assert.EndsWith("/subdir/redirect", Browser.Url);
     }
 
+    [Fact]
+    public void NavigationException_InAsyncContext_DoesNotBecomeUnobservedTaskException()
+    {
+        AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", false);
+
+        // Navigate to the page that triggers the circular redirect.
+        Navigate($"{ServerPathBase}/redirect/circular");
+
+        // The component will stop redirecting after 3 attempts and render the exception count.
+        Browser.Equal("0", () => Browser.FindElement(By.Id("unobserved-exceptions-count")).Text);
+    }
+
     private void AssertElementRemoved(IWebElement element)
     {
         Browser.True(() =>
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RenderingTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RenderingTest.cs
index 16a1387feb89..8232098d8a78 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RenderingTest.cs
@@ -66,4 +66,53 @@ public void PostRequestRendersEndStateOfComponentsOnSSRPage()
 
         Browser.Equal("loaded child", () => Browser.Exists(By.Id("child")).Text);
     }
+
+    [Theory]
+    [InlineData(false, "ServerPrerendered", true)]
+    [InlineData(false, "ServerPrerendered", false)]
+    [InlineData(true, "ServerPrerendered", false)]
+    [InlineData(true, "ServerNonPrerendered", false)]
+    [InlineData(true, "WebAssemblyPrerendered", false)]
+    [InlineData(true, "WebAssemblyNonPrerendered", false)]
+    public async Task RenderBatchQueuedAfterRedirectionIsNotProcessed(bool redirect, string renderMode, bool throwSync)
+    {
+        string relativeUri = $"subdir/stopping-renderer?renderMode={renderMode}";
+        if (redirect)
+        {
+            relativeUri += $"&destination=redirect";
+        }
+
+        // async operation forces the next render batch
+        if (throwSync)
+        {
+            relativeUri += $"&delay=0";
+        }
+        else
+        {
+            relativeUri += $"&delay=1";
+        }
+
+        var requestUri = new Uri(_serverFixture.RootUri, relativeUri);
+        var httpClient = new HttpClient(new HttpClientHandler { AllowAutoRedirect = false });
+        var response = await httpClient.GetAsync(requestUri);
+
+        if (redirect)
+        {
+            var expectedUri = new Uri(_serverFixture.RootUri, "subdir/redirect");
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expectedUri, response.Headers.Location);
+        }
+        else
+        {
+            // the status code cannot be changed after it got set, so async throwing returns OK
+            if (throwSync)
+            {
+                Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            }
+            else
+            {
+                Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            }
+        }
+    }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs
index f935ac4fe3a0..1d3e5d133900 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs
@@ -32,11 +32,11 @@ public void StaticRendering_CanUseFingerprintedResources()
         var url = $"{ServerPathBase}/resource-collection";
         Navigate(url);
 
-        Browser.True(() => AppStylesRegex().IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
+        Browser.True(() => AppStylesRegex.IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
 
         Browser.Exists(By.Id("import-module")).Click();
 
-        Browser.True(() => JsModuleRegex().IsMatch(Browser.Exists(By.Id("js-module")).Text));
+        Browser.True(() => JsModuleRegex.IsMatch(Browser.Exists(By.Id("js-module")).Text));
     }
 
     [Theory]
@@ -49,15 +49,15 @@ public void StaticRendering_CanUseFingerprintedResources_InteractiveModes(string
 
         Browser.Equal(renderMode, () => Browser.Exists(By.Id("platform-name")).Text);
 
-        Browser.True(() => AppStylesRegex().IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
+        Browser.True(() => AppStylesRegex.IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
 
         Browser.Exists(By.Id("import-module")).Click();
 
-        Browser.True(() => JsModuleRegex().IsMatch(Browser.Exists(By.Id("js-module")).Text));
+        Browser.True(() => JsModuleRegex.IsMatch(Browser.Exists(By.Id("js-module")).Text));
     }
 
     [GeneratedRegex("""BasicTestApp\.[a-zA-Z0-9]{10}\.styles\.css""")]
-    private static partial Regex AppStylesRegex();
+    private static partial Regex AppStylesRegex { get; }
     [GeneratedRegex(""".*Index\.[a-zA-Z0-9]{10}\.mjs""")]
-    private static partial Regex JsModuleRegex();
+    private static partial Regex JsModuleRegex { get; }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
index 76ba4abec238..5fcf6d2a3813 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
@@ -245,7 +245,7 @@ static async Task<string> BandwidthThrottledGet(string url, int chunkLength, int
     [Theory]
     [InlineData(false)]
     [InlineData(true)]
-    public async void StopsProcessingStreamingOutputFromPreviousRequestAfterEnhancedNav(bool duringEnhancedNavigation)
+    public async Task StopsProcessingStreamingOutputFromPreviousRequestAfterEnhancedNav(bool duringEnhancedNavigation)
     {
         IWebElement originalH1Elem;
 
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/VirtualizationRenderModesTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/VirtualizationRenderModesTest.cs
index d080a7084a29..11218422ecf3 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/VirtualizationRenderModesTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/VirtualizationRenderModesTest.cs
@@ -26,8 +26,8 @@ public void Virtualize_Works_WhenMultipleRenderModesAreActive()
     {
         Navigate($"{ServerPathBase}/interactivity/virtualization");
 
-        Browser.Equal("interactive", () => Browser.FindElement(By.Id("virtualize-server")).GetAttribute("class"));
-        Browser.Equal("interactive", () => Browser.FindElement(By.Id("virtualize-webassembly")).GetAttribute("class"));
+        Browser.Equal("interactive", () => Browser.FindElement(By.Id("virtualize-server")).GetDomAttribute("class"));
+        Browser.Equal("interactive", () => Browser.FindElement(By.Id("virtualize-webassembly")).GetDomAttribute("class"));
 
         Browser.True(() => GetRenderedItems(Browser.FindElement(By.Id("virtualize-server"))).Contains("Item 1"));
         Browser.True(() => GetRenderedItems(Browser.FindElement(By.Id("virtualize-webassembly"))).Contains("Item 1"));
diff --git a/src/Components/test/E2ETest/Tests/BindTest.cs b/src/Components/test/E2ETest/Tests/BindTest.cs
index f64edb1b514e..f98a01a8ce35 100644
--- a/src/Components/test/E2ETest/Tests/BindTest.cs
+++ b/src/Components/test/E2ETest/Tests/BindTest.cs
@@ -38,23 +38,23 @@ public void CanBindTextbox_InitiallyBlank()
         var boundValue = Browser.Exists(By.Id("textbox-initially-blank-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-initially-blank-mirror"));
         var setNullButton = Browser.Exists(By.Id("textbox-initially-blank-setnull"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("Changed value");
         Assert.Equal(string.Empty, boundValue.Text); // Doesn't update until change event
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
         target.SendKeys("\t");
         Browser.Equal("Changed value", () => boundValue.Text);
-        Assert.Equal("Changed value", mirrorValue.GetAttribute("value"));
+        Assert.Equal("Changed value", mirrorValue.GetDomProperty("value"));
 
         // Remove the value altogether
         setNullButton.Click();
-        Browser.Equal(string.Empty, () => target.GetAttribute("value"));
+        Browser.Equal(string.Empty, () => target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -64,21 +64,21 @@ public void CanBindTextbox_InitiallyPopulated()
         var boundValue = Browser.Exists(By.Id("textbox-initially-populated-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-initially-populated-mirror"));
         var setNullButton = Browser.Exists(By.Id("textbox-initially-populated-setnull"));
-        Assert.Equal("Hello", target.GetAttribute("value"));
+        Assert.Equal("Hello", target.GetDomProperty("value"));
         Assert.Equal("Hello", boundValue.Text);
-        Assert.Equal("Hello", mirrorValue.GetAttribute("value"));
+        Assert.Equal("Hello", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("Changed value\t");
         Browser.Equal("Changed value", () => boundValue.Text);
-        Assert.Equal("Changed value", mirrorValue.GetAttribute("value"));
+        Assert.Equal("Changed value", mirrorValue.GetDomProperty("value"));
 
         // Remove the value altogether
         setNullButton.Click();
-        Browser.Equal(string.Empty, () => target.GetAttribute("value"));
+        Browser.Equal(string.Empty, () => target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -88,21 +88,21 @@ public void CanBindTextbox_WithBindSuffixInitiallyPopulated()
         var boundValue = Browser.Exists(By.Id("bind-with-suffix-textbox-initially-populated-value"));
         var mirrorValue = Browser.Exists(By.Id("bind-with-suffix-textbox-initially-populated-mirror"));
         var setNullButton = Browser.Exists(By.Id("bind-with-suffix-textbox-initially-populated-setnull"));
-        Assert.Equal("Hello", target.GetAttribute("value"));
+        Assert.Equal("Hello", target.GetDomProperty("value"));
         Assert.Equal("Hello", boundValue.Text);
-        Assert.Equal("Hello", mirrorValue.GetAttribute("value"));
+        Assert.Equal("Hello", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("Changed value\t");
         Browser.Equal("Changed value", () => boundValue.Text);
-        Assert.Equal("Changed value", mirrorValue.GetAttribute("value"));
+        Assert.Equal("Changed value", mirrorValue.GetDomProperty("value"));
 
         // Remove the value altogether
         setNullButton.Click();
-        Browser.Equal(string.Empty, () => target.GetAttribute("value"));
+        Browser.Equal(string.Empty, () => target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -110,7 +110,7 @@ public void CanBindTextArea_InitiallyBlank()
     {
         var target = Browser.Exists(By.Id("textarea-initially-blank"));
         var boundValue = Browser.Exists(By.Id("textarea-initially-blank-value"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
 
         // Modify target; verify value is updated
@@ -125,7 +125,7 @@ public void CanBindTextArea_InitiallyPopulated()
     {
         var target = Browser.Exists(By.Id("textarea-initially-populated"));
         var boundValue = Browser.Exists(By.Id("textarea-initially-populated-value"));
-        Assert.Equal("Hello", target.GetAttribute("value"));
+        Assert.Equal("Hello", target.GetDomProperty("value"));
         Assert.Equal("Hello", boundValue.Text);
 
         // Modify target; verify value is updated
@@ -249,24 +249,24 @@ public void CanBindTextboxInt()
         var target = Browser.Exists(By.Id("textbox-int"));
         var boundValue = Browser.Exists(By.Id("textbox-int-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-int-mirror"));
-        Assert.Equal("-42", target.GetAttribute("value"));
+        Assert.Equal("-42", target.GetDomProperty("value"));
         Assert.Equal("-42", boundValue.Text);
-        Assert.Equal("-42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-42", mirrorValue.GetDomProperty("value"));
 
         // Clear target; value resets to zero
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // Leading zeros are not preserved
         target.SendKeys("42");
-        Browser.Equal("042", () => target.GetAttribute("value"));
+        Browser.Equal("042", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal("42", () => target.GetAttribute("value"));
+        Browser.Equal("42", () => target.GetDomProperty("value"));
         Assert.Equal("42", boundValue.Text);
-        Assert.Equal("42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("42", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -275,31 +275,31 @@ public void CanBindTextboxNullableInt()
         var target = Browser.Exists(By.Id("textbox-nullable-int"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-int-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-int-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("-42\t");
         Browser.Equal("-42", () => boundValue.Text);
-        Assert.Equal("-42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-42", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("42\t");
         Browser.Equal("42", () => boundValue.Text);
-        Assert.Equal("42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("42", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -308,22 +308,22 @@ public void CanBindTextboxLong()
         var target = Browser.Exists(By.Id("textbox-long"));
         var boundValue = Browser.Exists(By.Id("textbox-long-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-long-mirror"));
-        Assert.Equal("3000000000", target.GetAttribute("value"));
+        Assert.Equal("3000000000", target.GetDomProperty("value"));
         Assert.Equal("3000000000", boundValue.Text);
-        Assert.Equal("3000000000", mirrorValue.GetAttribute("value"));
+        Assert.Equal("3000000000", mirrorValue.GetDomProperty("value"));
 
         // Clear target; value resets to zero
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Backspace);
         target.SendKeys("-3000000000\t");
-        Browser.Equal("-3000000000", () => target.GetAttribute("value"));
+        Browser.Equal("-3000000000", () => target.GetDomProperty("value"));
         Assert.Equal("-3000000000", boundValue.Text);
-        Assert.Equal("-3000000000", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-3000000000", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -332,31 +332,31 @@ public void CanBindTextboxNullableLong()
         var target = Browser.Exists(By.Id("textbox-nullable-long"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-long-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-long-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("3000000000\t");
         Browser.Equal("3000000000", () => boundValue.Text);
-        Assert.Equal("3000000000", mirrorValue.GetAttribute("value"));
+        Assert.Equal("3000000000", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("-3000000000\t");
         Browser.Equal("-3000000000", () => boundValue.Text);
-        Assert.Equal("-3000000000", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-3000000000", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -365,24 +365,24 @@ public void CanBindTextboxShort()
         var target = Browser.Exists(By.Id("textbox-short"));
         var boundValue = Browser.Exists(By.Id("textbox-short-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-short-mirror"));
-        Assert.Equal("-42", target.GetAttribute("value"));
+        Assert.Equal("-42", target.GetDomProperty("value"));
         Assert.Equal("-42", boundValue.Text);
-        Assert.Equal("-42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-42", mirrorValue.GetDomProperty("value"));
 
         // Clear target; value resets to zero
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // Leading zeros are not preserved
         target.SendKeys("42");
-        Browser.Equal("042", () => target.GetAttribute("value"));
+        Browser.Equal("042", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal("42", () => target.GetAttribute("value"));
+        Browser.Equal("42", () => target.GetDomProperty("value"));
         Assert.Equal("42", boundValue.Text);
-        Assert.Equal("42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("42", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -391,31 +391,31 @@ public void CanBindTextboxNullableShort()
         var target = Browser.Exists(By.Id("textbox-nullable-short"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-short-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-short-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("-42\t");
         Browser.Equal("-42", () => boundValue.Text);
-        Browser.Equal("-42", () => mirrorValue.GetAttribute("value"));
+        Browser.Equal("-42", () => mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("42\t");
         Browser.Equal("42", () => boundValue.Text);
-        Browser.Equal("42", () => mirrorValue.GetAttribute("value"));
+        Browser.Equal("42", () => mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -424,22 +424,22 @@ public void CanBindTextboxFloat()
         var target = Browser.Exists(By.Id("textbox-float"));
         var boundValue = Browser.Exists(By.Id("textbox-float-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-float-mirror"));
-        Assert.Equal("3.141", target.GetAttribute("value"));
+        Assert.Equal("3.141", target.GetDomProperty("value"));
         Assert.Equal("3.141", boundValue.Text);
-        Assert.Equal("3.141", mirrorValue.GetAttribute("value"));
+        Assert.Equal("3.141", mirrorValue.GetDomProperty("value"));
 
         // Clear target; value resets to zero
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Backspace);
         target.SendKeys("-3.141\t");
-        Browser.Equal("-3.141", () => target.GetAttribute("value"));
+        Browser.Equal("-3.141", () => target.GetDomProperty("value"));
         Browser.Equal("-3.141", () => boundValue.Text);
-        Browser.Equal("-3.141", () => mirrorValue.GetAttribute("value"));
+        Browser.Equal("-3.141", () => mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -448,31 +448,31 @@ public void CanBindTextboxNullableFloat()
         var target = Browser.Exists(By.Id("textbox-nullable-float"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-float-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-float-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("3.141\t");
         Browser.Equal("3.141", () => boundValue.Text);
-        Assert.Equal("3.141", mirrorValue.GetAttribute("value"));
+        Assert.Equal("3.141", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("-3.141\t");
         Browser.Equal("-3.141", () => boundValue.Text);
-        Assert.Equal("-3.141", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-3.141", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -481,30 +481,30 @@ public void CanBindTextboxDouble()
         var target = Browser.Exists(By.Id("textbox-double"));
         var boundValue = Browser.Exists(By.Id("textbox-double-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-double-mirror"));
-        Assert.Equal("3.14159265359", target.GetAttribute("value"));
+        Assert.Equal("3.14159265359", target.GetDomProperty("value"));
         Assert.Equal("3.14159265359", boundValue.Text);
-        Assert.Equal("3.14159265359", mirrorValue.GetAttribute("value"));
+        Assert.Equal("3.14159265359", mirrorValue.GetDomProperty("value"));
 
         // Clear target; value resets to default
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Backspace);
         target.SendKeys("-3.14159265359\t");
         Browser.Equal("-3.14159265359", () => boundValue.Text);
-        Assert.Equal("-3.14159265359", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-3.14159265359", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // Double shouldn't preserve trailing zeros
         target.Clear();
         target.SendKeys(Keys.Backspace);
         target.SendKeys("0.010\t");
-        Browser.Equal("0.01", () => target.GetAttribute("value"));
+        Browser.Equal("0.01", () => target.GetDomProperty("value"));
         Assert.Equal("0.01", boundValue.Text);
-        Assert.Equal("0.01", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.01", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -513,38 +513,38 @@ public void CanBindTextboxNullableDouble()
         var target = Browser.Exists(By.Id("textbox-nullable-double"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-double-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-double-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("3.14159265359\t");
         Browser.Equal("3.14159265359", () => boundValue.Text);
-        Assert.Equal("3.14159265359", mirrorValue.GetAttribute("value"));
+        Assert.Equal("3.14159265359", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("-3.14159265359\t");
         Browser.Equal("-3.14159265359", () => boundValue.Text);
-        Assert.Equal("-3.14159265359", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-3.14159265359", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // Double shouldn't preserve trailing zeros
         target.Clear();
         target.SendKeys("0.010\t");
         Browser.Equal("0.01", () => boundValue.Text);
-        Assert.Equal("0.01", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.01", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -553,21 +553,21 @@ public void CanBindTextboxDecimal()
         var target = Browser.Exists(By.Id("textbox-decimal"));
         var boundValue = Browser.Exists(By.Id("textbox-decimal-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-decimal-mirror"));
-        Assert.Equal("0.0000000000000000000000000001", target.GetAttribute("value"));
+        Assert.Equal("0.0000000000000000000000000001", target.GetDomProperty("value"));
         Assert.Equal("0.0000000000000000000000000001", boundValue.Text);
-        Assert.Equal("0.0000000000000000000000000001", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.0000000000000000000000000001", mirrorValue.GetDomProperty("value"));
 
         // Clear textbox; value updates to zero because that's the default
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // Decimal should preserve trailing zeros
         target.SendKeys("0.010\t");
         Browser.Equal("0.010", () => boundValue.Text);
-        Assert.Equal("0.010", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.010", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -576,32 +576,32 @@ public void CanBindTextboxNullableDecimal()
         var target = Browser.Exists(By.Id("textbox-nullable-decimal"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-decimal-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-decimal-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("0.0000000000000000000000000001\t");
         Browser.Equal("0.0000000000000000000000000001", () => boundValue.Text);
-        Assert.Equal("0.0000000000000000000000000001", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.0000000000000000000000000001", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // Decimal should preserve trailing zeros
         target.Clear();
         target.SendKeys("0.010\t");
         Browser.Equal("0.010", () => boundValue.Text);
-        Browser.Equal("0.010", () => mirrorValue.GetAttribute("value"));
+        Browser.Equal("0.010", () => mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // This tests what happens you put invalid (unconvertable) input in. This is separate from the
@@ -612,30 +612,30 @@ public void CanBindTextbox_Decimal_InvalidInput()
         var target = Browser.Exists(By.Id("textbox-decimal-invalid"));
         var boundValue = Browser.Exists(By.Id("textbox-decimal-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-decimal-invalid-mirror"));
-        Assert.Equal("0.0000000000000000000000000001", target.GetAttribute("value"));
+        Assert.Equal("0.0000000000000000000000000001", target.GetDomProperty("value"));
         Assert.Equal("0.0000000000000000000000000001", boundValue.Text);
-        Assert.Equal("0.0000000000000000000000000001", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.0000000000000000000000000001", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("0.01\t");
         Browser.Equal("0.01", () => boundValue.Text);
-        Assert.Equal("0.01", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.01", mirrorValue.GetDomProperty("value"));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys("2A");
-        Assert.Equal("0.012A", target.GetAttribute("value"));
+        Assert.Equal("0.012A", target.GetDomProperty("value"));
         target.SendKeys("\t");
         Browser.Equal("0.01", () => boundValue.Text);
-        Browser.Equal("0.01", () => mirrorValue.GetAttribute("value"));
-        Browser.Equal("0.01", () => target.GetAttribute("value"));
+        Browser.Equal("0.01", () => mirrorValue.GetDomProperty("value"));
+        Browser.Equal("0.01", () => target.GetDomProperty("value"));
 
         // Continue editing with valid inputs
         target.SendKeys(Keys.Backspace);
         target.SendKeys("2\t");
         Browser.Equal("0.02", () => boundValue.Text);
-        Browser.Equal("0.02", () => mirrorValue.GetAttribute("value"));
+        Browser.Equal("0.02", () => mirrorValue.GetDomProperty("value"));
     }
 
     // This tests what happens you put invalid (unconvertable) input in. This is separate from the
@@ -646,30 +646,30 @@ public void CanBindTextbox_NullableDecimal_InvalidInput()
         var target = Browser.Exists(By.Id("textbox-nullable-decimal-invalid"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-decimal-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-decimal-invalid-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("0.01\t");
         Browser.Equal("0.01", () => boundValue.Text);
-        Assert.Equal("0.01", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.01", mirrorValue.GetDomProperty("value"));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys("2A");
-        Assert.Equal("0.012A", target.GetAttribute("value"));
+        Assert.Equal("0.012A", target.GetDomProperty("value"));
         target.SendKeys("\t");
         Browser.Equal("0.01", () => boundValue.Text);
-        Assert.Equal("0.01", mirrorValue.GetAttribute("value"));
-        Assert.Equal("0.01", target.GetAttribute("value"));
+        Assert.Equal("0.01", mirrorValue.GetDomProperty("value"));
+        Assert.Equal("0.01", target.GetDomProperty("value"));
 
         // Continue editing with valid inputs
         target.SendKeys(Keys.Backspace);
         target.SendKeys("2\t");
         Browser.Equal("0.02", () => boundValue.Text);
-        Assert.Equal("0.02", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0.02", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -678,20 +678,20 @@ public void CanBindTextboxGenericInt()
         var target = Browser.Exists(By.Id("textbox-generic-int"));
         var boundValue = Browser.Exists(By.Id("textbox-generic-int-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-generic-int-mirror"));
-        Assert.Equal("-42", target.GetAttribute("value"));
+        Assert.Equal("-42", target.GetDomProperty("value"));
         Assert.Equal("-42", boundValue.Text);
-        Assert.Equal("-42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("-42", mirrorValue.GetDomProperty("value"));
 
         // Clear target; value resets to zero
         target.Clear();
-        Browser.Equal("0", () => target.GetAttribute("value"));
+        Browser.Equal("0", () => target.GetDomProperty("value"));
         Assert.Equal("0", boundValue.Text);
-        Assert.Equal("0", mirrorValue.GetAttribute("value"));
+        Assert.Equal("0", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("42\t");
         Browser.Equal("42", () => boundValue.Text);
-        Assert.Equal("42", mirrorValue.GetAttribute("value"));
+        Assert.Equal("42", mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -700,20 +700,20 @@ public void CanBindTextboxGenericGuid()
         var target = Browser.Exists(By.Id("textbox-generic-guid"));
         var boundValue = Browser.Exists(By.Id("textbox-generic-guid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-generic-guid-mirror"));
-        Assert.Equal("00000000-0000-0000-0000-000000000000", target.GetAttribute("value"));
+        Assert.Equal("00000000-0000-0000-0000-000000000000", target.GetDomProperty("value"));
         Assert.Equal("00000000-0000-0000-0000-000000000000", boundValue.Text);
-        Assert.Equal("00000000-0000-0000-0000-000000000000", mirrorValue.GetAttribute("value"));
+        Assert.Equal("00000000-0000-0000-0000-000000000000", mirrorValue.GetDomProperty("value"));
 
         // Modify target; value is not updated because it's not convertable.
         target.Clear();
         Browser.Equal("00000000-0000-0000-0000-000000000000", () => boundValue.Text);
-        Assert.Equal("00000000-0000-0000-0000-000000000000", mirrorValue.GetAttribute("value"));
+        Assert.Equal("00000000-0000-0000-0000-000000000000", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var newValue = Guid.NewGuid().ToString();
         target.SendKeys(newValue + "\t");
         Browser.Equal(newValue, () => boundValue.Text);
-        Assert.Equal(newValue, mirrorValue.GetAttribute("value"));
+        Assert.Equal(newValue, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -725,23 +725,23 @@ public void CanBindTextboxDateTime()
         var boundValue = Browser.Exists(By.Id("textbox-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-datetime-mirror"));
         var expected = new DateTime(1985, 3, 4);
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01/02/2000 00:00:00\t");
         expected = new DateTime(2000, 1, 2);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -752,26 +752,26 @@ public void CanBindTextboxNullableDateTime()
         var target = Browser.Exists(By.Id("textbox-nullable-datetime"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-datetime-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new DateTime(2000, 1, 2);
         target.SendKeys("01/02/2000 00:00:00\t");
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -783,23 +783,23 @@ public void CanBindTextboxDateTimeOffset()
         var boundValue = Browser.Exists(By.Id("textbox-datetimeoffset-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-datetimeoffset-mirror"));
         var expected = new DateTimeOffset(new DateTime(1985, 3, 4), TimeSpan.FromHours(8));
-        Assert.Equal(expected, DateTimeOffset.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateTimeOffset.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateTimeOffset.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01/02/2000 00:00:00 +08:00\t");
         expected = new DateTimeOffset(new DateTime(2000, 1, 2), TimeSpan.FromHours(8));
         Browser.Equal(expected, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -810,26 +810,26 @@ public void CanBindTextboxNullableDateTimeOffset()
         var target = Browser.Exists(By.Id("textbox-nullable-datetimeoffset"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("01/02/2000 00:00:00 +08:00" + "\t");
         var expected = new DateTimeOffset(new DateTime(2000, 1, 2), TimeSpan.FromHours(8));
         Browser.Equal(expected, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -841,23 +841,23 @@ public void CanBindTextboxDateOnly()
         var boundValue = Browser.Exists(By.Id("textbox-dateonly-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-dateonly-mirror"));
         var expected = new DateOnly(1985, 3, 4);
-        Assert.Equal(expected, DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01/02/2000\t");
         expected = new DateOnly(2000, 1, 2);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -868,26 +868,26 @@ public void CanBindTextboxNullableDateOnly()
         var target = Browser.Exists(By.Id("textbox-nullable-dateonly"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-dateonly-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-dateonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new DateOnly(2000, 1, 2);
         target.SendKeys("01/02/2000\t");
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -899,23 +899,23 @@ public void CanBindTextboxTimeOnly()
         var boundValue = Browser.Exists(By.Id("textbox-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-timeonly-mirror"));
         var expected = new TimeOnly(8, 5);
-        Assert.Equal(expected, TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("10:42\t");
         expected = new TimeOnly(10, 42);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -926,26 +926,26 @@ public void CanBindTextboxNullableTimeOnly()
         var target = Browser.Exists(By.Id("textbox-nullable-timeonly"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-timeonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new TimeOnly(8, 5);
         target.SendKeys("08:05\t");
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -957,24 +957,24 @@ public void CanBindTextboxDateTimeWithFormat()
         var boundValue = Browser.Exists(By.Id("textbox-datetime-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-datetime-format-mirror"));
         var expected = new DateTime(1985, 3, 4);
-        Assert.Equal("03-04", target.GetAttribute("value"));
+        Assert.Equal("03-04", target.GetDomProperty("value"));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to the default
         target.Clear();
         target.SendKeys("\t");
         expected = default;
-        Browser.Equal("01-01", () => target.GetAttribute("value"));
+        Browser.Equal("01-01", () => target.GetDomProperty("value"));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01-02\t");
         expected = new DateTime(DateTime.Now.Year, 1, 2);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -985,26 +985,26 @@ public void CanBindTextboxNullableDateTimeWithFormat()
         var target = Browser.Exists(By.Id("textbox-nullable-datetime-format"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-datetime-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-datetime-format-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("01-02\t");
         var expected = new DateTime(DateTime.Now.Year, 1, 2);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1016,23 +1016,23 @@ public void CanBindTextboxDateTimeOffsetWithFormat()
         var boundValue = Browser.Exists(By.Id("textbox-datetimeoffset-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-datetimeoffset-format-mirror"));
         var expected = new DateTimeOffset(new DateTime(1985, 3, 4), TimeSpan.FromHours(8));
-        Assert.Equal("03-04", target.GetAttribute("value"));
+        Assert.Equal("03-04", target.GetDomProperty("value"));
         Assert.Equal(expected, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to the default
         target.Clear();
         expected = default;
-        Browser.Equal("01-01", () => target.GetAttribute("value"));
+        Browser.Equal("01-01", () => target.GetDomProperty("value"));
         Assert.Equal(expected, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01-02\t");
         expected = new DateTimeOffset(new DateTime(DateTime.Now.Year, 1, 2), TimeSpan.FromHours(0));
         Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1046,26 +1046,26 @@ public void CanBindTextboxNullableDateTimeOffsetWithFormat()
         var target = Browser.Exists(By.Id("textbox-nullable-datetimeoffset"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("01-02" + "\t");
         var expected = new DateTimeOffset(new DateTime(DateTime.Now.Year, 1, 2), TimeSpan.FromHours(0));
         Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1077,24 +1077,24 @@ public void CanBindTextboxDateOnlyWithFormat()
         var boundValue = Browser.Exists(By.Id("textbox-dateonly-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-dateonly-format-mirror"));
         var expected = new DateOnly(1985, 3, 4);
-        Assert.Equal("03-04", target.GetAttribute("value"));
+        Assert.Equal("03-04", target.GetDomProperty("value"));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to the default
         target.Clear();
         target.SendKeys("\t");
         expected = default;
-        Browser.Equal("01-01", () => target.GetAttribute("value"));
+        Browser.Equal("01-01", () => target.GetDomProperty("value"));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01-02\t");
         expected = new DateOnly(DateTime.Now.Year, 1, 2);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1105,26 +1105,26 @@ public void CanBindTextboxNullableDateOnlyWithFormat()
         var target = Browser.Exists(By.Id("textbox-nullable-dateonly-format"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-dateonly-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-dateonly-format-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("01-02\t");
         var expected = new DateOnly(DateTime.Now.Year, 1, 2);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1136,24 +1136,24 @@ public void CanBindTextboxTimeOnlyWithFormat()
         var boundValue = Browser.Exists(By.Id("textbox-timeonly-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-timeonly-format-mirror"));
         var expected = new TimeOnly(8, 5);
-        Assert.Equal("08:05:00", target.GetAttribute("value"));
+        Assert.Equal("08:05:00", target.GetDomProperty("value"));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to the default
         target.Clear();
         target.SendKeys("\t");
         expected = default;
-        Browser.Equal("00:00:00", () => target.GetAttribute("value"));
+        Browser.Equal("00:00:00", () => target.GetDomProperty("value"));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("10:42:00\t");
         expected = new TimeOnly(10, 42);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1164,26 +1164,26 @@ public void CanBindTextboxNullableTimeOnlyWithFormat()
         var target = Browser.Exists(By.Id("textbox-nullable-timeonly-format"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-timeonly-format-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-timeonly-format-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.SendKeys("08:05:00\t");
         var expected = new TimeOnly(8, 5);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1194,32 +1194,32 @@ public void CanBindTextboxNullableDateTime_InvalidValue()
         var target = Browser.Exists(By.Id("textbox-nullable-datetime-invalid"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-datetime-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-datetime-invalid-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new DateTime(2000, 1, 2);
         target.SendKeys("01/02/2000 00:00:00\t");
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06X");
-        Browser.Equal("05/06X", () => target.GetAttribute("value"));
+        Browser.Equal("05/06X", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal(expected, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06\t");
         expected = new DateTime(DateTime.Now.Year, 5, 6);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1231,33 +1231,33 @@ public void CanBindTextboxDateTimeOffset_InvalidValue()
         var boundValue = Browser.Exists(By.Id("textbox-datetimeoffset-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-datetimeoffset-invalid-mirror"));
         var expected = new DateTimeOffset(new DateTime(1985, 3, 4), TimeSpan.FromHours(8));
-        Assert.Equal(expected, DateTimeOffset.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         expected = new DateTime(2000, 1, 2);
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01/02/2000 00:00:00\t");
         Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06X");
-        Browser.Equal("05/06X", () => target.GetAttribute("value"));
+        Browser.Equal("05/06X", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
         Assert.Equal(expected.DateTime, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06\t");
         expected = new DateTime(DateTime.Now.Year, 5, 6);
         Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1269,26 +1269,26 @@ public void CanBindTextboxDateTimeWithFormat_InvalidValue()
         var boundValue = Browser.Exists(By.Id("textbox-datetime-format-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-datetime-format-invalid-mirror"));
         var expected = new DateTime(1985, 3, 4);
-        Assert.Equal("03-04", target.GetAttribute("value"));
+        Assert.Equal("03-04", target.GetDomProperty("value"));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06");
-        Browser.Equal("05/06", () => target.GetAttribute("value"));
+        Browser.Equal("05/06", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal("03-04", () => target.GetAttribute("value"));
+        Browser.Equal("03-04", () => target.GetDomProperty("value"));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05-06\t");
         expected = new DateTime(DateTime.Now.Year, 5, 6);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1299,33 +1299,33 @@ public void CanBindTextboxNullableDateTimeOffsetWithFormat_InvalidValue()
         var target = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-format-invalid"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-format-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-datetimeoffset-format-invalid-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new DateTimeOffset(new DateTime(DateTime.Now.Year, 1, 2));
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("01-02\t");
         Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06");
-        Browser.Equal("05/06", () => target.GetAttribute("value"));
+        Browser.Equal("05/06", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
         Assert.Equal(expected.DateTime, DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05-06\t");
         expected = new DateTime(DateTime.Now.Year, 5, 6);
         Browser.Equal(expected.DateTime, () => DateTimeOffset.Parse(boundValue.Text, CultureInfo.InvariantCulture).DateTime);
-        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture).DateTime);
+        Assert.Equal(expected.DateTime, DateTimeOffset.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture).DateTime);
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1336,32 +1336,32 @@ public void CanBindTextboxNullableDateOnly_InvalidValue()
         var target = Browser.Exists(By.Id("textbox-nullable-dateonly-invalid"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-dateonly-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-dateonly-invalid-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new DateOnly(2000, 1, 2);
         target.SendKeys("01/02/2000\t");
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06X");
-        Browser.Equal("05/06X", () => target.GetAttribute("value"));
+        Browser.Equal("05/06X", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal(expected, () => DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06\t");
         expected = new DateOnly(DateTime.Now.Year, 5, 6);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1373,26 +1373,26 @@ public void CanBindTextboxDateOnlyWithFormat_InvalidValue()
         var boundValue = Browser.Exists(By.Id("textbox-dateonly-format-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-dateonly-format-invalid-mirror"));
         var expected = new DateOnly(1985, 3, 4);
-        Assert.Equal("03-04", target.GetAttribute("value"));
+        Assert.Equal("03-04", target.GetDomProperty("value"));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05/06");
-        Browser.Equal("05/06", () => target.GetAttribute("value"));
+        Browser.Equal("05/06", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal("03-04", () => target.GetAttribute("value"));
+        Browser.Equal("03-04", () => target.GetDomProperty("value"));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("05-06\t");
         expected = new DateOnly(DateTime.Now.Year, 5, 6);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1403,32 +1403,32 @@ public void CanBindTextboxNullableTimeOnly_InvalidValue()
         var target = Browser.Exists(By.Id("textbox-nullable-timeonly-invalid"));
         var boundValue = Browser.Exists(By.Id("textbox-nullable-timeonly-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-nullable-timeonly-invalid-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         var expected = new TimeOnly(8, 5);
         target.SendKeys("08:05:00\t");
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("10:42:00X");
-        Browser.Equal("10:42:00X", () => target.GetAttribute("value"));
+        Browser.Equal("10:42:00X", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal(expected, () => TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("10:42:00\t");
         expected = new TimeOnly(10, 42);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1440,26 +1440,26 @@ public void CanBindTextboxTimeOnlyWithFormat_InvalidValue()
         var boundValue = Browser.Exists(By.Id("textbox-timeonly-format-invalid-value"));
         var mirrorValue = Browser.Exists(By.Id("textbox-timeonly-format-invalid-mirror"));
         var expected = new TimeOnly(8, 5);
-        Assert.Equal("08:05:00", target.GetAttribute("value"));
+        Assert.Equal("08:05:00", target.GetDomProperty("value"));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target to something invalid - the invalid change is reverted
         // back to the last valid value
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("10:42");
-        Browser.Equal("10:42", () => target.GetAttribute("value"));
+        Browser.Equal("10:42", () => target.GetDomProperty("value"));
         target.SendKeys("\t");
-        Browser.Equal("08:05:00", () => target.GetAttribute("value"));
+        Browser.Equal("08:05:00", () => target.GetDomProperty("value"));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Now change it to something valid
         target.SendKeys(Keys.Control + "a"); // select all
         target.SendKeys("10:42:00\t");
         expected = new TimeOnly(10, 42);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1471,23 +1471,23 @@ public void CanBindDateTimeLocalTextboxDateTime()
         var boundValue = Browser.Exists(By.Id("datetime-local-textbox-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("datetime-local-textbox-datetime-mirror"));
         var expected = new DateTime(1985, 3, 4);
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#datetime-local-textbox-datetime", "2000-01-02T04:05:06");
         expected = new DateTime(2000, 1, 2, 04, 05, 06);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1498,14 +1498,14 @@ public void CanBindDateTimeLocalTextboxNullableDateTime()
         var target = Browser.Exists(By.Id("datetime-local-textbox-nullable-datetime"));
         var boundValue = Browser.Exists(By.Id("datetime-local-textbox-nullable-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("datetime-local-textbox-nullable-datetime-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1513,13 +1513,13 @@ public void CanBindDateTimeLocalTextboxNullableDateTime()
         ApplyInputValue("#datetime-local-textbox-nullable-datetime", "2000-01-02T04:05:06");
         var expected = new DateTime(2000, 1, 2, 04, 05, 06);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1531,23 +1531,23 @@ public void CanBindDateTimeLocalTextboxDateOnly()
         var boundValue = Browser.Exists(By.Id("datetime-local-textbox-dateonly-value"));
         var mirrorValue = Browser.Exists(By.Id("datetime-local-textbox-dateonly-mirror"));
         var expected = new DateOnly(1985, 3, 4);
-        Assert.Equal(expected, DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#datetime-local-textbox-dateonly", "2000-01-02T04:05:06");
         expected = new DateOnly(2000, 1, 2);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1558,14 +1558,14 @@ public void CanBindDateTimeLocalTextboxNullableDateOnly()
         var target = Browser.Exists(By.Id("datetime-local-textbox-nullable-dateonly"));
         var boundValue = Browser.Exists(By.Id("datetime-local-textbox-nullable-dateonly-value"));
         var mirrorValue = Browser.Exists(By.Id("datetime-local-textbox-nullable-dateonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1573,13 +1573,13 @@ public void CanBindDateTimeLocalTextboxNullableDateOnly()
         ApplyInputValue("#datetime-local-textbox-nullable-dateonly", "2000-01-02T04:05:06");
         var expected = new DateOnly(2000, 1, 2);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1591,23 +1591,23 @@ public void CanBindDateTimeLocalTextboxTimeOnly()
         var boundValue = Browser.Exists(By.Id("datetime-local-textbox-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("datetime-local-textbox-timeonly-mirror"));
         var expected = new TimeOnly(8, 5);
-        Assert.Equal(expected, TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#datetime-local-textbox-timeonly", "2000-01-02T04:05:00");
         expected = new TimeOnly(4, 5);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1618,14 +1618,14 @@ public void CanBindDateTimeLocalTextboxNullableTimeOnly()
         var target = Browser.Exists(By.Id("datetime-local-textbox-nullable-timeonly"));
         var boundValue = Browser.Exists(By.Id("datetime-local-textbox-nullable-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("datetime-local-textbox-nullable-timeonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1633,13 +1633,13 @@ public void CanBindDateTimeLocalTextboxNullableTimeOnly()
         ApplyInputValue("#datetime-local-textbox-nullable-timeonly", "2000-01-02T04:05:00");
         var expected = new TimeOnly(4, 5);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1651,25 +1651,25 @@ public void CanBindMonthTextboxDateTime()
         var boundValue = Browser.Exists(By.Id("month-textbox-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("month-textbox-datetime-mirror"));
         var expected = new DateTime(1985, 3, 1);
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         // When the value gets displayed the first time it gets truncated to the 1st day,
         // until there is no change the bound value doesn't get updated.
         Assert.Equal(expected.AddDays(3), DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected.AddDays(3), DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected.AddDays(3), DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#month-textbox-datetime", "2000-02");
         expected = new DateTime(2000, 2, 1);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1680,14 +1680,14 @@ public void CanBindMonthTextboxNullableDateTime()
         var target = Browser.Exists(By.Id("month-textbox-nullable-datetime"));
         var boundValue = Browser.Exists(By.Id("month-textbox-nullable-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("month-textbox-nullable-datetime-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1695,13 +1695,13 @@ public void CanBindMonthTextboxNullableDateTime()
         ApplyInputValue("#month-textbox-nullable-datetime", "2000-02");
         var expected = new DateTime(2000, 2, 1);
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1713,25 +1713,25 @@ public void CanBindMonthTextboxDateOnly()
         var boundValue = Browser.Exists(By.Id("month-textbox-dateonly-value"));
         var mirrorValue = Browser.Exists(By.Id("month-textbox-dateonly-mirror"));
         var expected = new DateOnly(1985, 3, 1);
-        Assert.Equal(expected, DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         // When the value gets displayed the first time it gets truncated to the 1st day,
         // until there is no change the bound value doesn't get updated.
         Assert.Equal(expected.AddDays(3), DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected.AddDays(3), DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected.AddDays(3), DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 01/01/0001 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(expected, () => DateOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(expected, () => DateOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#month-textbox-dateonly", "2000-02");
         expected = new DateOnly(2000, 2, 1);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1742,14 +1742,14 @@ public void CanBindMonthTextboxNullableDateOnly()
         var target = Browser.Exists(By.Id("month-textbox-nullable-dateonly"));
         var boundValue = Browser.Exists(By.Id("month-textbox-nullable-dateonly-value"));
         var mirrorValue = Browser.Exists(By.Id("month-textbox-nullable-dateonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1757,13 +1757,13 @@ public void CanBindMonthTextboxNullableDateOnly()
         ApplyInputValue("#month-textbox-nullable-dateonly", "2000-02");
         var expected = new DateOnly(2000, 2, 1);
         Browser.Equal(expected, () => DateOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1775,23 +1775,23 @@ public void CanBindTimeTextboxDateTime()
         var boundValue = Browser.Exists(By.Id("time-textbox-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("time-textbox-datetime-mirror"));
         var expected = DateTime.Now.Date.AddHours(8).AddMinutes(5);
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(DateTime.Now.Date, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(DateTime.Now.Date, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(default, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(default, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#time-textbox-datetime", "04:05");
         expected = DateTime.Now.Date.Add(new TimeSpan(4, 5, 0));
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1802,14 +1802,14 @@ public void CanBindTimeTextboxNullableDateTime()
         var target = Browser.Exists(By.Id("time-textbox-nullable-datetime"));
         var boundValue = Browser.Exists(By.Id("time-textbox-nullable-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("time-textbox-nullable-datetime-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1817,13 +1817,13 @@ public void CanBindTimeTextboxNullableDateTime()
         ApplyInputValue("#time-textbox-nullable-datetime", "05:06");
         var expected = DateTime.Now.Date.Add(new TimeSpan(05, 06, 0));
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1835,23 +1835,23 @@ public void CanBindTimeTextboxTimeOnly()
         var boundValue = Browser.Exists(By.Id("time-textbox-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("time-textbox-timeonly-mirror"));
         var expected = new TimeOnly(8, 5);
-        Assert.Equal(expected, TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(TimeOnly.MinValue, () => TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(TimeOnly.MinValue, () => TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(default, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(default, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#time-textbox-timeonly", "04:05");
         expected = new TimeOnly(4, 5);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1862,14 +1862,14 @@ public void CanBindTimeTextboxNullableTimeOnly()
         var target = Browser.Exists(By.Id("time-textbox-nullable-timeonly"));
         var boundValue = Browser.Exists(By.Id("time-textbox-nullable-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("time-textbox-nullable-timeonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1877,13 +1877,13 @@ public void CanBindTimeTextboxNullableTimeOnly()
         ApplyInputValue("#time-textbox-nullable-timeonly", "05:06");
         var expected = new TimeOnly(5, 6);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1895,23 +1895,23 @@ public void CanBindTimeStepTextboxDateTime()
         var boundValue = Browser.Exists(By.Id("time-step-textbox-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("time-step-textbox-datetime-mirror"));
         var expected = DateTime.Now.Date.Add(new TimeSpan(8, 5, 30));
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(DateTime.Now.Date, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(DateTime.Now.Date, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(default, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(default, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#time-step-textbox-datetime", "04:05:06");
         expected = DateTime.Now.Date.Add(new TimeSpan(4, 5, 6));
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1922,14 +1922,14 @@ public void CanBindTimeStepTextboxNullableDateTime()
         var target = Browser.Exists(By.Id("time-step-textbox-nullable-datetime"));
         var boundValue = Browser.Exists(By.Id("time-step-textbox-nullable-datetime-value"));
         var mirrorValue = Browser.Exists(By.Id("time-step-textbox-nullable-datetime-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1937,13 +1937,13 @@ public void CanBindTimeStepTextboxNullableDateTime()
         ApplyInputValue("#time-step-textbox-nullable-datetime", "05:06");
         var expected = DateTime.Now.Date.Add(new TimeSpan(05, 06, 0));
         Browser.Equal(expected, () => DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1955,23 +1955,23 @@ public void CanBindTimeStepTextboxTimeOnly()
         var boundValue = Browser.Exists(By.Id("time-step-textbox-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("time-step-textbox-timeonly-mirror"));
         var expected = new TimeOnly(8, 5, 30);
-        Assert.Equal(expected, TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(expected, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(TimeOnly.MinValue, () => TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(TimeOnly.MinValue, () => TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(default, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(default, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input
         // element directly.
         ApplyInputValue("#time-step-textbox-timeonly", "04:05:06");
         expected = new TimeOnly(4, 5, 6);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
     }
 
     // For date comparisons, we parse (non-formatted) values to compare them. Client-side and server-side
@@ -1982,14 +1982,14 @@ public void CanBindTimeStepTextboxNullableTimeOnly()
         var target = Browser.Exists(By.Id("time-step-textbox-nullable-timeonly"));
         var boundValue = Browser.Exists(By.Id("time-step-textbox-nullable-timeonly-value"));
         var mirrorValue = Browser.Exists(By.Id("time-step-textbox-nullable-timeonly-mirror"));
-        Assert.Equal(string.Empty, target.GetAttribute("value"));
+        Assert.Equal(string.Empty, target.GetDomProperty("value"));
         Assert.Equal(string.Empty, boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         Browser.Equal("", () => boundValue.Text);
-        Assert.Equal("", mirrorValue.GetAttribute("value"));
+        Assert.Equal("", mirrorValue.GetDomProperty("value"));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         // We have to do it this way because the browser gets in the way when sending keys to the input
@@ -1997,13 +1997,13 @@ public void CanBindTimeStepTextboxNullableTimeOnly()
         ApplyInputValue("#time-step-textbox-nullable-timeonly", "05:06");
         var expected = new TimeOnly(5, 6);
         Browser.Equal(expected, () => TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
-        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(mirrorValue.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Modify target; verify value is updated and that textboxes linked to the same data are updated
         target.Clear();
         target.SendKeys("\t");
         Browser.Equal(string.Empty, () => boundValue.Text);
-        Assert.Equal(string.Empty, mirrorValue.GetAttribute("value"));
+        Assert.Equal(string.Empty, mirrorValue.GetDomProperty("value"));
     }
 
     [Fact]
@@ -2016,12 +2016,12 @@ public void CanBindDateTimeLocalDefaultStepTextboxDateTime()
         var target = Browser.Exists(By.Id("datetime-local-default-step-textbox-datetime"));
         var boundValue = Browser.Exists(By.Id("datetime-local-default-step-textbox-datetime-value"));
         var expected = DateTime.Now.Date.Add(new TimeSpan(8, 5, 0)); // Notice the "seconds" part is zero here, even though the original data has seconds=30
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(default, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(default, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input element directly.
@@ -2040,12 +2040,12 @@ public void CanBindTimeDefaultStepTextboxDateTime()
         var target = Browser.Exists(By.Id("time-default-step-textbox-datetime"));
         var boundValue = Browser.Exists(By.Id("time-default-step-textbox-datetime-value"));
         var expected = DateTime.Now.Date.Add(new TimeSpan(8, 5, 0)); // Notice the "seconds" part is zero here, even though the original data has seconds=30
-        Assert.Equal(expected, DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(DateTime.Now.Date, () => DateTime.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(DateTime.Now.Date, () => DateTime.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, DateTime.Parse(boundValue.Text, CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input element directly.
@@ -2064,12 +2064,12 @@ public void CanBindTimeDefaultStepTextboxTimeOnly()
         var target = Browser.Exists(By.Id("time-default-step-textbox-timeonly"));
         var boundValue = Browser.Exists(By.Id("time-default-step-textbox-timeonly-value"));
         var expected = new TimeOnly(8, 5, 0); // Notice the "seconds" part is zero here, even though the original data has seconds=30
-        Assert.Equal(expected, TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Assert.Equal(expected, TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
 
         // Clear textbox; value updates to 00:00 because that's the default
         target.Clear();
         expected = default;
-        Browser.Equal(default, () => TimeOnly.Parse(target.GetAttribute("value"), CultureInfo.InvariantCulture));
+        Browser.Equal(default, () => TimeOnly.Parse(target.GetDomProperty("value"), CultureInfo.InvariantCulture));
         Assert.Equal(default, TimeOnly.Parse(boundValue.Text, CultureInfo.InvariantCulture));
 
         // We have to do it this way because the browser gets in the way when sending keys to the input element directly.
diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
index 544e588d5f4c..d40c7612866e 100644
--- a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
+++ b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
@@ -19,9 +19,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
 public partial class BootResourceCachingTest
     : ServerTestBase<AspNetSiteServerFixture>
 {
-    // The cache name is derived from the application's base href value (in this case, '/')
-    private const string CacheName = "dotnet-resources-/";
-
     public BootResourceCachingTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
@@ -43,7 +40,6 @@ public void CachesResourcesAfterFirstLoad()
         Navigate("/");
         WaitUntilLoaded();
         var initialResourcesRequested = GetAndClearRequestedPaths();
-        Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
         Assert.NotEmpty(initialResourcesRequested.Where(path =>
             path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
             path.EndsWith(".wasm", StringComparison.Ordinal)));
@@ -52,122 +48,18 @@ public void CachesResourcesAfterFirstLoad()
             !path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
             path.EndsWith(".wasm", StringComparison.Ordinal)));
 
-        // On subsequent loads, we skip the items referenced from blazor.boot.json
-        // which includes .wasm (original .dll) files and dotnet.native.[fingerprint].wasm
-        Navigate("about:blank");
-        Browser.Equal(string.Empty, () => Browser.Title);
-        Navigate("/");
-        WaitUntilLoaded();
-        var subsequentResourcesRequested = GetAndClearRequestedPaths();
-        Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
-        Assert.Empty(subsequentResourcesRequested.Where(path =>
-            path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
-            path.EndsWith(".wasm", StringComparison.Ordinal)));
-        Assert.NotEmpty(subsequentResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
-        Assert.Empty(subsequentResourcesRequested.Where(path =>
-            !path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
-            path.EndsWith(".wasm", StringComparison.Ordinal)));
-    }
-
-    [Fact]
-    public async Task IncrementallyUpdatesCache()
-    {
-        // Perform a first load to populate the cache
-        Navigate("/");
-        WaitUntilLoaded();
-        var cacheEntryUrls1 = GetCacheEntryUrls();
-        var cacheEntryForComponentsDll = cacheEntryUrls1.Single(IsFingerprintedComponentsEntry);
-        var cacheEntryForDotNetWasm = cacheEntryUrls1.Single(IsFingerprintedDotNetWasmEntry);
-        var cacheEntryForDotNetWasmWithChangedHash = cacheEntryForDotNetWasm.Replace(".sha256-", ".sha256-different");
-
-        // Remove some items we do need, and add an item we don't need
-        RemoveCacheEntry(cacheEntryForComponentsDll);
-        RemoveCacheEntry(cacheEntryForDotNetWasm);
-        AddCacheEntry(cacheEntryForDotNetWasmWithChangedHash, "ignored content");
-        var cacheEntryUrls2 = GetCacheEntryUrls();
-        Assert.DoesNotContain(cacheEntryForComponentsDll, cacheEntryUrls2);
-        Assert.DoesNotContain(cacheEntryForDotNetWasm, cacheEntryUrls2);
-        Assert.Contains(cacheEntryForDotNetWasmWithChangedHash, cacheEntryUrls2);
-
-        // On the next load, we'll fetch only the items we need (not things already cached)
-        GetAndClearRequestedPaths();
         Navigate("about:blank");
         Browser.Equal(string.Empty, () => Browser.Title);
         Navigate("/");
         WaitUntilLoaded();
         var subsequentResourcesRequested = GetAndClearRequestedPaths();
-        Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".wasm")),
-            requestedDll => Assert.True(IsFingerprintedComponentsEntry(requestedDll)),
-            requestedDll => Assert.True(IsFingerprintedDotNetWasmEntry(requestedDll)));
-
-        var cacheEntryUrls3 = GetCacheEntryUrls();
-        // wait until the cache was cleaned, max 500ms
-        for (var i = 0; i < 5; i++)
-        {
-            if (!cacheEntryUrls3.Contains(cacheEntryForDotNetWasmWithChangedHash))
-            {
-                break;
-            }
-            await Task.Delay(100); // wait for cache purge
-            cacheEntryUrls3 = GetCacheEntryUrls();
-        }
-        Assert.Contains(cacheEntryForComponentsDll, cacheEntryUrls3);
-        Assert.Contains(cacheEntryForDotNetWasm, cacheEntryUrls3);
-        Assert.DoesNotContain(cacheEntryForDotNetWasmWithChangedHash, cacheEntryUrls3);
-    }
-
-    [GeneratedRegex("/Microsoft\\.AspNetCore\\.Components\\.\\w*\\.wasm")]
-    private static partial Regex GetFingerprintedComponentsEntryRegex();
-
-    [GeneratedRegex("/dotnet\\.native\\.\\w*\\.wasm")]
-    private static partial Regex GetFingerprintedDotNetWasmEntryRegex();
-
-    private static bool IsFingerprintedComponentsEntry(string url)
-        => GetFingerprintedComponentsEntryRegex().IsMatch(url);
-
-    private static bool IsFingerprintedDotNetWasmEntry(string url)
-        => GetFingerprintedDotNetWasmEntryRegex().IsMatch(url);
-
-    private IReadOnlyCollection<string> GetCacheEntryUrls()
-    {
-        var js = @"
-                (async function(cacheName, completedCallback) {
-                    const cache = await caches.open(cacheName);
-                    const keys = await cache.keys();
-                    const urls = keys.map(r => r.url);
-                    completedCallback(urls);
-                }).apply(null, arguments)";
-        var jsExecutor = (IJavaScriptExecutor)Browser;
-        var result = (IEnumerable<object>)jsExecutor.ExecuteAsyncScript(js, CacheName);
-        return result.Cast<string>().ToList();
-    }
-
-    private void RemoveCacheEntry(string url)
-    {
-        var js = @"
-                (async function(cacheName, urlToRemove, completedCallback) {
-                    const cache = await caches.open(cacheName);
-                    await cache.delete(urlToRemove);
-                    completedCallback();
-                }).apply(null, arguments)";
-        ((IJavaScriptExecutor)Browser).ExecuteAsyncScript(js, CacheName, url);
-    }
-
-    private void AddCacheEntry(string url, string content)
-    {
-        var js = @"
-                (async function(cacheName, urlToAdd, contentToAdd, completedCallback) {
-                    const cache = await caches.open(cacheName);
-                    await cache.put(urlToAdd, new Response(contentToAdd));
-                    completedCallback();
-                }).apply(null, arguments)";
-        ((IJavaScriptExecutor)Browser).ExecuteAsyncScript(js, CacheName, url, content);
+        Assert.Empty(subsequentResourcesRequested);
     }
 
     private IReadOnlyCollection<string> GetAndClearRequestedPaths()
     {
         var requestLog = _serverFixture.Host.Services.GetRequiredService<BootResourceRequestLog>();
-        var result = requestLog.RequestPaths.ToList();
+        var result = requestLog.RequestPathsWithNewContent.ToList();
         requestLog.Clear();
         return result;
     }
diff --git a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
index 73033fc25459..5492d8bb8cdc 100644
--- a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
+++ b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
@@ -51,7 +51,7 @@ public void CanRenderMultipleRootComponents()
         Assert.Single(greets, "Hello Abraham");
         Assert.Equal(2, greets.Where(g => g == "Hello Blue fish").Count());
         Assert.Equal(3, greets.Where(g => string.Equals("Hello", g)).Count()); // 3 server prerendered without parameters
-        var content = Browser.Exists(By.Id("test-container")).GetAttribute("innerHTML");
+        var content = Browser.Exists(By.Id("test-container")).GetDomProperty("innerHTML");
         var markers = ReadMarkers(content);
         var componentSequence = markers.Select(m => m.Item1.PrerenderId != null).ToArray();
         Assert.Equal(13, componentSequence.Length);
diff --git a/src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs b/src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs
index c27d04d06ec2..9c957c2da8a7 100644
--- a/src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs
+++ b/src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs
@@ -51,7 +51,7 @@ public void CanRenderComponentWithDataDash()
     {
         var appElement = Browser.MountTestComponent<DataDashComponent>();
         var element = appElement.FindElement(By.Id("cool_beans"));
-        Assert.Equal("17", element.GetAttribute("data-tab"));
+        Assert.Equal("17", element.GetDomAttribute("data-tab"));
         Assert.Equal("17", element.Text);
     }
 
@@ -61,8 +61,8 @@ public void CanRenderComponentWithAttributes()
         var appElement = Browser.MountTestComponent<RedTextComponent>();
         var styledElement = appElement.FindElement(By.TagName("h1"));
         Assert.Equal("Hello, world!", styledElement.Text);
-        Assert.Equal("color: red;", styledElement.GetAttribute("style"));
-        Assert.Equal("somevalue", styledElement.GetAttribute("customattribute"));
+        Assert.Equal("color: red;", styledElement.GetDomAttribute("style"));
+        Assert.Equal("somevalue", styledElement.GetDomAttribute("customattribute"));
     }
 
     [Fact]
@@ -117,7 +117,7 @@ public void CanTriggerKeyPressEvents()
             li => Assert.Equal("b", li.Text));
 
         // Textbox contains typed text
-        Assert.Equal("ab", inputElement.GetAttribute("value"));
+        Assert.Equal("ab", inputElement.GetDomProperty("value"));
     }
 
     [Fact]
@@ -155,8 +155,8 @@ public void CanRenderChildComponents()
 
         var styledElement = appElement.FindElement(By.CssSelector("fieldset > h1"));
         Assert.Equal("Hello, world!", styledElement.Text);
-        Assert.Equal("color: red;", styledElement.GetAttribute("style"));
-        Assert.Equal("somevalue", styledElement.GetAttribute("customattribute"));
+        Assert.Equal("color: red;", styledElement.GetDomAttribute("style"));
+        Assert.Equal("somevalue", styledElement.GetDomAttribute("customattribute"));
     }
 
     // Verifies we can render HTML content as a single block
@@ -165,7 +165,7 @@ public void CanRenderChildContent_StaticHtmlBlock()
     {
         var appElement = Browser.MountTestComponent<HtmlBlockChildContent>();
         Assert.Equal("<p>Some-Static-Text</p>",
-            appElement.FindElement(By.Id("foo")).GetAttribute("innerHTML"));
+            appElement.FindElement(By.Id("foo")).GetDomProperty("innerHTML"));
     }
 
     // Verifies we can rewite more complex HTML content into blocks
@@ -175,16 +175,16 @@ public void CanRenderChildContent_MixedHtmlBlock()
         var appElement = Browser.MountTestComponent<HtmlMixedChildContent>();
 
         var one = appElement.FindElement(By.Id("one"));
-        Assert.Equal("<p>Some-Static-Text</p>", one.GetAttribute("innerHTML"));
+        Assert.Equal("<p>Some-Static-Text</p>", one.GetDomProperty("innerHTML"));
 
         var two = appElement.FindElement(By.Id("two"));
-        Assert.Equal("<span>More-Static-Text</span>", two.GetAttribute("innerHTML"));
+        Assert.Equal("<span>More-Static-Text</span>", two.GetDomProperty("innerHTML"));
 
         var three = appElement.FindElement(By.Id("three"));
-        Assert.Equal("Some-Dynamic-Text", three.GetAttribute("innerHTML"));
+        Assert.Equal("Some-Dynamic-Text", three.GetDomProperty("innerHTML"));
 
         var four = appElement.FindElement(By.Id("four"));
-        Assert.Equal("But this is static", four.GetAttribute("innerHTML"));
+        Assert.Equal("But this is static", four.GetDomProperty("innerHTML"));
     }
 
     // Verifies we can rewrite HTML blocks with encoded HTML
@@ -194,16 +194,16 @@ public void CanRenderChildContent_EncodedHtmlInBlock()
         var appElement = Browser.MountTestComponent<HtmlEncodedChildContent>();
 
         var one = appElement.FindElement(By.Id("one"));
-        Assert.Equal("<p>Some-Static-Text</p>", one.GetAttribute("innerHTML"));
+        Assert.Equal("<p>Some-Static-Text</p>", one.GetDomProperty("innerHTML"));
 
         var two = appElement.FindElement(By.Id("two"));
-        Assert.Equal("&lt;span&gt;More-Static-Text&lt;/span&gt;", two.GetAttribute("innerHTML"));
+        Assert.Equal("&lt;span&gt;More-Static-Text&lt;/span&gt;", two.GetDomProperty("innerHTML"));
 
         var three = appElement.FindElement(By.Id("three"));
-        Assert.Equal("Some-Dynamic-Text", three.GetAttribute("innerHTML"));
+        Assert.Equal("Some-Dynamic-Text", three.GetDomProperty("innerHTML"));
 
         var four = appElement.FindElement(By.Id("four"));
-        Assert.Equal("But this is static", four.GetAttribute("innerHTML"));
+        Assert.Equal("But this is static", four.GetDomProperty("innerHTML"));
     }
 
     [Fact]
@@ -363,18 +363,18 @@ public void CanUseJsInteropToReferenceElements()
         var inputElement = appElement.FindElement(By.Id("capturedElement"));
         var buttonElement = appElement.FindElement(By.TagName("button"));
 
-        Assert.Equal(string.Empty, inputElement.GetAttribute("value"));
+        Assert.Equal(string.Empty, inputElement.GetDomProperty("value"));
 
         buttonElement.Click();
-        Browser.Equal("Clicks: 1", () => inputElement.GetAttribute("value"));
+        Browser.Equal("Clicks: 1", () => inputElement.GetDomProperty("value"));
         buttonElement.Click();
-        Browser.Equal("Clicks: 2", () => inputElement.GetAttribute("value"));
+        Browser.Equal("Clicks: 2", () => inputElement.GetDomProperty("value"));
     }
 
     [Fact]
     public void CanUseFocusExtensionToFocusElement()
     {
-        Browser.Manage().Window.Size = new System.Drawing.Size(100, 300);
+        Browser.SetWindowSize(100, 300);
         var appElement = Browser.MountTestComponent<ElementFocusComponent>();
 
         // y scroll position before click
@@ -399,7 +399,7 @@ public void CanUseFocusExtensionToFocusElement()
         Assert.True(pageYOffsetAfter > pageYOffsetBefore);
 
         // A local helper that gets the ID of the focused element.
-        string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetAttribute("id");
+        string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id");
 
         // A local helper that gets window.PageYOffset
         int getPageYOffset() => Convert.ToInt32(((IJavaScriptExecutor)Browser).ExecuteScript("return window.pageYOffset"), CultureInfo.InvariantCulture);
@@ -408,7 +408,7 @@ public void CanUseFocusExtensionToFocusElement()
     [Fact]
     public void CanUseFocusExtensionToFocusSvgElement()
     {
-        Browser.Manage().Window.Size = new System.Drawing.Size(100, 300);
+        Browser.SetWindowSize(100, 300);
         var appElement = Browser.MountTestComponent<SvgFocusComponent>();
 
         var buttonElement = appElement.FindElement(By.Id("focus-button"));
@@ -424,13 +424,13 @@ public void CanUseFocusExtensionToFocusSvgElement()
         Browser.Equal("focus-circle", getFocusedElementId);
 
         // A local helper that gets the ID of the focused element.
-        string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetAttribute("id");
+        string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id");
     }
 
     [Fact]
     public void CanUseFocusExtensionToFocusElementPreventScroll()
     {
-        Browser.Manage().Window.Size = new System.Drawing.Size(600, 600);
+        Browser.SetWindowSize(600, 600);
         var appElement = Browser.MountTestComponent<ElementFocusComponent>();
 
         var buttonElement = Browser.Exists(By.Id("focus-button-prevented"));
@@ -453,7 +453,7 @@ public void CanUseFocusExtensionToFocusElementPreventScroll()
         Assert.Equal(pageYOffsetBefore, pageYOffsetAfter);
 
         // A local helper that gets the ID of the focused element.
-        string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetAttribute("id");
+        string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id");
 
         // A local helper that gets window.PageYOffset
         int getPageYOffset() => Convert.ToInt32(((IJavaScriptExecutor)Browser).ExecuteScript("return window.pageYOffset"), CultureInfo.InvariantCulture);
@@ -474,7 +474,7 @@ public void CanFocusDuringOnAfterRenderAsyncWithFocusInEvent(string triggerButto
 
         appElement.FindElement(By.Id(triggerButton)).Click();
         Browser.Equal("True", () => didReceiveFocusLabel.Text);
-        Browser.Equal("focus-input-onafterrender", () => Browser.SwitchTo().ActiveElement().GetAttribute("id"));
+        Browser.Equal("focus-input-onafterrender", () => Browser.SwitchTo().ActiveElement().GetDomAttribute("id"));
 
         // As well as actually focusing and triggering the onfocusin event, we should not be seeing any errors
         var log = Browser.Manage().Logs.GetLog(LogType.Browser).ToArray();
@@ -499,11 +499,11 @@ public void CanCaptureReferencesToDynamicallyAddedElements()
         // Re-add it; observe it starts empty again
         checkbox.Click();
         var inputElement = appElement.FindElement(By.Id("capturedElement"));
-        Assert.Equal(string.Empty, inputElement.GetAttribute("value"));
+        Assert.Equal(string.Empty, inputElement.GetDomProperty("value"));
 
         // See that the capture variable was automatically updated to reference the new instance
         buttonElement.Click();
-        Browser.Equal("Clicks: 1", () => inputElement.GetAttribute("value"));
+        Browser.Equal("Clicks: 1", () => inputElement.GetDomProperty("value"));
     }
 
     [Fact]
@@ -541,7 +541,7 @@ public void CanCaptureReferencesToDynamicallyAddedComponents()
     public void CanUseJsInteropForRefElementsDuringOnAfterRender()
     {
         var appElement = Browser.MountTestComponent<AfterRenderInteropComponent>();
-        Browser.Equal("Value set after render", () => Browser.Exists(By.TagName("input")).GetAttribute("value"));
+        Browser.Equal("Value set after render", () => Browser.Exists(By.TagName("input")).GetDomProperty("value"));
     }
 
     [Fact]
@@ -665,7 +665,7 @@ public void CanPerformInteropImmediatelyOnComponentInsertion()
     {
         var appElement = Browser.MountTestComponent<InteropOnInitializationComponent>();
         Browser.Equal("Hello from interop call", () => appElement.FindElement(By.Id("val-get-by-interop")).Text);
-        Browser.Equal("Hello from interop call", () => appElement.FindElement(By.Id("val-set-by-interop")).GetAttribute("value"));
+        Browser.Equal("Hello from interop call", () => appElement.FindElement(By.Id("val-set-by-interop")).GetDomProperty("value"));
     }
 
     [Fact]
@@ -677,15 +677,15 @@ public void CanUseAddMultipleAttributes()
         Browser.Exists(selector);
 
         var element = appElement.FindElement(selector);
-        Assert.Equal(string.Empty, element.GetAttribute("bool")); // attribute is present
-        Assert.Equal("middle-value", element.GetAttribute("string"));
-        Assert.Equal("unmatched-value", element.GetAttribute("unmatched"));
+        Assert.Equal(string.Empty, element.GetDomAttribute("bool")); // attribute is present
+        Assert.Equal("middle-value", element.GetDomAttribute("string"));
+        Assert.Equal("unmatched-value", element.GetDomAttribute("unmatched"));
 
         selector = By.CssSelector("#duplicate-on-element-override > div");
         element = appElement.FindElement(selector);
-        Assert.Null(element.GetAttribute("bool")); // attribute is not present
-        Assert.Equal("other-text", element.GetAttribute("string"));
-        Assert.Equal("unmatched-value", element.GetAttribute("unmatched"));
+        Assert.Null(element.GetDomAttribute("bool")); // attribute is not present
+        Assert.Equal("other-text", element.GetDomAttribute("string"));
+        Assert.Equal("unmatched-value", element.GetDomAttribute("unmatched"));
     }
 
     [Fact]
diff --git a/src/Components/test/E2ETest/Tests/ErrorBoundaryTest.cs b/src/Components/test/E2ETest/Tests/ErrorBoundaryTest.cs
index a31ef73a9f62..80402e38bf54 100644
--- a/src/Components/test/E2ETest/Tests/ErrorBoundaryTest.cs
+++ b/src/Components/test/E2ETest/Tests/ErrorBoundaryTest.cs
@@ -46,7 +46,7 @@ public void CanHandleExceptions(string triggerId)
         Browser.Collection(() => container.FindElements(By.CssSelector("*")),
             elem =>
             {
-                Assert.Equal("blazor-error-boundary", elem.GetAttribute("class"));
+                Assert.Equal("blazor-error-boundary", elem.GetDomAttribute("class"));
                 Assert.Empty(elem.FindElements(By.CssSelector("*")));
             });
 
@@ -126,6 +126,17 @@ public void CanHandleErrorsAfterDisposingComponent()
         AssertGlobalErrorState(false);
     }
 
+    [Fact]
+    public void CanHandleErrorsAfterDisposingErrorBoundaryComponent()
+    {
+        var container = Browser.Exists(By.Id("multiple-errors-at-once-test"));
+        container.FindElement(By.ClassName("throw-multiple-errors")).Click();
+        // The error boundary is still there, so we see the error message
+        Browser.Collection(() => container.FindElements(By.ClassName("error-message")),
+            elem => Assert.Equal("OnInitializedAsyncError", elem.Text));
+        AssertGlobalErrorState(false);
+    }
+
     [Fact]
     public async Task CanHandleErrorsAfterDisposingErrorBoundary()
     {
diff --git a/src/Components/test/E2ETest/Tests/EventBubblingTest.cs b/src/Components/test/E2ETest/Tests/EventBubblingTest.cs
index 3d19ba508728..c20f873a9914 100644
--- a/src/Components/test/E2ETest/Tests/EventBubblingTest.cs
+++ b/src/Components/test/E2ETest/Tests/EventBubblingTest.cs
@@ -166,7 +166,7 @@ public void PreventDefaultCanBlockKeystrokes()
         var textbox = Browser.Exists(By.Id($"textbox-that-can-block-keystrokes"));
         textbox.SendKeys("a");
         Browser.Equal(new[] { "Received keydown" }, GetLogLines);
-        Browser.Equal("a", () => textbox.GetAttribute("value"));
+        Browser.Equal("a", () => textbox.GetDomProperty("value"));
 
         // We can turn on preventDefault to stop keystrokes
         // There will still be a keydown event, but we're preventing it from actually changing the textbox value
@@ -174,19 +174,19 @@ public void PreventDefaultCanBlockKeystrokes()
         Browser.Exists(By.Id($"prevent-keydown")).Click();
         textbox.SendKeys("b");
         Browser.Equal(new[] { "Received keydown" }, GetLogLines);
-        Browser.Equal("a", () => textbox.GetAttribute("value"));
+        Browser.Equal("a", () => textbox.GetDomProperty("value"));
 
         // We can turn it back off
         ClearLog();
         Browser.Exists(By.Id($"prevent-keydown")).Click();
         textbox.SendKeys("c");
         Browser.Equal(new[] { "Received keydown" }, GetLogLines);
-        Browser.Equal("ac", () => textbox.GetAttribute("value"));
+        Browser.Equal("ac", () => textbox.GetDomProperty("value"));
     }
 
     private string[] GetLogLines()
         => Browser.Exists(By.TagName("textarea"))
-        .GetAttribute("value")
+        .GetDomProperty("value")
         .Replace("\r\n", "\n")
         .Split('\n', StringSplitOptions.RemoveEmptyEntries);
 
diff --git a/src/Components/test/E2ETest/Tests/EventCustomArgsTest.cs b/src/Components/test/E2ETest/Tests/EventCustomArgsTest.cs
index 55f22d9cc4d0..a5a236a67585 100644
--- a/src/Components/test/E2ETest/Tests/EventCustomArgsTest.cs
+++ b/src/Components/test/E2ETest/Tests/EventCustomArgsTest.cs
@@ -77,7 +77,7 @@ public void CanAliasBrowserEvent_WithCreateEventArgsReturningData()
                 "You pressed: b",
             }, GetLogLines);
 
-        Assert.Equal("ab", input.GetAttribute("value"));
+        Assert.Equal("ab", input.GetDomProperty("value"));
     }
 
     [Fact]
@@ -97,7 +97,7 @@ public void CanAliasBrowserEvent_PreventDefaultOnNativeEvent()
             }, GetLogLines);
 
         // Check it was actually preventDefault-ed
-        Assert.Equal("", input.GetAttribute("value"));
+        Assert.Equal("", input.GetDomProperty("value"));
     }
 
     [Fact]
@@ -120,7 +120,7 @@ public void CanAliasBrowserEvent_StopPropagationIndependentOfNativeEvent()
                 "Yet another aliased event received: b",
             }, GetLogLines);
 
-        Assert.Equal("ab", input.GetAttribute("value"));
+        Assert.Equal("ab", input.GetDomProperty("value"));
     }
 
     [Fact]
@@ -141,7 +141,7 @@ public void CanHaveMultipleAliasesForASingleBrowserEvent()
                 "Yet another aliased event received: b",
             }, GetLogLines);
 
-        Assert.Equal("ab", input.GetAttribute("value"));
+        Assert.Equal("ab", input.GetDomProperty("value"));
     }
 
     [Fact]
@@ -180,7 +180,7 @@ void SendKeysSequentially(IWebElement target, string text)
 
     private string[] GetLogLines()
         => Browser.Exists(By.Id("test-log"))
-        .GetAttribute("value")
+        .GetDomProperty("value")
         .Replace("\r\n", "\n")
         .Split('\n', StringSplitOptions.RemoveEmptyEntries);
 }
diff --git a/src/Components/test/E2ETest/Tests/EventFlagsTest.cs b/src/Components/test/E2ETest/Tests/EventFlagsTest.cs
new file mode 100644
index 000000000000..08099a2c85e4
--- /dev/null
+++ b/src/Components/test/E2ETest/Tests/EventFlagsTest.cs
@@ -0,0 +1,149 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using BasicTestApp;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Interactions;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
+
+public class EventFlagsTest : ServerTestBase<ToggleExecutionModeServerFixture<Program>>
+{
+    public EventFlagsTest(
+        BrowserFixture browserFixture,
+        ToggleExecutionModeServerFixture<Program> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+        Navigate(ServerPathBase);
+        Browser.MountTestComponent<EventFlagsComponent>();
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void OnMouseDown_WithPreventDefaultEnabled_DoesNotFocusButton(bool handlersEnabled)
+    {
+        if (!handlersEnabled)
+        {
+            // Disable onmousedown handlers
+            var toggleHandlers = Browser.Exists(By.Id("toggle-handlers"));
+            toggleHandlers.Click();
+        }
+
+        var button = Browser.Exists(By.Id("mousedown-test-button"));
+        button.Click();
+
+        // Check that the button has not gained focus (should not be yellow)
+        var afterClickBackgroundColor = button.GetCssValue("background-color");
+        Assert.DoesNotContain("255, 255, 0", afterClickBackgroundColor);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void OnMouseDown_WithPreventDefaultDisabled_DoesFocusButton(bool handlersEnabled)
+    {
+        if (!handlersEnabled)
+        {
+            // Disable onmousedown handlers
+            var toggleHandlers = Browser.Exists(By.Id("toggle-handlers"));
+            toggleHandlers.Click();
+        }
+
+        // Disable preventDefault
+        var togglePreventDefault = Browser.Exists(By.Id("toggle-prevent-default"));
+        togglePreventDefault.Click();
+
+        var button = Browser.Exists(By.Id("mousedown-test-button"));
+
+        // Get the initial background color and check that it is no yellow
+        var initialBackgroundColor = button.GetCssValue("background-color");
+        Assert.DoesNotContain("255, 255, 0", initialBackgroundColor);
+
+        button.Click();
+
+        // Check that the button has gained focus (yellow background)
+        var afterClickBackgroundColor = button.GetCssValue("background-color");
+        Assert.Contains("255, 255, 0", afterClickBackgroundColor);
+    }
+
+    [Fact]
+    public void OnClick_WithStopPropagationEnabled_DoesNotPropagateToParent()
+    {
+        var button = Browser.Exists(By.Id("stop-propagation-test-button"));
+        button.Click();
+
+        var eventLog = Browser.Exists(By.Id("event-log"));
+        Assert.Contains("mousedown handler called on child", eventLog.Text);
+        Assert.DoesNotContain("mousedown handler called on parent", eventLog.Text);
+    }
+
+    [Fact]
+    public void OnClick_WithStopPropagationDisabled_PropagatesToParent()
+    {
+        // Disable stopPropagation
+        var toggleStopPropagation = Browser.Exists(By.Id("toggle-stop-propagation"));
+        toggleStopPropagation.Click();
+
+        var button = Browser.Exists(By.Id("stop-propagation-test-button"));
+        button.Click();
+
+        var eventLog = Browser.Exists(By.Id("event-log"));
+        Assert.Contains("mousedown handler called on child", eventLog.Text);
+        Assert.Contains("mousedown handler called on parent", eventLog.Text);
+    }
+
+    [Fact]
+    public void OnWheel_WithPreventDefaultEnabled_DoesNotScrollDiv()
+    {
+        var scrollableDiv = Browser.Exists(By.Id("wheel-test-area"));
+
+        // Simulate a wheel scroll action
+        var scrollOrigin = new WheelInputDevice.ScrollOrigin
+        {
+            Element = scrollableDiv,
+        };
+        new Actions(Browser)
+            .ScrollFromOrigin(scrollOrigin, 0, 200)
+            .Perform();
+
+        // The Selenium scrolling action always changes the scrollTop property even when the event is prevented.
+        // For this reason, we do not check for equality with zero.
+        var newScrollTop = int.Parse(scrollableDiv.GetDomProperty("scrollTop"), CultureInfo.InvariantCulture);
+        Assert.True(newScrollTop < 3);
+    }
+
+    [Fact]
+    public void OnWheel_WithPreventDefaultDisabled_DoesScrollDiv()
+    {
+        // Disable preventDefault
+        var togglePreventDefault = Browser.Exists(By.Id("toggle-prevent-default"));
+        togglePreventDefault.Click();
+
+        var scrollableDiv = Browser.Exists(By.Id("wheel-test-area"));
+
+        // Simulate a wheel scroll action
+        var scrollOrigin = new WheelInputDevice.ScrollOrigin
+        {
+            Element = scrollableDiv,
+        };
+        new Actions(Browser)
+            .ScrollFromOrigin(scrollOrigin, 0, 200)
+            .Perform();
+
+        // The Selenium scrolling action is not precise and changes the scrollTop property to e.g. 202 instead of 200.
+        // For this reason, we do not check for equality with specific value.
+        var newScrollTop = int.Parse(scrollableDiv.GetDomProperty("scrollTop"), CultureInfo.InvariantCulture);
+        Assert.True(newScrollTop >= 200);
+    }
+}
diff --git a/src/Components/test/E2ETest/Tests/EventTest.cs b/src/Components/test/E2ETest/Tests/EventTest.cs
index 5f112a11bec5..8316852991de 100644
--- a/src/Components/test/E2ETest/Tests/EventTest.cs
+++ b/src/Components/test/E2ETest/Tests/EventTest.cs
@@ -199,7 +199,6 @@ public void Close_CanTrigger()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/52783")]
     public void Cancel_CanTrigger()
     {
         Browser.MountTestComponent<DialogEventsComponent>();
@@ -279,11 +278,13 @@ public void PreventDefault_AppliesToFormOnSubmitHandlers()
     }
 
     [Fact]
-    public void PreventDefault_DotNotApplyByDefault()
+    public void PreventDefault_DoNotApplyByDefault()
     {
         var appElement = Browser.MountTestComponent<EventPreventDefaultComponent>();
         appElement.FindElement(By.Id("form-2-button")).Click();
-        Assert.Contains("about:blank", Browser.Url);
+
+        // The URL should change because the submit event is not prevented
+        Browser.Contains("about:blank", () => Browser.Url);
     }
 
     [Fact]
@@ -333,9 +334,9 @@ public void NonInteractiveElementWithDisabledAttributeDoesRespondToMouseEvents()
         var element = Browser.Exists(By.Id("disabled-div"));
         var eventLog = Browser.Exists(By.Id("event-log"));
 
-        Browser.Equal(string.Empty, () => eventLog.GetAttribute("value"));
+        Browser.Equal(string.Empty, () => eventLog.GetDomProperty("value"));
         element.Click();
-        Browser.Equal("Got event on div", () => eventLog.GetAttribute("value"));
+        Browser.Equal("Got event on div", () => eventLog.GetDomProperty("value"));
     }
 
     [Theory]
@@ -348,13 +349,13 @@ public void InteractiveElementWithDisabledAttributeDoesNotRespondToMouseEvents(s
         var element = Browser.Exists(By.CssSelector(elementSelector));
         var eventLog = Browser.Exists(By.Id("event-log"));
 
-        Browser.Equal(string.Empty, () => eventLog.GetAttribute("value"));
+        Browser.Equal(string.Empty, () => eventLog.GetDomProperty("value"));
         element.Click();
 
         // It's no use observing that the log is still empty, since maybe the UI just hasn't updated yet
         // To be sure that the preceding action has no effect, we need to trigger a different action that does have an effect
         Browser.Exists(By.Id("enabled-button")).Click();
-        Browser.Equal("Got event on enabled button", () => eventLog.GetAttribute("value"));
+        Browser.Equal("Got event on enabled button", () => eventLog.GetDomProperty("value"));
     }
 
     [Fact]
@@ -366,7 +367,7 @@ public virtual void EventDuringBatchRendering_CanTriggerDOMEvents()
         var eventLog = Browser.Exists(By.Id("event-log"));
 
         SendKeysSequentially(input, "abc");
-        Browser.Equal("abc", () => input.GetAttribute("value"));
+        Browser.Equal("abc", () => input.GetDomProperty("value"));
         Browser.Equal(
             "Change event on item First with value a\n" +
             "Change event on item First with value ab\n" +
diff --git a/src/Components/test/E2ETest/Tests/FormsInputDateTest.cs b/src/Components/test/E2ETest/Tests/FormsInputDateTest.cs
index 0e034d019e6f..1308d87b9ed9 100644
--- a/src/Components/test/E2ETest/Tests/FormsInputDateTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsInputDateTest.cs
@@ -41,27 +41,27 @@ public void InputDateInteractsWithEditContext_NonNullableDateTime()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // InputDate emits unmatched attributes
-        Browser.Equal("Enter the date", () => renewalDateInput.GetAttribute("placeholder"));
+        Browser.Equal("Enter the date", () => renewalDateInput.GetDomAttribute("placeholder"));
 
         // Validates on edit
-        Browser.Equal("valid", () => renewalDateInput.GetAttribute("class"));
+        Browser.Equal("valid", () => renewalDateInput.GetDomAttribute("class"));
         renewalDateInput.SendKeys($"{Keys.Backspace}\t{Keys.Backspace}\t{Keys.Backspace}\t");
         renewalDateInput.SendKeys("01/01/2000\t");
-        Browser.Equal("modified valid", () => renewalDateInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => renewalDateInput.GetDomAttribute("class"));
 
         // Can become invalid
         renewalDateInput.SendKeys("11-11-11111\t");
-        Browser.Equal("modified invalid", () => renewalDateInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => renewalDateInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The RenewalDate field must be a date." }, messagesAccessor);
 
         // Empty is invalid, because it's not nullable
         renewalDateInput.SendKeys($"{Keys.Backspace}\t{Keys.Backspace}\t{Keys.Backspace}\t");
-        Browser.Equal("modified invalid", () => renewalDateInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => renewalDateInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The RenewalDate field must be a date." }, messagesAccessor);
 
         // Can become valid
         renewalDateInput.SendKeys("01/01/01\t");
-        Browser.Equal("modified valid", () => renewalDateInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => renewalDateInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -73,18 +73,18 @@ public void InputDateInteractsWithEditContext_NullableDateTimeOffset()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // Validates on edit
-        Browser.Equal("valid", () => expiryDateInput.GetAttribute("class"));
+        Browser.Equal("valid", () => expiryDateInput.GetDomAttribute("class"));
         expiryDateInput.SendKeys("01-01-2000\t");
-        Browser.Equal("modified valid", () => expiryDateInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => expiryDateInput.GetDomAttribute("class"));
 
         // Can become invalid
         expiryDateInput.SendKeys("11-11-11111\t");
-        Browser.Equal("modified invalid", () => expiryDateInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => expiryDateInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The OptionalExpiryDate field must be a date." }, messagesAccessor);
 
         // Empty is valid, because it's nullable
         expiryDateInput.SendKeys($"{Keys.Backspace}\t{Keys.Backspace}\t{Keys.Backspace}\t");
-        Browser.Equal("modified valid", () => expiryDateInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => expiryDateInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -103,15 +103,15 @@ public void InputDateInteractsWithEditContext_TimeInput()
         }
 
         // Validates on edit
-        Browser.Equal("valid", () => departureTimeInput.GetAttribute("class"));
+        Browser.Equal("valid", () => departureTimeInput.GetDomAttribute("class"));
         departureTimeInput.SendKeys("06:43\t");
-        Browser.Equal("modified valid", () => departureTimeInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => departureTimeInput.GetDomAttribute("class"));
 
         // Can become invalid
         // Stricly speaking the following is equivalent to the empty state, because that's how incomplete input is represented
         // We don't know of any way to produce a different (non-empty-equivalent) state using UI gestures, so there's nothing else to test
         departureTimeInput.SendKeys($"20{Keys.Backspace}\t");
-        Browser.Equal("modified invalid", () => departureTimeInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => departureTimeInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The DepartureTime field must be a time." }, messagesAccessor);
     }
 
@@ -130,16 +130,16 @@ public void InputDateInteractsWithEditContext_TimeInput_Step()
         }
 
         // Input works with seconds value of zero and has the expected final value
-        Browser.Equal("valid", () => departureTimeInput.GetAttribute("class"));
+        Browser.Equal("valid", () => departureTimeInput.GetDomAttribute("class"));
         departureTimeInput.SendKeys("111111");
-        Browser.Equal("modified valid", () => departureTimeInput.GetAttribute("class"));
-        Browser.Equal("11:11:11", () => departureTimeInput.GetAttribute("value"));
+        Browser.Equal("modified valid", () => departureTimeInput.GetDomAttribute("class"));
+        Browser.Equal("11:11:11", () => departureTimeInput.GetDomProperty("value"));
 
         // Input works with non-zero seconds value
         // Move to the beginning of the input and put the new time
         departureTimeInput.SendKeys(string.Concat(Enumerable.Repeat(Keys.ArrowLeft, 3)) + "101010");
-        Browser.Equal("modified valid", () => departureTimeInput.GetAttribute("class"));
-        Browser.Equal("10:10:10", () => departureTimeInput.GetAttribute("value"));
+        Browser.Equal("modified valid", () => departureTimeInput.GetDomAttribute("class"));
+        Browser.Equal("10:10:10", () => departureTimeInput.GetDomProperty("value"));
     }
 
     [Fact]
@@ -150,24 +150,24 @@ public void InputDateInteractsWithEditContext_MonthInput()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // Validates on edit
-        Browser.Equal("valid", () => visitMonthInput.GetAttribute("class"));
+        Browser.Equal("valid", () => visitMonthInput.GetDomAttribute("class"));
         visitMonthInput.SendKeys($"03{Keys.ArrowRight}2005\t");
-        Browser.Equal("modified valid", () => visitMonthInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => visitMonthInput.GetDomAttribute("class"));
 
         // Empty is invalid because it's not nullable
         visitMonthInput.Clear();
-        Browser.Equal("modified invalid", () => visitMonthInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => visitMonthInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The VisitMonth field must be a year and month." }, messagesAccessor);
 
         // Invalid year (11111)
         visitMonthInput.SendKeys($"11{Keys.ArrowRight}11111\t");
-        Browser.Equal("modified invalid", () => visitMonthInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => visitMonthInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The VisitMonth field must be a year and month." }, messagesAccessor);
 
         // Can become valid again
         visitMonthInput.Clear();
         visitMonthInput.SendKeys($"11{Keys.ArrowRight}1111\t");
-        Browser.Equal("modified valid", () => visitMonthInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => visitMonthInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -186,24 +186,24 @@ public void InputDateInteractsWithEditContext_DateTimeLocalInput()
         }
 
         // Validates on edit and has the expected value
-        Browser.Equal("valid", () => appointmentInput.GetAttribute("class"));
+        Browser.Equal("valid", () => appointmentInput.GetDomAttribute("class"));
         appointmentInput.SendKeys($"01011970{Keys.ArrowRight}05421");
-        Browser.Equal("modified valid", () => appointmentInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => appointmentInput.GetDomAttribute("class"));
 
         // Empty is invalid because it's not nullable
         appointmentInput.Clear();
-        Browser.Equal("modified invalid", () => appointmentInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => appointmentInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The AppointmentDateAndTime field must be a date and time." }, messagesAccessor);
 
         // Invalid year (11111)
         appointmentInput.SendKeys($"111111111{Keys.ArrowRight}11111");
-        Browser.Equal("modified invalid", () => appointmentInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => appointmentInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The AppointmentDateAndTime field must be a date and time." }, messagesAccessor);
 
         // Can become valid again
         appointmentInput.Clear();
         appointmentInput.SendKeys($"11111111{Keys.ArrowRight}11111");
-        Browser.Equal("modified valid", () => appointmentInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => appointmentInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -222,16 +222,16 @@ public void InputDateInteractsWithEditContext_DateTimeLocalInput_Step()
         }
 
         // Input works with seconds value of zero (as in, starting from a zero value, which is the default) and has the expected final value
-        Browser.Equal("valid", () => appointmentInput.GetAttribute("class"));
+        Browser.Equal("valid", () => appointmentInput.GetDomAttribute("class"));
         appointmentInput.SendKeys($"11111970{Keys.ArrowRight}114216");
-        Browser.Equal("modified valid", () => appointmentInput.GetAttribute("class"));
-        Browser.Equal("1970-11-11T11:42:16", () => appointmentInput.GetAttribute("value"));
+        Browser.Equal("modified valid", () => appointmentInput.GetDomAttribute("class"));
+        Browser.Equal("1970-11-11T11:42:16", () => appointmentInput.GetDomProperty("value"));
 
         // Input works when starting with a non-zero seconds value
         // Move to the beginning of the input and put the new value
         appointmentInput.SendKeys(string.Concat(Enumerable.Repeat(Keys.ArrowLeft, 6)) + $"10101970{Keys.ArrowRight}105321");
-        Browser.Equal("modified valid", () => appointmentInput.GetAttribute("class"));
-        Browser.Equal("1970-10-10T10:53:21", () => appointmentInput.GetAttribute("value"));
+        Browser.Equal("modified valid", () => appointmentInput.GetDomAttribute("class"));
+        Browser.Equal("1970-10-10T10:53:21", () => appointmentInput.GetDomProperty("value"));
     }
 
     private Func<string[]> CreateValidationMessagesAccessor(IWebElement appElement)
diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs
index c82706d04e50..b58dee62cf0b 100644
--- a/src/Components/test/E2ETest/Tests/FormsTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsTest.cs
@@ -45,7 +45,7 @@ public async Task EditFormWorksWithDataAnnotationsValidator()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // The form emits unmatched attributes
-        Browser.Equal("off", () => form.GetAttribute("autocomplete"));
+        Browser.Equal("off", () => form.GetDomAttribute("autocomplete"));
 
         // Editing a field doesn't trigger validation on its own
         userNameInput.SendKeys("Bert\t");
@@ -105,17 +105,17 @@ public void InputTextInteractsWithEditContext()
             ".validation-errors > .validation-message"); // Shows that the default class name for ValidationSummary is validation-errors
 
         // InputText emits unmatched attributes
-        Browser.Equal("Enter your name", () => nameInput.GetAttribute("placeholder"));
+        Browser.Equal("Enter your name", () => nameInput.GetDomAttribute("placeholder"));
 
         // Validates on edit
-        Browser.Equal("valid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("valid", () => nameInput.GetDomAttribute("class"));
         nameInput.SendKeys("Bert\t");
-        Browser.Equal("modified valid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => nameInput.GetDomAttribute("class"));
         EnsureAttributeNotRendered(nameInput, "aria-invalid");
 
         // Can become invalid
         nameInput.SendKeys("01234567890123456789\t");
-        Browser.Equal("modified invalid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => nameInput.GetDomAttribute("class"));
         EnsureAttributeValue(nameInput, "aria-invalid", "true");
         Browser.Equal(new[] { "That name is too long" }, messagesAccessor);
         Browser.True(() => summaryMessagesAccessor().Contains("That name is too long"));
@@ -123,7 +123,7 @@ public void InputTextInteractsWithEditContext()
         // Can become valid
         nameInput.Clear();
         nameInput.SendKeys("Bert\t");
-        Browser.Equal("modified valid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => nameInput.GetDomAttribute("class"));
         EnsureAttributeNotRendered(nameInput, "aria-invalid");
         Browser.Empty(messagesAccessor);
         Browser.False(() => summaryMessagesAccessor().Contains("That name is too long"));
@@ -137,28 +137,28 @@ public void InputNumberInteractsWithEditContext_NonNullableInt()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // InputNumber emits unmatched attributes
-        Browser.Equal("Enter your age", () => ageInput.GetAttribute("placeholder"));
+        Browser.Equal("Enter your age", () => ageInput.GetDomAttribute("placeholder"));
 
         // Validates on edit
-        Browser.Equal("valid", () => ageInput.GetAttribute("class"));
+        Browser.Equal("valid", () => ageInput.GetDomAttribute("class"));
         ageInput.SendKeys("123\t");
-        Browser.Equal("modified valid", () => ageInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => ageInput.GetDomAttribute("class"));
 
         // Can become invalid
         ageInput.SendKeys("e100\t");
-        Browser.Equal("modified invalid", () => ageInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => ageInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The AgeInYears field must be a number." }, messagesAccessor);
 
         // Empty is invalid, because it's not a nullable int
         ageInput.Clear();
         ageInput.SendKeys("\t");
-        Browser.Equal("modified invalid", () => ageInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => ageInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The AgeInYears field must be a number." }, messagesAccessor);
         Browser.Equal("", () => ageInput.GetDomProperty("value")); // We can display 'empty' even though it's not representable within the bound property
 
         // Zero is within the allowed range
         ageInput.SendKeys("0\t");
-        Browser.Equal("modified valid", () => ageInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => ageInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -170,19 +170,19 @@ public void InputNumberInteractsWithEditContext_NullableFloat()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // Validates on edit
-        Browser.Equal("valid", () => heightInput.GetAttribute("class"));
+        Browser.Equal("valid", () => heightInput.GetDomAttribute("class"));
         heightInput.SendKeys("123.456\t");
-        Browser.Equal("modified valid", () => heightInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => heightInput.GetDomAttribute("class"));
 
         // Can become invalid
         heightInput.SendKeys("e100\t");
-        Browser.Equal("modified invalid", () => heightInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => heightInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "The OptionalHeight field must be a number." }, messagesAccessor);
 
         // Empty is valid, because it's a nullable float
         heightInput.Clear();
         heightInput.SendKeys("\t");
-        Browser.Equal("modified valid", () => heightInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => heightInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -194,22 +194,22 @@ public void InputTextAreaInteractsWithEditContext()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // InputTextArea emits unmatched attributes
-        Browser.Equal("Tell us about yourself", () => descriptionInput.GetAttribute("placeholder"));
+        Browser.Equal("Tell us about yourself", () => descriptionInput.GetDomAttribute("placeholder"));
 
         // Validates on edit
-        Browser.Equal("valid", () => descriptionInput.GetAttribute("class"));
+        Browser.Equal("valid", () => descriptionInput.GetDomAttribute("class"));
         descriptionInput.SendKeys("Hello\t");
-        Browser.Equal("modified valid", () => descriptionInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => descriptionInput.GetDomAttribute("class"));
 
         // Can become invalid
         descriptionInput.SendKeys("too long too long too long too long too long\t");
-        Browser.Equal("modified invalid", () => descriptionInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => descriptionInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "Description is max 20 chars" }, messagesAccessor);
 
         // Can become valid
         descriptionInput.Clear();
         descriptionInput.SendKeys("Hello\t");
-        Browser.Equal("modified valid", () => descriptionInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => descriptionInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
     }
 
@@ -222,16 +222,16 @@ public void InputSelectInteractsWithEditContext()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // InputSelect emits unmatched attributes
-        Browser.Equal("4", () => select.GetAttribute("size"));
+        Browser.Equal("4", () => select.GetDomAttribute("size"));
 
         // Validates on edit
-        Browser.Equal("valid", () => select.GetAttribute("class"));
+        Browser.Equal("valid", () => select.GetDomAttribute("class"));
         ticketClassInput.SelectByText("First class");
-        Browser.Equal("modified valid", () => select.GetAttribute("class"));
+        Browser.Equal("modified valid", () => select.GetDomAttribute("class"));
 
         // Can become invalid
         ticketClassInput.SelectByText("(select)");
-        Browser.Equal("modified invalid", () => select.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => select.GetDomAttribute("class"));
         Browser.Equal(new[] { "The TicketClass field is not valid." }, messagesAccessor);
     }
 
@@ -244,14 +244,14 @@ public void InputSelectInteractsWithEditContext_BoolValues()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // Invalidates on edit
-        Browser.Equal("valid", () => select.GetAttribute("class"));
+        Browser.Equal("valid", () => select.GetDomAttribute("class"));
         ticketClassInput.SelectByText("true");
-        Browser.Equal("modified invalid", () => select.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => select.GetDomAttribute("class"));
         Browser.Equal(new[] { "77 + 33 = 100 is a false statement, unfortunately." }, messagesAccessor);
 
         // Nullable conversion can fail
         ticketClassInput.SelectByText("(select)");
-        Browser.Equal("modified invalid", () => select.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => select.GetDomAttribute("class"));
         Browser.Equal(new[]
         {
                 "77 + 33 = 100 is a false statement, unfortunately.",
@@ -260,7 +260,7 @@ public void InputSelectInteractsWithEditContext_BoolValues()
 
         // Can become valid
         ticketClassInput.SelectByText("false");
-        Browser.Equal("modified valid", () => select.GetAttribute("class"));
+        Browser.Equal("modified valid", () => select.GetDomAttribute("class"));
     }
 
     [Fact]
@@ -272,17 +272,17 @@ public void InputSelectInteractsWithEditContext_MultipleAttribute()
         var messagesAccesor = CreateValidationMessagesAccessor(appElement);
 
         // Binding applies to option selection
-        Browser.Equal(new[] { "SanFrancisco" }, () => citiesInput.AllSelectedOptions.Select(option => option.GetAttribute("value")));
+        Browser.Equal(new[] { "SanFrancisco" }, () => citiesInput.AllSelectedOptions.Select(option => option.GetDomProperty("value")));
 
         // Validates on edit
-        Browser.Equal("valid", () => select.GetAttribute("class"));
+        Browser.Equal("valid", () => select.GetDomAttribute("class"));
         citiesInput.SelectByIndex(2);
-        Browser.Equal("modified valid", () => select.GetAttribute("class"));
+        Browser.Equal("modified valid", () => select.GetDomAttribute("class"));
 
         // Can become invalid
         citiesInput.SelectByIndex(1);
         citiesInput.SelectByIndex(3);
-        Browser.Equal("modified invalid", () => select.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => select.GetDomAttribute("class"));
         Browser.Equal(new[] { "The field SelectedCities must be a string or array type with a maximum length of '3'." }, messagesAccesor);
     }
 
@@ -333,25 +333,25 @@ public void InputCheckboxInteractsWithEditContext()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // InputCheckbox emits unmatched attributes
-        Browser.Equal("You have to check this", () => acceptsTermsInput.GetAttribute("title"));
+        Browser.Equal("You have to check this", () => acceptsTermsInput.GetDomAttribute("title"));
 
         // Correct initial checkedness
         Assert.False(acceptsTermsInput.Selected);
         Assert.True(isEvilInput.Selected);
 
         // Validates on edit
-        Browser.Equal("valid", () => acceptsTermsInput.GetAttribute("class"));
-        Browser.Equal("valid", () => isEvilInput.GetAttribute("class"));
+        Browser.Equal("valid", () => acceptsTermsInput.GetDomAttribute("class"));
+        Browser.Equal("valid", () => isEvilInput.GetDomAttribute("class"));
         acceptsTermsInput.Click();
         isEvilInput.Click();
-        Browser.Equal("modified valid", () => acceptsTermsInput.GetAttribute("class"));
-        Browser.Equal("modified valid", () => isEvilInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => acceptsTermsInput.GetDomAttribute("class"));
+        Browser.Equal("modified valid", () => isEvilInput.GetDomAttribute("class"));
 
         // Can become invalid
         acceptsTermsInput.Click();
         isEvilInput.Click();
-        Browser.Equal("modified invalid", () => acceptsTermsInput.GetAttribute("class"));
-        Browser.Equal("modified invalid", () => isEvilInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => acceptsTermsInput.GetDomAttribute("class"));
+        Browser.Equal("modified invalid", () => isEvilInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "Must accept terms", "Must not be evil" }, messagesAccessor);
     }
 
@@ -363,30 +363,30 @@ public void InputRadioGroupWithoutNameInteractsWithEditContext()
 
         // By capturing the inputradio elements just once up front, we're implicitly showing
         // that they are retained as their values change
-        var unknownAirlineInput = FindAirlineInputs().First(i => string.Equals("Unknown", i.GetAttribute("value")));
-        var bestAirlineInput = FindAirlineInputs().First(i => string.Equals("BestAirline", i.GetAttribute("value")));
+        var unknownAirlineInput = FindAirlineInputs().First(i => string.Equals("Unknown", i.GetDomProperty("value")));
+        var bestAirlineInput = FindAirlineInputs().First(i => string.Equals("BestAirline", i.GetDomProperty("value")));
 
         // Validate selected inputs
         Browser.True(() => unknownAirlineInput.Selected);
         Browser.False(() => bestAirlineInput.Selected);
 
         // InputRadio emits additional attributes
-        Browser.True(() => unknownAirlineInput.GetAttribute("extra").Equals("additional"));
+        Browser.True(() => unknownAirlineInput.GetDomAttribute("extra").Equals("additional"));
 
         // Validates on edit
-        Browser.Equal("valid", () => unknownAirlineInput.GetAttribute("class"));
-        Browser.Equal("valid", () => bestAirlineInput.GetAttribute("class"));
+        Browser.Equal("valid", () => unknownAirlineInput.GetDomAttribute("class"));
+        Browser.Equal("valid", () => bestAirlineInput.GetDomAttribute("class"));
 
         bestAirlineInput.Click();
 
-        Browser.Equal("modified valid", () => unknownAirlineInput.GetAttribute("class"));
-        Browser.Equal("modified valid", () => bestAirlineInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => unknownAirlineInput.GetDomAttribute("class"));
+        Browser.Equal("modified valid", () => bestAirlineInput.GetDomAttribute("class"));
 
         // Can become invalid
         unknownAirlineInput.Click();
 
-        Browser.Equal("modified invalid", () => unknownAirlineInput.GetAttribute("class"));
-        Browser.Equal("modified invalid", () => bestAirlineInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => unknownAirlineInput.GetDomAttribute("class"));
+        Browser.Equal("modified invalid", () => bestAirlineInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "Pick a valid airline." }, messagesAccessor);
 
         IReadOnlyCollection<IWebElement> FindAirlineInputs()
@@ -405,23 +405,23 @@ public void InputRadioGroupsWithNamesNestedInteractWithEditContext()
         Browser.True(() => FindColorInputs().All(i => !i.Selected));
 
         // Invalidates on submit
-        Browser.True(() => FindCountryInputs().All(i => string.Equals("valid", i.GetAttribute("class"))));
-        Browser.True(() => FindColorInputs().All(i => string.Equals("valid", i.GetAttribute("class"))));
+        Browser.True(() => FindCountryInputs().All(i => string.Equals("valid", i.GetDomAttribute("class"))));
+        Browser.True(() => FindColorInputs().All(i => string.Equals("valid", i.GetDomAttribute("class"))));
 
         submitButton.Click();
 
-        Browser.True(() => FindCountryInputs().All(i => string.Equals("invalid", i.GetAttribute("class"))));
-        Browser.True(() => FindColorInputs().All(i => string.Equals("invalid", i.GetAttribute("class"))));
+        Browser.True(() => FindCountryInputs().All(i => string.Equals("invalid", i.GetDomAttribute("class"))));
+        Browser.True(() => FindColorInputs().All(i => string.Equals("invalid", i.GetDomAttribute("class"))));
 
         // Validates on edit
         FindCountryInputs().First().Click();
 
-        Browser.True(() => FindCountryInputs().All(i => string.Equals("modified valid", i.GetAttribute("class"))));
-        Browser.True(() => FindColorInputs().All(i => string.Equals("invalid", i.GetAttribute("class"))));
+        Browser.True(() => FindCountryInputs().All(i => string.Equals("modified valid", i.GetDomAttribute("class"))));
+        Browser.True(() => FindColorInputs().All(i => string.Equals("invalid", i.GetDomAttribute("class"))));
 
         FindColorInputs().First().Click();
 
-        Browser.True(() => FindColorInputs().All(i => string.Equals("modified valid", i.GetAttribute("class"))));
+        Browser.True(() => FindColorInputs().All(i => string.Equals("modified valid", i.GetDomAttribute("class"))));
 
         IReadOnlyCollection<IWebElement> FindCountryInputs() => group.FindElements(By.Name("country"));
 
@@ -439,29 +439,29 @@ public void InputRadioGroupWithBoolValuesInteractsWithEditContext()
         Browser.True(() => FindFalseInput().Selected);
 
         // Validates on edit
-        Browser.Equal("valid", () => FindTrueInput().GetAttribute("class"));
-        Browser.Equal("valid", () => FindFalseInput().GetAttribute("class"));
+        Browser.Equal("valid", () => FindTrueInput().GetDomAttribute("class"));
+        Browser.Equal("valid", () => FindFalseInput().GetDomAttribute("class"));
 
         FindTrueInput().Click();
 
-        Browser.Equal("modified valid", () => FindTrueInput().GetAttribute("class"));
-        Browser.Equal("modified valid", () => FindFalseInput().GetAttribute("class"));
+        Browser.Equal("modified valid", () => FindTrueInput().GetDomAttribute("class"));
+        Browser.Equal("modified valid", () => FindFalseInput().GetDomAttribute("class"));
 
         // Can become invalid
         FindFalseInput().Click();
 
-        Browser.Equal("modified invalid", () => FindTrueInput().GetAttribute("class"));
-        Browser.Equal("modified invalid", () => FindFalseInput().GetAttribute("class"));
+        Browser.Equal("modified invalid", () => FindTrueInput().GetDomAttribute("class"));
+        Browser.Equal("modified invalid", () => FindFalseInput().GetDomAttribute("class"));
         Browser.Equal(new[] { "7 * 3 = 21 is a true statement." }, messagesAccessor);
 
         IReadOnlyCollection<IWebElement> FindInputs()
             => appElement.FindElement(By.ClassName("radio-group-bool-values")).FindElements(By.TagName("input"));
 
         IWebElement FindTrueInput()
-            => FindInputs().First(i => string.Equals("True", i.GetAttribute("value")));
+            => FindInputs().First(i => string.Equals("True", i.GetDomProperty("value")));
 
         IWebElement FindFalseInput()
-            => FindInputs().First(i => string.Equals("False", i.GetAttribute("value")));
+            => FindInputs().First(i => string.Equals("False", i.GetDomProperty("value")));
     }
 
     [Fact]
@@ -475,30 +475,30 @@ public void CanWireUpINotifyPropertyChangedToEditContext()
         var submissionStatus = appElement.FindElement(By.Id("submission-status"));
 
         // Editing a field triggers validation immediately
-        Browser.Equal("valid", () => userNameInput.GetAttribute("class"));
+        Browser.Equal("valid", () => userNameInput.GetDomAttribute("class"));
         userNameInput.SendKeys("Too long too long\t");
-        Browser.Equal("modified invalid", () => userNameInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => userNameInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "That name is too long" }, messagesAccessor);
 
         // Submitting the form validates remaining fields
         submitButton.Click();
         Browser.Equal(new[] { "That name is too long", "You must accept the terms" }, messagesAccessor);
-        Browser.Equal("modified invalid", () => userNameInput.GetAttribute("class"));
-        Browser.Equal("invalid", () => acceptsTermsInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => userNameInput.GetDomAttribute("class"));
+        Browser.Equal("invalid", () => acceptsTermsInput.GetDomAttribute("class"));
 
         // Can make fields valid
         userNameInput.Clear();
         userNameInput.SendKeys("Bert\t");
-        Browser.Equal("modified valid", () => userNameInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => userNameInput.GetDomAttribute("class"));
         acceptsTermsInput.Click();
-        Browser.Equal("modified valid", () => acceptsTermsInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => acceptsTermsInput.GetDomAttribute("class"));
         Browser.Equal(string.Empty, () => submissionStatus.Text);
         submitButton.Click();
         Browser.True(() => submissionStatus.Text.StartsWith("Submitted", StringComparison.Ordinal));
 
         // Fields can revert to unmodified
-        Browser.Equal("valid", () => userNameInput.GetAttribute("class"));
-        Browser.Equal("valid", () => acceptsTermsInput.GetAttribute("class"));
+        Browser.Equal("valid", () => userNameInput.GetDomAttribute("class"));
+        Browser.Equal("valid", () => acceptsTermsInput.GetDomAttribute("class"));
     }
 
     [Fact]
@@ -586,12 +586,12 @@ public void InputComponentsRespondToAsynchronouslyAddedMessages()
 
         // Initially shows no error
         Browser.Empty(() => messagesAccessor());
-        Browser.Equal("valid", () => input.GetAttribute("class"));
+        Browser.Equal("valid", () => input.GetDomAttribute("class"));
 
         // Can trigger async error
         triggerAsyncErrorButton.Click();
         Browser.Equal(new[] { "This is invalid, asynchronously" }, messagesAccessor);
-        Browser.Equal("invalid", () => input.GetAttribute("class"));
+        Browser.Equal("invalid", () => input.GetDomAttribute("class"));
     }
 
     [Fact]
@@ -605,29 +605,29 @@ public void SelectComponentSupportsOptionsComponent()
 
         // Select with custom options component and HTML component behave the
         // same when the selectElement.value is provided
-        Browser.Equal("B", () => selectWithoutComponent.GetAttribute("value"));
-        Browser.Equal("B", () => selectWithComponent.GetAttribute("value"));
+        Browser.Equal("B", () => selectWithoutComponent.GetDomProperty("value"));
+        Browser.Equal("B", () => selectWithComponent.GetDomProperty("value"));
 
         // Reset to a value that doesn't exist
         input.Clear();
         input.SendKeys("D\t");
 
         // Confirm that both values are cleared
-        Browser.Equal("", () => selectWithComponent.GetAttribute("value"));
-        Browser.Equal("", () => selectWithoutComponent.GetAttribute("value"));
+        Browser.Equal("", () => selectWithComponent.GetDomProperty("value"));
+        Browser.Equal("", () => selectWithoutComponent.GetDomProperty("value"));
 
         // Dynamically showing the fourth option updates the selected value
         showAdditionalOptionButton.Click();
 
-        Browser.Equal("D", () => selectWithComponent.GetAttribute("value"));
-        Browser.Equal("D", () => selectWithoutComponent.GetAttribute("value"));
+        Browser.Equal("D", () => selectWithComponent.GetDomProperty("value"));
+        Browser.Equal("D", () => selectWithoutComponent.GetDomProperty("value"));
 
         // Change the value to one that does really doesn't exist
         input.Clear();
         input.SendKeys("F\t");
 
-        Browser.Equal("", () => selectWithComponent.GetAttribute("value"));
-        Browser.Equal("", () => selectWithoutComponent.GetAttribute("value"));
+        Browser.Equal("", () => selectWithComponent.GetDomProperty("value"));
+        Browser.Equal("", () => selectWithoutComponent.GetDomProperty("value"));
     }
 
     [Fact]
@@ -637,7 +637,7 @@ public void SelectWithMultipleAttributeCanBindValue()
         var select = new SelectElement(appElement.FindElement(By.Id("select-cities")));
 
         // Assert that the binding works in the .NET -> JS direction
-        Browser.Equal(new[] { "\"sf\"", "\"sea\"" }, () => select.AllSelectedOptions.Select(option => option.GetAttribute("value")));
+        Browser.Equal(new[] { "\"sf\"", "\"sea\"" }, () => select.AllSelectedOptions.Select(option => option.GetDomProperty("value")));
 
         select.DeselectByIndex(0);
         select.SelectByIndex(1);
@@ -672,13 +672,13 @@ public void RespectsCustomFieldCssClassProvider()
         var messagesAccessor = CreateValidationMessagesAccessor(appElement);
 
         // Validates on edit
-        Browser.Equal("valid-socks", () => socksInput.GetAttribute("class"));
+        Browser.Equal("valid-socks", () => socksInput.GetDomAttribute("class"));
         socksInput.SendKeys("Purple\t");
-        Browser.Equal("modified valid-socks", () => socksInput.GetAttribute("class"));
+        Browser.Equal("modified valid-socks", () => socksInput.GetDomAttribute("class"));
 
         // Can become invalid
         socksInput.SendKeys(" with yellow spots\t");
-        Browser.Equal("modified invalid-socks", () => socksInput.GetAttribute("class"));
+        Browser.Equal("modified invalid-socks", () => socksInput.GetDomAttribute("class"));
     }
 
     [Fact]
@@ -701,20 +701,20 @@ public void CanRemoveAndReAddDataAnnotationsSupport()
         Func<string> lastLogEntryAccessor = () => appElement.FindElement(By.CssSelector(".submission-log-entry:last-of-type")).Text;
 
         nameInput.SendKeys("01234567890123456789\t");
-        Browser.Equal("modified invalid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => nameInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "That name is too long" }, messagesAccessor);
 
         // Remove DataAnnotations support
         appElement.FindElement(By.Id("toggle-dataannotations")).Click();
         Browser.Equal("DataAnnotations support is now disabled", lastLogEntryAccessor);
-        Browser.Equal("modified valid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("modified valid", () => nameInput.GetDomAttribute("class"));
         Browser.Empty(messagesAccessor);
 
         // Re-add DataAnnotations support
         appElement.FindElement(By.Id("toggle-dataannotations")).Click();
         nameInput.SendKeys("0\t");
         Browser.Equal("DataAnnotations support is now enabled", lastLogEntryAccessor);
-        Browser.Equal("modified invalid", () => nameInput.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => nameInput.GetDomAttribute("class"));
         Browser.Equal(new[] { "That name is too long" }, messagesAccessor);
     }
 
@@ -915,7 +915,7 @@ public void InputWithCustomParserPreservesInvalidValueWhenParsingFails()
         // should not replace the input contents with last known component value (null)
         input.SendKeys("INVALID\t");
         Browser.Equal("INVALID", () => input.GetDomProperty("value"));
-        Browser.Equal("modified invalid", () => input.GetAttribute("class"));
+        Browser.Equal("modified invalid", () => input.GetDomAttribute("class"));
     }
 
     [Fact]
@@ -963,14 +963,14 @@ public void InputRadioGroupWorksWithoutEditContext()
 
         // The bound value is expected and no inputs have a class attribute
         Browser.True(() => FindRadioInputs().All(input => !ElementHasAttribute(input, "class")));
-        Browser.True(() => FindRadioInputs().First(input => input.GetAttribute("value") == "Unknown").Selected);
+        Browser.True(() => FindRadioInputs().First(input => input.GetDomProperty("value") == "Unknown").Selected);
         Browser.Equal("Unknown", () => selectedInputText.Text);
 
         FindRadioInputs().First().Click();
 
         // Value binding continues to work without an edit context and class attributes are unchanged
         Browser.True(() => FindRadioInputs().All(input => !ElementHasAttribute(input, "class")));
-        Browser.True(() => FindRadioInputs().First(input => input.GetAttribute("value") == "BestAirline").Selected);
+        Browser.True(() => FindRadioInputs().First(input => input.GetDomProperty("value") == "BestAirline").Selected);
         Browser.Equal("BestAirline", () => selectedInputText.Text);
 
         IReadOnlyCollection<IWebElement> FindRadioInputs()
@@ -1057,12 +1057,12 @@ private Func<string[]> CreateValidationMessagesAccessor(IWebElement appElement,
 
     private void EnsureAttributeValue(IWebElement element, string attributeName, string value)
     {
-        Browser.Equal(value, () => element.GetAttribute(attributeName));
+        Browser.Equal(value, () => element.GetDomAttribute(attributeName));
     }
 
     private void EnsureAttributeNotRendered(IWebElement element, string attributeName)
     {
-        Browser.True(() => element.GetAttribute(attributeName) == null);
+        Browser.True(() => element.GetDomAttribute(attributeName) == null);
     }
 
     private bool ElementHasAttribute(IWebElement webElement, string attribute)
diff --git a/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs b/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs
index c35ca3680d8f..3e0a68780580 100644
--- a/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs
+++ b/src/Components/test/E2ETest/Tests/GlobalInteractivityTest.cs
@@ -1,7 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net;
+using System.Net.Http;
 using Components.TestServer.RazorComponents;
+using Microsoft.AspNetCore.Components.E2ETest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
@@ -17,6 +20,48 @@ public class GlobalInteractivityTest(
     ITestOutputHelper output)
     : ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<GlobalInteractivityApp>>>(browserFixture, serverFixture, output)
 {
+
+    [Theory]
+    [InlineData("server", false)]
+    [InlineData("webassembly", false)]
+    [InlineData("server", true)]
+    [InlineData("webassembly", true)]
+    public void CanRenderNotFoundInteractive(string renderingMode, bool useCustomNotFoundPage)
+    {
+        string query = useCustomNotFoundPage ? "?useCustomNotFoundPage=true" : "";
+        Navigate($"{ServerPathBase}/render-not-found-{renderingMode}{query}");
+
+        var buttonId = "trigger-not-found";
+        Browser.WaitForElementToBeVisible(By.Id(buttonId));
+        Browser.Exists(By.Id(buttonId)).Click();
+
+        if (useCustomNotFoundPage)
+        {
+            AssertNotFoundPageRendered();
+        }
+        else
+        {
+            AssertNotFoundContentNotRendered();
+        }
+    }
+
+    private void AssertNotFoundContentNotRendered() =>
+        Browser.Equal("Any content", () => Browser.FindElement(By.Id("test-info")).Text);
+
+    [Fact]
+    public async Task CanSetNotFoundStatus()
+    {
+        var statusCode = await GetStatusCodeAsync($"/subdir/render-not-found-ssr");
+        Assert.Equal(HttpStatusCode.NotFound, statusCode);
+    }
+
+    private async Task<HttpStatusCode> GetStatusCodeAsync(string relativeUrl)
+    {
+        using var client = new HttpClient() { BaseAddress = _serverFixture.RootUri };
+        var response = await client.GetAsync(relativeUrl, HttpCompletionOption.ResponseHeadersRead);
+        return response.StatusCode;
+    }
+
     [Fact]
     public void CanFindStaticallyRenderedPageAfterClickingBrowserBackButtonOnDynamicallyRenderedPage()
     {
@@ -93,4 +138,61 @@ public void CanNavigateBetweenStaticPagesViaEnhancedNav()
         Browser.Equal("Global interactivity page: Static via attribute", () => h1.Text);
         Browser.Equal("static", () => Browser.Exists(By.Id("execution-mode")).Text);
     }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void CanRenderNotFoundPage_SSR(bool streamingStarted)
+    {
+        string streamingPath = streamingStarted ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/set-not-found-ssr{streamingPath}?useCustomNotFoundPage=true");
+        AssertNotFoundPageRendered();
+    }
+
+    [Theory]
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void CanRenderNotFoundPage_Interactive(string renderMode)
+    {
+        Navigate($"{ServerPathBase}/set-not-found?useCustomNotFoundPage=true&renderMode={renderMode}");
+        AssertNotFoundPageRendered();
+    }
+
+    private void AssertNotFoundPageRendered()
+    {
+        Browser.Equal("Welcome On Custom Not Found Page", () => Browser.FindElement(By.Id("test-info")).Text);
+        // custom page should have a custom layout
+        Browser.Equal("About", () => Browser.FindElement(By.Id("about-link")).Text);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void CanRenderNotFoundIfNotFoundPageTypeNotProvided_SSR(bool streamingStarted)
+    {
+        string streamingPath = streamingStarted ? "-streaming" : "";
+        Navigate($"{ServerPathBase}/reexecution/set-not-found-ssr{streamingPath}");
+        AssertReExecutedPageRendered();
+    }
+
+    [Theory]
+    [InlineData("ServerNonPrerendered")]
+    [InlineData("WebAssemblyNonPrerendered")]
+    public void DoesNotReExecuteIf404WasHandled_Interactive(string renderMode)
+    {
+        Navigate($"{ServerPathBase}/reexecution/set-not-found?useCustomNotFoundPage=true&renderMode={renderMode}");
+        AssertNotFoundPageRendered();
+    }
+
+    private void AssertNotFoundFragmentRendered() =>
+        Browser.Equal("There's nothing here", () => Browser.FindElement(By.Id("not-found-fragment")).Text);
+
+    [Fact]
+    public void StatusCodePagesWithReExecution()
+    {
+        Navigate($"{ServerPathBase}/reexecution/trigger-404");
+        AssertReExecutedPageRendered();
+    }
+    private void AssertReExecutedPageRendered() =>
+        Browser.Equal("Welcome On Page Re-executed After Not Found Event", () => Browser.Exists(By.Id("test-info")).Text);
 }
diff --git a/src/Components/test/E2ETest/Tests/GlobalizationTest.cs b/src/Components/test/E2ETest/Tests/GlobalizationTest.cs
index ccbbcfa04f1a..b6ddf05aeec8 100644
--- a/src/Components/test/E2ETest/Tests/GlobalizationTest.cs
+++ b/src/Components/test/E2ETest/Tests/GlobalizationTest.cs
@@ -104,49 +104,49 @@ public void CanSetCultureAndParseCultureInvariantNumbersAndDatesWithInputFields(
         var input = Browser.Exists(By.Id("input_type_number_int"));
         var display = Browser.Exists(By.Id("input_type_number_int_value"));
         Browser.Equal(42.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(42.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(42.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         input.Clear();
         input.SendKeys(9000.ToString(CultureInfo.InvariantCulture));
         input.SendKeys("\t");
         Browser.Equal(9000.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(9000.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(9000.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // decimal
         input = Browser.Exists(By.Id("input_type_number_decimal"));
         display = Browser.Exists(By.Id("input_type_number_decimal_value"));
         Browser.Equal(4.2m.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(4.2m.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(4.2m.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         input.Clear();
         input.SendKeys(9000.42m.ToString(CultureInfo.InvariantCulture));
         input.SendKeys("\t");
         Browser.Equal(9000.42m.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(9000.42m.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(9000.42m.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // datetime
         input = Browser.Exists(By.Id("input_type_date_datetime"));
         display = Browser.Exists(By.Id("input_type_date_datetime_value"));
         var extraInput = Browser.Exists(By.Id("input_type_date_datetime_extrainput"));
         Browser.Equal(new DateTime(1985, 3, 4).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTime(1985, 3, 4).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTime(1985, 3, 4).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         extraInput.ReplaceText(new DateTime(2000, 1, 2).ToString(cultureInfo));
         extraInput.SendKeys("\t");
         Browser.Equal(new DateTime(2000, 1, 2).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTime(2000, 1, 2).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTime(2000, 1, 2).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // datetimeoffset
         input = Browser.Exists(By.Id("input_type_date_datetimeoffset"));
         display = Browser.Exists(By.Id("input_type_date_datetimeoffset_value"));
         extraInput = Browser.Exists(By.Id("input_type_date_datetimeoffset_extrainput"));
         Browser.Equal(new DateTimeOffset(new DateTime(1985, 3, 4)).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTimeOffset(new DateTime(1985, 3, 4)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTimeOffset(new DateTime(1985, 3, 4)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         extraInput.ReplaceText(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString(cultureInfo));
         extraInput.SendKeys("\t");
         Browser.Equal(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
     }
 
     [Theory]
@@ -161,72 +161,72 @@ public void CanSetCultureAndParseCultureInvariantNumbersAndDatesWithFormComponen
         var input = Browser.Exists(By.Id("inputnumber_int"));
         var display = Browser.Exists(By.Id("inputnumber_int_value"));
         Browser.Equal(42.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(42.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(42.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         input.Clear();
         input.SendKeys(9000.ToString(CultureInfo.InvariantCulture));
         input.SendKeys("\t");
         Browser.Equal(9000.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(9000.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(9000.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // long
         input = Browser.Exists(By.Id("inputnumber_long"));
         display = Browser.Exists(By.Id("inputnumber_long_value"));
         Browser.Equal(4200.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(4200.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(4200.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         input.Clear();
         input.SendKeys(90000000000.ToString(CultureInfo.InvariantCulture));
         input.SendKeys("\t");
         Browser.Equal(90000000000.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(90000000000.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(90000000000.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // short
         input = Browser.Exists(By.Id("inputnumber_short"));
         display = Browser.Exists(By.Id("inputnumber_short_value"));
         Browser.Equal(42.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(42.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(42.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         input.Clear();
         input.SendKeys(127.ToString(CultureInfo.InvariantCulture));
         input.SendKeys("\t");
         Browser.Equal(127.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(127.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(127.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // decimal
         input = Browser.Exists(By.Id("inputnumber_decimal"));
         display = Browser.Exists(By.Id("inputnumber_decimal_value"));
         Browser.Equal(4.2m.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(4.2m.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(4.2m.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         input.Clear();
         input.SendKeys(9000.42m.ToString(CultureInfo.InvariantCulture));
         input.SendKeys("\t");
         Browser.Equal(9000.42m.ToString(cultureInfo), () => display.Text);
-        Browser.Equal(9000.42m.ToString(CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(9000.42m.ToString(CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // datetime
         input = Browser.Exists(By.Id("inputdate_datetime"));
         display = Browser.Exists(By.Id("inputdate_datetime_value"));
         var extraInput = Browser.Exists(By.Id("inputdate_datetime_extrainput"));
         Browser.Equal(new DateTime(1985, 3, 4).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTime(1985, 3, 4).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTime(1985, 3, 4).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         extraInput.ReplaceText(new DateTime(2000, 1, 2).ToString(cultureInfo));
         extraInput.SendKeys("\t");
         Browser.Equal(new DateTime(2000, 1, 2).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTime(2000, 1, 2).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTime(2000, 1, 2).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         // datetimeoffset
         input = Browser.Exists(By.Id("inputdate_datetimeoffset"));
         display = Browser.Exists(By.Id("inputdate_datetimeoffset_value"));
         extraInput = Browser.Exists(By.Id("inputdate_datetimeoffset_extrainput"));
         Browser.Equal(new DateTimeOffset(new DateTime(1985, 3, 4)).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTimeOffset(new DateTime(1985, 3, 4)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTimeOffset(new DateTime(1985, 3, 4)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
 
         extraInput.ReplaceText(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString(cultureInfo));
         extraInput.SendKeys("\t");
         Browser.Equal(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString(cultureInfo), () => display.Text);
-        Browser.Equal(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetAttribute("value"));
+        Browser.Equal(new DateTimeOffset(new DateTime(2000, 1, 2)).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), () => input.GetDomProperty("value"));
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/HeadModificationTest.cs b/src/Components/test/E2ETest/Tests/HeadModificationTest.cs
index 5ecc3d377e52..c8ec9cf041a6 100644
--- a/src/Components/test/E2ETest/Tests/HeadModificationTest.cs
+++ b/src/Components/test/E2ETest/Tests/HeadModificationTest.cs
@@ -92,7 +92,7 @@ public void MostRecentlyAttachedHeadContentTakesPriority()
 
         void AssertDescriptionEquals(string description)
         {
-            Browser.Equal(description, () => Browser.FindElement(By.Id("meta-description")).GetAttribute("content"));
+            Browser.Equal(description, () => Browser.FindElement(By.Id("meta-description")).GetDomAttribute("content"));
         }
     }
 
diff --git a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
index a513fda50fb5..df1cbaecc556 100644
--- a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
+++ b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
@@ -32,7 +32,7 @@ protected override void InitializeAsyncCore()
     public void CanLoadBlazorAppFromSubPath()
     {
         Assert.Equal("App loaded on custom path", Browser.Title);
-        Assert.Equal(0, Browser.GetBrowserLogs(LogLevel.Severe).Count);
+        Assert.Empty(Browser.GetBrowserLogs(LogLevel.Severe));
     }
 
     private void WaitUntilLoaded()
diff --git a/src/Components/test/E2ETest/Tests/InteropTest.cs b/src/Components/test/E2ETest/Tests/InteropTest.cs
index 45ea9805fd0e..07d54f0fa3d8 100644
--- a/src/Components/test/E2ETest/Tests/InteropTest.cs
+++ b/src/Components/test/E2ETest/Tests/InteropTest.cs
@@ -28,7 +28,7 @@ protected override void InitializeAsyncCore()
     }
 
     [Fact]
-    public void CanInvokeDotNetMethods()
+    public void CanInvokeInteropMethods()
     {
         // Arrange
         var expectedAsyncValues = new Dictionary<string, string>
@@ -89,9 +89,29 @@ public void CanInvokeDotNetMethods()
             ["invokeVoidAsyncReturnsWithoutSerializing"] = "Success",
             ["invokeVoidAsyncReturnsWithoutSerializingInJSObjectReference"] = "Success",
             ["invokeAsyncThrowsSerializingCircularStructure"] = "Success",
-            ["invokeAsyncThrowsUndefinedJSObjectReference"] = "Success",
-            ["invokeAsyncThrowsNullJSObjectReference"] = "Success",
             ["disposeJSObjectReferenceAsync"] = "Success",
+            // GetValue tests
+            ["getValueFromDataPropertyAsync"] = "10",
+            ["getValueFromGetterAsync"] = "20",
+            ["getValueFromSetterAsync"] = "Success",
+            ["getValueFromUndefinedPropertyAsync"] = "Success",
+            // SetValueTests
+            ["setValueToDataPropertyAsync"] = "30",
+            ["setValueToSetterAsync"] = "40",
+            ["setValueToUndefinedPropertyAsync"] = "50",
+            ["setValueToGetterAsync"] = "Success",
+            // InvokeConstructor tests
+            ["invokeConstructorWithClassConstructorAsync"] = "Success",
+            ["invokeConstructorWithClassConstructorAsync.dataProperty"] = "abraka",
+            ["invokeConstructorWithClassConstructorAsync.function"] = "6",
+            ["invokeConstructorWithNonConstructorAsync"] = "Success",
+            // Function reference tests
+            ["changeFunctionViaObjectReferenceAsync"] = "42",
+            // JS Object Nullable reference tests
+            ["invokeAsyncUndefinedJSObjectReference"] = "Success",
+            ["invokeAsyncNullJSObjectReference"] = "Success",
+            ["invokeAsyncNullFromVariableJSObjectReference"] = "Success",
+            ["invokeAsyncNonExistentJSObjectReference"] = "Success",
         };
 
         var expectedSyncValues = new Dictionary<string, string>
@@ -131,8 +151,6 @@ public void CanInvokeDotNetMethods()
             ["invokeVoidReturnsWithoutSerializingIJSInProcessRuntime"] = "Success",
             ["invokeVoidReturnsWithoutSerializingInIJSInProcessObjectReference"] = "Success",
             ["invokeThrowsSerializingCircularStructure"] = "Success",
-            ["invokeThrowsUndefinedJSObjectReference"] = "Success",
-            ["invokeThrowsNullJSObjectReference"] = "Success",
             ["stringValueUpperSync"] = "MY STRING",
             ["testDtoNonSerializedValueSync"] = "99999",
             ["testDtoSync"] = "Same",
@@ -141,6 +159,28 @@ public void CanInvokeDotNetMethods()
             ["genericInstanceMethod"] = @"""Updated value 2""",
             ["requestDotNetStreamReference"] = @"""Success""",
             ["requestDotNetStreamWrapperReference"] = @"""Success""",
+            // GetValue tests
+            ["getValueFromDataProperty"] = "10",
+            ["getValueFromGetter"] = "20",
+            ["getValueFromSetter"] = "Success",
+            ["getValueFromUndefinedProperty"] = "Success",
+            // SetValue tests
+            ["setValueToDataProperty"] = "30",
+            ["setValueToSetter"] = "40",
+            ["setValueToUndefinedProperty"] = "50",
+            ["setValueToGetter"] = "Success",
+            // InvokeConstructor tests
+            ["invokeConstructorWithClassConstructor"] = "Success",
+            ["invokeConstructorWithClassConstructor.dataProperty"] = "abraka",
+            ["invokeConstructorWithClassConstructor.function"] = "6",
+            ["invokeConstructorWithNonConstructor"] = "Success",
+            // Function reference tests
+            ["changeFunctionViaObjectReference"] = "42",
+            // JS Object Nullable reference tests
+            ["invokeUndefinedJSObjectReference"] = "Success",
+            ["invokeNullJSObjectReference"] = "Success",
+            ["invokeNullFromVariableJSObjectReference"] = "Success",
+            ["invokeNonExistentJSObjectReference"] = "Success",
         };
 
         // Include the sync assertions only when running under WebAssembly
@@ -186,7 +226,7 @@ public void CanInvokeDotNetMethods()
             {
                 if (expectedValue.Value != actualValue)
                 {
-                    throw new AssertActualExpectedException(expectedValue.Value, actualValue, $"Scenario '{expectedValue.Key}' failed. Expected '{expectedValue.Value}, Actual {actualValue}");
+                    throw EqualException.ForMismatchedValues(expectedValue.Value, actualValue, $"Scenario '{expectedValue.Key}' failed. Expected '{expectedValue.Value}, Actual {actualValue}");
                 }
             }
         }
diff --git a/src/Components/test/E2ETest/Tests/InteropValueTypesTest.cs b/src/Components/test/E2ETest/Tests/InteropValueTypesTest.cs
new file mode 100644
index 000000000000..53ad9387744b
--- /dev/null
+++ b/src/Components/test/E2ETest/Tests/InteropValueTypesTest.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using BasicTestApp;
+using Microsoft.AspNetCore.Components.E2ETest;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETests.Tests;
+
+public class InteropValueTypesTest(
+    BrowserFixture browserFixture,
+    ToggleExecutionModeServerFixture<Program> serverFixture,
+    ITestOutputHelper output)
+    : ServerTestBase<ToggleExecutionModeServerFixture<Program>>(browserFixture, serverFixture, output)
+{
+    protected override void InitializeAsyncCore()
+    {
+        Navigate(ServerPathBase);
+        Browser.MountTestComponent<InteropValueTypesComponent>();
+
+        var interopButton = Browser.Exists(By.Id("btn-interop"));
+        interopButton.Click();
+        Browser.Exists(By.Id("done-with-interop"));
+    }
+
+    [Fact]
+    public void CanRetrieveStoredGuidAsString()
+    {
+        var stringGuidElement = Browser.Exists(By.Id("string-get-by-interop"));
+
+        Browser.NotEqual(string.Empty, () => stringGuidElement.Text);
+        Browser.NotEqual(default, () => Guid.Parse(stringGuidElement.Text));
+    }
+
+    [Fact]
+    public void CanRetrieveStoredGuidAsGuid()
+    {
+        var guidElement = Browser.Exists(By.Id("guid-get-by-interop"));
+
+        Browser.NotEqual(default, () => Guid.Parse(guidElement.Text));
+    }
+
+    [Fact]
+    public void CanRetrieveStoredGuidAsNullableGuid()
+    {
+        var nullableGuidElement = Browser.Exists(By.Id("nullable-guid-get-by-interop"));
+
+        Browser.NotEqual(default, () => Guid.Parse(nullableGuidElement.Text));
+    }
+
+    [Fact]
+    public void CanRetrieveNullAsNullableGuid()
+    {
+        var nullableGuidElement = Browser.Exists(By.Id("null-loaded-into-nullable"));
+
+        Browser.Equal(true.ToString(), () => nullableGuidElement.Text);
+    }
+}
diff --git a/src/Components/test/E2ETest/Tests/KeyTest.cs b/src/Components/test/E2ETest/Tests/KeyTest.cs
index a67ac3aae5b4..d736d3845b85 100644
--- a/src/Components/test/E2ETest/Tests/KeyTest.cs
+++ b/src/Components/test/E2ETest/Tests/KeyTest.cs
@@ -222,7 +222,7 @@ public async Task CanRetainFocusWhileMovingTextBox()
 
             // Send keys to whatever has focus
             new Actions(Browser).SendKeys(nextChar).Perform();
-            Browser.Equal(expectedTextTyped, () => textboxFinder().GetAttribute("value"));
+            Browser.Equal(expectedTextTyped, () => textboxFinder().GetDomProperty("value"));
 
             // We delay between typings to ensure the events aren't all collapsed into one.
             await Task.Delay(50);
@@ -235,7 +235,7 @@ public async Task CanRetainFocusWhileMovingTextBox()
             By.CssSelector(".incomplete-items .item-1 input[type=checkbox]")).Click();
         Browser.Equal(expectedTextTyped, () => appElem
             .FindElement(By.CssSelector(".complete-items .item-1 input[type=text]"))
-            .GetAttribute("value"));
+            .GetDomProperty("value"));
     }
 
     [Fact]
@@ -324,7 +324,7 @@ private void SetTextAreaValueFast(IWebElement textAreaElementWithId, string valu
     {
         var javascript = (IJavaScriptExecutor)Browser;
         javascript.ExecuteScript(
-            $"document.getElementById('{textAreaElementWithId.GetAttribute("id")}').value = {JsonSerializer.Serialize(value, TestJsonSerializerOptionsProvider.Options)}");
+            $"document.getElementById('{textAreaElementWithId.GetDomAttribute("id")}').value = {JsonSerializer.Serialize(value, TestJsonSerializerOptionsProvider.Options)}");
         textAreaElementWithId.SendKeys(" "); // So it fires the change event
     }
 
diff --git a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
index 230b1bc11a68..feee1434d50d 100644
--- a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
@@ -34,7 +34,7 @@ public void CanLoadBlazorAppFromSubPath()
         Navigate("/app/");
         WaitUntilLoaded();
         Assert.Equal("App loaded on custom path", Browser.Title);
-        Assert.Equal(0, Browser.GetBrowserLogs(LogLevel.Severe).Count);
+        Assert.Empty(Browser.GetBrowserLogs(LogLevel.Severe));
     }
 
     [Fact]
diff --git a/src/Components/test/E2ETest/Tests/QuickGridTest.cs b/src/Components/test/E2ETest/Tests/QuickGridTest.cs
index a151e900e7c5..63ea37319277 100644
--- a/src/Components/test/E2ETest/Tests/QuickGridTest.cs
+++ b/src/Components/test/E2ETest/Tests/QuickGridTest.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Support.Extensions;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETests.Tests;
@@ -118,7 +119,93 @@ public void PaginatorDisplaysCorrectItemCount()
     public void AdditionalAttributesApplied()
     {
         var grid = app.FindElement(By.CssSelector("#grid > table"));
-        Assert.Equal("somevalue", grid.GetAttribute("custom-attrib"));
-        Assert.Contains("custom-class-attrib", grid.GetAttribute("class")?.Split(" "));
+        Assert.Equal("somevalue", grid.GetDomAttribute("custom-attrib"));
+        Assert.Contains("custom-class-attrib", grid.GetDomAttribute("class")?.Split(" "));
+    }
+
+    [Fact]
+    public void RowClassApplied()
+    {
+        var grid = app.FindElement(By.CssSelector("#grid > table"));
+        var rows = grid.FindElements(By.CssSelector("tbody > tr"));
+
+        bool isJulieRowFound = false;
+        foreach (var row in rows)
+        {
+            var firstName = row.FindElement(By.CssSelector("td:nth-child(2)")).Text;
+            if (firstName == "Julie")
+            {
+                isJulieRowFound = true;
+                Assert.Equal("highlight", row.GetDomAttribute("class"));
+            }
+            else
+            {
+                Assert.Null(row.GetDomAttribute("class"));
+            }
+        }
+
+        if (!isJulieRowFound)
+        {
+            Assert.Fail("No row found for Julie to highlight.");
+        }
+    }
+
+    [Fact]
+    public void RowStyleApplied()
+    {
+        var grid = app.FindElement(By.CssSelector("#grid > table"));
+        var birthDateColumn = grid.FindElement(By.CssSelector("thead > tr > th:nth-child(4)"));
+        var ageColumn = grid.FindElement(By.CssSelector("thead > tr > th:nth-child(5)"));
+
+        Assert.Contains("col-justify-center", birthDateColumn.GetAttribute("class"));
+        Assert.Contains("col-justify-right", ageColumn.GetAttribute("class"));
+        Assert.Equal("center", Browser.ExecuteJavaScript<string>(@"
+        const p = document.querySelector('tbody > tr:first-child > td:nth-child(4)');
+        return p ? getComputedStyle(p).textAlign : null;"));
+        Assert.Equal("right", Browser.ExecuteJavaScript<string>(@"
+        const p = document.querySelector('tbody > tr:first-child > td:nth-child(5)');
+        return p ? getComputedStyle(p).textAlign : null;"));
+    }
+    
+    [Fact]
+    public void CanOpenColumnOptions()
+    {
+        var grid = app.FindElement(By.CssSelector("#grid > table"));
+        var firstNameColumnOptionsButton = grid.FindElement(By.CssSelector("thead > tr > th:nth-child(2) > div > button[title=\"Column options\"]"));
+
+        firstNameColumnOptionsButton.Click();
+
+        var firstNameSearchSelector = "#grid > table > thead > tr > th:nth-child(2) input[type=search]";
+        Browser.Exists(By.CssSelector(firstNameSearchSelector));
+    }
+
+    [Fact]
+    public void CanCloseColumnOptionsByBlurring()
+    {
+        var grid = app.FindElement(By.CssSelector("#grid > table"));
+        var firstNameColumnOptionsButton = grid.FindElement(By.CssSelector("thead > tr > th:nth-child(2) > div > button[title=\"Column options\"]"));
+
+        firstNameColumnOptionsButton.Click();
+
+        // Click outside the column options to close
+        grid.Click();
+
+        var firstNameSearchSelector = "#grid > table > thead > tr > th:nth-child(2) input[type=search]";
+        Browser.DoesNotExist(By.CssSelector(firstNameSearchSelector));
+    }
+
+    [Fact]
+    public void CanCloseColumnOptionsByHideColumnOptionsAsync()
+    {
+        var grid = app.FindElement(By.CssSelector("#grid > table"));
+        var firstNameColumnOptionsButton = grid.FindElement(By.CssSelector("thead > tr > th:nth-child(2) > div > button[title=\"Column options\"]"));
+
+        firstNameColumnOptionsButton.Click();
+
+        // Click the button inside the column options popup to close, which calls QuickGrid.HideColumnOptionsAsync
+        grid.FindElement(By.CssSelector("#close-column-options")).Click();
+
+        var firstNameSearchSelector = "#grid > table > thead > tr > th:nth-child(2) input[type=search]";
+        Browser.DoesNotExist(By.CssSelector(firstNameSearchSelector));
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/RoutingTest.cs b/src/Components/test/E2ETest/Tests/RoutingTest.cs
index cb974cd0151b..3457ca4cd4d1 100644
--- a/src/Components/test/E2ETest/Tests/RoutingTest.cs
+++ b/src/Components/test/E2ETest/Tests/RoutingTest.cs
@@ -26,6 +26,9 @@ public RoutingTest(
     {
     }
 
+    public override Task InitializeAsync()
+        => InitializeAsync(BrowserFixture.RoutingTestContext);
+
     protected override void InitializeAsyncCore()
     {
         Navigate(ServerPathBase);
@@ -296,7 +299,7 @@ public void CanFollowLinkToOtherPageWithQueryString()
         var app = Browser.MountTestComponent<TestRouter>();
         app.FindElement(By.LinkText("Other with query")).Click();
         Browser.Equal("This is another page.", () => app.FindElement(By.Id("test-info")).Text);
-        AssertHighlightedLinks("Other", "Other with query");
+        AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)", "Other with query");
     }
 
     [Fact]
@@ -307,7 +310,10 @@ public void CanFollowLinkToDefaultPageWithQueryString()
         var app = Browser.MountTestComponent<TestRouter>();
         app.FindElement(By.LinkText("Default with query")).Click();
         Browser.Equal("This is the default page.", () => app.FindElement(By.Id("test-info")).Text);
-        AssertHighlightedLinks("Default with query");
+        AssertHighlightedLinks(
+            "Default (matches all)",
+            "Default with base-relative URL (matches all)",
+            "Default with query");
     }
 
     [Fact]
@@ -318,7 +324,11 @@ public void CanFollowLinkToDefaultPageWithQueryString_NoTrailingSlash()
         var app = Browser.MountTestComponent<TestRouter>();
         app.FindElement(By.LinkText("Default with query, no trailing slash")).Click();
         Browser.Equal("This is the default page.", () => app.FindElement(By.Id("test-info")).Text);
-        AssertHighlightedLinks("Default with query, no trailing slash");
+        AssertHighlightedLinks(
+            "Default (matches all)",
+            "Default with base-relative URL (matches all)",
+            "Default, no trailing slash (matches all)",
+            "Default with query, no trailing slash");
     }
 
     [Fact]
@@ -329,7 +339,7 @@ public void CanFollowLinkToOtherPageWithHash()
         var app = Browser.MountTestComponent<TestRouter>();
         app.FindElement(By.LinkText("Other with hash")).Click();
         Browser.Equal("This is another page.", () => app.FindElement(By.Id("test-info")).Text);
-        AssertHighlightedLinks("Other", "Other with hash");
+        AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)", "Other with hash");
     }
 
     [Fact]
@@ -340,7 +350,10 @@ public void CanFollowLinkToDefaultPageWithHash()
         var app = Browser.MountTestComponent<TestRouter>();
         app.FindElement(By.LinkText("Default with hash")).Click();
         Browser.Equal("This is the default page.", () => app.FindElement(By.Id("test-info")).Text);
-        AssertHighlightedLinks("Default with hash");
+        AssertHighlightedLinks(
+            "Default (matches all)",
+            "Default with base-relative URL (matches all)",
+            "Default with hash");
     }
 
     [Fact]
@@ -351,7 +364,11 @@ public void CanFollowLinkToDefaultPageWithHash_NoTrailingSlash()
         var app = Browser.MountTestComponent<TestRouter>();
         app.FindElement(By.LinkText("Default with hash, no trailing slash")).Click();
         Browser.Equal("This is the default page.", () => app.FindElement(By.Id("test-info")).Text);
-        AssertHighlightedLinks("Default with hash, no trailing slash");
+        AssertHighlightedLinks(
+            "Default (matches all)",
+            "Default with base-relative URL (matches all)",
+            "Default, no trailing slash (matches all)",
+            "Default with hash, no trailing slash");
     }
 
     [Fact]
@@ -380,6 +397,28 @@ public void CanFollowLinkDefinedInOpenShadowRoot()
         AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)");
     }
 
+    [Fact]
+    public void CanOverrideNavLinkToNotIgnoreFragment()
+    {
+        SetUrlViaPushState("/layout-overridden/for-hash");
+
+        var app = Browser.MountTestComponent<TestRouter>();
+        app.FindElement(By.LinkText("Override layout with hash, no trailing slash")).Click();
+        Browser.Equal("This is the page with overridden layout.", () => app.FindElement(By.Id("test-info")).Text);
+        AssertHighlightedLinks("Override layout with hash, no trailing slash");
+    }
+
+    [Fact]
+    public void CanOverrideNavLinkToNotIgnoreQuery()
+    {
+        SetUrlViaPushState("/layout-overridden");
+
+        var app = Browser.MountTestComponent<TestRouter>();
+        app.FindElement(By.LinkText("Override layout with query, no trailing slash")).Click();
+        Browser.Equal("This is the page with overridden layout.", () => app.FindElement(By.Id("test-info")).Text);
+        AssertHighlightedLinks("Override layout with query, no trailing slash");
+    }
+
     [Fact]
     public void CanGoBackFromNotAComponent()
     {
@@ -418,7 +457,7 @@ public void CanNavigateProgrammatically()
         AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)");
 
         // Because this was client-side navigation, we didn't lose the state in the test selector
-        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetAttribute("value"));
+        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetDomProperty("value"));
     }
 
     [Fact]
@@ -435,7 +474,7 @@ public void CanNavigateProgrammaticallyWithForceLoad()
         // Because this was a full-page load, our element references should no longer be valid
         Assert.Throws<StaleElementReferenceException>(() =>
         {
-            testSelector.SelectedOption.GetAttribute("value");
+            testSelector.SelectedOption.GetDomProperty("value");
         });
     }
 
@@ -471,7 +510,7 @@ public void CanNavigateProgrammaticallyWithStateValidateNoReplaceHistoryEntry()
 
         // We check if we had a force load
         Assert.Throws<StaleElementReferenceException>(() =>
-            testSelector.SelectedOption.GetAttribute("value"));
+            testSelector.SelectedOption.GetDomProperty("value"));
 
         // But still we should be able to navigate back, and end up at the "/ProgrammaticNavigationCases" page
         Browser.Navigate().Back();
@@ -504,7 +543,41 @@ public void CanNavigateProgrammaticallyWithStateReplaceHistoryEntry()
         AssertHighlightedLinks("Default (matches all)", "Default with base-relative URL (matches all)");
 
         // Because this was all with client-side navigation, we didn't lose the state in the test selector
-        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetAttribute("value"));
+        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetDomProperty("value"));
+    }
+
+    [Fact]
+    public void NavigationToSamePathDoesNotScrollToTheTop()
+    {
+        // This test checks if the navigation to same path or path with query appeneded,
+        // keeps the scroll in the position from before navigation
+        // but moves it when we navigate to a fragment
+        SetUrlViaPushState("/");
+
+        var app = Browser.MountTestComponent<TestRouter>();
+        var testSelector = Browser.WaitUntilTestSelectorReady();
+
+        app.FindElement(By.LinkText("Programmatic navigation cases")).Click();
+        Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
+        Browser.Contains("programmatic navigation", () => app.FindElement(By.Id("test-info")).Text);
+
+        var jsExecutor = (IJavaScriptExecutor)Browser;
+        var maxScrollPosition = (long)jsExecutor.ExecuteScript("return document.documentElement.scrollHeight - window.innerHeight;");
+        // scroll max up to find the position of fragment
+        BrowserScrollY = 0;
+        var fragmentScrollPosition = (long)jsExecutor.ExecuteScript("return document.getElementById('fragment').getBoundingClientRect().top + window.scrollY;");
+
+        // scroll maximally down
+        BrowserScrollY = maxScrollPosition;
+
+        app.FindElement(By.Id("do-self-navigate")).Click();
+        WaitAssert.True(Browser, () => maxScrollPosition == BrowserScrollY, default, $"Expected to stay scrolled down in {maxScrollPosition} but the scroll is in position {BrowserScrollY}.");
+
+        app.FindElement(By.Id("do-self-navigate-with-query")).Click();
+        WaitAssert.True(Browser, () => maxScrollPosition == BrowserScrollY, default, $"Expected to stay scrolled down in {maxScrollPosition} but the scroll is in position {BrowserScrollY}.");
+
+        app.FindElement(By.Id("do-self-navigate-to-fragment")).Click();
+        WaitAssert.True(Browser, () => fragmentScrollPosition == BrowserScrollY, default, $"Expected to scroll to the fragment in position {fragmentScrollPosition} but the scroll is in position {BrowserScrollY}.");
     }
 
     [Fact]
@@ -543,14 +616,14 @@ public void CanNavigateProgrammaticallyValidateNoReplaceHistoryEntry()
         AssertHighlightedLinks("Programmatic navigation cases");
 
         // Because this was client-side navigation, we didn't lose the state in the test selector
-        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetAttribute("value"));
+        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetDomProperty("value"));
 
         app.FindElement(By.Id("do-other-navigation-forced")).Click();
         Browser.True(() => Browser.Url.EndsWith("/Other", StringComparison.Ordinal));
 
         // We check if we had a force load
         Assert.Throws<StaleElementReferenceException>(() =>
-            testSelector.SelectedOption.GetAttribute("value"));
+            testSelector.SelectedOption.GetDomProperty("value"));
 
         // But still we should be able to navigate back, and end up at the "/ProgrammaticNavigationCases" page
         Browser.Navigate().Back();
@@ -582,7 +655,7 @@ public void CanNavigateProgrammaticallyWithReplaceHistoryEntry()
         AssertHighlightedLinks("Default (matches all)", "Default with base-relative URL (matches all)");
 
         // Because this was all with client-side navigation, we didn't lose the state in the test selector
-        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetAttribute("value"));
+        Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetDomProperty("value"));
     }
 
     [Fact]
@@ -603,7 +676,7 @@ public void CanNavigateProgrammaticallyWithForceLoadAndReplaceHistoryEntry()
 
         // We check if we had a force load
         Assert.Throws<StaleElementReferenceException>(() =>
-            testSelector.SelectedOption.GetAttribute("value"));
+            testSelector.SelectedOption.GetDomProperty("value"));
 
         // After we press back, we should end up at the "/" page so we know browser history has been replaced
         Browser.Navigate().Back();
@@ -897,6 +970,7 @@ public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_PushS
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61080")]
     public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation()
     {
         SetUrlViaPushState("/");
@@ -1620,11 +1694,11 @@ public void AnchorWithHrefContainingHashSamePage_ScrollsToElementOnTheSamePage()
 
         app.FindElement(By.Id("anchor-test1")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1636,11 +1710,11 @@ public void AnchorWithHrefToSameUrlWithQueryAndHash_ScrollsToElementOnTheSamePag
 
         app.FindElement(By.Id("anchor-test1-with-query")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash?color=green&number=123#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash?color=green&number=123#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1652,11 +1726,11 @@ public void AnchorWithHrefToSameUrlWithParamAndHash_ScrollsToElementOnTheSamePag
 
         app.FindElement(By.Id("anchor-test1-with-param")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash/11#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash/11#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1668,15 +1742,14 @@ public void AnchorWithHrefToSameUrlWithParamQueryAndHash_ScrollsToElementOnTheSa
 
         app.FindElement(By.Id("anchor-test1-with-param-and-query")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash/11?color=green&number=123#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash/11?color=green&number=123#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47967")]
     public void AnchorWithHrefContainingHashAnotherPage_NavigatesToPageAndScrollsToElement()
     {
         SetUrlViaPushState("/");
@@ -1685,15 +1758,14 @@ public void AnchorWithHrefContainingHashAnotherPage_NavigatesToPageAndScrollsToE
 
         app.FindElement(By.Id("anchor-test2")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test2VerticalLocation = app.FindElement(By.Id("test2")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash2#test2", currentRelativeUrl);
-        Assert.Equal(test2VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash2#test2";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test2VerticalLocation, default, $"Expected {test2VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47967")]
     public void NavigationManagerNavigateToAnotherUrlWithHash_NavigatesToPageAndScrollsToElement()
     {
         SetUrlViaPushState("/");
@@ -1702,11 +1774,11 @@ public void NavigationManagerNavigateToAnotherUrlWithHash_NavigatesToPageAndScro
 
         app.FindElement(By.Id("navigate-test2")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test2VerticalLocation = app.FindElement(By.Id("test2")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash2#test2", currentRelativeUrl);
-        Assert.Equal(test2VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash2#test2";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test2VerticalLocation, default, $"Expected {test2VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1718,11 +1790,11 @@ public void NavigationManagerNavigateToSameUrlWithHash_ScrollsToElementOnTheSame
 
         app.FindElement(By.Id("navigate-test1")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1734,11 +1806,11 @@ public void NavigationManagerNavigateToSameUrlWithQueryAndHash_ScrollsToElementO
 
         app.FindElement(By.Id("navigate-test1-with-query")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash?color=green&number=123#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash?color=green&number=123#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1750,11 +1822,11 @@ public void NavigationManagerNavigateToSameUrlWithParamAndHash_ScrollsToElementO
 
         app.FindElement(By.Id("navigate-test1-with-param")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash/22#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash/22#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     [Fact]
@@ -1766,11 +1838,11 @@ public void NavigationManagerNavigateToSameUrlWithParamQueryAndHash_ScrollsToEle
 
         app.FindElement(By.Id("navigate-test1-with-param-and-query")).Click();
 
-        var currentWindowScrollY = BrowserScrollY;
         var test1VerticalLocation = app.FindElement(By.Id("test1")).Location.Y;
         var currentRelativeUrl = _serverFixture.RootUri.MakeRelativeUri(new Uri(Browser.Url)).ToString();
-        Assert.Equal("subdir/LongPageWithHash/22?color=green&number=123#test1", currentRelativeUrl);
-        Assert.Equal(test1VerticalLocation, currentWindowScrollY);
+        string expectedUrl = "subdir/LongPageWithHash/22?color=green&number=123#test1";
+        WaitAssert.True(Browser, () => expectedUrl == currentRelativeUrl, default, $"Expected {expectedUrl} but got {currentRelativeUrl}");
+        WaitAssert.True(Browser, () => BrowserScrollY == test1VerticalLocation, default, $"Expected {test1VerticalLocation} but got {BrowserScrollY}");
     }
 
     private long BrowserScrollY
diff --git a/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs b/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs
index bd69e484a5f8..73a860124ecb 100644
--- a/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs
+++ b/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs
@@ -35,7 +35,7 @@ public void RenderSectionContent_CascadingParameterForSectionOutletIsDeterminedB
         Browser.FindElement(By.Id("render-section-outlet")).Click();
         Browser.FindElement(By.Id("render-second-section-content")).Click();
 
-        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -46,7 +46,7 @@ public void ChangeCascadingValueForSectionContent_CascadingValueForSectionOutlet
 
         Browser.FindElement(By.Id("change-cascading-value")).Click();
 
-        Browser.Equal("First Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -56,7 +56,7 @@ public void RenderTwoSectionContentsWithSameId_CascadingParameterForSectionOutle
         Browser.FindElement(By.Id("render-first-section-content")).Click();
         Browser.FindElement(By.Id("render-section-outlet")).Click();
 
-        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -68,7 +68,7 @@ public void SecondSectionContentIdChanged_CascadingParameterForSectionOutletIsDe
 
         Browser.FindElement(By.Id("change-second-section-content-id")).Click();
 
-        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -80,7 +80,7 @@ public void SecondSectionContentDisposed_CascadingParameterForSectionOutletIsDet
 
         Browser.FindElement(By.Id("dispose-second-section-content")).Click();
 
-        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -92,7 +92,7 @@ public void FirstSectionContentDisposedThenRenderSecondSectionContent_CascadingP
         Browser.FindElement(By.Id("dispose-first-section-content")).Click();
         Browser.FindElement(By.Id("render-second-section-content")).Click();
 
-        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -105,6 +105,6 @@ public void SectionOutletIdChanged_CascadingParameterForSectionOutletIsDetermine
 
         Browser.FindElement(By.Id("change-section-outlet-id")).Click();
 
-        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs b/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs
index 3509030754af..25106e9ba4f2 100644
--- a/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs
+++ b/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs
@@ -37,7 +37,7 @@ public void RenderSectionContent_ErrorBoundaryForSectionOutletContentIsDetermine
 
         Browser.FindElement(By.Id("error-button")).Click();
 
-        Browser.Equal("Sorry!", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Sorry!", () => Browser.Exists(By.Id("error-content")).Text);
     }
 
     [Fact]
@@ -88,7 +88,7 @@ public void FirstSectionContentDisposedThenRenderSecondSectionContent_ErrorBound
         Browser.FindElement(By.Id("render-second-section-content")).Click();
         Browser.FindElement(By.Id("error-button")).Click();
 
-        Browser.Equal("Sorry!", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Sorry!", () => Browser.Exists(By.Id("error-content")).Text);
     }
 
     [Fact]
@@ -102,6 +102,6 @@ public void SectionOutletIdChanged_ErrorBoundaryForSectionOutletIsDeterminedByMa
         Browser.FindElement(By.Id("change-section-outlet-id")).Click();
         Browser.FindElement(By.Id("error-button")).Click();
 
-        Browser.Equal("Sorry!", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Sorry!", () => Browser.Exists(By.Id("error-content")).Text);
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs b/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
index abdc012a2482..f5370b03a22b 100644
--- a/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
 
 public class StandaloneAppTest
-    : ServerTestBase<BlazorWasmTestAppFixture<StandaloneApp.Program>>, IDisposable
+    : ServerTestBase<BlazorWasmTestAppFixture<StandaloneApp.Program>>
 {
     public StandaloneAppTest(
         BrowserFixture browserFixture,
@@ -22,6 +22,12 @@ public StandaloneAppTest(
 
     protected override void InitializeAsyncCore()
     {
+        // The sidebar is hidden if the screen is too narrow.
+        // Without setting the window size explicitly, visibility-sensitive properties (e.g. IWebElement.Text)
+        // and element finders (e.g. By.LinkText) can behave unexpectedly, causing assertions to fail.
+        // In particular, this happens in the headless mode (used when running without debugger).
+        Browser.SetWindowSize(1920, 1080);
+
         Navigate("/");
         WaitUntilLoaded();
     }
@@ -126,10 +132,12 @@ private void WaitUntilLoaded()
         Browser.NotEqual("Loading...", () => app.Text);
     }
 
-    public void Dispose()
+    public override Task DisposeAsync()
     {
         // Make the tests run faster by navigating back to the home page when we are done
         // If we don't, then the next test will reload the whole page before it starts
         Browser.Exists(By.LinkText("Home")).Click();
+
+        return base.DisposeAsync();
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/StartupErrorNotificationTest.cs b/src/Components/test/E2ETest/Tests/StartupErrorNotificationTest.cs
index 37c70e381e29..b8d69471694e 100644
--- a/src/Components/test/E2ETest/Tests/StartupErrorNotificationTest.cs
+++ b/src/Components/test/E2ETest/Tests/StartupErrorNotificationTest.cs
@@ -27,7 +27,7 @@ public StartupErrorNotificationTest(
     public void DisplaysNotificationForStartupException(bool errorIsAsync)
     {
         var url = $"{ServerPathBase}?error={(errorIsAsync ? "async" : "sync")}";
-
+        
         Navigate(url);
         var errorUiElem = Browser.Exists(By.Id("blazor-error-ui"), TimeSpan.FromSeconds(10));
         Assert.NotNull(errorUiElem);
diff --git a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
index d49e4fbc5704..007c7ce5de16 100644
--- a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
+++ b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
@@ -107,6 +107,151 @@ public void CanRenderComponentWithPersistedState(bool suppressEnhancedNavigation
         }
     }
 
+    // Validates that we can use persisted state across server, webassembly, and auto modes, with and without
+    // streaming rendering.
+    // For streaming rendering, we validate that the state is captured and restored after streaming completes.
+    // For enhanced navigation we validate that the state is captured at the time components are rendered for
+    // the first time on the page.
+    // For auto mode, we validate that the state is captured and restored for both server and wasm runtimes.
+    // In each case, we validate that the state is available until the initial set of components first render reaches quiescence. Similar to how it works for Server and WebAssembly.
+    // For server we validate that the state is provided every time a circuit is initialized.
+    [Theory]
+    [InlineData(typeof(InteractiveServerRenderMode), (string)null, "yes")]
+    [InlineData(typeof(InteractiveServerRenderMode), "ServerStreaming", "yes")]
+    [InlineData(typeof(InteractiveWebAssemblyRenderMode), (string)null, "yes")]
+    [InlineData(typeof(InteractiveWebAssemblyRenderMode), "WebAssemblyStreaming", "yes")]
+    [InlineData(typeof(InteractiveAutoRenderMode), (string)null, "yes")]
+    [InlineData(typeof(InteractiveAutoRenderMode), "AutoStreaming", "yes")]
+    [InlineData(typeof(InteractiveServerRenderMode), (string)null, null)]
+    [InlineData(typeof(InteractiveServerRenderMode), "ServerStreaming", null)]
+    [InlineData(typeof(InteractiveWebAssemblyRenderMode), (string)null, null)]
+    [InlineData(typeof(InteractiveWebAssemblyRenderMode), "WebAssemblyStreaming", null)]
+    [InlineData(typeof(InteractiveAutoRenderMode), (string)null, null)]
+    [InlineData(typeof(InteractiveAutoRenderMode), "AutoStreaming", null)]
+    public void CanUpdateComponentsWithPersistedStateAndEnhancedNavUpdates(
+        Type renderMode,
+        string streaming,
+        string key)
+    {
+        var mode = renderMode switch
+        {
+            var t when t == typeof(InteractiveServerRenderMode) => "server",
+            var t when t == typeof(InteractiveWebAssemblyRenderMode) => "wasm",
+            var t when t == typeof(InteractiveAutoRenderMode) => "auto",
+            _ => throw new ArgumentException($"Unknown render mode: {renderMode.Name}")
+        };
+
+        // Navigate to a page without components first to make sure that we exercise rendering components
+        // with enhanced navigation on.
+        NavigateToInitialPage(streaming, mode, key);
+        if (mode == "auto")
+        {
+            BlockWebAssemblyResourceLoad();
+        }
+        Browser.Click(By.Id("call-blazor-start"));
+        Browser.Click(By.Id("page-with-components-link-and-declarative-state"));
+
+        if (mode != "auto")
+        {
+            RenderComponentsWithDeclarativePersistentStateAndValidate(mode, renderMode, streaming, stateValue: "other");
+        }
+        else
+        {
+            // For auto mode, validate that the state is persisted for both runtimes and is able
+            // to be loaded on server and wasm.
+            RenderComponentsWithDeclarativePersistentStateAndValidate(mode, renderMode, streaming, interactiveRuntime: "server", stateValue: "other");
+
+            UnblockWebAssemblyResourceLoad();
+            Browser.Navigate().Refresh();
+            NavigateToInitialPage(streaming, mode, key);
+            Browser.Click(By.Id("call-blazor-start"));
+            Browser.Click(By.Id("page-with-components-link-and-declarative-state"));
+
+            RenderComponentsWithDeclarativePersistentStateAndValidate(mode, renderMode, streaming, interactiveRuntime: "wasm", stateValue: "other");
+        }
+
+        void NavigateToInitialPage(string streaming, string mode, string key)
+        {
+            if (key == null)
+            {
+                if (streaming == null)
+                {
+                    Navigate($"subdir/persistent-state/page-no-components?render-mode={mode}&suppress-autostart");
+                }
+                else
+                {
+                    Navigate($"subdir/persistent-state/page-no-components?render-mode={mode}&streaming-id={streaming}&suppress-autostart");
+                }
+            }
+            else
+            {
+                if (streaming == null)
+                {
+                    Navigate($"subdir/persistent-state/page-no-components?render-mode={mode}&key={key}&suppress-autostart");
+                }
+                else
+                {
+                    Navigate($"subdir/persistent-state/page-no-components?render-mode={mode}&key={key}&streaming-id={streaming}&suppress-autostart");
+                }
+            }
+        }
+    }
+
+    private void RenderComponentsWithDeclarativePersistentStateAndValidate(
+    string mode,
+    Type renderMode,
+    string streaming,
+    string interactiveRuntime = null,
+    string stateValue = "restored")
+    {
+        AssertDeclarativePageState(
+            mode: mode,
+            renderMode: renderMode.Name,
+            interactive: streaming == null,
+            stateValue: stateValue,
+            streamingId: streaming,
+            streamingCompleted: false,
+            interactiveRuntime: interactiveRuntime);
+
+        if (streaming == null)
+        {
+            Browser.Click(By.Id("enhanced-nav-update"));
+            AssertDeclarativePageState(
+                mode: mode,
+                renderMode: renderMode.Name,
+                interactive: streaming == null,
+                stateValue: "updated",
+                streamingId: streaming,
+                streamingCompleted: false,
+                interactiveRuntime: interactiveRuntime);
+            return;
+        }
+
+        Browser.Click(By.Id("end-streaming"));
+
+        AssertDeclarativePageState(
+            mode: mode,
+            renderMode: renderMode.Name,
+            interactive: true,
+            stateValue: stateValue,
+            streamingId: streaming,
+            streamingCompleted: true,
+            interactiveRuntime: interactiveRuntime);
+
+        Browser.Click(By.Id("enhanced-nav-update"));
+        Browser.Click(By.Id("end-streaming"));
+        AssertDeclarativePageState(
+            mode: mode,
+            renderMode: renderMode.Name,
+            interactive: true,
+            stateValue: "updated",
+            streamingId: streaming,
+            streamingCompleted: true,
+            interactiveRuntime: interactiveRuntime);
+
+        return;
+    }
+
     [Theory]
     [InlineData((string)null)]
     [InlineData("ServerStreaming")]
@@ -236,4 +381,29 @@ private void AssertPageState(
             Browser.Equal("Streaming: True", () => Browser.FindElement(By.Id("streaming")).Text);
         }
     }
+
+    private void AssertDeclarativePageState(
+        string mode,
+        string renderMode,
+        bool interactive,
+        string stateValue,
+        string streamingId = null,
+        bool streamingCompleted = false,
+        string interactiveRuntime = null)
+    {
+        Browser.Equal($"Render mode: {renderMode}", () => Browser.FindElement(By.Id("render-mode")).Text);
+        Browser.Equal($"Streaming id:{streamingId}", () => Browser.FindElement(By.Id("streaming-id")).Text);
+        Browser.Equal($"Interactive: {interactive}", () => Browser.FindElement(By.Id("interactive")).Text);
+        if (streamingId == null || streamingCompleted)
+        {
+            interactiveRuntime = !interactive ? "none" : mode == "server" || mode == "wasm" ? mode : (interactiveRuntime ?? throw new InvalidOperationException("Specify interactiveRuntime for auto mode"));
+
+            Browser.Equal($"Interactive runtime: {interactiveRuntime}", () => Browser.FindElement(By.Id("interactive-runtime")).Text);
+            Browser.Equal($"State value:{stateValue}", () => Browser.FindElement(By.Id("state-value")).Text);
+        }
+        else
+        {
+            Browser.Equal("Streaming: True", () => Browser.FindElement(By.Id("streaming")).Text);
+        }
+    }
 }
diff --git a/src/Components/test/E2ETest/Tests/SvgTest.cs b/src/Components/test/E2ETest/Tests/SvgTest.cs
index 5a429784a573..145d63424883 100644
--- a/src/Components/test/E2ETest/Tests/SvgTest.cs
+++ b/src/Components/test/E2ETest/Tests/SvgTest.cs
@@ -36,10 +36,10 @@ public void CanRenderSvgWithCorrectNamespace()
 
         var svgCircleElement = svgElement.FindElement(By.XPath("//*[local-name()='circle' and namespace-uri()='http://www.w3.org/2000/svg']"));
         Assert.NotNull(svgCircleElement);
-        Assert.Equal("10", svgCircleElement.GetAttribute("r"));
+        Assert.Equal("10", svgCircleElement.GetDomAttribute("r"));
 
         appElement.FindElement(By.TagName("button")).Click();
-        Browser.Equal("20", () => svgCircleElement.GetAttribute("r"));
+        Browser.Equal("20", () => svgCircleElement.GetDomAttribute("r"));
     }
 
     [Fact]
@@ -52,10 +52,10 @@ public void CanRenderSvgWithAttributeRemoval()
 
         var svgCircleElement = svgElement.FindElement(By.XPath("//*[local-name()='circle' and namespace-uri()='http://www.w3.org/2000/svg']"));
         Assert.NotNull(svgCircleElement);
-        Assert.Equal("stroke: red;", svgCircleElement.GetAttribute("style"));
+        Assert.Equal("stroke: red;", svgCircleElement.GetDomAttribute("style"));
 
         appElement.FindElement(By.TagName("button")).Click();
-        Browser.Equal("", () => svgCircleElement.GetAttribute("style"));
+        Browser.Equal(null, () => svgCircleElement.GetDomAttribute("style"));
     }
 
     [Fact]
diff --git a/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs b/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs
index b9b6bd1db8a5..ff075400ada3 100644
--- a/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs
+++ b/src/Components/test/E2ETest/Tests/ThreadingAppHostedTest.cs
@@ -32,15 +32,13 @@ protected override void InitializeAsyncCore()
         WaitUntilLoaded();
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54761")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void HasHeading()
     {
         Assert.Equal("Hello, world!", Browser.Exists(By.TagName("h1")).Text);
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54761")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void NavMenuHighlightsCurrentLocation()
     {
         var activeNavLinksSelector = By.CssSelector(".sidebar a.active");
@@ -66,8 +64,7 @@ public void NavMenuHighlightsCurrentLocation()
             item => Assert.Equal("Home", item.Text.Trim()));
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54761")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void CounterPageCanUseThreads()
     {
         // Navigate to "Counter"
@@ -84,8 +81,7 @@ public void CounterPageCanUseThreads()
         Browser.NotEqual("Current count: 0", () => Browser.Exists(By.CssSelector("h1 + p")).Text);
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54761")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void HasFetchDataPage()
     {
         // Navigate to "Fetch data"
diff --git a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs
index b50b5e787977..98953991d8b2 100644
--- a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs
@@ -19,6 +19,7 @@ public ThreadingAppTest(
         ITestOutputHelper output)
         : base(browserFixture, serverFixture, output)
     {
+        serverFixture.RequiresMultithreadingHeaders = true;
     }
 
     protected override void InitializeAsyncCore()
@@ -27,22 +28,19 @@ protected override void InitializeAsyncCore()
         WaitUntilLoaded();
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void HasTitle()
     {
         Assert.Equal("Blazor standalone", Browser.Title);
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void HasHeading()
     {
         Assert.Equal("Hello, world!", Browser.Exists(By.TagName("h1")).Text);
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54497")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void NavMenuHighlightsCurrentLocation()
     {
         var activeNavLinksSelector = By.CssSelector(".sidebar a.active");
@@ -68,8 +66,7 @@ public void NavMenuHighlightsCurrentLocation()
             item => Assert.Equal("Home", item.Text.Trim()));
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void CounterPageCanUseThreads()
     {
         // Navigate to "Counter"
@@ -86,8 +83,7 @@ public void CounterPageCanUseThreads()
         Browser.NotEqual("Current count: 0", () => Browser.Exists(By.CssSelector("h1 + p")).Text);
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void HasFetchDataPage()
     {
         // Navigate to "Fetch data"
@@ -108,8 +104,7 @@ public void HasFetchDataPage()
         }
     }
 
-    [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")]
+    [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/63524")]
     public void IsStarted()
     {
         // Read from property
diff --git a/src/Components/test/E2ETest/Tests/VirtualizationTest.cs b/src/Components/test/E2ETest/Tests/VirtualizationTest.cs
index f7256289a388..4fa21ef3fe11 100644
--- a/src/Components/test/E2ETest/Tests/VirtualizationTest.cs
+++ b/src/Components/test/E2ETest/Tests/VirtualizationTest.cs
@@ -39,21 +39,24 @@ public void AlwaysFillsVisibleCapacity_Sync()
 
         // Wait until items have been rendered.
         Browser.True(() => (initialItemCount = GetItemCount()) > 0);
-        Browser.Equal(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.Equal(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
 
         // Scroll halfway.
         Browser.ExecuteJavaScript("const container = document.getElementById('sync-container');container.scrollTop = container.scrollHeight * 0.5;");
 
         // Validate that we get the same item count after scrolling halfway.
         Browser.Equal(initialItemCount, GetItemCount);
-        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
 
         // Scroll to the bottom.
         Browser.ExecuteJavaScript("const container = document.getElementById('sync-container');container.scrollTop = container.scrollHeight;");
 
         // Validate that we get the same item count after scrolling to the bottom.
         Browser.Equal(initialItemCount, GetItemCount);
-        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
 
         int GetItemCount() => Browser.FindElements(By.Id("sync-item")).Count;
     }
@@ -199,7 +202,8 @@ public void CanUseViewportAsContainer()
         Browser.ExecuteJavaScript("const element = document.getElementById('viewport-as-root'); element.scrollIntoView();");
 
         // Validate that the top spacer has a height of zero.
-        Browser.Equal(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.Equal(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
 
         Browser.ExecuteJavaScript("window.scrollTo(0, document.body.scrollHeight);");
 
@@ -208,7 +212,8 @@ public void CanUseViewportAsContainer()
         Browser.True(() => lastElement.Displayed);
 
         // Validate that the top spacer has expanded.
-        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
     }
 
     [Fact]
@@ -220,7 +225,8 @@ public async Task ToleratesIncorrectItemSize()
 
         // Wait until items have been rendered.
         Browser.True(() => GetItemCount() > 0);
-        Browser.Equal(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.Equal(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
 
         // Scroll slowly, in increments of 50px at a time. At one point this would trigger a bug
         // due to the incorrect item size, whereby it would not realise it's necessary to show more
@@ -233,7 +239,8 @@ public async Task ToleratesIncorrectItemSize()
         }
 
         // Validate that the top spacer did change
-        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetAttribute("style"));
+        Browser.NotEqual(expectedInitialSpacerStyle, () => topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
 
         int GetItemCount() => Browser.FindElements(By.ClassName("incorrect-size-item")).Count;
     }
@@ -249,7 +256,9 @@ public void CanRenderHtmlTable()
         // We can override the tag name of the spacer
         Assert.Equal("tr", topSpacer.TagName.ToLowerInvariant());
         Assert.Equal("tr", bottomSpacer.TagName.ToLowerInvariant());
-        Assert.Contains(expectedInitialSpacerStyle, topSpacer.GetAttribute("style"));
+        Assert.Contains(expectedInitialSpacerStyle, topSpacer.GetDomAttribute("style"));
+        Assert.Contains("true", topSpacer.GetDomAttribute("aria-hidden"));
+        Assert.Contains("true", bottomSpacer.GetDomAttribute("aria-hidden"));
 
         // Check scrolling document element works
         Browser.DoesNotExist(By.Id("row-999"));
@@ -258,8 +267,8 @@ public void CanRenderHtmlTable()
         Browser.True(() => lastElement.Displayed);
 
         // Validate that the top spacer has expanded, and bottom one has collapsed
-        Browser.False(() => topSpacer.GetAttribute("style").Contains(expectedInitialSpacerStyle));
-        Assert.Contains(expectedInitialSpacerStyle, bottomSpacer.GetAttribute("style"));
+        Browser.False(() => topSpacer.GetDomAttribute("style").Contains(expectedInitialSpacerStyle));
+        Assert.Contains(expectedInitialSpacerStyle, bottomSpacer.GetDomAttribute("style"));
     }
 
     [Theory]
@@ -282,14 +291,14 @@ public void CanLimitMaxItemsRendered(bool useAppContext)
         // we only render 10 items due to the MaxItemCount setting
         var scrollArea = Browser.Exists(By.Id("virtualize-scroll-area"));
         var getItems = () => scrollArea.FindElements(By.ClassName("my-item"));
-        Browser.Equal(10, () => getItems().Count);
+        Browser.Equal(16, () => getItems().Count);
         Browser.Equal("Id: 0; Name: Thing 0", () => getItems().First().Text);
 
         // Scrolling still works and loads new data, though there's no guarantee about
         // exactly how many items will show up at any one time
         Browser.ExecuteJavaScript("document.getElementById('virtualize-scroll-area').scrollTop = 300;");
         Browser.NotEqual("Id: 0; Name: Thing 0", () => getItems().First().Text);
-        Browser.True(() => getItems().Count > 3 && getItems().Count <= 10);
+        Browser.True(() => getItems().Count > 3 && getItems().Count <= 16);
     }
 
     [Fact]
@@ -564,6 +573,101 @@ public void EmptyContentRendered_Async()
         int GetPlaceholderCount() => Browser.FindElements(By.Id("async-placeholder")).Count;
     }
 
+    [Fact]
+    public void CanElevateEffectiveMaxItemCount_WhenOverscanExceedsMax()
+    {
+        Browser.MountTestComponent<VirtualizationLargeOverscan>();
+        var container = Browser.Exists(By.Id("virtualize-large-overscan"));
+        // Ensure we have an initial contiguous batch and the elevated effective max has kicked in (>= OverscanCount)
+        var indices = GetVisibleItemIndices();
+        Browser.True(() => indices.Count >= 200);
+
+        // Give focus so PageDown works
+        container.Click();
+
+        var js = (IJavaScriptExecutor)Browser;
+        var lastMaxIndex = -1;
+        var lastScrollTop = -1L;
+
+        // Check if we've reached (or effectively reached) the bottom
+        var scrollHeight = (long)js.ExecuteScript("return arguments[0].scrollHeight", container);
+        var clientHeight = (long)js.ExecuteScript("return arguments[0].clientHeight", container);
+        var scrollTop = (long)js.ExecuteScript("return arguments[0].scrollTop", container);
+        while (scrollTop + clientHeight < scrollHeight)
+        {
+            // Validate contiguity on the current page
+            Browser.True(() => IsCurrentViewContiguous(indices));
+
+            // Track progress in indices
+            var currentMax = indices.Max();
+            Assert.True(currentMax >= lastMaxIndex, $"Unexpected backward movement: previous max {lastMaxIndex}, current max {currentMax}.");
+            lastMaxIndex = currentMax;
+
+            // Send PageDown
+            container.SendKeys(Keys.PageDown);
+
+            // Wait for scrollTop to change (progress) to avoid infinite loop
+            var prevScrollTop = scrollTop;
+            Browser.True(() =>
+            {
+                var st = (long)js.ExecuteScript("return arguments[0].scrollTop", container);
+                if (st > prevScrollTop)
+                {
+                    lastScrollTop = st;
+                    return true;
+                }
+                return false;
+            });
+            scrollHeight = (long)js.ExecuteScript("return arguments[0].scrollHeight", container);
+            clientHeight = (long)js.ExecuteScript("return arguments[0].clientHeight", container);
+            scrollTop = (long)js.ExecuteScript("return arguments[0].scrollTop", container);
+        }
+
+        // Final contiguous assertion at bottom
+        Browser.True(() => IsCurrentViewContiguous());
+
+        // Helper: check visible items contiguous with no holes
+        bool IsCurrentViewContiguous(List<int> existingIndices = null)
+        {
+            var indices = existingIndices ?? GetVisibleItemIndices();
+            if (indices.Count == 0)
+            {
+                return false;
+            }
+
+            if (indices[^1] - indices[0] != indices.Count - 1)
+            {
+                return false;
+            }
+            for (var i = 1; i < indices.Count; i++)
+            {
+                if (indices[i] - indices[i - 1] != 1)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        List<int> GetVisibleItemIndices()
+        {
+            var elements = container.FindElements(By.CssSelector(".large-overscan-item"));
+            var list = new List<int>(elements.Count);
+            foreach (var el in elements)
+            {
+                var text = el.Text;
+                if (text.StartsWith("Item ", StringComparison.Ordinal))
+                {
+                    if (int.TryParse(text.AsSpan(5), NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
+                    {
+                        list.Add(value);
+                    }
+                }
+            }
+            return list;
+        }
+    }
+
     private string[] GetPeopleNames(IWebElement container)
     {
         var peopleElements = container.FindElements(By.CssSelector(".person span"));
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyConfigurationHostedTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyConfigurationHostedTest.cs
index ddc83cef68e2..4cee4903c653 100644
--- a/src/Components/test/E2ETest/Tests/WebAssemblyConfigurationHostedTest.cs
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyConfigurationHostedTest.cs
@@ -30,7 +30,7 @@ protected override void InitializeAsyncCore()
         _appElement = Browser.MountTestComponent<ConfigurationComponent>();
     }
 
-    [Fact]
+    [Fact(Skip = "We don't have a way to propagate AppEnvironment from server when using index.html fallback - https://github.com/dotnet/aspnetcore/issues/59456")]
     public void WebAssemblyConfiguration_Works()
     {
         // Verify values from the default 'appsettings.json' are read.
@@ -43,7 +43,7 @@ public void WebAssemblyConfiguration_Works()
         Assert.Equal("Prod key3-value", _appElement.FindElement(By.Id("key3")).Text);
     }
 
-    [Fact]
+    [Fact(Skip = "We don't have a way to propagate AppEnvironment from server when using index.html fallback - https://github.com/dotnet/aspnetcore/issues/59456")]
     public void WebAssemblyHostingEnvironment_Works()
     {
         // Verify values from the default 'appsettings.json' are read.
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyEnvironmentTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyEnvironmentTest.cs
new file mode 100644
index 000000000000..8a80853521cf
--- /dev/null
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyEnvironmentTest.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using GlobalizationWasmApp;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
+
+public class WebAssemblyEnvironmentTest : ServerTestBase<ToggleExecutionModeServerFixture<Program>>
+{
+    public WebAssemblyEnvironmentTest(
+        BrowserFixture browserFixture,
+        ToggleExecutionModeServerFixture<Program> serverFixture,
+        ITestOutputHelper output)
+        : base(browserFixture, serverFixture, output)
+    {
+    }
+
+    [Fact]
+    public void WebAssemblyEnvironment_Works()
+    {
+        Navigate($"{ServerPathBase}/");
+
+        // Verify that the environment gets detected as 'Staging'.
+        Browser.Equal("Staging", () => Browser.FindElement(By.Id("environment")).Text);
+    }
+}
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs
index 9d3a67d48eba..c5d3c64db2df 100644
--- a/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs
@@ -114,7 +114,7 @@ public void CanLazyLoadAssemblyWithRoutes()
         Assert.True(renderedElement.Displayed);
 
         // FocusOnNavigate runs after the lazily-loaded page and focuses the correct element
-        Browser.Equal("lazy-page", () => Browser.SwitchTo().ActiveElement().GetAttribute("id"));
+        Browser.Equal("lazy-page", () => Browser.SwitchTo().ActiveElement().GetDomAttribute("id"));
     }
 
     [Fact]
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyLocalizationTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyLocalizationTest.cs
index 2265de49da5f..0f04220d02a2 100644
--- a/src/Components/test/E2ETest/Tests/WebAssemblyLocalizationTest.cs
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyLocalizationTest.cs
@@ -35,4 +35,23 @@ public void CanSetCultureAndReadLocalizedResources(string culture, string messag
         var messageDisplay = Browser.Exists(By.Id("message-display"));
         Assert.Equal(message, messageDisplay.Text);
     }
+
+    [Theory]
+    [InlineData("en-US", "fr-FR", "Bonjour!")]
+    [InlineData("fr-FR", "en-US", "Hello!")]
+    public void CanSetCultureAndDifferentiateBetweenCurrentAndUICulture(string culture, string cultureUI, string message)
+    {
+        Navigate($"{ServerPathBase}/?culture={culture}&cultureUI={cultureUI}");
+
+        Browser.MountTestComponent<LocalizedText>();
+
+        var cultureDisplay = Browser.Exists(By.Id("culture-name-display"));
+        Assert.Equal($"Culture is: {culture}", cultureDisplay.Text);
+
+        var cultureUIDisplay = Browser.Exists(By.Id("culture-ui-display"));
+        Assert.Equal($"CultureUI is: {cultureUI}", cultureUIDisplay.Text);
+
+        var messageDisplay = Browser.Exists(By.Id("message-display"));
+        Assert.Equal(message, messageDisplay.Text);
+    }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
index a336a1090ced..d3be5f099dfa 100644
--- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
+++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -11,6 +11,9 @@
 
     <!-- Project supports more than one language -->
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TestTrimmedOrMultithreadingApps)' == 'true'">
@@ -19,8 +22,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System.ComponentModel" />
-    <Reference Include="System.Net.Http.Json" />
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <Reference Include="Microsoft.AspNetCore.Components.CustomElements" />
     <Reference Include="Microsoft.AspNetCore.Components.Authorization" />
@@ -28,7 +29,6 @@
     <Reference Include="Microsoft.AspNetCore.SignalR.Client" />
     <Reference Include="Microsoft.Extensions.Logging.Configuration" />
     <Reference Include="Newtonsoft.Json" />
-    <Reference Include="System.Private.Uri" />
   </ItemGroup>
 
   <ItemGroup>
@@ -50,10 +50,8 @@
     <ItemGroup>
       <ResolvedFileToPublish RelativePath="$([System.String]::Copy('%(ResolvedFileToPublish.RelativePath)').Replace('subdir\subdir', 'subdir').Replace('subdir/subdir', 'subdir'))" />
 
-      <ResolvedFileToPublish
-        Include="@(ResolvedFileToPublish)"
-        RelativePath="$([System.String]::Copy('%(ResolvedFileToPublish.RelativePath)').Replace('subdir\_content', '_content').Replace('subdir/subdir', '_content'))"
-        Condition="$([System.String]::Copy('%(ResolvedFileToPublish.RelativePath)').Replace('subdir\_content', 'subdir/_content').Contains('subdir/_content'))" />
+      <ResolvedFileToPublish Include="@(ResolvedFileToPublish)" RelativePath="$([System.String]::Copy('%(ResolvedFileToPublish.RelativePath)').Replace('subdir\_content', '_content').Replace('subdir/subdir', '_content'))" Condition="$([System.String]::Copy('%(ResolvedFileToPublish.RelativePath)').Replace('subdir\_content', 'subdir/_content').Contains('subdir/_content'))" />
+
     </ItemGroup>
   </Target>
 
diff --git a/src/Components/test/testassets/BasicTestApp/DotNetToJSInterop.razor b/src/Components/test/testassets/BasicTestApp/DotNetToJSInterop.razor
new file mode 100644
index 000000000000..624e8bbfb175
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/DotNetToJSInterop.razor
@@ -0,0 +1,185 @@
+@using Microsoft.JSInterop
+@inject IJSRuntime JSRuntime
+
+<script>
+    "use strict";
+
+    window.getDocumentTitle = function () {
+        return document.title;
+    }
+
+    window.setDocumentTitle = function (title) {
+        document.title = title;
+    };
+
+    window.logDefault = function () {
+        console.log("This is a default log message");
+    }
+
+    window.logMessage = function (message) {
+        console.log(message);
+    }
+
+    window.testObject = {
+        num: 10,
+        text: "Hello World",
+        log: function () {
+            console.log(this.text);
+        },
+        get getOnlyProperty() {
+            return this.num;
+        },
+        set setOnlyProperty(value) {
+            this.num = value;
+        }
+    }
+
+    window.getTestObject = function () {
+        return window.testObject;
+    }
+
+    window.Cat = class {
+        constructor(name) {
+            this.name = name;
+        }
+
+        meow() {
+            const text = `${this.name} says Meow!`;
+            console.log(text);
+            return text;
+        }
+    }
+
+    window.Dog = function (name) {
+        this.name = name;
+    }
+
+    window.Dog.prototype.bark = function () {
+        const text = `${this.name} says Woof!`;
+        console.log(text);
+        return text;
+    }
+</script>
+
+<h3>DotNetToJSInterop</h3>
+
+<div style="margin-top: 2em">
+    <button onclick="console.log('Logged from inline JS')">Log with inline JS</button>
+</div>
+
+<div style="margin-top: 2em">
+    Message: <input type="text" @bind="Message" />
+    <button @onclick="() => LogMessageWithInvoke(Message)">Log with InvokeAsync</button>
+</div>
+
+<div style="margin-top: 2em">
+    Title: <input type="text" @bind="NewTitle" />
+    <button @onclick="() => SetDocumentTitleWithInvoke(NewTitle)">Change document.title with InvokeAsync</button>
+    <button @onclick="() => SetDocumentTitleWithSetValue(NewTitle)">Change document.title with SetValueAsync</button>
+</div>
+
+<div style="margin-top: 2em">
+    <button @onclick="GetDocumentTitleWithGetValue">Get document.title</button>
+    <span>@CurrentTitle</span>
+</div>
+
+<div style="margin-top: 2em">
+    <span>@TestObjectDisplay</span> <br />
+    <button @onclick="GetObjectModelWithInvoke">Get object model with InvokeAsync</button>
+    <button @onclick="GetObjectPropertiesWithGetValue">Get individual object properties with GetValue</button>
+</div>
+
+<div style="margin-top: 2em">
+    <button @onclick="CreateInstanceByConstructorFunction">Call constructor function InvokeConstructorAsync</button>
+    <button @onclick="CreateInstanceByClassConstructor">Call class constructor with InvokeConstructorAsync</button>
+    <button @onclick="ChangeInstanceMethodWithFunctionReference">Change instance method with function reference</button>
+    <span>@InstanceMessage</span>
+</div>
+
+<div style="margin-top: 2em">
+    <button @onclick="GetInvalid">Access set-only property with GetValueAsync</button>
+    <button @onclick="SetInvalid">Access get-only property with SetValueAsync</button>
+    <span>@ErrorMessage</span>
+</div>
+
+@code {
+    private string Message { get; set; }
+    private string CurrentTitle { get; set; }
+    private string NewTitle { get; set; }
+    private string TestObjectDisplay { get; set; }
+    private string InstanceMessage { get; set; }
+    private string ErrorMessage { get; set; }
+
+    private async Task LogMessageWithInvoke(string message)
+    {
+        await JSRuntime.InvokeVoidAsync("logMessage", message);
+    }
+
+    private async Task SetDocumentTitleWithInvoke(string title)
+    {
+        await JSRuntime.InvokeVoidAsync("setDocumentTitle", title);
+    }
+
+    private async Task SetDocumentTitleWithSetValue(string title)
+    {
+        await JSRuntime.SetValueAsync("document.title", title);
+    }
+
+    private async Task GetDocumentTitleWithGetValue()
+    {
+        CurrentTitle = await JSRuntime.GetValueAsync<string>("document.title");
+    }
+
+    private async Task GetObjectModelWithInvoke()
+    {
+        var model = await JSRuntime.InvokeAsync<TestObjectModel>("getTestObject");
+        TestObjectDisplay = $"State loaded from model with Invoke: {model.Num} | {model.Text} | {model.GetOnlyProperty}";
+    }
+
+    private async Task GetObjectPropertiesWithGetValue()
+    {
+        var objectRef = await JSRuntime.InvokeAsync<IJSObjectReference>("getTestObject");
+        var numValue = await objectRef.GetValueAsync<int>("num");
+        var textValue = await objectRef.GetValueAsync<string>("text");
+        var getOnlyProperty = await objectRef.GetValueAsync<int>("getOnlyProperty");
+        TestObjectDisplay = $"State loaded from properties with GetValue: {numValue} | {textValue} | {getOnlyProperty}";
+    }
+
+    private async Task CreateInstanceByConstructorFunction()
+    {
+        var dogRef = await JSRuntime.InvokeConstructorAsync("Dog", "A dog");
+        InstanceMessage = await dogRef.InvokeAsync<string>("bark");
+    }
+
+    private async Task CreateInstanceByClassConstructor()
+    {
+        var catRef = await JSRuntime.InvokeConstructorAsync("Cat", "A cat");
+        InstanceMessage = await catRef.InvokeAsync<string>("meow");
+    }
+
+    private async Task GetInvalid(MouseEventArgs args)
+    {
+        var value = await JSRuntime.GetValueAsync<int>("testObject.setOnlyProperty");
+    }
+
+    private async Task SetInvalid(MouseEventArgs args)
+    {
+        await JSRuntime.SetValueAsync<int>("testObject.getOnlyProperty", 123);
+    }
+
+    private async Task ChangeInstanceMethodWithFunctionReference()
+    {
+        var dogRef = await JSRuntime.InvokeConstructorAsync("Dog", "A dog");
+        var dogFuncRef = await dogRef.GetValueAsync<IJSObjectReference>("bark");
+        var catRef = await JSRuntime.InvokeConstructorAsync("Cat", "A cat");
+        await catRef.SetValueAsync("meow", dogFuncRef);
+        InstanceMessage = await catRef.InvokeAsync<string>("meow");
+    }
+
+    class TestObjectModel
+    {
+        public int Num { get; set; }
+        public string Text { get; set; }
+        public int GetOnlyProperty { get; set; }
+    }
+}
diff --git a/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/ErrorBoundaryCases.razor b/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/ErrorBoundaryCases.razor
index bcc4aec249e0..6b1916019d06 100644
--- a/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/ErrorBoundaryCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/ErrorBoundaryCases.razor
@@ -70,6 +70,22 @@
     <button class="throw-in-errorcontent" @onclick="@(() => throwInErrorContent = true)">Throw in error content (causing infinite error loop)</button>
 </div>
 
+<hr/>
+<h2>Two errors in child</h2>
+<div id="multiple-errors-at-once-test">
+    @if (twoErrorsInChild) {
+        <ErrorBoundary>
+            <ChildContent>
+                <MultipleErrorsChild />
+            </ChildContent>
+            <ErrorContent>
+                <p class="error-message">@context.Message</p>
+            </ErrorContent>
+        </ErrorBoundary>
+    }
+    <button class="throw-multiple-errors" @onclick="@(() => twoErrorsInChild = true)">Throw multiple errors in child</button>
+</div>
+
 <hr />
 <h2>Errors after disposal</h2>
 <p>Long-running tasks could fail after the component has been removed from the tree. We still want these failures to be captured by the error boundary they were inside when the task began, even if that error boundary itself has also since been disposed. Otherwise, error handling would behave differently based on whether the user has navigated away while processing was in flight, which would be very unexpected and hard to handle.</p>
@@ -122,6 +138,7 @@
     private bool disposalTestRemoveErrorBoundary;
     private bool disposalTestBeginDelayedError;
     private bool multipleChildrenBeginDelayedError;
+    private bool twoErrorsInChild;
 
     void EventHandlerErrorSync()
         => throw new InvalidTimeZoneException("Synchronous error from event handler");
diff --git a/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/MultipleErrorsChild.razor b/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/MultipleErrorsChild.razor
new file mode 100644
index 000000000000..f8f4c768f4ba
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/ErrorBoundaryTest/MultipleErrorsChild.razor
@@ -0,0 +1,12 @@
+<h3>MultipleErrorsChild</h3>
+
+@{
+    throw new Exception("BuildRenderTreeError");
+}
+
+@code {
+    protected override Task OnInitializedAsync()
+    {
+        return Task.FromException(new Exception("OnInitializedAsyncError"));
+    }
+}
diff --git a/src/Components/test/testassets/BasicTestApp/EventFlagsComponent.razor b/src/Components/test/testassets/BasicTestApp/EventFlagsComponent.razor
new file mode 100644
index 000000000000..0ddba430c567
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/EventFlagsComponent.razor
@@ -0,0 +1,117 @@
+<style>
+    button:focus {
+        background-color: yellow !important;
+    }
+</style>
+
+<h1>Event flags</h1>
+
+<div>
+    <h2>Test Controls</h2>
+    <button id="toggle-prevent-default" @onclick="TogglePreventDefault">
+        Toggle preventDefault: @preventDefaultEnabled
+    </button>
+    <button id="toggle-stop-propagation" @onclick="ToggleStopPropagation">
+        Toggle stopPropagation: @stopPropagationEnabled
+    </button>
+    <button id="toggle-handlers" @onclick="ToggleEventHandlers">
+        Toggle Event Handlers: @eventHandlersEnabled
+    </button>
+</div>
+
+@if (eventHandlersEnabled)
+{
+    <h2 @onmousedown="() => { }">OnMouseDown handler present</h2>
+    <h2 @onwheel="() => { }">OnWheel handler present</h2>
+}
+else
+{
+    <h2>OnMouseDown handler not present</h2>
+    <h2>OnWheel handler not present</h2>
+}
+
+<div>
+    <h2>Test Scenarios</h2>
+
+    <div id="mousedown-scenario">
+        <h3>Scenario 1: onmousedown:preventDefault</h3>
+        <button id="mousedown-test-button" @onmousedown:preventDefault="preventDefaultEnabled">
+            Should not focus when preventDefault is enabled
+        </button>
+    </div>
+
+    <div id="stoppropagation-scenario">
+        <h3>Scenario 2: onclick:stopPropagation</h3>
+        <div @onclick="OnParentMouseDown">
+            <p>Parent container</p>
+            <button id="stop-propagation-test-button" @onclick="OnChildMouseDown"
+                @onclick:stopPropagation="stopPropagationEnabled">
+                Should not propagate the Blazor event when stopPropagation is enabled
+            </button>
+        </div>
+    </div>
+
+    <div id="wheel-scenario">
+        <h3>Scenario 3: wheel preventDefault (passive vs active)</h3>
+        <div id="wheel-test-area" @onwheel:preventDefault="preventDefaultEnabled"
+            style="width: 400px; height: 200px; border: 2px solid black; overflow-y: scroll;">
+            <p>Try scrolling with mouse wheel in this area.</p>
+            <p>If preventDefault is true, scrolling should be blocked.</p>
+            <p>If preventDefault is false, scrolling should work normally.</p>
+            <div style="height: 500px;">
+                <p>This content makes the area scrollable</p>
+                <p style="margin-top: 200px;">More</p>
+                <p style="margin-top: 200px;">More</p>
+            </div>
+        </div>
+    </div>
+</div>
+
+<pre id="event-log">@eventLog</pre>
+
+
+@code {
+    private bool preventDefaultEnabled = true;
+    private bool stopPropagationEnabled = true;
+    private bool eventHandlersEnabled = true;
+
+    private string eventLog = string.Empty;
+
+    private void TogglePreventDefault()
+    {
+        preventDefaultEnabled = !preventDefaultEnabled;
+        StateHasChanged();
+    }
+
+    private void ToggleStopPropagation()
+    {
+        stopPropagationEnabled = !stopPropagationEnabled;
+        StateHasChanged();
+    }
+
+    private void ToggleEventHandlers()
+    {
+        eventHandlersEnabled = !eventHandlersEnabled;
+        StateHasChanged();
+    }
+
+    void LogEvent(string message)
+    {
+        if (eventLog != string.Empty)
+        {
+            eventLog += Environment.NewLine;
+        }
+
+        eventLog += message;
+    }
+
+    private void OnChildMouseDown()
+    {
+        LogEvent("mousedown handler called on child");
+    }
+
+    private void OnParentMouseDown()
+    {
+        LogEvent("mousedown handler called on parent");
+    }
+}
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
index f08a419ef6f6..f21620148737 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
@@ -107,6 +107,6 @@
     public class TestServiceProvider : IServiceProvider
     {
         public object GetService(Type serviceType)
-            => throw new NotImplementedException();
+            => null;
     }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor b/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor
index 967775faa4bb..8109f027687f 100644
--- a/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor
+++ b/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor
@@ -1,6 +1,6 @@
 @inject NavigationManager navigationManager
 
-<h1>Graceful Termination</h1>
+<h1 id="graceful-termination-title">Graceful Termination</h1>
 
 <a href="mailto:test@example.com" id="mailto-link">Send Email</a>
 <a href="download" download id="download-href">Download Link</a>
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index 3ce2eb27dc95..d7df87adbeed 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -1,6 +1,8 @@
 @using Microsoft.AspNetCore.Components.Rendering
 @using System.Web
 @inject NavigationManager NavigationManager
+
+<p id="session-storage-anchor"></p>
 <div id="test-selector">
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>
@@ -36,7 +38,8 @@
         <option value="BasicTestApp.EventCustomArgsComponent">Event custom arguments</option>
         <option value="BasicTestApp.EventDisablingComponent">Event disabling</option>
         <option value="BasicTestApp.EventDuringBatchRendering">Event during batch rendering</option>
-        <option value="BasicTestApp.EventPreventDefaultComponent">Event preventDefault</option>
+        <option value="BasicTestApp.EventPreventDefaultComponent">Event preventDefault with submit</option>
+        <option value="BasicTestApp.EventFlagsComponent">Event flags (preventDefault/stopPropagation)</option>
         <option value="BasicTestApp.ExternalContentPackage">External content package</option>
         <option value="BasicTestApp.FocusEventComponent">Focus events</option>
         <option value="BasicTestApp.FormsTest.InputFocusComponent">Input Focus</option>
@@ -66,7 +69,9 @@
         <option value="BasicTestApp.HttpClientTest.HttpRequestsComponent">HttpClient tester</option>
         <option value="BasicTestApp.InputEventComponent">Input events</option>
         <option value="BasicTestApp.InteropComponent">Interop component</option>
+        <option value="BasicTestApp.InteropValueTypesComponent">Interop value types</option>
         <option value="BasicTestApp.InteropOnInitializationComponent">Interop on initialization</option>
+        <option value="BasicTestApp.DotNetToJSInterop">Dotnet to JS interop</option>
         <option value="BasicTestApp.JavaScriptRootComponents">JavaScript root components</option>
         <option value="BasicTestApp.JsonSerializationCases">JSON serialization</option>
         <option value="BasicTestApp.KeyCasesComponent">Key cases</option>
@@ -114,6 +119,7 @@
         <option value="BasicTestApp.VirtualizationMaxItemCount">Virtualization MaxItemCount</option>
         <option value="BasicTestApp.VirtualizationMaxItemCount_AppContext">Virtualization MaxItemCount (via AppContext)</option>
         <option value="BasicTestApp.VirtualizationTable">Virtualization HTML table</option>
+        <option value="BasicTestApp.VirtualizationLargeOverscan">Virtualization large overscan</option>
         <option value="BasicTestApp.HotReload.RenderOnHotReload">Render on hot reload</option>
         <option value="BasicTestApp.SectionsTest.ParentComponentWithTwoChildren">Sections test</option>
         <option value="BasicTestApp.SectionsTest.SectionsWithCascadingParameters">Sections with Cascading parameters test</option>
diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
index 6310b0e745be..3cafad7b577b 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
@@ -167,33 +167,6 @@
             ReturnValues["invokeAsyncThrowsSerializingCircularStructure"] = $"Failure: {ex.Message}";
         }
 
-        try
-        {
-            var undefinedJsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("returnUndefined");
-            ReturnValues["invokeAsyncThrowsUndefinedJSObjectReference"] = undefinedJsObjectReference is null ? "Failure: null" : "Failure: not null";
-        }
-        catch (JSException)
-        {
-            ReturnValues["invokeAsyncThrowsUndefinedJSObjectReference"] = "Success";
-        }
-        catch (Exception ex)
-        {
-            ReturnValues["invokeAsyncThrowsUndefinedJSObjectReference"] = $"Failure: {ex.Message}";
-        }
-
-        try
-        {
-            var nullJsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("returnNull");
-            ReturnValues["invokeAsyncThrowsNullJSObjectReference"] = nullJsObjectReference is null ? "Failure: null" : "Failure: not null";
-        }
-        catch (JSException)
-        {
-            ReturnValues["invokeAsyncThrowsNullJSObjectReference"] = "Success";
-        }
-        catch (Exception ex)
-        {
-            ReturnValues["invokeAsyncThrowsNullJSObjectReference"] = $"Failure: {ex.Message}";
-        }
 
         var jsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("returnJSObjectReference");
         ReturnValues["jsObjectReference.identity"] = await jsObjectReference.InvokeAsync<string>("identity", "Invoked from JSObjectReference");
@@ -280,6 +253,41 @@
         var dotNetStreamReferenceWrapper = DotNetStreamReferenceInterop.GetDotNetStreamWrapperReference();
         ReturnValues["dotNetToJSReceiveDotNetStreamWrapperReferenceAsync"] = await JSRuntime.InvokeAsync<string>("jsInteropTests.receiveDotNetStreamWrapperReference", dotNetStreamReferenceWrapper);
 
+        await GetValueAsyncTests();
+
+        if (shouldSupportSyncInterop)
+        {
+            GetValueSyncTests();
+        }
+
+        await SetValueAsyncTests();
+
+        if (shouldSupportSyncInterop)
+        {
+            SetValueTests();
+        }
+
+        await InvokeConstructorAsyncTests();
+
+        if (shouldSupportSyncInterop)
+        {
+            InvokeConstructorTests();
+        }
+
+        await FunctionReferenceAsyncTests();
+
+        if (shouldSupportSyncInterop)
+        {
+            FunctionReferenceTests();
+        }
+
+        await JSObjectReferenceAsyncTests();
+
+        if (shouldSupportSyncInterop)
+        {
+            JSObjectReferenceTests();
+        }
+
         Invocations = invocations;
         DoneWithInterop = true;
     }
@@ -366,47 +374,325 @@
             ReturnValues["invokeThrowsSerializingCircularStructure"] = $"Failure: {ex.Message}";
         }
 
+        var jsInProcObjectReference = inProcRuntime.Invoke<IJSInProcessObjectReference>("returnJSObjectReference");
+        ReturnValues["jsInProcessObjectReference.identity"] = jsInProcObjectReference.Invoke<string>("identity", "Invoked from JSInProcessObjectReference");
+
         try
         {
-            var undefinedJsObjectReference = inProcRuntime.Invoke<IJSObjectReference>("returnUndefined");
-            ReturnValues["invokeThrowsUndefinedJSObjectReference"] = undefinedJsObjectReference is null ? "Failure: null" : "Failure: not null";
+            // Fetch a non-serializable Window (https://developer.mozilla.org/en-US/docs/Web/API/Window)
+            // InvokeVoid shouldn't serialize return values, and thus there shouldn't be any exception thrown.
+            jsInProcObjectReference.InvokeVoid("getWindow");
+            ReturnValues["invokeVoidReturnsWithoutSerializingInIJSInProcessObjectReference"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeVoidReturnsWithoutSerializingInIJSInProcessObjectReference"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private async Task GetValueAsyncTests()
+    {
+        ReturnValues["getValueFromDataPropertyAsync"] = (await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.num")).ToString();
+        ReturnValues["getValueFromGetterAsync"] = (await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.getOnlyProperty")).ToString();
+
+        try
+        {
+            var _ = await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.setOnlyProperty");
         }
         catch (JSException)
         {
-            ReturnValues["invokeThrowsUndefinedJSObjectReference"] = "Success";
+            ReturnValues["getValueFromSetterAsync"] = "Success";
         }
         catch (Exception ex)
         {
-            ReturnValues["invokeThrowsUndefinedJSObjectReference"] = $"Failure: {ex.Message}";
+            ReturnValues["getValueFromSetterAsync"] = $"Failure: {ex.Message}";
         }
 
         try
         {
-            var nullJsObjectReference = inProcRuntime.Invoke<IJSObjectReference>("returnNull");
-            ReturnValues["invokeThrowsNullJSObjectReference"] = nullJsObjectReference is null ? "Failure: null" : "Failure: not null";
+            var _ = await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.undefinedProperty");
         }
         catch (JSException)
         {
-            ReturnValues["invokeThrowsNullJSObjectReference"] = "Success";
+            ReturnValues["getValueFromUndefinedPropertyAsync"] = "Success";
         }
         catch (Exception ex)
         {
-            ReturnValues["invokeThrowsNullJSObjectReference"] = $"Failure: {ex.Message}";
+            ReturnValues["getValueFromUndefinedPropertyAsync"] = $"Failure: {ex.Message}";
         }
+    }
 
-        var jsInProcObjectReference = inProcRuntime.Invoke<IJSInProcessObjectReference>("returnJSObjectReference");
-        ReturnValues["jsInProcessObjectReference.identity"] = jsInProcObjectReference.Invoke<string>("identity", "Invoked from JSInProcessObjectReference");
+    private void GetValueSyncTests()
+    {
+        var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);
+
+        ReturnValues["getValueFromDataProperty"] = inProcRuntime.GetValue<int>("jsInteropTests.testObject.num").ToString();
+        ReturnValues["getValueFromGetter"] = inProcRuntime.GetValue<int>("jsInteropTests.testObject.getOnlyProperty").ToString();
 
         try
         {
-            // Fetch a non-serializable Window (https://developer.mozilla.org/en-US/docs/Web/API/Window)
-            // InvokeVoid shouldn't serialize return values, and thus there shouldn't be any exception thrown.
-            jsInProcObjectReference.InvokeVoid("getWindow");
-            ReturnValues["invokeVoidReturnsWithoutSerializingInIJSInProcessObjectReference"] = "Success";
+            var _ = inProcRuntime.GetValue<int>("jsInteropTests.testObject.setOnlyProperty");
+        }
+        catch (JSException)
+        {
+            ReturnValues["getValueFromSetter"] = "Success";
         }
         catch (Exception ex)
         {
-            ReturnValues["invokeVoidReturnsWithoutSerializingInIJSInProcessObjectReference"] = $"Failure: {ex.Message}";
+            ReturnValues["getValueFromSetter"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+            var _ = inProcRuntime.GetValue<int>("jsInteropTests.testObject.undefinedProperty");
+        }
+        catch (JSException)
+        {
+            ReturnValues["getValueFromUndefinedProperty"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["getValueFromUndefinedProperty"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private async Task SetValueAsyncTests()
+    {
+        ReturnValues["getValueFromGetterAsync"] = (await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.getOnlyProperty")).ToString();
+
+        await JSRuntime.SetValueAsync("jsInteropTests.testObject.num", 30);
+        ReturnValues["setValueToDataPropertyAsync"] = (await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.num")).ToString();
+
+        await JSRuntime.SetValueAsync("jsInteropTests.testObject.setOnlyProperty", 40);
+        ReturnValues["setValueToSetterAsync"] = (await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.num")).ToString();
+
+        await JSRuntime.SetValueAsync("jsInteropTests.testObject.newProperty", 50);
+        ReturnValues["setValueToUndefinedPropertyAsync"] = (await JSRuntime.GetValueAsync<int>("jsInteropTests.testObject.newProperty")).ToString();
+
+        try
+        {
+            await JSRuntime.SetValueAsync("jsInteropTests.testObject.getOnlyProperty", 50);
+        }
+        catch (JSException)
+        {
+            ReturnValues["setValueToGetterAsync"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["setValueToGetterAsync"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private void SetValueTests()
+    {
+        var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);
+
+        ReturnValues["getValueFromGetter"] = inProcRuntime.GetValue<int>("jsInteropTests.testObject.getOnlyProperty").ToString();
+
+        inProcRuntime.SetValue("jsInteropTests.testObject.num", 30);
+        ReturnValues["setValueToDataProperty"] = inProcRuntime.GetValue<int>("jsInteropTests.testObject.num").ToString();
+
+        inProcRuntime.SetValue("jsInteropTests.testObject.setOnlyProperty", 40);
+        ReturnValues["setValueToSetter"] = inProcRuntime.GetValue<int>("jsInteropTests.testObject.num").ToString();
+
+        inProcRuntime.SetValue("jsInteropTests.testObject.newProperty", 50);
+        ReturnValues["setValueToUndefinedProperty"] = inProcRuntime.GetValue<int>("jsInteropTests.testObject.newProperty").ToString();
+
+        try
+        {
+            inProcRuntime.SetValue("jsInteropTests.testObject.getOnlyProperty", 60);
+        }
+        catch (JSException)
+        {
+            ReturnValues["setValueToGetter"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["setValueToGetter"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private async Task InvokeConstructorAsyncTests()
+    {
+        var testClassRef = await JSRuntime.InvokeConstructorAsync("jsInteropTests.TestClass", "abraka");
+
+        ReturnValues["invokeConstructorWithClassConstructorAsync"] = testClassRef is IJSObjectReference ? "Success" : "Failure";
+        ReturnValues["invokeConstructorWithClassConstructorAsync.dataProperty"] = await testClassRef.GetValueAsync<string>("text");
+        ReturnValues["invokeConstructorWithClassConstructorAsync.function"] = (await testClassRef.InvokeAsync<int>("getTextLength")).ToString();
+
+        try
+        {
+            var nonConstructorRef = await JSRuntime.InvokeConstructorAsync("jsInteropTests.nonConstructorFunction");
+            ReturnValues["invokeConstructorWithNonConstructorAsync"] = nonConstructorRef is null ? "Failure: null" : "Failure: not null";
+        }
+        catch (JSException)
+        {
+            ReturnValues["invokeConstructorWithNonConstructorAsync"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeConstructorWithNonConstructorAsync"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private void InvokeConstructorTests()
+    {
+        var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);
+
+        var testClassRef = inProcRuntime.InvokeConstructor("jsInteropTests.TestClass", "abraka");
+
+        ReturnValues["invokeConstructorWithClassConstructor"] = testClassRef is IJSInProcessObjectReference ? "Success" : "Failure";
+        ReturnValues["invokeConstructorWithClassConstructor.dataProperty"] = testClassRef.GetValue<string>("text");
+        ReturnValues["invokeConstructorWithClassConstructor.function"] = testClassRef.Invoke<int>("getTextLength").ToString();
+
+        try
+        {
+            var nonConstructorRef = inProcRuntime.InvokeConstructor("jsInteropTests.nonConstructorFunction");
+            ReturnValues["invokeConstructorWithNonConstructor"] = nonConstructorRef is null ? "Failure: null" : "Failure: not null";
+        }
+        catch (JSException)
+        {
+            ReturnValues["invokeConstructorWithNonConstructor"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeConstructorWithNonConstructor"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private async Task FunctionReferenceAsyncTests()
+    {
+        var funcRef = await JSRuntime.GetValueAsync<IJSObjectReference>("jsInteropTests.nonConstructorFunction");
+        var testClassRef = await JSRuntime.InvokeConstructorAsync("jsInteropTests.TestClass", "abraka");
+        await testClassRef.SetValueAsync("getTextLength", funcRef);
+        ReturnValues["changeFunctionViaObjectReferenceAsync"] = (await testClassRef.InvokeAsync<int>("getTextLength")).ToString();
+    }
+
+    private void FunctionReferenceTests()
+    {
+        var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);
+
+        var funcRef = inProcRuntime.GetValue<IJSObjectReference>("jsInteropTests.nonConstructorFunction");
+        var testClassRef = inProcRuntime.InvokeConstructor("jsInteropTests.TestClass", "abraka");
+        testClassRef.SetValue("getTextLength", funcRef);
+        ReturnValues["changeFunctionViaObjectReference"] = testClassRef.Invoke<int>("getTextLength").ToString();
+    }
+
+    private async Task JSObjectReferenceAsyncTests()
+    {
+        try
+        {
+            var undefinedJsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("jsInteropTests.returnUndefined");
+            ReturnValues["invokeAsyncUndefinedJSObjectReference"] = undefinedJsObjectReference is null ? "Success" : $"Failure: not null (type: {undefinedJsObjectReference.GetType().FullName})";
+        }
+        catch (JSException ex)
+        {
+            ReturnValues["invokeAsyncUndefinedJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeAsyncUndefinedJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+            var nullJsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("jsInteropTests.returnNull");
+            ReturnValues["invokeAsyncNullJSObjectReference"] = nullJsObjectReference is null ? "Success" : $"Failure: not null (type: {nullJsObjectReference.GetType().FullName})";
+        }
+        catch (JSException ex)
+        {
+            ReturnValues["invokeAsyncNullJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeAsyncNullJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+            var nullVariableJsObjectReference = await JSRuntime.GetValueAsync<IJSObjectReference>("jsInteropTests.testObject.nullProperty");
+            ReturnValues["invokeAsyncNullFromVariableJSObjectReference"] = nullVariableJsObjectReference is null ? "Success" : $"Failure: not null (type: {nullVariableJsObjectReference.GetType().FullName})";
+        }
+        catch (JSException ex)
+        {
+            ReturnValues["invokeAsyncNullFromVariableJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeAsyncNullFromVariableJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+        await JSRuntime.GetValueAsync<IJSObjectReference>("nonexistend");
+        }
+        catch (JSException)
+        {
+            ReturnValues["invokeAsyncNonExistentJSObjectReference"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeAsyncNonExistentJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+    }
+
+    private void JSObjectReferenceTests()
+    {
+        var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);
+        
+        try
+        {
+            var undefinedJsObjectReference = inProcRuntime.Invoke<IJSObjectReference>("returnUndefined");
+            ReturnValues["invokeUndefinedJSObjectReference"] = undefinedJsObjectReference is null ? "Success" : $"Failure: not null (type: {undefinedJsObjectReference.GetType().FullName})";
+        }
+        catch (JSException ex)
+        {
+            ReturnValues["invokeUndefinedJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeUndefinedJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+            var nullJsObjectReference = inProcRuntime.Invoke<IJSObjectReference>("returnNull");
+            ReturnValues["invokeNullJSObjectReference"] = nullJsObjectReference is null ? "Success" : $"Failure: not null (type: {nullJsObjectReference.GetType().FullName})";
+        }
+        catch (JSException ex)
+        {
+            ReturnValues["invokeNullJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeNullJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+            var nullVariableJsObjectReference = inProcRuntime.GetValue<IJSObjectReference>("jsInteropTests.testObject.nullProperty");
+            ReturnValues["invokeNullFromVariableJSObjectReference"] = nullVariableJsObjectReference is null ? "Success" : $"Failure: not null (type: {nullVariableJsObjectReference.GetType().FullName})";
+        }
+        catch (JSException ex)
+        {
+            ReturnValues["invokeNullFromVariableJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeNullFromVariableJSObjectReference"] = $"Failure: {ex.Message}";
+        }
+
+        try
+        {
+            inProcRuntime.GetValue<IJSObjectReference>("nonexistend");
+        }
+        catch (JSException)
+        {
+            ReturnValues["invokeNonExistentJSObjectReference"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["invokeNonExistentJSObjectReference"] = $"Failure: {ex.Message}";
         }
     }
 
diff --git a/src/Components/test/testassets/BasicTestApp/InteropValueTypesComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropValueTypesComponent.razor
new file mode 100644
index 000000000000..21172b4dac4a
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/InteropValueTypesComponent.razor
@@ -0,0 +1,69 @@
+@using Microsoft.JSInterop
+@inject IJSRuntime JSRuntime
+
+<button id="btn-interop" @onclick="InvokeInteropAsync">Invoke interop!</button>
+
+<p>
+    This component shows it's possible to save and load value types (in this case, a guid)
+    to and from localstorage,
+    and also that a null value can be loaded into a nullable value type, i.e. a Guid?.
+</p>
+
+<p>
+    String value from guid:
+    <strong id="string-get-by-interop">@(StringFromInterop ?? "No value yet")</strong>
+</p>
+
+<p>
+    Guid value from guid is default(Guid) if it wasn't loaded correctly:
+    <strong id="guid-get-by-interop">@GuidFromInterop</strong>
+</p>
+
+<p>
+    Nullable Guid value from guid is null if it wasn't loaded correctly:
+    <strong id="nullable-guid-get-by-interop">@NullableGuidFromInterop</strong>
+</p>
+
+<p>
+    Nullable load result is false if the null value wasn't loaded into the nullable guid correctly:
+    <strong id="null-loaded-into-nullable">@NullableLoadResult</strong>
+</p>
+
+@if (DoneWithInterop)
+{
+    <p id="done-with-interop">
+        Done with interop!
+    </p>
+}
+
+@code {
+    public Guid Guid { get; } = Guid.NewGuid();
+    public string StringFromInterop { get; set; }
+    public Guid GuidFromInterop { get; set; }
+    public Guid? NullableGuidFromInterop { get; set; }
+    public bool NullableLoadResult { get; set; }
+    public bool DoneWithInterop { get; set; }
+
+    private async Task InvokeInteropAsync()
+    {
+        // Store guid in localStorage
+        await JSRuntime.InvokeVoidAsync("localStorage.setItem", "guid", Guid);
+
+        // Retrieve guid from localStorage as string because it's a simple conversion
+        StringFromInterop = await JSRuntime.InvokeAsync<string>("localStorage.getItem", "guid");
+
+        // Retrieve guid from localStorage as Guid
+        GuidFromInterop = await JSRuntime.InvokeAsync<Guid>("localStorage.getItem", "guid");
+
+        // Retrieve guid from localStorage as Guid?
+        NullableGuidFromInterop = await JSRuntime.InvokeAsync<Guid?>("localStorage.getItem", "guid");
+
+        // Retrieve null from localStorage as Guid?
+        var nullableGuid = await JSRuntime.InvokeAsync<Guid?>("localStorage.getItem", "nothingHere");
+
+        // If the retrieval crashes, the bool stays false
+        NullableLoadResult = !nullableGuid.HasValue;
+
+        DoneWithInterop = true;
+    }
+}
diff --git a/src/Components/test/testassets/BasicTestApp/LocalizedText.razor b/src/Components/test/testassets/BasicTestApp/LocalizedText.razor
index a86579e3c975..79ac237568b7 100644
--- a/src/Components/test/testassets/BasicTestApp/LocalizedText.razor
+++ b/src/Components/test/testassets/BasicTestApp/LocalizedText.razor
@@ -1,2 +1,3 @@
 <h3 id="culture-name-display">Culture is: @System.Globalization.CultureInfo.CurrentCulture.Name</h3>
+<h3 id="culture-ui-display">CultureUI is: @System.Globalization.CultureInfo.CurrentUICulture.Name</h3>
 <p id="message-display">@Resources.Message</p>
diff --git a/src/Components/test/testassets/BasicTestApp/Program.cs b/src/Components/test/testassets/BasicTestApp/Program.cs
index 4b147896e621..0332b3915c88 100644
--- a/src/Components/test/testassets/BasicTestApp/Program.cs
+++ b/src/Components/test/testassets/BasicTestApp/Program.cs
@@ -23,6 +23,9 @@ public static async Task Main(string[] args)
         await SimulateErrorsIfNeededForTest();
 
         var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
+        builder.Services.AddValidation();
+
         builder.RootComponents.Add<HeadOutlet>("head::after");
         builder.RootComponents.Add<Index>("root");
         builder.RootComponents.RegisterForJavaScript<DynamicallyAddedRootComponent>("my-dynamic-root-component");
@@ -60,6 +63,7 @@ private static void ConfigureCulture(WebAssemblyHost host)
     {
         // In the absence of a specified value, we want the culture to be en-US so that the tests for bind can work consistently.
         var culture = new CultureInfo("en-US");
+        var cultureUI = new CultureInfo("en-US");
 
         Uri uri = null;
         try
@@ -74,12 +78,18 @@ private static void ConfigureCulture(WebAssemblyHost host)
         if (uri != null && HttpUtility.ParseQueryString(uri.Query)["culture"] is string cultureName)
         {
             culture = new CultureInfo(cultureName);
+            cultureUI = culture; // Default to the same culture for UI if not specified
+        }
+
+        if (uri != null && HttpUtility.ParseQueryString(uri.Query)["cultureUI"] is string cultureUIName)
+        {
+            cultureUI = new CultureInfo(cultureUIName);
         }
 
         // CultureInfo.CurrentCulture is async-scoped and will not affect the culture in sibling scopes.
         // Use CultureInfo.DefaultThreadCurrentCulture instead to modify the application's default scope.
         CultureInfo.DefaultThreadCurrentCulture = culture;
-        CultureInfo.DefaultThreadCurrentUICulture = culture;
+        CultureInfo.DefaultThreadCurrentUICulture = cultureUI;
     }
 
     // Supports E2E tests in StartupErrorNotificationTest
diff --git a/src/Components/test/testassets/BasicTestApp/QuickGridTest/SampleQuickGridComponent.razor b/src/Components/test/testassets/BasicTestApp/QuickGridTest/SampleQuickGridComponent.razor
index ad76551bae3b..8de3631566f6 100644
--- a/src/Components/test/testassets/BasicTestApp/QuickGridTest/SampleQuickGridComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/QuickGridTest/SampleQuickGridComponent.razor
@@ -3,30 +3,34 @@
 <h3>Sample QuickGrid Component</h3>
 
 <div id="grid">
-    <QuickGrid Items="@FilteredPeople" Pagination="@pagination" custom-attrib="somevalue" class="custom-class-attrib">
+    <QuickGrid @ref="@quickGridRef" Items="@FilteredPeople" Pagination="@pagination" RowClass="HighlightJulie" custom-attrib="somevalue" class="custom-class-attrib">
         <PropertyColumn Property="@(p => p.PersonId)" Sortable="true" />
-        <PropertyColumn Property="@(p => p.firstName)" Sortable="true">
-                <ColumnOptions>
-                    <div class="search-box">
-                        <input type="search" autofocus @bind="firstNameFilter" @bind:event="oninput" placeholder="First name..." />
-                    </div>
-                </ColumnOptions>
-         </PropertyColumn>
-        <PropertyColumn Property="@(p => p.lastName)" Sortable="true" />
-        <PropertyColumn Property="@(p => p.BirthDate)" Format="yyyy-MM-dd" Sortable="true" />
-        <PropertyColumn Title="Age in years" Property="@(p => ComputeAge(p.BirthDate))" Sortable="true"/>
+        <PropertyColumn Property="@(p => p.FirstName)" Sortable="true">
+            <ColumnOptions>
+                <div class="search-box">
+                    <input type="search" autofocus @bind="firstNameFilter" @bind:event="oninput" placeholder="First name..." />
+                </div>
+                <button type="button" id="close-column-options" @onclick="@(() => quickGridRef.HideColumnOptionsAsync())">Close Column Options</button>
+            </ColumnOptions>
+        </PropertyColumn>
+        <PropertyColumn Property="@(p => p.LastName)" Sortable="true" />
+        <PropertyColumn Property="@(p => p.BirthDate)" Format="yyyy-MM-dd" Sortable="true" Align="Align.Center" />
+        <PropertyColumn Title="Age in years" Property="@(p => ComputeAge(p.BirthDate))" Sortable="true" Align="Align.Right"/>
     </QuickGrid>
 </div>
 <Paginator State="@pagination" />
 
 @code {
-    record Person(int PersonId, string firstName, string lastName, DateOnly BirthDate);
+    record Person(int PersonId, string FirstName, string LastName, DateOnly BirthDate);
     PaginationState pagination = new PaginationState { ItemsPerPage = 10 };
     string firstNameFilter;
+    QuickGrid<Person> quickGridRef;
 
     int ComputeAge(DateOnly birthDate)
         => DateTime.Now.Year - birthDate.Year - (birthDate.DayOfYear < DateTime.Now.DayOfYear ? 0 : 1);
 
+    string HighlightJulie(Person person) => person.FirstName == "Julie" ? "highlight" : null;
+
     IQueryable<Person> FilteredPeople
     {
         get
@@ -35,7 +39,7 @@
 
             if (!string.IsNullOrEmpty(firstNameFilter))
             {
-                result = result.Where(p => p.firstName.Contains(firstNameFilter, StringComparison.CurrentCultureIgnoreCase));
+                result = result.Where(p => p.FirstName.Contains(firstNameFilter, StringComparison.CurrentCultureIgnoreCase));
             }
 
             return result;
diff --git a/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor b/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor
index ec5f659fa20b..2a113db37bb4 100644
--- a/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor
@@ -1,4 +1,6 @@
 @using System.Timers
+@using System.Web
+@inject NavigationManager Navigation
 @implements IDisposable
 <h3>Reconnection Component</h3>
 
@@ -20,16 +22,49 @@
 
     <button id="cause-error" @onclick="CauseError">Cause error</button>
 </div>
+
+@if (useCustomReconnectModal)
+{
+    // We set stricter CSP for styles as we want to check that the application is CSP compliant
+    // when using a custom reconnect modal.
+    // (We know that it is not compliant with the JS-created default reconnect UI.)
+    <HeadContent>
+        <meta http-equiv="Content-Security-Policy" content="style-src 'self';">
+    </HeadContent>
+
+    <dialog id="components-reconnect-modal">
+        Rejoining the server...
+    </dialog>
+
+    <script>
+        const reconnectModal = document.getElementById("components-reconnect-modal");
+        reconnectModal.addEventListener("components-reconnect-state-changed", handleReconnectStateChanged);
+
+        function handleReconnectStateChanged(event) {
+            if (event.detail.state === "show") {
+                reconnectModal.showModal();
+            } else if (event.detail.state === "hide") {
+                reconnectModal.close();
+            }
+        }
+    </script>
+}
+
 @code {
     int count;
     void Increment() => count++;
     int tickCount = 0;
     Timer timer;
     bool causeError = false;
+    bool useCustomReconnectModal = false;
 
-    protected override  void OnInitialized()
+    protected override void OnInitialized()
     {
         timer = StartTimer();
+
+        var uri = Navigation.ToAbsoluteUri(Navigation.Uri);
+        var query = HttpUtility.ParseQueryString(uri.Query);
+        useCustomReconnectModal = query["useCustomReconnectModal"] == "true";
     }
 
     private Timer StartTimer()
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/LayoutOverridden.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/LayoutOverridden.razor
new file mode 100644
index 000000000000..47d9c16d1c7a
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/LayoutOverridden.razor
@@ -0,0 +1,4 @@
+@page "/layout-overridden"
+@page "/layout-overridden/for-hash"
+@layout RouterTestLayoutNavLinksOverridden
+<div id="test-info">This is the page with overridden layout.</div>
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/LinksOverridden.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/LinksOverridden.razor
new file mode 100644
index 000000000000..447d90c8b9f3
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/LinksOverridden.razor
@@ -0,0 +1,18 @@
+@using Microsoft.AspNetCore.Components.Routing
+<style type="text/css">
+    a.active {
+        background-color: yellow;
+        font-weight: bold;
+    }
+</style>
+<ul>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden/" Match=NavLinkMatch.All>Override layout (matches all)</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden" Match=NavLinkMatch.All>Override layout, no trailing slash (matches all)</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden/?abc=123">Override layout with query</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden?abc=123">Override layout with query, no trailing slash</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden/#blah">Override layout with hash</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden#blah">Override layout with hash, no trailing slash</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden/Default.html">Override layout with extension</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/layout-overridden/Other">Override Other</NavLinkNotIgnoreQueryOrFragmentString></li>
+    <li><NavLinkNotIgnoreQueryOrFragmentString href="/subdir/Other" Match=NavLinkMatch.All>Override Other with base-relative URL (matches all)</NavLinkNotIgnoreQueryOrFragmentString></li>
+</ul>
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/NavLinkNotIgnoreQueryOrFragmentString.cs b/src/Components/test/testassets/BasicTestApp/RouterTest/NavLinkNotIgnoreQueryOrFragmentString.cs
new file mode 100644
index 000000000000..e384e24b23e7
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/NavLinkNotIgnoreQueryOrFragmentString.cs
@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
+
+public class NavLinkNotIgnoreQueryOrFragmentString : NavLink
+{
+    string hrefAbsolute;
+    NavigationManager _navigationManager;
+
+    public NavLinkNotIgnoreQueryOrFragmentString(NavigationManager navigationManager)
+    {
+        _navigationManager = navigationManager;
+    }
+
+    protected override void OnInitialized()
+    {
+        string href = "";
+        if (AdditionalAttributes != null && AdditionalAttributes.TryGetValue("href", out var obj))
+        {
+            href = Convert.ToString(obj, CultureInfo.InvariantCulture) ?? "";
+        }
+        hrefAbsolute = _navigationManager.ToAbsoluteUri(href).AbsoluteUri;
+        base.OnInitialized();
+    }
+    protected override bool ShouldMatch(string currentUriAbsolute)
+    {
+        bool baseMatch = base.ShouldMatch(currentUriAbsolute);
+        if (!baseMatch || string.IsNullOrEmpty(hrefAbsolute) || Match != NavLinkMatch.All)
+        {
+            return baseMatch;
+        }
+
+        if (NormalizeUri(hrefAbsolute) == NormalizeUri(currentUriAbsolute))
+        {
+            return true;
+        }
+        return false;
+    }
+
+    private static string NormalizeUri(string uri) =>
+        uri.EndsWith('/') ? uri.TrimEnd('/') : uri;
+}
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/ProgrammaticNavigationCases.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/ProgrammaticNavigationCases.razor
index 3c86f3d33929..c97ba8371759 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/ProgrammaticNavigationCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/ProgrammaticNavigationCases.razor
@@ -3,6 +3,22 @@
 
 <div id="test-info">This page has test cases for programmatic navigation.</div>
 
+<style>
+.sticky-top {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 0;
+    z-index: 1020;
+    background-color: white;
+}
+</style>
+
+<div class="sticky-top">
+    <button id="do-self-navigate" @onclick="SelfNavigate">Navigate to Self</button>
+    <button id="do-self-navigate-with-query" @onclick="SelfNavigateWithQuery">Navigate to Self With Query</button>
+    <button id="do-self-navigate-to-fragment" @onclick="SelfNavigateWithFragment">Navigate to Self with Fragment</button>
+</div>
+
 <button id="do-other-navigation" @onclick="@(() => NavigationManager.NavigateTo("Other", new NavigationOptions()))">
     Programmatic navigation (NavigationOptions overload)
 </button>
@@ -34,3 +50,46 @@
 <button id="do-other-navigation-state-replacehistoryentry" @onclick="@(() => NavigationManager.NavigateTo("Other", new NavigationOptions { HistoryEntryState = "state", ReplaceHistoryEntry = true }))">
     Programmatic navigation (NavigationOptions overload) with replace and state
 </button>
+
+<div>
+    @foreach (var i in Enumerable.Range(0, 200))
+    {
+        <p>before fragment: @i</p>
+    }
+
+    <div id="fragment">
+        Middle section
+    </div>
+
+    @foreach (var i in Enumerable.Range(0, 200))
+    {
+        <p>after fragment: @i</p>
+    }
+</div>
+
+@code
+{
+    private void SelfNavigate()
+    {
+        NavigationManager.NavigateTo(NavigationManager.Uri.ToString(), false);
+    }
+
+    private void SelfNavigateWithQuery()
+    {
+        var newUri = new UriBuilder(NavigationManager.Uri)
+        {
+            Query = $"random={Random.Shared.Next()}"
+        };
+        NavigationManager.NavigateTo(newUri.ToString(), false);
+    }
+
+    private void SelfNavigateWithFragment()
+    {
+        var newUri = new UriBuilder(NavigationManager.Uri)
+        {
+            Fragment = "fragment"
+        };
+        NavigationManager.NavigateTo(newUri.ToString(), false);
+    }
+
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTestLayoutNavLinksOverridden.razor b/src/Components/test/testassets/BasicTestApp/RouterTestLayoutNavLinksOverridden.razor
new file mode 100644
index 000000000000..ff0c57ec65a9
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/RouterTestLayoutNavLinksOverridden.razor
@@ -0,0 +1,6 @@
+@using Microsoft.AspNetCore.Components
+@inherits LayoutComponentBase
+
+@Body
+
+<BasicTestApp.RouterTest.LinksOverridden />
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor b/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor
index 6edb00c7c309..a7ebeb3ee878 100644
--- a/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor
+++ b/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor
@@ -40,7 +40,7 @@
             </SectionContent>
         </ChildContent>
         <ErrorContent>
-            <p>Sorry!</p>
+            <p id="error-content">Sorry!</p>
         </ErrorContent>
     </ErrorBoundary>
 }
diff --git a/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor b/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor
index 0000841c1322..840c6f9f4852 100644
--- a/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor
+++ b/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor
@@ -1,4 +1,4 @@
-<p>@Text @AdditionalText</p>
+<p id="text-component">@Text @AdditionalText</p>
 
 @code {
     [Parameter]
diff --git a/src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor b/src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor
new file mode 100644
index 000000000000..3beb29cf87c2
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor
@@ -0,0 +1,12 @@
+@* Test component to validate behavior when OverscanCount greatly exceeds MaxItemCount. *@
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+
+<div id="virtualize-large-overscan" style="height: 600px; overflow-y: auto; outline: 1px solid #999; background:#f8f8f8;">
+    <Virtualize Items="_items" ItemSize="30" MaxItemCount="100" OverscanCount="200">
+        <div class="large-overscan-item" @key="context" style="height:30px; line-height:30px; border-bottom:1px solid #ddd;">Item @context</div>
+    </Virtualize>
+</div>
+
+@code {
+    private IList<int> _items = Enumerable.Range(0, 5000).ToList();
+}
diff --git a/src/Components/test/testassets/BasicTestApp/wwwroot/JSInitializers/ClassicAndModern/BasicTestApp.lib.module.js b/src/Components/test/testassets/BasicTestApp/wwwroot/JSInitializers/ClassicAndModern/BasicTestApp.lib.module.js
index 26c0b20b0185..7fc1b019bb84 100644
--- a/src/Components/test/testassets/BasicTestApp/wwwroot/JSInitializers/ClassicAndModern/BasicTestApp.lib.module.js
+++ b/src/Components/test/testassets/BasicTestApp/wwwroot/JSInitializers/ClassicAndModern/BasicTestApp.lib.module.js
@@ -36,6 +36,7 @@ export function afterServerStarted() {
     appendElement('classic-and-modern-after-server-started', 'Classic and modern "afterServerStarted"');
 }
 
+// Duplicated in Components.TestServer\wwwroot\Components.TestServer.lib.module.js
 function appendElement(id, text) {
     var content = document.getElementById('initializers-content');
     if (!content) {
diff --git a/src/Components/test/testassets/BasicTestApp/wwwroot/js/jsinteroptests.js b/src/Components/test/testassets/BasicTestApp/wwwroot/js/jsinteroptests.js
index dac70d67e6ec..3faee4235ecb 100644
--- a/src/Components/test/testassets/BasicTestApp/wwwroot/js/jsinteroptests.js
+++ b/src/Components/test/testassets/BasicTestApp/wwwroot/js/jsinteroptests.js
@@ -217,6 +217,27 @@ function createArgumentList(argumentNumber, dotNetObjectByRef) {
   return array;
 }
 
+class TestClass {
+    constructor(text) {
+        this.text = text;
+    }
+
+    getTextLength() {
+        return this.text.length;
+    }
+}
+
+const testObject = {
+    num: 10,
+    get getOnlyProperty() {
+        return 20;
+    },
+    set setOnlyProperty(value) {
+        this.num = value;
+    },
+    nullProperty: null
+}
+
 window.jsInteropTests = {
   invokeDotNetInteropMethodsAsync: invokeDotNetInteropMethodsAsync,
   collectInteropResults: collectInteropResults,
@@ -233,6 +254,9 @@ window.jsInteropTests = {
   receiveDotNetObjectByRefAsync: receiveDotNetObjectByRefAsync,
   receiveDotNetStreamReference: receiveDotNetStreamReference,
   receiveDotNetStreamWrapperReference: receiveDotNetStreamWrapperReference,
+  TestClass: TestClass,
+  nonConstructorFunction: () => { return 42; },
+  testObject: testObject,
 };
 
 function returnUndefined() {
diff --git a/src/Components/test/testassets/Components.TestServer/.gitignore b/src/Components/test/testassets/Components.TestServer/.gitignore
deleted file mode 100644
index 5aa0a61168bd..000000000000
--- a/src/Components/test/testassets/Components.TestServer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-wwwroot/**/*
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.TestServer/BlazorWebServerStartup.cs b/src/Components/test/testassets/Components.TestServer/BlazorWebServerStartup.cs
deleted file mode 100644
index 5deffb0d94b1..000000000000
--- a/src/Components/test/testassets/Components.TestServer/BlazorWebServerStartup.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Globalization;
-using Components.TestServer.RazorComponents;
-using Microsoft.AspNetCore.Components.Server.Circuits;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.DataProtection;
-
-namespace TestServer;
-
-public class BlazorWebServerStartup
-{
-    public BlazorWebServerStartup(IConfiguration configuration)
-    {
-        Configuration = configuration;
-    }
-
-    public IConfiguration Configuration { get; }
-
-    // This method gets called by the runtime. Use this method to add services to the container.
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddRazorComponents()
-            .AddInteractiveServerComponents();
-
-        // Since tests run in parallel, we use an ephemeral key provider to avoid filesystem
-        // contention issues.
-        services.AddSingleton<IDataProtectionProvider, EphemeralDataProtectionProvider>();
-    }
-
-    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-    public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment env, ResourceRequestLog resourceRequestLog)
-    {
-        if (env.IsDevelopment())
-        {
-            app.UseDeveloperExceptionPage();
-        }
-
-        // Mount the server-side Blazor app on /subdir
-        app.Map("/subdir", app =>
-        {
-            app.UseRouting();
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapRazorComponents<Root>()
-                    .AddInteractiveServerRenderMode();
-            });
-        });
-    }
-}
diff --git a/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor b/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor
index 7a7b79e4f9f7..0daed1933fd5 100644
--- a/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor
+++ b/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor
@@ -5,7 +5,7 @@
 @inject IJSRuntime JS
 @inject TestCircuitContextAccessor CircuitContextAccessor
 
-<h1>Circuit Context</h1>
+<h1 id="circuit-context-title">Circuit Context</h1>
 
 <button id="trigger-click-event-button" type="button" @onclick="OnClickEvent">Trigger event</button>
 
diff --git a/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj b/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
index 1341319c942c..17ff57531d67 100644
--- a/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
+++ b/src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
@@ -10,8 +10,13 @@
     <Nullable>annotations</Nullable>
     <RazorLangVersion>latest</RazorLangVersion>
     <BlazorRoutingEnableRegexConstraint>true</BlazorRoutingEnableRegexConstraint>
+    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.Http.Validation.Generated;Microsoft.Extensions.Validation.Generated</InterceptorsNamespaces>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Validation/gen/Microsoft.Extensions.Validation.ValidationsGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
@@ -28,6 +33,7 @@
     <Reference Include="Microsoft.AspNetCore.SignalR" />
     <Reference Include="Microsoft.AspNetCore.InternalTesting" />
     <Reference Include="Microsoft.Extensions.Hosting" />
+    <Reference Include="Microsoft.Extensions.Caching.Hybrid" />
     <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
   </ItemGroup>
 
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
index b1cac62cfee8..8df0fb304427 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
@@ -40,7 +40,7 @@
                 <component render-mode="ServerPrerendered" type="typeof(PreserveStateComponent)" param-State="@state1"></component>
                 @* State can change after a component has rendered, when this happens the output will not be updated during prerendering
                    and will have to wait until the app restarts in interactive mode.
-                *@ 
+                *@
                 PreserveService.NewState();
                 <component render-mode="ServerPrerendered" type="typeof(PreserveStateComponent)" param-State="@state2"></component>
                 break;
@@ -57,7 +57,7 @@
 
         @* This is just to show that the state of a service can still change after the component has rendered and it's the component
            responsibility to deal with updates after the initial render
-        *@ 
+        *@
         <p>
             Service state after components have rendered: <span id="service-state">@PreserveService.Guid</span>
         </p>
@@ -66,7 +66,7 @@
 
         PreserveService.NewState();
 
-        @* This is just to show that this state will be lost and not restored since the state was persisted before *@ 
+        @* This is just to show that this state will be lost and not restored since the state was persisted before *@
         <p>
             Service state after state has been persisted: <span id="service-state-after">@PreserveService.Guid</span>
         </p>
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml
index 13c09111b590..9de8ea472840 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/_ServerHost.cshtml
@@ -12,6 +12,7 @@
     <!-- Used by ExternalContentPackage -->
     <link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
     <link href="Components.TestServer.styles.css" rel="stylesheet" />
+    <component type="typeof(Microsoft.AspNetCore.Components.Web.HeadOutlet)" render-mode="Server" />
 </head>
 <body>
     <root><component type="typeof(BasicTestApp.Index)" render-mode="Server" /></root>
diff --git a/src/Components/test/testassets/Components.TestServer/Program.cs b/src/Components/test/testassets/Components.TestServer/Program.cs
index ca2d7b1aeb7f..568f809454a7 100644
--- a/src/Components/test/testassets/Components.TestServer/Program.cs
+++ b/src/Components/test/testassets/Components.TestServer/Program.cs
@@ -32,6 +32,8 @@ public static async Task Main(string[] args)
             ["Globalization + Localization (Server-side)"] = (BuildWebHost<InternationalizationStartup>(CreateAdditionalArgs(args)), "/subdir"),
             ["Server-side blazor"] = (BuildWebHost<ServerStartup>(CreateAdditionalArgs(args)), "/subdir"),
             ["Blazor web with server-side blazor root component"] = (BuildWebHost<RazorComponentEndpointsStartup<Root>>(CreateAdditionalArgs(args)), "/subdir"),
+            ["Blazor web with server-side reconnection disabled"] = (BuildWebHost<RazorComponentEndpointsStartup<Root>>(CreateAdditionalArgs([.. args, "--DisableReconnectionCache", "true"])), "/subdir"),
+            ["Blazor web with server-side hybrid cache"] = (BuildWebHost<RazorComponentEndpointsStartup<Root>>(CreateAdditionalArgs([.. args, "--DisableReconnectionCache", "true", "--UseHybridCache", "true"])), "/subdir"),
             ["Hosted client-side blazor"] = (BuildWebHost<ClientStartup>(CreateAdditionalArgs(args)), "/subdir"),
             ["Hot Reload"] = (BuildWebHost<HotReloadStartup>(CreateAdditionalArgs(args)), "/subdir"),
             ["Dev server client-side blazor"] = CreateDevServerHost(CreateAdditionalArgs(args)),
@@ -75,12 +77,20 @@ private static (IHost host, string basePath) CreateDevServerHost(string[] args)
     }
 
     private static string[] CreateAdditionalArgs(string[] args) =>
-        args.Concat(new[] { "--urls", $"http://127.0.0.1:{GetNextChildAppPortNumber()}" }).ToArray();
+        [.. args, .. new[] { "--urls", $"http://127.0.0.1:{GetNextChildAppPortNumber()}" }];
 
     public static IHost BuildWebHost(string[] args) => BuildWebHost<Startup>(args);
 
-    public static IHost BuildWebHost<TStartup>(string[] args) where TStartup : class =>
-        Host.CreateDefaultBuilder(args)
+    public static IHost BuildWebHost<TStartup>(string[] args) where TStartup : class
+    {
+        var unobservedTaskExceptionObserver = new UnobservedTaskExceptionObserver();
+        TaskScheduler.UnobservedTaskException += unobservedTaskExceptionObserver.OnUnobservedTaskException;
+
+        return Host.CreateDefaultBuilder(args)
+            .ConfigureServices(services =>
+            {
+                services.AddSingleton(unobservedTaskExceptionObserver);
+            })
             .ConfigureLogging((ctx, lb) =>
             {
                 TestSink sink = new TestSink();
@@ -96,6 +106,7 @@ public static IHost BuildWebHost<TStartup>(string[] args) where TStartup : class
                 webHostBuilder.UseStaticWebAssets();
             })
             .Build();
+    }
 
     private static int GetNextChildAppPortNumber()
     {
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs
index c4af233c40fe..65adb091bbfd 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs
@@ -48,19 +48,53 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
         app.Map("/subdir", app =>
         {
-            if (!env.IsDevelopment())
+            app.Map("/reexecution", reexecutionApp =>
             {
-                app.UseExceptionHandler("/Error", createScopeForErrors: true);
-            }
+                app.Map("/trigger-404", trigger404App =>
+                {
+                    trigger404App.Run(async context =>
+                    {
+                        context.Response.StatusCode = 404;
+                        await context.Response.WriteAsync("Triggered a 404 status code.");
+                    });
+                });
 
-            app.UseStaticFiles();
-            app.UseRouting();
-            RazorComponentEndpointsStartup<TRootComponent>.UseFakeAuthState(app);
-            app.UseAntiforgery();
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapRazorComponents<TRootComponent>();
+                if (!env.IsDevelopment())
+                {
+                    app.UseExceptionHandler("/Error", createScopeForErrors: true);
+                }
+
+                reexecutionApp.UseStatusCodePagesWithReExecute("/not-found-reexecute", createScopeForStatusCodePages: true);
+                reexecutionApp.UseStaticFiles();
+                reexecutionApp.UseRouting();
+                RazorComponentEndpointsStartup<TRootComponent>.UseFakeAuthState(reexecutionApp);
+                reexecutionApp.UseAntiforgery();
+                reexecutionApp.UseEndpoints(endpoints =>
+                {
+                    endpoints.MapRazorComponents<TRootComponent>()
+                        .AddAdditionalAssemblies(Assembly.Load("TestContentPackage"));
+                });
             });
+
+            ConfigureSubdirPipeline(app, env);
+        });
+    }
+
+    private void ConfigureSubdirPipeline(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (!env.IsDevelopment())
+        {
+            app.UseExceptionHandler("/Error", createScopeForErrors: true);
+        }
+
+        app.UseStaticFiles();
+        app.UseRouting();
+        RazorComponentEndpointsStartup<TRootComponent>.UseFakeAuthState(app);
+        app.UseAntiforgery();
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapRazorComponents<TRootComponent>()
+                .AddAdditionalAssemblies(Assembly.Load("TestContentPackage"));
         });
     }
 }
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs
index 943ee32d635c..861e0fbdf288 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs
@@ -8,9 +8,13 @@
 using Components.TestServer.RazorComponents;
 using Components.TestServer.RazorComponents.Pages.Forms;
 using Components.TestServer.Services;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Server.Circuits;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Server;
 using Microsoft.AspNetCore.Mvc;
+using TestContentPackage;
+using TestContentPackage.Services;
 
 namespace TestServer;
 
@@ -26,20 +30,45 @@ public RazorComponentEndpointsStartup(IConfiguration configuration)
     // This method gets called by the runtime. Use this method to add services to the container.
     public void ConfigureServices(IServiceCollection services)
     {
+        services.AddValidation();
+
         services.AddRazorComponents(options =>
         {
             options.MaxFormMappingErrorCount = 10;
             options.MaxFormMappingRecursionDepth = 5;
             options.MaxFormMappingCollectionSize = 100;
         })
+            .RegisterPersistentService<InteractiveServerService>(RenderMode.InteractiveServer)
+            .RegisterPersistentService<InteractiveAutoService>(RenderMode.InteractiveAuto)
+            .RegisterPersistentService<InteractiveWebAssemblyService>(RenderMode.InteractiveWebAssembly)
             .AddInteractiveWebAssemblyComponents()
-            .AddInteractiveServerComponents()
+            .AddInteractiveServerComponents(options =>
+            {
+                if (Configuration.GetValue<bool>("DisableReconnectionCache"))
+                {
+                    // This disables the reconnection cache, which forces the server to persist the circuit state.
+                    options.DisconnectedCircuitMaxRetained = 0;
+                    options.DetailedErrors = true;
+                }
+            })
             .AddAuthenticationStateSerialization(options =>
             {
                 bool.TryParse(Configuration["SerializeAllClaims"], out var serializeAllClaims);
                 options.SerializeAllClaims = serializeAllClaims;
             });
 
+        if (Configuration.GetValue<bool>("UseHybridCache"))
+        {
+            services.AddHybridCache();
+        }
+
+        services.AddScoped<InteractiveWebAssemblyService>();
+        services.AddScoped<InteractiveServerService>();
+        services.AddScoped<InteractiveAutoService>();
+
+        // Register custom serializer for E2E testing of persistent component state serialization extensibility
+        services.AddSingleton<PersistentComponentStateSerializer<int>, CustomIntSerializer>();
+
         services.AddHttpContextAccessor();
         services.AddSingleton<AsyncOperationService>();
         services.AddCascadingAuthenticationState();
@@ -64,57 +93,91 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
         app.Map("/subdir", app =>
         {
-            WebAssemblyTestHelper.ServeCoopHeadersIfWebAssemblyThreadingEnabled(app);
-
-            if (!env.IsDevelopment())
+            app.Map("/reexecution", reexecutionApp =>
             {
-                app.UseExceptionHandler("/Error", createScopeForErrors: true);
-            }
+                app.Map("/trigger-404", app =>
+                {
+                    app.Run(async context =>
+                    {
+                        context.Response.StatusCode = 404;
+                        await context.Response.WriteAsync("Triggered a 404 status code.");
+                    });
+                });
+                reexecutionApp.UseStatusCodePagesWithReExecute("/not-found-reexecute", createScopeForStatusCodePages: true);
+                reexecutionApp.UseRouting();
+
+                reexecutionApp.UseAntiforgery();
+                ConfigureEndpoints(reexecutionApp, env);
+            });
+            app.Map("/interactive-reexecution", reexecutionApp =>
+            {
+                reexecutionApp.UseStatusCodePagesWithReExecute("/not-found-reexecute-interactive", createScopeForStatusCodePages: true);
+                reexecutionApp.UseRouting();
+                reexecutionApp.UseAntiforgery();
+                ConfigureEndpoints(reexecutionApp, env);
+            });
+
+            ConfigureSubdirPipeline(app, env);
+        });
+    }
+
+    private void ConfigureSubdirPipeline(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        WebAssemblyTestHelper.ServeCoopHeadersIfWebAssemblyThreadingEnabled(app);
+
+        if (!env.IsDevelopment())
+        {
+            app.UseExceptionHandler("/Error", createScopeForErrors: true);
+        }
 
-            app.UseRouting();
-            UseFakeAuthState(app);
-            app.UseAntiforgery();
+        app.UseRouting();
+        UseFakeAuthState(app);
+        app.UseAntiforgery();
 
-            app.Use((ctx, nxt) =>
+        app.Use((ctx, nxt) =>
+        {
+            if (ctx.Request.Query.ContainsKey("add-csp"))
             {
-                if (ctx.Request.Query.ContainsKey("add-csp"))
-                {
-                    ctx.Response.Headers.Add("Content-Security-Policy", "script-src 'self' 'unsafe-inline'");
-                }
-                return nxt();
-            });
+                ctx.Response.Headers.Add("Content-Security-Policy", "script-src 'self' 'unsafe-inline'");
+            }
+            return nxt();
+        });
+        ConfigureEndpoints(app, env);
+    }
 
-            _ = app.UseEndpoints(endpoints =>
+    private void ConfigureEndpoints(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        _ = app.UseEndpoints(endpoints =>
+        {
+            var contentRootStaticAssetsPath = Path.Combine(env.ContentRootPath, "Components.TestServer.staticwebassets.endpoints.json");
+            if (File.Exists(contentRootStaticAssetsPath))
             {
-                var contentRootStaticAssetsPath = Path.Combine(env.ContentRootPath, "Components.TestServer.staticwebassets.endpoints.json");
-                if (File.Exists(contentRootStaticAssetsPath))
-                {
-                    endpoints.MapStaticAssets(contentRootStaticAssetsPath);
-                }
-                else
-                {
-                    endpoints.MapStaticAssets();
-                }
+                endpoints.MapStaticAssets(contentRootStaticAssetsPath);
+            }
+            else
+            {
+                endpoints.MapStaticAssets();
+            }
 
-                _ = endpoints.MapRazorComponents<TRootComponent>()
-                    .AddAdditionalAssemblies(Assembly.Load("Components.WasmMinimal"))
-                    .AddInteractiveServerRenderMode(options =>
-                    {
-                        var config = app.ApplicationServices.GetRequiredService<WebSocketCompressionConfiguration>();
-                        options.DisableWebSocketCompression = config.IsCompressionDisabled;
+            _ = endpoints.MapRazorComponents<TRootComponent>()
+                .AddAdditionalAssemblies(Assembly.Load("TestContentPackage"))
+                .AddAdditionalAssemblies(Assembly.Load("Components.WasmMinimal"))
+                .AddInteractiveServerRenderMode(options =>
+                {
+                    var config = app.ApplicationServices.GetRequiredService<WebSocketCompressionConfiguration>();
+                    options.DisableWebSocketCompression = config.IsCompressionDisabled;
 
-                        options.ContentSecurityFrameAncestorsPolicy = config.CspPolicy;
+                    options.ContentSecurityFrameAncestorsPolicy = config.CspPolicy;
 
-                        options.ConfigureWebSocketAcceptContext = config.ConfigureWebSocketAcceptContext;
-                    })
-                    .AddInteractiveWebAssemblyRenderMode(options => options.PathPrefix = "/WasmMinimal");
+                    options.ConfigureWebSocketAcceptContext = config.ConfigureWebSocketAcceptContext;
+                })
+                .AddInteractiveWebAssemblyRenderMode(options => options.PathPrefix = "/WasmMinimal");
 
-                NotEnabledStreamingRenderingComponent.MapEndpoints(endpoints);
-                StreamingRenderingForm.MapEndpoints(endpoints);
-                InteractiveStreamingRenderingComponent.MapEndpoints(endpoints);
+            NotEnabledStreamingRenderingComponent.MapEndpoints(endpoints);
+            StreamingRenderingForm.MapEndpoints(endpoints);
+            InteractiveStreamingRenderingComponent.MapEndpoints(endpoints);
 
-                MapEnhancedNavigationEndpoints(endpoints);
-            });
+            MapEnhancedNavigationEndpoints(endpoints);
         });
     }
 
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
index e6edce82500a..f547144c8fdd 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
@@ -1,4 +1,76 @@
-@using Components.TestServer.RazorComponents.Pages.Forms
+@implements IDisposable
+@using Components.TestServer.RazorComponents.Pages.Forms
+@using Components.WasmMinimal.Pages.NotFound
+@using TestContentPackage.NotFound
+@using Components.TestServer.RazorComponents
+
+@code {
+    [Parameter]
+    [SupplyParameterFromQuery(Name = "useCustomNotFoundPage")]
+    public string? UseCustomNotFoundPage { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery(Name = "useCustomRouter")]
+    public string? UseCustomRouter { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery(Name = "appSetsEventArgsPath")]
+    public bool AppSetsEventArgsPath { get; set; }
+
+    private Type? NotFoundPageType { get; set; }
+    private NavigationManager _navigationManager = default!;
+
+    [Inject]
+    private NavigationManager NavigationManager
+    {
+        get => _navigationManager;
+        set
+        {
+            _navigationManager = value;
+        }
+    }
+
+    private void OnNotFoundEvent(object sender, NotFoundEventArgs e)
+    {
+        var type = typeof(CustomNotFoundPage);
+        var routeAttributes = type.GetCustomAttributes(typeof(RouteAttribute), inherit: true);
+        if (routeAttributes.Length == 0)
+        {
+            throw new InvalidOperationException($"The type {type.FullName} " +
+                $"does not have a {typeof(RouteAttribute).FullName} applied to it.");
+        }
+
+        var routeAttribute = (RouteAttribute)routeAttributes[0];
+        if (routeAttribute.Template != null)
+        {
+            e.Path = routeAttribute.Template;
+        }
+    }
+
+    protected override void OnParametersSet()
+    {
+        if (string.Equals(UseCustomNotFoundPage, "true", StringComparison.OrdinalIgnoreCase))
+        {
+            NotFoundPageType = typeof(CustomNotFoundPage);
+        }
+        else
+        {
+            NotFoundPageType = null;
+        }
+        if (AppSetsEventArgsPath && _navigationManager is not null)
+        {
+            _navigationManager.OnNotFound += OnNotFoundEvent;
+        }
+    }
+
+    public void Dispose()
+    {
+        if (AppSetsEventArgsPath)
+        {
+            _navigationManager.OnNotFound -= OnNotFoundEvent;
+        }
+    }
+}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -8,13 +80,37 @@
     <HeadOutlet />
 </head>
 <body>
-    <Router AppAssembly="@typeof(App).Assembly">
-        <Found Context="routeData">
-            <RouteView RouteData="@routeData" />
-            <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
-        </Found>
-        <NotFound>There's nothing here</NotFound>
-    </Router>
+    @if(string.Equals(UseCustomRouter, "true", StringComparison.OrdinalIgnoreCase))
+    {
+        <CustomRouter AppAssembly="@typeof(App).Assembly">
+            <Found Context="routeData">
+                <RouteView RouteData="@routeData" />
+                <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
+            </Found>
+        </CustomRouter>
+    }
+    else
+    {
+        @if (NotFoundPageType is not null)
+        {
+            <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
+                <Found Context="routeData">
+                    <RouteView RouteData="@routeData" />
+                    <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
+                </Found>
+            </Router>
+        }
+        else
+        {
+            <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }">
+                <Found Context="routeData">
+                    <RouteView RouteData="@routeData" />
+                    <FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />
+                </Found>
+                <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
+            </Router>
+        }
+    }
     <script>
         // This script must come before blazor.web.js to test that
         // the framework does the right thing when an element is already focused.
@@ -23,7 +119,7 @@
             elementToFocus.focus();
         }
     </script>
-    <script src="_framework/blazor.web.js" autostart="false" suppress-error="BL9992"></script>
+    <script src="@Assets["_framework/blazor.web.js"]" autostart="false" suppress-error="BL9992"></script>
     <script src="_content/TestContentPackage/counterInterop.js"></script>
     <script src="js/circuitContextTest.js"></script>
     <script>
@@ -43,9 +139,10 @@
             const enableClassicInitializers = sessionStorage.getItem('enable-classic-initializers') === 'true';
             const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
             const blockLoadBootResource = sessionStorage.getItem('block-load-boot-resource') === 'true';
-            sessionStorage.removeItem('suppress-enhanced-navigation');
+            const blockWebassemblySettings = sessionStorage.getItem('block-webassembly-settings') === 'true';
             sessionStorage.removeItem('block-load-boot-resource');
             sessionStorage.removeItem('enable-classic-initializers');
+            sessionStorage.removeItem('block-webassembly-settings');
 
             let loadBootResourceUnblocked = null;
             if (blockLoadBootResource) {
@@ -66,6 +163,35 @@
 
             let maxParallelResourceDownloadCount = 0;
             let currentParallelResourceDownloadCount = 0;
+            let webAssemblySettings = {
+                loadBootResource: function (type, name, defaultUri, integrity) {
+                    switch (type) {
+                        case 'manifest':
+                        case 'dotnetjs':
+                        case 'dotnetwasm':
+                            // note this is resolved to absolute URL using document.baseURI
+                            return `WasmMinimal/_framework/${name}`;
+                        default:
+                            // The following allows us to arbitrarily delay the loading of WebAssembly resources.
+                            // This is useful for guaranteeing that auto mode components will fall back on
+                            // using Blazor server.
+                            currentParallelResourceDownloadCount++;
+                            return fetch(`${document.baseURI}WasmMinimal/_framework/${name}?`, {
+                                method: "GET",
+                            }).then(async (response) => {
+                                if (currentParallelResourceDownloadCount > maxParallelResourceDownloadCount) {
+                                    maxParallelResourceDownloadCount = currentParallelResourceDownloadCount;
+                                    window['__aspnetcore__testing__max__parallel__resource__download__count'] = maxParallelResourceDownloadCount;
+                                }
+                                currentParallelResourceDownloadCount--;
+                                await loadBootResourceUnblocked;
+                                return response;
+                            });
+                    }
+                },
+            };
+            if (blockWebassemblySettings)
+                webAssemblySettings = null;
 
             Blazor.start({
                 ssr: {
@@ -75,33 +201,7 @@
                     circuitInactivityTimeoutMs: 100,
                 },
                 enableClassicInitializers: enableClassicInitializers,
-                webAssembly: {
-                    loadBootResource: function (type, name, defaultUri, integrity) {
-                        switch (type) {
-                            case 'manifest':
-                            case 'dotnetjs':
-                            case 'dotnetwasm':
-                                // note this is resolved to absolute URL using document.baseURI
-                                return `WasmMinimal/_framework/${name}`;
-                            default:
-                                // The following allows us to arbitrarily delay the loading of WebAssembly resources.
-                                // This is useful for guaranteeing that auto mode components will fall back on
-                                // using Blazor server.
-                                currentParallelResourceDownloadCount++;
-                                return fetch(`${document.baseURI}WasmMinimal/_framework/${name}?`, {
-                                    method: "GET",
-                                }).then(async (response) => {
-                                    if (currentParallelResourceDownloadCount > maxParallelResourceDownloadCount) {
-                                        maxParallelResourceDownloadCount = currentParallelResourceDownloadCount;
-                                        window['__aspnetcore__testing__max__parallel__resource__download__count'] = maxParallelResourceDownloadCount;
-                                    }
-                                    currentParallelResourceDownloadCount--;
-                                    await loadBootResourceUnblocked;
-                                    return response;
-                                });
-                        }
-                    },
-                },
+                webAssembly: webAssemblySettings,
                 circuit: {
                     reconnectionOptions: {
                         // It's easier to test the reconnection logic if we wait a bit
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/ComplexValidationComponent.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/ComplexValidationComponent.razor
new file mode 100644
index 000000000000..9605c9f855be
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/ComplexValidationComponent.razor
@@ -0,0 +1,151 @@
+@using BasicTestApp.ValidationModels
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Components.Forms
+
+@if(RendererInfo.IsInteractive) {
+    <p id="is-interactive"></p>
+}
+
+@if (_invalid)
+{
+    <p id="is-invalid"></p>
+}
+
+<EditForm id="add-validation-form" Model="@order" OnValidSubmit="@HandleValidSubmit" OnInvalidSubmit="@HandleInvalidSubmit">
+    <DataAnnotationsValidator />
+
+    <div class="container mt-4">
+        <h4>Order Details</h4>
+        <div class="mb-3">
+            <label for="orderName" class="form-label">Order Name</label>
+            <InputText id="orderName" @bind-Value="order.OrderName" class="form-control" />
+            <ValidationMessage For="@(() => order.OrderName)" />
+        </div>
+
+        <hr />
+
+        <h4>Customer Details</h4>
+        <div class="card mb-3">
+            <div class="card-body">
+                <div class="mb-3">
+                    <label for="customerFullName" class="form-label">Full Name</label>
+                    <InputText id="customerFullName" @bind-Value="order.CustomerDetails.FullName" class="form-control" />
+                    <ValidationMessage For="@(() => order.CustomerDetails.FullName)" />
+                </div>
+                <div class="mb-3">
+                    <label for="customerEmail" class="form-label">Email</label>
+                    <InputText id="customerEmail" @bind-Value="order.CustomerDetails.Email" class="form-control" />
+                    <ValidationMessage For="@(() => order.CustomerDetails.Email)" />
+                </div>
+
+                <h5>Payment Address</h5>
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="mb-3 col-sm-8">
+                                <label for="paymentStreet" class="form-label">Street</label>
+                                <InputText id="paymentStreet" @bind-Value="order.CustomerDetails.PaymentAddress.Street" class="form-control" />
+                                <ValidationMessage For="@(() => order.CustomerDetails.PaymentAddress.Street)" />
+                            </div>
+                            <div class="mb-3 col-sm">
+                                <label for="paymentZipCode" class="form-label">Zip Code</label>
+                                <InputText id="paymentZipCode" @bind-Value="order.CustomerDetails.PaymentAddress.ZipCode" class="form-control" />
+                                <ValidationMessage For="@(() => order.CustomerDetails.PaymentAddress.ZipCode)" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <h5>Shipping Address</h5>
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="mb-3 col-sm-8">
+                                <label for="shippingStreet" class="form-label">Street</label>
+                                <InputText id="shippingStreet" @bind-Value="order.CustomerDetails.ShippingAddress.Street" class="form-control" />
+                                <ValidationMessage For="@(() => order.CustomerDetails.ShippingAddress.Street)" />
+                            </div>
+                            <div class="mb-3 col-sm">
+                                <label for="shippingZipCode" class="form-label">Zip Code</label>
+                                <InputText id="shippingZipCode" @bind-Value="order.CustomerDetails.ShippingAddress.ZipCode" class="form-control" />
+                                <ValidationMessage For="@(() => order.CustomerDetails.ShippingAddress.ZipCode)" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <hr />
+
+        <h4>Order Items</h4>
+        @if (order.OrderItems.Any())
+        {
+            for (int i = 0; i < order.OrderItems.Count; i++)
+            {
+                var itemIndex = i;
+                <div class="card mb-3">
+                    <div class="card-header d-flex justify-content-between align-items-center">
+                        <span>Item @(itemIndex + 1)</span>
+                        <button type="button" class="btn btn-sm btn-danger" @onclick="() => RemoveOrderItem(itemIndex)">Remove</button>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="mb-3 col-sm-8">
+                                <label for="@($"productName_{itemIndex}")" class="form-label">Product Name</label>
+                                <InputText id="@($"productName_{itemIndex}")" @bind-Value="order.OrderItems[itemIndex].ProductName" class="form-control" />
+                                <ValidationMessage For="@(() => order.OrderItems[itemIndex].ProductName)" />
+                            </div>
+                            <div class="mb-3 col-sm">
+                                <label for="@($"quantity_{itemIndex}")" class="form-label">Quantity</label>
+                                <InputNumber id="@($"quantity_{itemIndex}")" @bind-Value="order.OrderItems[itemIndex].Quantity" class="form-control" />
+                                <ValidationMessage For="@(() => order.OrderItems[itemIndex].Quantity)" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            }
+        }
+        else
+        {
+            <p>No order items. Add one below.</p>
+        }
+
+        <button type="button" class="btn btn-success mb-3" @onclick="AddOrderItem">Add Order Item</button>
+
+        <hr />
+
+        <div class="mb-3">
+            <button type="submit" id="submit-form" class="btn btn-primary">Submit Order</button>
+        </div>
+
+        <ValidationSummary />
+    </div>
+</EditForm>
+
+@code {
+    private OrderModel order = new OrderModel();
+    private bool _invalid;
+
+    private void HandleValidSubmit()
+    {
+    }
+
+    private void HandleInvalidSubmit()
+    {
+        _invalid = true;
+    }
+
+    private void AddOrderItem()
+    {
+        order.OrderItems.Add(new OrderItemModel());
+    }
+
+    private void RemoveOrderItem(int index)
+    {
+        if (index >= 0 && index < order.OrderItems.Count)
+        {
+            order.OrderItems.RemoveAt(index);
+        }
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/InteractiveStreamingRenderingComponent.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/InteractiveStreamingRenderingComponent.razor
index de9d5114a204..605941be0f38 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/InteractiveStreamingRenderingComponent.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/InteractiveStreamingRenderingComponent.razor
@@ -59,7 +59,7 @@ else
         object key = DisableKeys ? null : counter.Id;
 
         <Counter
-            @rendermode="@GetRenderMode(counter.RenderModeId)"
+            @rendermode="@RenderModeHelper.GetRenderMode(counter.RenderModeId)"
             @key="@key"
             IdSuffix="@counter.Id.ToString()"
             IncrementAmount="counter.IncrementAmount"
@@ -201,30 +201,6 @@ else
             $"&{nameof(DisableKeys)}={disableKeys}";
     }
 
-    private static IComponentRenderMode GetRenderMode(RenderModeId renderMode)
-    {
-        return renderMode switch
-        {
-            RenderModeId.ServerPrerendered => RenderMode.InteractiveServer,
-            RenderModeId.ServerNonPrerendered => new InteractiveServerRenderMode(false),
-            RenderModeId.WebAssemblyPrerendered => RenderMode.InteractiveWebAssembly,
-            RenderModeId.WebAssemblyNonPrerendered => new InteractiveWebAssemblyRenderMode(false),
-            RenderModeId.AutoPrerendered => RenderMode.InteractiveAuto,
-            RenderModeId.AutoNonPrerendered => new InteractiveAutoRenderMode(false),
-            _ => throw new InvalidOperationException($"Unknown render mode: {renderMode}"),
-        };
-    }
-
-    private enum RenderModeId
-    {
-        ServerPrerendered = 0,
-        ServerNonPrerendered = 1,
-        WebAssemblyPrerendered = 2,
-        WebAssemblyNonPrerendered = 3,
-        AutoPrerendered = 4,
-        AutoNonPrerendered = 5,
-    }
-
     private record struct CounterInfo(int Id, int IncrementAmount, RenderModeId RenderModeId);
 
     private record ComponentState(ImmutableArray<CounterInfo> Counters, int NextCounterId)
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor
new file mode 100644
index 000000000000..a061e882ce94
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor
@@ -0,0 +1,31 @@
+<script type="module" src="@Assets["RazorComponents/Components/ReconnectModal.razor.js"]"></script>
+
+<dialog id="components-reconnect-modal" data-nosnippet>
+    <div class="components-reconnect-container">
+        <div class="components-rejoining-animation" aria-hidden="true">
+            <div></div>
+            <div></div>
+        </div>
+        <p class="components-reconnect-first-attempt-visible">
+            Rejoining the server...
+        </p>
+        <p class="components-reconnect-repeated-attempt-visible">
+            Rejoin failed... trying again in <span id="components-seconds-to-next-attempt"></span> seconds.
+        </p>
+        <p class="components-reconnect-failed-visible">
+            Failed to rejoin.<br />Please retry or reload the page.
+        </p>
+        <button id="components-reconnect-button" class="components-reconnect-failed-visible">
+            Retry
+        </button>
+        <p class="components-pause-visible">
+            The session has been paused by the server.
+        </p>
+        <button id="components-resume-button" class="components-pause-visible">
+            Resume
+        </button>
+        <p class="components-resume-failed-visible">
+            Failed to resume the session.<br />Please reload the page.
+        </p>
+    </div>
+</dialog>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor.css b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor.css
new file mode 100644
index 000000000000..1c093642d90a
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor.css
@@ -0,0 +1,159 @@
+/* Comment */
+
+.components-reconnect-first-attempt-visible,
+.components-reconnect-repeated-attempt-visible,
+.components-reconnect-failed-visible,
+.components-pause-visible,
+.components-resume-failed-visible,
+.components-rejoining-animation {
+    display: none;
+}
+
+#components-reconnect-modal.components-reconnect-show .components-reconnect-first-attempt-visible,
+#components-reconnect-modal.components-reconnect-show .components-rejoining-animation,
+#components-reconnect-modal.components-reconnect-paused .components-pause-visible,
+#components-reconnect-modal.components-reconnect-resume-failed .components-resume-failed-visible,
+#components-reconnect-modal.components-reconnect-retrying,
+#components-reconnect-modal.components-reconnect-retrying .components-reconnect-repeated-attempt-visible,
+#components-reconnect-modal.components-reconnect-retrying .components-rejoining-animation,
+#components-reconnect-modal.components-reconnect-failed,
+#components-reconnect-modal.components-reconnect-failed .components-reconnect-failed-visible {
+    display: block;
+}
+
+
+#components-reconnect-modal {
+    background-color: white;
+    width: 20rem;
+    margin: 20vh auto;
+    padding: 2rem;
+    border: 0;
+    border-radius: 0.5rem;
+    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3);
+    opacity: 0;
+    transition: display 0.5s allow-discrete, overlay 0.5s allow-discrete;
+    animation: components-reconnect-modal-fadeOutOpacity 0.5s both;
+    &[open]
+
+{
+    animation: components-reconnect-modal-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s;
+    animation-fill-mode: both;
+}
+
+}
+
+#components-reconnect-modal::backdrop {
+    background-color: rgba(0, 0, 0, 0.4);
+    animation: components-reconnect-modal-fadeInOpacity 0.5s ease-in-out;
+    opacity: 1;
+}
+
+@keyframes components-reconnect-modal-slideUp {
+    0% {
+        transform: translateY(30px) scale(0.95);
+    }
+
+    100% {
+        transform: translateY(0);
+    }
+}
+
+@keyframes components-reconnect-modal-fadeInOpacity {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes components-reconnect-modal-fadeOutOpacity {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+.components-reconnect-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 1rem;
+}
+
+#components-reconnect-modal p {
+    margin: 0;
+    text-align: center;
+}
+
+#components-reconnect-modal button {
+    border: 0;
+    background-color: #6b9ed2;
+    color: white;
+    padding: 4px 24px;
+    border-radius: 4px;
+}
+
+    #components-reconnect-modal button:hover {
+        background-color: #3b6ea2;
+    }
+
+    #components-reconnect-modal button:active {
+        background-color: #6b9ed2;
+    }
+
+.components-rejoining-animation {
+    position: relative;
+    width: 80px;
+    height: 80px;
+}
+
+    .components-rejoining-animation div {
+        position: absolute;
+        border: 3px solid #0087ff;
+        opacity: 1;
+        border-radius: 50%;
+        animation: components-rejoining-animation 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite;
+    }
+
+        .components-rejoining-animation div:nth-child(2) {
+            animation-delay: -0.5s;
+        }
+
+@keyframes components-rejoining-animation {
+    0% {
+        top: 40px;
+        left: 40px;
+        width: 0;
+        height: 0;
+        opacity: 0;
+    }
+
+    4.9% {
+        top: 40px;
+        left: 40px;
+        width: 0;
+        height: 0;
+        opacity: 0;
+    }
+
+    5% {
+        top: 40px;
+        left: 40px;
+        width: 0;
+        height: 0;
+        opacity: 1;
+    }
+
+    100% {
+        top: 0px;
+        left: 0px;
+        width: 80px;
+        height: 80px;
+        opacity: 0;
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor.js b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor.js
new file mode 100644
index 000000000000..e52a190bacbb
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Components/ReconnectModal.razor.js
@@ -0,0 +1,63 @@
+// Set up event handlers
+const reconnectModal = document.getElementById("components-reconnect-modal");
+reconnectModal.addEventListener("components-reconnect-state-changed", handleReconnectStateChanged);
+
+const retryButton = document.getElementById("components-reconnect-button");
+retryButton.addEventListener("click", retry);
+
+const resumeButton = document.getElementById("components-resume-button");
+resumeButton.addEventListener("click", resume);
+
+function handleReconnectStateChanged(event) {
+    if (event.detail.state === "show") {
+        reconnectModal.showModal();
+    } else if (event.detail.state === "hide") {
+        reconnectModal.close();
+    } else if (event.detail.state === "failed") {
+        document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
+    } else if (event.detail.state === "rejected") {
+        location.reload();
+    }
+}
+
+async function retry() {
+    document.removeEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
+
+    try {
+        // Reconnect will asynchronously return:
+        // - true to mean success
+        // - false to mean we reached the server, but it rejected the connection (e.g., unknown circuit ID)
+        // - exception to mean we didn't reach the server (this can be sync or async)
+        const successful = await Blazor.reconnect();
+        if (!successful) {
+            // We have been able to reach the server, but the circuit is no longer available.
+            // We'll reload the page so the user can continue using the app as quickly as possible.
+            const resumeSuccessful = await Blazor.resumeCircuit();
+            if (!resumeSuccessful) {
+                location.reload();
+            } else {
+                reconnectModal.close();
+            }
+        }
+    } catch (err) {
+        // We got an exception, server is currently unavailable
+        document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
+    }
+}
+
+async function resume() {
+    try {
+        const successful = await Blazor.resumeCircuit();
+        if (!successful) {
+            location.reload();
+        }
+    } catch {
+        location.reload();
+    }
+}
+
+async function retryWhenDocumentBecomesVisible() {
+    if (document.visibilityState === "visible") {
+        await retry();
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/CustomRouter.cs b/src/Components/test/testassets/Components.TestServer/RazorComponents/CustomRouter.cs
new file mode 100644
index 000000000000..574c1c0627ad
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/CustomRouter.cs
@@ -0,0 +1,171 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace Components.TestServer.RazorComponents;
+
+/// <summary>
+/// A custom router implementation for testing NavigationManager.NotFound() with custom routers.
+/// This implementation matches the built-in Router component's behavior but with a different implementation
+/// to ensure custom routers can properly handle NotFound events.
+/// </summary>
+public class CustomRouter : IComponent, IHandleAfterRender, IDisposable
+{
+    private RenderHandle _renderHandle;
+    private bool _navigationInterceptionEnabled;
+    private ILogger<CustomRouter> _logger = default!;
+    private NavigationManager _navigationManager = default!;
+    private INavigationInterception _navigationInterception = default!;
+
+    [Inject] private IRoutingStateProvider? RoutingStateProvider { get; set; }
+
+    [Inject]
+    private NavigationManager NavigationManager
+    {
+        get => _navigationManager;
+        set
+        {
+            _navigationManager = value;
+            _navigationManager.LocationChanged += OnLocationChanged;
+        }
+    }
+
+    [Inject] private INavigationInterception NavigationInterception
+    {
+        get => _navigationInterception;
+        set => _navigationInterception = value;
+    }
+
+    [Inject] private ILoggerFactory LoggerFactory
+    {
+        get => throw new InvalidOperationException($"{nameof(LoggerFactory)} should only be set via injection.");
+        set => _logger = value.CreateLogger<CustomRouter>();
+    }
+
+    [Parameter]
+    [EditorRequired]
+    public Assembly AppAssembly { get; set; } = default!;
+
+    [Parameter] public IEnumerable<Assembly> AdditionalAssemblies { get; set; } = default!;
+
+    [Parameter]
+    [EditorRequired]
+    public RenderFragment<Microsoft.AspNetCore.Components.RouteData> Found { get; set; } = default!;
+
+    [Parameter] public bool PreferExactMatches { get; set; }
+
+    public void Attach(RenderHandle renderHandle)
+    {
+        _renderHandle = renderHandle;
+    }
+
+    public Task SetParametersAsync(ParameterView parameters)
+    {
+        parameters.SetParameterProperties(this);
+
+        if (AppAssembly is null)
+        {
+            throw new InvalidOperationException($"The {nameof(CustomRouter)} component requires a value for the parameter {nameof(AppAssembly)}.");
+        }
+
+        if (Found is null)
+        {
+            throw new InvalidOperationException($"The {nameof(CustomRouter)} component requires a value for the parameter {nameof(Found)}.");
+        }
+
+        RefreshRouteTable();
+        RefreshComponent();
+
+        return Task.CompletedTask;
+    }
+
+    public void Dispose()
+    {
+        NavigationManager.LocationChanged -= OnLocationChanged;
+    }
+
+    private RouteTable? _routeTable;
+
+    [Inject] private IServiceProvider ServiceProvider { get; set; } = default!;
+
+    private void RefreshRouteTable()
+    {
+        var routeKey = new RouteKey(AppAssembly, AdditionalAssemblies);
+        _routeTable = RouteTableFactory.Instance.Create(routeKey, ServiceProvider);
+    }
+
+    private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
+    {
+        RefreshComponent();
+    }
+
+    private void RefreshComponent()
+    {
+        if (_renderHandle.IsInitialized)
+        {
+            var uri = NavigationManager.Uri;
+            var locationPath = NavigationManager.ToBaseRelativePath(uri);
+            locationPath = StringUntilAny(locationPath, '?', '#');
+            var locationPathWithLeadingSlash = $"/{locationPath}";
+
+            // First check if the routing state provider has route data for us
+            if (RoutingStateProvider?.RouteData is { } routeData)
+            {
+                _logger.LogInformation($"CustomRouter: Using route from RoutingStateProvider for component {routeData.PageType}");
+
+                // Process parameters to ensure proper handling of route constraints and optional parameters
+                var processedRouteData = RouteTable.ProcessParameters(routeData);
+
+                _renderHandle.Render(Found(processedRouteData));
+                return;
+            }
+
+            // Otherwise, use our route table to find a matching route
+            var context = new Microsoft.AspNetCore.Components.Routing.RouteContext(locationPathWithLeadingSlash);
+            _routeTable?.Route(context);
+
+            if (context.Handler != null)
+            {
+                _logger.LogInformation($"CustomRouter: Navigating to component {context.Handler}");
+                var matchedRouteData = new Microsoft.AspNetCore.Components.RouteData(
+                    context.Handler,
+                    context.Parameters ?? new Dictionary<string, object?>());
+
+                // Set the template to maintain route information
+                if (context.Entry != null)
+                {
+                    matchedRouteData.Template = context.Entry.RoutePattern.RawText;
+                }
+
+                _renderHandle.Render(Found(matchedRouteData));
+            }
+        }
+    }
+
+    private static string StringUntilAny(string str, params char[] chars)
+    {
+        var firstIndex = str.IndexOfAny(chars);
+        return firstIndex < 0
+            ? str
+            : str.Substring(0, firstIndex);
+    }
+
+    Task IHandleAfterRender.OnAfterRenderAsync()
+    {
+        if (!_navigationInterceptionEnabled)
+        {
+            _navigationInterceptionEnabled = true;
+            return NavigationInterception.EnableNavigationInterceptionAsync();
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/GlobalInteractivityApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/GlobalInteractivityApp.razor
index 05cf45c1a56e..9454e37b69ad 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/GlobalInteractivityApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/GlobalInteractivityApp.razor
@@ -7,7 +7,7 @@
 </head>
 <body>
     <Components.WasmMinimal.Routes @rendermode="@PageRenderMode" />
-    <script src="_framework/blazor.web.js" autostart="false"></script>
+    <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
         Blazor.start({
             webAssembly: {
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
index 206262a11c8c..fc8a291d9821 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
@@ -10,6 +10,6 @@
 <body>
     <h1 id="ready">Form test cases</h1>
     <NamedFormContextNoFormContextLayout />
-    <script src="_framework/blazor.web.js" suppress-error="BL9992"></script>
+    <script src="@Assets["_framework/blazor.web.js"]" suppress-error="BL9992"></script>
 </body>
 </html>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/PageForScrollingToHash.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/PageForScrollingToHash.razor
index 102e18a84807..22597ce37be3 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/PageForScrollingToHash.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/PageForScrollingToHash.razor
@@ -1,6 +1,7 @@
 @page "/nav/scroll-to-hash"
 @attribute [StreamRendering]
 @inject NavigationManager NavigationManager
+@using Microsoft.AspNetCore.Components.Forms
 
 <PageTitle>Page for scrolling to hash</PageTitle>
 
@@ -13,6 +14,18 @@
     <div id="uri-on-page-load" style="display: none" data-value="@uriOnPageLoad"></div>
 </p>
 
+<div data-enhance-nav="false" id="anchor">
+    <a id="scroll-anchor" href="nav/scroll-to-hash#some-content">Scroll via anchor</a>
+    <div id="uri-on-page-load" style="display: none" data-value="@uriOnPageLoad"></div>
+    <p id="text">Text</p>
+</div>
+
+<div data-enhance-nav="false" id="navlink">
+    <NavLink id="scroll-anchor" href="nav/scroll-to-hash#some-content">Scroll via NavLink</NavLink>
+    <div id="uri-on-page-load" style="display: none" data-value="@uriOnPageLoad"></div>
+    <p id="text">Text</p>
+</div>
+
 <div style="height: 2000px; border: 2px dashed red;">spacer</div>
 
 @if (showContent)
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestLandingPage.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestLandingPage.razor
new file mode 100644
index 000000000000..effc2ffc205f
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestLandingPage.razor
@@ -0,0 +1,50 @@
+@page "/nav/scroll-test"
+@inject NavigationManager NavigationManager
+@attribute [StreamRendering]
+@rendermode RenderMode.InteractiveServer
+
+<PageTitle>Page for testing scroll position</PageTitle>
+
+<h1 id="test-info-1">Scroll tests landing page</h1>
+
+<p>If you scroll down a long way, you'll find more content. We add it asynchronously via streaming rendering.</p>
+
+<div style="height: 2000px; border: 2px dashed red;">spacer top</div>
+
+@if (showContent)
+{
+    <NavLink id="do-navigation-with-fragment" href="@(hashPageFragmentPath)">
+        Navigation to another page with fragment
+    </NavLink>
+    <NavLink id="do-navigation" href="@(hashPagePath)">
+        Navigation to another page
+    </NavLink>
+    <button id="do-programmatic-navigation-with-fragment" @onclick="@(() => NavigationManager.NavigateTo(hashPageFragmentPath))">
+        Programmatic navigation to another page with fragment
+    </button>
+    <button id="do-programmatic-navigation" @onclick="@(() => NavigationManager.NavigateTo(hashPagePath))">
+        Programmatic navigation to another page
+    </button>
+}
+
+<div style="height: 2000px; border: 2px dashed red;">spacer bottom</div>
+
+@if (showContent)
+{
+    <h2 id="some-content">Some content</h2>
+    <p>This is the content.</p>
+}
+
+@code {
+    bool showContent;
+    string uriOnPageLoad;
+    string hashPagePath = "nav/scroll-test-next";
+    string hashPageFragmentPath = "nav/scroll-test-next#some-content";
+
+    protected override async Task OnInitializedAsync()
+    {
+        uriOnPageLoad = NavigationManager.Uri;
+        await Task.Delay(1000);
+        showContent = true;
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestLandingPageNoStreaming.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestLandingPageNoStreaming.razor
new file mode 100644
index 000000000000..160dd0db39a7
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestLandingPageNoStreaming.razor
@@ -0,0 +1,32 @@
+@page "/nav/scroll-test-no-streaming"
+@inject NavigationManager NavigationManager
+@rendermode RenderMode.InteractiveServer
+@* This is a copy of ScrollTestLandingPage, without StreamRendering *@
+
+<PageTitle>Page for testing scroll position</PageTitle>
+
+<h1 id="test-info-1">Scroll tests landing page</h1>
+
+<div style="height: 2000px; border: 2px dashed red;">spacer top</div>
+
+<NavLink id="do-navigation-with-fragment" href="@(hashPageFragmentPath)">
+    Navigation to another page with fragment
+</NavLink>
+<NavLink id="do-navigation" href="@(hashPagePath)">
+    Navigation to another page
+</NavLink>
+<button id="do-programmatic-navigation-with-fragment" @onclick="@(() => NavigationManager.NavigateTo(hashPageFragmentPath))">
+    Programmatic navigation to another page with fragment
+</button>
+<button id="do-programmatic-navigation" @onclick="@(() => NavigationManager.NavigateTo(hashPagePath))">
+    Programmatic navigation to another page
+</button>
+
+<div style="height: 2000px; border: 2px dashed red;">spacer bottom</div>
+
+<h2 id="some-content">Some content</h2>
+
+@code {
+    string hashPagePath = "nav/scroll-test-next-no-streaming";
+    string hashPageFragmentPath = "nav/scroll-test-next-no-streaming#some-content";
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestNextPage.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestNextPage.razor
new file mode 100644
index 000000000000..f26d1b677bf2
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestNextPage.razor
@@ -0,0 +1,38 @@
+@page "/nav/scroll-test-next"
+@inject NavigationManager NavigationManager
+@attribute [StreamRendering]
+@rendermode RenderMode.InteractiveServer
+
+<PageTitle>Next page for testing scroll position</PageTitle>
+
+<h1 id="test-info-2">Scroll tests next page</h1>
+
+<p>If you scroll down a long way, you'll find more content. We add it asynchronously via streaming rendering.</p>
+
+<div style="height: 2000px; border: 2px dashed red;">top spacer</div>
+
+@if (showContent)
+{
+    <h2 id="some-content">Some content</h2>
+    <NavLink id="do-navigation" href="@(scrollPagePath)">
+        Navigation to another page
+    </NavLink>
+    <button id="do-programmatic-navigation" @onclick="@(() => NavigationManager.NavigateTo(scrollPagePath))">
+        Programmatic navigation to another page
+    </button>
+
+    <p>This is the content.</p>
+}
+
+<div style="height: 2000px; border: 2px dashed red;">bottom spacer</div>
+
+@code {
+    bool showContent;
+    string scrollPagePath = "nav/scroll-test";
+
+    protected override async Task OnInitializedAsync()
+    {
+        await Task.Delay(1000);
+        showContent = true;
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestNextPageNoStreaming.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestNextPageNoStreaming.razor
new file mode 100644
index 000000000000..ededc32aa929
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/EnhancedNav/ScrollTestNextPageNoStreaming.razor
@@ -0,0 +1,24 @@
+@page "/nav/scroll-test-next-no-streaming"
+@inject NavigationManager NavigationManager
+@rendermode RenderMode.InteractiveServer
+@* This is a copy of ScrollTestNextPage, without StreamRendering *@
+
+<PageTitle>Next page for testing scroll position</PageTitle>
+
+<h1 id="test-info-2">Scroll tests next page</h1>
+
+<div style="height: 1000px; border: 2px dashed red;">top spacer</div>
+
+<h2 id="some-content">Some content</h2>
+<NavLink id="do-navigation" href="@(scrollPagePath)">
+    Navigation to another page
+</NavLink>
+<button id="do-programmatic-navigation" @onclick="@(() => NavigationManager.NavigateTo(scrollPagePath))">
+    Programmatic navigation to another page
+</button>
+
+<div style="height: 2000px; border: 2px dashed red;">bottom spacer</div>
+
+@code {
+    string scrollPagePath = "nav/scroll-test-no-streaming";
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/AddValidationCapableForm.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/AddValidationCapableForm.razor
new file mode 100644
index 000000000000..88c19cd11103
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/AddValidationCapableForm.razor
@@ -0,0 +1,6 @@
+@page "/forms/add-validation-form"
+@rendermode RenderMode.InteractiveServer
+
+<h3>This form demostrates using `AddValidation` from Microsoft.Extensions.Validation</h3>
+
+<ComplexValidationComponent></ComplexValidationComponent>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultForm.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultForm.razor
index e33200a8a5a5..54c25fd1dbc8 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultForm.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultForm.razor
@@ -1,4 +1,5 @@
 @page "/forms/default-form"
+@page "/reexecution/forms/default-form"
 @using Microsoft.AspNetCore.Components.Forms
 
 <h2>Default form</h2>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultFormInputHidden.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultFormInputHidden.razor
new file mode 100644
index 000000000000..75107fb33e9b
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultFormInputHidden.razor
@@ -0,0 +1,21 @@
+@page "/forms/default-form-input-hidden"
+@page "/reexecution/forms/default-form-input-hidden"
+@using Microsoft.AspNetCore.Components.Forms
+
+<h2>Default form Input Hidden</h2>
+
+<EditForm Enhance Model="Parameter" method="POST" OnValidSubmit="() => _submitted = true" FormName="someform">
+    <InputHidden id="hidden" @bind-Value="Parameter" />
+    <input id="send" type="submit" value="Send" />
+</EditForm>
+
+@if (_submitted)
+{
+    <p id="pass">Hello @Parameter!</p>
+}
+
+@code {
+    bool _submitted = false;
+
+    [SupplyParameterFromForm] public string Parameter { get; set; } = "stranger";
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoAntiforgery.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoAntiforgery.razor
index 5ab564216a9d..93991bab3279 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoAntiforgery.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoAntiforgery.razor
@@ -1,4 +1,5 @@
 @page "/forms/no-antiforgery"
+@page "/reexecution/forms/no-antiforgery"
 @using Microsoft.AspNetCore.Components.Forms
 
 <h2>Default form</h2>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoHandler.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoHandler.razor
index 9bce527bb582..6ec5170a5928 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoHandler.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoHandler.razor
@@ -1,4 +1,5 @@
 @page "/forms/no-handler"
+@page "/reexecution/forms/no-handler"
 @using Microsoft.AspNetCore.Components.Forms
 
 <h2>Form with no handler</h2>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormWithNullableDateTime.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormWithNullableDateTime.razor
new file mode 100644
index 000000000000..dd17d19ba6e0
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormWithNullableDateTime.razor
@@ -0,0 +1,42 @@
+@page "/forms/with-nullable-datetime"
+@using Microsoft.AspNetCore.Components.Forms
+<h3>Edit Form With Nullable DateTime</h3>
+<EditForm Enhance Model="@this.Model" method="post" id="nullable" FormName="nullable-datetime-testform" OnValidSubmit="this.HandleSubmit">
+    <ValidationSummary />
+    <div>
+        <label for="Model.NullableDateTime">
+            Date:
+            <input type="date" id="datetime" name="Model.NullableDateTime" @bind-value="this.Model.NullableDateTime" />
+        </label>
+        <ValidationMessage For="() => Model.NullableDateTime" />
+    </div>
+    <button id="send" type="submit">Submit</button>
+</EditForm>
+@code {
+    [SupplyParameterFromForm]
+    public FormObject Model
+    {
+        get;
+        set;
+    }
+
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+
+        this.Model ??= new FormObject();
+    }
+
+    private void HandleSubmit()
+    {
+    }
+
+    public class FormObject
+    {
+        public DateTime? NullableDateTime
+        {
+            get;
+            set;
+        }
+    };
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/ServerAntiforgeryForm.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/ServerAntiforgeryForm.razor
index a2c3eacc0e87..80a6df3d34da 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/ServerAntiforgeryForm.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/ServerAntiforgeryForm.razor
@@ -6,7 +6,7 @@
 {
     <TestContentPackage.InteractiveAntiforgery RenderForm="bool.Parse(RenderForm)" />
 }
-else
+else if (RendererInfo.IsInteractive)
 {
     <p id="result">@Name</p>
 }
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
index 81020bd258ed..cd6f38b6f2e5 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
@@ -2,6 +2,6 @@
 
 <PageTitle>Home</PageTitle>
 
-<h1>Hello</h1>
+<h1 id="session-storage-anchor">Hello</h1>
 
 <p>This is a Razor Component endpoint.</p>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR-streaming.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR-streaming.razor
new file mode 100644
index 000000000000..f9d0b9da9b5a
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR-streaming.razor
@@ -0,0 +1,5 @@
+@page "/redirection-not-found-ssr-streaming"
+@page "/reexecution/redirection-not-found-ssr-streaming"
+@attribute [StreamRendering(true)]
+
+<Components.WasmMinimal.Pages.NotFound.RedirectionNotFoundComponent DoAsyncOperationBeforeRedirection="true" />
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR.razor
new file mode 100644
index 000000000000..d64425d233d9
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/NotFound/RedirectionNotFound-SSR.razor
@@ -0,0 +1,10 @@
+@page "/redirection-not-found-ssr"
+@page "/reexecution/redirection-not-found-ssr"
+@attribute [StreamRendering(false)]
+
+<Components.WasmMinimal.Pages.NotFound.RedirectionNotFoundComponent DoAsyncOperationBeforeRedirection="@DoAsync" />
+
+@code{
+    [SupplyParameterFromQuery(Name = "doAsync")]
+    public bool DoAsync { get; set; } = false;
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistMultipleRootServerState.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistMultipleRootServerState.razor
new file mode 100644
index 000000000000..5718db6e96f5
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistMultipleRootServerState.razor
@@ -0,0 +1,46 @@
+@page "/persist-multiple-root-component-state-declaratively"
+@using Microsoft.AspNetCore.Components.Web
+@using TestContentPackage
+
+<h1>Persist multiple State Components declaratively</h1>
+
+@if (Server.GetValueOrDefault())
+{
+    <strong>Server Persist State Component 1</strong>
+    <DeclarativePersistStateComponent @rendermode="@RenderMode.InteractiveServer" @key="1" InitialValue="restored 1" KeyName="server-1" />
+    <hr />
+    <strong>Server Persist State Component 2</strong>
+    <DeclarativePersistStateComponent @rendermode="@RenderMode.InteractiveServer" @key="2" InitialValue="restored 2" KeyName="server-2" />
+    <hr />
+}
+
+@if (WebAssembly.GetValueOrDefault())
+{
+    <strong>WebAssembly Persist State Component 1</strong>
+    <DeclarativePersistStateComponent @rendermode="@RenderMode.InteractiveWebAssembly" @key="1" InitialValue="restored 1" KeyName="wasm-1" />
+    <hr />
+    <strong>WebAssembly Persist State Component 2</strong>
+    <DeclarativePersistStateComponent @rendermode="@RenderMode.InteractiveWebAssembly" @key="2" InitialValue="restored 2" KeyName="wasm-2" />
+    <hr />
+}
+
+@if (Auto.GetValueOrDefault())
+{
+    <strong>Auto Persist State Component 1</strong>
+    <DeclarativePersistStateComponent @rendermode="@RenderMode.InteractiveAuto" @key="1" InitialValue="restored 1" KeyName="auto-1" />
+    <hr />
+    <strong>Auto Persist State Component 2</strong>
+    <DeclarativePersistStateComponent @rendermode="@RenderMode.InteractiveAuto" @key="2" InitialValue="restored 2" KeyName="auto-2" />
+    <hr />
+}
+
+@code {
+    [Parameter, SupplyParameterFromQuery(Name = "server")]
+    public bool? Server { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "wasm")]
+    public bool? WebAssembly { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "auto")]
+    public bool? Auto { get; set; }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistMultipleServerState.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistMultipleServerState.razor
new file mode 100644
index 000000000000..53206e588a22
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistMultipleServerState.razor
@@ -0,0 +1,45 @@
+@page "/persist-multiple-state-declaratively"
+@using Microsoft.AspNetCore.Components.Web
+
+<h1>Persist multiple State Components declaratively</h1>
+
+@if (Server.GetValueOrDefault())
+{
+    <strong>Server Persist State Component 1</strong>
+    <TestContentPackage.DeclarativePersistStateComponentWrapper KeyDirective=1 InitialValue="restored 1" KeyName="server-1" @rendermode="@RenderMode.InteractiveServer" />
+    <hr />
+    <strong>Server Persist State Component 2</strong>
+    <TestContentPackage.DeclarativePersistStateComponentWrapper KeyDirective=2 InitialValue="restored 2" KeyName="server-2" @rendermode="@RenderMode.InteractiveServer" />
+    <hr />
+}
+
+@if (WebAssembly.GetValueOrDefault())
+{
+    <strong>WebAssembly Persist State Component 1</strong>
+    <TestContentPackage.DeclarativePersistStateComponentWrapper KeyDirective=1 InitialValue="restored 1" KeyName="wasm-1" @rendermode="@RenderMode.InteractiveWebAssembly" />
+    <hr />
+    <strong>WebAssembly Persist State Component 2</strong>
+    <TestContentPackage.DeclarativePersistStateComponentWrapper KeyDirective=2 InitialValue="restored 2" KeyName="wasm-2" @rendermode="@RenderMode.InteractiveWebAssembly" />
+    <hr />
+}
+
+@if (Auto.GetValueOrDefault())
+{
+    <strong>Auto Persist State Component 1</strong>
+    <TestContentPackage.DeclarativePersistStateComponentWrapper KeyDirective=1 InitialValue="restored 1" KeyName="auto-1" @rendermode="@RenderMode.InteractiveAuto" />
+    <hr />
+    <strong>Auto Persist State Component 2</strong>
+    <TestContentPackage.DeclarativePersistStateComponentWrapper KeyDirective=2 InitialValue="restored 2" KeyName="auto-2" @rendermode="@RenderMode.InteractiveAuto" />
+    <hr />
+}
+
+@code {
+    [Parameter, SupplyParameterFromQuery(Name = "server")]
+    public bool? Server { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "wasm")]
+    public bool? WebAssembly { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "auto")]
+    public bool? Auto { get; set; }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistServicesStateComponents.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistServicesStateComponents.razor
new file mode 100644
index 000000000000..6f16bd9e13c0
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistServicesStateComponents.razor
@@ -0,0 +1,24 @@
+@page "/persist-services-state"
+@using Microsoft.AspNetCore.Components.Web
+
+<h1>Persist Services State Components</h1>
+
+<TestContentPackage.PersistServicesState @rendermode="@_renderMode" />
+
+@code {
+    private IComponentRenderMode _renderMode;
+
+    [Parameter, SupplyParameterFromQuery(Name = "mode")]
+    public string Mode { get; set; }
+
+    protected override void OnInitialized()
+    {
+        _renderMode = Mode switch
+        {
+            "server" => RenderMode.InteractiveServer,
+            "wasm" => RenderMode.InteractiveWebAssembly,
+            "auto" => RenderMode.InteractiveAuto,
+            _ => throw new InvalidOperationException($"Invalid mode: {Mode}")
+        };
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistStateComponents.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistStateComponents.razor
index 990fdce136ec..806ea1e75409 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistStateComponents.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistStateComponents.razor
@@ -5,20 +5,38 @@
 
 @if (Server.GetValueOrDefault()) {
     <strong>Server Persist State Component</strong>
-    <TestContentPackage.PersistStateComponent KeyName="server" @rendermode="@RenderMode.InteractiveServer" />
-    <hr />
+    @if (!Declarative)
+    {
+        <TestContentPackage.PersistStateComponent KeyName="server" @rendermode="@RenderMode.InteractiveServer" />
+        <hr />
+    } else {
+        <TestContentPackage.DeclarativePersistStateComponent InitialValue="restored" KeyName="server" @rendermode="@RenderMode.InteractiveServer" />
+        <hr />
+    }
 }
 
 @if (WebAssembly.GetValueOrDefault()) {
     <strong>WebAssembly Persist State Component</strong>
-    <TestContentPackage.PersistStateComponent KeyName="wasm" @rendermode="@RenderMode.InteractiveWebAssembly" />
-    <hr />
+    @if (!Declarative)
+    {
+        <TestContentPackage.PersistStateComponent KeyName="wasm" @rendermode="@RenderMode.InteractiveWebAssembly" />
+        <hr />
+    } else {
+        <TestContentPackage.DeclarativePersistStateComponent InitialValue="restored" KeyName="wasm" @rendermode="@RenderMode.InteractiveWebAssembly" />
+        <hr />
+    }
 }
 
 @if (Auto.GetValueOrDefault()) {
     <strong>Auto Persist State Component</strong>
-    <TestContentPackage.PersistStateComponent KeyName="auto" @rendermode="@RenderMode.InteractiveAuto" />
-    <hr />
+    @if (!Declarative)
+    {
+        <TestContentPackage.PersistStateComponent KeyName="auto" @rendermode="@RenderMode.InteractiveAuto" />
+        <hr />
+    } else {
+        <TestContentPackage.DeclarativePersistStateComponent InitialValue="restored" KeyName="auto" @rendermode="@RenderMode.InteractiveAuto" />
+        <hr />
+    }
 }
 
 @code {
@@ -30,4 +48,7 @@
 
     [Parameter, SupplyParameterFromQuery(Name = "auto")]
     public bool? Auto { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "declarative")]
+    public bool Declarative { get; set; }
 }
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithDeclarativeEnhancedNavigationPersistentComponents.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithDeclarativeEnhancedNavigationPersistentComponents.razor
new file mode 100644
index 000000000000..43d04d8e6938
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithDeclarativeEnhancedNavigationPersistentComponents.razor
@@ -0,0 +1,81 @@
+@page "/persistent-state/page-with-declarative-state-components"
+@using TestContentPackage.PersistentComponents
+
+<h3>Declarative persistent component with enhanced navigation updates</h3>
+
+<h3>
+    This page can render one or more components with different render modes and different streaming rendering modes.
+    It accepts a render-mode query parameter which is used to determine the render mode for the components on the page.
+    It also accepts a streaming-id query parameter which is used to select whether to render a component that uses streaming rendering or not.
+    The rendered components display the behavior of [UpdateOnEnhancedNavigation(true)] properties of [PersistentState]
+</h3>
+
+<p id="render-mode">Render mode: @_renderMode?.GetType()?.Name</p>
+<p id="streaming-id">Streaming id:@StreamingId</p>
+@if (_renderMode != null)
+{
+    @if(!string.IsNullOrEmpty(KeyValue))
+    {
+        @if (!string.IsNullOrEmpty(StreamingId))
+        {
+            <StreamingComponentWithDeclarativePersistentState @key="0" @rendermode="@_renderMode" StreamingId="@StreamingId" ServerState="@ServerState" />
+        }
+        else
+        {
+            <NonStreamingComponentWithDeclarativePersistentState @key="0" @rendermode="@_renderMode" ServerState="@ServerState" />
+        }
+    }
+    else
+    {
+        @if (!string.IsNullOrEmpty(StreamingId))
+        {
+            <StreamingComponentWithDeclarativePersistentState @rendermode="@_renderMode" StreamingId="@StreamingId" ServerState="@ServerState" />
+        }
+        else
+        {
+            <NonStreamingComponentWithDeclarativePersistentState @rendermode="@_renderMode" ServerState="@ServerState" />
+        }
+    }
+}
+
+@if (!string.IsNullOrEmpty(StreamingId))
+{
+    <a id="end-streaming" href="@($"persistent-state/end-streaming?streaming-id={StreamingId}")" target="_blank">End streaming</a>
+}
+
+<a id="page-no-components-link" href=@($"persistent-state/page-no-components?render-mode={RenderMode}&streaming-id={StreamingId}")>Go to page with no components</a>
+
+
+@code {
+
+    private IComponentRenderMode _renderMode;
+
+    [SupplyParameterFromQuery(Name = "render-mode")] public string RenderMode { get; set; }
+
+    [SupplyParameterFromQuery(Name = "streaming-id")] public string StreamingId { get; set; }
+
+    [SupplyParameterFromQuery(Name = "server-state")] public string ServerState { get; set; }
+
+    [SupplyParameterFromQuery(Name = "key")] public string KeyValue { get; set; }
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(RenderMode))
+        {
+            switch (RenderMode)
+            {
+                case "server":
+                    _renderMode = new InteractiveServerRenderMode(true);
+                    break;
+                case "wasm":
+                    _renderMode = new InteractiveWebAssemblyRenderMode(true);
+                    break;
+                case "auto":
+                    _renderMode = new InteractiveAutoRenderMode(true);
+                    break;
+                default:
+                    throw new ArgumentException($"Invalid render mode: {RenderMode}");
+            }
+        }
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithoutComponents.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithoutComponents.razor
index fe7693c59523..fd2807311980 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithoutComponents.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PageWithoutComponents.razor
@@ -2,13 +2,19 @@
 
 <h3>This page does not render any component. We use it to test that persisted state is only provided at the time interactive components get activated on the page.</h3>
 
-<a id="page-with-components-link" href=@($"persistent-state/page-with-components?render-mode={RenderMode}&streaming-id={StreamingId}")>Go to page with components</a>
-
-<a id="page-with-components-link-and-state" href=@($"persistent-state/page-with-components?render-mode={RenderMode}&streaming-id={StreamingId}&server-state=other")>Go to page with components and state</a>
-
+<ul>
+    <li><a id="page-with-components-link" href=@($"persistent-state/page-with-components?render-mode={RenderMode}&streaming-id={StreamingId}")>Go to page with components</a></li>
+    
+    <li><a id="page-with-components-link-and-state" href=@($"persistent-state/page-with-components?render-mode={RenderMode}&streaming-id={StreamingId}&server-state=other")>Go to page with components and state</a></li>
+    
+    <li><a id="page-with-components-link-and-declarative-state" href=@($"persistent-state/page-with-declarative-state-components?render-mode={RenderMode}&streaming-id={StreamingId}&key={KeyValue}&server-state=other")>Go to page with declarative state components</a></li>
+    
+</ul>
 
 @code {
     [SupplyParameterFromQuery(Name = "render-mode")] public string RenderMode { get; set; }
 
     [SupplyParameterFromQuery(Name = "streaming-id")] public string StreamingId { get; set; }
+
+    [SupplyParameterFromQuery(Name = "key")] public string KeyValue { get; set; }
 }
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PersistentStateDisconnection.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PersistentStateDisconnection.razor
new file mode 100644
index 000000000000..cef4f9a60fec
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/PersistentState/PersistentStateDisconnection.razor
@@ -0,0 +1,8 @@
+@page "/persistent-state/disconnection"
+@rendermode RenderMode.InteractiveServer
+
+<p>
+    Validates state persistence across disconnections
+</p>
+
+<TestContentPackage.PersistentCounter />
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/CircularRedirection.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/CircularRedirection.razor
new file mode 100644
index 000000000000..dd4ec0b413e0
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/CircularRedirection.razor
@@ -0,0 +1,53 @@
+@page "/redirect/circular"
+@using System.Collections.Concurrent
+@inject NavigationManager Nav
+@inject UnobservedTaskExceptionObserver Observer
+
+<h1>Hello, world!</h1>
+
+@if (_shouldStopRedirecting)
+{
+    <p id="unobserved-exceptions-count">@_unobservedExceptions.Count</p>
+
+    @if (_unobservedExceptions.Any())
+    {
+        <h2>Unobserved Exceptions (for debugging):</h2>
+        <ul>
+            @foreach (var ex in _unobservedExceptions)
+            {
+                <li>@ex.ToString()</li>
+            }
+        </ul>
+    }
+}
+
+@code {
+    private bool _shouldStopRedirecting;
+    private IReadOnlyCollection<Exception> _unobservedExceptions = Array.Empty<Exception>();
+
+    protected override async Task OnInitializedAsync()
+    {
+		int visits = Observer.GetCircularRedirectCount();
+		if (visits == 0)
+		{
+			// make sure we start with clean logs
+			Observer.Clear();
+		}
+
+        // Force GC collection to trigger finalizers - this is what causes the issue
+        GC.Collect();
+        GC.WaitForPendingFinalizers();
+        GC.Collect();
+        await Task.Yield();
+
+        if (Observer.GetAndIncrementCircularRedirectCount() < 3)
+        {
+            Nav.NavigateTo("redirect/circular");
+        }
+        else
+        {
+            _shouldStopRedirecting = true;
+            _unobservedExceptions = Observer.GetExceptions();
+        }
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/AsyncComponent.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/AsyncComponent.razor
new file mode 100644
index 000000000000..ead21ed17d84
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/AsyncComponent.razor
@@ -0,0 +1,28 @@
+@if(throwException)
+{
+    throw new InvalidOperationException("Child component UI exception: redirection should have stopped renderer.");
+}
+
+@code {
+    [Parameter]
+    public int Delay { get; set; }
+
+    private bool throwException { get; set; }
+
+    private string message = string.Empty;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await Task.Yield();
+        _ = ScheduleRenderingExceptionAfterDelay();
+    }
+
+    private async Task ScheduleRenderingExceptionAfterDelay()
+    {
+        // This update should not happen if the renderer is stopped
+        await Task.Delay(Delay);
+        throwException = true;
+        StateHasChanged();
+    }
+}
+
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/StoppingRenderer.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/StoppingRenderer.razor
new file mode 100644
index 000000000000..e60fc672ed6b
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Rendering/StoppingRenderer.razor
@@ -0,0 +1,27 @@
+@page "/stopping-renderer"
+@inject NavigationManager NavigationManager
+
+<p>Parent content</p>
+<AsyncComponent @rendermode="@RenderModeHelper.GetRenderMode(CurrentRenderMode)" Delay="@Delay" />
+
+@code {
+    [Parameter, SupplyParameterFromQuery(Name = "destination")]
+    public string Destination { get; set; } = string.Empty;
+
+    [Parameter, SupplyParameterFromQuery(Name = "renderMode")]
+    public string? RenderModeStr { get; set; }
+
+    [Parameter, SupplyParameterFromQuery(Name = "delay")]
+    public int Delay { get; set; }
+
+    private RenderModeId CurrentRenderMode => RenderModeHelper.ParseRenderMode(RenderModeStr);
+
+    protected override Task OnInitializedAsync()
+    {
+        if (!string.IsNullOrEmpty(Destination))
+        {
+            NavigationManager.NavigateTo(Destination);
+        }
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/RoutingTestCases.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/RoutingTestCases.razor
index f4297a4360c6..9b49bfd183ab 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/RoutingTestCases.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/RoutingTestCases.razor
@@ -1,5 +1,5 @@
 @page "/routing"
-<h3>Routing test cases</h3>
+<h3 id="test-info">Routing test cases</h3>
 
 <ul>
     <li>
@@ -23,4 +23,7 @@
     <li>
         <a href="routing/complex-segment(value)">Complex segments</a>
     </li>
+    <li>
+        <a href="routing/ssr-navigate-to">Redirect on SSR page</a>
+    </li>
 </ul>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/SSRRedirection.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/SSRRedirection.razor
new file mode 100644
index 000000000000..252d8675dc5f
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/SSRRedirection.razor
@@ -0,0 +1,17 @@
+@page "/routing/ssr-navigate-to"
+@using Microsoft.AspNetCore.Components.Forms
+@inject NavigationManager NavigationManager
+
+<p id="test-info">Click submit to navigate to home</p>
+<form method="post" @onsubmit="Submit" @formname="MyUniqueFormName">
+    <AntiforgeryToken />
+    <button type="submit" id="redirectButton" class="btn btn-primary">Redirect</button>
+</form>
+
+@code {
+    private void Submit()
+    {
+        NavigationManager.NavigateTo("/subdir/routing");
+    }
+}
+
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/SSRRedirectionStreaming.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/SSRRedirectionStreaming.razor
new file mode 100644
index 000000000000..d4af78f18d39
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Routing/SSRRedirectionStreaming.razor
@@ -0,0 +1,19 @@
+@page "/routing/ssr-streaming-navigate-to"
+@attribute [StreamRendering]
+@using Microsoft.AspNetCore.Components.Forms
+@inject NavigationManager NavigationManager
+
+<p id="test-info">Click submit to navigate to home</p>
+<form method="post" @onsubmit="Submit" @formname="MyUniqueFormName">
+    <AntiforgeryToken />
+    <button type="submit" id="redirectButton" class="btn btn-primary">Redirect</button>
+</form>
+
+@code {
+    private async Task Submit()
+    {
+        await Task.Yield();
+        NavigationManager.NavigateTo("/subdir/routing");
+    }
+}
+
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor
index 9b6d199c76ee..99ea274e45d2 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/LargeStreamRendering.razor
@@ -2,6 +2,8 @@
 
 @attribute [StreamRendering]
 
+<PageTitle>Streaming</PageTitle>
+
 <h1>Streaming Rendering</h1>
 
 <NotEnabledStreamingRenderingComponent UseLargeItems="true"/>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor
index 0bd36fd4817c..64f85052ae2d 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/StreamingRendering/StreamingRendering.razor
@@ -2,6 +2,8 @@
 
 @attribute [StreamRendering]
 
+<PageTitle>Streaming</PageTitle>
+
 <h1>Streaming Rendering</h1>
 
 <NotEnabledStreamingRenderingComponent />
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
index 7cec534aca44..c8f89e587f8f 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
@@ -10,7 +10,7 @@
 
 <body>
     <Components.WasmRemoteAuthentication.Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
-    <script src="_framework/blazor.web.js" autostart="false"></script>
+    <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
     <script>
         Blazor.start({
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
index 2673a96e0858..9238fb858c7b 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
@@ -6,15 +6,39 @@
 <head>
     <meta charset="utf-8" />
     <base href="/subdir/" />
+    <link rel="stylesheet" href="@Assets["Components.TestServer.styles.css"]" />
     <HeadOutlet />
 </head>
 <body>
     <ServerApp @rendermode="@RenderMode.InteractiveServer" />
 
-    <script src="_framework/blazor.web.js" autostart="false"></script>
+    <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
         const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
-        sessionStorage.removeItem('suppress-enhanced-navigation');
+
+        let pwr = Promise.withResolvers();
+        let reconnectPromise = pwr.promise;
+        let reconnectResolver = pwr.resolve;
+
+        function triggerReconnect() {
+            if(reconnectResolver) {
+                reconnectResolver();
+            }
+        }
+
+        function resetReconnect() {
+            pwr = Promise.withResolvers();
+            reconnectPromise = pwr.promise;
+            reconnectResolver = pwr.resolve;
+        }
+
+        function replaceReconnectCallback() {
+            const originalCallback = Blazor.defaultReconnectionHandler._reconnectCallback;
+            Blazor.defaultReconnectionHandler._reconnectCallback = async () => {
+                await reconnectPromise;
+                await originalCallback();
+            };
+        }
 
         function callBlazorStart() {
             Blazor.start({
@@ -26,6 +50,9 @@
                         return `WasmMinimal/_framework/${name}`;
                     },
                 },
+                circuit: {
+                    logLevel: 0
+                },
             });
         }
 
@@ -39,5 +66,13 @@
             document.body.appendChild(startButton);
         }
     </script>
+
+    @if(CustomReconnectUI) {
+        <ReconnectModal></ReconnectModal>
+    }
 </body>
 </html>
+
+@code {
+    [SupplyParameterFromQuery(Name = "custom-reconnect-ui")] public bool CustomReconnectUI { get; set; }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/AddressModel.cs b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/AddressModel.cs
new file mode 100644
index 000000000000..ec34d35e3beb
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/AddressModel.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicTestApp.ValidationModels;
+
+public class AddressModel
+{
+    [Required(ErrorMessage = "Street is required.")]
+    public string Street { get; set; }
+
+    [Required(ErrorMessage = "Zip Code is required.")]
+    [StringLength(10, MinimumLength = 5, ErrorMessage = "Zip Code must be between 5 and 10 characters.")]
+    public string ZipCode { get; set; }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/CustomerModel.cs b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/CustomerModel.cs
new file mode 100644
index 000000000000..94606771bff2
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/CustomerModel.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Validation;
+
+namespace BasicTestApp.ValidationModels;
+
+public class CustomerModel
+{
+    [Required(ErrorMessage = "Full Name is required.")]
+    public string FullName { get; set; }
+
+    [Required(ErrorMessage = "Email is required.")]
+    [EmailAddress(ErrorMessage = "Invalid Email Address.")]
+    public string Email { get; set; }
+
+    public AddressModel PaymentAddress { get; set; } = new AddressModel();
+
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+    [SkipValidation]
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+    public AddressModel ShippingAddress { get; set; } = new AddressModel();
+
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/OrderItemModel.cs b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/OrderItemModel.cs
new file mode 100644
index 000000000000..177da9e5ff04
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/OrderItemModel.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicTestApp.ValidationModels;
+
+public class OrderItemModel
+{
+    [Required(ErrorMessage = "Product Name is required.")]
+    public string ProductName { get; set; }
+
+    [Range(1, 100, ErrorMessage = "Quantity must be between 1 and 100.")]
+    public int Quantity { get; set; } = 1;
+}
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/OrderModel.cs b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/OrderModel.cs
new file mode 100644
index 000000000000..7811def84634
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/ValidationModels/OrderModel.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicTestApp.ValidationModels;
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+[ValidatableType]
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+public class OrderModel
+{
+    [Required(ErrorMessage = "Order Name is required.")]
+    [StringLength(100, ErrorMessage = "Order Name cannot be longer than 100 characters.")]
+    public string OrderName { get; set; }
+
+    public CustomerModel CustomerDetails { get; set; } = new CustomerModel();
+
+    public List<OrderItemModel> OrderItems { get; set; } = new List<OrderItemModel>();
+
+    public OrderModel()
+    {
+        OrderItems.Add(new OrderItemModel());
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/UnobservedTaskExceptionObserver.cs b/src/Components/test/testassets/Components.TestServer/UnobservedTaskExceptionObserver.cs
new file mode 100644
index 000000000000..af61be6cebd5
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/UnobservedTaskExceptionObserver.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Threading;
+
+namespace TestServer;
+
+public class UnobservedTaskExceptionObserver
+{
+    private readonly ConcurrentQueue<Exception> _exceptions = new();
+    private int _circularRedirectCount;
+
+    public void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
+    {
+        _exceptions.Enqueue(e.Exception);
+        e.SetObserved(); // Mark as observed to prevent the process from crashing during tests
+    }
+
+    public bool HasExceptions => !_exceptions.IsEmpty;
+
+    public IReadOnlyCollection<Exception> GetExceptions() => _exceptions.ToArray();
+
+    public void Clear()
+    {
+        _exceptions.Clear();
+        _circularRedirectCount = 0;
+    }
+
+    public int GetCircularRedirectCount()
+    {
+        return _circularRedirectCount;
+    }
+
+    public int GetAndIncrementCircularRedirectCount()
+    {
+        return Interlocked.Increment(ref _circularRedirectCount) - 1;
+    }
+}
diff --git a/src/Components/test/testassets/Components.TestServer/wwwroot/Components.TestServer.lib.module.js b/src/Components/test/testassets/Components.TestServer/wwwroot/Components.TestServer.lib.module.js
new file mode 100644
index 000000000000..4570b2c5d029
--- /dev/null
+++ b/src/Components/test/testassets/Components.TestServer/wwwroot/Components.TestServer.lib.module.js
@@ -0,0 +1,19 @@
+export function beforeWebAssemblyStart() {
+    appendElement('server--classic-and-modern-before-web-assembly-start', 'Server project Classic and modern "beforeWebAssemblyStart"');
+}
+
+export function afterWebAssemblyStarted() {
+    appendElement('server--classic-and-modern-after-web-assembly-started', 'Server project Classic and modern "afterWebAssemblyStarted"');
+}
+
+// Duplicated in BasicTestApp\wwwroot\JSInitializers\ClassicAndModern\BasicTestApp.lib.module.js
+function appendElement(id, text) {
+    var content = document.getElementById('initializers-content');
+    if (!content) {
+        return;
+    }
+    var element = document.createElement('p');
+    element.id = id;
+    element.innerText = text;
+    content.appendChild(element);
+}
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
index deabcd7fccae..5cd17cfac619 100644
--- a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
+++ b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <StaticWebAssetBasePath>WasmMinimal</StaticWebAssetBasePath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <WasmEnableHotReload>false</WasmEnableHotReload>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveServer.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveServer.razor
new file mode 100644
index 000000000000..1212703d4b4f
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveServer.razor
@@ -0,0 +1,17 @@
+@page "/render-not-found-server"
+@using Microsoft.AspNetCore.Components;
+@using Microsoft.AspNetCore.Components.Web;
+@inject NavigationManager NavigationManager
+
+<p id="test-info">Any content</p>
+@if(RendererInfo.IsInteractive)
+{
+    <button id="trigger-not-found" @onclick="@TriggerNotFound">Trigger not found button</button>
+}
+
+@code{
+    private void TriggerNotFound()
+    {
+        NavigationManager.NotFound();
+    }
+}
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveWebassembly.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveWebassembly.razor
new file mode 100644
index 000000000000..91f31dec78a4
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundInteractiveWebassembly.razor
@@ -0,0 +1,17 @@
+@page "/render-not-found-webassembly"
+@using Microsoft.AspNetCore.Components;
+@using Microsoft.AspNetCore.Components.Web;
+@inject NavigationManager NavigationManager
+
+<p id="test-info">Any content</p>
+@if(RendererInfo.IsInteractive)
+{
+    <button id="trigger-not-found" @onclick="@TriggerNotFound">Trigger not found button</button>
+}
+
+@code{
+    private void TriggerNotFound()
+    {
+        NavigationManager.NotFound();
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundSSR.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundSSR.razor
new file mode 100644
index 000000000000..a4d3fbe8f7aa
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/NotFoundSSR.razor
@@ -0,0 +1,11 @@
+@page "/render-not-found-ssr"
+@inject NavigationManager NavigationManager
+
+<p id="test-info">Any content</p>
+
+@code{
+    protected override void OnInitialized()
+    {
+        NavigationManager.NotFound();
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor
new file mode 100644
index 000000000000..fe0362ccda63
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor
@@ -0,0 +1,28 @@
+@page "/reexecution/set-not-found"
+@page "/set-not-found"
+
+@*
+    this page is used only in global interactivity scenarios
+    the component's content will be rendered when it becomes interactive
+*@
+
+<TestContentPackage.NotFound.ComponentThatSetsNotFound @rendermode="@RenderModeHelper.GetRenderMode(_renderMode)" WaitForInteractivity="true" />
+
+@code{
+    [Parameter, SupplyParameterFromQuery(Name = "renderMode")]
+    public string? RenderModeStr { get; set; }
+
+    private RenderModeId _renderMode;
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(RenderModeStr))
+        {
+            _renderMode = RenderModeHelper.ParseRenderMode(RenderModeStr);
+        }
+        else
+        {
+            throw new ArgumentException("RenderModeStr cannot be null or empty. Did you mean to redirect to /set-not-found-ssr?", nameof(RenderModeStr));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFound-Interactive.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFound-Interactive.razor
new file mode 100644
index 000000000000..269277bb3be6
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFound-Interactive.razor
@@ -0,0 +1,23 @@
+@page "/redirection-not-found"
+@page "/reexecution/redirection-not-found"
+
+<RedirectionNotFoundComponent @rendermode="@RenderModeHelper.GetRenderMode(_renderMode)" WaitForInteractivity="true"/>
+
+@code{
+    [Parameter, SupplyParameterFromQuery(Name = "renderMode")]
+    public string? RenderModeStr { get; set; }
+
+    private RenderModeId _renderMode;
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(RenderModeStr))
+        {
+            _renderMode = RenderModeHelper.ParseRenderMode(RenderModeStr);
+        }
+        else
+        {
+            throw new ArgumentException("RenderModeStr cannot be null or empty. Did you mean to redirect to /redirection-not-found-ssr?", nameof(RenderModeStr));
+        }
+    }
+}
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFoundComponent.razor b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFoundComponent.razor
new file mode 100644
index 000000000000..46d8496af1cb
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/RedirectionNotFoundComponent.razor
@@ -0,0 +1,38 @@
+@inject NavigationManager NavigationManager
+
+@if (!WaitForInteractivity || RendererInfo.IsInteractive)
+{
+    <h1>Original page</h1>
+
+    <p id="test-info">Any content</p>
+    <a id="link-to-not-existing-page" href="@_nonExistingPath">
+        Go to not-existing-page
+    </a>
+}
+
+@code{
+    [Parameter]
+    [SupplyParameterFromQuery(Name = "navigate-programmatically")]
+    public bool? NavigateProgrammatically { get; set; }
+
+    [Parameter]
+    public bool DoAsyncOperationBeforeRedirection { get; set; } = false;
+
+    [Parameter]
+    public bool WaitForInteractivity { get; set; } = false;
+
+    private string _nonExistingPath = string.Empty;
+
+    protected override async Task OnInitializedAsync()
+    {
+        if (DoAsyncOperationBeforeRedirection)
+        {
+            await Task.Yield();
+        }
+        _nonExistingPath = $"{NavigationManager.BaseUri}reexecution/not-existing-page";
+        if (NavigateProgrammatically == true)
+        {
+            NavigationManager.NavigateTo(_nonExistingPath);
+        }
+    }
+}
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Program.cs b/src/Components/test/testassets/Components.WasmMinimal/Program.cs
index 5074e4a0a068..57f0689b6e44 100644
--- a/src/Components/test/testassets/Components.WasmMinimal/Program.cs
+++ b/src/Components/test/testassets/Components.WasmMinimal/Program.cs
@@ -4,10 +4,21 @@
 using System.Runtime.InteropServices.JavaScript;
 using System.Security.Claims;
 using Components.TestServer.Services;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using TestContentPackage;
+using TestContentPackage.Services;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.Services.AddSingleton<AsyncOperationService>();
+builder.Services.AddSingleton<InteractiveWebAssemblyService>();
+builder.Services.AddSingleton<InteractiveAutoService>();
+builder.Services.AddSingleton<InteractiveServerService>();
+
+// Register custom serializer for persistent component state
+builder.Services.AddSingleton<PersistentComponentStateSerializer<int>, CustomIntSerializer>();
+
 builder.Services.AddCascadingAuthenticationState();
 
 builder.Services.AddAuthenticationStateDeserialization(options =>
diff --git a/src/Components/test/testassets/Components.WasmMinimal/RenderModeHelper.cs b/src/Components/test/testassets/Components.WasmMinimal/RenderModeHelper.cs
new file mode 100644
index 000000000000..1845bddfbe22
--- /dev/null
+++ b/src/Components/test/testassets/Components.WasmMinimal/RenderModeHelper.cs
@@ -0,0 +1,44 @@
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
+
+public static class RenderModeHelper
+{
+    public static IComponentRenderMode GetRenderMode(RenderModeId renderMode)
+    {
+        return renderMode switch
+        {
+            RenderModeId.ServerPrerendered => RenderMode.InteractiveServer,
+            RenderModeId.ServerNonPrerendered => new InteractiveServerRenderMode(false),
+            RenderModeId.WebAssemblyPrerendered => RenderMode.InteractiveWebAssembly,
+            RenderModeId.WebAssemblyNonPrerendered => new InteractiveWebAssemblyRenderMode(false),
+            RenderModeId.AutoPrerendered => RenderMode.InteractiveAuto,
+            RenderModeId.AutoNonPrerendered => new InteractiveAutoRenderMode(false),
+            _ => throw new InvalidOperationException($"Unknown render mode: {renderMode}"),
+        };
+    }
+
+    public static RenderModeId ParseRenderMode(string? renderModeStr)
+    {
+        if (!string.IsNullOrEmpty(renderModeStr) &&
+            Enum.TryParse<RenderModeId>(renderModeStr, ignoreCase: true, out var result))
+        {
+            return result;
+        }
+        return RenderModeId.AutoNonPrerendered;
+    }
+
+}
+
+public enum RenderModeId
+{
+    ServerPrerendered = 0,
+    ServerNonPrerendered = 1,
+    WebAssemblyPrerendered = 2,
+    WebAssemblyNonPrerendered = 3,
+    AutoPrerendered = 4,
+    AutoNonPrerendered = 5,
+}
diff --git a/src/Components/test/testassets/Components.WasmMinimal/Routes.razor b/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
index ec39646aa5a5..e8bfa4af46b2 100644
--- a/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
+++ b/src/Components/test/testassets/Components.WasmMinimal/Routes.razor
@@ -1,9 +1,44 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Components.WasmMinimal.Pages.NotFound
+@using TestContentPackage.NotFound
+@inject NavigationManager NavigationManager
 
-<Router AppAssembly="@typeof(Program).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" />
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-    </Found>
-    <NotFound>There's nothing here</NotFound>
-</Router>
+@code {
+    [Parameter]
+    [SupplyParameterFromQuery(Name = "useCustomNotFoundPage")]
+    public string? UseCustomNotFoundPage { get; set; }
+
+    private Type? NotFoundPageType { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        if (string.Equals(UseCustomNotFoundPage, "true", StringComparison.OrdinalIgnoreCase))
+        {
+            NotFoundPageType = typeof(CustomNotFoundPage);
+        }
+        else
+        {
+            NotFoundPageType = null;
+        }
+    }
+}
+
+@if (NotFoundPageType != null)
+{
+    <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
+        <Found Context="routeData">
+            <RouteView RouteData="@routeData" />
+            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+        </Found>
+    </Router>
+}
+else
+{
+    <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }">
+        <Found Context="routeData">
+            <RouteView RouteData="@routeData" />
+            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+        </Found>
+        <NotFound><p id="not-found-fragment">There's nothing here</p></NotFound>
+    </Router>
+}
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Program.cs b/src/Components/test/testassets/ComponentsApp.Server/Program.cs
index 1fb78e81f354..93f34b504d12 100644
--- a/src/Components/test/testassets/ComponentsApp.Server/Program.cs
+++ b/src/Components/test/testassets/ComponentsApp.Server/Program.cs
@@ -1,7 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace ComponentsApp.Server;
 
@@ -12,10 +13,13 @@ public static void Main(string[] args)
         BuildWebHost(args).Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 
-    public static IWebHost BuildWebHost(string[] args) =>
-        CreateWebHostBuilder(args).Build();
+    public static IHost BuildWebHost(string[] args) =>
+        CreateHostBuilder(args).Build();
 }
diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props
index ad5e636d6eb6..64274438641a 100644
--- a/src/Components/test/testassets/Directory.Build.props
+++ b/src/Components/test/testassets/Directory.Build.props
@@ -19,4 +19,15 @@
       <_Parameter2>true</_Parameter2>
     </AssemblyAttribute>
   </ItemGroup>
+  <PropertyGroup>
+    <WasmPreloadAssets>false</WasmPreloadAssets>
+  </PropertyGroup>
+  <PropertyGroup>
+    <BlazorCacheBootResources>false</BlazorCacheBootResources>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <!-- Enable RespectRequiredConstructorParametersDefault to test compatibility -->
+    <RuntimeHostConfigurationOption Include="System.Text.Json.Serialization.RespectRequiredConstructorParametersDefault" Value="true" />
+  </ItemGroup>
 </Project>
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/App.razor b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
index 18684c00a742..8ee3c33fdcb1 100644
--- a/src/Components/test/testassets/GlobalizationWasmApp/App.razor
+++ b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
@@ -6,3 +6,5 @@
 <p>DateTime: <span id="dateTime">@(new DateTime(2020, 09, 02))</span></p>
 
 <p>Localized string: <span id="localizedString">@Loc["Hello"]</span></p>
+
+<WebAssemblyEnvironment />
\ No newline at end of file
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/GlobalizationWasmApp.csproj b/src/Components/test/testassets/GlobalizationWasmApp/GlobalizationWasmApp.csproj
index ffcaad706f56..25d78a0f1ff9 100644
--- a/src/Components/test/testassets/GlobalizationWasmApp/GlobalizationWasmApp.csproj
+++ b/src/Components/test/testassets/GlobalizationWasmApp/GlobalizationWasmApp.csproj
@@ -7,6 +7,8 @@
 
     <!-- Resx generation on Resources.resx only -->
     <GenerateResxSource>false</GenerateResxSource>
+
+    <WasmApplicationEnvironmentName>Staging</WasmApplicationEnvironmentName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TestTrimmedOrMultithreadingApps)' == 'true'">
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/WebAssemblyEnvironment.razor b/src/Components/test/testassets/GlobalizationWasmApp/WebAssemblyEnvironment.razor
new file mode 100644
index 000000000000..42852ced7446
--- /dev/null
+++ b/src/Components/test/testassets/GlobalizationWasmApp/WebAssemblyEnvironment.razor
@@ -0,0 +1,3 @@
+@inject Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment HostEnvironment
+
+<div id="environment">@HostEnvironment.Environment</div>
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
index a9345d1495c5..7201ad0e358b 100644
--- a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
+++ b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <head>
+    <base href="/subdir/" />
     <style>
         #blazor-error-ui { display: none }
     </style>
diff --git a/src/Components/test/testassets/TestContentPackage/CustomIntSerializer.cs b/src/Components/test/testassets/TestContentPackage/CustomIntSerializer.cs
new file mode 100644
index 000000000000..487a7b2de45e
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/CustomIntSerializer.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage;
+
+/// <summary>
+/// A custom serializer for int values that uses a custom format to test serialization extensibility.
+/// This serializer prefixes integer values with "CUSTOM:" to clearly distinguish them from JSON serialization.
+/// </summary>
+public class CustomIntSerializer : PersistentComponentStateSerializer<int>
+{
+    public override void Persist(int value, IBufferWriter<byte> writer)
+    {
+        var customFormat = $"CUSTOM:{value}";
+        var bytes = Encoding.UTF8.GetBytes(customFormat);
+        writer.Write(bytes);
+    }
+
+    public override int Restore(ReadOnlySequence<byte> data)
+    {
+        var bytes = data.ToArray();
+        var text = Encoding.UTF8.GetString(bytes);
+        
+        if (text.StartsWith("CUSTOM:", StringComparison.Ordinal) && int.TryParse(text.Substring(7), out var value))
+        {
+            return value;
+        }
+        
+        // Fallback to direct parsing if format is unexpected
+        return int.TryParse(text, out var fallbackValue) ? fallbackValue : 0;
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/DeclarativePersistStateComponent.razor b/src/Components/test/testassets/TestContentPackage/DeclarativePersistStateComponent.razor
new file mode 100644
index 000000000000..d62de87a3bc8
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/DeclarativePersistStateComponent.razor
@@ -0,0 +1,35 @@
+<p>Application state is <span id="@KeyName">@Value</span></p>
+<p>Custom value is <span id="custom-@KeyName">@CustomValue</span></p>
+<p>Render mode: <span id="render-mode-@KeyName">@_renderMode</span></p>
+<p>Prerendering disabled: <span id="prerendering-disabled-@KeyName">@PrerenderingDisabledValue</span></p>
+
+@code {
+    [Parameter, EditorRequired]
+    public string InitialValue { get; set; } = "";
+
+    [Parameter, EditorRequired]
+    public string KeyName { get; set; } = "";
+
+    [PersistentState]
+    public string Value { get; set; }
+
+    [PersistentState]
+    public int CustomValue { get; set; }
+
+    [PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
+    public string PrerenderingDisabledValue { get; set; }
+
+    private string _renderMode = "SSR";
+
+    protected override void OnInitialized()
+    {
+        Value ??= !RendererInfo.IsInteractive ? InitialValue : "not restored";
+        if (CustomValue == 0)
+        {
+            CustomValue = !RendererInfo.IsInteractive ? 42 : 0;
+        }
+        _renderMode = OperatingSystem.IsBrowser() ? "WebAssembly" : "Server";
+
+        PrerenderingDisabledValue ??= !RendererInfo.IsInteractive ? "prerender-disabled-initial" : "prerender-disabled-not-restored";
+    }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/DeclarativePersistStateComponentWrapper.razor b/src/Components/test/testassets/TestContentPackage/DeclarativePersistStateComponentWrapper.razor
new file mode 100644
index 000000000000..82608670ff64
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/DeclarativePersistStateComponentWrapper.razor
@@ -0,0 +1,12 @@
+<DeclarativePersistStateComponent @key="KeyDirective" InitialValue="@InitialValue" KeyName="@KeyName" />
+
+@code {
+    [Parameter, EditorRequired]
+    public string InitialValue { get; set; } = "";
+
+    [Parameter, EditorRequired]
+    public string KeyName { get; set; } = "";
+
+    [Parameter, EditorRequired]
+    public object KeyDirective { get; set; }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatPostsNotFound.razor b/src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatPostsNotFound.razor
new file mode 100644
index 000000000000..3fd4aa87b408
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatPostsNotFound.razor
@@ -0,0 +1,32 @@
+@using Microsoft.AspNetCore.Components.Forms
+
+@inject NavigationManager NavigationManager
+
+@if (!WaitForInteractivity || RendererInfo.IsInteractive)
+{
+    <PageTitle>Original page</PageTitle>
+
+    <form method="post" id="not-found-form" @onsubmit="HandleSubmit" @formname="PostNotFoundForm">
+        <AntiforgeryToken />
+        <button type="submit">Trigger NotFound</button>
+    </form>
+
+    <p id="test-info">Any content</p>
+}
+
+@code{
+    [Parameter]
+    public bool PerformAsyncOperationBeforeSettingNotFound { get; set; } = false;
+
+    [Parameter]
+    public bool WaitForInteractivity { get; set; } = false;
+
+    private async Task HandleSubmit()
+    {
+        if (PerformAsyncOperationBeforeSettingNotFound)
+        {
+            await Task.Yield();
+        }
+        NavigationManager.NotFound();
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatSetsNotFound.razor b/src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatSetsNotFound.razor
new file mode 100644
index 000000000000..114ce14cf9b5
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatSetsNotFound.razor
@@ -0,0 +1,26 @@
+@inject NavigationManager NavigationManager
+
+@if (!WaitForInteractivity || RendererInfo.IsInteractive)
+{
+    <PageTitle>Original page</PageTitle>
+
+    <p id="test-info">Any content</p>
+
+}
+
+@code{
+    [Parameter]
+    public bool PerformAsyncOperationBeforeSettingNotFound { get; set; } = false;
+
+    [Parameter]
+    public bool WaitForInteractivity { get; set; } = false;
+
+    protected async override Task OnInitializedAsync()
+    {
+        if (PerformAsyncOperationBeforeSettingNotFound)
+        {
+            await Task.Yield();
+        }
+        NavigationManager.NotFound();
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/CustomNotFoundPage.razor b/src/Components/test/testassets/TestContentPackage/NotFound/CustomNotFoundPage.razor
new file mode 100644
index 000000000000..ed03f17c7ccb
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/CustomNotFoundPage.razor
@@ -0,0 +1,5 @@
+@page "/render-custom-not-found-page"
+@layout NotFoundLayout
+
+<h3 id="test-info">Welcome On Custom Not Found Page</h3>
+<p>Sorry, the page you are looking for does not exist.</p>
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/Index.razor b/src/Components/test/testassets/TestContentPackage/NotFound/Index.razor
new file mode 100644
index 000000000000..5d0bd8b17ddc
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/Index.razor
@@ -0,0 +1,89 @@
+@page "/not-found-index"
+
+@using Microsoft.AspNetCore.Components.Forms
+
+@inject NavigationManager NavigationManager
+
+<h1 id="test-info">List of Not Found test pages</h1>
+
+<h2>Link navigation (enhanced nav passed in Headers)</h2>
+<ul>
+    <li><a href="@PostNotFoundNoStreaming">@PostNotFoundNoStreamingText</a></li>
+    <li><a href="@PostNotFoundNoStreamingReexecution">@PostNotFoundNoStreamingReexecutionText</a></li>
+
+    <li><a href="@PostNotFoundStreaming">@PostNotFoundStreamingText</a></li>
+    <li><a href="@PostNotFoundStreamingReexecution">@PostNotFoundStreamingReexecutionText</a></li>
+
+    <li><a href="@SetNotFoundNoStreaming">@SetNotFoundNoStreamingText</a></li>
+    <li><a href="@SetNotFoundNoStreamingReexecution">@SetNotFoundNoStreamingReexecutionText</a></li>
+
+    <li><a href="@SetNotFoundStreaming">@SetNotFoundStreamingText</a></li>
+    <li><a href="@SetNotFoundStreamingReexecution">@SetNotFoundStreamingReexecutionText</a></li>
+</ul>
+
+<h2>Programmatic navigation in a form (enhanced nav not passed in Headers)</h2>
+<form method="post" @onsubmit="() => NavigateTo(PostNotFoundNoStreaming)" @formname="ProgrammaticPostNotFoundNoStreamingForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @PostNotFoundNoStreamingText</button>
+</form>
+<form method="post" @onsubmit="() => NavigateTo(PostNotFoundNoStreamingReexecution)" @formname="ProgrammaticPostNotFoundNoStreamingReexecutionForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @PostNotFoundNoStreamingReexecutionText</button>
+</form>
+
+<form method="post" @onsubmit="() => NavigateTo(PostNotFoundStreaming)" @formname="ProgrammaticPostNotFoundStreamingForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @PostNotFoundStreamingText</button>
+</form>
+<form method="post" @onsubmit="() => NavigateTo(PostNotFoundStreamingReexecution)" @formname="ProgrammaticPostNotFoundStreamingReexecutionForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @PostNotFoundStreamingReexecutionText</button>
+</form>
+
+<form method="post" @onsubmit="() => NavigateTo(SetNotFoundNoStreaming)" @formname="ProgrammaticSetNotFoundNoStreamingForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @SetNotFoundNoStreamingText</button>
+</form>
+<form method="post" @onsubmit="() => NavigateTo(SetNotFoundNoStreamingReexecution)" @formname="ProgrammaticSetNotFoundNoStreamingReexecutionForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @SetNotFoundNoStreamingReexecutionText</button>
+</form>
+
+<form method="post" @onsubmit="() => NavigateTo(SetNotFoundStreaming)" @formname="ProgrammaticSetNotFoundStreamingForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @SetNotFoundStreamingText</button>
+</form>
+<form method="post" @onsubmit="() => NavigateTo(SetNotFoundStreamingReexecution)" @formname="ProgrammaticSetNotFoundStreamingReexecutionForm">
+    <AntiforgeryToken />
+    <button type="submit">Programmatic navigate to @SetNotFoundStreamingReexecutionText</button>
+</form>
+
+@code {
+    [SupplyParameterFromQuery]
+    public bool useCustomNotFoundPage { get; set; }
+
+    private string AppendQuery(string url) => $"{url}?useCustomNotFoundPage={useCustomNotFoundPage}";
+
+    private string PostNotFoundNoStreaming => AppendQuery("post-not-found-ssr");
+    private string PostNotFoundNoStreamingReexecution => AppendQuery($"reexecution/post-not-found-ssr");
+    private string PostNotFoundStreaming => AppendQuery("post-not-found-ssr-streaming");
+    private string PostNotFoundStreamingReexecution => AppendQuery($"reexecution/post-not-found-ssr-streaming");
+    private string SetNotFoundNoStreaming => AppendQuery("set-not-found-ssr");
+    private string SetNotFoundNoStreamingReexecution => AppendQuery($"reexecution/set-not-found-ssr");
+    private string SetNotFoundStreaming => AppendQuery("set-not-found-ssr-streaming");
+    private string SetNotFoundStreamingReexecution => AppendQuery($"reexecution/set-not-found-ssr-streaming");
+
+    private const string PostNotFoundNoStreamingText = "PageThatPostsNotFound-no-streaming";
+    private const string PostNotFoundNoStreamingReexecutionText = $"{PostNotFoundNoStreamingText} with reexecution";
+    private const string PostNotFoundStreamingText = "PageThatPostsNotFound-streaming";
+    private const string PostNotFoundStreamingReexecutionText = $"{PostNotFoundStreamingText} with reexecution";
+    private const string SetNotFoundNoStreamingText = "PageThatSetsNotFound-no-streaming";
+    private const string SetNotFoundNoStreamingReexecutionText = $"{SetNotFoundNoStreamingText} with reexecution";
+    private const string SetNotFoundStreamingText = "PageThatSetsNotFound-streaming";
+    private const string SetNotFoundStreamingReexecutionText = $"{SetNotFoundStreamingText} with reexecution";
+
+    private void NavigateTo(string url)
+    {
+        NavigationManager.NavigateTo(url);
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/NotFoundLayout.razor b/src/Components/test/testassets/TestContentPackage/NotFound/NotFoundLayout.razor
new file mode 100644
index 000000000000..14f82987bc24
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/NotFoundLayout.razor
@@ -0,0 +1,23 @@
+@inherits LayoutComponentBase
+
+<div class="page">
+    <header class="top-bar">
+        <a id="about-link" href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
+    </header>
+    <main>
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>
+
+<style>
+    .top-bar {
+        background-color: #0078d4;
+        color: white;
+        padding: 10px;
+        text-align: center;
+        width: 100%;
+        box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.2);
+    }
+</style>
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/NotFoundPage.razor b/src/Components/test/testassets/TestContentPackage/NotFound/NotFoundPage.razor
new file mode 100644
index 000000000000..26641748f282
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/NotFoundPage.razor
@@ -0,0 +1,6 @@
+@page "/not-found"
+
+<PageTitle>Default Not Found Page</PageTitle>
+
+<p id="test-info">This page is used for a workaround of NavigationManager.NotFound() method, used in SSR when the response already started and changing it to 404 is not possible.
+    This workaround triggers navigation to a constant "not-found" relative path.</p>
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-no-streaming.razor b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-no-streaming.razor
new file mode 100644
index 000000000000..76799fd2c648
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-no-streaming.razor
@@ -0,0 +1,16 @@
+@page "/reexecution/post-not-found-ssr"
+@page "/post-not-found-ssr"
+@attribute [StreamRendering(false)]
+
+@*
+    this page is used in global interactivity and no interactivity scenarios
+    the content is rendered on the server without streaming and might become
+    interactive later if interactivity was enabled in the app
+*@
+
+<TestContentPackage.NotFound.ComponentThatPostsNotFound PerformAsyncOperationBeforeSettingNotFound="@DoAsync" />
+
+@code{
+    [SupplyParameterFromQuery(Name = "doAsync")]
+    public bool DoAsync { get; set; } = false;
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-streaming.razor b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-streaming.razor
new file mode 100644
index 000000000000..3b73f76db70e
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatPostsNotFound-streaming.razor
@@ -0,0 +1,11 @@
+@page "/reexecution/post-not-found-ssr-streaming"
+@page "/post-not-found-ssr-streaming"
+@attribute [StreamRendering(true)]
+
+@*
+    this page is used in global interactivity and no interactivity scenarios
+    the content is rendered on the server with streaming and might become
+    interactive later if interactivity was enabled in the app
+*@
+
+<TestContentPackage.NotFound.ComponentThatPostsNotFound PerformAsyncOperationBeforeSettingNotFound="true"/>
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-no-streaming.razor b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-no-streaming.razor
new file mode 100644
index 000000000000..7006addc80a1
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-no-streaming.razor
@@ -0,0 +1,16 @@
+@page "/reexecution/set-not-found-ssr"
+@page "/set-not-found-ssr"
+@attribute [StreamRendering(false)]
+
+@*
+    this page is used in global interactivity and no interactivity scenarios
+    the content is rendered on the server without streaming and might become
+    interactive later if interactivity was enabled in the app
+*@
+
+<TestContentPackage.NotFound.ComponentThatSetsNotFound PerformAsyncOperationBeforeSettingNotFound="@DoAsync" />
+
+@code{
+    [SupplyParameterFromQuery(Name = "doAsync")]
+    public bool DoAsync { get; set; } = false;
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-streaming.razor b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-streaming.razor
new file mode 100644
index 000000000000..a88e4f1bcd3f
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/PageThatSetsNotFound-streaming.razor
@@ -0,0 +1,11 @@
+@page "/reexecution/set-not-found-ssr-streaming"
+@page "/set-not-found-ssr-streaming"
+@attribute [StreamRendering(true)]
+
+@*
+    this page is used in global interactivity and no interactivity scenarios
+    the content is rendered on the server with streaming and might become
+    interactive later if interactivity was enabled in the app
+*@
+
+<TestContentPackage.NotFound.ComponentThatSetsNotFound PerformAsyncOperationBeforeSettingNotFound="true"/>
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/ReExecutedComponent.razor b/src/Components/test/testassets/TestContentPackage/NotFound/ReExecutedComponent.razor
new file mode 100644
index 000000000000..de208d2a681c
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/ReExecutedComponent.razor
@@ -0,0 +1,4 @@
+<PageTitle>Re-executed page</PageTitle>
+
+<h3 id="test-info">Welcome On Page Re-executed After Not Found Event</h3>
+<p>This page is shown when UseStatusCodePagesWithReExecute is set and another page sets 404</p>
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/ReexecutedPage.razor b/src/Components/test/testassets/TestContentPackage/NotFound/ReexecutedPage.razor
new file mode 100644
index 000000000000..a36b405c45f4
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/ReexecutedPage.razor
@@ -0,0 +1,3 @@
+@page "/not-found-reexecute"
+
+<ReExecutedComponent />
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/NotFound/ReexecutedPageInteractive.razor b/src/Components/test/testassets/TestContentPackage/NotFound/ReexecutedPageInteractive.razor
new file mode 100644
index 000000000000..c041b96d14f8
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/NotFound/ReexecutedPageInteractive.razor
@@ -0,0 +1,17 @@
+@page "/not-found-reexecute-interactive"
+@rendermode RenderMode.InteractiveServer
+
+<ReExecutedComponent />
+
+<p role="status">Current count: @currentCount</p>
+
+<button id="increment-button" class="btn btn-primary" @onclick="IncrementCount">Click me</button>
+
+@code {
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        currentCount++;
+    }
+}
\ No newline at end of file
diff --git a/src/Components/test/testassets/TestContentPackage/PersistServicesState.razor b/src/Components/test/testassets/TestContentPackage/PersistServicesState.razor
new file mode 100644
index 000000000000..e8d45fd9958f
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/PersistServicesState.razor
@@ -0,0 +1,41 @@
+@using TestContentPackage.Services
+
+@inject InteractiveServerService InteractiveServerState
+@inject InteractiveWebAssemblyService InteractiveWebAssemblyState
+@inject InteractiveAutoService InteractiveAutoState
+
+<p>Interactive server state is <span id="server-state">@InteractiveServerState.State</span></p>
+<p>Filtered server state is <span id="filtered-server-state">@InteractiveServerState.FilteredState</span></p>
+<p>Interactive webassembly state is <span id="wasm-state">@InteractiveWebAssemblyState.State</span></p>
+<p>Filtered webassembly state is <span id="filtered-wasm-state">@InteractiveWebAssemblyState.FilteredState</span></p>
+<p>Interactive auto state is <span id="auto-state">@InteractiveAutoState.State</span></p>
+<p>Filtered auto state is <span id="filtered-auto-state">@InteractiveAutoState.FilteredState</span></p>
+
+<p>Render mode: <span id="render-mode">@_renderMode</span></p>
+
+@code {
+
+    private string _renderMode = "";
+
+    protected override void OnInitialized()
+    {
+        _renderMode = RendererInfo.Name;
+        if (!RendererInfo.IsInteractive)
+        {
+            InteractiveServerState.State = "Server state";
+            InteractiveServerState.FilteredState = "Filtered server state";
+            InteractiveWebAssemblyState.State = "WebAssembly state";
+            InteractiveWebAssemblyState.FilteredState = "Filtered webassembly state";
+            InteractiveAutoState.State = "Auto state";
+            InteractiveAutoState.FilteredState = "Filtered auto state";
+        }else
+        {
+            InteractiveServerState.State ??= "not restored";
+            InteractiveServerState.FilteredState ??= "not restored";
+            InteractiveWebAssemblyState.State ??= "not restored";
+            InteractiveWebAssemblyState.FilteredState ??= "not restored";
+            InteractiveAutoState.FilteredState ??= "not restored";
+            InteractiveAutoState.State ??= "not restored";
+        }
+    }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/PersistentComponents/NonStreamingComponentWithDeclarativePersistentState.razor b/src/Components/test/testassets/TestContentPackage/PersistentComponents/NonStreamingComponentWithDeclarativePersistentState.razor
new file mode 100644
index 000000000000..56dff42b75cf
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/PersistentComponents/NonStreamingComponentWithDeclarativePersistentState.razor
@@ -0,0 +1,40 @@
+<p>Non streaming component with persistent state</p>
+
+<p>This component demonstrates state persistence in the absence of streaming rendering.
+When the component renders it will try to restore the state and if present display that
+it succeeded in doing so and the restored value.
+If the state is not present, it will indicate it didn't find it and display a "fresh"
+value.</p>
+
+<p id="interactive">Interactive: @(RendererInfo.IsInteractive)</p>
+<p id="interactive-runtime">Interactive runtime: @_interactiveRuntime</p>
+<p id="state-value">State value:@EnhancedNavState</p>
+
+<a id="enhanced-nav-update" href="@Navigation.GetUriWithQueryParameter("server-state", "updated")">With updated server state</a>
+<br />
+
+@code {
+    private string _interactiveRuntime;
+
+    [Inject] public PersistentComponentState PersistentComponentState { get; set; }
+    [Inject] public NavigationManager Navigation { get; set; }
+
+    [Parameter] public string ServerState { get; set; }
+
+    [PersistentState(AllowUpdates = true)]
+    public string EnhancedNavState { get; set; }
+
+    protected override void OnInitialized()
+    {
+        if (!RendererInfo.IsInteractive)
+        {
+            _interactiveRuntime = "none";
+            EnhancedNavState = ServerState;
+        }
+        else
+        {
+            EnhancedNavState ??= "not found";
+            _interactiveRuntime = OperatingSystem.IsBrowser() ? "wasm" : "server";
+        }
+    }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/PersistentComponents/StreamingComponentWithDeclarativePersistentState.razor b/src/Components/test/testassets/TestContentPackage/PersistentComponents/StreamingComponentWithDeclarativePersistentState.razor
new file mode 100644
index 000000000000..d9dcd8b18f8c
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/PersistentComponents/StreamingComponentWithDeclarativePersistentState.razor
@@ -0,0 +1,59 @@
+@using Components.TestServer.Services
+@attribute [StreamRendering]
+<p>Streaming component with persistent state</p>
+
+<p>This component demonstrates state persistence alongside streaming rendering. When the component first renders, it'll emit a message "streaming" and yield until its notified via a call to <code>/persistent-state/end-streaming</code>. When the component renders it will try to restore the state and if present display that it succeded in doing so and the restored value. If the state is not present, it will indicate it didn't find it and display a "fresh" value.</p>
+
+<p id="interactive">Interactive: @(RendererInfo.IsInteractive)</p>
+@if (_streaming)
+{
+    <p id="streaming">Streaming: @_streaming</p>
+}
+else
+{
+    <p id="interactive-runtime">Interactive runtime: @_interactiveRuntime</p>
+    <p id="state-value">State value:@EnhancedNavState</p>
+}
+
+<a id="enhanced-nav-update" href="@Navigation.GetUriWithQueryParameter("server-state", "updated")">With updated server state</a>
+<br />
+
+
+@code {
+
+    private bool _streaming;
+    private string _interactiveRuntime;
+
+    [Inject] public AsyncOperationService StreamingManager { get; set; }
+
+    [Inject] public NavigationManager Navigation { get; set; }
+
+    [Parameter] public string StreamingId { get; set; }
+
+    [Parameter] public string ServerState { get; set; }
+
+    [PersistentState(AllowUpdates = true)]
+    public string EnhancedNavState { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        if (string.IsNullOrEmpty(StreamingId))
+        {
+            throw new InvalidOperationException("StreamingId is required.");
+        }
+
+        if (!RendererInfo.IsInteractive)
+        {
+            _interactiveRuntime = "none";
+            _streaming = true;
+            await StreamingManager.Start(StreamingId);
+            _streaming = false;
+            EnhancedNavState = ServerState;
+        }
+        else
+        {
+            EnhancedNavState ??= "not found";
+            _interactiveRuntime = OperatingSystem.IsBrowser() ? "wasm" : "server";
+        }
+    }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/PersistentCounter.razor b/src/Components/test/testassets/TestContentPackage/PersistentCounter.razor
new file mode 100644
index 000000000000..9b7302adb783
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/PersistentCounter.razor
@@ -0,0 +1,52 @@
+@using Microsoft.JSInterop
+@inject IJSRuntime JSRuntime
+
+<!-- The render changes when the component is resumed because it runs in a separate circuit -->
+@if (RendererInfo.IsInteractive)
+{
+    <p>Interactive <span id="render-mode-interactive">@RendererInfo.IsInteractive</span></p>
+}
+<p>Current render GUID: <span id="persistent-counter-render">@Guid.NewGuid().ToString()</span></p>
+
+
+<p>Current count: <span id="persistent-counter-count">@State.Count</span></p>
+<p>Non-persisted counter: <span id="non-persisted-counter">@NonPersistedCounter</span></p>
+
+<button id="increment-persistent-counter-count" @onclick="IncrementCount">Click me</button>
+<button id="increment-non-persisted-counter" @onclick="IncrementNonPersistedCount">Increment non-persisted</button>
+
+@code {
+
+    [PersistentState]
+    public CounterState State { get; set; }
+
+    [PersistentState(RestoreBehavior = RestoreBehavior.SkipLastSnapshot)]
+    public int NonPersistedCounter { get; set; }
+
+    public class CounterState
+    {
+        public int Count { get; set; } = 0;
+    }
+
+    protected override void OnInitialized()
+    {
+        // State is preserved across disconnections
+        State ??= new CounterState();
+
+        // Initialize non-persisted counter to 5 during SSR (before interactivity)
+        if (!RendererInfo.IsInteractive)
+        {
+            NonPersistedCounter = 5;
+        }
+    }
+
+    private void IncrementCount()
+    {
+        State.Count = State.Count + 1;
+    }
+
+    private void IncrementNonPersistedCount()
+    {
+        NonPersistedCounter = NonPersistedCounter + 1;
+    }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/Services/InteractiveAutoService.cs b/src/Components/test/testassets/TestContentPackage/Services/InteractiveAutoService.cs
new file mode 100644
index 000000000000..963427a4bb9c
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/Services/InteractiveAutoService.cs
@@ -0,0 +1,18 @@
+// 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.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage.Services;
+
+public class InteractiveAutoService
+{
+    [PersistentState]
+    public string State { get; set; }
+
+    [PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
+    public string FilteredState { get; set; }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/Services/InteractiveServerService.cs b/src/Components/test/testassets/TestContentPackage/Services/InteractiveServerService.cs
new file mode 100644
index 000000000000..8ee8dfc049bd
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/Services/InteractiveServerService.cs
@@ -0,0 +1,17 @@
+// 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.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage.Services;
+public class InteractiveServerService
+{
+    [PersistentState]
+    public string State { get; set; }
+
+    [PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
+    public string FilteredState { get; set; }
+}
diff --git a/src/Components/test/testassets/TestContentPackage/Services/InteractiveWebAssemblyService.cs b/src/Components/test/testassets/TestContentPackage/Services/InteractiveWebAssemblyService.cs
new file mode 100644
index 000000000000..a44e038b23a2
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/Services/InteractiveWebAssemblyService.cs
@@ -0,0 +1,18 @@
+// 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.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Components;
+
+namespace TestContentPackage.Services;
+
+public class InteractiveWebAssemblyService
+{
+    [PersistentState]
+    public string State { get; set; }
+
+    [PersistentState(RestoreBehavior = RestoreBehavior.SkipInitialValue)]
+    public string FilteredState { get; set; }
+}
diff --git a/src/DataProtection/Cryptography.Internal/src/CryptoUtil.cs b/src/DataProtection/Cryptography.Internal/src/CryptoUtil.cs
index 0c4526a6419b..dbabd1b9359e 100644
--- a/src/DataProtection/Cryptography.Internal/src/CryptoUtil.cs
+++ b/src/DataProtection/Cryptography.Internal/src/CryptoUtil.cs
@@ -92,24 +92,18 @@ public static bool TimeConstantBuffersAreEqual(byte* bufA, byte* bufB, uint coun
     }
 
     [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
-    public static bool TimeConstantBuffersAreEqual(byte[] bufA, int offsetA, int countA, byte[] bufB, int offsetB, int countB)
+    public static bool TimeConstantBuffersAreEqual(ReadOnlySpan<byte> bufA, ReadOnlySpan<byte> bufB)
     {
-        // Technically this is an early exit scenario, but it means that the caller did something bizarre.
-        // An error at the call site isn't usable for timing attacks.
-        Assert(countA == countB, "countA == countB");
+        // This early exit handles unexpected input without introducing timing vulnerabilities.
+        Assert(bufA.Length == bufB.Length, "countA == countB");
 
 #if NETCOREAPP
-        unsafe
-        {
-            return CryptographicOperations.FixedTimeEquals(
-                bufA.AsSpan(start: offsetA, length: countA),
-                bufB.AsSpan(start: offsetB, length: countB));
-        }
+        return CryptographicOperations.FixedTimeEquals(bufA, bufB);
 #else
         bool areEqual = true;
-        for (int i = 0; i < countA; i++)
+        for (int i = 0; i < bufA.Length; i++)
         {
-            areEqual &= (bufA[offsetA + i] == bufB[offsetB + i]);
+            areEqual &= (bufA[i] == bufB[i]);
         }
         return areEqual;
 #endif
diff --git a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
index e90b466580d2..aa5d5730a02e 100644
--- a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
+++ b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
@@ -19,4 +19,8 @@
     <InternalsVisibleTo Include="Microsoft.AspNetCore.DataProtection.Extensions.Tests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.DataProtection.Tests" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'">
+    <Reference Include="System.Memory" />
+  </ItemGroup>
 </Project>
diff --git a/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
index d5cd7420582f..6d6d9f9f6d66 100644
--- a/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
+++ b/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
@@ -55,6 +55,6 @@ public void GenRandom_PopulatesBuffer()
             }
         }
 
-        Assert.True(false, "Buffer was not filled as expected.");
+        Assert.Fail("Buffer was not filled as expected.");
     }
 }
diff --git a/src/DataProtection/Cryptography.Internal/test/CryptoUtilTests.cs b/src/DataProtection/Cryptography.Internal/test/CryptoUtilTests.cs
index 612a2300b1ed..6e57b9051652 100644
--- a/src/DataProtection/Cryptography.Internal/test/CryptoUtilTests.cs
+++ b/src/DataProtection/Cryptography.Internal/test/CryptoUtilTests.cs
@@ -1,6 +1,7 @@
 // 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 Xunit;
 
 namespace Microsoft.AspNetCore.Cryptography;
@@ -15,7 +16,7 @@ public void TimeConstantBuffersAreEqual_Array_Equal()
         byte[] b = new byte[] { 0xAB, 0xCD, 0x23, 0x45, 0x67, 0xEF };
 
         // Act & assert
-        Assert.True(CryptoUtil.TimeConstantBuffersAreEqual(a, 1, 3, b, 2, 3));
+        Assert.True(CryptoUtil.TimeConstantBuffersAreEqual(a.AsSpan(1, 3), b.AsSpan(2, 3)));
     }
 
     [Fact]
@@ -25,7 +26,7 @@ public void TimeConstantBuffersAreEqual_Array_Unequal()
         byte[] b = new byte[] { 0xAB, 0xCD, 0x23, 0xFF, 0x67, 0xEF };
 
         // Act & assert
-        Assert.False(CryptoUtil.TimeConstantBuffersAreEqual(a, 1, 3, b, 2, 3));
+        Assert.False(CryptoUtil.TimeConstantBuffersAreEqual(a.AsSpan(1, 3), b.AsSpan(2, 3)));
     }
 
     [Fact]
diff --git a/src/DataProtection/DataProtection.slnf b/src/DataProtection/DataProtection.slnf
index 06e59cabfb26..dafc26b7f42a 100644
--- a/src/DataProtection/DataProtection.slnf
+++ b/src/DataProtection/DataProtection.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Abstractions\\test\\Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj",
diff --git a/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs
index 9ee20854dae7..844042cf14d9 100644
--- a/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs
+++ b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs
@@ -77,34 +77,4 @@ void IInternalAlgorithmConfiguration.Validate()
         using var encryptor = factory.CreateAuthenticatedEncryptorInstance(secret, this);
         encryptor.PerformSelfTest();
     }
-
-    // Any changes to this method should also be be reflected
-    // in ManagedAuthenticatedEncryptorDescriptorDeserializer.FriendlyNameToType.
-    private static string TypeToFriendlyName(Type type)
-    {
-        if (type == typeof(Aes))
-        {
-            return nameof(Aes);
-        }
-        else if (type == typeof(HMACSHA1))
-        {
-            return nameof(HMACSHA1);
-        }
-        else if (type == typeof(HMACSHA256))
-        {
-            return nameof(HMACSHA256);
-        }
-        else if (type == typeof(HMACSHA384))
-        {
-            return nameof(HMACSHA384);
-        }
-        else if (type == typeof(HMACSHA512))
-        {
-            return nameof(HMACSHA512);
-        }
-        else
-        {
-            return type.AssemblyQualifiedName!;
-        }
-    }
 }
diff --git a/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml b/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/DataProtection/DataProtection/src/Internal/ContainerUtils.cs b/src/DataProtection/DataProtection/src/Internal/ContainerUtils.cs
index 5ae6c60ca89b..3e49202877a8 100644
--- a/src/DataProtection/DataProtection/src/Internal/ContainerUtils.cs
+++ b/src/DataProtection/DataProtection/src/Internal/ContainerUtils.cs
@@ -103,7 +103,7 @@ private static bool IsProcessRunningInContainer()
 
         var lines = File.ReadAllLines(procFile);
         // typically the last line in the file is "1:name=openrc:/docker"
-        return lines.Reverse().Any(l => l.EndsWith("name=openrc:/docker", StringComparison.Ordinal));
+        return Enumerable.Reverse(lines).Any(l => l.EndsWith("name=openrc:/docker", StringComparison.Ordinal));
     }
 
     private static bool GetBooleanEnvVar(string envVarName)
diff --git a/src/DataProtection/DataProtection/src/KeyManagement/DefaultKeyResolver.cs b/src/DataProtection/DataProtection/src/KeyManagement/DefaultKeyResolver.cs
index c16c8842ad12..2c60e6356bae 100644
--- a/src/DataProtection/DataProtection/src/KeyManagement/DefaultKeyResolver.cs
+++ b/src/DataProtection/DataProtection/src/KeyManagement/DefaultKeyResolver.cs
@@ -157,8 +157,9 @@ private bool CanCreateAuthenticatedEncryptor(IKey key, ref int retriesRemaining)
         // fallback code below and the hypothetical advantage of making it easier for instances
         // to choose the same key in the event of a race (though we never managed to show that
         // empirically.  See also https://github.com/dotnet/aspnetcore/issues/57137.
+        var maxActivationDate = now + _maxServerToServerClockSkew;
         var preferredDefaultKey = (from key in allKeys
-                                   where key.ActivationDate <= now + _maxServerToServerClockSkew
+                                   where key.ActivationDate <= maxActivationDate
                                    orderby key.ActivationDate descending, key.KeyId ascending
                                    select key).FirstOrDefault();
 
@@ -192,13 +193,14 @@ private bool CanCreateAuthenticatedEncryptor(IKey key, ref int retriesRemaining)
         // Unlike for the preferred key, we don't choose a fallback key and then reject it if
         // CanCreateAuthenticatedEncryptor is false.  We want to end up with *some* key, so we
         // keep trying until we find one that works.
+        var maxCreationDate = now - _keyPropagationWindow;
         var unrevokedKeys = allKeys.Where(key => !key.IsRevoked);
         fallbackKey = (from key in (from key in unrevokedKeys
                                     where !ReferenceEquals(key, preferredDefaultKey) // Don't reconsider it as a fallback
-                                    where key.CreationDate <= now - _keyPropagationWindow
+                                    where key.CreationDate <= maxCreationDate
                                     orderby key.CreationDate descending
                                     select key).Concat(from key in unrevokedKeys
-                                                       where key.CreationDate > now - _keyPropagationWindow
+                                                       where key.CreationDate > maxCreationDate
                                                        orderby key.CreationDate ascending
                                                        select key)
                        where CanCreateAuthenticatedEncryptor(key, ref decryptRetriesRemaining)
diff --git a/src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs
index ed0e20cdd6cd..9f19e137a48f 100644
--- a/src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs
+++ b/src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers.Binary;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -14,6 +16,8 @@
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
 using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Logging;
+using System.Buffers.Text;
+using Microsoft.AspNetCore.DataProtection.Internal;
 
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement;
 
@@ -313,39 +317,13 @@ private static void WriteBigEndianInteger(byte* ptr, uint value)
         ptr[3] = (byte)(value);
     }
 
-    private struct AdditionalAuthenticatedDataTemplate
+    internal struct AdditionalAuthenticatedDataTemplate
     {
         private byte[] _aadTemplate;
 
-        public AdditionalAuthenticatedDataTemplate(IEnumerable<string> purposes)
+        public AdditionalAuthenticatedDataTemplate(string[] purposes)
         {
-            const int MEMORYSTREAM_DEFAULT_CAPACITY = 0x100; // matches MemoryStream.EnsureCapacity
-            var ms = new MemoryStream(MEMORYSTREAM_DEFAULT_CAPACITY);
-
-            // additionalAuthenticatedData := { magicHeader (32-bit) || keyId || purposeCount (32-bit) || (purpose)* }
-            // purpose := { utf8ByteCount (7-bit encoded) || utf8Text }
-
-            using (var writer = new PurposeBinaryWriter(ms))
-            {
-                writer.WriteBigEndian(MAGIC_HEADER_V0);
-                Debug.Assert(ms.Position == sizeof(uint));
-                var posPurposeCount = writer.Seek(sizeof(Guid), SeekOrigin.Current); // skip over where the key id will be stored; we'll fill it in later
-                writer.Seek(sizeof(uint), SeekOrigin.Current); // skip over where the purposeCount will be stored; we'll fill it in later
-
-                uint purposeCount = 0;
-                foreach (string purpose in purposes)
-                {
-                    Debug.Assert(purpose != null);
-                    writer.Write(purpose); // prepends length as a 7-bit encoded integer
-                    purposeCount++;
-                }
-
-                // Once we have written all the purposes, go back and fill in 'purposeCount'
-                writer.Seek(checked((int)posPurposeCount), SeekOrigin.Begin);
-                writer.WriteBigEndian(purposeCount);
-            }
-
-            _aadTemplate = ms.ToArray();
+            _aadTemplate = BuildAadTemplateBytes(purposes);
         }
 
         public byte[] GetAadForKey(Guid keyId, bool isProtecting)
@@ -381,19 +359,57 @@ public byte[] GetAadForKey(Guid keyId, bool isProtecting)
             }
         }
 
-        private sealed class PurposeBinaryWriter : BinaryWriter
+        internal static byte[] BuildAadTemplateBytes(string[] purposes)
         {
-            public PurposeBinaryWriter(MemoryStream stream) : base(stream, EncodingUtil.SecureUtf8Encoding, leaveOpen: true) { }
+            // additionalAuthenticatedData := { magicHeader (32-bit) || keyId || purposeCount (32-bit) || (purpose)* }
+            // purpose := { utf8ByteCount (7-bit encoded) || utf8Text }
+
+            var keySize = sizeof(Guid);
+            int totalPurposeLen = 4 + keySize + 4;
 
-            // Writes a big-endian 32-bit integer to the underlying stream.
-            public void WriteBigEndian(uint value)
+            int[]? lease = null;
+            var targetLength = purposes.Length;
+            Span<int> purposeLengthsPool = targetLength <= 32 ? stackalloc int[targetLength] : (lease = ArrayPool<int>.Shared.Rent(targetLength)).AsSpan(0, targetLength);
+            for (int i = 0; i < targetLength; i++)
             {
-                var outStream = BaseStream; // property accessor also performs a flush
-                outStream.WriteByte((byte)(value >> 24));
-                outStream.WriteByte((byte)(value >> 16));
-                outStream.WriteByte((byte)(value >> 8));
-                outStream.WriteByte((byte)(value));
+                string purpose = purposes[i];
+
+                int purposeLength = EncodingUtil.SecureUtf8Encoding.GetByteCount(purpose);
+                purposeLengthsPool[i] = purposeLength;
+
+                var encoded7BitUIntLength = purposeLength.Measure7BitEncodedUIntLength();
+                totalPurposeLen += purposeLength /* length of actual string */ + encoded7BitUIntLength /* length of 'string length' 7-bit encoded int */;
             }
+
+            byte[] targetArr = new byte[totalPurposeLen];
+            var targetSpan = targetArr.AsSpan();
+
+            // index 0: magic header
+            BinaryPrimitives.WriteUInt32BigEndian(targetSpan.Slice(0), MAGIC_HEADER_V0);
+            // index 4: key (skipped for now, will be populated in `GetAadForKey()`)
+            // index 4 + keySize: purposeCount
+            BinaryPrimitives.WriteInt32BigEndian(targetSpan.Slice(4 + keySize), targetLength);
+
+            int index = 4 /* MAGIC_HEADER_V0 */ + keySize + 4 /* purposeLength */; // starting from first purpose
+            for (int i = 0; i < targetLength; i++)
+            {
+                string purpose = purposes[i];
+
+                // writing `utf8ByteCount (7-bit encoded integer)`
+                // we have already calculated the lengths of the purpose strings, so just get it from the pool
+                index += targetSpan.Slice(index).Write7BitEncodedInt(purposeLengthsPool[i]);
+
+                // write the utf8text for the purpose
+                index += EncodingUtil.SecureUtf8Encoding.GetBytes(purpose, charIndex: 0, charCount: purpose.Length, bytes: targetArr, byteIndex: index);
+            }
+
+            if (lease is not null)
+            {
+                ArrayPool<int>.Shared.Return(lease);
+            }
+            Debug.Assert(index == targetArr.Length);
+
+            return targetArr;
         }
     }
 
diff --git a/src/DataProtection/DataProtection/src/Managed/AesGcmAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Managed/AesGcmAuthenticatedEncryptor.cs
index 7fbc7ce37e1b..413adfb4825f 100644
--- a/src/DataProtection/DataProtection/src/Managed/AesGcmAuthenticatedEncryptor.cs
+++ b/src/DataProtection/DataProtection/src/Managed/AesGcmAuthenticatedEncryptor.cs
@@ -35,8 +35,6 @@ internal sealed unsafe class AesGcmAuthenticatedEncryptor : IOptimizedAuthentica
     // 256 00-01-00-00-00-20-00-00-00-0C-00-00-00-10-00-00-00-10-E7-DC-CE-66-DF-85-5A-32-3A-6B-B7-BD-7A-59-BE-45
     private static readonly byte[] AES_256_GCM_Header = new byte[] { 0x00, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0xE7, 0xDC, 0xCE, 0x66, 0xDF, 0x85, 0x5A, 0x32, 0x3A, 0x6B, 0xB7, 0xBD, 0x7A, 0x59, 0xBE, 0x45 };
 
-    private static readonly Func<byte[], HashAlgorithm> _kdkPrfFactory = key => new HMACSHA512(key); // currently hardcoded to SHA512
-
     private readonly byte[] _contextHeader;
 
     private readonly Secret _keyDerivationKey;
@@ -112,13 +110,13 @@ public byte[] Decrypt(ArraySegment<byte> ciphertext, ArraySegment<byte> addition
                 try
                 {
                     _keyDerivationKey.WriteSecretIntoBuffer(new ArraySegment<byte>(decryptedKdk));
-                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeysWithContextHeader(
+                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeys(
                         kdk: decryptedKdk,
                         label: additionalAuthenticatedData,
                         contextHeader: _contextHeader,
-                        context: keyModifier,
-                        prfFactory: _kdkPrfFactory,
-                        output: new ArraySegment<byte>(derivedKey));
+                        contextData: keyModifier,
+                        operationSubkey: derivedKey,
+                        validationSubkey: Span<byte>.Empty /* filling in derivedKey only */ );
 
                     // Perform the decryption operation
                     var nonce = new Span<byte>(ciphertext.Array, nonceOffset, NONCE_SIZE_IN_BYTES);
@@ -185,13 +183,13 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
                 try
                 {
                     _keyDerivationKey.WriteSecretIntoBuffer(new ArraySegment<byte>(decryptedKdk));
-                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeysWithContextHeader(
+                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeys(
                         kdk: decryptedKdk,
                         label: additionalAuthenticatedData,
                         contextHeader: _contextHeader,
-                        context: keyModifier,
-                        prfFactory: _kdkPrfFactory,
-                        output: new ArraySegment<byte>(derivedKey));
+                        contextData: keyModifier,
+                        operationSubkey: derivedKey,
+                        validationSubkey: Span<byte>.Empty /* filling in derivedKey only */ );
 
                     // do gcm
                     var nonce = new Span<byte>(retVal, nonceOffset, NONCE_SIZE_IN_BYTES);
diff --git a/src/DataProtection/DataProtection/src/Managed/IManagedGenRandom.cs b/src/DataProtection/DataProtection/src/Managed/IManagedGenRandom.cs
index 2bb04c686fda..c865ecb2edf7 100644
--- a/src/DataProtection/DataProtection/src/Managed/IManagedGenRandom.cs
+++ b/src/DataProtection/DataProtection/src/Managed/IManagedGenRandom.cs
@@ -1,9 +1,15 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+
 namespace Microsoft.AspNetCore.DataProtection.Managed;
 
 internal interface IManagedGenRandom
 {
     byte[] GenRandom(int numBytes);
+
+#if NET10_0_OR_GREATER
+    void GenRandom(Span<byte> target);
+#endif
 }
diff --git a/src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs
index 775e0070d6c7..e11e3862b53e 100644
--- a/src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs
+++ b/src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
+using Microsoft.AspNetCore.DataProtection.Internal;
 using Microsoft.AspNetCore.DataProtection.SP800_108;
 
 namespace Microsoft.AspNetCore.DataProtection.Managed;
@@ -26,8 +30,6 @@ internal sealed unsafe class ManagedAuthenticatedEncryptor : IAuthenticatedEncry
     // probability of collision, and this is acceptable for the expected KDK lifetime.
     private const int KEY_MODIFIER_SIZE_IN_BYTES = 128 / 8;
 
-    private static readonly Func<byte[], HashAlgorithm> _kdkPrfFactory = key => new HMACSHA512(key); // currently hardcoded to SHA512
-
     private readonly byte[] _contextHeader;
     private readonly IManagedGenRandom _genRandom;
     private readonly Secret _keyDerivationKey;
@@ -101,9 +103,10 @@ private byte[] CreateContextHeader()
         ManagedSP800_108_CTR_HMACSHA512.DeriveKeys(
             kdk: EMPTY_ARRAY,
             label: EMPTY_ARRAY_SEGMENT,
-            context: EMPTY_ARRAY_SEGMENT,
-            prfFactory: _kdkPrfFactory,
-            output: new ArraySegment<byte>(tempKeys));
+            contextHeader: EMPTY_ARRAY_SEGMENT,
+            contextData: EMPTY_ARRAY_SEGMENT,
+            operationSubkey: tempKeys.AsSpan(0, _symmetricAlgorithmSubkeyLengthInBytes),
+            validationSubkey: tempKeys.AsSpan(_symmetricAlgorithmSubkeyLengthInBytes, _validationAlgorithmSubkeyLengthInBytes));
 
         // At this point, tempKeys := { K_E || K_H }.
 
@@ -144,20 +147,25 @@ private SymmetricAlgorithm CreateSymmetricAlgorithm()
 
         retVal.Mode = CipherMode.CBC;
         retVal.Padding = PaddingMode.PKCS7;
+
         return retVal;
     }
 
-    private KeyedHashAlgorithm CreateValidationAlgorithm(byte[] key)
+    private KeyedHashAlgorithm CreateValidationAlgorithm(byte[]? key = null)
     {
         var retVal = _validationAlgorithmFactory();
         CryptoUtil.Assert(retVal != null, "retVal != null");
 
-        retVal.Key = key;
+        if (key is not null)
+        {
+            retVal.Key = key;
+        }
         return retVal;
     }
 
     public byte[] Decrypt(ArraySegment<byte> protectedPayload, ArraySegment<byte> additionalAuthenticatedData)
     {
+        // Assumption: protectedPayload := { keyModifier | IV | encryptedData | MAC(IV | encryptedPayload) }
         protectedPayload.Validate();
         additionalAuthenticatedData.Validate();
 
@@ -167,12 +175,9 @@ public byte[] Decrypt(ArraySegment<byte> protectedPayload, ArraySegment<byte> ad
             throw Error.CryptCommon_PayloadInvalid();
         }
 
-        // Assumption: protectedPayload := { keyModifier | IV | encryptedData | MAC(IV | encryptedPayload) }
-
         try
         {
             // Step 1: Extract the key modifier and IV from the payload.
-
             int keyModifierOffset; // position in protectedPayload.Array where key modifier begins
             int ivOffset; // position in protectedPayload.Array where key modifier ends / IV begins
             int ciphertextOffset; // position in protectedPayload.Array where IV ends / ciphertext begins
@@ -186,60 +191,72 @@ public byte[] Decrypt(ArraySegment<byte> protectedPayload, ArraySegment<byte> ad
                 ciphertextOffset = ivOffset + _symmetricAlgorithmBlockSizeInBytes;
             }
 
-            ArraySegment<byte> keyModifier = new ArraySegment<byte>(protectedPayload.Array!, keyModifierOffset, ivOffset - keyModifierOffset);
-            var iv = new byte[_symmetricAlgorithmBlockSizeInBytes];
-            Buffer.BlockCopy(protectedPayload.Array!, ivOffset, iv, 0, iv.Length);
+            ReadOnlySpan<byte> keyModifier = protectedPayload.Array!.AsSpan(keyModifierOffset, ivOffset - keyModifierOffset);
 
             // Step 2: Decrypt the KDK and use it to restore the original encryption and MAC keys.
-            // We pin all unencrypted keys to limit their exposure via GC relocation.
-
+#if NET10_0_OR_GREATER
+            Span<byte> decryptedKdk = _keyDerivationKey.Length <= 256
+                ? stackalloc byte[256].Slice(0, _keyDerivationKey.Length)
+                : new byte[_keyDerivationKey.Length];
+#else
             var decryptedKdk = new byte[_keyDerivationKey.Length];
-            var decryptionSubkey = new byte[_symmetricAlgorithmSubkeyLengthInBytes];
-            var validationSubkey = new byte[_validationAlgorithmSubkeyLengthInBytes];
-            var derivedKeysBuffer = new byte[checked(decryptionSubkey.Length + validationSubkey.Length)];
-
-            fixed (byte* __unused__1 = decryptedKdk)
+#endif
+
+            byte[]? validationSubkeyArray = null;
+            var validationSubkey = _validationAlgorithmSubkeyLengthInBytes <= 128
+                ? stackalloc byte[128].Slice(0, _validationAlgorithmSubkeyLengthInBytes)
+                : (validationSubkeyArray = new byte[_validationAlgorithmSubkeyLengthInBytes]);
+
+#if NET10_0_OR_GREATER
+            Span<byte> decryptionSubkey =
+                _symmetricAlgorithmSubkeyLengthInBytes <= 128
+                ? stackalloc byte[128].Slice(0, _symmetricAlgorithmSubkeyLengthInBytes)
+                : new byte[_symmetricAlgorithmBlockSizeInBytes];
+#else
+            byte[] decryptionSubkey = new byte[_symmetricAlgorithmSubkeyLengthInBytes];
+#endif
+
+            // calling "fixed" is basically pinning the array, meaning the GC won't move it around. (Also for safety concerns)
+            // note: it is safe to call `fixed` on null - it is just a no-op
+            fixed (byte* decryptedKdkUnsafe = decryptedKdk)
             fixed (byte* __unused__2 = decryptionSubkey)
-            fixed (byte* __unused__3 = validationSubkey)
-            fixed (byte* __unused__4 = derivedKeysBuffer)
+            fixed (byte* __unused__3 = validationSubkeyArray)
             {
                 try
                 {
-                    _keyDerivationKey.WriteSecretIntoBuffer(new ArraySegment<byte>(decryptedKdk));
-                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeysWithContextHeader(
+                    _keyDerivationKey.WriteSecretIntoBuffer(decryptedKdkUnsafe, decryptedKdk.Length);
+                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeys(
                         kdk: decryptedKdk,
                         label: additionalAuthenticatedData,
                         contextHeader: _contextHeader,
-                        context: keyModifier,
-                        prfFactory: _kdkPrfFactory,
-                        output: new ArraySegment<byte>(derivedKeysBuffer));
-
-                    Buffer.BlockCopy(derivedKeysBuffer, 0, decryptionSubkey, 0, decryptionSubkey.Length);
-                    Buffer.BlockCopy(derivedKeysBuffer, decryptionSubkey.Length, validationSubkey, 0, validationSubkey.Length);
+                        contextData: keyModifier,
+                        operationSubkey: decryptionSubkey,
+                        validationSubkey: validationSubkey);
 
                     // Step 3: Calculate the correct MAC for this payload.
                     // correctHash := MAC(IV || ciphertext)
-                    byte[] correctHash;
-
-                    using (var hashAlgorithm = CreateValidationAlgorithm(validationSubkey))
+                    checked
                     {
-                        checked
-                        {
-                            eofOffset = protectedPayload.Offset + protectedPayload.Count;
-                            macOffset = eofOffset - _validationAlgorithmDigestLengthInBytes;
-                        }
-
-                        correctHash = hashAlgorithm.ComputeHash(protectedPayload.Array!, ivOffset, macOffset - ivOffset);
+                        eofOffset = protectedPayload.Offset + protectedPayload.Count;
+                        macOffset = eofOffset - _validationAlgorithmDigestLengthInBytes;
                     }
 
                     // Step 4: Validate the MAC provided as part of the payload.
-
-                    if (!CryptoUtil.TimeConstantBuffersAreEqual(correctHash, 0, correctHash.Length, protectedPayload.Array!, macOffset, eofOffset - macOffset))
-                    {
-                        throw Error.CryptCommon_PayloadInvalid(); // integrity check failure
-                    }
+                    CalculateAndValidateMac(protectedPayload.Array!, ivOffset, macOffset, eofOffset, validationSubkey, validationSubkeyArray);
 
                     // Step 5: Decipher the ciphertext and return it to the caller.
+#if NET10_0_OR_GREATER
+                    using var symmetricAlgorithm = CreateSymmetricAlgorithm();
+                    symmetricAlgorithm.SetKey(decryptionSubkey); // setKey is a single-shot usage of symmetricAlgorithm. Not allocatey
+
+                    // note: here protectedPayload.Array is taken without an offset (can't use AsSpan() on ArraySegment)
+                    var ciphertext = protectedPayload.Array.AsSpan(ciphertextOffset, macOffset - ciphertextOffset);
+                    var iv = protectedPayload.Array.AsSpan(ivOffset, _symmetricAlgorithmBlockSizeInBytes);
+
+                    // symmetricAlgorithm is created with CBC mode (see CreateSymmetricAlgorithm())
+                    return symmetricAlgorithm.DecryptCbc(ciphertext, iv);
+#else
+                    var iv = protectedPayload.Array!.AsSpan(ivOffset, _symmetricAlgorithmBlockSizeInBytes).ToArray();
 
                     using (var symmetricAlgorithm = CreateSymmetricAlgorithm())
                     using (var cryptoTransform = symmetricAlgorithm.CreateDecryptor(decryptionSubkey, iv))
@@ -254,14 +271,19 @@ public byte[] Decrypt(ArraySegment<byte> protectedPayload, ArraySegment<byte> ad
                             return outputStream.ToArray();
                         }
                     }
+#endif
                 }
                 finally
                 {
                     // delete since these contain secret material
+                    validationSubkey.Clear();
+
+#if NET10_0_OR_GREATER
+                    decryptedKdk.Clear();
+                    decryptionSubkey.Clear();
+#else
                     Array.Clear(decryptedKdk, 0, decryptedKdk.Length);
-                    Array.Clear(decryptionSubkey, 0, decryptionSubkey.Length);
-                    Array.Clear(validationSubkey, 0, validationSubkey.Length);
-                    Array.Clear(derivedKeysBuffer, 0, derivedKeysBuffer.Length);
+#endif
                 }
             }
         }
@@ -272,62 +294,144 @@ public byte[] Decrypt(ArraySegment<byte> protectedPayload, ArraySegment<byte> ad
         }
     }
 
-    public void Dispose()
-    {
-        _keyDerivationKey.Dispose();
-    }
-
     public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additionalAuthenticatedData)
     {
         plaintext.Validate();
         additionalAuthenticatedData.Validate();
+        var plainTextSpan = plaintext.AsSpan();
 
         try
         {
-            var outputStream = new MemoryStream();
-
-            // Step 1: Generate a random key modifier and IV for this operation.
-            // Both will be equal to the block size of the block cipher algorithm.
-
-            var keyModifier = _genRandom.GenRandom(KEY_MODIFIER_SIZE_IN_BYTES);
-            var iv = _genRandom.GenRandom(_symmetricAlgorithmBlockSizeInBytes);
-
-            // Step 2: Copy the key modifier and the IV to the output stream since they'll act as a header.
-
-            outputStream.Write(keyModifier, 0, keyModifier.Length);
-            outputStream.Write(iv, 0, iv.Length);
-
-            // At this point, outputStream := { keyModifier || IV }.
-
-            // Step 3: Decrypt the KDK, and use it to generate new encryption and HMAC keys.
-            // We pin all unencrypted keys to limit their exposure via GC relocation.
-
+            var keyModifierLength = KEY_MODIFIER_SIZE_IN_BYTES;
+            var ivLength = _symmetricAlgorithmBlockSizeInBytes;
+
+#if NET10_0_OR_GREATER
+            Span<byte> decryptedKdk = _keyDerivationKey.Length <= 256
+                ? stackalloc byte[256].Slice(0, _keyDerivationKey.Length)
+                : new byte[_keyDerivationKey.Length];
+#else
             var decryptedKdk = new byte[_keyDerivationKey.Length];
-            var encryptionSubkey = new byte[_symmetricAlgorithmSubkeyLengthInBytes];
-            var validationSubkey = new byte[_validationAlgorithmSubkeyLengthInBytes];
-            var derivedKeysBuffer = new byte[checked(encryptionSubkey.Length + validationSubkey.Length)];
-
-            fixed (byte* __unused__1 = decryptedKdk)
-            fixed (byte* __unused__2 = encryptionSubkey)
-            fixed (byte* __unused__3 = validationSubkey)
-            fixed (byte* __unused__4 = derivedKeysBuffer)
+#endif
+
+#if NET10_0_OR_GREATER
+            byte[]? validationSubkeyArray = null;
+            Span<byte> validationSubkey = _validationAlgorithmSubkeyLengthInBytes <= 128
+                ? stackalloc byte[128].Slice(0, _validationAlgorithmSubkeyLengthInBytes)
+                : (validationSubkeyArray = new byte[_validationAlgorithmSubkeyLengthInBytes]);
+#else
+            var validationSubkeyArray = new byte[_validationAlgorithmSubkeyLengthInBytes];
+            var validationSubkey = validationSubkeyArray.AsSpan();
+#endif
+
+#if NET10_0_OR_GREATER
+            Span<byte> encryptionSubkey = _symmetricAlgorithmSubkeyLengthInBytes <= 128
+                ? stackalloc byte[128].Slice(0, _symmetricAlgorithmSubkeyLengthInBytes)
+                : new byte[_symmetricAlgorithmSubkeyLengthInBytes];
+#else
+            byte[] encryptionSubkey = new byte[_symmetricAlgorithmSubkeyLengthInBytes];
+#endif
+
+            fixed (byte* decryptedKdkUnsafe = decryptedKdk)
+            fixed (byte* __unused__1 = encryptionSubkey)
+            fixed (byte* __unused__2 = validationSubkeyArray)
             {
+                // Step 1: Generate a random key modifier and IV for this operation.
+                // Both will be equal to the block size of the block cipher algorithm.
+#if NET10_0_OR_GREATER
+                Span<byte> keyModifier = keyModifierLength <= 128
+                    ? stackalloc byte[128].Slice(0, keyModifierLength)
+                    : new byte[keyModifierLength];
+
+                _genRandom.GenRandom(keyModifier);
+#else
+                var keyModifier = _genRandom.GenRandom(keyModifierLength);
+#endif
+
                 try
                 {
-                    _keyDerivationKey.WriteSecretIntoBuffer(new ArraySegment<byte>(decryptedKdk));
-                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeysWithContextHeader(
+                    // Step 2: Decrypt the KDK, and use it to generate new encryption and HMAC keys.
+                    _keyDerivationKey.WriteSecretIntoBuffer(decryptedKdkUnsafe, decryptedKdk.Length);
+                    ManagedSP800_108_CTR_HMACSHA512.DeriveKeys(
                         kdk: decryptedKdk,
                         label: additionalAuthenticatedData,
                         contextHeader: _contextHeader,
-                        context: new ArraySegment<byte>(keyModifier),
-                        prfFactory: _kdkPrfFactory,
-                        output: new ArraySegment<byte>(derivedKeysBuffer));
+                        contextData: keyModifier,
+                        operationSubkey: encryptionSubkey,
+                        validationSubkey: validationSubkey);
+
+#if NET10_0_OR_GREATER
+                    // idea of optimization here is firstly get all the types preset
+                    // for calculating length of the output array and allocating it.
+                    // then we are filling it with the data directly, without any additional copying
+
+                    using var symmetricAlgorithm = CreateSymmetricAlgorithm();
+                    symmetricAlgorithm.SetKey(encryptionSubkey); // setKey is a single-shot usage of symmetricAlgorithm. Not allocatey
+
+                    using var validationAlgorithm = CreateValidationAlgorithm();
+
+                    // Later framework has an API to pre-calculate optimal length of the ciphertext.
+                    // That means we can avoid allocating more data than we need.
+
+                    var cipherTextLength = symmetricAlgorithm.GetCiphertextLengthCbc(plainTextSpan.Length); // CBC because symmetricAlgorithm is created with CBC mode
+                    var macLength = _validationAlgorithmDigestLengthInBytes;
+
+                    // allocating an array of a specific required length
+                    var outputArray = new byte[keyModifierLength + ivLength + cipherTextLength + macLength];
+                    var outputSpan = outputArray.AsSpan();
+#else
+                    var outputStream = new MemoryStream();
+#endif
+
+#if NET10_0_OR_GREATER
+                    // Step 2: Copy the key modifier to the output stream (part of a header)
+                    keyModifier.CopyTo(outputSpan.Slice(start: 0, length: keyModifierLength));
+
+                    // Step 3: Generate IV for this operation right into the output stream (no allocation)
+                    // key modifier and IV together act as a header.
+                    var iv = outputSpan.Slice(start: keyModifierLength, length: ivLength);
+                    _genRandom.GenRandom(iv);
+#else
+                    // Step 2: Copy the key modifier and the IV to the output stream since they'll act as a header.
+                    outputStream.Write(keyModifier, 0, keyModifier.Length);
+
+                    // Step 3: Generate IV for this operation right into the result array
+                    var iv = _genRandom.GenRandom(_symmetricAlgorithmBlockSizeInBytes);
+                    outputStream.Write(iv, 0, iv.Length);
+#endif
+
+#if NET10_0_OR_GREATER
+                    // Step 4: Perform the encryption operation.
+                    // encrypting plaintext into the target array directly
+                    symmetricAlgorithm.EncryptCbc(plainTextSpan, iv, outputSpan.Slice(start: keyModifierLength + ivLength, length: cipherTextLength));
 
-                    Buffer.BlockCopy(derivedKeysBuffer, 0, encryptionSubkey, 0, encryptionSubkey.Length);
-                    Buffer.BlockCopy(derivedKeysBuffer, encryptionSubkey.Length, validationSubkey, 0, validationSubkey.Length);
+                    // At this point, outputStream := { keyModifier || IV || ciphertext }
 
-                    // Step 4: Perform the encryption operation.
+                    // Step 5: Calculate the digest over the IV and ciphertext.
+                    // We don't need to calculate the digest over the key modifier since that
+                    // value has already been mixed into the KDF used to generate the MAC key.
+
+                    var ivAndCipherTextSpan = outputSpan.Slice(start: keyModifierLength, length: ivLength + cipherTextLength);
+                    var macDestinationSpan = outputSpan.Slice(keyModifierLength + ivLength + cipherTextLength, macLength);
 
+                    // if we can use an optimized method for specific algorithm - we use it (no extra alloc for subKey)
+                    if (validationAlgorithm is HMACSHA256)
+                    {
+                        HMACSHA256.HashData(key: validationSubkey, source: ivAndCipherTextSpan, destination: macDestinationSpan);
+                    }
+                    else if (validationAlgorithm is HMACSHA512)
+                    {
+                        HMACSHA512.HashData(key: validationSubkey, source: ivAndCipherTextSpan, destination: macDestinationSpan);
+                    }
+                    else
+                    {
+                        validationAlgorithm.Key = validationSubkeyArray ?? validationSubkey.ToArray();
+                        validationAlgorithm.TryComputeHash(source: ivAndCipherTextSpan, destination: macDestinationSpan, bytesWritten: out _);
+                    }
+
+                    // At this point, outputArray := { keyModifier || IV || ciphertext || MAC(IV || ciphertext) }
+                    return outputArray;
+#else
+                    // Step 4: Perform the encryption operation.
                     using (var symmetricAlgorithm = CreateSymmetricAlgorithm())
                     using (var cryptoTransform = symmetricAlgorithm.CreateEncryptor(encryptionSubkey, iv))
                     using (var cryptoStream = new CryptoStream(outputStream, cryptoTransform, CryptoStreamMode.Write))
@@ -340,8 +444,7 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
                         // Step 5: Calculate the digest over the IV and ciphertext.
                         // We don't need to calculate the digest over the key modifier since that
                         // value has already been mixed into the KDF used to generate the MAC key.
-
-                        using (var validationAlgorithm = CreateValidationAlgorithm(validationSubkey))
+                        using (var validationAlgorithm = CreateValidationAlgorithm(validationSubkeyArray))
                         {
                             // As an optimization, avoid duplicating the underlying buffer
                             var underlyingBuffer = outputStream.GetBuffer();
@@ -354,14 +457,17 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
                             return outputStream.ToArray();
                         }
                     }
+#endif
                 }
                 finally
                 {
-                    // delete since these contain secret material
+#if NET10_0_OR_GREATER
+                    keyModifier.Clear();
+                    decryptedKdk.Clear();
+#else
+                    Array.Clear(keyModifier, 0, keyModifierLength);
                     Array.Clear(decryptedKdk, 0, decryptedKdk.Length);
-                    Array.Clear(encryptionSubkey, 0, encryptionSubkey.Length);
-                    Array.Clear(validationSubkey, 0, validationSubkey.Length);
-                    Array.Clear(derivedKeysBuffer, 0, derivedKeysBuffer.Length);
+#endif
                 }
             }
         }
@@ -371,4 +477,65 @@ public byte[] Encrypt(ArraySegment<byte> plaintext, ArraySegment<byte> additiona
             throw Error.CryptCommon_GenericError(ex);
         }
     }
+
+    private void CalculateAndValidateMac(
+        byte[] payloadArray,
+        int ivOffset, int macOffset, int eofOffset, // offsets to slice the payload array
+        ReadOnlySpan<byte> validationSubkey,
+        byte[]? validationSubkeyArray)
+    {
+        using var validationAlgorithm = CreateValidationAlgorithm();
+        var hashSize = validationAlgorithm.GetDigestSizeInBytes();
+
+        byte[]? correctHashArray = null;
+        Span<byte> correctHash = hashSize <= 128
+            ? stackalloc byte[128].Slice(0, hashSize)
+            : (correctHashArray = new byte[hashSize]);
+
+        try
+        {
+#if NET10_0_OR_GREATER
+            var hashSource = payloadArray!.AsSpan(ivOffset, macOffset - ivOffset);
+
+            int bytesWritten;
+            if (validationAlgorithm is HMACSHA256)
+            {
+                bytesWritten = HMACSHA256.HashData(key: validationSubkey, source: hashSource, destination: correctHash);
+            }
+            else if (validationAlgorithm is HMACSHA512)
+            {
+                bytesWritten = HMACSHA512.HashData(key: validationSubkey, source: hashSource, destination: correctHash);
+            }
+            else
+            {
+                // if validationSubkey is stackalloc'ed, there is no way we avoid an alloc here
+                validationAlgorithm.Key = validationSubkeyArray ?? validationSubkey.ToArray();
+                var success = validationAlgorithm.TryComputeHash(hashSource, correctHash, out bytesWritten);
+                Debug.Assert(success);
+            }
+
+            Debug.Assert(bytesWritten == hashSize);
+#else
+            // if validationSubkey is stackalloc'ed, there is no way we avoid an alloc here
+            validationAlgorithm.Key = validationSubkeyArray ?? validationSubkey.ToArray();
+            correctHashArray = validationAlgorithm.ComputeHash(payloadArray, macOffset, eofOffset - macOffset);
+#endif
+
+            // Step 4: Validate the MAC provided as part of the payload.
+            var payloadMacSpan = payloadArray!.AsSpan(macOffset, eofOffset - macOffset);
+            if (!CryptoUtil.TimeConstantBuffersAreEqual(correctHash, payloadMacSpan))
+            {
+                throw Error.CryptCommon_PayloadInvalid(); // integrity check failure
+            }
+        }
+        finally
+        {
+            correctHash.Clear();
+        }
+    }
+
+    public void Dispose()
+    {
+        _keyDerivationKey.Dispose();
+    }
 }
diff --git a/src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs b/src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs
index 07dd20c4a9ff..04136930074b 100644
--- a/src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs
+++ b/src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs
@@ -1,6 +1,7 @@
 // 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.Security.Cryptography;
 
 namespace Microsoft.AspNetCore.DataProtection.Managed;
@@ -16,6 +17,10 @@ private ManagedGenRandomImpl()
     {
     }
 
+#if NET10_0_OR_GREATER
+    public void GenRandom(Span<byte> target) => RandomNumberGenerator.Fill(target);
+#endif
+
     public byte[] GenRandom(int numBytes)
     {
         var bytes = new byte[numBytes];
diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
index ddf556d6668c..92fa8a526a84 100644
--- a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
+++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
@@ -21,6 +21,7 @@
     <Compile Include="$(SharedSourceRoot)TrimmingAttributes.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentNullThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)CallerArgument\CallerArgumentExpressionAttribute.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Encoding\Int7BitEncodingUtils.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DataProtection/DataProtection/src/PublicAPI.Shipped.txt b/src/DataProtection/DataProtection/src/PublicAPI.Shipped.txt
index ce4946328fd2..9b356ddc49a8 100644
--- a/src/DataProtection/DataProtection/src/PublicAPI.Shipped.txt
+++ b/src/DataProtection/DataProtection/src/PublicAPI.Shipped.txt
@@ -115,6 +115,9 @@ Microsoft.AspNetCore.DataProtection.IPersistedDataProtector.DangerousUnprotect(b
 Microsoft.AspNetCore.DataProtection.ISecret
 Microsoft.AspNetCore.DataProtection.ISecret.Length.get -> int
 Microsoft.AspNetCore.DataProtection.ISecret.WriteSecretIntoBuffer(System.ArraySegment<byte> buffer) -> void
+Microsoft.AspNetCore.DataProtection.KeyManagement.IDeletableKeyManager
+Microsoft.AspNetCore.DataProtection.KeyManagement.IDeletableKeyManager.CanDeleteKeys.get -> bool
+Microsoft.AspNetCore.DataProtection.KeyManagement.IDeletableKeyManager.DeleteKeys(System.Func<Microsoft.AspNetCore.DataProtection.KeyManagement.IKey!, bool>! shouldDelete) -> bool
 Microsoft.AspNetCore.DataProtection.KeyManagement.IKey
 Microsoft.AspNetCore.DataProtection.KeyManagement.IKey.ActivationDate.get -> System.DateTimeOffset
 Microsoft.AspNetCore.DataProtection.KeyManagement.IKey.CreateEncryptor() -> Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor?
@@ -166,7 +169,9 @@ Microsoft.AspNetCore.DataProtection.KeyManagement.KeyManagementOptions.XmlEncryp
 Microsoft.AspNetCore.DataProtection.KeyManagement.KeyManagementOptions.XmlRepository.get -> Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository?
 Microsoft.AspNetCore.DataProtection.KeyManagement.KeyManagementOptions.XmlRepository.set -> void
 Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager
+Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.CanDeleteKeys.get -> bool
 Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.CreateNewKey(System.DateTimeOffset activationDate, System.DateTimeOffset expirationDate) -> Microsoft.AspNetCore.DataProtection.KeyManagement.IKey!
+Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.DeleteKeys(System.Func<Microsoft.AspNetCore.DataProtection.KeyManagement.IKey!, bool>! shouldDelete) -> bool
 Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.GetAllKeys() -> System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.KeyManagement.IKey!>!
 Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.GetCacheExpirationToken() -> System.Threading.CancellationToken
 Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.RevokeAllKeys(System.DateTimeOffset revocationDate, string? reason = null) -> void
@@ -176,6 +181,12 @@ Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.XmlKeyManager(Mi
 Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository
 Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository.Directory.get -> System.IO.DirectoryInfo!
 Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository.FileSystemXmlRepository(System.IO.DirectoryInfo! directory, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
+Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement
+Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement.DeletionOrder.get -> int?
+Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement.DeletionOrder.set -> void
+Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement.Element.get -> System.Xml.Linq.XElement!
+Microsoft.AspNetCore.DataProtection.Repositories.IDeletableXmlRepository
+Microsoft.AspNetCore.DataProtection.Repositories.IDeletableXmlRepository.DeleteElements(System.Action<System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement!>!>! chooseElements) -> bool
 Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository
 Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository.GetAllElements() -> System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement!>!
 Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository.StoreElement(System.Xml.Linq.XElement! element, string! friendlyName) -> void
@@ -269,8 +280,10 @@ static Microsoft.AspNetCore.DataProtection.Repositories.RegistryXmlRepository.De
 static Microsoft.AspNetCore.DataProtection.Secret.Random(int numBytes) -> Microsoft.AspNetCore.DataProtection.Secret!
 static Microsoft.Extensions.DependencyInjection.DataProtectionServiceCollectionExtensions.AddDataProtection(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder!
 static Microsoft.Extensions.DependencyInjection.DataProtectionServiceCollectionExtensions.AddDataProtection(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.DataProtection.DataProtectionOptions!>! setupAction) -> Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder!
+virtual Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository.DeleteElements(System.Action<System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement!>!>! chooseElements) -> bool
 virtual Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository.GetAllElements() -> System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement!>!
 virtual Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository.StoreElement(System.Xml.Linq.XElement! element, string! friendlyName) -> void
+virtual Microsoft.AspNetCore.DataProtection.Repositories.RegistryXmlRepository.DeleteElements(System.Action<System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement!>!>! chooseElements) -> bool
 virtual Microsoft.AspNetCore.DataProtection.Repositories.RegistryXmlRepository.GetAllElements() -> System.Collections.Generic.IReadOnlyCollection<System.Xml.Linq.XElement!>!
 virtual Microsoft.AspNetCore.DataProtection.Repositories.RegistryXmlRepository.StoreElement(System.Xml.Linq.XElement! element, string! friendlyName) -> void
 virtual Microsoft.AspNetCore.DataProtection.XmlEncryption.CertificateResolver.ResolveCertificate(string! thumbprint) -> System.Security.Cryptography.X509Certificates.X509Certificate2?
diff --git a/src/DataProtection/DataProtection/src/PublicAPI.Unshipped.txt b/src/DataProtection/DataProtection/src/PublicAPI.Unshipped.txt
index de9b28a68bda..7dc5c58110bf 100644
--- a/src/DataProtection/DataProtection/src/PublicAPI.Unshipped.txt
+++ b/src/DataProtection/DataProtection/src/PublicAPI.Unshipped.txt
@@ -1,14 +1 @@
 #nullable enable
-Microsoft.AspNetCore.DataProtection.KeyManagement.IDeletableKeyManager
-Microsoft.AspNetCore.DataProtection.KeyManagement.IDeletableKeyManager.CanDeleteKeys.get -> bool
-Microsoft.AspNetCore.DataProtection.KeyManagement.IDeletableKeyManager.DeleteKeys(System.Func<Microsoft.AspNetCore.DataProtection.KeyManagement.IKey!, bool>! shouldDelete) -> bool
-Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.CanDeleteKeys.get -> bool
-Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager.DeleteKeys(System.Func<Microsoft.AspNetCore.DataProtection.KeyManagement.IKey!, bool>! shouldDelete) -> bool
-Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement
-Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement.DeletionOrder.get -> int?
-Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement.DeletionOrder.set -> void
-Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement.Element.get -> System.Xml.Linq.XElement!
-Microsoft.AspNetCore.DataProtection.Repositories.IDeletableXmlRepository
-Microsoft.AspNetCore.DataProtection.Repositories.IDeletableXmlRepository.DeleteElements(System.Action<System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement!>!>! chooseElements) -> bool
-virtual Microsoft.AspNetCore.DataProtection.Repositories.FileSystemXmlRepository.DeleteElements(System.Action<System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement!>!>! chooseElements) -> bool
-virtual Microsoft.AspNetCore.DataProtection.Repositories.RegistryXmlRepository.DeleteElements(System.Action<System.Collections.Generic.IReadOnlyCollection<Microsoft.AspNetCore.DataProtection.Repositories.IDeletableElement!>!>! chooseElements) -> bool
diff --git a/src/DataProtection/DataProtection/src/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs b/src/DataProtection/DataProtection/src/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs
index 3b343684786e..eccb36dddf11 100644
--- a/src/DataProtection/DataProtection/src/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs
+++ b/src/DataProtection/DataProtection/src/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs
@@ -2,25 +2,84 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers;
+using System.Diagnostics;
 using System.Security.Cryptography;
 using Microsoft.AspNetCore.Cryptography;
+using Microsoft.AspNetCore.DataProtection.Internal;
 using Microsoft.AspNetCore.DataProtection.Managed;
 
 namespace Microsoft.AspNetCore.DataProtection.SP800_108;
 
 internal static class ManagedSP800_108_CTR_HMACSHA512
 {
-    public static void DeriveKeys(byte[] kdk, ArraySegment<byte> label, ArraySegment<byte> context, Func<byte[], HashAlgorithm> prfFactory, ArraySegment<byte> output)
+#if !NET10_0_OR_GREATER
+    public static void DeriveKeys(
+        byte[] kdk,
+        ReadOnlySpan<byte> label,
+        ReadOnlySpan<byte> contextHeader,
+        ReadOnlySpan<byte> contextData,
+        Span<byte> operationSubkey,
+        Span<byte> validationSubkey)
     {
-        // make copies so we can mutate these local vars
-        var outputOffset = output.Offset;
-        var outputCount = output.Count;
+        // netFX and netStandard dont have API to NOT use HashAlgorithm
+        using HashAlgorithm prf = new HMACSHA512(kdk);
 
-        using (var prf = prfFactory(kdk))
-        {
-            // See SP800-108, Sec. 5.1 for the format of the input to the PRF routine.
-            var prfInput = new byte[checked(sizeof(uint) /* [i]_2 */ + label.Count + 1 /* 0x00 */ + context.Count + sizeof(uint) /* [K]_2 */)];
+        // kdk is passed just to have a shared implementation for different framework versions
+        DeriveKeys(kdk, label, contextHeader, contextData, operationSubkey, validationSubkey, prf);
+    }
+#endif
+
+#if NET10_0_OR_GREATER
+    public static void DeriveKeys(ReadOnlySpan<byte> kdk, ReadOnlySpan<byte> label, ReadOnlySpan<byte> contextHeader, ReadOnlySpan<byte> contextData, Span<byte> operationSubkey, Span<byte> validationSubkey)
+        => DeriveKeys(kdk, label, contextHeader, contextData, operationSubkey, validationSubkey, prf: null);
+#endif
+
+    /// <remarks>
+    /// note: kdk will be used only if prf is null and only in later framework versions (10+)
+    /// where static method on `HMACSHA512` exists which avoids allocations
+    /// </remarks>
+    private static void DeriveKeys(
+        ReadOnlySpan<byte> kdk,
+        ReadOnlySpan<byte> label,
+        ReadOnlySpan<byte> contextHeader,
+        ReadOnlySpan<byte> contextData,
+        Span<byte> operationSubkey,
+        Span<byte> validationSubkey,
+        HashAlgorithm? prf = null)
+    {
+        var operationSubKeyIndex = 0;
+        var validationSubKeyIndex = 0;
+        var outputCount = operationSubkey.Length + validationSubkey.Length;
+
+        int prfOutputSizeInBytes =
+#if NET10_0_OR_GREATER
+            HMACSHA512.HashSizeInBytes;
+#else
+            prf.GetDigestSizeInBytes();
+#endif
+
+#if NET10_0_OR_GREATER
+        Span<byte> prfOutput = prfOutputSizeInBytes <= 128
+            ? stackalloc byte[128].Slice(0, prfOutputSizeInBytes)
+            : new byte[prfOutputSizeInBytes];
+#endif
+
+        // See SP800-108, Sec. 5.1 for the format of the input to the PRF routine.
+        var prfInputLength = checked(sizeof(uint) /* [i]_2 */ + label.Length + 1 /* 0x00 */ + (contextHeader.Length + contextData.Length) + sizeof(uint) /* [K]_2 */);
+
+#if NET10_0_OR_GREATER
+        byte[]? prfInputArray = null;
+        Span<byte> prfInput = prfInputLength <= 128
+            ? stackalloc byte[128].Slice(0, prfInputLength)
+            : (prfInputArray = new byte[prfInputLength]);
+#else
+        var prfInputArray = new byte[prfInputLength];
+        var prfInput = prfInputArray.AsSpan();
+#endif
 
+        try
+        {
             // Copy [L]_2 to prfInput since it's stable over all iterations
             uint outputSizeInBits = (uint)checked((int)outputCount * 8);
             prfInput[prfInput.Length - 4] = (byte)(outputSizeInBits >> 24);
@@ -29,10 +88,10 @@ public static void DeriveKeys(byte[] kdk, ArraySegment<byte> label, ArraySegment
             prfInput[prfInput.Length - 1] = (byte)(outputSizeInBits);
 
             // Copy label and context to prfInput since they're stable over all iterations
-            Buffer.BlockCopy(label.Array!, label.Offset, prfInput, sizeof(uint), label.Count);
-            Buffer.BlockCopy(context.Array!, context.Offset, prfInput, sizeof(int) + label.Count + 1, context.Count);
+            label.CopyTo(prfInput.Slice(sizeof(uint)));
+            contextHeader.CopyTo(prfInput.Slice(sizeof(uint) + label.Length + 1));
+            contextData.CopyTo(prfInput.Slice(sizeof(uint) + label.Length + 1 + contextHeader.Length));
 
-            var prfOutputSizeInBytes = prf.GetDigestSizeInBytes();
             for (uint i = 1; outputCount > 0; i++)
             {
                 // Copy [i]_2 to prfInput since it mutates with each iteration
@@ -41,25 +100,43 @@ public static void DeriveKeys(byte[] kdk, ArraySegment<byte> label, ArraySegment
                 prfInput[2] = (byte)(i >> 8);
                 prfInput[3] = (byte)(i);
 
-                // Run the PRF and copy the results to the output buffer
-                var prfOutput = prf.ComputeHash(prfInput);
+#if NET10_0_OR_GREATER
+                var success = HMACSHA512.TryHashData(kdk, prfInput, prfOutput, out var bytesWritten);
+                Debug.Assert(success);
+                Debug.Assert(bytesWritten == prfOutputSizeInBytes);
+#else
+                var prfOutputArray = prf.ComputeHash(prfInputArray);
+                var prfOutput = prfOutputArray.AsSpan();
+#endif
                 CryptoUtil.Assert(prfOutputSizeInBytes == prfOutput.Length, "prfOutputSizeInBytes == prfOutput.Length");
                 var numBytesToCopyThisIteration = Math.Min(prfOutputSizeInBytes, outputCount);
-                Buffer.BlockCopy(prfOutput, 0, output.Array!, outputOffset, numBytesToCopyThisIteration);
-                Array.Clear(prfOutput, 0, prfOutput.Length); // contains key material, so delete it
 
-                // adjust offsets
-                outputOffset += numBytesToCopyThisIteration;
+                // we need to write into the operationSubkey
+                // but it may be the case that we need to split the output
+                // so lets count how many bytes we can write into the operationSubKey
+                var bytesToWrite = Math.Min(numBytesToCopyThisIteration, operationSubkey.Length - operationSubKeyIndex);
+                var leftOverBytes = numBytesToCopyThisIteration - bytesToWrite;
+                if (operationSubKeyIndex < operationSubkey.Length) // meaning we need to write to operationSubKey
+                {
+                    var destination = operationSubkey.Slice(operationSubKeyIndex, bytesToWrite);
+                    prfOutput.Slice(0, bytesToWrite).CopyTo(destination);
+                    operationSubKeyIndex += bytesToWrite;
+                }
+
+                if (operationSubKeyIndex == operationSubkey.Length && leftOverBytes != 0) // we have filled the operationSubKey. It's time for the validationSubKey
+                {
+                    var destination = validationSubkey.Slice(validationSubKeyIndex, leftOverBytes);
+                    prfOutput.Slice(bytesToWrite, leftOverBytes).CopyTo(destination);
+                    validationSubKeyIndex += leftOverBytes;
+                }
+
                 outputCount -= numBytesToCopyThisIteration;
+                prfOutput.Clear(); // contains key material, so delete it
             }
         }
-    }
-
-    public static void DeriveKeysWithContextHeader(byte[] kdk, ArraySegment<byte> label, byte[] contextHeader, ArraySegment<byte> context, Func<byte[], HashAlgorithm> prfFactory, ArraySegment<byte> output)
-    {
-        var combinedContext = new byte[checked(contextHeader.Length + context.Count)];
-        Buffer.BlockCopy(contextHeader, 0, combinedContext, 0, contextHeader.Length);
-        Buffer.BlockCopy(context.Array!, context.Offset, combinedContext, contextHeader.Length, context.Count);
-        DeriveKeys(kdk, label, new ArraySegment<byte>(combinedContext), prfFactory, output);
+        finally
+        {
+            prfInput.Clear();
+        }
     }
 }
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
index d97993ee6074..e8131de80b71 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
@@ -101,8 +101,8 @@ public void CreateAuthenticatedEncryptor_RoundTripsData_AesGcmImplementation(Enc
         Assert.Equal(plaintext, roundTripPlaintext);
     }
 
-    public static TheoryData CreateAuthenticatedEncryptor_RoundTripsData_ManagedImplementationData
-        => new TheoryData<EncryptionAlgorithm, ValidationAlgorithm, Func<HMAC>>
+    public static TheoryData<EncryptionAlgorithm, ValidationAlgorithm, Func<HMAC>> CreateAuthenticatedEncryptor_RoundTripsData_ManagedImplementationData
+        => new()
         {
                 { EncryptionAlgorithm.AES_128_CBC, ValidationAlgorithm.HMACSHA256, () => new HMACSHA256() },
                 { EncryptionAlgorithm.AES_192_CBC, ValidationAlgorithm.HMACSHA256, () => new HMACSHA256() },
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
index 549fdc217463..ef8a921f2bae 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
@@ -29,7 +29,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext, decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
     }
 
     [ConditionalFact]
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
index 6c3cb9f51d12..15b8a2fd1bb1 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
@@ -26,7 +26,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext, decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
     }
 
     [ConditionalFact]
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs
index 31f8626d1981..2ce40203dd49 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs
@@ -25,6 +25,7 @@ public async Task WebhostLoadsKeyRingBeforeServerStarts()
             .Returns(Mock.Of<IKeyRing>())
             .Callback(() => tcs.TrySetResult());
 
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .UseStartup<TestStartup>()
             .ConfigureServices(s =>
@@ -33,8 +34,11 @@ public async Task WebhostLoadsKeyRingBeforeServerStarts()
                 .Replace(ServiceDescriptor.Singleton(mockKeyRing.Object))
                 .AddSingleton<IServer>(
                     new FakeServer(onStart: () => tcs.TrySetException(new InvalidOperationException("Server was started before key ring was initialized")))));
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
         using (var host = builder.Build())
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
         {
             await host.StartAsync();
         }
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Internal/Int7BitEncodingUtilsTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Internal/Int7BitEncodingUtilsTests.cs
new file mode 100644
index 000000000000..f4ba8ca0db9e
--- /dev/null
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Internal/Int7BitEncodingUtilsTests.cs
@@ -0,0 +1,31 @@
+// 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.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.DataProtection.Internal;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.DataProtection.Tests.Internal;
+
+public class Int7BitEncodingUtilsTests
+{
+    [Theory]
+    [InlineData(0, 1)]
+    [InlineData(1, 1)]
+    [InlineData(0b0_1111111, 1)]
+    [InlineData(0b1_0000000, 2)]
+    [InlineData(0b1111111_1111111, 2)]
+    [InlineData(0b1_0000000_0000000, 3)]
+    [InlineData(0b1111111_1111111_1111111, 3)]
+    [InlineData(0b1_0000000_0000000_0000000, 4)]
+    [InlineData(0b1111111_1111111_1111111_1111111, 4)]
+    [InlineData(0b1_0000000_0000000_0000000_0000000, 5)]
+    [InlineData(uint.MaxValue, 5)]
+    public void Measure7BitEncodedUIntLength_ReturnsExceptedLength(uint value, int expectedSize)
+    {
+        var actualSize = value.Measure7BitEncodedUIntLength();
+        Assert.Equal(expectedSize, actualSize);
+    }
+}
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/AdditionalAuthenticatedDataTemplateTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/AdditionalAuthenticatedDataTemplateTests.cs
new file mode 100644
index 000000000000..adbfdf9efc8b
--- /dev/null
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/AdditionalAuthenticatedDataTemplateTests.cs
@@ -0,0 +1,50 @@
+// 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.Collections.Generic;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Unicode;
+using Microsoft.AspNetCore.DataProtection.KeyManagement;
+using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+
+namespace Microsoft.AspNetCore.DataProtection.Tests.KeyManagement;
+public class AdditionalAuthenticatedDataTemplateTests
+{
+    [Fact]
+    public void AdditionalAuthenticatedDataTemplateBuildAadTemplateBytes_ReturnsSameResultAsPreviousImplementation()
+    {
+        var actualBytes = KeyRingBasedDataProtector.AdditionalAuthenticatedDataTemplate.BuildAadTemplateBytes([
+            "my sample string",
+            "©®±µ¶", // exotic unicode characters (https://en.wikipedia.org/wiki/List_of_Unicode_characters)
+            "my other sample string",
+            // more than 128 utf-8 bytes string
+            "CfDJ8H5oH_fp1QNBmvs-OWXxsVoV30hrXeI4-PI4p1VZytjsgd0DTstMdtTZbFtm2dKHvsBlDCv7TiEWKztZf8fb48pUgBgUE2SeYV3eOUXvSfNWU0D8SmHLy5KEnwKKkZKqudDhCnjQSIU7mhDliJJN1e4",
+            "."
+        ]);
+
+        // expected bytes are formed by running former code with the same input
+        // former code can be found in https://github.com/dotnet/aspnetcore/pull/59322
+        var expectedBytesInBase64 = "CfDJ8AAAAAAAAAAAAAAAAAAAAAAAAAAFEG15IHNhbXBsZSBzdHJpbmcKwqnCrsKxwrXCthZteSBvdGhlciBzYW1wbGUgc3RyaW5nmwFDZkRKOEg1b0hfZnAxUU5CbXZzLU9XWHhzVm9WMzBoclhlSTQtUEk0cDFWWnl0anNnZDBEVHN0TWR0VFpiRnRtMmRLSHZzQmxEQ3Y3VGlFV0t6dFpmOGZiNDhwVWdCZ1VFMlNlWVYzZU9VWHZTZk5XVTBEOFNtSEx5NUtFbndLS2taS3F1ZERoQ25qUVNJVTdtaERsaUpKTjFlNAEu";
+
+        var actualBytesInBase64 = Convert.ToBase64String(actualBytes);
+        Assert.Equal(expectedBytesInBase64, actualBytesInBase64);
+    }
+
+    [Fact]
+    public void AdditionalAuthenticatedDataTemplateBuildAadTemplateBytes_ThrowsOnIllegalUtf8Text()
+    {
+        Assert.Throws<EncoderFallbackException>(() =>
+        {
+            var actualBytes = KeyRingBasedDataProtector.AdditionalAuthenticatedDataTemplate.BuildAadTemplateBytes([
+                "😀"[0] + "X",
+            ]);
+        });
+    }
+}
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs
index f955c9e27f41..1a17c3b44215 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -45,8 +46,8 @@ public void Protect_EncryptsToDefaultProtector_MultiplePurposes()
             .Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
             {
-                Assert.Equal(expectedPlaintext, actualPlaintext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
+                Assert.Equal(expectedAad, actualAad.AsSpan());
                 return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
             });
 
@@ -83,8 +84,8 @@ public void Protect_EncryptsToDefaultProtector_SinglePurpose()
             .Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
             {
-                Assert.Equal(expectedPlaintext, actualPlaintext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
+                Assert.Equal(expectedAad, actualAad.AsSpan());
                 return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
             });
 
@@ -423,8 +424,8 @@ public void Unprotect_KeyRevoked_RevocationAllowed_ReturnsOriginalData_SetsRevok
             .Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
             {
-                Assert.Equal(expectedCiphertext, actualCiphertext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
+                Assert.Equal(expectedAad, actualAad.AsSpan());
                 return expectedPlaintext;
             });
         var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -470,8 +471,8 @@ public void Unprotect_IsAlsoDefaultKey_Success_NoMigrationRequired()
             .Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
             {
-                Assert.Equal(expectedCiphertext, actualCiphertext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
+                Assert.Equal(expectedAad, actualAad.AsSpan());
                 return expectedPlaintext;
             });
         var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -519,8 +520,8 @@ public void Unprotect_IsNotDefaultKey_Success_RequiresMigration()
             .Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
             {
-                Assert.Equal(expectedCiphertext, actualCiphertext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
+                Assert.Equal(expectedAad, actualAad.AsSpan());
                 return expectedPlaintext;
             });
         var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -594,8 +595,8 @@ public void CreateProtector_ChainsPurposes()
             .Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
             .Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
             {
-                Assert.Equal(expectedPlaintext, actualPlaintext);
-                Assert.Equal(expectedAad, actualAad);
+                Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
+                Assert.Equal(expectedAad, actualAad.AsSpan());
                 return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
             });
 
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingProviderTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingProviderTests.cs
index 844123f591e8..2436d938c0ed 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingProviderTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingProviderTests.cs
@@ -709,8 +709,10 @@ public void GetCurrentKeyRing_NoExistingKeyRing_HoldsAllThreadsUntilKeyRingCreat
         Assert.True(mreBackgroundThreadHasCalledGetCurrentKeyRing.Wait(testTimeout), "Test timed out.");
         mreForegroundThreadIsCallingGetCurrentKeyRing.Set();
         var foregroundRetVal = keyRingProvider.GetCurrentKeyRingCore(now);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         backgroundGetKeyRingTask.Wait(testTimeout);
         var backgroundRetVal = backgroundGetKeyRingTask.GetAwaiter().GetResult();
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         // Assert - underlying provider only should have been called once
         Assert.Same(expectedKeyRing, foregroundRetVal);
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/XmlKeyManagerTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/XmlKeyManagerTests.cs
index 998088277438..f624199f6eae 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/XmlKeyManagerTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/XmlKeyManagerTests.cs
@@ -328,7 +328,7 @@ public void GetAllKeys_Empty()
         var keys = RunGetAllKeysCore(xml, activator);
 
         // Assert
-        Assert.Equal(0, keys.Count);
+        Assert.Empty(keys);
     }
 
     [Fact]
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs
index b74f7102b731..e49a4ef4cfa8 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs
@@ -25,7 +25,7 @@ public void Encrypt_Decrypt_RoundTrips()
         byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
 
         // Assert
-        Assert.Equal(plaintext, decipheredtext);
+        Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
     }
 
     [Fact]
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/EphemeralXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/EphemeralXmlRepositoryTests.cs
index e00b13c5d7bd..ba7dc9fa4c7c 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/EphemeralXmlRepositoryTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/EphemeralXmlRepositoryTests.cs
@@ -99,7 +99,7 @@ public void DeleteElementsWithOutOfBandDeletion()
             // Now that the repository has read the element from the registry, delete it out-of-band.
             repository.DeleteElements(deletableElements => deletableElements.First().DeletionOrder = 1);
 
-            Assert.Equal(1, deletableElements.Count);
+            Assert.Single(deletableElements);
 
             deletableElements.First().DeletionOrder = 1;
         }));
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/FileSystemXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/FileSystemXmlRepositoryTests.cs
index 036b1ed4596d..a3ba5bbeeef9 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/FileSystemXmlRepositoryTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/FileSystemXmlRepositoryTests.cs
@@ -55,7 +55,7 @@ public void GetAllElements_EmptyOrNonexistentDirectory_ReturnsEmptyCollection()
             var allElements = repository.GetAllElements();
 
             // Assert
-            Assert.Equal(0, allElements.Count);
+            Assert.Empty(allElements);
         });
     }
 
@@ -264,7 +264,7 @@ public void DeleteElementsWithOutOfBandDeletion()
                 // Now that the repository has read the element from disk, delete it out-of-band.
                 File.Delete(filePath);
 
-                Assert.Equal(1, deletableElements.Count);
+                Assert.Single(deletableElements);
 
                 deletableElements.First().DeletionOrder = 1;
             }));
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/RegistryXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/RegistryXmlRepositoryTests.cs
index 1835eb4b39a1..c39722dec113 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/RegistryXmlRepositoryTests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/RegistryXmlRepositoryTests.cs
@@ -42,7 +42,7 @@ public void GetAllElements_EmptyOrNonexistentDirectory_ReturnsEmptyCollection()
             var allElements = repository.GetAllElements();
 
             // Assert
-            Assert.Equal(0, allElements.Count);
+            Assert.Empty(allElements);
         });
     }
 
@@ -206,7 +206,7 @@ public void DeleteElementsWithOutOfBandDeletion()
                 // Now that the repository has read the element from the registry, delete it out-of-band.
                 regKey.DeleteValue("friendly1");
 
-                Assert.Equal(1, deletableElements.Count);
+                Assert.Single(deletableElements);
 
                 deletableElements.First().DeletionOrder = 1;
             }));
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SP800_108/SP800_108Tests.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SP800_108/SP800_108Tests.cs
index 697330e853c3..3791d254adfb 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SP800_108/SP800_108Tests.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SP800_108/SP800_108Tests.cs
@@ -163,8 +163,7 @@ private static void TestManagedKeyDerivation(byte[] kdk, byte[] label, byte[] co
         Buffer.BlockCopy(context, 0, contextSegment.Array, contextSegment.Offset, contextSegment.Count);
         var derivedSubkeySegment = new ArraySegment<byte>(new byte[numDerivedBytes + 10], 4, numDerivedBytes);
 
-        ManagedSP800_108_CTR_HMACSHA512.DeriveKeysWithContextHeader(kdk, labelSegment, contextHeader, contextSegment,
-            bytes => new HMACSHA512(bytes), derivedSubkeySegment);
+        ManagedSP800_108_CTR_HMACSHA512.DeriveKeys(kdk, labelSegment, contextHeader, contextSegment, derivedSubkeySegment, validationSubkey: Span<byte>.Empty /* filling in derivedSubkeySegment only */);
         Assert.Equal(expectedDerivedSubkeyAsBase64, Convert.ToBase64String(derivedSubkeySegment.AsStandaloneArray()));
     }
 }
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SequentialGenRandom.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SequentialGenRandom.cs
index 02f34da40414..6eba86edb7e6 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SequentialGenRandom.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SequentialGenRandom.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.Managed;
 
@@ -27,4 +28,12 @@ public void GenRandom(byte* pbBuffer, uint cbBuffer)
             pbBuffer[i] = _value++;
         }
     }
+
+    public void GenRandom(Span<byte> target)
+    {
+        for (var i = 0; i < target.Length; i++)
+        {
+            target[i] = _value++;
+        }
+    }
 }
diff --git a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlAssert.cs b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlAssert.cs
index acc527b8a961..e08afec11ca8 100644
--- a/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlAssert.cs
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlAssert.cs
@@ -33,7 +33,7 @@ public static void Equal(XElement expected, XElement actual)
 
         if (!Core.AreEqual(expected, actual))
         {
-            Assert.True(false,
+            Assert.Fail(
                    "Expected element:" + Environment.NewLine
                    + expected.ToString() + Environment.NewLine
                    + "Actual element:" + Environment.NewLine
diff --git a/src/DataProtection/EntityFrameworkCore/src/PACKAGE.md b/src/DataProtection/EntityFrameworkCore/src/PACKAGE.md
new file mode 100644
index 000000000000..03a9966ae7ed
--- /dev/null
+++ b/src/DataProtection/EntityFrameworkCore/src/PACKAGE.md
@@ -0,0 +1,45 @@
+## About
+
+`Microsoft.AspNetCore.DataProtection.EntityFrameworkCore` provides a mechanism for storing data protection keys to a database using Entity Framework Core.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.DataProtection.EntityFrameworkCore`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.DataProtection.EntityFrameworkCore
+```
+
+### Configuration
+
+To store keys in a database, use the `PersistKeysToDbContext` extension method. For example:
+
+```csharp
+builder.Services.AddDataProtection()
+    .PersistKeysToDbContext<MyDbContext>();
+```
+
+Ensure that your DB context (`MyDbContext` in the above example) implements `IDataProtectionKeyContext`. For example:
+
+```csharp
+class MyDbContext : DbContext, IDataProtectionKeyContext
+{
+    public MyKeysContext(DbContextOptions<MyKeysContext> options)
+        : base(options)
+    {
+    }
+
+    // This maps to the table that stores keys
+    public DbSet<DataProtectionKey> DataProtectionKeys { get; set; }
+}
+```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/data-protection/implementation/key-storage-providers#entity-framework-core) on the Entity Framework Core key storage provider.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.DataProtection.EntityFrameworkCore` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml b/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml b/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/DataProtection/StackExchangeRedis/src/PACKAGE.md b/src/DataProtection/StackExchangeRedis/src/PACKAGE.md
new file mode 100644
index 000000000000..830b7255d257
--- /dev/null
+++ b/src/DataProtection/StackExchangeRedis/src/PACKAGE.md
@@ -0,0 +1,34 @@
+## About
+
+`Microsoft.AspNetCore.DataProtection.StackExchangeRedis` allows storing data protection keys in a Redis cache.
+
+> [!WARNING]
+> Only Redis versions supporting [Redis Data Persistence](https://learn.microsoft.com/azure/azure-cache-for-redis/cache-how-to-premium-persistence) should be used to store keys. [Azure Blob storage](https://learn.microsoft.com/azure/storage/blobs/storage-blobs-introduction) is persistent and can be used to store keys. For more information, see [this GitHub issue](https://github.com/dotnet/AspNetCore/issues/13476).
+
+## How to Use
+
+To use `Microsoft.AspNetCore.DataProtection.StackExchangeRedis`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.DataProtection.StackExchangeRedis
+```
+
+### Configuration
+
+To configure data protection key storage on Redis, call one of the `PersistKeysToStackExchangeRedis` overloads:
+
+```csharp
+var redis = ConnectionMultiplexer.Connect("<URI>");
+builder.Services.AddDataProtection()
+    .PersistKeysToStackExchangeRedis(redis, "DataProtection-Keys");
+```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/data-protection/implementation/key-storage-providers#redis) on the Redis key storage provider.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.DataProtection.StackExchangeRedis` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/DefaultBuilder/DefaultBuilder.slnf b/src/DefaultBuilder/DefaultBuilder.slnf
index 7e0be7992642..9f542908a1d0 100644
--- a/src/DefaultBuilder/DefaultBuilder.slnf
+++ b/src/DefaultBuilder/DefaultBuilder.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\DefaultBuilder\\samples\\SampleApp\\DefaultBuilder.SampleApp.csproj",
diff --git a/src/DefaultBuilder/samples/SampleApp/Program.cs b/src/DefaultBuilder/samples/SampleApp/Program.cs
index fa29b18ac461..d79316f4b28e 100644
--- a/src/DefaultBuilder/samples/SampleApp/Program.cs
+++ b/src/DefaultBuilder/samples/SampleApp/Program.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+
 using Microsoft.AspNetCore;
 
 namespace SampleApp;
diff --git a/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs b/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs
index bd99297c8e56..d4f7a19a2d80 100644
--- a/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs
+++ b/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs
@@ -28,10 +28,12 @@ internal ConfigureWebHostBuilder(WebHostBuilderContext webHostBuilderContext, Co
         _context = webHostBuilderContext;
     }
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     IWebHost IWebHostBuilder.Build()
     {
         throw new NotSupportedException($"Call {nameof(WebApplicationBuilder)}.{nameof(WebApplicationBuilder.Build)}() instead.");
     }
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
 
     /// <inheritdoc />
     public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
diff --git a/src/DefaultBuilder/src/ForwardedHeadersOptionsSetup.cs b/src/DefaultBuilder/src/ForwardedHeadersOptionsSetup.cs
index 98835ff05482..9d2fe4d790cb 100644
--- a/src/DefaultBuilder/src/ForwardedHeadersOptionsSetup.cs
+++ b/src/DefaultBuilder/src/ForwardedHeadersOptionsSetup.cs
@@ -27,7 +27,7 @@ public void Configure(ForwardedHeadersOptions options)
         options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
         // Only loopback proxies are allowed by default. Clear that restriction because forwarders are
         // being enabled by explicit configuration.
-        options.KnownNetworks.Clear();
+        options.KnownIPNetworks.Clear();
         options.KnownProxies.Clear();
     }
 }
diff --git a/src/DefaultBuilder/src/GenericHostBuilderExtensions.cs b/src/DefaultBuilder/src/GenericHostBuilderExtensions.cs
index f61d482b4066..15ee5cca437e 100644
--- a/src/DefaultBuilder/src/GenericHostBuilderExtensions.cs
+++ b/src/DefaultBuilder/src/GenericHostBuilderExtensions.cs
@@ -61,7 +61,9 @@ public static IHostBuilder ConfigureWebHostDefaults(this IHostBuilder builder, A
 
         return builder.ConfigureWebHost(webHostBuilder =>
         {
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
             WebHost.ConfigureWebDefaults(webHostBuilder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
 
             configure(webHostBuilder);
         }, configureOptions);
diff --git a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
index 7c8c5ea97aa1..b7b1e259a1e3 100644
--- a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
+++ b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
@@ -35,6 +35,10 @@
     <Reference Include="Microsoft.Extensions.Logging.EventSource" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Authentication.Test" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Authorization.Test" />
diff --git a/src/DefaultBuilder/src/WebApplication.cs b/src/DefaultBuilder/src/WebApplication.cs
index e06b7a0e1904..8f10bf20d3af 100644
--- a/src/DefaultBuilder/src/WebApplication.cs
+++ b/src/DefaultBuilder/src/WebApplication.cs
@@ -166,7 +166,7 @@ public Task StartAsync(CancellationToken cancellationToken = default) =>
     /// <param name="cancellationToken"></param>
     /// <returns>
     /// A <see cref="Task"/> that represents the shutdown of the <see cref="WebApplication"/>.
-    /// Successful completion indicates that all the HTTP server has stopped.
+    /// Successful completion indicates that the HTTP server has stopped.
     /// </returns>
     public Task StopAsync(CancellationToken cancellationToken = default) =>
         _host.StopAsync(cancellationToken);
@@ -185,7 +185,7 @@ public Task RunAsync([StringSyntax(StringSyntaxAttribute.Uri)] string? url = nul
     }
 
     /// <summary>
-    /// Runs an application and block the calling thread until host shutdown.
+    /// Runs an application and blocks the calling thread until host shutdown.
     /// </summary>
     /// <param name="url">The URL to listen to if the server hasn't been configured directly.</param>
     public void Run([StringSyntax(StringSyntaxAttribute.Uri)] string? url = null)
diff --git a/src/DefaultBuilder/src/WebApplicationBuilder.cs b/src/DefaultBuilder/src/WebApplicationBuilder.cs
index 2cff4ae4ffb9..d2f02b4fa74f 100644
--- a/src/DefaultBuilder/src/WebApplicationBuilder.cs
+++ b/src/DefaultBuilder/src/WebApplicationBuilder.cs
@@ -127,7 +127,9 @@ internal WebApplicationBuilder(WebApplicationOptions options, bool slim, Action<
         bootstrapHostBuilder.ConfigureSlimWebHost(
             webHostBuilder =>
             {
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
                 AspNetCore.WebHost.ConfigureWebDefaultsSlim(webHostBuilder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
 
                 // Runs inline.
                 webHostBuilder.Configure(ConfigureApplication);
diff --git a/src/DefaultBuilder/src/WebHost.cs b/src/DefaultBuilder/src/WebHost.cs
index a3e8b030d4c0..68703a76854c 100644
--- a/src/DefaultBuilder/src/WebHost.cs
+++ b/src/DefaultBuilder/src/WebHost.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -21,6 +22,7 @@ namespace Microsoft.AspNetCore;
 /// <summary>
 /// Provides convenience methods for creating instances of <see cref="IWebHost"/> and <see cref="IWebHostBuilder"/> with pre-configured defaults.
 /// </summary>
+[Obsolete("WebHost is obsolete. Use HostBuilder or WebApplicationBuilder instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
 public static class WebHost
 {
     /// <summary>
@@ -154,7 +156,9 @@ public static IWebHostBuilder CreateDefaultBuilder() =>
     /// <returns>The initialized <see cref="IWebHostBuilder"/>.</returns>
     public static IWebHostBuilder CreateDefaultBuilder(string[] args)
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         if (string.IsNullOrEmpty(builder.GetSetting(WebHostDefaults.ContentRootKey)))
         {
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
index cd11d5448522..32b74e2d92b3 100644
--- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
+++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+
 using System.Net.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
@@ -126,7 +128,7 @@ public void LoggingConfigurationSectionPassedToLoggerByDefault()
 
                 logger.Log(LogLevel.Information, 0, "Message", null, (s, e) =>
                 {
-                    Assert.True(false, "Information log when log level set to warning in config");
+                    Assert.Fail("Information log when log level set to warning in config");
                     return string.Empty;
                 });
 
@@ -153,7 +155,7 @@ public async Task RunsInIISExpressInProcess()
         var applicationName = "CreateDefaultBuilderApp";
         var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
         {
-            TargetFramework = "net9.0",
+            TargetFramework = "net10.0",
             HostingModel = HostingModel.InProcess
         };
 
@@ -208,7 +210,7 @@ private async Task ExecuteTestApp(string applicationName,
     {
         var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitectures.Current)
         {
-            TargetFramework = "net9.0",
+            TargetFramework = "net10.0",
         };
 
         if (setTestEnvVars)
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs
index 43a3573cee89..5353602e357f 100644
--- a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs
+++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs
@@ -377,7 +377,9 @@ public void WebApplicationBuilderHost_ThrowsWhenBuiltDirectly(CreateBuilderFunc
     [MemberData(nameof(CreateBuilderFuncs))]
     public void WebApplicationBuilderWebHost_ThrowsWhenBuiltDirectly(CreateBuilderFunc createBuilder)
     {
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
         Assert.Throws<NotSupportedException>(() => ((IWebHostBuilder)createBuilder().WebHost).Build());
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
     }
 
     [Theory]
@@ -1770,10 +1772,10 @@ public void EmptyWebApplicationBuilder_OnlyContainsMinimalServices()
     {
         var builder = WebApplication.CreateEmptyBuilder(new());
 
-        Assert.Empty(builder.Services.Where(descriptor => descriptor.ServiceType == typeof(IConfigureOptions<LoggerFactoryOptions>)));
-        Assert.Empty(builder.Services.Where(descriptor => descriptor.ServiceType == typeof(IOptionsChangeTokenSource<HostFilteringOptions>)));
-        Assert.Empty(builder.Services.Where(descriptor => descriptor.ServiceType == typeof(IServer)));
-        Assert.Empty(builder.Services.Where(descriptor => descriptor.ServiceType == typeof(EndpointDataSource)));
+        Assert.DoesNotContain(builder.Services, descriptor => descriptor.ServiceType == typeof(IConfigureOptions<LoggerFactoryOptions>));
+        Assert.DoesNotContain(builder.Services, descriptor => descriptor.ServiceType == typeof(IOptionsChangeTokenSource<HostFilteringOptions>));
+        Assert.DoesNotContain(builder.Services, descriptor => descriptor.ServiceType == typeof(IServer));
+        Assert.DoesNotContain(builder.Services, descriptor => descriptor.ServiceType == typeof(EndpointDataSource));
 
         // These services are still necessary
         Assert.Single(builder.Services.Where(descriptor => descriptor.ServiceType == typeof(IWebHostEnvironment)));
@@ -1932,7 +1934,7 @@ public async Task WebApplication_CallsUseRoutingAndUseEndpoints(CreateBuilderFun
         await app.StartAsync();
 
         var ds = app.Services.GetRequiredService<EndpointDataSource>();
-        Assert.Equal(1, ds.Endpoints.Count);
+        Assert.Single(ds.Endpoints);
         Assert.Equal("One", ds.Endpoints[0].DisplayName);
 
         var client = app.GetTestClient();
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostTests.cs
index 8205e1459a08..31b3982a160b 100644
--- a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostTests.cs
+++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostTests.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+
 using System.Collections.Concurrent;
 using System.Diagnostics.Tracing;
 using Microsoft.AspNetCore.Builder;
diff --git a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/Program.cs b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/Program.cs
index 947c13abb87d..a3cbc83ab1c0 100644
--- a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/Program.cs
+++ b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/Program.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace CreateDefaultBuilderApp;
 
@@ -16,23 +16,27 @@ static void Main(string[] args)
     {
         string responseMessage = null;
 
-        WebHost.CreateDefaultBuilder(new[] { "--cliKey", "cliValue" })
-            .ConfigureServices((context, services) => responseMessage = responseMessage ?? GetResponseMessage(context))
-            .ConfigureKestrel(options => options
-                .Configure(options.ConfigurationLoader.Configuration)
-                .Endpoint("HTTP", endpointOptions =>
-                {
-                    if (responseMessage == null
-                        && !string.Equals("KestrelEndPointSettingValue", endpointOptions.ConfigSection["KestrelEndPointSettingName"]))
-                    {
-                        responseMessage = "Default Kestrel configuration not read.";
-                    }
-                }))
-            .Configure(app => app.Run(context =>
+        Host.CreateDefaultBuilder(new[] { "--cliKey", "cliValue" })
+            .ConfigureWebHostDefaults(webBuilder =>
             {
-                var hostingEnvironment = app.ApplicationServices.GetRequiredService<IWebHostEnvironment>();
-                return context.Response.WriteAsync(responseMessage ?? hostingEnvironment.ApplicationName);
-            }))
+                webBuilder
+                    .ConfigureServices((context, services) => responseMessage = responseMessage ?? GetResponseMessage(context))
+                    .ConfigureKestrel(options => options
+                        .Configure(options.ConfigurationLoader.Configuration)
+                        .Endpoint("HTTP", endpointOptions =>
+                        {
+                            if (responseMessage == null
+                                && !string.Equals("KestrelEndPointSettingValue", endpointOptions.ConfigSection["KestrelEndPointSettingName"]))
+                            {
+                                responseMessage = "Default Kestrel configuration not read.";
+                            }
+                        }))
+                    .Configure(app => app.Run(context =>
+                    {
+                        var hostingEnvironment = app.ApplicationServices.GetRequiredService<IWebHostEnvironment>();
+                        return context.Response.WriteAsync(responseMessage ?? hostingEnvironment.ApplicationName);
+                    }));
+            })
             .Build().Run();
     }
 
diff --git a/src/DefaultBuilder/testassets/CreateDefaultBuilderOfTApp/Program.cs b/src/DefaultBuilder/testassets/CreateDefaultBuilderOfTApp/Program.cs
index e5a9e22f8e23..cd96ae23e1f9 100644
--- a/src/DefaultBuilder/testassets/CreateDefaultBuilderOfTApp/Program.cs
+++ b/src/DefaultBuilder/testassets/CreateDefaultBuilderOfTApp/Program.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.HostFiltering;
 using Microsoft.AspNetCore.Hosting;
@@ -19,31 +18,35 @@ static void Main(string[] args)
     {
         string responseMessage = null;
 
-        WebHost.CreateDefaultBuilder(new[] { "--cliKey", "cliValue" })
-            .ConfigureServices((context, service) => responseMessage = responseMessage ?? GetResponseMessage(context))
-            .ConfigureKestrel(options => options
-                .Configure(options.ConfigurationLoader.Configuration)
-                .Endpoint("HTTP", endpointOptions =>
-                {
-                    if (responseMessage == null
-                        && !string.Equals("KestrelEndPointSettingValue", endpointOptions.ConfigSection["KestrelEndPointSettingName"]))
-                    {
-                        responseMessage = "Default Kestrel configuration not read.";
-                    }
-                }))
-            .Configure(app => app.Run(context =>
+        Host.CreateDefaultBuilder(new[] { "--cliKey", "cliValue" })
+            .ConfigureWebHostDefaults(webBuilder =>
             {
-                // Verify allowed hosts were loaded
-                var hostFilteringOptions = app.ApplicationServices.GetRequiredService<IOptions<HostFilteringOptions>>();
-                var hosts = string.Join(',', hostFilteringOptions.Value.AllowedHosts);
-                if (responseMessage == null && !string.Equals("example.com,127.0.0.1", hosts, StringComparison.Ordinal))
-                {
-                    responseMessage = "AllowedHosts not loaded into Options.";
-                }
+                webBuilder
+                    .ConfigureServices((context, service) => responseMessage = responseMessage ?? GetResponseMessage(context))
+                    .ConfigureKestrel(options => options
+                        .Configure(options.ConfigurationLoader.Configuration)
+                        .Endpoint("HTTP", endpointOptions =>
+                        {
+                            if (responseMessage == null
+                                && !string.Equals("KestrelEndPointSettingValue", endpointOptions.ConfigSection["KestrelEndPointSettingName"]))
+                            {
+                                responseMessage = "Default Kestrel configuration not read.";
+                            }
+                        }))
+                    .Configure(app => app.Run(context =>
+                    {
+                        // Verify allowed hosts were loaded
+                        var hostFilteringOptions = app.ApplicationServices.GetRequiredService<IOptions<HostFilteringOptions>>();
+                        var hosts = string.Join(',', hostFilteringOptions.Value.AllowedHosts);
+                        if (responseMessage == null && !string.Equals("example.com,127.0.0.1", hosts, StringComparison.Ordinal))
+                        {
+                            responseMessage = "AllowedHosts not loaded into Options.";
+                        }
 
-                var hostingEnvironment = app.ApplicationServices.GetRequiredService<IHostEnvironment>();
-                return context.Response.WriteAsync(responseMessage ?? hostingEnvironment.ApplicationName);
-            }))
+                        var hostingEnvironment = app.ApplicationServices.GetRequiredService<IHostEnvironment>();
+                        return context.Response.WriteAsync(responseMessage ?? hostingEnvironment.ApplicationName);
+                    }));
+            })
             .Build()
             .Run();
     }
diff --git a/src/DefaultBuilder/testassets/DependencyInjectionApp/Program.cs b/src/DefaultBuilder/testassets/DependencyInjectionApp/Program.cs
index 657b7940895d..6cd428fa86f8 100644
--- a/src/DefaultBuilder/testassets/DependencyInjectionApp/Program.cs
+++ b/src/DefaultBuilder/testassets/DependencyInjectionApp/Program.cs
@@ -1,12 +1,12 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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 Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace CreateDefaultBuilderApp;
 
@@ -14,27 +14,31 @@ public class Program
 {
     static void Main(string[] args)
     {
-        WebHost.CreateDefaultBuilder()
-            .UseUrls("http://127.0.0.1:0")
-            .ConfigureServices((context, services) =>
+        Host.CreateDefaultBuilder()
+            .ConfigureWebHostDefaults(webBuilder =>
             {
-                services.AddSingleton(typeof(IService<>), typeof(Service<>));
-                services.AddScoped<IAnotherService, AnotherService>();
-            })
-            .Configure(app =>
-            {
-                app.Run(context =>
-                {
-                    try
+                webBuilder
+                    .UseUrls("http://127.0.0.1:0")
+                    .ConfigureServices((context, services) =>
                     {
-                        context.RequestServices.GetService<IService<IAnotherService>>();
-                        return context.Response.WriteAsync("Success");
-                    }
-                    catch (Exception ex)
+                        services.AddSingleton(typeof(IService<>), typeof(Service<>));
+                        services.AddScoped<IAnotherService, AnotherService>();
+                    })
+                    .Configure(app =>
                     {
-                        return context.Response.WriteAsync(ex.ToString());
-                    }
-                });
+                        app.Run(context =>
+                        {
+                            try
+                            {
+                                context.RequestServices.GetService<IService<IAnotherService>>();
+                                return context.Response.WriteAsync("Success");
+                            }
+                            catch (Exception ex)
+                            {
+                                return context.Response.WriteAsync(ex.ToString());
+                            }
+                        });
+                    });
             })
             .Build().Run();
     }
diff --git a/src/DefaultBuilder/testassets/StartRequestDelegateUrlApp/Program.cs b/src/DefaultBuilder/testassets/StartRequestDelegateUrlApp/Program.cs
index f2cadf086c50..27f2b58928cd 100644
--- a/src/DefaultBuilder/testassets/StartRequestDelegateUrlApp/Program.cs
+++ b/src/DefaultBuilder/testassets/StartRequestDelegateUrlApp/Program.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+
 using System;
 using System.Threading;
 using Microsoft.AspNetCore;
diff --git a/src/DefaultBuilder/testassets/StartRouteBuilderUrlApp/Program.cs b/src/DefaultBuilder/testassets/StartRouteBuilderUrlApp/Program.cs
index 46980d54399d..19b44c905d25 100644
--- a/src/DefaultBuilder/testassets/StartRouteBuilderUrlApp/Program.cs
+++ b/src/DefaultBuilder/testassets/StartRouteBuilderUrlApp/Program.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+
 using System;
 using System.Threading;
 using Microsoft.AspNetCore;
diff --git a/src/DefaultBuilder/testassets/StartWithIApplicationBuilderUrlApp/Program.cs b/src/DefaultBuilder/testassets/StartWithIApplicationBuilderUrlApp/Program.cs
index c3422885bc75..981b2a61b961 100644
--- a/src/DefaultBuilder/testassets/StartWithIApplicationBuilderUrlApp/Program.cs
+++ b/src/DefaultBuilder/testassets/StartWithIApplicationBuilderUrlApp/Program.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+
 using System;
 using System.Threading;
 using Microsoft.AspNetCore;
diff --git a/src/Features/JsonPatch.SystemTextJson/.vsconfig b/src/Features/JsonPatch.SystemTextJson/.vsconfig
new file mode 100644
index 000000000000..77009588dff2
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/.vsconfig
@@ -0,0 +1,12 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.Net.Component.4.6.2.TargetingPack",
+    "Microsoft.Net.Component.4.7.2.SDK",
+    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.VisualStudio.Workload.NetCoreTools",
+    "Microsoft.VisualStudio.Workload.NetWeb",
+    "Microsoft.VisualStudio.Workload.VisualStudioExtension"
+  ]
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/JsonPatch.SystemTextJson.slnf b/src/Features/JsonPatch.SystemTextJson/JsonPatch.SystemTextJson.slnf
new file mode 100644
index 000000000000..19edc5866421
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/JsonPatch.SystemTextJson.slnf
@@ -0,0 +1,9 @@
+{
+  "solution": {
+    "path": "..\\..\\..\\AspNetCore.slnx",
+    "projects" : [
+      "src\\Features\\JsonPatch.SystemTextJson\\src\\Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj",
+      "src\\Features\\JsonPatch.SystemTextJson\\test\\Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj"
+    ]
+  }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/build.cmd b/src/Features/JsonPatch.SystemTextJson/build.cmd
new file mode 100644
index 000000000000..956c031417d3
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/build.cmd
@@ -0,0 +1,4 @@
+
+@ECHO OFF
+SET RepoRoot=%~dp0..\..\..
+%RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj %*
diff --git a/src/Features/JsonPatch.SystemTextJson/build.sh b/src/Features/JsonPatch.SystemTextJson/build.sh
new file mode 100644
index 000000000000..4eb40c27e392
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../.."
+"$repo_root/eng/build.sh" --projects "$DIR/**/*.*proj" "$@"
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Adapters/AdapterFactory.cs b/src/Features/JsonPatch.SystemTextJson/src/Adapters/AdapterFactory.cs
new file mode 100644
index 000000000000..aff6f3a6bf5a
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Adapters/AdapterFactory.cs
@@ -0,0 +1,40 @@
+// 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.Collections;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+
+/// <summary>
+/// The default AdapterFactory to be used for resolving <see cref="IAdapter"/>.
+/// </summary>
+internal class AdapterFactory : IAdapterFactory
+{
+    internal static AdapterFactory Default { get; } = new();
+
+    /// <inheritdoc />
+    public virtual IAdapter Create(object target)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(target);
+
+        var typeToConvert = target.GetType();
+        if (typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+        {
+            return (IAdapter)Activator.CreateInstance(typeof(DictionaryAdapter<,>).MakeGenericType(typeToConvert.GenericTypeArguments[0], typeToConvert.GenericTypeArguments[1]));
+        }
+
+        return target switch
+        {
+            JsonObject => new JsonObjectAdapter(),
+            JsonArray => new ListAdapter(),
+            IList => new ListAdapter(),
+            _ => new PocoAdapter()
+        };
+    }
+}
+
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Adapters/IAdapterFactory.cs b/src/Features/JsonPatch.SystemTextJson/src/Adapters/IAdapterFactory.cs
new file mode 100644
index 000000000000..2afae2ee4e6c
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Adapters/IAdapterFactory.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+
+/// <summary>
+/// Defines the operations used for loading an <see cref="IAdapter"/> based on the current object and ContractResolver.
+/// </summary>
+internal interface IAdapterFactory
+{
+    /// <summary>
+    /// Creates an <see cref="IAdapter"/> for the current object
+    /// </summary>
+    /// <param name="target">The target object</param>
+    /// <returns>The needed <see cref="IAdapter"/></returns>
+    IAdapter Create(object target);
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Adapters/IObjectAdapter.cs b/src/Features/JsonPatch.SystemTextJson/src/Adapters/IObjectAdapter.cs
new file mode 100644
index 000000000000..4a20c424484d
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Adapters/IObjectAdapter.cs
@@ -0,0 +1,111 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+
+/// <summary>
+/// Defines the operations that can be performed on a JSON patch document.
+/// </summary>
+public interface IObjectAdapter
+{
+    /// <summary>
+    /// Using the "add" operation a new value is inserted into the root of the target
+    /// document, into the target array at the specified valid index, or to a target object at
+    /// the specified location.
+    ///
+    /// When adding to arrays, the specified index MUST NOT be greater than the number of elements in the array.
+    /// To append the value to the array, the index of "-" character is used (see [RFC6901]).
+    ///
+    /// When adding to an object, if an object member does not already exist, a new member is added to the object at the
+    /// specified location or if an object member does exist, that member's value is replaced.
+    ///
+    /// The operation object MUST contain a "value" member whose content
+    /// specifies the value to be added.
+    ///
+    /// For example:
+    ///
+    /// { "op": "add", "path": "/a/b/c", "value": [ "foo", "bar" ] }
+    ///
+    /// See RFC 6902 <see href="https://tools.ietf.org/html/rfc6902#page-4"/>
+    /// </summary>
+    /// <param name="operation">The add operation.</param>
+    /// <param name="objectToApplyTo">Object to apply the operation to.</param>
+    void Add(Operation operation, object objectToApplyTo);
+
+    /// <summary>
+    ///  Using the "copy" operation, a value is copied from a specified location to the
+    ///  target location.
+    ///
+    ///  The operation object MUST contain a "from" member, which references the location in the
+    ///  target document to copy the value from.
+    ///
+    ///  The "from" location MUST exist for the operation to be successful.
+    ///
+    ///  For example:
+    ///
+    ///  { "op": "copy", "from": "/a/b/c", "path": "/a/b/e" }
+    ///
+    /// See RFC 6902 <see href="https://tools.ietf.org/html/rfc6902#page-7"/>
+    /// </summary>
+    /// <param name="operation">The copy operation.</param>
+    /// <param name="objectToApplyTo">Object to apply the operation to.</param>
+    void Copy(Operation operation, object objectToApplyTo);
+
+    /// <summary>
+    /// Using the "move" operation the value at a specified location is removed and
+    /// added to the target location.
+    ///
+    /// The operation object MUST contain a "from" member, which references the location in the
+    /// target document to move the value from.
+    ///
+    /// The "from" location MUST exist for the operation to be successful.
+    ///
+    /// For example:
+    ///
+    /// { "op": "move", "from": "/a/b/c", "path": "/a/b/d" }
+    ///
+    /// A location cannot be moved into one of its children.
+    ///
+    /// See RFC 6902 <see href="https://tools.ietf.org/html/rfc6902#page-6"/>
+    /// </summary>
+    /// <param name="operation">The move operation.</param>
+    /// <param name="objectToApplyTo">Object to apply the operation to.</param>
+    void Move(Operation operation, object objectToApplyTo);
+
+    /// <summary>
+    /// Using the "remove" operation the value at the target location is removed.
+    ///
+    /// The target location MUST exist for the operation to be successful.
+    ///
+    /// For example:
+    ///
+    /// { "op": "remove", "path": "/a/b/c" }
+    ///
+    /// If removing an element from an array, any elements above the
+    /// specified index are shifted one position to the left.
+    ///
+    /// See RFC 6902 <see href="https://tools.ietf.org/html/rfc6902#page-6"/>
+    /// </summary>
+    /// <param name="operation">The remove operation.</param>
+    /// <param name="objectToApplyTo">Object to apply the operation to.</param>
+    void Remove(Operation operation, object objectToApplyTo);
+
+    /// <summary>
+    /// Using the "replace" operation the value at the target location is replaced
+    /// with a new value.  The operation object MUST contain a "value" member
+    /// which specifies the replacement value.
+    ///
+    /// The target location MUST exist for the operation to be successful.
+    ///
+    /// For example:
+    ///
+    /// { "op": "replace", "path": "/a/b/c", "value": 42 }
+    ///
+    /// See RFC 6902 <see href="https://tools.ietf.org/html/rfc6902#page-6"/>
+    /// </summary>
+    /// <param name="operation">The replace operation.</param>
+    /// <param name="objectToApplyTo">Object to apply the operation to.</param>
+    void Replace(Operation operation, object objectToApplyTo);
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Adapters/IObjectAdapterWithTest.cs b/src/Features/JsonPatch.SystemTextJson/src/Adapters/IObjectAdapterWithTest.cs
new file mode 100644
index 000000000000..9dd4612a727f
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Adapters/IObjectAdapterWithTest.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+
+/// <summary>
+/// Defines the operations that can be performed on a JSON patch document, including "test".
+/// </summary>
+public interface IObjectAdapterWithTest : IObjectAdapter
+{
+    /// <summary>
+    /// Using the "test" operation a value at the target location is compared for
+    /// equality to a specified value.
+    ///
+    /// The operation object MUST contain a "value" member that specifies
+    /// value to be compared to the target location's value.
+    ///
+    /// The target location MUST be equal to the "value" value for the
+    /// operation to be considered successful.
+    ///
+    /// For example:
+    /// { "op": "test", "path": "/a/b/c", "value": "foo" }
+    ///
+    /// See RFC 6902 <see href="https://tools.ietf.org/html/rfc6902#page-7"/>
+    /// </summary>
+    /// <param name="operation">The test operation.</param>
+    /// <param name="objectToApplyTo">Object to apply the operation to.</param>
+    void Test(Operation operation, object objectToApplyTo);
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Adapters/ObjectAdapter.cs b/src/Features/JsonPatch.SystemTextJson/src/Adapters/ObjectAdapter.cs
new file mode 100644
index 000000000000..708dd61dffeb
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Adapters/ObjectAdapter.cs
@@ -0,0 +1,280 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+
+/// <inheritdoc />
+internal class ObjectAdapter : IObjectAdapterWithTest
+{
+    /// <summary>
+    /// Initializes a new instance of <see cref="ObjectAdapter"/>.
+    /// </summary>
+    /// <param name="serializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="logErrorAction">The <see cref="Action"/> for logging <see cref="JsonPatchError"/>.</param>
+    public ObjectAdapter(
+        JsonSerializerOptions serializerOptions,
+        Action<JsonPatchError> logErrorAction) :
+        this(serializerOptions, logErrorAction, Adapters.AdapterFactory.Default)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of <see cref="ObjectAdapter"/>.
+    /// </summary>
+    /// <param name="serializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="logErrorAction">The <see cref="Action"/> for logging <see cref="JsonPatchError"/>.</param>
+    /// <param name="adapterFactory">The <see cref="IAdapterFactory"/> to use when creating adaptors.</param>
+    public ObjectAdapter(
+       JsonSerializerOptions serializerOptions,
+       Action<JsonPatchError> logErrorAction,
+       IAdapterFactory adapterFactory)
+    {
+        SerializerOptions = serializerOptions ?? throw new ArgumentNullException(nameof(serializerOptions));
+        LogErrorAction = logErrorAction;
+        AdapterFactory = adapterFactory ?? throw new ArgumentNullException(nameof(adapterFactory));
+    }
+
+    /// <summary>
+    /// Gets or sets the <see cref="IJsonTypeInfoResolver"/>.
+    /// </summary>
+    public JsonSerializerOptions SerializerOptions { get; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="IAdapterFactory"/>
+    /// </summary>
+    public IAdapterFactory AdapterFactory { get; }
+
+    /// <summary>
+    /// Action for logging <see cref="JsonPatchError"/>.
+    /// </summary>
+    public Action<JsonPatchError> LogErrorAction { get; }
+
+    public void Add(Operation operation, object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        Add(operation.path, operation.value, objectToApplyTo, operation);
+    }
+
+    /// <summary>
+    /// Add is used by various operations (eg: add, copy, ...), yet through different operations;
+    /// This method allows code reuse yet reporting the correct operation on error
+    /// </summary>
+    private void Add(
+        string path,
+        object value,
+        object objectToApplyTo,
+        Operation operation)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+
+        var parsedPath = new ParsedPath(path);
+        var visitor = new ObjectVisitor(parsedPath, SerializerOptions, AdapterFactory);
+
+        var target = objectToApplyTo;
+        // Find the target object and the appropriate adapter
+        if (!visitor.TryVisit(ref target, out var adapter, out var errorMessage))
+        {
+            var error = CreatePathNotFoundError(objectToApplyTo, path, operation, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+
+        if (!adapter.TryAdd(target, parsedPath.LastSegment, SerializerOptions, value, out errorMessage))
+        {
+            var error = CreateOperationFailedError(objectToApplyTo, path, operation, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+    }
+
+    public void Move(Operation operation, object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        // Get value at 'from' location and add that value to the 'path' location
+        if (TryGetValue(operation.from, objectToApplyTo, operation, out var propertyValue))
+        {
+            // remove that value
+            Remove(operation.from, objectToApplyTo, operation);
+
+            // add that value to the path location
+            Add(operation.path, propertyValue, objectToApplyTo, operation);
+        }
+    }
+
+    public void Remove(Operation operation, object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        Remove(operation.path, objectToApplyTo, operation);
+    }
+
+    /// <summary>
+    /// Remove is used by various operations (eg: remove, move, ...), yet through different operations;
+    /// This method allows code reuse yet reporting the correct operation on error.  The return value
+    /// contains the type of the item that has been removed (and a bool possibly signifying an error)
+    /// This can be used by other methods, like replace, to ensure that we can pass in the correctly
+    /// typed value to whatever method follows.
+    /// </summary>
+    private void Remove(string path, object objectToApplyTo, Operation operationToReport)
+    {
+        var parsedPath = new ParsedPath(path);
+        var visitor = new ObjectVisitor(parsedPath, SerializerOptions, AdapterFactory);
+
+        var target = objectToApplyTo;
+        if (!visitor.TryVisit(ref target, out var adapter, out var errorMessage))
+        {
+            var error = CreatePathNotFoundError(objectToApplyTo, path, operationToReport, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+
+        if (!adapter.TryRemove(target, parsedPath.LastSegment, SerializerOptions, out errorMessage))
+        {
+            var error = CreateOperationFailedError(objectToApplyTo, path, operationToReport, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+    }
+
+    public void Replace(Operation operation, object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        var parsedPath = new ParsedPath(operation.path);
+        var visitor = new ObjectVisitor(parsedPath, SerializerOptions, AdapterFactory);
+
+        var target = objectToApplyTo;
+        if (!visitor.TryVisit(ref target, out var adapter, out var errorMessage))
+        {
+            var error = CreatePathNotFoundError(objectToApplyTo, operation.path, operation, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+
+        if (!adapter.TryReplace(target, parsedPath.LastSegment, SerializerOptions, operation.value, out errorMessage))
+        {
+            var error = CreateOperationFailedError(objectToApplyTo, operation.path, operation, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+    }
+
+    public void Copy(Operation operation, object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        // Get value at 'from' location and add that value to the 'path' location
+        if (TryGetValue(operation.from, objectToApplyTo, operation, out var propertyValue))
+        {
+            // Create deep copy
+            var copyResult = ConversionResultProvider.CopyTo(propertyValue, propertyValue?.GetType(), SerializerOptions);
+            if (copyResult.CanBeConverted)
+            {
+                Add(operation.path, copyResult.ConvertedInstance, objectToApplyTo, operation);
+            }
+            else
+            {
+                var error = CreateOperationFailedError(objectToApplyTo, operation.path, operation, Resources.FormatCannotCopyProperty(operation.from));
+                ErrorReporter(error);
+                return;
+            }
+        }
+    }
+
+    public void Test(Operation operation, object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        var parsedPath = new ParsedPath(operation.path);
+        var visitor = new ObjectVisitor(parsedPath, SerializerOptions, AdapterFactory);
+
+        var target = objectToApplyTo;
+        if (!visitor.TryVisit(ref target, out var adapter, out var errorMessage))
+        {
+            var error = CreatePathNotFoundError(objectToApplyTo, operation.path, operation, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+
+        if (!adapter.TryTest(target, parsedPath.LastSegment, SerializerOptions, operation.value, out errorMessage))
+        {
+            var error = CreateOperationFailedError(objectToApplyTo, operation.path, operation, errorMessage);
+            ErrorReporter(error);
+            return;
+        }
+    }
+
+    private bool TryGetValue(
+        string fromLocation,
+        object objectToGetValueFrom,
+        Operation operation,
+        out object propertyValue)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(fromLocation);
+        ArgumentNullThrowHelper.ThrowIfNull(objectToGetValueFrom);
+        ArgumentNullThrowHelper.ThrowIfNull(operation);
+
+        propertyValue = null;
+
+        var parsedPath = new ParsedPath(fromLocation);
+        var visitor = new ObjectVisitor(parsedPath, SerializerOptions, AdapterFactory);
+
+        var target = objectToGetValueFrom;
+        if (!visitor.TryVisit(ref target, out var adapter, out var errorMessage))
+        {
+            var error = CreatePathNotFoundError(objectToGetValueFrom, fromLocation, operation, errorMessage);
+            ErrorReporter(error);
+            return false;
+        }
+
+        if (!adapter.TryGet(target, parsedPath.LastSegment, SerializerOptions, out propertyValue, out errorMessage))
+        {
+            var error = CreateOperationFailedError(objectToGetValueFrom, fromLocation, operation, errorMessage);
+            ErrorReporter(error);
+            return false;
+        }
+
+        return true;
+    }
+
+    private Action<JsonPatchError> ErrorReporter
+    {
+        get
+        {
+            return LogErrorAction ?? Internal.ErrorReporter.Default;
+        }
+    }
+
+    private static JsonPatchError CreateOperationFailedError(object target, string path, Operation operation, string errorMessage)
+    {
+        return new JsonPatchError(
+            target,
+            operation,
+            errorMessage ?? Resources.FormatCannotPerformOperation(operation.op, path));
+    }
+
+    private static JsonPatchError CreatePathNotFoundError(object target, string path, Operation operation, string errorMessage)
+    {
+        return new JsonPatchError(
+            target,
+            operation,
+            errorMessage ?? Resources.FormatTargetLocationNotFound(operation.op, path));
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonConverterForJsonPatchDocumentOfT.cs b/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonConverterForJsonPatchDocumentOfT.cs
new file mode 100644
index 000000000000..d6871a8b455e
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonConverterForJsonPatchDocumentOfT.cs
@@ -0,0 +1,69 @@
+// 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.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Converters;
+
+internal sealed class JsonConverterForJsonPatchDocumentOfT<T> : JsonConverter<JsonPatchDocument<T>>
+    where T : class
+{
+    private static JsonConverter<Operation<T>> GetConverter(JsonSerializerOptions options) =>
+            (JsonConverter<Operation<T>>)options.GetConverter(typeof(Operation<T>));
+
+    public override JsonPatchDocument<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (typeToConvert != typeof(JsonPatchDocument<T>))
+        {
+            throw new ArgumentException(Resources.FormatParameterMustMatchType(nameof(typeToConvert), nameof(JsonPatchDocument<T>)), nameof(typeToConvert));
+        }
+
+        if (reader.TokenType != JsonTokenType.StartArray)
+        {
+            throw new JsonException(Resources.InvalidJsonPatchDocument);
+        }
+
+        if (reader.TokenType == JsonTokenType.Null)
+        {
+            return null;
+        }
+
+        List<Operation<T>> ops = [];
+        try
+        {
+            JsonConverter<Operation<T>> operationConverter = GetConverter(options);
+            while (reader.Read() && reader.TokenType is not JsonTokenType.EndArray)
+            {
+                var op = operationConverter.Read(ref reader, typeof(Operation<T>), options);
+                ops.Add(op);
+            }
+
+            return new JsonPatchDocument<T>(ops, options);
+        }
+        catch (Exception ex)
+        {
+            throw new JsonException(Resources.InvalidJsonPatchDocument, ex);
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, JsonPatchDocument<T> value, JsonSerializerOptions options)
+    {
+        if (value == null)
+        {
+            writer.WriteNullValue();
+            return;
+        }
+
+        JsonConverter<Operation<T>> operationConverter = GetConverter(options);
+        writer.WriteStartArray();
+        foreach (var operation in value.Operations)
+        {
+            operationConverter.Write(writer, operation, options);
+        }
+        writer.WriteEndArray();
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonPatchDocumentConverter.cs b/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonPatchDocumentConverter.cs
new file mode 100644
index 000000000000..554fe8d12eb8
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonPatchDocumentConverter.cs
@@ -0,0 +1,71 @@
+// 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.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Converters;
+
+internal class JsonPatchDocumentConverter : JsonConverter<JsonPatchDocument>
+{
+    private static JsonConverter<Operation> GetConverter(JsonSerializerOptions options) =>
+            (JsonConverter<Operation>)options.GetConverter(typeof(Operation));
+
+    public override JsonPatchDocument Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (typeToConvert != typeof(JsonPatchDocument))
+        {
+            throw new ArgumentException(Resources.FormatParameterMustMatchType(nameof(typeToConvert), nameof(JsonPatchDocument)), nameof(typeToConvert));
+        }
+
+        if (reader.TokenType != JsonTokenType.StartArray)
+        {
+            throw new JsonException(Resources.InvalidJsonPatchDocument);
+        }
+
+        if (reader.TokenType == JsonTokenType.Null)
+        {
+            return null;
+        }
+
+        List<Operation> ops = [];
+
+        try
+        {
+            JsonConverter<Operation> operationConverter = GetConverter(options);
+            while (reader.Read() && reader.TokenType is not JsonTokenType.EndArray)
+            {
+                var op = operationConverter.Read(ref reader, typeof(Operation), options);
+                ops.Add(op);
+            }
+
+            return new JsonPatchDocument(ops, options);
+        }
+        catch (Exception ex)
+        {
+            throw new JsonException(Resources.InvalidJsonPatchDocument, ex);
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, JsonPatchDocument value, JsonSerializerOptions options)
+    {
+        if (value == null)
+        {
+            writer.WriteNullValue();
+            return;
+        }
+
+        JsonConverter<Operation> operationConverter = GetConverter(options);
+
+        writer.WriteStartArray();
+        foreach (var operation in value.Operations)
+        {
+            operationConverter.Write(writer, operation, options);
+        }
+
+        writer.WriteEndArray();
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonPatchDocumentConverterFactory.cs b/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonPatchDocumentConverterFactory.cs
new file mode 100644
index 000000000000..d862cb97df80
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Converters/JsonPatchDocumentConverterFactory.cs
@@ -0,0 +1,27 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Converters;
+
+internal class JsonPatchDocumentConverterFactory : JsonConverterFactory
+{
+    public override bool CanConvert(Type typeToConvert)
+    {
+        return typeToConvert == typeof(JsonPatchDocument) ||
+               (typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(JsonPatchDocument<>));
+    }
+
+    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (typeToConvert == typeof(JsonPatchDocument))
+        {
+            return new JsonPatchDocumentConverter();
+        }
+
+        return (JsonConverter)Activator.CreateInstance(typeof(JsonConverterForJsonPatchDocumentOfT<>).MakeGenericType(typeToConvert.GenericTypeArguments[0]));
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Exceptions/JsonPatchException.cs b/src/Features/JsonPatch.SystemTextJson/src/Exceptions/JsonPatchException.cs
new file mode 100644
index 000000000000..a772e4393773
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Exceptions/JsonPatchException.cs
@@ -0,0 +1,34 @@
+// 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 Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+
+public class JsonPatchException : Exception
+{
+    public Operation FailedOperation { get; private set; }
+    public object AffectedObject { get; private set; }
+
+    public JsonPatchException()
+    {
+    }
+
+    public JsonPatchException(JsonPatchError jsonPatchError, Exception innerException)
+        : base(jsonPatchError.ErrorMessage, innerException)
+    {
+        FailedOperation = jsonPatchError.Operation;
+        AffectedObject = jsonPatchError.AffectedObject;
+    }
+
+    public JsonPatchException(JsonPatchError jsonPatchError)
+      : this(jsonPatchError, null)
+    {
+    }
+
+    public JsonPatchException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Helpers/GenericListOrJsonArrayUtilities.cs b/src/Features/JsonPatch.SystemTextJson/src/Helpers/GenericListOrJsonArrayUtilities.cs
new file mode 100644
index 000000000000..a82ee38ab951
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Helpers/GenericListOrJsonArrayUtilities.cs
@@ -0,0 +1,105 @@
+// 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.Collections;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Helpers;
+
+internal static class GenericListOrJsonArrayUtilities
+{
+    internal static object GetElementAt(object list, int index)
+    {
+        if (list is IList nonGenericList)
+        {
+            return nonGenericList[index];
+        }
+
+        if (list is JsonArray array)
+        {
+            return array[index];
+        }
+
+        throw new InvalidOperationException($"Unsupported list type: {list.GetType()}");
+    }
+
+    internal static void SetValueAt(object list, int index, object value)
+    {
+        if (list is IList nonGenericList)
+        {
+            nonGenericList[index] = value;
+        }
+        else if (list is JsonArray array)
+        {
+            array[index] = (JsonNode)value;
+        }
+        else
+        {
+            throw new InvalidOperationException($"Unsupported list type: {list.GetType()}");
+        }
+    }
+
+    internal static int GetCount(object list)
+    {
+        if (list is ICollection nonGenericList)
+        {
+            return nonGenericList.Count;
+        }
+
+        if (list is JsonArray jsonArray)
+        {
+            return jsonArray.Count;
+        }
+
+        throw new InvalidOperationException($"Unsupported list type: {list.GetType()}");
+    }
+
+    internal static void RemoveElementAt(object list, int index)
+    {
+        if (list is IList nonGenericList)
+        {
+            nonGenericList.RemoveAt(index);
+        }
+        else if (list is JsonArray array)
+        {
+            array.RemoveAt(index);
+        }
+        else
+        {
+            throw new InvalidOperationException($"Unsupported list type: {list.GetType()}");
+        }
+    }
+
+    internal static void InsertElementAt(object list, int index, object value)
+    {
+        if (list is IList nonGenericList)
+        {
+            nonGenericList.Insert(index, value);
+        }
+        else if (list is JsonArray array)
+        {
+            array.Insert(index, (JsonNode)value);
+        }
+        else
+        {
+            throw new InvalidOperationException($"Unsupported list type: {list.GetType()}");
+        }
+    }
+
+    internal static void AddElement(object list, object value)
+    {
+        if (list is IList nonGenericList)
+        {
+            nonGenericList.Add(value);
+        }
+        else if (list is JsonArray array)
+        {
+            array.Add(value);
+        }
+        else
+        {
+            throw new InvalidOperationException($"Unsupported list type: {list.GetType()}");
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Helpers/JsonUtilities.cs b/src/Features/JsonPatch.SystemTextJson/src/Helpers/JsonUtilities.cs
new file mode 100644
index 000000000000..7c223fff2093
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Helpers/JsonUtilities.cs
@@ -0,0 +1,51 @@
+// 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.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Helpers;
+
+internal static class JsonUtilities
+{
+    public static bool DeepEquals(object a, object b, JsonSerializerOptions serializerOptions)
+    {
+        if (a == null && b == null)
+        {
+            return true;
+        }
+
+        if (a == null || b == null)
+        {
+            return false;
+        }
+
+        if (a is JsonNode nodeA && b is JsonNode nodeB)
+        {
+            return JsonNode.DeepEquals(nodeA, nodeB);
+        }
+
+        using var docA = TryGetJsonElement(a, serializerOptions, out var elementA);
+        using var docB = TryGetJsonElement(b, serializerOptions, out var elementB);
+
+        return JsonElement.DeepEquals(elementA, elementB);
+    }
+
+    private static IDisposable TryGetJsonElement(object item, JsonSerializerOptions serializerOptions, out JsonElement element)
+    {
+        IDisposable result = null;
+        if (item is JsonElement jsonElement)
+        {
+            element = jsonElement;
+        }
+        else
+        {
+            var docA = JsonSerializer.SerializeToDocument(item, serializerOptions);
+            element = docA.RootElement;
+            result = docA;
+        }
+
+        return result;
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/IJsonPatchDocument.cs b/src/Features/JsonPatch.SystemTextJson/src/IJsonPatchDocument.cs
new file mode 100644
index 000000000000..01aafc5431a7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/IJsonPatchDocument.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public interface IJsonPatchDocument
+{
+    JsonSerializerOptions SerializerOptions { get; set; }
+
+    IList<Operation> GetOperations();
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResult.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResult.cs
new file mode 100644
index 000000000000..57d88953acea
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResult.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class ConversionResult
+{
+    public ConversionResult(bool canBeConverted, object convertedInstance)
+    {
+        CanBeConverted = canBeConverted;
+        ConvertedInstance = convertedInstance;
+    }
+
+    public bool CanBeConverted { get; }
+    public object ConvertedInstance { get; }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResultProvider.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResultProvider.cs
new file mode 100644
index 000000000000..1ef5c87a92e7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResultProvider.cs
@@ -0,0 +1,85 @@
+// 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.Text.Json;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal static class ConversionResultProvider
+{
+    internal static ConversionResult ConvertTo(object value, Type typeToConvertTo, JsonSerializerOptions serializerOptions)
+    {
+        if (value == null)
+        {
+            return new ConversionResult(IsNullableType(typeToConvertTo), null);
+        }
+
+        if (typeToConvertTo.IsAssignableFrom(value.GetType()))
+        {
+            // No need to convert
+            return new ConversionResult(true, value);
+        }
+
+        return GetConvertedValue(value, serializerOptions, ref typeToConvertTo);
+    }
+
+    internal static ConversionResult CopyTo(object value, Type typeToConvertTo, JsonSerializerOptions serializerOptions)
+    {
+        var targetType = typeToConvertTo;
+        if (value == null)
+        {
+            return new ConversionResult(canBeConverted: true, convertedInstance: null);
+        }
+
+        if (typeToConvertTo != value.GetType() && typeToConvertTo.IsAssignableFrom(value.GetType()))
+        {
+            // Keep original type
+            targetType = value.GetType();
+        }
+
+        return GetConvertedValue(value, serializerOptions, ref targetType);
+    }
+
+    private static ConversionResult GetConvertedValue(object value, JsonSerializerOptions serializerOptions, ref Type targetType)
+    {
+        // Workaround for the https://github.com/dotnet/runtime/issues/113926
+        if (targetType.Name == "JsonValuePrimitive`1")
+        {
+            targetType = typeof(JsonElement);
+        }
+
+        try
+        {
+            var deserialized = ConvertToTargetType(value, targetType, serializerOptions);
+            return new ConversionResult(true, deserialized);
+        }
+        catch
+        {
+            return new ConversionResult(canBeConverted: false, convertedInstance: null);
+        }
+    }
+
+    private static bool IsNullableType(Type type)
+    {
+        if (type.IsValueType)
+        {
+            // value types are only nullable if they are Nullable<T>
+            return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+        }
+
+        // reference types are always nullable
+        return true;
+    }
+
+    private static object ConvertToTargetType(object value, Type targetType, JsonSerializerOptions serializerOptions)
+    {
+        if (value is JsonElement jsonElement)
+        {
+            return JsonSerializer.Deserialize(jsonElement, targetType, serializerOptions);
+        }
+
+        using JsonDocument doc = JsonSerializer.SerializeToDocument(value, serializerOptions);
+        return JsonSerializer.Deserialize(doc.RootElement, targetType, serializerOptions);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/DictionaryAdapterOfTU.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/DictionaryAdapterOfTU.cs
new file mode 100644
index 000000000000..c0540d4c4cd0
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/DictionaryAdapterOfTU.cs
@@ -0,0 +1,235 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Helpers;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class DictionaryAdapter<TKey, TValue> : IAdapter
+{
+    public virtual bool TryAdd(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        var key = segment;
+        var dictionary = (IDictionary<TKey, TValue>)target;
+
+        // As per JsonPatch spec, if a key already exists, adding should replace the existing value
+        if (!TryConvertKey(key, out var convertedKey, out errorMessage))
+        {
+            return false;
+        }
+
+        if (!TryConvertValue(value, serializerOptions, out var convertedValue, out errorMessage))
+        {
+            return false;
+        }
+
+        dictionary[convertedKey] = convertedValue;
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryGet(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object value,
+        out string errorMessage)
+    {
+        var key = segment;
+        var dictionary = (IDictionary<TKey, TValue>)target;
+
+        if (!TryConvertKey(key, out var convertedKey, out errorMessage))
+        {
+            value = null;
+            return false;
+        }
+
+        if (!dictionary.TryGetValue(convertedKey, out var valueAsT))
+        {
+            value = null;
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        value = valueAsT;
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryRemove(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out string errorMessage)
+    {
+        var key = segment;
+        var dictionary = (IDictionary<TKey, TValue>)target;
+
+        if (!TryConvertKey(key, out var convertedKey, out errorMessage))
+        {
+            return false;
+        }
+
+        // As per JsonPatch spec, the target location must exist for remove to be successful
+        if (!dictionary.Remove(convertedKey))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryReplace(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        var key = segment;
+        var dictionary = (IDictionary<TKey, TValue>)target;
+
+        if (!TryConvertKey(key, out var convertedKey, out errorMessage))
+        {
+            return false;
+        }
+
+        // As per JsonPatch spec, the target location must exist for remove to be successful
+        if (!dictionary.ContainsKey(convertedKey))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (!TryConvertValue(value, serializerOptions, out var convertedValue, out errorMessage))
+        {
+            return false;
+        }
+
+        dictionary[convertedKey] = convertedValue;
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryTest(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        var key = segment;
+        var dictionary = (IDictionary<TKey, TValue>)target;
+
+        if (!TryConvertKey(key, out var convertedKey, out errorMessage))
+        {
+            return false;
+        }
+
+        // As per JsonPatch spec, the target location must exist for test to be successful
+        if (!dictionary.TryGetValue(convertedKey, out var currentValue))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (!TryConvertValue(value, serializerOptions, out var convertedValue, out errorMessage))
+        {
+            return false;
+        }
+
+        // The target segment does not have an assigned value to compare the test value with
+        if (currentValue == null)
+        {
+            errorMessage = Resources.FormatValueForTargetSegmentCannotBeNullOrEmpty(segment);
+            return false;
+        }
+
+        if (!JsonUtilities.DeepEquals(currentValue, convertedValue, serializerOptions))
+        {
+            errorMessage = Resources.FormatValueNotEqualToTestValue(currentValue, value, segment);
+            return false;
+        }
+        else
+        {
+            errorMessage = null;
+            return true;
+        }
+    }
+
+    public virtual bool TryTraverse(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object nextTarget,
+        out string errorMessage)
+    {
+        var key = segment;
+        var dictionary = (IDictionary<TKey, TValue>)target;
+
+        if (!TryConvertKey(key, out var convertedKey, out errorMessage))
+        {
+            nextTarget = null;
+            return false;
+        }
+
+        if (dictionary.TryGetValue(convertedKey, out var valueAsT))
+        {
+            nextTarget = valueAsT;
+            errorMessage = null;
+            return true;
+        }
+        else
+        {
+            nextTarget = null;
+            errorMessage = null;
+            return false;
+        }
+    }
+
+    private static bool TryConvertKey(string key, out TKey convertedKey, out string errorMessage)
+    {
+        var options = new JsonSerializerOptions() { NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString };
+        var conversionResult = ConversionResultProvider.ConvertTo(key, typeof(TKey), options);
+        if (conversionResult.CanBeConverted)
+        {
+            errorMessage = null;
+            convertedKey = (TKey)conversionResult.ConvertedInstance;
+            return true;
+        }
+        else
+        {
+            errorMessage = Resources.FormatInvalidPathSegment(key);
+            convertedKey = default(TKey);
+            return false;
+        }
+    }
+
+    private static bool TryConvertValue(object value, JsonSerializerOptions serializerOptions, out TValue convertedValue, out string errorMessage)
+    {
+        var conversionResult = ConversionResultProvider.ConvertTo(value, typeof(TValue), serializerOptions);
+        if (conversionResult.CanBeConverted)
+        {
+            errorMessage = null;
+            convertedValue = (TValue)conversionResult.ConvertedInstance;
+            return true;
+        }
+        else
+        {
+            errorMessage = Resources.FormatInvalidValueForProperty(value);
+            convertedValue = default(TValue);
+            return false;
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/ErrorReporter.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/ErrorReporter.cs
new file mode 100644
index 000000000000..2b32156b2d90
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/ErrorReporter.cs
@@ -0,0 +1,15 @@
+// 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 Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal static class ErrorReporter
+{
+    public static readonly Action<JsonPatchError> Default = (error) =>
+    {
+        throw new JsonPatchException(error);
+    };
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/IAdapter.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/IAdapter.cs
new file mode 100644
index 000000000000..5e1dbceb75a7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/IAdapter.cs
@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal interface IAdapter
+{
+    bool TryTraverse(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object nextTarget,
+        out string errorMessage);
+
+    bool TryAdd(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage);
+
+    bool TryRemove(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out string errorMessage);
+
+    bool TryGet(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object value,
+        out string errorMessage);
+
+    bool TryReplace(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage);
+
+    bool TryTest(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage);
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/JsonObjectAdapter.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/JsonObjectAdapter.cs
new file mode 100644
index 000000000000..7db344c78545
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/JsonObjectAdapter.cs
@@ -0,0 +1,142 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Helpers;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class JsonObjectAdapter : IAdapter
+{
+    public virtual bool TryAdd(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        // Set the property specified by the `segment` argument to the given `value` of the `target` object.
+        var obj = (JsonObject)target;
+
+        obj[segment] = value != null ? JsonSerializer.SerializeToNode(value, serializerOptions) : GetJsonNull();
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryGet(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object value,
+        out string errorMessage)
+    {
+        var obj = (JsonObject)target;
+
+        if (!obj.TryGetPropertyValue(segment, out var valueAsToken))
+        {
+            value = null;
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        value = valueAsToken;
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryRemove(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out string errorMessage)
+    {
+        var obj = (JsonObject)target;
+
+        if (!obj.Remove(segment))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryReplace(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        var obj = (JsonObject)target;
+
+        int index = obj.IndexOf(segment);
+        if (index == -1)
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        obj[index] = value != null ? JsonSerializer.SerializeToNode(value, serializerOptions) : GetJsonNull();
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryTest(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        var obj = (JsonObject)target;
+
+        if (!obj.TryGetPropertyValue(segment, out var currentValue))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (currentValue == null || string.IsNullOrEmpty(currentValue.ToString()))
+        {
+            errorMessage = Resources.FormatValueForTargetSegmentCannotBeNullOrEmpty(segment);
+            return false;
+        }
+
+        if (!JsonUtilities.DeepEquals(currentValue, value, serializerOptions))
+        {
+            errorMessage = Resources.FormatValueNotEqualToTestValue(currentValue, value, segment);
+            return false;
+        }
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryTraverse(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object nextTarget,
+        out string errorMessage)
+    {
+        var obj = (JsonObject)target;
+
+        if (!obj.TryGetPropertyValue(segment, out var nextTargetToken))
+        {
+            nextTarget = null;
+            errorMessage = null;
+            return false;
+        }
+
+        nextTarget = nextTargetToken;
+        errorMessage = null;
+        return true;
+    }
+
+    private static JsonValue GetJsonNull() => JsonValue.Create<object>(null);
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/ListAdapter.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/ListAdapter.cs
new file mode 100644
index 000000000000..8f481928fe9a
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/ListAdapter.cs
@@ -0,0 +1,286 @@
+// 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.Collections;
+using System.Collections.Generic;
+using System.Text.Json;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Helpers;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class ListAdapter : IAdapter
+{
+    public virtual bool TryAdd(object target, string segment, JsonSerializerOptions serializerOptions, object value, out string errorMessage)
+    {
+        if (!TryGetListTypeArgument(target, out var typeArgument, out errorMessage))
+        {
+            return false;
+        }
+
+        var targetCollectionCount = GenericListOrJsonArrayUtilities.GetCount(target);
+        if (!TryGetPositionInfo(targetCollectionCount, segment, OperationType.Add, out var positionInfo, out errorMessage))
+        {
+            return false;
+        }
+
+        if (!TryConvertValue(value, typeArgument, segment, serializerOptions, out var convertedValue, out errorMessage))
+        {
+            return false;
+        }
+
+        if (positionInfo.Type == PositionType.EndOfList)
+        {
+            GenericListOrJsonArrayUtilities.AddElement(target, convertedValue);
+        }
+        else
+        {
+            GenericListOrJsonArrayUtilities.InsertElementAt(target, positionInfo.Index, convertedValue);
+        }
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryGet(object target, string segment, JsonSerializerOptions serializerOptions, out object value, out string errorMessage)
+    {
+        if (!TryGetListTypeArgument(target, out _, out errorMessage))
+        {
+            value = null;
+            return false;
+        }
+
+        var targetCollectionCount = GenericListOrJsonArrayUtilities.GetCount(target);
+
+        if (!TryGetPositionInfo(targetCollectionCount, segment, OperationType.Get, out var positionInfo, out errorMessage))
+        {
+            value = null;
+            return false;
+        }
+
+        var valueIndex = positionInfo.Type == PositionType.EndOfList ? targetCollectionCount - 1 : positionInfo.Index;
+        value = GenericListOrJsonArrayUtilities.GetElementAt(target, valueIndex);
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryRemove(object target, string segment, JsonSerializerOptions serializerOptions, out string errorMessage)
+    {
+        if (!TryGetListTypeArgument(target, out _, out errorMessage))
+        {
+            return false;
+        }
+
+        var count = GenericListOrJsonArrayUtilities.GetCount(target);
+        if (!TryGetPositionInfo(count, segment, OperationType.Remove, out var positionInfo, out errorMessage))
+        {
+            return false;
+        }
+
+        var indexToRemove = positionInfo.Type == PositionType.EndOfList ? count - 1 : positionInfo.Index;
+        GenericListOrJsonArrayUtilities.RemoveElementAt(target, indexToRemove);
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryReplace(object target, string segment, JsonSerializerOptions serializerOptions, object value, out string errorMessage)
+    {
+        if (!TryGetListTypeArgument(target, out var typeArgument, out errorMessage))
+        {
+            return false;
+        }
+
+        var count = GenericListOrJsonArrayUtilities.GetCount(target);
+        if (!TryGetPositionInfo(count, segment, OperationType.Replace, out var positionInfo, out errorMessage))
+        {
+            return false;
+        }
+
+        if (!TryConvertValue(value, typeArgument, segment, serializerOptions, out var convertedValue, out errorMessage))
+        {
+            return false;
+        }
+
+        var indexToAddTo = positionInfo.Type == PositionType.EndOfList ? count - 1 : positionInfo.Index;
+        GenericListOrJsonArrayUtilities.SetValueAt(target, indexToAddTo, convertedValue);
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryTest(object target, string segment, JsonSerializerOptions serializerOptions, object value, out string errorMessage)
+    {
+
+        if (!TryGetListTypeArgument(target, out var typeArgument, out errorMessage))
+        {
+            return false;
+        }
+
+        var count = GenericListOrJsonArrayUtilities.GetCount(target);
+
+        if (!TryGetPositionInfo(count, segment, OperationType.Replace, out var positionInfo, out errorMessage))
+        {
+            return false;
+        }
+
+        if (!TryConvertValue(value, typeArgument, segment, serializerOptions, out var convertedValue, out errorMessage))
+        {
+            return false;
+        }
+
+        var currentValue = GenericListOrJsonArrayUtilities.GetElementAt(target, positionInfo.Index);
+
+        if (!JsonUtilities.DeepEquals(currentValue, convertedValue, serializerOptions))
+        {
+            errorMessage = Resources.FormatValueAtListPositionNotEqualToTestValue(currentValue, value, positionInfo.Index);
+            return false;
+        }
+        else
+        {
+            errorMessage = null;
+            return true;
+        }
+    }
+
+    public virtual bool TryTraverse(object target, string segment, JsonSerializerOptions serializerOptions, out object value, out string errorMessage)
+    {
+        var list = target as IList;
+        if (list == null)
+        {
+            value = null;
+            errorMessage = null;
+            return false;
+        }
+
+        if (!int.TryParse(segment, out var index))
+        {
+            value = null;
+            errorMessage = Resources.FormatInvalidIndexValue(segment);
+            return false;
+        }
+
+        if (index < 0 || index >= list.Count)
+        {
+            value = null;
+            errorMessage = Resources.FormatIndexOutOfBounds(segment);
+            return false;
+        }
+
+        value = list[index];
+        errorMessage = null;
+        return true;
+    }
+
+    protected virtual bool TryConvertValue(object originalValue, Type listTypeArgument, string segment, out object convertedValue, out string errorMessage)
+    {
+        return TryConvertValue(originalValue, listTypeArgument, segment, null, out convertedValue, out errorMessage);
+    }
+
+    protected virtual bool TryConvertValue(object originalValue, Type listTypeArgument, string segment, JsonSerializerOptions serializerOptions, out object convertedValue, out string errorMessage)
+    {
+        var conversionResult = ConversionResultProvider.ConvertTo(originalValue, listTypeArgument, serializerOptions);
+        if (!conversionResult.CanBeConverted)
+        {
+            convertedValue = null;
+            errorMessage = Resources.FormatInvalidValueForProperty(originalValue);
+            return false;
+        }
+
+        convertedValue = conversionResult.ConvertedInstance;
+        errorMessage = null;
+        return true;
+    }
+
+    private static bool TryGetListTypeArgument(object list, out Type listTypeArgument, out string errorMessage)
+    {
+        var listType = list.GetType();
+        if (listType.IsArray)
+        {
+            errorMessage = $"The type '{listType.FullName}' which is an array is not supported for json patch operations as it has a fixed size.";
+            listTypeArgument = null;
+            return false;
+        }
+
+        var genericList = ClosedGenericMatcher.ExtractGenericInterface(listType, typeof(IList<>));
+        if (genericList == null)
+        {
+            errorMessage = $"The type '{listType.FullName}' which is a non generic list is not supported for json patch operations. Only generic list types are supported.";
+            listTypeArgument = null;
+            return false;
+        }
+
+        listTypeArgument = genericList.GenericTypeArguments[0];
+        errorMessage = null;
+        return true;
+    }
+
+    protected virtual bool TryGetPositionInfo(int collectionCount, string segment, OperationType operationType, out PositionInfo positionInfo, out string errorMessage)
+    {
+        if (segment == "-")
+        {
+            positionInfo = new PositionInfo(PositionType.EndOfList, -1);
+            errorMessage = null;
+            return true;
+        }
+
+        if (int.TryParse(segment, out var position))
+        {
+            if (position >= 0 && position < collectionCount)
+            {
+                positionInfo = new PositionInfo(PositionType.Index, position);
+                errorMessage = null;
+                return true;
+            }
+
+            // As per JSON Patch spec, for Add operation the index value representing the number of elements is valid,
+            // where as for other operations like Remove, Replace, Move and Copy the target index MUST exist.
+            if (position == collectionCount && operationType == OperationType.Add)
+            {
+                positionInfo = new PositionInfo(PositionType.EndOfList, -1);
+                errorMessage = null;
+                return true;
+            }
+
+            positionInfo = new PositionInfo(PositionType.OutOfBounds, position);
+            errorMessage = Resources.FormatIndexOutOfBounds(segment);
+            return false;
+        }
+        else
+        {
+            positionInfo = new PositionInfo(PositionType.Invalid, -1);
+            errorMessage = Resources.FormatInvalidIndexValue(segment);
+            return false;
+        }
+    }
+
+    protected readonly struct PositionInfo
+    {
+        public PositionInfo(PositionType type, int index)
+        {
+            Type = type;
+            Index = index;
+        }
+
+        public PositionType Type { get; }
+        public int Index { get; }
+    }
+
+    protected enum PositionType
+    {
+        Index, // valid index
+        EndOfList, // '-'
+        Invalid, // Ex: not an integer
+        OutOfBounds
+    }
+
+    protected enum OperationType
+    {
+        Add,
+        Remove,
+        Get,
+        Replace
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/ObjectVisitor.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/ObjectVisitor.cs
new file mode 100644
index 000000000000..f9151adecde9
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/ObjectVisitor.cs
@@ -0,0 +1,78 @@
+// 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.Text.Json;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class ObjectVisitor
+{
+    private readonly IAdapterFactory _adapterFactory;
+    private readonly JsonSerializerOptions _serializerOptions;
+    private readonly ParsedPath _path;
+
+    /// <summary>
+    /// Initializes a new instance of <see cref="ObjectVisitor"/>.
+    /// </summary>
+    /// <param name="path">The path of the JsonPatch operation</param>
+    /// <param name="serializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
+    public ObjectVisitor(ParsedPath path, JsonSerializerOptions serializerOptions)
+        : this(path, serializerOptions, AdapterFactory.Default)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of <see cref="ObjectVisitor"/>.
+    /// </summary>
+    /// <param name="path">The path of the JsonPatch operation</param>
+    /// <param name="serializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="adapterFactory">The <see cref="IAdapterFactory"/> to use when creating adaptors.</param>
+    public ObjectVisitor(ParsedPath path, JsonSerializerOptions serializerOptions, IAdapterFactory adapterFactory)
+    {
+        _path = path;
+        _serializerOptions = serializerOptions ?? throw new ArgumentNullException(nameof(serializerOptions));
+        _adapterFactory = adapterFactory ?? throw new ArgumentNullException(nameof(adapterFactory));
+    }
+
+    public bool TryVisit(ref object target, out IAdapter adapter, out string errorMessage)
+    {
+        if (target == null)
+        {
+            adapter = null;
+            errorMessage = null;
+            return false;
+        }
+
+        adapter = SelectAdapter(target);
+
+        // Traverse until the penultimate segment to get the target object and adapter
+        for (var i = 0; i < _path.Segments.Count - 1; i++)
+        {
+            if (!adapter.TryTraverse(target, _path.Segments[i], _serializerOptions, out var next, out errorMessage))
+            {
+                adapter = null;
+                return false;
+            }
+
+            // If we hit a null on an interior segment then we need to stop traversing.
+            if (next == null)
+            {
+                adapter = null;
+                return false;
+            }
+
+            target = next;
+            adapter = SelectAdapter(target);
+        }
+
+        errorMessage = null;
+        return true;
+    }
+
+    private IAdapter SelectAdapter(object targetObject)
+    {
+        return _adapterFactory.Create(targetObject);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/ParsedPath.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/ParsedPath.cs
new file mode 100644
index 000000000000..a5e13cae9663
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/ParsedPath.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal readonly struct ParsedPath
+{
+    private readonly string[] _segments;
+
+    public ParsedPath(string path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        _segments = ParsePath(path);
+    }
+
+    public string LastSegment
+    {
+        get
+        {
+            if (_segments == null || _segments.Length == 0)
+            {
+                return null;
+            }
+
+            return _segments[_segments.Length - 1];
+        }
+    }
+
+    public IReadOnlyList<string> Segments => _segments;
+
+    private static string[] ParsePath(string path)
+    {
+        var strings = new List<string>();
+        var sb = new StringBuilder(path.Length);
+
+        for (var i = 0; i < path.Length; i++)
+        {
+            if (path[i] == '/')
+            {
+                if (sb.Length > 0)
+                {
+                    strings.Add(sb.ToString());
+                    sb.Length = 0;
+                }
+            }
+            else if (path[i] == '~')
+            {
+                ++i;
+                if (i >= path.Length)
+                {
+                    throw new JsonPatchException(Resources.FormatInvalidValueForPath(path), null);
+                }
+
+                if (path[i] == '0')
+                {
+                    sb.Append('~');
+                }
+                else if (path[i] == '1')
+                {
+                    sb.Append('/');
+                }
+                else
+                {
+                    throw new JsonPatchException(Resources.FormatInvalidValueForPath(path), null);
+                }
+            }
+            else
+            {
+                sb.Append(path[i]);
+            }
+        }
+
+        if (sb.Length > 0)
+        {
+            strings.Add(sb.ToString());
+        }
+
+        return strings.ToArray();
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/PathHelpers.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/PathHelpers.cs
new file mode 100644
index 000000000000..2dd355a71179
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/PathHelpers.cs
@@ -0,0 +1,32 @@
+// 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 Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal static class PathHelpers
+{
+    internal static string ValidateAndNormalizePath(string path)
+    {
+        // check for most common path errors on create.  This is not
+        // absolutely necessary, but it allows us to already catch mistakes
+        // on creation of the patch document rather than on execute.
+
+        if (path.Contains("//"))
+        {
+            throw new JsonPatchException(Resources.FormatInvalidValueForPath(path), null);
+        }
+
+        if (!path.StartsWith("/", StringComparison.Ordinal))
+        {
+            return "/" + path;
+        }
+        else
+        {
+            return path;
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Internal/PocoAdapter.cs b/src/Features/JsonPatch.SystemTextJson/src/Internal/PocoAdapter.cs
new file mode 100644
index 000000000000..ff364a7d25a7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Internal/PocoAdapter.cs
@@ -0,0 +1,237 @@
+// 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.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Helpers;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class PocoAdapter : IAdapter
+{
+    public virtual bool TryAdd(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        if (!TryGetJsonProperty(target, serializerOptions, segment, out var jsonProperty))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (jsonProperty.Set == null)
+        {
+            errorMessage = Resources.FormatCannotUpdateProperty(segment);
+            return false;
+        }
+
+        if (!TryConvertValue(value, jsonProperty.PropertyType, serializerOptions, out var convertedValue))
+        {
+            errorMessage = Resources.FormatInvalidValueForProperty(value);
+            return false;
+        }
+
+        jsonProperty.Set(target, convertedValue);
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryGet(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object value,
+        out string errorMessage)
+    {
+        if (!TryGetJsonProperty(target, serializerOptions, segment, out var jsonProperty))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            value = null;
+            return false;
+        }
+
+        if (jsonProperty.Get == null)
+        {
+            errorMessage = Resources.FormatCannotReadProperty(segment);
+            value = null;
+            return false;
+        }
+
+        value = jsonProperty.Get(target);
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryRemove(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out string errorMessage)
+    {
+        if (!TryGetJsonProperty(target, serializerOptions, segment, out var jsonProperty))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (jsonProperty.Set == null)
+        {
+            errorMessage = Resources.FormatCannotUpdateProperty(segment);
+            return false;
+        }
+
+        // Setting the value to "null" will use the default value in case of value types, and
+        // null in case of reference types
+        object value = null;
+        if (jsonProperty.PropertyType.IsValueType
+            && Nullable.GetUnderlyingType(jsonProperty.PropertyType) == null)
+        {
+            value = Activator.CreateInstance(jsonProperty.PropertyType);
+        }
+
+        jsonProperty.Set(target, value);
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryReplace(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        if (!TryGetJsonProperty(target, serializerOptions, segment, out var jsonProperty))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (jsonProperty.Set == null)
+        {
+            errorMessage = Resources.FormatCannotUpdateProperty(segment);
+            return false;
+        }
+
+        if (!TryConvertValue(value, jsonProperty.PropertyType, serializerOptions, out var convertedValue))
+        {
+            errorMessage = Resources.FormatInvalidValueForProperty(value);
+            return false;
+        }
+
+        jsonProperty.Set(target, convertedValue);
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryTest(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        object value,
+        out string errorMessage)
+    {
+        if (!TryGetJsonProperty(target, serializerOptions, segment, out var jsonProperty))
+        {
+            errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+            return false;
+        }
+
+        if (jsonProperty.Get == null)
+        {
+            errorMessage = Resources.FormatCannotReadProperty(segment);
+            return false;
+        }
+
+        if (!TryConvertValue(value, jsonProperty.PropertyType, serializerOptions, out var convertedValue))
+        {
+            errorMessage = Resources.FormatInvalidValueForProperty(value);
+            return false;
+        }
+
+        var currentValue = jsonProperty.Get(target);
+        if (!JsonUtilities.DeepEquals(currentValue, convertedValue, serializerOptions))
+        {
+            errorMessage = Resources.FormatValueNotEqualToTestValue(currentValue, value, segment);
+            return false;
+        }
+
+        errorMessage = null;
+        return true;
+    }
+
+    public virtual bool TryTraverse(
+        object target,
+        string segment,
+        JsonSerializerOptions serializerOptions,
+        out object value,
+        out string errorMessage)
+    {
+        if (target == null)
+        {
+            value = null;
+            errorMessage = null;
+            return false;
+        }
+
+        if (TryGetJsonProperty(target, serializerOptions, segment, out var jsonProperty))
+        {
+            value = jsonProperty.Get(target);
+            errorMessage = null;
+            return true;
+        }
+
+        value = null;
+        errorMessage = Resources.FormatTargetLocationAtPathSegmentNotFound(segment);
+        return false;
+    }
+
+    protected virtual bool TryGetJsonProperty(
+        object target,
+        JsonSerializerOptions serializerOptions,
+        string segment,
+        out JsonPropertyInfo jsonProperty)
+    {
+        var typeInfo = serializerOptions.GetTypeInfo(target.GetType());
+        if (typeInfo is not null)
+        {
+            var pocoProperty = typeInfo
+                .Properties
+                .FirstOrDefault(p => string.Equals(p.Name, segment, ExtractStringComparison(serializerOptions)));
+
+            if (pocoProperty != null)
+            {
+                jsonProperty = pocoProperty;
+                return true;
+            }
+        }
+
+        jsonProperty = null;
+        return false;
+    }
+
+    protected virtual bool TryConvertValue(object value, Type propertyType, JsonSerializerOptions serializerOptions, out object convertedValue)
+    {
+        var conversionResult = ConversionResultProvider.ConvertTo(value, propertyType, serializerOptions);
+        if (!conversionResult.CanBeConverted)
+        {
+            convertedValue = null;
+            return false;
+        }
+
+        convertedValue = conversionResult.ConvertedInstance;
+        return true;
+    }
+
+    private static StringComparison ExtractStringComparison(JsonSerializerOptions serializerOptions)
+        => serializerOptions.PropertyNameCaseInsensitive ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/JsonPatchDocument.cs b/src/Features/JsonPatch.SystemTextJson/src/JsonPatchDocument.cs
new file mode 100644
index 000000000000..684ef7a8d28d
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/JsonPatchDocument.cs
@@ -0,0 +1,234 @@
+// 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.Collections.Generic;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Converters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+// Implementation details: the purpose of this type of patch document is to allow creation of such
+// documents for cases where there's no class/DTO to work on. Typical use case: backend not built in
+// .NET or architecture doesn't contain a shared DTO layer.
+[JsonConverter(typeof(JsonPatchDocumentConverter))]
+public class JsonPatchDocument : IJsonPatchDocument, IEndpointParameterMetadataProvider
+{
+    public List<Operation> Operations { get; private set; }
+
+    [JsonIgnore]
+    public JsonSerializerOptions SerializerOptions { get; set; }
+
+    public JsonPatchDocument()
+    {
+        Operations = [];
+        SerializerOptions = JsonSerializerOptions.Default;
+    }
+
+    public JsonPatchDocument(List<Operation> operations, JsonSerializerOptions serializerOptions)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(operations);
+        ArgumentNullThrowHelper.ThrowIfNull(serializerOptions);
+
+        Operations = operations;
+        SerializerOptions = serializerOptions;
+    }
+
+    /// <summary>
+    /// Add operation.  Will result in, for example,
+    /// { "op": "add", "path": "/a/b/c", "value": [ "foo", "bar" ] }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument"/> for chaining.</returns>
+    public JsonPatchDocument Add(string path, object value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation("add", PathHelpers.ValidateAndNormalizePath(path), null, value));
+        return this;
+    }
+
+    /// <summary>
+    /// Remove value at target location.  Will result in, for example,
+    /// { "op": "remove", "path": "/a/b/c" }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument"/> for chaining.</returns>
+    public JsonPatchDocument Remove(string path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation("remove", PathHelpers.ValidateAndNormalizePath(path), null, null));
+        return this;
+    }
+
+    /// <summary>
+    /// Replace value.  Will result in, for example,
+    /// { "op": "replace", "path": "/a/b/c", "value": 42 }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument"/> for chaining.</returns>
+    public JsonPatchDocument Replace(string path, object value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation("replace", PathHelpers.ValidateAndNormalizePath(path), null, value));
+        return this;
+    }
+
+    /// <summary>
+    /// Test value.  Will result in, for example,
+    /// { "op": "test", "path": "/a/b/c", "value": 42 }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument"/> for chaining.</returns>
+    public JsonPatchDocument Test(string path, object value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation("test", PathHelpers.ValidateAndNormalizePath(path), null, value));
+        return this;
+    }
+
+    /// <summary>
+    /// Removes value at specified location and add it to the target location.  Will result in, for example:
+    /// { "op": "move", "from": "/a/b/c", "path": "/a/b/d" }
+    /// </summary>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument"/> for chaining.</returns>
+    public JsonPatchDocument Move(string from, string path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation("move", PathHelpers.ValidateAndNormalizePath(path), PathHelpers.ValidateAndNormalizePath(from)));
+        return this;
+    }
+
+    /// <summary>
+    /// Copy the value at specified location to the target location.  Will result in, for example:
+    /// { "op": "copy", "from": "/a/b/c", "path": "/a/b/e" }
+    /// </summary>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument"/> for chaining.</returns>
+    public JsonPatchDocument Copy(string from, string path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation("copy", PathHelpers.ValidateAndNormalizePath(path), PathHelpers.ValidateAndNormalizePath(from)));
+        return this;
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument to a specified object.
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    public void ApplyTo(object objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        ApplyTo(objectToApplyTo, new ObjectAdapter(SerializerOptions, null, AdapterFactory.Default));
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    /// <param name="logErrorAction">Action to log errors</param>
+    public void ApplyTo(object objectToApplyTo, Action<JsonPatchError> logErrorAction)
+    {
+        ApplyTo(objectToApplyTo, new ObjectAdapter(SerializerOptions, logErrorAction, AdapterFactory.Default), logErrorAction);
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    /// <param name="adapter">IObjectAdapter instance to use when applying</param>
+    /// <param name="logErrorAction">Action to log errors</param>
+    public void ApplyTo(object objectToApplyTo, IObjectAdapter adapter, Action<JsonPatchError> logErrorAction)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(adapter);
+
+        foreach (var op in Operations)
+        {
+            try
+            {
+                op.Apply(objectToApplyTo, adapter);
+            }
+            catch (JsonPatchException jsonPatchException)
+            {
+                var errorReporter = logErrorAction ?? ErrorReporter.Default;
+                errorReporter(new JsonPatchError(objectToApplyTo, op, jsonPatchException.Message));
+
+                // As per JSON Patch spec if an operation results in error, further operations should not be executed.
+                break;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    /// <param name="adapter">IObjectAdapter instance to use when applying</param>
+    public void ApplyTo(object objectToApplyTo, IObjectAdapter adapter)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(adapter);
+
+        // apply each operation in order
+        foreach (var op in Operations)
+        {
+            op.Apply(objectToApplyTo, adapter);
+        }
+    }
+
+    IList<Operation> IJsonPatchDocument.GetOperations()
+    {
+        var allOps = new List<Operation>(Operations?.Count ?? 0);
+
+        if (Operations != null)
+        {
+            foreach (var op in Operations)
+            {
+                var untypedOp = new Operation
+                {
+                    op = op.op,
+                    value = op.value,
+                    path = op.path,
+                    from = op.from
+                };
+
+                allOps.Add(untypedOp);
+            }
+        }
+
+        return allOps;
+    }
+
+    /// <inheritdoc/>
+    static void IEndpointParameterMetadataProvider.PopulateMetadata(ParameterInfo parameter, EndpointBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(parameter);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.Metadata.Add(new AcceptsMetadata(["application/json-patch+json"], parameter.ParameterType));
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/JsonPatchDocumentOfT.cs b/src/Features/JsonPatch.SystemTextJson/src/JsonPatchDocumentOfT.cs
new file mode 100644
index 000000000000..a9f1671ce8e6
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/JsonPatchDocumentOfT.cs
@@ -0,0 +1,752 @@
+// 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.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Converters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+// Implementation details: the purpose of this type of patch document is to ensure we can do type-checking
+// when producing a JsonPatchDocument.  However, we cannot send this "typed" over the wire, as that would require
+// including type data in the JsonPatchDocument serialized as JSON (to allow for correct deserialization) - that's
+// not according to RFC 6902, and would thus break cross-platform compatibility.
+[JsonConverter(typeof(JsonPatchDocumentConverterFactory))]
+public class JsonPatchDocument<TModel> : IJsonPatchDocument, IEndpointParameterMetadataProvider where TModel : class
+{
+    public List<Operation<TModel>> Operations { get; private set; }
+
+    [JsonIgnore]
+    public JsonSerializerOptions SerializerOptions { get; set; }
+
+    public JsonPatchDocument()
+    {
+        Operations = [];
+        SerializerOptions = JsonSerializerOptions.Default;
+    }
+
+    // Create from list of operations
+    public JsonPatchDocument(List<Operation<TModel>> operations, JsonSerializerOptions serializerOptions)
+    {
+        Operations = operations ?? throw new ArgumentNullException(nameof(operations));
+        SerializerOptions = serializerOptions ?? throw new ArgumentNullException(nameof(serializerOptions));
+    }
+
+    /// <summary>
+    /// Add operation.  Will result in, for example,
+    /// { "op": "add", "path": "/a/b/c", "value": [ "foo", "bar" ] }
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Add<TProp>(Expression<Func<TModel, TProp>> path, TProp value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "add",
+            GetPath(path, null),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Add value to list at given position
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <param name="position">position</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Add<TProp>(
+        Expression<Func<TModel, IList<TProp>>> path,
+        TProp value,
+        int position)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "add",
+            GetPath(path, position.ToString(CultureInfo.InvariantCulture)),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Add value to the end of the list
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Add<TProp>(Expression<Func<TModel, IList<TProp>>> path, TProp value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "add",
+            GetPath(path, "-"),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Remove value at target location.  Will result in, for example,
+    /// { "op": "remove", "path": "/a/b/c" }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Remove<TProp>(Expression<Func<TModel, TProp>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>("remove", GetPath(path, null), from: null));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Remove value from list at given position
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="position">position</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Remove<TProp>(Expression<Func<TModel, IList<TProp>>> path, int position)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "remove",
+            GetPath(path, position.ToString(CultureInfo.InvariantCulture)),
+            from: null));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Remove value from end of list
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Remove<TProp>(Expression<Func<TModel, IList<TProp>>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "remove",
+            GetPath(path, "-"),
+            from: null));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Replace value.  Will result in, for example,
+    /// { "op": "replace", "path": "/a/b/c", "value": 42 }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Replace<TProp>(Expression<Func<TModel, TProp>> path, TProp value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "replace",
+            GetPath(path, null),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Replace value in a list at given position
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <param name="position">position</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Replace<TProp>(Expression<Func<TModel, IList<TProp>>> path,
+        TProp value, int position)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "replace",
+            GetPath(path, position.ToString(CultureInfo.InvariantCulture)),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Replace value at end of a list
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Replace<TProp>(Expression<Func<TModel, IList<TProp>>> path, TProp value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "replace",
+            GetPath(path, "-"),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Test value.  Will result in, for example,
+    /// { "op": "test", "path": "/a/b/c", "value": 42 }
+    /// </summary>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Test<TProp>(Expression<Func<TModel, TProp>> path, TProp value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "test",
+            GetPath(path, null),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Test value in a list at given position
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <param name="position">position</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Test<TProp>(Expression<Func<TModel, IList<TProp>>> path,
+        TProp value, int position)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "test",
+            GetPath(path, position.ToString(CultureInfo.InvariantCulture)),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Test value at end of a list
+    /// </summary>
+    /// <typeparam name="TProp">value type</typeparam>
+    /// <param name="path">target location</param>
+    /// <param name="value">value</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Test<TProp>(Expression<Func<TModel, IList<TProp>>> path, TProp value)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "test",
+            GetPath(path, "-"),
+            from: null,
+            value: value));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Removes value at specified location and add it to the target location.  Will result in, for example:
+    /// { "op": "move", "from": "/a/b/c", "path": "/a/b/d" }
+    /// </summary>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Move<TProp>(
+        Expression<Func<TModel, TProp>> from,
+        Expression<Func<TModel, TProp>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "move",
+            GetPath(path, null),
+            GetPath(from, null)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Move from a position in a list to a new location
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="positionFrom">position</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Move<TProp>(
+        Expression<Func<TModel, IList<TProp>>> from,
+        int positionFrom,
+        Expression<Func<TModel, TProp>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "move",
+            GetPath(path, null),
+            GetPath(from, positionFrom.ToString(CultureInfo.InvariantCulture))));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Move from a property to a location in a list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <param name="positionTo">position</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Move<TProp>(
+        Expression<Func<TModel, TProp>> from,
+        Expression<Func<TModel, IList<TProp>>> path,
+        int positionTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "move",
+            GetPath(path, positionTo.ToString(CultureInfo.InvariantCulture)),
+            GetPath(from, null)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Move from a position in a list to another location in a list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="positionFrom">position (source)</param>
+    /// <param name="path">target location</param>
+    /// <param name="positionTo">position (target)</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Move<TProp>(
+        Expression<Func<TModel, IList<TProp>>> from,
+        int positionFrom,
+        Expression<Func<TModel, IList<TProp>>> path,
+        int positionTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "move",
+            GetPath(path, positionTo.ToString(CultureInfo.InvariantCulture)),
+            GetPath(from, positionFrom.ToString(CultureInfo.InvariantCulture))));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Move from a position in a list to the end of another list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="positionFrom">position</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Move<TProp>(
+        Expression<Func<TModel, IList<TProp>>> from,
+        int positionFrom,
+        Expression<Func<TModel, IList<TProp>>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "move",
+            GetPath(path, "-"),
+            GetPath(from, positionFrom.ToString(CultureInfo.InvariantCulture))));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Move to the end of a list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Move<TProp>(
+        Expression<Func<TModel, TProp>> from,
+        Expression<Func<TModel, IList<TProp>>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "move",
+            GetPath(path, "-"),
+            GetPath(from, null)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Copy the value at specified location to the target location.  Will result in, for example:
+    /// { "op": "copy", "from": "/a/b/c", "path": "/a/b/e" }
+    /// </summary>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Copy<TProp>(
+        Expression<Func<TModel, TProp>> from,
+        Expression<Func<TModel, TProp>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "copy",
+            GetPath(path, null),
+            GetPath(from, null)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Copy from a position in a list to a new location
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="positionFrom">position</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Copy<TProp>(
+        Expression<Func<TModel, IList<TProp>>> from,
+        int positionFrom,
+        Expression<Func<TModel, TProp>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "copy",
+            GetPath(path, null),
+            GetPath(from, positionFrom.ToString(CultureInfo.InvariantCulture))));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Copy from a property to a location in a list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <param name="positionTo">position</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Copy<TProp>(
+        Expression<Func<TModel, TProp>> from,
+        Expression<Func<TModel, IList<TProp>>> path,
+        int positionTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "copy",
+            GetPath(path, positionTo.ToString(CultureInfo.InvariantCulture)),
+            GetPath(from, null)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Copy from a position in a list to a new location in a list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="positionFrom">position (source)</param>
+    /// <param name="path">target location</param>
+    /// <param name="positionTo">position (target)</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Copy<TProp>(
+        Expression<Func<TModel, IList<TProp>>> from,
+        int positionFrom,
+        Expression<Func<TModel, IList<TProp>>> path,
+        int positionTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "copy",
+            GetPath(path, positionTo.ToString(CultureInfo.InvariantCulture)),
+            GetPath(from, positionFrom.ToString(CultureInfo.InvariantCulture))));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Copy from a position in a list to the end of another list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="positionFrom">position</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Copy<TProp>(
+        Expression<Func<TModel, IList<TProp>>> from,
+        int positionFrom,
+        Expression<Func<TModel, IList<TProp>>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "copy",
+            GetPath(path, "-"),
+            GetPath(from, positionFrom.ToString(CultureInfo.InvariantCulture))));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Copy to the end of a list
+    /// </summary>
+    /// <typeparam name="TProp"></typeparam>
+    /// <param name="from">source location</param>
+    /// <param name="path">target location</param>
+    /// <returns>The <see cref="JsonPatchDocument{TModel}"/> for chaining.</returns>
+    public JsonPatchDocument<TModel> Copy<TProp>(
+        Expression<Func<TModel, TProp>> from,
+        Expression<Func<TModel, IList<TProp>>> path)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(from);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        Operations.Add(new Operation<TModel>(
+            "copy",
+            GetPath(path, "-"),
+            GetPath(from, null)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    public void ApplyTo(TModel objectToApplyTo)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+
+        ApplyTo(objectToApplyTo, new ObjectAdapter(SerializerOptions, null, AdapterFactory.Default));
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    /// <param name="logErrorAction">Action to log errors</param>
+    public void ApplyTo(TModel objectToApplyTo, Action<JsonPatchError> logErrorAction)
+    {
+        ApplyTo(objectToApplyTo, new ObjectAdapter(SerializerOptions, logErrorAction, AdapterFactory.Default), logErrorAction);
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    /// <param name="adapter">IObjectAdapter instance to use when applying</param>
+    /// <param name="logErrorAction">Action to log errors</param>
+    public void ApplyTo(TModel objectToApplyTo, IObjectAdapter adapter, Action<JsonPatchError> logErrorAction)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(adapter);
+
+        foreach (var op in Operations)
+        {
+            try
+            {
+                op.Apply(objectToApplyTo, adapter);
+            }
+            catch (JsonPatchException jsonPatchException)
+            {
+                var errorReporter = logErrorAction ?? ErrorReporter.Default;
+                errorReporter(new JsonPatchError(objectToApplyTo, op, jsonPatchException.Message));
+
+                // As per JSON Patch spec if an operation results in error, further operations should not be executed.
+                break;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Apply this JsonPatchDocument
+    /// </summary>
+    /// <param name="objectToApplyTo">Object to apply the JsonPatchDocument to</param>
+    /// <param name="adapter">IObjectAdapter instance to use when applying</param>
+    public void ApplyTo(TModel objectToApplyTo, IObjectAdapter adapter)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(adapter);
+
+        // apply each operation in order
+        foreach (var op in Operations)
+        {
+            op.Apply(objectToApplyTo, adapter);
+        }
+    }
+
+    IList<Operation> IJsonPatchDocument.GetOperations()
+    {
+        var allOps = new List<Operation>(Operations?.Count ?? 0);
+
+        if (Operations != null)
+        {
+            foreach (var op in Operations)
+            {
+                var untypedOp = new Operation
+                {
+                    op = op.op,
+                    value = op.value,
+                    path = op.path,
+                    from = op.from
+                };
+
+                allOps.Add(untypedOp);
+            }
+        }
+
+        return allOps;
+    }
+
+    /// <inheritdoc/>
+    static void IEndpointParameterMetadataProvider.PopulateMetadata(ParameterInfo parameter, EndpointBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(parameter);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.Metadata.Add(new AcceptsMetadata(["application/json-patch+json"], typeof(TModel)));
+    }
+
+    // Internal for testing
+    internal string GetPath<TProp>(Expression<Func<TModel, TProp>> expr, string position)
+    {
+        var segments = GetPathSegments(expr.Body);
+        var path = string.Join('/', segments);
+        if (position != null)
+        {
+            path += "/" + position;
+            if (segments.Count == 0)
+            {
+                return path;
+            }
+        }
+
+        return "/" + path;
+    }
+
+    private List<string> GetPathSegments(Expression expr)
+    {
+        var listOfSegments = new List<string>();
+        switch (expr.NodeType)
+        {
+            case ExpressionType.ArrayIndex:
+                var binaryExpression = (BinaryExpression)expr;
+                listOfSegments.AddRange(GetPathSegments(binaryExpression.Left));
+                listOfSegments.Add(binaryExpression.Right.ToString());
+                return listOfSegments;
+
+            case ExpressionType.Call:
+                var methodCallExpression = (MethodCallExpression)expr;
+                listOfSegments.AddRange(GetPathSegments(methodCallExpression.Object));
+                listOfSegments.Add(EvaluateExpression(methodCallExpression.Arguments[0]));
+                return listOfSegments;
+
+            case ExpressionType.Convert:
+                listOfSegments.AddRange(GetPathSegments(((UnaryExpression)expr).Operand));
+                return listOfSegments;
+
+            case ExpressionType.MemberAccess:
+                var memberExpression = expr as MemberExpression;
+                listOfSegments.AddRange(GetPathSegments(memberExpression.Expression));
+                // Get property name, respecting JsonProperty attribute
+                listOfSegments.Add(GetPropertyNameFromMemberExpression(memberExpression));
+                return listOfSegments;
+
+            case ExpressionType.Parameter:
+                // Fits "x => x" (the whole document which is "" as JSON pointer)
+                return listOfSegments;
+
+            default:
+                throw new InvalidOperationException(Resources.FormatExpressionTypeNotSupported(expr));
+        }
+    }
+
+    private string GetPropertyNameFromMemberExpression(MemberExpression memberExpression)
+    {
+        var jsonTypeInfo = SerializerOptions.GetTypeInfo(memberExpression.Expression.Type);
+        if (jsonTypeInfo != null)
+        {
+            var memberInfo = memberExpression.Member;
+            var matchingProp = jsonTypeInfo
+                .Properties
+                .First(jsonProp => jsonProp.AttributeProvider is MemberInfo mi && mi == memberInfo);
+            return matchingProp.Name;
+        }
+
+        return null;
+    }
+
+    // Evaluates the value of the key or index which may be an int or a string,
+    // or some other expression type.
+    // The expression is converted to a delegate and the result of executing the delegate is returned as a string.
+    private static string EvaluateExpression(Expression expression)
+    {
+        var converted = Expression.Convert(expression, typeof(object));
+        var fakeParameter = Expression.Parameter(typeof(object), null);
+        var lambda = Expression.Lambda<Func<object, object>>(converted, fakeParameter);
+        var func = lambda.Compile();
+
+        return Convert.ToString(func(null), CultureInfo.InvariantCulture);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/JsonPatchError.cs b/src/Features/JsonPatch.SystemTextJson/src/JsonPatchError.cs
new file mode 100644
index 000000000000..e18d8d909aa5
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/JsonPatchError.cs
@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+/// <summary>
+/// Captures error message and the related entity and the operation that caused it.
+/// </summary>
+public class JsonPatchError
+{
+    /// <summary>
+    /// Initializes a new instance of <see cref="JsonPatchError"/>.
+    /// </summary>
+    /// <param name="affectedObject">The object that is affected by the error.</param>
+    /// <param name="operation">The <see cref="Operation"/> that caused the error.</param>
+    /// <param name="errorMessage">The error message.</param>
+    public JsonPatchError(
+        object affectedObject,
+        Operation operation,
+        string errorMessage)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(errorMessage);
+
+        AffectedObject = affectedObject;
+        Operation = operation;
+        ErrorMessage = errorMessage;
+    }
+
+    /// <summary>
+    /// Gets the object that is affected by the error.
+    /// </summary>
+    public object AffectedObject { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Operation"/> that caused the error.
+    /// </summary>
+    public Operation Operation { get; }
+
+    /// <summary>
+    /// Gets the error message.
+    /// </summary>
+    public string ErrorMessage { get; }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj b/src/Features/JsonPatch.SystemTextJson/src/Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj
new file mode 100644
index 000000000000..434a8cf7373a
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Microsoft.AspNetCore.JsonPatch.SystemTextJson.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core support for JSON PATCH, based on System.Text.Json serialization.</Description>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <DefineConstants>$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;json;jsonpatch</PackageTags>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\*.cs" />
+    <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentNullThrowHelper.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)CallerArgument\CallerArgumentExpressionAttribute.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests" />
+  </ItemGroup>
+</Project>
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Operations/Operation.cs b/src/Features/JsonPatch.SystemTextJson/src/Operations/Operation.cs
new file mode 100644
index 000000000000..bb2941ff2851
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Operations/Operation.cs
@@ -0,0 +1,68 @@
+// 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.Text.Json.Serialization;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+public class Operation : OperationBase
+{
+    [JsonPropertyName(nameof(value))]
+    public object value { get; set; }
+
+    public Operation()
+    {
+    }
+
+    public Operation(string op, string path, string from, object value)
+        : base(op, path, from)
+    {
+        this.value = value;
+    }
+
+    public Operation(string op, string path, string from)
+        : base(op, path, from)
+    {
+    }
+
+    public void Apply(object objectToApplyTo, IObjectAdapter adapter)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(adapter);
+
+        switch (OperationType)
+        {
+            case OperationType.Add:
+                adapter.Add(this, objectToApplyTo);
+                break;
+            case OperationType.Remove:
+                adapter.Remove(this, objectToApplyTo);
+                break;
+            case OperationType.Replace:
+                adapter.Replace(this, objectToApplyTo);
+                break;
+            case OperationType.Move:
+                adapter.Move(this, objectToApplyTo);
+                break;
+            case OperationType.Copy:
+                adapter.Copy(this, objectToApplyTo);
+                break;
+            case OperationType.Test:
+                if (adapter is IObjectAdapterWithTest adapterWithTest)
+                {
+                    adapterWithTest.Test(this, objectToApplyTo);
+                    break;
+                }
+                else
+                {
+                    throw new NotSupportedException(Resources.TestOperationNotSupported);
+                }
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationBase.cs b/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationBase.cs
new file mode 100644
index 000000000000..adfa72767aa0
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationBase.cs
@@ -0,0 +1,68 @@
+// 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.Text.Json.Serialization;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+public class OperationBase
+{
+    private string _op;
+    private OperationType _operationType;
+
+    [JsonIgnore]
+    public OperationType OperationType
+    {
+        get
+        {
+            return _operationType;
+        }
+    }
+
+    [JsonPropertyName(nameof(path))]
+    public string path { get; set; }
+
+    [JsonPropertyName(nameof(op))]
+    public string op
+    {
+        get
+        {
+            return _op;
+        }
+        set
+        {
+            OperationType result;
+            if (!Enum.TryParse(value, ignoreCase: true, result: out result))
+            {
+                result = OperationType.Invalid;
+            }
+            _operationType = result;
+            _op = value;
+        }
+    }
+
+    [JsonPropertyName(nameof(from))]
+    public string from { get; set; }
+
+    public OperationBase()
+    {
+    }
+
+    public OperationBase(string op, string path, string from)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(op);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        this.op = op;
+        this.path = path;
+        this.from = from;
+    }
+
+    public bool ShouldSerializeFrom()
+    {
+        return (OperationType == OperationType.Move
+            || OperationType == OperationType.Copy);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationOfT.cs b/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationOfT.cs
new file mode 100644
index 000000000000..ac00db7652f7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationOfT.cs
@@ -0,0 +1,71 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.Shared;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+public class Operation<TModel> : Operation where TModel : class
+{
+    public Operation()
+    {
+    }
+
+    public Operation(string op, string path, string from, object value)
+        : base(op, path, from)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(op);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+
+        this.value = value;
+    }
+
+    public Operation(string op, string path, string from)
+        : base(op, path, from)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(op);
+        ArgumentNullThrowHelper.ThrowIfNull(path);
+    }
+
+    public void Apply(TModel objectToApplyTo, IObjectAdapter adapter)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(objectToApplyTo);
+        ArgumentNullThrowHelper.ThrowIfNull(adapter);
+
+        switch (OperationType)
+        {
+            case OperationType.Add:
+                adapter.Add(this, objectToApplyTo);
+                break;
+            case OperationType.Remove:
+                adapter.Remove(this, objectToApplyTo);
+                break;
+            case OperationType.Replace:
+                adapter.Replace(this, objectToApplyTo);
+                break;
+            case OperationType.Move:
+                adapter.Move(this, objectToApplyTo);
+                break;
+            case OperationType.Copy:
+                adapter.Copy(this, objectToApplyTo);
+                break;
+            case OperationType.Test:
+                if (adapter is IObjectAdapterWithTest adapterWithTest)
+                {
+                    adapterWithTest.Test(this, objectToApplyTo);
+                    break;
+                }
+                else
+                {
+                    throw new JsonPatchException(new JsonPatchError(objectToApplyTo, this, Resources.TestOperationNotSupported));
+                }
+            case OperationType.Invalid:
+                throw new JsonPatchException(
+                    Resources.FormatInvalidJsonPatchOperation(op), innerException: null);
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationType.cs b/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationType.cs
new file mode 100644
index 000000000000..52af41c723de
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Operations/OperationType.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+public enum OperationType
+{
+    Add,
+    Remove,
+    Replace,
+    Move,
+    Copy,
+    Test,
+    Invalid
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/src/PACKAGE.md b/src/Features/JsonPatch.SystemTextJson/src/PACKAGE.md
new file mode 100644
index 000000000000..ebc6e9ba7284
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/PACKAGE.md
@@ -0,0 +1,58 @@
+## About
+
+`Microsoft.AspNetCore.JsonPatch.SystemTextJson` provides ASP.NET Core support for JSON PATCH requests.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.JsonPatch.SystemTextJson`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.JsonPatch.SystemTextJson
+```
+
+
+### Usage
+
+To define an action method for a JSON Patch in an API controller:
+1. Annotate it with the `HttpPatch` attribute
+2. Accept a `JsonPatchDocument<TModel>`
+3. Call `ApplyTo` on the patch document to apply changes
+
+For example:
+
+```csharp
+[HttpPatch]
+public IActionResult JsonPatchWithModelState(
+    [FromBody] JsonPatchDocument<Customer> patchDoc)
+{
+    if (patchDoc is not null)
+    {
+        var customer = CreateCustomer();
+
+        patchDoc.ApplyTo(customer, ModelState);
+
+        if (!ModelState.IsValid)
+        {
+            return BadRequest(ModelState);
+        }
+
+        return new ObjectResult(customer);
+    }
+    else
+    {
+        return BadRequest(ModelState);
+    }
+}
+```
+
+In a real app, the code would retrieve the data from a store such as a database and update the database after applying the patch.
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/web-api/jsonpatch) on JSON Patch in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.JsonPatch.SystemTextJson` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Features/JsonPatch.SystemTextJson/src/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt
rename to src/Features/JsonPatch.SystemTextJson/src/PublicAPI.Shipped.txt
diff --git a/src/Features/JsonPatch.SystemTextJson/src/PublicAPI.Unshipped.txt b/src/Features/JsonPatch.SystemTextJson/src/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..e2421fc8af3c
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/PublicAPI.Unshipped.txt
@@ -0,0 +1,106 @@
+#nullable enable
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapterWithTest
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException.JsonPatchException() -> void
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.IJsonPatchDocument
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.JsonPatchDocument() -> void
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.JsonPatchDocument() -> void
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation.Operation() -> void
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>.Operation() -> void
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.OperationBase() -> void
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.OperationType.get -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.ShouldSerializeFrom() -> bool
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Add = 0 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Copy = 4 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Invalid = 6 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Move = 3 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Remove = 1 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Replace = 2 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType.Test = 5 -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationType
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter.Add(Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter.Copy(Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter.Move(Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter.Remove(Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter.Replace(Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapterWithTest.Test(Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException.AffectedObject.get -> object
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException.FailedOperation.get -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException.JsonPatchException(Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError jsonPatchError) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException.JsonPatchException(Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError jsonPatchError, System.Exception innerException) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions.JsonPatchException.JsonPatchException(string message, System.Exception innerException) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.IJsonPatchDocument.GetOperations() -> System.Collections.Generic.IList<Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.IJsonPatchDocument.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.IJsonPatchDocument.SerializerOptions.set -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Add(string path, object value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.ApplyTo(object objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.ApplyTo(object objectToApplyTo, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter adapter) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.ApplyTo(object objectToApplyTo, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter adapter, System.Action<Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError> logErrorAction) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.ApplyTo(object objectToApplyTo, System.Action<Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError> logErrorAction) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Copy(string from, string path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.JsonPatchDocument(System.Collections.Generic.List<Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation> operations, System.Text.Json.JsonSerializerOptions serializerOptions) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Move(string from, string path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Operations.get -> System.Collections.Generic.List<Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Remove(string path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Replace(string path, object value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.SerializerOptions.set -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument.Test(string path, object value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Add<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, TProp value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Add<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, TProp value, int position) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Add<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path, TProp value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.ApplyTo(TModel objectToApplyTo) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.ApplyTo(TModel objectToApplyTo, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter adapter) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.ApplyTo(TModel objectToApplyTo, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter adapter, System.Action<Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError> logErrorAction) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.ApplyTo(TModel objectToApplyTo, System.Action<Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError> logErrorAction) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Copy<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> from, int positionFrom, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Copy<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> from, int positionFrom, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, int positionTo) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Copy<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> from, int positionFrom, System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Copy<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> from, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Copy<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> from, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, int positionTo) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Copy<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> from, System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.JsonPatchDocument(System.Collections.Generic.List<Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>> operations, System.Text.Json.JsonSerializerOptions serializerOptions) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Move<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> from, int positionFrom, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Move<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> from, int positionFrom, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, int positionTo) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Move<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> from, int positionFrom, System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Move<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> from, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Move<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> from, System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, int positionTo) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Move<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> from, System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Operations.get -> System.Collections.Generic.List<Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Remove<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Remove<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, int position) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Remove<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Replace<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, TProp value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Replace<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, TProp value, int position) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Replace<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path, TProp value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.SerializerOptions.set -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Test<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, TProp value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Test<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, System.Collections.Generic.IList<TProp>>> path, TProp value, int position) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>.Test<TProp>(System.Linq.Expressions.Expression<System.Func<TModel, TProp>> path, TProp value) -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchDocument<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError.AffectedObject.get -> object
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError.ErrorMessage.get -> string
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError.JsonPatchError(object affectedObject, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation operation, string errorMessage) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.JsonPatchError.Operation.get -> Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation.Apply(object objectToApplyTo, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter adapter) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation.Operation(string op, string path, string from) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation.Operation(string op, string path, string from, object value) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation.value.get -> object
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation.value.set -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>.Apply(TModel objectToApplyTo, Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters.IObjectAdapter adapter) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>.Operation(string op, string path, string from) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.Operation<TModel>.Operation(string op, string path, string from, object value) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.from.get -> string
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.from.set -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.op.get -> string
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.op.set -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.OperationBase(string op, string path, string from) -> void
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.path.get -> string
+~Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations.OperationBase.path.set -> void
diff --git a/src/Features/JsonPatch.SystemTextJson/src/Resources.resx b/src/Features/JsonPatch.SystemTextJson/src/Resources.resx
new file mode 100644
index 000000000000..87cc399c6274
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/src/Resources.resx
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CannotCopyProperty" xml:space="preserve">
+    <value>The property at '{0}' could not be copied.</value>
+  </data>
+  <data name="CannotDeterminePropertyType" xml:space="preserve">
+    <value>The type of the property at path '{0}' could not be determined.</value>
+  </data>
+  <data name="CannotPerformOperation" xml:space="preserve">
+    <value>The '{0}' operation at path '{1}' could not be performed.</value>
+  </data>
+  <data name="CannotReadProperty" xml:space="preserve">
+    <value>The property at '{0}' could not be read.</value>
+  </data>
+  <data name="CannotUpdateProperty" xml:space="preserve">
+    <value>The property at path '{0}' could not be updated.</value>
+  </data>
+  <data name="ExpressionTypeNotSupported" xml:space="preserve">
+    <value>The expression '{0}' is not supported. Supported expressions include member access and indexer expressions.</value>
+  </data>
+  <data name="IndexOutOfBounds" xml:space="preserve">
+    <value>The index value provided by path segment '{0}' is out of bounds of the array size.</value>
+  </data>
+  <data name="InvalidIndexValue" xml:space="preserve">
+    <value>The path segment '{0}' is invalid for an array index.</value>
+  </data>
+  <data name="InvalidJsonPatchDocument" xml:space="preserve">
+    <value>The JSON patch document was malformed and could not be parsed.</value>
+  </data>
+  <data name="InvalidJsonPatchOperation" xml:space="preserve">
+    <value>Invalid JsonPatch operation '{0}'.</value>
+  </data>
+  <data name="InvalidPathSegment" xml:space="preserve">
+    <value>The provided path segment '{0}' cannot be converted to the target type.</value>
+  </data>
+  <data name="InvalidValueForPath" xml:space="preserve">
+    <value>The provided string '{0}' is an invalid path.</value>
+  </data>
+  <data name="InvalidValueForProperty" xml:space="preserve">
+    <value>The value '{0}' is invalid for target location.</value>
+  </data>
+  <data name="ParameterMustMatchType" xml:space="preserve">
+    <value>'{0}' must be of type '{1}'.</value>
+  </data>
+  <data name="PatchNotSupportedForArrays" xml:space="preserve">
+    <value>The type '{0}' which is an array is not supported for json patch operations as it has a fixed size.</value>
+  </data>
+  <data name="PatchNotSupportedForNonGenericLists" xml:space="preserve">
+    <value>The type '{0}' which is a non generic list is not supported for json patch operations. Only generic list types are supported.</value>
+  </data>
+  <data name="TargetLocationAtPathSegmentNotFound" xml:space="preserve">
+    <value>The target location specified by path segment '{0}' was not found.</value>
+  </data>
+  <data name="TargetLocationNotFound" xml:space="preserve">
+    <value>For operation '{0}', the target location specified by path '{1}' was not found.</value>
+  </data>
+  <data name="TestOperationNotSupported" xml:space="preserve">
+    <value>The test operation is not supported.</value>
+  </data>
+  <data name="ValueAtListPositionNotEqualToTestValue" xml:space="preserve">
+    <value>The current value '{0}' at position '{2}' is not equal to the test value '{1}'.</value>
+  </data>
+  <data name="ValueForTargetSegmentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>The value at '{0}' cannot be null or empty to perform the test operation.</value>
+  </data>
+  <data name="ValueNotEqualToTestValue" xml:space="preserve">
+    <value>The current value '{0}' at path '{2}' is not equal to the test value '{1}'.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Features/JsonPatch.SystemTextJson/startvs.cmd b/src/Features/JsonPatch.SystemTextJson/startvs.cmd
new file mode 100644
index 000000000000..f83559bb92c7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\..\startvs.cmd %~dp0JsonPatch.SystemTextJson.slnf
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Adapters/AdapterFactoryTests.cs b/src/Features/JsonPatch.SystemTextJson/test/Adapters/AdapterFactoryTests.cs
new file mode 100644
index 000000000000..32096e7257bc
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Adapters/AdapterFactoryTests.cs
@@ -0,0 +1,55 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Adapters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Test.Adapters;
+
+public class AdapterFactoryTests
+{
+    [Fact]
+    public void GetListAdapterForListTargets()
+    {
+        // Arrange
+        AdapterFactory factory = new AdapterFactory();
+
+        //Act:
+        IAdapter adapter = factory.Create(new List<string>());
+
+        // Assert
+        Assert.Equal(typeof(ListAdapter), adapter.GetType());
+    }
+
+    [Fact]
+    public void GetDictionaryAdapterForDictionaryObjects()
+    {
+        // Arrange
+        AdapterFactory factory = new AdapterFactory();
+
+        //Act:
+        IAdapter adapter = factory.Create(new Dictionary<string, string>());
+
+        // Assert
+        Assert.Equal(typeof(DictionaryAdapter<string, string>), adapter.GetType());
+    }
+
+    private class PocoModel
+    { }
+
+    [Fact]
+    public void GetPocoAdapterForGenericObjects()
+    {
+        // Arrange
+        AdapterFactory factory = new AdapterFactory();
+
+        //Act:
+        IAdapter adapter = factory.Create(new PocoModel());
+
+        // Assert
+        Assert.Equal(typeof(PocoAdapter), adapter.GetType());
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Adapters/TestDynamicObject.cs b/src/Features/JsonPatch.SystemTextJson/test/Adapters/TestDynamicObject.cs
new file mode 100644
index 000000000000..dc6342236021
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Adapters/TestDynamicObject.cs
@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Dynamic;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Test.Adapters;
+
+public class TestDynamicObject : DynamicObject
+{ }
diff --git a/src/Features/JsonPatch.SystemTextJson/test/CustomNamingStrategyTests.cs b/src/Features/JsonPatch.SystemTextJson/test/CustomNamingStrategyTests.cs
new file mode 100644
index 000000000000..9f40bfad961f
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/CustomNamingStrategyTests.cs
@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class CustomNamingStrategyTests
+{
+    [Fact]
+    public void RemoveProperty_FromDictionaryObject_WithCustomNamingStrategy()
+    {
+        // Arrange
+        var serializerOptions = new JsonSerializerOptions();
+        serializerOptions.PropertyNamingPolicy = new TestNamingPolicy();
+        serializerOptions.TypeInfoResolver = new DefaultJsonTypeInfoResolver();
+
+        var targetObject = new Dictionary<string, int>()
+            {
+                { "customTest", 1},
+            };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove("customTest");
+        patchDocument.SerializerOptions = serializerOptions;
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+        var cont = targetObject as IDictionary<string, int>;
+        cont.TryGetValue("customTest", out var valueFromDictionary);
+
+        // Assert
+        Assert.Equal(0, valueFromDictionary);
+    }
+
+    private class TestNamingPolicy : JsonNamingPolicy
+    {
+        public override string ConvertName(string name)
+        {
+            return "custom" + name;
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/AnonymousObjectIntegrationTest.cs b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/AnonymousObjectIntegrationTest.cs
new file mode 100644
index 000000000000..64bf3de4a5f0
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/AnonymousObjectIntegrationTest.cs
@@ -0,0 +1,165 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.IntegrationTests;
+
+public class AnonymousObjectIntegrationTest
+{
+    [Fact]
+    public void AddNewProperty_ShouldFail()
+    {
+        // Arrange
+        var targetObject = new { };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Add("NewProperty", 4);
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal("The target location specified by path segment 'NewProperty' was not found.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void AddDoesNotReplace()
+    {
+        // Arrange
+        var targetObject = new
+        {
+            StringProperty = "A"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Add("StringProperty", "B");
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal("The property at path 'StringProperty' could not be updated.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void RemoveProperty_ShouldFail()
+    {
+        // Arrange
+        dynamic targetObject = new
+        {
+            Test = 1
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove("Test");
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal("The property at path 'Test' could not be updated.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void ReplaceProperty_ShouldFail()
+    {
+        // Arrange
+        var targetObject = new
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Replace("StringProperty", "AnotherStringProperty");
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal("The property at path 'StringProperty' could not be updated.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void MoveProperty_ShouldFail()
+    {
+        // Arrange
+        var targetObject = new
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Move("StringProperty", "AnotherStringProperty");
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal("The property at path 'StringProperty' could not be updated.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void TestStringProperty_IsSuccessful()
+    {
+        // Arrange
+        var targetObject = new
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Test("StringProperty", "A");
+
+        // Act & Assert
+        patchDocument.ApplyTo(targetObject);
+    }
+
+    [Fact]
+    public void TestStringProperty_Fails()
+    {
+        // Arrange
+        var targetObject = new
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Test("StringProperty", "B");
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal("The current value 'A' at path 'StringProperty' is not equal to the test value 'B'.",
+            exception.Message);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/DictionaryIntegrationTest.cs b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/DictionaryIntegrationTest.cs
new file mode 100644
index 000000000000..227748e5ac15
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/DictionaryIntegrationTest.cs
@@ -0,0 +1,318 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.IntegrationTests;
+
+public class DictionaryTest
+{
+    [Fact]
+    public void TestIntegerValue_IsSuccessful()
+    {
+        // Arrange
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger["one"] = 1;
+        model.DictionaryOfStringToInteger["two"] = 2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Test("/DictionaryOfStringToInteger/two", 2);
+
+        // Act & Assert
+        patchDocument.ApplyTo(model);
+    }
+
+    [Fact]
+    public void AddIntegerValue_Succeeds()
+    {
+        // Arrange
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger["one"] = 1;
+        model.DictionaryOfStringToInteger["two"] = 2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Add("/DictionaryOfStringToInteger/three", 3);
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(3, model.DictionaryOfStringToInteger.Count);
+        Assert.Equal(1, model.DictionaryOfStringToInteger["one"]);
+        Assert.Equal(2, model.DictionaryOfStringToInteger["two"]);
+        Assert.Equal(3, model.DictionaryOfStringToInteger["three"]);
+    }
+
+    [Fact]
+    public void RemoveIntegerValue_Succeeds()
+    {
+        // Arrange
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger["one"] = 1;
+        model.DictionaryOfStringToInteger["two"] = 2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove("/DictionaryOfStringToInteger/two");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Single(model.DictionaryOfStringToInteger);
+        Assert.Equal(1, model.DictionaryOfStringToInteger["one"]);
+    }
+
+    [Fact]
+    public void MoveIntegerValue_Succeeds()
+    {
+        // Arrange
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger["one"] = 1;
+        model.DictionaryOfStringToInteger["two"] = 2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Move("/DictionaryOfStringToInteger/one", "/DictionaryOfStringToInteger/two");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Single(model.DictionaryOfStringToInteger);
+        Assert.Equal(1, model.DictionaryOfStringToInteger["two"]);
+    }
+
+    [Fact]
+    public void ReplaceIntegerValue_Succeeds()
+    {
+        // Arrange
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger["one"] = 1;
+        model.DictionaryOfStringToInteger["two"] = 2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Replace("/DictionaryOfStringToInteger/two", 20);
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(2, model.DictionaryOfStringToInteger.Count);
+        Assert.Equal(1, model.DictionaryOfStringToInteger["one"]);
+        Assert.Equal(20, model.DictionaryOfStringToInteger["two"]);
+    }
+
+    [Fact]
+    public void CopyIntegerValue_Succeeds()
+    {
+        // Arrange
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger["one"] = 1;
+        model.DictionaryOfStringToInteger["two"] = 2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy("/DictionaryOfStringToInteger/one", "/DictionaryOfStringToInteger/two");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(2, model.DictionaryOfStringToInteger.Count);
+        Assert.Equal(1, model.DictionaryOfStringToInteger["one"]);
+        Assert.Equal(1, model.DictionaryOfStringToInteger["two"]);
+    }
+
+    private class Customer
+    {
+        public string Name { get; set; }
+        public Address Address { get; set; }
+    }
+
+    private class Address
+    {
+        public string City { get; set; }
+    }
+
+    private class IntDictionary
+    {
+        public IDictionary<string, int> DictionaryOfStringToInteger { get; } = new Dictionary<string, int>();
+    }
+
+    private class CustomerDictionary
+    {
+        public IDictionary<int, Customer> DictionaryOfStringToCustomer { get; } = new Dictionary<int, Customer>();
+    }
+
+    [Fact]
+    public void TestPocoObject_Succeeds()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "James" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Test($"/DictionaryOfStringToCustomer/{key1}/Name", "James");
+
+        // Act & Assert
+        patchDocument.ApplyTo(model);
+    }
+
+    [Fact]
+    public void TestPocoObject_FailsWhenTestValueIsNotEqualToObjectValue()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "James" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Test($"/DictionaryOfStringToCustomer/{key1}/Name", "Mike");
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(model);
+        });
+
+        // Assert
+        Assert.Equal("The current value 'James' at path 'Name' is not equal to the test value 'Mike'.", exception.Message);
+    }
+
+    [Fact]
+    public void AddReplacesPocoObject_Succeeds()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "Jamesss" };
+        var key2 = 200;
+        var value2 = new Customer() { Name = "Mike" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        model.DictionaryOfStringToCustomer[key2] = value2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Add($"/DictionaryOfStringToCustomer/{key1}/Name", "James");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(2, model.DictionaryOfStringToCustomer.Count);
+        var actualValue1 = model.DictionaryOfStringToCustomer[key1];
+        Assert.NotNull(actualValue1);
+        Assert.Equal("James", actualValue1.Name);
+    }
+
+    [Fact]
+    public void RemovePocoObject_Succeeds()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "Jamesss" };
+        var key2 = 200;
+        var value2 = new Customer() { Name = "Mike" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        model.DictionaryOfStringToCustomer[key2] = value2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove($"/DictionaryOfStringToCustomer/{key1}/Name");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        var actualValue1 = model.DictionaryOfStringToCustomer[key1];
+        Assert.Null(actualValue1.Name);
+    }
+
+    [Fact]
+    public void MovePocoObject_Succeeds()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "James" };
+        var key2 = 200;
+        var value2 = new Customer() { Name = "Mike" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        model.DictionaryOfStringToCustomer[key2] = value2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Move($"/DictionaryOfStringToCustomer/{key1}/Name", $"/DictionaryOfStringToCustomer/{key2}/Name");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        var actualValue2 = model.DictionaryOfStringToCustomer[key2];
+        Assert.NotNull(actualValue2);
+        Assert.Equal("James", actualValue2.Name);
+    }
+
+    [Fact]
+    public void CopyPocoObject_Succeeds()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "James" };
+        var key2 = 200;
+        var value2 = new Customer() { Name = "Mike" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        model.DictionaryOfStringToCustomer[key2] = value2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy($"/DictionaryOfStringToCustomer/{key1}/Name", $"/DictionaryOfStringToCustomer/{key2}/Name");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(2, model.DictionaryOfStringToCustomer.Count);
+        var actualValue2 = model.DictionaryOfStringToCustomer[key2];
+        Assert.NotNull(actualValue2);
+        Assert.Equal("James", actualValue2.Name);
+    }
+
+    [Fact]
+    public void ReplacePocoObject_Succeeds()
+    {
+        // Arrange
+        var key1 = 100;
+        var value1 = new Customer() { Name = "Jamesss" };
+        var key2 = 200;
+        var value2 = new Customer() { Name = "Mike" };
+        var model = new CustomerDictionary();
+        model.DictionaryOfStringToCustomer[key1] = value1;
+        model.DictionaryOfStringToCustomer[key2] = value2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Replace($"/DictionaryOfStringToCustomer/{key1}/Name", "James");
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(2, model.DictionaryOfStringToCustomer.Count);
+        var actualValue1 = model.DictionaryOfStringToCustomer[key1];
+        Assert.NotNull(actualValue1);
+        Assert.Equal("James", actualValue1.Name);
+    }
+
+    [Fact]
+    public void ReplacePocoObject_WithEscaping_Succeeds()
+    {
+        // Arrange
+        var key1 = "Foo/Name";
+        var value1 = 100;
+        var key2 = "Foo";
+        var value2 = 200;
+        var model = new IntDictionary();
+        model.DictionaryOfStringToInteger[key1] = value1;
+        model.DictionaryOfStringToInteger[key2] = value2;
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Replace($"/DictionaryOfStringToInteger/Foo~1Name", 300);
+
+        // Act
+        patchDocument.ApplyTo(model);
+
+        // Assert
+        Assert.Equal(2, model.DictionaryOfStringToInteger.Count);
+        var actualValue1 = model.DictionaryOfStringToInteger[key1];
+        var actualValue2 = model.DictionaryOfStringToInteger[key2];
+        Assert.Equal(300, actualValue1);
+        Assert.Equal(200, actualValue2);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/HeterogenousCollectionTests.cs b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/HeterogenousCollectionTests.cs
new file mode 100644
index 000000000000..bbc59d86db63
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/HeterogenousCollectionTests.cs
@@ -0,0 +1,123 @@
+// 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.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.IntegrationTests;
+
+public class HeterogenousCollectionTests
+{
+    [Fact]
+    public void AddItemToList()
+    {
+        // Arrange
+        var targetObject = new Canvas()
+        {
+            Items = new List<Shape>()
+        };
+
+        var circleJObject = JsonObject.Parse(@"{
+                      ""Type"": ""Circle"",
+                      ""ShapeProperty"": ""Shape property"",
+                      ""CircleProperty"": ""Circle property""
+                    }");
+
+        var serializerOptions = new JsonSerializerOptions();
+        serializerOptions.TypeInfoResolver = new CanvasContractResolver();
+
+        var patchDocument = new JsonPatchDocument
+        {
+            SerializerOptions = serializerOptions
+        };
+
+        patchDocument.Add("/Items/-", circleJObject);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        var circle = targetObject.Items[0] as Circle;
+        Assert.NotNull(circle);
+        Assert.Equal("Shape property", circle.ShapeProperty);
+        Assert.Equal("Circle property", circle.CircleProperty);
+    }
+}
+
+public class CanvasContractResolver : DefaultJsonTypeInfoResolver
+{
+    public override JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions options)
+    {
+        // Get the default metadata for the type.
+        var jsonTypeInfo = base.GetTypeInfo(type, options);
+
+        // Check if the type is Shape or derives from it.
+        if (jsonTypeInfo.Type == typeof(Shape))
+        {
+            // Configure polymorphism options if they haven't been set yet.
+            if (jsonTypeInfo.PolymorphismOptions == null)
+            {
+                jsonTypeInfo.PolymorphismOptions = new JsonPolymorphismOptions
+                {
+                    TypeDiscriminatorPropertyName = "Type",
+                    IgnoreUnrecognizedTypeDiscriminators = true,
+                    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FailSerialization,
+                    DerivedTypes = {
+                        new JsonDerivedType(typeof(Circle), "Circle"),
+                        new JsonDerivedType(typeof(Rectangle), "Rectangle")
+                    }
+                };
+            }
+        }
+
+        return jsonTypeInfo;
+    }
+}
+
+public class ShapeJsonConverter : JsonConverter<Shape>
+{
+    public override Shape Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.StartObject)
+        {
+            throw new JsonException();
+        }
+
+        using var doc = JsonDocument.ParseValue(ref reader);
+        var root = doc.RootElement;
+
+        if (root.TryGetProperty("CircleProperty", out _))
+        {
+            return JsonSerializer.Deserialize<Circle>(root.GetRawText(), options);
+        }
+        else if (root.TryGetProperty("RectangleProperty", out _))
+        {
+            return JsonSerializer.Deserialize<Rectangle>(root.GetRawText(), options);
+        }
+        else
+        {
+            throw new JsonException("Unknown shape type");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, Shape value, JsonSerializerOptions options)
+    {
+        if (value is Circle circle)
+        {
+            JsonSerializer.Serialize(writer, circle, options);
+        }
+        else if (value is Rectangle rectangle)
+        {
+            JsonSerializer.Serialize(writer, rectangle, options);
+        }
+        else
+        {
+            throw new JsonException("Unknown shape type");
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/ListIntegrationTest.cs b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/ListIntegrationTest.cs
new file mode 100644
index 000000000000..b68dff481b84
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/ListIntegrationTest.cs
@@ -0,0 +1,365 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.IntegrationTests;
+
+public class ListIntegrationTest
+{
+    [Fact]
+    public void TestInList_IsSuccessful()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Test(o => o.SimpleObject.IntegerList, 3, 2);
+
+        // Act & Assert
+        patchDocument.ApplyTo(targetObject);
+    }
+
+    [Fact]
+    public void TestInList_InvalidPosition()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Test(o => o.SimpleObject.IntegerList, 4, -1);
+
+        // Act & Assert
+        var exception = Assert.Throws<JsonPatchException>(() => { patchDocument.ApplyTo(targetObject); });
+        Assert.Equal("The index value provided by path segment '-1' is out of bounds of the array size.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void AddToIntegerIList()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerIList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Add(o => (List<int>)o.SimpleObject.IntegerIList, 4, 0);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 4, 1, 2, 3 }, targetObject.SimpleObject.IntegerIList);
+    }
+
+    [Fact]
+    public void AddToComplextTypeList_SpecifyIndex()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObjectList = new List<SimpleObject>()
+                {
+                    new SimpleObject
+                    {
+                        StringProperty = "String1"
+                    },
+                    new SimpleObject
+                    {
+                        StringProperty = "String2"
+                    }
+                }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Add(o => o.SimpleObjectList[0].StringProperty, "ChangedString1");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("ChangedString1", targetObject.SimpleObjectList[0].StringProperty);
+    }
+
+    [Fact]
+    public void AddToListAppend()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Add(o => o.SimpleObject.IntegerList, 4);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 1, 2, 3, 4 }, targetObject.SimpleObject.IntegerList);
+    }
+
+    [Fact]
+    public void RemoveFromList()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerList = new List<int>() { 1, 2, 3 }
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove("IntegerList/2");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 1, 2 }, targetObject.IntegerList);
+    }
+
+    [Theory]
+    [InlineData("3")]
+    [InlineData("-1")]
+    public void RemoveFromList_InvalidPosition(string position)
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerList = new List<int>() { 1, 2, 3 }
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove("IntegerList/" + position);
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.ApplyTo(targetObject);
+        });
+
+        // Assert
+        Assert.Equal($"The index value provided by path segment '{position}' is out of bounds of the array size.", exception.Message);
+    }
+
+    [Fact]
+    public void Remove_FromEndOfList()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Remove<int>(o => o.SimpleObject.IntegerList);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 1, 2 }, targetObject.SimpleObject.IntegerList);
+    }
+
+    [Fact]
+    public void ReplaceFullList_WithCollection()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerList = new List<int>() { 1, 2, 3 }
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Replace("IntegerList", new Collection<int>() { 4, 5, 6 });
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 4, 5, 6 }, targetObject.IntegerList);
+    }
+
+    [Fact]
+    public void Replace_AtEndOfList()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Replace(o => o.SimpleObject.IntegerList, 5);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 1, 2, 5 }, targetObject.SimpleObject.IntegerList);
+    }
+
+    [Fact]
+    public void Replace_InList_InvalidPosition()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Replace(o => o.SimpleObject.IntegerList, 5, -1);
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() => { patchDocument.ApplyTo(targetObject); });
+
+        // Assert
+        Assert.Equal("The index value provided by path segment '-1' is out of bounds of the array size.", exception.Message);
+    }
+
+    [Fact]
+    public void CopyFromListToEndOfList()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerList = new List<int>() { 1, 2, 3 }
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy("IntegerList/0", "IntegerList/-");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 1, 2, 3, 1 }, targetObject.IntegerList);
+    }
+
+    [Fact]
+    public void CopyFromListToNonList()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerList = new List<int>() { 1, 2, 3 }
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy("IntegerList/0", "IntegerValue");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(1, targetObject.IntegerValue);
+    }
+
+    [Fact]
+    public void MoveToEndOfList()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerValue = 5,
+            IntegerList = new List<int>() { 1, 2, 3 }
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Move("IntegerValue", "IntegerList/-");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(0, targetObject.IntegerValue);
+        Assert.Equal(new List<int>() { 1, 2, 3, 5 }, targetObject.IntegerList);
+    }
+
+    [Fact]
+    public void Move_KeepsObjectReferenceInList()
+    {
+        // Arrange
+        var simpleObject1 = new SimpleObject() { IntegerValue = 1 };
+        var simpleObject2 = new SimpleObject() { IntegerValue = 2 };
+        var simpleObject3 = new SimpleObject() { IntegerValue = 3 };
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObjectList = new List<SimpleObject>() {
+                    simpleObject1,
+                    simpleObject2,
+                    simpleObject3
+                }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Move(o => o.SimpleObjectList, 0, o => o.SimpleObjectList, 1);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<SimpleObject>() { simpleObject2, simpleObject1, simpleObject3 }, targetObject.SimpleObjectList);
+        Assert.Equal(2, targetObject.SimpleObjectList[0].IntegerValue);
+        Assert.Equal(1, targetObject.SimpleObjectList[1].IntegerValue);
+        Assert.Same(simpleObject2, targetObject.SimpleObjectList[0]);
+        Assert.Same(simpleObject1, targetObject.SimpleObjectList[1]);
+    }
+
+    [Fact]
+    public void MoveFromList_ToNonList_BetweenHierarchy()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerList = new List<int>() { 1, 2, 3 }
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Move(o => o.SimpleObject.IntegerList, 0, o => o.IntegerValue);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(new List<int>() { 2, 3 }, targetObject.SimpleObject.IntegerList);
+        Assert.Equal(1, targetObject.IntegerValue);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/NestedObjectIntegrationTest.cs b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/NestedObjectIntegrationTest.cs
new file mode 100644
index 000000000000..6a8dc03a4590
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/NestedObjectIntegrationTest.cs
@@ -0,0 +1,347 @@
+// 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.Dynamic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Shared;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.IntegrationTests;
+
+public class NestedObjectIntegrationTest
+{
+    [Fact]
+    public void Replace_DTOWithNullCheck()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObjectWithNullCheck()
+        {
+            SimpleObjectWithNullCheck = new SimpleObjectWithNullCheck()
+            {
+                StringProperty = "A"
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObjectWithNullCheck>();
+        patchDocument.Replace(o => o.SimpleObjectWithNullCheck.StringProperty, "B");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("B", targetObject.SimpleObjectWithNullCheck.StringProperty);
+    }
+
+    [Fact]
+    public void ReplaceNestedObject_WithSerialization()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            IntegerValue = 1
+        };
+
+        var newNested = new NestedObject() { StringProperty = "B" };
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Replace(o => o.NestedObject, newNested);
+
+        var serialized = JsonSerializer.Serialize(patchDocument);
+        var deserialized = JsonSerializer.Deserialize<JsonPatchDocument<SimpleObjectWithNestedObject>>(serialized);
+
+        // Act
+        deserialized.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("B", targetObject.NestedObject.StringProperty);
+    }
+
+    [Fact]
+    public void TestStringProperty_InNestedObject()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            NestedObject = new NestedObject() { StringProperty = "A" }
+        };
+
+        var patchDocument = new JsonPatchDocument<NestedObject>();
+        patchDocument.Test(o => o.StringProperty, "A");
+
+        // Act
+        patchDocument.ApplyTo(targetObject.NestedObject);
+
+        // Assert
+        Assert.Equal("A", targetObject.NestedObject.StringProperty);
+    }
+
+    [Fact]
+    public void TestNestedObject()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            NestedObject = new NestedObject() { StringProperty = "B" }
+        };
+
+        var testNested = new NestedObject() { StringProperty = "B" };
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Test(o => o.NestedObject, testNested);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("B", targetObject.NestedObject.StringProperty);
+    }
+
+    [Fact]
+    public void AddReplaces_ExistingStringProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                StringProperty = "A"
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Add(o => o.SimpleObject.StringProperty, "B");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("B", targetObject.SimpleObject.StringProperty);
+    }
+
+    [Fact]
+    public void RemoveStringProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                StringProperty = "A"
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Remove(o => o.SimpleObject.StringProperty);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Null(targetObject.SimpleObject.StringProperty);
+    }
+
+    [Fact]
+    public void CopyStringProperty_ToAnotherStringProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                StringProperty = "A",
+                AnotherStringProperty = "B"
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Copy(o => o.SimpleObject.StringProperty, o => o.SimpleObject.AnotherStringProperty);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("A", targetObject.SimpleObject.AnotherStringProperty);
+    }
+
+    [Fact]
+    public void CopyNullStringProperty_ToAnotherStringProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                StringProperty = null,
+                AnotherStringProperty = "B"
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Copy(o => o.SimpleObject.StringProperty, o => o.SimpleObject.AnotherStringProperty);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Null(targetObject.SimpleObject.AnotherStringProperty);
+    }
+
+    [Fact]
+    public void Copy_DeepClonesObject()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                StringProperty = "A",
+                AnotherStringProperty = "B"
+            },
+            InheritedObject = new InheritedObject()
+            {
+                StringProperty = "C",
+                AnotherStringProperty = "D"
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Copy(o => o.InheritedObject, o => o.SimpleObject);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("C", targetObject.SimpleObject.StringProperty);
+        Assert.Equal("D", targetObject.SimpleObject.AnotherStringProperty);
+        Assert.Equal("C", targetObject.InheritedObject.StringProperty);
+        Assert.Equal("D", targetObject.InheritedObject.AnotherStringProperty);
+        Assert.NotSame(targetObject.SimpleObject.StringProperty, targetObject.InheritedObject.StringProperty);
+    }
+
+    [Fact]
+    public void Copy_KeepsObjectType()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject(),
+            InheritedObject = new InheritedObject()
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Copy(o => o.InheritedObject, o => o.SimpleObject);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(typeof(InheritedObject), targetObject.SimpleObject.GetType());
+    }
+
+    [Fact]
+    public void Copy_BreaksObjectReference()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject(),
+            InheritedObject = new InheritedObject()
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Copy(o => o.InheritedObject, o => o.SimpleObject);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.NotSame(targetObject.SimpleObject, targetObject.InheritedObject);
+    }
+
+    [Fact]
+    public void MoveIntegerValue_ToAnotherIntegerProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = new SimpleObject()
+            {
+                IntegerValue = 2,
+                AnotherIntegerValue = 3
+            }
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Move(o => o.SimpleObject.IntegerValue, o => o.SimpleObject.AnotherIntegerValue);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(2, targetObject.SimpleObject.AnotherIntegerValue);
+        Assert.Equal(0, targetObject.SimpleObject.IntegerValue);
+    }
+
+    [Fact]
+    public void Move_KeepsObjectReference()
+    {
+        // Arrange
+        var sDto = new SimpleObject()
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+        var iDto = new InheritedObject()
+        {
+            StringProperty = "C",
+            AnotherStringProperty = "D"
+        };
+        var targetObject = new SimpleObjectWithNestedObject()
+        {
+            SimpleObject = sDto,
+            InheritedObject = iDto
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+        patchDocument.Move(o => o.InheritedObject, o => o.SimpleObject);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("C", targetObject.SimpleObject.StringProperty);
+        Assert.Equal("D", targetObject.SimpleObject.AnotherStringProperty);
+        Assert.Same(iDto, targetObject.SimpleObject);
+        Assert.Null(targetObject.InheritedObject);
+    }
+
+    private class SimpleObjectWithNullCheck
+    {
+        private string stringProperty;
+
+        public string StringProperty
+        {
+            get
+            {
+                return stringProperty;
+            }
+
+            set
+            {
+                ArgumentNullThrowHelper.ThrowIfNull(value);
+
+                stringProperty = value;
+            }
+        }
+    }
+
+    private class SimpleObjectWithNestedObjectWithNullCheck
+    {
+        public SimpleObjectWithNullCheck SimpleObjectWithNullCheck { get; set; }
+
+        public SimpleObjectWithNestedObjectWithNullCheck()
+        {
+            SimpleObjectWithNullCheck = new SimpleObjectWithNullCheck();
+        }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/SimpleObjectIntegrationTest.cs b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/SimpleObjectIntegrationTest.cs
new file mode 100644
index 000000000000..1e44ba161746
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/IntegrationTests/SimpleObjectIntegrationTest.cs
@@ -0,0 +1,174 @@
+// 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.Dynamic;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.IntegrationTests;
+
+public class SimpleObjectIntegrationTest
+{
+    [Fact]
+    public void TestDoubleValueProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            DoubleValue = 9.8
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Test("DoubleValue", 9.8);
+
+        // Act & Assert
+        patchDocument.ApplyTo(targetObject);
+    }
+
+    [Fact]
+    public void CopyStringProperty_ToAnotherStringProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy("StringProperty", "AnotherStringProperty");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("A", targetObject.AnotherStringProperty);
+    }
+
+    [Fact]
+    public void CopyNullStringProperty_ToAnotherStringProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            StringProperty = null,
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy("StringProperty", "AnotherStringProperty");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Null(targetObject.AnotherStringProperty);
+    }
+
+    [Fact]
+    public void MoveIntegerProperty_ToAnotherIntegerProperty()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            IntegerValue = 2,
+            AnotherIntegerValue = 3
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Move("IntegerValue", "AnotherIntegerValue");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(2, targetObject.AnotherIntegerValue);
+        Assert.Equal(0, targetObject.IntegerValue);
+    }
+
+    [Fact]
+    public void RemoveDecimalPropertyValue()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            DecimalValue = 9.8M
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Remove("DecimalValue");
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(0, targetObject.DecimalValue);
+    }
+
+    [Fact]
+    public void ReplaceGuid()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            GuidValue = Guid.NewGuid()
+        };
+
+        var newGuid = Guid.NewGuid();
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Replace("GuidValue", newGuid);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(newGuid, targetObject.GuidValue);
+    }
+
+    [Fact]
+    public void AddReplacesGuid()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            GuidValue = Guid.NewGuid()
+        };
+
+        var newGuid = Guid.NewGuid();
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Add("GuidValue", newGuid);
+
+        // Act
+        patchDocument.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal(newGuid, targetObject.GuidValue);
+    }
+
+    // https://github.com/dotnet/aspnetcore/issues/3634
+    [Fact]
+    public void Regression_AspNetCore3634()
+    {
+        // Assert
+        var document = new JsonPatchDocument();
+        document.Move("/Object", "/Object/goodbye");
+
+        dynamic @object = new ExpandoObject();
+        @object.hello = "world";
+
+        var target = new Regression_AspNetCore3634_Object();
+        target.Object = @object;
+
+        // Act
+        var ex = Assert.Throws<JsonPatchException>(() => document.ApplyTo(target));
+
+        // Assert
+        Assert.Equal("For operation 'move', the target location specified by path '/Object/goodbye' was not found.", ex.Message);
+    }
+
+    private class Regression_AspNetCore3634_Object
+    {
+        public dynamic Object { get; set; }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Internal/DictionaryAdapterTest.cs b/src/Features/JsonPatch.SystemTextJson/test/Internal/DictionaryAdapterTest.cs
new file mode 100644
index 000000000000..907b13bde3d0
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Internal/DictionaryAdapterTest.cs
@@ -0,0 +1,335 @@
+// 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.Collections.Generic;
+using System.Globalization;
+using System.Text.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+public class DictionaryAdapterTest
+{
+    [Fact]
+    public void Add_KeyWhichAlreadyExists_ReplacesExistingValue()
+    {
+        // Arrange
+        var key = "Status";
+        var dictionary = new Dictionary<string, int>(StringComparer.Ordinal);
+        dictionary[key] = 404;
+        var dictionaryAdapter = new DictionaryAdapter<string, int>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var addStatus = dictionaryAdapter.TryAdd(dictionary, key, serializerOptions, 200, out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal(200, dictionary[key]);
+    }
+
+    [Fact]
+    public void Add_IntKeyWhichAlreadyExists_ReplacesExistingValue()
+    {
+        // Arrange
+        var intKey = 1;
+        var dictionary = new Dictionary<int, object>();
+        dictionary[intKey] = "Mike";
+        var dictionaryAdapter = new DictionaryAdapter<int, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var addStatus = dictionaryAdapter.TryAdd(dictionary, intKey.ToString(CultureInfo.InvariantCulture), serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[intKey]);
+    }
+
+    [Fact]
+    public void GetInvalidKey_ThrowsInvalidPathSegmentException()
+    {
+        // Arrange
+        var dictionaryAdapter = new DictionaryAdapter<int, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var key = 1;
+        var dictionary = new Dictionary<int, object>();
+
+        // Act
+        var addStatus = dictionaryAdapter.TryAdd(dictionary, key.ToString(CultureInfo.InvariantCulture), serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[key]);
+
+        // Act
+        var guidKey = new Guid();
+        var getStatus = dictionaryAdapter.TryGet(dictionary, guidKey.ToString(), serializerOptions, out var outValue, out message);
+
+        // Assert
+        Assert.False(getStatus);
+        Assert.Equal($"The provided path segment '{guidKey.ToString()}' cannot be converted to the target type.", message);
+        Assert.Null(outValue);
+    }
+
+    [Fact]
+    public void Get_UsingCaseSensitiveKey_FailureScenario()
+    {
+        // Arrange
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+
+        // Act
+        var addStatus = dictionaryAdapter.TryAdd(dictionary, nameKey, serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[nameKey]);
+
+        // Act
+        var getStatus = dictionaryAdapter.TryGet(dictionary, nameKey.ToUpperInvariant(), serializerOptions, out var outValue, out message);
+
+        // Assert
+        Assert.False(getStatus);
+        Assert.Equal("The target location specified by path segment 'NAME' was not found.", message);
+        Assert.Null(outValue);
+    }
+
+    [Fact]
+    public void Get_UsingCaseSensitiveKey_SuccessScenario()
+    {
+        // Arrange
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+
+        // Act
+        var addStatus = dictionaryAdapter.TryAdd(dictionary, nameKey, serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[nameKey]);
+
+        // Act
+        addStatus = dictionaryAdapter.TryGet(dictionary, nameKey, serializerOptions, out var outValue, out message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal("James", outValue?.ToString());
+    }
+
+    [Fact]
+    public void ReplacingExistingItem()
+    {
+        // Arrange
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+        dictionary.Add(nameKey, "Mike");
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var replaceStatus = dictionaryAdapter.TryReplace(dictionary, nameKey, serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(replaceStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[nameKey]);
+    }
+
+    [Fact]
+    public void ReplacingExistingItem_WithGuidKey()
+    {
+        // Arrange
+        var guidKey = new Guid();
+        var dictionary = new Dictionary<Guid, object>();
+        dictionary.Add(guidKey, "Mike");
+        var dictionaryAdapter = new DictionaryAdapter<Guid, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var replaceStatus = dictionaryAdapter.TryReplace(dictionary, guidKey.ToString(), serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(replaceStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[guidKey]);
+    }
+
+    [Fact]
+    public void ReplacingWithInvalidValue_ThrowsInvalidValueForPropertyException()
+    {
+        // Arrange
+        var guidKey = new Guid();
+        var dictionary = new Dictionary<Guid, int>();
+        dictionary.Add(guidKey, 5);
+        var dictionaryAdapter = new DictionaryAdapter<Guid, int>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var replaceStatus = dictionaryAdapter.TryReplace(dictionary, guidKey.ToString(), serializerOptions, "test", out var message);
+
+        // Assert
+        Assert.False(replaceStatus);
+        Assert.Equal("The value 'test' is invalid for target location.", message);
+        Assert.Equal(5, dictionary[guidKey]);
+    }
+
+    [Fact]
+    public void Replace_NonExistingKey_Fails()
+    {
+        // Arrange
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var replaceStatus = dictionaryAdapter.TryReplace(dictionary, nameKey, serializerOptions, "Mike", out var message);
+
+        // Assert
+        Assert.False(replaceStatus);
+        Assert.Equal("The target location specified by path segment 'Name' was not found.", message);
+        Assert.Empty(dictionary);
+    }
+
+    [Fact]
+    public void Remove_NonExistingKey_Fails()
+    {
+        // Arrange
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var removeStatus = dictionaryAdapter.TryRemove(dictionary, nameKey, serializerOptions, out var message);
+
+        // Assert
+        Assert.False(removeStatus);
+        Assert.Equal("The target location specified by path segment 'Name' was not found.", message);
+        Assert.Empty(dictionary);
+    }
+
+    [Fact]
+    public void Replace_UsesCustomConverter()
+    {
+        // Arrange
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, Rectangle>(StringComparer.Ordinal);
+        dictionary.Add(nameKey, new Rectangle()
+        {
+            RectangleProperty = "Mike"
+        });
+        var dictionaryAdapter = new DictionaryAdapter<string, Rectangle>();
+        var serializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web) { PropertyNameCaseInsensitive = true };
+        serializerOptions.Converters.Add(new RectangleJsonConverter());
+
+        // Act
+        var replaceStatus = dictionaryAdapter.TryReplace(dictionary, nameKey, serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.True(replaceStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Single(dictionary);
+        Assert.Equal("James", dictionary[nameKey].RectangleProperty);
+    }
+
+    [Fact]
+    public void Remove_RemovesFromDictionary()
+    {
+        // Arrange
+        var nameKey = "Name";
+        var dictionary = new Dictionary<string, object>(StringComparer.Ordinal);
+        dictionary[nameKey] = "James";
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var removeStatus = dictionaryAdapter.TryRemove(dictionary, nameKey, serializerOptions, out var message);
+
+        //Assert
+        Assert.True(removeStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Empty(dictionary);
+    }
+
+    [Fact]
+    public void Remove_RemovesFromDictionary_WithUriKey()
+    {
+        // Arrange
+        var uriKey = new Uri("http://www.test.com/name");
+        var dictionary = new Dictionary<Uri, object>();
+        dictionary[uriKey] = "James";
+        var dictionaryAdapter = new DictionaryAdapter<Uri, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var removeStatus = dictionaryAdapter.TryRemove(dictionary, uriKey.ToString(), serializerOptions, out var message);
+
+        //Assert
+        Assert.True(removeStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Empty(dictionary);
+    }
+
+    [Fact]
+    public void Test_DoesNotThrowException_IfTestIsSuccessful()
+    {
+        // Arrange
+        var key = "Name";
+        var dictionary = new Dictionary<string, List<object>>();
+        var value = new List<object>()
+            {
+                "James",
+                2,
+                new Customer("James", 25)
+            };
+        dictionary[key] = value;
+        var dictionaryAdapter = new DictionaryAdapter<string, List<object>>();
+        var serializerOptions = JsonSerializerOptions.Default;
+
+        // Act
+        var testStatus = dictionaryAdapter.TryTest(dictionary, key, serializerOptions, value, out var message);
+
+        //Assert
+        Assert.True(testStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+    }
+
+    [Fact]
+    public void Test_ThrowsJsonPatchException_IfTestFails()
+    {
+        // Arrange
+        var key = "Name";
+        var dictionary = new Dictionary<string, object>();
+        dictionary[key] = "James";
+        var dictionaryAdapter = new DictionaryAdapter<string, object>();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var expectedErrorMessage = "The current value 'James' at path 'Name' is not equal to the test value 'John'.";
+
+        // Act
+        var testStatus = dictionaryAdapter.TryTest(dictionary, key, serializerOptions, "John", out var errorMessage);
+
+        //Assert
+        Assert.False(testStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Internal/ListAdapterTest.cs b/src/Features/JsonPatch.SystemTextJson/test/Internal/ListAdapterTest.cs
new file mode 100644
index 000000000000..deb1b1a404a4
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Internal/ListAdapterTest.cs
@@ -0,0 +1,498 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+public class ListAdapterTest
+{
+    [Fact]
+    public void Patch_OnArrayObject_Fails()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new[] { 20, 30 };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, "0", serializerOptions, "40", out var message);
+
+        // Assert
+        Assert.False(addStatus);
+        Assert.Equal($"The type '{targetObject.GetType().FullName}' which is an array is not supported for json patch operations as it has a fixed size.", message);
+    }
+
+    [Fact]
+    public void Patch_OnNonGenericListObject_Fails()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new ArrayList();
+        targetObject.Add(20);
+        targetObject.Add(30);
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, "-", serializerOptions, "40", out var message);
+
+        // Assert
+        Assert.False(addStatus);
+        Assert.Equal($"The type '{targetObject.GetType().FullName}' which is a non generic list is not supported for json patch operations. Only generic list types are supported.", message);
+    }
+
+    [Fact]
+    public void Add_WithIndexSameAsNumberOfElements_Works()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<string>() { "James", "Mike" };
+        var listAdapter = new ListAdapter();
+        var position = targetObject.Count.ToString(CultureInfo.InvariantCulture);
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, position, serializerOptions, "Rob", out var message);
+
+        // Assert
+        Assert.Null(message);
+        Assert.True(addStatus);
+        Assert.Equal(3, targetObject.Count);
+        Assert.Equal(new List<string>() { "James", "Mike", "Rob" }, targetObject);
+    }
+
+    [Theory]
+    [InlineData("-1")]
+    [InlineData("-2")]
+    [InlineData("3")]
+    public void Add_WithOutOfBoundsIndex_Fails(string position)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<string>() { "James", "Mike" };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, position, serializerOptions, "40", out var message);
+
+        // Assert
+        Assert.False(addStatus);
+        Assert.Equal($"The index value provided by path segment '{position}' is out of bounds of the array size.", message);
+    }
+
+    [Theory]
+    [InlineData("_")]
+    [InlineData("blah")]
+    public void Patch_WithInvalidPositionFormat_Fails(string position)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<string>() { "James", "Mike" };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, position, serializerOptions, "40", out var message);
+
+        // Assert
+        Assert.False(addStatus);
+        Assert.Equal($"The path segment '{position}' is invalid for an array index.", message);
+    }
+
+    public static TheoryData<List<int>, List<int>> AppendAtEndOfListData
+    {
+        get
+        {
+            return new TheoryData<List<int>, List<int>>()
+                {
+                    {
+                        new List<int>() {  },
+                        new List<int>() { 20 }
+                    },
+                    {
+                        new List<int>() { 5, 10 },
+                        new List<int>() { 5, 10, 20 }
+                    }
+                };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(AppendAtEndOfListData))]
+    public void Add_Appends_AtTheEnd(List<int> targetObject, List<int> expected)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, "-", serializerOptions, 20, out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(expected.Count, targetObject.Count);
+        Assert.Equal(expected, targetObject);
+    }
+
+    [Fact]
+    public void Add_NullObject_ToReferenceTypeListWorks()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var listAdapter = new ListAdapter();
+        var targetObject = new List<string>() { "James", "Mike" };
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, "-", serializerOptions, value: null, errorMessage: out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(3, targetObject.Count);
+        Assert.Equal(new List<string>() { "James", "Mike", null }, targetObject);
+    }
+
+    [Fact]
+    public void Add_CompatibleTypeWorks()
+    {
+        // Arrange
+        var sDto = new SimpleObject();
+        var iDto = new InheritedObject();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<SimpleObject>() { sDto };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, "-", serializerOptions, iDto, out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(2, targetObject.Count);
+        Assert.Equal(new List<SimpleObject>() { sDto, iDto }, targetObject);
+    }
+
+    [Fact]
+    public void Add_NonCompatibleType_Fails()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, "-", serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.False(addStatus);
+        Assert.Equal("The value 'James' is invalid for target location.", message);
+    }
+
+    public static TheoryData<IList, object, string, IList> AddingDifferentComplexTypeWorksData
+    {
+        get
+        {
+            return new TheoryData<IList, object, string, IList>()
+                {
+                    {
+                        new List<string>() { },
+                        "a",
+                        "-",
+                        new List<string>() { "a" }
+                    },
+                    {
+                        new List<string>() { "a", "b" },
+                        "c",
+                        "-",
+                        new List<string>() { "a", "b", "c" }
+                    },
+                    {
+                        new List<string>() { "a", "b" },
+                        "c",
+                        "0",
+                        new List<string>() { "c", "a", "b" }
+                    },
+                    {
+                        new List<string>() { "a", "b" },
+                        "c",
+                        "1",
+                        new List<string>() { "a", "c", "b" }
+                    }
+                };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(AddingDifferentComplexTypeWorksData))]
+    public void Add_DifferentComplexTypeWorks(IList targetObject, object value, string position, IList expected)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, position, serializerOptions, value, out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(expected.Count, targetObject.Count);
+        Assert.Equal(expected, targetObject);
+    }
+
+    public static TheoryData<IList, object, string, IList> AddingKeepsObjectReferenceData
+    {
+        get
+        {
+            var sDto1 = new SimpleObject();
+            var sDto2 = new SimpleObject();
+            var sDto3 = new SimpleObject();
+            return new TheoryData<IList, object, string, IList>()
+                {
+                    {
+                        new List<SimpleObject>() { },
+                        sDto1,
+                        "-",
+                        new List<SimpleObject>() { sDto1 }
+                    },
+                    {
+                        new List<SimpleObject>() { sDto1, sDto2 },
+                        sDto3,
+                        "-",
+                        new List<SimpleObject>() { sDto1, sDto2, sDto3 }
+                    },
+                    {
+                        new List<SimpleObject>() { sDto1, sDto2 },
+                        sDto3,
+                        "0",
+                        new List<SimpleObject>() { sDto3, sDto1, sDto2 }
+                    },
+                    {
+                        new List<SimpleObject>() {  sDto1, sDto2 },
+                        sDto3,
+                        "1",
+                        new List<SimpleObject>() { sDto1, sDto3, sDto2 }
+                    }
+                };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(AddingKeepsObjectReferenceData))]
+    public void Add_KeepsObjectReference(IList targetObject, object value, string position, IList expected)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var addStatus = listAdapter.TryAdd(targetObject, position, serializerOptions, value, out var message);
+
+        // Assert
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(expected.Count, targetObject.Count);
+        Assert.Equal(expected, targetObject);
+    }
+
+    [Theory]
+    [InlineData(new int[] { }, "0")]
+    [InlineData(new[] { 10, 20 }, "-1")]
+    [InlineData(new[] { 10, 20 }, "2")]
+    public void Get_IndexOutOfBounds(int[] input, string position)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>(input);
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var getStatus = listAdapter.TryGet(targetObject, position, serializerOptions, out var value, out var message);
+
+        // Assert
+        Assert.False(getStatus);
+        Assert.Equal($"The index value provided by path segment '{position}' is out of bounds of the array size.", message);
+    }
+
+    [Theory]
+    [InlineData(new[] { 10, 20 }, "0", 10)]
+    [InlineData(new[] { 10, 20 }, "1", 20)]
+    [InlineData(new[] { 10 }, "0", 10)]
+    public void Get(int[] input, string position, object expected)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>(input);
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var getStatus = listAdapter.TryGet(targetObject, position, serializerOptions, out var value, out var message);
+
+        // Assert
+        Assert.True(getStatus);
+        Assert.Equal(expected, value);
+        Assert.Equal(new List<int>(input), targetObject);
+    }
+
+    [Theory]
+    [InlineData(new int[] { }, "0")]
+    [InlineData(new[] { 10, 20 }, "-1")]
+    [InlineData(new[] { 10, 20 }, "2")]
+    public void Remove_IndexOutOfBounds(int[] input, string position)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>(input);
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var removeStatus = listAdapter.TryRemove(targetObject, position, serializerOptions, out var message);
+
+        // Assert
+        Assert.False(removeStatus);
+        Assert.Equal($"The index value provided by path segment '{position}' is out of bounds of the array size.", message);
+    }
+
+    [Theory]
+    [InlineData(new[] { 10, 20 }, "0", new[] { 20 })]
+    [InlineData(new[] { 10, 20 }, "1", new[] { 10 })]
+    [InlineData(new[] { 10 }, "0", new int[] { })]
+    public void Remove(int[] input, string position, int[] expected)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>(input);
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var removeStatus = listAdapter.TryRemove(targetObject, position, serializerOptions, out var message);
+
+        // Assert
+        Assert.True(removeStatus);
+        Assert.Equal(new List<int>(expected), targetObject);
+    }
+
+    [Fact]
+    public void Replace_NonCompatibleType_Fails()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var replaceStatus = listAdapter.TryReplace(targetObject, "-", serializerOptions, "James", out var message);
+
+        // Assert
+        Assert.False(replaceStatus);
+        Assert.Equal("The value 'James' is invalid for target location.", message);
+    }
+
+    [Fact]
+    public void Replace_ReplacesValue_AtTheEnd()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var replaceStatus = listAdapter.TryReplace(targetObject, "-", serializerOptions, 30, out var message);
+
+        // Assert
+        Assert.True(replaceStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(new List<int>() { 10, 30 }, targetObject);
+    }
+
+    public static TheoryData<string, List<int>> ReplacesValuesAtPositionData
+    {
+        get
+        {
+            return new TheoryData<string, List<int>>()
+                {
+                    {
+                        "0",
+                        new List<int>() { 30, 20 }
+                    },
+                    {
+                        "1",
+                        new List<int>() { 10, 30 }
+                    }
+                };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(ReplacesValuesAtPositionData))]
+    public void Replace_ReplacesValue_AtGivenPosition(string position, List<int> expected)
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var replaceStatus = listAdapter.TryReplace(targetObject, position, serializerOptions, 30, out var message);
+
+        // Assert
+        Assert.True(replaceStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Equal(expected, targetObject);
+    }
+
+    [Fact]
+    public void Test_DoesNotThrowException_IfTestIsSuccessful()
+    {
+        // Arrange
+        var serializerOptions = new JsonSerializerOptions();
+        serializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString;
+
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+
+        // Act
+        var testStatus = listAdapter.TryTest(targetObject, "0", serializerOptions, "10", out var message);
+
+        //Assert
+        Assert.True(testStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+    }
+
+    [Fact]
+    public void Test_ThrowsJsonPatchException_IfTestFails()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+        var expectedErrorMessage = "The current value '20' at position '1' is not equal to the test value '10'.";
+
+        // Act
+        var testStatus = listAdapter.TryTest(targetObject, "1", serializerOptions, 10, out var errorMessage);
+
+        //Assert
+        Assert.False(testStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    [Fact]
+    public void Test_ThrowsJsonPatchException_IfListPositionOutOfBounds()
+    {
+        // Arrange
+        var serializerOptions = JsonSerializerOptions.Default;
+        var targetObject = new List<int>() { 10, 20 };
+        var listAdapter = new ListAdapter();
+        var expectedErrorMessage = "The index value provided by path segment '2' is out of bounds of the array size.";
+
+        // Act
+        var testStatus = listAdapter.TryTest(targetObject, "2", serializerOptions, "10", out var errorMessage);
+
+        //Assert
+        Assert.False(testStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Internal/ObjectVisitorTest.cs b/src/Features/JsonPatch.SystemTextJson/test/Internal/ObjectVisitorTest.cs
new file mode 100644
index 000000000000..fca3d196a228
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Internal/ObjectVisitorTest.cs
@@ -0,0 +1,222 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Text.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+public class ObjectVisitorTest
+{
+    private class Class1
+    {
+        public string Name { get; set; }
+        public IList<string> States { get; set; } = new List<string>();
+        public IDictionary<string, string> CountriesAndRegions = new Dictionary<string, string>();
+        public dynamic Items { get; set; } = new ExpandoObject();
+    }
+
+    private class Class1Nested
+    {
+        public List<Class1> Customers { get; set; } = new List<Class1>();
+    }
+
+    public static IEnumerable<object[]> ReturnsListAdapterData
+    {
+        get
+        {
+            var model = new Class1();
+            yield return new object[] { model, "/States/-", model.States };
+            yield return new object[] { model.States, "/-", model.States };
+
+            var nestedModel = new Class1Nested();
+            nestedModel.Customers.Add(new Class1());
+            yield return new object[] { nestedModel, "/Customers/0/States/-", nestedModel.Customers[0].States };
+            yield return new object[] { nestedModel, "/Customers/0/States/0", nestedModel.Customers[0].States };
+            yield return new object[] { nestedModel.Customers, "/0/States/-", nestedModel.Customers[0].States };
+            yield return new object[] { nestedModel.Customers[0], "/States/-", nestedModel.Customers[0].States };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(ReturnsListAdapterData))]
+    public void Visit_ValidPathToArray_ReturnsListAdapter(object targetObject, string path, object expectedTargetObject)
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath(path), JsonSerializerOptions.Default);
+
+        // Act
+        var visitStatus = visitor.TryVisit(ref targetObject, out var adapter, out var message);
+
+        // Assert
+        Assert.True(visitStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Same(expectedTargetObject, targetObject);
+        Assert.IsType<ListAdapter>(adapter);
+    }
+
+    public static IEnumerable<object[]> ReturnsDictionaryAdapterData
+    {
+        get
+        {
+            var model = new Class1();
+            yield return new object[] { model, "/CountriesAndRegions/USA", model.CountriesAndRegions };
+            yield return new object[] { model.CountriesAndRegions, "/USA", model.CountriesAndRegions };
+
+            var nestedModel = new Class1Nested();
+            nestedModel.Customers.Add(new Class1());
+            yield return new object[] { nestedModel, "/Customers/0/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions };
+            yield return new object[] { nestedModel.Customers, "/0/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions };
+            yield return new object[] { nestedModel.Customers[0], "/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(ReturnsDictionaryAdapterData))]
+    public void Visit_ValidPathToDictionary_ReturnsDictionaryAdapter(object targetObject, string path, object expectedTargetObject)
+    {
+        // Arrange
+        var options = new JsonSerializerOptions(JsonSerializerOptions.Web) { IncludeFields = true };
+        var visitor = new ObjectVisitor(new ParsedPath(path), options);
+
+        // Act
+        var visitStatus = visitor.TryVisit(ref targetObject, out var adapter, out var message);
+
+        // Assert
+        Assert.True(visitStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Same(expectedTargetObject, targetObject);
+        Assert.Equal(typeof(DictionaryAdapter<string, string>), adapter.GetType());
+    }
+
+    public static IEnumerable<object[]> ReturnsExpandoAdapterData
+    {
+        get
+        {
+            var nestedModel = new Class1Nested();
+            nestedModel.Customers.Add(new Class1());
+            yield return new object[] { nestedModel, "/Customers/0/Items/Name", nestedModel.Customers[0].Items };
+            yield return new object[] { nestedModel.Customers, "/0/Items/Name", nestedModel.Customers[0].Items };
+            yield return new object[] { nestedModel.Customers[0], "/Items/Name", nestedModel.Customers[0].Items };
+        }
+    }
+
+    public static IEnumerable<object[]> ReturnsPocoAdapterData
+    {
+        get
+        {
+            var model = new Class1();
+            yield return new object[] { model, "/Name", model };
+
+            var nestedModel = new Class1Nested();
+            nestedModel.Customers.Add(new Class1());
+            yield return new object[] { nestedModel, "/Customers/0/Name", nestedModel.Customers[0] };
+            yield return new object[] { nestedModel.Customers, "/0/Name", nestedModel.Customers[0] };
+            yield return new object[] { nestedModel.Customers[0], "/Name", nestedModel.Customers[0] };
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(ReturnsPocoAdapterData))]
+    public void Visit_ValidPath_ReturnsExpandoAdapter(object targetObject, string path, object expectedTargetObject)
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath(path), JsonSerializerOptions.Default);
+
+        // Act
+        var visitStatus = visitor.TryVisit(ref targetObject, out var adapter, out var message);
+
+        // Assert
+        Assert.True(visitStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.Same(expectedTargetObject, targetObject);
+        Assert.IsType<PocoAdapter>(adapter);
+    }
+
+    [Theory]
+    [InlineData("0")]
+    [InlineData("-1")]
+    public void Visit_InvalidIndexToArray_Fails(string position)
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath($"/Customers/{position}/States/-"), JsonSerializerOptions.Default);
+        var automobileDepartment = new Class1Nested();
+        object targetObject = automobileDepartment;
+
+        // Act
+        var visitStatus = visitor.TryVisit(ref targetObject, out var adapter, out var message);
+
+        // Assert
+        Assert.False(visitStatus);
+        Assert.Equal($"The index value provided by path segment '{position}' is out of bounds of the array size.", message);
+    }
+
+    [Theory]
+    [InlineData("-")]
+    [InlineData("foo")]
+    public void Visit_InvalidIndexFormatToArray_Fails(string position)
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath($"/Customers/{position}/States/-"), JsonSerializerOptions.Default);
+        var automobileDepartment = new Class1Nested();
+        object targetObject = automobileDepartment;
+
+        // Act
+        var visitStatus = visitor.TryVisit(ref targetObject, out var adapter, out var message);
+
+        // Assert
+        Assert.False(visitStatus);
+        Assert.Equal($"The path segment '{position}' is invalid for an array index.", message);
+    }
+
+    [Fact]
+    public void Visit_DoesNotValidate_FinalPathSegment()
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath($"/NonExisting"), JsonSerializerOptions.Default);
+        var model = new Class1();
+        object targetObject = model;
+
+        // Act
+        var visitStatus = visitor.TryVisit(ref targetObject, out var adapter, out var message);
+
+        // Assert
+        Assert.True(visitStatus);
+        Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
+        Assert.IsType<PocoAdapter>(adapter);
+    }
+
+    [Fact]
+    public void Visit_NullInteriorTarget_ReturnsFalse()
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath("/States/0"), JsonSerializerOptions.Default);
+
+        // Act
+        object target = new Class1() { States = null, };
+        var visitStatus = visitor.TryVisit(ref target, out var adapter, out var message);
+
+        // Assert
+        Assert.False(visitStatus);
+        Assert.Null(adapter);
+        Assert.Null(message);
+    }
+
+    [Fact]
+    public void Visit_NullTarget_ReturnsNullAdapter()
+    {
+        // Arrange
+        var visitor = new ObjectVisitor(new ParsedPath("test"), JsonSerializerOptions.Default);
+
+        // Act
+        object target = null;
+        var visitStatus = visitor.TryVisit(ref target, out var adapter, out var message);
+
+        // Assert
+        Assert.False(visitStatus);
+        Assert.Null(adapter);
+        Assert.Null(message);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Internal/ParsedPathTests.cs b/src/Features/JsonPatch.SystemTextJson/test/Internal/ParsedPathTests.cs
new file mode 100644
index 000000000000..547d69ed704c
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Internal/ParsedPathTests.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+public class ParsedPathTests
+{
+    [Theory]
+    [InlineData("foo/bar~0baz", new string[] { "foo", "bar~baz" })]
+    [InlineData("foo/bar~00baz", new string[] { "foo", "bar~0baz" })]
+    [InlineData("foo/bar~01baz", new string[] { "foo", "bar~1baz" })]
+    [InlineData("foo/bar~10baz", new string[] { "foo", "bar/0baz" })]
+    [InlineData("foo/bar~1baz", new string[] { "foo", "bar/baz" })]
+    [InlineData("foo/bar~0/~0/~1~1/~0~0/baz", new string[] { "foo", "bar~", "~", "//", "~~", "baz" })]
+    [InlineData("~0~1foo", new string[] { "~/foo" })]
+    public void ParsingValidPathShouldSucceed(string path, string[] expected)
+    {
+        // Arrange & Act
+        var parsedPath = new ParsedPath(path);
+
+        // Assert
+        Assert.Equal(expected, parsedPath.Segments);
+    }
+
+    [Theory]
+    [InlineData("foo/bar~")]
+    [InlineData("~")]
+    [InlineData("~2")]
+    [InlineData("foo~3bar")]
+    public void PathWithInvalidEscapeSequenceShouldFail(string path)
+    {
+        // Arrange, Act & Assert
+        Assert.Throws<JsonPatchException>(() =>
+        {
+            var parsedPath = new ParsedPath(path);
+        });
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Internal/PocoAdapterTest.cs b/src/Features/JsonPatch.SystemTextJson/test/Internal/PocoAdapterTest.cs
new file mode 100644
index 000000000000..34195b4e75f9
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Internal/PocoAdapterTest.cs
@@ -0,0 +1,268 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+public class PocoAdapterTest
+{
+    [Fact]
+    public void TryAdd_ReplacesExistingProperty()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+
+        // Act
+        var addStatus = adapter.TryAdd(model, "Name", serializerOptions, "John", out var errorMessage);
+
+        // Assert
+        Assert.Equal("John", model.Name);
+        Assert.True(addStatus);
+        Assert.True(string.IsNullOrEmpty(errorMessage), "Expected no error message");
+    }
+
+    [Fact]
+    public void TryAdd_ThrowsJsonPatchException_IfPropertyDoesNotExist()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+        var expectedErrorMessage = "The target location specified by path segment 'LastName' was not found.";
+
+        // Act
+        var addStatus = adapter.TryAdd(model, "LastName", serializerOptions, "Smith", out var errorMessage);
+
+        // Assert
+        Assert.False(addStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    [Fact]
+    public void TryGet_ExistingProperty()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+
+        // Act
+        var getStatus = adapter.TryGet(model, "Name", serializerOptions, out var value, out var errorMessage);
+
+        // Assert
+        Assert.Equal("Joana", value);
+        Assert.True(getStatus);
+        Assert.True(string.IsNullOrEmpty(errorMessage), "Expected no error message");
+    }
+
+    [Fact]
+    public void TryGet_ThrowsJsonPatchException_IfPropertyDoesNotExist()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+        var expectedErrorMessage = "The target location specified by path segment 'LastName' was not found.";
+
+        // Act
+        var getStatus = adapter.TryGet(model, "LastName", serializerOptions, out var value, out var errorMessage);
+
+        // Assert
+        Assert.Null(value);
+        Assert.False(getStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    [Fact]
+    public void TryRemove_SetsPropertyToNull()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+
+        // Act
+        var removeStatus = adapter.TryRemove(model, "Name", serializerOptions, out var errorMessage);
+
+        // Assert
+        Assert.Null(model.Name);
+        Assert.True(removeStatus);
+        Assert.True(string.IsNullOrEmpty(errorMessage), "Expected no error message");
+    }
+
+    [Fact]
+    public void TryRemove_ThrowsJsonPatchException_IfPropertyDoesNotExist()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+        var expectedErrorMessage = "The target location specified by path segment 'LastName' was not found.";
+
+        // Act
+        var removeStatus = adapter.TryRemove(model, "LastName", serializerOptions, out var errorMessage);
+
+        // Assert
+        Assert.False(removeStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    [Fact]
+    public void TryReplace_OverwritesExistingValue()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+
+        // Act
+        var replaceStatus = adapter.TryReplace(model, "Name", serializerOptions, "John", out var errorMessage);
+
+        // Assert
+        Assert.Equal("John", model.Name);
+        Assert.True(replaceStatus);
+        Assert.True(string.IsNullOrEmpty(errorMessage), "Expected no error message");
+    }
+
+    [Fact]
+    public void TryReplace_ThrowsJsonPatchException_IfNewValueIsInvalidType()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Age = 25
+        };
+
+        var expectedErrorMessage = "The value 'TwentySix' is invalid for target location.";
+
+        // Act
+        var replaceStatus = adapter.TryReplace(model, "Age", serializerOptions, "TwentySix", out var errorMessage);
+
+        // Assert
+        Assert.Equal(25, model.Age);
+        Assert.False(replaceStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    [Fact]
+    public void TryReplace_ThrowsJsonPatchException_IfPropertyDoesNotExist()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+        var expectedErrorMessage = "The target location specified by path segment 'LastName' was not found.";
+
+        // Act
+        var replaceStatus = adapter.TryReplace(model, "LastName", serializerOptions, "Smith", out var errorMessage);
+
+        // Assert
+        Assert.Equal("Joana", model.Name);
+        Assert.False(replaceStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    [Fact]
+    public void TryReplace_UsesCustomConverter()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var contractResolver = new RectangleContractResolver();
+        var serializerOptions = new JsonSerializerOptions();
+        serializerOptions.Converters.Add(new RectangleJsonConverter());
+        serializerOptions.TypeInfoResolver = new DefaultJsonTypeInfoResolver();
+
+        var model = new Square()
+        {
+            Rectangle = new Rectangle()
+            {
+                RectangleProperty = "Square"
+            }
+        };
+
+        // Act
+        var replaceStatus = adapter.TryReplace(model, "Rectangle", serializerOptions, "Oval", out var errorMessage);
+
+        // Assert
+        Assert.True(replaceStatus);
+        Assert.Equal("Oval", model.Rectangle.RectangleProperty);
+        Assert.Null(errorMessage);
+    }
+
+    [Fact]
+    public void TryTest_DoesNotThrowException_IfTestSuccessful()
+    {
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+
+        // Act
+        var testStatus = adapter.TryTest(model, "Name", serializerOptions, "Joana", out var errorMessage);
+
+        // Assert
+        Assert.Equal("Joana", model.Name);
+        Assert.True(testStatus);
+        Assert.True(string.IsNullOrEmpty(errorMessage), "Expected no error message");
+    }
+
+    [Fact]
+    public void TryTest_ThrowsJsonPatchException_IfTestFails()
+    {
+        // Arrange
+        var adapter = new PocoAdapter();
+        var serializerOptions = JsonSerializerOptions.Default;
+        var model = new Customer
+        {
+            Name = "Joana"
+        };
+        var expectedErrorMessage = "The current value 'Joana' at path 'Name' is not equal to the test value 'John'.";
+
+        // Act
+        var testStatus = adapter.TryTest(model, "Name", serializerOptions, "John", out var errorMessage);
+
+        // Assert
+        Assert.False(testStatus);
+        Assert.Equal(expectedErrorMessage, errorMessage);
+    }
+
+    private class Customer
+    {
+        public string Name { get; set; }
+
+        public int Age { get; set; }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentGetPathTest.cs b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentGetPathTest.cs
new file mode 100644
index 000000000000..167ad59a7e3a
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentGetPathTest.cs
@@ -0,0 +1,121 @@
+// 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.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class JsonPatchDocumentGetPathTest
+{
+    [Fact]
+    public void ExpressionType_MemberAccess()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<SimpleObjectWithNestedObject>();
+
+        // Act
+        var path = patchDocument.GetPath(p => p.SimpleObject.IntegerList, "-");
+
+        // Assert
+        Assert.Equal("/SimpleObject/IntegerList/-", path);
+    }
+
+    [Fact]
+    public void ExpressionType_ArrayIndex()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<int[]>();
+
+        // Act
+        var path = patchDocument.GetPath(p => p[3], null);
+
+        // Assert
+        Assert.Equal("/3", path);
+    }
+
+    [Fact]
+    public void ExpressionType_Call()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<Dictionary<string, int>>();
+
+        // Act
+        var path = patchDocument.GetPath(p => p["key"], "3");
+
+        // Assert
+        Assert.Equal("/key/3", path);
+    }
+
+    [Fact]
+    public void ExpressionType_Parameter_NullPosition()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<SimpleObject>();
+
+        // Act
+        var path = patchDocument.GetPath(p => p, null);
+
+        // Assert
+        Assert.Equal("/", path);
+    }
+
+    [Fact]
+    public void ExpressionType_Parameter_WithPosition()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<SimpleObject>();
+
+        // Act
+        var path = patchDocument.GetPath(p => p, "-");
+
+        // Assert
+        Assert.Equal("/-", path);
+    }
+
+    [Fact]
+    public void ExpressionType_Convert()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<NestedObjectWithDerivedClass>();
+
+        // Act
+        var path = patchDocument.GetPath(p => (BaseClass)p.DerivedObject, null);
+
+        // Assert
+        Assert.Equal("/DerivedObject", path);
+    }
+
+    [Fact]
+    public void ExpressionType_NotSupported()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<SimpleObject>();
+
+        // Act
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+        {
+            patchDocument.GetPath(p => p.IntegerValue >= 4, null);
+        });
+
+        // Assert
+        Assert.Equal("The expression '(p.IntegerValue >= 4)' is not supported. Supported expressions include member access and indexer expressions.", exception.Message);
+    }
+}
+
+internal class DerivedClass : BaseClass
+{
+    public DerivedClass()
+    {
+    }
+}
+
+internal class NestedObjectWithDerivedClass
+{
+    public DerivedClass DerivedObject { get; set; }
+}
+
+internal class BaseClass
+{
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentJObjectTest.cs b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentJObjectTest.cs
new file mode 100644
index 000000000000..2aa62546b5da
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentJObjectTest.cs
@@ -0,0 +1,174 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class JsonPatchDocumentJObjectTest
+{
+    [Fact]
+    public void ApplyTo_Array_Add()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = (JsonObject)JsonSerializer.SerializeToNode(new { Emails = new[] { "foo@bar.com" } }) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("add", "/CustomData/Emails/-", null, "foo@baz.com"));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Equal("foo@baz.com", model.CustomData["Emails"][1].GetValue<string>());
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Test1()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = (JsonObject)JsonSerializer.SerializeToNode(new { Email = "foo@bar.com", Name = "Bar" }) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("test", "/CustomData/Email", null, "foo@baz.com"));
+        patch.Operations.Add(new Operation<ObjectWithJObject>("add", "/CustomData/Name", null, "Bar Baz"));
+
+        // Act & Assert
+        Assert.Throws<JsonPatchException>(() => patch.ApplyTo(model));
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Test2()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = new JsonObject([new("Email", "foo@bar.com"), new("Name", "Bar")]) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("test", "/CustomData/Email", null, "foo@bar.com"));
+        patch.Operations.Add(new Operation<ObjectWithJObject>("add", "/CustomData/Name", null, "Bar Baz"));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Equal("Bar Baz", model.CustomData["Name"].GetValue<string>());
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Copy()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = new JsonObject([new("Email", "foo@bar.com")]) };
+
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+        patch.Operations.Add(new Operation<ObjectWithJObject>("copy", "/CustomData/UserName", "/CustomData/Email"));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Equal("foo@bar.com", model.CustomData["UserName"].GetValue<string>());
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Remove()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = new JsonObject([new("FirstName", "Bar"), new("LastName", "Bar")]) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("remove", "/CustomData/LastName", null));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.False(model.CustomData.ContainsKey("LastName"));
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Move()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = new JsonObject([new("FirstName", "Bar")]) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("move", "/CustomData/LastName", "/CustomData/FirstName"));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.False(model.CustomData.ContainsKey("FirstName"));
+        Assert.Equal("Bar", model.CustomData["LastName"].GetValue<string>());
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Add()
+    {
+        // Arrange
+        var model = new ObjectWithJObject();
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("add", "/CustomData/Name", null, "Foo"));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Equal("Foo", model.CustomData["Name"].GetValue<string>());
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Add_Null()
+    {
+        // Arrange
+        var model = new ObjectWithJObject();
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("add", "/CustomData/Name", null, null));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Contains("Name", model.CustomData);
+        Assert.Null(model.CustomData["Name"]);
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Replace()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = new JsonObject([new("Email", "foo@bar.com"), new("Name", "Bar")]) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("replace", "/CustomData/Email", null, "foo@baz.com"));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Equal("foo@baz.com", model.CustomData["Email"].GetValue<string>());
+    }
+
+    [Fact]
+    public void ApplyTo_Model_Replace_Null()
+    {
+        // Arrange
+        var model = new ObjectWithJObject { CustomData = new JsonObject([new("Email", "foo@bar.com"), new("Name", "Bar")]) };
+        var patch = new JsonPatchDocument<ObjectWithJObject>();
+
+        patch.Operations.Add(new Operation<ObjectWithJObject>("replace", "/CustomData/Email", null, null));
+
+        // Act
+        patch.ApplyTo(model);
+
+        // Assert
+        Assert.Null(model.CustomData["Email"]);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentJsonPropertyAttributeTest.cs b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentJsonPropertyAttributeTest.cs
new file mode 100644
index 000000000000..9175ffe1e97a
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentJsonPropertyAttributeTest.cs
@@ -0,0 +1,84 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Text.Json.Serialization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class JsonPatchDocumentJsonPropertyAttributeTest
+{
+    [Fact]
+    public void Add_RespectsJsonPropertyAttribute()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<JsonPropertyObject>();
+
+        // Act
+        patchDocument.Add(p => p.Name, "John");
+
+        // Assert
+        var pathToCheck = patchDocument.Operations.First().path;
+        Assert.Equal("/AnotherName", pathToCheck);
+    }
+
+    [Fact]
+    public void Add_RespectsJsonPropertyAttribute_WithDotWhitespaceAndBackslashInName()
+    {
+        // Arrange
+        var obj = new JsonPropertyObjectWithStrangeNames();
+        var patchDocument = new JsonPatchDocument();
+
+        // Act
+        patchDocument.Add("/First Name.", "John");
+        patchDocument.Add("Last\\Name", "Doe");
+        patchDocument.ApplyTo(obj);
+
+        // Assert
+        Assert.Equal("John", obj.FirstName);
+        Assert.Equal("Doe", obj.LastName);
+    }
+
+    [Fact]
+    public void Move_FallsbackToPropertyName_WhenJsonPropertyAttributeName_IsEmpty()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument<JsonPropertyWithNoPropertyName>();
+
+        // Act
+        patchDocument.Move(m => m.StringProperty, m => m.StringProperty2);
+
+        // Assert
+        var fromPath = patchDocument.Operations.First().from;
+        Assert.Equal("/StringProperty", fromPath);
+        var toPath = patchDocument.Operations.First().path;
+        Assert.Equal("/StringProperty2", toPath);
+    }
+
+    private class JsonPropertyObject
+    {
+        [JsonPropertyName("AnotherName")]
+        public string Name { get; set; }
+    }
+
+    private class JsonPropertyObjectWithStrangeNames
+    {
+        [JsonPropertyName("First Name.")]
+        public string FirstName { get; set; }
+
+        [JsonPropertyName("Last\\Name")]
+        public string LastName { get; set; }
+    }
+
+    private class JsonPropertyWithNoPropertyName
+    {
+        public string StringProperty { get; set; }
+
+        public string[] ArrayProperty { get; set; }
+
+        public string StringProperty2 { get; set; }
+
+        public string SSN { get; set; }
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentTest.cs b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentTest.cs
new file mode 100644
index 000000000000..9e7c6073e036
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/JsonPatchDocumentTest.cs
@@ -0,0 +1,258 @@
+// 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.Collections.Generic;
+using System.Text.Json;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Converters;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Exceptions;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class JsonPatchDocumentTest
+{
+    [Fact]
+    public void InvalidPathAtBeginningShouldThrowException()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument();
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.Add("//NewInt", 1);
+        });
+
+        // Assert
+        Assert.Equal(
+           "The provided string '//NewInt' is an invalid path.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void InvalidPathAtEndShouldThrowException()
+    {
+        // Arrange
+        var patchDocument = new JsonPatchDocument();
+
+        // Act
+        var exception = Assert.Throws<JsonPatchException>(() =>
+        {
+            patchDocument.Add("NewInt//", 1);
+        });
+
+        // Assert
+        Assert.Equal(
+           "The provided string 'NewInt//' is an invalid path.",
+            exception.Message);
+    }
+
+    [Fact]
+    public void NonGenericPatchDocToGenericMustSerialize()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocument = new JsonPatchDocument();
+        patchDocument.Copy("StringProperty", "AnotherStringProperty");
+
+        var serialized = JsonSerializer.Serialize(patchDocument);
+        var deserialized = JsonSerializer.Deserialize<JsonPatchDocument<SimpleObject>>(serialized);
+
+        // Act
+        deserialized.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("A", targetObject.AnotherStringProperty);
+    }
+
+    public class Employee
+    {
+        public int EmployeeId { get; set; }
+        public string Name { get; set; }
+    }
+
+    public class SalariedEmployee : Employee
+    {
+        public decimal AnnualSalary { get; set; }
+    }
+
+    public class Organization
+    {
+        public List<Employee> Employees { get; } = new();
+    }
+
+    [Fact]
+    public void ListWithGenericTypeWorkForSpecificChildren()
+    {
+        //Arrange
+        var org = new Organization();
+        // Populate Employees with two employees
+        org.Employees.Add(new SalariedEmployee { EmployeeId = 2, Name = "Jane", AnnualSalary = 50000 });
+        org.Employees.Add(new Employee { EmployeeId = 1, Name = "John" });
+
+        var doc = new JsonPatchDocument<Organization>();
+        doc.Operations.Add(new Operations.Operation<Organization>("add", "/Employees/0/AnnualSalary", "", 100));
+
+        // Act
+        doc.ApplyTo(org);
+
+        // Assert
+        Assert.Equal(100, (org.Employees[0] as SalariedEmployee).AnnualSalary);
+    }
+
+    [Fact]
+    public void GenericPatchDocToNonGenericMustSerialize()
+    {
+        // Arrange
+        var targetObject = new SimpleObject()
+        {
+            StringProperty = "A",
+            AnotherStringProperty = "B"
+        };
+
+        var patchDocTyped = new JsonPatchDocument<SimpleObject>();
+        patchDocTyped.Copy(o => o.StringProperty, o => o.AnotherStringProperty);
+
+        var patchDocUntyped = new JsonPatchDocument();
+        patchDocUntyped.Copy("StringProperty", "AnotherStringProperty");
+
+        var serializedTyped = JsonSerializer.Serialize(patchDocTyped);
+        var serializedUntyped = JsonSerializer.Serialize(patchDocUntyped);
+        var deserialized = JsonSerializer.Deserialize<JsonPatchDocument>(serializedTyped);
+
+        // Act
+        deserialized.ApplyTo(targetObject);
+
+        // Assert
+        Assert.Equal("A", targetObject.AnotherStringProperty);
+    }
+
+    [Fact]
+    public void Deserialization_Successful_ForValidJsonPatchDocument()
+    {
+        // Arrange
+        var doc = new SimpleObject()
+        {
+            StringProperty = "A",
+            DecimalValue = 10,
+            DoubleValue = 10,
+            FloatValue = 10,
+            IntegerValue = 10
+        };
+
+        var patchDocument = new JsonPatchDocument<SimpleObject>();
+        patchDocument.Replace(o => o.StringProperty, "B");
+        patchDocument.Replace(o => o.DecimalValue, 12);
+        patchDocument.Replace(o => o.DoubleValue, 12);
+        patchDocument.Replace(o => o.FloatValue, 12);
+        patchDocument.Replace(o => o.IntegerValue, 12);
+
+        // default: no envelope
+        var serialized = JsonSerializer.Serialize(patchDocument);
+
+        // Act
+        var deserialized = JsonSerializer.Deserialize<JsonPatchDocument<SimpleObject>>(serialized);
+
+        // Assert
+        Assert.IsType<JsonPatchDocument<SimpleObject>>(deserialized);
+    }
+
+    [Fact]
+    public void Deserialization_Fails_ForInvalidJsonPatchDocument()
+    {
+        // Arrange
+        var serialized = "{\"Operations\": [{ \"op\": \"replace\", \"path\": \"/title\", \"value\": \"New Title\"}]}";
+
+        // Act
+        var exception = Assert.Throws<JsonException>(() =>
+        {
+            var deserialized
+                = JsonSerializer.Deserialize<JsonPatchDocument>(serialized);
+        });
+
+        // Assert
+        Assert.Equal("The JSON patch document was malformed and could not be parsed.", exception.Message);
+    }
+
+    [Fact]
+    public void Deserialization_Fails_ForInvalidTypedJsonPatchDocument()
+    {
+        // Arrange
+        var serialized = "{\"Operations\": [{ \"op\": \"replace\", \"path\": \"/title\", \"value\": \"New Title\"}]}";
+
+        // Act
+        var exception = Assert.Throws<JsonException>(() =>
+        {
+            var options = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+            options.Converters.Add(new JsonConverterForJsonPatchDocumentOfT<SimpleObject>());
+            var deserialized
+                = JsonSerializer.Deserialize<JsonPatchDocument<SimpleObject>>(serialized, options);
+        });
+
+        // Assert
+        Assert.Equal("The JSON patch document was malformed and could not be parsed.", exception.Message);
+    }
+
+    [Fact]
+    public void Deserialization_RespectsNamingPolicy()
+    {
+        // Arrange
+        var childToAdd = new SimpleObject
+        {
+            GuidValue = Guid.NewGuid(),
+            StringProperty = "some test data"
+        };
+
+        var options = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+        options.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+        options.DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingDefault;
+
+        var json = GeneratePatchDocumentJson(childToAdd, options);
+
+        var getTestObject = () => new SimpleObject() { SimpleObjectList = new() };
+
+        //Act
+        var docSuccess = DeserializePatchDocumentWithNamingPolicy(json, JsonNamingPolicy.CamelCase);
+        var docFail = DeserializePatchDocumentWithNamingPolicy(json, JsonNamingPolicy.KebabCaseLower);
+
+        // Assert
+
+        // The following call should succeed
+        docSuccess.ApplyTo(getTestObject());
+
+        // The following call should fail
+        Assert.Throws<JsonPatchException>(() =>
+        {
+            docFail.ApplyTo(getTestObject());
+        });
+    }
+
+    private static JsonPatchDocument<SimpleObject> DeserializePatchDocumentWithNamingPolicy(string json, JsonNamingPolicy policy)
+    {
+        var compatibleSerializerOption = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+        compatibleSerializerOption.PropertyNamingPolicy = policy;
+        var docSuccess = JsonSerializer.Deserialize<JsonPatchDocument<SimpleObject>>(json, compatibleSerializerOption);
+        return docSuccess;
+    }
+
+    private string GeneratePatchDocumentJson(SimpleObject toAdd, JsonSerializerOptions jsonSerializerOptions)
+    {
+        var document = new JsonPatchDocument<SimpleObject>();
+        var operation = new Operation<SimpleObject>
+        {
+            op = "add",
+            path = "/simpleObjectList/-",
+            value = toAdd
+        };
+        document.Operations.Add(operation);
+
+        return JsonSerializer.Serialize<JsonPatchDocument<SimpleObject>>(document, jsonSerializerOptions);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj b/src/Features/JsonPatch.SystemTextJson/test/Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj
new file mode 100644
index 000000000000..3addcd38dec1
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/Microsoft.AspNetCore.JsonPatch.SystemTextJson.Tests.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Features/JsonPatch.SystemTextJson/test/OperationBaseTests.cs b/src/Features/JsonPatch.SystemTextJson/test/OperationBaseTests.cs
new file mode 100644
index 000000000000..aabb27c1cb57
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/OperationBaseTests.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Operations;
+
+public class OperationBaseTests
+{
+    [Theory]
+    [InlineData("ADd", OperationType.Add)]
+    [InlineData("Copy", OperationType.Copy)]
+    [InlineData("mOVE", OperationType.Move)]
+    [InlineData("REMOVE", OperationType.Remove)]
+    [InlineData("replace", OperationType.Replace)]
+    [InlineData("TeSt", OperationType.Test)]
+    public void SetValidOperationType(string op, OperationType operationType)
+    {
+        // Arrange
+        var operationBase = new OperationBase();
+        operationBase.op = op;
+
+        // Act & Assert
+        Assert.Equal(operationType, operationBase.OperationType);
+    }
+
+    [Theory]
+    [InlineData("invalid", OperationType.Invalid)]
+    [InlineData("coppy", OperationType.Invalid)]
+    [InlineData("notvalid", OperationType.Invalid)]
+    public void InvalidOperationType_SetsOperationTypeInvalid(string op, OperationType operationType)
+    {
+        // Arrange
+        var operationBase = new OperationBase();
+        operationBase.op = op;
+
+        // Act & Assert
+        Assert.Equal(operationType, operationBase.OperationType);
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestErrorLogger.cs b/src/Features/JsonPatch.SystemTextJson/test/TestErrorLogger.cs
new file mode 100644
index 000000000000..a99e4582a97c
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestErrorLogger.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class TestErrorLogger<T> where T : class
+{
+    public string ErrorMessage { get; set; }
+
+    public void LogErrorMessage(JsonPatchError patchError)
+    {
+        ErrorMessage = patchError.ErrorMessage;
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/Customer.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/Customer.cs
new file mode 100644
index 000000000000..a5c60fe88248
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/Customer.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+internal class Customer
+{
+    private string _name;
+    private int _age;
+
+    public Customer(string name, int age)
+    {
+        _name = name;
+        _age = age;
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/DynamicTestObject.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/DynamicTestObject.cs
new file mode 100644
index 000000000000..e0382a6ed15e
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/DynamicTestObject.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Dynamic;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class DynamicTestObject : DynamicObject
+{
+    private Dictionary<string, object> _dictionary = new Dictionary<string, object>();
+
+    public object this[string key] { get => ((IDictionary<string, object>)_dictionary)[key]; set => ((IDictionary<string, object>)_dictionary)[key] = value; }
+
+    public ICollection<string> Keys => ((IDictionary<string, object>)_dictionary).Keys;
+
+    public ICollection<object> Values => ((IDictionary<string, object>)_dictionary).Values;
+
+    public int Count => ((IDictionary<string, object>)_dictionary).Count;
+
+    public bool IsReadOnly => ((IDictionary<string, object>)_dictionary).IsReadOnly;
+
+    public void Add(string key, object value)
+    {
+        ((IDictionary<string, object>)_dictionary).Add(key, value);
+    }
+
+    public void Add(KeyValuePair<string, object> item)
+    {
+        ((IDictionary<string, object>)_dictionary).Add(item);
+    }
+
+    public void Clear()
+    {
+        ((IDictionary<string, object>)_dictionary).Clear();
+    }
+
+    public bool Contains(KeyValuePair<string, object> item)
+    {
+        return ((IDictionary<string, object>)_dictionary).Contains(item);
+    }
+
+    public bool ContainsKey(string key)
+    {
+        return ((IDictionary<string, object>)_dictionary).ContainsKey(key);
+    }
+
+    public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+    {
+        ((IDictionary<string, object>)_dictionary).CopyTo(array, arrayIndex);
+    }
+
+    public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+    {
+        return ((IDictionary<string, object>)_dictionary).GetEnumerator();
+    }
+
+    public bool Remove(string key)
+    {
+        return ((IDictionary<string, object>)_dictionary).Remove(key);
+    }
+
+    public bool Remove(KeyValuePair<string, object> item)
+    {
+        return ((IDictionary<string, object>)_dictionary).Remove(item);
+    }
+
+    public bool TryGetValue(string key, out object value)
+    {
+        return ((IDictionary<string, object>)_dictionary).TryGetValue(key, out value);
+    }
+
+    public override bool TryGetMember(GetMemberBinder binder, out object result)
+    {
+        var name = binder.Name;
+
+        return TryGetValue(name, out result);
+    }
+
+    public override bool TrySetMember(SetMemberBinder binder, object value)
+    {
+        _dictionary[binder.Name] = value;
+
+        return true;
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/HeterogenousCollection.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/HeterogenousCollection.cs
new file mode 100644
index 000000000000..3a70519ff04c
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/HeterogenousCollection.cs
@@ -0,0 +1,125 @@
+// 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.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public abstract class Shape
+{
+    public string ShapeProperty { get; set; }
+}
+
+public class Circle : Shape
+{
+    public string CircleProperty { get; set; }
+}
+
+public class Rectangle : Shape
+{
+    public string RectangleProperty { get; set; }
+}
+
+public class Square : Shape
+{
+    public Rectangle Rectangle { get; set; }
+}
+
+public class Canvas
+{
+    public IList<Shape> Items { get; set; }
+}
+
+public class RectangleContractResolver : DefaultJsonTypeInfoResolver
+{
+    public override JsonTypeInfo GetTypeInfo(Type type, JsonSerializerOptions options)
+    {
+        if (type == typeof(Rectangle))
+        {
+            JsonTypeInfo<Rectangle> jsonTypeInfo = (JsonTypeInfo<Rectangle>)base.GetTypeInfo(type, options);
+            jsonTypeInfo.CreateObject = () => new Rectangle();
+
+            var stringComparison = options.PropertyNameCaseInsensitive ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+            foreach (var property in jsonTypeInfo.Properties)
+            {
+                if (nameof(Rectangle.ShapeProperty).Equals(property.Name, stringComparison))
+                {
+                    property.Get = (obj) => ((Rectangle)obj).ShapeProperty;
+                    property.Set = (obj, value) => ((Rectangle)obj).ShapeProperty = (string)value;
+                }
+                else if (nameof(Rectangle.RectangleProperty).Equals(property.Name, stringComparison))
+                {
+                    property.Get = (obj) => ((Rectangle)obj).RectangleProperty;
+                    property.Set = (obj, value) => ((Rectangle)obj).RectangleProperty = (string)value;
+                }
+            }
+
+            return jsonTypeInfo;
+        }
+
+        return base.GetTypeInfo(type, options);
+    }
+}
+
+public class RectangleJsonConverter : JsonConverter<Rectangle>
+{
+    public override Rectangle Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.String)
+        {
+            return new Rectangle { RectangleProperty = reader.GetString() };
+        }
+
+        if (reader.TokenType != JsonTokenType.StartObject)
+        {
+            throw new JsonException();
+        }
+
+        var rectangle = new Rectangle();
+
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.EndObject)
+            {
+                return rectangle;
+            }
+
+            if (reader.TokenType != JsonTokenType.PropertyName)
+            {
+                throw new JsonException();
+            }
+
+            string propertyName = reader.GetString();
+
+            reader.Read();
+
+            switch (propertyName)
+            {
+                case nameof(Rectangle.ShapeProperty):
+                    rectangle.ShapeProperty = reader.GetString();
+                    break;
+                case nameof(Rectangle.RectangleProperty):
+                    rectangle.RectangleProperty = reader.GetString();
+                    break;
+                default:
+                    throw new JsonException();
+            }
+        }
+
+        return rectangle;
+    }
+
+    public override void Write(Utf8JsonWriter writer, Rectangle value, JsonSerializerOptions options)
+    {
+        writer.WriteStartObject();
+
+        writer.WriteString(nameof(Rectangle.ShapeProperty), value.ShapeProperty);
+        writer.WriteString(nameof(Rectangle.RectangleProperty), value.RectangleProperty);
+
+        writer.WriteEndObject();
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/InheritedObject.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/InheritedObject.cs
new file mode 100644
index 000000000000..2516d7138445
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/InheritedObject.cs
@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class InheritedObject : SimpleObject
+{
+    public string AdditionalStringProperty { get; set; }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/NestedObject.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/NestedObject.cs
new file mode 100644
index 000000000000..e2bd24203369
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/NestedObject.cs
@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class NestedObject
+{
+    public string StringProperty { get; set; }
+    public dynamic DynamicProperty { get; set; }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/ObjectWithJObject.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/ObjectWithJObject.cs
new file mode 100644
index 000000000000..48c290903a53
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/ObjectWithJObject.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class ObjectWithJObject
+{
+    public JsonObject CustomData { get; set; } = new JsonObject();
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/SimpleObject.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/SimpleObject.cs
new file mode 100644
index 000000000000..020ebe8699b7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/SimpleObject.cs
@@ -0,0 +1,22 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class SimpleObject
+{
+    public List<SimpleObject> SimpleObjectList { get; set; }
+    public List<int> IntegerList { get; set; }
+    public IList<int> IntegerIList { get; set; }
+    public int IntegerValue { get; set; }
+    public int AnotherIntegerValue { get; set; }
+    public string StringProperty { get; set; }
+    public string AnotherStringProperty { get; set; }
+    public decimal DecimalValue { get; set; }
+    public double DoubleValue { get; set; }
+    public float FloatValue { get; set; }
+    public Guid GuidValue { get; set; }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/SimpleObjectWithNestedObject.cs b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/SimpleObjectWithNestedObject.cs
new file mode 100644
index 000000000000..59123e7bcedc
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/TestObjectModels/SimpleObjectWithNestedObject.cs
@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public class SimpleObjectWithNestedObject
+{
+    public int IntegerValue { get; set; }
+
+    public NestedObject NestedObject { get; set; }
+
+    public SimpleObject SimpleObject { get; set; }
+
+    public InheritedObject InheritedObject { get; set; }
+
+    public List<SimpleObject> SimpleObjectList { get; set; }
+
+    public IList<SimpleObject> SimpleObjectIList { get; set; }
+
+    public SimpleObjectWithNestedObject()
+    {
+        NestedObject = new NestedObject();
+        SimpleObject = new SimpleObject();
+        InheritedObject = new InheritedObject();
+        SimpleObjectList = new List<SimpleObject>();
+    }
+}
diff --git a/src/Features/JsonPatch.SystemTextJson/test/WriteOnceDynamicTestObject.cs b/src/Features/JsonPatch.SystemTextJson/test/WriteOnceDynamicTestObject.cs
new file mode 100644
index 000000000000..52cf38a17bb7
--- /dev/null
+++ b/src/Features/JsonPatch.SystemTextJson/test/WriteOnceDynamicTestObject.cs
@@ -0,0 +1,116 @@
+// 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.Collections.Generic;
+using System.Dynamic;
+
+namespace Microsoft.AspNetCore.JsonPatch.SystemTextJson.Internal;
+
+/// <remarks>
+/// <para>
+/// This class is used specifically to test that JSON patch "replace" operations are functionally equivalent to
+/// "add" and "remove" operations applied sequentially using the same path.
+/// </para>
+/// <para>
+/// This is done by asserting that no value exists for a particular key before setting its value. To replace the
+/// value for a key, the key must first be removed, and then re-added with the new value.
+/// </para>
+/// <para>
+/// See https://github.com/dotnet/aspnetcore/issues/3623 for further details.
+/// </para>
+/// </remarks>
+public class WriteOnceDynamicTestObject : DynamicObject
+{
+    private Dictionary<string, object> _dictionary = new Dictionary<string, object>();
+
+    public object this[string key] { get => ((IDictionary<string, object>)_dictionary)[key]; set => SetValueForKey(key, value); }
+
+    public ICollection<string> Keys => ((IDictionary<string, object>)_dictionary).Keys;
+
+    public ICollection<object> Values => ((IDictionary<string, object>)_dictionary).Values;
+
+    public int Count => ((IDictionary<string, object>)_dictionary).Count;
+
+    public bool IsReadOnly => ((IDictionary<string, object>)_dictionary).IsReadOnly;
+
+    public void Add(string key, object value)
+    {
+        SetValueForKey(key, value);
+    }
+
+    public void Add(KeyValuePair<string, object> item)
+    {
+        SetValueForKey(item.Key, item.Value);
+    }
+
+    public void Clear()
+    {
+        ((IDictionary<string, object>)_dictionary).Clear();
+    }
+
+    public bool Contains(KeyValuePair<string, object> item)
+    {
+        return ((IDictionary<string, object>)_dictionary).Contains(item);
+    }
+
+    public bool ContainsKey(string key)
+    {
+        return ((IDictionary<string, object>)_dictionary).ContainsKey(key);
+    }
+
+    public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+    {
+        ((IDictionary<string, object>)_dictionary).CopyTo(array, arrayIndex);
+    }
+
+    public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+    {
+        return ((IDictionary<string, object>)_dictionary).GetEnumerator();
+    }
+
+    public bool Remove(string key)
+    {
+        return ((IDictionary<string, object>)_dictionary).Remove(key);
+    }
+
+    public bool Remove(KeyValuePair<string, object> item)
+    {
+        return ((IDictionary<string, object>)_dictionary).Remove(item);
+    }
+
+    public bool TryGetValue(string key, out object value)
+    {
+        return ((IDictionary<string, object>)_dictionary).TryGetValue(key, out value);
+    }
+
+    public override bool TryGetMember(GetMemberBinder binder, out object result)
+    {
+        var name = binder.Name;
+
+        return TryGetValue(name, out result);
+    }
+
+    public override bool TrySetMember(SetMemberBinder binder, object value)
+    {
+        SetValueForKey(binder.Name, value);
+
+        return true;
+    }
+
+    private void SetValueForKey(string key, object value)
+    {
+        if (value == null)
+        {
+            _dictionary.Remove(key);
+            return;
+        }
+
+        if (_dictionary.ContainsKey(key))
+        {
+            throw new ArgumentException($"Value for {key} already exists");
+        }
+
+        _dictionary[key] = value;
+    }
+}
diff --git a/src/Features/JsonPatch/JsonPatch.slnf b/src/Features/JsonPatch/JsonPatch.slnf
index 09af04d0d669..e14407f2c0b3 100644
--- a/src/Features/JsonPatch/JsonPatch.slnf
+++ b/src/Features/JsonPatch/JsonPatch.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Features\\JsonPatch\\src\\Microsoft.AspNetCore.JsonPatch.csproj",
       "src\\Features\\JsonPatch\\test\\Microsoft.AspNetCore.JsonPatch.Tests.csproj"
diff --git a/src/Features/JsonPatch/build.cmd b/src/Features/JsonPatch/build.cmd
index 5274e00264f0..a71232783bb2 100644
--- a/src/Features/JsonPatch/build.cmd
+++ b/src/Features/JsonPatch/build.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-SET RepoRoot=%~dp0..\..
+SET RepoRoot=%~dp0..\..\..
 %RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj %*
diff --git a/src/Features/JsonPatch/src/CompatibilitySuppressions.xml b/src/Features/JsonPatch/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/Features/JsonPatch/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Features/JsonPatch/src/JsonPatchDocument.cs b/src/Features/JsonPatch/src/JsonPatchDocument.cs
index 5b9152ccdb12..e3f79c455806 100644
--- a/src/Features/JsonPatch/src/JsonPatchDocument.cs
+++ b/src/Features/JsonPatch/src/JsonPatchDocument.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Microsoft.AspNetCore.JsonPatch.Adapters;
 using Microsoft.AspNetCore.JsonPatch.Converters;
 using Microsoft.AspNetCore.JsonPatch.Exceptions;
@@ -12,13 +13,22 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
+#if NET
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
+#endif
+
 namespace Microsoft.AspNetCore.JsonPatch;
 
 // Implementation details: the purpose of this type of patch document is to allow creation of such
 // documents for cases where there's no class/DTO to work on. Typical use case: backend not built in
 // .NET or architecture doesn't contain a shared DTO layer.
 [JsonConverter(typeof(JsonPatchDocumentConverter))]
+#if NET
+public class JsonPatchDocument : IJsonPatchDocument, IEndpointParameterMetadataProvider
+#else
 public class JsonPatchDocument : IJsonPatchDocument
+#endif
 {
     public List<Operation> Operations { get; private set; }
 
@@ -27,7 +37,7 @@ public class JsonPatchDocument : IJsonPatchDocument
 
     public JsonPatchDocument()
     {
-        Operations = new List<Operation>();
+        Operations = [];
         ContractResolver = new DefaultContractResolver();
     }
 
@@ -205,12 +215,13 @@ IList<Operation> IJsonPatchDocument.GetOperations()
         {
             foreach (var op in Operations)
             {
-                var untypedOp = new Operation();
-
-                untypedOp.op = op.op;
-                untypedOp.value = op.value;
-                untypedOp.path = op.path;
-                untypedOp.from = op.from;
+                var untypedOp = new Operation
+                {
+                    op = op.op,
+                    value = op.value,
+                    path = op.path,
+                    from = op.from
+                };
 
                 allOps.Add(untypedOp);
             }
@@ -218,4 +229,15 @@ IList<Operation> IJsonPatchDocument.GetOperations()
 
         return allOps;
     }
+
+#if NET
+    /// <inheritdoc/>
+    static void IEndpointParameterMetadataProvider.PopulateMetadata(ParameterInfo parameter, EndpointBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(parameter);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.Metadata.Add(new AcceptsMetadata(["application/json-patch+json"], parameter.ParameterType));
+    }
+#endif
 }
diff --git a/src/Features/JsonPatch/src/JsonPatchDocumentOfT.cs b/src/Features/JsonPatch/src/JsonPatchDocumentOfT.cs
index a5340ef515c4..afefe6b4a9d1 100644
--- a/src/Features/JsonPatch/src/JsonPatchDocumentOfT.cs
+++ b/src/Features/JsonPatch/src/JsonPatchDocumentOfT.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using Microsoft.AspNetCore.JsonPatch.Adapters;
 using Microsoft.AspNetCore.JsonPatch.Converters;
 using Microsoft.AspNetCore.JsonPatch.Exceptions;
@@ -15,6 +16,11 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
+#if NET
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
+#endif
+
 namespace Microsoft.AspNetCore.JsonPatch;
 
 // Implementation details: the purpose of this type of patch document is to ensure we can do type-checking
@@ -22,7 +28,11 @@ namespace Microsoft.AspNetCore.JsonPatch;
 // including type data in the JsonPatchDocument serialized as JSON (to allow for correct deserialization) - that's
 // not according to RFC 6902, and would thus break cross-platform compatibility.
 [JsonConverter(typeof(TypedJsonPatchDocumentConverter))]
+#if NET
+public class JsonPatchDocument<TModel> : IJsonPatchDocument, IEndpointParameterMetadataProvider where TModel : class
+#else
 public class JsonPatchDocument<TModel> : IJsonPatchDocument where TModel : class
+#endif
 {
     public List<Operation<TModel>> Operations { get; private set; }
 
@@ -31,7 +41,7 @@ public class JsonPatchDocument<TModel> : IJsonPatchDocument where TModel : class
 
     public JsonPatchDocument()
     {
-        Operations = new List<Operation<TModel>>();
+        Operations = [];
         ContractResolver = new DefaultContractResolver();
     }
 
@@ -656,11 +666,22 @@ IList<Operation> IJsonPatchDocument.GetOperations()
         return allOps;
     }
 
+#if NET
+    /// <inheritdoc/>
+    static void IEndpointParameterMetadataProvider.PopulateMetadata(ParameterInfo parameter, EndpointBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(parameter);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.Metadata.Add(new AcceptsMetadata(["application/json-patch+json"], typeof(TModel)));
+    }
+#endif
+
     // Internal for testing
     internal string GetPath<TProp>(Expression<Func<TModel, TProp>> expr, string position)
     {
         var segments = GetPathSegments(expr.Body);
-        var path = String.Join("/", segments);
+        var path = string.Join("/", segments);
         if (position != null)
         {
             path += "/" + position;
@@ -712,8 +733,7 @@ private List<string> GetPathSegments(Expression expr)
 
     private string GetPropertyNameFromMemberExpression(MemberExpression memberExpression)
     {
-        var jsonObjectContract = ContractResolver.ResolveContract(memberExpression.Expression.Type) as JsonObjectContract;
-        if (jsonObjectContract != null)
+        if (ContractResolver.ResolveContract(memberExpression.Expression.Type) is JsonObjectContract jsonObjectContract)
         {
             return jsonObjectContract.Properties
                 .First(jsonProperty => jsonProperty.UnderlyingName == memberExpression.Member.Name)
diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
index 57cc0737ff21..65f81617bc6e 100644
--- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
+++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
@@ -22,8 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.CSharp" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
     <Reference Include="Newtonsoft.Json" />
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Features/JsonPatch/src/PACKAGE.md b/src/Features/JsonPatch/src/PACKAGE.md
new file mode 100644
index 000000000000..f387c5838ffa
--- /dev/null
+++ b/src/Features/JsonPatch/src/PACKAGE.md
@@ -0,0 +1,100 @@
+## About
+
+`Microsoft.AspNetCore.JsonPatch` provides ASP.NET Core support for JSON PATCH requests.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.JsonPatch`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.JsonPatch
+dotnet add package Microsoft.AspNetCore.Mvc.NewtonsoftJson
+```
+
+### Configuration
+
+To enable JSON Patch support, call `AddNewtonsoftJson` in your ASP.NET Core app's `Program.cs`:
+```csharp
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllers()
+    .AddNewtonsoftJson();
+```
+
+#### Configure when using `System.Text.Json`
+
+To add support for JSON Patch using `Newtonsoft.Json` while continuing to use `System.Text.Json` for other input and output formatters:
+
+1. Update your `Program.cs` with logic to construct a `NewtonsoftJsonPatchInputFormatter`:
+    ```csharp
+    static NewtonsoftJsonPatchInputFormatter GetJsonPatchInputFormatter()
+    {
+        var builder = new ServiceCollection()
+            .AddLogging()
+            .AddMvc()
+            .AddNewtonsoftJson()
+            .Services.BuildServiceProvider();
+
+        return builder
+            .GetRequiredService<IOptions<MvcOptions>>()
+            .Value
+            .InputFormatters
+            .OfType<NewtonsoftJsonPatchInputFormatter>()
+            .First();
+    }
+    ```
+2. Configure the input formatter:
+    ```csharp
+    var builder = WebApplication.CreateBuilder(args);
+
+    builder.Services.AddControllers(options =>
+    {
+        options.InputFormatters.Insert(0, GetJsonPatchInputFormatter());
+    });
+    ```
+
+### Usage
+
+To define an action method for a JSON Patch in an API controller:
+1. Annotate it with the `HttpPatch` attribute
+2. Accept a `JsonPatchDocument<TModel>`
+3. Call `ApplyTo` on the patch document to apply changes
+
+For example:
+
+```csharp
+[HttpPatch]
+public IActionResult JsonPatchWithModelState(
+    [FromBody] JsonPatchDocument<Customer> patchDoc)
+{
+    if (patchDoc is not null)
+    {
+        var customer = CreateCustomer();
+
+        patchDoc.ApplyTo(customer, ModelState);
+
+        if (!ModelState.IsValid)
+        {
+            return BadRequest(ModelState);
+        }
+
+        return new ObjectResult(customer);
+    }
+    else
+    {
+        return BadRequest(ModelState);
+    }
+}
+```
+
+In a real app, the code would retrieve the data from a store such as a database and update the database after applying the patch.
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/web-api/jsonpatch) on JSON Patch in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.JsonPatch` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Features/JsonPatch/test/IntegrationTests/DictionaryIntegrationTest.cs b/src/Features/JsonPatch/test/IntegrationTests/DictionaryIntegrationTest.cs
index 7343e04fb29e..bd63306fb8bd 100644
--- a/src/Features/JsonPatch/test/IntegrationTests/DictionaryIntegrationTest.cs
+++ b/src/Features/JsonPatch/test/IntegrationTests/DictionaryIntegrationTest.cs
@@ -57,7 +57,7 @@ public void RemoveIntegerValue_Succeeds()
         patchDocument.ApplyTo(model);
 
         // Assert
-        Assert.Equal(1, model.DictionaryOfStringToInteger.Count);
+        Assert.Single(model.DictionaryOfStringToInteger);
         Assert.Equal(1, model.DictionaryOfStringToInteger["one"]);
     }
 
@@ -75,7 +75,7 @@ public void MoveIntegerValue_Succeeds()
         patchDocument.ApplyTo(model);
 
         // Assert
-        Assert.Equal(1, model.DictionaryOfStringToInteger.Count);
+        Assert.Single(model.DictionaryOfStringToInteger);
         Assert.Equal(1, model.DictionaryOfStringToInteger["two"]);
     }
 
diff --git a/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml b/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml
index d8abf08409d2..9487263e1b4d 100644
--- a/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml
+++ b/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP1003</DiagnosticId>
     <Target>lib/net7.0/Microsoft.Extensions.FileProviders.Embedded.dll</Target>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
index dd3bb5c6e72e..57b12455fa31 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework=".net9.0">
+      <group targetFramework=".net10.0">
         <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsVersion$" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
index 2b341ad296d5..a463d21643b1 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework=".net9.0">
+      <group targetFramework=".net10.0">
         <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
diff --git a/src/FileProviders/Embedded/test/EmbeddedFileProviderTests.cs b/src/FileProviders/Embedded/test/EmbeddedFileProviderTests.cs
index 5ae31794fb53..0b68036f47b2 100644
--- a/src/FileProviders/Embedded/test/EmbeddedFileProviderTests.cs
+++ b/src/FileProviders/Embedded/test/EmbeddedFileProviderTests.cs
@@ -83,7 +83,7 @@ public void GetFileInfo_ReturnsNotFoundIfPathStartsWithBackSlash()
         Assert.False(fileInfo.Exists);
     }
 
-    public static TheoryData GetFileInfo_LocatesFilesUnderSpecifiedNamespaceData
+    public static TheoryData<string> GetFileInfo_LocatesFilesUnderSpecifiedNamespaceData
     {
         get
         {
@@ -121,7 +121,7 @@ public void GetFileInfo_LocatesFilesUnderSpecifiedNamespace(string path)
         Assert.Equal("File3.txt", fileInfo.Name);
     }
 
-    public static TheoryData GetFileInfo_LocatesFilesUnderSubDirectoriesData
+    public static TheoryData<string> GetFileInfo_LocatesFilesUnderSubDirectoriesData
     {
         get
         {
@@ -159,7 +159,7 @@ public void GetFileInfo_LocatesFilesUnderSubDirectories(string path)
         Assert.Equal("File.txt", fileInfo.Name);
     }
 
-    public static TheoryData GetFileInfo_LocatesFilesUnderSubDirectories_IfDirectoriesContainsInvalidEverettCharData
+    public static TheoryData<string> GetFileInfo_LocatesFilesUnderSubDirectories_IfDirectoriesContainsInvalidEverettCharData
     {
         get
         {
diff --git a/src/FileProviders/FileProviders.slnf b/src/FileProviders/FileProviders.slnf
index a89a1c7c7984..4066a9b1ed77 100644
--- a/src/FileProviders/FileProviders.slnf
+++ b/src/FileProviders/FileProviders.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
       "src\\FileProviders\\Embedded\\test\\Microsoft.Extensions.FileProviders.Embedded.Tests.csproj",
diff --git a/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj b/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj
index 08223b01aff3..3646532ddf9e 100644
--- a/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj
+++ b/src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj
@@ -11,6 +11,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
     <NoPackageAnalysis>true</NoPackageAnalysis>
+    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Framework/App.Ref/src/CompatibilitySuppressions.xml b/src/Framework/App.Ref/src/CompatibilitySuppressions.xml
index 5fd58d407c27..8aab0193f779 100644
--- a/src/Framework/App.Ref/src/CompatibilitySuppressions.xml
+++ b/src/Framework/App.Ref/src/CompatibilitySuppressions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
     <DiagnosticId>PKV004</DiagnosticId>
-    <Target>net9.0</Target>
+    <Target>net10.0</Target>
   </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/src/Framework/App.Ref/src/Directory.Build.props b/src/Framework/App.Ref/src/Directory.Build.props
new file mode 100644
index 000000000000..11440dd1b555
--- /dev/null
+++ b/src/Framework/App.Ref/src/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <OutDirName Condition="'$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref'">aspnetcore-ref</OutDirName>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+</Project>
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
deleted file mode 100644
index 99eb568b96bb..000000000000
--- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
+++ /dev/null
@@ -1,265 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <PackageId>$(TargetingPackName)</PackageId>
-    <VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
-
-    <!-- This is a reference package and does not include any dependencies. -->
-    <!-- We also disable warnings about package downgrades, because we intentionally reference lower versions of certain packages -->
-    <NoWarn>$(NoWarn);NU5128;NU1605</NoWarn>
-
-    <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains reference assemblies, documentation, and other design-time assets.
-
-This package is an internal implementation of the .NET Core SDK and is not meant to be used as a normal PackageReference.</PackageDescription>
-    <PackageTags>aspnetcore;targeting-pack</PackageTags>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-
-    <PackageType>DotnetPlatform</PackageType>
-    <RefAssemblyPackagePath>ref/$(TargetFramework)/</RefAssemblyPackagePath>
-
-    <!-- There are no symbols for reference assemblies. -->
-    <IncludeSymbols>false</IncludeSymbols>
-
-    <!-- The project representing the shared framework doesn't produce a .NET assembly or symbols. -->
-    <DebugType>none</DebugType>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- This project should not be referenced via the `<Reference>` implementation. -->
-    <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
-
-    <!--
-      We are ignoring MSB3243 warnings since implementation and reference assemblies are versioned differently.
-      We need both to compose the targeting pack with reference assemblies and xml docs.
-    -->
-    <MSBuildWarningsAsMessages>MSB3243</MSBuildWarningsAsMessages>
-    <!-- We are ignoring NU5131 and NU5128 warnings since the dependency group should be kept empty. -->
-    <NoWarn>$(NoWarn);NU5131;NU5128</NoWarn>
-
-    <!-- Platform manifest data -->
-    <FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>
-    <FrameworkListOutputPath>$(BaseIntermediateOutputPath)$(FrameworkListFileName)</FrameworkListOutputPath>
-
-    <!-- Runtime transport path i.e. location of runtime ref/ assemblies that are not in Microsoft.NETCore.App.Ref. -->
-    <RuntimeTransportReferenceDirectory>$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\ref\$(TargetFramework)\</RuntimeTransportReferenceDirectory>
-
-    <!-- Package overrides and platform manifest metadata. -->
-    <PackageOverridesFileName>PackageOverrides.txt</PackageOverridesFileName>
-    <!-- PackageOverrides.txt is written in GeneratePackageOverrides target unless servicing. -->
-    <ReferencePackageOverridesPath Condition="'$(IsServicingBuild)' != 'true'">$(BaseIntermediateOutputPath)$(PackageOverridesFileName)</ReferencePackageOverridesPath>
-    <ReferencePackageOverridesPath Condition="'$(IsServicingBuild)' == 'true'">$(RepoRoot)eng\$(PackageOverridesFileName)</ReferencePackageOverridesPath>
-    <!-- PlatformManifest.txt is written in App.Runtime's GenerateSharedFxDepsFile target but not used here when servicing. -->
-    <ReferencePlatformManifestPath Condition="'$(IsServicingBuild)' != 'true'">$(PlatformManifestOutputPath)</ReferencePlatformManifestPath>
-    <ReferencePlatformManifestPath Condition="'$(IsServicingBuild)' == 'true'">$(RepoRoot)eng\PlatformManifest.txt</ReferencePlatformManifestPath>
-
-    <!--
-      Package is needed when publishing for Helix tests. Set GeneratePackageOnBuild here, though sometimes
-      unnecessary, to avoid distinct references to this project.
-    -->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
-    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
-
-    <!-- Ensure prerequisite analyzers are built. -->
-    <ProjectReference Include="..\..\AspNetCoreAnalyzers\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false" />
-
-    <ProjectReference Include="$(RepoRoot)src\Components\Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false" />
-
-    <ProjectReference Include="$(RepoRoot)src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false" />
-
-    <!-- Enforce build order. Targeting pack needs to bundle analyzers and information about the runtime. -->
-    <ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetingPackSubPath>packs\Microsoft.AspNetCore.App.Ref\$(PackageVersion)\</TargetingPackSubPath>
-    <LayoutTargetDir>$(TargetingPackLayoutRoot)$(TargetingPackSubPath)</LayoutTargetDir>
-
-    <ArchiveOutputFileName>aspnetcore-targeting-pack-$(PackageVersion)-$(TargetRuntimeIdentifier)</ArchiveOutputFileName>
-    <ArchiveOutputPath>$(InstallersOutputPath)$(ArchiveOutputFileName)$(ArchiveExtension)</ArchiveOutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      $(BuildDependsOn);
-      _ResolveInitialTargetingPackContent;
-      GeneratePackageOverrides;
-      GenerateFrameworkListFile;
-      _ResolveTargetingPackContent;
-      _BatchCopyToLayoutTargetDir;
-      _CreateTargetingPackArchive;
-    </BuildDependsOn>
-    <ResolveTargetingPackContentDependsOn>
-      _ResolveInitialTargetingPackContent;
-      _ResolveTargetingPackContent;
-    </ResolveTargetingPackContentDependsOn>
-    <!-- If Build won't run in the GenerateNuspec context, need to update _PackageFiles. -->
-    <GenerateNuspecDependsOn Condition=" '$(NoBuild)' == 'true' AND '$(GeneratePackageOnBuild)' != 'true' ">
-      $(GenerateNuspecDependsOn);
-      $(ResolveTargetingPackContentDependsOn)
-    </GenerateNuspecDependsOn>
-  </PropertyGroup>
-
-  <!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
-  <Target Name="GetTargetPath" />
-  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
-
-  <!-- This project doesn't compile anything. -->
-  <Target Name="CoreCompile" />
-
-  <!-- Completely disable default targets for copying to output. -->
-  <Target Name="CopyFilesToOutputDirectory" />
-
-  <!-- This target finds the reference assemblies. -->
-  <Target Name="_ResolveInitialTargetingPackContent"
-          Returns="@(AspNetCoreReferenceAssemblyPath)"
-          DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
-    <ItemGroup>
-      <!-- Exclude a dependency that we don't want to expose. -->
-      <_DisallowedReferenceAssemblies Include="System.Net.Quic.dll" />
-      <_AvailableRuntimeRefAssemblies Include="$(RuntimeTransportReferenceDirectory)*.dll"
-          Exclude="@(_DisallowedReferenceAssemblies->'$(RuntimeTransportReferenceDirectory)%(Filename)%(Extension)')" />
-    </ItemGroup>
-
-    <JoinItems Left="@(ReferencePathWithRefAssemblies)" Right="@(_AvailableRuntimeRefAssemblies)" LeftKey="Filename" RightKey="Filename" ItemSpecToUse="Left">
-      <Output TaskParameter="JoinResult" ItemName="_ReferencedRuntimeRefAssemblies" />
-    </JoinItems>
-
-    <ItemGroup>
-      <!--
-        Grab full dependency closure but exclude Microsoft.NETCore.App.Ref assets (avoid duplicates) and
-        Microsoft.Internal.Runtime.AspNetCore.Transport assets (almost all added just below).
-
-        Filename exclusions are due to implementation assemblies creeping into the closure. Reference assemblies
-        for all but System.Security.Cryptography.Pkcs are available in the transport package.
-      -->
-      <AspNetCoreReferenceAssemblyPath
-          Include="@(ReferencePathWithRefAssemblies)"
-          Exclude="
-            @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
-            @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.Internal.Runtime.AspNetCore.Transport'));
-            @(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Diagnostics.EventLog'));
-            @(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Pkcs'));
-            @(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Xml'));
-            @(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Threading.RateLimiting'))"/>
-
-      <AspNetCoreReferenceAssemblyPath
-          Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName)%(Extension)')" />
-
-      <AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->'%(RootDir)%(Directory)%(FileName).xml')"
-          Condition="Exists('%(RootDir)%(Directory)%(FileName).xml')" />
-      <AspNetCoreReferenceDocXml Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName).xml')" />
-      <!-- Grab remaining .xml files from packages -->
-      <AspNetCoreReferenceDocXml
-          Include="@(AspNetCoreReferenceAssemblyPath->WithMetadataValue('ExternallyResolved', 'true')->'%(RootDir)%(Directory)%(Filename).xml')"
-          Condition="Exists('%(RootDir)%(Directory)%(Filename).xml')" />
-
-      <_InitialRefPackContent Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\$(AnalyzersPackagePath)**\*.*" PackagePath="$(AnalyzersPackagePath)" />
-      <_InitialRefPackContent Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.App.Analyzers\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.App.Analyzers.dll" PackagePath="$(AnalyzersPackagePath)dotnet/cs/" />
-      <_InitialRefPackContent Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.Components.Analyzers\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Components.Analyzers.dll" PackagePath="$(AnalyzersPackagePath)dotnet/cs/" />
-      <_InitialRefPackContent Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.App.CodeFixes\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.App.CodeFixes.dll" PackagePath="$(AnalyzersPackagePath)dotnet/cs/" />
-      <_InitialRefPackContent Include="$(ArtifactsDir)bin\Microsoft.AspNetCore.Http.RequestDelegateGenerator\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Http.RequestDelegateGenerator.dll" PackagePath="$(AnalyzersPackagePath)dotnet/cs/" />
-
-      <_InitialRefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
-      <_InitialRefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
-      <_InitialRefPackContent Include="$(ReferencePlatformManifestPath)" PackagePath="$(ManifestsPackagePath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_ResolveTargetingPackContent">
-    <ItemGroup>
-      <RefPackContent Include="@(_InitialRefPackContent)" />
-      <RefPackContent Include="$(ReferencePackageOverridesPath)" PackagePath="$(ManifestsPackagePath)" />
-      <RefPackContent Include="$(FrameworkListOutputPath)" PackagePath="$(ManifestsPackagePath)" />
-      <_PackageFiles Include="@(RefPackContent)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="ResolveTargetingPackContent"
-      DependsOnTargets="$(ResolveTargetingPackContentDependsOn)"
-      Returns="@(AspNetCoreReferenceAssemblyPath)" />
-
-  <Target Name="GeneratePackageOverrides" Condition=" '$(IsServicingBuild)' != 'true' ">
-    <ItemGroup>
-      <!-- Use package version for non-Runtime references. -->
-      <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')"
-          Condition="!Exists('$(RuntimeTransportReferenceDirectory)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND
-            '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND
-            '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Internal.Runtime.AspNetCore.Transport' AND
-            '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />
-
-      <!-- Use NETCore.App.Runtime version for Runtime references. -->
-      <_AspNetCoreAppPackageOverrides Include="@(_ReferencedRuntimeRefAssemblies->'%(FileName)|$(MicrosoftNETCoreAppRuntimeVersion)')" />
-
-      <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(FileName)|$(ReferencePackSharedFxVersion)')"
-          Condition=" '%(AspNetCoreReferenceAssemblyPath.ReferenceSourceTarget)' == 'ProjectReference' " />
-    </ItemGroup>
-
-    <WriteLinesToFile
-        Lines="@(_AspNetCoreAppPackageOverrides)"
-        File="$(ReferencePackageOverridesPath)"
-        Overwrite="true" />
-  </Target>
-
-  <!--
-    Cannot use RemoveDir task because _BatchCopyToLayoutTargetDir may only copy a subset of the files to the
-    layout directory. Instead, remove any files that shouldn't exist.
-  -->
-  <Target Name="_CleanLayout" BeforeTargets="_BatchCopyToLayoutTargetDir">
-    <ItemGroup>
-      <_ExtraLayoutFiles Include="$(LayoutTargetDir)**\*.*"
-          Exclude="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')" />
-    </ItemGroup>
-    <Delete Files="@(_ExtraLayoutFiles)" />
-  </Target>
-
-  <Target Name="_BatchCopyToLayoutTargetDir"
-          Inputs="@(RefPackContent)"
-          Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')">
-    <Copy SourceFiles="@(RefPackContent)"
-          DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(RecursiveDir)%(FileName)%(Extension)')"
-          UseHardlinksIfPossible="true" />
-    <Message Importance="High" Text="$(MSBuildProjectName) -> $(LayoutTargetDir)" />
-  </Target>
-
-  <Target Name="_CreateTargetingPackArchive"
-          Inputs="@(RefPackContent)"
-          Outputs="$(ArchiveOutputPath)">
-    <ZipDirectory
-      SourceDirectory="$(TargetingPackLayoutRoot)"
-      DestinationFile="$(ArchiveOutputPath)"
-      Overwrite="true"
-      Condition="'$(ArchiveExtension)' == '.zip'" />
-    <Exec
-      Command="tar -czf $(ArchiveOutputPath) ."
-      WorkingDirectory="$(TargetingPackLayoutRoot)"
-      Condition="'$(ArchiveExtension)' == '.tar.gz'" />
-    <Message Importance="High" Text="$(MSBuildProjectName) -> $(ArchiveOutputPath)" />
-  </Target>
-
-  <Target Name="GenerateFrameworkListFile">
-    <RepoTasks.CreateFrameworkListFile
-      Files="@(_InitialRefPackContent)"
-      TargetFile="$(FrameworkListOutputPath)"
-      RootAttributes="@(FrameworkListRootAttributes)" />
-  </Target>
-</Project>
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
new file mode 100644
index 000000000000..4e68f38c1c44
--- /dev/null
+++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
@@ -0,0 +1,196 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <PlatformPackageType>TargetingPack</PlatformPackageType>
+    <SharedFrameworkName>Microsoft.AspNetCore.App</SharedFrameworkName>
+    <SharedFrameworkFriendlyName>Microsoft ASP.NET Core</SharedFrameworkFriendlyName>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <PackageTags>aspnetcore;targeting-pack</PackageTags>
+    <RuntimePackProjectPath>$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj</RuntimePackProjectPath>
+    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
+    <ArchiveName>$(TargetingPackInstallerBaseName)</ArchiveName>
+    <InstallerName>$(TargetingPackInstallerBaseName)</InstallerName>
+    <GenerateInstallers>true</GenerateInstallers>
+    <ProductBrandPrefix>Microsoft ASP.NET Core</ProductBrandPrefix>
+    <VSInsertionShortComponentName>AspNetCore.TargetingPack</VSInsertionShortComponentName>
+
+    <IsPackable Condition="'$(OnlyPackPlatformSpecificPackages)' == 'true'">false</IsPackable>
+
+    <PackageSummary>ASP.NET Core Targeting Pack</PackageSummary>
+    <PackageDescription>$(SharedFxDescription)</PackageDescription>
+    <InstallerPackageDescription>$(SharedFxDescription)</InstallerPackageDescription>
+    <LicenseFile>$(RepoRoot)LICENSE.txt</LicenseFile>
+    <MajorVersion>$(AspNetCoreMajorVersion)</MajorVersion>
+    <MinorVersion>$(AspNetCoreMinorVersion)</MinorVersion>
+    <PatchVersion>$(AspNetCorePatchVersion)</PatchVersion>
+
+    <!-- Needed some creativity to convert the PackageVersion M.N.P-PreReleaseVersionLabel-Build to the installer version M.N.P~PreReleaseVersionLabel-Build, The conditional handles stabilized builds -->
+    <DotnetTargetingPackDependencyVersion>$(MicrosoftNETCoreAppRefVersion)</DotnetTargetingPackDependencyVersion>
+    <DotnetTargetingPackDependencyVersion Condition="$(DotnetTargetingPackDependencyVersion.Contains('-'))">$(DotnetTargetingPackDependencyVersion.Substring(0, $(DotnetTargetingPackDependencyVersion.IndexOf('-'))))~$(DotnetTargetingPackDependencyVersion.Substring($([MSBuild]::Add($(DotnetTargetingPackDependencyVersion.IndexOf('-')), 1))))</DotnetTargetingPackDependencyVersion>
+    <DotnetTargetingPackDependencyMajorMinorVersion>$(MicrosoftNETCoreAppRefVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefVersion.Split('.')[1])</DotnetTargetingPackDependencyMajorMinorVersion>
+
+    <!-- TODO: Try to remove this disable property -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BuildInstallers)' == 'true' or '$(TargetOsName)' == 'win'">
+    <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
+    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
+    <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
+    <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+    <PackageReference Condition="'$(GenerateInstallers)' == 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+    <LinuxPackageDependency Include="dotnet-targeting-pack-$(DotnetTargetingPackDependencyMajorMinorVersion)" Version="$(DotnetTargetingPackDependencyVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
+    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
+
+    <ProjectReference Include="..\..\AspNetCoreAnalyzers\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj"
+      Private="false"
+      OutputItemType="AspNetCoreAnalyzer"
+      ReferenceOutputAssembly="false" />
+
+    <ProjectReference Include="..\..\AspNetCoreAnalyzers\src\Analyzers\Microsoft.AspNetCore.App.Analyzers.csproj"
+      Private="false"
+      OutputItemType="AspNetCoreAnalyzer"
+      ReferenceOutputAssembly="false" />
+
+    <ProjectReference Include="..\..\AspNetCoreAnalyzers\src\SourceGenerators\Microsoft.AspNetCore.App.SourceGenerators.csproj"
+      Private="false"
+      OutputItemType="AspNetCoreAnalyzer"
+      ReferenceOutputAssembly="false" />
+
+    <ProjectReference Include="$(RepoRoot)src\Components\Analyzers\src\Microsoft.AspNetCore.Components.Analyzers.csproj"
+      Private="false"
+      OutputItemType="AspNetCoreAnalyzer"
+      ReferenceOutputAssembly="false" />
+
+    <ProjectReference Include="$(RepoRoot)src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj"
+      Private="false"
+      OutputItemType="AspNetCoreAnalyzer"
+      ReferenceOutputAssembly="false" />
+
+    <ProjectReference Include="$(RepoRoot)src\Validation\gen\Microsoft.Extensions.Validation.ValidationsGenerator.csproj"
+      Private="false"
+      OutputItemType="AspNetCoreAnalyzer"
+      ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <IgnoredDuplicateType Include="Microsoft.AspNetCore.Hosting.WebHostBuilderIISExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.SignalRDependencyInjectionExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.IdentityServiceCollectionExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.Logging.LoggingBuilderExtensions" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <!-- Package overrides and platform manifest metadata. -->
+    <PackageOverridesFileName>PackageOverrides.txt</PackageOverridesFileName>
+    <!-- PackageOverrides.txt is written in GeneratePackageOverrides target unless servicing. -->
+    <ReferencePackageOverridesPath Condition="'$(IsServicingBuild)' != 'true'">$(BaseIntermediateOutputPath)$(PackageOverridesFileName)</ReferencePackageOverridesPath>
+    <ReferencePackageOverridesPath Condition="'$(IsServicingBuild)' == 'true'">$(RepoRoot)eng\$(PackageOverridesFileName)</ReferencePackageOverridesPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageOverridesFile Include="$(ReferencePackageOverridesPath)" />
+  </ItemGroup>
+
+  <!--
+    COMPAT: Remove the System.Security.Cryptography.Pkcs reference from the project.
+    We don't package System.Security.Cryptography.Pkcs into the reference pack for ASP.NET Core.
+  -->
+  <Target Name="_RemovePkcsReference" AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <ReferencePath Remove="@(ReferencePath)" Condition="'%(FileName)' == 'System.Security.Cryptography.Pkcs'" />
+      <IgnoredReference Include="System.Security.Cryptography.Pkcs" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_AddAnalyzersToRefPack" BeforeTargets="GetFilesToPackage">
+    <ItemGroup>
+      <!-- Include analyzers from dotnet/runtime. Start with the non-Roslyn-versioned ones -->
+      <_TransportRoslynVersionedAnalyzers Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\$(AnalyzersPackagePath)\dotnet\roslyn*\**\*.*" />
+      <_TransportAnalyzers Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\$(AnalyzersPackagePath)**\*.*"
+                           Exclude="@(_TransportRoslynVersionedAnalyzers)" />
+      <FilesToPackage Include="@(_TransportAnalyzers)"
+                      ExcludeFromValidation="true"
+                      TargetPath="$(AnalyzersPackagePath)%(RecursiveDir)" />
+
+    </ItemGroup>
+
+    <!--
+      Strip off the roslyn*.* section of the path so we can package the analyzers without the roslyn subfolder.
+      Ref packs don't package multiple analyzers for different roslyn versions, so this version info is gratuitous.
+    -->
+    <PropertyGroup>
+      <RoslynVersionPattern>roslyn[0-9]+.[0-9]+\$([System.IO.Path]::DirectorySeparatorChar)</RoslynVersionPattern>
+    </PropertyGroup>
+    <ItemGroup>
+      <_TransportRoslynVersionedAnalyzers Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\$(AnalyzersPackagePath)\dotnet\roslyn*\**\*.*" />
+      <_TransportRoslynVersionedAnalyzers UnversionedAnalyzerPath="$([System.Text.RegularExpressions.Regex]::Replace('%(RecursiveDir)', '$(RoslynVersionPattern)', ''))" />
+      <FilesToPackage Include="@(_TransportRoslynVersionedAnalyzers)"
+                      ExcludeFromValidation="true"
+                      TargetPath="$(AnalyzersPackagePath)dotnet/%(_TransportRoslynVersionedAnalyzers.UnversionedAnalyzerPath)" />
+    </ItemGroup>
+
+    <!-- Package the analyzers and other Roslyn components produced in this repo. -->
+    <ItemGroup>
+      <FilesToPackage Include="@(AspNetCoreAnalyzer)"
+                      ExcludeFromValidation="true"
+                      TargetPath="$(AnalyzersPackagePath)dotnet/cs/" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CreatePackageOverrides"
+          DependsOnTargets="ResolveReferences"
+          Condition="'$(IsServicingBuild)' != 'true'">
+    <ItemGroup>
+      <!-- Use package version for non-Runtime references. -->
+      <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')"
+          Condition="!Exists('$(RuntimeTransportReferenceDirectory)%(ReferencePath.NuGetPackageId).dll') AND
+            '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND
+            '%(ReferencePath.NuGetPackageId)' != 'Microsoft.Internal.Runtime.AspNetCore.Transport' AND
+            '%(ReferencePath.NuGetSourceType)' == 'Package' " />
+
+      <!--
+        Use NETCore.App.Ref version for Runtime references.
+        This is the same as above except in "stabilized" version builds, where the transport package version
+        would be a non-shipping unstablized version, but the NETCore.App version is the shipping version.
+      -->
+      <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(MicrosoftNETCoreAppRefVersion)')"
+      Condition="'%(ReferencePath.NuGetPackageId)' == 'Microsoft.Internal.Runtime.AspNetCore.Transport' AND
+                 '%(ReferencePath.NuGetSourceType)' == 'Package' " />
+
+      <!-- Use shared framework version for project references. -->
+      <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')"
+          Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' " />
+
+      <!-- Include Microsoft.AspNetCore.App for Package Pruning -->
+      <_AspNetCoreAppPackageOverrides Include="$(SharedFrameworkName)|$(ReferencePackSharedFxVersion)" />
+
+      <!--
+        Exclude Microsoft.Extensions.FileProviders.Embedded from pruning because it contains build logic
+        required to generate the embedded files manifest. The package's build targets are not in the SDK,
+        so they must be available from the package itself. See https://github.com/dotnet/aspnetcore/issues/63719
+      -->
+      <_AspNetCoreAppPackageOverrides Remove="Microsoft.Extensions.FileProviders.Embedded|$(ReferencePackSharedFxVersion)" />
+    </ItemGroup>
+
+    <WriteLinesToFile
+        Lines="@(_AspNetCoreAppPackageOverrides)"
+        File="$(ReferencePackageOverridesPath)"
+        Overwrite="true" />
+  </Target>
+
+  <Target Name="PublishToSharedLayoutRoot" BeforeTargets="Build">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="PublishToDisk"
+             Properties="OutputPath=$(TargetingPackLayoutRoot)" />
+  </Target>
+</Project>
diff --git a/src/Framework/App.Runtime/bundle/DotNetLogo_256x.png b/src/Framework/App.Runtime/bundle/DotNetLogo_256x.png
new file mode 100644
index 000000000000..3ff052f8302a
Binary files /dev/null and b/src/Framework/App.Runtime/bundle/DotNetLogo_256x.png differ
diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj
new file mode 100644
index 000000000000..fa5e05dbb6ab
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj
@@ -0,0 +1,44 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" />
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <!-- We aren't producing a NuGet package here, so disable package validation -->
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <IsPackable>false</IsPackable>
+    <!-- Bundles should always be built for x86 -->
+    <InstallerPlatform>x86</InstallerPlatform>
+    <BundleInstallerUpgradeCodeSeed>ASP.NET Core Shared Framework Bundle Installer</BundleInstallerUpgradeCodeSeed>
+    <BundleThemeDirectory>$(MSBuildProjectDirectory)</BundleThemeDirectory>
+    <InstallerName>aspnetcore-runtime</InstallerName>
+    <InstallerRuntimeIdentifiers>win-x86;win-x64;win-arm64</InstallerRuntimeIdentifiers>
+    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
+    <ProductBrandPrefix>Microsoft ASP.NET Core</ProductBrandPrefix>
+    <BundleNameSuffix>Runtime</BundleNameSuffix>
+
+    <MajorVersion>$(AspNetCoreMajorVersion)</MajorVersion>
+    <MinorVersion>$(AspNetCoreMinorVersion)</MinorVersion>
+    <PatchVersion>$(AspNetCorePatchVersion)</PatchVersion>
+
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+    <UseWix5>true</UseWix5>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+    <!-- Microsoft.Wix is a dotnet tool package, so exlude its assets. -->
+    <PackageReference Include="Microsoft.Wix" Version="$(MicrosoftWixToolsetSdkVersion)" ExcludeAssets="all" />
+    <!-- Installers needs the $(PkgMicrosoftWixToolsetUIwixext) property to locate the extension. -->
+    <PackageReference Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <BundleComponentReference Include="$(RepoRoot)/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" />
+</Project>
diff --git a/src/Framework/App.Runtime/bundle/bundle.thm b/src/Framework/App.Runtime/bundle/bundle.thm
new file mode 100644
index 000000000000..4a7934d05a67
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/bundle.thm
@@ -0,0 +1,119 @@
+<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
+      <!-- Use system colors where possible as they change based on themes and are automatically adjusted for high contrast.
+       For custom colors, ensure the contrast ratio is at least 4.5:1 (3:1 for large text and other UI components).
+       The WinUI 3 Gallery app can be used to calculate contrast settings. Take note that custom colors for <Font>
+       elements use BGR instead of RGB ordering.
+
+       Line spacing for fonts should be rounded to the nearest multiple of 4. For example, Segoe UI with a height of 24 has
+       a line spacing of 31.9, so 32 should be used when calculating the height of a control that contains a single line of text,
+       like a label. For a height of 12, the line spacing to use is 16. -->
+    <Font Id="DefaultFont" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
+    <Font Id="WindowBannerFont" Height="-24" Weight="900" Foreground="000000" Background="D42B52">Segoe UI</Font>
+    <Font Id="PageHeaderFont" Height="-20" Weight="500" Foreground="graytext" Background="window">Segoe UI</Font>
+    <Font Id="ErrorFont" Height="-12" Weight="900" Foreground="windowtext" Background="window">Segoe UI</Font>
+    <Window Width="644" Height="460" HexStyle="100a0000" FontId="DefaultFont" Caption="#(loc.Caption)" IconFile="dotnet.ico">
+        <ImageControl Name="DotNetLogo" X="12" Y="-48" Width="124" Height="124" ImageFile="DotNetLogo_256x.png" Visible="yes" />
+        <Text X="80" Y="12" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
+        <Page Name="Help">
+            <Label Name="HelpHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpHeader)</Label>
+            <Label Name="HelpText" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpText)</Label>
+
+            <Button Name="HelpCancelButton"  X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.HelpCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Install">
+            <Text Name="WelcomeText" X="148" Y="80" Width="-12" Height="-70" FontId="PageHeaderFont" HexStyle="000000" DisablePrefix="yes" />
+            <Text Name="WelcomeHeaderMessage" X="160" Y="80" Width="300" Height="32" FontId="PageHeaderFont">#(loc.WelcomeHeaderMessage)</Text>
+            <Text Name="WelcomeDescription" X="160" Y="124" Width="460" Height="64" FontId="DefaultFont">#(loc.WelcomeDescription)</Text>
+
+            <!-- Align the label with the top of the logo on the left. -->
+            <Label Name="LicenseTermsAndPolicies" X="148" Y="288" Width="-12" Height="32" FontId="DefaultFont" HexStyle="000000">#(loc.LicenseAssent)</Label>
+
+            <!-- These controls have larger vertical spacing to improve readability (20 instead of 16). -->
+            <Hypertext Name="PrivacyStatementLink" X="172" Y="320" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">#(loc.PrivacyStatementLink)</Hypertext>
+            <Hypertext Name="DotNetCLITelemetryLink" X="172" Y="340" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">#(loc.DotNetCLITelemetryLink)</Hypertext>
+            <Hypertext Name="DotNetEulaLink" X="172" Y="360" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">#(loc.DotNetEulaLink)</Hypertext>
+            <Button Name="InstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
+            <Button Name="InstallCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.InstallCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Progress">
+            <Label HexStyle="000000" Name="ProgressHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ProgressHeader)</Label>
+            <Label HexStyle="000000" Name="ProgressLabel" X="12" Y="124" Width="96" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.ProgressLabel)</Label>
+            <Label HexStyle="000000" Name="OverallProgressPackageText" X="108" Y="124" Width="-12" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Label>
+
+            <Progressbar Name="OverallCalculatedProgressbar" X="12" Y="152" Width="-12" Height="20" />
+
+            <Button Name="ProgressCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.ProgressCancelButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Modify">
+            <Label Name="ModifyHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
+            <Button Name="RepairButton" X="-236" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
+            <Button Name="UninstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>
+            <Button Name="ModifyCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.ModifyCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Success">
+            <Label Name="SuccessHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
+                <!-- Default text to display if none of the conditions are true. -->
+                <Text>#(loc.SuccessHeader)</Text>
+                <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
+            </Label>
+
+            <Label X="148" Y="-48" Width="-12" Height="34" FontId="DefaultFont" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
+                <Text>#(loc.SuccessRestartText)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallRestartText)</Text>
+            </Label>
+
+            <!-- Calculate the relative offset as follows, assuming there are two buttons, right aligned:
+               First button, X="-12" Width="100"
+               Second button, X="-124" (-12 - 100 (width of first button) - 12 (gap between buttons)) -->
+            <Button Name="SuccessRestartButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
+            <Button Name="SuccessCloseButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.SuccessCloseButton)</Text>
+                <CloseWindowAction />
+            </Button>
+        </Page>
+        <Page Name="Failure">
+            <Label Name="FailureHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
+                <Text>#(loc.FailureHeader)</Text>
+                <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
+            </Label>
+
+            <!-- Reserve three lines of space (2 for the message plus a 3rd for a line break. -->
+            <Hypertext HexStyle="000000" Name="FailureLogFileLink" X="148" Y="124" Width="-12" Height="48" FontId="DefaultFont" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
+
+            <!-- This element is updated by the bootstrapper application. Reserve 3 lines of space. -->
+            <Hypertext HexStyle="000000" Name="FailureMessageText" X="148" Y="172" Width="-12" Height="48" FontId="ErrorFont" TabStop="yes" HideWhenDisabled="yes" />
+
+            <!-- Reserve two lines of space to accommodate localized content. -->
+            <Label X="148" Y="-48" Width="-12" Height="32" FontId="DefaultFont" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
+            <Button Name="FailureRestartButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
+            <Button Name="FailureCloseButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.FailureCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+    </Window>
+</Theme>
diff --git a/src/Framework/App.Runtime/bundle/dotnet.ico b/src/Framework/App.Runtime/bundle/dotnet.ico
new file mode 100644
index 000000000000..16c9148e8609
Binary files /dev/null and b/src/Framework/App.Runtime/bundle/dotnet.ico differ
diff --git a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl
new file mode 100644
index 000000000000..98438707f1fc
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] 安裝程式"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="版本 [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="您確定要取消嗎?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="先前的版本"/>
+  <String Id="HelpHeader" Value="安裝程式說明"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - 安裝、修復、解除安裝或
+   在目錄中建立套件組合的完整本機複本。預設會進行安裝。
+
+/passive | /quiet - 顯示最基本的 UI 且不出現提示，或是不顯示任何 UI 且
+   不出現提示。預設會顯示 UI 及所有提示。
+
+/norestart - 抑制任何重新啟動嘗試。根據預設，UI 在重新啟動前會先提示。
+/log log.txt - 記錄到特定檔案。預設會在 %TEMP% 中建立記錄檔。"/>
+  <String Id="HelpCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="我同意授權條款和條件(&amp;A)"/>
+  <String Id="InstallInstallButton" Value="安裝(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="ProgressHeader" Value="安裝程式進度"/>
+  <String Id="ProgressLabel" Value="正在處理:"/>
+  <String Id="OverallProgressPackageText" Value="正在初始化..."/>
+  <String Id="ProgressCancelButton" Value="取消(&amp;C)"/>
+  <String Id="ModifyHeader" Value="修改安裝程式"/>
+  <String Id="ModifyRepairButton" Value="修復(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="解除安裝(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="快取已成功完成"/>
+  <String Id="SuccessModifyHeader" Value="修改已成功完成"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="解除安裝已成功完成"/>
+  <String Id="SuccessLayoutHeader" Value="配置已成功完成"/>
+  <String Id="SuccessRepairHeader" Value="修復已成功完成"/>
+  <String Id="SuccessUninstallHeader" Value="解除安裝已成功完成"/>
+  <String Id="SuccessInstallHeader" Value="安裝已成功完成"/>
+  <String Id="SuccessHeader" Value="安裝程式成功"/>
+  <String Id="SuccessLaunchButton" Value="啟動(&amp;L)"/>
+  <String Id="SuccessRestartText" Value="必須重新啟動電腦，才能使用此軟體。"/>
+  <String Id="SuccessUninstallRestartText" Value="您必須重新啟動電腦，才能完成軟體移除。"/>
+  <String Id="SuccessRestartButton" Value="重新啟動(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="FailureHeader" Value="安裝程式失敗"/>
+  <String Id="FailureCacheHeader" Value="快取失敗"/>
+  <String Id="FailureLayoutHeader" Value="配置失敗"/>
+  <String Id="FailureInstallHeader" Value="安裝程式失敗"/>
+  <String Id="FailureUninstallHeader" Value="解除安裝失敗"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="解除安裝失敗"/>
+  <String Id="FailureRepairHeader" Value="修復失敗"/>
+  <String Id="FailureModifyHeader" Value="修改失敗"/>
+  <String Id="FailureHyperlinkLogText" Value="一或多個問題導致設定失敗。請修正問題，然後重試安裝程式。如需詳細資訊，請參考&lt;a href=&quot;#&quot;&gt;記錄檔&lt;/a&gt;。"/>
+  <String Id="FailureRestartText" Value="必須重新啟動電腦，才能完成軟體的復原。"/>
+  <String Id="FailureRestartButton" Value="重新啟動(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="使用中的檔案"/>
+  <String Id="FilesInUseLabel" Value="以下應用程式正在使用需要進行更新的檔案:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="請關閉應用程式然後嘗試重新啟動。(&amp;A)"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="不要關閉應用程式(&amp;D)。需要重新啟動。"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="關閉應用程式(&amp;A)。"/>
+  <String Id="FilesInUseOkButton" Value="確定(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="取消(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="重試(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="略過(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="結束(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="使用中的檔案"/>
+  <String Id="LicenseAssent" Value="按一下 “安裝” 即表示您同意下列條款:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;隱私權聲明&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET 授權資訊&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;遙測收集和選擇退出&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;授權條款&lt;/a&gt;和&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;隱私權聲明&lt;/a&gt;。"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl
new file mode 100644
index 000000000000..b9f103b6f663
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Instalace [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Verze [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Opravdu chcete akci zrušit?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Předchozí verze"/>
+  <String Id="HelpHeader" Value="Nápověda k nastavení"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]adresář[\]]– nainstaluje, opraví, odinstaluje nebo
+   vytvoří úplnou místní kopii sady v adresáři. Výchozí možností je instalace.
+
+/passive | /quiet – zobrazí minimální uživatelské rozhraní bez jakýchkoli výzev nebo nezobrazí žádné uživatelské rozhraní ani
+   žádné výzvy. Ve výchozím nastavení se zobrazí uživatelské rozhraní a všechny výzvy.
+
+/norestart – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní zobrazí před restartováním výzvu.
+/log log.txt – zapíše protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Zavřít"/>
+  <String Id="InstallAcceptCheckbox" Value="&amp;Souhlasím s licenčními podmínkami a ujednáními"/>
+  <String Id="InstallInstallButton" Value="Na&amp;instalovat"/>
+  <String Id="InstallCloseButton" Value="&amp;Zavřít"/>
+  <String Id="ProgressHeader" Value="Průběh instalace"/>
+  <String Id="ProgressLabel" Value="Zpracování:"/>
+  <String Id="OverallProgressPackageText" Value="Probíhá inicializace..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Zrušit"/>
+  <String Id="ModifyHeader" Value="Upravit nastavení"/>
+  <String Id="ModifyRepairButton" Value="&amp;Opravit"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Odinstalovat"/>
+  <String Id="ModifyCloseButton" Value="&amp;Zavřít"/>
+  <String Id="SuccessCacheHeader" Value="Úspěšné dokončení mezipaměti"/>
+  <String Id="SuccessModifyHeader" Value="Úprava byla úspěšně dokončena."/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Odinstalace se úspěšně dokončila."/>
+  <String Id="SuccessLayoutHeader" Value="Rozložení se úspěšně dokončilo."/>
+  <String Id="SuccessRepairHeader" Value="Oprava byla úspěšně dokončena."/>
+  <String Id="SuccessUninstallHeader" Value="Odinstalace se úspěšně dokončila."/>
+  <String Id="SuccessInstallHeader" Value="Instalace se úspěšně dokončila"/>
+  <String Id="SuccessHeader" Value="Instalace byla úspěšná"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Spustit"/>
+  <String Id="SuccessRestartText" Value="Před použitím tohoto softwaru musíte restartovat počítač."/>
+  <String Id="SuccessUninstallRestartText" Value="Odebrání softwaru dokončíte restartováním počítače."/>
+  <String Id="SuccessRestartButton" Value="&amp;Restartovat"/>
+  <String Id="SuccessCloseButton" Value="&amp;Zavřít"/>
+  <String Id="FailureHeader" Value="Instalace selhala."/>
+  <String Id="FailureCacheHeader" Value="Mezipaměť selhala."/>
+  <String Id="FailureLayoutHeader" Value="Rozložení selhalo."/>
+  <String Id="FailureInstallHeader" Value="Instalace selhala."/>
+  <String Id="FailureUninstallHeader" Value="Odinstalace selhala."/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Odinstalace selhala."/>
+  <String Id="FailureRepairHeader" Value="Oprava selhala."/>
+  <String Id="FailureModifyHeader" Value="Úprava selhala."/>
+  <String Id="FailureHyperlinkLogText" Value="Nejméně jeden problém způsobil, že instalace selhala. Opravte prosím tyto problémy a zkuste instalaci zopakovat. Další informace najdete v &lt;a href=&quot;#&quot;&gt;souboru protokolu&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač."/>
+  <String Id="FailureRestartButton" Value="&amp;Restartovat"/>
+  <String Id="FailureCloseButton" Value="&amp;Zavřít"/>
+  <String Id="FilesInUseHeader" Value="Soubory jsou používány"/>
+  <String Id="FilesInUseLabel" Value="Následující aplikace používají soubory, které je potřeba aktualizovat:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Zavřít aplikace a pokusit se je znovu spustit"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Nezavírat aplikace Bude nutné restartovat počítač."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="&amp;Zavřít aplikace"/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Zrušit"/>
+  <String Id="FilesInUseRetryButton" Value="Opakov&amp;at"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Přeskočit"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Ukončit"/>
+  <String Id="FilesInUseTitle" Value="Soubory jsou používány."/>
+  <String Id="LicenseAssent" Value="Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Prohlášení o zásadách ochrany osobních údajů&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informace o licencování pro .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Shromažďování telemetrie a výslovný nesouhlas&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] – &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;licenční podmínky&lt;/a&gt; a &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl
new file mode 100644
index 000000000000..041e420cce85
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName]-Setup"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Version von [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Möchten Sie den Vorgang wirklich abbrechen?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Vorherige Version"/>
+  <String Id="HelpHeader" Value="Setuphilfe"/>
+  
+  <String Id="HelpText" Value="/installieren | /reparieren | /deinstallieren | /Layout [\[]Verzeichnis[\]] – installiert, repariert, deinstalliert oder
+   erstellt eine vollständige lokale Kopie des Bündels im Verzeichnis. Standardmäßig wird eine Installation durchgeführt.
+
+/passiv | /ruhig – Zeigt eine minimale Benutzeroberfläche ohne Prompts an oder zeigt keine Benutzeroberfläche und
+   keine Prompts an. Standardmäßig werden die Benutzeroberfläche und alle Prompts angezeigt.
+
+/norestart: Unterdrückt alle Neustartversuche. Standardmäßig wird die Benutzeroberfläche vor dem Neustart aufgefordert.
+/log log.txt: Protokolliert eine bestimmte Datei. Standardmäßig wird die Protokolldatei in %TEMP% erstellt."/>
+  <String Id="HelpCloseButton" Value="&amp;Schließen"/>
+  <String Id="InstallAcceptCheckbox" Value="Ich &amp;stimme den Bedingungen des Lizenzvertrags zu"/>
+  <String Id="InstallInstallButton" Value="&amp;Installieren"/>
+  <String Id="InstallCloseButton" Value="&amp;Schließen"/>
+  <String Id="ProgressHeader" Value="Setupstatus"/>
+  <String Id="ProgressLabel" Value="Verarbeitung:"/>
+  <String Id="OverallProgressPackageText" Value="Initialisierung wird ausgeführt..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Abbrechen"/>
+  <String Id="ModifyHeader" Value="Setup ändern"/>
+  <String Id="ModifyRepairButton" Value="&amp;Reparieren"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Deinstallieren"/>
+  <String Id="ModifyCloseButton" Value="&amp;Schließen"/>
+  <String Id="SuccessCacheHeader" Value="Zwischenspeichern erfolgreich abgeschlossen"/>
+  <String Id="SuccessModifyHeader" Value="Änderung erfolgreich abgeschlossen"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Deinstallation erfolgreich abgeschlossen"/>
+  <String Id="SuccessLayoutHeader" Value="Layout erfolgreich abgeschlossen"/>
+  <String Id="SuccessRepairHeader" Value="Reparatur erfolgreich abgeschlossen"/>
+  <String Id="SuccessUninstallHeader" Value="Deinstallation erfolgreich abgeschlossen"/>
+  <String Id="SuccessInstallHeader" Value="Installation erfolgreich abgeschlossen"/>
+  <String Id="SuccessHeader" Value="Setup wurde erfolgreich abgeschlossen"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Starten"/>
+  <String Id="SuccessRestartText" Value="Sie müssen den Computer neu starten, bevor Sie die Software verwenden können."/>
+  <String Id="SuccessUninstallRestartText" Value="Sie müssen den Computer neu starten, um das Entfernen der Software abzuschließen."/>
+  <String Id="SuccessRestartButton" Value="&amp;Neu starten"/>
+  <String Id="SuccessCloseButton" Value="&amp;Schließen"/>
+  <String Id="FailureHeader" Value="Fehler beim Setup"/>
+  <String Id="FailureCacheHeader" Value="Fehler beim Zwischenspeichern"/>
+  <String Id="FailureLayoutHeader" Value="Fehler beim Layout"/>
+  <String Id="FailureInstallHeader" Value="Fehler beim Setup"/>
+  <String Id="FailureUninstallHeader" Value="Fehler bei der Deinstallation"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Fehler bei der Deinstallation"/>
+  <String Id="FailureRepairHeader" Value="Fehler bei der Reparatur"/>
+  <String Id="FailureModifyHeader" Value="Fehler beim Ändern"/>
+  <String Id="FailureHyperlinkLogText" Value="Mindestens ein Problem hat zu einem Fehler beim Setup geführt. Beheben Sie die Probleme, und wiederholen Sie dann die Einrichtung. Weitere Informationen finden Sie in der &lt;a href=&quot;#&quot;&gt;Protokolldatei&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen."/>
+  <String Id="FailureRestartButton" Value="&amp;Neu starten"/>
+  <String Id="FailureCloseButton" Value="&amp;Schließen"/>
+  <String Id="FilesInUseHeader" Value="Dateien in Verwendung"/>
+  <String Id="FilesInUseLabel" Value="Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Schließen Sie die &amp;Anwendungen, und versuchen Sie sie erneut zu starten."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Schließen Sie die Anwendungen nicht. Ein Neustart ist erforderlich."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Schließen Sie die &amp;Anwendungen."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Abbrechen"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Wiederholen"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignorieren"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Beenden"/>
+  <String Id="FilesInUseTitle" Value="Dateien in Verwendung"/>
+  <String Id="LicenseAssent" Value="Durch Klicken auf „Installieren“ stimmen Sie den nachstehenden Bedingungen zu:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Datenschutzerklärung&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Lizenzierungsinformationen für .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetriesammlung und Kündigen&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;Lizenzbedingungen&lt;/a&gt; und &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;Datenschutzbestimmungen&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl
new file mode 100644
index 000000000000..55fefa93cb44
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  <!--_locComment_text="{Locked='[WixBundleName]'}"-->
+  <String Id="Caption" Value="[WixBundleName] Setup" />
+  <!--_locComment_text="{Locked}"-->
+  <String Id="Title" Value="[BUNDLEMONIKER]" />
+  <!--_locComment_text="{Locked}"-->
+  <!--_locComment_text="{Locked='[WixBundleVersion]'}"-->
+  <String Id="InstallVersion" Value="Version [WixBundleVersion]" />
+  <String Id="ConfirmCancelMessage" Value="Are you sure you want to cancel?" />
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Previous version" />
+  <String Id="HelpHeader" Value="Setup Help" />
+  <!--_locComment_text="'directory' is to be translated in both places"-->
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - installs, repairs, uninstalls or
+   creates a complete local copy of the bundle in directory. Install is the default.
+
+/passive | /quiet -  displays minimal UI with no prompts or displays no UI and
+   no prompts. By default UI and all prompts are displayed.
+
+/norestart   - suppress any attempts to restart. By default UI will prompt before restart.
+/log log.txt - logs to a specific file. By default a log file is created in %TEMP%." />
+  <String Id="HelpCloseButton" Value="&amp;Close" />
+  <String Id="InstallAcceptCheckbox" Value="I &amp;agree to the license terms and conditions" />
+  <String Id="InstallInstallButton" Value="&amp;Install" />
+  <String Id="InstallCloseButton" Value="&amp;Close" />
+  <String Id="ProgressHeader" Value="Setup Progress" />
+  <String Id="ProgressLabel" Value="Processing:" />
+  <String Id="OverallProgressPackageText" Value="Initializing..." />
+  <String Id="ProgressCancelButton" Value="&amp;Cancel" />
+  <String Id="ModifyHeader" Value="Modify Setup" />
+  <String Id="ModifyRepairButton" Value="&amp;Repair" />
+  <String Id="ModifyUninstallButton" Value="&amp;Uninstall" />
+  <String Id="ModifyCloseButton" Value="&amp;Close" />
+  <String Id="SuccessCacheHeader" Value="Cache Successfully Completed" />
+  <String Id="SuccessModifyHeader" Value="Modify Successfully Completed" />
+  <String Id="SuccessUnsafeUninstallHeader" Value="Uninstall Successfully Completed" />
+  <String Id="SuccessLayoutHeader" Value="Layout Successfully Completed" />
+  <String Id="SuccessRepairHeader" Value="Repair Successfully Completed" />
+  <String Id="SuccessUninstallHeader" Value="Uninstall Successfully Completed" />
+  <String Id="SuccessInstallHeader" Value="Installation Successfully Completed" />
+  <String Id="SuccessHeader" Value="Setup Successful" />
+  <String Id="SuccessLaunchButton" Value="&amp;Launch" />
+  <String Id="SuccessRestartText" Value="You must restart your computer before you can use the software." />
+  <String Id="SuccessUninstallRestartText" Value="You must restart your computer to complete the removal of the software." />
+  <String Id="SuccessRestartButton" Value="&amp;Restart" />
+  <String Id="SuccessCloseButton" Value="&amp;Close" />
+  <String Id="FailureHeader" Value="Setup Failed" />
+  <String Id="FailureCacheHeader" Value="Cache Failed" />
+  <String Id="FailureLayoutHeader" Value="Layout Failed" />
+  <String Id="FailureInstallHeader" Value="Setup Failed" />
+  <String Id="FailureUninstallHeader" Value="Uninstall Failed" />
+  <String Id="FailureUnsafeUninstallHeader" Value="Uninstall Failed" />
+  <String Id="FailureRepairHeader" Value="Repair Failed" />
+  <String Id="FailureModifyHeader" Value="Modify Failed" />
+  <String Id="FailureHyperlinkLogText" Value="One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href=&quot;#&quot;&gt;log file&lt;/a&gt;." />
+  <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
+  <String Id="FailureRestartButton" Value="&amp;Restart" />
+  <String Id="FailureCloseButton" Value="&amp;Close" />
+  <String Id="FilesInUseHeader" Value="Files In Use" />
+  <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
+  <String Id="FilesInUseCloseRadioButton" Value="Close the &amp;applications and attempt to restart them." />
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close applications. A reboot will be required." />
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
+  <String Id="FilesInUseOkButton" Value="&amp;OK" />
+  <String Id="FilesInUseCancelButton" Value="&amp;Cancel" />
+  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
+  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
+  <String Id="FilesInUseTitle" Value="Files In Use" />
+  <String Id="LicenseAssent" Value="By clicking Install, you agree to the following terms:" />
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Privacy Statement&lt;/A&gt;" />
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Licensing Information for .NET&lt;/A&gt;" />
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetry collection and opt-out&lt;/A&gt;" />
+
+  <!--_locComment_text="{Locked='[WixBundleName]'}"-->
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;license terms&lt;/a&gt; and &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;privacy statement&lt;/a&gt;." />
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl
new file mode 100644
index 000000000000..bb4e4443f41a
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Installation de [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Version [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Voulez-vous vraiment annuler ?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Version précédente"/>
+  <String Id="HelpHeader" Value="Aide sur l’installation"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] – installe, répare, désinstalle ou
+   crée une copie locale complète du bundle dans le répertoire. L’installation constitue la valeur par défaut.
+
+/passive | /quiet – affiche une interface utilisateur minimale sans requêtes ou n’affiche ni interface utilisateur et
+   aucune requête. Par défaut, l’interface utilisateur et toutes les requêtes sont affichées.
+
+/norestart   – supprime toute tentative de redémarrage. Par défaut, l’interface utilisateur vous invite à redémarrer.
+/log log.txt – enregistre dans un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Fermer"/>
+  <String Id="InstallAcceptCheckbox" Value="J’&amp;accepte les conditions générales de la licence"/>
+  <String Id="InstallInstallButton" Value="&amp;Installer"/>
+  <String Id="InstallCloseButton" Value="&amp;Fermer"/>
+  <String Id="ProgressHeader" Value="Progression de l’opération"/>
+  <String Id="ProgressLabel" Value="Traitement :"/>
+  <String Id="OverallProgressPackageText" Value="Initialisation en cours... Merci de patienter."/>
+  <String Id="ProgressCancelButton" Value="&amp;Annuler"/>
+  <String Id="ModifyHeader" Value="Modifier la configuration"/>
+  <String Id="ModifyRepairButton" Value="&amp;Réparer"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Désinstaller"/>
+  <String Id="ModifyCloseButton" Value="&amp;Fermer"/>
+  <String Id="SuccessCacheHeader" Value="Cache correctement terminé"/>
+  <String Id="SuccessModifyHeader" Value="Modification correctement terminée"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Désinstallation correctement terminée"/>
+  <String Id="SuccessLayoutHeader" Value="Mise en page correctement terminée"/>
+  <String Id="SuccessRepairHeader" Value="Réparation correctement terminée"/>
+  <String Id="SuccessUninstallHeader" Value="Désinstallation correctement terminée"/>
+  <String Id="SuccessInstallHeader" Value="Installation correctement terminée"/>
+  <String Id="SuccessHeader" Value="Installation réussie"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Lancement"/>
+  <String Id="SuccessRestartText" Value="Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel."/>
+  <String Id="SuccessUninstallRestartText" Value="Vous devez redémarrer votre ordinateur pour terminer la suppression du logiciel."/>
+  <String Id="SuccessRestartButton" Value="&amp;Redémarrer"/>
+  <String Id="SuccessCloseButton" Value="&amp;Fermer"/>
+  <String Id="FailureHeader" Value="Nous n’avons pas pu effectuer l’installation"/>
+  <String Id="FailureCacheHeader" Value="Échec du cache"/>
+  <String Id="FailureLayoutHeader" Value="Échec de la mise en page"/>
+  <String Id="FailureInstallHeader" Value="Nous n’avons pas pu effectuer l’installation"/>
+  <String Id="FailureUninstallHeader" Value="Nous n’avons pas pu effectuer la désinstallation"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Nous n’avons pas pu effectuer la désinstallation"/>
+  <String Id="FailureRepairHeader" Value="Nous n’avons pas pu effectuer la réparation"/>
+  <String Id="FailureModifyHeader" Value="Modification échouée"/>
+  <String Id="FailureHyperlinkLogText" Value="Un ou plusieurs problèmes ont provoqué l’échec de l’installation. Veuillez résoudre les problèmes, puis réessayer la configuration. Pour découvrir plus d’informations, consultez le &lt;a href=&quot;#&quot;&gt;fichier journal&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel."/>
+  <String Id="FailureRestartButton" Value="&amp;Redémarrer"/>
+  <String Id="FailureCloseButton" Value="&amp;Fermer"/>
+  <String Id="FilesInUseHeader" Value="Fichiers en cours d’utilisation"/>
+  <String Id="FilesInUseLabel" Value="Les applications suivantes utilisent des fichiers qui doivent être mis à jour :"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Fermer les &amp;applications et essayer de les redémarrer."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Ne fermez pas les applications. Un redémarrage sera nécessaire."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Fermez les &amp;applications."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Annuler"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Recommencer"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignorer"/>
+  <String Id="FilesInUseExitButton" Value="Q&amp;uitter"/>
+  <String Id="FilesInUseTitle" Value="Fichiers en cours d’utilisation"/>
+  <String Id="LicenseAssent" Value="En cliquant sur Installer, vous acceptez les conditions suivantes :"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Déclaration de confidentialité&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informations de licence pour .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Collecte de données de télémétrie et option de refus&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;conditions de licence&lt;/a&gt; et &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;déclaration de confidentialité&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl
new file mode 100644
index 000000000000..cd35cff97681
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Installazione di [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Versione di [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Annullare?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versione precedente"/>
+  <String Id="HelpHeader" Value="Guida all'installazione"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - Consente di installare, riparare, disinstallare oppure
+   creare una copia locale completa del pacchetto nella directory. Install è l'opzione predefinita.
+
+/passive | /quiet - Consente di visualizzare un'interfaccia utente minima senza prompt o di non visualizzare alcuna interfaccia utente e
+   alcun prompt. Per impostazione predefinita, vengono visualizzate l'interfaccia utente e tutti i prompt.
+
+/norestart - Consente di impedire qualsiasi tentativo di riavvio. Per impostazione predefinita, prima del riavvio verrà visualizzato un prompt nell'interfaccia utente.
+/log log.txt - Esegue la registrazione in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Chiudi"/>
+  <String Id="InstallAcceptCheckbox" Value="A&amp;ccetto i termini e le condizioni di licenza"/>
+  <String Id="InstallInstallButton" Value="&amp;Installa"/>
+  <String Id="InstallCloseButton" Value="&amp;Chiudi"/>
+  <String Id="ProgressHeader" Value="Stato dell'installazione"/>
+  <String Id="ProgressLabel" Value="Elaborazione:"/>
+  <String Id="OverallProgressPackageText" Value="Inizializzazione in corso..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Annulla"/>
+  <String Id="ModifyHeader" Value="Modifica installazione"/>
+  <String Id="ModifyRepairButton" Value="&amp;Ripristina"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Disinstalla"/>
+  <String Id="ModifyCloseButton" Value="&amp;Chiudi"/>
+  <String Id="SuccessCacheHeader" Value="Memorizzazione nella cache completata"/>
+  <String Id="SuccessModifyHeader" Value="Modifica completata"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Disinstallazione completata"/>
+  <String Id="SuccessLayoutHeader" Value="Layout completato"/>
+  <String Id="SuccessRepairHeader" Value="Riparazione completata"/>
+  <String Id="SuccessUninstallHeader" Value="Disinstallazione completata"/>
+  <String Id="SuccessInstallHeader" Value="Installazione completata correttamente"/>
+  <String Id="SuccessHeader" Value="Configurazione completata"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Avvio"/>
+  <String Id="SuccessRestartText" Value="Per poter usare il software, è necessario riavviare il computer."/>
+  <String Id="SuccessUninstallRestartText" Value="È necessario riavviare il computer per completare la rimozione del software."/>
+  <String Id="SuccessRestartButton" Value="&amp;Riavvia"/>
+  <String Id="SuccessCloseButton" Value="&amp;Chiudi"/>
+  <String Id="FailureHeader" Value="Configurazione non riuscita"/>
+  <String Id="FailureCacheHeader" Value="Memorizzazione nella cache non riuscita"/>
+  <String Id="FailureLayoutHeader" Value="Layout non riuscito"/>
+  <String Id="FailureInstallHeader" Value="Configurazione non riuscita"/>
+  <String Id="FailureUninstallHeader" Value="Disinstallazione non riuscita"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Disinstallazione non riuscita"/>
+  <String Id="FailureRepairHeader" Value="Riparazione non riuscita"/>
+  <String Id="FailureModifyHeader" Value="Modifica non riuscita"/>
+  <String Id="FailureHyperlinkLogText" Value="L'installazione non è stata completata a causa di uno o più problemi. Risolvere i problemi e quindi riprovare a eseguire l'installazione. Per altre informazioni, vedere il &lt;a href=&quot;#&quot;&gt;file di log&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Per completare il rollback del software, è necessario riavviare il computer."/>
+  <String Id="FailureRestartButton" Value="&amp;Riavvia"/>
+  <String Id="FailureCloseButton" Value="&amp;Chiudi"/>
+  <String Id="FilesInUseHeader" Value="File in uso"/>
+  <String Id="FilesInUseLabel" Value="Le applicazioni seguenti usano file che necessitano di aggiornamento:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Chiudi tutte le applicazioni e tenta di riavviarle."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Non chiudere le applicazioni. Sarà necessario riavviare il sistema."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Chiudi le &amp;applicazioni."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Annulla"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Riprova"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignora"/>
+  <String Id="FilesInUseExitButton" Value="E&amp;sci"/>
+  <String Id="FilesInUseTitle" Value="File in uso"/>
+  <String Id="LicenseAssent" Value="Facendo clic su Installa, si accettano le condizioni seguenti:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Informativa sulla privacy&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informazioni sulle licenze per .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Raccolta di telemetria e rifiuto esplicito&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;Condizioni di licenza&lt;/a&gt; e &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;Informativa sulla privacy&lt;/a&gt; di [WixBundleName]."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl
new file mode 100644
index 000000000000..07ec85e5459b
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] のセットアップ"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="バージョン [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="取り消しますか?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="以前のバージョン"/>
+  <String Id="HelpHeader" Value="セットアップのヘルプ"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - ディレクトリ内のバンドルの完全なローカル コピーを
+   インストール、修復、アンインストール、または作成します。install が既定値です。
+
+/passive | /quiet - プロンプトなしで最小限の UI を表示するか、UI もプロンプトも
+   表示しません。既定では、UI とすべてのプロンプトが表示されます。
+
+/norestart - 再起動の試行をすべて抑止します。既定では、再起動の前に UI が表示されます。
+/log log.txt - 特定のファイルにログを出力します。既定では、ログ ファイルは %TEMP% に作成されます。"/>
+  <String Id="HelpCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="ライセンス条項および条件に同意します(&amp;A)"/>
+  <String Id="InstallInstallButton" Value="インストール(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="ProgressHeader" Value="セットアップの進行状況"/>
+  <String Id="ProgressLabel" Value="処理中:"/>
+  <String Id="OverallProgressPackageText" Value="初期化しています..."/>
+  <String Id="ProgressCancelButton" Value="キャンセル(&amp;C)"/>
+  <String Id="ModifyHeader" Value="セットアップの変更"/>
+  <String Id="ModifyRepairButton" Value="修復(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="アンインストール(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="キャッシュが正常に完了しました"/>
+  <String Id="SuccessModifyHeader" Value="変更が正常に完了しました"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="アンインストールが正常に完了しました"/>
+  <String Id="SuccessLayoutHeader" Value="レイアウトが正常に完了しました"/>
+  <String Id="SuccessRepairHeader" Value="修復が正常に完了しました"/>
+  <String Id="SuccessUninstallHeader" Value="アンインストールが正常に完了しました"/>
+  <String Id="SuccessInstallHeader" Value="インストールが正常に完了しました"/>
+  <String Id="SuccessHeader" Value="セットアップに成功しました"/>
+  <String Id="SuccessLaunchButton" Value="起動(&amp;L)"/>
+  <String Id="SuccessRestartText" Value="ソフトウェアを使用する前にコンピューターを再起動する必要があります。"/>
+  <String Id="SuccessUninstallRestartText" Value="ソフトウェアの削除を完了するには、コンピューターを再起動する必要があります。"/>
+  <String Id="SuccessRestartButton" Value="再起動(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="FailureHeader" Value="セットアップに失敗しました"/>
+  <String Id="FailureCacheHeader" Value="キャッシュに失敗しました"/>
+  <String Id="FailureLayoutHeader" Value="レイアウトに失敗しました"/>
+  <String Id="FailureInstallHeader" Value="セットアップに失敗しました"/>
+  <String Id="FailureUninstallHeader" Value="アンインストールに失敗しました"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="アンインストールに失敗しました"/>
+  <String Id="FailureRepairHeader" Value="修復に失敗しました"/>
+  <String Id="FailureModifyHeader" Value="変更に失敗しました"/>
+  <String Id="FailureHyperlinkLogText" Value="1 つ以上の問題が原因でセットアップが失敗しました。問題を修正してから、セットアップを再試行してください。詳細については、&lt;a href=&quot;#&quot;&gt;ログ ファイル&lt;/a&gt;を参照してください。"/>
+  <String Id="FailureRestartText" Value="ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。"/>
+  <String Id="FailureRestartButton" Value="再起動(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="ファイルは使用中です"/>
+  <String Id="FilesInUseLabel" Value="次のアプリケーションは、更新の必要があるファイルを使用しています:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="アプリケーションを終了してから再起動します(&amp;A)。"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="アプリケーションを閉じません(&amp;D)。再起動が必要です。"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="アプリケーションを閉じます(&amp;A)。"/>
+  <String Id="FilesInUseOkButton" Value="OK(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="キャンセル(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="再試行(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="無視(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="終了(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="ファイルが使用中"/>
+  <String Id="LicenseAssent" Value="インストール をクリックすると、次の条項に同意したものと見なされます:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;プライバシーに関する声明&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET のライセンス情報&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;テレメトリの収集とオプトアウト&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] の &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;ライセンス条項&lt;/a&gt; および &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;プライバシーに関する声明&lt;/a&gt;。"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl
new file mode 100644
index 000000000000..fa156e015132
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] 설치"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="버전 [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="취소하시겠습니까?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="이전 버전"/>
+  <String Id="HelpHeader" Value="설치 도움말"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - 설치, 복구, 제거 또는
+   디렉터리에 번들의 전체 로컬 복사본을 만듭니다. 설치가 기본값입니다.
+
+/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI와
+   프롬프트를 표시하지 않습니다. 기본적으로 UI와 모든 프롬프트가 표시됩니다.
+
+/norestart   - 다시 시작 시도를 억제합니다. 기본적으로 UI는 다시 시작하기 전에 메시지를 표시합니다.
+/log log.txt - 특정 파일에 로그합니다. 기본적으로 로그 파일은 %TEMP%에 만들어집니다."/>
+  <String Id="HelpCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="라이선스 사용 약관에 동의합니다(&amp;A)."/>
+  <String Id="InstallInstallButton" Value="설치(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="ProgressHeader" Value="설치 진행률"/>
+  <String Id="ProgressLabel" Value="처리하는 중:"/>
+  <String Id="OverallProgressPackageText" Value="초기화하는 중..."/>
+  <String Id="ProgressCancelButton" Value="취소(&amp;C)"/>
+  <String Id="ModifyHeader" Value="설치 수정"/>
+  <String Id="ModifyRepairButton" Value="복구(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="제거(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="캐시가 완료됨"/>
+  <String Id="SuccessModifyHeader" Value="수정 완료됨"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="제거 완료됨"/>
+  <String Id="SuccessLayoutHeader" Value="레이아웃 완료됨"/>
+  <String Id="SuccessRepairHeader" Value="복구 완료됨"/>
+  <String Id="SuccessUninstallHeader" Value="제거 완료됨"/>
+  <String Id="SuccessInstallHeader" Value="설치 완료됨"/>
+  <String Id="SuccessHeader" Value="설치 완료"/>
+  <String Id="SuccessLaunchButton" Value="시작(&amp;L)"/>
+  <String Id="SuccessRestartText" Value="소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다."/>
+  <String Id="SuccessUninstallRestartText" Value="소프트웨어 제거를 완료하려면 컴퓨터를 다시 시작해야 합니다."/>
+  <String Id="SuccessRestartButton" Value="다시 시작(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="FailureHeader" Value="설치 실패"/>
+  <String Id="FailureCacheHeader" Value="캐시 실패"/>
+  <String Id="FailureLayoutHeader" Value="레이아웃 실패"/>
+  <String Id="FailureInstallHeader" Value="설치 실패"/>
+  <String Id="FailureUninstallHeader" Value="제거 실패"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="제거 실패"/>
+  <String Id="FailureRepairHeader" Value="복구 실패"/>
+  <String Id="FailureModifyHeader" Value="수정 실패"/>
+  <String Id="FailureHyperlinkLogText" Value="하나 이상의 문제로 인해 설치가 실패했습니다. 문제를 해결한 후 설치를 다시 시도하세요. 자세한 내용은 &lt;a href=&quot;#&quot;&gt;로그 파일&lt;/a&gt;을 참조하세요."/>
+  <String Id="FailureRestartText" Value="소프트웨어 롤백을 완료하려면 먼저 컴퓨터를 다시 시작해야 합니다."/>
+  <String Id="FailureRestartButton" Value="다시 시작(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="사용 중인 파일"/>
+  <String Id="FilesInUseLabel" Value="다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다."/>
+  <String Id="FilesInUseCloseRadioButton" Value="애플리케이션을 닫고 다시 시작합니다(&amp;A)."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="애플리케이션을 닫지 마세요(&amp;D). 다시 부팅해야 합니다."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="애플리케이션을 닫습니다(&amp;A)."/>
+  <String Id="FilesInUseOkButton" Value="확인(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="취소(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="다시 시도(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="무시(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="끝내기(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="사용 중인 파일"/>
+  <String Id="LicenseAssent" Value="설치를 클릭하면 다음 사용 약관에 동의하는 것입니다."/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;개인정보처리방침&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET에 대한 라이선싱 정보&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;원격 분석 수집 및 옵트아웃&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;사용 조건&lt;/a&gt;과 &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;개인정보 처리방침&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
new file mode 100644
index 000000000000..e9dd3ad9f88e
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] — instalacja"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Wersja [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Czy na pewno chcesz anulować?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Poprzednia wersja"/>
+  <String Id="HelpHeader" Value="Konfiguracja — Pomoc"/>
+  
+  <String Id="HelpText" Value="/instaluj | /napraw | /odinstaluj | /układ [\[]katalog[\]] — instaluje, naprawia, odinstalowuje lub
+   tworzy pełną kopię lokalną pakietu w katalogu. Instalacja jest domyślna.
+
+/pasywny| /spokojny — wyświetla minimalny interfejs użytkownika bez monitów lub nie wyświetla interfejsu użytkownika
+   brak monitów. Domyślnie wyświetlane są interfejsy użytkownika i wszystkie monity.
+
+/brakrestartu — powstrzymuje przed ewentualnymi próbami ponownego uruchomienia. Domyślnie interfejs użytkownika będzie monitować przed ponownym uruchomieniem.
+/zarejestruj log.txt — rejestruje w określonym pliku. Domyślnie plik dziennika jest tworzony w folderze %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Zamknij"/>
+  <String Id="InstallAcceptCheckbox" Value="&amp;Akceptuję postanowienia licencyjne"/>
+  <String Id="InstallInstallButton" Value="&amp;Zainstaluj"/>
+  <String Id="InstallCloseButton" Value="&amp;Zamknij"/>
+  <String Id="ProgressHeader" Value="Postęp konfiguracji"/>
+  <String Id="ProgressLabel" Value="Przetwarzanie:"/>
+  <String Id="OverallProgressPackageText" Value="Trwa inicjowanie..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Anuluj"/>
+  <String Id="ModifyHeader" Value="Modyfikowanie instalacji"/>
+  <String Id="ModifyRepairButton" Value="&amp;Napraw"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Odinstaluj"/>
+  <String Id="ModifyCloseButton" Value="&amp;Zamknij"/>
+  <String Id="SuccessCacheHeader" Value="Buforowanie zostało ukończone pomyślnie"/>
+  <String Id="SuccessModifyHeader" Value="Modyfikowanie zostało ukończone pomyślnie"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Pomyślnie ukończono operację odinstalowania"/>
+  <String Id="SuccessLayoutHeader" Value="Układ został ukończony pomyślnie"/>
+  <String Id="SuccessRepairHeader" Value="Pomyślnie ukończono naprawę"/>
+  <String Id="SuccessUninstallHeader" Value="Pomyślnie ukończono operację odinstalowania"/>
+  <String Id="SuccessInstallHeader" Value="Pomyślnie ukończono instalację"/>
+  <String Id="SuccessHeader" Value="Konfiguracja powiodła się"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Uruchom"/>
+  <String Id="SuccessRestartText" Value="Aby móc korzystać z oprogramowania, musisz uruchomić ponownie komputer."/>
+  <String Id="SuccessUninstallRestartText" Value="Aby zakończyć usuwanie oprogramowania, należy ponownie uruchomić komputer."/>
+  <String Id="SuccessRestartButton" Value="&amp;Uruchom ponownie"/>
+  <String Id="SuccessCloseButton" Value="&amp;Zamknij"/>
+  <String Id="FailureHeader" Value="Konfiguracja nie powiodła się"/>
+  <String Id="FailureCacheHeader" Value="Buforowanie nie powiodło się"/>
+  <String Id="FailureLayoutHeader" Value="Układ nie powiódł się"/>
+  <String Id="FailureInstallHeader" Value="Konfiguracja nie powiodła się"/>
+  <String Id="FailureUninstallHeader" Value="Operacja odinstalowania nie powiodła się"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Operacja odinstalowania nie powiodła się"/>
+  <String Id="FailureRepairHeader" Value="Naprawa nie powiodła się"/>
+  <String Id="FailureModifyHeader" Value="Modyfikacja nie powiodła się"/>
+  <String Id="FailureHyperlinkLogText" Value="Co najmniej jeden problem spowodował niepowodzenie konfiguracji. Rozwiąż problemy, a następnie ponów próbę konfiguracji. Aby uzyskać więcej informacji, zobacz &lt;a href=&quot;#&quot;&gt;plik dziennika&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Aby ukończyć wycofywanie oprogramowania, musisz uruchomić ponownie komputer."/>
+  <String Id="FailureRestartButton" Value="&amp;Uruchom ponownie"/>
+  <String Id="FailureCloseButton" Value="&amp;Zamknij"/>
+  <String Id="FilesInUseHeader" Value="Pliki w użyciu"/>
+  <String Id="FilesInUseLabel" Value="Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Zamknij &amp;aplikacje i spróbuj je ponownie uruchomić."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Nie zamykaj aplikacji. Wymagany będzie ponowny rozruch."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Zamknij &amp;aplikacje."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Anuluj"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Ponów próbę"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignoruj"/>
+  <String Id="FilesInUseExitButton" Value="Za&amp;kończ"/>
+  <String Id="FilesInUseTitle" Value="Pliki w użyciu"/>
+  <String Id="LicenseAssent" Value="Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Oświadczenie o ochronie prywatności&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informacje licencyjne dla platformy .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Zbieranie telemetrii i rezygnacja&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;postanowienia licencyjne&lt;/a&gt; i &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;zasady zachowania poufności informacji&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl
new file mode 100644
index 000000000000..52dc6e0a764c
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] Configuração"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Versão [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Tem certeza de que deseja cancelar?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versão anterior"/>
+  <String Id="HelpHeader" Value="Ajuda de Configuração"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - instala, repara, desinstala ou
+   cria uma cópia local completa do pacote no diretório. A instalação é padrão.
+
+/passive | /quiet - exibe interface mínima sem solicitações ou não exibe interface e
+   nenhuma solicitação. Por padrão, a interface e todas as solicitações são exibidas.
+
+/norestart - suprime quaisquer tentativas de reinício. Por padrão, a interface exibirá uma solicitação antes de reiniciar.
+/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Fechar"/>
+  <String Id="InstallAcceptCheckbox" Value="Eu &amp;concordo com os termos e condições da licença"/>
+  <String Id="InstallInstallButton" Value="I&amp;nstalar"/>
+  <String Id="InstallCloseButton" Value="&amp;Fechar"/>
+  <String Id="ProgressHeader" Value="Progresso da Instalação"/>
+  <String Id="ProgressLabel" Value="Processamento:"/>
+  <String Id="OverallProgressPackageText" Value="Inicializando..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Cancelar"/>
+  <String Id="ModifyHeader" Value="Modificar Instalação"/>
+  <String Id="ModifyRepairButton" Value="&amp;Reparar"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Desinstalar"/>
+  <String Id="ModifyCloseButton" Value="&amp;Fechar"/>
+  <String Id="SuccessCacheHeader" Value="Cache Concluído com Sucesso"/>
+  <String Id="SuccessModifyHeader" Value="Modificação Concluída com Sucesso"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Desinstalação Concluída com Sucesso"/>
+  <String Id="SuccessLayoutHeader" Value="Layout Concluído com Sucesso"/>
+  <String Id="SuccessRepairHeader" Value="Reparo Concluído com Sucesso"/>
+  <String Id="SuccessUninstallHeader" Value="Desinstalação Concluída com Sucesso"/>
+  <String Id="SuccessInstallHeader" Value="Instalação Concluída com Sucesso"/>
+  <String Id="SuccessHeader" Value="Instalação bem-sucedida"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Iniciar"/>
+  <String Id="SuccessRestartText" Value="Você deve reiniciar seu computador antes de usar o software."/>
+  <String Id="SuccessUninstallRestartText" Value="Você precisa reiniciar o seu computador para concluir a remoção do software."/>
+  <String Id="SuccessRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="SuccessCloseButton" Value="&amp;Fechar"/>
+  <String Id="FailureHeader" Value="Falha na Instalação"/>
+  <String Id="FailureCacheHeader" Value="Falha no Cache"/>
+  <String Id="FailureLayoutHeader" Value="Falha no Layout"/>
+  <String Id="FailureInstallHeader" Value="Falha na Instalação"/>
+  <String Id="FailureUninstallHeader" Value="Falha ao Desinstalar"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Falha ao Desinstalar"/>
+  <String Id="FailureRepairHeader" Value="Falha no Reparo"/>
+  <String Id="FailureModifyHeader" Value="Falha ao Modificar"/>
+  <String Id="FailureHyperlinkLogText" Value="Um ou mais problemas fizeram com que a instalação falhasse. Corrija os problemas e, em seguida, tente a instalação novamente. Para mais informações, consulte o &lt;a href=&quot;#&quot;&gt;arquivo de log&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Você deve reiniciar o computador para concluir a reversão do software."/>
+  <String Id="FailureRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="FailureCloseButton" Value="&amp;Fechar"/>
+  <String Id="FilesInUseHeader" Value="Arquivos em Uso"/>
+  <String Id="FilesInUseLabel" Value="Os aplicativos a seguir estão usando arquivos que precisam ser atualizados:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Feche os &amp;aplicativos e tente reiniciá-los."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Não fechar aplicativos. Uma reinicialização será necessária."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Feche os &amp;aplicativos."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Cancelar"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Repetir"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignorar"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Saída"/>
+  <String Id="FilesInUseTitle" Value="Arquivos em Uso"/>
+  <String Id="LicenseAssent" Value="Ao clicar em Instalar, você concorda com os termos a seguir:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Política de privacidade&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informações de licenciamento para .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Coleta e recusa de telemetria&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;termos de licença&lt;/a&gt; e &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;declaração de privacidade&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl
new file mode 100644
index 000000000000..4b2e77b12218
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Установка [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Версия [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Вы действительно хотите отменить?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Предыдущая версия"/>
+  <String Id="HelpHeader" Value="Справка по установке"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] — устанавливает, исправляет, удаляет или
+   создает полную локальную копию пакета в каталоге. По умолчанию выполняется установка.
+
+/passive | /quiet — показывает минимальный пользовательский интерфейс без запросов или вообще не показывает пользовательский интерфейс и
+   запросы. По умолчанию отображаются пользовательский интерфейс и все запросы.
+
+/norestart — подавлять все попытки перезапуска. По умолчанию пользовательский интерфейс запрашивает подтверждение перед перезапуском.
+/log log.txt — журналы в определенном файле. По умолчанию файл журнала создается в папке %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Закрыть"/>
+  <String Id="InstallAcceptCheckbox" Value="Я &amp;принимаю условия лицензии"/>
+  <String Id="InstallInstallButton" Value="&amp;Установить"/>
+  <String Id="InstallCloseButton" Value="&amp;Закрыть"/>
+  <String Id="ProgressHeader" Value="Ход установки"/>
+  <String Id="ProgressLabel" Value="Выполняется обработка:"/>
+  <String Id="OverallProgressPackageText" Value="Выполняется инициализация…"/>
+  <String Id="ProgressCancelButton" Value="&amp;Отмена"/>
+  <String Id="ModifyHeader" Value="Изменение установки"/>
+  <String Id="ModifyRepairButton" Value="&amp;Исправить"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Удалить"/>
+  <String Id="ModifyCloseButton" Value="&amp;Закрыть"/>
+  <String Id="SuccessCacheHeader" Value="Кэширование успешно завершено"/>
+  <String Id="SuccessModifyHeader" Value="Изменение успешно завершено"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Удаление успешно завершено"/>
+  <String Id="SuccessLayoutHeader" Value="Компоновка успешно завершена"/>
+  <String Id="SuccessRepairHeader" Value="Исправление успешно завершено"/>
+  <String Id="SuccessUninstallHeader" Value="Удаление успешно завершено"/>
+  <String Id="SuccessInstallHeader" Value="Установка успешно завершена"/>
+  <String Id="SuccessHeader" Value="Настройка успешно завершена"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Запустить"/>
+  <String Id="SuccessRestartText" Value="Перед использованием программного обеспечения необходимо перезапустить компьютер."/>
+  <String Id="SuccessUninstallRestartText" Value="Чтобы завершить удаление программного обеспечения, перезагрузите компьютер."/>
+  <String Id="SuccessRestartButton" Value="&amp;Перезагрузить"/>
+  <String Id="SuccessCloseButton" Value="&amp;Закрыть"/>
+  <String Id="FailureHeader" Value="Не удалось выполнить установку"/>
+  <String Id="FailureCacheHeader" Value="Сбой кэша"/>
+  <String Id="FailureLayoutHeader" Value="Сбой макета"/>
+  <String Id="FailureInstallHeader" Value="Не удалось выполнить установку"/>
+  <String Id="FailureUninstallHeader" Value="Не удалось выполнить удаление"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Не удалось выполнить удаление"/>
+  <String Id="FailureRepairHeader" Value="Не удалось выполнить исправление"/>
+  <String Id="FailureModifyHeader" Value="Сбой изменения"/>
+  <String Id="FailureHyperlinkLogText" Value="Возникли ошибки, вызвавшие сбой настройки. Устраните проблемы и повторите попытку настройки. Дополнительные сведения см. в &lt;a href=&quot;#&quot;&gt;файле журнала&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Необходимо перезагрузить компьютер перед тем, как выполнять откат программного обеспечения."/>
+  <String Id="FailureRestartButton" Value="&amp;Перезагрузить"/>
+  <String Id="FailureCloseButton" Value="&amp;Закрыть"/>
+  <String Id="FilesInUseHeader" Value="Используемые файлы"/>
+  <String Id="FilesInUseLabel" Value="Следующие приложения используют файлы, которые следует обновить:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Закрыть приложения и попробовать перезапустить их."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Не закрывать приложения. Потребуется перезагрузка."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="&amp;Закрыть приложения."/>
+  <String Id="FilesInUseOkButton" Value="&amp;ОК"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Отмена"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Повторить"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Пропустить"/>
+  <String Id="FilesInUseExitButton" Value="Вы&amp;ход"/>
+  <String Id="FilesInUseTitle" Value="Используемые файлы"/>
+  <String Id="LicenseAssent" Value="Нажимая кнопку &quot;Установить&quot;, вы принимаете следующие условия."/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Заявление о конфиденциальности&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Сведения о лицензировании для .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Сбор данных телеметрии и возможность отказа&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;Условия лицензии&lt;/a&gt; и &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;заявление о конфиденциальности&lt;/a&gt; [WixBundleName]."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl
new file mode 100644
index 000000000000..7256f4f39272
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] Kurulumu"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="[WixBundleVersion] Sürümü"/>
+  <String Id="ConfirmCancelMessage" Value="İptal etmek istediğinizden emin misiniz?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Önceki sürüm"/>
+  <String Id="HelpHeader" Value="Kurulum Yardımı"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - yükler, onarır, kaldırır veya
+   paketin tam bir yerel kopyasını dizinde oluşturur. Yükleme varsayılandır.
+
+/passive | /quiet - komut istemleri olmadan minimal kullanıcı arayüzü görüntüler veya kullanıcı arayüzü görüntülemez ve
+   istem olmadan görüntüler. Varsayılan olarak kullanıcı arabirimi ve tüm istemler görüntülenir.
+
+/norestart   - yeniden başlatma girişimlerini durdur. Varsayılan olarak kullanıcı arabirimi yeniden başlatmadan önce soracaktır.
+/log log.txt - belirli bir dosyaya kaydeder. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur."/>
+  <String Id="HelpCloseButton" Value="&amp;Kapat"/>
+  <String Id="InstallAcceptCheckbox" Value="Lisans hüküm ve koşullarını &amp;kabul ediyorum"/>
+  <String Id="InstallInstallButton" Value="&amp;Yükle"/>
+  <String Id="InstallCloseButton" Value="&amp;Kapat"/>
+  <String Id="ProgressHeader" Value="Kurulum İlerleme Durumu"/>
+  <String Id="ProgressLabel" Value="İşleniyor:"/>
+  <String Id="OverallProgressPackageText" Value="Başlatılıyor..."/>
+  <String Id="ProgressCancelButton" Value="İ&amp;ptal"/>
+  <String Id="ModifyHeader" Value="Kurulumu Değiştir"/>
+  <String Id="ModifyRepairButton" Value="&amp;Onar"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Kaldır"/>
+  <String Id="ModifyCloseButton" Value="&amp;Kapat"/>
+  <String Id="SuccessCacheHeader" Value="Önbellek Başarıyla Tamamlandı"/>
+  <String Id="SuccessModifyHeader" Value="Değiştirme Başarıyla Tamamlandı"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Kaldırma Başarıyla Tamamlandı"/>
+  <String Id="SuccessLayoutHeader" Value="Düzen Başarıyla Tamamlandı"/>
+  <String Id="SuccessRepairHeader" Value="Onarım Başarıyla Tamamlandı"/>
+  <String Id="SuccessUninstallHeader" Value="Kaldırma Başarıyla Tamamlandı"/>
+  <String Id="SuccessInstallHeader" Value="Yükleme Başarıyla Tamamlandı"/>
+  <String Id="SuccessHeader" Value="Kurulum Başarılı"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Başlatma"/>
+  <String Id="SuccessRestartText" Value="Yazılımı kullanabilmek için bilgisayarınızı yeniden başlatmanız gerekiyor."/>
+  <String Id="SuccessUninstallRestartText" Value="Yazılımın kaldırılmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor."/>
+  <String Id="SuccessRestartButton" Value="&amp;Yeniden Başlat"/>
+  <String Id="SuccessCloseButton" Value="&amp;Kapat"/>
+  <String Id="FailureHeader" Value="Kurulum Başarısız"/>
+  <String Id="FailureCacheHeader" Value="Önbellek Başarısız"/>
+  <String Id="FailureLayoutHeader" Value="Düzen Başarısız"/>
+  <String Id="FailureInstallHeader" Value="Kurulum Başarısız"/>
+  <String Id="FailureUninstallHeader" Value="Kaldırılamadı"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Kaldırılamadı"/>
+  <String Id="FailureRepairHeader" Value="Onarım Başarısız"/>
+  <String Id="FailureModifyHeader" Value="Değiştirme Başarısız"/>
+  <String Id="FailureHyperlinkLogText" Value="Bir veya daha fazla sorun kurulumun başarısız olmasına neden oldu. Lütfen sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için &lt;a href=&quot;#&quot;&gt;günlük dosyasına&lt;/a&gt; bakın."/>
+  <String Id="FailureRestartText" Value="Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor."/>
+  <String Id="FailureRestartButton" Value="&amp;Yeniden Başlat"/>
+  <String Id="FailureCloseButton" Value="&amp;Kapat"/>
+  <String Id="FilesInUseHeader" Value="Kullanımda Olan Dosyalar"/>
+  <String Id="FilesInUseLabel" Value="Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Uygulamaları kapatın ve yeniden başlatmayı deneyin."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Uygulamaları kapatmayın. Yeniden başlatma gerekiyor."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="&amp;Uygulamaları kapatın."/>
+  <String Id="FilesInUseOkButton" Value="&amp;Tamam"/>
+  <String Id="FilesInUseCancelButton" Value="İ&amp;ptal"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Yeniden Dene"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Yoksay"/>
+  <String Id="FilesInUseExitButton" Value="Çı&amp;k"/>
+  <String Id="FilesInUseTitle" Value="Kullanımda Olan Dosyalar"/>
+  <String Id="LicenseAssent" Value="Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Gizlilik Bildirimi&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET için Lisans Bilgileri&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetri toplama ve geri çevirme&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;lisans koşulları&lt;/a&gt; ve &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;gizlilik bildirimi&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl
new file mode 100644
index 000000000000..8356b9b25999
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] 安装"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="版本 [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="是否确实要取消?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="上一个版本"/>
+  <String Id="HelpHeader" Value="安装帮助"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - 安装、修复、卸载或
+   在目录中创建捆绑包的完整本地副本。Install 为默认值。
+
+/passive | /quiet - 显示最小 UI 且无提示，或不显示 UI 和
+   提示。默认情况下，将显示 UI 和所有提示。
+
+/norestart - 禁止任何重启尝试。默认情况下，UI 将在重启前提示。
+/log log.txt - 记录到特定文件。默认在 %TEMP% 中创建日志文件。"/>
+  <String Id="HelpCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="我同意(&amp;A)许可条款和条件"/>
+  <String Id="InstallInstallButton" Value="安装(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="ProgressHeader" Value="安装进度"/>
+  <String Id="ProgressLabel" Value="正在处理:"/>
+  <String Id="OverallProgressPackageText" Value="正在初始化..."/>
+  <String Id="ProgressCancelButton" Value="取消(&amp;C)"/>
+  <String Id="ModifyHeader" Value="修改安装"/>
+  <String Id="ModifyRepairButton" Value="修复(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="卸载(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="已成功完成缓存"/>
+  <String Id="SuccessModifyHeader" Value="已成功完成修改"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="已成功完成卸载"/>
+  <String Id="SuccessLayoutHeader" Value="已成功完成布局"/>
+  <String Id="SuccessRepairHeader" Value="已成功完成修复"/>
+  <String Id="SuccessUninstallHeader" Value="已成功完成卸载"/>
+  <String Id="SuccessInstallHeader" Value="已成功完成安装"/>
+  <String Id="SuccessHeader" Value="安装成功"/>
+  <String Id="SuccessLaunchButton" Value="启动(&amp;L)"/>
+  <String Id="SuccessRestartText" Value="在使用此软件之前，您必须重新启动计算机。"/>
+  <String Id="SuccessUninstallRestartText" Value="必须重启计算机才能完成软件移除。"/>
+  <String Id="SuccessRestartButton" Value="重启(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="FailureHeader" Value="安装失败"/>
+  <String Id="FailureCacheHeader" Value="缓存失败"/>
+  <String Id="FailureLayoutHeader" Value="布局失败"/>
+  <String Id="FailureInstallHeader" Value="安装失败"/>
+  <String Id="FailureUninstallHeader" Value="卸载失败"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="卸载失败"/>
+  <String Id="FailureRepairHeader" Value="修复失败"/>
+  <String Id="FailureModifyHeader" Value="修改失败"/>
+  <String Id="FailureHyperlinkLogText" Value="一个或多个问题导致了安装失败。请修复问题，然后重试安装。有关详细信息，请参阅&lt;a href=&quot;#&quot;&gt;日志文件&lt;/a&gt;。"/>
+  <String Id="FailureRestartText" Value="必须重新启动计算机才能完成软件回退。"/>
+  <String Id="FailureRestartButton" Value="重启(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="文件正在使用"/>
+  <String Id="FilesInUseLabel" Value="以下应用程序正在使用的文件需要更新:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="关闭应用程序，并尝试重启它们(&amp;A)。"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="不关闭应用程序(&amp;D)。需要重新启动。"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="关闭应用程序(&amp;A)。"/>
+  <String Id="FilesInUseOkButton" Value="确定(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="取消(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="重试(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="忽略(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="退出(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="文件正在使用"/>
+  <String Id="LicenseAssent" Value="单击“安装”即表示你同意以下条款:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;隐私声明&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET 的许可信息&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;遥测收集和选择退出&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;许可条款&lt;/a&gt;和&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;隐私声明&lt;/a&gt;。"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl
new file mode 100644
index 000000000000..24e40a2fdd0b
--- /dev/null
+++ b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl
@@ -0,0 +1,78 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Configuración de [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BUNDLEMONIKER]"/>
+  
+  
+  <String Id="InstallVersion" Value="Versión [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="¿Está seguro de que desea cancelar?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versión anterior"/>
+  <String Id="HelpHeader" Value="Ayuda del programa de configuración"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]]: instala, repara, desinstala o
+   crea una copia local completa del paquete en el directorio. Instalar es el valor predeterminado.
+
+/passive | /quiet: muestra una interfaz de usuario mínima sin indicaciones o no muestra ninguna interfaz de usuario y ni
+   ninguna indicación. De manera predeterminada, se muestran la interfaz de usuario y todas las indicaciones.
+
+/norestart   : suprime los intentos de reinicio. De manera predeterminada, la interfaz de usuario le avisará antes del reinicio.
+/log log.txt: registra en un archivo específico. De manera predeterminada, se crea un archivo de registro en %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Cerrar"/>
+  <String Id="InstallAcceptCheckbox" Value="&amp;Acepto los términos y las condiciones de la licencia"/>
+  <String Id="InstallInstallButton" Value="&amp;Instalar"/>
+  <String Id="InstallCloseButton" Value="&amp;Cerrar"/>
+  <String Id="ProgressHeader" Value="Progreso de la instalación"/>
+  <String Id="ProgressLabel" Value="Procesando:"/>
+  <String Id="OverallProgressPackageText" Value="Inicializando..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Cancelar"/>
+  <String Id="ModifyHeader" Value="Modificar configuración"/>
+  <String Id="ModifyRepairButton" Value="&amp;Reparar"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Desinstalar"/>
+  <String Id="ModifyCloseButton" Value="&amp;Cerrar"/>
+  <String Id="SuccessCacheHeader" Value="El almacenamiento en caché se completó correctamente"/>
+  <String Id="SuccessModifyHeader" Value="La modificación se completó correctamente"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="La desinstalación se completó correctamente"/>
+  <String Id="SuccessLayoutHeader" Value="El diseño se completó correctamente"/>
+  <String Id="SuccessRepairHeader" Value="La reparación se completó correctamente"/>
+  <String Id="SuccessUninstallHeader" Value="La desinstalación se completó correctamente"/>
+  <String Id="SuccessInstallHeader" Value="La instalación se completó correctamente"/>
+  <String Id="SuccessHeader" Value="La configuración se realizó correctamente"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Iniciar"/>
+  <String Id="SuccessRestartText" Value="Debe reiniciar el equipo para poder usar el software."/>
+  <String Id="SuccessUninstallRestartText" Value="Debe reiniciar su equipo para completar la eliminación del software."/>
+  <String Id="SuccessRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="SuccessCloseButton" Value="&amp;Cerrar"/>
+  <String Id="FailureHeader" Value="No se pudo configurar"/>
+  <String Id="FailureCacheHeader" Value="No se pudo almacenar en caché"/>
+  <String Id="FailureLayoutHeader" Value="Error de diseño"/>
+  <String Id="FailureInstallHeader" Value="No se pudo configurar"/>
+  <String Id="FailureUninstallHeader" Value="No se pudo desinstalar"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="No se pudo desinstalar"/>
+  <String Id="FailureRepairHeader" Value="No se pudo reparar"/>
+  <String Id="FailureModifyHeader" Value="No se pudo modificar"/>
+  <String Id="FailureHyperlinkLogText" Value="Ha habido algún problema que ha provocado un error en la configuración. Corrija los problemas y vuelva a intentar la instalación. Para más información, consulte el &lt;a href=&quot;#&quot;&gt;archivo de registro&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Debe reiniciar el equipo para completar la reversión del software."/>
+  <String Id="FailureRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="FailureCloseButton" Value="&amp;Cerrar"/>
+  <String Id="FilesInUseHeader" Value="Archivos en uso"/>
+  <String Id="FilesInUseLabel" Value="Las siguientes aplicaciones usan archivos que se deben actualizar:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Cierre las &amp;aplicaciones e intente reiniciarlas."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;No cerrar aplicaciones. Será necesario un reinicio."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Cierre las &amp;aplicaciones."/>
+  <String Id="FilesInUseOkButton" Value="&amp;Aceptar"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Cancelar"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Reintentar"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Omitir"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Salir"/>
+  <String Id="FilesInUseTitle" Value="Archivos en uso"/>
+  <String Id="LicenseAssent" Value="Al hacer clic en Instalar, acepta los siguientes términos:"/>
+  <String Id="WelcomeHeaderMessage">ASP.NET Runtime</String>
+  <String Id="WelcomeDescription">The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it!</String>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Declaración de privacidad&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Información de licencias para .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Recopilación y rechazo de telemetría&lt;/A&gt;"/>
+
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;términos de licencia&lt;/a&gt; y &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;declaración de privacidad&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml b/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml
index 044b90f8b6da..2b57d860ed2b 100644
--- a/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml
+++ b/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
     <DiagnosticId>PKV0001</DiagnosticId>
-    <Target>net9.0</Target>
+    <Target>net10.0</Target>
   </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/src/Framework/App.Runtime/src/Directory.Build.props b/src/Framework/App.Runtime/src/Directory.Build.props
new file mode 100644
index 000000000000..6c3d39c75836
--- /dev/null
+++ b/src/Framework/App.Runtime/src/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <OutDirName Condition="'$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Runtime'">aspnetcore-sfx</OutDirName>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+</Project>
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj
new file mode 100644
index 000000000000..1e74652b7d32
--- /dev/null
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj
@@ -0,0 +1,141 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <PlatformPackageType>RuntimePack</PlatformPackageType>
+    <SharedFrameworkName>Microsoft.AspNetCore.App</SharedFrameworkName>
+    <SharedFrameworkFriendlyName>Microsoft ASP.NET Core</SharedFrameworkFriendlyName>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
+    <!-- System.Diagnostics.EventLog.Messages.dll has no file version -->
+    <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
+    <!-- Target the latest runtime patch so the latest version is specified in runtimeconfig.json -->
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <RollForward>LatestPatch</RollForward>
+    <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6. -->
+    <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' ">false</PublishReadyToRun>
+    <PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
+    <!-- Don't use ReadyToRun when explicitly opted out -->
+    <PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
+    <!-- Build a composite R2R image -->
+    <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
+
+    <!-- HACK: We aren't self-contained but we need to say we are so the SDK lets us do composite R2R -->
+    <SelfContained>true</SelfContained>
+
+    <InstructionSetSupport Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86'">+x86-64-v3</InstructionSetSupport>
+    <PublishReadyToRunCrossgen2ExtraArgs Condition="'$(InstructionSetSupport)' != ''">$(PublishReadyToRunCrossgen2ExtraArgs);--instruction-set:$(InstructionSetSupport)</PublishReadyToRunCrossgen2ExtraArgs>
+
+    <!-- Setting this suppresses getting documentation .xml files in the shared runtime output. -->
+    <AllowedReferenceRelatedFileExtensions>.pdb</AllowedReferenceRelatedFileExtensions>
+
+    <PartialCompositeAssemblyListPath>PartialCompositeAssemblyListPath.txt</PartialCompositeAssemblyListPath>
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>
+      $(GetSharedFrameworkFilesForReadyToRunDependsOn);
+      _AddExtensionsSymbolsToSymbolPack;
+    </GetSharedFrameworkFilesForReadyToRunDependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
+        Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
+        ExcludeAssets="All"
+        GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
+      <IncludeAssets>Runtime;Native</IncludeAssets>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <_AllExternalAspNetCoreAppReferences Include="@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <IgnoredDuplicateType Include="Microsoft.AspNetCore.Hosting.WebHostBuilderIISExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.SignalRDependencyInjectionExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.IdentityServiceCollectionExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.Logging.LoggingBuilderExtensions" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Temporary workaround tracked by https://github.com/dotnet/runtime/issues/84860 -->
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Configuration.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Configuration.Abstractions.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Configuration.Binder.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.DependencyInjection.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Logging.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Logging.Abstractions.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Logging.Console.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Logging.Configuration.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Options.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Options.ConfigurationExtensions.dll" />
+    <PublishReadyToRunExclusions Include="Microsoft.Extensions.Primitives.dll" />
+  </ItemGroup>
+
+  <Target Name="_ComputePartialCompositeRoots" BeforeTargets="ResolveReadyToRunCompilers">
+    <!-- Read list of assemblies that should generate native code for the full assembly in the composite image. -->
+    <ReadLinesFromFile File="$(PartialCompositeAssemblyListPath)">
+      <Output TaskParameter="Lines" ItemName="PublishReadyToRunCompositeRoots" />
+    </ReadLinesFromFile>
+  </Target>
+
+  <!-- Add native dependencies to the package when required. -->
+  <ItemGroup>
+    <ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative)  AND '$(MSBuildRestoreSessionId)' == ''"
+        Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
+      <SetPlatform>Platform=$(NativePlatform)</SetPlatform>
+      <!-- A custom item group to be used in targets later.  -->
+      <OutputItemType>NativeRuntimeAsset</OutputItemType>
+      <!-- C++ projects don't invoke GetTargetPath by default when building. -->
+      <Targets>Build;GetTargetPath</Targets>
+    </ProjectReference>
+
+    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
+        Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
+    <!-- Always explicitly include the .pdb -->
+    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
+        Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
+  </ItemGroup>
+
+  <!-- Explicitly include symbols for libraries we redistribute from runtime -->
+  <Target Name="_AddExtensionsSymbolsToSymbolPack">
+    <!-- Flatten _AllExternalAspNetCoreAppReferences into a property -->
+    <PropertyGroup>
+      <FileNameList>@(_AllExternalAspNetCoreAppReferences, ';')</FileNameList>
+      <!-- Add trailing semicolon -->
+      <FileNameList>$(FileNameList);</FileNameList>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
+          Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
+
+      <!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
+      <!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' == 'win'" />
+
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' != 'win'" />
+
+      <_SymbolFilesToPackage Include="@(_TransportPdbs)"
+          Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_WarnAboutUnbuiltNativeDependencies"
+          BeforeTargets="Build"
+          Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND
+              !EXISTS('$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll') ">
+    <Warning Text="This project has native dependencies which were not built. Without this, tests may not function correctly. Run `build.cmd -BuildNative -BuildManaged` to build both C# and C++." />
+  </Target>
+</Project>
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
deleted file mode 100644
index 48725d72139d..000000000000
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ /dev/null
@@ -1,723 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
-    <!-- Even though RuntimeIdentifier is set, shared framework projects are not self-contained projects -->
-    <SelfContained>false</SelfContained>
-    <PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId>
-    <!-- Do not exclude this project from source build -->
-    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
-    <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains assets used for self-contained deployments.
-
-This package is an internal implementation of the .NET Core SDK and is not meant to be used as a normal PackageReference.
-    </PackageDescription>
-    <PackageTags>aspnetcore;shared-framework</PackageTags>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <!-- There is a ref directory next to this project but it's not auto generated, disable the guardrails -->
-    <SkipRefDirectoryCheck>true</SkipRefDirectoryCheck>
-    <PackageType>DotnetPlatform</PackageType>
-
-    <!-- This file is used by the dotnet/core-sdk repo to determine if the version of AspNetCore.App is coherent with Microsoft.NETCore.App. -->
-    <BaseRuntimeVersionFileName>aspnetcore_base_runtime.version</BaseRuntimeVersionFileName>
-    <BaseRuntimeVersionFileOutputPath>$(InstallersOutputPath)$(BaseRuntimeVersionFileName)</BaseRuntimeVersionFileOutputPath>
-
-    <!-- NuGet appends target framework to this value. Example: runtimes/win-x64/lib/netcoreappX.Y/ -->
-    <BuildOutputTargetFolder>runtimes/$(RuntimeIdentifier)/lib/</BuildOutputTargetFolder>
-    <!-- We still need the native path to these assets though for the RuntimeList.xml manifest -->
-    <ManagedAssetsPackagePath>$(BuildOutputTargetFolder)$(DefaultNetCoreTargetFramework)</ManagedAssetsPackagePath>
-    <!-- Target framework is not appended to this because native assets do not have a target framework. -->
-    <NativeAssetsPackagePath>runtimes/$(RuntimeIdentifier)/native/</NativeAssetsPackagePath>
-
-    <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
-    <DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</DotNetRuntimeArchiveFileName>
-    <DotNetRuntimeDownloadPath>Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
-    <DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
-
-    <!-- Setting this suppresses getting documentation .xml files in the shared runtime output. -->
-    <AllowedReferenceRelatedFileExtensions>.pdb</AllowedReferenceRelatedFileExtensions>
-
-    <!-- Pack .ni.r2rmap files in symbols package (native symbols for Linux) -->
-    <AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>$(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.r2rmap</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
-
-    <!-- Optimize the framework using the crossgen2 tool. Crossgen2 is not currently supported on s390x or ppc64le or armv6 or loongarch64. -->
-    <CrossgenOutput Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' OR '$(TargetArchitecture)' == 'loongarch64' ">false</CrossgenOutput>
-    <!-- VMR doesn't produce valid crossgen for the host/build machine https://github.com/dotnet/source-build/issues/3793 -->
-    <CrossgenOutput Condition=" '$(DotNetBuild)' == 'true' AND '$(Crossbuild)' == 'true' ">false</CrossgenOutput>
-    <CrossgenOutput Condition=" '$(CrossgenOutput)' == '' AND '$(Configuration)' != 'Debug' ">true</CrossgenOutput>
-
-    <!-- Produce crossgen2 profiling symbols (.ni.pdb or .r2rmap files). -->
-    <GenerateCrossgenProfilingSymbols>true</GenerateCrossgenProfilingSymbols>
-    <GenerateCrossgenProfilingSymbols Condition=" '$(CrossgenOutput)' != 'true' OR '$(TargetOsName)' == 'osx' ">false</GenerateCrossgenProfilingSymbols>
-
-    <!-- Always generated, even though output type == Library -->
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <ProjectRuntimeConfigFileName>$(SharedFxName).runtimeconfig.json</ProjectRuntimeConfigFileName>
-    <!-- Target the latest runtime patch so the latest version is specified in runtimeconfig.json -->
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-
-    <!-- Suppress .deps generation because we have to customize its layout. -->
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-    <ProjectDepsFileName>$(SharedFxName).deps.json</ProjectDepsFileName>
-
-    <!-- There is no way to suppress .dev.runtimeconfig.json generation. Rename it to exclude it from the package. -->
-    <ProjectRuntimeConfigDevFilePath>$(IntermediateOutputPath)ignoreme.dev.runtimeconfig.json</ProjectRuntimeConfigDevFilePath>
-
-    <VersionTxtFileIntermediateOutputPath>$(IntermediateOutputPath)$(SharedFxName).versions.txt</VersionTxtFileIntermediateOutputPath>
-    <DotVersionFileIntermediateOutputPath>$(IntermediateOutputPath).version</DotVersionFileIntermediateOutputPath>
-
-    <!-- The project representing the shared framework doesn't produce a .NET assembly or symbols. -->
-    <DebugType>none</DebugType>
-    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-
-    <!-- Copy assets to output path from NuGet packages. -->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-
-    <!-- Workaround for the way Microsoft.AspNetCore.Server.IIS.csproj references ANCM native deps. Do not copy content from ProjectReference's CopyToOutput items.  -->
-    <_GetChildProjectCopyToOutputDirectoryItems>false</_GetChildProjectCopyToOutputDirectoryItems>
-
-    <!-- This project should not be referenced via the `<Reference>` implementation. -->
-    <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
-
-    <!-- Properties related to crossgen2 -->
-    <CrossGenSymbolsType>PerfMap</CrossGenSymbolsType>
-    <CrossGenSymbolsType Condition="'$(TargetOsName)' == 'win'">PDB</CrossGenSymbolsType>
-
-    <!--
-      hostfxr and hostpolicy libraries are named libhostfxr.so and libhostpolicy.so in non-Windows
-      microsoft.netcore.app.runtime packages.
-    -->
-    <LibPrefix Condition=" '$(TargetOsName)' != 'win' ">lib</LibPrefix>
-
-    <!-- crossgen2 executable name -->
-    <Crossgen2ToolFileName>crossgen2</Crossgen2ToolFileName>
-    <Crossgen2ToolFileName Condition=" '$(TargetOsName)' == 'win' ">$(Crossgen2ToolFileName).exe</Crossgen2ToolFileName>
-
-    <!-- E.g. "PkgMicrosoft_NETCore_App_Runtime_win-x64" (set in obj/Microsoft.AspNetCore.App.Runtime.csproj.nuget.g.props). -->
-    <RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName>
-
-    <!--
-      Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
-      are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container.
-      Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
-    -->
-    <BuildOsName>$(TargetOsName)</BuildOsName>
-    <BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64'">linux</BuildOsName>
-    <BuildOsName Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName>
-    <Crossgen2BuildArchitecture Condition=" '$(BuildOsName)' == 'win' ">x64</Crossgen2BuildArchitecture>
-    <Crossgen2BuildArchitecture Condition=" '$(Crossgen2BuildArchitecture)' == '' ">$(BuildArchitecture)</Crossgen2BuildArchitecture>
-    <Crossgen2PackageRootVariableName>PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName.Replace('.', '_'))-$(Crossgen2BuildArchitecture)</Crossgen2PackageRootVariableName>
-
-    <AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
-
-    <NativePlatform>$(TargetArchitecture)</NativePlatform>
-    <NativePlatform Condition=" '$(NativePlatform)' == 'x86' ">Win32</NativePlatform>
-
-    <!--
-      Package is needed when publishing for Helix tests. Set GeneratePackageOnBuild here, though sometimes
-      unnecessary, to avoid distinct references to this project.
-    -->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
-    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
-      <IncludeAssets>Runtime;Native</IncludeAssets>
-    </Reference>
-
-    <Reference Condition="'$(CrossgenOutput)' == 'true'"
-        Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
-        ExcludeAssets="All"
-        PrivateAssets="All"
-        GeneratePathProperty="true" />
-
-    <!--
-      This package contains the crossgen2 tool. Unfortunately, it doesn't make the tool easy to use.
-      $(GeneratePathProperty) and hacks in the _ExpandRuntimePackageRoot target work around the gaps.
-    -->
-    <Reference Condition="'$(CrossgenOutput)' == 'true'"
-        Include="Microsoft.NETCore.App.Crossgen2.$(BuildOsName)-$(Crossgen2BuildArchitecture)"
-        ExcludeAssets="All"
-        PrivateAssets="All"
-        GeneratePathProperty="true" />
-
-    <ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative) "
-        Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
-      <SetPlatform>Platform=$(NativePlatform)</SetPlatform>
-      <!-- Custom attribute used to distinguish managed from native references. -->
-      <IsNativeImage>true</IsNativeImage>
-      <!-- A custom item group to be used in targets later.  -->
-      <OutputItemType>_ResolvedNativeProjectReferencePaths</OutputItemType>
-      <!-- C++ projects don't invoke GetTargetPath by default when building. -->
-      <Targets>Build;GetTargetPath</Targets>
-    </ProjectReference>
-
-    <_ResolvedNativeProjectReferencePaths Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
-        Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll">
-      <IsNativeImage>true</IsNativeImage>
-    </_ResolvedNativeProjectReferencePaths>
-  </ItemGroup>
-
-  <ItemGroup>
-    <GenerateRuntimeConfigurationFilesInputs Include="$(MSBuildAllProjects)" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <SharedRuntimeSubPath>shared\$(SharedFxName)\$(SharedFxVersion)\</SharedRuntimeSubPath>
-    <SharedFxLayoutTargetDir>$(SharedFrameworkLayoutRoot)$(SharedRuntimeSubPath)</SharedFxLayoutTargetDir>
-    <RedistLayoutTargetDir>$(RedistSharedFrameworkLayoutRoot)$(SharedRuntimeSubPath)</RedistLayoutTargetDir>
-
-    <RuntimeListFileName>RuntimeList.xml</RuntimeListFileName>
-    <RuntimeListOutputPath>$(BaseIntermediateOutputPath)$(RuntimeListFileName)</RuntimeListOutputPath>
-
-    <RedistArchiveOutputFileName>$(RuntimeInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</RedistArchiveOutputFileName>
-    <RedistArchiveOutputPath>$(InstallersOutputPath)$(RedistArchiveOutputFileName)</RedistArchiveOutputPath>
-    <CompositeArchiveOutputFileName>$(RuntimeInstallerBaseName)-composite-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</CompositeArchiveOutputFileName>
-    <CompositeArchiveOutputPath>$(InstallersOutputPath)$(CompositeArchiveOutputFileName)</CompositeArchiveOutputPath>
-  </PropertyGroup>
-
-  <!-- Target chain -->
-  <PropertyGroup>
-    <ResolveReferencesDependsOn>
-      $(ResolveReferencesDependsOn);
-      FilterUnwantedContent;
-      _ResolveCopyLocalNativeReference;
-      PrepareForCrossGen;
-    </ResolveReferencesDependsOn>
-    <CoreBuildDependsOn>
-      $(CoreBuildDependsOn);
-      Crossgen;
-      GenerateSharedFxDepsFile;
-      GenerateSharedFxVersionsFiles;
-      _ResolveNativePackContent;
-      _IncludeVersionFile;
-      _ResolveInitialSharedFrameworkContent;
-      _GenerateRuntimeListFile;
-      _ResolveRuntimePackContent;
-      _ResolveSharedFrameworkContent;
-      _DownloadAndExtractDotNetRuntime;
-      _BatchCopyToSharedFrameworkLayout;
-      _BatchCopyToRedistLayout;
-      _BatchCopyToCompositeLayout;
-      _CreateRedistSharedFxArchive;
-      _CreateRedistCompositeArchive;
-    </CoreBuildDependsOn>
-    <!-- If Build won't run in the GenerateNuspec context, need to update Content, None and _PackageFiles. -->
-    <GenerateNuspecDependsOn Condition=" '$(NoBuild)' == 'true' AND '$(GeneratePackageOnBuild)' != 'true' ">
-      _ResolveNativePackContent;
-      _IncludeVersionFile;
-      $(GenerateNuspecDependsOn);
-      _ResolveInitialSharedFrameworkContent;
-      _ResolveRuntimePackContent;
-      _ResolveSharedFrameworkContent;
-    </GenerateNuspecDependsOn>
-    <CrossGenDependsOn>
-      ResolveReferences;
-    </CrossGenDependsOn>
-    <CrossGenDependsOn Condition=" '$(CrossgenOutput)' == 'true' ">
-      $(CrossGenDependsOn);
-      _BatchCrossGenAssemblies;
-      _GenerateComposites;
-    </CrossGenDependsOn>
-    <!-- _GetBuildOutputFilesWithTfm executes in a separate context from Build, GenerateNuspec, and so on. -->
-    <TargetsForTfmSpecificBuildOutput>
-      $(TargetsForTfmSpecificBuildOutput);
-      _ResolveRuntimePackBuildOutput
-    </TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-
-  <!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
-  <Target Name="GetTargetPath" />
-  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)">
-    <Message Importance="High" Text="$(MSBuildProjectName) -> $(TargetDir)" />
-  </Target>
-
-  <!-- There is no Microsoft.AspNetCore.App.Runtime.dll file. Clear the default value from the build output group. -->
-  <ItemGroup>
-    <BuiltProjectOutputGroupKeyOutput Remove="@(BuiltProjectOutputGroupKeyOutput)" />
-  </ItemGroup>
-
-  <!-- This project doesn't compile anything. -->
-  <Target Name="CoreCompile" />
-
-  <Target Name="FilterUnwantedContent"
-          DependsOnTargets="_ExpandRuntimePackageRoot">
-    <ItemGroup>
-      <!-- These files end up in this item group as a result of setting CopyLocalLockFileAssemblies, but shouldn't be. -->
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'apphost' OR '%(FileName)' == '$(LibPrefix)hostfxr' OR '%(FileName)' == '$(LibPrefix)hostpolicy' "/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <RuntimePackageFiles Include="$(RuntimePackageRoot)runtimes\**\*" />
-      <!--
-        Filter out any overlap between our SharedFx (ReferenceCopyLocalPaths) and dotnet/runtime's SharedFx (RuntimePackageFiles).
-        Most of the time there is no overlap, but in certain rare corner cases there can be.
-        See https://github.com/dotnet/aspnetcore/issues/45033 for more detail.
-      -->
-      <ReferenceCopyLocalPaths Remove="@(RuntimePackageFiles)" MatchOnMetadata="FileName"/>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_RemoveUnwantedRuntimeConfigItems" BeforeTargets="GenerateBuildRuntimeConfigurationFiles">
-    <ItemGroup>
-      <RuntimeHostConfigurationOption Remove="@(RuntimeHostConfigurationOption)" Condition="'%(Identity)' != 'System.Reflection.Metadata.MetadataUpdater.IsSupported' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_WarnAboutUnbuiltNativeDependencies"
-          BeforeTargets="Build"
-          Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND
-              !EXISTS('$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll') ">
-    <Warning Text="This project has native dependencies which were not built. Without this, tests may not function correctly. Run `build.cmd -BuildNative -BuildManaged` to build both C# and C++." />
-  </Target>
-
-  <Target Name="_ResolveCopyLocalNativeReference" DependsOnTargets="ResolveProjectReferences">
-    <ItemGroup>
-      <ReferenceCopyLocalPaths Include="@(_ResolvedNativeProjectReferencePaths)" />
-      <ReferenceCopyLocalPaths Include="@(_ResolvedNativeProjectReferencePaths->'%(RootDir)%(Directory)%(FileName).pdb')" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="GenerateSharedFxDepsFile" DependsOnTargets="ResolveReferences">
-    <ItemGroup>
-      <_RuntimeReference Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)' != '.pdb' AND '%(ReferenceCopyLocalPaths.Extension)' != '.r2rmap'" />
-    </ItemGroup>
-
-    <RepoTasks.GenerateSharedFrameworkDepsFile
-      DepsFilePath="$(ProjectDepsFilePath)"
-      TargetFramework="$(TargetFrameworkMoniker)"
-      FrameworkName="$(TargetingPackName)"
-      FrameworkVersion="$(SharedFxVersion)"
-      References="@(_RuntimeReference)"
-      RuntimeIdentifier="$(RuntimeIdentifier)"
-      RuntimePackageName="$(PackageId)"
-      PlatformManifestOutputPath="$(PlatformManifestOutputPath)" />
-  </Target>
-
-  <!--
-    Generate the .version, aspnetcore_base_runtime.version and Microsoft.AspNetCore.App.versions.txt files in the
-    shared framework.
-  -->
-  <Target Name="GenerateSharedFxVersionsFiles" DependsOnTargets="InitializeSourceControlInformation">
-    <WriteLinesToFile
-      File="$(BaseRuntimeVersionFileOutputPath)"
-      Lines="$(MicrosoftNETCoreAppRuntimeVersion)"
-      Overwrite="true" />
-
-    <ItemGroup>
-      <VersionLines Include="$(SourceRevisionId)" />
-      <VersionLines Include="$(SharedFxVersion)" />
-    </ItemGroup>
-
-    <WriteLinesToFile
-      File="$(VersionTxtFileIntermediateOutputPath)"
-      Lines="@(VersionLines)"
-      Overwrite="true" />
-
-    <WriteLinesToFile
-      File="$(DotVersionFileIntermediateOutputPath)"
-      Lines="@(VersionLines)"
-      Overwrite="true" />
-  </Target>
-
-  <!-- This target resolves files into the BuiltProjectOutputGroupOutput which NuGet uses to generate the package files. -->
-  <Target Name="_ResolveRuntimePackBuildOutput" DependsOnTargets="ResolveReferences">
-    <ItemGroup>
-      <BuildOutputFiles Include="$(ProjectDepsFilePath)" />
-      <BuildOutputFiles Include="@(ReferenceCopyLocalPaths)" Condition=" '%(ReferenceCopyLocalPaths.IsNativeImage)' != 'true' " />
-      <!-- Include all .pdbs in build output. Some .pdb files are part of ReferenceCopyLocalPaths, but this can change when running /t:Pack /p:NoBuild=true. -->
-      <BuildOutputFiles Include="$(TargetDir)*.pdb" Exclude="@(ReferenceCopyLocalPaths)" />
-      <!-- crossgen2 symbols for Linux include a GUID in the file name which cannot be predicted. -->
-      <BuildOutputFiles Include="$(TargetDir)*.r2rmap" Condition="'$(CrossGenSymbolsType)' == 'PerfMap'" />
-
-      <!-- Strip duplicate Files by checking for distinct %(FileName)%(Extension) -->
-      <OutputFileNames Include="%(BuildOutputFiles.FileName)%(BuildOutputFiles.Extension)">
-        <ItemPath>%(BuildOutputFiles.Identity)</ItemPath>
-      </OutputFileNames>
-      <DistinctOutputFileNames Include="@(OutputFileNames->Distinct())"></DistinctOutputFileNames>
-
-      <!--BuiltProjectOutputGroupOutput is the item actually used by Nuget -->
-      <BuiltProjectOutputGroupOutput Include="%(DistinctOutputFileNames.ItemPath)" />
-      <NuGetPackInput Include="@(BuiltProjectOutputGroupOutput)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_ResolveNativePackContent" DependsOnTargets="ResolveReferences">
-    <ItemGroup>
-      <!-- Native files are included in _PackageFile instead because they belong in a separate package folder. -->
-      <Content Include="@(ReferenceCopyLocalPaths)" PackagePath="$(NativeAssetsPackagePath)"
-          Condition=" '%(ReferenceCopyLocalPaths.IsNativeImage)' == 'true' AND '%(ReferenceCopyLocalPaths.Extension)' != '.pdb' " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_ResolveRuntimePackContent">
-    <ItemGroup>
-      <RuntimePackContent Include="$(PlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-  ##############################################
-  Targets related to crossgen
-  ##############################################
-  -->
-  <PropertyGroup>
-    <CrossgenToolDir>$(IntermediateOutputPath)crossgen\</CrossgenToolDir>
-    <CrossgenPlatformAssembliesDir>$(IntermediateOutputPath)platformAssemblies\</CrossgenPlatformAssembliesDir>
-  </PropertyGroup>
-
-  <Target Name="Crossgen" DependsOnTargets="$(CrossgenDependsOn)" />
-
-  <Target Name="_ExpandRuntimePackageRoot">
-    <!--
-      Use an item group for expansion of $($(RuntimePackageRootVariableName)) and $($(Crossgen2PackageRootMapping))
-      (both illegal MSBuild expressions) i.e. the prop value's value.
-    -->
-    <ItemGroup>
-      <RuntimePackageRootMapping Include="$(RuntimePackageRootVariableName)" />
-      <RuntimePackageRootMapping>
-        <RuntimePackageRoot>$(%(Identity))</RuntimePackageRoot>
-      </RuntimePackageRootMapping>
-      <Crossgen2PackageRootMapping Include="$(Crossgen2PackageRootVariableName)" />
-      <Crossgen2PackageRootMapping>
-        <Crossgen2PackageRoot>$(%(Identity))</Crossgen2PackageRoot>
-      </Crossgen2PackageRootMapping>
-    </ItemGroup>
-    <PropertyGroup>
-      <RuntimePackageRoot>@(RuntimePackageRootMapping->'%(RuntimePackageRoot)')</RuntimePackageRoot>
-      <RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
-      <Crossgen2PackageRoot>@(Crossgen2PackageRootMapping->'%(Crossgen2PackageRoot)')</Crossgen2PackageRoot>
-      <Crossgen2PackageRoot>$([MSBuild]::EnsureTrailingSlash('$(Crossgen2PackageRoot)'))</Crossgen2PackageRoot>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="PrepareForCrossGen"
-          Condition="'$(CrossgenOutput)' == 'true'"
-          DependsOnTargets="FilterUnwantedContent">
-    <!-- The output directories of assemblies built in this repo contain a mix of ref and impl assemblies. Copy impl assemblies to a separate directory. -->
-    <RemoveDir Directories="$(CrossgenPlatformAssembliesDir)" />
-    <Copy SourceFiles="@(ReferenceCopyLocalPaths)" DestinationFolder="$(CrossgenPlatformAssembliesDir)" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' != ''"/>
-
-    <!-- Resolve list of assemblies to crossgen2 -->
-    <ItemGroup>
-      <IntermediateCrossgenAssembly Include="@(ReferenceCopyLocalPaths)" Condition=" '%(ReferenceCopyLocalPaths.IsNativeImage)' != 'true' AND '%(ReferenceCopyLocalPaths.Extension)' != '.pdb'" />
-
-      <!-- These are the paths used by crossgen2 to find assemblies that are expected to exist at runtime in the shared frameworks. -->
-      <_PlatformAssemblyPaths Include="$(CrossgenToolDir)" />
-      <!-- Include the directories of the assemblies not built in this repo. These contain only implementation assemblies. -->
-      <_PlatformAssemblyPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)')" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' == ''"/>
-      <!-- The output directories of assemblies built in this repo contain a mix of ref and impl assemblies. Use the directory with only impl assemblies. -->
-      <_PlatformAssemblyPaths Include="$(CrossgenPlatformAssembliesDir)"/>
-
-      <ReferenceCopyLocalPaths Remove="@(IntermediateCrossgenAssembly)" />
-      <ReferenceCopyLocalPaths Include="@(IntermediateCrossgenAssembly->'$(TargetDir)%(FileName)%(Extension)')" />
-
-      <_DistinctPlatformAssemblyPaths Include="@(_PlatformAssemblyPaths->Distinct())"/>
-      <_DistinctPlatformAssemblyPaths>
-        <CommandLineOption>-r:%(Identity)*.dll</CommandLineOption>
-      </_DistinctPlatformAssemblyPaths>
-
-      <Crossgen2PlatformAssemblyPaths Include="@(_DistinctPlatformAssemblyPaths->'%(CommandLineOption)')" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <CrossgenToolPath>$([System.IO.Path]::Combine('$(Crossgen2PackageRoot)', 'tools', '$(Crossgen2ToolFileName)'))</CrossgenToolPath>
-      <CrossgenSymbolsTargetDir>$(TargetDir)</CrossgenSymbolsTargetDir>
-      <CrossgenOptimizationData Condition="'$(RuntimePackageRoot)' != ''">$(RuntimePackageRoot)tools\StandardOptimizationData.mibc</CrossgenOptimizationData>
-      <CrossgenOptimizationData Condition="!Exists('$(CrossgenOptimizationData)')"></CrossgenOptimizationData>
-
-      <!-- Escaping (double backslash at end) required due to the way batch processes backslashes. -->
-      <CrossgenSymbolsTargetDir Condition="HasTrailingSlash($(CrossgenSymbolsTargetDir)) AND '$(OS)' == 'Windows_NT'">$(TargetDir)\</CrossgenSymbolsTargetDir>
-    </PropertyGroup>
-
-    <RemoveDir Directories="$(CrossgenToolDir)" />
-    <WriteLinesToFile
-        Lines="@(Crossgen2PlatformAssemblyPaths)"
-        File="$(CrossgenToolDir)PlatformAssembliesPathsCrossgen2.rsp"
-        Overwrite="true" />
-
-    <Error Text="Could not find crossgen2 $(CrossgenToolPath)" Condition=" ! Exists($(CrossgenToolPath))" />
-
-    <!-- Create tool directory with runtime assemblies -->
-    <Copy SourceFiles="@(RuntimePackageFiles)" DestinationFolder="$(CrossGenToolDir)"/>
-  </Target>
-
-  <!-- Target executes once per @(IntermediateCrossgenAssembly) item. -->
-  <Target Name="_BatchCrossGenAssemblies"
-    DependsOnTargets="_ExpandRuntimePackageRoot"
-    Inputs="@(IntermediateCrossgenAssembly)"
-    Outputs="@(IntermediateCrossgenAssembly->'$(TargetDir)%(FileName)%(Extension)')">
-    <PropertyGroup>
-      <!--
-        Handle different names for the target OS on the crossgen2 command line. This often matches neither
-        $(TargetOsName) nor $(BuildOsName).
-      -->
-      <Crossgen2TargetOs>$(TargetOsName)</Crossgen2TargetOs>
-      <Crossgen2TargetOs Condition="'$(TargetOsName)' == 'win'">windows</Crossgen2TargetOs>
-      <Crossgen2TargetOs Condition="'$(TargetOsName)' == 'linux-musl'">linux</Crossgen2TargetOs>
-
-      <!-- Compose the crossgen2 command line. -->
-      <Crossgen2Args>--targetarch:$(TargetArchitecture)</Crossgen2Args>
-      <Crossgen2Args>$(Crossgen2Args) --targetos:$(Crossgen2TargetOs)</Crossgen2Args>
-      <Crossgen2Args>$(Crossgen2Args) -O</Crossgen2Args>
-      <Crossgen2Args>$(Crossgen2Args) @&quot;$(CrossgenToolDir)PlatformAssembliesPathsCrossgen2.rsp&quot;</Crossgen2Args>
-      <Crossgen2Args Condition="'$(CrossgenOptimizationData)' != ''">$(Crossgen2Args) &quot;-m:$(CrossgenOptimizationData)&quot;</Crossgen2Args>
-      <Crossgen2Args Condition="'$(GenerateCrossgenProfilingSymbols)' == 'true' and '$(TargetOsName)' == 'win'">$(Crossgen2Args) --pdb --pdb-path:&quot;$(CrossgenSymbolsTargetDir)&quot;</Crossgen2Args>
-      <Crossgen2Args Condition="'$(GenerateCrossgenProfilingSymbols)' == 'true' and '$(TargetOsName)' != 'win'">$(Crossgen2Args) --perfmap --perfmap-format-version:1 --perfmap-path:&quot;$(CrossgenSymbolsTargetDir)&quot;</Crossgen2Args>
-    </PropertyGroup>
-
-    <Message Text="Running crossgen with $(CrossgenToolPath)"
-        Importance="High" />
-    <!-- All metadata in batched task comes from current @(IntermediateCrossgenAssembly) item. -->
-    <Exec Command="&quot;$(CrossgenToolPath)&quot; $(Crossgen2Args) -o:&quot;$(TargetDir)%(FileName)%(Extension)&quot; &quot;%(IntermediateCrossgenAssembly.Identity)&quot;"
-          IgnoreStandardErrorWarningFormat="true"
-          StandardOutputImportance="High" />
-    <Message Text="Finished crossgen"
-        Importance="High" />
-  </Target>
-
-  <Target Name="_GenerateComposites"
-          Condition="'$(TargetOsName)' == 'linux' or '$(TargetOsName)' == 'linux-musl'"
-          DependsOnTargets="_ExpandRuntimePackageRoot">
-
-    <PropertyGroup>
-      <CompositeTargetDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Composite', '$(Configuration)'))</CompositeTargetDir>
-      <CompositeFileName>full-composite.r2r</CompositeFileName>
-      <CompositeResponseFile>$(CompositeTargetDir)\$(CompositeFileName).rsp</CompositeResponseFile>
-      <CompositeArgs>@$(CompositeResponseFile)</CompositeArgs>
-      <ManagedAssetsFullPath>$(RuntimePackageRoot)$(ManagedAssetsPackagePath)</ManagedAssetsFullPath>
-      <NativeAssetsFullPath>$(RuntimePackageRoot)$(NativeAssetsPackagePath)</NativeAssetsFullPath>
-      <PartialCompositeAssemblyListPath>$(MSBuildThisFileDirectory)\PartialCompositeAssemblyList.txt</PartialCompositeAssemblyListPath>
-      <InstructionSetSupport Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86'">+x86-x64-v3</InstructionSetSupport>
-    </PropertyGroup>
-
-    <RemoveDir Directories="$(CompositeTargetDir)" />
-    <MakeDir Directories="$(CompositeTargetDir)" />
-
-    <!-- Read list of assemblies that should generate native code in the full composite image. -->
-    <ReadLinesFromFile File="$(PartialCompositeAssemblyListPath)">
-      <Output TaskParameter="Lines" ItemName="PartialCompositeAssemblyNames" />
-    </ReadLinesFromFile>
-
-    <ItemGroup>
-      <!-- Temporary workaround tracked by https://github.com/dotnet/runtime/issues/84860 -->
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Configuration.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Configuration.Abstractions.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Configuration.Binder.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.DependencyInjection.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Logging.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Logging.Abstractions.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Logging.Console.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Logging.Configuration.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Options.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Options.ConfigurationExtensions.dll" />
-      <ExcludeAssemblies Include="$(TargetDir)\Microsoft.Extensions.Primitives.dll" />
-
-      <BaseAssemblies Include="$(ManagedAssetsFullPath)\*.dll" />
-      <BaseAssemblies Include="$(TargetDir)\*.dll" />
-
-      <PartialCompositeAssemblyPaths Include="$(ManagedAssetsFullPath)\%(PartialCompositeAssemblyNames.Identity).dll" />
-      <PartialCompositeAssemblyPaths Include="$(TargetDir)\%(PartialCompositeAssemblyNames.Identity).dll" />
-      <PartialCompositeAssemblyPaths Remove="%(PartialCompositeAssemblyPaths.Identity)" Condition="!Exists('%(Identity)')" />
-      <PartialCompositeAssemblyPaths Remove="@(ExcludeAssemblies)" />
-
-      <UnrootedAssemblyPaths Include="@(BaseAssemblies)" />
-      <UnrootedAssemblyPaths Remove="@(PartialCompositeAssemblyPaths)" />
-      <UnrootedAssemblyPaths Remove="@(ExcludeAssemblies)" />
-    </ItemGroup>
-
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="--composite" Overwrite="true" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="--targetarch:$(TargetArchitecture)" Overwrite="false" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="--targetos:$(Crossgen2TargetOs)" Overwrite="false" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="-u:&quot;%(UnrootedAssemblyPaths.Identity)&quot;" Overwrite="false" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="&quot;%(PartialCompositeAssemblyPaths.Identity)&quot;" Overwrite="false" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="-r:&quot;%(ExcludeAssemblies.Identity)&quot;" Overwrite="false" Condition="'@(ExcludeAssemblies)' != ''" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="--out:&quot;$(CompositeTargetDir)$(CompositeFileName).dll&quot;" Overwrite="false" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="--instruction-set:$(InstructionSetSupport)" Overwrite="false" Condition="'$(InstructionSetSupport)' != ''" />
-    <WriteLinesToFile File="$(CompositeResponseFile)" Lines="-m:&quot;$(CrossgenOptimizationData)&quot;" Overwrite="false" Condition="'$(CrossgenOptimizationData)' != ''" />
-
-    <ItemGroup>
-      <NativeSharedObjects Include="$(NativeAssetsFullPath)\*.so" />
-    </ItemGroup>
-
-    <Exec Command="&quot;$(CrossgenToolPath)&quot; $(CompositeArgs)" />
-    <Copy SourceFiles="@(NativeSharedObjects)" DestinationFolder="$(CompositeTargetDir)" />
-  </Target>
-
-  <!--
-  #########################################
-  Targets related to creating .zip/.tar.gz
-  #########################################
-  -->
-  <Target Name="_DownloadAndExtractDotNetRuntime" Condition="'$(DotNetBuild)' != 'true'">
-    <!-- Try various places to find the runtime. It's either released (use official version),
-         public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
-    <ItemGroup>
-      <UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/$(DotNetRuntimeDownloadPath)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/public/$(DotNetRuntimeDownloadPath)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/internal/$(DotNetRuntimeDownloadPath)"
-          Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
-        <token>$(DotnetRuntimeSourceFeedKey)</token>
-      </UrisToDownload>
-    </ItemGroup>
-
-    <DownloadFile Condition=" !Exists('$(DotNetRuntimeArchive)') "
-                  Uris="@(UrisToDownload)"
-                  DestinationPath="$(DotNetRuntimeArchive)" />
-
-    <RemoveDir Directories="$(RedistSharedFrameworkLayoutRoot)" />
-    <MakeDir Directories="$(RedistSharedFrameworkLayoutRoot)" />
-
-    <!-- Extract the dotnet-runtime archive -->
-    <Exec Condition="'$(ArchiveExtension)' == '.tar.gz'"
-      Command="tar -xzf $(DotNetRuntimeArchive) -C $(RedistSharedFrameworkLayoutRoot)" />
-
-    <Unzip Condition="'$(ArchiveExtension)' == '.zip'"
-      SourceFiles="$(DotNetRuntimeArchive)"
-      DestinationFolder="$(RedistSharedFrameworkLayoutRoot)"
-      OverwriteReadOnlyFiles="true" />
-  </Target>
-
-  <Target Name="_ResolveInitialSharedFrameworkContent" DependsOnTargets="ResolveReferences">
-    <ItemGroup>
-      <_InitialSharedFxContent Include="$(DotVersionFileIntermediateOutputPath)" />
-      <_InitialSharedFxContent Include="$(ProjectDepsFilePath)" />
-      <_InitialSharedFxContent Include="$(ProjectRuntimeConfigFilePath)" />
-      <_InitialSharedFxContent Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' != '.pdb'" />
-      <_InitialSharedFxContent Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" />
-    </ItemGroup>
-    <ItemGroup>
-      <_InitialSharedFxContent Condition="'%(_InitialSharedFxContent.Extension)' == '.dll'">
-        <PackagePath Condition="'%(_InitialSharedFxContent.IsNativeImage)' == 'true'">$(NativeAssetsPackagePath)</PackagePath>
-        <PackagePath Condition="'%(_InitialSharedFxContent.IsNativeImage)' != 'true'">$(ManagedAssetsPackagePath)</PackagePath>
-      </_InitialSharedFxContent>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_ResolveSharedFrameworkContent">
-    <ItemGroup>
-      <SharedFxContent Include="@(_InitialSharedFxContent)" />
-
-      <!-- We only need RuntimeList.xml in the .nupkg, so we intentionally do not include it in the archives -->
-      <_PackageFiles Include="$(RuntimeListOutputPath)" PackagePath="$(ManifestsPackagePath)" />
-      <_PackageFiles Include="@(RuntimePackContent)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Cannot use RemoveDir task because _BatchCopyToSharedFrameworkLayout may only copy a subset of the files to the
-    layout directory. Instead, remove any files that shouldn't exist.
-  -->
-  <Target Name="_CleanLayout" BeforeTargets="_BatchCopyToSharedFrameworkLayout">
-    <ItemGroup>
-      <_ExtraLayoutFiles Include="$(SharedFxLayoutTargetDir)**\*.*"
-          Exclude="@(RefPackContent->'$(SharedFxLayoutTargetDir)%(FileName)%(Extension)')" />
-    </ItemGroup>
-    <Delete Files="@(_ExtraLayoutFiles)" />
-  </Target>
-
-  <Target Name="_BatchCopyToSharedFrameworkLayout"
-          Inputs="@(SharedFxContent)"
-          Outputs="@(SharedFxContent->'$(SharedFxLayoutTargetDir)%(FileName)%(Extension)')">
-
-    <Copy SourceFiles="@(SharedFxContent)"
-          DestinationFiles="@(SharedFxContent->'$(SharedFxLayoutTargetDir)%(FileName)%(Extension)')"
-          UseHardlinksIfPossible="true" />
-    <Message Importance="High" Text="$(MSbuildProjectFile) -> $(SharedFxLayoutTargetDir)" />
-  </Target>
-
-  <Target Name="_CleanRedist" BeforeTargets="_BatchCopyToRedistLayout">
-    <ItemGroup>
-      <_ExtraRedistFiles Include="$(RedistLayoutTargetDir)**\*.*"
-          Exclude="@(RefPackContent->'$(RedistLayoutTargetDir)%(FileName)%(Extension)')" />
-    </ItemGroup>
-    <Delete Files="@(_ExtraRedistFiles)" />
-  </Target>
-
-  <Target Name="_BatchCopyToRedistLayout"
-          Inputs="@(SharedFxContent)"
-          Outputs="@(SharedFxContent->'$(RedistLayoutTargetDir)%(FileName)%(Extension)')">
-
-    <Copy SourceFiles="@(SharedFxContent)"
-          DestinationFiles="@(SharedFxContent->'$(RedistLayoutTargetDir)%(FileName)%(Extension)')"
-          UseHardlinksIfPossible="true" />
-    <Message Importance="High" Text="$(MSbuildProjectFile) -> $(RedistLayoutTargetDir)" />
-  </Target>
-
-  <Target Name="_BatchCopyToCompositeLayout"
-          Condition="'$(TargetOsName)' == 'linux' or '$(TargetOsName)' == 'linux-musl'">
-    <PropertyGroup>
-      <CompositeFrameworkLayoutRoot>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', CompositeFx.Layout, '$(Configuration)', '$(TargetRuntimeIdentifier)'))</CompositeFrameworkLayoutRoot>
-      <LayoutAspnetPath>$(CompositeFrameworkLayoutRoot)\shared\$(SharedFxName)\$(SharedFxVersion)\</LayoutAspnetPath>
-      <LayoutNetcorePath>$(CompositeFrameworkLayoutRoot)\shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppRuntimeVersion)\</LayoutNetcorePath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <RedistLayoutFiles Include="$(RedistSharedFrameworkLayoutRoot)**\*.*" />
-      <CompositeFiles Include="$(CompositeTargetDir)**\*.*" />
-    </ItemGroup>
-
-    <RemoveDir Directories="$(CompositeFrameworkLayoutRoot)" />
-    <Copy SourceFiles="@(RedistLayoutFiles)" DestinationFolder="$(CompositeFrameworkLayoutRoot)%(RecursiveDir)" />
-
-    <ItemGroup>
-      <AspnetFiles Include="$(LayoutAspnetPath)**\*.*" />
-      <AspnetFilesByName Include="@(AspnetFiles->'%(Filename)%(Extension)')" />
-      <CompositeFilesByName Include="@(CompositeFiles->'%(Filename)%(Extension)')" />
-      <FrameworkCompositesByName Include="@(CompositeFilesByName)" Exclude="@(AspnetFilesByName)" />
-      <AspnetCompositesByName Include="@(CompositeFilesByName)" Exclude="@(FrameworkCompositesByName)" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(FrameworkCompositesByName->'$(CompositeTargetDir)%(Filename)%(Extension)')"
-          DestinationFolder="$(LayoutNetcorePath)" />
-
-    <Copy SourceFiles="@(AspnetCompositesByName->'$(CompositeTargetDir)%(Filename)%(Extension)')"
-          DestinationFolder="$(LayoutAspnetPath)" />
-  </Target>
-
-  <Target Name="_CreateRedistCompositeArchive"
-          Condition="'$(TargetOsName)' == 'linux' or '$(TargetOsName)' == 'linux-musl'"
-          Inputs="$(CompositeTargetDir)"
-          Outputs="$(CompositeArchiveOutputPath)">
-    <Message Importance="High" Text="$(MSbuildProjectFile) -> $(CompositeArchiveOutputPath)" />
-    <Exec
-      Command="tar -czf $(CompositeArchiveOutputPath) ."
-      WorkingDirectory="$(CompositeFrameworkLayoutRoot)" />
-  </Target>
-
-  <Target Name="_CreateRedistSharedFxArchive"
-          Inputs="@(SharedFxContent)"
-          Outputs="$(RedistArchiveOutputPath)">
-    <Message Importance="High" Text="$(MSbuildProjectFile) -> $(RedistArchiveOutputPath)" />
-
-    <ZipDirectory
-      SourceDirectory="$(RedistSharedFrameworkLayoutRoot)"
-      DestinationFile="$(RedistArchiveOutputPath)"
-      Overwrite="true"
-      Condition="'$(ArchiveExtension)' == '.zip'" />
-    <Exec
-      Command="tar -czf $(RedistArchiveOutputPath) ."
-      WorkingDirectory="$(RedistSharedFrameworkLayoutRoot)"
-      Condition="'$(ArchiveExtension)' == '.tar.gz'" />
-  </Target>
-
-  <Target Name="_GenerateRuntimeListFile">
-    <RepoTasks.CreateFrameworkListFile
-      Files="@(_InitialSharedFxContent)"
-      TargetFile="$(RuntimeListOutputPath)"
-      RootAttributes="@(FrameworkListRootAttributes)" />
-  </Target>
-
-  <Target Name="_IncludeVersionFile">
-    <ItemGroup>
-      <None Include="$(VersionTxtFileIntermediateOutputPath)" Pack="true" PackagePath="." />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
new file mode 100644
index 000000000000..6e335490fbc4
--- /dev/null
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
@@ -0,0 +1,145 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" />
+
+  <PropertyGroup>
+    <PlatformPackageType>RuntimePack</PlatformPackageType>
+    <SharedFrameworkName>Microsoft.AspNetCore.App</SharedFrameworkName>
+    <SharedFrameworkFriendlyName>Microsoft ASP.NET Core</SharedFrameworkFriendlyName>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <PackageTags>aspnetcore;shared-framework</PackageTags>
+    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
+    <!-- System.Diagnostics.EventLog.Messages.dll has no file version -->
+    <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion>
+    <!-- Target the latest runtime patch so the latest version is specified in runtimeconfig.json -->
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <RollForward>LatestPatch</RollForward>
+    <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6. -->
+    <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' ">false</PublishReadyToRun>
+    <PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
+    <!-- Don't use ReadyToRun when explicitly opted out -->
+    <PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
+
+    <InstallerName>$(RuntimeInstallerBaseName)</InstallerName>
+    <GenerateInstallers>true</GenerateInstallers>
+    <ProductBrandPrefix>Microsoft ASP.NET Core</ProductBrandPrefix>
+    <VSInsertionShortComponentName>AspNetCore.SharedFramework</VSInsertionShortComponentName>
+    <PackageDescription>$(SharedFxDescription)</PackageDescription>
+    <InstallerPackageDescription>$(SharedFxDescription)</InstallerPackageDescription>
+    <LicenseFile>$(RepoRoot)LICENSE.txt</LicenseFile>
+    <MajorVersion>$(AspNetCoreMajorVersion)</MajorVersion>
+    <MinorVersion>$(AspNetCoreMinorVersion)</MinorVersion>
+    <PatchVersion>$(AspNetCorePatchVersion)</PatchVersion>
+
+    <!-- Needed some creativity to convert the PackageVersion M.N.P-PreReleaseVersionLabel-Build to the installer version M.N.P~PreReleaseVersionLabel-Build, The conditional handles stabilized builds -->
+    <DotnetRuntimeDependencyVersion>$(MicrosoftNETCoreAppRefVersion)</DotnetRuntimeDependencyVersion>
+    <DotnetRuntimeDependencyVersion Condition="$(DotnetRuntimeDependencyVersion.Contains('-'))">$(DotnetRuntimeDependencyVersion.Substring(0, $(DotnetRuntimeDependencyVersion.IndexOf('-'))))~$(DotnetRuntimeDependencyVersion.Substring($([MSBuild]::Add($(DotnetRuntimeDependencyVersion.IndexOf('-')), 1))))</DotnetRuntimeDependencyVersion>
+    <DotnetRuntimeDependencyMajorMinorVersion>$(MicrosoftNETCoreAppRefVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefVersion.Split('.')[1])</DotnetRuntimeDependencyMajorMinorVersion>
+
+    <!-- Setting this suppresses getting documentation .xml files in the shared runtime output. -->
+    <AllowedReferenceRelatedFileExtensions>.pdb</AllowedReferenceRelatedFileExtensions>
+
+    <!-- TODO: Try to remove this disable property -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BuildInstallers)' == 'true' or '$(TargetOsName)' == 'win'">
+    <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
+    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
+    <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
+    <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>
+      $(GetSharedFrameworkFilesForReadyToRunDependsOn);
+      _AddExtensionsSymbolsToSymbolPack;
+    </GetSharedFrameworkFilesForReadyToRunDependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
+        Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
+        ExcludeAssets="All"
+        GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
+      <IncludeAssets>Runtime;Native</IncludeAssets>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <_AllExternalAspNetCoreAppReferences Include="@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Condition="'$(GenerateInstallers)' == 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
+    <LinuxPackageDependency Include="dotnet-runtime-$(DotnetRuntimeDependencyMajorMinorVersion)" Version="$(DotnetRuntimeDependencyVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <IgnoredDuplicateType Include="Microsoft.AspNetCore.Hosting.WebHostBuilderIISExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.SignalRDependencyInjectionExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.IdentityServiceCollectionExtensions" />
+    <IgnoredDuplicateType Include="Microsoft.Extensions.Logging.LoggingBuilderExtensions" />
+  </ItemGroup>
+
+  <!-- Add native dependencies to the package when required. -->
+  <ItemGroup>
+    <ProjectReference Condition=" '$(UseIisNativeAssets)' == 'true' AND $(BuildNative) AND '$(MSBuildRestoreSessionId)' == ''"
+        Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
+      <SetPlatform>Platform=$(NativePlatform)</SetPlatform>
+      <OutputItemType>NativeRuntimeAsset</OutputItemType>
+      <!-- C++ projects don't invoke GetTargetPath by default when building. -->
+      <Targets>Build;GetTargetPath</Targets>
+    </ProjectReference>
+
+    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
+        Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
+    <!-- Always explicitly include the .pdb -->
+    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
+        Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
+  </ItemGroup>
+
+  <!-- Explicitly include symbols for libraries we redistribute from runtime -->
+  <Target Name="_AddExtensionsSymbolsToSymbolPack">
+    <!-- Flatten _AllExternalAspNetCoreAppReferences into a property -->
+    <PropertyGroup>
+      <FileNameList>@(_AllExternalAspNetCoreAppReferences, ';')</FileNameList>
+      <!-- Add trailing semicolon -->
+      <FileNameList>$(FileNameList);</FileNameList>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
+          Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
+
+      <!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
+      <!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' == 'win'" />
+
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' != 'win'" />
+
+      <_SymbolFilesToPackage Include="@(_TransportPdbs)"
+          Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_WarnAboutUnbuiltNativeDependencies"
+          BeforeTargets="Build"
+          Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND
+              !EXISTS('$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll') ">
+    <Warning Text="This project has native dependencies which were not built. Without this, tests may not function correctly. Run `build.cmd -BuildNative -BuildManaged` to build both C# and C++." />
+  </Target>
+
+  <Target Name="PublishToSharedLayoutRoot" BeforeTargets="Build">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="PublishToDisk"
+             Properties="OutputPath=$(SharedFrameworkLayoutRoot)" />
+  </Target>
+
+  <Target Name="ReturnProductVersion" Returns="$(Version)" />
+</Project>
diff --git a/src/Framework/App.Runtime/src/PartialCompositeAssemblyList.txt b/src/Framework/App.Runtime/src/PartialCompositeAssemblyList.txt
index 45729ddbfc0c..0bcbd4d48ad1 100644
--- a/src/Framework/App.Runtime/src/PartialCompositeAssemblyList.txt
+++ b/src/Framework/App.Runtime/src/PartialCompositeAssemblyList.txt
@@ -1,38 +1,38 @@
-System.Private.CoreLib
-System.Runtime
-Microsoft.AspNetCore.Hosting
-Microsoft.AspNetCore.Hosting.Abstractions
-Microsoft.EntityFrameworkCore
-System.ComponentModel
-Microsoft.AspNetCore.Server.Kestrel.Core
-Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
-System.Console
-System.Threading
-System.Runtime.InteropServices
-Microsoft.Win32.Primitives
-System.Collections
-Microsoft.Extensions.Configuration.Json
-Microsoft.Extensions.Configuration.FileExtensions
-Microsoft.Extensions.FileProviders.Abstractions
-Microsoft.Extensions.FileProviders.Physical
-Microsoft.Extensions.Configuration.EnvironmentVariables
-Microsoft.Extensions.Configuration.CommandLine
-System.Linq
-System.Memory
-Microsoft.Extensions.Hosting.Abstractions
-Microsoft.AspNetCore.Server.Kestrel
-Microsoft.AspNetCore.Server.Kestrel.Transport.Quic
-System.Net.Quic
-System.Diagnostics.Tracing
-Microsoft.Extensions.Features
-Microsoft.AspNetCore.Http.Abstractions
-Microsoft.AspNetCore.Http
-System.Diagnostics.DiagnosticSource
-Microsoft.AspNetCore.Mvc.Core
-Microsoft.AspNetCore.Razor.Runtime
-Microsoft.AspNetCore.Connections.Abstractions
-System.Net.Primitives
-Microsoft.AspNetCore.Hosting.Server.Abstractions
-System.Collections.Concurrent
-System.Threading.ThreadPool
-System.Text.Json
+System.Private.CoreLib.dll
+System.Runtime.dll
+Microsoft.AspNetCore.Hosting.dll
+Microsoft.AspNetCore.Hosting.Abstractions.dll
+Microsoft.EntityFrameworkCore.dll
+System.ComponentModel.dll
+Microsoft.AspNetCore.Server.Kestrel.Core.dll
+Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll
+System.Console.dll
+System.Threading.dll
+System.Runtime.InteropServices.dll
+Microsoft.Win32.Primitives.dll
+System.Collections.dll
+Microsoft.Extensions.Configuration.Json.dll
+Microsoft.Extensions.Configuration.FileExtensions.dll
+Microsoft.Extensions.FileProviders.Abstractions.dll
+Microsoft.Extensions.FileProviders.Physical.dll
+Microsoft.Extensions.Configuration.EnvironmentVariables.dll
+Microsoft.Extensions.Configuration.CommandLine.dll
+System.Linq.dll
+System.Memory.dll
+Microsoft.Extensions.Hosting.Abstractions.dll
+Microsoft.AspNetCore.Server.Kestrel.dll
+Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.dll
+System.Net.Quic.dll
+System.Diagnostics.Tracing.dll
+Microsoft.Extensions.Features.dll
+Microsoft.AspNetCore.Http.Abstractions.dll
+Microsoft.AspNetCore.Http.dll
+System.Diagnostics.DiagnosticSource.dll
+Microsoft.AspNetCore.Mvc.Core.dll
+Microsoft.AspNetCore.Razor.Runtime.dll
+Microsoft.AspNetCore.Connections.Abstractions.dll
+System.Net.Primitives.dll
+Microsoft.AspNetCore.Hosting.Server.Abstractions.dll
+System.Collections.Concurrent.dll
+System.Threading.ThreadPool.dll
+System.Text.Json.dll
diff --git a/src/Framework/App.Runtime/src/aspnetcore-base-runtime.proj b/src/Framework/App.Runtime/src/aspnetcore-base-runtime.proj
new file mode 100644
index 000000000000..2f3f66312a3c
--- /dev/null
+++ b/src/Framework/App.Runtime/src/aspnetcore-base-runtime.proj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <!-- This file is used by the dotnet/sdk repo to determine if the version of AspNetCore.App is coherent with Microsoft.NETCore.App. -->
+    <BaseRuntimeVersionFileName>aspnetcore_base_runtime.version</BaseRuntimeVersionFileName>
+    <BaseRuntimeVersionFileOutputPath>$(InstallersOutputPath)$(BaseRuntimeVersionFileName)</BaseRuntimeVersionFileOutputPath>
+    <!--
+      This version file is required by source-build.
+    -->
+    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <Target Name="WriteBaseRuntimeVersionFile" AfterTargets="Build">
+    <WriteLinesToFile File="$(BaseRuntimeVersionFileOutputPath)"
+                      Lines="$(MicrosoftNETCoreAppRefVersion)"
+                      Overwrite="true" />
+  </Target>
+</Project>
diff --git a/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj b/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj
new file mode 100644
index 000000000000..3fb2266b7f95
--- /dev/null
+++ b/src/Framework/App.Runtime/src/aspnetcore-runtime-composite.proj
@@ -0,0 +1,65 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
+    <!-- We aren't producing a NuGet package here, so disable package validation -->
+    <EnablePackageValidation>false</EnablePackageValidation>
+
+    <!-- TODO: Try to remove this disable property -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+
+    <!--
+      Build this project in source-build as we want the archives to be built and this project is the transitive entry point
+      for the shared framework.
+    -->
+    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+    <ProjectReference Include="Microsoft.AspNetCore.App.Runtime.Composite.sfxproj" />
+  </ItemGroup>
+
+  <!--
+    The aspnetcore-runtime archive contains both the Microsoft.NETCore.App.Runtime layout and the Microsoft.AspNetCore.App.Runtime layout.
+    Download the Microsoft.NETCore.App.Runtime layout.
+  -->
+  <PropertyGroup>
+    <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for .NETCoreApp -->
+    <DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-$(TargetRuntimeIdentifier).$(ArchiveFormat)</DotNetRuntimeArchiveFileName>
+    <DotNetRuntimeDownloadPath>Runtime/$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
+    <DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
+  </PropertyGroup>
+
+  <Target Name="_DownloadAndExtractDotNetRuntime" Returns="$(DotNetRuntimeArchive)">
+    <ItemGroup>
+      <UrisToDownload Include="@(RemoteAssetBaseURL->'%(Identity)$(DotNetRuntimeDownloadPath)')" />
+    </ItemGroup>
+
+    <DownloadFile Condition=" !Exists('$(DotNetRuntimeArchive)') "
+                  Uris="@(UrisToDownload)"
+                  DestinationPath="$(DotNetRuntimeArchive)" />
+  </Target>
+
+  <Target Name="PublishToDisk">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="_DownloadAndExtractDotNetRuntime"
+             RemoveProperties="OutputPath" />
+
+    <RemoveDir Directories="$(OutputPath)" />
+    <MakeDir Directories="$(OutputPath)" />
+
+    <!-- Extract the dotnet-runtime archive -->
+    <Exec Condition="'$(ArchiveFormat)' == 'tar.gz'"
+      Command="tar -xzf $(DotNetRuntimeArchive) -C $(OutputPath)" />
+
+    <Unzip Condition="'$(ArchiveFormat)' == 'zip'"
+      SourceFiles="$(DotNetRuntimeArchive)"
+      DestinationFolder="$(OutputPath)"
+      OverwriteReadOnlyFiles="true" />
+
+    <MSBuild Projects="@(ProjectReference)"
+              Targets="PublishToDisk"
+              Properties="OutputPath=$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/src/Framework/App.Runtime/src/aspnetcore-runtime.proj b/src/Framework/App.Runtime/src/aspnetcore-runtime.proj
new file mode 100644
index 000000000000..18220c8a4cf3
--- /dev/null
+++ b/src/Framework/App.Runtime/src/aspnetcore-runtime.proj
@@ -0,0 +1,74 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
+    <!-- We aren't producing a NuGet package here, so disable package validation -->
+    <EnablePackageValidation>false</EnablePackageValidation>
+
+    <!-- TODO: Try to remove this disable property -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+
+    <!--
+      Build this project in source-build as we want the archives to be built and this project is the transitive entry point
+      for the shared framework.
+    -->
+    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+    <ProjectReference Include="Microsoft.AspNetCore.App.Runtime.sfxproj"
+      Private="false"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />
+  </ItemGroup>
+
+  <!--
+    The aspnetcore-runtime archive contains both the Microsoft.NETCore.App.Runtime layout and the Microsoft.AspNetCore.App.Runtime layout.
+    Download the Microsoft.NETCore.App.Runtime layout.
+  -->
+  <PropertyGroup>
+    <!-- Use the Microsoft.Internal.Runtime.AspNetCore.Transport package as a sentinel for the nonshipping version for .NETCoreApp -->
+    <DotNetRuntimeArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-$(TargetRuntimeIdentifier).$(ArchiveFormat)</DotNetRuntimeArchiveFileName>
+    <DotNetRuntimeDownloadPath>Runtime/$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/$(DotNetRuntimeArchiveFileName)</DotNetRuntimeDownloadPath>
+    <DotNetRuntimeArchive>$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)</DotNetRuntimeArchive>
+  </PropertyGroup>
+
+  <Target Name="_DownloadAndExtractDotNetRuntime" Returns="$(DotNetRuntimeArchive)">
+    <ItemGroup>
+      <UrisToDownload Include="@(RemoteAssetBaseURL->'%(Identity)$(DotNetRuntimeDownloadPath)')" />
+    </ItemGroup>
+
+    <DownloadFile Condition=" !Exists('$(DotNetRuntimeArchive)') "
+                  Uris="@(UrisToDownload)"
+                  DestinationPath="$(DotNetRuntimeArchive)" />
+  </Target>
+
+  <Target Name="PublishToDisk">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="_DownloadAndExtractDotNetRuntime"
+             RemoveProperties="OutputPath" />
+
+    <RemoveDir Directories="$(OutputPath)" />
+    <MakeDir Directories="$(OutputPath)" />
+
+    <!-- Extract the dotnet-runtime archive -->
+    <Exec Condition="'$(ArchiveFormat)' == 'tar.gz'"
+      Command="tar -xzf $(DotNetRuntimeArchive) -C $(OutputPath)" />
+
+    <Unzip Condition="'$(ArchiveFormat)' == 'zip'"
+      SourceFiles="$(DotNetRuntimeArchive)"
+      DestinationFolder="$(OutputPath)"
+      OverwriteReadOnlyFiles="true" />
+
+    <MSBuild Projects="@(ProjectReference)"
+              Targets="PublishToDisk"
+              Properties="OutputPath=$(OutputPath)" />
+  </Target>
+
+  <Target Name="PublishToSharedLayoutRoot" BeforeTargets="Build">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="PublishToDisk"
+             Properties="OutputPath=$(RedistSharedFrameworkLayoutRoot)" />
+  </Target>
+</Project>
diff --git a/src/Framework/App.Runtime/src/runtimeconfig.template.json b/src/Framework/App.Runtime/src/runtimeconfig.template.json
deleted file mode 100644
index 94bcf689a3b8..000000000000
--- a/src/Framework/App.Runtime/src/runtimeconfig.template.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "rollForward": "LatestPatch"
-}
\ No newline at end of file
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs
index e0143542bff0..e48dd9445bfc 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs
@@ -8,219 +8,244 @@ namespace Microsoft.AspNetCore.Analyzers;
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
 internal static class DiagnosticDescriptors
 {
+    private const string Security = "Security";
+    private const string Usage = "Usage";
+    private const string AnalyzersLink = "https://aka.ms/aspnet/analyzers";
+
+    private static LocalizableResourceString CreateLocalizableResourceString(string resource) => new(resource, Resources.ResourceManager, typeof(Resources));
+    
     internal static readonly DiagnosticDescriptor DoNotUseModelBindingAttributesOnRouteHandlerParameters = new(
         "ASP0003",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseModelBindingAttributesOnRouteHandlerParameters_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseModelBindingAttributesOnRouteHandlerParameters_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseModelBindingAttributesOnRouteHandlerParameters_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseModelBindingAttributesOnRouteHandlerParameters_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotReturnActionResultsFromRouteHandlers = new(
         "ASP0004",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotReturnActionResultsFromRouteHandlers_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotReturnActionResultsFromRouteHandlers_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotReturnActionResultsFromRouteHandlers_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotReturnActionResultsFromRouteHandlers_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DetectMisplacedLambdaAttribute = new(
         "ASP0005",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DetectMisplacedLambdaAttribute_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DetectMisplacedLambdaAttribute_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DetectMisplacedLambdaAttribute_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DetectMisplacedLambdaAttribute_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseNonLiteralSequenceNumbers = new(
         "ASP0006",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseNonLiteralSequenceNumbers_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseNonLiteralSequenceNumbers_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseNonLiteralSequenceNumbers_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseNonLiteralSequenceNumbers_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DetectMismatchedParameterOptionality = new(
         "ASP0007",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DetectMismatchedParameterOptionality_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DetectMismatchedParameterOptionality_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DetectMismatchedParameterOptionality_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DetectMismatchedParameterOptionality_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseConfigureWebHostWithConfigureHostBuilder = new(
         "ASP0008",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWebHostWithConfigureHostBuilder_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWebHostWithConfigureHostBuilder_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWebHostWithConfigureHostBuilder_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWebHostWithConfigureHostBuilder_Message)),
+        Usage,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseConfigureWithConfigureWebHostBuilder = new(
         "ASP0009",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWithConfigureWebHostBuilder_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWithConfigureWebHostBuilder_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWithConfigureWebHostBuilder_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseConfigureWithConfigureWebHostBuilder_Message)),
+        Usage,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseUseStartupWithConfigureWebHostBuilder = new(
         "ASP0010",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseUseStartupWithConfigureWebHostBuilder_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseUseStartupWithConfigureWebHostBuilder_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseUseStartupWithConfigureWebHostBuilder_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseUseStartupWithConfigureWebHostBuilder_Message)),
+        Usage,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseHostConfigureLogging = new(
         "ASP0011",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureLogging_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureLogging_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureLogging_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureLogging_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseHostConfigureServices = new(
         "ASP0012",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureServices_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureServices_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureServices_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DoNotUseHostConfigureServices_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DisallowConfigureAppConfigureHostBuilder = new(
         "ASP0013",
-        new LocalizableResourceString(nameof(Resources.Analyzer_DisallowConfigureAppConfigureHostBuilder_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_DisallowConfigureAppConfigureHostBuilder_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DisallowConfigureAppConfigureHostBuilder_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_DisallowConfigureAppConfigureHostBuilder_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor UseTopLevelRouteRegistrationsInsteadOfUseEndpoints = new(
         "ASP0014",
-        new LocalizableResourceString(nameof(Resources.Analyzer_UseTopLevelRouteRegistrationsInsteadOfUseEndpoints_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_UseTopLevelRouteRegistrationsInsteadOfUseEndpoints_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_UseTopLevelRouteRegistrationsInsteadOfUseEndpoints_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_UseTopLevelRouteRegistrationsInsteadOfUseEndpoints_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor UseHeaderDictionaryPropertiesInsteadOfIndexer = new(
         "ASP0015",
-        new LocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryIndexer_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryIndexer_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryIndexer_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryIndexer_Message)),
+        Usage,
         DiagnosticSeverity.Info,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotReturnValueFromRequestDelegate = new(
         "ASP0016",
-        new LocalizableResourceString(nameof(Resources.Analyzer_RequestDelegateReturnValue_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_RequestDelegateReturnValue_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_RequestDelegateReturnValue_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_RequestDelegateReturnValue_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor RoutePatternIssue = new(
         "ASP0017",
-        new LocalizableResourceString(nameof(Resources.Analyzer_RouteIssue_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_RouteIssue_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_RouteIssue_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_RouteIssue_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor RoutePatternUnusedParameter = new(
         "ASP0018",
-        new LocalizableResourceString(nameof(Resources.Analyzer_UnusedParameter_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_UnusedParameter_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_UnusedParameter_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_UnusedParameter_Message)),
+        Usage,
         DiagnosticSeverity.Info,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor DoNotUseIHeaderDictionaryAdd = new(
         "ASP0019",
-        new LocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryAdd_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryAdd_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryAdd_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_HeaderDictionaryAdd_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor RouteParameterComplexTypeIsNotParsable = new(
         "ASP0020",
-        new LocalizableResourceString(nameof(Resources.Analyzer_RouteParameterComplexTypeIsNotParsable_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_RouteParameterComplexTypeIsNotParsable_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_RouteParameterComplexTypeIsNotParsable_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_RouteParameterComplexTypeIsNotParsable_Message)),
+        Usage,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor BindAsyncSignatureMustReturnValueTaskOfT = new(
         "ASP0021",
-        new LocalizableResourceString(nameof(Resources.Analyzer_BindAsyncSignatureMustReturnValueTaskOfT_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_BindAsyncSignatureMustReturnValueTaskOfT_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_BindAsyncSignatureMustReturnValueTaskOfT_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_BindAsyncSignatureMustReturnValueTaskOfT_Message)),
+        Usage,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor AmbiguousRouteHandlerRoute = new(
         "ASP0022",
-        new LocalizableResourceString(nameof(Resources.Analyzer_AmbiguousRouteHandlerRoute_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_AmbiguousRouteHandlerRoute_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_AmbiguousRouteHandlerRoute_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_AmbiguousRouteHandlerRoute_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor AmbiguousActionRoute = new(
         "ASP0023",
-        new LocalizableResourceString(nameof(Resources.Analyzer_AmbiguousActionRoute_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_AmbiguousActionRoute_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_AmbiguousActionRoute_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_AmbiguousActionRoute_Message)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor AtMostOneFromBodyAttribute = new(
         "ASP0024",
-        new LocalizableResourceString(nameof(Resources.Analyzer_MultipleFromBody_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_MultipleFromBody_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_MultipleFromBody_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_MultipleFromBody_Message)),
+        Usage,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor UseAddAuthorizationBuilder = new(
         "ASP0025",
-        new LocalizableResourceString(nameof(Resources.Analyzer_UseAddAuthorizationBuilder_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_UseAddAuthorizationBuilder_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_UseAddAuthorizationBuilder_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_UseAddAuthorizationBuilder_Message)),
+        Usage,
         DiagnosticSeverity.Info,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor OverriddenAuthorizeAttribute = new(
         "ASP0026",
-        new LocalizableResourceString(nameof(Resources.Analyzer_OverriddenAuthorizeAttribute_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.Analyzer_OverriddenAuthorizeAttribute_Message), Resources.ResourceManager, typeof(Resources)),
-        "Security",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_OverriddenAuthorizeAttribute_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_OverriddenAuthorizeAttribute_Message)),
+        Security,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        helpLinkUri: "https://aka.ms/aspnet/analyzers");
+        helpLinkUri: AnalyzersLink);
+
+    internal static readonly DiagnosticDescriptor PublicPartialProgramClassNotRequired = new(
+        "ASP0027",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_PublicPartialProgramClass_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_PublicPartialProgramClass_Message)),
+        Usage,
+        DiagnosticSeverity.Info,
+        isEnabledByDefault: true,
+        helpLinkUri: AnalyzersLink,
+        customTags: WellKnownDiagnosticTags.Unnecessary);
+
+    internal static readonly DiagnosticDescriptor KestrelShouldListenOnIPv6AnyInsteadOfIpAny = new(
+        "ASP0028",
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_KestrelShouldListenOnIPv6AnyInsteadOfIpAny_Title)),
+        CreateLocalizableResourceString(nameof(Resources.Analyzer_KestrelShouldListenOnIPv6AnyInsteadOfIpAny_Message)),
+        Usage,
+        DiagnosticSeverity.Info,
+        isEnabledByDefault: true,
+        helpLinkUri: AnalyzersLink);
 }
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Kestrel/ListenOnIPv6AnyAnalyzer.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Kestrel/ListenOnIPv6AnyAnalyzer.cs
new file mode 100644
index 000000000000..63fe4134e9b4
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Kestrel/ListenOnIPv6AnyAnalyzer.cs
@@ -0,0 +1,143 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Operations;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Analyzers.Kestrel;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public class ListenOnIPv6AnyAnalyzer : DiagnosticAnalyzer
+{
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [ DiagnosticDescriptors.KestrelShouldListenOnIPv6AnyInsteadOfIpAny ];
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
+        context.EnableConcurrentExecution();
+
+        context.RegisterSyntaxNodeAction(KestrelServerOptionsListenInvocation, SyntaxKind.InvocationExpression);
+    }
+
+    private void KestrelServerOptionsListenInvocation(SyntaxNodeAnalysisContext context)
+    {
+        // fail fast before accessing SemanticModel
+        if (context.Node is not InvocationExpressionSyntax
+            {
+                Expression: MemberAccessExpressionSyntax
+                {
+                    Name: IdentifierNameSyntax { Identifier.ValueText: "Listen" }
+                }
+            } kestrelOptionsListenExpressionSyntax)
+        {
+            return;
+        }
+
+        var nodeOperation = context.SemanticModel.GetOperation(context.Node, context.CancellationToken);
+        if (!IsKestrelServerOptionsType(nodeOperation, out var kestrelOptionsListenInvocation))
+        {
+            return;
+        }
+
+        var addressArgument = kestrelOptionsListenInvocation?.Arguments.FirstOrDefault();
+        if (!IsIPAddressType(addressArgument?.Parameter))
+        {
+            return;
+        }
+
+        var args = kestrelOptionsListenExpressionSyntax.ArgumentList;
+        var ipAddressArgumentSyntax = args.Arguments.FirstOrDefault();
+        if (ipAddressArgumentSyntax is null)
+        {
+            return;
+        }
+
+        // explicit usage like `options.Listen(IPAddress.Any, ...)`
+        if (ipAddressArgumentSyntax is ArgumentSyntax
+        {
+            Expression: MemberAccessExpressionSyntax
+            {
+                Name: IdentifierNameSyntax { Identifier.ValueText: "Any" }
+            }
+        })
+        {
+            context.ReportDiagnostic(Diagnostic.Create(DiagnosticDescriptors.KestrelShouldListenOnIPv6AnyInsteadOfIpAny, ipAddressArgumentSyntax.GetLocation()));
+        }
+
+        // usage via local variable like
+        // ```
+        // var myIp = IPAddress.Any;
+        // options.Listen(myIp, ...);
+        // ```
+        if (addressArgument!.Value is ILocalReferenceOperation localReferenceOperation)
+        {
+            var localVariableDeclaration = localReferenceOperation.Local.DeclaringSyntaxReferences.FirstOrDefault();
+            if (localVariableDeclaration is null)
+            {
+                return;
+            }
+
+            var localVarSyntax = localVariableDeclaration.GetSyntax(context.CancellationToken);
+            if (localVarSyntax is VariableDeclaratorSyntax
+            {
+                Initializer.Value: MemberAccessExpressionSyntax
+                {
+                    Name.Identifier.ValueText: "Any"
+                }
+            })
+            {
+                context.ReportDiagnostic(Diagnostic.Create(DiagnosticDescriptors.KestrelShouldListenOnIPv6AnyInsteadOfIpAny, ipAddressArgumentSyntax.GetLocation()));
+            }
+        }
+    }
+
+    private static bool IsIPAddressType(IParameterSymbol? parameter) => parameter is 
+    {
+        Type: // searching type `System.Net.IPAddress`
+        {
+            Name: "IPAddress",
+            ContainingNamespace: { Name: "Net", ContainingNamespace: { Name: "System", ContainingNamespace.IsGlobalNamespace: true } }
+        }
+    };
+
+    private static bool IsKestrelServerOptionsType(IOperation? operation, out IInvocationOperation? kestrelOptionsListenInvocation)
+    {
+        var result = operation is IInvocationOperation // searching type `Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions`
+        {
+            TargetMethod: { Name: "Listen" },
+            Instance.Type:
+            {
+                Name: "KestrelServerOptions",
+                ContainingNamespace:
+                {
+                    Name: "Core",
+                    ContainingNamespace:
+                    {
+                        Name: "Kestrel",
+                        ContainingNamespace:
+                        {
+                            Name: "Server",
+                            ContainingNamespace:
+                            {
+                                Name: "AspNetCore",
+                                ContainingNamespace:
+                                {
+                                    Name: "Microsoft",
+                                    ContainingNamespace.IsGlobalNamespace: true
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+
+        kestrelOptionsListenInvocation = result ? (IInvocationOperation)operation! : null;
+        return result;
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Resources.resx b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Resources.resx
index e983fd83ad25..8c9397f5be64 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Resources.resx
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -321,4 +321,16 @@
   <data name="Analyzer_OverriddenAuthorizeAttribute_Title" xml:space="preserve">
     <value>[Authorize] overridden by [AllowAnonymous] from farther away</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="Analyzer_PublicPartialProgramClass_Message" xml:space="preserve">
+    <value>Using public partial class Program { } to make the generated Program class public is no longer required in ASP.NET Core apps. See https://aka.ms/aspnetcore-warnings/ASP0027 for more details.</value>
+  </data>
+  <data name="Analyzer_PublicPartialProgramClass_Title" xml:space="preserve">
+    <value>Unnecessary public Program class declaration</value>
+  </data>
+  <data name="Analyzer_KestrelShouldListenOnIPv6AnyInsteadOfIpAny_Title" xml:space="preserve">
+    <value>Consider using ListenAnyIP() instead of Listen(IPAddress.Any)</value>
+  </data>
+  <data name="Analyzer_KestrelShouldListenOnIPv6AnyInsteadOfIpAny_Message" xml:space="preserve">
+    <value>If the server does not specifically reject IPv6, IPAddress.IPv6Any is preferred over IPAddress.Any usage for safety and performance reasons. See https://aka.ms/aspnetcore-warnings/ASP0028 for more details.</value>
+  </data>
+</root>
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/FrameworkParametersCompletionProvider.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/FrameworkParametersCompletionProvider.cs
index cbf3846cc212..2cedbc5b7a76 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/FrameworkParametersCompletionProvider.cs
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/FrameworkParametersCompletionProvider.cs
@@ -160,7 +160,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
             methodNode = delegateExpression;
 
             // Incomplete inline delegate syntax is very messy and arguments are mixed together.
-            // Examine tokens to figure out wether the current token is the argument name.
+            // Examine tokens to figure out whether the current token is the argument name.
             var previous = token.GetPreviousToken();
             if (previous.IsKind(SyntaxKind.CommaToken) ||
                 previous.IsKind(SyntaxKind.OpenParenToken) ||
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/Infrastructure/SyntaxNodeExtensions.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/Infrastructure/SyntaxNodeExtensions.cs
index 3eba331a5ffb..ca244de30c0b 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/Infrastructure/SyntaxNodeExtensions.cs
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteEmbeddedLanguage/Infrastructure/SyntaxNodeExtensions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Linq;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -126,7 +127,7 @@ private static SyntaxToken GetInitialToken(
     /// </summary>
     private static SyntaxToken FindSkippedTokenBackward(SyntaxTriviaList triviaList, int position)
     {
-        foreach (var trivia in triviaList.Reverse())
+        foreach (var trivia in Enumerable.Reverse(triviaList))
         {
             if (trivia.HasStructure)
             {
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMisplacedLambdaAttribute.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMisplacedLambdaAttribute.cs
index c6025fe0431f..ef6f1131d769 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMisplacedLambdaAttribute.cs
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DetectMisplacedLambdaAttribute.cs
@@ -70,7 +70,7 @@ static bool IsInValidNamespace(INamespaceSymbol? @namespace)
 
         static IMethodSymbol? GetReturnedInvocation(IBlockOperation blockOperation)
         {
-            foreach (var op in blockOperation.ChildOperations.Reverse())
+            foreach (var op in Enumerable.Reverse(blockOperation.ChildOperations))
             {
                 if (op is IReturnOperation returnStatement)
                 {
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DisallowNonParsableComplexTypesOnParameters.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DisallowNonParsableComplexTypesOnParameters.cs
index 1d5f8550a1a5..22ef6d3bdd38 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DisallowNonParsableComplexTypesOnParameters.cs
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/RouteHandlers/DisallowNonParsableComplexTypesOnParameters.cs
@@ -30,7 +30,7 @@ private static void DisallowNonParsableComplexTypesOnParameters(
                 continue;
             }
 
-            var parameterTypeSymbol = ResovleParameterTypeSymbol(handlerDelegateParameter);
+            var parameterTypeSymbol = ResolveParameterTypeSymbol(handlerDelegateParameter);
 
             // If this is null it means we aren't working with a named type symbol.
             if (parameterTypeSymbol == null)
@@ -113,7 +113,7 @@ static bool ReportFromAttributeDiagnostic(OperationAnalysisContext context, Well
             return false;
         }
 
-        static INamedTypeSymbol? ResovleParameterTypeSymbol(IParameterSymbol parameterSymbol)
+        static INamedTypeSymbol? ResolveParameterTypeSymbol(IParameterSymbol parameterSymbol)
         {
             INamedTypeSymbol? parameterTypeSymbol = null;
 
@@ -127,8 +127,10 @@ static bool ReportFromAttributeDiagnostic(OperationAnalysisContext context, Well
                 parameterTypeSymbol = namedTypeSymbol;
             }
 
-            // If it is nullable, unwrap it.
-            if (parameterTypeSymbol!.ConstructedFrom.SpecialType == SpecialType.System_Nullable_T)
+            // If it is nullable and we have type arguments, unwrap it.
+            // The length check aims to alleviate AD0001 warnings when referencing methods in external class libraries that contain parameters
+            if (parameterTypeSymbol!.ConstructedFrom.SpecialType == SpecialType.System_Nullable_T &&
+                parameterTypeSymbol.TypeArguments.Length > 0)
             {
                 parameterTypeSymbol = parameterTypeSymbol.TypeArguments[0] as INamedTypeSymbol;
             }
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/WebApplicationBuilder/PublicPartialProgramClassAnalyzer.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/WebApplicationBuilder/PublicPartialProgramClassAnalyzer.cs
new file mode 100644
index 000000000000..9d8bfa781e4f
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/WebApplicationBuilder/PublicPartialProgramClassAnalyzer.cs
@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class PublicPartialProgramClassAnalyzer : DiagnosticAnalyzer
+{
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(DiagnosticDescriptors.PublicPartialProgramClassNotRequired);
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
+        context.EnableConcurrentExecution();
+        context.RegisterSyntaxNodeAction(context =>
+        {
+            var syntaxNode = context.Node;
+            if (IsPublicPartialClassProgram(syntaxNode))
+            {
+                context.ReportDiagnostic(Diagnostic.Create(
+                    DiagnosticDescriptors.PublicPartialProgramClassNotRequired,
+                    syntaxNode.GetLocation()));
+            }
+        }, SyntaxKind.ClassDeclaration);
+    }
+
+    private static bool IsPublicPartialClassProgram(SyntaxNode syntaxNode)
+    {
+        return syntaxNode is ClassDeclarationSyntax { Modifiers: { } modifiers } classDeclaration
+            && classDeclaration.Parent is CompilationUnitSyntax parentNode
+            && classDeclaration is { Identifier.ValueText: "Program" }
+            && (classDeclaration.Members == null || classDeclaration.Members.Count == 0) // Skip non-empty declarations
+            && modifiers is { Count: > 1 }
+            && modifiers.Any(SyntaxKind.PublicKeyword)
+            && modifiers.Any(SyntaxKind.PartialKeyword)
+            && parentNode.DescendantNodes().Count() > 1;
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Http/HeaderDictionaryAddFixer.cs b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Http/HeaderDictionaryAddFixer.cs
index 3d11de0e1f97..faeb1c6936a2 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Http/HeaderDictionaryAddFixer.cs
+++ b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Http/HeaderDictionaryAddFixer.cs
@@ -124,7 +124,7 @@ private static bool CanReplaceWithIndexer(Diagnostic diagnostic, SyntaxNode root
                 SyntaxFactory.AssignmentExpression(
                     SyntaxKind.SimpleAssignmentExpression,
                     SyntaxFactory.ElementAccessExpression(
-                        memberAccessExpression.Expression,
+                        memberAccessExpression.Expression.WithoutTrailingTrivia(),
                         SyntaxFactory.BracketedArgumentList(
                             SyntaxFactory.SeparatedList(new[] { arguments[0] }))),
                     arguments[1].Expression);
diff --git a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Kestrel/ListenOnIPv6AnyFixer.cs b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Kestrel/ListenOnIPv6AnyFixer.cs
new file mode 100644
index 000000000000..207d80e9c6e0
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/Kestrel/ListenOnIPv6AnyFixer.cs
@@ -0,0 +1,79 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Analyzers;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Fixers.Kestrel;
+
+[ExportCodeFixProvider(LanguageNames.CSharp), Shared]
+public class ListenOnIPv6AnyFixer : CodeFixProvider
+{
+    public override ImmutableArray<string> FixableDiagnosticIds => [ DiagnosticDescriptors.KestrelShouldListenOnIPv6AnyInsteadOfIpAny.Id ];
+
+    public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+    public override Task RegisterCodeFixesAsync(CodeFixContext context)
+    {
+        foreach (var diagnostic in context.Diagnostics)
+        {
+            context.RegisterCodeFix(
+                CodeAction.Create(
+                    "Consider using IPAddress.IPv6Any instead of IPAddress.Any",
+                    async cancellationToken =>
+                    {
+                        var editor = await DocumentEditor.CreateAsync(context.Document, cancellationToken).ConfigureAwait(false);
+                        var root = await context.Document.GetSyntaxRootAsync(cancellationToken);
+                        if (root is null)
+                        {
+                            return context.Document;
+                        }
+
+                        var argumentSyntax = root.FindNode(diagnostic.Location.SourceSpan).FirstAncestorOrSelf<ArgumentSyntax>();
+                        if (argumentSyntax is null)
+                        {
+                            return context.Document;
+                        }
+
+                        // get to the `Listen(IPAddress.Any, ...)` invocation
+                        if (argumentSyntax.Parent?.Parent is not InvocationExpressionSyntax { ArgumentList.Arguments.Count: > 1 } invocationExpressionSyntax)
+                        {
+                            return context.Document;
+                        }
+                        if (invocationExpressionSyntax.Expression is not MemberAccessExpressionSyntax memberAccessExpressionSyntax)
+                        {
+                            return context.Document;
+                        }
+
+                        var instanceVariableInvoked = memberAccessExpressionSyntax.Expression;
+                        var adjustedArgumentList = invocationExpressionSyntax.ArgumentList.RemoveNode(invocationExpressionSyntax.ArgumentList.Arguments.First(), SyntaxRemoveOptions.KeepLeadingTrivia);
+                        if (adjustedArgumentList is null || adjustedArgumentList.Arguments.Count == 0)
+                        {
+                            return context.Document;
+                        }
+
+                        // changing invocation from `<variable>.Listen(IPAddress.Any, ...)` to `<variable>.ListenAnyIP(...)`
+                        editor.ReplaceNode(
+                            invocationExpressionSyntax,
+                            invocationExpressionSyntax
+                                .WithExpression(SyntaxFactory.ParseExpression($"{instanceVariableInvoked.ToString()}.ListenAnyIP"))
+                                .WithArgumentList(adjustedArgumentList!)
+                                .WithLeadingTrivia(invocationExpressionSyntax.GetLeadingTrivia())
+                        );
+                        return editor.GetChangedDocument();
+                    },
+                    equivalenceKey: DiagnosticDescriptors.KestrelShouldListenOnIPv6AnyInsteadOfIpAny.Id),
+                diagnostic);
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/PublicPartialProgramClassFixer.cs b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/PublicPartialProgramClassFixer.cs
new file mode 100644
index 000000000000..69cf2fbd17b2
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/src/CodeFixes/PublicPartialProgramClassFixer.cs
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Analyzers;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editing;
+
+namespace Microsoft.AspNetCore.Fixers;
+
+[ExportCodeFixProvider(LanguageNames.CSharp), Shared]
+public class PublicPartialProgramClassFixer : CodeFixProvider
+{
+    public override ImmutableArray<string> FixableDiagnosticIds { get; } = [DiagnosticDescriptors.PublicPartialProgramClassNotRequired.Id];
+
+    public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+    public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
+    {
+        foreach (var diagnostic in context.Diagnostics)
+        {
+            context.RegisterCodeFix(
+                CodeAction.Create("Remove unnecessary public partial class Program declaration",
+                    async cancellationToken =>
+                    {
+                        var editor = await DocumentEditor.CreateAsync(context.Document, cancellationToken).ConfigureAwait(false);
+                        var root = await context.Document.GetSyntaxRootAsync(cancellationToken);
+                        if (root is null)
+                        {
+                            return context.Document;
+                        }
+
+                        var classDeclaration = root.FindNode(diagnostic.Location.SourceSpan)
+                            .FirstAncestorOrSelf<ClassDeclarationSyntax>();
+                        if (classDeclaration is null)
+                        {
+                            return context.Document;
+                        }
+                        editor.RemoveNode(classDeclaration, SyntaxRemoveOptions.KeepExteriorTrivia);
+                        return editor.GetChangedDocument();
+                    },
+                    equivalenceKey: DiagnosticDescriptors.PublicPartialProgramClassNotRequired.Id),
+                diagnostic);
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj b/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj
new file mode 100644
index 000000000000..f623f6d11875
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IsPackable>false</IsPackable>
+    <IsAnalyzersProject>true</IsAnalyzersProject>
+    <AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
+    <Nullable>enable</Nullable>
+    <WarnOnNullable>true</WarnOnNullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="All" />
+    <Reference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="All" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/PublicTopLevelProgramGenerator.cs b/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/PublicTopLevelProgramGenerator.cs
new file mode 100644
index 000000000000..77b95a4b5070
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/PublicTopLevelProgramGenerator.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.AspNetCore.SourceGenerators;
+
+[Generator]
+public class PublicProgramSourceGenerator : IIncrementalGenerator
+{
+    private const string PublicPartialProgramClassSource = """
+// <auto-generated />
+/// <summary>
+/// Auto-generated public partial Program class for top-level statement apps.
+/// </summary>
+public partial class Program { }
+""";
+
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        var internalGeneratedProgramClass = context.CompilationProvider.Select(static (compilation, cancellationToken) =>
+            // Get the entry point associated with the compilation, this maps to the Main method definition
+            // Get the containing symbol of the entry point, this maps to the Program class
+            compilation.GetEntryPoint(cancellationToken)?.ContainingSymbol is INamedTypeSymbol
+            {
+                // If the program class is already public, we don't need to generate anything
+                DeclaredAccessibility: not Accessibility.Public,
+                // If the discovered `Program` type is not a class then its not
+                // generated and has been defined in source, so we can skip it
+                TypeKind: TypeKind.Class,
+                // If there are multiple partial declarations, then do nothing since we don't want
+                // to trample on visibility explicitly set by the user
+                DeclaringSyntaxReferences: { Length: 1 } declaringSyntaxReferences
+            } &&
+            // If the `Program` class is already declared in user code, we don't need to generate anything
+            declaringSyntaxReferences.Single().GetSyntax(cancellationToken) is not ClassDeclarationSyntax
+        );
+
+        context.RegisterSourceOutput(internalGeneratedProgramClass, (context, result) =>
+        {
+            if (result)
+            {
+                context.AddSource("PublicTopLevelProgram.Generated.g.cs", PublicPartialProgramClassSource);
+            }
+        });
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Http/HeaderDictionaryAddTest.cs b/src/Framework/AspNetCoreAnalyzers/test/Http/HeaderDictionaryAddTest.cs
index 337511920853..2aa91ec01c1b 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/Http/HeaderDictionaryAddTest.cs
+++ b/src/Framework/AspNetCoreAnalyzers/test/Http/HeaderDictionaryAddTest.cs
@@ -232,6 +232,27 @@ await VerifyCS.VerifyCodeFixAsync(
             @"
 using Microsoft.AspNetCore.Http;
 
+var context = new DefaultHttpContext();
+context.Request.Headers[""Accept""] = ""text/html""{|CS1002:|}"
+        },
+
+        // With trailing trivia
+        {
+            @"
+using Microsoft.AspNetCore.Http;
+
+var context = new DefaultHttpContext();
+{|#0:context.Request.Headers
+    .Add(""Accept"", ""text/html"")|}{|CS1002:|}",
+            new[]
+            {
+                new DiagnosticResult(DiagnosticDescriptors.DoNotUseIHeaderDictionaryAdd)
+                    .WithLocation(0)
+                    .WithMessage(Resources.Analyzer_HeaderDictionaryAdd_Message)
+            },
+            @"
+using Microsoft.AspNetCore.Http;
+
 var context = new DefaultHttpContext();
 context.Request.Headers[""Accept""] = ""text/html""{|CS1002:|}"
         }
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Infrastructure/WellKnownTypesTests.cs b/src/Framework/AspNetCoreAnalyzers/test/Infrastructure/WellKnownTypesTests.cs
index 7619fa767fd1..c5591f0950cc 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/Infrastructure/WellKnownTypesTests.cs
+++ b/src/Framework/AspNetCoreAnalyzers/test/Infrastructure/WellKnownTypesTests.cs
@@ -82,7 +82,9 @@ private static Stream GetInMemoryAssemblyStreamForCode(string code, string assem
         return stream;
     }
 
+#pragma warning disable RS1041 // Compiler extensions should be implemented in assemblies targeting netstandard2.0
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
+#pragma warning restore RS1041 // Compiler extensions should be implemented in assemblies targeting netstandard2.0
     private class TestAnalyzer : DiagnosticAnalyzer
     {
         internal static readonly DiagnosticDescriptor SuccessDescriptor = new(
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Kestrel/ListenOnIPv6AnyAnalyzerAndFixerTests.cs b/src/Framework/AspNetCoreAnalyzers/test/Kestrel/ListenOnIPv6AnyAnalyzerAndFixerTests.cs
new file mode 100644
index 000000000000..af0cbd4c307e
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/test/Kestrel/ListenOnIPv6AnyAnalyzerAndFixerTests.cs
@@ -0,0 +1,90 @@
+// 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.Collections.Generic;
+using System.Text;
+using Microsoft.CodeAnalysis.Testing;
+using VerifyCS = Microsoft.AspNetCore.Analyzers.Verifiers.CSharpCodeFixVerifier<
+    Microsoft.AspNetCore.Analyzers.Kestrel.ListenOnIPv6AnyAnalyzer,
+    Microsoft.AspNetCore.Fixers.Kestrel.ListenOnIPv6AnyFixer>;
+
+namespace Microsoft.AspNetCore.Analyzers.Kestrel;
+
+public class ListenOnIPv6AnyAnalyzerAndFixerTests
+{
+    [Fact]
+    public async Task ReportsDiagnostic_IPAddressAsLocalVariable_OuterScope()
+    {
+        var source = GetKestrelSetupSource("myIp", extraOuterCode: "var myIp = IPAddress.Any;");
+        await VerifyCS.VerifyAnalyzerAsync(source, codeSampleDiagnosticResult);
+    }
+
+    [Fact]
+    public async Task ReportsDiagnostic_IPAddressAsLocalVariable()
+    {
+        var source = GetKestrelSetupSource("myIp", extraInlineCode: "var myIp = IPAddress.Any;");
+        await VerifyCS.VerifyAnalyzerAsync(source, codeSampleDiagnosticResult);
+    }
+
+    [Fact]
+    public async Task ReportsDiagnostic_ExplicitUsage()
+    {
+        var source = GetKestrelSetupSource("IPAddress.Any");
+        await VerifyCS.VerifyAnalyzerAsync(source, codeSampleDiagnosticResult);
+    }
+
+    [Fact]
+    public async Task CodeFix_ExplicitUsage()
+    {
+        var source = GetKestrelSetupSource("IPAddress.Any");
+        var fixedSource = GetCorrectedKestrelSetup();
+        await VerifyCS.VerifyCodeFixAsync(source, codeSampleDiagnosticResult, fixedSource);
+    }
+
+    [Fact]
+    public async Task CodeFix_IPAddressAsLocalVariable()
+    {
+        var source = GetKestrelSetupSource("IPAddress.Any", extraInlineCode: "var myIp = IPAddress.Any;");
+        var fixedSource = GetCorrectedKestrelSetup(extraInlineCode: "var myIp = IPAddress.Any;");
+        await VerifyCS.VerifyCodeFixAsync(source, codeSampleDiagnosticResult, fixedSource);
+    }
+
+    private static DiagnosticResult codeSampleDiagnosticResult
+        = new DiagnosticResult(DiagnosticDescriptors.KestrelShouldListenOnIPv6AnyInsteadOfIpAny).WithLocation(0);
+
+    static string GetKestrelSetupSource(string ipAddressArgument, string extraInlineCode = null, string extraOuterCode = null)
+        => GetCodeSample($$"""Listen({|#0:{{ipAddressArgument}}|}, """, extraInlineCode, extraOuterCode);
+
+    static string GetCorrectedKestrelSetup(string extraInlineCode = null, string extraOuterCode = null)
+        => GetCodeSample("ListenAnyIP(", extraInlineCode, extraOuterCode);
+
+    static string GetCodeSample(string invocation, string extraInlineCode = null, string extraOuterCode = null) => $$"""
+        using Microsoft.Extensions.Hosting;
+        using Microsoft.AspNetCore.Hosting;
+        using Microsoft.AspNetCore.Server.Kestrel.Core;
+        using System.Net;
+    
+        {{extraOuterCode}}
+    
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHost =>
+            {
+                webHost.UseKestrel().ConfigureKestrel(options =>
+                {
+                    {{extraInlineCode}}
+                    
+                    options.ListenLocalhost(5000);
+                    options.ListenAnyIP(5000);
+                    options.{{invocation}}5000, listenOptions =>
+                    {
+                        listenOptions.UseHttps();
+                        listenOptions.Protocols = HttpProtocols.Http1AndHttp2AndHttp3;
+                    });
+                });
+            });
+    
+        var host = hostBuilder.Build();
+        host.Run();
+    """;
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj b/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj
index 8070e80c0b51..7c95e4dab135 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj
+++ b/src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj
@@ -15,6 +15,7 @@
   <ItemGroup>
     <!-- Also bring in Microsoft.AspNetCore.App.Analyzers. -->
     <ProjectReference Include="..\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj" />
+    <ProjectReference Include="..\src\SourceGenerators\Microsoft.AspNetCore.App.SourceGenerators.csproj" />
 
     <ProjectReference Include="$(RepoRoot)src\Analyzers\Microsoft.AspNetCore.Analyzer.Testing\src\Microsoft.AspNetCore.Analyzer.Testing.csproj" />
 
@@ -22,8 +23,9 @@
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Http.Results" />
     <Reference Include="Microsoft.AspNetCore.RateLimiting" />
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/RoutePatternParserTests.cs b/src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/RoutePatternParserTests.cs
index 332827e58af6..960100c0461f 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/RoutePatternParserTests.cs
+++ b/src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/RoutePatternParserTests.cs
@@ -176,7 +176,7 @@ private void TryParseSubTrees(
 
                 // Ensure the diagnostic we emit is the same as the .NET one. Note: we can only
                 // do this in en as that's the only culture where we control the text exactly
-                // and can ensure it exactly matches RoutePattern. We depend on localization to do a 
+                // and can ensure it exactly matches RoutePattern. We depend on localization to do a
                 // good enough job here for other languages.
                 if (Thread.CurrentThread.CurrentCulture.Parent.Name == "en")
                 {
@@ -195,7 +195,7 @@ private void TryParseSubTrees(
         if (!tree.Diagnostics.IsEmpty && !allowDiagnosticsMismatch)
         {
             var expectedDiagnostics = CreateDiagnosticsElement(sourceText, tree);
-            Assert.False(true, $"Parsing '{token.ValueText}' didn't throw an error for expected diagnostics: \r\n" + expectedDiagnostics.ToString().Replace(@"""", @""""""));
+            Assert.Fail($"Parsing '{token.ValueText}' didn't throw an error for expected diagnostics: \r\n" + expectedDiagnostics.ToString().Replace(@"""", @""""""));
         }
 
         if (parsedRoutePatterns != null)
diff --git a/src/Framework/AspNetCoreAnalyzers/test/RouteHandlers/DisallowNonParsableComplexTypesOnParametersTest.cs b/src/Framework/AspNetCoreAnalyzers/test/RouteHandlers/DisallowNonParsableComplexTypesOnParametersTest.cs
index 6651effa31fa..58e7476ca796 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/RouteHandlers/DisallowNonParsableComplexTypesOnParametersTest.cs
+++ b/src/Framework/AspNetCoreAnalyzers/test/RouteHandlers/DisallowNonParsableComplexTypesOnParametersTest.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.Security.Policy;
 using Microsoft.CodeAnalysis.Testing;
 using VerifyCS = Microsoft.AspNetCore.Analyzers.Verifiers.CSharpAnalyzerVerifier<Microsoft.AspNetCore.Analyzers.RouteHandlers.RouteHandlerAnalyzer>;
 
diff --git a/src/Framework/AspNetCoreAnalyzers/test/SourceGenerators/PublicTopLevelProgramGeneratorTests.cs b/src/Framework/AspNetCoreAnalyzers/test/SourceGenerators/PublicTopLevelProgramGeneratorTests.cs
new file mode 100644
index 000000000000..a75a34057fd9
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/test/SourceGenerators/PublicTopLevelProgramGeneratorTests.cs
@@ -0,0 +1,240 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using VerifyCS = Microsoft.AspNetCore.Analyzers.Verifiers.CSharpSourceGeneratorVerifier<Microsoft.AspNetCore.SourceGenerators.PublicProgramSourceGenerator>;
+
+namespace Microsoft.AspNetCore.SourceGenerators.Tests;
+
+public class PublicTopLevelProgramGeneratorTests
+{
+    private const string ExpectedGeneratedSource = """
+// <auto-generated />
+/// <summary>
+/// Auto-generated public partial Program class for top-level statement apps.
+/// </summary>
+public partial class Program { }
+""";
+
+    [Fact]
+    public async Task GeneratesSource_ProgramWithTopLevelStatements()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+""";
+
+        await VerifyCS.VerifyAsync(source, "PublicTopLevelProgram.Generated.g.cs", ExpectedGeneratedSource);
+    }
+
+    // The compiler synthesizes a Program class in the global namespace due to top-level statements
+    // The Foo.Program class is completely unrelated to the entry point and is just as any regular type
+    // Hence, we will expect to see the source generated in these scenarios
+    [Theory]
+    [InlineData("public partial class Program { }")]
+    [InlineData("internal partial class Program { }")]
+    public async Task GeneratesSource_IfProgramDefinedInANamespace (string declaration)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+namespace Foo
+{
+    {{declaration}}
+}
+""";
+
+        await VerifyCS.VerifyAsync(source, "PublicTopLevelProgram.Generated.g.cs", ExpectedGeneratedSource);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratesSource_IfProgramIsAlreadyPublic()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+public partial class Program { }
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratesSource_IfProgramDeclaresExplicitInternalAccess()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+internal partial class Program { }
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratorSource_ExplicitPublicProgramClass()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+public class Program
+{
+    public static void Main()
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratorSource_ExplicitPublicProgramClassInNamespace()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+namespace Foo
+{
+    public class Program
+    {
+        public static void Main()
+        {
+            var app = WebApplication.Create();
+
+            app.MapGet("/", () => "Hello, World!");
+
+            app.Run();
+        }
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratorSource_ExplicitInternalProgramClass()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+internal class Program
+{
+    public static void Main()
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratorSource_ExplicitInternalProgramClassInNamespace()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+namespace Foo
+{
+    internal class Program
+    {
+        public static void Main()
+        {
+            var app = WebApplication.Create();
+
+            app.MapGet("/", () => "Hello, World!");
+
+            app.Run();
+        }
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Theory]
+    [InlineData("interface")]
+    [InlineData("struct")]
+    public async Task DoesNotGeneratorSource_ExplicitInternalProgramType(string type)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+internal {{type}} Program
+{
+    public static void Main(string[] args)
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Theory]
+    [InlineData("interface")]
+    [InlineData("struct")]
+    public async Task DoesNotGeneratorSource_ExplicitInternalProgramTypeInNamespace(string type)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+namespace Foo
+{
+    internal {{type}} Program
+    {
+        public static void Main(string[] args)
+        {
+            var app = WebApplication.Create();
+
+            app.MapGet("/", () => "Hello, World!");
+
+            app.Run();
+        }
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs
index 9afed98bd962..cfbc023573b3 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs
+++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs
@@ -9,8 +9,8 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Hosting;
 
 namespace Microsoft.AspNetCore.Analyzers.Verifiers;
 
@@ -19,20 +19,20 @@ public static partial class CSharpAnalyzerVerifier<TAnalyzer>
 {
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic()"/>
     public static DiagnosticResult Diagnostic()
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic();
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic();
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(string)"/>
     public static DiagnosticResult Diagnostic(string diagnosticId)
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(diagnosticId);
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(diagnosticId);
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
     public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(descriptor);
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(descriptor);
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
     public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
+        var test = new CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
         {
             TestCode = source.ReplaceLineEndings(),
             // We need to set the output type to an exe to properly
@@ -53,20 +53,22 @@ internal static ReferenceAssemblies GetReferenceAssemblies()
                 Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"),
                 "NuGet.config") :
             Path.Combine(TestData.GetRepoRoot(), "NuGet.config");
-        var net8Ref = new ReferenceAssemblies(
-            "net9.0",
+        var net10Ref = new ReferenceAssemblies(
+            "net10.0",
             new PackageIdentity(
                 "Microsoft.NETCore.App.Ref",
                 TestData.GetMicrosoftNETCoreAppRefPackageVersion()),
-            Path.Combine("ref", "net9.0"))
+            Path.Combine("ref", "net10.0"))
         .WithNuGetConfigFilePath(nugetConfigPath);
 
-        return net8Ref.AddAssemblies(ImmutableArray.Create(
+        return net10Ref.AddAssemblies(ImmutableArray.Create(
             TrimAssemblyExtension(typeof(System.IO.Pipelines.PipeReader).Assembly.Location),
+            TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServer).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Authorization.IAuthorizeData).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Mvc.BindAttribute).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Hosting.WebHostBuilderExtensions).Assembly.Location),
+            TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Hosting.WebHostBuilderKestrelExtensions).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.Extensions.Hosting.IHostBuilder).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.Extensions.Hosting.HostingHostBuilderExtensions).Assembly.Location),
             TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Builder.ConfigureHostBuilder).Assembly.Location),
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs
index 83f30d841e49..c39a1a87e87b 100644
--- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs
+++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpCodeFixVerifier.cs
@@ -6,7 +6,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Microsoft.AspNetCore.Analyzers.Verifiers;
 
@@ -16,20 +15,20 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
 {
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic()"/>
     public static DiagnosticResult Diagnostic()
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic();
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(string)"/>
     public static DiagnosticResult Diagnostic(string diagnosticId)
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(diagnosticId);
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(diagnosticId);
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
     public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(descriptor);
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(descriptor);
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
     public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
     {
-        var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
+        var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
         {
             TestCode = source.ReplaceLineEndings(),
             // We need to set the output type to an exe to properly
@@ -54,7 +53,7 @@ public static async Task VerifyCodeFixAsync(string source, DiagnosticResult expe
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyCodeFixAsync(string, DiagnosticResult[], string)"/>
     public static async Task VerifyCodeFixAsync(string source, DiagnosticResult[] expected, string fixedSource, int? expectedIterations = null, string usageSource = null, string codeActionEquivalenceKey = null)
     {
-        var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
+        var test = new CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
         {
             // We need to set the output type to an exe to properly
             // support top-level programs in the tests. Otherwise,
diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs
new file mode 100644
index 000000000000..13286b98f26f
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpSourceGeneratorVerifier.cs
@@ -0,0 +1,47 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text;
+using Microsoft.AspNetCore.Analyzers.WebApplicationBuilder;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Testing;
+using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.AspNetCore.Analyzers.Verifiers;
+
+public static partial class CSharpSourceGeneratorVerifier<TSourceGenerator>
+        where TSourceGenerator : IIncrementalGenerator, new()
+{
+    public static async Task VerifyAsync(string source, string generatedFileName, string generatedSource)
+    {
+        var test = new CSharpSourceGeneratorTest<TSourceGenerator, DefaultVerifier>
+        {
+            TestState =
+            {
+                Sources = { source.ReplaceLineEndings() },
+                OutputKind = OutputKind.ConsoleApplication,
+                GeneratedSources =
+                {
+                    (typeof(TSourceGenerator), generatedFileName, SourceText.From(generatedSource, Encoding.UTF8))
+                },
+                ReferenceAssemblies = CSharpAnalyzerVerifier<WebApplicationBuilderAnalyzer>.GetReferenceAssemblies()
+            },
+        };
+        await test.RunAsync(CancellationToken.None);
+    }
+
+    public static async Task VerifyAsync(string source)
+    {
+        var test = new CSharpSourceGeneratorTest<TSourceGenerator, DefaultVerifier>
+        {
+            TestState =
+            {
+                Sources = { source.ReplaceLineEndings() },
+                OutputKind = OutputKind.ConsoleApplication,
+                ReferenceAssemblies = CSharpAnalyzerVerifier<WebApplicationBuilderAnalyzer>.GetReferenceAssemblies()
+            },
+        };
+        await test.RunAsync(CancellationToken.None);
+    }
+}
diff --git a/src/Framework/AspNetCoreAnalyzers/test/WebApplicationBuilder/PublicPartialProgramClassTest.cs b/src/Framework/AspNetCoreAnalyzers/test/WebApplicationBuilder/PublicPartialProgramClassTest.cs
new file mode 100644
index 000000000000..0c7fd74b2a02
--- /dev/null
+++ b/src/Framework/AspNetCoreAnalyzers/test/WebApplicationBuilder/PublicPartialProgramClassTest.cs
@@ -0,0 +1,263 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.Testing;
+using VerifyCS = Microsoft.AspNetCore.Analyzers.Verifiers.CSharpCodeFixVerifier<
+    Microsoft.AspNetCore.Analyzers.PublicPartialProgramClassAnalyzer,
+    Microsoft.AspNetCore.Fixers.PublicPartialProgramClassFixer>;
+
+namespace Microsoft.AspNetCore.Analyzers;
+
+public class PublicPartialProgramClassTest
+{
+    [Fact]
+    public async Task DoesNothingWhenNoDeclarationIsFound()
+    {
+        // Arrange
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+""";
+
+        // Assert
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Theory]
+    [InlineData("public partial class Program { }")]
+    [InlineData("public partial class Program { /* This is just for tests */ }")]
+    [InlineData("public partial class Program { \n // This is just for tests \n }")]
+    [InlineData("public partial class Program;")]
+    public async Task RemovesDeclarationIfItIsFound(string declarationStyle)
+    {
+        // Arrange
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+{|#0:{{declarationStyle}}|}
+""";
+
+        var diagnostic = new DiagnosticResult(DiagnosticDescriptors.PublicPartialProgramClassNotRequired)
+                .WithLocation(0);
+
+        var fixedSource = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+
+""";
+
+        // Assert
+        await VerifyCS.VerifyCodeFixAsync(source, [diagnostic], fixedSource);
+    }
+
+    [Fact]
+    public async Task RemovesDeclarationIfItIsFound_WithLeadingTrivia()
+    {
+        // Arrange
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+// This is a test
+
+{|#0:public partial class Program;|}
+""";
+
+        var diagnostic = new DiagnosticResult(DiagnosticDescriptors.PublicPartialProgramClassNotRequired)
+                .WithLocation(0);
+
+        var fixedSource = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+// This is a test
+
+
+""";
+
+        // Assert
+        await VerifyCS.VerifyCodeFixAsync(source, [diagnostic], fixedSource);
+    }
+
+    [Fact]
+    public async Task DoesNotGeneratesSource_IfProgramDeclaresExplicitInternalAccess()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+internal partial class Program { }
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Fact]
+    public async Task DoesNotFix_ExplicitPublicProgramClass()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+public class Program
+{
+    public static void Main()
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Fact]
+    public async Task DoesNotFix_ExplicitPublicPartialProgramClass()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+public partial class Program
+{
+    public static void Main()
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Theory]
+    [InlineData("public int Number { get; set; }")]
+    [InlineData("private int _foo = 2;")]
+    public async Task DoesNotFix_ExplicitPublicPartialProgramClass_WithProperty(string contents)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+public partial class Program
+{
+    {{contents}}
+}
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Theory]
+    [InlineData("namespace Foo")]
+    [InlineData("public class Foo")]
+    public async Task DoesNotFix_ExplicitPublicPartialProgramClassInNestedPattern(string parentDefinition)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+{{parentDefinition}}
+{
+    public partial class Program { }
+}
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Fact]
+    public async Task DoesNotFix_ExplicitInternalProgramClass()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+internal class Program
+{
+    public static void Main()
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+
+    [Theory]
+    [InlineData("interface")]
+    [InlineData("struct")]
+    public async Task DoesNotFix_ExplicitInternalProgramType(string type)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+internal {{type}} Program
+{
+    public static void Main(string[] args)
+    {
+        var app = WebApplication.Create();
+
+        app.MapGet("/", () => "Hello, World!");
+
+        app.Run();
+    }
+}
+""";
+
+        await VerifyCS.VerifyCodeFixAsync(source, source);
+    }
+}
+
diff --git a/src/Framework/Framework.slnf b/src/Framework/Framework.slnf
index ca623b466702..cde653913838 100644
--- a/src/Framework/Framework.slnf
+++ b/src/Framework/Framework.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Analyzers\\Microsoft.AspNetCore.Analyzer.Testing\\src\\Microsoft.AspNetCore.Analyzer.Testing.csproj",
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
@@ -21,11 +21,12 @@
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
       "src\\FileProviders\\Manifest.MSBuildTask\\src\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj",
-      "src\\Framework\\App.Ref\\src\\Microsoft.AspNetCore.App.Ref.csproj",
-      "src\\Framework\\App.Runtime\\src\\Microsoft.AspNetCore.App.Runtime.csproj",
+      "src\\Framework\\App.Ref\\src\\Microsoft.AspNetCore.App.Ref.sfxproj",
+      "src\\Framework\\App.Runtime\\src\\Microsoft.AspNetCore.App.Runtime.sfxproj",
       "src\\Framework\\AspNetCoreAnalyzers\\samples\\WebAppSample\\WebAppSample.csproj",
       "src\\Framework\\AspNetCoreAnalyzers\\src\\Analyzers\\Microsoft.AspNetCore.App.Analyzers.csproj",
       "src\\Framework\\AspNetCoreAnalyzers\\src\\CodeFixes\\Microsoft.AspNetCore.App.CodeFixes.csproj",
+      "src\\Framework\\AspNetCoreAnalyzers\\src\\SourceGenerators\\Microsoft.AspNetCore.App.SourceGenerators.csproj",
       "src\\Framework\\AspNetCoreAnalyzers\\test\\Microsoft.AspNetCore.App.Analyzers.Test.csproj",
       "src\\Framework\\test\\Microsoft.AspNetCore.App.UnitTests.csproj",
       "src\\HealthChecks\\Abstractions\\src\\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj",
diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index d559bd5b0fcb..09eeccfea525 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -11,8 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Grab RuntimeList.xml because it's not placed in the .dotnet/ folder. -->
-    <None Include="$(ArtifactsObjDir)Microsoft.AspNetCore.App.Runtime\RuntimeList.xml"
+    <!--
+      Grab RuntimeList.xml because it's not placed in the .dotnet/ folder.
+      This depends on internal implementation details of the SharedFramework SDK and should be changed to use a supported mechanism
+      to discover the runtime list.
+    -->
+    <None Include="$(ArtifactsObjDir)aspnetcore-sfx\$(Configuration)\$(TargetRuntimeIdentifier)\RuntimeList.xml"
         CopyToOutputDirectory="PreserveNewest" />
 
     <!-- Ignore aspnetcorev2_inprocess because tests expect only managed assemblies in this item group. -->
@@ -42,8 +46,8 @@
       <_Parameter2>$(TargetRuntimeIdentifier)</_Parameter2>
     </AssemblyAttribute>
     <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
-      <_Parameter1>MicrosoftNETCoreAppRuntimeVersion</_Parameter1>
-      <_Parameter2>$(MicrosoftNETCoreAppRuntimeVersion)</_Parameter2>
+      <_Parameter1>MicrosoftNETCoreAppRefVersion</_Parameter1>
+      <_Parameter2>$(MicrosoftNETCoreAppRefVersion)</_Parameter2>
     </AssemblyAttribute>
     <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
       <_Parameter1>SharedFrameworkBinariesFromRepo</_Parameter1>
@@ -77,7 +81,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
+    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
@@ -85,12 +89,16 @@
 
   <Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
     <!-- Use the ref pack logic to compute the list of expected targeting pack content -->
-    <MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
-        Targets="ResolveTargetingPackContent">
-      <Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
+    <MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
+        Targets="GetFilesToPackage">
+      <Output TaskParameter="TargetOutputs" ItemName="_TargetingPackFiles" />
     </MSBuild>
 
     <ItemGroup>
+      <_AnalyzersInTargetingPack Include="@(_TargetingPackFiles)" Condition="$([System.String]::new('%(_TargetingPackFiles.Directory)').Contains('analyzers'))" />
+      <_AnalyzersInTargetingPack Include="@(_TargetingPackFiles->WithMetadataValue('OutputItemType','AspNetCoreAnalyzer'))" />
+      <_TargetingPackDependencies Include="@(_TargetingPackFiles->WithMetadataValue('Extension','.dll'))" Exclude="@(_AnalyzersInTargetingPack)" />
+
       <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
         <_Parameter1>TargetingPackDependencies</_Parameter1>
         <_Parameter2>@(_TargetingPackDependencies->'%(FileName)')</_Parameter2>
diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 8aed6fa3bff5..5578643035b8 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -96,7 +96,7 @@ public void SharedFrameworkContainsValidRuntimeConfigFile()
         Assert.Equal(_expectedTfm, (string)runtimeConfig["runtimeOptions"]["tfm"]);
         Assert.Equal("LatestPatch", (string)runtimeConfig["runtimeOptions"]["rollForward"]);
 
-        Assert.Equal(TestData.GetMicrosoftNETCoreAppPackageVersion(), (string)runtimeConfig["runtimeOptions"]["framework"]["version"]);
+        Assert.Equal(TestData.GetMicrosoftNETCoreAppVersion(), (string)runtimeConfig["runtimeOptions"]["framework"]["version"]);
     }
 
     [Fact]
@@ -165,7 +165,7 @@ public void SharedFrameworkAssembliesHaveExpectedAssemblyVersions()
             .Split(';', StringSplitOptions.RemoveEmptyEntries)
             .ToHashSet();
 
-        var versionStringWithoutPrereleaseTag = TestData.GetMicrosoftNETCoreAppPackageVersion().Split('-', 2)[0];
+        var versionStringWithoutPrereleaseTag = TestData.GetMicrosoftNETCoreAppVersion().Split('-', 2)[0];
         var version = Version.Parse(versionStringWithoutPrereleaseTag);
         var aspnetcoreVersionString = TestData.GetSharedFxVersion().Split('-', 2)[0];
         var aspnetcoreVersion = Version.Parse(aspnetcoreVersionString);
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index fbd159b3a045..ddaeb7b1ded1 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -65,7 +65,7 @@ public void RefAssembliesHaveExpectedAssemblyVersions()
             .Split(';', StringSplitOptions.RemoveEmptyEntries)
             .ToHashSet();
 
-        var versionStringWithoutPrereleaseTag = TestData.GetMicrosoftNETCoreAppPackageVersion().Split('-', 2)[0];
+        var versionStringWithoutPrereleaseTag = TestData.GetMicrosoftNETCoreAppVersion().Split('-', 2)[0];
         var version = Version.Parse(versionStringWithoutPrereleaseTag);
         var aspnetcoreVersionString = TestData.GetSharedFxVersion().Split('-', 2)[0];
         var aspnetcoreVersion = Version.Parse(aspnetcoreVersionString);
@@ -144,10 +144,27 @@ public void PackageOverridesContainsCorrectEntries()
             .Split(';', StringSplitOptions.RemoveEmptyEntries)
             .ToHashSet();
 
-        Assert.Equal(packageOverrideFileLines.Length, runtimeDependencies.Count + aspnetcoreDependencies.Count);
+        // Some packages are excluded from pruning because they contain build logic that is not in the SDK.
+        // These packages need their build targets to execute even though their runtime assemblies are in the shared framework.
+        string[] packagesExcludedFromPruning = ["Microsoft.Extensions.FileProviders.Embedded"]; // See https://github.com/dotnet/aspnetcore/issues/63719
+
+        foreach (var excludedPackage in packagesExcludedFromPruning)
+        {
+            aspnetcoreDependencies.Remove(excludedPackage);
+        }
+
+        // PackageOverrides will contain all Aspnetcore/Runtime ref pack libs, plus an entry for Microsoft.AspNetCore.App,
+        // minus any packages excluded from pruning
+        Assert.Equal(packageOverrideFileLines.Length, runtimeDependencies.Count + aspnetcoreDependencies.Count + 1);
+
+        // Verify that excluded packages are NOT in PackageOverrides
+        foreach (var excludedPackage in packagesExcludedFromPruning)
+        {
+            Assert.DoesNotContain(packageOverrideFileLines, line => line.StartsWith(excludedPackage + "|", StringComparison.Ordinal));
+        }
 
         // PackageOverrides versions should remain at Major.Minor.0 while servicing.
-        var netCoreAppPackageVersion = TestData.GetMicrosoftNETCoreAppPackageVersion();
+        var netCoreAppPackageVersion = TestData.GetMicrosoftNETCoreAppVersion();
         Assert.True(
             NuGetVersion.TryParse(netCoreAppPackageVersion, out var parsedVersion),
             "MicrosoftNETCoreAppPackageVersion must be convertable to a NuGetVersion.");
@@ -177,13 +194,13 @@ public void PackageOverridesContainsCorrectEntries()
             {
                 Assert.Equal(netCoreAppPackageVersion, packageVersion);
             }
-            else if (aspnetcoreDependencies.Contains(packageName))
+            else if (packageName.Equals("Microsoft.AspNetCore.App", StringComparison.Ordinal) || aspnetcoreDependencies.Contains(packageName))
             {
                 Assert.Equal(aspNetCoreAppPackageVersion, packageVersion);
             }
             else
             {
-                Assert.True(false, $"{packageName} is not a recognized aspNetCore or runtime dependency");
+                Assert.Fail($"{packageName} is not a recognized aspNetCore or runtime dependency");
             }
         });
     }
diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs
index fe88b95fcdd6..78e9a72a04d7 100644
--- a/src/Framework/test/TestData.cs
+++ b/src/Framework/test/TestData.cs
@@ -151,10 +151,12 @@ static TestData()
                 "Microsoft.Extensions.Options.DataAnnotations",
                 "Microsoft.Extensions.Primitives",
                 "Microsoft.Extensions.WebEncoders",
+                "Microsoft.Extensions.Validation",
                 "Microsoft.JSInterop",
                 "Microsoft.Net.Http.Headers",
                 "System.Diagnostics.EventLog",
                 "System.Diagnostics.EventLog.Messages",
+                "System.Formats.Cbor",
                 "System.Security.Cryptography.Pkcs",
                 "System.Security.Cryptography.Xml",
                 "System.Threading.RateLimiting",
@@ -302,9 +304,11 @@ static TestData()
                 { "Microsoft.Extensions.Options" },
                 { "Microsoft.Extensions.Primitives" },
                 { "Microsoft.Extensions.WebEncoders" },
+                { "Microsoft.Extensions.Validation" },
                 { "Microsoft.JSInterop" },
                 { "Microsoft.Net.Http.Headers" },
                 { "System.Diagnostics.EventLog" },
+                { "System.Formats.Cbor" },
                 { "System.Security.Cryptography.Xml" },
                 { "System.Threading.RateLimiting" },
             };
@@ -319,7 +323,7 @@ static TestData()
 
     public static string GetDefaultNetCoreTargetFramework() => GetTestDataValue("DefaultNetCoreTargetFramework");
 
-    public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppRuntimeVersion");
+    public static string GetMicrosoftNETCoreAppVersion() => GetTestDataValue("MicrosoftNETCoreAppRefVersion");
 
     public static string GetReferencePackSharedFxVersion() => GetTestDataValue("ReferencePackSharedFxVersion");
 
diff --git a/src/Grpc/Grpc.slnf b/src/Grpc/Grpc.slnf
index 98592f405ac7..2dc9d6d019ae 100644
--- a/src/Grpc/Grpc.slnf
+++ b/src/Grpc/Grpc.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\Grpc\\Interop\\test\\InteropTests\\InteropTests.csproj",
diff --git a/src/Grpc/Interop/test/InteropTests/Helpers/ClientProcess.cs b/src/Grpc/Interop/test/InteropTests/Helpers/ClientProcess.cs
index 0104584535d2..4714e9bb0376 100644
--- a/src/Grpc/Interop/test/InteropTests/Helpers/ClientProcess.cs
+++ b/src/Grpc/Interop/test/InteropTests/Helpers/ClientProcess.cs
@@ -31,6 +31,8 @@ public ClientProcess(ITestOutputHelper output, string path, string serverPort, s
         _process.EnableRaisingEvents = true;
         _process.OutputDataReceived += Process_OutputDataReceived;
         _process.ErrorDataReceived += Process_ErrorDataReceived;
+
+        output.WriteLine($"Starting process: {ProcessDebugHelper.GetDebugCommand(_process.StartInfo)}");
         _process.Start();
 
         _processEx = new ProcessEx(output, _process, timeout: Timeout.InfiniteTimeSpan);
diff --git a/src/Grpc/Interop/test/InteropTests/Helpers/ProcessDebugHelper.cs b/src/Grpc/Interop/test/InteropTests/Helpers/ProcessDebugHelper.cs
new file mode 100644
index 000000000000..2305c67953f8
--- /dev/null
+++ b/src/Grpc/Interop/test/InteropTests/Helpers/ProcessDebugHelper.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+
+namespace InteropTests.Helpers;
+
+public static class ProcessDebugHelper
+{
+    public static string GetDebugCommand(ProcessStartInfo psi)
+    {
+        // Quote the file name if it contains spaces or special characters
+        var fileName = QuoteIfNeeded(psi.FileName);
+
+        // Arguments are typically already passed as a single string
+        var arguments = psi.Arguments;
+
+        return $"{fileName} {arguments}".Trim();
+    }
+
+    private static string QuoteIfNeeded(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return "\"\"";
+        }
+
+        // Add quotes if value contains spaces or special characters
+        if (value.Contains(' ') || value.Contains('"'))
+        {
+            return $"\"{value.Replace("\"", "\\\"")}\"";
+        }
+
+        return value;
+    }
+}
diff --git a/src/Grpc/Interop/test/InteropTests/Helpers/WebsiteProcess.cs b/src/Grpc/Interop/test/InteropTests/Helpers/WebsiteProcess.cs
index cfd8dfb34be0..b187f01b913f 100644
--- a/src/Grpc/Interop/test/InteropTests/Helpers/WebsiteProcess.cs
+++ b/src/Grpc/Interop/test/InteropTests/Helpers/WebsiteProcess.cs
@@ -36,6 +36,8 @@ public WebsiteProcess(string path, ITestOutputHelper output)
         _process.EnableRaisingEvents = true;
         _process.OutputDataReceived += Process_OutputDataReceived;
         _process.ErrorDataReceived += Process_ErrorDataReceived;
+
+        output.WriteLine($"Starting process: {ProcessDebugHelper.GetDebugCommand(_process.StartInfo)}");
         _process.Start();
 
         _processEx = new ProcessEx(output, _process, Timeout.InfiniteTimeSpan);
diff --git a/src/Grpc/Interop/test/InteropTests/InteropTests.cs b/src/Grpc/Interop/test/InteropTests/InteropTests.cs
index 825c0ff3c06a..9785d8890c9d 100644
--- a/src/Grpc/Interop/test/InteropTests/InteropTests.cs
+++ b/src/Grpc/Interop/test/InteropTests/InteropTests.cs
@@ -9,9 +9,10 @@ namespace InteropTests;
 
 // All interop test cases, minus GCE authentication specific tests.
 // Tests are separate methods so that they can be quarantined separately.
+[Retry]
 public class InteropTests
 {
-    private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(30);
+    private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(100);
     private readonly string _clientPath = Path.Combine(Directory.GetCurrentDirectory(), "InteropClient", "InteropClient.dll");
     private readonly string _serverPath = Path.Combine(Directory.GetCurrentDirectory(), "InteropWebsite", "InteropWebsite.dll");
     private readonly ITestOutputHelper _output;
@@ -77,13 +78,48 @@ public InteropTests(ITestOutputHelper output)
 
     private async Task InteropTestCase(string name)
     {
+        // Building interop tests processes can be flaky. Sometimes it times out.
+        // To mitigate this, we retry the test case a few times on timeout.
+        const int maxRetries = 3;
+        var attempt = 0;
+
+        while (true)
+        {
+            attempt++;
+
+            try
+            {
+                await InteropTestCaseCore(name);
+                break; // Exit loop on success
+            }
+            catch (TimeoutException ex)
+            {
+                _output.WriteLine($"Attempt {attempt} failed: {ex.Message}");
+
+                if (attempt == maxRetries)
+                {
+                    _output.WriteLine("Maximum retry attempts reached. Giving up.");
+                    throw;
+                }
+                else
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(1));
+                }
+            }
+        }
+    }
+
+    private async Task InteropTestCaseCore(string name)
+    {
+        _output.WriteLine($"Starting {nameof(WebsiteProcess)}.");
         using (var serverProcess = new WebsiteProcess(_serverPath, _output))
         {
             try
             {
+                _output.WriteLine($"Waiting for {nameof(WebsiteProcess)} to be ready.");
                 await serverProcess.WaitForReady().TimeoutAfter(DefaultTimeout);
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ex is not TimeoutException)
             {
                 var errorMessage = $@"Error while running server process.
 
@@ -96,17 +132,20 @@ private async Task InteropTestCase(string name)
                 throw new InvalidOperationException(errorMessage, ex);
             }
 
+            _output.WriteLine($"Starting {nameof(ClientProcess)}.");
             using (var clientProcess = new ClientProcess(_output, _clientPath, serverProcess.ServerPort, name))
             {
                 try
                 {
+                    _output.WriteLine($"Waiting for {nameof(ClientProcess)} to be ready.");
                     await clientProcess.WaitForReadyAsync().TimeoutAfter(DefaultTimeout);
 
+                    _output.WriteLine($"Waiting for {nameof(ClientProcess)} to exit.");
                     await clientProcess.WaitForExitAsync().TimeoutAfter(DefaultTimeout);
 
                     Assert.Equal(0, clientProcess.ExitCode);
                 }
-                catch (Exception ex)
+                catch (Exception ex) when (ex is not TimeoutException)
                 {
                     var errorMessage = $@"Error while running client process.
 
diff --git a/src/Grpc/Interop/test/InteropTests/InteropTests.csproj b/src/Grpc/Interop/test/InteropTests/InteropTests.csproj
index f5e9b3a9cbfd..dcdc7d16d586 100644
--- a/src/Grpc/Interop/test/InteropTests/InteropTests.csproj
+++ b/src/Grpc/Interop/test/InteropTests/InteropTests.csproj
@@ -9,7 +9,7 @@
     <Compile Include="..\..\..\..\Shared\Process\ProcessExtensions.cs" Link="Helpers\ProcessExtensions.cs" />
 
     <!-- Enforce build order. Need shared Fx before PublishTestAssets runs. -->
-    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
+    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj b/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
index 4c8e02e25b8f..322fea55238a 100644
--- a/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
+++ b/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
@@ -6,6 +6,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TieredCompilation>false</TieredCompilation>
     <DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
+    <SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonSettings.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonSettings.cs
index d53ca301dc01..6a4ab85c5ee5 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonSettings.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonSettings.cs
@@ -11,25 +11,79 @@ public sealed class GrpcJsonSettings
     /// <summary>
     /// Gets or sets a value that indicates whether fields with default values are ignored during serialization.
     /// This setting only affects fields which don't support "presence", such as singular non-optional proto3 primitive fields.
-    /// Default value is false.
+    /// Default value is <see langword="false"/>.
     /// </summary>
     public bool IgnoreDefaultValues { get; set; }
 
     /// <summary>
     /// Gets or sets a value that indicates whether <see cref="Enum"/> values are written as integers instead of strings.
-    /// Default value is false.
+    /// Default value is <see langword="false"/>.
     /// </summary>
     public bool WriteEnumsAsIntegers { get; set; }
 
     /// <summary>
     /// Gets or sets a value that indicates whether <see cref="long"/> and <see cref="ulong"/> values are written as strings instead of numbers.
-    /// Default value is false.
+    /// Default value is <see langword="false"/>.
     /// </summary>
     public bool WriteInt64sAsStrings { get; set; }
 
     /// <summary>
     /// Gets or sets a value that indicates whether JSON should use pretty printing.
-    /// Default value is false.
+    /// Default value is <see langword="false"/>.
     /// </summary>
     public bool WriteIndented { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value that indicates whether property names are compared using case-insensitive matching during deserialization.
+    /// The default value is <see langword="false"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The Protobuf JSON specification requires JSON property names to match message field names exactly, including case.
+    /// Enabling this option may reduce interoperability, as case-insensitive property matching might not be supported
+    /// by other JSON transcoding implementations.
+    /// </para>
+    /// <para>
+    /// For more information, see <see href="https://protobuf.dev/programming-guides/json/"/>.
+    /// </para>
+    /// </remarks>
+    public bool PropertyNameCaseInsensitive { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the enum type name prefix should be removed when reading and writing enum values.
+    /// The default value is <see langword="false"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// In Protocol Buffers, enum value names are globally scoped, so they are often prefixed with the enum type name
+    /// to avoid name collisions. For example, the <c>Status</c> enum might define values like <c>STATUS_UNKNOWN</c>
+    /// and <c>STATUS_OK</c>.
+    /// </para>
+    /// <code>
+    /// enum Status {
+    ///   STATUS_UNKNOWN = 0;
+    ///   STATUS_OK = 1;
+    /// }
+    /// </code>
+    /// <para>
+    /// When <see cref="RemoveEnumPrefix"/> is set to <see langword="true"/>:
+    /// </para>
+    /// <list type="bullet">
+    /// <item>
+    /// <description>The <c>STATUS</c> prefix is removed from enum values. The enum values above will be read and written as <c>UNKNOWN</c> and <c>OK</c> instead of <c>STATUS_UNKNOWN</c> and <c>STATUS_OK</c>.</description>
+    /// </item>
+    /// <item>
+    /// <description>Original prefixed values are used as a fallback when reading JSON. For example, <c>STATUS_OK</c> and <c>OK</c> map to the <c>STATUS_OK</c> enum value.</description>
+    /// </item>
+    /// </list>
+    /// <para>
+    /// The Protobuf JSON specification requires enum values in JSON to match enum fields exactly.
+    /// Enabling this option may reduce interoperability, as removing enum prefix might not be supported
+    /// by other JSON transcoding implementations.
+    /// </para>
+    /// <para>
+    /// For more information, see <see href="https://protobuf.dev/programming-guides/json/"/>.
+    /// </para>
+    /// </remarks>
+    public bool RemoveEnumPrefix { get; set; }
 }
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs
index ceb7a2c0eb82..f9e5a7070d7c 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs
@@ -4,6 +4,7 @@
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Shared;
+using Grpc.Shared.Server;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Binding;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -28,6 +29,7 @@ public static IGrpcServerBuilder AddJsonTranscoding(this IGrpcServerBuilder buil
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IServiceMethodProvider<>), typeof(JsonTranscodingServiceMethodProvider<>)));
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<GrpcJsonTranscodingOptions>, GrpcJsonTranscodingOptionsSetup>());
         builder.Services.TryAddSingleton<DescriptorRegistry>();
+        builder.Services.TryAddSingleton<InterceptorActivators>();
 
         return builder;
     }
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingProviderServiceBinder.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingProviderServiceBinder.cs
index ff55facbdd73..81325c33a82c 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingProviderServiceBinder.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingProviderServiceBinder.cs
@@ -34,6 +34,7 @@ private delegate (RequestDelegate RequestDelegate, List<object> Metadata) Create
     private readonly GrpcServiceOptions<TService> _serviceOptions;
     private readonly IGrpcServiceActivator<TService> _serviceActivator;
     private readonly GrpcJsonTranscodingOptions _jsonTranscodingOptions;
+    private readonly InterceptorActivators _interceptorActivators;
     private readonly ILoggerFactory _loggerFactory;
     private readonly ILogger _logger;
 
@@ -45,7 +46,8 @@ internal JsonTranscodingProviderServiceBinder(
         GrpcServiceOptions<TService> serviceOptions,
         ILoggerFactory loggerFactory,
         IGrpcServiceActivator<TService> serviceActivator,
-        GrpcJsonTranscodingOptions jsonTranscodingOptions)
+        GrpcJsonTranscodingOptions jsonTranscodingOptions,
+        InterceptorActivators interceptorActivators)
     {
         _context = context;
         _invokerResolver = invokerResolver;
@@ -54,6 +56,7 @@ internal JsonTranscodingProviderServiceBinder(
         _serviceOptions = serviceOptions;
         _serviceActivator = serviceActivator;
         _jsonTranscodingOptions = jsonTranscodingOptions;
+        _interceptorActivators = interceptorActivators;
         _loggerFactory = loggerFactory;
         _logger = loggerFactory.CreateLogger<JsonTranscodingProviderServiceBinder<TService>>();
     }
@@ -162,7 +165,7 @@ private void ProcessHttpRule<TRequest, TResponse>(
             httpRule,
             methodDescriptor);
 
-        var methodInvoker = new UnaryServerMethodInvoker<TService, TRequest, TResponse>(invoker, method, methodOptions, _serviceActivator);
+        var methodInvoker = new UnaryServerMethodInvoker<TService, TRequest, TResponse>(invoker, method, methodOptions, _serviceActivator, _interceptorActivators);
         var callHandler = new UnaryServerCallHandler<TService, TRequest, TResponse>(
             methodInvoker,
             _loggerFactory,
@@ -189,7 +192,7 @@ private void ProcessHttpRule<TRequest, TResponse>(
             httpRule,
             methodDescriptor);
 
-        var methodInvoker = new ServerStreamingServerMethodInvoker<TService, TRequest, TResponse>(invoker, method, methodOptions, _serviceActivator);
+        var methodInvoker = new ServerStreamingServerMethodInvoker<TService, TRequest, TResponse>(invoker, method, methodOptions, _serviceActivator, _interceptorActivators);
         var callHandler = new ServerStreamingServerCallHandler<TService, TRequest, TResponse>(
             methodInvoker,
             _loggerFactory,
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingServiceMethodProvider.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingServiceMethodProvider.cs
index 66e03b25c1e5..4d46fb164b34 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingServiceMethodProvider.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingServiceMethodProvider.cs
@@ -20,6 +20,7 @@ internal sealed partial class JsonTranscodingServiceMethodProvider<TService> : I
     private readonly ILoggerFactory _loggerFactory;
     private readonly IGrpcServiceActivator<TService> _serviceActivator;
     private readonly DescriptorRegistry _serviceDescriptorRegistry;
+    private readonly InterceptorActivators _interceptorActivators;
 
     public JsonTranscodingServiceMethodProvider(
         ILoggerFactory loggerFactory,
@@ -27,7 +28,8 @@ public JsonTranscodingServiceMethodProvider(
         IOptions<GrpcServiceOptions<TService>> serviceOptions,
         IGrpcServiceActivator<TService> serviceActivator,
         IOptions<GrpcJsonTranscodingOptions> jsonTranscodingOptions,
-        DescriptorRegistry serviceDescriptorRegistry)
+        DescriptorRegistry serviceDescriptorRegistry,
+        InterceptorActivators interceptorActivators)
     {
         _logger = loggerFactory.CreateLogger<JsonTranscodingServiceMethodProvider<TService>>();
         _globalOptions = globalOptions.Value;
@@ -36,6 +38,7 @@ public JsonTranscodingServiceMethodProvider(
         _loggerFactory = loggerFactory;
         _serviceActivator = serviceActivator;
         _serviceDescriptorRegistry = serviceDescriptorRegistry;
+        _interceptorActivators = interceptorActivators;
     }
 
     public void OnServiceMethodDiscovery(ServiceMethodProviderContext<TService> context)
@@ -70,7 +73,8 @@ public void OnServiceMethodDiscovery(ServiceMethodProviderContext<TService> cont
                     _serviceOptions,
                     _loggerFactory,
                     _serviceActivator,
-                    _jsonTranscodingOptions);
+                    _jsonTranscodingOptions,
+                    _interceptorActivators);
 
                 try
                 {
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumConverter.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumConverter.cs
index c2779e931d83..6f761424d571 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumConverter.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumConverter.cs
@@ -5,7 +5,6 @@
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Google.Protobuf.Reflection;
-using Grpc.Shared;
 using Type = System.Type;
 
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
@@ -21,18 +20,12 @@ public EnumConverter(JsonContext context) : base(context)
         switch (reader.TokenType)
         {
             case JsonTokenType.String:
-                var enumDescriptor = (EnumDescriptor?)Context.DescriptorRegistry.FindDescriptorByType(typeToConvert);
-                if (enumDescriptor == null)
-                {
-                    throw new InvalidOperationException($"Unable to resolve descriptor for {typeToConvert}.");
-                }
+                var enumDescriptor = (EnumDescriptor?)Context.DescriptorRegistry.FindDescriptorByType(typeToConvert)
+                    ?? throw new InvalidOperationException($"Unable to resolve descriptor for {typeToConvert}.");
 
                 var value = reader.GetString()!;
-                var valueDescriptor = enumDescriptor.FindValueByName(value);
-                if (valueDescriptor == null)
-                {
-                    throw new InvalidOperationException(@$"Error converting value ""{value}"" to enum type {typeToConvert}.");
-                }
+                var valueDescriptor = JsonNamingHelpers.GetEnumFieldReadValue(enumDescriptor, value, Context.Settings)
+                    ?? throw new InvalidOperationException(@$"Error converting value ""{value}"" to enum type {typeToConvert}.");
 
                 return ConvertFromInteger(valueDescriptor.Number);
             case JsonTokenType.Number:
@@ -52,7 +45,10 @@ public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOpt
         }
         else
         {
-            var name = Legacy.OriginalEnumValueHelper.GetOriginalName(value);
+            var enumDescriptor = (EnumDescriptor?)Context.DescriptorRegistry.FindDescriptorByType(value.GetType())
+                ?? throw new InvalidOperationException($"Unable to resolve descriptor for {value.GetType()}.");
+
+            var name = JsonNamingHelpers.GetEnumFieldWriteName(enumDescriptor, value, Context.Settings);
             if (name != null)
             {
                 writer.WriteStringValue(name);
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumNameHelpers.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumNameHelpers.cs
new file mode 100644
index 000000000000..986524d4ec74
--- /dev/null
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/EnumNameHelpers.cs
@@ -0,0 +1,164 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Reflection;
+using Google.Protobuf.Reflection;
+
+namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
+
+internal static class JsonNamingHelpers
+{
+    private static readonly ConcurrentDictionary<Type, EnumMapping> _enumMappings = new ConcurrentDictionary<Type, EnumMapping>();
+
+    internal static EnumValueDescriptor? GetEnumFieldReadValue(EnumDescriptor enumDescriptor, string value, GrpcJsonSettings settings)
+    {
+        string resolvedName;
+        if (settings.RemoveEnumPrefix)
+        {
+            var nameMapping = GetEnumMapping(enumDescriptor);
+            if (!nameMapping.RemoveEnumPrefixMapping.TryGetValue(value, out var n))
+            {
+                return null;
+            }
+
+            resolvedName = n;
+        }
+        else
+        {
+            resolvedName = value;
+        }
+
+        return enumDescriptor.FindValueByName(resolvedName);
+    }
+
+    internal static string? GetEnumFieldWriteName(EnumDescriptor enumDescriptor, object value, GrpcJsonSettings settings)
+    {
+        var enumMapping = GetEnumMapping(enumDescriptor);
+
+        // If this returns false, name will be null, which is what we want.
+        if (!enumMapping.WriteMapping.TryGetValue(value, out var mapping))
+        {
+            return null;
+        }
+
+        return settings.RemoveEnumPrefix ? mapping.RemoveEnumPrefixName : mapping.OriginalName;
+    }
+
+    private static EnumMapping GetEnumMapping(EnumDescriptor enumDescriptor)
+    {
+        return _enumMappings.GetOrAdd(
+            enumDescriptor.ClrType,
+            static (t, descriptor) => GetEnumMapping(descriptor.Name, t),
+            enumDescriptor);
+    }
+
+    private static EnumMapping GetEnumMapping(string enumName, Type enumType)
+    {
+        var nameMappings = enumType.GetTypeInfo().DeclaredFields
+            .Where(f => f.IsStatic)
+            .Where(f => f.GetCustomAttributes<OriginalNameAttribute>().FirstOrDefault()?.PreferredAlias ?? true)
+            .Select(f =>
+            {
+                // If the attribute hasn't been applied, fall back to the name of the field.
+                var fieldName = f.GetCustomAttributes<OriginalNameAttribute>().FirstOrDefault()?.Name ?? f.Name;
+
+                return new NameMapping
+                {
+                    Value = f.GetValue(null)!,
+                    OriginalName = fieldName,
+                    RemoveEnumPrefixName = GetEnumValueName(enumName, fieldName)
+                };
+            })
+            .ToList();
+
+        var writeMapping = nameMappings.ToDictionary(m => m.Value, m => m);
+
+        // Add original names as fallback when mapping enum values with removed prefixes.
+        // There are added to the dictionary first so they are overridden by the mappings with removed prefixes.
+        var removeEnumPrefixMapping = nameMappings.ToDictionary(m => m.OriginalName, m => m.OriginalName);
+
+        // Protobuf codegen prevents collision of enum names when the prefix is removed.
+        // For example, the following enum will fail to build because both fields would resolve to "OK":
+        //
+        // enum Status {
+        //     STATUS_OK = 0;
+        //     OK = 1;
+        // }
+        //
+        // Tooling error message:
+        // ----------------------
+        // Enum name OK has the same name as STATUS_OK if you ignore case and strip out the enum name prefix (if any).
+        // (If you are using allow_alias, please assign the same number to each enum value name.)
+        //
+        // Just in case it does happen, map to the first value rather than error.
+        foreach (var item in nameMappings.GroupBy(m => m.RemoveEnumPrefixName).Select(g => KeyValuePair.Create(g.Key, g.First().OriginalName)))
+        {
+            removeEnumPrefixMapping[item.Key] = item.Value;
+        }
+
+        return new EnumMapping { WriteMapping = writeMapping, RemoveEnumPrefixMapping = removeEnumPrefixMapping };
+    }
+
+    // Remove the prefix from the specified value. Ignore case and underscores in the comparison.
+    private static string TryRemovePrefix(string prefix, string value)
+    {
+        var normalizedPrefix = prefix.Replace("_", string.Empty, StringComparison.Ordinal).ToLowerInvariant();
+
+        var prefixIndex = 0;
+        var valueIndex = 0;
+
+        while (prefixIndex < normalizedPrefix.Length && valueIndex < value.Length)
+        {
+            if (value[valueIndex] == '_')
+            {
+                valueIndex++;
+                continue;
+            }
+
+            if (char.ToLowerInvariant(value[valueIndex]) != normalizedPrefix[prefixIndex])
+            {
+                return value;
+            }
+
+            prefixIndex++;
+            valueIndex++;
+        }
+
+        if (prefixIndex < normalizedPrefix.Length)
+        {
+            return value;
+        }
+
+        while (valueIndex < value.Length && value[valueIndex] == '_')
+        {
+            valueIndex++;
+        }
+
+        return valueIndex == value.Length ? value : value.Substring(valueIndex);
+    }
+
+    private static string GetEnumValueName(string enumName, string valueName)
+    {
+        var result = TryRemovePrefix(enumName, valueName);
+
+        // Prefix name starting with a digit with an underscore to ensure it is a valid identifier.
+        return result.Length > 0 && char.IsDigit(result[0])
+            ? $"_{result}"
+            : result;
+    }
+
+    private sealed class EnumMapping
+    {
+        public required Dictionary<object, NameMapping> WriteMapping { get; init; }
+        public required Dictionary<string, string> RemoveEnumPrefixMapping { get; init; }
+    }
+
+    private sealed class NameMapping
+    {
+        public required object Value { get; init; }
+        public required string OriginalName { get; init; }
+        public required string RemoveEnumPrefixName { get; init; }
+    }
+}
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/JsonConverterHelper.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/JsonConverterHelper.cs
index 0f5ebefdce18..c207730bc87b 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/JsonConverterHelper.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/JsonConverterHelper.cs
@@ -46,7 +46,8 @@ internal static JsonSerializerOptions CreateSerializerOptions(JsonContext contex
             WriteIndented = writeIndented,
             NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-            TypeInfoResolver = typeInfoResolver
+            TypeInfoResolver = typeInfoResolver,
+            PropertyNameCaseInsensitive = context.Settings.PropertyNameCaseInsensitive,
         };
         options.Converters.Add(new NullValueConverter());
         options.Converters.Add(new ByteStringConverter());
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/MessageTypeInfoResolver.cs b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/MessageTypeInfoResolver.cs
index 66e249194e0c..12d188d19df8 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/MessageTypeInfoResolver.cs
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/MessageTypeInfoResolver.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.Collections;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
@@ -94,6 +93,23 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
             JsonConverterHelper.GetFieldType(field),
             name);
 
+        // A property with a wrapper type is usually the underlying type on the DTO.
+        // For example, a field of type google.protobuf.StringValue will have a property of type string.
+        // However, the wrapper type is exposed if someone manually creates a DTO with it, or there is a problem
+        // detecting wrapper type in code generation. For example, https://github.com/protocolbuffers/protobuf/issues/22744
+        FieldDescriptor? wrapperTypeValueField = null;
+        if (field.FieldType == FieldType.Message && ServiceDescriptorHelpers.IsWrapperType(field.MessageType))
+        {
+            var property = field.ContainingType.ClrType.GetProperty(field.PropertyName);
+
+            // Check if the property type is the same as the field type. This means the property is StringValue, et al,
+            // and additional conversion is required.
+            if (property != null && property.PropertyType == field.MessageType.ClrType)
+            {
+                wrapperTypeValueField = field.MessageType.FindFieldByName("value");
+            }
+        }
+
         propertyInfo.ShouldSerialize = (o, v) =>
         {
             // Properties that don't have this flag set are only used to deserialize incoming JSON.
@@ -105,7 +121,13 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
         };
         propertyInfo.Get = (o) =>
         {
-            return field.Accessor.GetValue((IMessage)o);
+            var value = field.Accessor.GetValue((IMessage)o);
+            if (wrapperTypeValueField != null && value is IMessage wrapperMessage)
+            {
+                return wrapperTypeValueField.Accessor.GetValue(wrapperMessage);
+            }
+
+            return value;
         };
 
         if (field.IsMap || field.IsRepeated)
@@ -115,13 +137,13 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
         }
         else
         {
-            propertyInfo.Set = GetSetMethod(field);
+            propertyInfo.Set = GetSetMethod(field, wrapperTypeValueField);
         }
 
         return propertyInfo;
     }
 
-    private static Action<object, object?> GetSetMethod(FieldDescriptor field)
+    private static Action<object, object?> GetSetMethod(FieldDescriptor field, FieldDescriptor? wrapperTypeValueField)
     {
         Debug.Assert(!field.IsRepeated && !field.IsMap, "Collections shouldn't have a setter.");
 
@@ -135,19 +157,27 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
                     throw new InvalidOperationException($"Multiple values specified for oneof {field.RealContainingOneof.Name}.");
                 }
 
-                SetFieldValue(field, (IMessage)o, v);
+                SetFieldValue(field, wrapperTypeValueField, (IMessage)o, v);
             };
         }
 
         return (o, v) =>
         {
-            SetFieldValue(field, (IMessage)o, v);
+            SetFieldValue(field, wrapperTypeValueField, (IMessage)o, v);
         };
 
-        static void SetFieldValue(FieldDescriptor field, IMessage m, object? v)
+        static void SetFieldValue(FieldDescriptor field, FieldDescriptor? wrapperTypeValueField, IMessage m, object? v)
         {
             if (v != null)
             {
+                // This field exposes a wrapper type. Need to create a wrapper instance and set the value on it.
+                if (wrapperTypeValueField != null && v is not IMessage)
+                {
+                    var wrapper = (IMessage)Activator.CreateInstance(field.MessageType.ClrType)!;
+                    wrapperTypeValueField.Accessor.SetValue(wrapper, v);
+                    v = wrapper;
+                }
+
                 field.Accessor.SetValue(m, v);
             }
             else
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj
index b238af68b28b..3e3332639fbf 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>HTTP API for gRPC ASP.NET Core</Description>
     <PackageTags>gRPC RPC HTTP/2 REST</PackageTags>
@@ -18,6 +18,8 @@
     <Compile Include="..\Shared\Server\ServerMethodInvokerBase.cs" Link="Internal\Shared\Server\ServerMethodInvokerBase.cs" />
     <Compile Include="..\Shared\Server\ServerStreamingServerMethodInvoker.cs" Link="Internal\Shared\Server\ServerStreamingServerMethodInvoker.cs" />
     <Compile Include="..\Shared\Server\UnaryServerMethodInvoker.cs" Link="Internal\Shared\Server\UnaryServerMethodInvoker.cs" />
+    <Compile Include="..\Shared\Server\ServerDynamicAccessConstants.cs" Link="Internal\Shared\Server\ServerDynamicAccessConstants.cs" />
+    <Compile Include="..\Shared\Server\InterceptorActivators.cs" Link="Internal\Shared\Server\InterceptorActivators.cs" />
     <Compile Include="..\Shared\DescriptorRegistry.cs" Link="Internal\Shared\DescriptorRegistry.cs" />
     <Compile Include="..\Shared\AuthContextHelpers.cs" Link="Internal\Shared\AuthContextHelpers.cs" />
     <Compile Include="..\Shared\ServiceDescriptorHelpers.cs" Link="Internal\Shared\ServiceDescriptorHelpers.cs" />
@@ -31,6 +33,12 @@
     <Reference Include="Google.Protobuf" />
     <Reference Include="Grpc.AspNetCore.Server" />
 
+    <!-- Enforce build order. -->
+    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
+      Private="false"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />
+
     <None Update="protos\google\api\*.proto">
       <Pack>true</Pack>
       <PackagePath>content</PackagePath>
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt
index 7dc5c58110bf..b11ea58cf311 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
 #nullable enable
+Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.PropertyNameCaseInsensitive.get -> bool
+Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.PropertyNameCaseInsensitive.set -> void
+Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.RemoveEnumPrefix.get -> bool
+Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.RemoveEnumPrefix.set -> void
diff --git a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj
index 3dc2ec209b31..6f98454f95ac 100644
--- a/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj
+++ b/src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj
@@ -17,5 +17,11 @@
 
     <Reference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" />
     <Reference Include="Swashbuckle.AspNetCore" />
+
+    <!-- Enforce build order. -->
+    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
+      Private="false"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 </Project>
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Legacy.cs b/src/Grpc/JsonTranscoding/src/Shared/Legacy.cs
index 7cb1304980bc..6de5e8c04805 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Legacy.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Legacy.cs
@@ -40,6 +40,7 @@
 using System.Text.RegularExpressions;
 using Google.Protobuf.Reflection;
 using Google.Protobuf.WellKnownTypes;
+using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Type = System.Type;
 
 namespace Grpc.Shared;
@@ -365,44 +366,4 @@ internal static bool IsPathValid(string input)
         }
         return true;
     }
-
-    // Effectively a cache of mapping from enum values to the original name as specified in the proto file,
-    // fetched by reflection.
-    // The need for this is unfortunate, as is its unbounded size, but realistically it shouldn't cause issues.
-    internal static class OriginalEnumValueHelper
-    {
-        private static readonly ConcurrentDictionary<Type, Dictionary<object, string>> _dictionaries
-            = new ConcurrentDictionary<Type, Dictionary<object, string>>();
-
-        internal static string? GetOriginalName(object value)
-        {
-            var enumType = value.GetType();
-            Dictionary<object, string>? nameMapping;
-            lock (_dictionaries)
-            {
-                if (!_dictionaries.TryGetValue(enumType, out nameMapping))
-                {
-                    nameMapping = GetNameMapping(enumType);
-                    _dictionaries[enumType] = nameMapping;
-                }
-            }
-
-            // If this returns false, originalName will be null, which is what we want.
-            nameMapping.TryGetValue(value, out var originalName);
-            return originalName;
-        }
-
-        private static Dictionary<object, string> GetNameMapping(Type enumType)
-        {
-            return enumType.GetTypeInfo().DeclaredFields
-                .Where(f => f.IsStatic)
-                .Where(f => f.GetCustomAttributes<OriginalNameAttribute>()
-                             .FirstOrDefault()?.PreferredAlias ?? true)
-                .ToDictionary(f => f.GetValue(null)!,
-                              f => f.GetCustomAttributes<OriginalNameAttribute>()
-                                    .FirstOrDefault()
-                                    // If the attribute hasn't been applied, fall back to the name of the field.
-                                    ?.Name ?? f.Name);
-        }
-    }
 }
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/BindMethodFinder.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/BindMethodFinder.cs
index 4dbc6b8a470f..d48fdb90d61f 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/BindMethodFinder.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/BindMethodFinder.cs
@@ -16,6 +16,7 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Grpc.Core;
 
@@ -64,6 +65,8 @@ internal static class BindMethodFinder
         return null;
     }
 
+    [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2075:UnrecognizedReflectionPattern",
+        Justification = "Fallback doesn't have BindServiceMethodAttribute so can't be verified.")]
     internal static MethodInfo? GetBindMethodFallback(Type serviceType)
     {
         // Search for the generated service base class
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/ClientStreamingServerMethodInvoker.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/ClientStreamingServerMethodInvoker.cs
index 72377dc3b861..8e95adb7c3c1 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/ClientStreamingServerMethodInvoker.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/ClientStreamingServerMethodInvoker.cs
@@ -16,6 +16,7 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
@@ -29,7 +30,7 @@ namespace Grpc.Shared.Server;
 /// <typeparam name="TService">Service type for this method.</typeparam>
 /// <typeparam name="TRequest">Request message type for this method.</typeparam>
 /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-internal sealed class ClientStreamingServerMethodInvoker<TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
+internal sealed class ClientStreamingServerMethodInvoker<[DynamicallyAccessedMembers(ServerDynamicAccessConstants.ServiceAccessibility)] TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
     where TRequest : class
     where TResponse : class
     where TService : class
@@ -44,18 +45,20 @@ internal sealed class ClientStreamingServerMethodInvoker<TService, TRequest, TRe
     /// <param name="method">The description of the gRPC method.</param>
     /// <param name="options">The options used to execute the method.</param>
     /// <param name="serviceActivator">The service activator used to create service instances.</param>
+    /// <param name="interceptorActivators">The interceptor activators used to create interceptor instances.</param>
     public ClientStreamingServerMethodInvoker(
         ClientStreamingServerMethod<TService, TRequest, TResponse> invoker,
         Method<TRequest, TResponse> method,
         MethodOptions options,
-        IGrpcServiceActivator<TService> serviceActivator)
+        IGrpcServiceActivator<TService> serviceActivator,
+        InterceptorActivators interceptorActivators)
         : base(method, options, serviceActivator)
     {
         _invoker = invoker;
 
         if (Options.HasInterceptors)
         {
-            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors);
+            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors, interceptorActivators);
             _pipelineInvoker = interceptorPipeline.ClientStreamingPipeline(ResolvedInterceptorInvoker);
         }
     }
@@ -65,7 +68,7 @@ private async Task<TResponse> ResolvedInterceptorInvoker(IAsyncStreamReader<TReq
         GrpcActivatorHandle<TService> serviceHandle = default;
         try
         {
-            serviceHandle = ServiceActivator.Create(resolvedContext.GetHttpContext().RequestServices);
+            serviceHandle = CreateServiceHandle(resolvedContext);
             return await _invoker(
                 serviceHandle.Instance,
                 requestStream,
@@ -95,7 +98,7 @@ public async Task<TResponse> Invoke(HttpContext httpContext, ServerCallContext s
             GrpcActivatorHandle<TService> serviceHandle = default;
             try
             {
-                serviceHandle = ServiceActivator.Create(httpContext.RequestServices);
+                serviceHandle = CreateServiceHandle(httpContext);
                 return await _invoker(
                     serviceHandle.Instance,
                     requestStream,
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/DuplexStreamingServerMethodInvoker.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/DuplexStreamingServerMethodInvoker.cs
index 8a76507f9cce..4153d3fc6eea 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/DuplexStreamingServerMethodInvoker.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/DuplexStreamingServerMethodInvoker.cs
@@ -16,6 +16,7 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
@@ -29,7 +30,7 @@ namespace Grpc.Shared.Server;
 /// <typeparam name="TService">Service type for this method.</typeparam>
 /// <typeparam name="TRequest">Request message type for this method.</typeparam>
 /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-internal sealed class DuplexStreamingServerMethodInvoker<TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
+internal sealed class DuplexStreamingServerMethodInvoker<[DynamicallyAccessedMembers(ServerDynamicAccessConstants.ServiceAccessibility)] TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
     where TRequest : class
     where TResponse : class
     where TService : class
@@ -44,18 +45,20 @@ internal sealed class DuplexStreamingServerMethodInvoker<TService, TRequest, TRe
     /// <param name="method">The description of the gRPC method.</param>
     /// <param name="options">The options used to execute the method.</param>
     /// <param name="serviceActivator">The service activator used to create service instances.</param>
+    /// <param name="interceptorActivators">The interceptor activators used to create interceptor instances.</param>
     public DuplexStreamingServerMethodInvoker(
         DuplexStreamingServerMethod<TService, TRequest, TResponse> invoker,
         Method<TRequest, TResponse> method,
         MethodOptions options,
-        IGrpcServiceActivator<TService> serviceActivator)
+        IGrpcServiceActivator<TService> serviceActivator,
+        InterceptorActivators interceptorActivators)
         : base(method, options, serviceActivator)
     {
         _invoker = invoker;
 
         if (Options.HasInterceptors)
         {
-            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors);
+            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors, interceptorActivators);
             _pipelineInvoker = interceptorPipeline.DuplexStreamingPipeline(ResolvedInterceptorInvoker);
         }
     }
@@ -65,7 +68,7 @@ private async Task ResolvedInterceptorInvoker(IAsyncStreamReader<TRequest> reque
         GrpcActivatorHandle<TService> serviceHandle = default;
         try
         {
-            serviceHandle = ServiceActivator.Create(resolvedContext.GetHttpContext().RequestServices);
+            serviceHandle = CreateServiceHandle(resolvedContext);
             await _invoker(
                 serviceHandle.Instance,
                 requestStream,
@@ -88,7 +91,7 @@ await _invoker(
     /// <param name="serverCallContext">The <see cref="ServerCallContext"/>.</param>
     /// <param name="requestStream">The <typeparamref name="TRequest"/> reader.</param>
     /// <param name="responseStream">The <typeparamref name="TResponse"/> writer.</param>
-    /// <returns>A <see cref="Task"/> that represents the asynchronous method.</returns>
+    /// <returns>A <see cref="Task{TResponse}"/> that represents the asynchronous method.</returns>
     public async Task Invoke(HttpContext httpContext, ServerCallContext serverCallContext, IAsyncStreamReader<TRequest> requestStream, IServerStreamWriter<TResponse> responseStream)
     {
         if (_pipelineInvoker == null)
@@ -96,7 +99,7 @@ public async Task Invoke(HttpContext httpContext, ServerCallContext serverCallCo
             GrpcActivatorHandle<TService> serviceHandle = default;
             try
             {
-                serviceHandle = ServiceActivator.Create(httpContext.RequestServices);
+                serviceHandle = CreateServiceHandle(httpContext);
                 await _invoker(
                     serviceHandle.Instance,
                     requestStream,
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorActivators.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorActivators.cs
new file mode 100644
index 000000000000..b5e7ff82af98
--- /dev/null
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorActivators.cs
@@ -0,0 +1,49 @@
+#region Copyright notice and license
+
+// Copyright 2019 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#endregion
+
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using Grpc.AspNetCore.Server;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grpc.Shared.Server;
+
+internal sealed class InterceptorActivators
+{
+    private readonly ConcurrentDictionary<Type, IGrpcInterceptorActivator> _cachedActivators = new();
+    private readonly IServiceProvider _serviceProvider;
+
+    public InterceptorActivators(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public IGrpcInterceptorActivator GetInterceptorActivator(Type type)
+    {
+        return _cachedActivators.GetOrAdd<IServiceProvider>(type, CreateActivator, _serviceProvider);
+    }
+
+    [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:UnrecognizedReflectionPattern",
+        Justification = "Type parameter members are preserved with DynamicallyAccessedMembers on InterceptorRegistration.Type property.")]
+    [UnconditionalSuppressMessage("AotAnalysis", "IL3050:RequiresDynamicCode",
+        Justification = "Type definition is explicitly specified and type argument is always an Interceptor type.")]
+    private static IGrpcInterceptorActivator CreateActivator(Type type, IServiceProvider serviceProvider)
+    {
+        return (IGrpcInterceptorActivator)serviceProvider.GetRequiredService(typeof(IGrpcInterceptorActivator<>).MakeGenericType(type));
+    }
+}
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorPipelineBuilder.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorPipelineBuilder.cs
index ccea9f1ea554..4fb186f6dced 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorPipelineBuilder.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/InterceptorPipelineBuilder.cs
@@ -16,11 +16,9 @@
 
 #endregion
 
-using System.Linq;
 using Grpc.AspNetCore.Server;
 using Grpc.Core;
 using Grpc.Core.Interceptors;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Grpc.Shared.Server;
 
@@ -28,24 +26,26 @@ internal sealed class InterceptorPipelineBuilder<TRequest, TResponse>
     where TRequest : class
     where TResponse : class
 {
-    private readonly List<InterceptorActivatorHandle> _interceptors;
+    private readonly IReadOnlyList<InterceptorRegistration> _interceptors;
+    private readonly InterceptorActivators _interceptorActivators;
 
-    public InterceptorPipelineBuilder(IReadOnlyList<InterceptorRegistration> interceptors)
+    public InterceptorPipelineBuilder(IReadOnlyList<InterceptorRegistration> interceptors, InterceptorActivators interceptorActivators)
     {
-        _interceptors = interceptors.Select(i => new InterceptorActivatorHandle(i)).ToList();
+        _interceptors = interceptors;
+        _interceptorActivators = interceptorActivators;
     }
 
     public ClientStreamingServerMethod<TRequest, TResponse> ClientStreamingPipeline(ClientStreamingServerMethod<TRequest, TResponse> innerInvoker)
     {
         return BuildPipeline(innerInvoker, BuildInvoker);
 
-        static ClientStreamingServerMethod<TRequest, TResponse> BuildInvoker(InterceptorActivatorHandle interceptorActivatorHandle, ClientStreamingServerMethod<TRequest, TResponse> next)
+        static ClientStreamingServerMethod<TRequest, TResponse> BuildInvoker(InterceptorRegistration interceptorRegistration, InterceptorActivators interceptorActivators, ClientStreamingServerMethod<TRequest, TResponse> next)
         {
             return async (requestStream, context) =>
             {
                 var serviceProvider = context.GetHttpContext().RequestServices;
-                var interceptorActivator = interceptorActivatorHandle.GetActivator(serviceProvider);
-                var interceptorHandle = CreateInterceptor(interceptorActivatorHandle, interceptorActivator, serviceProvider);
+                var interceptorActivator = interceptorActivators.GetInterceptorActivator(interceptorRegistration.Type);
+                var interceptorHandle = CreateInterceptor(interceptorRegistration, interceptorActivator, serviceProvider);
 
                 try
                 {
@@ -63,13 +63,13 @@ internal DuplexStreamingServerMethod<TRequest, TResponse> DuplexStreamingPipelin
     {
         return BuildPipeline(innerInvoker, BuildInvoker);
 
-        static DuplexStreamingServerMethod<TRequest, TResponse> BuildInvoker(InterceptorActivatorHandle interceptorActivatorHandle, DuplexStreamingServerMethod<TRequest, TResponse> next)
+        static DuplexStreamingServerMethod<TRequest, TResponse> BuildInvoker(InterceptorRegistration interceptorRegistration, InterceptorActivators interceptorActivators, DuplexStreamingServerMethod<TRequest, TResponse> next)
         {
             return async (requestStream, responseStream, context) =>
             {
                 var serviceProvider = context.GetHttpContext().RequestServices;
-                var interceptorActivator = interceptorActivatorHandle.GetActivator(serviceProvider);
-                var interceptorHandle = CreateInterceptor(interceptorActivatorHandle, interceptorActivator, serviceProvider);
+                var interceptorActivator = interceptorActivators.GetInterceptorActivator(interceptorRegistration.Type);
+                var interceptorHandle = CreateInterceptor(interceptorRegistration, interceptorActivator, serviceProvider);
 
                 try
                 {
@@ -87,13 +87,18 @@ internal ServerStreamingServerMethod<TRequest, TResponse> ServerStreamingPipelin
     {
         return BuildPipeline(innerInvoker, BuildInvoker);
 
-        static ServerStreamingServerMethod<TRequest, TResponse> BuildInvoker(InterceptorActivatorHandle interceptorActivatorHandle, ServerStreamingServerMethod<TRequest, TResponse> next)
+        static ServerStreamingServerMethod<TRequest, TResponse> BuildInvoker(InterceptorRegistration interceptorRegistration, InterceptorActivators interceptorActivators, ServerStreamingServerMethod<TRequest, TResponse> next)
         {
             return async (request, responseStream, context) =>
             {
                 var serviceProvider = context.GetHttpContext().RequestServices;
-                var interceptorActivator = interceptorActivatorHandle.GetActivator(serviceProvider);
-                var interceptorHandle = CreateInterceptor(interceptorActivatorHandle, interceptorActivator, serviceProvider);
+                var interceptorActivator = interceptorActivators.GetInterceptorActivator(interceptorRegistration.Type);
+                var interceptorHandle = CreateInterceptor(interceptorRegistration, interceptorActivator, serviceProvider);
+
+                if (interceptorHandle.Instance == null)
+                {
+                    throw new InvalidOperationException($"Could not construct Interceptor instance for type {interceptorRegistration.Type.FullName}");
+                }
 
                 try
                 {
@@ -111,13 +116,13 @@ internal UnaryServerMethod<TRequest, TResponse> UnaryPipeline(UnaryServerMethod<
     {
         return BuildPipeline(innerInvoker, BuildInvoker);
 
-        static UnaryServerMethod<TRequest, TResponse> BuildInvoker(InterceptorActivatorHandle interceptorActivatorHandle, UnaryServerMethod<TRequest, TResponse> next)
+        static UnaryServerMethod<TRequest, TResponse> BuildInvoker(InterceptorRegistration interceptorRegistration, InterceptorActivators interceptorActivators, UnaryServerMethod<TRequest, TResponse> next)
         {
             return async (request, context) =>
             {
                 var serviceProvider = context.GetHttpContext().RequestServices;
-                var interceptorActivator = interceptorActivatorHandle.GetActivator(serviceProvider);
-                var interceptorHandle = CreateInterceptor(interceptorActivatorHandle, interceptorActivator, serviceProvider);
+                var interceptorActivator = interceptorActivators.GetInterceptorActivator(interceptorRegistration.Type);
+                var interceptorHandle = CreateInterceptor(interceptorRegistration, interceptorActivator, serviceProvider);
 
                 try
                 {
@@ -131,7 +136,7 @@ static UnaryServerMethod<TRequest, TResponse> BuildInvoker(InterceptorActivatorH
         }
     }
 
-    private T BuildPipeline<T>(T innerInvoker, Func<InterceptorActivatorHandle, T, T> wrapInvoker)
+    private T BuildPipeline<T>(T innerInvoker, Func<InterceptorRegistration, InterceptorActivators, T, T> wrapInvoker)
     {
         // The inner invoker will create the service instance and invoke the method
         var resolvedInvoker = innerInvoker;
@@ -139,48 +144,21 @@ private T BuildPipeline<T>(T innerInvoker, Func<InterceptorActivatorHandle, T, T
         // The list is reversed during construction so the first interceptor is built last and invoked first
         for (var i = _interceptors.Count - 1; i >= 0; i--)
         {
-            resolvedInvoker = wrapInvoker(_interceptors[i], resolvedInvoker);
+            resolvedInvoker = wrapInvoker(_interceptors[i], _interceptorActivators, resolvedInvoker);
         }
 
         return resolvedInvoker;
     }
 
-    private static GrpcActivatorHandle<Interceptor> CreateInterceptor(
-        InterceptorActivatorHandle interceptorActivatorHandle,
-        IGrpcInterceptorActivator interceptorActivator,
-        IServiceProvider serviceProvider)
+    private static GrpcActivatorHandle<Interceptor> CreateInterceptor(InterceptorRegistration interceptorRegistration, IGrpcInterceptorActivator interceptorActivator, IServiceProvider serviceProvider)
     {
-        var interceptorHandle = interceptorActivator.Create(serviceProvider, interceptorActivatorHandle.Registration);
+        var interceptorHandle = interceptorActivator.Create(serviceProvider, interceptorRegistration);
 
         if (interceptorHandle.Instance == null)
         {
-            throw new InvalidOperationException($"Could not construct Interceptor instance for type {interceptorActivatorHandle.Registration.Type.FullName}");
+            throw new InvalidOperationException($"Could not construct Interceptor instance for type {interceptorRegistration.Type.FullName}");
         }
 
         return interceptorHandle;
     }
-
-    private sealed class InterceptorActivatorHandle
-    {
-        public InterceptorRegistration Registration { get; }
-
-        private IGrpcInterceptorActivator? _interceptorActivator;
-
-        public InterceptorActivatorHandle(InterceptorRegistration interceptorRegistration)
-        {
-            Registration = interceptorRegistration;
-        }
-
-        public IGrpcInterceptorActivator GetActivator(IServiceProvider serviceProvider)
-        {
-            // Not thread safe. Side effect is resolving the service twice.
-            if (_interceptorActivator == null)
-            {
-                var activatorType = typeof(IGrpcInterceptorActivator<>).MakeGenericType(Registration.Type);
-                _interceptorActivator = (IGrpcInterceptorActivator)serviceProvider.GetRequiredService(activatorType);
-            }
-
-            return _interceptorActivator;
-        }
-    }
 }
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/MethodOptions.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/MethodOptions.cs
index 1ed83b6ea24b..58b83208dd36 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/MethodOptions.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/MethodOptions.cs
@@ -19,6 +19,7 @@
 using System.IO.Compression;
 using System.Linq;
 using Grpc.AspNetCore.Server;
+using Grpc.AspNetCore.Server.Internal;
 using Grpc.Net.Compression;
 
 namespace Grpc.Shared.Server;
@@ -70,6 +71,8 @@ internal sealed class MethodOptions
     // Fast check for whether the service has any interceptors
     internal bool HasInterceptors { get; }
 
+    internal bool SuppressCreatingService { get; }
+
     private MethodOptions(
         Dictionary<string, ICompressionProvider> compressionProviders,
         InterceptorCollection interceptors,
@@ -77,7 +80,8 @@ private MethodOptions(
         int? maxReceiveMessageSize,
         bool? enableDetailedErrors,
         string? responseCompressionAlgorithm,
-        CompressionLevel? responseCompressionLevel)
+        CompressionLevel? responseCompressionLevel,
+        bool suppressCreatingService)
     {
         CompressionProviders = compressionProviders;
         Interceptors = interceptors;
@@ -87,6 +91,7 @@ private MethodOptions(
         EnableDetailedErrors = enableDetailedErrors;
         ResponseCompressionAlgorithm = responseCompressionAlgorithm;
         ResponseCompressionLevel = responseCompressionLevel;
+        SuppressCreatingService = suppressCreatingService;
 
         if (ResponseCompressionAlgorithm != null)
         {
@@ -115,6 +120,7 @@ public static MethodOptions Create(IEnumerable<GrpcServiceOptions> serviceOption
         bool? enableDetailedErrors = null;
         string? responseCompressionAlgorithm = null;
         CompressionLevel? responseCompressionLevel = null;
+        bool? suppressCreatingService = null;
 
         foreach (var options in serviceOptions.Reverse())
         {
@@ -128,9 +134,9 @@ public static MethodOptions Create(IEnumerable<GrpcServiceOptions> serviceOption
         }
 
         var interceptors = new InterceptorCollection();
-        foreach (var interceptor in tempInterceptors)
+        foreach (var registration in tempInterceptors)
         {
-            interceptors.Add(interceptor);
+            interceptors.Add(registration);
         }
 
         return new MethodOptions
@@ -141,7 +147,8 @@ public static MethodOptions Create(IEnumerable<GrpcServiceOptions> serviceOption
             maxReceiveMessageSize: maxReceiveMessageSize,
             enableDetailedErrors: enableDetailedErrors,
             responseCompressionAlgorithm: responseCompressionAlgorithm,
-            responseCompressionLevel: responseCompressionLevel
+            responseCompressionLevel: responseCompressionLevel,
+            suppressCreatingService: suppressCreatingService ?? false
         );
     }
 
@@ -151,10 +158,7 @@ private static void AddCompressionProviders(Dictionary<string, ICompressionProvi
         {
             foreach (var compressionProvider in compressionProviders)
             {
-                if (!resolvedProviders.ContainsKey(compressionProvider.EncodingName))
-                {
-                    resolvedProviders.Add(compressionProvider.EncodingName, compressionProvider);
-                }
+                resolvedProviders.TryAdd(compressionProvider.EncodingName, compressionProvider);
             }
         }
     }
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/ServerDynamicAccessConstants.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/ServerDynamicAccessConstants.cs
new file mode 100644
index 000000000000..ec44fbd089dd
--- /dev/null
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/ServerDynamicAccessConstants.cs
@@ -0,0 +1,26 @@
+#region Copyright notice and license
+
+// Copyright 2019 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#endregion
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Grpc.Shared.Server;
+
+internal static class ServerDynamicAccessConstants
+{
+    internal const DynamicallyAccessedMemberTypes ServiceAccessibility = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
+}
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/ServerMethodInvokerBase.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/ServerMethodInvokerBase.cs
index 8e61c5877e38..c599b6dad958 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/ServerMethodInvokerBase.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/ServerMethodInvokerBase.cs
@@ -16,8 +16,10 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using Grpc.AspNetCore.Server;
 using Grpc.Core;
+using Microsoft.AspNetCore.Http;
 
 namespace Grpc.Shared.Server;
 
@@ -27,7 +29,7 @@ namespace Grpc.Shared.Server;
 /// <typeparam name="TService">Service type for this method.</typeparam>
 /// <typeparam name="TRequest">Request message type for this method.</typeparam>
 /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-internal abstract class ServerMethodInvokerBase<TService, TRequest, TResponse>
+internal abstract class ServerMethodInvokerBase<[DynamicallyAccessedMembers(ServerDynamicAccessConstants.ServiceAccessibility)] TService, TRequest, TResponse>
     where TRequest : class
     where TResponse : class
     where TService : class
@@ -62,4 +64,19 @@ private protected ServerMethodInvokerBase(
         Options = options;
         ServiceActivator = serviceActivator;
     }
+
+    protected GrpcActivatorHandle<TService> CreateServiceHandle(ServerCallContext context)
+    {
+        return CreateServiceHandle(context.GetHttpContext());
+    }
+
+    protected GrpcActivatorHandle<TService> CreateServiceHandle(HttpContext httpContext)
+    {
+        if (!Options.SuppressCreatingService)
+        {
+            return ServiceActivator.Create(httpContext.RequestServices);
+        }
+
+        return default;
+    }
 }
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/ServerStreamingServerMethodInvoker.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/ServerStreamingServerMethodInvoker.cs
index 5b73c4b22309..a29aabfb6e80 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/ServerStreamingServerMethodInvoker.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/ServerStreamingServerMethodInvoker.cs
@@ -16,6 +16,7 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
@@ -29,7 +30,7 @@ namespace Grpc.Shared.Server;
 /// <typeparam name="TService">Service type for this method.</typeparam>
 /// <typeparam name="TRequest">Request message type for this method.</typeparam>
 /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-internal sealed class ServerStreamingServerMethodInvoker<TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
+internal sealed class ServerStreamingServerMethodInvoker<[DynamicallyAccessedMembers(ServerDynamicAccessConstants.ServiceAccessibility)] TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
     where TRequest : class
     where TResponse : class
     where TService : class
@@ -44,18 +45,20 @@ internal sealed class ServerStreamingServerMethodInvoker<TService, TRequest, TRe
     /// <param name="method">The description of the gRPC method.</param>
     /// <param name="options">The options used to execute the method.</param>
     /// <param name="serviceActivator">The service activator used to create service instances.</param>
+    /// <param name="interceptorActivators">The interceptor activators used to create interceptor instances.</param>
     public ServerStreamingServerMethodInvoker(
         ServerStreamingServerMethod<TService, TRequest, TResponse> invoker,
         Method<TRequest, TResponse> method,
         MethodOptions options,
-        IGrpcServiceActivator<TService> serviceActivator)
+        IGrpcServiceActivator<TService> serviceActivator,
+        InterceptorActivators interceptorActivators)
         : base(method, options, serviceActivator)
     {
         _invoker = invoker;
 
         if (Options.HasInterceptors)
         {
-            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors);
+            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors, interceptorActivators);
             _pipelineInvoker = interceptorPipeline.ServerStreamingPipeline(ResolvedInterceptorInvoker);
         }
     }
@@ -65,7 +68,7 @@ private async Task ResolvedInterceptorInvoker(TRequest request, IServerStreamWri
         GrpcActivatorHandle<TService> serviceHandle = default;
         try
         {
-            serviceHandle = ServiceActivator.Create(resolvedContext.GetHttpContext().RequestServices);
+            serviceHandle = CreateServiceHandle(resolvedContext);
             await _invoker(
                 serviceHandle.Instance,
                 request,
@@ -96,7 +99,7 @@ public async Task Invoke(HttpContext httpContext, ServerCallContext serverCallCo
             GrpcActivatorHandle<TService> serviceHandle = default;
             try
             {
-                serviceHandle = ServiceActivator.Create(httpContext.RequestServices);
+                serviceHandle = CreateServiceHandle(httpContext);
                 await _invoker(
                     serviceHandle.Instance,
                     request,
diff --git a/src/Grpc/JsonTranscoding/src/Shared/Server/UnaryServerMethodInvoker.cs b/src/Grpc/JsonTranscoding/src/Shared/Server/UnaryServerMethodInvoker.cs
index b29f08c94f5c..09398689ccb0 100644
--- a/src/Grpc/JsonTranscoding/src/Shared/Server/UnaryServerMethodInvoker.cs
+++ b/src/Grpc/JsonTranscoding/src/Shared/Server/UnaryServerMethodInvoker.cs
@@ -16,6 +16,8 @@
 
 #endregion
 
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.ExceptionServices;
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
@@ -29,7 +31,7 @@ namespace Grpc.Shared.Server;
 /// <typeparam name="TService">Service type for this method.</typeparam>
 /// <typeparam name="TRequest">Request message type for this method.</typeparam>
 /// <typeparam name="TResponse">Response message type for this method.</typeparam>
-internal sealed class UnaryServerMethodInvoker<TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
+internal sealed class UnaryServerMethodInvoker<[DynamicallyAccessedMembers(ServerDynamicAccessConstants.ServiceAccessibility)] TService, TRequest, TResponse> : ServerMethodInvokerBase<TService, TRequest, TResponse>
     where TRequest : class
     where TResponse : class
     where TService : class
@@ -44,18 +46,20 @@ internal sealed class UnaryServerMethodInvoker<TService, TRequest, TResponse> :
     /// <param name="method">The description of the gRPC method.</param>
     /// <param name="options">The options used to execute the method.</param>
     /// <param name="serviceActivator">The service activator used to create service instances.</param>
+    /// <param name="interceptorActivators">The interceptor activators used to create interceptor instances.</param>
     public UnaryServerMethodInvoker(
         UnaryServerMethod<TService, TRequest, TResponse> invoker,
         Method<TRequest, TResponse> method,
         MethodOptions options,
-        IGrpcServiceActivator<TService> serviceActivator)
+        IGrpcServiceActivator<TService> serviceActivator,
+        InterceptorActivators interceptorActivators)
         : base(method, options, serviceActivator)
     {
         _invoker = invoker;
 
         if (Options.HasInterceptors)
         {
-            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors);
+            var interceptorPipeline = new InterceptorPipelineBuilder<TRequest, TResponse>(Options.Interceptors, interceptorActivators);
             _pipelineInvoker = interceptorPipeline.UnaryPipeline(ResolvedInterceptorInvoker);
         }
     }
@@ -65,7 +69,7 @@ private async Task<TResponse> ResolvedInterceptorInvoker(TRequest resolvedReques
         GrpcActivatorHandle<TService> serviceHandle = default;
         try
         {
-            serviceHandle = ServiceActivator.Create(resolvedContext.GetHttpContext().RequestServices);
+            serviceHandle = CreateServiceHandle(resolvedContext);
             return await _invoker(serviceHandle.Instance, resolvedRequest, resolvedContext);
         }
         finally
@@ -85,32 +89,88 @@ private async Task<TResponse> ResolvedInterceptorInvoker(TRequest resolvedReques
     /// <param name="request">The <typeparamref name="TRequest"/> message.</param>
     /// <returns>A <see cref="Task{TResponse}"/> that represents the asynchronous method. The <see cref="Task{TResponse}.Result"/>
     /// property returns the <typeparamref name="TResponse"/> message.</returns>
-    public async Task<TResponse> Invoke(HttpContext httpContext, ServerCallContext serverCallContext, TRequest request)
+    public Task<TResponse> Invoke(HttpContext httpContext, ServerCallContext serverCallContext, TRequest request)
     {
         if (_pipelineInvoker == null)
         {
             GrpcActivatorHandle<TService> serviceHandle = default;
+            Task<TResponse>? invokerTask = null;
             try
             {
-                serviceHandle = ServiceActivator.Create(httpContext.RequestServices);
-                return await _invoker(
+                serviceHandle = CreateServiceHandle(httpContext);
+                invokerTask = _invoker(
                     serviceHandle.Instance,
                     request,
                     serverCallContext);
             }
-            finally
+            catch (Exception ex)
             {
+                // Invoker calls user code. User code may throw an exception instead
+                // of a faulted task. We need to catch the exception, ensure cleanup
+                // runs and convert exception into a faulted task.
                 if (serviceHandle.Instance != null)
                 {
-                    await ServiceActivator.ReleaseAsync(serviceHandle);
+                    var releaseTask = ServiceActivator.ReleaseAsync(serviceHandle);
+                    if (!releaseTask.IsCompletedSuccessfully)
+                    {
+                        // Capture the current exception state so we can rethrow it after awaiting
+                        // with the same stack trace.
+                        var exceptionDispatchInfo = ExceptionDispatchInfo.Capture(ex);
+                        return AwaitServiceReleaseAndThrow(releaseTask, exceptionDispatchInfo);
+                    }
                 }
+
+                return Task.FromException<TResponse>(ex);
+            }
+
+            if (invokerTask.IsCompletedSuccessfully && serviceHandle.Instance != null)
+            {
+                var releaseTask = ServiceActivator.ReleaseAsync(serviceHandle);
+                if (!releaseTask.IsCompletedSuccessfully)
+                {
+                    return AwaitServiceReleaseAndReturn(invokerTask.Result, serviceHandle);
+                }
+
+                return invokerTask;
             }
+
+            return AwaitInvoker(invokerTask, serviceHandle);
         }
         else
         {
-            return await _pipelineInvoker(
+            return _pipelineInvoker(
                 request,
                 serverCallContext);
         }
     }
+
+    private async Task<TResponse> AwaitInvoker(Task<TResponse> invokerTask, GrpcActivatorHandle<TService> serviceHandle)
+    {
+        try
+        {
+            return await invokerTask;
+        }
+        finally
+        {
+            if (serviceHandle.Instance != null)
+            {
+                await ServiceActivator.ReleaseAsync(serviceHandle);
+            }
+        }
+    }
+
+    private static async Task<TResponse> AwaitServiceReleaseAndThrow(ValueTask releaseTask, ExceptionDispatchInfo ex)
+    {
+        await releaseTask;
+        ex.Throw();
+
+        // Should never reach here
+        return null;
+    }
+
+    private async Task<TResponse> AwaitServiceReleaseAndReturn(TResponse invokerResult, GrpcActivatorHandle<TService> serviceHandle)
+    {
+        await ServiceActivator.ReleaseAsync(serviceHandle);
+        return invokerResult;
+    }
 }
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Infrastructure/DynamicGrpcServiceRegistry.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Infrastructure/DynamicGrpcServiceRegistry.cs
index dc86e1303a5e..200977c57185 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Infrastructure/DynamicGrpcServiceRegistry.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Infrastructure/DynamicGrpcServiceRegistry.cs
@@ -8,6 +8,7 @@
 using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Grpc.Shared;
+using Grpc.Shared.Server;
 using IntegrationTestsWebsite.Infrastructure;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Binding;
@@ -151,7 +152,8 @@ private JsonTranscodingProviderServiceBinder<DynamicService> CreateJsonTranscodi
             _serviceProvider.GetRequiredService<IOptions<GrpcServiceOptions<DynamicService>>>().Value,
             _serviceProvider.GetRequiredService<ILoggerFactory>(),
             _serviceProvider.GetRequiredService<IGrpcServiceActivator<DynamicService>>(),
-            JsonTranscodingOptions);
+            JsonTranscodingOptions,
+            new InterceptorActivators(_serviceProvider));
 
         return binder;
     }
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterReadTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterReadTests.cs
index 519f40221216..7876516e4930 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterReadTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterReadTests.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
+using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages;
 using Transcoding;
 using Xunit.Abstractions;
 
@@ -59,6 +60,40 @@ public void JsonCustomizedName()
         Assert.Equal("A field name", m.FieldName);
     }
 
+    [Fact]
+    public void NonJsonName_CaseInsensitive()
+    {
+        var json = @"{
+  ""HIDING_FIELD_NAME"": ""A field name""
+}";
+
+        var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+        Assert.Equal("A field name", m.HidingFieldName);
+    }
+
+    [Fact]
+    public void HidingJsonName_CaseInsensitive()
+    {
+        var json = @"{
+  ""FIELD_NAME"": ""A field name""
+}";
+
+        var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+        Assert.Equal("", m.FieldName);
+        Assert.Equal("A field name", m.HidingFieldName);
+    }
+
+    [Fact]
+    public void JsonCustomizedName_CaseInsensitive()
+    {
+        var json = @"{
+  ""JSON_CUSTOMIZED_NAME"": ""A field name""
+}";
+
+        var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+        Assert.Equal("A field name", m.FieldName);
+    }
+
     [Fact]
     public void ReadObjectProperties()
     {
@@ -229,17 +264,52 @@ public void Enum_ReadNumber(int value)
     }
 
     [Theory]
-    [InlineData("FOO")]
-    [InlineData("BAR")]
-    [InlineData("NEG")]
-    public void Enum_ReadString(string value)
+    [InlineData("FOO", HelloRequest.Types.DataTypes.Types.NestedEnum.Foo)]
+    [InlineData("BAR", HelloRequest.Types.DataTypes.Types.NestedEnum.Bar)]
+    [InlineData("NEG", HelloRequest.Types.DataTypes.Types.NestedEnum.Neg)]
+    public void Enum_ReadString(string value, HelloRequest.Types.DataTypes.Types.NestedEnum expectedValue)
     {
         var serviceDescriptorRegistry = new DescriptorRegistry();
         serviceDescriptorRegistry.RegisterFileDescriptor(JsonTranscodingGreeter.Descriptor.File);
 
         var json = @$"{{ ""singleEnum"": ""{value}"" }}";
 
-        AssertReadJson<HelloRequest.Types.DataTypes>(json, descriptorRegistry: serviceDescriptorRegistry);
+        var result = AssertReadJson<HelloRequest.Types.DataTypes>(json, descriptorRegistry: serviceDescriptorRegistry);
+        Assert.Equal(expectedValue, result.SingleEnum);
+    }
+
+    [Theory]
+    [InlineData("UNSPECIFIED", PrefixEnumType.Types.PrefixEnum.Unspecified)]
+    [InlineData("PREFIX_ENUM_UNSPECIFIED", PrefixEnumType.Types.PrefixEnum.Unspecified)]
+    [InlineData("FOO", PrefixEnumType.Types.PrefixEnum.Foo)]
+    [InlineData("PREFIX_ENUM_FOO", PrefixEnumType.Types.PrefixEnum.Foo)]
+    [InlineData("BAR", PrefixEnumType.Types.PrefixEnum.Bar)]
+    public void Enum_RemovePrefix_ReadString(string value, PrefixEnumType.Types.PrefixEnum expectedValue)
+    {
+        var serviceDescriptorRegistry = new DescriptorRegistry();
+        serviceDescriptorRegistry.RegisterFileDescriptor(JsonTranscodingGreeter.Descriptor.File);
+
+        var json = @$"{{ ""singleEnum"": ""{value}"" }}";
+
+        var result = AssertReadJson<PrefixEnumType>(json, descriptorRegistry: serviceDescriptorRegistry, serializeOld: false, settings: new GrpcJsonSettings { RemoveEnumPrefix = true });
+        Assert.Equal(expectedValue, result.SingleEnum);
+    }
+
+    [Theory]
+    [InlineData("UNSPECIFIED", CollisionPrefixEnumType.Types.CollisionPrefixEnum.Unspecified)]
+    [InlineData("COLLISION_PREFIX_ENUM_UNSPECIFIED", CollisionPrefixEnumType.Types.CollisionPrefixEnum.Unspecified)]
+    [InlineData("FOO", CollisionPrefixEnumType.Types.CollisionPrefixEnum.Foo)]
+    [InlineData("COLLISION_PREFIX_ENUM_FOO", CollisionPrefixEnumType.Types.CollisionPrefixEnum.CollisionPrefixEnumFoo)] // Match exact rather than fallback.
+    [InlineData("COLLISION_PREFIX_ENUM_COLLISION_PREFIX_ENUM_FOO", CollisionPrefixEnumType.Types.CollisionPrefixEnum.CollisionPrefixEnumFoo)]
+    public void Enum_RemovePrefix_Collision_ReadString(string value, CollisionPrefixEnumType.Types.CollisionPrefixEnum expectedValue)
+    {
+        var serviceDescriptorRegistry = new DescriptorRegistry();
+        serviceDescriptorRegistry.RegisterFileDescriptor(JsonTranscodingGreeter.Descriptor.File);
+
+        var json = @$"{{ ""singleEnum"": ""{value}"" }}";
+
+        var result = AssertReadJson<CollisionPrefixEnumType>(json, descriptorRegistry: serviceDescriptorRegistry, serializeOld: false, settings: new GrpcJsonSettings { RemoveEnumPrefix = true });
+        Assert.Equal(expectedValue, result.SingleEnum);
     }
 
     [Fact]
@@ -438,6 +508,23 @@ public void MapMessages()
         AssertReadJson<HelloRequest>(json);
     }
 
+    [Fact]
+    public void MapMessages_CaseInsensitive()
+    {
+        var json = @"{
+  ""mapMessage"": {
+    ""name1"": {
+      ""SUBFIELD"": ""value1""
+    },
+    ""name2"": {
+      ""SUBFIELD"": ""value2""
+    }
+  }
+}";
+
+        AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+    }
+
     [Fact]
     public void MapKeyBool()
     {
@@ -451,6 +538,21 @@ public void MapKeyBool()
         AssertReadJson<HelloRequest>(json);
     }
 
+    [Fact]
+    public void MapKeyBool_CaseInsensitive()
+    {
+        var json = @"{
+  ""mapKeybool"": {
+    ""TRUE"": ""value1"",
+    ""FALSE"": ""value2""
+  }
+}";
+
+        // Note: JSON property names here are keys in a dictionary, not fields. So FieldNamesCaseInsensitive doesn't apply.
+        // The new serializer supports converting true/false to boolean keys while ignoring case.
+        AssertReadJson<HelloRequest>(json, serializeOld: false);
+    }
+
     [Fact]
     public void MapKeyInt()
     {
@@ -474,6 +576,16 @@ public void OneOf_Success()
         AssertReadJson<HelloRequest>(json);
     }
 
+    [Fact]
+    public void OneOf_CaseInsensitive_Success()
+    {
+        var json = @"{
+  ""ONEOFNAME1"": ""test""
+}";
+
+        AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+    }
+
     [Fact]
     public void OneOf_Failure()
     {
@@ -485,6 +597,17 @@ public void OneOf_Failure()
         AssertReadJsonError<HelloRequest>(json, ex => Assert.Equal("Multiple values specified for oneof oneof_test", ex.Message.TrimEnd('.')));
     }
 
+    [Fact]
+    public void OneOf_CaseInsensitive_Failure()
+    {
+        var json = @"{
+  ""ONEOFNAME1"": ""test"",
+  ""ONEOFNAME2"": ""test""
+}";
+
+        AssertReadJsonError<HelloRequest>(json, ex => Assert.Equal("Multiple values specified for oneof oneof_test", ex.Message.TrimEnd('.')), deserializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+    }
+
     [Fact]
     public void NullableWrappers_NaN()
     {
@@ -528,7 +651,46 @@ public void NullableWrappers()
   ""bytesValue"": ""SGVsbG8gd29ybGQ=""
 }";
 
-        AssertReadJson<HelloRequest.Types.Wrappers>(json);
+        var result = AssertReadJson<HelloRequest.Types.Wrappers>(json);
+        Assert.Equal("A string", result.StringValue);
+    }
+
+    [Fact]
+    public void NullableWrappers_CaseInsensitive()
+    {
+        var json = @"{
+  ""STRINGVALUE"": ""A string"",
+  ""INT32VALUE"": 1,
+  ""INT64VALUE"": ""2"",
+  ""FLOATVALUE"": 1.2,
+  ""DOUBLEVALUE"": 1.1,
+  ""BOOLVALUE"": true,
+  ""UINT32VALUE"": 3,
+  ""UINT64VALUE"": ""4"",
+  ""BYTESVALUE"": ""SGVsbG8gd29ybGQ=""
+}";
+
+        var result = AssertReadJson<HelloRequest.Types.Wrappers>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+        Assert.Equal("A string", result.StringValue);
+    }
+
+    [Fact]
+    public void NullableWrappers_Type()
+    {
+        var json = @"{
+  ""stringValue"": ""A string"",
+  ""int32Value"": 1,
+  ""int64Value"": ""2"",
+  ""floatValue"": 1.2,
+  ""doubleValue"": 1.1,
+  ""boolValue"": true,
+  ""uint32Value"": 3,
+  ""uint64Value"": ""4"",
+  ""bytesValue"": ""SGVsbG8gd29ybGQ=""
+}";
+
+        var result = AssertReadJson<WrappersMessage>(json, serializeOld: false);
+        Assert.Equal("A string", result.StringValue.Value);
     }
 
     [Fact]
@@ -609,8 +771,19 @@ public void JsonNamePriority_JsonName()
     {
         var json = @"{""b"":10,""a"":20,""d"":30}";
 
-        // TODO: Current Google.Protobuf version doesn't have fix. Update when available. 3.23.0 or later?
-        var m = AssertReadJson<Issue047349Message>(json, serializeOld: false);
+        var m = AssertReadJson<Issue047349Message>(json);
+
+        Assert.Equal(10, m.A);
+        Assert.Equal(20, m.B);
+        Assert.Equal(30, m.C);
+    }
+
+    [Fact]
+    public void JsonNamePriority_CaseInsensitive_JsonName()
+    {
+        var json = @"{""B"":10,""A"":20,""D"":30}";
+
+        var m = AssertReadJson<Issue047349Message>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
 
         Assert.Equal(10, m.A);
         Assert.Equal(20, m.B);
@@ -622,14 +795,44 @@ public void JsonNamePriority_FieldNameFallback()
     {
         var json = @"{""b"":10,""a"":20,""c"":30}";
 
-        // TODO: Current Google.Protobuf version doesn't have fix. Update when available. 3.23.0 or later?
-        var m = AssertReadJson<Issue047349Message>(json, serializeOld: false);
+        var m = AssertReadJson<Issue047349Message>(json);
 
         Assert.Equal(10, m.A);
         Assert.Equal(20, m.B);
         Assert.Equal(30, m.C);
     }
 
+    [Fact]
+    public void JsonNamePriority_CaseInsensitive_FieldNameFallback()
+    {
+        var json = @"{""B"":10,""A"":20,""C"":30}";
+
+        var m = AssertReadJson<Issue047349Message>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+
+        Assert.Equal(10, m.A);
+        Assert.Equal(20, m.B);
+        Assert.Equal(30, m.C);
+    }
+
+    [Fact]
+    public void FieldNameCase_Success()
+    {
+        var json = @"{""a"":10,""A"":20}";
+
+        var m = AssertReadJson<FieldNameCaseMessage>(json);
+
+        Assert.Equal(10, m.A);
+        Assert.Equal(20, m.B);
+    }
+
+    [Fact]
+    public void FieldNameCase_CaseInsensitive_Failure()
+    {
+        var json = @"{""a"":10,""A"":20}";
+
+        AssertReadJsonError<FieldNameCaseMessage>(json, ex => Assert.Equal("The JSON property name for 'Transcoding.FieldNameCaseMessage.A' collides with another property.", ex.Message), deserializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
+    }
+
     private TValue AssertReadJson<TValue>(string value, GrpcJsonSettings? settings = null, DescriptorRegistry? descriptorRegistry = null, bool serializeOld = true) where TValue : IMessage, new()
     {
         var typeRegistery = TypeRegistry.FromFiles(
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterWriteTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterWriteTests.cs
index 32d1df26d8e4..a735afa4e458 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterWriteTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterWriteTests.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
+using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages;
 using Transcoding;
 using Xunit.Abstractions;
 using Type = System.Type;
@@ -201,6 +202,25 @@ public void NullableWrappers()
         AssertWrittenJson(wrappers);
     }
 
+    [Fact]
+    public void NullableWrappers_Types()
+    {
+        var wrappers = new WrappersMessage
+        {
+            BoolValue = new BoolValue { Value = true },
+            BytesValue = new BytesValue { Value = ByteString.CopyFrom(Encoding.UTF8.GetBytes("Hello world")) },
+            DoubleValue = new DoubleValue { Value = 1.1 },
+            FloatValue = new FloatValue { Value = 1.2f },
+            Int32Value = new Int32Value { Value = 1 },
+            Int64Value = new Int64Value { Value = 2L },
+            StringValue = new StringValue { Value = "A string" },
+            Uint32Value = new UInt32Value { Value = 3U },
+            Uint64Value = new UInt64Value { Value = 4UL }
+        };
+
+        AssertWrittenJson(wrappers);
+    }
+
     [Fact]
     public void NullableWrapper_Root_Int32()
     {
@@ -469,33 +489,83 @@ public void FieldMask_Root()
     }
 
     [Theory]
-    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Unspecified)]
-    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Bar)]
-    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Neg)]
-    [InlineData((HelloRequest.Types.DataTypes.Types.NestedEnum)100)]
-    public void Enum(HelloRequest.Types.DataTypes.Types.NestedEnum value)
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Unspecified, @"""UNSPECIFIED""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Foo, @"""FOO""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Bar, @"""BAR""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Baz, @"""BAZ""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum._123, @"""_123""")]
+    [InlineData((PrefixEnumType.Types.PrefixEnum)100, "100")]
+    public void Enum_RemovePrefix(PrefixEnumType.Types.PrefixEnum value, string expectedString)
+    {
+        var dataTypes = new PrefixEnumType
+        {
+            SingleEnum = value
+        };
+
+        var json = AssertWrittenJson(dataTypes, settings: new GrpcJsonSettings { RemoveEnumPrefix = true }, compareOldNew: false);
+        Assert.Equal(@$"{{""singleEnum"":{expectedString}}}", json);
+    }
+
+    [Theory]
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Unspecified, @"""PREFIX_ENUM_UNSPECIFIED""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Foo, @"""PREFIX_ENUM_FOO""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum.Bar, @"""BAR""")]
+    [InlineData(PrefixEnumType.Types.PrefixEnum._123, @"""PREFIX_ENUM_123""")]
+    public void Enum_NoRemovePrefix(PrefixEnumType.Types.PrefixEnum value, string expectedString)
+    {
+        var dataTypes = new PrefixEnumType
+        {
+            SingleEnum = value
+        };
+
+        var json = AssertWrittenJson(dataTypes, compareOldNew: false);
+        Assert.Equal(@$"{{""singleEnum"":{expectedString}}}", json);
+    }
+
+    [Theory]
+    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Unspecified, null)]
+    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Bar, @"""BAR""")]
+    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Neg, @"""NEG""")]
+    [InlineData((HelloRequest.Types.DataTypes.Types.NestedEnum)100, "100")]
+    public void Enum(HelloRequest.Types.DataTypes.Types.NestedEnum value, string? expectedString)
     {
         var dataTypes = new HelloRequest.Types.DataTypes
         {
             SingleEnum = value
         };
 
-        AssertWrittenJson(dataTypes);
+        var json = AssertWrittenJson(dataTypes, settings: new GrpcJsonSettings { IgnoreDefaultValues = true });
+        if (expectedString != null)
+        {
+            Assert.Equal(@$"{{""singleEnum"":{expectedString}}}", json);
+        }
+        else
+        {
+            Assert.Equal("{}", json);
+        }
     }
 
     [Theory]
-    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Unspecified)]
-    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Bar)]
-    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Neg)]
-    [InlineData((HelloRequest.Types.DataTypes.Types.NestedEnum)100)]
-    public void Enum_WriteNumber(HelloRequest.Types.DataTypes.Types.NestedEnum value)
+    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Unspecified, null)]
+    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Bar, "2")]
+    [InlineData(HelloRequest.Types.DataTypes.Types.NestedEnum.Neg, "-1")]
+    [InlineData((HelloRequest.Types.DataTypes.Types.NestedEnum)100, "100")]
+    public void Enum_WriteNumber(HelloRequest.Types.DataTypes.Types.NestedEnum value, string? expectedString)
     {
         var dataTypes = new HelloRequest.Types.DataTypes
         {
             SingleEnum = value
         };
 
-        AssertWrittenJson(dataTypes, new GrpcJsonSettings { WriteEnumsAsIntegers = true, IgnoreDefaultValues = true });
+        var json = AssertWrittenJson(dataTypes, new GrpcJsonSettings { WriteEnumsAsIntegers = true, IgnoreDefaultValues = true });
+        if (expectedString != null)
+        {
+            Assert.Equal(@$"{{""singleEnum"":{expectedString}}}", json);
+        }
+        else
+        {
+            Assert.Equal("{}", json);
+        }
     }
 
     [Fact]
@@ -517,7 +587,7 @@ public void JsonNamePriority()
         Assert.Equal(@"{""b"":10,""a"":20,""d"":30}", json);
     }
 
-    private string AssertWrittenJson<TValue>(TValue value, GrpcJsonSettings? settings = null, bool? compareRawStrings = null) where TValue : IMessage
+    private string AssertWrittenJson<TValue>(TValue value, GrpcJsonSettings? settings = null, bool? compareRawStrings = null, bool? compareOldNew = null) where TValue : IMessage
     {
         var typeRegistery = TypeRegistry.FromFiles(
             HelloRequest.Descriptor.File,
@@ -543,11 +613,14 @@ private string AssertWrittenJson<TValue>(TValue value, GrpcJsonSettings? setting
         _output.WriteLine("New:");
         _output.WriteLine(jsonNew);
 
-        using var doc1 = JsonDocument.Parse(jsonNew);
-        using var doc2 = JsonDocument.Parse(jsonOld);
+        if (compareOldNew ?? true)
+        {
+            using var doc1 = JsonDocument.Parse(jsonNew);
+            using var doc2 = JsonDocument.Parse(jsonOld);
 
-        var comparer = new JsonElementComparer(maxHashDepth: -1, compareRawStrings: compareRawStrings ?? false);
-        Assert.True(comparer.Equals(doc1.RootElement, doc2.RootElement));
+            var comparer = new JsonElementComparer(maxHashDepth: -1, compareRawStrings: compareRawStrings ?? false);
+            Assert.True(comparer.Equals(doc1.RootElement, doc2.RootElement));
+        }
 
         return jsonNew;
     }
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Infrastructure/TestHelpers.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Infrastructure/TestHelpers.cs
index 656420605d4e..7bdbfe24b6be 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Infrastructure/TestHelpers.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Infrastructure/TestHelpers.cs
@@ -19,10 +19,7 @@ internal static class TestHelpers
 {
     public static DefaultHttpContext CreateHttpContext(CancellationToken cancellationToken = default, Stream? bodyStream = null)
     {
-        var serviceCollection = new ServiceCollection();
-        serviceCollection.AddSingleton<JsonTranscodingGreeterService>();
-        serviceCollection.AddSingleton(typeof(IGrpcInterceptorActivator<>), typeof(TestInterceptorActivator<>));
-        var serviceProvider = serviceCollection.BuildServiceProvider();
+        var serviceProvider = CreateServiceProvider();
         var httpContext = new DefaultHttpContext();
         httpContext.Request.Host = new HostString("localhost");
         httpContext.RequestServices = serviceProvider;
@@ -32,6 +29,15 @@ public static DefaultHttpContext CreateHttpContext(CancellationToken cancellatio
         return httpContext;
     }
 
+    public static IServiceProvider CreateServiceProvider()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.AddSingleton<JsonTranscodingGreeterService>();
+        serviceCollection.AddSingleton(typeof(IGrpcInterceptorActivator<>), typeof(TestInterceptorActivator<>));
+        var serviceProvider = serviceCollection.BuildServiceProvider();
+        return serviceProvider;
+    }
+
     internal static MessageDescriptor GetMessageDescriptor(Type typeToConvert)
     {
         var property = typeToConvert.GetProperty("Descriptor", BindingFlags.Static | BindingFlags.Public, binder: null, typeof(MessageDescriptor), Type.EmptyTypes, modifiers: null);
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs
index a59540d67c9a..b20e026176e1 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/JsonTranscodingServiceMethodProviderTests.cs
@@ -29,7 +29,7 @@ public void AddMethod_OptionGet_ResolveMethod()
 
         Assert.Equal("GET", endpoint.Metadata.GetMetadata<IHttpMethodMetadata>()?.HttpMethods.Single());
         Assert.Equal("/v1/greeter/{name}", endpoint.RoutePattern.RawText);
-        Assert.Equal(1, endpoint.RoutePattern.Parameters.Count);
+        Assert.Single(endpoint.RoutePattern.Parameters);
         Assert.Equal("name", endpoint.RoutePattern.Parameters[0].Name);
     }
 
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Proto/transcoding.proto b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Proto/transcoding.proto
index e44535586bba..3c61333ad821 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Proto/transcoding.proto
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Proto/transcoding.proto
@@ -235,3 +235,28 @@ message HelloReply {
 message NullValueContainer {
   google.protobuf.NullValue null_value = 1;
 }
+
+message FieldNameCaseMessage {
+  int32 a = 1;
+  int32 b = 2  [json_name="A"];
+}
+
+message PrefixEnumType {
+  enum PrefixEnum {
+    PREFIX_ENUM_UNSPECIFIED = 0;
+    PREFIX_ENUM_FOO = 1;
+    BAR = 2;
+    BAZ = 3;
+    PREFIX_ENUM_123 = 4;
+  }
+  PrefixEnum single_enum = 1;
+}
+
+message CollisionPrefixEnumType {
+  enum CollisionPrefixEnum {
+    COLLISION_PREFIX_ENUM_UNSPECIFIED = 0;
+    COLLISION_PREFIX_ENUM_FOO = 1;
+    COLLISION_PREFIX_ENUM_COLLISION_PREFIX_ENUM_FOO = 2;
+  }
+  CollisionPrefixEnum single_enum = 1;
+}
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ServerStreamingServerCallHandlerTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ServerStreamingServerCallHandlerTests.cs
index f74675a6b9a4..ec1f3666d737 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ServerStreamingServerCallHandlerTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ServerStreamingServerCallHandlerTests.cs
@@ -20,6 +20,7 @@
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
 using Transcoding;
 using Xunit.Abstractions;
 using MethodOptions = Grpc.Shared.Server.MethodOptions;
@@ -339,7 +340,8 @@ private ServerStreamingServerCallHandler<JsonTranscodingGreeterService, TRequest
             invoker,
             method,
             MethodOptions.Create(new[] { serviceOptions }),
-            new TestGrpcServiceActivator<JsonTranscodingGreeterService>());
+            new TestGrpcServiceActivator<JsonTranscodingGreeterService>(),
+            new InterceptorActivators(TestHelpers.CreateServiceProvider()));
 
         var jsonSettings = jsonTranscodingOptions?.JsonSettings ?? new GrpcJsonSettings() { WriteIndented = false };
 
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/TestObjects/ProtobutMessages/WrappersMessage.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/TestObjects/ProtobutMessages/WrappersMessage.cs
new file mode 100644
index 000000000000..d1ae86daa8c7
--- /dev/null
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/TestObjects/ProtobutMessages/WrappersMessage.cs
@@ -0,0 +1,731 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: Protos/extra.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021, 8981
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages
+{
+
+    /// <summary>Holder for reflection information generated from Protos/extra.proto</summary>
+    public static partial class ExtraReflection
+    {
+
+        #region Descriptor
+        /// <summary>File descriptor for Protos/extra.proto</summary>
+        public static pbr::FileDescriptor Descriptor
+        {
+            get { return descriptor; }
+        }
+        private static pbr::FileDescriptor descriptor;
+
+        static ExtraReflection()
+        {
+            byte[] descriptorData = global::System.Convert.FromBase64String(
+                string.Concat(
+                  "ChJQcm90b3MvZXh0cmEucHJvdG8SBHRlc3QaHkdvb2dsZS9wcm90b2J1Zi93",
+                  "cmFwcGVycy5wcm90bxocR29vZ2xlL2FwaS9hbm5vdGF0aW9ucy5wcm90byLZ",
+                  "AwoPV3JhcHBlcnNNZXNzYWdlEjIKDHN0cmluZ192YWx1ZRgBIAEoCzIcLmdv",
+                  "b2dsZS5wcm90b2J1Zi5TdHJpbmdWYWx1ZRIwCgtpbnQzMl92YWx1ZRgCIAEo",
+                  "CzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlEjAKC2ludDY0X3ZhbHVl",
+                  "GAMgASgLMhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUSMAoLZmxvYXRf",
+                  "dmFsdWUYBCABKAsyGy5nb29nbGUucHJvdG9idWYuRmxvYXRWYWx1ZRIyCgxk",
+                  "b3VibGVfdmFsdWUYBSABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFs",
+                  "dWUSLgoKYm9vbF92YWx1ZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5Cb29s",
+                  "VmFsdWUSMgoMdWludDMyX3ZhbHVlGAcgASgLMhwuZ29vZ2xlLnByb3RvYnVm",
+                  "LlVJbnQzMlZhbHVlEjIKDHVpbnQ2NF92YWx1ZRgIIAEoCzIcLmdvb2dsZS5w",
+                  "cm90b2J1Zi5VSW50NjRWYWx1ZRIwCgtieXRlc192YWx1ZRgJIAEoCzIbLmdv",
+                  "b2dsZS5wcm90b2J1Zi5CeXRlc1ZhbHVlQk+qAkxNaWNyb3NvZnQuQXNwTmV0",
+                  "Q29yZS5HcnBjLkpzb25UcmFuc2NvZGluZy5UZXN0cy5UZXN0T2JqZWN0cy5Q",
+                  "cm90b2J1dE1lc3NhZ2VzYgZwcm90bzM="));
+            descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+                new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, },
+                new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages.WrappersMessage), global::Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages.WrappersMessage.Parser, new[]{ "StringValue", "Int32Value", "Int64Value", "FloatValue", "DoubleValue", "BoolValue", "Uint32Value", "Uint64Value", "BytesValue" }, null, null, null, null)
+                }));
+        }
+        #endregion
+
+    }
+    #region Messages
+    [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+    public sealed partial class WrappersMessage : pb::IMessage<WrappersMessage>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        , pb::IBufferMessage
+#endif
+    {
+        private static readonly pb::MessageParser<WrappersMessage> _parser = new pb::MessageParser<WrappersMessage>(() => new WrappersMessage());
+        private pb::UnknownFieldSet _unknownFields;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public static pb::MessageParser<WrappersMessage> Parser { get { return _parser; } }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public static pbr::MessageDescriptor Descriptor
+        {
+            get { return global::Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages.ExtraReflection.Descriptor.MessageTypes[0]; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        pbr::MessageDescriptor pb::IMessage.Descriptor
+        {
+            get { return Descriptor; }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public WrappersMessage()
+        {
+            OnConstruction();
+        }
+
+        partial void OnConstruction();
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public WrappersMessage(WrappersMessage other) : this()
+        {
+            stringValue_ = other.stringValue_ != null ? other.stringValue_.Clone() : null;
+            int32Value_ = other.int32Value_ != null ? other.int32Value_.Clone() : null;
+            int64Value_ = other.int64Value_ != null ? other.int64Value_.Clone() : null;
+            floatValue_ = other.floatValue_ != null ? other.floatValue_.Clone() : null;
+            doubleValue_ = other.doubleValue_ != null ? other.doubleValue_.Clone() : null;
+            boolValue_ = other.boolValue_ != null ? other.boolValue_.Clone() : null;
+            uint32Value_ = other.uint32Value_ != null ? other.uint32Value_.Clone() : null;
+            uint64Value_ = other.uint64Value_ != null ? other.uint64Value_.Clone() : null;
+            bytesValue_ = other.bytesValue_ != null ? other.bytesValue_.Clone() : null;
+            _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public WrappersMessage Clone()
+        {
+            return new WrappersMessage(this);
+        }
+
+        /// <summary>Field number for the "string_value" field.</summary>
+        public const int StringValueFieldNumber = 1;
+        private global::Google.Protobuf.WellKnownTypes.StringValue stringValue_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.StringValue StringValue
+        {
+            get { return stringValue_; }
+            set
+            {
+                stringValue_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "int32_value" field.</summary>
+        public const int Int32ValueFieldNumber = 2;
+        private global::Google.Protobuf.WellKnownTypes.Int32Value int32Value_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.Int32Value Int32Value
+        {
+            get { return int32Value_; }
+            set
+            {
+                int32Value_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "int64_value" field.</summary>
+        public const int Int64ValueFieldNumber = 3;
+        private global::Google.Protobuf.WellKnownTypes.Int64Value int64Value_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.Int64Value Int64Value
+        {
+            get { return int64Value_; }
+            set
+            {
+                int64Value_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "float_value" field.</summary>
+        public const int FloatValueFieldNumber = 4;
+        private global::Google.Protobuf.WellKnownTypes.FloatValue floatValue_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.FloatValue FloatValue
+        {
+            get { return floatValue_; }
+            set
+            {
+                floatValue_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "double_value" field.</summary>
+        public const int DoubleValueFieldNumber = 5;
+        private global::Google.Protobuf.WellKnownTypes.DoubleValue doubleValue_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.DoubleValue DoubleValue
+        {
+            get { return doubleValue_; }
+            set
+            {
+                doubleValue_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "bool_value" field.</summary>
+        public const int BoolValueFieldNumber = 6;
+        private global::Google.Protobuf.WellKnownTypes.BoolValue boolValue_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.BoolValue BoolValue
+        {
+            get { return boolValue_; }
+            set
+            {
+                boolValue_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "uint32_value" field.</summary>
+        public const int Uint32ValueFieldNumber = 7;
+        private global::Google.Protobuf.WellKnownTypes.UInt32Value uint32Value_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.UInt32Value Uint32Value
+        {
+            get { return uint32Value_; }
+            set
+            {
+                uint32Value_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "uint64_value" field.</summary>
+        public const int Uint64ValueFieldNumber = 8;
+        private global::Google.Protobuf.WellKnownTypes.UInt64Value uint64Value_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.UInt64Value Uint64Value
+        {
+            get { return uint64Value_; }
+            set
+            {
+                uint64Value_ = value;
+            }
+        }
+
+        /// <summary>Field number for the "bytes_value" field.</summary>
+        public const int BytesValueFieldNumber = 9;
+        private global::Google.Protobuf.WellKnownTypes.BytesValue bytesValue_;
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public global::Google.Protobuf.WellKnownTypes.BytesValue BytesValue
+        {
+            get { return bytesValue_; }
+            set
+            {
+                bytesValue_ = value;
+            }
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public override bool Equals(object other)
+        {
+            return Equals(other as WrappersMessage);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public bool Equals(WrappersMessage other)
+        {
+            if (ReferenceEquals(other, null))
+            {
+                return false;
+            }
+            if (ReferenceEquals(other, this))
+            {
+                return true;
+            }
+            if (!object.Equals(StringValue, other.StringValue)) return false;
+            if (!object.Equals(Int32Value, other.Int32Value)) return false;
+            if (!object.Equals(Int64Value, other.Int64Value)) return false;
+            if (!object.Equals(FloatValue, other.FloatValue)) return false;
+            if (!object.Equals(DoubleValue, other.DoubleValue)) return false;
+            if (!object.Equals(BoolValue, other.BoolValue)) return false;
+            if (!object.Equals(Uint32Value, other.Uint32Value)) return false;
+            if (!object.Equals(Uint64Value, other.Uint64Value)) return false;
+            if (!object.Equals(BytesValue, other.BytesValue)) return false;
+            return Equals(_unknownFields, other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public override int GetHashCode()
+        {
+            int hash = 1;
+            if (stringValue_ != null) hash ^= StringValue.GetHashCode();
+            if (int32Value_ != null) hash ^= Int32Value.GetHashCode();
+            if (int64Value_ != null) hash ^= Int64Value.GetHashCode();
+            if (floatValue_ != null) hash ^= FloatValue.GetHashCode();
+            if (doubleValue_ != null) hash ^= DoubleValue.GetHashCode();
+            if (boolValue_ != null) hash ^= BoolValue.GetHashCode();
+            if (uint32Value_ != null) hash ^= Uint32Value.GetHashCode();
+            if (uint64Value_ != null) hash ^= Uint64Value.GetHashCode();
+            if (bytesValue_ != null) hash ^= BytesValue.GetHashCode();
+            if (_unknownFields != null)
+            {
+                hash ^= _unknownFields.GetHashCode();
+            }
+            return hash;
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public override string ToString()
+        {
+            return pb::JsonFormatter.ToDiagnosticString(this);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public void WriteTo(pb::CodedOutputStream output)
+        {
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+            output.WriteRawMessage(this);
+#else
+      if (stringValue_ != null) {
+        output.WriteRawTag(10);
+        output.WriteMessage(StringValue);
+      }
+      if (int32Value_ != null) {
+        output.WriteRawTag(18);
+        output.WriteMessage(Int32Value);
+      }
+      if (int64Value_ != null) {
+        output.WriteRawTag(26);
+        output.WriteMessage(Int64Value);
+      }
+      if (floatValue_ != null) {
+        output.WriteRawTag(34);
+        output.WriteMessage(FloatValue);
+      }
+      if (doubleValue_ != null) {
+        output.WriteRawTag(42);
+        output.WriteMessage(DoubleValue);
+      }
+      if (boolValue_ != null) {
+        output.WriteRawTag(50);
+        output.WriteMessage(BoolValue);
+      }
+      if (uint32Value_ != null) {
+        output.WriteRawTag(58);
+        output.WriteMessage(Uint32Value);
+      }
+      if (uint64Value_ != null) {
+        output.WriteRawTag(66);
+        output.WriteMessage(Uint64Value);
+      }
+      if (bytesValue_ != null) {
+        output.WriteRawTag(74);
+        output.WriteMessage(BytesValue);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+#endif
+        }
+
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
+        {
+            if (stringValue_ != null)
+            {
+                output.WriteRawTag(10);
+                output.WriteMessage(StringValue);
+            }
+            if (int32Value_ != null)
+            {
+                output.WriteRawTag(18);
+                output.WriteMessage(Int32Value);
+            }
+            if (int64Value_ != null)
+            {
+                output.WriteRawTag(26);
+                output.WriteMessage(Int64Value);
+            }
+            if (floatValue_ != null)
+            {
+                output.WriteRawTag(34);
+                output.WriteMessage(FloatValue);
+            }
+            if (doubleValue_ != null)
+            {
+                output.WriteRawTag(42);
+                output.WriteMessage(DoubleValue);
+            }
+            if (boolValue_ != null)
+            {
+                output.WriteRawTag(50);
+                output.WriteMessage(BoolValue);
+            }
+            if (uint32Value_ != null)
+            {
+                output.WriteRawTag(58);
+                output.WriteMessage(Uint32Value);
+            }
+            if (uint64Value_ != null)
+            {
+                output.WriteRawTag(66);
+                output.WriteMessage(Uint64Value);
+            }
+            if (bytesValue_ != null)
+            {
+                output.WriteRawTag(74);
+                output.WriteMessage(BytesValue);
+            }
+            if (_unknownFields != null)
+            {
+                _unknownFields.WriteTo(ref output);
+            }
+        }
+#endif
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public int CalculateSize()
+        {
+            int size = 0;
+            if (stringValue_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(StringValue);
+            }
+            if (int32Value_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(Int32Value);
+            }
+            if (int64Value_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(Int64Value);
+            }
+            if (floatValue_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(FloatValue);
+            }
+            if (doubleValue_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(DoubleValue);
+            }
+            if (boolValue_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(BoolValue);
+            }
+            if (uint32Value_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(Uint32Value);
+            }
+            if (uint64Value_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(Uint64Value);
+            }
+            if (bytesValue_ != null)
+            {
+                size += 1 + pb::CodedOutputStream.ComputeMessageSize(BytesValue);
+            }
+            if (_unknownFields != null)
+            {
+                size += _unknownFields.CalculateSize();
+            }
+            return size;
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public void MergeFrom(WrappersMessage other)
+        {
+            if (other == null)
+            {
+                return;
+            }
+            if (other.stringValue_ != null)
+            {
+                if (stringValue_ == null)
+                {
+                    StringValue = new global::Google.Protobuf.WellKnownTypes.StringValue();
+                }
+                StringValue.MergeFrom(other.StringValue);
+            }
+            if (other.int32Value_ != null)
+            {
+                if (int32Value_ == null)
+                {
+                    Int32Value = new global::Google.Protobuf.WellKnownTypes.Int32Value();
+                }
+                Int32Value.MergeFrom(other.Int32Value);
+            }
+            if (other.int64Value_ != null)
+            {
+                if (int64Value_ == null)
+                {
+                    Int64Value = new global::Google.Protobuf.WellKnownTypes.Int64Value();
+                }
+                Int64Value.MergeFrom(other.Int64Value);
+            }
+            if (other.floatValue_ != null)
+            {
+                if (floatValue_ == null)
+                {
+                    FloatValue = new global::Google.Protobuf.WellKnownTypes.FloatValue();
+                }
+                FloatValue.MergeFrom(other.FloatValue);
+            }
+            if (other.doubleValue_ != null)
+            {
+                if (doubleValue_ == null)
+                {
+                    DoubleValue = new global::Google.Protobuf.WellKnownTypes.DoubleValue();
+                }
+                DoubleValue.MergeFrom(other.DoubleValue);
+            }
+            if (other.boolValue_ != null)
+            {
+                if (boolValue_ == null)
+                {
+                    BoolValue = new global::Google.Protobuf.WellKnownTypes.BoolValue();
+                }
+                BoolValue.MergeFrom(other.BoolValue);
+            }
+            if (other.uint32Value_ != null)
+            {
+                if (uint32Value_ == null)
+                {
+                    Uint32Value = new global::Google.Protobuf.WellKnownTypes.UInt32Value();
+                }
+                Uint32Value.MergeFrom(other.Uint32Value);
+            }
+            if (other.uint64Value_ != null)
+            {
+                if (uint64Value_ == null)
+                {
+                    Uint64Value = new global::Google.Protobuf.WellKnownTypes.UInt64Value();
+                }
+                Uint64Value.MergeFrom(other.Uint64Value);
+            }
+            if (other.bytesValue_ != null)
+            {
+                if (bytesValue_ == null)
+                {
+                    BytesValue = new global::Google.Protobuf.WellKnownTypes.BytesValue();
+                }
+                BytesValue.MergeFrom(other.BytesValue);
+            }
+            _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+        }
+
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        public void MergeFrom(pb::CodedInputStream input)
+        {
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+            input.ReadRawMessage(this);
+#else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            if (stringValue_ == null) {
+              StringValue = new global::Google.Protobuf.WellKnownTypes.StringValue();
+            }
+            input.ReadMessage(StringValue);
+            break;
+          }
+          case 18: {
+            if (int32Value_ == null) {
+              Int32Value = new global::Google.Protobuf.WellKnownTypes.Int32Value();
+            }
+            input.ReadMessage(Int32Value);
+            break;
+          }
+          case 26: {
+            if (int64Value_ == null) {
+              Int64Value = new global::Google.Protobuf.WellKnownTypes.Int64Value();
+            }
+            input.ReadMessage(Int64Value);
+            break;
+          }
+          case 34: {
+            if (floatValue_ == null) {
+              FloatValue = new global::Google.Protobuf.WellKnownTypes.FloatValue();
+            }
+            input.ReadMessage(FloatValue);
+            break;
+          }
+          case 42: {
+            if (doubleValue_ == null) {
+              DoubleValue = new global::Google.Protobuf.WellKnownTypes.DoubleValue();
+            }
+            input.ReadMessage(DoubleValue);
+            break;
+          }
+          case 50: {
+            if (boolValue_ == null) {
+              BoolValue = new global::Google.Protobuf.WellKnownTypes.BoolValue();
+            }
+            input.ReadMessage(BoolValue);
+            break;
+          }
+          case 58: {
+            if (uint32Value_ == null) {
+              Uint32Value = new global::Google.Protobuf.WellKnownTypes.UInt32Value();
+            }
+            input.ReadMessage(Uint32Value);
+            break;
+          }
+          case 66: {
+            if (uint64Value_ == null) {
+              Uint64Value = new global::Google.Protobuf.WellKnownTypes.UInt64Value();
+            }
+            input.ReadMessage(Uint64Value);
+            break;
+          }
+          case 74: {
+            if (bytesValue_ == null) {
+              BytesValue = new global::Google.Protobuf.WellKnownTypes.BytesValue();
+            }
+            input.ReadMessage(BytesValue);
+            break;
+          }
+        }
+      }
+#endif
+        }
+
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input)
+        {
+            uint tag;
+            while ((tag = input.ReadTag()) != 0)
+            {
+                if ((tag & 7) == 4)
+                {
+                    // Abort on any end group tag.
+                    return;
+                }
+                switch (tag)
+                {
+                    default:
+                        _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+                        break;
+                    case 10:
+                        {
+                            if (stringValue_ == null)
+                            {
+                                StringValue = new global::Google.Protobuf.WellKnownTypes.StringValue();
+                            }
+                            input.ReadMessage(StringValue);
+                            break;
+                        }
+                    case 18:
+                        {
+                            if (int32Value_ == null)
+                            {
+                                Int32Value = new global::Google.Protobuf.WellKnownTypes.Int32Value();
+                            }
+                            input.ReadMessage(Int32Value);
+                            break;
+                        }
+                    case 26:
+                        {
+                            if (int64Value_ == null)
+                            {
+                                Int64Value = new global::Google.Protobuf.WellKnownTypes.Int64Value();
+                            }
+                            input.ReadMessage(Int64Value);
+                            break;
+                        }
+                    case 34:
+                        {
+                            if (floatValue_ == null)
+                            {
+                                FloatValue = new global::Google.Protobuf.WellKnownTypes.FloatValue();
+                            }
+                            input.ReadMessage(FloatValue);
+                            break;
+                        }
+                    case 42:
+                        {
+                            if (doubleValue_ == null)
+                            {
+                                DoubleValue = new global::Google.Protobuf.WellKnownTypes.DoubleValue();
+                            }
+                            input.ReadMessage(DoubleValue);
+                            break;
+                        }
+                    case 50:
+                        {
+                            if (boolValue_ == null)
+                            {
+                                BoolValue = new global::Google.Protobuf.WellKnownTypes.BoolValue();
+                            }
+                            input.ReadMessage(BoolValue);
+                            break;
+                        }
+                    case 58:
+                        {
+                            if (uint32Value_ == null)
+                            {
+                                Uint32Value = new global::Google.Protobuf.WellKnownTypes.UInt32Value();
+                            }
+                            input.ReadMessage(Uint32Value);
+                            break;
+                        }
+                    case 66:
+                        {
+                            if (uint64Value_ == null)
+                            {
+                                Uint64Value = new global::Google.Protobuf.WellKnownTypes.UInt64Value();
+                            }
+                            input.ReadMessage(Uint64Value);
+                            break;
+                        }
+                    case 74:
+                        {
+                            if (bytesValue_ == null)
+                            {
+                                BytesValue = new global::Google.Protobuf.WellKnownTypes.BytesValue();
+                            }
+                            input.ReadMessage(BytesValue);
+                            break;
+                        }
+                }
+            }
+        }
+#endif
+
+    }
+
+    #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/UnaryServerCallHandlerTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/UnaryServerCallHandlerTests.cs
index 1c5b03d79483..762483117ba4 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/UnaryServerCallHandlerTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/UnaryServerCallHandlerTests.cs
@@ -23,6 +23,7 @@
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
 using Transcoding;
 using Xunit.Abstractions;
@@ -791,7 +792,7 @@ public async Task HandleCallAsync_MalformedRequestBody_RepeatedBody_BadRequestRe
     [Theory]
     [InlineData(null)]
     [InlineData("text/html")]
-    public async Task HandleCallAsync_BadContentType_BadRequestReturned(string contentType)
+    public async Task HandleCallAsync_BadContentType_BadRequestReturned(string? contentType)
     {
         // Arrange
         UnaryServerMethod<JsonTranscodingGreeterService, HelloRequest, HelloReply> invoker = (s, r, c) =>
@@ -1842,7 +1843,8 @@ private UnaryServerCallHandler<JsonTranscodingGreeterService, TRequest, TRespons
             invoker,
             method,
             MethodOptions.Create(new[] { serviceOptions }),
-            new TestGrpcServiceActivator<JsonTranscodingGreeterService>());
+            new TestGrpcServiceActivator<JsonTranscodingGreeterService>(),
+            new InterceptorActivators(TestHelpers.CreateServiceProvider()));
 
         var descriptorRegistry = new DescriptorRegistry();
         descriptorRegistry.RegisterFileDescriptor(TestHelpers.GetMessageDescriptor(typeof(TRequest)).File);
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Binding/ParametersTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Binding/ParametersTests.cs
index 8a4db851175f..4a27f8d945e7 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Binding/ParametersTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Binding/ParametersTests.cs
@@ -67,7 +67,7 @@ public void RouteAndBodyFields_FilterRouteAndBodyQueryFields()
         Assert.Equal("parameterThree", operation.Parameters[2].Name);
         // body with one parameter
         Assert.NotNull(operation.RequestBody);
-        Assert.Equal(1, swagger.Components.Schemas["RequestBody"].Properties.Count);
+        Assert.Single(swagger.Components.Schemas["RequestBody"].Properties);
     }
 
     [Fact]
@@ -79,7 +79,7 @@ public void CatchAllBody_NoQueryFields()
         // Assert
         var path = swagger.Paths["/v1/parameters4/{parameterTwo}"];
         Assert.True(path.Operations.TryGetValue(OperationType.Post, out var operation));
-        Assert.Equal(1, operation.Parameters.Count);
+        Assert.Single(operation.Parameters);
         Assert.Equal(ParameterLocation.Path, operation.Parameters[0].In);
         Assert.Equal("parameterTwo", operation.Parameters[0].Name);
         // body with four parameters
@@ -110,7 +110,7 @@ public void RepeatedStringField_ArrayQueryField()
         // Assert
         var path = swagger.Paths["/v1/parameters6"];
         Assert.True(path.Operations.TryGetValue(OperationType.Get, out var operation));
-        Assert.Equal(1, operation.Parameters.Count);
+        Assert.Single(operation.Parameters);
         Assert.Equal(ParameterLocation.Query, operation.Parameters[0].In);
         Assert.Equal("parameterOne", operation.Parameters[0].Name);
         Assert.Equal("array", operation.Parameters[0].Schema.Type);
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/SchemaGeneratorIntegrationTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/SchemaGeneratorIntegrationTests.cs
index cafa080ac619..771a8e5c006c 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/SchemaGeneratorIntegrationTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/SchemaGeneratorIntegrationTests.cs
@@ -38,7 +38,7 @@ public void GenerateSchema_EnumValue_ReturnSchema()
         // Assert
         schema = repository.Schemas[schema.Reference.Id];
         Assert.Equal("object", schema.Type);
-        Assert.Equal(1, schema.Properties.Count);
+        Assert.Single(schema.Properties);
 
         var enumSchema = repository.Schemas[schema.Properties["enumValue"].Reference.Id];
         Assert.Equal("string", enumSchema.Type);
@@ -99,7 +99,7 @@ public void GenerateSchema_RecursiveMessage_ReturnSchema()
         // Assert
         schema = repository.Schemas[schema.Reference.Id];
         Assert.Equal("object", schema.Type);
-        Assert.Equal(1, schema.Properties.Count);
+        Assert.Single(schema.Properties);
         Assert.Equal("RecursiveMessage", schema.Properties["child"].Reference.Id);
     }
 
@@ -143,7 +143,7 @@ public void GenerateSchema_Struct_ReturnSchema()
         var resolvedSchema = repository.Schemas[schema.Reference.Id];
 
         Assert.Equal("object", resolvedSchema.Type);
-        Assert.Equal(0, resolvedSchema.Properties.Count);
+        Assert.Empty(resolvedSchema.Properties);
         Assert.NotNull(resolvedSchema.AdditionalProperties);
         Assert.Null(resolvedSchema.AdditionalProperties.Type);
     }
@@ -159,7 +159,7 @@ public void GenerateSchema_Any_ReturnSchema()
         Assert.Equal("object", schema.Type);
         Assert.NotNull(schema.AdditionalProperties);
         Assert.Null(schema.AdditionalProperties.Type);
-        Assert.Equal(1, schema.Properties.Count);
+        Assert.Single(schema.Properties);
         Assert.Equal("string", schema.Properties["@type"].Type);
     }
 
@@ -189,7 +189,7 @@ public void GenerateSchema_Map_ReturnSchema()
         // Assert
         schema = repository.Schemas[schema.Reference.Id];
         Assert.Equal("object", schema.Type);
-        Assert.Equal(1, schema.Properties.Count);
+        Assert.Single(schema.Properties);
         Assert.Equal("object", schema.Properties["mapValue"].Type);
         Assert.Equal("number", schema.Properties["mapValue"].AdditionalProperties.Type);
         Assert.Equal("double", schema.Properties["mapValue"].AdditionalProperties.Format);
@@ -204,7 +204,7 @@ public void GenerateSchema_FieldMask_ReturnSchema()
         // Assert
         schema = repository.Schemas[schema.Reference.Id];
         Assert.Equal("object", schema.Type);
-        Assert.Equal(1, schema.Properties.Count);
+        Assert.Single(schema.Properties);
         Assert.Equal("string", schema.Properties["fieldMaskValue"].Type);
     }
 }
diff --git a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/XmlComments/XmlCommentsDocumentFilterTests.cs b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/XmlComments/XmlCommentsDocumentFilterTests.cs
index 6d9e0c3cc0d6..ed3bf26ab7dd 100644
--- a/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/XmlComments/XmlCommentsDocumentFilterTests.cs
+++ b/src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/XmlComments/XmlCommentsDocumentFilterTests.cs
@@ -40,7 +40,7 @@ public void Apply_SetsTagDescription_FromControllerSummaryTags(Type serviceType,
 
         Subject().Apply(document, filterContext);
 
-        Assert.Equal(1, document.Tags.Count);
+        Assert.Single(document.Tags);
         Assert.Equal(expectedDescription, document.Tags[0].Description);
 
         static ApiDescription CreateApiDescription(Type serviceType)
diff --git a/src/HealthChecks/Abstractions/src/HealthReport.cs b/src/HealthChecks/Abstractions/src/HealthReport.cs
index 829067fb3cfa..15418441ad7b 100644
--- a/src/HealthChecks/Abstractions/src/HealthReport.cs
+++ b/src/HealthChecks/Abstractions/src/HealthReport.cs
@@ -66,13 +66,13 @@ private static HealthStatus CalculateAggregateStatus(IEnumerable<HealthReportEnt
             if (currentValue > entry.Status)
             {
                 currentValue = entry.Status;
-            }
 
-            if (currentValue == HealthStatus.Unhealthy)
-            {
-                // Game over, man! Game over!
-                // (We hit the worst possible status, so there's no need to keep iterating)
-                return currentValue;
+                if (currentValue == HealthStatus.Unhealthy)
+                {
+                    // Game over, man! Game over!
+                    // (We hit the worst possible status, so there's no need to keep iterating)
+                    return currentValue;
+                }
             }
         }
 
diff --git a/src/HealthChecks/HealthChecks.slnf b/src/HealthChecks/HealthChecks.slnf
index aa672d2ab329..11f6af533a9e 100644
--- a/src/HealthChecks/HealthChecks.slnf
+++ b/src/HealthChecks/HealthChecks.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\HealthChecks\\Abstractions\\src\\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj",
       "src\\HealthChecks\\HealthChecks\\src\\Microsoft.Extensions.Diagnostics.HealthChecks.csproj",
diff --git a/src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs b/src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs
index 386439cb89c5..c78290fd5dd4 100644
--- a/src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs
+++ b/src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs
@@ -517,7 +517,7 @@ public async Task CheckHealthAsync_ChecksAreRunInParallel()
         await checkHealthTask;
 
         // Assert
-        Assert.Collection(checkHealthTask.Result.Entries,
+        Assert.Collection((await checkHealthTask).Entries,
             entry =>
             {
                 Assert.Equal("test1", entry.Key);
diff --git a/src/Hosting/Abstractions/src/HostingAbstractionsWebHostBuilderExtensions.cs b/src/Hosting/Abstractions/src/HostingAbstractionsWebHostBuilderExtensions.cs
index 930fde23ac41..877b63c5aacc 100644
--- a/src/Hosting/Abstractions/src/HostingAbstractionsWebHostBuilderExtensions.cs
+++ b/src/Hosting/Abstractions/src/HostingAbstractionsWebHostBuilderExtensions.cs
@@ -169,10 +169,12 @@ public static IWebHostBuilder UseShutdownTimeout(this IWebHostBuilder hostBuilde
     /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to start.</param>
     /// <param name="urls">The urls the hosted application will listen on.</param>
     /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     public static IWebHost Start(this IWebHostBuilder hostBuilder, [StringSyntax(StringSyntaxAttribute.Uri)] params string[] urls)
     {
         var host = hostBuilder.UseUrls(urls).Build();
         host.StartAsync(CancellationToken.None).GetAwaiter().GetResult();
         return host;
     }
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
 }
diff --git a/src/Hosting/Abstractions/src/IWebHost.cs b/src/Hosting/Abstractions/src/IWebHost.cs
index b770ff5cee3d..adfa708db5e5 100644
--- a/src/Hosting/Abstractions/src/IWebHost.cs
+++ b/src/Hosting/Abstractions/src/IWebHost.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.Hosting;
 
 /// <summary>
 /// Represents a configured web host.
 /// </summary>
+[Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
 public interface IWebHost : IDisposable
 {
     /// <summary>
diff --git a/src/Hosting/Abstractions/src/IWebHostBuilder.cs b/src/Hosting/Abstractions/src/IWebHostBuilder.cs
index dd3fc81fd207..713a1069e1a5 100644
--- a/src/Hosting/Abstractions/src/IWebHostBuilder.cs
+++ b/src/Hosting/Abstractions/src/IWebHostBuilder.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -15,6 +16,7 @@ public interface IWebHostBuilder
     /// <summary>
     /// Builds an <see cref="IWebHost"/> which hosts a web application.
     /// </summary>
+    [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     IWebHost Build();
 
     /// <summary>
diff --git a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj
index 9b5d4268cb21..ed3426d65288 100644
--- a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj
+++ b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj
@@ -17,4 +17,8 @@
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Hosting/Hosting.slnf b/src/Hosting/Hosting.slnf
index 15ea47da7f67..ff947cbef379 100644
--- a/src/Hosting/Hosting.slnf
+++ b/src/Hosting/Hosting.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
index 5cc17d57e2ec..83f416fa0089 100644
--- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
+++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Hosting;
 
 internal sealed class GenericWebHostBuilder : WebHostBuilderBase, ISupportsStartup
 {
-    private object? _startupObject;
+    private const string _startupConfigName = "__UseStartup.StartupObject";
     private readonly object _startupKey = new object();
 
     private AggregateException? _hostingStartupErrors;
@@ -170,13 +170,15 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // UseStartup can be called multiple times. Only run the last one.
-        _startupObject = startupType;
+        _builder.Properties[_startupConfigName] = startupType;
 
         _builder.ConfigureServices((context, services) =>
         {
             // Run this delegate if the startup type matches
-            if (object.ReferenceEquals(_startupObject, startupType))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, startupType))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 UseStartup(startupType, context, services);
             }
         });
@@ -193,7 +195,7 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // Clear the startup type
-        _startupObject = startupFactory;
+        _builder.Properties[_startupConfigName] = startupFactory;
 
         _builder.ConfigureServices(ConfigureStartup);
 
@@ -201,8 +203,10 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         void ConfigureStartup(HostBuilderContext context, IServiceCollection services)
         {
             // UseStartup can be called multiple times. Only run the last one.
-            if (object.ReferenceEquals(_startupObject, startupFactory))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, startupFactory))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 var webHostBuilderContext = GetWebHostBuilderContext(context);
                 var instance = startupFactory(webHostBuilderContext) ?? throw new InvalidOperationException("The specified factory returned null startup instance.");
                 UseStartup(instance.GetType(), context, services, instance);
@@ -316,12 +320,14 @@ public IWebHostBuilder Configure(Action<IApplicationBuilder> configure)
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // Clear the startup type
-        _startupObject = configure;
+        _builder.Properties[_startupConfigName] = configure;
 
         _builder.ConfigureServices((context, services) =>
         {
-            if (object.ReferenceEquals(_startupObject, configure))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, configure))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 services.Configure<GenericWebHostServiceOptions>(options =>
                 {
                     options.ConfigureApplication = configure;
@@ -339,12 +345,14 @@ public IWebHostBuilder Configure(Action<WebHostBuilderContext, IApplicationBuild
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // Clear the startup type
-        _startupObject = configure;
+        _builder.Properties[_startupConfigName] = configure;
 
         _builder.ConfigureServices((context, services) =>
         {
-            if (object.ReferenceEquals(_startupObject, configure))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, configure))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 services.Configure<GenericWebHostServiceOptions>(options =>
                 {
                     var webhostBuilderContext = GetWebHostBuilderContext(context);
diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs
index 9ac3001c9b0f..6dcecd3d50a5 100644
--- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs
+++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs
@@ -132,7 +132,7 @@ static string ExpandPorts(string ports, string scheme)
 
             var builder = ApplicationBuilderFactory.CreateBuilder(Server.Features);
 
-            foreach (var filter in StartupFilters.Reverse())
+            foreach (var filter in Enumerable.Reverse(StartupFilters))
             {
                 configure = filter.Configure(configure);
             }
@@ -166,6 +166,14 @@ static string ExpandPorts(string ports, string scheme)
             foreach (var address in addresses)
             {
                 Log.ListeningOnAddress(LifetimeLogger, address);
+                if (LifetimeLogger.IsEnabled(LogLevel.Information))
+                {
+                    if (address.Contains(".localhost", StringComparison.OrdinalIgnoreCase) && Uri.TryCreate(address, UriKind.Absolute, out var uri) && uri.Host.EndsWith(".localhost", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Log the localhost address without the sub-domain prefix too
+                        Log.ListeningOnAddress(LifetimeLogger, new UriBuilder(uri) { Host = "localhost" }.ToString().TrimEnd('/'));
+                    }
+                }
             }
         }
 
diff --git a/src/Hosting/Hosting/src/GenericHost/HostingStartupWebHostBuilder.cs b/src/Hosting/Hosting/src/GenericHost/HostingStartupWebHostBuilder.cs
index 85e384a1a2a7..4ad87bd48c0b 100644
--- a/src/Hosting/Hosting/src/GenericHost/HostingStartupWebHostBuilder.cs
+++ b/src/Hosting/Hosting/src/GenericHost/HostingStartupWebHostBuilder.cs
@@ -23,10 +23,12 @@ public HostingStartupWebHostBuilder(GenericWebHostBuilder builder)
         _builder = builder;
     }
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     public IWebHost Build()
     {
         throw new NotSupportedException($"Building this implementation of {nameof(IWebHostBuilder)} is not supported.");
     }
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
 
     public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
     {
diff --git a/src/Hosting/Hosting/src/GenericHost/WebHostBuilderBase.cs b/src/Hosting/Hosting/src/GenericHost/WebHostBuilderBase.cs
index c104ed40002a..d6b547d573db 100644
--- a/src/Hosting/Hosting/src/GenericHost/WebHostBuilderBase.cs
+++ b/src/Hosting/Hosting/src/GenericHost/WebHostBuilderBase.cs
@@ -26,10 +26,12 @@ public WebHostBuilderBase(IHostBuilder builder, WebHostBuilderOptions options)
         _config = configBuilder.Build();
     }
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     public IWebHost Build()
     {
         throw new NotSupportedException($"Building this implementation of {nameof(IWebHostBuilder)} is not supported.");
     }
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
 
     public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
     {
diff --git a/src/Hosting/Hosting/src/Http/DefaultHttpContextFactory.cs b/src/Hosting/Hosting/src/Http/DefaultHttpContextFactory.cs
index a5b6541b0f91..d087dc54d943 100644
--- a/src/Hosting/Hosting/src/Http/DefaultHttpContextFactory.cs
+++ b/src/Hosting/Hosting/src/Http/DefaultHttpContextFactory.cs
@@ -58,10 +58,7 @@ internal void Initialize(DefaultHttpContext httpContext, IFeatureCollection feat
 
         httpContext.Initialize(featureCollection);
 
-        if (_httpContextAccessor != null)
-        {
-            _httpContextAccessor.HttpContext = httpContext;
-        }
+        _httpContextAccessor?.HttpContext = httpContext;
 
         httpContext.FormOptions = _formOptions;
         httpContext.ServiceScopeFactory = _serviceScopeFactory;
@@ -72,18 +69,12 @@ internal void Initialize(DefaultHttpContext httpContext, IFeatureCollection feat
     /// </summary>
     public void Dispose(HttpContext httpContext)
     {
-        if (_httpContextAccessor != null)
-        {
-            _httpContextAccessor.HttpContext = null;
-        }
+        _httpContextAccessor?.HttpContext = null;
     }
 
     internal void Dispose(DefaultHttpContext httpContext)
     {
-        if (_httpContextAccessor != null)
-        {
-            _httpContextAccessor.HttpContext = null;
-        }
+        _httpContextAccessor?.HttpContext = null;
 
         httpContext.Uninitialize();
     }
diff --git a/src/Hosting/Hosting/src/Internal/HostingApplication.cs b/src/Hosting/Hosting/src/Internal/HostingApplication.cs
index b610173be531..37996905bdf1 100644
--- a/src/Hosting/Hosting/src/Internal/HostingApplication.cs
+++ b/src/Hosting/Hosting/src/Internal/HostingApplication.cs
@@ -17,6 +17,13 @@ internal sealed class HostingApplication : IHttpApplication<HostingApplication.C
     private readonly DefaultHttpContextFactory? _defaultHttpContextFactory;
     private readonly HostingApplicationDiagnostics _diagnostics;
 
+    // Internal for testing purposes only
+    internal bool SuppressActivityOpenTelemetryData
+    {
+        get => _diagnostics.SuppressActivityOpenTelemetryData;
+        set => _diagnostics.SuppressActivityOpenTelemetryData = value;
+    }
+
     public HostingApplication(
         RequestDelegate application,
         ILogger logger,
diff --git a/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs b/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs
index 1a344203727c..67f584462e6e 100644
--- a/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs
+++ b/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs
@@ -34,6 +34,9 @@ internal sealed class HostingApplicationDiagnostics
     private readonly HostingMetrics _metrics;
     private readonly ILogger _logger;
 
+    // Internal for testing purposes only
+    internal bool SuppressActivityOpenTelemetryData { get; set; }
+
     public HostingApplicationDiagnostics(
         ILogger logger,
         DiagnosticListener diagnosticListener,
@@ -48,6 +51,19 @@ public HostingApplicationDiagnostics(
         _propagator = propagator;
         _eventSource = eventSource;
         _metrics = metrics;
+
+        SuppressActivityOpenTelemetryData = GetSuppressActivityOpenTelemetryData();
+    }
+
+    private static bool GetSuppressActivityOpenTelemetryData()
+    {
+        // Default to true if the switch isn't set.
+        if (!AppContext.TryGetSwitch("Microsoft.AspNetCore.Hosting.SuppressActivityOpenTelemetryData", out var enabled))
+        {
+            return true;
+        }
+
+        return enabled;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -88,9 +104,9 @@ public void BeginRequest(HttpContext httpContext, HostingApplication.Context con
         var diagnosticListenerActivityCreationEnabled = (diagnosticListenerEnabled && _diagnosticListener.IsEnabled(ActivityName, httpContext));
         var loggingEnabled = _logger.IsEnabled(LogLevel.Critical);
 
-        if (loggingEnabled || diagnosticListenerActivityCreationEnabled || _activitySource.HasListeners())
+        if (ActivityCreator.IsActivityCreated(_activitySource, loggingEnabled || diagnosticListenerActivityCreationEnabled))
         {
-            context.Activity = StartActivity(httpContext, loggingEnabled, diagnosticListenerActivityCreationEnabled, out var hasDiagnosticListener);
+            context.Activity = StartActivity(httpContext, loggingEnabled || diagnosticListenerActivityCreationEnabled, out var hasDiagnosticListener);
             context.HasDiagnosticListener = hasDiagnosticListener;
 
             if (context.Activity != null)
@@ -385,10 +401,18 @@ private void RecordRequestStartMetrics(HttpContext httpContext)
     }
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    private Activity? StartActivity(HttpContext httpContext, bool loggingEnabled, bool diagnosticListenerActivityCreationEnabled, out bool hasDiagnosticListener)
+    private Activity? StartActivity(HttpContext httpContext, bool diagnosticsOrLoggingEnabled, out bool hasDiagnosticListener)
     {
+        // StartActivity is only called if an Activity is already verified to be created.
+        Debug.Assert(ActivityCreator.IsActivityCreated(_activitySource, diagnosticsOrLoggingEnabled),
+            "Activity should only be created if diagnostics or logging is enabled.");
+
         hasDiagnosticListener = false;
 
+        var initializeTags = !SuppressActivityOpenTelemetryData
+            ? CreateInitializeActivityTags(httpContext)
+            : (TagList?)null;
+
         var headers = httpContext.Request.Headers;
         var activity = ActivityCreator.CreateFromRemote(
             _activitySource,
@@ -402,9 +426,9 @@ private void RecordRequestStartMetrics(HttpContext httpContext)
             },
             ActivityName,
             ActivityKind.Server,
-            tags: null,
+            tags: initializeTags,
             links: null,
-            loggingEnabled || diagnosticListenerActivityCreationEnabled);
+            diagnosticsOrLoggingEnabled);
         if (activity is null)
         {
             return null;
@@ -425,6 +449,47 @@ private void RecordRequestStartMetrics(HttpContext httpContext)
         return activity;
     }
 
+    private static TagList CreateInitializeActivityTags(HttpContext httpContext)
+    {
+        // The tags here are set when the activity is created. They can be used in sampling decisions.
+        // Most values in semantic conventions that are present at creation are specified:
+        // https://github.com/open-telemetry/semantic-conventions/blob/27735ccca3746d7bb7fa061dfb73d93bcbae2b6e/docs/http/http-spans.md#L581-L592
+        // Missing values recommended by the spec are:
+        // - url.query (need configuration around redaction to do properly)
+        // - http.request.header.<key>
+
+        var request = httpContext.Request;
+        var creationTags = new TagList();
+
+        if (request.Host.HasValue)
+        {
+            creationTags.Add(HostingTelemetryHelpers.AttributeServerAddress, request.Host.Host);
+
+            if (HostingTelemetryHelpers.TryGetServerPort(request.Host, request.Scheme, out var port))
+            {
+                creationTags.Add(HostingTelemetryHelpers.AttributeServerPort, port);
+            }
+        }
+
+        HostingTelemetryHelpers.SetActivityHttpMethodTags(ref creationTags, request.Method);
+
+        if (request.Headers.TryGetValue("User-Agent", out var values))
+        {
+            var userAgent = values.Count > 0 ? values[0] : null;
+            if (!string.IsNullOrEmpty(userAgent))
+            {
+                creationTags.Add(HostingTelemetryHelpers.AttributeUserAgentOriginal, userAgent);
+            }
+        }
+
+        creationTags.Add(HostingTelemetryHelpers.AttributeUrlScheme, request.Scheme);
+
+        var path = (request.PathBase.HasValue || request.Path.HasValue) ? (request.PathBase + request.Path).ToString() : "/";
+        creationTags.Add(HostingTelemetryHelpers.AttributeUrlPath, path);
+
+        return creationTags;
+    }
+
     [MethodImpl(MethodImplOptions.NoInlining)]
     private void StopActivity(HttpContext httpContext, Activity activity, bool hasDiagnosticListener)
     {
diff --git a/src/Hosting/Hosting/src/Internal/HostingMetrics.cs b/src/Hosting/Hosting/src/Internal/HostingMetrics.cs
index 129542fec15a..2615bf5608f7 100644
--- a/src/Hosting/Hosting/src/Internal/HostingMetrics.cs
+++ b/src/Hosting/Hosting/src/Internal/HostingMetrics.cs
@@ -1,11 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Frozen;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Metrics;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.Hosting;
 
@@ -55,7 +54,7 @@ public void RequestEnd(string protocol, string scheme, string method, string? ro
 
         if (!disableHttpRequestDurationMetric && _requestDuration.Enabled)
         {
-            if (TryGetHttpVersion(protocol, out var httpVersion))
+            if (HostingTelemetryHelpers.TryGetHttpVersion(protocol, out var httpVersion))
             {
                 tags.Add("network.protocol.version", httpVersion);
             }
@@ -65,10 +64,10 @@ public void RequestEnd(string protocol, string scheme, string method, string? ro
             }
 
             // Add information gathered during request.
-            tags.Add("http.response.status_code", GetBoxedStatusCode(statusCode));
+            tags.Add("http.response.status_code", HostingTelemetryHelpers.GetBoxedStatusCode(statusCode));
             if (route != null)
             {
-                tags.Add("http.route", route);
+                tags.Add("http.route", RouteDiagnosticsHelpers.ResolveHttpRoute(route));
             }
 
             // Add before some built in tags so custom tags are prioritized when dealing with duplicates.
@@ -104,73 +103,6 @@ public void Dispose()
     private static void InitializeRequestTags(ref TagList tags, string scheme, string method)
     {
         tags.Add("url.scheme", scheme);
-        tags.Add("http.request.method", ResolveHttpMethod(method));
-    }
-
-    private static readonly object[] BoxedStatusCodes = new object[512];
-
-    private static object GetBoxedStatusCode(int statusCode)
-    {
-        object[] boxes = BoxedStatusCodes;
-        return (uint)statusCode < (uint)boxes.Length
-            ? boxes[statusCode] ??= statusCode
-            : statusCode;
-    }
-
-    private static readonly FrozenDictionary<string, string> KnownMethods = FrozenDictionary.ToFrozenDictionary(new[]
-    {
-        KeyValuePair.Create(HttpMethods.Connect, HttpMethods.Connect),
-        KeyValuePair.Create(HttpMethods.Delete, HttpMethods.Delete),
-        KeyValuePair.Create(HttpMethods.Get, HttpMethods.Get),
-        KeyValuePair.Create(HttpMethods.Head, HttpMethods.Head),
-        KeyValuePair.Create(HttpMethods.Options, HttpMethods.Options),
-        KeyValuePair.Create(HttpMethods.Patch, HttpMethods.Patch),
-        KeyValuePair.Create(HttpMethods.Post, HttpMethods.Post),
-        KeyValuePair.Create(HttpMethods.Put, HttpMethods.Put),
-        KeyValuePair.Create(HttpMethods.Trace, HttpMethods.Trace)
-    }, StringComparer.OrdinalIgnoreCase);
-
-    private static string ResolveHttpMethod(string method)
-    {
-        // TODO: Support configuration for configuring known methods
-        if (KnownMethods.TryGetValue(method, out var result))
-        {
-            // KnownMethods ignores case. Use the value returned by the dictionary to have a consistent case.
-            return result;
-        }
-        return "_OTHER";
-    }
-
-    private static bool TryGetHttpVersion(string protocol, [NotNullWhen(true)] out string? version)
-    {
-        if (HttpProtocol.IsHttp11(protocol))
-        {
-            version = "1.1";
-            return true;
-        }
-        if (HttpProtocol.IsHttp2(protocol))
-        {
-            // HTTP/2 only has one version.
-            version = "2";
-            return true;
-        }
-        if (HttpProtocol.IsHttp3(protocol))
-        {
-            // HTTP/3 only has one version.
-            version = "3";
-            return true;
-        }
-        if (HttpProtocol.IsHttp10(protocol))
-        {
-            version = "1.0";
-            return true;
-        }
-        if (HttpProtocol.IsHttp09(protocol))
-        {
-            version = "0.9";
-            return true;
-        }
-        version = null;
-        return false;
+        tags.Add("http.request.method", HostingTelemetryHelpers.GetNormalizedHttpMethod(method));
     }
 }
diff --git a/src/Hosting/Hosting/src/Internal/HostingTelemetryHelpers.cs b/src/Hosting/Hosting/src/Internal/HostingTelemetryHelpers.cs
new file mode 100644
index 000000000000..e415869e9cff
--- /dev/null
+++ b/src/Hosting/Hosting/src/Internal/HostingTelemetryHelpers.cs
@@ -0,0 +1,132 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Frozen;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Hosting;
+
+internal static class HostingTelemetryHelpers
+{
+    // Semantic Conventions for HTTP.
+    // Note: Not all telemetry code is using these const attribute names yet.
+    public const string AttributeHttpRequestMethod = "http.request.method";
+    public const string AttributeHttpRequestMethodOriginal = "http.request.method_original";
+    public const string AttributeUrlScheme = "url.scheme";
+    public const string AttributeUrlPath = "url.path";
+    public const string AttributeServerAddress = "server.address";
+    public const string AttributeServerPort = "server.port";
+    public const string AttributeUserAgentOriginal = "user_agent.original";
+
+    // The value "_OTHER" is used for non-standard HTTP methods.
+    // https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md#common-attributes
+    private const string OtherHttpMethod = "_OTHER";
+
+    private static readonly object[] BoxedStatusCodes = new object[512];
+
+    private static readonly FrozenDictionary<string, string> KnownHttpMethods = FrozenDictionary.ToFrozenDictionary([
+        KeyValuePair.Create(HttpMethods.Connect, HttpMethods.Connect),
+        KeyValuePair.Create(HttpMethods.Delete, HttpMethods.Delete),
+        KeyValuePair.Create(HttpMethods.Get, HttpMethods.Get),
+        KeyValuePair.Create(HttpMethods.Head, HttpMethods.Head),
+        KeyValuePair.Create(HttpMethods.Options, HttpMethods.Options),
+        KeyValuePair.Create(HttpMethods.Patch, HttpMethods.Patch),
+        KeyValuePair.Create(HttpMethods.Post, HttpMethods.Post),
+        KeyValuePair.Create(HttpMethods.Put, HttpMethods.Put),
+        KeyValuePair.Create(HttpMethods.Trace, HttpMethods.Trace)
+    ], StringComparer.OrdinalIgnoreCase);
+
+    // Boxed port values for HTTP and HTTPS.
+    private static readonly object HttpPort = 80;
+    private static readonly object HttpsPort = 443;
+
+    public static bool TryGetServerPort(HostString host, string scheme, [NotNullWhen(true)] out object? port)
+    {
+        if (host.Port.HasValue)
+        {
+            port = host.Port.Value;
+            return true;
+        }
+
+        // If the port is not specified, use the default port for the scheme.
+        if (string.Equals(scheme, "http", StringComparison.OrdinalIgnoreCase))
+        {
+            port = HttpPort;
+            return true;
+        }
+        else if (string.Equals(scheme, "https", StringComparison.OrdinalIgnoreCase))
+        {
+            port = HttpsPort;
+            return true;
+        }
+
+        // Unknown scheme, no default port.
+        port = null;
+        return false;
+    }
+
+    public static object GetBoxedStatusCode(int statusCode)
+    {
+        object[] boxes = BoxedStatusCodes;
+        return (uint)statusCode < (uint)boxes.Length
+            ? boxes[statusCode] ??= statusCode
+            : statusCode;
+    }
+
+    public static string GetNormalizedHttpMethod(string method)
+    {
+        // TODO: Support configuration for configuring known methods
+        if (method != null && KnownHttpMethods.TryGetValue(method, out var result))
+        {
+            // KnownHttpMethods ignores case. Use the value returned by the dictionary to have a consistent case.
+            return result;
+        }
+        return OtherHttpMethod;
+    }
+
+    public static bool TryGetHttpVersion(string protocol, [NotNullWhen(true)] out string? version)
+    {
+        if (HttpProtocol.IsHttp11(protocol))
+        {
+            version = "1.1";
+            return true;
+        }
+        if (HttpProtocol.IsHttp2(protocol))
+        {
+            // HTTP/2 only has one version.
+            version = "2";
+            return true;
+        }
+        if (HttpProtocol.IsHttp3(protocol))
+        {
+            // HTTP/3 only has one version.
+            version = "3";
+            return true;
+        }
+        if (HttpProtocol.IsHttp10(protocol))
+        {
+            version = "1.0";
+            return true;
+        }
+        if (HttpProtocol.IsHttp09(protocol))
+        {
+            version = "0.9";
+            return true;
+        }
+        version = null;
+        return false;
+    }
+
+    public static void SetActivityHttpMethodTags(ref TagList tags, string originalHttpMethod)
+    {
+        var normalizedHttpMethod = GetNormalizedHttpMethod(originalHttpMethod);
+        tags.Add(AttributeHttpRequestMethod, normalizedHttpMethod);
+
+        if (originalHttpMethod != normalizedHttpMethod)
+        {
+            tags.Add(AttributeHttpRequestMethodOriginal, originalHttpMethod);
+        }
+    }
+}
diff --git a/src/Hosting/Hosting/src/Internal/StartupLoader.cs b/src/Hosting/Hosting/src/Internal/StartupLoader.cs
index 6124347cebc3..3989a7786bcc 100644
--- a/src/Hosting/Hosting/src/Internal/StartupLoader.cs
+++ b/src/Hosting/Hosting/src/Internal/StartupLoader.cs
@@ -222,7 +222,7 @@ void RunPipeline(TContainerBuilder containerBuilder)
 #pragma warning restore CS0612 // Type or member is obsolete
 
                 Action<TContainerBuilder> pipeline = InvokeConfigureContainer;
-                foreach (var filter in filters.Reverse())
+                foreach (var filter in Enumerable.Reverse(filters))
                 {
                     pipeline = filter.ConfigureContainer(pipeline);
                 }
diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs
index 404ba7107c90..e0b0857d982f 100644
--- a/src/Hosting/Hosting/src/Internal/WebHost.cs
+++ b/src/Hosting/Hosting/src/Internal/WebHost.cs
@@ -19,6 +19,7 @@
 
 namespace Microsoft.AspNetCore.Hosting;
 
+[Obsolete("WebHost is obsolete. Use Host.CreateDefaultBuilder or WebApplication.CreateBuilder instead.")]
 internal sealed partial class WebHost : IWebHost, IAsyncDisposable
 {
     private const string DeprecatedServerUrlsKey = "server.urls";
@@ -214,7 +215,7 @@ private RequestDelegate BuildApplication()
             Action<IApplicationBuilder> configure = _startup!.Configure;
             if (startupFilters != null)
             {
-                foreach (var filter in startupFilters.Reverse())
+                foreach (var filter in Enumerable.Reverse(startupFilters))
                 {
                     configure = filter.Configure(configure);
                 }
diff --git a/src/Hosting/Hosting/src/Internal/WebHostLifetime.cs b/src/Hosting/Hosting/src/Internal/WebHostLifetime.cs
index 00481689ce09..ba2bb10c0ac1 100644
--- a/src/Hosting/Hosting/src/Internal/WebHostLifetime.cs
+++ b/src/Hosting/Hosting/src/Internal/WebHostLifetime.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.InteropServices;
+
 namespace Microsoft.AspNetCore.Hosting;
 
 internal sealed class WebHostLifetime : IDisposable
@@ -9,8 +11,11 @@ internal sealed class WebHostLifetime : IDisposable
     private readonly ManualResetEventSlim _resetEvent;
     private readonly string _shutdownMessage;
 
+    private readonly PosixSignalRegistration _sigIntRegistration;
+    private readonly PosixSignalRegistration _sigQuitRegistration;
+    private readonly PosixSignalRegistration _sigTermRegistration;
+
     private bool _disposed;
-    private bool _exitedGracefully;
 
     public WebHostLifetime(CancellationTokenSource cts, ManualResetEventSlim resetEvent, string shutdownMessage)
     {
@@ -18,13 +23,10 @@ public WebHostLifetime(CancellationTokenSource cts, ManualResetEventSlim resetEv
         _resetEvent = resetEvent;
         _shutdownMessage = shutdownMessage;
 
-        AppDomain.CurrentDomain.ProcessExit += ProcessExit;
-        Console.CancelKeyPress += CancelKeyPress;
-    }
-
-    internal void SetExitedGracefully()
-    {
-        _exitedGracefully = true;
+        Action<PosixSignalContext> handler = HandlePosixSignal;
+        _sigIntRegistration = PosixSignalRegistration.Create(PosixSignal.SIGINT, handler);
+        _sigQuitRegistration = PosixSignalRegistration.Create(PosixSignal.SIGQUIT, handler);
+        _sigTermRegistration = PosixSignalRegistration.Create(PosixSignal.SIGTERM, handler);
     }
 
     public void Dispose()
@@ -35,26 +37,18 @@ public void Dispose()
         }
 
         _disposed = true;
-        AppDomain.CurrentDomain.ProcessExit -= ProcessExit;
-        Console.CancelKeyPress -= CancelKeyPress;
-    }
 
-    private void CancelKeyPress(object? sender, ConsoleCancelEventArgs eventArgs)
-    {
-        Shutdown();
-        // Don't terminate the process immediately, wait for the Main thread to exit gracefully.
-        eventArgs.Cancel = true;
+        _sigIntRegistration.Dispose();
+        _sigQuitRegistration.Dispose();
+        _sigTermRegistration.Dispose();
     }
 
-    private void ProcessExit(object? sender, EventArgs eventArgs)
+    private void HandlePosixSignal(PosixSignalContext context)
     {
         Shutdown();
-        if (_exitedGracefully)
-        {
-            // On Linux if the shutdown is triggered by SIGTERM then that's signaled with the 143 exit code.
-            // Suppress that since we shut down gracefully. https://github.com/dotnet/aspnetcore/issues/6526
-            Environment.ExitCode = 0;
-        }
+
+        // Don't terminate the process immediately, wait for the Main thread to exit gracefully.
+        context.Cancel = true;
     }
 
     private void Shutdown()
diff --git a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
index e91f7124f54d..eb2052e0b5e7 100644
--- a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
+++ b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj
@@ -19,6 +19,8 @@
     <Compile Include="$(SharedSourceRoot)Metrics\MetricsExtensions.cs" />
     <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" />
     <Compile Include="$(SharedSourceRoot)Diagnostics\ActivityCreator.cs" />
+    <Compile Include="$(SharedSourceRoot)Diagnostics\RouteDiagnosticsHelpers.cs" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Hosting/Hosting/src/WebHostBuilder.cs b/src/Hosting/Hosting/src/WebHostBuilder.cs
index f21d3593697e..0317c83bd1db 100644
--- a/src/Hosting/Hosting/src/WebHostBuilder.cs
+++ b/src/Hosting/Hosting/src/WebHostBuilder.cs
@@ -9,6 +9,7 @@
 using System.Runtime.ExceptionServices;
 using Microsoft.AspNetCore.Hosting.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -20,6 +21,7 @@ namespace Microsoft.AspNetCore.Hosting;
 /// <summary>
 /// A builder for <see cref="IWebHost"/>
 /// </summary>
+[Obsolete("WebHostBuilder is deprecated in favor of HostBuilder and WebApplicationBuilder. For more information, visit https://aka.ms/aspnet/deprecate/004.", DiagnosticId = "ASPDEPR004", UrlFormat = Obsoletions.AspNetCoreDeprecate004Url)]
 public class WebHostBuilder : IWebHostBuilder
 {
     private readonly HostingEnvironment _hostingEnvironment;
diff --git a/src/Hosting/Hosting/src/WebHostExtensions.cs b/src/Hosting/Hosting/src/WebHostExtensions.cs
index 1d4d115f904d..4ad56d847d07 100644
--- a/src/Hosting/Hosting/src/WebHostExtensions.cs
+++ b/src/Hosting/Hosting/src/WebHostExtensions.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -12,6 +13,7 @@ namespace Microsoft.AspNetCore.Hosting;
 /// <summary>
 /// Contains extensions for managing the lifecycle of an <see cref="IWebHost"/>.
 /// </summary>
+[Obsolete("WebHostExtensions is obsolete. Use Host.CreateDefaultBuilder or WebApplication.CreateBuilder instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
 public static class WebHostExtensions
 {
     /// <summary>
@@ -52,7 +54,6 @@ public static async Task WaitForShutdownAsync(this IWebHost host, CancellationTo
                 try
                 {
                     await host.WaitForTokenShutdownAsync(cts.Token);
-                    lifetime.SetExitedGracefully();
                 }
                 finally
                 {
@@ -95,7 +96,6 @@ public static async Task RunAsync(this IWebHost host, CancellationToken token =
                 try
                 {
                     await host.RunAsync(cts.Token, "Application started. Press Ctrl+C to shut down.");
-                    lifetime.SetExitedGracefully();
                 }
                 finally
                 {
diff --git a/src/Hosting/Hosting/test/Fakes/GenericWebHost.cs b/src/Hosting/Hosting/test/Fakes/GenericWebHost.cs
index 1d6cd64871f4..31e718cc2046 100644
--- a/src/Hosting/Hosting/test/Fakes/GenericWebHost.cs
+++ b/src/Hosting/Hosting/test/Fakes/GenericWebHost.cs
@@ -1,6 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Hosting/Hosting/test/Fakes/GenericWebHostBuilderWrapper.cs b/src/Hosting/Hosting/test/Fakes/GenericWebHostBuilderWrapper.cs
index 57f51e921138..008a37c6c5a5 100644
--- a/src/Hosting/Hosting/test/Fakes/GenericWebHostBuilderWrapper.cs
+++ b/src/Hosting/Hosting/test/Fakes/GenericWebHostBuilderWrapper.cs
@@ -21,11 +21,13 @@ internal GenericWebHostBuilderWrapper(HostBuilder hostBuilder)
     }
 
     // This is the only one that doesn't pass through
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     public IWebHost Build()
     {
         _hostBuilder.ConfigureServices((context, services) => services.AddHostedService<GenericWebHostService>());
         return new GenericWebHost(_hostBuilder.Build());
     }
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
 
     public IWebHostBuilder Configure(Action<IApplicationBuilder> configure)
     {
diff --git a/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs b/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs
index d517e6e0fe6b..5d940a63c8dc 100644
--- a/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs
+++ b/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Linq;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -128,6 +130,86 @@ public void ReadsUrlsOrPorts(string urls, string httpPorts, string httpsPorts, s
         Assert.Equal(expected, string.Join(';', server.Addresses));
     }
 
+    [Fact]
+    public async Task MultipleConfigureWebHostCallsWithUseStartupLastWins()
+    {
+        var server = new TestServer();
+        
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseServer(server)
+                    .UseStartup<FirstStartup>();
+            })
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseStartup<SecondStartup>();
+            })
+            .Build();
+
+        await host.StartAsync();
+        await AssertResponseContains(server.RequestDelegate, "SecondStartup");
+    }
+
+    [Fact]
+    public async Task MultipleConfigureWebHostCallsWithSameUseStartupOnlyRunsOne()
+    {
+        var server = new TestServer();
+
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseServer(server)
+                    .UseStartup<FirstStartup>();
+            })
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseStartup<FirstStartup>();
+            })
+            .Build();
+
+        await host.StartAsync();
+        Assert.Single(host.Services.GetRequiredService<IEnumerable<FirstStartup>>());
+    }
+
+    private async Task AssertResponseContains(RequestDelegate app, string expectedText)
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Response.Body = new MemoryStream();
+        await app(httpContext);
+        httpContext.Response.Body.Seek(0, SeekOrigin.Begin);
+        var bodyText = new StreamReader(httpContext.Response.Body).ReadToEnd();
+        Assert.Contains(expectedText, bodyText);
+    }
+
+    private class FirstStartup
+    {
+        public void ConfigureServices(IServiceCollection services) { services.AddSingleton<FirstStartup>(); }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            Assert.NotNull(app.ApplicationServices.GetService<FirstStartup>());
+            Assert.Null(app.ApplicationServices.GetService<SecondStartup>());
+            app.Run(context => context.Response.WriteAsync("FirstStartup"));
+        }
+    }
+
+    private class SecondStartup
+    {
+        public void ConfigureServices(IServiceCollection services) { services.AddSingleton<SecondStartup>(); }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            Assert.Null(app.ApplicationServices.GetService<FirstStartup>());
+            Assert.NotNull(app.ApplicationServices.GetService<SecondStartup>());
+            app.Run(context => context.Response.WriteAsync("SecondStartup"));
+        }
+    }
+
     private class TestServer : IServer, IServerAddressesFeature
     {
         public TestServer()
@@ -139,9 +221,31 @@ public TestServer()
 
         public ICollection<string> Addresses { get; } = new List<string>();
         public bool PreferHostingUrls { get; set; }
+        public RequestDelegate RequestDelegate { get; private set; }
 
-        public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken) => Task.CompletedTask;
-        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
         public void Dispose() { }
+
+        public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken)
+        {
+            // For testing that uses RequestDelegate
+            RequestDelegate = async ctx =>
+            {
+                var httpContext = application.CreateContext(ctx.Features);
+                try
+                {
+                    await application.ProcessRequestAsync(httpContext);
+                }
+                catch (Exception ex)
+                {
+                    application.DisposeContext(httpContext, ex);
+                    throw;
+                }
+                application.DisposeContext(httpContext, null);
+            };
+
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
     }
 }
diff --git a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs
index 3eac7ed0a781..032eab752397 100644
--- a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs
+++ b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs
@@ -22,15 +22,14 @@ namespace Microsoft.AspNetCore.Hosting.Tests;
 public class HostingApplicationDiagnosticsTests : LoggedTest
 {
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57259")]
     public async Task EventCountersAndMetricsValues()
     {
         // Arrange
         var hostingEventSource = new HostingEventSource(Guid.NewGuid().ToString());
 
+        // requests-per-second isn't tested because the value can't be reliably tested because of time
         using var eventListener = new TestCounterListener(LoggerFactory, hostingEventSource.Name,
         [
-            "requests-per-second",
             "total-requests",
             "current-requests",
             "failed-requests"
@@ -40,10 +39,9 @@ public async Task EventCountersAndMetricsValues()
         using CancellationTokenSource timeoutTokenSource = new CancellationTokenSource(timeout);
         timeoutTokenSource.Token.Register(() => Logger.LogError("Timeout while waiting for counter value."));
 
-        var rpsValues = eventListener.GetCounterValues("requests-per-second", timeoutTokenSource.Token).GetAsyncEnumerator();
-        var totalRequestValues = eventListener.GetCounterValues("total-requests", timeoutTokenSource.Token).GetAsyncEnumerator();
-        var currentRequestValues = eventListener.GetCounterValues("current-requests", timeoutTokenSource.Token).GetAsyncEnumerator();
-        var failedRequestValues = eventListener.GetCounterValues("failed-requests", timeoutTokenSource.Token).GetAsyncEnumerator();
+        var totalRequestValues = eventListener.GetCounterValues("total-requests", timeoutTokenSource.Token);
+        var currentRequestValues = eventListener.GetCounterValues("current-requests", timeoutTokenSource.Token);
+        var failedRequestValues = eventListener.GetCounterValues("failed-requests", timeoutTokenSource.Token);
 
         eventListener.EnableEvents(hostingEventSource, EventLevel.Informational, EventKeywords.None,
             new Dictionary<string, string>
@@ -64,21 +62,24 @@ public async Task EventCountersAndMetricsValues()
         using var requestDurationCollector2 = new MetricCollector<double>(testMeterFactory2, HostingMetrics.MeterName, "http.server.request.duration");
 
         // Act/Assert 1
+        Logger.LogInformation("Act/Assert 1");
+        Logger.LogInformation(nameof(HostingApplication.CreateContext));
+
         var context1 = hostingApplication1.CreateContext(features1);
         var context2 = hostingApplication2.CreateContext(features2);
 
-        await totalRequestValues.WaitForSumValueAsync(2);
-        await rpsValues.WaitForValueAsync(2);
-        await currentRequestValues.WaitForValueAsync(2);
-        await failedRequestValues.WaitForValueAsync(0);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 2, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 2, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 0, Logger);
+
+        Logger.LogInformation(nameof(HostingApplication.DisposeContext));
 
         hostingApplication1.DisposeContext(context1, null);
         hostingApplication2.DisposeContext(context2, null);
 
-        await totalRequestValues.WaitForSumValueAsync(2);
-        await rpsValues.WaitForValueAsync(0);
-        await currentRequestValues.WaitForValueAsync(0);
-        await failedRequestValues.WaitForValueAsync(0);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 2, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 0, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 0, Logger);
 
         Assert.Collection(activeRequestsCollector1.GetMeasurementSnapshot(),
             m => Assert.Equal(1, m.Value),
@@ -92,24 +93,27 @@ public async Task EventCountersAndMetricsValues()
             m => Assert.True(m.Value > 0));
 
         // Act/Assert 2
+        Logger.LogInformation("Act/Assert 2");
+        Logger.LogInformation(nameof(HostingApplication.CreateContext));
+
         context1 = hostingApplication1.CreateContext(features1);
         context2 = hostingApplication2.CreateContext(features2);
 
-        await totalRequestValues.WaitForSumValueAsync(4);
-        await rpsValues.WaitForValueAsync(2);
-        await currentRequestValues.WaitForValueAsync(2);
-        await failedRequestValues.WaitForValueAsync(0);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 4, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 2, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 0, Logger);
 
         context1.HttpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
         context2.HttpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
 
+        Logger.LogInformation(nameof(HostingApplication.DisposeContext));
+
         hostingApplication1.DisposeContext(context1, null);
         hostingApplication2.DisposeContext(context2, null);
 
-        await totalRequestValues.WaitForSumValueAsync(4);
-        await rpsValues.WaitForValueAsync(0);
-        await currentRequestValues.WaitForValueAsync(0);
-        await failedRequestValues.WaitForValueAsync(2);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 4, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 0, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 2, Logger);
 
         Assert.Collection(activeRequestsCollector1.GetMeasurementSnapshot(),
             m => Assert.Equal(1, m.Value),
@@ -129,6 +133,11 @@ public async Task EventCountersAndMetricsValues()
             m => Assert.True(m.Value > 0));
     }
 
+    private static async Task WaitForCounterValue(CounterValues values, double expectedValue, ILogger logger)
+    {
+        await values.Values.WaitForValueAsync(expectedValue, values.CounterName, logger);
+    }
+
     [Fact]
     public void EventCountersEnabled()
     {
@@ -343,6 +352,71 @@ public void Metrics_Route_RouteTagReported()
             });
     }
 
+    private sealed class EmptyRouteDiagnosticsMetadata : IRouteDiagnosticsMetadata
+    {
+        public string Route { get; } = "";
+    }
+
+    [Fact]
+    public void Metrics_Route_RouteTagIsRootWhenEmpty()
+    {
+        // Arrange
+        var hostingEventSource = new HostingEventSource(Guid.NewGuid().ToString());
+
+        var testMeterFactory = new TestMeterFactory();
+        using var activeRequestsCollector = new MetricCollector<long>(testMeterFactory, HostingMetrics.MeterName, "http.server.active_requests");
+        using var requestDurationCollector = new MetricCollector<double>(testMeterFactory, HostingMetrics.MeterName, "http.server.request.duration");
+
+        // Act
+        var hostingApplication = CreateApplication(out var features, eventSource: hostingEventSource, meterFactory: testMeterFactory, configure: c =>
+        {
+            c.Request.Protocol = "1.1";
+            c.Request.Scheme = "http";
+            c.Request.Method = "POST";
+            c.Request.Host = new HostString("localhost");
+            c.Request.Path = "";
+            c.Request.ContentType = "text/plain";
+            c.Request.ContentLength = 1024;
+        });
+        var context = hostingApplication.CreateContext(features);
+
+        Assert.Collection(activeRequestsCollector.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.Equal(1, m.Value);
+                Assert.Equal("http", m.Tags["url.scheme"]);
+                Assert.Equal("POST", m.Tags["http.request.method"]);
+            });
+
+        context.HttpContext.SetEndpoint(new Endpoint(
+            c => Task.CompletedTask,
+            new EndpointMetadataCollection(new EmptyRouteDiagnosticsMetadata()),
+            "Test empty endpoint"));
+
+        hostingApplication.DisposeContext(context, null);
+
+        // Assert
+        Assert.Collection(activeRequestsCollector.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.Equal(1, m.Value);
+                Assert.Equal("http", m.Tags["url.scheme"]);
+                Assert.Equal("POST", m.Tags["http.request.method"]);
+            },
+            m =>
+            {
+                Assert.Equal(-1, m.Value);
+                Assert.Equal("http", m.Tags["url.scheme"]);
+                Assert.Equal("POST", m.Tags["http.request.method"]);
+            });
+        Assert.Collection(requestDurationCollector.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.True(m.Value > 0);
+                Assert.Equal("/", m.Tags["http.route"]);
+            });
+    }
+
     [Fact]
     public void Metrics_DisableHttpMetricsWithMetadata_NoMetrics()
     {
@@ -731,13 +805,13 @@ public void ActivityParentIdAndBaggageReadFromHeaders()
         {
             Headers = new HeaderDictionary()
             {
-                {"Request-Id", "ParentId1"},
+                {"Request-Id", "ParentId1"}, // non-standard header, won't apply to Activity
                 {"baggage", "Key1=value1, Key2=value2"}
             }
         });
         hostingApplication.CreateContext(features);
         Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", Activity.Current.OperationName);
-        Assert.Equal("ParentId1", Activity.Current.ParentId);
+        Assert.Null(Activity.Current.ParentId);
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");
     }
@@ -919,7 +993,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders()
             Headers = new HeaderDictionary()
             {
                 {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                {"tracestate", "TraceState1"},
+                {"tracestate", "tracestate=1"},
                 {"baggage", "Key1=value1, Key2=value2"}
             }
         });
@@ -928,7 +1002,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders()
         Assert.Equal(ActivityIdFormat.W3C, Activity.Current.IdFormat);
         Assert.Equal("0123456789abcdef0123456789abcdef", Activity.Current.TraceId.ToHexString());
         Assert.Equal("0123456789abcdef", Activity.Current.ParentSpanId.ToHexString());
-        Assert.Equal("TraceState1", Activity.Current.TraceStateString);
+        Assert.Equal("tracestate=1", Activity.Current.TraceStateString);
 
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");
@@ -1012,6 +1086,7 @@ public void ActivityListenersAreCalled()
         var testSource = new ActivitySource(Path.GetRandomFileName());
         var hostingApplication = CreateApplication(out var features, activitySource: testSource);
         var parentSpanId = "";
+        var tags = new List<KeyValuePair<string, object>>();
         using var listener = new ActivityListener
         {
             ShouldListenTo = activitySource => ReferenceEquals(activitySource, testSource),
@@ -1019,6 +1094,7 @@ public void ActivityListenersAreCalled()
             ActivityStarted = activity =>
             {
                 parentSpanId = Activity.Current.ParentSpanId.ToHexString();
+                tags = Activity.Current.TagObjects.OrderBy(t => t.Key).ToList();
             }
         };
 
@@ -1030,12 +1106,112 @@ public void ActivityListenersAreCalled()
             {
                 {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
                 {"tracestate", "TraceState1"},
-                {"baggage", "Key1=value1, Key2=value2"}
+                {"baggage", "Key1=value1, Key2=value2"},
+                {"host", "localhost:8080" }
+            },
+            PathBase = "/path_base",
+            Path = "/path",
+            Scheme = "http",
+            Method = "CUSTOM_METHOD",
+            Protocol = "HTTP/1.1"
+        });
+
+        hostingApplication.CreateContext(features);
+        Assert.Equal("0123456789abcdef", parentSpanId);
+
+        Assert.Empty(tags);
+    }
+
+    [Fact]
+    public void ActivityListeners_DontSuppressActivityTags_TagsAdded()
+    {
+        var testSource = new ActivitySource(Path.GetRandomFileName());
+        var hostingApplication = CreateApplication(out var features, activitySource: testSource, suppressActivityOpenTelemetryData: false);
+        var parentSpanId = "";
+        var tags = new List<KeyValuePair<string, object>>();
+        using var listener = new ActivityListener
+        {
+            ShouldListenTo = activitySource => ReferenceEquals(activitySource, testSource),
+            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
+            ActivityStarted = activity =>
+            {
+                parentSpanId = Activity.Current.ParentSpanId.ToHexString();
+                tags = Activity.Current.TagObjects.OrderBy(t => t.Key).ToList();
             }
+        };
+
+        ActivitySource.AddActivityListener(listener);
+
+        features.Set<IHttpRequestFeature>(new HttpRequestFeature()
+        {
+            Headers = new HeaderDictionary()
+            {
+                {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
+                {"tracestate", "TraceState1"},
+                {"baggage", "Key1=value1, Key2=value2"},
+                {"host", "localhost:8080" }
+            },
+            PathBase = "/path_base",
+            Path = "/path",
+            Scheme = "http",
+            Method = "CUSTOM_METHOD",
+            Protocol = "HTTP/1.1"
         });
 
         hostingApplication.CreateContext(features);
         Assert.Equal("0123456789abcdef", parentSpanId);
+
+        Assert.Collection(tags,
+            kvp => AssertKeyValuePair(kvp, "http.request.method", "_OTHER"),
+            kvp => AssertKeyValuePair(kvp, "http.request.method_original", "CUSTOM_METHOD"),
+            kvp => AssertKeyValuePair(kvp, "server.address", "localhost"),
+            kvp => AssertKeyValuePair(kvp, "server.port", 8080),
+            kvp => AssertKeyValuePair(kvp, "url.path", "/path_base/path"),
+            kvp => AssertKeyValuePair(kvp, "url.scheme", "http"));
+
+        static void AssertKeyValuePair<T>(KeyValuePair<string, T> pair, string key, T value)
+        {
+            Assert.Equal(key, pair.Key);
+            Assert.Equal(value, pair.Value);
+        }
+    }
+
+    [Theory]
+    [InlineData("http", 80)]
+    [InlineData("HTTP", 80)]
+    [InlineData("https", 443)]
+    [InlineData("HTTPS", 443)]
+    [InlineData("other", null)]
+    public void ActivityListeners_DefaultPorts(string scheme, int? expectedPort)
+    {
+        var testSource = new ActivitySource(Path.GetRandomFileName());
+        var hostingApplication = CreateApplication(out var features, activitySource: testSource, suppressActivityOpenTelemetryData: false);
+        var tags = new Dictionary<string, object>();
+        using var listener = new ActivityListener
+        {
+            ShouldListenTo = activitySource => ReferenceEquals(activitySource, testSource),
+            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
+            ActivityStarted = activity =>
+            {
+                tags = Activity.Current.TagObjects.ToDictionary();
+            }
+        };
+
+        ActivitySource.AddActivityListener(listener);
+
+        features.Set<IHttpRequestFeature>(new HttpRequestFeature()
+        {
+            Headers = new HeaderDictionary()
+            {
+                {"host", "localhost" }
+            },
+            Scheme = scheme,
+        });
+
+        hostingApplication.CreateContext(features);
+
+        Assert.Equal(expectedPort != null, tags.TryGetValue("server.port", out var actualPort));
+        Assert.Equal(expectedPort, (int?)actualPort);
     }
 
     [Fact]
@@ -1083,7 +1259,8 @@ private static void AssertProperty<T>(object o, string name)
 
     private static HostingApplication CreateApplication(out FeatureCollection features,
         DiagnosticListener diagnosticListener = null, ActivitySource activitySource = null, ILogger logger = null,
-        Action<DefaultHttpContext> configure = null, HostingEventSource eventSource = null, IMeterFactory meterFactory = null)
+        Action<DefaultHttpContext> configure = null, HostingEventSource eventSource = null, IMeterFactory meterFactory = null,
+        bool? suppressActivityOpenTelemetryData = null)
     {
         var httpContextFactory = new Mock<IHttpContextFactory>();
 
@@ -1105,6 +1282,11 @@ private static HostingApplication CreateApplication(out FeatureCollection featur
             eventSource ?? HostingEventSource.Log,
             new HostingMetrics(meterFactory ?? new TestMeterFactory()));
 
+        if (suppressActivityOpenTelemetryData is { } suppress)
+        {
+            hostingApplication.SuppressActivityOpenTelemetryData = suppress;
+        }
+
         return hostingApplication;
     }
 
diff --git a/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs b/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs
index e9dfd3ec04b3..2fd4b40376da 100644
--- a/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs
+++ b/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs
@@ -176,15 +176,14 @@ public void UnhandledException()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57259")]
     public async Task VerifyCountersFireWithCorrectValues()
     {
         // Arrange
         var hostingEventSource = GetHostingEventSource();
 
+        // requests-per-second isn't tested because the value can't be reliably tested because of time
         using var eventListener = new TestCounterListener(LoggerFactory, hostingEventSource.Name,
         [
-            "requests-per-second",
             "total-requests",
             "current-requests",
             "failed-requests"
@@ -193,10 +192,9 @@ public async Task VerifyCountersFireWithCorrectValues()
         using var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
         timeoutTokenSource.Token.Register(() => Logger.LogError("Timeout while waiting for counter value."));
 
-        var rpsValues = eventListener.GetCounterValues("requests-per-second", timeoutTokenSource.Token).GetAsyncEnumerator();
-        var totalRequestValues = eventListener.GetCounterValues("total-requests", timeoutTokenSource.Token).GetAsyncEnumerator();
-        var currentRequestValues = eventListener.GetCounterValues("current-requests", timeoutTokenSource.Token).GetAsyncEnumerator();
-        var failedRequestValues = eventListener.GetCounterValues("failed-requests", timeoutTokenSource.Token).GetAsyncEnumerator();
+        var totalRequestValues = eventListener.GetCounterValues("total-requests", timeoutTokenSource.Token);
+        var currentRequestValues = eventListener.GetCounterValues("current-requests", timeoutTokenSource.Token);
+        var failedRequestValues = eventListener.GetCounterValues("failed-requests", timeoutTokenSource.Token);
 
         eventListener.EnableEvents(hostingEventSource, EventLevel.Informational, EventKeywords.None,
             new Dictionary<string, string>
@@ -208,36 +206,37 @@ public async Task VerifyCountersFireWithCorrectValues()
         Logger.LogInformation(nameof(HostingEventSource.RequestStart));
         hostingEventSource.RequestStart("GET", "/");
 
-        await totalRequestValues.WaitForSumValueAsync(1);
-        await rpsValues.WaitForValueAsync(1);
-        await currentRequestValues.WaitForValueAsync(1);
-        await failedRequestValues.WaitForValueAsync(0);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 1, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 1, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 0, Logger);
 
         Logger.LogInformation(nameof(HostingEventSource.RequestStop));
         hostingEventSource.RequestStop();
 
-        await totalRequestValues.WaitForSumValueAsync(1);
-        await rpsValues.WaitForValueAsync(0);
-        await currentRequestValues.WaitForValueAsync(0);
-        await failedRequestValues.WaitForValueAsync(0);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 1, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 0, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 0, Logger);
 
         Logger.LogInformation(nameof(HostingEventSource.RequestStart));
         hostingEventSource.RequestStart("POST", "/");
 
-        await totalRequestValues.WaitForSumValueAsync(2);
-        await rpsValues.WaitForValueAsync(1);
-        await currentRequestValues.WaitForValueAsync(1);
-        await failedRequestValues.WaitForValueAsync(0);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 2, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 1, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 0, Logger);
 
         Logger.LogInformation(nameof(HostingEventSource.RequestFailed));
         hostingEventSource.RequestFailed();
         Logger.LogInformation(nameof(HostingEventSource.RequestStop));
         hostingEventSource.RequestStop();
 
-        await totalRequestValues.WaitForSumValueAsync(2);
-        await rpsValues.WaitForValueAsync(0);
-        await currentRequestValues.WaitForValueAsync(0);
-        await failedRequestValues.WaitForValueAsync(1);
+        await WaitForCounterValue(totalRequestValues, expectedValue: 2, Logger);
+        await WaitForCounterValue(currentRequestValues, expectedValue: 0, Logger);
+        await WaitForCounterValue(failedRequestValues, expectedValue: 1, Logger);
+    }
+
+    private static async Task WaitForCounterValue(CounterValues values, double expectedValue, ILogger logger)
+    {
+        await values.Values.WaitForValueAsync(expectedValue, values.CounterName, logger);
     }
 
     private static HostingEventSource GetHostingEventSource()
diff --git a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
index 19c3179c3d0a..866a08e32b43 100644
--- a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
+++ b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
@@ -11,6 +11,7 @@
     <Compile Include="$(SharedSourceRoot)EventSource.Testing\TestCounterListener.cs" />
     <Compile Include="$(SharedSourceRoot)SyncPoint\SyncPoint.cs" />
     <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
+    <Compile Include="$(SharedSourceRoot)AsyncEnumerableExtensions.cs" LinkBase="shared" />
     <Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
     <Content Include="Microsoft.AspNetCore.Hosting.StaticWebAssets.xml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
@@ -25,7 +26,6 @@
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.Options" />
     <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
-    <Reference Include="System.Threading.Channels" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Hosting/Hosting/test/WebHostBuilderTests.cs b/src/Hosting/Hosting/test/WebHostBuilderTests.cs
index 0bd72551ec1e..4b8ea68616e8 100644
--- a/src/Hosting/Hosting/test/WebHostBuilderTests.cs
+++ b/src/Hosting/Hosting/test/WebHostBuilderTests.cs
@@ -16,6 +16,8 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Testing;
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+
 [assembly: HostingStartup(typeof(WebHostBuilderTests.TestHostingStartup))]
 
 namespace Microsoft.AspNetCore.Hosting;
@@ -429,6 +431,7 @@ public void DoNotCaptureStartupErrorsByDefault(IWebHostBuilder builder)
     public void ServiceProviderDisposedOnBuildException()
     {
         var service = new DisposableService();
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var hostBuilder = new WebHostBuilder()
             .UseServer(new TestServer())
             .ConfigureServices(services =>
@@ -437,6 +440,7 @@ public void ServiceProviderDisposedOnBuildException()
                 services.AddSingleton(sp => service);
             })
             .UseStartup<StartupWithResolvedDisposableThatThrows>();
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         Assert.Throws<InvalidOperationException>(() => hostBuilder.Build());
         Assert.True(service.Disposed);
@@ -1483,14 +1487,18 @@ private IWebHostBuilder CreateWebHostBuilder()
             .AddInMemoryCollection(vals);
         var config = builder.Build();
 
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         return new WebHostBuilder().UseConfiguration(config);
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
     public static TheoryData<IWebHostBuilder> DefaultWebHostBuilders => new TheoryData<IWebHostBuilder>
         {
             new WebHostBuilder(),
             new GenericWebHostBuilderWrapper(new HostBuilder())
         };
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
     public static TheoryData<IWebHostBuilder> DefaultWebHostBuildersWithConfig
     {
@@ -1506,10 +1514,12 @@ public static TheoryData<IWebHostBuilder> DefaultWebHostBuildersWithConfig
                 .AddInMemoryCollection(vals);
             var config = builder.Build();
 
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
             return new TheoryData<IWebHostBuilder> {
                     new WebHostBuilder().UseConfiguration(config),
                     new GenericWebHostBuilderWrapper(new HostBuilder()).UseConfiguration(config)
                 };
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         }
     }
 
@@ -1681,11 +1691,11 @@ public void Configure(IWebHostBuilder builder)
                        // This check is required because MVC still uses the
                        // IWebHostEnvironment instance before the container is baked
 #pragma warning disable CS0618 // Type or member is obsolete
-                       var heDescriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
+                       var heDescriptor = services.LastOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
                        Assert.NotNull(heDescriptor);
                        Assert.NotNull(heDescriptor.ImplementationInstance);
 #pragma warning restore CS0618 // Type or member is obsolete
-                       var wheDescriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
+                       var wheDescriptor = services.LastOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
                        Assert.NotNull(wheDescriptor);
                        Assert.NotNull(wheDescriptor.ImplementationInstance);
                    })
diff --git a/src/Hosting/Hosting/test/WebHostTests.AsyncDisposable.cs b/src/Hosting/Hosting/test/WebHostTests.AsyncDisposable.cs
index 1cce3afd4224..8a053d189038 100644
--- a/src/Hosting/Hosting/test/WebHostTests.AsyncDisposable.cs
+++ b/src/Hosting/Hosting/test/WebHostTests.AsyncDisposable.cs
@@ -11,6 +11,7 @@ public partial class WebHostTests
     public async Task DisposingHostCallsDisposeAsyncOnProvider()
     {
         var providerFactory = new AsyncServiceProviderFactory();
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
         using (var host = CreateBuilder()
             .UseFakeServer()
             .ConfigureServices((context, services) =>
@@ -18,6 +19,7 @@ public async Task DisposingHostCallsDisposeAsyncOnProvider()
                 ))
             .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
             .Build())
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
         {
             await host.StartAsync();
 
diff --git a/src/Hosting/Hosting/test/WebHostTests.cs b/src/Hosting/Hosting/test/WebHostTests.cs
index a89352b61da6..ad26abb1fc64 100644
--- a/src/Hosting/Hosting/test/WebHostTests.cs
+++ b/src/Hosting/Hosting/test/WebHostTests.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+
 using System.Collections;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Fakes;
@@ -143,7 +145,7 @@ public void WebHostCanBeStarted()
         {
             var server = (FakeServer)host.Services.GetRequiredService<IServer>();
             Assert.NotNull(host);
-            Assert.Equal(1, server.StartInstances.Count);
+            Assert.Single(server.StartInstances);
             Assert.Equal(0, server.StartInstances[0].DisposeCalls);
 
             host.Dispose();
@@ -174,7 +176,7 @@ public async Task WebHostShutsDownWhenTokenTriggers()
             lifetime.ApplicationStarted.WaitHandle.WaitOne();
             Assert.True(lifetime2.ApplicationStarted.IsCancellationRequested);
 
-            Assert.Equal(1, server.StartInstances.Count);
+            Assert.Single(server.StartInstances);
             Assert.Equal(0, server.StartInstances[0].DisposeCalls);
 
             cts.Cancel();
@@ -1103,7 +1105,9 @@ private IWebHost CreateHost(RequestDelegate requestDelegate)
 
     private IWebHostBuilder CreateBuilder(IConfiguration config = null)
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         return new WebHostBuilder().UseConfiguration(config ?? new ConfigurationBuilder().Build()).UseStartup("Microsoft.AspNetCore.Hosting.Tests");
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     private static bool[] RegisterCallbacksThatThrow(IServiceCollection services)
diff --git a/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs b/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs
index 0f13855c2c7e..ad6ccc2ab1d9 100644
--- a/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs
+++ b/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs
@@ -183,11 +183,12 @@ public override string ToString()
     {
         return string.Format(
             CultureInfo.InvariantCulture,
-            "[Variation] :: ServerType={0}, Runtime={1}, Arch={2}, BaseUrlHint={3}, Publish={4}",
+            "[Variation] :: ServerType={0}, Runtime={1}, Arch={2}, BaseUrlHint={3}, Publish={4}, HostingModel={5}",
             ServerType,
             RuntimeFlavor,
             RuntimeArchitecture,
             ApplicationBaseUriHint,
-            PublishApplicationBeforeDeployment);
+            PublishApplicationBeforeDeployment,
+            HostingModel);
     }
 }
diff --git a/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs b/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs
index 3df9f24e0dcb..997b995c24e5 100644
--- a/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs
+++ b/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs
@@ -16,7 +16,8 @@ public static class Tfm
     public const string Net70 = "net7.0";
     public const string Net80 = "net8.0";
     public const string Net90 = "net9.0";
-    public const string Default = Net90;
+    public const string Net100 = "net10.0";
+    public const string Default = Net100;
 
     public static bool Matches(string tfm1, string tfm2)
     {
diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
index 77b288b7250f..3dc6a0dbecb3 100644
--- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
+++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj
@@ -13,6 +13,10 @@
     <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.TestHost.Tests" />
   </ItemGroup>
diff --git a/src/Hosting/TestHost/src/PACKAGE.md b/src/Hosting/TestHost/src/PACKAGE.md
new file mode 100644
index 000000000000..9da0717c04df
--- /dev/null
+++ b/src/Hosting/TestHost/src/PACKAGE.md
@@ -0,0 +1,66 @@
+## About
+
+`Microsoft.AspNetCore.TestHost` provides an ASP.NET Core web server for testing middleware in isolation.
+
+## Key Features
+
+* Instantiate an app pipeline containing only the components that you need to test
+* Send custom requests to verify middleware behavior
+
+## How to Use
+
+To use `Microsoft.AspNetCore.TestHost`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.TestHost
+```
+
+### Usage
+
+To set up the `TestServer`, configure it in your test project. Here's an example:
+
+```csharp
+[Fact]
+public async Task MiddlewareTest_ReturnsNotFoundForRequest()
+{
+    // Build and start a host that uses TestServer
+    using var host = await new HostBuilder()
+        .ConfigureWebHost(builder =>
+        {
+            builder.UseTestServer()
+                .ConfigureServices(services =>
+                {
+                    // Add any required services that the middleware uses
+                    services.AddMyServices();
+                })
+                .Configure(app =>
+                {
+                    // Configure the processing pipeline to use the middleware
+                    // for the test
+                    app.UseMiddleware<MyMiddleware>();
+                });
+        })
+        .StartAsync();
+
+    var response = await host.GetTestClient().GetAsync("/");
+
+    Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+}
+```
+
+## Main Types
+
+The main types provided by this package are:
+
+* `TestServer`: An `IServer` implementation for executing tests
+* `TestServerOptions`: Provides options for configuring a `TestServer`
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/test/middleware) for testing middleware in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.TestHost` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Hosting/TestHost/src/PublicAPI.Unshipped.txt b/src/Hosting/TestHost/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..38d66595d1b9 100644
--- a/src/Hosting/TestHost/src/PublicAPI.Unshipped.txt
+++ b/src/Hosting/TestHost/src/PublicAPI.Unshipped.txt
@@ -1 +1,8 @@
 #nullable enable
+*REMOVED*static Microsoft.AspNetCore.TestHost.WebHostBuilderExtensions.UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, string! solutionRelativePath, string! applicationBasePath, string! solutionName = "*.sln") -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+*REMOVED*static Microsoft.AspNetCore.TestHost.WebHostBuilderExtensions.UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, string! solutionRelativePath, string! solutionName = "*.sln") -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+static Microsoft.AspNetCore.TestHost.WebHostBuilderExtensions.UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, string! solutionRelativePath) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+static Microsoft.AspNetCore.TestHost.WebHostBuilderExtensions.UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, string! solutionRelativePath, string! applicationBasePath, string! solutionName) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+static Microsoft.AspNetCore.TestHost.WebHostBuilderExtensions.UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, string! solutionRelativePath, string! applicationBasePath, System.ReadOnlySpan<string!> solutionNames = default(System.ReadOnlySpan<string!>)) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+static Microsoft.AspNetCore.TestHost.WebHostBuilderExtensions.UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, string! solutionRelativePath, string! solutionName) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+
diff --git a/src/Hosting/TestHost/src/TestServer.cs b/src/Hosting/TestHost/src/TestServer.cs
index 1c9c295406ee..f3256b860cf7 100644
--- a/src/Hosting/TestHost/src/TestServer.cs
+++ b/src/Hosting/TestHost/src/TestServer.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.TestHost;
@@ -16,7 +17,9 @@ namespace Microsoft.AspNetCore.TestHost;
 /// </summary>
 public class TestServer : IServer
 {
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     private readonly IWebHost? _hostInstance;
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
     private bool _disposed;
     private ApplicationWrapper? _application;
 
@@ -78,6 +81,7 @@ public TestServer(IServiceProvider services, IFeatureCollection featureCollectio
     /// For use with IWebHostBuilder.
     /// </summary>
     /// <param name="builder"></param>
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     public TestServer(IWebHostBuilder builder)
         : this(builder, CreateTestFeatureCollection())
     {
@@ -88,6 +92,7 @@ public TestServer(IWebHostBuilder builder)
     /// </summary>
     /// <param name="builder"></param>
     /// <param name="featureCollection"></param>
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     public TestServer(IWebHostBuilder builder, IFeatureCollection featureCollection)
     {
         ArgumentNullException.ThrowIfNull(builder);
@@ -109,6 +114,7 @@ public TestServer(IWebHostBuilder builder, IFeatureCollection featureCollection)
     /// <summary>
     /// Gets the <see cref="IWebHost" /> instance associated with the test server.
     /// </summary>
+    [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     public IWebHost Host
     {
         get
diff --git a/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs b/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs
index cbdb7e06e989..86e3739d52a3 100644
--- a/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs
+++ b/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs
@@ -6,6 +6,7 @@
 using System.Net.Http;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -16,6 +17,8 @@ namespace Microsoft.AspNetCore.TestHost;
 /// </summary>
 public static class WebHostBuilderExtensions
 {
+    private static readonly string[] _defaultSolutionNames = ["*.sln", "*.slnx"];
+
     /// <summary>
     /// Enables the <see cref="TestServer" /> service.
     /// </summary>
@@ -51,6 +54,7 @@ public static IWebHostBuilder UseTestServer(this IWebHostBuilder builder, Action
     /// </summary>
     /// <param name="host"></param>
     /// <returns></returns>
+    [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     public static TestServer GetTestServer(this IWebHost host)
     {
         return (TestServer)host.Services.GetRequiredService<IServer>();
@@ -61,6 +65,7 @@ public static TestServer GetTestServer(this IWebHost host)
     /// </summary>
     /// <param name="host"></param>
     /// <returns></returns>
+    [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     public static HttpClient GetTestClient(this IWebHost host)
     {
         return host.GetTestServer().CreateClient();
@@ -115,6 +120,19 @@ public static IWebHostBuilder ConfigureTestContainer<TContainer>(this IWebHostBu
         return webHostBuilder;
     }
 
+    /// <summary>
+    /// Sets the content root of relative to the <paramref name="solutionRelativePath" />.
+    /// </summary>
+    /// <param name="builder">The <see cref="IWebHostBuilder"/>.</param>
+    /// <param name="solutionRelativePath">The directory of the solution file.</param>
+    /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
+    public static IWebHostBuilder UseSolutionRelativeContentRoot(
+        this IWebHostBuilder builder,
+        string solutionRelativePath)
+    {
+        return builder.UseSolutionRelativeContentRoot(solutionRelativePath, AppContext.BaseDirectory, _defaultSolutionNames);
+    }
+
     /// <summary>
     /// Sets the content root of relative to the <paramref name="solutionRelativePath" />.
     /// </summary>
@@ -122,13 +140,12 @@ public static IWebHostBuilder ConfigureTestContainer<TContainer>(this IWebHostBu
     /// <param name="solutionRelativePath">The directory of the solution file.</param>
     /// <param name="solutionName">The name of the solution file to make the content root relative to.</param>
     /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
-    [SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "Required to maintain compatibility")]
     public static IWebHostBuilder UseSolutionRelativeContentRoot(
         this IWebHostBuilder builder,
         string solutionRelativePath,
-        string solutionName = "*.sln")
+        string solutionName)
     {
-        return builder.UseSolutionRelativeContentRoot(solutionRelativePath, AppContext.BaseDirectory, solutionName);
+        return builder.UseSolutionRelativeContentRoot(solutionRelativePath, AppContext.BaseDirectory, [solutionName]);
     }
 
     /// <summary>
@@ -139,24 +156,49 @@ public static IWebHostBuilder UseSolutionRelativeContentRoot(
     /// <param name="applicationBasePath">The root of the app's directory.</param>
     /// <param name="solutionName">The name of the solution file to make the content root relative to.</param>
     /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
-    [SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "Required to maintain compatibility")]
     public static IWebHostBuilder UseSolutionRelativeContentRoot(
         this IWebHostBuilder builder,
         string solutionRelativePath,
         string applicationBasePath,
-        string solutionName = "*.sln")
+        string solutionName)
+    {
+        return builder.UseSolutionRelativeContentRoot(solutionRelativePath, applicationBasePath, [solutionName]);
+    }
+
+    /// <summary>
+    /// Sets the content root of relative to the <paramref name="solutionRelativePath" />.
+    /// </summary>
+    /// <param name="builder">The <see cref="IWebHostBuilder"/>.</param>
+    /// <param name="solutionRelativePath">The directory of the solution file.</param>
+    /// <param name="applicationBasePath">The root of the app's directory.</param>
+    /// <param name="solutionNames">The names of the solution files to make the content root relative to. If empty, defaults to *.sln and *.slnx.</param>
+    /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
+    [SuppressMessage("ApiDesign", "RS0027:Public API with optional parameter(s) should have the most parameters amongst its public overloads", Justification = "Required to maintain compatibility")]
+    public static IWebHostBuilder UseSolutionRelativeContentRoot(
+        this IWebHostBuilder builder,
+        string solutionRelativePath,
+        string applicationBasePath,
+        ReadOnlySpan<string> solutionNames = default)
     {
         ArgumentNullException.ThrowIfNull(solutionRelativePath);
         ArgumentNullException.ThrowIfNull(applicationBasePath);
 
+        if (solutionNames.IsEmpty)
+        {
+            solutionNames = _defaultSolutionNames;
+        }
+
         var directoryInfo = new DirectoryInfo(applicationBasePath);
         do
         {
-            var solutionPath = Directory.EnumerateFiles(directoryInfo.FullName, solutionName).FirstOrDefault();
-            if (solutionPath != null)
+            foreach (var solutionName in solutionNames)
             {
-                builder.UseContentRoot(Path.GetFullPath(Path.Combine(directoryInfo.FullName, solutionRelativePath)));
-                return builder;
+                var solutionPath = Directory.EnumerateFiles(directoryInfo.FullName, solutionName).FirstOrDefault();
+                if (solutionPath != null)
+                {
+                    builder.UseContentRoot(Path.GetFullPath(Path.Combine(directoryInfo.FullName, solutionRelativePath)));
+                    return builder;
+                }
             }
 
             directoryInfo = directoryInfo.Parent;
diff --git a/src/Hosting/TestHost/test/ClientHandlerTests.cs b/src/Hosting/TestHost/test/ClientHandlerTests.cs
index fa8f23543be6..57713056492d 100644
--- a/src/Hosting/TestHost/test/ClientHandlerTests.cs
+++ b/src/Hosting/TestHost/test/ClientHandlerTests.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
@@ -392,7 +393,9 @@ public async Task BlockingMiddlewareShouldNotBlockClient()
         var httpClient = new HttpClient(handler);
         Task<HttpResponseMessage> task = httpClient.GetAsync("https://example.com/");
         Assert.False(task.IsCompleted);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(task.Wait(50));
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         block.Set();
         HttpResponseMessage response = await task;
     }
@@ -689,25 +692,37 @@ public async Task ClientHandlerCreateContextWithDefaultRequestParameters()
     {
         // This logger will attempt to access information from HttpRequest once the HttpContext is created
         var logger = new VerifierLogger();
-        var builder = new WebHostBuilder()
-            .ConfigureServices(services =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                services.AddSingleton<ILogger<IWebHost>>(logger);
+                webHostBuilder
+                    .UseTestServer()
+                    .ConfigureServices(services =>
+                    {
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+                        services.AddSingleton<ILogger<IWebHost>>(logger);
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+                    })
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            return Task.FromResult(0);
+                        });
+                    });
             })
-            .Configure(app =>
-            {
-                app.Run(context =>
-                {
-                    return Task.FromResult(0);
-                });
-            });
-        var server = new TestServer(builder);
+            .Build();
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
 
         // The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values
         var result = await server.CreateClient().GetStringAsync("/");
     }
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     private class VerifierLogger : ILogger<IWebHost>
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
     {
         public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();
 
diff --git a/src/Hosting/TestHost/test/HttpContextBuilderTests.cs b/src/Hosting/TestHost/test/HttpContextBuilderTests.cs
index e524bbe7007b..8a98da7bf701 100644
--- a/src/Hosting/TestHost/test/HttpContextBuilderTests.cs
+++ b/src/Hosting/TestHost/test/HttpContextBuilderTests.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.TestHost;
@@ -17,8 +18,18 @@ public class HttpContextBuilderTests
     [Fact]
     public async Task ExpectedValuesAreAvailable()
     {
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
+
         server.BaseAddress = new Uri("https://example.com/A/Path/");
         var context = await server.SendAsync(c =>
         {
@@ -48,8 +59,18 @@ public async Task ExpectedValuesAreAvailable()
     public async Task UserAgentHeaderWorks()
     {
         var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:71.0) Gecko/20100101 Firefox/71.0";
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
+
         server.BaseAddress = new Uri("https://example.com/");
         var context = await server.SendAsync(c =>
         {
@@ -63,8 +84,18 @@ public async Task UserAgentHeaderWorks()
     [Fact]
     public async Task SingleSlashNotMovedToPathBase()
     {
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
+
         var context = await server.SendAsync(c =>
         {
             c.Request.Path = "/";
@@ -77,15 +108,25 @@ public async Task SingleSlashNotMovedToPathBase()
     [Fact]
     public async Task MiddlewareOnlySetsHeaders()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                return Task.FromResult(0);
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            return Task.FromResult(0);
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -95,19 +136,27 @@ public async Task MiddlewareOnlySetsHeaders()
     public async Task BlockingMiddlewareShouldNotBlockClient()
     {
         var block = new ManualResetEvent(false);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(c =>
+        var builder = new HostBuilder().ConfigureWebHost(webHostBuilder =>
+            webHostBuilder.Configure(app =>
             {
-                block.WaitOne();
-                return Task.FromResult(0);
-            });
-        });
-        var server = new TestServer(builder);
+                app.Run(c =>
+                {
+                    block.WaitOne();
+                    return Task.FromResult(0);
+                });
+            })
+            .UseTestServer());
+        using var host = builder.Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var task = server.SendAsync(c => { });
 
         Assert.False(task.IsCompleted);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(task.Wait(50));
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         block.Set();
         var context = await task;
     }
@@ -116,20 +165,29 @@ public async Task BlockingMiddlewareShouldNotBlockClient()
     public async Task HeadersAvailableBeforeSyncBodyFinished()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                var bytes = Encoding.UTF8.GetBytes("BodyStarted" + Environment.NewLine);
-                c.Features.Get<IHttpBodyControlFeature>().AllowSynchronousIO = true;
-                c.Response.Body.Write(bytes, 0, bytes.Length);
-                await block.Task;
-                bytes = Encoding.UTF8.GetBytes("BodyFinished");
-                c.Response.Body.Write(bytes, 0, bytes.Length);
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            var bytes = Encoding.UTF8.GetBytes("BodyStarted" + Environment.NewLine);
+                            c.Features.Get<IHttpBodyControlFeature>().AllowSynchronousIO = true;
+                            c.Response.Body.Write(bytes, 0, bytes.Length);
+                            await block.Task;
+                            bytes = Encoding.UTF8.GetBytes("BodyFinished");
+                            c.Response.Body.Write(bytes, 0, bytes.Length);
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -143,17 +201,26 @@ public async Task HeadersAvailableBeforeSyncBodyFinished()
     public async Task HeadersAvailableBeforeAsyncBodyFinished()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                await c.Response.WriteAsync("BodyStarted" + Environment.NewLine);
-                await block.Task;
-                await c.Response.WriteAsync("BodyFinished");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            await c.Response.WriteAsync("BodyStarted" + Environment.NewLine);
+                            await block.Task;
+                            await c.Response.WriteAsync("BodyFinished");
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -167,17 +234,26 @@ public async Task HeadersAvailableBeforeAsyncBodyFinished()
     public async Task FlushSendsHeaders()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                await c.Response.Body.FlushAsync();
-                await block.Task;
-                await c.Response.WriteAsync("BodyFinished");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            await c.Response.Body.FlushAsync();
+                            await block.Task;
+                            await c.Response.WriteAsync("BodyFinished");
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -189,17 +265,26 @@ public async Task FlushSendsHeaders()
     public async Task ClientDisposalCloses()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                await c.Response.Body.FlushAsync();
-                await block.Task;
-                await c.Response.WriteAsync("BodyFinished");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            await c.Response.Body.FlushAsync();
+                            await block.Task;
+                            await c.Response.WriteAsync("BodyFinished");
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -215,17 +300,26 @@ public async Task ClientDisposalCloses()
     public async Task ClientCancellationAborts()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                block.SetResult();
-                Assert.True(c.RequestAborted.WaitHandle.WaitOne(TimeSpan.FromSeconds(10)));
-                c.RequestAborted.ThrowIfCancellationRequested();
-                return Task.CompletedTask;
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(c =>
+                        {
+                            block.SetResult();
+                            Assert.True(c.RequestAborted.WaitHandle.WaitOne(TimeSpan.FromSeconds(10)));
+                            c.RequestAborted.ThrowIfCancellationRequested();
+                            return Task.CompletedTask;
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var cts = new CancellationTokenSource();
         var contextTask = server.SendAsync(c => { }, cts.Token);
         await block.Task;
@@ -238,17 +332,26 @@ public async Task ClientCancellationAborts()
     public async Task ClientCancellationAbortsReadAsync()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                await c.Response.Body.FlushAsync();
-                await block.Task;
-                await c.Response.WriteAsync("BodyFinished");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            await c.Response.Body.FlushAsync();
+                            await block.Task;
+                            await c.Response.WriteAsync("BodyFinished");
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -264,14 +367,21 @@ public async Task ClientCancellationAbortsReadAsync()
     [Fact]
     public Task ExceptionBeforeFirstWriteIsReported()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                throw new InvalidOperationException("Test Exception");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(c =>
+                        {
+                            throw new InvalidOperationException("Test Exception");
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
         return Assert.ThrowsAsync<InvalidOperationException>(() => server.SendAsync(c => { }));
     }
 
@@ -279,17 +389,26 @@ public Task ExceptionBeforeFirstWriteIsReported()
     public async Task ExceptionAfterFirstWriteIsReported()
     {
         var block = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async c =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                c.Response.Headers["TestHeader"] = "TestValue";
-                await c.Response.WriteAsync("BodyStarted");
-                await block.Task;
-                throw new InvalidOperationException("Test Exception");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            c.Response.Headers["TestHeader"] = "TestValue";
+                            await c.Response.WriteAsync("BodyStarted");
+                            await block.Task;
+                            throw new InvalidOperationException("Test Exception");
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
+
         var context = await server.SendAsync(c => { });
 
         Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -304,19 +423,29 @@ public async Task ClientHandlerCreateContextWithDefaultRequestParameters()
     {
         // This logger will attempt to access information from HttpRequest once the HttpContext is created
         var logger = new VerifierLogger();
-        var builder = new WebHostBuilder()
-            .ConfigureServices(services =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                services.AddSingleton<ILogger<IWebHost>>(logger);
+                webBuilder
+                    .UseTestServer()
+                    .ConfigureServices(services =>
+                    {
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+                        services.AddSingleton<ILogger<IWebHost>>(logger);
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+                    })
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            return Task.FromResult(0);
+                        });
+                    });
             })
-            .Configure(app =>
-            {
-                app.Run(context =>
-                {
-                    return Task.FromResult(0);
-                });
-            });
-        var server = new TestServer(builder);
+            .Build();
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
 
         // The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values
         var ctx = await server.SendAsync(c => { });
@@ -326,24 +455,33 @@ public async Task ClientHandlerCreateContextWithDefaultRequestParameters()
     public async Task CallingAbortInsideHandlerShouldSetRequestAborted()
     {
         var requestAborted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder()
-            .Configure(app =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                app.Run(context =>
-                {
-                    context.RequestAborted.Register(() => requestAborted.SetResult());
-                    context.Abort();
-                    return Task.CompletedTask;
-                });
-            });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            context.RequestAborted.Register(() => requestAborted.SetResult());
+                            context.Abort();
+                            return Task.CompletedTask;
+                        });
+                    });
+            })
+            .Build();
+        var server = host.GetTestServer();
+        await host.StartAsync();
 
         var ex = await Assert.ThrowsAsync<OperationCanceledException>(() => server.SendAsync(c => { }));
         Assert.Equal("The application aborted the request.", ex.Message);
         await requestAborted.Task.DefaultTimeout();
     }
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     private class VerifierLogger : ILogger<IWebHost>
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
     {
         public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();
 
diff --git a/src/Hosting/TestHost/test/RequestBuilderTests.cs b/src/Hosting/TestHost/test/RequestBuilderTests.cs
index 5b6703e5ac90..f3ac06797787 100644
--- a/src/Hosting/TestHost/test/RequestBuilderTests.cs
+++ b/src/Hosting/TestHost/test/RequestBuilderTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.TestHost;
 
@@ -10,8 +11,15 @@ public class RequestBuilderTests
     [Fact]
     public void AddRequestHeader()
     {
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
         server.CreateRequest("/")
             .AddHeader("Host", "MyHost:90")
             .And(request =>
@@ -23,8 +31,15 @@ public void AddRequestHeader()
     [Fact]
     public void AddContentHeaders()
     {
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
         server.CreateRequest("/")
             .AddHeader("Content-Type", "Test/Value")
             .And(request =>
@@ -38,8 +53,15 @@ public void AddContentHeaders()
     public void TestServer_PropertyShouldHoldTestServerInstance()
     {
         // Arrange
-        var builder = new WebHostBuilder().Configure(app => { });
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
+        var server = host.GetTestServer();
 
         // Act
         var requestBuilder = server.CreateRequest("/");
diff --git a/src/Hosting/TestHost/test/TestClientTests.cs b/src/Hosting/TestHost/test/TestClientTests.cs
index ce9c3a76c892..5d3d774a3e37 100644
--- a/src/Hosting/TestHost/test/TestClientTests.cs
+++ b/src/Hosting/TestHost/test/TestClientTests.cs
@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
@@ -26,8 +27,18 @@ public async Task GetAsyncWorks()
         var expected = "GET Response";
         RequestDelegate appDelegate = ctx =>
             ctx.Response.WriteAsync(expected);
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         // Act
@@ -48,8 +59,20 @@ public async Task NoTrailingSlash_NoPathBase()
             Assert.Equal("/", ctx.Request.Path.Value);
             return ctx.Response.WriteAsync(expected);
         };
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         // Act
@@ -70,8 +93,19 @@ public async Task SingleTrailingSlash_NoPathBase()
             Assert.Equal("/", ctx.Request.Path.Value);
             return ctx.Response.WriteAsync(expected);
         };
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         // Act
@@ -90,8 +124,19 @@ public async Task PutAsyncWorks()
             var content = await new StreamReader(ctx.Request.Body).ReadToEndAsync();
             await ctx.Response.WriteAsync(content + " PUT Response");
         };
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         // Act
@@ -108,8 +153,19 @@ public async Task PostAsyncWorks()
         // Arrange
         RequestDelegate appDelegate = async ctx =>
             await ctx.Response.WriteAsync(await new StreamReader(ctx.Request.Body).ReadToEndAsync() + " POST Response");
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         // Act
@@ -132,7 +188,6 @@ public async Task LargePayload_DisposesRequest_AfterResponseIsCompleted()
             data[i] = character[0];
         }
 
-        var builder = new WebHostBuilder();
         RequestDelegate app = async ctx =>
         {
             var disposable = new TestDisposable();
@@ -144,8 +199,17 @@ public async Task LargePayload_DisposesRequest_AfterResponseIsCompleted()
             await ctx.Response.Body.WriteAsync(data, 1024, 1024);
         };
 
-        builder.Configure(appBuilder => appBuilder.Run(app));
-        var server = new TestServer(builder);
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(appBuilder => appBuilder.Run(app));
+            });
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         // Act & Assert
@@ -189,8 +253,18 @@ public async Task ClientStreamingWorks()
 
         Stream requestStream = null;
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -246,8 +320,18 @@ public async Task ClientStreaming_HttpContentException()
             return Task.CompletedTask;
         };
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var message = new HttpRequestMessage(HttpMethod.Post, "https://example.com/");
@@ -297,8 +381,18 @@ public async Task ClientStreaming_Cancellation()
 
         Stream requestStream = null;
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -354,8 +448,18 @@ public async Task ClientStreaming_ResponseCompletesWithoutReadingRequest()
 
         Stream requestStream = null;
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -416,8 +520,19 @@ public async Task ClientStreaming_ResponseCompletesWithPendingRead_ThrowError()
 
         Stream requestStream = null;
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
+
         var client = server.CreateClient();
 
         var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -463,8 +578,18 @@ public async Task ClientStreaming_ResponseCompletesWithoutResponseBodyWrite()
 
         Stream requestStream = null;
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -514,8 +639,19 @@ public async Task ClientStreaming_ServerAbort()
 
         Stream requestStream = null;
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        var server = host.GetTestServer();
+
+        await host.StartAsync();
+
         var client = server.CreateClient();
 
         var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -598,16 +734,27 @@ public async Task WebSocketWorks()
                 }
             }
         };
-        var builder = new WebHostBuilder()
-            .ConfigureServices(services =>
-            {
-                services.AddSingleton<ILogger<IWebHost>>(logger);
-            })
-            .Configure(app =>
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.Run(appDelegate);
+                webHostBuilder
+                .UseTestServer()
+                .ConfigureServices(services =>
+                {
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+                    services.AddSingleton<ILogger<IWebHost>>(logger);
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+                })
+                .Configure(app =>
+                {
+                    app.Run(appDelegate);
+                });
             });
-        var server = new TestServer(builder);
+        using var host = builder.Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         // Act
         var client = server.CreateWebSocketClient();
@@ -668,13 +815,18 @@ public async Task WebSocketSubProtocolsWorks()
                 }
             }
         };
-        var builder = new WebHostBuilder()
-            .Configure(app =>
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.Run(appDelegate);
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
             });
-        var server = new TestServer(builder);
+        using var host = builder.Build();
+        await host.StartAsync();
 
+        var server = host.GetTestServer();
         // Act
         var client = server.CreateWebSocketClient();
         client.SubProtocols.Add("alpha");
@@ -720,10 +872,21 @@ public async Task WebSocketAcceptThrowsWhenCancelled()
                 }
             }
         };
-        var builder = new WebHostBuilder()
-            .ConfigureServices(services => services.AddSingleton<ILogger<IWebHost>>(logger))
-            .Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+                    .ConfigureServices(services => services.AddSingleton<ILogger<IWebHost>>(logger))
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+                    .Configure(app => app.Run(appDelegate));
+            });
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         // Act
         var client = server.CreateWebSocketClient();
@@ -734,7 +897,9 @@ public async Task WebSocketAcceptThrowsWhenCancelled()
         await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await client.ConnectAsync(new Uri("http://localhost"), tokenSource.Token));
     }
 
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
     private class VerifierLogger : ILogger<IWebHost>
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
     {
         public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();
 
@@ -763,11 +928,18 @@ public async Task WebSocketDisposalThrowsOnPeer()
                 websocket.Dispose();
             }
         };
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(appDelegate);
-        });
-        var server = new TestServer(builder);
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            });
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         // Act
         var client = server.CreateWebSocketClient();
@@ -796,11 +968,18 @@ public async Task WebSocketTinyReceiveGeneratesEndOfMessage()
                 }
             }
         };
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(appDelegate);
-        });
-        var server = new TestServer(builder);
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            });
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         // Act
         var client = server.CreateWebSocketClient();
@@ -844,8 +1023,18 @@ public async Task ClientDisposalAbortsRequest()
         };
 
         // Act
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
         var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
         var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
@@ -860,21 +1049,31 @@ public async Task ClientDisposalAbortsRequest()
     public async Task ClientCancellationAbortsRequest()
     {
         var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-        var builder = new WebHostBuilder().Configure(app => app.Run(async ctx =>
-        {
-            try
-            {
-                await Task.Delay(TimeSpan.FromSeconds(30), ctx.RequestAborted);
-                tcs.SetResult();
-            }
-            catch (Exception e)
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                tcs.SetException(e);
-                return;
-            }
-            throw new InvalidOperationException("The request was not aborted");
-        }));
-        using var server = new TestServer(builder);
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(async ctx =>
+                    {
+                        try
+                        {
+                            await Task.Delay(TimeSpan.FromSeconds(30), ctx.RequestAborted);
+                            tcs.SetResult();
+                        }
+                        catch (Exception e)
+                        {
+                            tcs.SetException(e);
+                            return;
+                        }
+                        throw new InvalidOperationException("The request was not aborted");
+                    }));
+            });
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        using var server = host.GetTestServer();
         using var client = server.CreateClient();
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));
         var response = await Assert.ThrowsAnyAsync<OperationCanceledException>(() => client.GetAsync("http://localhost:12345", cts.Token));
@@ -890,16 +1089,25 @@ public async Task AsyncLocalValueOnClientIsNotPreserved()
         asyncLocal.Value = value;
 
         object capturedValue = null;
-        var builder = new WebHostBuilder()
-            .Configure(app =>
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.Run((context) =>
-                {
-                    capturedValue = asyncLocal.Value;
-                    return context.Response.WriteAsync("Done");
-                });
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run((context) =>
+                        {
+                            capturedValue = asyncLocal.Value;
+                            return context.Response.WriteAsync("Done");
+                        });
+                    });
             });
-        var server = new TestServer(builder);
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var resp = await client.GetAsync("/");
@@ -915,19 +1123,28 @@ public async Task AsyncLocalValueOnClientIsPreservedIfPreserveExecutionContextIs
         asyncLocal.Value = value;
 
         object capturedValue = null;
-        var builder = new WebHostBuilder()
-            .Configure(app =>
+
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.Run((context) =>
-                {
-                    capturedValue = asyncLocal.Value;
-                    return context.Response.WriteAsync("Done");
-                });
+                webHostBuilder
+                    .UseTestServer(o =>
+                    {
+                        o.PreserveExecutionContext = true;
+                    })
+                    .Configure(app =>
+                    {
+                        app.Run((context) =>
+                        {
+                            capturedValue = asyncLocal.Value;
+                            return context.Response.WriteAsync("Done");
+                        });
+                    });
             });
-        var server = new TestServer(builder)
-        {
-            PreserveExecutionContext = true
-        };
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var resp = await client.GetAsync("/");
@@ -946,8 +1163,18 @@ public async Task SendAsync_Default_Protocol11()
             protocol = ctx.Request.Protocol;
             await ctx.Response.WriteAsync(expected);
         };
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
         var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
 
@@ -972,8 +1199,18 @@ public async Task SendAsync_ExplicitlySet_Protocol20()
             protocol = ctx.Request.Protocol;
             await ctx.Response.WriteAsync(expected);
         };
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
         var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
         request.Version = new Version(2, 0);
@@ -999,8 +1236,18 @@ public async Task SendAsync_ExplicitlySet_Protocol30()
             protocol = ctx.Request.Protocol;
             await ctx.Response.WriteAsync(expected);
         };
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
         var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
         request.Version = new Version(3, 0);
@@ -1018,7 +1265,10 @@ public async Task SendAsync_ExplicitlySet_Protocol30()
     [Fact]
     public async Task VerifyWebSocketAndUpgradeFeaturesForNonWebSocket()
     {
-        using (var testServer = new TestServer(new WebHostBuilder()
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            webHostBuilder
+            .UseTestServer()
             .Configure(app =>
             {
                 app.UseWebSockets();
@@ -1036,12 +1286,14 @@ public async Task VerifyWebSocketAndUpgradeFeaturesForNonWebSocket()
 
                     await c.Response.WriteAsync("test");
                 });
-            })))
-        {
-            var client = testServer.CreateClient();
+            }));
+        using var host = builder.Build();
+        await host.StartAsync();
 
-            var actual = await client.GetStringAsync("http://localhost:12345/");
-            Assert.Equal("test", actual);
-        }
+        var testServer = host.GetTestServer();
+        var client = testServer.CreateClient();
+
+        var actual = await client.GetStringAsync("http://localhost:12345/");
+        Assert.Equal("test", actual);
     }
 }
diff --git a/src/Hosting/TestHost/test/TestServerTests.cs b/src/Hosting/TestHost/test/TestServerTests.cs
index 8437d11065cc..b2cbe107ce1e 100644
--- a/src/Hosting/TestHost/test/TestServerTests.cs
+++ b/src/Hosting/TestHost/test/TestServerTests.cs
@@ -92,42 +92,57 @@ public void CreateWithDelegate()
     {
         // Arrange
         // Act & Assert (Does not throw)
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         new TestServer(new WebHostBuilder().Configure(app => { }));
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     [Fact]
     public void CreateWithDelegate_DI()
     {
-        var builder = new WebHostBuilder()
-            .Configure(app => { })
-            .UseTestServer();
-
-        using var host = builder.Build();
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => { });
+            })
+            .Build();
         host.Start();
     }
 
     [Fact]
     public void DoesNotCaptureStartupErrorsByDefault()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .Configure(app =>
             {
                 throw new InvalidOperationException();
             });
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         Assert.Throws<InvalidOperationException>(() => new TestServer(builder));
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     [Fact]
     public async Task ServicesCanBeOverridenForTestingAsync()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .ConfigureServices(s => s.AddSingleton<IServiceProviderFactory<ThirdPartyContainer>, ThirdPartyContainerServiceProviderFactory>())
             .UseStartup<ThirdPartyContainerStartup>()
             .ConfigureTestServices(services => services.AddSingleton(new SimpleService { Message = "OverridesConfigureServices" }))
             .ConfigureTestContainer<ThirdPartyContainer>(container => container.Services.AddSingleton(new TestService { Message = "OverridesConfigureContainer" }));
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         var host = new TestServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         var response = await host.CreateClient().GetStringAsync("/");
 
@@ -162,6 +177,7 @@ public class ThirdPartyContainerServiceProviderFactory : IServiceProviderFactory
     [Fact]
     public void CaptureStartupErrorsSettingPreserved()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .CaptureStartupErrors(true)
             .Configure(app =>
@@ -169,36 +185,73 @@ public void CaptureStartupErrorsSettingPreserved()
                 throw new InvalidOperationException();
             });
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         // Does not throw
         new TestServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     [Fact]
     public void ApplicationServicesAvailableFromTestServer()
     {
         var testService = new TestService();
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .Configure(app => { })
             .ConfigureServices(services =>
             {
                 services.AddSingleton(testService);
             });
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         var server = new TestServer(builder);
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         Assert.Equal(testService, server.Host.Services.GetRequiredService<TestService>());
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+    }
+
+    [Fact]
+    public async Task ApplicationServicesAvailableFromTestServer_GenericHost()
+    {
+        var testService = new TestService();
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app => { })
+                    .ConfigureServices(services =>
+                    {
+                        services.AddSingleton(testService);
+                    }));
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
+
+        Assert.Equal(testService, server.Services.GetRequiredService<TestService>());
     }
 
     [Fact]
     public async Task RequestServicesAutoCreated()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                return context.Response.WriteAsync("RequestServices:" + (context.RequestServices != null));
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            return context.Response.WriteAsync("RequestServices:" + (context.RequestServices != null));
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("RequestServices:True", result);
@@ -207,17 +260,26 @@ public async Task RequestServicesAutoCreated()
     [Fact]
     public async Task DispoingTheRequestBodyDoesNotDisposeClientStreams()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                using (var sr = new StreamReader(context.Request.Body))
-                {
-                    await context.Response.WriteAsync(await sr.ReadToEndAsync());
-                }
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async context =>
+                        {
+                            using (var sr = new StreamReader(context.Request.Body))
+                            {
+                                await context.Response.WriteAsync(await sr.ReadToEndAsync());
+                            }
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         var stream = new ThrowOnDisposeStream();
         stream.Write(Encoding.ASCII.GetBytes("Hello World"));
@@ -250,8 +312,12 @@ public void Configure(IApplicationBuilder app)
     [Fact]
     public async Task CustomServiceProviderSetsApplicationServices()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder().UseStartup<CustomContainerStartup>();
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         var server = new TestServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("ApplicationServicesEqual:True", result);
     }
@@ -261,6 +327,7 @@ public void TestServerConstructorWithFeatureCollectionAllowsInitializingServerFe
     {
         // Arrange
         var url = "http://localhost:8000/appName/serviceName";
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .UseUrls(url)
             .Configure(applicationBuilder =>
@@ -268,12 +335,15 @@ public void TestServerConstructorWithFeatureCollectionAllowsInitializingServerFe
                 var serverAddressesFeature = applicationBuilder.ServerFeatures.Get<IServerAddressesFeature>();
                 Assert.Contains(serverAddressesFeature.Addresses, s => string.Equals(s, url, StringComparison.Ordinal));
             });
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         var featureCollection = new FeatureCollection();
         featureCollection.Set<IServerAddressesFeature>(new ServerAddressesFeature());
 
         // Act
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         new TestServer(builder, featureCollection);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
 
         // Assert
         // Is inside configure callback
@@ -283,6 +353,7 @@ public void TestServerConstructorWithFeatureCollectionAllowsInitializingServerFe
     public void TestServerConstructedWithoutFeatureCollectionHasServerAddressesFeature()
     {
         // Arrange
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .Configure(applicationBuilder =>
             {
@@ -291,7 +362,10 @@ public void TestServerConstructedWithoutFeatureCollectionHasServerAddressesFeatu
             });
 
         // Act
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         new TestServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         // Assert
         // Is inside configure callback
@@ -300,10 +374,14 @@ public void TestServerConstructedWithoutFeatureCollectionHasServerAddressesFeatu
     [Fact]
     public void TestServerConstructorWithNullFeatureCollectionThrows()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .Configure(b => { });
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         Assert.Throws<ArgumentNullException>(() => new TestServer(builder, null));
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
     }
 
     [Fact]
@@ -324,12 +402,16 @@ public void TestServerConstructorShouldProvideServicesFromWebHost()
     {
         // Arrange
         var testService = new TestService();
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder()
             .ConfigureServices(services => services.AddSingleton(testService))
             .Configure(_ => { });
 
         // Act
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         var testServer = new TestServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         // Assert
         Assert.Equal(testService, testServer.Services.GetService<TestService>());
@@ -423,19 +505,28 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
     [Fact]
     public async Task ExistingRequestServicesWillNotBeReplaced()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                var service = context.RequestServices.GetService<TestService>();
-                return context.Response.WriteAsync("Found:" + (service != null));
-            });
-        })
-        .ConfigureServices(services =>
-        {
-            services.AddTransient<IStartupFilter, RequestServicesFilter>();
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            var service = context.RequestServices.GetService<TestService>();
+                            return context.Response.WriteAsync("Found:" + (service != null));
+                        });
+                    })
+                    .ConfigureServices(services =>
+                    {
+                        services.AddTransient<IStartupFilter, RequestServicesFilter>();
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("Found:True", result);
@@ -444,20 +535,29 @@ public async Task ExistingRequestServicesWillNotBeReplaced()
     [Fact]
     public async Task CanSetCustomServiceProvider()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                context.RequestServices = new ServiceCollection()
-                .AddTransient<TestService>()
-                .BuildServiceProvider();
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            context.RequestServices = new ServiceCollection()
+                            .AddTransient<TestService>()
+                            .BuildServiceProvider();
 
-                var s = context.RequestServices.GetRequiredService<TestService>();
+                            var s = context.RequestServices.GetRequiredService<TestService>();
 
-                return context.Response.WriteAsync("Success");
-            });
-        });
-        var server = new TestServer(builder);
+                            return context.Response.WriteAsync("Success");
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("Success", result);
@@ -493,19 +593,28 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
     public async Task ExistingServiceProviderFeatureWillNotBeReplaced()
     {
         var appServices = new ServiceCollection().BuildServiceProvider();
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                Assert.Equal(appServices, context.RequestServices);
-                return context.Response.WriteAsync("Success");
-            });
-        })
-        .ConfigureServices(services =>
-        {
-            services.AddSingleton<IStartupFilter>(new ReplaceServiceProvidersFeatureFilter(appServices, appServices));
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            Assert.Equal(appServices, context.RequestServices);
+                            return context.Response.WriteAsync("Success");
+                        });
+                    })
+                    .ConfigureServices(services =>
+                    {
+                        services.AddSingleton<IStartupFilter>(new ReplaceServiceProvidersFeatureFilter(appServices, appServices));
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         var result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("Success", result);
@@ -534,19 +643,28 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
     [Fact]
     public async Task WillReplaceServiceProviderFeatureWithNullRequestServices()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                Assert.Null(context.RequestServices);
-                return context.Response.WriteAsync("Success");
-            });
-        })
-        .ConfigureServices(services =>
-        {
-            services.AddTransient<IStartupFilter, NullServiceProvidersFeatureFilter>();
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            Assert.Null(context.RequestServices);
+                            return context.Response.WriteAsync("Success");
+                        });
+                    })
+                    .ConfigureServices(services =>
+                    {
+                        services.AddTransient<IStartupFilter, NullServiceProvidersFeatureFilter>();
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         var result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("Success", result);
@@ -555,15 +673,24 @@ public async Task WillReplaceServiceProviderFeatureWithNullRequestServices()
     [Fact]
     public async Task CanAccessLogger()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                var logger = app.ApplicationServices.GetRequiredService<ILogger<HttpContext>>();
-                return context.Response.WriteAsync("FoundLogger:" + (logger != null));
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            var logger = app.ApplicationServices.GetRequiredService<ILogger<HttpContext>>();
+                            return context.Response.WriteAsync("FoundLogger:" + (logger != null));
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("FoundLogger:True", result);
@@ -572,19 +699,28 @@ public async Task CanAccessLogger()
     [Fact]
     public async Task CanAccessHttpContext()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                var accessor = app.ApplicationServices.GetRequiredService<IHttpContextAccessor>();
-                return context.Response.WriteAsync("HasContext:" + (accessor.HttpContext != null));
-            });
-        })
-        .ConfigureServices(services =>
-        {
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            var accessor = app.ApplicationServices.GetRequiredService<IHttpContextAccessor>();
+                            return context.Response.WriteAsync("HasContext:" + (accessor.HttpContext != null));
+                        });
+                    })
+                    .ConfigureServices(services =>
+                    {
+                        services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("HasContext:True", result);
@@ -603,20 +739,29 @@ public ContextHolder(IHttpContextAccessor accessor)
     [Fact]
     public async Task CanAddNewHostServices()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                var accessor = app.ApplicationServices.GetRequiredService<ContextHolder>();
-                return context.Response.WriteAsync("HasContext:" + (accessor.Accessor.HttpContext != null));
-            });
-        })
-        .ConfigureServices(services =>
-        {
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-            services.AddSingleton<ContextHolder>();
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            var accessor = app.ApplicationServices.GetRequiredService<ContextHolder>();
+                            return context.Response.WriteAsync("HasContext:" + (accessor.Accessor.HttpContext != null));
+                        });
+                    })
+                    .ConfigureServices(services =>
+                    {
+                        services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+                        services.AddSingleton<ContextHolder>();
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("HasContext:True", result);
@@ -625,14 +770,23 @@ public async Task CanAddNewHostServices()
     [Fact]
     public async Task CreateInvokesApp()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                return context.Response.WriteAsync("CreateInvokesApp");
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            return context.Response.WriteAsync("CreateInvokesApp");
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         string result = await server.CreateClient().GetStringAsync("/path");
         Assert.Equal("CreateInvokesApp", result);
@@ -641,15 +795,24 @@ public async Task CreateInvokesApp()
     [Fact]
     public async Task DisposeStreamIgnored()
     {
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            app.Run(async context =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
             {
-                await context.Response.WriteAsync("Response");
-                context.Response.Body.Dispose();
-            });
-        });
-        var server = new TestServer(builder);
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async context =>
+                        {
+                            await context.Response.WriteAsync("Response");
+                            context.Response.Body.Dispose();
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+        var server = host.GetTestServer();
 
         HttpResponseMessage result = await server.CreateClient().GetAsync("/");
         Assert.Equal(HttpStatusCode.OK, result.StatusCode);
@@ -659,6 +822,7 @@ public async Task DisposeStreamIgnored()
     [Fact]
     public async Task DisposedServerThrows()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         var builder = new WebHostBuilder().Configure(app =>
         {
             app.Run(async context =>
@@ -667,7 +831,10 @@ public async Task DisposedServerThrows()
                 context.Response.Body.Dispose();
             });
         });
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         var server = new TestServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         HttpResponseMessage result = await server.CreateClient().GetAsync("/");
         Assert.Equal(HttpStatusCode.OK, result.StatusCode);
@@ -678,17 +845,23 @@ public async Task DisposedServerThrows()
     [Fact]
     public async Task CancelAborts()
     {
-        var builder = new WebHostBuilder()
-                              .Configure(app =>
-                              {
-                                  app.Run(context =>
-                                  {
-                                      TaskCompletionSource tcs = new TaskCompletionSource();
-                                      tcs.SetCanceled();
-                                      return tcs.Task;
-                                  });
-                              });
-        var server = new TestServer(builder);
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(context =>
+                        {
+                            TaskCompletionSource tcs = new TaskCompletionSource();
+                            tcs.SetCanceled();
+                            return tcs.Task;
+                        });
+                    }));
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         await Assert.ThrowsAsync<TaskCanceledException>(async () => { string result = await server.CreateClient().GetStringAsync("/path"); });
     }
@@ -696,9 +869,15 @@ public async Task CancelAborts()
     [Fact]
     public async Task CanCreateViaStartupType()
     {
-        var builder = new WebHostBuilder()
-            .UseStartup<TestStartup>();
-        var server = new TestServer(builder);
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+                webHostBuilder
+                    .UseTestServer()
+                    .UseStartup<TestStartup>());
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         HttpResponseMessage result = await server.CreateClient().GetAsync("/");
         Assert.Equal(HttpStatusCode.OK, result.StatusCode);
         Assert.Equal("FoundService:True", await result.Content.ReadAsStringAsync());
@@ -707,10 +886,16 @@ public async Task CanCreateViaStartupType()
     [Fact]
     public async Task CanCreateViaStartupTypeAndSpecifyEnv()
     {
-        var builder = new WebHostBuilder()
-                        .UseStartup<TestStartup>()
-                        .UseEnvironment("Foo");
-        var server = new TestServer(builder);
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+                webHostBuilder
+                    .UseTestServer()
+                    .UseStartup<TestStartup>()
+                    .UseEnvironment("Foo"));
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         HttpResponseMessage result = await server.CreateClient().GetAsync("/");
         Assert.Equal(HttpStatusCode.OK, result.StatusCode);
@@ -722,16 +907,22 @@ public async Task BeginEndDiagnosticAvailable()
     {
         DiagnosticListener diagnosticListener = null;
 
-        var builder = new WebHostBuilder()
-                        .Configure(app =>
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
+                        app.Run(context =>
                         {
-                            diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
-                            app.Run(context =>
-                            {
-                                return context.Response.WriteAsync("Hello World");
-                            });
+                            return context.Response.WriteAsync("Hello World");
                         });
-        var server = new TestServer(builder);
+                    }));
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         var listener = new TestDiagnosticListener();
         diagnosticListener.SubscribeWithAdapter(listener);
@@ -750,15 +941,22 @@ public async Task BeginEndDiagnosticAvailable()
     public async Task ExceptionDiagnosticAvailable()
     {
         DiagnosticListener diagnosticListener = null;
-        var builder = new WebHostBuilder().Configure(app =>
-        {
-            diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
-            app.Run(context =>
-            {
-                throw new Exception("Test exception");
-            });
-        });
-        var server = new TestServer(builder);
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
+                        app.Run(context =>
+                        {
+                            throw new Exception("Test exception");
+                        });
+                    }));
+        using var host = builder.Build();
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
 
         var listener = new TestDiagnosticListener();
         diagnosticListener.SubscribeWithAdapter(listener);
@@ -783,8 +981,18 @@ public async Task ManuallySetHostWinsOverInferredHostFromRequestUri(string uri)
         RequestDelegate appDelegate = ctx =>
             ctx.Response.WriteAsync(ctx.Request.Headers.Host);
 
-        var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate));
-        var server = new TestServer(builder);
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webBuilder =>
+            {
+                webBuilder
+                    .UseTestServer()
+                    .Configure(app => app.Run(appDelegate));
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
         var client = server.CreateClient();
 
         var request = new HttpRequestMessage(HttpMethod.Get, uri);
diff --git a/src/Hosting/TestHost/test/UseSolutionRelativeContentRootTests.cs b/src/Hosting/TestHost/test/UseSolutionRelativeContentRootTests.cs
new file mode 100644
index 000000000000..96a6466b72ad
--- /dev/null
+++ b/src/Hosting/TestHost/test/UseSolutionRelativeContentRootTests.cs
@@ -0,0 +1,200 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.TestHost;
+
+#pragma warning disable ASPDEPR004 // WebHostBuilder is obsolete
+#pragma warning disable ASPDEPR008 // WebHost is obsolete
+public class UseSolutionRelativeContentRootTests : IDisposable
+{
+    private readonly string _tempDirectory;
+    private readonly string _contentDirectory;
+
+    public UseSolutionRelativeContentRootTests()
+    {
+        _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N")[..8]);
+        _contentDirectory = Path.Combine(_tempDirectory, "src");
+        Directory.CreateDirectory(_contentDirectory);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_FindsSlnFile()
+    {
+        var solutionFile = Path.Combine(_tempDirectory, "TestApp.sln");
+        File.WriteAllText(solutionFile, "Microsoft Visual Studio Solution File, Format Version 12.00");
+
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        builder.UseSolutionRelativeContentRoot("src", applicationBasePath: _tempDirectory);
+
+        using var host = builder.Build();
+        var environment = host.Services.GetRequiredService<IWebHostEnvironment>();
+
+        Assert.Equal(_contentDirectory, environment.ContentRootPath);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_FindsSlnxFile()
+    {
+        var solutionFile = Path.Combine(_tempDirectory, "TestApp.slnx");
+        File.WriteAllText(solutionFile, """
+            <Solution>
+              <Configurations>
+                <Configuration Name="Debug|Any CPU" />
+                <Configuration Name="Release|Any CPU" />
+              </Configurations>
+            </Solution>
+            """);
+
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        builder.UseSolutionRelativeContentRoot("src", applicationBasePath: _tempDirectory);
+
+        using var host = builder.Build();
+        var environment = host.Services.GetRequiredService<IWebHostEnvironment>();
+
+        Assert.Equal(_contentDirectory, environment.ContentRootPath);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_WithSolutionName_FindsSpecifiedFile()
+    {
+        var subDirectory = Path.Combine(_tempDirectory, "sub");
+        Directory.CreateDirectory(subDirectory);
+
+        var slnFile = Path.Combine(subDirectory, "TestApp.sln");
+        var slnxFile = Path.Combine(_tempDirectory, "TestApp.slnx");
+        File.WriteAllText(slnFile, "Microsoft Visual Studio Solution File, Format Version 12.00");
+        File.WriteAllText(slnxFile, """
+            <Solution>
+              <Configurations>
+                <Configuration Name="Debug|Any CPU" />
+              </Configurations>
+            </Solution>
+            """);
+
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        builder.UseSolutionRelativeContentRoot("src", _tempDirectory, "*.slnx");
+
+        using var host = builder.Build();
+        var environment = host.Services.GetRequiredService<IWebHostEnvironment>();
+
+        Assert.Equal(_contentDirectory, environment.ContentRootPath);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_WithMultipleSolutionNames_FindsInCurrentDirectoryFirst()
+    {
+        var expectedPath = Path.Combine(_contentDirectory, "sub");
+        Directory.CreateDirectory(expectedPath);
+
+        var slnFile = Path.Combine(_tempDirectory, "TestApp.sln");
+        var slnxFile = Path.Combine(_contentDirectory, "TestApp.slnx");
+        File.WriteAllText(slnFile, "Microsoft Visual Studio Solution File, Format Version 12.00");
+        File.WriteAllText(slnxFile, """
+            <Solution>
+              <Configurations>
+                <Configuration Name="Debug|Any CPU" />
+              </Configurations>
+            </Solution>
+            """);
+
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        builder.UseSolutionRelativeContentRoot("sub", _contentDirectory, ["*.sln", "*.slnx"]);
+
+        using var host = builder.Build();
+        var environment = host.Services.GetRequiredService<IWebHostEnvironment>();
+
+        Assert.Equal(expectedPath, environment.ContentRootPath);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_WithMultipleSolutionNames_WorksWithMultipleFiles()
+    {
+        var slnFile = Path.Combine(_tempDirectory, "TestApp.sln");
+        var slnxFile = Path.Combine(_tempDirectory, "TestApp.slnx");
+        File.WriteAllText(slnFile, "Microsoft Visual Studio Solution File, Format Version 12.00");
+        File.WriteAllText(slnxFile, """
+            <Solution>
+              <Configurations>
+                <Configuration Name="Debug|Any CPU" />
+              </Configurations>
+            </Solution>
+            """);
+
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        builder.UseSolutionRelativeContentRoot("src", applicationBasePath: _tempDirectory, solutionNames: ["*.sln", "*.slnx"]);
+
+        using var host = builder.Build();
+        var environment = host.Services.GetRequiredService<IWebHostEnvironment>();
+
+        Assert.Equal(_contentDirectory, environment.ContentRootPath);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_ThrowsWhenSolutionNotFound()
+    {
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+            builder.UseSolutionRelativeContentRoot("src", applicationBasePath: _tempDirectory));
+
+        Assert.Contains("Solution root could not be located", exception.Message);
+        Assert.Contains(_tempDirectory, exception.Message);
+    }
+
+    [Fact]
+    public void UseSolutionRelativeContentRoot_WithSolutionName_SearchesParentDirectories()
+    {
+        var subDirectory = Path.Combine(_tempDirectory, "sub", "folder");
+        Directory.CreateDirectory(subDirectory);
+
+        var solutionFile = Path.Combine(_tempDirectory, "TestApp.slnx");
+        File.WriteAllText(solutionFile, """
+            <Solution>
+              <Configurations>
+                <Configuration Name="Debug|Any CPU" />
+              </Configurations>
+            </Solution>
+            """);
+
+        var builder = new WebHostBuilder()
+            .UseTestServer()
+            .Configure(app => { });
+
+        builder.UseSolutionRelativeContentRoot("src", subDirectory, "*.slnx");
+
+        using var host = builder.Build();
+        var environment = host.Services.GetRequiredService<IWebHostEnvironment>();
+
+        Assert.Equal(_contentDirectory, environment.ContentRootPath);
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_tempDirectory))
+        {
+            Directory.Delete(_tempDirectory, recursive: true);
+        }
+    }
+}
+#pragma warning restore ASPDEPR008 // WebHost is obsolete
+#pragma warning disable ASPDEPR004 // WebHostBuilder is obsolete
diff --git a/src/Hosting/TestHost/test/WebSocketClientTests.cs b/src/Hosting/TestHost/test/WebSocketClientTests.cs
index d17f6a43963b..f3e32c28d5a2 100644
--- a/src/Hosting/TestHost/test/WebSocketClientTests.cs
+++ b/src/Hosting/TestHost/test/WebSocketClientTests.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.TestHost.Tests;
 
@@ -19,22 +20,31 @@ public async Task ConnectAsync_ShouldSetRequestProperties(string requestUri, str
         string capturedHost = null;
         string capturedPath = null;
 
-        using (var testServer = new TestServer(new WebHostBuilder()
-            .Configure(app =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.Run(ctx =>
-                {
-                    if (ctx.Request.Path.StartsWithSegments("/connect"))
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
                     {
-                        capturedScheme = ctx.Request.Scheme;
-                        capturedHost = ctx.Request.Host.Value;
-                        capturedPath = ctx.Request.Path;
-                    }
-                    return Task.FromResult(0);
-                });
-            })))
-        {
-            var client = testServer.CreateWebSocketClient();
+                        app.Run(ctx =>
+                        {
+                            if (ctx.Request.Path.StartsWithSegments("/connect"))
+                            {
+                                capturedScheme = ctx.Request.Scheme;
+                                capturedHost = ctx.Request.Host.Value;
+                                capturedPath = ctx.Request.Path;
+                            }
+                            return Task.FromResult(0);
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var testServer = host.GetTestServer();
+        var client = testServer.CreateWebSocketClient();
 
             try
             {
@@ -46,7 +56,6 @@ await client.ConnectAsync(
             {
                 // An exception will be thrown because our dummy endpoint does not implement a full Web socket server
             }
-        }
 
         Assert.Equal("http", capturedScheme);
         Assert.Equal(expectedHost, capturedHost);
@@ -56,72 +65,88 @@ await client.ConnectAsync(
     [Fact]
     public async Task CanAcceptWebSocket()
     {
-        using (var testServer = new TestServer(new WebHostBuilder()
-            .Configure(app =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.UseWebSockets();
-                app.Run(async ctx =>
-                {
-                    if (ctx.Request.Path.StartsWithSegments("/connect"))
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
                     {
-                        if (ctx.WebSockets.IsWebSocketRequest)
+                        app.UseWebSockets();
+                        app.Run(async ctx =>
                         {
-                            using var websocket = await ctx.WebSockets.AcceptWebSocketAsync();
-                            var buffer = new byte[1000];
-                            var res = await websocket.ReceiveAsync(buffer, default);
-                            await websocket.SendAsync(buffer.AsMemory(0, res.Count), System.Net.WebSockets.WebSocketMessageType.Binary, true, default);
-                            await websocket.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.NormalClosure, null, default);
-                        }
-                    }
-                });
-            })))
-        {
-            var client = testServer.CreateWebSocketClient();
+                            if (ctx.Request.Path.StartsWithSegments("/connect"))
+                            {
+                                if (ctx.WebSockets.IsWebSocketRequest)
+                                {
+                                    using var websocket = await ctx.WebSockets.AcceptWebSocketAsync();
+                                    var buffer = new byte[1000];
+                                    var res = await websocket.ReceiveAsync(buffer, default);
+                                    await websocket.SendAsync(buffer.AsMemory(0, res.Count), System.Net.WebSockets.WebSocketMessageType.Binary, true, default);
+                                    await websocket.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.NormalClosure, null, default);
+                                }
+                            }
+                        });
+                    });
+            })
+            .Build();
 
-            using var socket = await client.ConnectAsync(
-                uri: new Uri("http://localhost/connect"),
-                cancellationToken: default);
+        await host.StartAsync();
 
-            await socket.SendAsync(new byte[10], System.Net.WebSockets.WebSocketMessageType.Binary, true, default);
-            var res = await socket.ReceiveAsync(new byte[100], default);
-            Assert.Equal(10, res.Count);
-            Assert.True(res.EndOfMessage);
+        var testServer = host.GetTestServer();
+        var client = testServer.CreateWebSocketClient();
 
-            await socket.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.NormalClosure, null, default);
-        }
+        using var socket = await client.ConnectAsync(
+            uri: new Uri("http://localhost/connect"),
+            cancellationToken: default);
+
+        await socket.SendAsync(new byte[10], System.Net.WebSockets.WebSocketMessageType.Binary, true, default);
+        var res = await socket.ReceiveAsync(new byte[100], default);
+        Assert.Equal(10, res.Count);
+        Assert.True(res.EndOfMessage);
+
+        await socket.CloseAsync(System.Net.WebSockets.WebSocketCloseStatus.NormalClosure, null, default);
     }
 
     [Fact]
     public async Task VerifyWebSocketAndUpgradeFeatures()
     {
-        using (var testServer = new TestServer(new WebHostBuilder()
-            .Configure(app =>
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                app.Run(async c =>
-                {
-                    var upgradeFeature = c.Features.Get<IHttpUpgradeFeature>();
-                    Assert.NotNull(upgradeFeature);
-                    Assert.False(upgradeFeature.IsUpgradableRequest);
-                    await Assert.ThrowsAsync<NotSupportedException>(() => upgradeFeature.UpgradeAsync());
-
-                    var webSocketFeature = c.Features.Get<IHttpWebSocketFeature>();
-                    Assert.NotNull(webSocketFeature);
-                    Assert.True(webSocketFeature.IsWebSocketRequest);
-                });
-            })))
-        {
-            var client = testServer.CreateWebSocketClient();
+                webHostBuilder
+                    .UseTestServer()
+                    .Configure(app =>
+                    {
+                        app.Run(async c =>
+                        {
+                            var upgradeFeature = c.Features.Get<IHttpUpgradeFeature>();
+                            Assert.NotNull(upgradeFeature);
+                            Assert.False(upgradeFeature.IsUpgradableRequest);
+                            await Assert.ThrowsAsync<NotSupportedException>(() => upgradeFeature.UpgradeAsync());
 
-            try
-            {
-                using var socket = await client.ConnectAsync(
-                    uri: new Uri("http://localhost/connect"),
-                    cancellationToken: default);
-            }
-            catch
-            {
-                // An exception will be thrown because our endpoint does not accept the websocket
-            }
+                            var webSocketFeature = c.Features.Get<IHttpWebSocketFeature>();
+                            Assert.NotNull(webSocketFeature);
+                            Assert.True(webSocketFeature.IsWebSocketRequest);
+                        });
+                    });
+            })
+            .Build();
+
+        await host.StartAsync();
+
+        var testServer = host.GetTestServer();
+        var client = testServer.CreateWebSocketClient();
+
+        try
+        {
+            using var socket = await client.ConnectAsync(
+                uri: new Uri("http://localhost/connect"),
+                cancellationToken: default);
+        }
+        catch
+        {
+            // An exception will be thrown because our endpoint does not accept the websocket
         }
     }
 }
diff --git a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
index 9f788a462f9e..1ab9352c8357 100644
--- a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
+++ b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj
@@ -18,6 +18,10 @@
     <Compile Update="WebHostService.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Hosting.WindowsServices.Tests" />
   </ItemGroup>
diff --git a/src/Hosting/WindowsServices/src/WebHostService.cs b/src/Hosting/WindowsServices/src/WebHostService.cs
index 89b9e72a2a4c..74b5bfc3933a 100644
--- a/src/Hosting/WindowsServices/src/WebHostService.cs
+++ b/src/Hosting/WindowsServices/src/WebHostService.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel;
 using System.ServiceProcess;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -12,6 +13,7 @@ namespace Microsoft.AspNetCore.Hosting.WindowsServices;
 ///     Provides an implementation of a Windows service that hosts ASP.NET Core.
 /// </summary>
 [DesignerCategory("Code")]
+[Obsolete("Use UseWindowsService and AddHostedService instead. For more information, visit https://aka.ms/aspnet/deprecate/009.", DiagnosticId = "ASPDEPR009", UrlFormat = Obsoletions.AspNetCoreDeprecate009Url)]
 public class WebHostService : ServiceBase
 {
     private readonly IWebHost _host;
diff --git a/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs b/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs
index 950dd27b9f4a..3f5790a8e78e 100644
--- a/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs
+++ b/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.ServiceProcess;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.Hosting.WindowsServices;
 
 /// <summary>
 ///     Extensions to <see cref="IWebHost"/> for hosting inside a Windows service.
 /// </summary>
+[Obsolete("Use UseWindowsService and AddHostedService instead. For more information, visit https://aka.ms/aspnet/deprecate/009.", DiagnosticId = "ASPDEPR009", UrlFormat = Obsoletions.AspNetCoreDeprecate009Url)]
 public static class WebHostWindowsServiceExtensions
 {
     /// <summary>
diff --git a/src/Hosting/WindowsServices/test/WebHostServiceTests.cs b/src/Hosting/WindowsServices/test/WebHostServiceTests.cs
index 16a4bcac02c2..6636dc3190a6 100644
--- a/src/Hosting/WindowsServices/test/WebHostServiceTests.cs
+++ b/src/Hosting/WindowsServices/test/WebHostServiceTests.cs
@@ -19,8 +19,14 @@ public class WebHostServiceTests
     [ConditionalFact]
     public async Task StopBeforeServiceStarted()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
         var host = new WebHostBuilder().UseServer(new FakeServer()).Configure(x => { }).Build();
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR009 // Type or member is obsolete
         var webHostService = new WebHostService(host);
+#pragma warning restore ASPDEPR009 // Type or member is obsolete
         var applicationLifetime = host.Services.GetRequiredService<IHostApplicationLifetime>();
 
         applicationLifetime.StopApplication();
@@ -33,8 +39,14 @@ await Assert.ThrowsAsync<TaskCanceledException>(
     [ConditionalFact]
     public async Task StopAfterServiceStarted()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
         var host = new WebHostBuilder().UseServer(new FakeServer()).Configure(x => { }).Build();
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR009 // Type or member is obsolete
         var webHostService = new WebHostService(host);
+#pragma warning restore ASPDEPR009 // Type or member is obsolete
         var applicationLifetime = host.Services.GetRequiredService<IHostApplicationLifetime>();
 
         webHostService.Start();
diff --git a/src/Hosting/test/FunctionalTests/ShutdownTests.cs b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
index a8f43edbb6bc..f639f8051238 100644
--- a/src/Hosting/test/FunctionalTests/ShutdownTests.cs
+++ b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
@@ -27,7 +27,6 @@ public async Task ShutdownTestRun()
         await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run");
     }
 
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/27371")]
     [ConditionalFact]
     [OSSkipCondition(OperatingSystems.Windows)]
     [OSSkipCondition(OperatingSystems.MacOSX)]
@@ -98,7 +97,7 @@ private async Task ExecuteShutdownTest(string testName, string shutdownMechanic)
                     throw new InvalidOperationException("Timeout while waiting for host process to output started message.", ex);
                 }
 
-                SendSIGINT(deployer.HostProcess.Id);
+                SendSIGTERM(deployer.HostProcess.Id);
 
                 WaitForExitOrKill(deployer.HostProcess);
 
@@ -118,7 +117,7 @@ private async Task ExecuteShutdownTest(string testName, string shutdownMechanic)
         }
     }
 
-    private static void SendSIGINT(int processId)
+    private static void SendSIGTERM(int processId)
     {
         var startInfo = new ProcessStartInfo
         {
diff --git a/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs b/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
index 8c39f8c53ce1..ebbd437388a6 100644
--- a/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
+++ b/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
@@ -44,11 +44,11 @@ public async Task InjectedStartup_DefaultApplicationNameIsEntryAssembly(TestVari
                     if (!string.IsNullOrWhiteSpace(data))
                     {
                         output += data + '\n';
-                        tcs.TrySetResult();
                     }
                 };
 
-                await deployer.DeployAsync();
+                var deploymentResult = await deployer.DeployAsync();
+                deploymentResult.HostShutdownToken.Register(tcs.SetResult);
 
                 try
                 {
diff --git a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/Program.cs b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/Program.cs
index 29e563ee74bc..d31f66d42350 100644
--- a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/Program.cs
+++ b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/Program.cs
@@ -11,15 +11,18 @@ public class Program
 {
     public static void Main(string[] args)
     {
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
         var webHost = CreateWebHostBuilder(args).Build();
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
         var applicationName = webHost.Services.GetRequiredService<IHostEnvironment>().ApplicationName;
         Console.WriteLine(applicationName);
-        Console.ReadKey();
     }
 
     // Do not change the signature of this method. It's used for tests.
     private static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         new WebHostBuilder()
         .SuppressStatusMessages(true)
         .ConfigureServices(services => services.AddSingleton<IStartup, Startup>());
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 }
diff --git a/src/Hosting/test/testassets/Microsoft.AspNetCore.Hosting.TestSites/Program.cs b/src/Hosting/test/testassets/Microsoft.AspNetCore.Hosting.TestSites/Program.cs
index e211da9e1405..a3d3b1581770 100644
--- a/src/Hosting/test/testassets/Microsoft.AspNetCore.Hosting.TestSites/Program.cs
+++ b/src/Hosting/test/testassets/Microsoft.AspNetCore.Hosting.TestSites/Program.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Console;
 
@@ -22,16 +23,19 @@ public static void Main(string[] args)
             .AddEnvironmentVariables(prefix: "ASPNETCORE_")
             .Build();
 
-        var builder = new WebHostBuilder()
-            .UseServer(new NoopServer())
-            .UseConfiguration(config)
-            .SuppressStatusMessages(true)
-            .ConfigureLogging((_, factory) =>
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                factory.AddConsole();
-                factory.AddFilter<ConsoleLoggerProvider>(level => level >= LogLevel.Warning);
-            })
-            .UseStartup("Microsoft.AspNetCore.Hosting.TestSites");
+                webHostBuilder.UseServer(new NoopServer())
+                    .UseConfiguration(config)
+                    .SuppressStatusMessages(true)
+                    .ConfigureLogging((_, factory) =>
+                    {
+                        factory.AddConsole();
+                        factory.AddFilter<ConsoleLoggerProvider>(level => level >= LogLevel.Warning);
+                    })
+                    .UseStartup("Microsoft.AspNetCore.Hosting.TestSites");
+            });
 
         if (config["STARTMECHANIC"] == "Run")
         {
diff --git a/src/Html.Abstractions/Html.Abstractions.slnf b/src/Html.Abstractions/Html.Abstractions.slnf
index e538eea60b90..623c5268aa76 100644
--- a/src/Html.Abstractions/Html.Abstractions.slnf
+++ b/src/Html.Abstractions/Html.Abstractions.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Html.Abstractions\\src\\Microsoft.AspNetCore.Html.Abstractions.csproj",
       "src\\Html.Abstractions\\test\\Microsoft.AspNetCore.Html.Abstractions.Tests.csproj",
diff --git a/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs b/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs
index f4e0f9293394..a9a95b84a1d9 100644
--- a/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs
+++ b/src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs
@@ -91,7 +91,7 @@ public void AddScheme(string name, Action<AuthenticationSchemeBuilder> configure
     public string? DefaultForbidScheme { get; set; }
 
     /// <summary>
-    /// If true, SignIn should throw if attempted with a user is not authenticated.
+    /// If true, SignIn should throw if attempted with a user who is not authenticated.
     /// A user is considered authenticated if <see cref="ClaimsIdentity.IsAuthenticated"/> returns <see langword="true" /> for the <see cref="ClaimsPrincipal"/> associated with the HTTP request.
     /// </summary>
     public bool RequireAuthenticatedSignIn { get; set; } = true;
diff --git a/src/Http/Authentication.Abstractions/src/PublicAPI.Unshipped.txt b/src/Http/Authentication.Abstractions/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..5bd5a8896c0b 100644
--- a/src/Http/Authentication.Abstractions/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Authentication.Abstractions/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*static Microsoft.AspNetCore.Authentication.AuthenticationTokenExtensions.UpdateTokenValue(this Microsoft.AspNetCore.Authentication.AuthenticationProperties! properties, string! tokenName, string! tokenValue) -> bool
+static Microsoft.AspNetCore.Authentication.AuthenticationTokenExtensions.UpdateTokenValue(this Microsoft.AspNetCore.Authentication.AuthenticationProperties! properties, string! tokenName, string? tokenValue) -> bool
diff --git a/src/Http/Authentication.Abstractions/src/TokenExtensions.cs b/src/Http/Authentication.Abstractions/src/TokenExtensions.cs
index 5e91c64d7094..68f578586fab 100644
--- a/src/Http/Authentication.Abstractions/src/TokenExtensions.cs
+++ b/src/Http/Authentication.Abstractions/src/TokenExtensions.cs
@@ -71,9 +71,9 @@ public static void StoreTokens(this AuthenticationProperties properties, IEnumer
     /// </summary>
     /// <param name="properties">The <see cref="AuthenticationProperties"/> to update.</param>
     /// <param name="tokenName">The token name.</param>
-    /// <param name="tokenValue">The token value.</param>
+    /// <param name="tokenValue">The token value. May be <c>null</c>.</param>
     /// <returns><see langword="true"/> if the token was updated, otherwise <see langword="false"/>.</returns>
-    public static bool UpdateTokenValue(this AuthenticationProperties properties, string tokenName, string tokenValue)
+    public static bool UpdateTokenValue(this AuthenticationProperties properties, string tokenName, string? tokenValue)
     {
         ArgumentNullException.ThrowIfNull(properties);
         ArgumentNullException.ThrowIfNull(tokenName);
diff --git a/src/Http/Authentication.Core/src/AuthenticationCoreServiceCollectionExtensions.cs b/src/Http/Authentication.Core/src/AuthenticationCoreServiceCollectionExtensions.cs
index 9b73616527ba..be04d14e3717 100644
--- a/src/Http/Authentication.Core/src/AuthenticationCoreServiceCollectionExtensions.cs
+++ b/src/Http/Authentication.Core/src/AuthenticationCoreServiceCollectionExtensions.cs
@@ -20,10 +20,12 @@ public static IServiceCollection AddAuthenticationCore(this IServiceCollection s
     {
         ArgumentNullException.ThrowIfNull(services);
 
-        services.TryAddScoped<IAuthenticationService, AuthenticationService>();
+        services.AddMetrics();
+        services.TryAddScoped<IAuthenticationService, AuthenticationServiceImpl>();
         services.TryAddSingleton<IClaimsTransformation, NoopClaimsTransformation>(); // Can be replaced with scoped ones that use DbContext
         services.TryAddScoped<IAuthenticationHandlerProvider, AuthenticationHandlerProvider>();
         services.TryAddSingleton<IAuthenticationSchemeProvider, AuthenticationSchemeProvider>();
+        services.TryAddSingleton<AuthenticationMetrics>();
         return services;
     }
 
diff --git a/src/Http/Authentication.Core/src/AuthenticationMetrics.cs b/src/Http/Authentication.Core/src/AuthenticationMetrics.cs
new file mode 100644
index 000000000000..59a2e8d5abf7
--- /dev/null
+++ b/src/Http/Authentication.Core/src/AuthenticationMetrics.cs
@@ -0,0 +1,204 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Authentication;
+
+internal sealed class AuthenticationMetrics
+{
+    public const string MeterName = "Microsoft.AspNetCore.Authentication";
+
+    private readonly Meter _meter;
+    private readonly Histogram<double> _authenticatedRequestDuration;
+    private readonly Counter<long> _challengeCount;
+    private readonly Counter<long> _forbidCount;
+    private readonly Counter<long> _signInCount;
+    private readonly Counter<long> _signOutCount;
+
+    public AuthenticationMetrics(IMeterFactory meterFactory)
+    {
+        _meter = meterFactory.Create(MeterName);
+
+        _authenticatedRequestDuration = _meter.CreateHistogram<double>(
+            "aspnetcore.authentication.authenticate.duration",
+            unit: "s",
+            description: "The authentication duration for a request.",
+            advice: new() { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
+
+        _challengeCount = _meter.CreateCounter<long>(
+            "aspnetcore.authentication.challenges",
+            unit: "{challenge}",
+            description: "The total number of times a scheme is challenged.");
+
+        _forbidCount = _meter.CreateCounter<long>(
+            "aspnetcore.authentication.forbids",
+            unit: "{forbid}",
+            description: "The total number of times an authenticated user attempts to access a resource they are not permitted to access.");
+
+        _signInCount = _meter.CreateCounter<long>(
+            "aspnetcore.authentication.sign_ins",
+            unit: "{sign_in}",
+            description: "The total number of times a principal is signed in with a scheme.");
+
+        _signOutCount = _meter.CreateCounter<long>(
+            "aspnetcore.authentication.sign_outs",
+            unit: "{sign_out}",
+            description: "The total number of times a principal is signed out with a scheme.");
+    }
+
+    public void AuthenticatedRequestCompleted(string? scheme, AuthenticateResult? result, Exception? exception, long startTimestamp, long currentTimestamp)
+    {
+        if (_authenticatedRequestDuration.Enabled)
+        {
+            AuthenticatedRequestCompletedCore(scheme, result, exception, startTimestamp, currentTimestamp);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void AuthenticatedRequestCompletedCore(string? scheme, AuthenticateResult? result, Exception? exception, long startTimestamp, long currentTimestamp)
+    {
+        var tags = new TagList();
+
+        if (scheme is not null)
+        {
+            AddSchemeTag(ref tags, scheme);
+        }
+
+        if (result is not null)
+        {
+            tags.Add("aspnetcore.authentication.result", result switch
+            {
+                { None: true } => "none",
+                { Succeeded: true } => "success",
+                { Failure: not null } => "failure",
+                _ => "_OTHER", // _OTHER is commonly used fallback for an extra or unexpected value. Shouldn't reach here.
+            });
+        }
+
+        if (exception is not null)
+        {
+            AddErrorTag(ref tags, exception);
+        }
+
+        var duration = Stopwatch.GetElapsedTime(startTimestamp, currentTimestamp);
+        _authenticatedRequestDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    public void ChallengeCompleted(string? scheme, Exception? exception)
+    {
+        if (_challengeCount.Enabled)
+        {
+            ChallengeCompletedCore(scheme, exception);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void ChallengeCompletedCore(string? scheme, Exception? exception)
+    {
+        var tags = new TagList();
+
+        if (scheme is not null)
+        {
+            AddSchemeTag(ref tags, scheme);
+        }
+
+        if (exception is not null)
+        {
+            AddErrorTag(ref tags, exception);
+        }
+
+        _challengeCount.Add(1, tags);
+    }
+
+    public void ForbidCompleted(string? scheme, Exception? exception)
+    {
+        if (_forbidCount.Enabled)
+        {
+            ForbidCompletedCore(scheme, exception);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void ForbidCompletedCore(string? scheme, Exception? exception)
+    {
+        var tags = new TagList();
+
+        if (scheme is not null)
+        {
+            AddSchemeTag(ref tags, scheme);
+        }
+
+        if (exception is not null)
+        {
+            AddErrorTag(ref tags, exception);
+        }
+
+        _forbidCount.Add(1, tags);
+    }
+
+    public void SignInCompleted(string? scheme, Exception? exception)
+    {
+        if (_signInCount.Enabled)
+        {
+            SignInCompletedCore(scheme, exception);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void SignInCompletedCore(string? scheme, Exception? exception)
+    {
+        var tags = new TagList();
+
+        if (scheme is not null)
+        {
+            AddSchemeTag(ref tags, scheme);
+        }
+
+        if (exception is not null)
+        {
+            AddErrorTag(ref tags, exception);
+        }
+
+        _signInCount.Add(1, tags);
+    }
+
+    public void SignOutCompleted(string? scheme, Exception? exception)
+    {
+        if (_signOutCount.Enabled)
+        {
+            SignOutCompletedCore(scheme, exception);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void SignOutCompletedCore(string? scheme, Exception? exception)
+    {
+        var tags = new TagList();
+
+        if (scheme is not null)
+        {
+            AddSchemeTag(ref tags, scheme);
+        }
+
+        if (exception is not null)
+        {
+            AddErrorTag(ref tags, exception);
+        }
+
+        _signOutCount.Add(1, tags);
+    }
+
+    private static void AddSchemeTag(ref TagList tags, string scheme)
+    {
+        tags.Add("aspnetcore.authentication.scheme", scheme);
+    }
+
+    private static void AddErrorTag(ref TagList tags, Exception exception)
+    {
+        tags.Add("error.type", exception.GetType().FullName);
+    }
+}
diff --git a/src/Http/Authentication.Core/src/AuthenticationService.cs b/src/Http/Authentication.Core/src/AuthenticationService.cs
index 027886286ef3..3b45ffc56dc6 100644
--- a/src/Http/Authentication.Core/src/AuthenticationService.cs
+++ b/src/Http/Authentication.Core/src/AuthenticationService.cs
@@ -22,7 +22,11 @@ public class AuthenticationService : IAuthenticationService
     /// <param name="handlers">The <see cref="IAuthenticationHandlerProvider"/>.</param>
     /// <param name="transform">The <see cref="IClaimsTransformation"/>.</param>
     /// <param name="options">The <see cref="AuthenticationOptions"/>.</param>
-    public AuthenticationService(IAuthenticationSchemeProvider schemes, IAuthenticationHandlerProvider handlers, IClaimsTransformation transform, IOptions<AuthenticationOptions> options)
+    public AuthenticationService(
+        IAuthenticationSchemeProvider schemes,
+        IAuthenticationHandlerProvider handlers,
+        IClaimsTransformation transform,
+        IOptions<AuthenticationOptions> options)
     {
         Schemes = schemes;
         Handlers = handlers;
@@ -68,11 +72,7 @@ public virtual async Task<AuthenticateResult> AuthenticateAsync(HttpContext cont
             }
         }
 
-        var handler = await Handlers.GetHandlerAsync(context, scheme);
-        if (handler == null)
-        {
-            throw await CreateMissingHandlerException(scheme);
-        }
+        var handler = await Handlers.GetHandlerAsync(context, scheme) ?? throw await CreateMissingHandlerException(scheme);
 
         // Handlers should not return null, but we'll be tolerant of null values for legacy reasons.
         var result = (await handler.AuthenticateAsync()) ?? AuthenticateResult.NoResult();
@@ -81,7 +81,7 @@ public virtual async Task<AuthenticateResult> AuthenticateAsync(HttpContext cont
         {
             var principal = result.Principal!;
             var doTransform = true;
-            _transformCache ??= new HashSet<ClaimsPrincipal>();
+            _transformCache ??= [];
             if (_transformCache.Contains(principal))
             {
                 doTransform = false;
@@ -94,6 +94,7 @@ public virtual async Task<AuthenticateResult> AuthenticateAsync(HttpContext cont
             }
             return AuthenticateResult.Success(new AuthenticationTicket(principal, result.Properties, result.Ticket!.AuthenticationScheme));
         }
+
         return result;
     }
 
@@ -116,12 +117,7 @@ public virtual async Task ChallengeAsync(HttpContext context, string? scheme, Au
             }
         }
 
-        var handler = await Handlers.GetHandlerAsync(context, scheme);
-        if (handler == null)
-        {
-            throw await CreateMissingHandlerException(scheme);
-        }
-
+        var handler = await Handlers.GetHandlerAsync(context, scheme) ?? throw await CreateMissingHandlerException(scheme);
         await handler.ChallengeAsync(properties);
     }
 
@@ -144,12 +140,7 @@ public virtual async Task ForbidAsync(HttpContext context, string? scheme, Authe
             }
         }
 
-        var handler = await Handlers.GetHandlerAsync(context, scheme);
-        if (handler == null)
-        {
-            throw await CreateMissingHandlerException(scheme);
-        }
-
+        var handler = await Handlers.GetHandlerAsync(context, scheme) ?? throw await CreateMissingHandlerException(scheme);
         await handler.ForbidAsync(properties);
     }
 
@@ -187,14 +178,8 @@ public virtual async Task SignInAsync(HttpContext context, string? scheme, Claim
             }
         }
 
-        var handler = await Handlers.GetHandlerAsync(context, scheme);
-        if (handler == null)
-        {
-            throw await CreateMissingSignInHandlerException(scheme);
-        }
-
-        var signInHandler = handler as IAuthenticationSignInHandler;
-        if (signInHandler == null)
+        var handler = await Handlers.GetHandlerAsync(context, scheme) ?? throw await CreateMissingSignInHandlerException(scheme);
+        if (handler is not IAuthenticationSignInHandler signInHandler)
         {
             throw await CreateMismatchedSignInHandlerException(scheme, handler);
         }
@@ -221,14 +206,8 @@ public virtual async Task SignOutAsync(HttpContext context, string? scheme, Auth
             }
         }
 
-        var handler = await Handlers.GetHandlerAsync(context, scheme);
-        if (handler == null)
-        {
-            throw await CreateMissingSignOutHandlerException(scheme);
-        }
-
-        var signOutHandler = handler as IAuthenticationSignOutHandler;
-        if (signOutHandler == null)
+        var handler = await Handlers.GetHandlerAsync(context, scheme) ?? throw await CreateMissingSignOutHandlerException(scheme);
+        if (handler is not IAuthenticationSignOutHandler signOutHandler)
         {
             throw await CreateMismatchedSignOutHandlerException(scheme, handler);
         }
diff --git a/src/Http/Authentication.Core/src/AuthenticationServiceImpl.cs b/src/Http/Authentication.Core/src/AuthenticationServiceImpl.cs
new file mode 100644
index 000000000000..8aca027a1af6
--- /dev/null
+++ b/src/Http/Authentication.Core/src/AuthenticationServiceImpl.cs
@@ -0,0 +1,96 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authentication;
+
+internal sealed class AuthenticationServiceImpl(
+    IAuthenticationSchemeProvider schemes,
+    IAuthenticationHandlerProvider handlers,
+    IClaimsTransformation transform,
+    IOptions<AuthenticationOptions> options,
+    AuthenticationMetrics metrics)
+    : AuthenticationService(schemes, handlers, transform, options)
+{
+    public override async Task<AuthenticateResult> AuthenticateAsync(HttpContext context, string? scheme)
+    {
+        AuthenticateResult result;
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            result = await base.AuthenticateAsync(context, scheme);
+        }
+        catch (Exception ex)
+        {
+            metrics.AuthenticatedRequestCompleted(scheme, result: null, ex, startTimestamp, currentTimestamp: Stopwatch.GetTimestamp());
+            throw;
+        }
+
+        metrics.AuthenticatedRequestCompleted(scheme, result, exception: result.Failure, startTimestamp, currentTimestamp: Stopwatch.GetTimestamp());
+        return result;
+    }
+
+    public override async Task ChallengeAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)
+    {
+        try
+        {
+            await base.ChallengeAsync(context, scheme, properties);
+        }
+        catch (Exception ex)
+        {
+            metrics.ChallengeCompleted(scheme, ex);
+            throw;
+        }
+
+        metrics.ChallengeCompleted(scheme, exception: null);
+    }
+
+    public override async Task ForbidAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)
+    {
+        try
+        {
+            await base.ForbidAsync(context, scheme, properties);
+        }
+        catch (Exception ex)
+        {
+            metrics.ForbidCompleted(scheme, ex);
+            throw;
+        }
+
+        metrics.ForbidCompleted(scheme, exception: null);
+    }
+
+    public override async Task SignInAsync(HttpContext context, string? scheme, ClaimsPrincipal principal, AuthenticationProperties? properties)
+    {
+        try
+        {
+            await base.SignInAsync(context, scheme, principal, properties);
+        }
+        catch (Exception ex)
+        {
+            metrics.SignInCompleted(scheme, ex);
+            throw;
+        }
+
+        metrics.SignInCompleted(scheme, exception: null);
+    }
+
+    public override async Task SignOutAsync(HttpContext context, string? scheme, AuthenticationProperties? properties)
+    {
+        try
+        {
+            await base.SignOutAsync(context, scheme, properties);
+        }
+        catch (Exception ex)
+        {
+            metrics.SignOutCompleted(scheme, ex);
+            throw;
+        }
+
+        metrics.SignOutCompleted(scheme, exception: null);
+    }
+}
diff --git a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
index 5786fd9a889a..61b6d3a8f71e 100644
--- a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
+++ b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj
@@ -10,10 +10,19 @@
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
+    <Reference Include="Microsoft.Extensions.Diagnostics" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Authentication.Test" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Http/Authentication.Core/test/AuthenticationPropertiesTests.cs b/src/Http/Authentication.Core/test/AuthenticationPropertiesTests.cs
index 2629dd7ceb05..2469ec7a7fa2 100644
--- a/src/Http/Authentication.Core/test/AuthenticationPropertiesTests.cs
+++ b/src/Http/Authentication.Core/test/AuthenticationPropertiesTests.cs
@@ -77,17 +77,17 @@ public void GetSetString()
     {
         var props = new AuthenticationProperties();
         Assert.Null(props.GetString("foo"));
-        Assert.Equal(0, props.Items.Count);
+        Assert.Empty(props.Items);
 
         props.SetString("foo", "foo bar");
         Assert.Equal("foo bar", props.GetString("foo"));
         Assert.Equal("foo bar", props.Items["foo"]);
-        Assert.Equal(1, props.Items.Count);
+        Assert.Single(props.Items);
 
         props.SetString("foo", "foo baz");
         Assert.Equal("foo baz", props.GetString("foo"));
         Assert.Equal("foo baz", props.Items["foo"]);
-        Assert.Equal(1, props.Items.Count);
+        Assert.Single(props.Items);
 
         props.SetString("bar", "xy");
         Assert.Equal("xy", props.GetString("bar"));
@@ -100,11 +100,11 @@ public void GetSetString()
 
         props.SetString("foo", null);
         Assert.Null(props.GetString("foo"));
-        Assert.Equal(1, props.Items.Count);
+        Assert.Single(props.Items);
 
         props.SetString("doesntexist", null);
         Assert.False(props.Items.ContainsKey("doesntexist"));
-        Assert.Equal(1, props.Items.Count);
+        Assert.Single(props.Items);
     }
 
     [Fact]
@@ -112,17 +112,17 @@ public void GetSetParameter_String()
     {
         var props = new AuthenticationProperties();
         Assert.Null(props.GetParameter<string>("foo"));
-        Assert.Equal(0, props.Parameters.Count);
+        Assert.Empty(props.Parameters);
 
         props.SetParameter<string>("foo", "foo bar");
         Assert.Equal("foo bar", props.GetParameter<string>("foo"));
         Assert.Equal("foo bar", props.Parameters["foo"]);
-        Assert.Equal(1, props.Parameters.Count);
+        Assert.Single(props.Parameters);
 
         props.SetParameter<string?>("foo", null);
         Assert.Null(props.GetParameter<string>("foo"));
         Assert.Null(props.Parameters["foo"]);
-        Assert.Equal(1, props.Parameters.Count);
+        Assert.Single(props.Parameters);
     }
 
     [Fact]
@@ -130,17 +130,17 @@ public void GetSetParameter_Int()
     {
         var props = new AuthenticationProperties();
         Assert.Null(props.GetParameter<int?>("foo"));
-        Assert.Equal(0, props.Parameters.Count);
+        Assert.Empty(props.Parameters);
 
         props.SetParameter<int?>("foo", 123);
         Assert.Equal(123, props.GetParameter<int?>("foo"));
         Assert.Equal(123, props.Parameters["foo"]);
-        Assert.Equal(1, props.Parameters.Count);
+        Assert.Single(props.Parameters);
 
         props.SetParameter<int?>("foo", null);
         Assert.Null(props.GetParameter<int?>("foo"));
         Assert.Null(props.Parameters["foo"]);
-        Assert.Equal(1, props.Parameters.Count);
+        Assert.Single(props.Parameters);
     }
 
     [Fact]
@@ -148,18 +148,18 @@ public void GetSetParameter_Collection()
     {
         var props = new AuthenticationProperties();
         Assert.Null(props.GetParameter<int?>("foo"));
-        Assert.Equal(0, props.Parameters.Count);
+        Assert.Empty(props.Parameters);
 
         var list = new string[] { "a", "b", "c" };
         props.SetParameter<ICollection<string>>("foo", list);
         Assert.Equal(new string[] { "a", "b", "c" }, props.GetParameter<ICollection<string>>("foo"));
         Assert.Same(list, props.Parameters["foo"]);
-        Assert.Equal(1, props.Parameters.Count);
+        Assert.Single(props.Parameters);
 
         props.SetParameter<ICollection<string>?>("foo", null);
         Assert.Null(props.GetParameter<ICollection<string>>("foo"));
         Assert.Null(props.Parameters["foo"]);
-        Assert.Equal(1, props.Parameters.Count);
+        Assert.Single(props.Parameters);
     }
 
     [Fact]
@@ -341,7 +341,7 @@ public void Roundtrip_Serializes_With_SystemTextJson()
 
         // Ensure that parameters are not round-tripped
         Assert.NotNull(deserialized.Parameters);
-        Assert.Equal(0, deserialized.Parameters.Count);
+        Assert.Empty(deserialized.Parameters);
     }
 
     [Fact]
@@ -355,7 +355,7 @@ public void Parameters_Is_Not_Deserialized_With_SystemTextJson()
 
         // Ensure that parameters is not deserialized from a raw payload
         Assert.NotNull(deserialized!.Parameters);
-        Assert.Equal(0, deserialized.Parameters.Count);
+        Assert.Empty(deserialized.Parameters);
     }
 
     [Fact]
diff --git a/src/Http/Authentication.Core/test/TokenExtensionTests.cs b/src/Http/Authentication.Core/test/TokenExtensionTests.cs
index 98c1558ae9e7..1a1325d27cdc 100644
--- a/src/Http/Authentication.Core/test/TokenExtensionTests.cs
+++ b/src/Http/Authentication.Core/test/TokenExtensionTests.cs
@@ -149,6 +149,22 @@ public async Task GetTokenWorksWithExplicitScheme()
         Assert.Equal("3", await context.GetTokenAsync("simple", "Three"));
     }
 
+    [Fact]
+    public void UpdateTokenValueWorksWithNullGetTokenValueResult()
+    {
+        var sourceProperties = new AuthenticationProperties();
+        var targetProperties = new AuthenticationProperties();
+
+        var tokens = new List<AuthenticationToken>
+        {
+            new AuthenticationToken { Name = "refresh_token", Value = "refresh_value" }
+        };
+
+        targetProperties.StoreTokens(tokens);
+        targetProperties.UpdateTokenValue("refresh_token", sourceProperties.GetTokenValue("refresh_token"));
+        Assert.Null(targetProperties.GetTokenValue("refresh_token"));
+    }
+
     private class SimpleAuth : IAuthenticationHandler
     {
         public Task<AuthenticateResult> AuthenticateAsync()
diff --git a/src/Http/Headers/test/CacheControlHeaderValueTest.cs b/src/Http/Headers/test/CacheControlHeaderValueTest.cs
index 12a5e209398c..1f407cc2177d 100644
--- a/src/Http/Headers/test/CacheControlHeaderValueTest.cs
+++ b/src/Http/Headers/test/CacheControlHeaderValueTest.cs
@@ -46,21 +46,21 @@ public void Properties_SetAndGetAllProperties_SetValueReturnedInGetter()
         Assert.Throws<ArgumentException>(() => cacheControl.NoCacheHeaders.Add(null));
         Assert.Throws<FormatException>(() => cacheControl.NoCacheHeaders.Add("invalid PLACEHOLDER"));
         cacheControl.NoCacheHeaders.Add("PLACEHOLDER");
-        Assert.Equal(1, cacheControl.NoCacheHeaders.Count);
-        Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First());
+        Assert.Single(cacheControl.NoCacheHeaders);
+        Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First().AsSpan());
 
         Assert.NotNull(cacheControl.PrivateHeaders);
         Assert.Throws<ArgumentException>(() => cacheControl.PrivateHeaders.Add(null));
         Assert.Throws<FormatException>(() => cacheControl.PrivateHeaders.Add("invalid PLACEHOLDER"));
         cacheControl.PrivateHeaders.Add("PLACEHOLDER");
-        Assert.Equal(1, cacheControl.PrivateHeaders.Count);
-        Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First());
+        Assert.Single(cacheControl.PrivateHeaders);
+        Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First().AsSpan());
 
         // NameValueHeaderValue collection property
         Assert.NotNull(cacheControl.Extensions);
         Assert.Throws<ArgumentNullException>(() => cacheControl.Extensions.Add(null!));
         cacheControl.Extensions.Add(new NameValueHeaderValue("name", "value"));
-        Assert.Equal(1, cacheControl.Extensions.Count);
+        Assert.Single(cacheControl.Extensions);
         Assert.Equal(new NameValueHeaderValue("name", "value"), cacheControl.Extensions.First());
     }
 
@@ -468,7 +468,7 @@ public void TryParse_DifferentValidScenarios_AllReturnTrue()
     [InlineData("s-maxage=1.5")]
     // Invalid Extension values
     [InlineData("custom value")]
-    public void TryParse_DifferentInvalidScenarios_ReturnsFalse(string input)
+    public void TryParse_DifferentInvalidScenarios_ReturnsFalse(string? input)
     {
         CheckInvalidTryParse(input);
     }
diff --git a/src/Http/Headers/test/ContentDispositionHeaderValueTest.cs b/src/Http/Headers/test/ContentDispositionHeaderValueTest.cs
index 38f7cfb4b7ca..f153018b0b0b 100644
--- a/src/Http/Headers/test/ContentDispositionHeaderValueTest.cs
+++ b/src/Http/Headers/test/ContentDispositionHeaderValueTest.cs
@@ -42,8 +42,8 @@ public void Ctor_ContentDispositionInvalidFormat_ThrowFormatException()
     public void Ctor_ContentDispositionValidFormat_SuccessfullyCreated()
     {
         var contentDisposition = new ContentDispositionHeaderValue("inline");
-        Assert.Equal("inline", contentDisposition.DispositionType);
-        Assert.Equal(0, contentDisposition.Parameters.Count);
+        Assert.Equal("inline", contentDisposition.DispositionType.AsSpan());
+        Assert.Empty(contentDisposition.Parameters);
         Assert.Null(contentDisposition.Name.Value);
         Assert.Null(contentDisposition.FileName.Value);
         Assert.Null(contentDisposition.CreationDate);
@@ -63,10 +63,10 @@ public void Parameters_AddNull_Throw()
     public void ContentDisposition_SetAndGetContentDisposition_MatchExpectations()
     {
         var contentDisposition = new ContentDispositionHeaderValue("inline");
-        Assert.Equal("inline", contentDisposition.DispositionType);
+        Assert.Equal("inline", contentDisposition.DispositionType.AsSpan());
 
         contentDisposition.DispositionType = "attachment";
-        Assert.Equal("attachment", contentDisposition.DispositionType);
+        Assert.Equal("attachment", contentDisposition.DispositionType.AsSpan());
     }
 
     [Fact]
@@ -74,13 +74,13 @@ public void Name_SetNameAndValidateObject_ParametersEntryForNameAdded()
     {
         var contentDisposition = new ContentDispositionHeaderValue("inline");
         contentDisposition.Name = "myname";
-        Assert.Equal("myname", contentDisposition.Name);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("name", contentDisposition.Parameters.First().Name);
+        Assert.Equal("myname", contentDisposition.Name.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("name", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Name = null;
         Assert.Null(contentDisposition.Name.Value);
-        Assert.Equal(0, contentDisposition.Parameters.Count);
+        Assert.Empty(contentDisposition.Parameters);
         contentDisposition.Name = null; // It's OK to set it again to null; no exception.
     }
 
@@ -92,13 +92,13 @@ public void Name_AddNameParameterThenUseProperty_ParametersEntryIsOverwritten()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         NameValueHeaderValue name = new NameValueHeaderValue("NAME", "old_name");
         contentDisposition.Parameters.Add(name);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("NAME", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("NAME", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Name = "new_name";
-        Assert.Equal("new_name", contentDisposition.Name);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("NAME", contentDisposition.Parameters.First().Name);
+        Assert.Equal("new_name", contentDisposition.Name.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("NAME", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Parameters.Remove(name);
         Assert.Null(contentDisposition.Name.Value);
@@ -112,13 +112,13 @@ public void FileName_AddNameParameterThenUseProperty_ParametersEntryIsOverwritte
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var fileName = new NameValueHeaderValue("FILENAME", "old_name");
         contentDisposition.Parameters.Add(fileName);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.FileName = "new_name";
-        Assert.Equal("new_name", contentDisposition.FileName);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name);
+        Assert.Equal("new_name", contentDisposition.FileName.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Parameters.Remove(fileName);
         Assert.Null(contentDisposition.FileName.Value);
@@ -130,10 +130,10 @@ public void FileName_NeedsEncoding_EncodedAndDecodedCorrectly()
         var contentDisposition = new ContentDispositionHeaderValue("inline");
 
         contentDisposition.FileName = "FileÃName.bat";
-        Assert.Equal("FileÃName.bat", contentDisposition.FileName);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("filename", contentDisposition.Parameters.First().Name);
-        Assert.Equal("\"=?utf-8?B?RmlsZcODTmFtZS5iYXQ=?=\"", contentDisposition.Parameters.First().Value);
+        Assert.Equal("FileÃName.bat", contentDisposition.FileName.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("filename", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("\"=?utf-8?B?RmlsZcODTmFtZS5iYXQ=?=\"", contentDisposition.Parameters.First().Value.AsSpan());
 
         contentDisposition.Parameters.Remove(contentDisposition.Parameters.First());
         Assert.Null(contentDisposition.FileName.Value);
@@ -145,10 +145,10 @@ public void FileName_NeedsEncodingBecauseOfNewLine_EncodedAndDecodedCorrectly()
         var contentDisposition = new ContentDispositionHeaderValue("inline");
 
         contentDisposition.FileName = "File\nName.bat";
-        Assert.Equal("File\nName.bat", contentDisposition.FileName);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("filename", contentDisposition.Parameters.First().Name);
-        Assert.Equal("\"=?utf-8?B?RmlsZQpOYW1lLmJhdA==?=\"", contentDisposition.Parameters.First().Value);
+        Assert.Equal("File\nName.bat", contentDisposition.FileName.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("filename", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("\"=?utf-8?B?RmlsZQpOYW1lLmJhdA==?=\"", contentDisposition.Parameters.First().Value.AsSpan());
 
         contentDisposition.Parameters.Remove(contentDisposition.Parameters.First());
         Assert.Null(contentDisposition.FileName.Value);
@@ -162,15 +162,15 @@ public void FileName_UnknownOrBadEncoding_PropertyFails()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var fileName = new NameValueHeaderValue("FILENAME", "\"=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=\"");
         contentDisposition.Parameters.Add(fileName);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name);
-        Assert.Equal("\"=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=\"", contentDisposition.Parameters.First().Value);
-        Assert.Equal("=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=", contentDisposition.FileName);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("\"=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=\"", contentDisposition.Parameters.First().Value.AsSpan());
+        Assert.Equal("=?utf-99?Q?R=mlsZcODTmFtZS5iYXQ=?=", contentDisposition.FileName.AsSpan());
 
         contentDisposition.FileName = "new_name";
-        Assert.Equal("new_name", contentDisposition.FileName);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name);
+        Assert.Equal("new_name", contentDisposition.FileName.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Parameters.Remove(fileName);
         Assert.Null(contentDisposition.FileName.Value);
@@ -184,15 +184,15 @@ public void FileNameStar_AddNameParameterThenUseProperty_ParametersEntryIsOverwr
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var fileNameStar = new NameValueHeaderValue("FILENAME*", "old_name");
         contentDisposition.Parameters.Add(fileNameStar);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name.AsSpan());
         Assert.Null(contentDisposition.FileNameStar.Value); // Decode failure
 
         contentDisposition.FileNameStar = "new_name";
-        Assert.Equal("new_name", contentDisposition.FileNameStar);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name);
-        Assert.Equal("UTF-8\'\'new_name", contentDisposition.Parameters.First().Value);
+        Assert.Equal("new_name", contentDisposition.FileNameStar.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("UTF-8\'\'new_name", contentDisposition.Parameters.First().Value.AsSpan());
 
         contentDisposition.Parameters.Remove(fileNameStar);
         Assert.Null(contentDisposition.FileNameStar.Value);
@@ -204,10 +204,10 @@ public void FileNameStar_NeedsEncoding_EncodedAndDecodedCorrectly()
         var contentDisposition = new ContentDispositionHeaderValue("inline");
 
         contentDisposition.FileNameStar = "FileÃName.bat";
-        Assert.Equal("FileÃName.bat", contentDisposition.FileNameStar);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("filename*", contentDisposition.Parameters.First().Name);
-        Assert.Equal("UTF-8\'\'File%C3%83Name.bat", contentDisposition.Parameters.First().Value);
+        Assert.Equal("FileÃName.bat", contentDisposition.FileNameStar.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("filename*", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("UTF-8\'\'File%C3%83Name.bat", contentDisposition.Parameters.First().Value.AsSpan());
 
         contentDisposition.Parameters.Remove(contentDisposition.Parameters.First());
         Assert.Null(contentDisposition.FileNameStar.Value);
@@ -218,7 +218,7 @@ public void NonValidAscii_WhenNeedsEncoding_UsesHex()
     {
         var contentDisposition = new ContentDispositionHeaderValue("inline");
         contentDisposition.FileNameStar = "a\u0080b";
-        Assert.Equal($"UTF-8\'\'a%C2%80b", contentDisposition.Parameters.First().Value); //%C2 added because the value in UTF-8 is encoded on 2 bytes.
+        Assert.Equal($"UTF-8\'\'a%C2%80b", contentDisposition.Parameters.First().Value.AsSpan()); //%C2 added because the value in UTF-8 is encoded on 2 bytes.
     }
 
     [Fact]
@@ -226,7 +226,7 @@ public void LongValidAscii_FullyProcessedWithout()
     {
         var contentDisposition = new ContentDispositionHeaderValue("inline");
         contentDisposition.FileNameStar = new string('a', 400); // 400 is larger to the max stackallow size
-        Assert.Equal($"UTF-8\'\'{new string('a', 400)}", contentDisposition.Parameters.First().Value);
+        Assert.Equal($"UTF-8\'\'{new string('a', 400)}", contentDisposition.Parameters.First().Value.AsSpan());
     }
 
     [Fact]
@@ -250,11 +250,11 @@ public void FileNameStar_WhenNeedsEncoding_UsesHex()
                 || b >= 0x7F)
             {
                 var hexC = Convert.ToHexString([b]);
-                Assert.Equal($"UTF-8\'\'a%{hexC}b", contentDisposition.Parameters.First().Value);
+                Assert.Equal($"UTF-8\'\'a%{hexC}b", contentDisposition.Parameters.First().Value.AsSpan());
             }
             else
             {
-                Assert.Equal($"UTF-8\'\'a{(char)b}b", contentDisposition.Parameters.First().Value);
+                Assert.Equal($"UTF-8\'\'a{(char)b}b", contentDisposition.Parameters.First().Value.AsSpan());
             }
             contentDisposition.Parameters.Remove(contentDisposition.Parameters.First());
         }
@@ -268,15 +268,15 @@ public void FileNameStar_UnknownOrBadEncoding_PropertyFails()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var fileNameStar = new NameValueHeaderValue("FILENAME*", "utf-99'lang'File%CZName.bat");
         contentDisposition.Parameters.Add(fileNameStar);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name);
-        Assert.Equal("utf-99'lang'File%CZName.bat", contentDisposition.Parameters.First().Value);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("utf-99'lang'File%CZName.bat", contentDisposition.Parameters.First().Value.AsSpan());
         Assert.Null(contentDisposition.FileNameStar.Value); // Decode failure
 
         contentDisposition.FileNameStar = "new_name";
-        Assert.Equal("new_name", contentDisposition.FileNameStar);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name);
+        Assert.Equal("new_name", contentDisposition.FileNameStar.AsSpan());
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("FILENAME*", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Parameters.Remove(fileNameStar);
         Assert.Null(contentDisposition.FileNameStar.Value);
@@ -294,8 +294,8 @@ public void SetHttpFileName_ShouldSanitizeFileNameWhereNeeded(string httpFileNam
     {
         var contentDisposition = new ContentDispositionHeaderValue("inline");
         contentDisposition.SetHttpFileName(httpFileName);
-        Assert.Equal(expectedFileName, contentDisposition.FileName);
-        Assert.Equal(httpFileName, contentDisposition.FileNameStar); // Should roundtrip through FileNameStar encoding
+        Assert.Equal(expectedFileName.AsSpan(), contentDisposition.FileName);
+        Assert.Equal(httpFileName.AsSpan(), contentDisposition.FileNameStar); // Should roundtrip through FileNameStar encoding
     }
 
     [Fact]
@@ -309,17 +309,17 @@ public void Dates_AddDateParameterThenUseProperty_ParametersEntryIsOverwritten()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var dateParameter = new NameValueHeaderValue("Creation-DATE", validDateString);
         contentDisposition.Parameters.Add(dateParameter);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("Creation-DATE", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("Creation-DATE", contentDisposition.Parameters.First().Name.AsSpan());
 
         Assert.Equal(validDate, contentDisposition.CreationDate);
 
         var newDate = validDate.AddSeconds(1);
         contentDisposition.CreationDate = newDate;
         Assert.Equal(newDate, contentDisposition.CreationDate);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("Creation-DATE", contentDisposition.Parameters.First().Name);
-        Assert.Equal("\"Tue, 15 Nov 1994 08:12:32 GMT\"", contentDisposition.Parameters.First().Value);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("Creation-DATE", contentDisposition.Parameters.First().Name.AsSpan());
+        Assert.Equal("\"Tue, 15 Nov 1994 08:12:32 GMT\"", contentDisposition.Parameters.First().Value.AsSpan());
 
         contentDisposition.Parameters.Remove(dateParameter);
         Assert.Null(contentDisposition.CreationDate);
@@ -335,14 +335,14 @@ public void Dates_InvalidDates_PropertyFails()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var dateParameter = new NameValueHeaderValue("read-DATE", invalidDateString);
         contentDisposition.Parameters.Add(dateParameter);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("read-DATE", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("read-DATE", contentDisposition.Parameters.First().Name.AsSpan());
 
         Assert.Null(contentDisposition.ReadDate);
 
         contentDisposition.ReadDate = null;
         Assert.Null(contentDisposition.ReadDate);
-        Assert.Equal(0, contentDisposition.Parameters.Count);
+        Assert.Empty(contentDisposition.Parameters);
     }
 
     [Fact]
@@ -353,14 +353,14 @@ public void Size_AddSizeParameterThenUseProperty_ParametersEntryIsOverwritten()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var sizeParameter = new NameValueHeaderValue("SIZE", "279172874239");
         contentDisposition.Parameters.Add(sizeParameter);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name.AsSpan());
         Assert.Equal(279172874239, contentDisposition.Size);
 
         contentDisposition.Size = 279172874240;
         Assert.Equal(279172874240, contentDisposition.Size);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Parameters.Remove(sizeParameter);
         Assert.Null(contentDisposition.Size);
@@ -374,15 +374,15 @@ public void Size_InvalidSizes_PropertyFails()
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var sizeParameter = new NameValueHeaderValue("SIZE", "-279172874239");
         contentDisposition.Parameters.Add(sizeParameter);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name.AsSpan());
         Assert.Null(contentDisposition.Size);
 
         // Negatives not allowed
         Assert.Throws<ArgumentOutOfRangeException>(() => contentDisposition.Size = -279172874240);
         Assert.Null(contentDisposition.Size);
-        Assert.Equal(1, contentDisposition.Parameters.Count);
-        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name);
+        Assert.Single(contentDisposition.Parameters);
+        Assert.Equal("SIZE", contentDisposition.Parameters.First().Name.AsSpan());
 
         contentDisposition.Parameters.Remove(sizeParameter);
         Assert.Null(contentDisposition.Size);
@@ -645,8 +645,8 @@ public void HeaderNamesWithQuotes_ExpectNamesToNotHaveQuotes()
 
         var result = ContentDispositionHeaderValue.Parse(contentDispositionLine);
 
-        Assert.Equal(expectedName, result.Name);
-        Assert.Equal(expectedFileName, result.FileName);
+        Assert.Equal(expectedName.AsSpan(), result.Name);
+        Assert.Equal(expectedFileName.AsSpan(), result.FileName);
     }
 
     [Fact]
@@ -655,9 +655,9 @@ public void FileNameWithSurrogatePairs_EncodedCorrectly()
         var contentDisposition = new ContentDispositionHeaderValue("attachment");
 
         contentDisposition.SetHttpFileName("File 🤩 name.txt");
-        Assert.Equal("File __ name.txt", contentDisposition.FileName);
+        Assert.Equal("File __ name.txt", contentDisposition.FileName.AsSpan());
         Assert.Equal(2, contentDisposition.Parameters.Count);
-        Assert.Equal("UTF-8\'\'File%20%F0%9F%A4%A9%20name.txt", contentDisposition.Parameters[1].Value);
+        Assert.Equal("UTF-8\'\'File%20%F0%9F%A4%A9%20name.txt", contentDisposition.Parameters[1].Value.AsSpan());
     }
 
     public class ContentDispositionValue
diff --git a/src/Http/Headers/test/ContentRangeHeaderValueTest.cs b/src/Http/Headers/test/ContentRangeHeaderValueTest.cs
index af2a5fa8bbad..f07823971549 100644
--- a/src/Http/Headers/test/ContentRangeHeaderValueTest.cs
+++ b/src/Http/Headers/test/ContentRangeHeaderValueTest.cs
@@ -18,7 +18,7 @@ public void Ctor_LengthOnlyOverloadValidValues_ValuesCorrectlySet()
 
         Assert.False(range.HasRange, "HasRange");
         Assert.True(range.HasLength, "HasLength");
-        Assert.Equal("bytes", range.Unit);
+        Assert.Equal("bytes", range.Unit.AsSpan());
         Assert.Null(range.From);
         Assert.Null(range.To);
         Assert.Equal(5, range.Length);
@@ -39,7 +39,7 @@ public void Ctor_FromAndToOverloadValidValues_ValuesCorrectlySet()
 
         Assert.True(range.HasRange, "HasRange");
         Assert.False(range.HasLength, "HasLength");
-        Assert.Equal("bytes", range.Unit);
+        Assert.Equal("bytes", range.Unit.AsSpan());
         Assert.Equal(0, range.From);
         Assert.Equal(1, range.To);
         Assert.Null(range.Length);
@@ -63,7 +63,7 @@ public void Ctor_FromToAndLengthOverloadValidValues_ValuesCorrectlySet()
 
         Assert.True(range.HasRange, "HasRange");
         Assert.True(range.HasLength, "HasLength");
-        Assert.Equal("bytes", range.Unit);
+        Assert.Equal("bytes", range.Unit.AsSpan());
         Assert.Equal(0, range.From);
         Assert.Equal(1, range.To);
         Assert.Equal(2, range.Length);
@@ -74,7 +74,7 @@ public void Unit_GetAndSetValidAndInvalidValues_MatchExpectation()
     {
         var range = new ContentRangeHeaderValue(0);
         range.Unit = "myunit";
-        Assert.Equal("myunit", range.Unit);
+        Assert.Equal("myunit", range.Unit.AsSpan());
 
         Assert.Throws<ArgumentException>(() => range.Unit = null);
         Assert.Throws<ArgumentException>(() => range.Unit = "");
@@ -156,7 +156,7 @@ public void Parse_SetOfValidValueStrings_ParsedCorrectly()
         // Note that we don't have a public constructor for value 'bytes */*' since the RFC doesn't mention a
         // scenario for it. However, if a server returns this value, we're flexible and accept it.
         var result = ContentRangeHeaderValue.Parse("bytes */*");
-        Assert.Equal("bytes", result.Unit);
+        Assert.Equal("bytes", result.Unit.AsSpan());
         Assert.Null(result.From);
         Assert.Null(result.To);
         Assert.Null(result.Length);
@@ -187,7 +187,7 @@ public void TryParse_SetOfValidValueStrings_ParsedCorrectly()
         // Note that we don't have a public constructor for value 'bytes */*' since the RFC doesn't mention a
         // scenario for it. However, if a server returns this value, we're flexible and accept it.
         Assert.True(ContentRangeHeaderValue.TryParse("bytes */*", out var result));
-        Assert.Equal("bytes", result.Unit);
+        Assert.Equal("bytes", result.Unit.AsSpan());
         Assert.Null(result.From);
         Assert.Null(result.To);
         Assert.Null(result.Length);
diff --git a/src/Http/Headers/test/CookieHeaderValueTest.cs b/src/Http/Headers/test/CookieHeaderValueTest.cs
index 6623a8ed13dd..91d1d94a0411 100644
--- a/src/Http/Headers/test/CookieHeaderValueTest.cs
+++ b/src/Http/Headers/test/CookieHeaderValueTest.cs
@@ -75,7 +75,7 @@ public static TheoryData<string> InvalidCookieValues
         }
     }
 
-    public static TheoryData<IList<CookieHeaderValue>, string?[]> ListOfCookieHeaderDataSet
+    public static TheoryData<IList<CookieHeaderValue>, string?[]> ListOfStrictCookieHeaderDataSet
     {
         get
         {
@@ -94,19 +94,30 @@ public static TheoryData<string> InvalidCookieValues
 
             dataset.Add(new[] { header1 }.ToList(), new[] { string1 });
             dataset.Add(new[] { header1, header1 }.ToList(), new[] { string1, string1 });
-            dataset.Add(new[] { header1, header1 }.ToList(), new[] { string1, null, "", " ", ";", " , ", string1 });
             dataset.Add(new[] { header2 }.ToList(), new[] { string2 });
             dataset.Add(new[] { header1, header2 }.ToList(), new[] { string1, string2 });
-            dataset.Add(new[] { header1, header2 }.ToList(), new[] { string1 + ", " + string2 });
             dataset.Add(new[] { header2, header1 }.ToList(), new[] { string2 + "; " + string1 });
             dataset.Add(new[] { header1, header2, header3, header4 }.ToList(), new[] { string1, string2, string3, string4 });
-            dataset.Add(new[] { header1, header2, header3, header4 }.ToList(), new[] { string.Join(",", string1, string2, string3, string4) });
             dataset.Add(new[] { header1, header2, header3, header4 }.ToList(), new[] { string.Join(";", string1, string2, string3, string4) });
 
             return dataset;
         }
     }
 
+    public static TheoryData<IList<CookieHeaderValue>, string?[]> ListOfCookieHeaderDataSet
+    {
+        get
+        {
+            var header1 = new CookieHeaderValue("name1", "n1=v1&n2=v2&n3=v3");
+            var string1 = "name1=n1=v1&n2=v2&n3=v3";
+
+            var dataset = new TheoryData<IList<CookieHeaderValue>, string?[]>();
+            dataset.Concat(ListOfStrictCookieHeaderDataSet);
+            dataset.Add(new[] { header1, header1 }.ToList(), new[] { string1, null, "", " ", ";", " , ", string1 });
+            return dataset;
+        }
+    }
+
     public static TheoryData<IList<CookieHeaderValue>?, string?[]> ListWithInvalidCookieHeaderDataSet
     {
         get
@@ -127,18 +138,19 @@ public static TheoryData<string> InvalidCookieValues
             dataset.Add(new[] { header1 }.ToList(), new[] { validString1, invalidString1 });
             dataset.Add(new[] { header1 }.ToList(), new[] { validString1, null, "", " ", ";", " , ", invalidString1 });
             dataset.Add(new[] { header1 }.ToList(), new[] { invalidString1, null, "", " ", ";", " , ", validString1 });
-            dataset.Add(new[] { header1 }.ToList(), new[] { validString1 + ", " + invalidString1 });
-            dataset.Add(new[] { header2 }.ToList(), new[] { invalidString1 + ", " + validString2 });
+            dataset.Add(null, new[] { validString1 + ", " });
+            dataset.Add(null, new[] { invalidString1 + ", " + validString2 });
             dataset.Add(new[] { header1 }.ToList(), new[] { invalidString1 + "; " + validString1 });
             dataset.Add(new[] { header2 }.ToList(), new[] { validString2 + "; " + invalidString1 });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { invalidString1, validString1, validString2, validString3 });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { validString1, invalidString1, validString2, validString3 });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { validString1, validString2, invalidString1, validString3 });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { validString1, validString2, validString3, invalidString1 });
-            dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", invalidString1, validString1, validString2, validString3) });
-            dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", validString1, invalidString1, validString2, validString3) });
-            dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", validString1, validString2, invalidString1, validString3) });
-            dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", validString1, validString2, validString3, invalidString1) });
+            dataset.Add(null, new[] { string.Join(",", invalidString1, validString1, validString2, validString3) });
+            dataset.Add(null, new[] { string.Join(",", validString1, invalidString1, validString2, validString3) });
+            dataset.Add(null, new[] { string.Join(",", validString1, validString2, invalidString1, validString3) });
+            dataset.Add(null, new[] { string.Join(",", validString1, validString2, validString3, invalidString1) });
+            dataset.Add(null, new[] { string.Join(",", validString1, validString2, validString3) });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(";", invalidString1, validString1, validString2, validString3) });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(";", validString1, invalidString1, validString2, validString3) });
             dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(";", validString1, validString2, invalidString1, validString3) });
@@ -172,8 +184,8 @@ public void CookieHeaderValue_CtorThrowsOnInvalidValue(string value)
     public void CookieHeaderValue_Ctor1_InitializesCorrectly()
     {
         var header = new CookieHeaderValue("cookie");
-        Assert.Equal("cookie", header.Name);
-        Assert.Equal(string.Empty, header.Value);
+        Assert.Equal("cookie", header.Name.AsSpan());
+        Assert.Equal(string.Empty, header.Value.AsSpan());
     }
 
     [Theory]
@@ -183,18 +195,18 @@ public void CookieHeaderValue_Ctor1_InitializesCorrectly()
     public void CookieHeaderValue_Ctor2InitializesCorrectly(string name, string value)
     {
         var header = new CookieHeaderValue(name, value);
-        Assert.Equal(name, header.Name);
-        Assert.Equal(value, header.Value);
+        Assert.Equal(name, header.Name.AsSpan());
+        Assert.Equal(value, header.Value.AsSpan());
     }
 
     [Fact]
     public void CookieHeaderValue_Value()
     {
         var cookie = new CookieHeaderValue("name");
-        Assert.Equal(string.Empty, cookie.Value);
+        Assert.Equal(string.Empty, cookie.Value.AsSpan());
 
         cookie.Value = "value1";
-        Assert.Equal("value1", cookie.Value);
+        Assert.Equal("value1", cookie.Value.AsSpan());
     }
 
     [Theory]
@@ -248,7 +260,7 @@ public void CookieHeaderValue_ParseList_AcceptsValidValues(IList<CookieHeaderVal
     }
 
     [Theory]
-    [MemberData(nameof(ListOfCookieHeaderDataSet))]
+    [MemberData(nameof(ListOfStrictCookieHeaderDataSet))]
     public void CookieHeaderValue_ParseStrictList_AcceptsValidValues(IList<CookieHeaderValue> cookies, string[] input)
     {
         var results = CookieHeaderValue.ParseStrictList(input);
@@ -267,7 +279,7 @@ public void CookieHeaderValue_TryParseList_AcceptsValidValues(IList<CookieHeader
     }
 
     [Theory]
-    [MemberData(nameof(ListOfCookieHeaderDataSet))]
+    [MemberData(nameof(ListOfStrictCookieHeaderDataSet))]
     public void CookieHeaderValue_TryParseStrictList_AcceptsValidValues(IList<CookieHeaderValue> cookies, string[] input)
     {
         var result = CookieHeaderValue.TryParseStrictList(input, out var results);
@@ -278,7 +290,7 @@ public void CookieHeaderValue_TryParseStrictList_AcceptsValidValues(IList<Cookie
 
     [Theory]
     [MemberData(nameof(ListWithInvalidCookieHeaderDataSet))]
-    public void CookieHeaderValue_ParseList_ExcludesInvalidValues(IList<CookieHeaderValue> cookies, string[] input)
+    public void CookieHeaderValue_ParseList_ExcludesInvalidValues(IList<CookieHeaderValue>? cookies, string[] input)
     {
         var results = CookieHeaderValue.ParseList(input);
         // ParseList always returns a list, even if empty. TryParseList may return null (via out).
@@ -287,7 +299,7 @@ public void CookieHeaderValue_ParseList_ExcludesInvalidValues(IList<CookieHeader
 
     [Theory]
     [MemberData(nameof(ListWithInvalidCookieHeaderDataSet))]
-    public void CookieHeaderValue_TryParseList_ExcludesInvalidValues(IList<CookieHeaderValue> cookies, string[] input)
+    public void CookieHeaderValue_TryParseList_ExcludesInvalidValues(IList<CookieHeaderValue>? cookies, string[] input)
     {
         var result = CookieHeaderValue.TryParseList(input, out var results);
         Assert.Equal(cookies, results);
@@ -298,7 +310,7 @@ public void CookieHeaderValue_TryParseList_ExcludesInvalidValues(IList<CookieHea
     [MemberData(nameof(ListWithInvalidCookieHeaderDataSet))]
     public void CookieHeaderValue_ParseStrictList_ThrowsForAnyInvalidValues(
 #pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-            IList<CookieHeaderValue> cookies,
+            IList<CookieHeaderValue>? cookies,
 #pragma warning restore xUnit1026 // Theory methods should use all of their parameters
             string[] input)
     {
@@ -309,7 +321,7 @@ public void CookieHeaderValue_ParseStrictList_ThrowsForAnyInvalidValues(
     [MemberData(nameof(ListWithInvalidCookieHeaderDataSet))]
     public void CookieHeaderValue_TryParseStrictList_FailsForAnyInvalidValues(
 #pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-            IList<CookieHeaderValue> cookies,
+            IList<CookieHeaderValue>? cookies,
 #pragma warning restore xUnit1026 // Theory methods should use all of their parameters
             string[] input)
     {
diff --git a/src/Http/Headers/test/EntityTagHeaderValueTest.cs b/src/Http/Headers/test/EntityTagHeaderValueTest.cs
index 21bd9a52b6ed..69f4e1bcac6e 100644
--- a/src/Http/Headers/test/EntityTagHeaderValueTest.cs
+++ b/src/Http/Headers/test/EntityTagHeaderValueTest.cs
@@ -32,7 +32,7 @@ public void Ctor_ETagInvalidFormat_ThrowFormatException()
     public void Ctor_ETagValidFormat_SuccessfullyCreated()
     {
         var etag = new EntityTagHeaderValue("\"tag\"");
-        Assert.Equal("\"tag\"", etag.Tag);
+        Assert.Equal("\"tag\"", etag.Tag.ToString());
         Assert.False(etag.IsWeak, "IsWeak");
     }
 
@@ -40,7 +40,7 @@ public void Ctor_ETagValidFormat_SuccessfullyCreated()
     public void Ctor_ETagValidFormatAndIsWeak_SuccessfullyCreated()
     {
         var etag = new EntityTagHeaderValue("\"e tag\"", true);
-        Assert.Equal("\"e tag\"", etag.Tag);
+        Assert.Equal("\"e tag\"", etag.Tag.ToString());
         Assert.True(etag.IsWeak, "IsWeak");
     }
 
@@ -245,15 +245,15 @@ public void ParseList_NullOrEmptyArray_ReturnsEmptyList()
     {
         var result = EntityTagHeaderValue.ParseList(null);
         Assert.NotNull(result);
-        Assert.Equal(0, result.Count);
+        Assert.Empty(result);
 
         result = EntityTagHeaderValue.ParseList(new string[0]);
         Assert.NotNull(result);
-        Assert.Equal(0, result.Count);
+        Assert.Empty(result);
 
         result = EntityTagHeaderValue.ParseList(new string[] { "" });
         Assert.NotNull(result);
-        Assert.Equal(0, result.Count);
+        Assert.Empty(result);
     }
 
     [Fact]
diff --git a/src/Http/Headers/test/HeaderUtilitiesTest.cs b/src/Http/Headers/test/HeaderUtilitiesTest.cs
index 77d46369c5b0..33dfe95fb3f1 100644
--- a/src/Http/Headers/test/HeaderUtilitiesTest.cs
+++ b/src/Http/Headers/test/HeaderUtilitiesTest.cs
@@ -90,10 +90,10 @@ public void TryParseSeconds_Succeeds(string headerValues, string targetValue, in
     [InlineData("directive1, directive2=80", "directive")]
     [InlineData("directive1=;, directive2=10", "directive1")]
     [InlineData("directive1;directive2=10", "directive2")]
-    public void TryParseSeconds_Fails(string headerValues, string targetValue)
+    public void TryParseSeconds_Fails(string? headerValues, string? targetValue)
     {
         TimeSpan? value;
-        Assert.False(HeaderUtilities.TryParseSeconds(new StringValues(headerValues), targetValue, out value));
+        Assert.False(HeaderUtilities.TryParseSeconds(new StringValues(headerValues), targetValue!, out value));
     }
 
     [Theory]
@@ -168,9 +168,9 @@ public void FormatInt64_MatchesToString(long value)
     [InlineData("directive1, directive2=80", "directive", false)]
     [InlineData("directive1;, directive2=80", "directive", false)]
     [InlineData("directive1=value;q=0.6;directive2 = 42 ", "directive2", false)]
-    public void ContainsCacheDirective_MatchesExactValue(string headerValues, string targetValue, bool contains)
+    public void ContainsCacheDirective_MatchesExactValue(string? headerValues, string? targetValue, bool contains)
     {
-        Assert.Equal(contains, HeaderUtilities.ContainsCacheDirective(new StringValues(headerValues), targetValue));
+        Assert.Equal(contains, HeaderUtilities.ContainsCacheDirective(new StringValues(headerValues), targetValue!));
     }
 
     [Theory]
@@ -180,7 +180,7 @@ public void ContainsCacheDirective_MatchesExactValue(string headerValues, string
     [InlineData("a")]
     [InlineData("1.1")]
     [InlineData("9223372036854775808")] // long.MaxValue + 1
-    public void TryParseNonNegativeInt64_Fails(string valueString)
+    public void TryParseNonNegativeInt64_Fails(string? valueString)
     {
         long value = 1;
         Assert.False(HeaderUtilities.TryParseNonNegativeInt64(valueString, out value));
@@ -205,7 +205,7 @@ public void TryParseNonNegativeInt64_Succeeds(string valueString, long expected)
     [InlineData("1.1")]
     [InlineData("1,000")]
     [InlineData("2147483648")] // int.MaxValue + 1
-    public void TryParseNonNegativeInt32_Fails(string valueString)
+    public void TryParseNonNegativeInt32_Fails(string? valueString)
     {
         int value = 1;
         Assert.False(HeaderUtilities.TryParseNonNegativeInt32(valueString, out value));
@@ -231,7 +231,7 @@ public void RemoveQuotes_BehaviorCheck(string input, string expected)
     {
         var actual = HeaderUtilities.RemoveQuotes(input);
 
-        Assert.Equal(expected, actual);
+        Assert.Equal(expected.AsSpan(), actual);
     }
     [Theory]
     [InlineData("\"hello\"", true)]
@@ -258,7 +258,7 @@ public void UnescapeAsQuotedString_BehaviorCheck(string input, string expected)
     {
         var actual = HeaderUtilities.UnescapeAsQuotedString(input);
 
-        Assert.Equal(expected, actual);
+        Assert.Equal(expected.AsSpan(), actual);
     }
 
     [Theory]
@@ -275,7 +275,7 @@ public void SetAndEscapeValue_BehaviorCheck(string input, string expected)
     {
         var actual = HeaderUtilities.EscapeAsQuotedString(input);
 
-        Assert.Equal(expected, actual);
+        Assert.Equal(expected.AsSpan(), actual);
     }
 
     [Theory]
diff --git a/src/Http/Headers/test/MediaTypeHeaderValueTest.cs b/src/Http/Headers/test/MediaTypeHeaderValueTest.cs
index 624cb1638b6e..77bcf89a4d8c 100644
--- a/src/Http/Headers/test/MediaTypeHeaderValueTest.cs
+++ b/src/Http/Headers/test/MediaTypeHeaderValueTest.cs
@@ -49,7 +49,7 @@ public void Ctor_MediaTypeInvalidFormat_ThrowFormatException()
 
     [Theory]
     [MemberData(nameof(MediaTypesWithSuffixes))]
-    public void Ctor_CanParseSuffixedMediaTypes(string mediaType, string expectedSubTypeWithoutSuffix, string expectedSubTypeSuffix)
+    public void Ctor_CanParseSuffixedMediaTypes(string mediaType, string expectedSubTypeWithoutSuffix, string? expectedSubTypeSuffix)
     {
         var result = new MediaTypeHeaderValue(mediaType);
 
@@ -102,8 +102,8 @@ public void MatchesAllSubTypesWithoutSuffix_ReturnsExpectedResult(string value,
     public void Ctor_MediaTypeValidFormat_SuccessfullyCreated()
     {
         var mediaType = new MediaTypeHeaderValue("text/plain");
-        Assert.Equal("text/plain", mediaType.MediaType);
-        Assert.Equal(0, mediaType.Parameters.Count);
+        Assert.Equal("text/plain", mediaType.MediaType.AsSpan());
+        Assert.Empty(mediaType.Parameters);
         Assert.Null(mediaType.Charset.Value);
     }
 
@@ -112,8 +112,8 @@ public void Ctor_AddNameAndQuality_QualityParameterAdded()
     {
         var mediaType = new MediaTypeHeaderValue("application/xml", 0.08);
         Assert.Equal(0.08, mediaType.Quality);
-        Assert.Equal("application/xml", mediaType.MediaType);
-        Assert.Equal(1, mediaType.Parameters.Count);
+        Assert.Equal("application/xml", mediaType.MediaType.AsSpan());
+        Assert.Single(mediaType.Parameters);
     }
 
     [Fact]
@@ -221,10 +221,10 @@ public void CopyFromReadOnly_WithParameters_CopiedAsNonReadOnly()
     public void MediaType_SetAndGetMediaType_MatchExpectations()
     {
         var mediaType = new MediaTypeHeaderValue("text/plain");
-        Assert.Equal("text/plain", mediaType.MediaType);
+        Assert.Equal("text/plain", mediaType.MediaType.AsSpan());
 
         mediaType.MediaType = "application/xml";
-        Assert.Equal("application/xml", mediaType.MediaType);
+        Assert.Equal("application/xml", mediaType.MediaType.AsSpan());
     }
 
     [Fact]
@@ -232,13 +232,13 @@ public void Charset_SetCharsetAndValidateObject_ParametersEntryForCharsetAdded()
     {
         var mediaType = new MediaTypeHeaderValue("text/plain");
         mediaType.Charset = "mycharset";
-        Assert.Equal("mycharset", mediaType.Charset);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("charset", mediaType.Parameters.First().Name);
+        Assert.Equal("mycharset", mediaType.Charset.AsSpan());
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("charset", mediaType.Parameters.First().Name.AsSpan());
 
         mediaType.Charset = null;
         Assert.Null(mediaType.Charset.Value);
-        Assert.Equal(0, mediaType.Parameters.Count);
+        Assert.Empty(mediaType.Parameters);
         mediaType.Charset = null; // It's OK to set it again to null; no exception.
     }
 
@@ -250,13 +250,13 @@ public void Charset_AddCharsetParameterThenUseProperty_ParametersEntryIsOverwrit
         // Note that uppercase letters are used. Comparison should happen case-insensitive.
         var charset = new NameValueHeaderValue("CHARSET", "old_charset");
         mediaType.Parameters.Add(charset);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("CHARSET", mediaType.Parameters.First().Name);
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("CHARSET", mediaType.Parameters.First().Name.AsSpan());
 
         mediaType.Charset = "new_charset";
-        Assert.Equal("new_charset", mediaType.Charset);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("CHARSET", mediaType.Parameters.First().Name);
+        Assert.Equal("new_charset", mediaType.Charset.AsSpan());
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("CHARSET", mediaType.Parameters.First().Name.AsSpan());
 
         mediaType.Parameters.Remove(charset);
         Assert.Null(mediaType.Charset.Value);
@@ -268,13 +268,13 @@ public void Quality_SetCharsetAndValidateObject_ParametersEntryForCharsetAdded()
         var mediaType = new MediaTypeHeaderValue("text/plain");
         mediaType.Quality = 0.563156454;
         Assert.Equal(0.563, mediaType.Quality);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("q", mediaType.Parameters.First().Name);
-        Assert.Equal("0.563", mediaType.Parameters.First().Value);
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("q", mediaType.Parameters.First().Name.AsSpan());
+        Assert.Equal("0.563", mediaType.Parameters.First().Value.AsSpan());
 
         mediaType.Quality = null;
         Assert.Null(mediaType.Quality);
-        Assert.Equal(0, mediaType.Parameters.Count);
+        Assert.Empty(mediaType.Parameters);
         mediaType.Quality = null; // It's OK to set it again to null; no exception.
     }
 
@@ -285,14 +285,14 @@ public void Quality_AddQualityParameterThenUseProperty_ParametersEntryIsOverwrit
 
         var quality = new NameValueHeaderValue("q", "0.132");
         mediaType.Parameters.Add(quality);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("q", mediaType.Parameters.First().Name);
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("q", mediaType.Parameters.First().Name.AsSpan());
         Assert.Equal(0.132, mediaType.Quality);
 
         mediaType.Quality = 0.9;
         Assert.Equal(0.9, mediaType.Quality);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("q", mediaType.Parameters.First().Name);
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("q", mediaType.Parameters.First().Name.AsSpan());
 
         mediaType.Parameters.Remove(quality);
         Assert.Null(mediaType.Quality);
@@ -305,8 +305,8 @@ public void Quality_AddQualityParameterUpperCase_CaseInsensitiveComparison()
 
         var quality = new NameValueHeaderValue("Q", "0.132");
         mediaType.Parameters.Add(quality);
-        Assert.Equal(1, mediaType.Parameters.Count);
-        Assert.Equal("Q", mediaType.Parameters.First().Name);
+        Assert.Single(mediaType.Parameters);
+        Assert.Equal("Q", mediaType.Parameters.First().Name.AsSpan());
         Assert.Equal(0.132, mediaType.Quality);
     }
 
@@ -518,15 +518,15 @@ public void ParseList_NullOrEmptyArray_ReturnsEmptyList()
     {
         var results = MediaTypeHeaderValue.ParseList(null);
         Assert.NotNull(results);
-        Assert.Equal(0, results.Count);
+        Assert.Empty(results);
 
         results = MediaTypeHeaderValue.ParseList(new string[0]);
         Assert.NotNull(results);
-        Assert.Equal(0, results.Count);
+        Assert.Empty(results);
 
         results = MediaTypeHeaderValue.ParseList(new string[] { "" });
         Assert.NotNull(results);
-        Assert.Equal(0, results.Count);
+        Assert.Empty(results);
     }
 
     [Fact]
diff --git a/src/Http/Headers/test/NameValueHeaderValueTest.cs b/src/Http/Headers/test/NameValueHeaderValueTest.cs
index 003ee695c7f6..20cd9f91e92e 100644
--- a/src/Http/Headers/test/NameValueHeaderValueTest.cs
+++ b/src/Http/Headers/test/NameValueHeaderValueTest.cs
@@ -29,7 +29,7 @@ public void Ctor_NameInvalidFormat_ThrowFormatException()
     public void Ctor_NameValidFormat_SuccessfullyCreated()
     {
         var nameValue = new NameValueHeaderValue("text", null);
-        Assert.Equal("text", nameValue.Name);
+        Assert.Equal("text", nameValue.Name.AsSpan());
     }
 
     [Fact]
@@ -66,7 +66,7 @@ public void Copy_NameOnly_SuccessfullyCopied()
 
         // Change one value and verify the other is unchanged.
         pair0.Value = "othervalue";
-        Assert.Equal("othervalue", pair0.Value);
+        Assert.Equal("othervalue", pair0.Value.AsSpan());
         Assert.Null(pair1.Value.Value);
     }
 
@@ -84,7 +84,7 @@ public void CopyAsReadOnly_NameOnly_CopiedAndReadOnly()
 
         // Change one value and verify the other is unchanged.
         pair0.Value = "othervalue";
-        Assert.Equal("othervalue", pair0.Value);
+        Assert.Equal("othervalue", pair0.Value.AsSpan());
         Assert.Null(pair1.Value.Value);
         Assert.Throws<InvalidOperationException>(() => { pair1.Value = "othervalue"; });
     }
@@ -100,8 +100,8 @@ public void Copy_NameAndValue_SuccessfullyCopied()
 
         // Change one value and verify the other is unchanged.
         pair0.Value = "othervalue";
-        Assert.Equal("othervalue", pair0.Value);
-        Assert.Equal("value", pair1.Value);
+        Assert.Equal("othervalue", pair0.Value.AsSpan());
+        Assert.Equal("value", pair1.Value.AsSpan());
     }
 
     [Fact]
@@ -117,8 +117,8 @@ public void CopyAsReadOnly_NameAndValue_CopiedAndReadOnly()
 
         // Change one value and verify the other is unchanged.
         pair0.Value = "othervalue";
-        Assert.Equal("othervalue", pair0.Value);
-        Assert.Equal("value", pair1.Value);
+        Assert.Equal("othervalue", pair0.Value.AsSpan());
+        Assert.Equal("value", pair1.Value.AsSpan());
         Assert.Throws<InvalidOperationException>(() => { pair1.Value = "othervalue"; });
     }
 
@@ -134,8 +134,8 @@ public void CopyFromReadOnly_NameAndValue_CopiedAsNonReadOnly()
 
         // Change one value and verify the other is unchanged.
         pair2.Value = "othervalue";
-        Assert.Equal("othervalue", pair2.Value);
-        Assert.Equal("value", pair1.Value);
+        Assert.Equal("othervalue", pair2.Value.AsSpan());
+        Assert.Equal("value", pair1.Value.AsSpan());
     }
 
     [Fact]
@@ -581,7 +581,7 @@ public void GetUnescapedValue_ReturnsExpectedValue(string input, string expected
 
         var actual = header.GetUnescapedValue();
 
-        Assert.Equal(expected, actual);
+        Assert.Equal(expected.AsSpan(), actual);
     }
 
     [Theory]
@@ -602,7 +602,7 @@ public void SetAndEscapeValue_ReturnsExpectedValue(string input, string expected
 
         var actual = header.Value;
 
-        Assert.Equal(expected, actual);
+        Assert.Equal(expected.AsSpan(), actual);
     }
 
     [Theory]
@@ -628,7 +628,7 @@ public void GetAndSetEncodeValueRoundTrip_ReturnsExpectedValue(string input)
 
         var actual = header.Value;
 
-        Assert.Equal(input, actual);
+        Assert.Equal(input.AsSpan(), actual);
     }
 
     [Theory]
@@ -673,7 +673,7 @@ private void CheckInvalidTryParse(string? input)
     private static void CheckValue(string? value)
     {
         var nameValue = new NameValueHeaderValue("text", value);
-        Assert.Equal(value, nameValue.Value);
+        Assert.Equal(value.AsSpan(), nameValue.Value);
     }
 
     private static void AssertFormatException(string name, string? value)
diff --git a/src/Http/Headers/test/RangeConditionHeaderValueTest.cs b/src/Http/Headers/test/RangeConditionHeaderValueTest.cs
index b055ea0f67c0..e63f62e17516 100644
--- a/src/Http/Headers/test/RangeConditionHeaderValueTest.cs
+++ b/src/Http/Headers/test/RangeConditionHeaderValueTest.cs
@@ -115,7 +115,7 @@ public void Parse_SetOfValidValueStrings_ParsedCorrectly()
     [InlineData("W/Wed 09 Nov 1994 08:49:37 GMT")]
     [InlineData("\"x\",")]
     [InlineData("Wed 09 Nov 1994 08:49:37 GMT,")]
-    public void Parse_SetOfInvalidValueStrings_Throws(string input)
+    public void Parse_SetOfInvalidValueStrings_Throws(string? input)
     {
         Assert.Throws<FormatException>(() => RangeConditionHeaderValue.Parse(input));
     }
@@ -144,7 +144,7 @@ public void TryParse_SetOfValidValueStrings_ParsedCorrectly()
     [InlineData("W/Wed 09 Nov 1994 08:49:37 GMT")]
     [InlineData("\"x\",")]
     [InlineData("Wed 09 Nov 1994 08:49:37 GMT,")]
-    public void TryParse_SetOfInvalidValueStrings_ReturnsFalse(string input)
+    public void TryParse_SetOfInvalidValueStrings_ReturnsFalse(string? input)
     {
         Assert.False(RangeConditionHeaderValue.TryParse(input, out var result));
         Assert.Null(result);
diff --git a/src/Http/Headers/test/RangeHeaderValueTest.cs b/src/Http/Headers/test/RangeHeaderValueTest.cs
index 624c07dafbd1..1f2c60b1a81e 100644
--- a/src/Http/Headers/test/RangeHeaderValueTest.cs
+++ b/src/Http/Headers/test/RangeHeaderValueTest.cs
@@ -16,7 +16,7 @@ public void Unit_GetAndSetValidAndInvalidValues_MatchExpectation()
     {
         var range = new RangeHeaderValue();
         range.Unit = "myunit";
-        Assert.Equal("myunit", range.Unit);
+        Assert.Equal("myunit", range.Unit.AsSpan());
 
         Assert.Throws<ArgumentException>(() => range.Unit = null);
         Assert.Throws<ArgumentException>(() => range.Unit = "");
diff --git a/src/Http/Headers/test/RangeItemHeaderValueTest.cs b/src/Http/Headers/test/RangeItemHeaderValueTest.cs
index d9fb8bd33616..0d7e54ad4f81 100644
--- a/src/Http/Headers/test/RangeItemHeaderValueTest.cs
+++ b/src/Http/Headers/test/RangeItemHeaderValueTest.cs
@@ -119,7 +119,7 @@ public void TryParse_DifferentValidScenarios_AllReturnNonZero()
     [InlineData("-12345678901234567890123")] // >>Int64.MaxValue
     [InlineData("9999999999999999999-")] // 19-digit numbers outside the Int64 range.
     [InlineData("-9999999999999999999")] // 19-digit numbers outside the Int64 range.
-    public void TryParse_DifferentInvalidScenarios_AllReturnFalse(string input)
+    public void TryParse_DifferentInvalidScenarios_AllReturnFalse(string? input)
     {
         RangeHeaderValue? result;
         Assert.False(RangeHeaderValue.TryParse("byte=" + input, out result));
diff --git a/src/Http/Headers/test/SetCookieHeaderValueTest.cs b/src/Http/Headers/test/SetCookieHeaderValueTest.cs
index caa09b8925ff..eff008809559 100644
--- a/src/Http/Headers/test/SetCookieHeaderValueTest.cs
+++ b/src/Http/Headers/test/SetCookieHeaderValueTest.cs
@@ -318,8 +318,8 @@ public void SetCookieHeaderValue_CtorThrowsOnInvalidValue(string value)
     public void SetCookieHeaderValue_Ctor1_InitializesCorrectly()
     {
         var header = new SetCookieHeaderValue("cookie");
-        Assert.Equal("cookie", header.Name);
-        Assert.Equal(string.Empty, header.Value);
+        Assert.Equal("cookie", header.Name.AsSpan());
+        Assert.Equal(string.Empty, header.Value.AsSpan());
     }
 
     [Theory]
@@ -329,18 +329,18 @@ public void SetCookieHeaderValue_Ctor1_InitializesCorrectly()
     public void SetCookieHeaderValue_Ctor2InitializesCorrectly(string name, string value)
     {
         var header = new SetCookieHeaderValue(name, value);
-        Assert.Equal(name, header.Name);
-        Assert.Equal(value, header.Value);
+        Assert.Equal(name, header.Name.AsSpan());
+        Assert.Equal(value, header.Value.AsSpan());
     }
 
     [Fact]
     public void SetCookieHeaderValue_Value()
     {
         var cookie = new SetCookieHeaderValue("name");
-        Assert.Equal(string.Empty, cookie.Value);
+        Assert.Equal(string.Empty, cookie.Value.AsSpan());
 
         cookie.Value = "value1";
-        Assert.Equal("value1", cookie.Value);
+        Assert.Equal("value1", cookie.Value.AsSpan());
     }
 
     [Theory]
@@ -447,7 +447,7 @@ public void SetCookieHeaderValue_TryParseStrictList_AcceptsValidValues(IList<Set
 
     [Theory]
     [MemberData(nameof(ListWithInvalidSetCookieHeaderDataSet))]
-    public void SetCookieHeaderValue_ParseList_ExcludesInvalidValues(IList<SetCookieHeaderValue> cookies, string[] input)
+    public void SetCookieHeaderValue_ParseList_ExcludesInvalidValues(IList<SetCookieHeaderValue>? cookies, string[] input)
     {
         var results = SetCookieHeaderValue.ParseList(input);
         // ParseList always returns a list, even if empty. TryParseList may return null (via out).
@@ -456,7 +456,7 @@ public void SetCookieHeaderValue_ParseList_ExcludesInvalidValues(IList<SetCookie
 
     [Theory]
     [MemberData(nameof(ListWithInvalidSetCookieHeaderDataSet))]
-    public void SetCookieHeaderValue_TryParseList_ExcludesInvalidValues(IList<SetCookieHeaderValue> cookies, string[] input)
+    public void SetCookieHeaderValue_TryParseList_ExcludesInvalidValues(IList<SetCookieHeaderValue>? cookies, string[] input)
     {
         bool result = SetCookieHeaderValue.TryParseList(input, out var results);
         Assert.Equal(cookies, results);
@@ -467,7 +467,7 @@ public void SetCookieHeaderValue_TryParseList_ExcludesInvalidValues(IList<SetCoo
     [MemberData(nameof(ListWithInvalidSetCookieHeaderDataSet))]
     public void SetCookieHeaderValue_ParseStrictList_ThrowsForAnyInvalidValues(
 #pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-            IList<SetCookieHeaderValue> cookies,
+            IList<SetCookieHeaderValue>? cookies,
 #pragma warning restore xUnit1026 // Theory methods should use all of their parameters
             string[] input)
     {
@@ -478,7 +478,7 @@ public void SetCookieHeaderValue_ParseStrictList_ThrowsForAnyInvalidValues(
     [MemberData(nameof(ListWithInvalidSetCookieHeaderDataSet))]
     public void SetCookieHeaderValue_TryParseStrictList_FailsForAnyInvalidValues(
 #pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-            IList<SetCookieHeaderValue> cookies,
+            IList<SetCookieHeaderValue>? cookies,
 #pragma warning restore xUnit1026 // Theory methods should use all of their parameters
             string[] input)
     {
diff --git a/src/Http/Headers/test/StringWithQualityHeaderValueTest.cs b/src/Http/Headers/test/StringWithQualityHeaderValueTest.cs
index 6eb58feb965f..eca804eb581d 100644
--- a/src/Http/Headers/test/StringWithQualityHeaderValueTest.cs
+++ b/src/Http/Headers/test/StringWithQualityHeaderValueTest.cs
@@ -9,7 +9,7 @@ public class StringWithQualityHeaderValueTest
     public void Ctor_StringOnlyOverload_MatchExpectation()
     {
         var value = new StringWithQualityHeaderValue("token");
-        Assert.Equal("token", value.Value);
+        Assert.Equal("token", value.Value.AsSpan());
         Assert.Null(value.Quality);
 
         Assert.Throws<ArgumentException>(() => new StringWithQualityHeaderValue(null));
@@ -21,7 +21,7 @@ public void Ctor_StringOnlyOverload_MatchExpectation()
     public void Ctor_StringWithQualityOverload_MatchExpectation()
     {
         var value = new StringWithQualityHeaderValue("token", 0.5);
-        Assert.Equal("token", value.Value);
+        Assert.Equal("token", value.Value.AsSpan());
         Assert.Equal(0.5, value.Quality);
 
         Assert.Throws<ArgumentException>(() => new StringWithQualityHeaderValue(null, 0.1));
@@ -156,7 +156,7 @@ public void Parse_SetOfValidValueStrings_ParsedCorrectly()
     [InlineData("decimal_part_too_long;q=0.123456789")]
     [InlineData("decimal_part_too_long;q=0.123456789 ")]
     [InlineData("no_integer_part;q=.1")]
-    public void Parse_SetOfInvalidValueStrings_Throws(string input)
+    public void Parse_SetOfInvalidValueStrings_Throws(string? input)
     {
         Assert.Throws<FormatException>(() => StringWithQualityHeaderValue.Parse(input));
     }
diff --git a/src/Http/Http.Abstractions/src/HttpMethods.cs b/src/Http/Http.Abstractions/src/HttpMethods.cs
index 187591b4e3eb..3be3155db0d3 100644
--- a/src/Http/Http.Abstractions/src/HttpMethods.cs
+++ b/src/Http/Http.Abstractions/src/HttpMethods.cs
@@ -49,6 +49,10 @@ public static class HttpMethods
     /// </summary>
     public static readonly string Put = "PUT";
     /// <summary>
+    /// HTTP "QUERY" method.
+    /// </summary>
+    public static readonly string Query = "QUERY";
+    /// <summary>
     /// HTTP "TRACE" method.
     /// </summary>
     public static readonly string Trace = "TRACE";
@@ -149,6 +153,18 @@ public static bool IsPut(string method)
         return Equals(Put, method);
     }
 
+    /// <summary>
+    /// Returns a value that indicates if the HTTP request method is QUERY.
+    /// </summary>
+    /// <param name="method">The HTTP request method.</param>
+    /// <returns>
+    /// <see langword="true" /> if the method is QUERY; otherwise, <see langword="false" />.
+    /// </returns>
+    public static bool IsQuery(string method)
+    {
+        return Equals(Query, method);
+    }
+
     /// <summary>
     /// Returns a value that indicates if the HTTP request method is TRACE.
     /// </summary>
@@ -175,6 +191,7 @@ string _ when IsDelete(method) => Delete,
         string _ when IsOptions(method) => Options,
         string _ when IsHead(method) => Head,
         string _ when IsPatch(method) => Patch,
+        string _ when IsQuery(method) => Query,
         string _ when IsTrace(method) => Trace,
         string _ when IsConnect(method) => Connect,
         string _ => method
diff --git a/src/Http/Http.Abstractions/src/Metadata/DisableCookieRedirectMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/DisableCookieRedirectMetadata.cs
new file mode 100644
index 000000000000..d7aad7f5c217
--- /dev/null
+++ b/src/Http/Http.Abstractions/src/Metadata/DisableCookieRedirectMetadata.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Http.Metadata;
+
+/// <summary>
+/// Metadata that indicates the endpoint should disable cookie-based authentication redirects.
+/// When present, authentication handlers should prefer returning status codes over browser redirects.
+/// </summary>
+internal sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+{
+    /// <summary>
+    /// Singleton instance of <see cref="DisableCookieRedirectMetadata"/>.
+    /// </summary>
+    public static readonly DisableCookieRedirectMetadata Instance = new();
+
+    private DisableCookieRedirectMetadata()
+    {
+    }
+}
diff --git a/src/Http/Http.Abstractions/src/Metadata/IAllowCookieRedirectMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/IAllowCookieRedirectMetadata.cs
new file mode 100644
index 000000000000..63c0de5859e3
--- /dev/null
+++ b/src/Http/Http.Abstractions/src/Metadata/IAllowCookieRedirectMetadata.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Http.Metadata;
+
+/// <summary>
+/// Metadata that indicates the endpoint should allow cookie-based authentication redirects.
+/// This is normally the default behavior, but it exists to override <see cref="IDisableCookieRedirectMetadata"/> no matter the order.
+/// When present, the cookie authentication handler will prefer browser login or access denied redirects over 401 and 403 status codes.
+/// </summary>
+public interface IAllowCookieRedirectMetadata
+{
+}
diff --git a/src/Http/Http.Abstractions/src/Metadata/IDisableCookieRedirectMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/IDisableCookieRedirectMetadata.cs
new file mode 100644
index 000000000000..c9651833552a
--- /dev/null
+++ b/src/Http/Http.Abstractions/src/Metadata/IDisableCookieRedirectMetadata.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Http.Metadata;
+
+/// <summary>
+/// Metadata that indicates the endpoint should disable cookie-based authentication redirects
+/// typically because it is intended for API clients rather than direct browser navigation.
+///
+/// <see cref="IAllowCookieRedirectMetadata"/> overrides this no matter the order.
+///
+/// When present and not overridden, the cookie authentication handler will prefer using
+/// 401 and 403 status codes over redirecting to the login or access denied paths.
+/// </summary>
+public interface IDisableCookieRedirectMetadata
+{
+}
diff --git a/src/Http/Http.Abstractions/src/Metadata/IDisableValidationMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/IDisableValidationMetadata.cs
new file mode 100644
index 000000000000..f45eff5a09fe
--- /dev/null
+++ b/src/Http/Http.Abstractions/src/Metadata/IDisableValidationMetadata.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Http.Metadata;
+
+/// <summary>
+/// A marker interface which can be used to identify metadata that disables validation
+/// on a given endpoint.
+/// </summary>
+public interface IDisableValidationMetadata
+{
+}
diff --git a/src/Http/Http.Abstractions/src/Metadata/IProducesResponseTypeMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/IProducesResponseTypeMetadata.cs
index 92bc264271ba..494ae0fcd2b6 100644
--- a/src/Http/Http.Abstractions/src/Metadata/IProducesResponseTypeMetadata.cs
+++ b/src/Http/Http.Abstractions/src/Metadata/IProducesResponseTypeMetadata.cs
@@ -18,6 +18,11 @@ public interface IProducesResponseTypeMetadata
     /// </summary>
     int StatusCode { get; }
 
+    /// <summary>
+    /// Gets the description of the response.
+    /// </summary>
+    string? Description => null;
+
     /// <summary>
     /// Gets the content types supported by the metadata.
     /// </summary>
diff --git a/src/Http/Http.Abstractions/src/Metadata/IStatusCodePagesMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/ISkipStatusCodePagesMetadata.cs
similarity index 99%
rename from src/Http/Http.Abstractions/src/Metadata/IStatusCodePagesMetadata.cs
rename to src/Http/Http.Abstractions/src/Metadata/ISkipStatusCodePagesMetadata.cs
index 1594b3da76e0..fa1778feb96b 100644
--- a/src/Http/Http.Abstractions/src/Metadata/IStatusCodePagesMetadata.cs
+++ b/src/Http/Http.Abstractions/src/Metadata/ISkipStatusCodePagesMetadata.cs
@@ -9,4 +9,4 @@ namespace Microsoft.AspNetCore.Http.Metadata;
 /// </summary>
 public interface ISkipStatusCodePagesMetadata
 {
-}
+}
\ No newline at end of file
diff --git a/src/Http/Http.Abstractions/src/Metadata/ProducesResponseTypeMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/ProducesResponseTypeMetadata.cs
index edb1ab091dc0..2186b76be610 100644
--- a/src/Http/Http.Abstractions/src/Metadata/ProducesResponseTypeMetadata.cs
+++ b/src/Http/Http.Abstractions/src/Metadata/ProducesResponseTypeMetadata.cs
@@ -68,6 +68,11 @@ private ProducesResponseTypeMetadata(int statusCode, Type? type, IEnumerable<str
     /// </summary>
     public int StatusCode { get; private set; }
 
+    /// <summary>
+    /// Gets or sets the description of the response.
+    /// </summary>
+    public string? Description { get; set; }
+
     /// <summary>
     /// Gets or sets the content types associated with the response.
     /// </summary>
diff --git a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
index d383efa6a20e..37e17a0f0f49 100644
--- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
+++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj
@@ -35,7 +35,6 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Extensions" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Results" />
   </ItemGroup>
@@ -61,5 +60,6 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
 
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Abstractions.Tests" />
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks" />
   </ItemGroup>
 </Project>
diff --git a/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs b/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs
index 430a4dc279b1..8d0e1d93ed69 100644
--- a/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs
+++ b/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs
@@ -47,5 +47,5 @@ private HttpValidationProblemDetails(Dictionary<string, string[]> errors)
     /// Gets the validation errors associated with this instance of <see cref="HttpValidationProblemDetails"/>.
     /// </summary>
     [JsonPropertyName("errors")]
-    public IDictionary<string, string[]> Errors { get; set; } = new Dictionary<string, string[]>(StringComparer.Ordinal);
+    public IDictionary<string, string[]> Errors { get; set; }
 }
diff --git a/src/Http/Http.Abstractions/src/PublicAPI.Shipped.txt b/src/Http/Http.Abstractions/src/PublicAPI.Shipped.txt
index d6c04a9a103f..1cd1d06dde8b 100644
--- a/src/Http/Http.Abstractions/src/PublicAPI.Shipped.txt
+++ b/src/Http/Http.Abstractions/src/PublicAPI.Shipped.txt
@@ -274,10 +274,10 @@ Microsoft.AspNetCore.Http.HostString.HasValue.get -> bool
 Microsoft.AspNetCore.Http.HostString.Host.get -> string!
 Microsoft.AspNetCore.Http.HostString.HostString() -> void
 Microsoft.AspNetCore.Http.HostString.HostString(string! host, int port) -> void
-Microsoft.AspNetCore.Http.HostString.HostString(string! value) -> void
+Microsoft.AspNetCore.Http.HostString.HostString(string? value) -> void
 Microsoft.AspNetCore.Http.HostString.Port.get -> int?
 Microsoft.AspNetCore.Http.HostString.ToUriComponent() -> string!
-Microsoft.AspNetCore.Http.HostString.Value.get -> string!
+Microsoft.AspNetCore.Http.HostString.Value.get -> string?
 Microsoft.AspNetCore.Http.HttpContext
 Microsoft.AspNetCore.Http.HttpContext.HttpContext() -> void
 Microsoft.AspNetCore.Http.HttpMethods
@@ -294,6 +294,7 @@ Microsoft.AspNetCore.Http.HttpValidationProblemDetails.Errors.get -> System.Coll
 Microsoft.AspNetCore.Http.HttpValidationProblemDetails.Errors.set -> void
 Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails() -> void
 Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails(System.Collections.Generic.IDictionary<string!, string![]!>! errors) -> void
+Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors) -> void
 Microsoft.AspNetCore.Http.IBindableFromHttpContext<TSelf>
 Microsoft.AspNetCore.Http.IBindableFromHttpContext<TSelf>.BindAsync(Microsoft.AspNetCore.Http.HttpContext! context, System.Reflection.ParameterInfo! parameter) -> System.Threading.Tasks.ValueTask<TSelf?>
 Microsoft.AspNetCore.Http.IContentTypeHttpResult
@@ -344,6 +345,7 @@ Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata
 Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata.ContentTypes.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata.IsOptional.get -> bool
 Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata.RequestType.get -> System.Type?
+Microsoft.AspNetCore.Http.Metadata.IDisableHttpMetricsMetadata
 Microsoft.AspNetCore.Http.Metadata.IEndpointDescriptionMetadata
 Microsoft.AspNetCore.Http.Metadata.IEndpointDescriptionMetadata.Description.get -> string!
 Microsoft.AspNetCore.Http.Metadata.IEndpointMetadataProvider
@@ -374,6 +376,12 @@ Microsoft.AspNetCore.Http.Metadata.IFromQueryMetadata.Name.get -> string?
 Microsoft.AspNetCore.Http.Metadata.IFromRouteMetadata
 Microsoft.AspNetCore.Http.Metadata.IFromRouteMetadata.Name.get -> string?
 Microsoft.AspNetCore.Http.Metadata.IFromServiceMetadata
+Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata
+Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.HasBindAsync.get -> bool
+Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.HasTryParse.get -> bool
+Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.IsOptional.get -> bool
+Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.Name.get -> string!
+Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.ParameterInfo.get -> System.Reflection.ParameterInfo!
 Microsoft.AspNetCore.Http.Metadata.IProducesResponseTypeMetadata
 Microsoft.AspNetCore.Http.Metadata.IProducesResponseTypeMetadata.ContentTypes.get -> System.Collections.Generic.IEnumerable<string!>!
 Microsoft.AspNetCore.Http.Metadata.IProducesResponseTypeMetadata.StatusCode.get -> int
diff --git a/src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt b/src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt
index 0d2aab25f97d..6ccd592237b8 100644
--- a/src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt
@@ -1,13 +1,9 @@
 #nullable enable
-*REMOVED*Microsoft.AspNetCore.Http.HostString.HostString(string! value) -> void
-Microsoft.AspNetCore.Http.HostString.HostString(string? value) -> void
-*REMOVED*Microsoft.AspNetCore.Http.HostString.Value.get -> string!
-Microsoft.AspNetCore.Http.HostString.Value.get -> string?
-Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors) -> void
-Microsoft.AspNetCore.Http.Metadata.IDisableHttpMetricsMetadata
-Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata
-Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.HasBindAsync.get -> bool
-Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.HasTryParse.get -> bool
-Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.IsOptional.get -> bool
-Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.Name.get -> string!
-Microsoft.AspNetCore.Http.Metadata.IParameterBindingMetadata.ParameterInfo.get -> System.Reflection.ParameterInfo!
+Microsoft.AspNetCore.Http.Metadata.IAllowCookieRedirectMetadata
+Microsoft.AspNetCore.Http.Metadata.IDisableCookieRedirectMetadata
+Microsoft.AspNetCore.Http.Metadata.IDisableValidationMetadata
+Microsoft.AspNetCore.Http.ProducesResponseTypeMetadata.Description.get -> string?
+Microsoft.AspNetCore.Http.ProducesResponseTypeMetadata.Description.set -> void
+Microsoft.AspNetCore.Http.Metadata.IProducesResponseTypeMetadata.Description.get -> string?
+static Microsoft.AspNetCore.Http.HttpMethods.IsQuery(string! method) -> bool
+static readonly Microsoft.AspNetCore.Http.HttpMethods.Query -> string!
diff --git a/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs b/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs
index 4d6948ff9e3c..3e2cccbb422c 100644
--- a/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs
+++ b/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs
@@ -208,7 +208,6 @@ public RouteValueDictionary(RouteValueDictionary? dictionary)
             _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
         }
     }
-#endif
 
     [MemberNotNull(nameof(_arrayStorage))]
     private void Initialize(IEnumerable<KeyValuePair<string, string?>> stringValueEnumerable)
@@ -221,21 +220,9 @@ private void Initialize(IEnumerable<KeyValuePair<string, string?>> stringValueEn
         }
     }
 
-    [MemberNotNull(nameof(_arrayStorage))]
-    private void Initialize(IEnumerable<KeyValuePair<string, object?>> keyValueEnumerable)
-    {
-        _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
-
-        foreach (var kvp in keyValueEnumerable)
-        {
-            Add(kvp.Key, kvp.Value);
-        }
-    }
-
     [MemberNotNull(nameof(_arrayStorage))]
     private void Initialize(RouteValueDictionary dictionary)
     {
-#if !COMPONENTS
         if (dictionary._propertyStorage != null)
         {
             // PropertyStorage is immutable so we can just copy it.
@@ -244,7 +231,6 @@ private void Initialize(RouteValueDictionary dictionary)
             _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
             return;
         }
-#endif
 
         var count = dictionary._count;
         if (count > 0)
@@ -260,6 +246,18 @@ private void Initialize(RouteValueDictionary dictionary)
             _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
         }
     }
+#endif
+
+    [MemberNotNull(nameof(_arrayStorage))]
+    private void Initialize(IEnumerable<KeyValuePair<string, object?>> keyValueEnumerable)
+    {
+        _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
+
+        foreach (var kvp in keyValueEnumerable)
+        {
+            Add(kvp.Key, kvp.Value);
+        }
+    }
 
     /// <inheritdoc />
     public object? this[string key]
diff --git a/src/Http/Http.Abstractions/test/CookieBuilderTests.cs b/src/Http/Http.Abstractions/test/CookieBuilderTests.cs
index ce171a6ec527..25203570c16a 100644
--- a/src/Http/Http.Abstractions/test/CookieBuilderTests.cs
+++ b/src/Http/Http.Abstractions/test/CookieBuilderTests.cs
@@ -64,8 +64,8 @@ public void CookieBuilder_Extensions_Added()
         Assert.Contains("key=value", options.Extensions);
 
         var cookie = options.CreateCookieHeader("name", "value");
-        Assert.Equal("name", cookie.Name);
-        Assert.Equal("value", cookie.Value);
+        Assert.Equal("name", cookie.Name.AsSpan());
+        Assert.Equal("value", cookie.Value.AsSpan());
         Assert.Equal(2, cookie.Extensions.Count);
         Assert.Contains("simple", cookie.Extensions);
         Assert.Contains("key=value", cookie.Extensions);
diff --git a/src/Http/Http.Abstractions/test/HostStringTest.cs b/src/Http/Http.Abstractions/test/HostStringTest.cs
index 070636aaa8c7..466842824a70 100644
--- a/src/Http/Http.Abstractions/test/HostStringTest.cs
+++ b/src/Http/Http.Abstractions/test/HostStringTest.cs
@@ -27,7 +27,7 @@ public void CtorThrows_IfPortIsNotGreaterThanZero(int port)
     [InlineData("1.2.3.4:5000", "1.2.3.4")]
     [InlineData("[2001:db8:a0b:12f0::1]:5000", "[2001:db8:a0b:12f0::1]")]
     [InlineData("本地主機:5000", "本地主機")]
-    public void Domain_ExtractsHostFromValue(string sourceValue, string expectedDomain)
+    public void Domain_ExtractsHostFromValue(string? sourceValue, string expectedDomain)
     {
         // Arrange
         var hostString = new HostString(sourceValue);
diff --git a/src/Http/Http.Abstractions/test/HttpMethodslTests.cs b/src/Http/Http.Abstractions/test/HttpMethodslTests.cs
index c9d79ecbd6f6..c22cb5a92689 100644
--- a/src/Http/Http.Abstractions/test/HttpMethodslTests.cs
+++ b/src/Http/Http.Abstractions/test/HttpMethodslTests.cs
@@ -20,6 +20,7 @@ public void CanonicalizedValue_Success()
                 (new string[] { "CONNECT", "Connect", "connect" }, HttpMethods.Connect),
                 (new string[] { "OPTIONS", "Options", "options" }, HttpMethods.Options),
                 (new string[] { "PATCH", "Patch", "patch" }, HttpMethods.Patch),
+                (new string[] { "QUERY", "Query", "query" }, HttpMethods.Query),
                 (new string[] { "TRACE", "Trace", "trace" }, HttpMethods.Trace)
             };
 
diff --git a/src/Http/Http.Abstractions/test/PathStringTests.cs b/src/Http/Http.Abstractions/test/PathStringTests.cs
index 7b1ec3782e97..30aa989ed92a 100644
--- a/src/Http/Http.Abstractions/test/PathStringTests.cs
+++ b/src/Http/Http.Abstractions/test/PathStringTests.cs
@@ -57,7 +57,7 @@ public void HashCode_CheckNullAndEmptyHaveSameHashcodes()
     [Theory]
     [InlineData(null, null)]
     [InlineData("", null)]
-    public void AddPathString_HandlesNullAndEmptyStrings(string appString, string concatString)
+    public void AddPathString_HandlesNullAndEmptyStrings(string? appString, string? concatString)
     {
         // Arrange
         var appPath = new PathString(appString);
@@ -77,7 +77,7 @@ public void AddPathString_HandlesNullAndEmptyStrings(string appString, string co
     [InlineData("/", "/test", "/test")]
     [InlineData("/myapp/", "/test/bar", "/myapp/test/bar")]
     [InlineData("/myapp/", "/test/bar/", "/myapp/test/bar/")]
-    public void AddPathString_HandlesLeadingAndTrailingSlashes(string appString, string concatString, string expected)
+    public void AddPathString_HandlesLeadingAndTrailingSlashes(string appString, string? concatString, string expected)
     {
         // Arrange
         var appPath = new PathString(appString);
diff --git a/src/Http/Http.Abstractions/test/QueryStringTests.cs b/src/Http/Http.Abstractions/test/QueryStringTests.cs
index cc92e97773c9..9faea85a7bff 100644
--- a/src/Http/Http.Abstractions/test/QueryStringTests.cs
+++ b/src/Http/Http.Abstractions/test/QueryStringTests.cs
@@ -54,9 +54,9 @@ public void ToString_EncodesHash()
     [InlineData("", "value", "?=value")]
     [InlineData("", "", "?=")]
     [InlineData("", null, "?=")]
-    public void CreateNameValue_Success(string name, string value, string expected)
+    public void CreateNameValue_Success(string name, string? value, string expected)
     {
-        var query = QueryString.Create(name, value);
+        var query = QueryString.Create(name, value!);
         Assert.Equal(expected, query.Value);
     }
 
@@ -98,7 +98,7 @@ public void CreateFromListStringValues_Success()
     [InlineData("?name1=value1", "", "?name1=value1")]
     [InlineData("?name1=value1", "?", "?name1=value1")]
     [InlineData("?name1=value1", "?name2=value2", "?name1=value1&name2=value2")]
-    public void AddQueryString_Success(string query1, string query2, string expected)
+    public void AddQueryString_Success(string? query1, string? query2, string? expected)
     {
         var q1 = new QueryString(query1);
         var q2 = new QueryString(query2);
@@ -120,10 +120,10 @@ public void AddQueryString_Success(string query1, string query2, string expected
     [InlineData("?name1=value1", "", null, "?name1=value1&=")]
     [InlineData("?name1=value1", "name2", "", "?name1=value1&name2=")]
     [InlineData("?name1=value1", "name2", null, "?name1=value1&name2=")]
-    public void AddNameValue_Success(string query1, string name2, string value2, string expected)
+    public void AddNameValue_Success(string query1, string name2, string? value2, string expected)
     {
         var q1 = new QueryString(query1);
-        var q2 = q1.Add(name2, value2);
+        var q2 = q1.Add(name2, value2!);
         Assert.Equal(expected, q2.Value);
     }
 
diff --git a/src/Http/Http.Abstractions/test/UsePathBaseExtensionsTests.cs b/src/Http/Http.Abstractions/test/UsePathBaseExtensionsTests.cs
index c5c3b86f312c..21a918335ee2 100644
--- a/src/Http/Http.Abstractions/test/UsePathBaseExtensionsTests.cs
+++ b/src/Http/Http.Abstractions/test/UsePathBaseExtensionsTests.cs
@@ -13,7 +13,7 @@ public class UsePathBaseExtensionsTests
     [InlineData(null)]
     [InlineData("")]
     [InlineData("/")]
-    public void EmptyOrNullPathBase_DoNotAddMiddleware(string pathBase)
+    public void EmptyOrNullPathBase_DoNotAddMiddleware(string? pathBase)
     {
         // Arrange
         var useCalled = false;
diff --git a/src/Http/Http.Extensions/gen/DiagnosticDescriptors.cs b/src/Http/Http.Extensions/gen/DiagnosticDescriptors.cs
deleted file mode 100644
index 53842cfcd9ce..000000000000
--- a/src/Http/Http.Extensions/gen/DiagnosticDescriptors.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.AspNetCore.Http.RequestDelegateGenerator;
-
-internal static class DiagnosticDescriptors
-{
-    private static string GetHelpLinkUrl(string id) => $"https://learn.microsoft.com/aspnet/core/fundamentals/aot/request-delegate-generator/diagnostics/{id}";
-
-    public static DiagnosticDescriptor UnableToResolveRoutePattern { get; } = new(
-        "RDG001",
-        new LocalizableResourceString(nameof(Resources.UnableToResolveRoutePattern_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.UnableToResolveRoutePattern_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG001"));
-
-    public static DiagnosticDescriptor UnableToResolveMethod { get; } = new(
-        "RDG002",
-        new LocalizableResourceString(nameof(Resources.UnableToResolveMethod_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.UnableToResolveMethod_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG002"));
-
-    public static DiagnosticDescriptor UnableToResolveParameterDescriptor { get; } = new(
-        "RDG003",
-        new LocalizableResourceString(nameof(Resources.UnableToResolveParameter_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.UnableToResolveParameter_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG003"));
-
-    public static DiagnosticDescriptor UnableToResolveAnonymousReturnType { get; } = new(
-        "RDG004",
-        new LocalizableResourceString(nameof(Resources.UnableToResolveAnonymousReturnType_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.UnableToResolveAnonymousReturnType_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG004"));
-
-    public static DiagnosticDescriptor InvalidAsParametersAbstractType { get; } = new(
-        "RDG005",
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersAbstractType_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersAbstractType_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG005"));
-
-    public static DiagnosticDescriptor InvalidAsParametersSignature { get; } = new(
-        "RDG006",
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersSignature_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersSignature_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG006"));
-
-    public static DiagnosticDescriptor InvalidAsParametersNoConstructorFound { get; } = new(
-        "RDG007",
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersNoConstructorFound_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersNoConstructorFound_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG007"));
-
-    public static DiagnosticDescriptor InvalidAsParametersSingleConstructorOnly { get; } = new(
-        "RDG008",
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersSingleConstructorOnly_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersSingleConstructorOnly_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG008"));
-
-    public static DiagnosticDescriptor InvalidAsParametersNested { get; } = new(
-        "RDG009",
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersNested_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersNested_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG009"));
-
-    public static DiagnosticDescriptor InvalidAsParametersNullable { get; } = new(
-        "RDG010",
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersNullable_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InvalidAsParametersNullable_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG010"));
-
-    public static DiagnosticDescriptor TypeParametersNotSupported { get; } = new(
-        "RDG011",
-        new LocalizableResourceString(nameof(Resources.TypeParametersNotSupported_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.TypeParametersNotSupported_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG011"));
-
-    public static DiagnosticDescriptor InaccessibleTypesNotSupported { get; } = new(
-        "RDG012",
-        new LocalizableResourceString(nameof(Resources.InaccessibleTypesNotSupported_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.InaccessibleTypesNotSupported_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG012"));
-
-    public static DiagnosticDescriptor KeyedAndNotKeyedServiceAttributesNotSupported { get; } = new(
-        "RDG013",
-        new LocalizableResourceString(nameof(Resources.KeyedAndNotKeyedServiceAttributesNotSupported_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.KeyedAndNotKeyedServiceAttributesNotSupported_Message), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true,
-        helpLinkUri: GetHelpLinkUrl("RDG013"));
-}
diff --git a/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/DiagnosticDescriptors.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/DiagnosticDescriptors.cs
new file mode 100644
index 000000000000..0aebd1761f4c
--- /dev/null
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/DiagnosticDescriptors.cs
@@ -0,0 +1,140 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Http.RequestDelegateGenerator;
+
+internal static class DiagnosticDescriptors
+{
+    private const string Usage = "Usage";
+
+    private static LocalizableResourceString CreateLocalizableResourceString(string resource) => new(resource, Resources.ResourceManager, typeof(Resources));
+    private static string GetHelpLinkUrl(string id) => $"https://learn.microsoft.com/aspnet/core/fundamentals/aot/request-delegate-generator/diagnostics/{id}";
+
+    public static DiagnosticDescriptor UnableToResolveRoutePattern { get; } = new(
+        "RDG001",
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveRoutePattern_Title)),
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveRoutePattern_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG001"));
+
+    public static DiagnosticDescriptor UnableToResolveMethod { get; } = new(
+        "RDG002",
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveMethod_Title)),
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveMethod_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG002"));
+
+    public static DiagnosticDescriptor UnableToResolveParameterDescriptor { get; } = new(
+        "RDG003",
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveParameter_Title)),
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveParameter_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG003"));
+
+    public static DiagnosticDescriptor UnableToResolveAnonymousReturnType { get; } = new(
+        "RDG004",
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveAnonymousReturnType_Title)),
+        CreateLocalizableResourceString(nameof(Resources.UnableToResolveAnonymousReturnType_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG004"));
+
+    public static DiagnosticDescriptor InvalidAsParametersAbstractType { get; } = new(
+        "RDG005",
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersAbstractType_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersAbstractType_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG005"));
+
+    public static DiagnosticDescriptor InvalidAsParametersSignature { get; } = new(
+        "RDG006",
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersSignature_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersSignature_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG006"));
+
+    public static DiagnosticDescriptor InvalidAsParametersNoConstructorFound { get; } = new(
+        "RDG007",
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersNoConstructorFound_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersNoConstructorFound_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG007"));
+
+    public static DiagnosticDescriptor InvalidAsParametersSingleConstructorOnly { get; } = new(
+        "RDG008",
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersSingleConstructorOnly_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersSingleConstructorOnly_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG008"));
+
+    public static DiagnosticDescriptor InvalidAsParametersNested { get; } = new(
+        "RDG009",
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersNested_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersNested_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG009"));
+
+    public static DiagnosticDescriptor InvalidAsParametersNullable { get; } = new(
+        "RDG010",
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersNullable_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InvalidAsParametersNullable_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG010"));
+
+    public static DiagnosticDescriptor TypeParametersNotSupported { get; } = new(
+        "RDG011",
+        CreateLocalizableResourceString(nameof(Resources.TypeParametersNotSupported_Title)),
+        CreateLocalizableResourceString(nameof(Resources.TypeParametersNotSupported_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG011"));
+
+    public static DiagnosticDescriptor InaccessibleTypesNotSupported { get; } = new(
+        "RDG012",
+        CreateLocalizableResourceString(nameof(Resources.InaccessibleTypesNotSupported_Title)),
+        CreateLocalizableResourceString(nameof(Resources.InaccessibleTypesNotSupported_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG012"));
+
+    public static DiagnosticDescriptor KeyedAndNotKeyedServiceAttributesNotSupported { get; } = new(
+        "RDG013",
+        CreateLocalizableResourceString(nameof(Resources.KeyedAndNotKeyedServiceAttributesNotSupported_Title)),
+        CreateLocalizableResourceString(nameof(Resources.KeyedAndNotKeyedServiceAttributesNotSupported_Message)),
+        Usage,
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG013"));
+
+    public static DiagnosticDescriptor InvalidAsParametersEnumerableType { get; } = new(
+        "RDG014",
+        new LocalizableResourceString(nameof(Resources.InvalidAsParametersEnumerableType_Title), Resources.ResourceManager, typeof(Resources)),
+        new LocalizableResourceString(nameof(Resources.InvalidAsParametersEnumerableType_Message), Resources.ResourceManager, typeof(Resources)),
+        "Usage",
+        DiagnosticSeverity.Warning,
+        isEnabledByDefault: true,
+        helpLinkUri: GetHelpLinkUrl("RDG014"));
+}
diff --git a/src/Http/Http.Extensions/gen/GeneratorSteps.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/GeneratorSteps.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/GeneratorSteps.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/GeneratorSteps.cs
diff --git a/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj
similarity index 100%
rename from src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj
diff --git a/src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGenerator.cs
similarity index 98%
rename from src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGenerator.cs
index f4e2ad0e8e33..6823c8746f02 100644
--- a/src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGenerator.cs
@@ -248,7 +248,12 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
                 if (hasFormBody)
                 {
-                    codeWriter.WriteLine(RequestDelegateGeneratorSources.AntiforgeryMetadataType);
+                    codeWriter.WriteLine(RequestDelegateGeneratorSources.AntiforgeryMetadataClass);
+                }
+
+                if (hasJsonBody || hasResponseMetadata)
+                {
+                    codeWriter.WriteLine(RequestDelegateGeneratorSources.DisableCookieRedirectMetadataClass);
                 }
 
                 if (hasFormBody || hasJsonBody || hasResponseMetadata)
diff --git a/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGeneratorSources.cs
similarity index 96%
rename from src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGeneratorSources.cs
index d7c7a480446c..4c0e6609382f 100644
--- a/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGeneratorSources.cs
@@ -479,19 +479,39 @@ internal ParameterBindingMetadata(
     }
 """;
 
-    public static string AntiforgeryMetadataType = """
-file sealed class AntiforgeryMetadata : IAntiforgeryMetadata
-{
-    public static readonly IAntiforgeryMetadata ValidationRequired = new AntiforgeryMetadata(true);
-
-    public AntiforgeryMetadata(bool requiresValidation)
+    public static string AntiforgeryMetadataClass = """
+    file sealed class AntiforgeryMetadata : IAntiforgeryMetadata
     {
-        RequiresValidation = requiresValidation;
+        public static readonly IAntiforgeryMetadata ValidationRequired = new AntiforgeryMetadata(true);
+
+        public AntiforgeryMetadata(bool requiresValidation)
+        {
+            RequiresValidation = requiresValidation;
+        }
+
+        public bool RequiresValidation { get; }
     }
+""";
 
-    public bool RequiresValidation { get; }
-}
+    public static string DisableCookieRedirectMetadataClass = """
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
 """;
+
     public static string GetGeneratedRouteBuilderExtensionsSource(string endpoints, string helperMethods, string helperTypes, ImmutableHashSet<string> verbs) => $$"""
 {{SourceHeader}}
 
diff --git a/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSuppressor.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGeneratorSuppressor.cs
similarity index 82%
rename from src/Http/Http.Extensions/gen/RequestDelegateGeneratorSuppressor.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGeneratorSuppressor.cs
index cbde9e7e4373..6840634560e6 100644
--- a/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSuppressor.cs
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/RequestDelegateGeneratorSuppressor.cs
@@ -46,8 +46,21 @@ public override void ReportSuppressions(SuppressionAnalysisContext context)
                 ? diagnostic.AdditionalLocations[0]
                 : diagnostic.Location;
 
-            if (location.SourceTree is not { } sourceTree
-                || sourceTree.GetRoot().FindNode(location.SourceSpan) is not InvocationExpressionSyntax node
+            if (location.SourceTree is not { } sourceTree)
+            {
+                continue;
+            }
+
+            // The trim analyzer changed from warning on the InvocationExpression to the MemberAccessExpression in https://github.com/dotnet/runtime/pull/110086.
+            // To account for this, we need to check if the location is an InvocationExpression or a child of an InvocationExpression.
+            var node = sourceTree.GetRoot().FindNode(location.SourceSpan) switch
+            {
+                InvocationExpressionSyntax s => s,
+                { Parent: InvocationExpressionSyntax s } => s,
+                _ => null,
+            };
+
+            if (node is null
                 || !node.TryGetMapMethodName(out var method)
                 || !InvocationOperationExtensions.KnownMethods.Contains(method))
             {
diff --git a/src/Http/Http.Extensions/gen/Resources.resx b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Resources.resx
similarity index 96%
rename from src/Http/Http.Extensions/gen/Resources.resx
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Resources.resx
index ba39a95278ac..a83fbe4a38df 100644
--- a/src/Http/Http.Extensions/gen/Resources.resx
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Resources.resx
@@ -195,4 +195,10 @@
   <data name="KeyedAndNotKeyedServiceAttributesNotSupported_Message" xml:space="preserve">
     <value>The [FromKeyedServices] attribute is not supported on parameters that are also annotated with IFromServiceMetadata. For more information, please see https://aka.ms/aspnet/rdg-known-issues</value>
   </data>
+  <data name="InvalidAsParametersEnumerableType_Title" xml:space="preserve">
+    <value>Invalid enumerable type</value>
+  </data>
+  <data name="InvalidAsParametersEnumerableType_Message" xml:space="preserve">
+    <value>The enumerable type '{0}' is not supported. For more information, please see https://aka.ms/aspnet/rdg-known-issues</value>
+  </data>
 </root>
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/DiagnosticEmitter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/DiagnosticEmitter.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/DiagnosticEmitter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/DiagnosticEmitter.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EmitterConstants.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EmitterConstants.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EmitterConstants.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EmitterConstants.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EmitterContext.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EmitterContext.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EmitterContext.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EmitterContext.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EmitterExtensions.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EmitterExtensions.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EmitterExtensions.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EmitterExtensions.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointEmitter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointEmitter.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointEmitter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointEmitter.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointJsonPreparationEmitter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointJsonPreparationEmitter.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointJsonPreparationEmitter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointJsonPreparationEmitter.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs
similarity index 82%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs
index 3d20278757ae..399c61755280 100644
--- a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs
@@ -18,9 +18,12 @@ internal static void EmitQueryOrHeaderParameterPreparation(this EndpointParamete
     {
         codeWriter.WriteLine(endpointParameter.EmitParameterDiagnosticComment());
 
-        var assigningCode = endpointParameter.Source is EndpointParameterSource.Header
-            ? $"httpContext.Request.Headers[\"{endpointParameter.LookupName}\"]"
-            : $"httpContext.Request.Query[\"{endpointParameter.LookupName}\"]";
+        var assigningCode = (endpointParameter.Source, endpointParameter.IsArray) switch
+        {
+            (EndpointParameterSource.Header, true) => $"httpContext.Request.Headers.GetCommaSeparatedValues(\"{endpointParameter.LookupName}\")",
+            (EndpointParameterSource.Header, false) => $"httpContext.Request.Headers[\"{endpointParameter.LookupName}\"]",
+            _ => $"httpContext.Request.Query[\"{endpointParameter.LookupName}\"]"
+        };
         codeWriter.WriteLine($"var {endpointParameter.EmitAssigningCodeResult()} = {assigningCode};");
 
         // If we are not optional, then at this point we can just assign the string value to the handler argument,
@@ -89,13 +92,26 @@ internal static void EmitFormParameterPreparation(this EndpointParameter endpoin
 
     internal static void EmitParsingBlock(this EndpointParameter endpointParameter, CodeWriter codeWriter)
     {
+        // parsable array
         if (endpointParameter.IsArray && endpointParameter.IsParsable)
         {
-            codeWriter.WriteLine($"{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)} {endpointParameter.EmitHandlerArgument()} = new {endpointParameter.ElementType.ToDisplayString(EmitterConstants.DisplayFormat)}[{endpointParameter.EmitTempArgument()}.Length];");
+            var createArray = $"new {endpointParameter.ElementType.ToDisplayString(EmitterConstants.DisplayFormat)}[{endpointParameter.EmitTempArgument()}.Length]";
+
+            // we assign a null to result parameter if it's optional array, otherwise we create new array immediately
+            codeWriter.WriteLine($"{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)} {endpointParameter.EmitHandlerArgument()} = {createArray};");
+
             codeWriter.WriteLine($"for (var i = 0; i < {endpointParameter.EmitTempArgument()}.Length; i++)");
             codeWriter.StartBlock();
             codeWriter.WriteLine($"var element = {endpointParameter.EmitTempArgument()}[i];");
-            endpointParameter.ParsingBlockEmitter(codeWriter, "element", "parsed_element");
+
+            // emit parsing block for current array element
+            codeWriter.WriteLine($$"""if (!{{endpointParameter.PreferredTryParseInvocation("element", "parsed_element")}})""");
+            codeWriter.StartBlock();
+            codeWriter.WriteLine("if (!string.IsNullOrEmpty(element))");
+            codeWriter.StartBlock();
+            EmitLogOrThrowException(endpointParameter, codeWriter, "element");
+            codeWriter.EndBlock();
+            codeWriter.EndBlock();
 
             // In cases where we are dealing with an array of parsable nullables we need to substitute
             // empty strings for null values.
@@ -109,19 +125,69 @@ internal static void EmitParsingBlock(this EndpointParameter endpointParameter,
             }
             codeWriter.EndBlock();
         }
-        else if (endpointParameter.IsArray && !endpointParameter.IsParsable)
+        // array fallback
+        else if (endpointParameter.IsArray)
         {
             codeWriter.WriteLine($"{endpointParameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {endpointParameter.EmitHandlerArgument()} = {endpointParameter.EmitTempArgument()}!;");
         }
-        else if (!endpointParameter.IsArray && endpointParameter.IsParsable)
+        // parsable single
+        else if (endpointParameter.IsParsable)
         {
-            endpointParameter.ParsingBlockEmitter(codeWriter, endpointParameter.EmitTempArgument(), endpointParameter.EmitParsedTempArgument());
+            var temp_argument = endpointParameter.EmitTempArgument();
+            var output_argument = endpointParameter.EmitParsedTempArgument();
+
+            // emit parsing block for optional OR nullable values
+            if (endpointParameter.IsOptional || endpointParameter.Type.NullableAnnotation == NullableAnnotation.Annotated)
+            {
+                var temp_argument_parsed_non_nullable = $"{temp_argument}_parsed_non_nullable";
+
+                codeWriter.WriteLine($"""{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)} {output_argument} = default;""");
+                codeWriter.WriteLine($"""if ({endpointParameter.PreferredTryParseInvocation(temp_argument, temp_argument_parsed_non_nullable)})""");
+                codeWriter.StartBlock();
+                codeWriter.WriteLine($"""{output_argument} = {temp_argument_parsed_non_nullable};""");
+                codeWriter.EndBlock();
+                codeWriter.WriteLine($"""else if (string.IsNullOrEmpty({temp_argument}))""");
+                codeWriter.StartBlock();
+                codeWriter.WriteLine($"""{output_argument} = {endpointParameter.DefaultValue};""");
+                codeWriter.EndBlock();
+                codeWriter.WriteLine("else");
+                codeWriter.StartBlock();
+                codeWriter.WriteLine("wasParamCheckFailure = true;");
+                codeWriter.EndBlock();
+            }
+            // parsing block for non-nullable required parameters
+            else
+            {
+                codeWriter.WriteLine($$"""if (!{{endpointParameter.PreferredTryParseInvocation(temp_argument, output_argument)}})""");
+                codeWriter.StartBlock();
+                codeWriter.WriteLine($"if (!string.IsNullOrEmpty({temp_argument}))");
+                codeWriter.StartBlock();
+                EmitLogOrThrowException(endpointParameter, codeWriter, temp_argument);
+                codeWriter.EndBlock();
+                codeWriter.EndBlock();
+            }
+
             codeWriter.WriteLine($"{endpointParameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {endpointParameter.EmitHandlerArgument()} = {endpointParameter.EmitParsedTempArgument()}!;");
         }
-        else // Not parsable, not an array.
+        // Not parsable, not an array.
+        else
         {
             codeWriter.WriteLine($"{endpointParameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {endpointParameter.EmitHandlerArgument()} = {endpointParameter.EmitTempArgument()}!;");
         }
+
+        static void EmitLogOrThrowException(EndpointParameter parameter, CodeWriter writer, string inputArgument)
+        {
+            if (parameter.IsArray && parameter.ElementType.NullableAnnotation == NullableAnnotation.Annotated)
+            {
+                writer.WriteLine("wasParamCheckFailure = true;");
+                writer.WriteLine($@"logOrThrowExceptionHelper.RequiredParameterNotProvided({SymbolDisplay.FormatLiteral(parameter.Type.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat), true)}, {SymbolDisplay.FormatLiteral(parameter.SymbolName, true)}, {SymbolDisplay.FormatLiteral(parameter.ToMessageString(), true)});");
+            }
+            else
+            {
+                writer.WriteLine($@"logOrThrowExceptionHelper.ParameterBindingFailed({SymbolDisplay.FormatLiteral(parameter.Type.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat), true)}, {SymbolDisplay.FormatLiteral(parameter.SymbolName, true)}, {inputArgument});");
+                writer.WriteLine("wasParamCheckFailure = true;");
+            }
+        }
     }
 
     internal static void EmitRouteParameterPreparation(this EndpointParameter endpointParameter, CodeWriter codeWriter)
@@ -326,8 +392,8 @@ internal static void EmitServiceParameterPreparation(this EndpointParameter endp
         // Unlike other scenarios, this will result in an exception being thrown
         // at runtime.
         var assigningCode = endpointParameter.IsOptional ?
-            $"httpContext.RequestServices.GetService<{endpointParameter.Type}>();" :
-            $"httpContext.RequestServices.GetRequiredService<{endpointParameter.Type}>()";
+            $"httpContext.RequestServices.GetService<{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)}>();" :
+            $"httpContext.RequestServices.GetRequiredService<{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)}>()";
         codeWriter.WriteLine($"var {endpointParameter.EmitHandlerArgument()} = {assigningCode};");
     }
 
@@ -341,8 +407,8 @@ internal static void EmitKeyedServiceParameterPreparation(this EndpointParameter
         codeWriter.EndBlock();
 
         var assigningCode = endpointParameter.IsOptional ?
-            $"httpContext.RequestServices.GetKeyedService<{endpointParameter.Type}>({endpointParameter.KeyedServiceKey});" :
-            $"httpContext.RequestServices.GetRequiredKeyedService<{endpointParameter.Type}>({endpointParameter.KeyedServiceKey})";
+            $"httpContext.RequestServices.GetKeyedService<{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)}>({endpointParameter.KeyedServiceKey});" :
+            $"httpContext.RequestServices.GetRequiredKeyedService<{endpointParameter.Type.ToDisplayString(EmitterConstants.DisplayFormat)}>({endpointParameter.KeyedServiceKey})";
         codeWriter.WriteLine($"var {endpointParameter.EmitHandlerArgument()} = {assigningCode};");
     }
 
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Endpoint.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Endpoint.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Endpoint.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Endpoint.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointDelegateComparer.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointDelegateComparer.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointDelegateComparer.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointDelegateComparer.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointHttpMethodComparer.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointHttpMethodComparer.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointHttpMethodComparer.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointHttpMethodComparer.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointParameter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointParameter.cs
similarity index 88%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointParameter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointParameter.cs
index 1eca598bc655..301e1d524d71 100644
--- a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointParameter.cs
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointParameter.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
@@ -10,7 +11,6 @@
 using Microsoft.AspNetCore.Analyzers.Infrastructure;
 using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
 using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
-using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel.Emitters;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using WellKnownType = Microsoft.AspNetCore.App.Analyzers.Infrastructure.WellKnownTypeData.WellKnownType;
@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerM
 
 internal class EndpointParameter
 {
-    public EndpointParameter(Endpoint endpoint, IParameterSymbol parameter, WellKnownTypes wellKnownTypes): this(endpoint, parameter.Type, parameter.Name, wellKnownTypes)
+    public EndpointParameter(Endpoint endpoint, IParameterSymbol parameter, WellKnownTypes wellKnownTypes) : this(endpoint, parameter.Type, parameter.Name, wellKnownTypes)
     {
         Ordinal = parameter.Ordinal;
         IsOptional = parameter.IsOptional();
@@ -71,22 +71,22 @@ private void ProcessEndpointParameterSource(Endpoint endpoint, ISymbol symbol, I
         {
             Source = EndpointParameterSource.Route;
             LookupName = GetEscapedParameterName(fromRouteAttribute, symbol.Name);
-            IsParsable = TryGetParsability(Type, wellKnownTypes, out var parsingBlockEmitter);
-            ParsingBlockEmitter = parsingBlockEmitter;
+            IsParsable = TryGetParsability(Type, wellKnownTypes, out var preferredTryParseInvocation);
+            PreferredTryParseInvocation = preferredTryParseInvocation;
         }
         else if (attributes.TryGetAttributeImplementingInterface(wellKnownTypes.Get(WellKnownType.Microsoft_AspNetCore_Http_Metadata_IFromQueryMetadata), out var fromQueryAttribute))
         {
             Source = EndpointParameterSource.Query;
             LookupName = GetEscapedParameterName(fromQueryAttribute, symbol.Name);
-            IsParsable = TryGetParsability(Type, wellKnownTypes, out var parsingBlockEmitter);
-            ParsingBlockEmitter = parsingBlockEmitter;
+            IsParsable = TryGetParsability(Type, wellKnownTypes, out var preferredTryParseInvocation);
+            PreferredTryParseInvocation = preferredTryParseInvocation;
         }
         else if (attributes.TryGetAttributeImplementingInterface(wellKnownTypes.Get(WellKnownType.Microsoft_AspNetCore_Http_Metadata_IFromHeaderMetadata), out var fromHeaderAttribute))
         {
             Source = EndpointParameterSource.Header;
             LookupName = GetEscapedParameterName(fromHeaderAttribute, symbol.Name);
-            IsParsable = TryGetParsability(Type, wellKnownTypes, out var parsingBlockEmitter);
-            ParsingBlockEmitter = parsingBlockEmitter;
+            IsParsable = TryGetParsability(Type, wellKnownTypes, out var preferredTryParseInvocation);
+            PreferredTryParseInvocation = preferredTryParseInvocation;
         }
         else if (attributes.TryGetAttributeImplementingInterface(wellKnownTypes.Get(WellKnownType.Microsoft_AspNetCore_Http_Metadata_IFromFormMetadata), out var fromFormAttribute))
         {
@@ -121,8 +121,8 @@ private void ProcessEndpointParameterSource(Endpoint endpoint, ISymbol symbol, I
                 AssigningCode = !IsArray
                     ? $"(string?)httpContext.Request.Form[{SymbolDisplay.FormatLiteral(LookupName, true)}]"
                     : $"httpContext.Request.Form[{SymbolDisplay.FormatLiteral(LookupName, true)}].ToArray()";
-                IsParsable = TryGetParsability(Type, wellKnownTypes, out var parsingBlockEmitter);
-                ParsingBlockEmitter = parsingBlockEmitter;
+                IsParsable = TryGetParsability(Type, wellKnownTypes, out var preferredTryParseInvocation);
+                PreferredTryParseInvocation = preferredTryParseInvocation;
             }
         }
         else if (TryGetExplicitFromJsonBody(symbol, attributes, wellKnownTypes, out var isOptional))
@@ -169,7 +169,7 @@ private void ProcessEndpointParameterSource(Endpoint endpoint, ISymbol symbol, I
             }
             if (symbol is IPropertySymbol ||
                 Type is not INamedTypeSymbol namedTypeSymbol ||
-                !TryGetAsParametersConstructor(endpoint, namedTypeSymbol, out var isDefaultConstructor, out var matchedProperties))
+                !TryGetAsParametersConstructor(endpoint, namedTypeSymbol, wellKnownTypes, out var isDefaultConstructor, out var matchedProperties))
             {
                 if (symbol is IPropertySymbol)
                 {
@@ -237,11 +237,11 @@ Type is not INamedTypeSymbol namedTypeSymbol ||
             Source = EndpointParameterSource.Query;
             IsStringValues = true;
         }
-        else if (TryGetParsability(Type, wellKnownTypes, out var parsingBlockEmitter))
+        else if (TryGetParsability(Type, wellKnownTypes, out var preferredTryParseInvocation))
         {
             Source = EndpointParameterSource.RouteOrQuery;
             IsParsable = true;
-            ParsingBlockEmitter = parsingBlockEmitter;
+            PreferredTryParseInvocation = preferredTryParseInvocation;
         }
         else
         {
@@ -293,9 +293,9 @@ private static bool ImplementsIEndpointParameterMetadataProvider(ITypeSymbol typ
     // to be resolved by a specific WellKnownType
     public string? AssigningCode { get; set; }
 
-    [MemberNotNullWhen(true, nameof(ParsingBlockEmitter))]
+    [MemberNotNullWhen(true, nameof(PreferredTryParseInvocation))]
     public bool IsParsable { get; set; }
-    public Action<CodeWriter, string, string>? ParsingBlockEmitter { get; set; }
+    public Func<string, string, string>? PreferredTryParseInvocation { get; set; }
     public bool IsStringValues { get; set; }
 
     public BindabilityMethod? BindMethod { get; set; }
@@ -307,7 +307,7 @@ private static bool HasBindAsync(ITypeSymbol typeSymbol, WellKnownTypes wellKnow
         return ParsabilityHelper.GetBindability(parameterType, wellKnownTypes, out bindMethod, out bindMethodSymbol) == Bindability.Bindable;
     }
 
-    private static bool TryGetArrayElementType(ITypeSymbol type, [NotNullWhen(true)]out ITypeSymbol elementType)
+    private static bool TryGetArrayElementType(ITypeSymbol type, [NotNullWhen(true)] out ITypeSymbol elementType)
     {
         if (type.TypeKind == TypeKind.Array)
         {
@@ -321,7 +321,7 @@ private static bool TryGetArrayElementType(ITypeSymbol type, [NotNullWhen(true)]
         }
     }
 
-    private bool TryGetParsability(ITypeSymbol typeSymbol, WellKnownTypes wellKnownTypes, [NotNullWhen(true)] out Action<CodeWriter, string, string>? parsingBlockEmitter)
+    private bool TryGetParsability(ITypeSymbol typeSymbol, WellKnownTypes wellKnownTypes, [NotNullWhen(true)] out Func<string, string, string>? preferredTryParseInvocation)
     {
         var parameterType = typeSymbol.UnwrapTypeSymbol(unwrapArray: true, unwrapNullable: true);
 
@@ -332,14 +332,14 @@ private bool TryGetParsability(ITypeSymbol typeSymbol, WellKnownTypes wellKnownT
         // parsable at all we bail.
         if (ParsabilityHelper.GetParsability(parameterType, wellKnownTypes, out var parsabilityMethod) != Parsability.Parsable)
         {
-            parsingBlockEmitter = null;
+            preferredTryParseInvocation = null;
             return false;
         }
 
         // If we are parsable we need to emit code based on the enumeration ParsabilityMethod which has a bunch of members
         // which spell out the preferred TryParse usage. This switch statement makes slight variations to them based on
         // which method was encountered.
-        Func<string, string, string>? preferredTryParseInvocation = parsabilityMethod switch
+        preferredTryParseInvocation = parsabilityMethod switch
         {
             ParsabilityMethod.IParsable => (string inputArgument, string outputArgument) => $$"""GeneratedRouteBuilderExtensionsCore.TryParseExplicit<{{parameterType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}}>({{inputArgument}}!, CultureInfo.InvariantCulture, out var {{outputArgument}})""",
             ParsabilityMethod.TryParseWithFormatProvider => (string inputArgument, string outputArgument) => $$"""{{parameterType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}}.TryParse({{inputArgument}}!, CultureInfo.InvariantCulture, out var {{outputArgument}})""",
@@ -371,58 +371,9 @@ private bool TryGetParsability(ITypeSymbol typeSymbol, WellKnownTypes wellKnownT
         // ... so for strings (null) we bail.
         if (preferredTryParseInvocation == null)
         {
-            parsingBlockEmitter = null;
             return false;
         }
 
-        if (IsOptional)
-        {
-            parsingBlockEmitter = (writer, inputArgument, outputArgument) =>
-            {
-                writer.WriteLine($"""{typeSymbol.ToDisplayString(EmitterConstants.DisplayFormat)} {outputArgument} = default;""");
-                writer.WriteLine($$"""if ({{preferredTryParseInvocation(inputArgument, $"{inputArgument}_parsed_non_nullable")}})""");
-                writer.StartBlock();
-                writer.WriteLine($$"""{{outputArgument}} = {{$"{inputArgument}_parsed_non_nullable"}};""");
-                writer.EndBlock();
-                writer.WriteLine($$"""else if (string.IsNullOrEmpty({{inputArgument}}))""");
-                writer.StartBlock();
-                writer.WriteLine($$"""{{outputArgument}} = {{DefaultValue}};""");
-                writer.EndBlock();
-                writer.WriteLine("else");
-                writer.StartBlock();
-                writer.WriteLine("wasParamCheckFailure = true;");
-                writer.EndBlock();
-            };
-        }
-        else
-        {
-            parsingBlockEmitter = (writer, inputArgument, outputArgument) =>
-            {
-                if (IsArray && ElementType.NullableAnnotation == NullableAnnotation.Annotated)
-                {
-                    writer.WriteLine($$"""if (!{{preferredTryParseInvocation(inputArgument, outputArgument)}})""");
-                    writer.StartBlock();
-                    writer.WriteLine($$"""if (!string.IsNullOrEmpty({{inputArgument}}))""");
-                    writer.StartBlock();
-                    writer.WriteLine("wasParamCheckFailure = true;");
-                    writer.WriteLine($@"logOrThrowExceptionHelper.RequiredParameterNotProvided({SymbolDisplay.FormatLiteral(Type.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat), true)}, {SymbolDisplay.FormatLiteral(SymbolName, true)}, {SymbolDisplay.FormatLiteral(this.ToMessageString(), true)});");
-                    writer.EndBlock();
-                    writer.EndBlock();
-                }
-                else
-                {
-                    writer.WriteLine($$"""if (!{{preferredTryParseInvocation(inputArgument, outputArgument)}})""");
-                    writer.StartBlock();
-                    writer.WriteLine($"if (!string.IsNullOrEmpty({inputArgument}))");
-                    writer.StartBlock();
-                    writer.WriteLine($@"logOrThrowExceptionHelper.ParameterBindingFailed({SymbolDisplay.FormatLiteral(Type.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat), true)}, {SymbolDisplay.FormatLiteral(SymbolName, true)}, {inputArgument});");
-                    writer.WriteLine("wasParamCheckFailure = true;");
-                    writer.EndBlock();
-                    writer.EndBlock();
-                }
-            };
-        }
-
         // Wrap the TryParse method call in an if-block and if it doesn't work set param check failure.
         return true;
     }
@@ -504,7 +455,7 @@ private static string GetEscapedParameterName(AttributeData attribute, string pa
         }
     }
 
-    private static bool TryGetAsParametersConstructor(Endpoint endpoint, INamedTypeSymbol type, out bool? isDefaultConstructor, [NotNullWhen(true)] out IEnumerable<ConstructorParameter>? matchedProperties)
+    private static bool TryGetAsParametersConstructor(Endpoint endpoint, INamedTypeSymbol type, WellKnownTypes wellKnownTypes, out bool? isDefaultConstructor, [NotNullWhen(true)] out IEnumerable<ConstructorParameter>? matchedProperties)
     {
         isDefaultConstructor = null;
         matchedProperties = null;
@@ -516,6 +467,12 @@ private static bool TryGetAsParametersConstructor(Endpoint endpoint, INamedTypeS
             return false;
         }
 
+        if (type.Implements(wellKnownTypes.Get(WellKnownType.System_Collections_IEnumerable)))
+        {
+            endpoint.Diagnostics.Add(Diagnostic.Create(DiagnosticDescriptors.InvalidAsParametersEnumerableType, location, parameterTypeString));
+            return false;
+        }
+
         var constructors = type.Constructors.Where(constructor => constructor.DeclaredAccessibility == Accessibility.Public && !constructor.IsStatic);
         var numOfConstructors = constructors.Count();
         // When leveraging parameterless constructors, we want to ensure we only emit for writable
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointParameterSource.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointParameterSource.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointParameterSource.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointParameterSource.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointResponse.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointResponse.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointResponse.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/EndpointResponse.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/InvocationOperationExtensions.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/InvocationOperationExtensions.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/InvocationOperationExtensions.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/InvocationOperationExtensions.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Model/ConstructorParameter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Model/ConstructorParameter.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Model/ConstructorParameter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Model/ConstructorParameter.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Model/EndpointParameterExtensions.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Model/EndpointParameterExtensions.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Model/EndpointParameterExtensions.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Model/EndpointParameterExtensions.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Model/ParameterLookupKey.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Model/ParameterLookupKey.cs
similarity index 100%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Model/ParameterLookupKey.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/Model/ParameterLookupKey.cs
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
similarity index 97%
rename from src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
rename to src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
index 83790d44eb33..e4a35735b65b 100644
--- a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
+++ b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
@@ -205,7 +205,7 @@ private static void EmitBuiltinResponseTypeMetadata(this Endpoint endpoint, Code
             return;
         }
 
-        if (!endpoint.Response.IsAwaitable && (response.HasNoResponse || response.IsIResult))
+        if (response.HasNoResponse || response.IsIResult)
         {
             return;
         }
@@ -215,13 +215,10 @@ private static void EmitBuiltinResponseTypeMetadata(this Endpoint endpoint, Code
         {
             codeWriter.WriteLine($"options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(string), contentTypes: GeneratedMetadataConstants.PlaintextContentType));");
         }
-        else if (response.IsAwaitable && response.ResponseType == null)
-        {
-            codeWriter.WriteLine($"options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(void), contentTypes: GeneratedMetadataConstants.PlaintextContentType));");
-        }
         else if (response.ResponseType is { } responseType)
         {
             codeWriter.WriteLine($$"""options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof({{responseType.ToDisplayString(EmitterConstants.DisplayFormatWithoutNullability)}}), contentTypes: GeneratedMetadataConstants.JsonContentType));""");
+            codeWriter.WriteLine("DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);");
         }
     }
 
@@ -339,13 +336,15 @@ public static void EmitJsonAcceptsMetadata(this Endpoint endpoint, CodeWriter co
             codeWriter.WriteLine("if (!serviceProviderIsService.IsService(type))");
             codeWriter.StartBlock();
             codeWriter.WriteLine("options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));");
+            codeWriter.WriteLine("options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);");
             codeWriter.WriteLine("break;");
             codeWriter.EndBlock();
             codeWriter.EndBlock();
         }
         else
         {
-            codeWriter.WriteLine($"options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(contentTypes: GeneratedMetadataConstants.JsonContentType));");
+            codeWriter.WriteLine("options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(contentTypes: GeneratedMetadataConstants.JsonContentType));");
+            codeWriter.WriteLine("options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);");
         }
     }
 
diff --git a/src/Http/Http.Extensions/src/AllowCookieRedirectAttribute.cs b/src/Http/Http.Extensions/src/AllowCookieRedirectAttribute.cs
new file mode 100644
index 000000000000..b559f3b1081f
--- /dev/null
+++ b/src/Http/Http.Extensions/src/AllowCookieRedirectAttribute.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http.Metadata;
+
+namespace Microsoft.AspNetCore.Http;
+
+/// <summary>
+/// Specifies that cookie-based authentication redirects are allowed for an endpoint.
+/// This is normally the default behavior, but it exists to override <see cref="IDisableCookieRedirectMetadata"/> no matter the order.
+/// When present, the cookie authentication handler will prefer browser login or access denied redirects over 401 and 403 status codes.
+/// </summary>
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
+public sealed class AllowCookieRedirectAttribute : Attribute, IAllowCookieRedirectMetadata
+{
+}
diff --git a/src/Http/Http.Extensions/src/CookieRedirectEndpointConventionBuilderExtensions.cs b/src/Http/Http.Extensions/src/CookieRedirectEndpointConventionBuilderExtensions.cs
new file mode 100644
index 000000000000..c7e045448d46
--- /dev/null
+++ b/src/Http/Http.Extensions/src/CookieRedirectEndpointConventionBuilderExtensions.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Metadata;
+
+namespace Microsoft.AspNetCore.Builder;
+
+/// <summary>
+/// Cookie redirect extension methods for <see cref="IEndpointConventionBuilder"/>.
+/// </summary>
+public static class CookieRedirectEndpointConventionBuilderExtensions
+{
+    private static readonly AllowCookieRedirectAttribute _allowCookieRedirectAttribute = new();
+
+    /// <summary>
+    /// Specifies that cookie-based authentication redirects are disabled for an endpoint using <see cref="IDisableCookieRedirectMetadata"/>.
+    /// When present and not overridden by <see cref="AllowCookieRedirect"/> or <see cref="IAllowCookieRedirectMetadata"/>,
+    /// the cookie authentication handler will prefer using 401 and 403 status codes over redirecting to the login or access denied paths.
+    /// </summary>
+    /// <typeparam name="TBuilder">The type of endpoint convention builder.</typeparam>
+    /// <param name="builder">The endpoint convention builder.</param>
+    /// <returns>The original convention builder parameter.</returns>
+    public static TBuilder DisableCookieRedirect<TBuilder>(this TBuilder builder) where TBuilder : IEndpointConventionBuilder
+    {
+        builder.Add(b => b.Metadata.Add(DisableCookieRedirectMetadata.Instance));
+        return builder;
+    }
+
+    /// <summary>
+    /// Specifies that cookie-based authentication redirects are allowed for an endpoint using <see cref="IAllowCookieRedirectMetadata"/>.
+    /// This is normally the default behavior, but it exists to override <see cref="IDisableCookieRedirectMetadata"/> no matter the order.
+    /// When present, the cookie authentication handler will prefer browser login or access denied redirects over 401 and 403 status codes.
+    /// </summary>
+    /// <typeparam name="TBuilder">The type of endpoint convention builder.</typeparam>
+    /// <param name="builder">The endpoint convention builder.</param>
+    /// <returns>The original convention builder parameter.</returns>
+    public static TBuilder AllowCookieRedirect<TBuilder>(this TBuilder builder) where TBuilder : IEndpointConventionBuilder
+    {
+        builder.Add(b => b.Metadata.Add(_allowCookieRedirectAttribute));
+        return builder;
+    }
+}
diff --git a/src/Http/Http.Extensions/src/DefaultProblemDetailsWriter.cs b/src/Http/Http.Extensions/src/DefaultProblemDetailsWriter.cs
index 4d47a1e54f06..b02d719b9086 100644
--- a/src/Http/Http.Extensions/src/DefaultProblemDetailsWriter.cs
+++ b/src/Http/Http.Extensions/src/DefaultProblemDetailsWriter.cs
@@ -56,7 +56,8 @@ public ValueTask WriteAsync(ProblemDetailsContext context)
         ProblemDetailsDefaults.Apply(context.ProblemDetails, httpContext.Response.StatusCode);
 
         var traceId = Activity.Current?.Id ?? httpContext.TraceIdentifier;
-        context.ProblemDetails.Extensions["traceId"] = traceId;
+        var traceIdKeyName = _serializerOptions.PropertyNamingPolicy?.ConvertName("traceId") ?? "traceId";
+        context.ProblemDetails.Extensions[traceIdKeyName] = traceId;
 
         _options.CustomizeProblemDetails?.Invoke(context);
 
diff --git a/src/Http/Http.Extensions/src/HttpRequestJsonExtensions.cs b/src/Http/Http.Extensions/src/HttpRequestJsonExtensions.cs
index 2c9c924a8d98..f7d8b49570bd 100644
--- a/src/Http/Http.Extensions/src/HttpRequestJsonExtensions.cs
+++ b/src/Http/Http.Extensions/src/HttpRequestJsonExtensions.cs
@@ -23,6 +23,10 @@ public static class HttpRequestJsonExtensions
         "Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.";
     private const string RequiresDynamicCodeMessage = "JSON serialization and deserialization might require types that cannot be statically analyzed and need runtime code generation. " +
         "Use the overload that takes a JsonTypeInfo or JsonSerializerContext for native AOT applications.";
+    // Fallback to the stream-based overloads for JsonSerializer.DeserializeAsync
+    // This is to give users with custom JsonConverter implementations the chance to update their
+    // converters to support ReadOnlySequence<T> if needed while still keeping their apps working.
+    private static readonly bool _useStreamJsonOverload = AppContext.TryGetSwitch("Microsoft.AspNetCore.UseStreamBasedJsonParsing", out var isEnabled) && isEnabled;
 
     /// <summary>
     /// Read JSON from the request and deserialize to the specified type.
@@ -68,15 +72,33 @@ public static class HttpRequestJsonExtensions
         options ??= ResolveSerializerOptions(request.HttpContext);
 
         var encoding = GetEncodingFromCharset(charset);
-        var (inputStream, usesTranscodingStream) = GetInputStream(request.HttpContext, encoding);
+        Stream? inputStream = null;
+        ValueTask<TValue?> deserializeTask;
 
         try
         {
-            return await JsonSerializer.DeserializeAsync<TValue>(inputStream, options, cancellationToken);
+            if (encoding == null || encoding.CodePage == Encoding.UTF8.CodePage)
+            {
+                if (_useStreamJsonOverload)
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync<TValue>(request.Body, options, cancellationToken);
+                }
+                else
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync<TValue>(request.BodyReader, options, cancellationToken);
+                }
+            }
+            else
+            {
+                inputStream = Encoding.CreateTranscodingStream(request.Body, encoding, Encoding.UTF8, leaveOpen: true);
+                deserializeTask = JsonSerializer.DeserializeAsync<TValue>(inputStream, options, cancellationToken);
+            }
+
+            return await deserializeTask;
         }
         finally
         {
-            if (usesTranscodingStream)
+            if (inputStream is not null)
             {
                 await inputStream.DisposeAsync();
             }
@@ -106,15 +128,33 @@ public static class HttpRequestJsonExtensions
         }
 
         var encoding = GetEncodingFromCharset(charset);
-        var (inputStream, usesTranscodingStream) = GetInputStream(request.HttpContext, encoding);
+        Stream? inputStream = null;
+        ValueTask<TValue?> deserializeTask;
 
         try
         {
-            return await JsonSerializer.DeserializeAsync(inputStream, jsonTypeInfo, cancellationToken);
+            if (encoding == null || encoding.CodePage == Encoding.UTF8.CodePage)
+            {
+                if (_useStreamJsonOverload)
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.Body, jsonTypeInfo, cancellationToken);
+                }
+                else
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.BodyReader, jsonTypeInfo, cancellationToken);
+                }
+            }
+            else
+            {
+                inputStream = Encoding.CreateTranscodingStream(request.Body, encoding, Encoding.UTF8, leaveOpen: true);
+                deserializeTask = JsonSerializer.DeserializeAsync(inputStream, jsonTypeInfo, cancellationToken);
+            }
+
+            return await deserializeTask;
         }
         finally
         {
-            if (usesTranscodingStream)
+            if (inputStream is not null)
             {
                 await inputStream.DisposeAsync();
             }
@@ -144,15 +184,33 @@ public static class HttpRequestJsonExtensions
         }
 
         var encoding = GetEncodingFromCharset(charset);
-        var (inputStream, usesTranscodingStream) = GetInputStream(request.HttpContext, encoding);
+        Stream? inputStream = null;
+        ValueTask<object?> deserializeTask;
 
         try
         {
-            return await JsonSerializer.DeserializeAsync(inputStream, jsonTypeInfo, cancellationToken);
+            if (encoding == null || encoding.CodePage == Encoding.UTF8.CodePage)
+            {
+                if (_useStreamJsonOverload)
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.Body, jsonTypeInfo, cancellationToken);
+                }
+                else
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.BodyReader, jsonTypeInfo, cancellationToken);
+                }
+            }
+            else
+            {
+                inputStream = Encoding.CreateTranscodingStream(request.Body, encoding, Encoding.UTF8, leaveOpen: true);
+                deserializeTask = JsonSerializer.DeserializeAsync(inputStream, jsonTypeInfo, cancellationToken);
+            }
+
+            return await deserializeTask;
         }
         finally
         {
-            if (usesTranscodingStream)
+            if (inputStream is not null)
             {
                 await inputStream.DisposeAsync();
             }
@@ -206,15 +264,33 @@ public static class HttpRequestJsonExtensions
         options ??= ResolveSerializerOptions(request.HttpContext);
 
         var encoding = GetEncodingFromCharset(charset);
-        var (inputStream, usesTranscodingStream) = GetInputStream(request.HttpContext, encoding);
+        Stream? inputStream = null;
+        ValueTask<object?> deserializeTask;
 
         try
         {
-            return await JsonSerializer.DeserializeAsync(inputStream, type, options, cancellationToken);
+            if (encoding == null || encoding.CodePage == Encoding.UTF8.CodePage)
+            {
+                if (_useStreamJsonOverload)
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.Body, type, options, cancellationToken);
+                }
+                else
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.BodyReader, type, options, cancellationToken);
+                }
+            }
+            else
+            {
+                inputStream = Encoding.CreateTranscodingStream(request.Body, encoding, Encoding.UTF8, leaveOpen: true);
+                deserializeTask = JsonSerializer.DeserializeAsync(inputStream, type, options, cancellationToken);
+            }
+
+            return await deserializeTask;
         }
         finally
         {
-            if (usesTranscodingStream)
+            if (inputStream is not null)
             {
                 await inputStream.DisposeAsync();
             }
@@ -248,15 +324,33 @@ public static class HttpRequestJsonExtensions
         }
 
         var encoding = GetEncodingFromCharset(charset);
-        var (inputStream, usesTranscodingStream) = GetInputStream(request.HttpContext, encoding);
+        Stream? inputStream = null;
+        ValueTask<object?> deserializeTask;
 
         try
         {
-            return await JsonSerializer.DeserializeAsync(inputStream, type, context, cancellationToken);
+            if (encoding == null || encoding.CodePage == Encoding.UTF8.CodePage)
+            {
+                if (_useStreamJsonOverload)
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.Body, type, context, cancellationToken);
+                }
+                else
+                {
+                    deserializeTask = JsonSerializer.DeserializeAsync(request.BodyReader, type, context, cancellationToken);
+                }
+            }
+            else
+            {
+                inputStream = Encoding.CreateTranscodingStream(request.Body, encoding, Encoding.UTF8, leaveOpen: true);
+                deserializeTask = JsonSerializer.DeserializeAsync(inputStream, type, context, cancellationToken);
+            }
+
+            return await deserializeTask;
         }
         finally
         {
-            if (usesTranscodingStream)
+            if (inputStream is not null)
             {
                 await inputStream.DisposeAsync();
             }
@@ -312,17 +406,6 @@ private static void ThrowContentTypeError(HttpRequest request)
         throw new InvalidOperationException($"Unable to read the request as JSON because the request content type '{request.ContentType}' is not a known JSON content type.");
     }
 
-    private static (Stream inputStream, bool usesTranscodingStream) GetInputStream(HttpContext httpContext, Encoding? encoding)
-    {
-        if (encoding == null || encoding.CodePage == Encoding.UTF8.CodePage)
-        {
-            return (httpContext.Request.Body, false);
-        }
-
-        var inputStream = Encoding.CreateTranscodingStream(httpContext.Request.Body, encoding, Encoding.UTF8, leaveOpen: true);
-        return (inputStream, true);
-    }
-
     private static Encoding? GetEncodingFromCharset(StringSegment charset)
     {
         if (charset.Equals("utf-8", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Http/Http.Extensions/src/PublicAPI.Shipped.txt b/src/Http/Http.Extensions/src/PublicAPI.Shipped.txt
index 62691cb28ddc..49c6f9937b56 100644
--- a/src/Http/Http.Extensions/src/PublicAPI.Shipped.txt
+++ b/src/Http/Http.Extensions/src/PublicAPI.Shipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.AspNetCore.Builder.HttpMetricsEndpointConventionBuilderExtensions
+Microsoft.AspNetCore.Http.DisableHttpMetricsAttribute
+Microsoft.AspNetCore.Http.DisableHttpMetricsAttribute.DisableHttpMetricsAttribute() -> void
 Microsoft.AspNetCore.Http.EndpointDescriptionAttribute
 Microsoft.AspNetCore.Http.EndpointDescriptionAttribute.Description.get -> string!
 Microsoft.AspNetCore.Http.EndpointDescriptionAttribute.EndpointDescriptionAttribute(string! description) -> void
@@ -107,6 +110,7 @@ Microsoft.AspNetCore.Http.HttpValidationProblemDetails.Errors.get -> System.Coll
 Microsoft.AspNetCore.Http.HttpValidationProblemDetails.Errors.set -> void (forwarded, contained in Microsoft.AspNetCore.Http.Abstractions)
 Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails() -> void (forwarded, contained in Microsoft.AspNetCore.Http.Abstractions)
 Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails(System.Collections.Generic.IDictionary<string!, string![]!>! errors) -> void (forwarded, contained in Microsoft.AspNetCore.Http.Abstractions)
+Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors) -> void (forwarded, contained in Microsoft.AspNetCore.Http.Abstractions)
 Microsoft.AspNetCore.Http.Json.JsonOptions
 Microsoft.AspNetCore.Http.Json.JsonOptions.JsonOptions() -> void
 Microsoft.AspNetCore.Http.Json.JsonOptions.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions!
@@ -153,12 +157,14 @@ Microsoft.AspNetCore.Mvc.ProblemDetails.Type.get -> string? (forwarded, containe
 Microsoft.AspNetCore.Mvc.ProblemDetails.Type.set -> void (forwarded, contained in Microsoft.AspNetCore.Http.Abstractions)
 Microsoft.Extensions.DependencyInjection.HttpJsonServiceExtensions
 Microsoft.Extensions.DependencyInjection.ProblemDetailsServiceCollectionExtensions
+override Microsoft.AspNetCore.Http.DisableHttpMetricsAttribute.ToString() -> string!
 override Microsoft.AspNetCore.Http.EndpointDescriptionAttribute.ToString() -> string!
 override Microsoft.AspNetCore.Http.EndpointSummaryAttribute.ToString() -> string!
 override Microsoft.AspNetCore.Http.Extensions.QueryBuilder.Equals(object? obj) -> bool
 override Microsoft.AspNetCore.Http.Extensions.QueryBuilder.GetHashCode() -> int
 override Microsoft.AspNetCore.Http.Extensions.QueryBuilder.ToString() -> string!
 override Microsoft.AspNetCore.Http.TagsAttribute.ToString() -> string!
+static Microsoft.AspNetCore.Builder.HttpMetricsEndpointConventionBuilderExtensions.DisableHttpMetrics<TBuilder>(this TBuilder builder) -> TBuilder
 static Microsoft.AspNetCore.Http.Extensions.HttpRequestMultipartExtensions.GetMultipartBoundary(this Microsoft.AspNetCore.Http.HttpRequest! request) -> string!
 static Microsoft.AspNetCore.Http.Extensions.StreamCopyOperation.CopyToAsync(System.IO.Stream! source, System.IO.Stream! destination, long? count, int bufferSize, System.Threading.CancellationToken cancel) -> System.Threading.Tasks.Task!
 static Microsoft.AspNetCore.Http.Extensions.StreamCopyOperation.CopyToAsync(System.IO.Stream! source, System.IO.Stream! destination, long? count, System.Threading.CancellationToken cancel) -> System.Threading.Tasks.Task!
diff --git a/src/Http/Http.Extensions/src/PublicAPI.Unshipped.txt b/src/Http/Http.Extensions/src/PublicAPI.Unshipped.txt
index 8dc031273ecf..dda4ec8ff207 100644
--- a/src/Http/Http.Extensions/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Http.Extensions/src/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
-Microsoft.AspNetCore.Http.HttpValidationProblemDetails.HttpValidationProblemDetails(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors) -> void (forwarded, contained in Microsoft.AspNetCore.Http.Abstractions)
-Microsoft.AspNetCore.Builder.HttpMetricsEndpointConventionBuilderExtensions
-Microsoft.AspNetCore.Http.DisableHttpMetricsAttribute
-Microsoft.AspNetCore.Http.DisableHttpMetricsAttribute.DisableHttpMetricsAttribute() -> void
-override Microsoft.AspNetCore.Http.DisableHttpMetricsAttribute.ToString() -> string!
-static Microsoft.AspNetCore.Builder.HttpMetricsEndpointConventionBuilderExtensions.DisableHttpMetrics<TBuilder>(this TBuilder builder) -> TBuilder
+Microsoft.AspNetCore.Builder.CookieRedirectEndpointConventionBuilderExtensions
+Microsoft.AspNetCore.Http.AllowCookieRedirectAttribute
+Microsoft.AspNetCore.Http.AllowCookieRedirectAttribute.AllowCookieRedirectAttribute() -> void
+static Microsoft.AspNetCore.Builder.CookieRedirectEndpointConventionBuilderExtensions.AllowCookieRedirect<TBuilder>(this TBuilder builder) -> TBuilder
+static Microsoft.AspNetCore.Builder.CookieRedirectEndpointConventionBuilderExtensions.DisableCookieRedirect<TBuilder>(this TBuilder builder) -> TBuilder
diff --git a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs
index f30dbe63ca10..ee76afb27f69 100644
--- a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs
+++ b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs
@@ -52,6 +52,7 @@ public static partial class RequestDelegateFactory
     private static readonly MethodInfo ExecuteTaskResultOfTMethod = typeof(RequestDelegateFactory).GetMethod(nameof(ExecuteTaskResult), BindingFlags.NonPublic | BindingFlags.Static)!;
     private static readonly MethodInfo ExecuteValueResultTaskOfTMethod = typeof(RequestDelegateFactory).GetMethod(nameof(ExecuteValueTaskResult), BindingFlags.NonPublic | BindingFlags.Static)!;
     private static readonly MethodInfo ExecuteAwaitedReturnMethod = typeof(RequestDelegateFactory).GetMethod(nameof(ExecuteAwaitedReturn), BindingFlags.NonPublic | BindingFlags.Static)!;
+    private static readonly MethodInfo GetHeaderSplitMethod = typeof(ParsingHelpers).GetMethod(nameof(ParsingHelpers.GetHeaderSplit), BindingFlags.Public | BindingFlags.Static, [typeof(IHeaderDictionary), typeof(string)])!;
     private static readonly MethodInfo GetRequiredServiceMethod = typeof(ServiceProviderServiceExtensions).GetMethod(nameof(ServiceProviderServiceExtensions.GetRequiredService), BindingFlags.Public | BindingFlags.Static, new Type[] { typeof(IServiceProvider) })!;
     private static readonly MethodInfo GetServiceMethod = typeof(ServiceProviderServiceExtensions).GetMethod(nameof(ServiceProviderServiceExtensions.GetService), BindingFlags.Public | BindingFlags.Static, new Type[] { typeof(IServiceProvider) })!;
     private static readonly MethodInfo GetRequiredKeyedServiceMethod = typeof(ServiceProviderKeyedServiceExtensions).GetMethod(nameof(ServiceProviderKeyedServiceExtensions.GetRequiredKeyedService), BindingFlags.Public | BindingFlags.Static, new Type[] { typeof(IServiceProvider), typeof(object) })!;
@@ -274,7 +275,7 @@ private static RequestDelegateFactoryContext CreateFactoryContext(RequestDelegat
         var serviceProvider = options?.ServiceProvider ?? options?.EndpointBuilder?.ApplicationServices ?? EmptyServiceProvider.Instance;
         var endpointBuilder = options?.EndpointBuilder ?? new RdfEndpointBuilder(serviceProvider);
         var jsonSerializerOptions = serviceProvider.GetService<IOptions<JsonOptions>>()?.Value.SerializerOptions ?? JsonOptions.DefaultSerializerOptions;
-        var formDataMapperOptions = new FormDataMapperOptions();;
+        var formDataMapperOptions = new FormDataMapperOptions();
 
         var factoryContext = new RequestDelegateFactoryContext
         {
@@ -400,7 +401,14 @@ private static Expression[] CreateArgumentsAndInferMetadata(MethodInfo methodInf
                 InferAntiforgeryMetadata(factoryContext);
             }
 
-            PopulateBuiltInResponseTypeMetadata(methodInfo.ReturnType, factoryContext.EndpointBuilder);
+            // If this endpoint expects a JSON request body, we assume its an API endpoint not intended for browser navigation.
+            // When present, authentication handlers should prefer returning status codes over browser redirects.
+            if (factoryContext.JsonRequestBodyParameter is not null)
+            {
+                factoryContext.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+            }
+
+            PopulateBuiltInResponseTypeMetadata(methodInfo.ReturnType, factoryContext);
 
             // Add metadata provided by the delegate return type and parameter types next, this will be more specific than inferred metadata from above
             EndpointMetadataPopulator.PopulateMetadata(methodInfo, factoryContext.EndpointBuilder, factoryContext.Parameters);
@@ -543,6 +551,11 @@ private static Expression MapHandlerReturnTypeToValueTask(Expression methodCall,
             }
         }
 
+        if (returnType.IsValueType)
+        {
+            return Expression.Call(WrapObjectAsValueTaskMethod, Expression.Convert(methodCall, typeof(object)));
+        }
+
         return Expression.Call(WrapObjectAsValueTaskMethod, methodCall);
     }
 
@@ -1017,37 +1030,40 @@ private static Expression CreateParamCheckingResponseWritingMethodCall(Type retu
         return Expression.Block(localVariables, checkParamAndCallMethod);
     }
 
-    private static void PopulateBuiltInResponseTypeMetadata(Type returnType, EndpointBuilder builder)
+    private static void PopulateBuiltInResponseTypeMetadata(Type returnType, RequestDelegateFactoryContext factoryContext)
     {
         if (returnType.IsByRefLike)
         {
             throw GetUnsupportedReturnTypeException(returnType);
         }
 
-        var isAwaitable = false;
         if (CoercedAwaitableInfo.IsTypeAwaitable(returnType, out var coercedAwaitableInfo))
         {
             returnType = coercedAwaitableInfo.AwaitableInfo.ResultType;
-            isAwaitable = true;
         }
 
         // Skip void returns and IResults. IResults might implement IEndpointMetadataProvider but otherwise we don't know what it might do.
-        if (!isAwaitable && (returnType == typeof(void) || typeof(IResult).IsAssignableFrom(returnType)))
+        if (returnType == typeof(void) || typeof(IResult).IsAssignableFrom(returnType))
         {
             return;
         }
 
+        var builder = factoryContext.EndpointBuilder;
+
         if (returnType == typeof(string))
         {
             builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(type: typeof(string), statusCode: 200, PlaintextContentType));
         }
-        else if (returnType == typeof(void))
-        {
-            builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(returnType, statusCode: 200, PlaintextContentType));
-        }
         else
         {
             builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(returnType, statusCode: 200, DefaultAcceptsAndProducesContentType));
+
+            if (factoryContext.JsonRequestBodyParameter is null)
+            {
+                // Since this endpoint responds with JSON, we assume its an API endpoint not intended for browser navigation,
+                // but we don't want to bother adding this metadata twice if we've already inferred it based on the expected JSON request body.
+                builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+            }
         }
     }
 
@@ -1636,7 +1652,7 @@ private static Expression BindParameterFromService(ParameterInfo parameter, Requ
         return Expression.Call(GetRequiredServiceMethod.MakeGenericMethod(parameter.ParameterType), RequestServicesExpr);
     }
 
-    private static Expression BindParameterFromKeyedService(ParameterInfo parameter, object key, RequestDelegateFactoryContext factoryContext)
+    private static Expression BindParameterFromKeyedService(ParameterInfo parameter, object? key, RequestDelegateFactoryContext factoryContext)
     {
         var isOptional = IsOptionalParameter(parameter, factoryContext);
 
@@ -1785,7 +1801,7 @@ private static Expression BindParameterFromValue(ParameterInfo parameter, Expres
             ? Expression.IfThen(TempSourceStringNotNullExpr, tryParseExpression)
             : Expression.IfThenElse(TempSourceStringNotNullExpr, tryParseExpression,
                 Expression.Assign(argument,
-                Expression.Constant(parameter.DefaultValue, parameter.ParameterType)));
+                CreateDefaultValueExpression(parameter.DefaultValue, parameter.ParameterType)));
 
         var loopExit = Expression.Label();
 
@@ -1947,11 +1963,17 @@ private static Expression BindParameterFromExpression(
         return Expression.Block(
             Expression.Condition(Expression.NotEqual(valueExpression, Expression.Constant(null)),
                 valueExpression,
-                Expression.Convert(Expression.Constant(parameter.DefaultValue), parameter.ParameterType)));
+                Expression.Convert(CreateDefaultValueExpression(parameter.DefaultValue, parameter.ParameterType), parameter.ParameterType)));
     }
 
-    private static Expression BindParameterFromProperty(ParameterInfo parameter, MemberExpression property, PropertyInfo itemProperty, string key, RequestDelegateFactoryContext factoryContext, string source) =>
-        BindParameterFromValue(parameter, GetValueFromProperty(property, itemProperty, key, GetExpressionType(parameter.ParameterType)), factoryContext, source);
+    private static Expression BindParameterFromProperty(ParameterInfo parameter, MemberExpression property, PropertyInfo itemProperty, string key, RequestDelegateFactoryContext factoryContext, string source)
+    {
+        var valueExpression = (source == "header" && parameter.ParameterType.IsArray)
+            ? Expression.Call(GetHeaderSplitMethod, property, Expression.Constant(key))
+            : GetValueFromProperty(property, itemProperty, key, GetExpressionType(parameter.ParameterType));
+
+        return BindParameterFromValue(parameter, valueExpression, factoryContext, source);
+    }
 
     private static Type? GetExpressionType(Type type) =>
         type.IsArray ? typeof(string[]) :
@@ -1959,6 +1981,34 @@ private static Expression BindParameterFromProperty(ParameterInfo parameter, Mem
         type == typeof(StringValues?) ? typeof(StringValues?) :
         null;
 
+    private static Expression CreateDefaultValueExpression(object? defaultValue, Type parameterType)
+    {
+        if (defaultValue is null)
+        {
+            return Expression.Constant(null, parameterType);
+        }
+
+        var underlyingType = Nullable.GetUnderlyingType(parameterType);
+        var isNullable = underlyingType != null;
+        var targetType = isNullable ? underlyingType! : parameterType;
+        var converted = defaultValue;
+
+        // Apply a conversion for scenarios where the default value's type
+        // doesn't match the parameter type
+        if (targetType.IsEnum && defaultValue.GetType() != targetType)
+        {
+            converted = Enum.ToObject(targetType, defaultValue);
+        }
+        else if (!targetType.IsAssignableFrom(defaultValue.GetType()))
+        {
+            converted = Convert.ChangeType(defaultValue, targetType, CultureInfo.InvariantCulture);
+        }
+
+        var constant = Expression.Constant(converted, targetType);
+        // Cast nullable types as needed
+        return isNullable ? Expression.Convert(constant, parameterType) : constant;
+    }
+
     private static Expression BindParameterFromRouteValueOrQueryString(ParameterInfo parameter, string key, RequestDelegateFactoryContext factoryContext)
     {
         var routeValue = GetValueFromProperty(RouteValuesExpr, RouteValuesIndexerProperty, key);
@@ -2336,7 +2386,7 @@ private static Expression BindParameterFromBody(ParameterInfo parameter, bool al
         {
             // Convert(bodyValue ?? SomeDefault, Todo)
             return Expression.Convert(
-                Expression.Coalesce(BodyValueExpr, Expression.Constant(parameter.DefaultValue)),
+                Expression.Coalesce(BodyValueExpr, CreateDefaultValueExpression(parameter.DefaultValue, typeof(object))),
                 parameter.ParameterType);
         }
 
diff --git a/src/Http/Http.Extensions/src/UriHelper.cs b/src/Http/Http.Extensions/src/UriHelper.cs
index 6c98c4d4890b..fc951704a85e 100644
--- a/src/Http/Http.Extensions/src/UriHelper.cs
+++ b/src/Http/Http.Extensions/src/UriHelper.cs
@@ -4,7 +4,6 @@
 using System.Buffers;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
-using System.Text;
 
 namespace Microsoft.AspNetCore.Http.Extensions;
 
@@ -204,24 +203,7 @@ public static string GetEncodedPathAndQuery(this HttpRequest request)
     /// suitable only for display.</returns>
     public static string GetDisplayUrl(this HttpRequest request)
     {
-        var scheme = request.Scheme ?? string.Empty;
-        var host = request.Host.Value ?? string.Empty;
-        var pathBase = request.PathBase.Value ?? string.Empty;
-        var path = request.Path.Value ?? string.Empty;
-        var queryString = request.QueryString.Value ?? string.Empty;
-
-        // PERF: Calculate string length to allocate correct buffer size for StringBuilder.
-        var length = scheme.Length + SchemeDelimiter.Length + host.Length
-            + pathBase.Length + path.Length + queryString.Length;
-
-        return new StringBuilder(length)
-            .Append(scheme)
-            .Append(SchemeDelimiter)
-            .Append(host)
-            .Append(pathBase)
-            .Append(path)
-            .Append(queryString)
-            .ToString();
+        return string.Concat([request.Scheme, SchemeDelimiter, request.Host.Value, request.PathBase.Value, request.Path.Value, request.QueryString.Value]);
     }
 
     /// <summary>
diff --git a/src/Http/Http.Extensions/test/CookieRedirectEndpointConventionBuilderExtensionsTests.cs b/src/Http/Http.Extensions/test/CookieRedirectEndpointConventionBuilderExtensionsTests.cs
new file mode 100644
index 000000000000..18610cdca905
--- /dev/null
+++ b/src/Http/Http.Extensions/test/CookieRedirectEndpointConventionBuilderExtensionsTests.cs
@@ -0,0 +1,72 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
+
+namespace Microsoft.AspNetCore.Http.Extensions.Tests;
+
+public class CookieRedirectEndpointConventionBuilderExtensionsTests
+{
+    [Fact]
+    public void DisableCookieRedirect_AddsMetadata()
+    {
+        // Arrange
+        var builder = new TestEndpointConventionBuilder();
+
+        // Act
+        builder.DisableCookieRedirect();
+
+        // Assert
+        Assert.IsAssignableFrom<IDisableCookieRedirectMetadata>(Assert.Single(builder.Metadata));
+    }
+
+    [Fact]
+    public void AllowCookieRedirect_AddsMetadata()
+    {
+        // Arrange
+        var builder = new TestEndpointConventionBuilder();
+
+        // Act
+        builder.AllowCookieRedirect();
+
+        // Assert
+        Assert.IsAssignableFrom<IAllowCookieRedirectMetadata>(Assert.Single(builder.Metadata));
+    }
+
+    [Fact]
+    public void DisableCookieRedirect_ReturnsBuilder()
+    {
+        // Arrange
+        var builder = new TestEndpointConventionBuilder();
+
+        // Act
+        var result = builder.DisableCookieRedirect();
+
+        // Assert
+        Assert.Same(builder, result);
+    }
+
+    [Fact]
+    public void AllowCookieRedirect_ReturnsBuilder()
+    {
+        // Arrange
+        var builder = new TestEndpointConventionBuilder();
+
+        // Act
+        var result = builder.AllowCookieRedirect();
+
+        // Assert
+        Assert.Same(builder, result);
+    }
+
+    private sealed class TestEndpointConventionBuilder : EndpointBuilder, IEndpointConventionBuilder
+    {
+        public void Add(Action<EndpointBuilder> convention)
+        {
+            convention(this);
+        }
+
+        public override Endpoint Build() => throw new NotImplementedException();
+    }
+}
diff --git a/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs b/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs
index 33ecc3ff1ea8..b4071866534b 100644
--- a/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs
+++ b/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs
@@ -214,7 +214,7 @@ public void GetListT_StringWithQualityHeaderValidValue_Success()
     public void GetListT_CookieHeaderValue_Success()
     {
         var context = new DefaultHttpContext();
-        context.Request.Headers.Cookie = "cookie1=a,cookie2=b";
+        context.Request.Headers.Cookie = "cookie1=a;cookie2=b";
 
         var result = context.Request.GetTypedHeaders().GetList<CookieHeaderValue>(HeaderNames.Cookie);
 
diff --git a/src/Http/Http.Extensions/test/HttpRequestJsonExtensionsTests.cs b/src/Http/Http.Extensions/test/HttpRequestJsonExtensionsTests.cs
index 4d63107214e9..26a8de2a6df4 100644
--- a/src/Http/Http.Extensions/test/HttpRequestJsonExtensionsTests.cs
+++ b/src/Http/Http.Extensions/test/HttpRequestJsonExtensionsTests.cs
@@ -23,7 +23,7 @@ public class HttpRequestJsonExtensionsTests
     [InlineData("APPLICATION/JSON", true)]
     [InlineData("APPLICATION/JSON; CHARSET=UTF-8", true)]
     [InlineData("APPLICATION/LD+JSON", true)]
-    public void HasJsonContentType(string contentType, bool hasJsonContentType)
+    public void HasJsonContentType(string? contentType, bool hasJsonContentType)
     {
         var request = new DefaultHttpContext().Request;
         request.ContentType = contentType;
@@ -147,7 +147,7 @@ public async Task ReadFromJsonAsyncGeneric_WithCancellationToken_CancellationRai
         cts.Cancel();
 
         // Assert
-        await Assert.ThrowsAsync<TaskCanceledException>(async () => await readTask);
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await readTask);
     }
 
     [Fact]
diff --git a/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj b/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj
index 4a35778afa55..1900e5ea3ebb 100644
--- a/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj
+++ b/src/Http/Http.Extensions/test/Microsoft.AspNetCore.Http.Extensions.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <!-- This is needed to support codepaths that use NullabilityInfoContext. -->
-    <Features>$(Features.Replace('nullablePublicOnly', '')</Features>
+    <Features>$(Features.Replace('nullablePublicOnly', ''))</Features>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
@@ -21,6 +21,8 @@
     <Reference Include="Microsoft.AspNetCore.TestHost" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.DependencyModel" />
+    <Reference Include="Verify.XUnit" />
+    <Reference Include="Verify.SourceGenerators" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,7 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" />
+    <ProjectReference Include="..\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" />
+
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Http/Http.Extensions/test/ModuleInitializer.cs b/src/Http/Http.Extensions/test/ModuleInitializer.cs
new file mode 100644
index 000000000000..2e42614606d4
--- /dev/null
+++ b/src/Http/Http.Extensions/test/ModuleInitializer.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+public static class ModuleInitializer
+{
+    [ModuleInitializer]
+    public static void Init() =>
+        VerifySourceGenerators.Initialize();
+}
diff --git a/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs b/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs
index d57a440a4593..2afabbec3f06 100644
--- a/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs
+++ b/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs
@@ -85,7 +85,7 @@ public async Task WriteAsync_Works_ProperCasing()
         //Assert
         stream.Position = 0;
         var result = await JsonSerializer.DeserializeAsync<Dictionary<string, object>>(stream, JsonSerializerOptions.Default);
-        Assert.Equal(result.Keys, new(new() { { "type", 0 }, { "title", 1 }, { "status", 2 }, { "detail", 3 }, { "instance", 4 }, { "extensionKey", 5 }, {"traceId", expectedTraceId } }));
+        Assert.Equal(result.Keys, new(new() { { "type", 0 }, { "title", 1 }, { "status", 2 }, { "detail", 3 }, { "instance", 4 }, { "extensionKey", 5 }, { "traceId", expectedTraceId } }));
     }
 
     [Fact]
@@ -117,7 +117,7 @@ public async Task WriteAsync_Works_ProperCasing_ValidationProblemDetails()
         //Assert
         stream.Position = 0;
         var result = await JsonSerializer.DeserializeAsync<Dictionary<string, object>>(stream, JsonSerializerOptions.Default);
-        Assert.Equal(result.Keys, new(new() { { "type", 0 }, { "title", 1 }, { "status", 2 }, { "detail", 3 }, { "instance", 4 }, { "errors", 5 }, {"traceId", expectedTraceId } }));
+        Assert.Equal(result.Keys, new(new() { { "type", 0 }, { "title", 1 }, { "status", 2 }, { "detail", 3 }, { "instance", 4 }, { "errors", 5 }, { "traceId", expectedTraceId } }));
     }
 
     [Fact]
@@ -689,6 +689,57 @@ private static HttpContext CreateContext(
         return context;
     }
 
+    [Theory]
+    [InlineData("SnakeCaseLower", "trace_id")]
+    [InlineData("CamelCase", "traceId")]
+    [InlineData("KebabCaseLower", "trace-id")]
+    [InlineData("KebabCaseUpper", "TRACE-ID")]
+    [InlineData("SnakeCaseUpper", "TRACE_ID")]
+    public async Task TestPropertyNamingPolicyChanges(string caseSelection, string extensionVariableName)
+    {
+        // Arrange
+        JsonNamingPolicy propertyNamingPolicy = caseSelection switch
+        {
+            "CamelCase" => JsonNamingPolicy.CamelCase,
+            "KebabCaseLower" => JsonNamingPolicy.KebabCaseLower,
+            "KebabCaseUpper" => JsonNamingPolicy.KebabCaseUpper,
+            "SnakeCaseLower" => JsonNamingPolicy.SnakeCaseLower,
+            "SnakeCaseUpper" => JsonNamingPolicy.SnakeCaseUpper,
+            _ => JsonNamingPolicy.KebabCaseLower
+        };
+
+        var options = new JsonOptions();
+        options.SerializerOptions.PropertyNamingPolicy = propertyNamingPolicy;
+
+        var writer = GetWriter(jsonOptions: options);
+        var stream = new MemoryStream();
+        var context = CreateContext(stream);
+
+        var expectedTraceId = Activity.Current?.Id ?? context.TraceIdentifier;
+        var expectedProblem = new ProblemDetails()
+        {
+            Detail = "Custom Bad Request",
+            Instance = "Custom Bad Request",
+            Status = StatusCodes.Status400BadRequest,
+            Type = "https://tools.ietf.org/html/rfc9110#section-15.5.1-custom",
+            Title = "Custom Bad Request",
+        };
+        var problemDetailsContext = new ProblemDetailsContext()
+        {
+            HttpContext = context,
+            ProblemDetails = expectedProblem
+        };
+
+        //Act
+        await writer.WriteAsync(problemDetailsContext);
+        stream.Position = 0;
+        using var reader = new StreamReader(stream);
+        var json = await reader.ReadToEndAsync();
+
+        //Assert
+        Assert.Contains($"\"{extensionVariableName}\":\"{expectedTraceId}\"", json);
+    }
+
     private static IServiceProvider CreateServices()
     {
         var services = new ServiceCollection();
diff --git a/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs
new file mode 100644
index 000000000000..894abb121049
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs
@@ -0,0 +1,98 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.InternalTesting;
+
+namespace Microsoft.AspNetCore.Routing.Internal;
+
+public partial class RequestDelegateFactoryTests : LoggedTest
+{
+    public static object[][] ValueTypeReturningDelegates =>
+    [
+        [(Func<HttpContext, int>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, char>)((HttpContext httpContext) => 'b')],
+        [(Func<HttpContext, bool>)((HttpContext httpContext) => true)],
+        [(Func<HttpContext, float>)((HttpContext httpContext) => 4.2f)],
+        [(Func<HttpContext, double>)((HttpContext httpContext) => 4.2)],
+        [(Func<HttpContext, decimal>)((HttpContext httpContext) => 4.2m)],
+        [(Func<HttpContext, long>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, short>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, byte>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, uint>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, ulong>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, ushort>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, sbyte>)((HttpContext httpContext) => 42)]
+    ];
+
+    [Theory]
+    [MemberData(nameof(ValueTypeReturningDelegates))]
+    public void Create_WithEndpointFilterOnBuiltInValueTypeReturningDelegate_Works(Delegate @delegate)
+    {
+        var invokeCount = 0;
+
+        RequestDelegateFactoryOptions options = new()
+        {
+            EndpointBuilder = CreateEndpointBuilderFromFilterFactories(
+            [
+                (routeHandlerContext, next) =>
+                {
+                    invokeCount++;
+                    return next;
+                },
+                (routeHandlerContext, next) =>
+                {
+                    invokeCount++;
+                    return next;
+                },
+            ]),
+        };
+
+        var result = RequestDelegateFactory.Create(@delegate, options);
+        Assert.Equal(2, invokeCount);
+    }
+
+    public static object[][] NullableValueTypeReturningDelegates =>
+    [
+        [(Func<HttpContext, int?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, char?>)((HttpContext httpContext) => 'b')],
+        [(Func<HttpContext, bool?>)((HttpContext httpContext) => true)],
+        [(Func<HttpContext, float?>)((HttpContext httpContext) => 4.2f)],
+        [(Func<HttpContext, double?>)((HttpContext httpContext) => 4.2)],
+        [(Func<HttpContext, decimal?>)((HttpContext httpContext) => 4.2m)],
+        [(Func<HttpContext, long?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, short?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, byte?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, uint?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, ulong?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, ushort?>)((HttpContext httpContext) => 42)],
+        [(Func<HttpContext, sbyte?>)((HttpContext httpContext) => 42)]
+    ];
+
+    [Theory]
+    [MemberData(nameof(NullableValueTypeReturningDelegates))]
+    public void Create_WithEndpointFilterOnNullableBuiltInValueTypeReturningDelegate_Works(Delegate @delegate)
+    {
+        var invokeCount = 0;
+
+        RequestDelegateFactoryOptions options = new()
+        {
+            EndpointBuilder = CreateEndpointBuilderFromFilterFactories(
+            [
+                (routeHandlerContext, next) =>
+                {
+                    invokeCount++;
+                    return next;
+                },
+                (routeHandlerContext, next) =>
+                {
+                    invokeCount++;
+                    return next;
+                },
+            ]),
+        };
+
+        var result = RequestDelegateFactory.Create(@delegate, options);
+        Assert.Equal(2, invokeCount);
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs
index 2afff2e67bd7..8ace889b526b 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs
@@ -2533,7 +2533,7 @@ public void Create_AddJsonResponseType_AsMetadata()
         var @delegate = () => new object();
         var result = RequestDelegateFactory.Create(@delegate);
 
-        var responseMetadata = Assert.IsAssignableFrom<IProducesResponseTypeMetadata>(Assert.Single(result.EndpointMetadata));
+        var responseMetadata = Assert.Single(result.EndpointMetadata.OfType<IProducesResponseTypeMetadata>());
 
         Assert.Equal("application/json", Assert.Single(responseMetadata.ContentTypes));
         Assert.Equal(typeof(object), responseMetadata.Type);
@@ -2545,7 +2545,7 @@ public void Create_AddPlaintextResponseType_AsMetadata()
         var @delegate = () => "Hello";
         var result = RequestDelegateFactory.Create(@delegate);
 
-        var responseMetadata = Assert.IsAssignableFrom<IProducesResponseTypeMetadata>(Assert.Single(result.EndpointMetadata));
+        var responseMetadata = Assert.Single(result.EndpointMetadata.OfType<IProducesResponseTypeMetadata>());
 
         Assert.Equal("text/plain", Assert.Single(responseMetadata.ContentTypes));
         Assert.Equal(typeof(string), responseMetadata.Type);
@@ -2683,6 +2683,7 @@ public void Create_CombinesDefaultMetadata_AndMetadataFromReturnTypesImplementin
 
         // Assert
         Assert.Contains(result.EndpointMetadata, m => m is CustomEndpointMetadata { Source: MetadataSource.Caller });
+        Assert.DoesNotContain(result.EndpointMetadata, m => m is IProducesResponseTypeMetadata);
         // Expecting '1' because only initial metadata will be in the metadata list when this metadata item is added
         Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 1 });
     }
@@ -2705,9 +2706,9 @@ public void Create_CombinesDefaultMetadata_AndMetadataFromTaskWrappedReturnTypes
 
         // Assert
         Assert.Contains(result.EndpointMetadata, m => m is CustomEndpointMetadata { Source: MetadataSource.Caller });
-        Assert.Contains(result.EndpointMetadata, m => m is ProducesResponseTypeMetadata { Type: { } type } && type == typeof(CountsDefaultEndpointMetadataResult));
-        // Expecting the custom metadata and the implicit metadata associated with a Task-based return type to be inserted
-        Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 2 });
+        Assert.DoesNotContain(result.EndpointMetadata, m => m is IProducesResponseTypeMetadata);
+        // Expecting '1' because only initial metadata will be in the metadata list when this metadata item is added
+        Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 1 });
     }
 
     [Fact]
@@ -2728,9 +2729,9 @@ public void Create_CombinesDefaultMetadata_AndMetadataFromValueTaskWrappedReturn
 
         // Assert
         Assert.Contains(result.EndpointMetadata, m => m is CustomEndpointMetadata { Source: MetadataSource.Caller });
-        Assert.Contains(result.EndpointMetadata, m => m is ProducesResponseTypeMetadata { Type: { } type } && type == typeof(CountsDefaultEndpointMetadataResult));
-        // Expecting the custom metadata nad hte implicit metadata associated with a Task-based return type to be inserted
-        Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 2 });
+        Assert.DoesNotContain(result.EndpointMetadata, m => m is IProducesResponseTypeMetadata);
+        // Expecting '1' because only initial metadata will be in the metadata list when this metadata item is added
+        Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 1 });
     }
 
     [Fact]
@@ -2751,9 +2752,9 @@ public void Create_CombinesDefaultMetadata_AndMetadataFromFSharpAsyncWrappedRetu
 
         // Assert
         Assert.Contains(result.EndpointMetadata, m => m is CustomEndpointMetadata { Source: MetadataSource.Caller });
-        Assert.Contains(result.EndpointMetadata, m => m is IProducesResponseTypeMetadata { Type: { } type } && type == typeof(CountsDefaultEndpointMetadataResult));
+        Assert.DoesNotContain(result.EndpointMetadata, m => m is IProducesResponseTypeMetadata);
         // Expecting '1' because only initial metadata will be in the metadata list when this metadata item is added
-        Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 2 });
+        Assert.Contains(result.EndpointMetadata, m => m is MetadataCountMetadata { Count: 1 });
     }
 
     [Fact]
@@ -2824,14 +2825,16 @@ public void Create_CombinesAllMetadata_InCorrectOrder()
             m => Assert.True(m is AcceptsMetadata am && am.RequestType == typeof(AddsCustomParameterMetadata)),
             // Inferred ParameterBinding metadata
             m => Assert.True(m is IParameterBindingMetadata { Name: "param1" }),
-            // Inferred ProducesResopnseTypeMetadata from RDF for complex type
+            // Inferred IDisableCookieRedirectMetadata from RDF for complex request and response type
+            m => Assert.True(m is IDisableCookieRedirectMetadata),
+            // Inferred ProducesResponseTypeMetadata from RDF for complex type
             m => Assert.Equal(typeof(CountsDefaultEndpointMetadataPoco), ((IProducesResponseTypeMetadata)m).Type),
             // Metadata provided by parameters implementing IEndpointParameterMetadataProvider
             m => Assert.True(m is ParameterNameMetadata { Name: "param1" }),
             // Metadata provided by parameters implementing IEndpointMetadataProvider
             m => Assert.True(m is CustomEndpointMetadata { Source: MetadataSource.Parameter }),
             // Metadata provided by return type implementing IEndpointMetadataProvider
-            m => Assert.True(m is MetadataCountMetadata { Count: 6 }));
+            m => Assert.True(m is MetadataCountMetadata { Count: 7 }));
     }
 
     [Fact]
@@ -3156,6 +3159,55 @@ static void TestAction([AsParameters] ParameterListRequiredNullableStringFromDif
         Assert.Null(httpContext.Items["RequiredHeaderParam"]);
     }
 
+    private class ParameterListFromHeaderCommaSeparatedValues
+    {
+        [FromHeader(Name = "q")]
+        public required StringValues? BoundToStringValues { get; set; }
+
+        [FromHeader(Name = "q")]
+        public string? BoundToString { get; set; }
+
+        [FromHeader(Name = "q")]
+        public string[]? BoundToStringArray { get; set; }
+
+        [FromHeader(Name = "q")]
+        public int[]? BoundToIntArray { get; set; }
+    }
+
+    [Theory]
+    [InlineData("", new string[] { }, new int[] {})]
+    [InlineData(" ", new string[] { }, new int[] { })]
+    [InlineData(",", new string[] { }, new int[] { })]
+    [InlineData("100", new string[] { "100" }, new int[] { 100 })]
+    [InlineData("1,2", new string[] { "1", "2" }, new int[] { 1, 2 })]
+    [InlineData("1, 2 ,  3", new string[] { "1", "2", "3" }, new int[] { 1, 2, 3 })]
+    public async Task RequestDelegateFactory_FromHeader_CommaSeparatedValues(string headerValue, string[] expectedStringArray, int[] expectedIntArray)
+    {
+        // Arrange
+        var httpContext = CreateHttpContext();
+        httpContext.Request.Headers["q"] = headerValue;
+
+        void TestAction([AsParameters] ParameterListFromHeaderCommaSeparatedValues args)
+        {
+            httpContext.Items[nameof(args.BoundToStringValues)] = args.BoundToStringValues;
+            httpContext.Items[nameof(args.BoundToString)] = args.BoundToString;
+            httpContext.Items[nameof(args.BoundToStringArray)] = args.BoundToStringArray;
+            httpContext.Items[nameof(args.BoundToIntArray)] = args.BoundToIntArray;
+        }
+
+        var factoryResult = RequestDelegateFactory.Create(TestAction);
+        var requestDelegate = factoryResult.RequestDelegate;
+
+        // Act
+        await requestDelegate(httpContext);
+
+        // Assert
+        Assert.Equal(headerValue, httpContext.Items[nameof(ParameterListFromHeaderCommaSeparatedValues.BoundToString)]);
+        Assert.Equal(new StringValues(headerValue), httpContext.Items[nameof(ParameterListFromHeaderCommaSeparatedValues.BoundToStringValues)]);
+        Assert.Equal(expectedStringArray, httpContext.Items[nameof(ParameterListFromHeaderCommaSeparatedValues.BoundToStringArray)]);
+        Assert.Equal(expectedIntArray, httpContext.Items[nameof(ParameterListFromHeaderCommaSeparatedValues.BoundToIntArray)]);
+    }
+
 #nullable disable
     private class ParameterListMixedRequiredStringsFromDifferentSources
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt
index ae38db998901..62465758d43e 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt
@@ -225,6 +225,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt
index ddfeaf604670..2011bb74d023 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt
@@ -363,6 +363,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt
index ab79dddfdc12..d4bed32cff50 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt
@@ -2225,6 +2225,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt
index 28e8316f4a7e..6159dd40f846 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt
@@ -412,6 +412,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt
index 3002127aa54c..2547e7535558 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -108,7 +109,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: p (Type = Microsoft.AspNetCore.Http.Generators.Tests.ParsableTodo[], IsOptional = False, IsParsable = True, IsArray = True, Source = Header)
-                    var p_raw = httpContext.Request.Headers["p"];
+                    var p_raw = httpContext.Request.Headers.GetCommaSeparatedValues("p");
                     var p_temp = p_raw.ToArray();
                     global::Microsoft.AspNetCore.Http.Generators.Tests.ParsableTodo[] p_local = new global::Microsoft.AspNetCore.Http.Generators.Tests.ParsableTodo[p_temp.Length];
                     for (var i = 0; i < p_temp.Length; i++)
@@ -138,7 +139,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: p (Type = Microsoft.AspNetCore.Http.Generators.Tests.ParsableTodo[], IsOptional = False, IsParsable = True, IsArray = True, Source = Header)
-                    var p_raw = httpContext.Request.Headers["p"];
+                    var p_raw = httpContext.Request.Headers.GetCommaSeparatedValues("p");
                     var p_temp = p_raw.ToArray();
                     global::Microsoft.AspNetCore.Http.Generators.Tests.ParsableTodo[] p_local = new global::Microsoft.AspNetCore.Http.Generators.Tests.ParsableTodo[p_temp.Length];
                     for (var i = 0; i < p_temp.Length; i++)
@@ -259,6 +260,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt
index c4463d8d32ac..b2d3d5182a98 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -108,7 +109,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: p (Type = string?[], IsOptional = False, IsParsable = False, IsArray = True, Source = Header)
-                    var p_raw = httpContext.Request.Headers["p"];
+                    var p_raw = httpContext.Request.Headers.GetCommaSeparatedValues("p");
                     var p_temp = p_raw.ToArray();
                     string[] p_local = p_temp!;
 
@@ -125,7 +126,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: p (Type = string?[], IsOptional = False, IsParsable = False, IsArray = True, Source = Header)
-                    var p_raw = httpContext.Request.Headers["p"];
+                    var p_raw = httpContext.Request.Headers.GetCommaSeparatedValues("p");
                     var p_temp = p_raw.ToArray();
                     string[] p_local = p_temp!;
 
@@ -231,6 +232,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt
index 040fdfca9d93..3b6dfaa17a49 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -108,7 +109,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: p (Type = string[], IsOptional = False, IsParsable = False, IsArray = True, Source = Header)
-                    var p_raw = httpContext.Request.Headers["p"];
+                    var p_raw = httpContext.Request.Headers.GetCommaSeparatedValues("p");
                     var p_temp = p_raw.ToArray();
                     string[] p_local = p_temp!;
 
@@ -125,7 +126,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: p (Type = string[], IsOptional = False, IsParsable = False, IsArray = True, Source = Header)
-                    var p_raw = httpContext.Request.Headers["p"];
+                    var p_raw = httpContext.Request.Headers.GetCommaSeparatedValues("p");
                     var p_temp = p_raw.ToArray();
                     string[] p_local = p_temp!;
 
@@ -231,6 +232,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt
index 860627ce40b0..e4de33218466 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -259,6 +260,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_IntArrayParam_Optional.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_IntArrayParam_Optional.generated.txt
new file mode 100644
index 000000000000..598d6ecd2a8d
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_IntArrayParam_Optional.generated.txt
@@ -0,0 +1,459 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_IntArrayParam_Optional_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_IntArrayParam_Optional_QueryNotPresent.generated.txt
new file mode 100644
index 000000000000..598d6ecd2a8d
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_IntArrayParam_Optional_QueryNotPresent.generated.txt
@@ -0,0 +1,459 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableIntArrayParam_Optional.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableIntArrayParam_Optional.generated.txt
new file mode 100644
index 000000000000..6bfc8e54f428
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableIntArrayParam_Optional.generated.txt
@@ -0,0 +1,459 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32?[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32?[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32?[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32?[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32?[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent.generated.txt
new file mode 100644
index 000000000000..6bfc8e54f428
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent.generated.txt
@@ -0,0 +1,459 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32?[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32?[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32?[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32?[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32?[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt
index 1d755d1dc5ad..a26bf2b75f56 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -230,6 +231,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt
index e9d7ec91cc48..0b1e00050add 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -230,6 +231,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam_Optional.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam_Optional.generated.txt
new file mode 100644
index 000000000000..fa538f0fe524
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam_Optional.generated.txt
@@ -0,0 +1,430 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.String[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.String[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.String[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    string[] p_local = p_temp!;
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    string[] p_local = p_temp!;
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.String[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam_Optional_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam_Optional_QueryNotPresent.generated.txt
new file mode 100644
index 000000000000..fa538f0fe524
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam_Optional_QueryNotPresent.generated.txt
@@ -0,0 +1,430 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.String[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.String[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.String[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    string[] p_local = p_temp!;
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = Query)
+                    var p_raw = httpContext.Request.Query["p"];
+                    var p_temp = p_raw.ToArray();
+                    string[] p_local = p_temp!;
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.String[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt
index 0a2c48bde9b4..73f90510b5f0 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt
@@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: svc (Type = Microsoft.AspNetCore.Http.Generators.Tests.TestService, IsOptional = False, IsParsable = False, IsArray = False, Source = Service)
-                    var svc_local = httpContext.RequestServices.GetRequiredService<Microsoft.AspNetCore.Http.Generators.Tests.TestService>();
+                    var svc_local = httpContext.RequestServices.GetRequiredService<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService>();
 
                     if (wasParamCheckFailure)
                     {
@@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: svc (Type = Microsoft.AspNetCore.Http.Generators.Tests.TestService, IsOptional = False, IsParsable = False, IsArray = False, Source = Service)
-                    var svc_local = httpContext.RequestServices.GetRequiredService<Microsoft.AspNetCore.Http.Generators.Tests.TestService>();
+                    var svc_local = httpContext.RequestServices.GetRequiredService<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService>();
 
                     if (wasParamCheckFailure)
                     {
@@ -207,7 +207,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: svc (Type = System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>, IsOptional = False, IsParsable = False, IsArray = False, Source = Service)
-                    var svc_local = httpContext.RequestServices.GetRequiredService<System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
+                    var svc_local = httpContext.RequestServices.GetRequiredService<global::System.Collections.Generic.IEnumerable<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
 
                     if (wasParamCheckFailure)
                     {
@@ -230,7 +230,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: svc (Type = System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>, IsOptional = False, IsParsable = False, IsArray = False, Source = Service)
-                    var svc_local = httpContext.RequestServices.GetRequiredService<System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
+                    var svc_local = httpContext.RequestServices.GetRequiredService<global::System.Collections.Generic.IEnumerable<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
 
                     if (wasParamCheckFailure)
                     {
@@ -308,9 +308,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: svc (Type = Microsoft.AspNetCore.Http.Generators.Tests.TestService?, IsOptional = True, IsParsable = False, IsArray = False, Source = Service)
-                    var svc_local = httpContext.RequestServices.GetService<Microsoft.AspNetCore.Http.Generators.Tests.TestService?>();;
+                    var svc_local = httpContext.RequestServices.GetService<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService?>();;
                     // Endpoint Parameter: svcs (Type = System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>, IsOptional = False, IsParsable = False, IsArray = False, Source = Service)
-                    var svcs_local = httpContext.RequestServices.GetRequiredService<System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
+                    var svcs_local = httpContext.RequestServices.GetRequiredService<global::System.Collections.Generic.IEnumerable<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
 
                     if (wasParamCheckFailure)
                     {
@@ -333,9 +333,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 {
                     var wasParamCheckFailure = false;
                     // Endpoint Parameter: svc (Type = Microsoft.AspNetCore.Http.Generators.Tests.TestService?, IsOptional = True, IsParsable = False, IsArray = False, Source = Service)
-                    var svc_local = httpContext.RequestServices.GetService<Microsoft.AspNetCore.Http.Generators.Tests.TestService?>();;
+                    var svc_local = httpContext.RequestServices.GetService<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService?>();;
                     // Endpoint Parameter: svcs (Type = System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>, IsOptional = False, IsParsable = False, IsArray = False, Source = Service)
-                    var svcs_local = httpContext.RequestServices.GetRequiredService<System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
+                    var svcs_local = httpContext.RequestServices.GetRequiredService<global::System.Collections.Generic.IEnumerable<global::Microsoft.AspNetCore.Http.Generators.Tests.TestService>>();
 
                     if (wasParamCheckFailure)
                     {
@@ -439,6 +439,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt
index 794413cb79a9..9b10d9642c06 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt
@@ -606,6 +606,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt
index 948327f881b7..718e7346565c 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt
@@ -72,6 +72,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -266,6 +267,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_IntArrayParam_Optional.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_IntArrayParam_Optional.generated.txt
new file mode 100644
index 000000000000..93b03a43f10b
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_IntArrayParam_Optional.generated.txt
@@ -0,0 +1,466 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32[]));
+                var p_RouteOrQueryResolver = GeneratedRouteBuilderExtensionsCore.ResolveFromRouteOrQuery("p", options.RouteParameterNames);
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static Func<HttpContext, StringValues> ResolveFromRouteOrQuery(string parameterName, IEnumerable<string>? routeParameterNames)
+        {
+            return routeParameterNames?.Contains(parameterName, StringComparer.OrdinalIgnoreCase) == true
+                ? (httpContext) => new StringValues((string?)httpContext.Request.RouteValues[parameterName])
+                : (httpContext) => httpContext.Request.Query[parameterName];
+        }
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_IntArrayParam_Optional_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_IntArrayParam_Optional_QueryNotPresent.generated.txt
new file mode 100644
index 000000000000..93b03a43f10b
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_IntArrayParam_Optional_QueryNotPresent.generated.txt
@@ -0,0 +1,466 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32[]));
+                var p_RouteOrQueryResolver = GeneratedRouteBuilderExtensionsCore.ResolveFromRouteOrQuery("p", options.RouteParameterNames);
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32[]? p_local = new global::System.Int32[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                logOrThrowExceptionHelper.ParameterBindingFailed("int[]?", "p", element);
+                                wasParamCheckFailure = true;
+                            }
+                        }
+                        p_local[i] = parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32[] (global::System.Int32[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static Func<HttpContext, StringValues> ResolveFromRouteOrQuery(string parameterName, IEnumerable<string>? routeParameterNames)
+        {
+            return routeParameterNames?.Contains(parameterName, StringComparer.OrdinalIgnoreCase) == true
+                ? (httpContext) => new StringValues((string?)httpContext.Request.RouteValues[parameterName])
+                : (httpContext) => httpContext.Request.Query[parameterName];
+        }
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableIntArrayParam_Optional.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableIntArrayParam_Optional.generated.txt
new file mode 100644
index 000000000000..a4534206e6cd
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableIntArrayParam_Optional.generated.txt
@@ -0,0 +1,466 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32?[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32?[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32?[]));
+                var p_RouteOrQueryResolver = GeneratedRouteBuilderExtensionsCore.ResolveFromRouteOrQuery("p", options.RouteParameterNames);
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32?[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "route or query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "route or query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32?[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static Func<HttpContext, StringValues> ResolveFromRouteOrQuery(string parameterName, IEnumerable<string>? routeParameterNames)
+        {
+            return routeParameterNames?.Contains(parameterName, StringComparer.OrdinalIgnoreCase) == true
+                ? (httpContext) => new StringValues((string?)httpContext.Request.RouteValues[parameterName])
+                : (httpContext) => httpContext.Request.Query[parameterName];
+        }
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent.generated.txt
new file mode 100644
index 000000000000..a4534206e6cd
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent.generated.txt
@@ -0,0 +1,466 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: true, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32?[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.Int32?[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.Int32?[]));
+                var p_RouteOrQueryResolver = GeneratedRouteBuilderExtensionsCore.ResolveFromRouteOrQuery("p", options.RouteParameterNames);
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.Int32?[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "route or query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return Task.CompletedTask;
+                    }
+                    var result = handler(p_local);
+                    return GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = int?[]?, IsOptional = True, IsParsable = True, IsArray = True, Source = RouteOrQuery)
+                    var p_raw = p_RouteOrQueryResolver(httpContext);
+                    var p_temp = p_raw.ToArray();
+                    global::System.Int32?[]? p_local = new global::System.Int32?[p_temp.Length];
+                    for (var i = 0; i < p_temp.Length; i++)
+                    {
+                        var element = p_temp[i];
+                        if (!GeneratedRouteBuilderExtensionsCore.TryParseExplicit<int>(element!, CultureInfo.InvariantCulture, out var parsed_element))
+                        {
+                            if (!string.IsNullOrEmpty(element))
+                            {
+                                wasParamCheckFailure = true;
+                                logOrThrowExceptionHelper.RequiredParameterNotProvided("int?[]?", "p", "route or query string");
+                            }
+                        }
+                        p_local[i] = string.IsNullOrEmpty(element) ? null! : parsed_element!;
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.Int32?[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.Int32?[] (global::System.Int32?[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static Func<HttpContext, StringValues> ResolveFromRouteOrQuery(string parameterName, IEnumerable<string>? routeParameterNames)
+        {
+            return routeParameterNames?.Contains(parameterName, StringComparer.OrdinalIgnoreCase) == true
+                ? (httpContext) => new StringValues((string?)httpContext.Request.RouteValues[parameterName])
+                : (httpContext) => httpContext.Request.Query[parameterName];
+        }
+        private static bool TryParseExplicit<T>(string? s, IFormatProvider? provider, [MaybeNullWhen(returnValue: false)] out T result) where T: IParsable<T>
+            => T.TryParse(s, provider, out result);
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt
index af6f3f0d1c17..15f5ee3f3a31 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt
@@ -81,12 +81,14 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -327,6 +329,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt
index af6f3f0d1c17..15f5ee3f3a31 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt
@@ -81,12 +81,14 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -327,6 +329,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt
index af6f3f0d1c17..15f5ee3f3a31 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt
@@ -81,12 +81,14 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -327,6 +329,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt
index 3d2c9a682319..1bfa6b37f0a0 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt
@@ -81,12 +81,14 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -327,6 +329,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam_Optional.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam_Optional.generated.txt
new file mode 100644
index 000000000000..18b9123305b6
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam_Optional.generated.txt
@@ -0,0 +1,528 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
+                var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
+                    (true, typeof(global::System.String[])),
+                    #nullable enable
+                };
+                foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
+                {
+                    if (!serviceProviderIsService.IsService(type))
+                    {
+                        options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+                        break;
+                    }
+                }
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.String[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.String[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.String[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                async Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = JsonBodyOrQuery)
+                    global::System.String[]? p_local = null!;
+                    if (options.DisableInferBodyFromParameters)
+                    {
+                        var p_raw = httpContext.Request.Query["p"];
+                        p_local = p_raw!;
+                    }
+                    else
+                    {
+                        var p_JsonTypeInfo = (JsonTypeInfo<global::System.String[]?>)jsonOptions.SerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+                        var p_resolveBodyResult = await GeneratedRouteBuilderExtensionsCore.TryResolveBodyAsync<global::System.String[]?>(httpContext, logOrThrowExceptionHelper, true, "string[]?", "p", p_JsonTypeInfo);
+                        p_local = p_resolveBodyResult.Item2!;
+                        if (!p_resolveBodyResult.Item1)
+                        {
+                            return;
+                        }
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return;
+                    }
+                    var result = handler(p_local);
+                    await GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = JsonBodyOrQuery)
+                    global::System.String[]? p_local = null!;
+                    if (options.DisableInferBodyFromParameters)
+                    {
+                        var p_raw = httpContext.Request.Query["p"];
+                        p_local = p_raw!;
+                    }
+                    else
+                    {
+                        var p_JsonTypeInfo = (JsonTypeInfo<global::System.String[]?>)jsonOptions.SerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+                        var p_resolveBodyResult = await GeneratedRouteBuilderExtensionsCore.TryResolveBodyAsync<global::System.String[]?>(httpContext, logOrThrowExceptionHelper, true, "string[]?", "p", p_JsonTypeInfo);
+                        p_local = p_resolveBodyResult.Item2!;
+                        if (!p_resolveBodyResult.Item1)
+                        {
+                            return;
+                        }
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.String[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static async ValueTask<(bool, T?)> TryResolveBodyAsync<T>(HttpContext httpContext, LogOrThrowExceptionHelper logOrThrowExceptionHelper, bool allowEmpty, string parameterTypeName, string parameterName, JsonTypeInfo<T> jsonTypeInfo, bool isInferred = false)
+        {
+            var feature = httpContext.Features.Get<Microsoft.AspNetCore.Http.Features.IHttpRequestBodyDetectionFeature>();
+            T? bodyValue = default;
+            var bodyValueSet = false;
+
+            if (feature?.CanHaveBody == true)
+            {
+                if (!httpContext.Request.HasJsonContentType())
+                {
+                    logOrThrowExceptionHelper.UnexpectedJsonContentType(httpContext.Request.ContentType);
+                    httpContext.Response.StatusCode = StatusCodes.Status415UnsupportedMediaType;
+                    return (false, default);
+                }
+                try
+                {
+                    bodyValue = await httpContext.Request.ReadFromJsonAsync(jsonTypeInfo);
+                    bodyValueSet = bodyValue != null;
+                }
+                catch (BadHttpRequestException badHttpRequestException)
+                {
+                    logOrThrowExceptionHelper.RequestBodyIOException(badHttpRequestException);
+                    httpContext.Response.StatusCode = badHttpRequestException.StatusCode;
+                    return (false, default);
+                }
+                catch (IOException ioException)
+                {
+                    logOrThrowExceptionHelper.RequestBodyIOException(ioException);
+                    httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+                    return (false, default);
+                }
+                catch (System.Text.Json.JsonException jsonException)
+                {
+                    logOrThrowExceptionHelper.InvalidJsonRequestBody(parameterTypeName, parameterName, jsonException);
+                    httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+                    return (false, default);
+                }
+            }
+
+            if (!allowEmpty && !bodyValueSet)
+            {
+                if (!isInferred)
+                {
+                    logOrThrowExceptionHelper.RequiredParameterNotProvided(parameterTypeName, parameterName, "body");
+                }
+                else
+                {
+                    logOrThrowExceptionHelper.ImplicitBodyNotProvided(parameterName);
+                }
+                httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+                return (false, bodyValue);
+            }
+
+            return (true, bodyValue);
+        }
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam_Optional_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam_Optional_QueryNotPresent.generated.txt
new file mode 100644
index 000000000000..18b9123305b6
--- /dev/null
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam_Optional_QueryNotPresent.generated.txt
@@ -0,0 +1,528 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+
+namespace System.Runtime.CompilerServices
+{
+    %GENERATEDCODEATTRIBUTE%
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.Http.Generated
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Runtime.CompilerServices;
+    using System.Text.Json;
+    using System.Text.Json.Serialization.Metadata;
+    using System.Threading.Tasks;
+    using System.IO;
+    using Microsoft.AspNetCore.Antiforgery;
+    using Microsoft.AspNetCore.Routing;
+    using Microsoft.AspNetCore.Routing.Patterns;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Http.Json;
+    using Microsoft.AspNetCore.Http.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.FileProviders;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Primitives;
+    using Microsoft.Extensions.Options;
+
+    using MetadataPopulator = System.Func<System.Reflection.MethodInfo, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult>;
+    using RequestDelegateFactoryFunc = System.Func<System.Delegate, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult>;
+
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedRouteBuilderExtensionsCore
+    {
+        private static readonly JsonOptions FallbackJsonOptions = new();
+        private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get };
+
+        %INTERCEPTSLOCATIONATTRIBUTE%
+        internal static RouteHandlerBuilder MapGet0(
+            this IEndpointRouteBuilder endpoints,
+            [StringSyntax("Route")] string pattern,
+            Delegate handler)
+        {
+            MetadataPopulator populateMetadata = (methodInfo, options) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
+                var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
+                    (true, typeof(global::System.String[])),
+                    #nullable enable
+                };
+                foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
+                {
+                    if (!serviceProviderIsService.IsService(type))
+                    {
+                        options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+                        break;
+                    }
+                }
+                var parameters = methodInfo.GetParameters();
+                options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: true));
+                options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.String[]), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
+                return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
+            };
+            RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
+            {
+                Debug.Assert(options != null, "RequestDelegateFactoryOptions not found.");
+                Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
+                Debug.Assert(options.EndpointBuilder.ApplicationServices != null, "ApplicationServices not found.");
+                Debug.Assert(options.EndpointBuilder.FilterFactories != null, "FilterFactories not found.");
+                var handler = Cast(del, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+                EndpointFilterDelegate? filteredInvocation = null;
+                var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
+                var logOrThrowExceptionHelper = new LogOrThrowExceptionHelper(serviceProvider, options);
+                var jsonOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value ?? FallbackJsonOptions;
+                var jsonSerializerOptions = jsonOptions.SerializerOptions;
+                jsonSerializerOptions.MakeReadOnly();
+                var objectJsonTypeInfo = (JsonTypeInfo<object?>)jsonSerializerOptions.GetTypeInfo(typeof(object));
+                var responseJsonTypeInfo =  (JsonTypeInfo<global::System.String[]?>)jsonSerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+
+                if (options.EndpointBuilder.FilterFactories.Count > 0)
+                {
+                    filteredInvocation = GeneratedRouteBuilderExtensionsCore.BuildFilterDelegate(ic =>
+                    {
+                        if (ic.HttpContext.Response.StatusCode == 400)
+                        {
+                            return ValueTask.FromResult<object?>(Results.Empty);
+                        }
+                        return ValueTask.FromResult<object?>(handler(ic.GetArgument<global::System.String[]?>(0)!));
+                    },
+                    options.EndpointBuilder,
+                    handler.Method);
+                }
+
+                async Task RequestHandler(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = JsonBodyOrQuery)
+                    global::System.String[]? p_local = null!;
+                    if (options.DisableInferBodyFromParameters)
+                    {
+                        var p_raw = httpContext.Request.Query["p"];
+                        p_local = p_raw!;
+                    }
+                    else
+                    {
+                        var p_JsonTypeInfo = (JsonTypeInfo<global::System.String[]?>)jsonOptions.SerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+                        var p_resolveBodyResult = await GeneratedRouteBuilderExtensionsCore.TryResolveBodyAsync<global::System.String[]?>(httpContext, logOrThrowExceptionHelper, true, "string[]?", "p", p_JsonTypeInfo);
+                        p_local = p_resolveBodyResult.Item2!;
+                        if (!p_resolveBodyResult.Item1)
+                        {
+                            return;
+                        }
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                        return;
+                    }
+                    var result = handler(p_local);
+                    await GeneratedRouteBuilderExtensionsCore.WriteJsonResponseAsync(httpContext.Response, result, responseJsonTypeInfo);
+                }
+
+                async Task RequestHandlerFiltered(HttpContext httpContext)
+                {
+                    var wasParamCheckFailure = false;
+                    // Endpoint Parameter: p (Type = string[]?, IsOptional = True, IsParsable = False, IsArray = True, Source = JsonBodyOrQuery)
+                    global::System.String[]? p_local = null!;
+                    if (options.DisableInferBodyFromParameters)
+                    {
+                        var p_raw = httpContext.Request.Query["p"];
+                        p_local = p_raw!;
+                    }
+                    else
+                    {
+                        var p_JsonTypeInfo = (JsonTypeInfo<global::System.String[]?>)jsonOptions.SerializerOptions.GetTypeInfo(typeof(global::System.String[]));
+                        var p_resolveBodyResult = await GeneratedRouteBuilderExtensionsCore.TryResolveBodyAsync<global::System.String[]?>(httpContext, logOrThrowExceptionHelper, true, "string[]?", "p", p_JsonTypeInfo);
+                        p_local = p_resolveBodyResult.Item2!;
+                        if (!p_resolveBodyResult.Item1)
+                        {
+                            return;
+                        }
+                    }
+
+                    if (wasParamCheckFailure)
+                    {
+                        httpContext.Response.StatusCode = 400;
+                    }
+                    var result = await filteredInvocation(EndpointFilterInvocationContext.Create<global::System.String[]?>(httpContext, p_local));
+                    if (result is not null)
+                    {
+                        await GeneratedRouteBuilderExtensionsCore.ExecuteReturnAsync(result, httpContext, objectJsonTypeInfo);
+                    }
+                }
+
+                RequestDelegate targetDelegate = filteredInvocation is null ? RequestHandler : RequestHandlerFiltered;
+                var metadata = inferredMetadataResult?.EndpointMetadata ?? ReadOnlyCollection<object>.Empty;
+                return new RequestDelegateResult(targetDelegate, metadata);
+            };
+            var castHandler = Cast(handler, global::System.String[] (global::System.String[]? arg0= default) => throw null!);
+            return MapCore(
+                endpoints,
+                pattern,
+                handler,
+                GetVerb,
+                populateMetadata,
+                createRequestDelegate,
+                castHandler.Method);
+        }
+
+
+
+        internal static RouteHandlerBuilder MapCore(
+            this IEndpointRouteBuilder routes,
+            string pattern,
+            Delegate handler,
+            IEnumerable<string>? httpMethods,
+            MetadataPopulator populateMetadata,
+            RequestDelegateFactoryFunc createRequestDelegate,
+            MethodInfo methodInfo)
+        {
+            return RouteHandlerServices.Map(routes, pattern, handler, httpMethods, populateMetadata, createRequestDelegate, methodInfo);
+        }
+
+        private static T Cast<T>(Delegate d, T _) where T : Delegate
+        {
+            return (T)d;
+        }
+
+        private static EndpointFilterDelegate BuildFilterDelegate(EndpointFilterDelegate filteredInvocation, EndpointBuilder builder, MethodInfo mi)
+        {
+            var routeHandlerFilters =  builder.FilterFactories;
+            var context0 = new EndpointFilterFactoryContext
+            {
+                MethodInfo = mi,
+                ApplicationServices = builder.ApplicationServices,
+            };
+            var initialFilteredInvocation = filteredInvocation;
+            for (var i = routeHandlerFilters.Count - 1; i >= 0; i--)
+            {
+                var filterFactory = routeHandlerFilters[i];
+                filteredInvocation = filterFactory(context0, filteredInvocation);
+            }
+            return filteredInvocation;
+        }
+
+        private static Task ExecuteReturnAsync(object? obj, HttpContext httpContext, JsonTypeInfo<object?> jsonTypeInfo)
+        {
+            if (obj is IResult r)
+            {
+                return r.ExecuteAsync(httpContext);
+            }
+            else if (obj is string s)
+            {
+                return httpContext.Response.WriteAsync(s);
+            }
+            else
+            {
+                return WriteJsonResponseAsync(httpContext.Response, obj, jsonTypeInfo);
+            }
+        }
+
+        [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode",
+            Justification = "The 'JsonSerializer.IsReflectionEnabledByDefault' feature switch, which is set to false by default for trimmed ASP.NET apps, ensures the JsonSerializer doesn't use Reflection.")]
+        [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "See above.")]
+        private static Task WriteJsonResponseAsync<T>(HttpResponse response, T? value, JsonTypeInfo<T?> jsonTypeInfo)
+        {
+            var runtimeType = value?.GetType();
+
+            if (jsonTypeInfo.ShouldUseWith(runtimeType))
+            {
+                return HttpResponseJsonExtensions.WriteAsJsonAsync(response, value, jsonTypeInfo, default);
+            }
+
+            return response.WriteAsJsonAsync<object?>(value, jsonTypeInfo.Options);
+        }
+
+        private static bool HasKnownPolymorphism(this JsonTypeInfo jsonTypeInfo)
+            => jsonTypeInfo.Type.IsSealed || jsonTypeInfo.Type.IsValueType || jsonTypeInfo.PolymorphismOptions is not null;
+
+        private static bool ShouldUseWith(this JsonTypeInfo jsonTypeInfo, [NotNullWhen(false)] Type? runtimeType)
+            => runtimeType is null || jsonTypeInfo.Type == runtimeType || jsonTypeInfo.HasKnownPolymorphism();
+
+        private static async ValueTask<(bool, T?)> TryResolveBodyAsync<T>(HttpContext httpContext, LogOrThrowExceptionHelper logOrThrowExceptionHelper, bool allowEmpty, string parameterTypeName, string parameterName, JsonTypeInfo<T> jsonTypeInfo, bool isInferred = false)
+        {
+            var feature = httpContext.Features.Get<Microsoft.AspNetCore.Http.Features.IHttpRequestBodyDetectionFeature>();
+            T? bodyValue = default;
+            var bodyValueSet = false;
+
+            if (feature?.CanHaveBody == true)
+            {
+                if (!httpContext.Request.HasJsonContentType())
+                {
+                    logOrThrowExceptionHelper.UnexpectedJsonContentType(httpContext.Request.ContentType);
+                    httpContext.Response.StatusCode = StatusCodes.Status415UnsupportedMediaType;
+                    return (false, default);
+                }
+                try
+                {
+                    bodyValue = await httpContext.Request.ReadFromJsonAsync(jsonTypeInfo);
+                    bodyValueSet = bodyValue != null;
+                }
+                catch (BadHttpRequestException badHttpRequestException)
+                {
+                    logOrThrowExceptionHelper.RequestBodyIOException(badHttpRequestException);
+                    httpContext.Response.StatusCode = badHttpRequestException.StatusCode;
+                    return (false, default);
+                }
+                catch (IOException ioException)
+                {
+                    logOrThrowExceptionHelper.RequestBodyIOException(ioException);
+                    httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+                    return (false, default);
+                }
+                catch (System.Text.Json.JsonException jsonException)
+                {
+                    logOrThrowExceptionHelper.InvalidJsonRequestBody(parameterTypeName, parameterName, jsonException);
+                    httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+                    return (false, default);
+                }
+            }
+
+            if (!allowEmpty && !bodyValueSet)
+            {
+                if (!isInferred)
+                {
+                    logOrThrowExceptionHelper.RequiredParameterNotProvided(parameterTypeName, parameterName, "body");
+                }
+                else
+                {
+                    logOrThrowExceptionHelper.ImplicitBodyNotProvided(parameterName);
+                }
+                httpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+                return (false, bodyValue);
+            }
+
+            return (true, bodyValue);
+        }
+
+    }
+
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
+    %GENERATEDCODEATTRIBUTE%
+    file static class GeneratedMetadataConstants
+    {
+        public static readonly string[] JsonContentType = new [] { "application/json" };
+        public static readonly string[] PlaintextContentType = new [] { "text/plain" };
+        public static readonly string[] FormFileContentType = new[] { "multipart/form-data" };
+        public static readonly string[] FormContentType = new[] { "multipart/form-data", "application/x-www-form-urlencoded" };
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class ParameterBindingMetadata: IParameterBindingMetadata
+    {
+        internal ParameterBindingMetadata(
+            string name,
+            ParameterInfo parameterInfo,
+            bool hasTryParse = false,
+            bool hasBindAsync = false,
+            bool isOptional = false)
+        {
+            Name = name;
+            ParameterInfo = parameterInfo;
+            HasTryParse = hasTryParse;
+            HasBindAsync = hasBindAsync;
+            IsOptional = isOptional;
+        }
+
+        public string Name { get; }
+
+        public bool HasTryParse { get; }
+
+        public bool HasBindAsync { get; }
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public bool IsOptional { get; }
+    }
+
+    %GENERATEDCODEATTRIBUTE%
+    file sealed class LogOrThrowExceptionHelper
+    {
+        private readonly ILogger? _rdgLogger;
+        private readonly bool _shouldThrow;
+
+        public LogOrThrowExceptionHelper(IServiceProvider? serviceProvider, RequestDelegateFactoryOptions? options)
+        {
+            var loggerFactory = serviceProvider?.GetRequiredService<ILoggerFactory>();
+            _rdgLogger = loggerFactory?.CreateLogger("Microsoft.AspNetCore.Http.RequestDelegateGenerator.RequestDelegateGenerator");
+            _shouldThrow = options?.ThrowOnBadRequest ?? false;
+        }
+
+        public void RequestBodyIOException(IOException exception)
+        {
+            if (_rdgLogger != null)
+            {
+                _requestBodyIOException(_rdgLogger, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, Exception?> _requestBodyIOException =
+            LoggerMessage.Define(LogLevel.Debug, new EventId(1, "RequestBodyIOException"), "Reading the request body failed with an IOException.");
+
+        public void InvalidJsonRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as JSON.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidJsonRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidJsonRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "InvalidJsonRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as JSON.");
+
+        public void ParameterBindingFailed(string parameterTypeName, string parameterName, string sourceValue)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to bind parameter \"{0} {1}\" from \"{2}\".", parameterTypeName, parameterName, sourceValue);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _parameterBindingFailed(_rdgLogger, parameterTypeName, parameterName, sourceValue, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _parameterBindingFailed =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(3, "ParameterBindingFailed"), "Failed to bind parameter \"{ParameterType} {ParameterName}\" from \"{SourceValue}\".");
+
+        public void RequiredParameterNotProvided(string parameterTypeName, string parameterName, string source)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Required parameter \"{0} {1}\" was not provided from {2}.", parameterTypeName, parameterName, source);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _requiredParameterNotProvided(_rdgLogger, parameterTypeName, parameterName, source, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, string, Exception?> _requiredParameterNotProvided =
+            LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(4, "RequiredParameterNotProvided"), "Required parameter \"{ParameterType} {ParameterName}\" was not provided from {Source}.");
+
+        public void ImplicitBodyNotProvided(string parameterName)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Implicit body inferred for parameter \"{0}\" but no body was provided. Did you mean to use a Service instead?", parameterName);
+                throw new BadHttpRequestException(message);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _implicitBodyNotProvided(_rdgLogger, parameterName, null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _implicitBodyNotProvided =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "ImplicitBodyNotProvided"), "Implicit body inferred for parameter \"{ParameterName}\" but no body was provided. Did you mean to use a Service instead?");
+
+        public void UnexpectedJsonContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported JSON media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedJsonContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedJsonContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "UnexpectedContentType"), "Expected a supported JSON media type but got \"{ContentType}\".");
+
+        public void UnexpectedNonFormContentType(string? contentType)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Expected a supported form media type but got \"{0}\".", contentType);
+                throw new BadHttpRequestException(message, StatusCodes.Status415UnsupportedMediaType);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _unexpectedNonFormContentType(_rdgLogger, contentType ?? "(none)", null);
+            }
+        }
+
+        private static readonly Action<ILogger, string, Exception?> _unexpectedNonFormContentType =
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "UnexpectedNonFormContentType"), "Expected a supported form media type but got \"{ContentType}\".");
+
+        public void InvalidFormRequestBody(string parameterTypeName, string parameterName, Exception exception)
+        {
+            if (_shouldThrow)
+            {
+                var message = string.Format(CultureInfo.InvariantCulture, "Failed to read parameter \"{0} {1}\" from the request body as form.", parameterTypeName, parameterName);
+                throw new BadHttpRequestException(message, exception);
+            }
+
+            if (_rdgLogger != null)
+            {
+                _invalidFormRequestBody(_rdgLogger, parameterTypeName, parameterName, exception);
+            }
+        }
+
+        private static readonly Action<ILogger, string, string, Exception?> _invalidFormRequestBody =
+            LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(8, "InvalidFormRequestBody"), "Failed to read parameter \"{ParameterType} {ParameterName}\" from the request body as form.");
+    }
+}
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt
index 9a7acd7eb45f..2eedb8ebb4e1 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt
@@ -82,6 +82,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -345,6 +346,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt
index 8ac1c767314e..5f19b3e84abc 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt
@@ -234,6 +234,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt
index 139a5739a234..df4453e888a8 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt
@@ -267,6 +267,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt
index ae38db998901..62465758d43e 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt
@@ -225,6 +225,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt
index ae38db998901..62465758d43e 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt
@@ -225,6 +225,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt
index f1a99f9eb04b..c13dd9830c01 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt
@@ -70,6 +70,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
                 options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.Todo), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -218,6 +219,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt
index dd910316c8f7..1fcb2d9a7010 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt
@@ -266,6 +266,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt
index e37a0fa0f25e..dca5ca2932c2 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt
@@ -266,6 +266,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt
index 773c77bc8d20..44bf443feb7f 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt
@@ -238,6 +238,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt
index 839b8eaa9374..f034206dfb59 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -333,6 +334,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
index 0daff798796f..48eafa3d6687 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -334,6 +335,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
index 0daff798796f..48eafa3d6687 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -334,6 +335,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
index 0daff798796f..48eafa3d6687 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -334,6 +335,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
index 0daff798796f..48eafa3d6687 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -334,6 +335,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
index 8a2bc539262c..d919734fe2bc 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
@@ -81,6 +81,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
@@ -334,6 +335,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt
index 379c78383b45..feb0157220ce 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt
@@ -81,12 +81,14 @@ namespace Microsoft.AspNetCore.Http.Generated
                     if (!serviceProviderIsService.IsService(type))
                     {
                         options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(type: type, isOptional: isOptional, contentTypes: GeneratedMetadataConstants.JsonContentType));
+                        options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                         break;
                     }
                 }
                 var parameters = methodInfo.GetParameters();
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("p", parameters[0], hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(global::System.Int32), contentTypes: GeneratedMetadataConstants.JsonContentType));
+                DisableCookieRedirectMetadata.AddMetadataIfMissing(options.EndpointBuilder);
                 return new RequestDelegateMetadataResult { EndpointMetadata = options.EndpointBuilder.Metadata.AsReadOnly() };
             };
             RequestDelegateFactoryFunc createRequestDelegate = (del, options, inferredMetadataResult) =>
@@ -327,6 +329,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt
index 79567d9d3a09..93d79c0abaec 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt
@@ -414,6 +414,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt
index 38e13d3e6d53..e2b916aea081 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt
@@ -428,6 +428,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt
index 905324b900eb..8119c31870ea 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt
@@ -373,17 +373,17 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
-file sealed class AntiforgeryMetadata : IAntiforgeryMetadata
-{
-    public static readonly IAntiforgeryMetadata ValidationRequired = new AntiforgeryMetadata(true);
-
-    public AntiforgeryMetadata(bool requiresValidation)
+    file sealed class AntiforgeryMetadata : IAntiforgeryMetadata
     {
-        RequiresValidation = requiresValidation;
-    }
+        public static readonly IAntiforgeryMetadata ValidationRequired = new AntiforgeryMetadata(true);
 
-    public bool RequiresValidation { get; }
-}
+        public AntiforgeryMetadata(bool requiresValidation)
+        {
+            RequiresValidation = requiresValidation;
+        }
+
+        public bool RequiresValidation { get; }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt
index 5316ad22d597..2211c3a0291f 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt
@@ -388,6 +388,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt
index aad88a30d271..df7e24a9eebc 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt
@@ -257,6 +257,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt
index 30b4541a6f49..02fc8baf1ac0 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt
@@ -446,6 +446,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
                 options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
                 options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(contentTypes: GeneratedMetadataConstants.JsonContentType));
+                options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("HttpContext", new PropertyAsParameterInfo(false, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithImplicitFromBody)!.GetProperty("HttpContext")!, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithImplicitFromBody).GetConstructor(new[] { typeof(Microsoft.AspNetCore.Http.HttpContext), typeof(Microsoft.AspNetCore.Http.Generators.Tests.TodoStruct) })?.GetParameters()[0]), hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("Todo", new PropertyAsParameterInfo(false, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithImplicitFromBody)!.GetProperty("Todo")!, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithImplicitFromBody).GetConstructor(new[] { typeof(Microsoft.AspNetCore.Http.HttpContext), typeof(Microsoft.AspNetCore.Http.Generators.Tests.TodoStruct) })?.GetParameters()[1]), hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(string), contentTypes: GeneratedMetadataConstants.PlaintextContentType));
@@ -567,6 +568,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
                 options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
                 options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(contentTypes: GeneratedMetadataConstants.JsonContentType));
+                options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("HttpContext", new PropertyAsParameterInfo(false, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithMetadataType)!.GetProperty("HttpContext")!, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithMetadataType).GetConstructor(new[] { typeof(Microsoft.AspNetCore.Http.HttpContext), typeof(Microsoft.AspNetCore.Http.Generators.Tests.AddsCustomParameterMetadataAsProperty) })?.GetParameters()[0]), hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("Value", new PropertyAsParameterInfo(false, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithMetadataType)!.GetProperty("Value")!, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParametersListWithMetadataType).GetConstructor(new[] { typeof(Microsoft.AspNetCore.Http.HttpContext), typeof(Microsoft.AspNetCore.Http.Generators.Tests.AddsCustomParameterMetadataAsProperty) })?.GetParameters()[1]), hasTryParse: false, hasBindAsync: false, isOptional: false));
                 var parameterInfos = methodInfo.GetParameters();
@@ -683,6 +685,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 Debug.Assert(options.EndpointBuilder != null, "EndpointBuilder not found.");
                 options.EndpointBuilder.Metadata.Add(new System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.RequestDelegateGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42"));
                 options.EndpointBuilder.Metadata.Add(new AcceptsMetadata(contentTypes: GeneratedMetadataConstants.JsonContentType));
+                options.EndpointBuilder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("Todo", new PropertyAsParameterInfo(false, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParameterRecordStructWithJsonBodyOrService)!.GetProperty("Todo")!), hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ParameterBindingMetadata("Service", new PropertyAsParameterInfo(false, typeof(Microsoft.AspNetCore.Http.Generators.Tests.ParameterRecordStructWithJsonBodyOrService)!.GetProperty("Service")!), hasTryParse: false, hasBindAsync: false, isOptional: false));
                 options.EndpointBuilder.Metadata.Add(new ProducesResponseTypeMetadata(statusCode: StatusCodes.Status200OK, type: typeof(string), contentTypes: GeneratedMetadataConstants.PlaintextContentType));
@@ -966,6 +969,22 @@ namespace Microsoft.AspNetCore.Http.Generated
 
     }
 
+    file sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static readonly DisableCookieRedirectMetadata Instance = new();
+
+        private DisableCookieRedirectMetadata()
+        {
+        }
+
+        public static void AddMetadataIfMissing(EndpointBuilder builder)
+        {
+            if (!builder.Metadata.Any(m => m is IDisableCookieRedirectMetadata))
+            {
+                builder.Metadata.Add(Instance);
+            }
+        }
+    }
     %GENERATEDCODEATTRIBUTE%
     file static class GeneratedMetadataConstants
     {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.AsParameters.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.AsParameters.cs
index ced9bb67a029..a42149b8286a 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.AsParameters.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.AsParameters.cs
@@ -50,6 +50,9 @@ static string GetNoContructorsError(Type type)
             static string GetInvalidConstructorError(Type type)
                 => $"The public parameterized constructor must contain only parameters that match the declared public properties for type '{TypeNameHelper.GetTypeDisplayName(type, fullName: false)}'. For more information, please see https://aka.ms/aspnet/rdg-known-issues";
 
+            static string GetEnumerableTypeError(Type type)
+                => $"The enumerable type '{TypeNameHelper.GetTypeDisplayName(type, fullName: false)}' is not supported. For more information, please see https://aka.ms/aspnet/rdg-known-issues";
+
             return new []
             {
                     new object[] { "BadArgumentListRecord", DiagnosticDescriptors.InvalidAsParametersSingleConstructorOnly.Id, GetMultipleContructorsError(typeof(BadArgumentListRecord)) },
@@ -57,6 +60,9 @@ static string GetInvalidConstructorError(Type type)
                     new object[] { "BadArgumentListClassMultipleCtors", DiagnosticDescriptors.InvalidAsParametersSingleConstructorOnly.Id, GetMultipleContructorsError(typeof(BadArgumentListClassMultipleCtors))  },
                     new object[] { "BadAbstractArgumentListClass", DiagnosticDescriptors.InvalidAsParametersAbstractType.Id, GetAbstractTypeError(typeof(BadAbstractArgumentListClass)) },
                     new object[] { "BadNoPublicConstructorArgumentListClass", DiagnosticDescriptors.InvalidAsParametersNoConstructorFound.Id, GetNoContructorsError(typeof(BadNoPublicConstructorArgumentListClass)) },
+                    new object[] { "List<string>", DiagnosticDescriptors.InvalidAsParametersEnumerableType.Id, GetEnumerableTypeError(typeof(List<string>)) },
+                    new object[] { "List<IFormFile>", DiagnosticDescriptors.InvalidAsParametersEnumerableType.Id, GetEnumerableTypeError(typeof(List<IFormFile>)) },
+                    new object[] { "Dictionary<string, string>", DiagnosticDescriptors.InvalidAsParametersEnumerableType.Id, GetEnumerableTypeError(typeof(Dictionary<string, string>)) }
             };
         }
     }
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs
index fcbae8ef9d27..56601f5f866c 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs
@@ -786,6 +786,6 @@ public async Task RequestDelegatePopulatesFromOptionalFormParameterStringArray()
 
         await endpoint.RequestDelegate(httpContext);
 
-        Assert.Equal(["hello", "bye"], (string[])httpContext.Items["message"]);
+        Assert.Equal<string[]>(["hello", "bye"], (string[])httpContext.Items["message"]);
     }
 }
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs
index aefa72875046..ed58db3e2198 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs
@@ -35,7 +35,7 @@ public abstract class RequestDelegateCreationTestBase : LoggedTest
 
     protected abstract bool IsGeneratorEnabled { get; }
 
-    internal static readonly CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview).WithFeatures(new[] { new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.AspNetCore.Http.Generated") });
+    internal static readonly CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview).WithFeatures(new[] { new KeyValuePair<string, string>("InterceptorsNamespaces", "Microsoft.AspNetCore.Http.Generated") });
     private static readonly Project _baseProject = CreateProject();
     private static readonly string _interceptsLocationAttributeRegex = @"\[global::System\.Runtime\.CompilerServices\.InterceptsLocationAttribute\(\d+, "".*""\)\]";
 
@@ -287,6 +287,7 @@ internal static string GetMapActionString(string sources, string className = "Te
 using Microsoft.AspNetCore.Http.Generators.Tests;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Extensions.DependencyInjection;
+using Http;
 
 public static class {{className}}
 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Arrays.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Arrays.cs
index d7bf9bdef497..e460f9e6ee84 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Arrays.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Arrays.cs
@@ -10,6 +10,7 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
 using Microsoft.VisualStudio.TestPlatform.Common;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
@@ -325,6 +326,264 @@ public async Task MapAction_ImplicitQuery_NullableStringArrayParam()
         await VerifyAgainstBaselineUsingFile(compilation);
     }
 
+    [Fact]
+    public async Task MapAction_ImplicitQuery_StringArrayParam_Optional()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", (string[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+        httpContext.Request.QueryString = new QueryString("?p=a&p=b&p=c");
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, """["a","b","c"]""");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ImplicitQuery_StringArrayParam_Optional_QueryNotPresent()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", (string[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ExplicitQuery_StringArrayParam_Optional()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", ([FromQuery] string[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+        httpContext.Request.QueryString = new QueryString("?p=a&p=b&p=c");
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, """["a","b","c"]""");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ExplicitQuery_StringArrayParam_Optional_QueryNotPresent()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", ([FromQuery] string[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ImplicitQuery_IntArrayParam_Optional()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", (int[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+        httpContext.Request.QueryString = new QueryString("?p=0&p=1&p=2");
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[0,1,2]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ImplicitQuery_IntArrayParam_Optional_QueryNotPresent()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", (int[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ExplicitQuery_IntArrayParam_Optional()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", ([FromQuery] int[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+        httpContext.Request.QueryString = new QueryString("?p=0&p=1&p=2");
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[0,1,2]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ExplicitQuery_IntArrayParam_Optional_QueryNotPresent()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", ([FromQuery] int[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ImplicitQuery_NullableIntArrayParam_Optional()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", (int?[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+        httpContext.Request.QueryString = new QueryString("?p=0&p=1&p=2");
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[0,1,2]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ImplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", (int?[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ExplicitQuery_NullableIntArrayParam_Optional()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", ([FromQuery] int?[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+        httpContext.Request.QueryString = new QueryString("?p=0&p=1&p=2");
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[0,1,2]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
+    [Fact]
+    public async Task MapAction_ExplicitQuery_NullableIntArrayParam_Optional_QueryNotPresent()
+    {
+        var (results, compilation) = await RunGeneratorAsync("""
+            app.MapGet("/hello", ([FromQuery] int?[]? p = null) => p);
+            """);
+
+        var endpoint = GetEndpointFromCompilation(compilation);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+        });
+
+        var httpContext = CreateHttpContext();
+
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "[]");
+        await VerifyAgainstBaselineUsingFile(compilation);
+    }
+
     [Fact]
     public async Task MapPost_WithArrayQueryString_ShouldFail()
     {
@@ -516,4 +775,23 @@ public async Task RequestDelegateHandlesArraysFromExplicitQueryStringSource()
         Assert.Equal(new[] { 4, 5, 6 }, (int[])httpContext.Items["headers"]!);
         Assert.Equal(new[] { 7, 8, 9 }, (int[])httpContext.Items["form"]!);
     }
+
+    [Theory]
+    [InlineData("""app.MapGet("/", ([FromHeader(Name = "q")] string[]? arr) => arr);""", "", "[]")]
+    [InlineData("""app.MapGet("/", ([FromHeader(Name = "q")] string[]? arr) => arr);""", "a,b,c", "[\"a\",\"b\",\"c\"]")]
+    [InlineData("""app.MapGet("/", ([FromHeader(Name = "q")] int[]? arr) => arr);""", "1,2,3", "[1,2,3]")]
+    public async Task MapMethods_Get_With_CommaSeparatedValues_InHeader_ShouldBindToArray(string source, string headerContent, string expectedBody)
+    {
+        var (_, compilation) = await RunGeneratorAsync(source);
+        var endpoints = GetEndpointsFromCompilation(compilation);
+
+        foreach (var endpoint in endpoints)
+        {
+            var httpContext = CreateHttpContext();
+            httpContext.Request.Headers["q"] = headerContent;
+            await endpoint.RequestDelegate(httpContext);
+
+            await VerifyResponseBodyAsync(httpContext, expectedBody);
+        }
+    }
 }
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.BindAsync.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.BindAsync.cs
index 6fe493ae4e68..906ad3db3134 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.BindAsync.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.BindAsync.cs
@@ -254,7 +254,7 @@ public async Task BindAsyncWithBodyArgument()
         Assert.Equal("Write more tests!", todo!.Name);
     }
 
-    [Fact]
+    [Fact(Skip = "Resetting Stream.Position to 0 doesn't work with StreamPipeReader currently.")]
     public async Task BindAsyncRunsBeforeBodyBinding()
     {
         Todo originalTodo = new()
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs
index 32c08cd4e22b..54844d00f5bc 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+using System.Globalization;
 using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Http.RequestDelegateGenerator;
+using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 
@@ -99,7 +101,7 @@ public async Task SupportsSingleKeyedServiceWithCharKey()
     public async Task SupportsSingleKeyedServiceWithPrimitiveKeyTypes(object key)
     {
         var source = $$"""
-app.MapGet("/", (HttpContext context, [FromKeyedServices({{key.ToString()?.ToLowerInvariant()}})] TestService arg) => context.Items["arg"] = arg);
+app.MapGet("/", (HttpContext context, [FromKeyedServices({{Convert.ToString(key, CultureInfo.InvariantCulture)?.ToLowerInvariant()}})] TestService arg) => context.Items["arg"] = arg);
 """;
         var (_, compilation) = await RunGeneratorAsync(source);
         var myOriginalService = new TestService();
@@ -125,7 +127,7 @@ public async Task ThrowsForUnregisteredRequiredKeyService()
         var exception = await Assert.ThrowsAsync<InvalidOperationException>(
             async () => await endpoint.RequestDelegate(httpContext));
 
-        Assert.Equal("No service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' has been registered.", exception.Message);
+        Assert.Equal("No keyed service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' using key type 'System.String' has been registered.", exception.Message);
     }
 
     [Fact]
@@ -224,6 +226,32 @@ public async Task ThrowsIfDiContainerDoesNotSupportKeyedServices()
         Assert.Equal("Unable to resolve service referenced by FromKeyedServicesAttribute. The service provider doesn't support keyed services.", exception.Message);
     }
 
+    // See: https://github.com/dotnet/aspnetcore/issues/58633
+    [Fact]
+    public async Task RequestDelegateGeneratesCompilableCodeForKeyedServiceInNamespaceHttp()
+    {
+        var source = """
+app.MapGet("/hello", ([FromKeyedServices("example")] global::Http.ExampleService e) => e.Act("To be or not to be…"));
+""";
+        var (results, compilation) = await RunGeneratorAsync(source);
+
+        // Ironically, the same error this is testing would bite us here, so we must globally qualify the type name.
+        var serviceProvider = CreateServiceProvider((serviceCollection) => serviceCollection.AddKeyedSingleton<global::Http.ExampleService>("example"));
+        var endpoint = GetEndpointFromCompilation(compilation, serviceProvider: serviceProvider);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+            var p = Assert.Single(endpointModel.Parameters);
+            Assert.Equal(EndpointParameterSource.KeyedService, p.Source);
+            Assert.Equal("e", p.SymbolName);
+        });
+
+        var httpContext = CreateHttpContext(serviceProvider);
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "To be or not to be…");
+    }
+
     private class MockServiceProvider : IServiceProvider, ISupportRequiredService
     {
         public object GetService(Type serviceType)
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Metadata.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Metadata.cs
index 68f0af004651..2814a136e55f 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Metadata.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.Metadata.cs
@@ -83,17 +83,14 @@ public async Task MapAction_ReturnsTaskOfString_Has_Metadata()
     }
 
     [Fact]
-    public async Task MapAction_ReturnsTask_ProducesInferredMetadata()
+    public async Task MapAction_ReturnsTask_ProducesNoInferredProducesResponseTypeMetadata()
     {
         var (_, compilation) = await RunGeneratorAsync("""
 app.MapGet("/", Task () => Task.CompletedTask);
 """);
         var endpoint = GetEndpointFromCompilation(compilation);
 
-        var metadata = endpoint.Metadata.OfType<IProducesResponseTypeMetadata>().Single();
-        Assert.Equal(200, metadata.StatusCode);
-        Assert.Equal("text/plain", metadata.ContentTypes.Single());
-        Assert.Equal(typeof(void), metadata.Type);
+        Assert.Empty(endpoint.Metadata.OfType<IProducesResponseTypeMetadata>());
     }
 
     [Fact]
@@ -111,17 +108,14 @@ public async Task MapAction_ReturnsValueTaskOfString_Has_Metadata()
     }
 
     [Fact]
-    public async Task MapAction_ReturnsValueTask_ProducesInferredMetadata()
+    public async Task MapAction_ReturnsValueTask_ProducesNoInferredProducesResponseTypeMetadata()
     {
         var (_, compilation) = await RunGeneratorAsync("""
 app.MapGet("/", ValueTask () => ValueTask.CompletedTask);
 """);
         var endpoint = GetEndpointFromCompilation(compilation);
 
-        var metadata = endpoint.Metadata.OfType<IProducesResponseTypeMetadata>().Single();
-        Assert.Equal(200, metadata.StatusCode);
-        Assert.Equal("text/plain", metadata.ContentTypes.Single());
-        Assert.Equal(typeof(void), metadata.Type);
+        Assert.Empty(endpoint.Metadata.OfType<IProducesResponseTypeMetadata>());
     }
 
     [Fact]
@@ -512,6 +506,11 @@ public async Task InferMetadata_ThenCreate_CombinesAllMetadata_InCorrectOrder()
         // Act
         var endpoint = GetEndpointFromCompilation(compilation);
 
+        // IDisableCookieRedirectMetadata is tricky to order consistently because it depends on whether AddsCustomParameterMetadata is registered
+        // as a service at runtime. However, the order of IDisableCookieRedirectMetadata is not significant since there's no way to override it
+        // other than removing it.
+        Assert.Single(endpoint.Metadata, m => m is IDisableCookieRedirectMetadata);
+
         // Assert
         // NOTE: Depending on whether we are running under RDG or RDG, there are some generated types which
         //       don't have equivalents in the opposite. The two examples here are NullableContextAttribute which
@@ -525,7 +524,8 @@ m is not MethodInfo &&
             m is not HttpMethodMetadata &&
             m is not Attribute1 &&
             m is not Attribute2 &&
-            m is not IRouteDiagnosticsMetadata);
+            m is not IRouteDiagnosticsMetadata &&
+            m is not IDisableCookieRedirectMetadata);
 
         Assert.Collection(filteredMetadata,
             // Inferred AcceptsMetadata from RDF for complex type
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.SpecialTypes.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.SpecialTypes.cs
index 6de44b0cf8c5..0c6d6fc9d264 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.SpecialTypes.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.SpecialTypes.cs
@@ -154,56 +154,66 @@ public static object[][] DefaultValues
     {
         get
         {
-            return new[]
-            {
-                new object[] { "string?", "default", default(string), true },
-                new object[] { "string", "\"test\"", "test", true },
-                new object[] { "string", "\"a\" + \"b\"", "ab", true },
-                new object[] { "DateOnly?", "default", default(DateOnly?), false },
-                new object[] { "bool", "default", default(bool), true },
-                new object[] { "bool", "false", false, true },
-                new object[] { "bool", "true", true, true},
-                new object[] { "System.Threading.CancellationToken", "default", default(CancellationToken), false },
-                new object[] { "Todo?", "default", default(Todo), false },
-                new object[] { "char", "\'a\'", 'a', true },
-                new object[] { "int", "default", 0, true },
-                new object[] { "int", "1234", 1234, true },
-                new object[] { "int", "1234 * 4", 1234 * 4, true },
-                new object[] { "double", "1.0", 1.0, true },
-                new object[] { "double", "double.NaN", double.NaN, true },
-                new object[] { "double", "double.PositiveInfinity", double.PositiveInfinity, true },
-                new object[] { "double", "double.NegativeInfinity", double.NegativeInfinity, true },
-                new object[] { "double", "double.E", double.E, true },
-                new object[] { "double", "double.Epsilon", double.Epsilon, true },
-                new object[] { "double", "double.NegativeZero", double.NegativeZero, true },
-                new object[] { "double", "double.MaxValue", double.MaxValue, true },
-                new object[] { "double", "double.MinValue", double.MinValue, true },
-                new object[] { "double", "double.Pi", double.Pi, true },
-                new object[] { "double", "double.Tau", double.Tau, true },
-                new object[] { "float", "float.NaN", float.NaN, true },
-                new object[] { "float", "float.PositiveInfinity", float.PositiveInfinity, true },
-                new object[] { "float", "float.NegativeInfinity", float.NegativeInfinity, true },
-                new object[] { "float", "float.E", float.E, true },
-                new object[] { "float", "float.Epsilon", float.Epsilon, true },
-                new object[] { "float", "float.NegativeZero", float.NegativeZero, true },
-                new object[] { "float", "float.MaxValue", float.MaxValue, true },
-                new object[] { "float", "float.MinValue", float.MinValue, true },
-                new object[] { "float", "float.Pi", float.Pi, true },
-                new object[] { "float", "float.Tau", float.Tau, true },
-                new object[] {"decimal", "decimal.MaxValue", decimal.MaxValue, true },
-                new object[] {"decimal", "decimal.MinusOne", decimal.MinusOne, true },
-                new object[] {"decimal", "decimal.MinValue", decimal.MinValue, true },
-                new object[] {"decimal", "decimal.One", decimal.One, true },
-                new object[] {"decimal", "decimal.Zero", decimal.Zero, true },
-                new object[] {"long", "long.MaxValue", long.MaxValue, true },
-                new object[] {"long", "long.MinValue", long.MinValue, true },
-                new object[] {"short", "short.MaxValue", short.MaxValue, true },
-                new object[] {"short", "short.MinValue", short.MinValue, true },
-                new object[] {"ulong", "ulong.MaxValue", ulong.MaxValue, true },
-                new object[] {"ulong", "ulong.MinValue", ulong.MinValue, true },
-                new object[] {"ushort", "ushort.MaxValue", ushort.MaxValue, true },
-                new object[] {"ushort", "ushort.MinValue", ushort.MinValue, true },
-            };
+            return
+            [
+                ["string?", "default", default(string), true],
+                ["string", "\"test\"", "test", true],
+                ["string", "\"a\" + \"b\"", "ab", true],
+                ["DateOnly?", "default", default(DateOnly?), false],
+                ["bool", "default", default(bool), true],
+                ["bool", "false", false, true],
+                ["bool", "true", true, true],
+                ["System.Threading.CancellationToken", "default", default(CancellationToken), false],
+                ["Todo?", "default", default(Todo), false],
+                ["char", "\'a\'", 'a', true],
+                ["int", "default", 0, true],
+                ["int", "1234", 1234, true],
+                ["int", "1234 * 4", 1234 * 4, true],
+                ["double", "1.0", 1.0, true],
+                ["double", "double.NaN", double.NaN, true],
+                ["double", "double.PositiveInfinity", double.PositiveInfinity, true],
+                ["double", "double.NegativeInfinity", double.NegativeInfinity, true],
+                ["double", "double.E", double.E, true],
+                ["double", "double.Epsilon", double.Epsilon, true],
+                ["double", "double.NegativeZero", double.NegativeZero, true],
+                ["double", "double.MaxValue", double.MaxValue, true],
+                ["double", "double.MinValue", double.MinValue, true],
+                ["double", "double.Pi", double.Pi, true],
+                ["double", "double.Tau", double.Tau, true],
+                ["float", "float.NaN", float.NaN, true],
+                ["float", "float.PositiveInfinity", float.PositiveInfinity, true],
+                ["float", "float.NegativeInfinity", float.NegativeInfinity, true],
+                ["float", "float.E", float.E, true],
+                ["float", "float.Epsilon", float.Epsilon, true],
+                ["float", "float.NegativeZero", float.NegativeZero, true],
+                ["float", "float.MaxValue", float.MaxValue, true],
+                ["float", "float.MinValue", float.MinValue, true],
+                ["float", "float.Pi", float.Pi, true],
+                ["float", "float.Tau", float.Tau, true],
+                ["decimal", "decimal.MaxValue", decimal.MaxValue, true],
+                ["decimal", "decimal.MinusOne", decimal.MinusOne, true],
+                ["decimal", "decimal.MinValue", decimal.MinValue, true],
+                ["decimal", "decimal.One", decimal.One, true],
+                ["decimal", "decimal.Zero", decimal.Zero, true],
+                ["long", "long.MaxValue", long.MaxValue, true],
+                ["long", "long.MinValue", long.MinValue, true],
+                ["long", "(long)3.14", (long)3, true],
+                ["short", "short.MaxValue", short.MaxValue, true],
+                ["short", "short.MinValue", short.MinValue, true],
+                ["ulong", "ulong.MaxValue", ulong.MaxValue, true],
+                ["ulong", "ulong.MinValue", ulong.MinValue, true],
+                ["ushort", "ushort.MaxValue", ushort.MaxValue, true],
+                ["ushort", "ushort.MinValue", ushort.MinValue, true],
+                ["TodoStatus", "TodoStatus.Done", TodoStatus.Done, true],
+                ["TodoStatus", "TodoStatus.InProgress", TodoStatus.InProgress, true],
+                ["TodoStatus", "TodoStatus.NotDone", TodoStatus.NotDone, true],
+                ["TodoStatus", "(TodoStatus)1", TodoStatus.Done, true],
+                ["MyEnum", "MyEnum.ValueA", MyEnum.ValueA, true],
+                ["MyEnum", "MyEnum.ValueB", MyEnum.ValueB, true],
+                // Test nullable enum values
+                ["TodoStatus?", "TodoStatus.Done", (TodoStatus?)TodoStatus.Done, false],
+                ["TodoStatus?", "default", default(TodoStatus?), false]
+            ];
         }
     }
 
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.cs
index 8823f162b56b..9e4f803968e8 100644
--- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.cs
@@ -599,4 +599,30 @@ public async Task RequestDelegateHandlesStringValuesFromExplicitQueryStringSourc
         Assert.Equal(new[] { 4, 5, 6 }, (int[])httpContext.Items["headers"]!);
         Assert.Equal(new[] { 7, 8, 9 }, (int[])httpContext.Items["form"]!);
     }
+
+    // See: https://github.com/dotnet/aspnetcore/issues/58633
+    [Fact]
+    public async Task RequestDelegateGeneratesCompilableCodeForServiceInNamespaceHttp()
+    {
+        var source = """
+app.MapGet("/hello", ([FromServices] ExampleService e) => e.Act("To be or not to be…"));
+""";
+        var (results, compilation) = await RunGeneratorAsync(source);
+
+        // Ironically, the same error this is testing would bite us here, so we must globally qualify the type name.
+        var serviceProvider = CreateServiceProvider((serviceCollection) => serviceCollection.AddSingleton<global::Http.ExampleService>());
+        var endpoint = GetEndpointFromCompilation(compilation, serviceProvider: serviceProvider);
+
+        VerifyStaticEndpointModel(results, endpointModel =>
+        {
+            Assert.Equal("MapGet", endpointModel.HttpMethod);
+            var p = Assert.Single(endpointModel.Parameters);
+            Assert.Equal(EndpointParameterSource.Service, p.Source);
+            Assert.Equal("e", p.SymbolName);
+        });
+
+        var httpContext = CreateHttpContext(serviceProvider);
+        await endpoint.RequestDelegate(httpContext);
+        await VerifyResponseBodyAsync(httpContext, "To be or not to be…");
+    }
 }
diff --git a/src/Installers/Debian/tools/test/test_assets/test_package_layout/samples/testsample.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/SharedTypes.Http.cs
similarity index 56%
rename from src/Installers/Debian/tools/test/test_assets/test_package_layout/samples/testsample.cs
rename to src/Http/Http.Extensions/test/RequestDelegateGenerator/SharedTypes.Http.cs
index 086319c67a58..419a5a8034b9 100644
--- a/src/Installers/Debian/tools/test/test_assets/test_package_layout/samples/testsample.cs
+++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/SharedTypes.Http.cs
@@ -1,12 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-
 using System;
 
-public class Program {
+namespace Http;
 
-    public static void Main(){
-        System.Console.WriteLine("Hello World");
-    }
+#nullable  enable
 
-}
\ No newline at end of file
+public sealed class ExampleService
+{
+    public string Act(string line) => line;
+}
diff --git a/src/Http/Http.Extensions/test/ValidationEndpointConventionBuilderExtensionsTests.cs b/src/Http/Http.Extensions/test/ValidationEndpointConventionBuilderExtensionsTests.cs
new file mode 100644
index 000000000000..c871c407bd31
--- /dev/null
+++ b/src/Http/Http.Extensions/test/ValidationEndpointConventionBuilderExtensionsTests.cs
@@ -0,0 +1,78 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Http.Extensions.Tests;
+
+public class ValidationEndpointConventionBuilderExtensionsTests : LoggedTest
+{
+    [Fact]
+    public async Task DisableValidation_PreventsValidationFilterRegistration()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        services.AddValidation();
+        services.AddSingleton(LoggerFactory);
+        var serviceProvider = services.BuildServiceProvider();
+
+        var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
+
+        // Act - Create two endpoints - one with validation disabled, one without
+        var regularBuilder = builder.MapGet("test-enabled", ([Range(5, 10)] int param) => "Validation enabled here.");
+        var disabledBuilder = builder.MapGet("test-disabled", ([Range(5, 10)] int param) => "Validation disabled here.");
+
+        disabledBuilder.DisableValidation();
+
+        // Build the endpoints
+        var dataSource = Assert.Single(builder.DataSources);
+        var endpoints = dataSource.Endpoints;
+
+        // Assert
+        Assert.Equal(2, endpoints.Count);
+
+        // Get filter factories from both endpoints
+        var regularEndpoint = endpoints[0];
+        var disabledEndpoint = endpoints[1];
+
+        // Verify the disabled endpoint has the IDisableValidationMetadata
+        Assert.Contains(disabledEndpoint.Metadata, m => m is IDisableValidationMetadata);
+
+        // Verify that invalid arguments on the disabled endpoint do not trigger validation
+        var context = new DefaultHttpContext
+        {
+            RequestServices = serviceProvider
+        };
+        context.Request.Method = "GET";
+        context.Request.QueryString = new QueryString("?param=15");
+        var ms = new MemoryStream();
+        context.Response.Body = ms;
+
+        await disabledEndpoint.RequestDelegate(context);
+        Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+        Assert.Equal("Validation disabled here.", Encoding.UTF8.GetString(ms.ToArray()));
+
+        context = new DefaultHttpContext
+        {
+            RequestServices = serviceProvider
+        };
+        context.Request.Method = "GET";
+        context.Request.QueryString = new QueryString("?param=15");
+        await regularEndpoint.RequestDelegate(context);
+        Assert.Equal(StatusCodes.Status400BadRequest, context.Response.StatusCode);
+    }
+
+    private class DefaultEndpointRouteBuilder(IApplicationBuilder applicationBuilder) : IEndpointRouteBuilder
+    {
+        private IApplicationBuilder ApplicationBuilder { get; } = applicationBuilder ?? throw new ArgumentNullException(nameof(applicationBuilder));
+        public IApplicationBuilder CreateApplicationBuilder() => ApplicationBuilder.New();
+        public ICollection<EndpointDataSource> DataSources { get; } = [];
+        public IServiceProvider ServiceProvider => ApplicationBuilder.ApplicationServices;
+    }
+}
diff --git a/src/Http/Http.Extensions/test/ValidationFilterEndpointFactoryTests.cs b/src/Http/Http.Extensions/test/ValidationFilterEndpointFactoryTests.cs
new file mode 100644
index 000000000000..0d9e005ac201
--- /dev/null
+++ b/src/Http/Http.Extensions/test/ValidationFilterEndpointFactoryTests.cs
@@ -0,0 +1,183 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Net.Mime;
+using System.Text.Json;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Http.Extensions.Tests;
+
+public class ValidationEndpointFilterFactoryTests : LoggedTest
+{
+    [Fact]
+    public async Task GetHttpValidationProblemDetailsWhenProblemDetailsServiceNotRegistered()
+    {
+        var services = new ServiceCollection();
+        services.AddValidation();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
+
+        // Act - Create one endpoint with validation
+        builder.MapGet("validation-test", ([Range(5, 10)] int param) => "Validation enabled here.");
+
+        // Build the endpoints
+        var dataSource = Assert.Single(builder.DataSources);
+        var endpoints = dataSource.Endpoints;
+
+        // Get filter factories from endpoint
+        var endpoint = endpoints[0];
+
+        var context = new DefaultHttpContext
+        {
+            RequestServices = serviceProvider
+        };
+
+        context.Request.Method = "GET";
+        context.Request.QueryString = new QueryString("?param=15");
+        using var ms = new MemoryStream();
+        context.Response.Body = ms;
+
+        await endpoint.RequestDelegate(context);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, context.Response.StatusCode);
+        Assert.StartsWith(MediaTypeNames.Application.Json, context.Response.ContentType, StringComparison.OrdinalIgnoreCase);
+
+        ms.Seek(0, SeekOrigin.Begin);
+        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(ms, JsonSerializerOptions.Web);
+
+        Assert.Equal("One or more validation errors occurred.", problemDetails.Title);
+
+        // Check that ProblemDetails contains the errors object with 1 validation error
+        Assert.True(problemDetails.Extensions.TryGetValue("errors", out var errorsObj));
+        var errors = Assert.IsType<JsonElement>(errorsObj);
+        Assert.True(errors.EnumerateObject().Count() == 1);
+    }
+
+    [Fact]
+    public async Task UseProblemDetailsServiceWhenAddedInServiceCollection()
+    {
+        var services = new ServiceCollection();
+        services.AddValidation();
+        services.AddProblemDetails();
+        var serviceProvider = services.BuildServiceProvider();
+
+        var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
+
+        // Act - Create one endpoint with validation
+        builder.MapGet("validation-test", ([Range(5, 10)] int param) => "Validation enabled here.");
+
+        // Build the endpoints
+        var dataSource = Assert.Single(builder.DataSources);
+        var endpoints = dataSource.Endpoints;
+
+        // Get filter factories from endpoint
+        var endpoint = endpoints[0];
+
+        var context = new DefaultHttpContext
+        {
+            RequestServices = serviceProvider
+        };
+
+        context.Request.Method = "GET";
+        context.Request.QueryString = new QueryString("?param=15");
+        using var ms = new MemoryStream();
+        context.Response.Body = ms;
+
+        await endpoint.RequestDelegate(context);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, context.Response.StatusCode);
+        Assert.StartsWith(MediaTypeNames.Application.ProblemJson, context.Response.ContentType, StringComparison.OrdinalIgnoreCase);
+
+        ms.Seek(0, SeekOrigin.Begin);
+        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(ms, JsonSerializerOptions.Web);
+
+        // Check if the response is an actual ProblemDetails object
+        Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.5.1", problemDetails.Type);
+        Assert.Equal("One or more validation errors occurred.", problemDetails.Title);
+        Assert.Equal(StatusCodes.Status400BadRequest, problemDetails.Status);
+
+        // Check that ProblemDetails contains the errors object with 1 validation error
+        Assert.True(problemDetails.Extensions.TryGetValue("errors", out var errorsObj));
+        var errors = Assert.IsType<JsonElement>(errorsObj);
+        Assert.True(errors.EnumerateObject().Count() == 1);
+    }
+
+    [Fact]
+    public async Task UseProblemDetailsServiceWithCallbackWhenAddedInServiceCollection()
+    {
+        var services = new ServiceCollection();
+        services.AddValidation();
+
+        services.AddProblemDetails(options =>
+        {
+            options.CustomizeProblemDetails = context =>
+            {
+                context.ProblemDetails.Extensions.Add("timestamp", DateTimeOffset.Now);
+            };
+        });
+
+        var serviceProvider = services.BuildServiceProvider();
+
+        var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
+
+        // Act - Create one endpoint with validation
+        builder.MapGet("validation-test", ([Range(5, 10)] int param) => "Validation enabled here.");
+
+        // Build the endpoints
+        var dataSource = Assert.Single(builder.DataSources);
+        var endpoints = dataSource.Endpoints;
+
+        // Get filter factories from endpoint
+        var endpoint = endpoints[0];
+
+        var context = new DefaultHttpContext
+        {
+            RequestServices = serviceProvider
+        };
+
+        context.Request.Method = "GET";
+        context.Request.QueryString = new QueryString("?param=15");
+        using var ms = new MemoryStream();
+        context.Response.Body = ms;
+
+        await endpoint.RequestDelegate(context);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status400BadRequest, context.Response.StatusCode);
+        Assert.StartsWith(MediaTypeNames.Application.ProblemJson, context.Response.ContentType, StringComparison.OrdinalIgnoreCase);
+
+        ms.Seek(0, SeekOrigin.Begin);
+        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(ms, JsonSerializerOptions.Web);
+
+        // Check if the response is an actual ProblemDetails object
+        Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.5.1", problemDetails.Type);
+        Assert.Equal("One or more validation errors occurred.", problemDetails.Title);
+        Assert.Equal(StatusCodes.Status400BadRequest, problemDetails.Status);
+
+        // Check that ProblemDetails contains the errors object with 1 validation error
+        Assert.True(problemDetails.Extensions.TryGetValue("errors", out var errorsObj));
+        var errors = Assert.IsType<JsonElement>(errorsObj);
+        Assert.True(errors.EnumerateObject().Count() == 1);
+
+        // Check that ProblemDetails customizations are applied in the response
+        Assert.True(problemDetails.Extensions.ContainsKey("timestamp"));
+    }
+
+    private class DefaultEndpointRouteBuilder(IApplicationBuilder applicationBuilder) : IEndpointRouteBuilder
+    {
+        private IApplicationBuilder ApplicationBuilder { get; } = applicationBuilder ?? throw new ArgumentNullException(nameof(applicationBuilder));
+        public IApplicationBuilder CreateApplicationBuilder() => ApplicationBuilder.New();
+        public ICollection<EndpointDataSource> DataSources { get; } = [];
+        public IServiceProvider ServiceProvider => ApplicationBuilder.ApplicationServices;
+    }
+}
diff --git a/src/Http/Http.Features/src/IHttpRequestBodyDetectionFeature.cs b/src/Http/Http.Features/src/IHttpRequestBodyDetectionFeature.cs
index 0e02daa33063..55a98f4eeebd 100644
--- a/src/Http/Http.Features/src/IHttpRequestBodyDetectionFeature.cs
+++ b/src/Http/Http.Features/src/IHttpRequestBodyDetectionFeature.cs
@@ -20,6 +20,9 @@ public interface IHttpRequestBodyDetectionFeature
     /// <item><description>
     /// It's an HTTP/2 request that did not set the END_STREAM flag on the initial headers frame.
     /// </description></item>
+    /// <item><description>
+    /// It's an HTTP/3 request that did not set the END_STREAM flag on the initial headers frame.
+    /// </description></item>
     /// </list>
     /// The final request body length may still be zero for the chunked or HTTP/2 scenarios.
     /// <para>
@@ -35,6 +38,9 @@ public interface IHttpRequestBodyDetectionFeature
     /// <item><description>
     /// It's an HTTP/2 request that set END_STREAM on the initial headers frame.
     /// </description></item>
+    /// <item><description>
+    /// It's an HTTP/3 request that set END_STREAM on the initial headers frame.
+    /// </description></item>
     /// </list>
     /// </para>
     /// When false, the request body should never return data.
diff --git a/src/Http/Http.Features/src/PublicAPI.Shipped.txt b/src/Http/Http.Features/src/PublicAPI.Shipped.txt
index b4621699e214..1e25190f2237 100644
--- a/src/Http/Http.Features/src/PublicAPI.Shipped.txt
+++ b/src/Http/Http.Features/src/PublicAPI.Shipped.txt
@@ -92,6 +92,8 @@ Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.IsReadOnly.get
 Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.MaxRequestBodySize.get -> long?
 Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.MaxRequestBodySize.set -> void
 Microsoft.AspNetCore.Http.Features.IHttpMetricsTagsFeature
+Microsoft.AspNetCore.Http.Features.IHttpMetricsTagsFeature.MetricsDisabled.get -> bool
+Microsoft.AspNetCore.Http.Features.IHttpMetricsTagsFeature.MetricsDisabled.set -> void
 Microsoft.AspNetCore.Http.Features.IHttpMetricsTagsFeature.Tags.get -> System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string!, object?>>!
 Microsoft.AspNetCore.Http.Features.IHttpRequestBodyDetectionFeature
 Microsoft.AspNetCore.Http.Features.IHttpRequestBodyDetectionFeature.CanHaveBody.get -> bool
@@ -443,6 +445,8 @@ Microsoft.AspNetCore.Http.WebSocketAcceptContext.DangerousEnableCompression.get
 Microsoft.AspNetCore.Http.WebSocketAcceptContext.DangerousEnableCompression.set -> void
 Microsoft.AspNetCore.Http.WebSocketAcceptContext.DisableServerContextTakeover.get -> bool
 Microsoft.AspNetCore.Http.WebSocketAcceptContext.DisableServerContextTakeover.set -> void
+Microsoft.AspNetCore.Http.WebSocketAcceptContext.KeepAliveTimeout.get -> System.TimeSpan?
+Microsoft.AspNetCore.Http.WebSocketAcceptContext.KeepAliveTimeout.set -> void
 Microsoft.AspNetCore.Http.WebSocketAcceptContext.ServerMaxWindowBits.get -> int
 Microsoft.AspNetCore.Http.WebSocketAcceptContext.ServerMaxWindowBits.set -> void
 Microsoft.AspNetCore.Http.WebSocketAcceptContext.WebSocketAcceptContext() -> void
diff --git a/src/Http/Http.Features/src/PublicAPI.Unshipped.txt b/src/Http/Http.Features/src/PublicAPI.Unshipped.txt
index 998915f4d291..7dc5c58110bf 100644
--- a/src/Http/Http.Features/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Http.Features/src/PublicAPI.Unshipped.txt
@@ -1,5 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Http.Features.IHttpMetricsTagsFeature.MetricsDisabled.get -> bool
-Microsoft.AspNetCore.Http.Features.IHttpMetricsTagsFeature.MetricsDisabled.set -> void
-Microsoft.AspNetCore.Http.WebSocketAcceptContext.KeepAliveTimeout.get -> System.TimeSpan?
-Microsoft.AspNetCore.Http.WebSocketAcceptContext.KeepAliveTimeout.set -> void
diff --git a/src/Http/Http.Results/src/Accepted.cs b/src/Http/Http.Results/src/Accepted.cs
index 5dbc56987c4c..b6b890960848 100644
--- a/src/Http/Http.Results/src/Accepted.cs
+++ b/src/Http/Http.Results/src/Accepted.cs
@@ -82,5 +82,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status202Accepted, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/AcceptedAtRoute.cs b/src/Http/Http.Results/src/AcceptedAtRoute.cs
index 7472559549da..8c5d5a7c7b04 100644
--- a/src/Http/Http.Results/src/AcceptedAtRoute.cs
+++ b/src/Http/Http.Results/src/AcceptedAtRoute.cs
@@ -109,5 +109,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status202Accepted, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/AcceptedAtRouteOfT.cs b/src/Http/Http.Results/src/AcceptedAtRouteOfT.cs
index e9467dbe1e54..026a040fc35c 100644
--- a/src/Http/Http.Results/src/AcceptedAtRouteOfT.cs
+++ b/src/Http/Http.Results/src/AcceptedAtRouteOfT.cs
@@ -123,5 +123,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status202Accepted, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/AcceptedOfT.cs b/src/Http/Http.Results/src/AcceptedOfT.cs
index 6777d3549d58..4fdc346ebabd 100644
--- a/src/Http/Http.Results/src/AcceptedOfT.cs
+++ b/src/Http/Http.Results/src/AcceptedOfT.cs
@@ -101,5 +101,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status202Accepted, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/BadRequest.cs b/src/Http/Http.Results/src/BadRequest.cs
index 9eef74aa41c2..70a6eba3199f 100644
--- a/src/Http/Http.Results/src/BadRequest.cs
+++ b/src/Http/Http.Results/src/BadRequest.cs
@@ -52,5 +52,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status400BadRequest, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/BadRequestOfT.cs b/src/Http/Http.Results/src/BadRequestOfT.cs
index 4b932786eb3b..32bb7a0ca613 100644
--- a/src/Http/Http.Results/src/BadRequestOfT.cs
+++ b/src/Http/Http.Results/src/BadRequestOfT.cs
@@ -66,5 +66,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status400BadRequest, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/Conflict.cs b/src/Http/Http.Results/src/Conflict.cs
index da162ed5d207..1de48f75a455 100644
--- a/src/Http/Http.Results/src/Conflict.cs
+++ b/src/Http/Http.Results/src/Conflict.cs
@@ -52,5 +52,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status409Conflict, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/ConflictOfT.cs b/src/Http/Http.Results/src/ConflictOfT.cs
index bbfb3c6a503e..32241e2b9424 100644
--- a/src/Http/Http.Results/src/ConflictOfT.cs
+++ b/src/Http/Http.Results/src/ConflictOfT.cs
@@ -66,5 +66,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status409Conflict, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/Created.cs b/src/Http/Http.Results/src/Created.cs
index 7766d91a6f46..e9eb9fa96655 100644
--- a/src/Http/Http.Results/src/Created.cs
+++ b/src/Http/Http.Results/src/Created.cs
@@ -82,5 +82,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status201Created, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/CreatedAtRoute.cs b/src/Http/Http.Results/src/CreatedAtRoute.cs
index 2fb70fa23b16..e194030ee327 100644
--- a/src/Http/Http.Results/src/CreatedAtRoute.cs
+++ b/src/Http/Http.Results/src/CreatedAtRoute.cs
@@ -109,5 +109,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status201Created, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/CreatedAtRouteOfT.cs b/src/Http/Http.Results/src/CreatedAtRouteOfT.cs
index d13d6154413b..9b972b29c044 100644
--- a/src/Http/Http.Results/src/CreatedAtRouteOfT.cs
+++ b/src/Http/Http.Results/src/CreatedAtRouteOfT.cs
@@ -126,5 +126,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status201Created, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/CreatedOfT.cs b/src/Http/Http.Results/src/CreatedOfT.cs
index 58d0638b218d..267f25fae39a 100644
--- a/src/Http/Http.Results/src/CreatedOfT.cs
+++ b/src/Http/Http.Results/src/CreatedOfT.cs
@@ -100,5 +100,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status201Created, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/InternalServerErrorOfT.cs b/src/Http/Http.Results/src/InternalServerErrorOfT.cs
index 36ec9fed9512..1a813205de25 100644
--- a/src/Http/Http.Results/src/InternalServerErrorOfT.cs
+++ b/src/Http/Http.Results/src/InternalServerErrorOfT.cs
@@ -66,5 +66,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status500InternalServerError, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/JsonHttpResultOfT.cs b/src/Http/Http.Results/src/JsonHttpResultOfT.cs
index 4841e675ecfd..d016be7f97e0 100644
--- a/src/Http/Http.Results/src/JsonHttpResultOfT.cs
+++ b/src/Http/Http.Results/src/JsonHttpResultOfT.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -13,7 +16,7 @@ namespace Microsoft.AspNetCore.Http.HttpResults;
 /// <summary>
 /// An action result which formats the given object as JSON.
 /// </summary>
-public sealed partial class JsonHttpResult<TValue> : IResult, IStatusCodeHttpResult, IValueHttpResult, IValueHttpResult<TValue>, IContentTypeHttpResult
+public sealed partial class JsonHttpResult<TValue> : IResult, IEndpointMetadataProvider, IStatusCodeHttpResult, IValueHttpResult, IValueHttpResult<TValue>, IContentTypeHttpResult
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="Json"/> class with the values.
@@ -117,7 +120,7 @@ public Task ExecuteAsync(HttpContext httpContext)
                     typedJsonTypeInfo,
                     contentType: ContentType);
             }
-            
+
             return httpContext.Response.WriteAsJsonAsync(
                 Value,
                 JsonTypeInfo,
@@ -131,4 +134,9 @@ public Task ExecuteAsync(HttpContext httpContext)
             ContentType,
             JsonSerializerOptions);
     }
+
+    static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, EndpointBuilder builder)
+    {
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+    }
 }
diff --git a/src/Http/Http.Results/src/NoContent.cs b/src/Http/Http.Results/src/NoContent.cs
index 987a06fc4eee..e76f8cc0f68c 100644
--- a/src/Http/Http.Results/src/NoContent.cs
+++ b/src/Http/Http.Results/src/NoContent.cs
@@ -52,5 +52,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status204NoContent, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/NotFoundOfT.cs b/src/Http/Http.Results/src/NotFoundOfT.cs
index ad9c3a1032eb..6c27054e81bd 100644
--- a/src/Http/Http.Results/src/NotFoundOfT.cs
+++ b/src/Http/Http.Results/src/NotFoundOfT.cs
@@ -65,5 +65,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status404NotFound, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/Ok.cs b/src/Http/Http.Results/src/Ok.cs
index 0db060d4e6d4..c348934d1523 100644
--- a/src/Http/Http.Results/src/Ok.cs
+++ b/src/Http/Http.Results/src/Ok.cs
@@ -51,5 +51,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/OkOfT.cs b/src/Http/Http.Results/src/OkOfT.cs
index 108674fdc2ac..6939fb290f19 100644
--- a/src/Http/Http.Results/src/OkOfT.cs
+++ b/src/Http/Http.Results/src/OkOfT.cs
@@ -65,5 +65,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status200OK, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/ProblemHttpResult.cs b/src/Http/Http.Results/src/ProblemHttpResult.cs
index 4fe63c4277cc..2aa3a7418653 100644
--- a/src/Http/Http.Results/src/ProblemHttpResult.cs
+++ b/src/Http/Http.Results/src/ProblemHttpResult.cs
@@ -4,6 +4,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System.Reflection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Metadata;
 
 namespace Microsoft.AspNetCore.Http.HttpResults;
 
@@ -11,7 +14,7 @@ namespace Microsoft.AspNetCore.Http.HttpResults;
 /// An <see cref="IResult"/> that on execution will write Problem Details
 /// HTTP API responses based on <see href="https://tools.ietf.org/html/rfc7807"/>
 /// </summary>
-public sealed class ProblemHttpResult : IResult, IStatusCodeHttpResult, IContentTypeHttpResult, IValueHttpResult, IValueHttpResult<ProblemDetails>
+public sealed class ProblemHttpResult : IResult, IEndpointMetadataProvider, IStatusCodeHttpResult, IContentTypeHttpResult, IValueHttpResult, IValueHttpResult<ProblemDetails>
 {
     /// <summary>
     /// Creates a new <see cref="ProblemHttpResult"/> instance with
@@ -69,4 +72,13 @@ await HttpResultsHelper.WriteResultAsJsonAsync(
                 ContentType);
         }
     }
+
+    /// <inheritdoc/>
+    static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, EndpointBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(method);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+    }
 }
diff --git a/src/Http/Http.Results/src/PublicAPI.Shipped.txt b/src/Http/Http.Results/src/PublicAPI.Shipped.txt
index 23f2cde22209..d0e74cc3a31d 100644
--- a/src/Http/Http.Results/src/PublicAPI.Shipped.txt
+++ b/src/Http/Http.Results/src/PublicAPI.Shipped.txt
@@ -121,6 +121,13 @@ Microsoft.AspNetCore.Http.HttpResults.ForbidHttpResult
 Microsoft.AspNetCore.Http.HttpResults.ForbidHttpResult.AuthenticationSchemes.get -> System.Collections.Generic.IReadOnlyList<string!>!
 Microsoft.AspNetCore.Http.HttpResults.ForbidHttpResult.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Http.HttpResults.ForbidHttpResult.Properties.get -> Microsoft.AspNetCore.Authentication.AuthenticationProperties?
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError.StatusCode.get -> int
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>.StatusCode.get -> int
+Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>.Value.get -> TValue?
 Microsoft.AspNetCore.Http.HttpResults.JsonHttpResult<TValue>
 Microsoft.AspNetCore.Http.HttpResults.JsonHttpResult<TValue>.ContentType.get -> string?
 Microsoft.AspNetCore.Http.HttpResults.JsonHttpResult<TValue>.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
@@ -255,6 +262,8 @@ static Microsoft.AspNetCore.Http.Results.File(byte[]! fileContents, string? cont
 static Microsoft.AspNetCore.Http.Results.File(string! path, string? contentType = null, string? fileDownloadName = null, System.DateTimeOffset? lastModified = null, Microsoft.Net.Http.Headers.EntityTagHeaderValue? entityTag = null, bool enableRangeProcessing = false) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.File(System.IO.Stream! fileStream, string? contentType = null, string? fileDownloadName = null, System.DateTimeOffset? lastModified = null, Microsoft.Net.Http.Headers.EntityTagHeaderValue? entityTag = null, bool enableRangeProcessing = false) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Forbid(Microsoft.AspNetCore.Authentication.AuthenticationProperties? properties = null, System.Collections.Generic.IList<string!>? authenticationSchemes = null) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.InternalServerError() -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.InternalServerError<TValue>(TValue? error) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Json(object? data, System.Text.Json.JsonSerializerOptions? options = null, string? contentType = null, int? statusCode = null) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Json(object? data, System.Text.Json.Serialization.Metadata.JsonTypeInfo! jsonTypeInfo, string? contentType = null, int? statusCode = null) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Json(object? data, System.Type! type, System.Text.Json.Serialization.JsonSerializerContext! context, string? contentType = null, int? statusCode = null) -> Microsoft.AspNetCore.Http.IResult!
@@ -268,7 +277,8 @@ static Microsoft.AspNetCore.Http.Results.NotFound<TValue>(TValue? value) -> Micr
 static Microsoft.AspNetCore.Http.Results.Ok(object? value = null) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Ok<TValue>(TValue? value) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Problem(Microsoft.AspNetCore.Mvc.ProblemDetails! problemDetails) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.Problem(string? detail, string? instance, int? statusCode, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.Redirect(string! url, bool permanent = false, bool preserveMethod = false) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.RedirectToRoute(string? routeName = null, object? routeValues = null, bool permanent = false, bool preserveMethod = false, string? fragment = null) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.RedirectToRoute(string? routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary? routeValues, bool permanent = false, bool preserveMethod = false, string? fragment = null) -> Microsoft.AspNetCore.Http.IResult!
@@ -284,7 +294,8 @@ static Microsoft.AspNetCore.Http.Results.Text(System.ReadOnlySpan<byte> utf8Cont
 static Microsoft.AspNetCore.Http.Results.Unauthorized() -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.UnprocessableEntity(object? error = null) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.Results.UnprocessableEntity<TValue>(TValue? error) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail, string? instance, int? statusCode, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.ValidationProblem(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors, string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
 static Microsoft.AspNetCore.Http.TypedResults.Accepted(string? uri) -> Microsoft.AspNetCore.Http.HttpResults.Accepted!
 static Microsoft.AspNetCore.Http.TypedResults.Accepted(System.Uri! uri) -> Microsoft.AspNetCore.Http.HttpResults.Accepted!
 static Microsoft.AspNetCore.Http.TypedResults.Accepted<TValue>(string? uri, TValue? value) -> Microsoft.AspNetCore.Http.HttpResults.Accepted<TValue>!
@@ -317,6 +328,8 @@ static Microsoft.AspNetCore.Http.TypedResults.Extensions.get -> Microsoft.AspNet
 static Microsoft.AspNetCore.Http.TypedResults.File(byte[]! fileContents, string? contentType = null, string? fileDownloadName = null, bool enableRangeProcessing = false, System.DateTimeOffset? lastModified = null, Microsoft.Net.Http.Headers.EntityTagHeaderValue? entityTag = null) -> Microsoft.AspNetCore.Http.HttpResults.FileContentHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.File(System.IO.Stream! fileStream, string? contentType = null, string? fileDownloadName = null, System.DateTimeOffset? lastModified = null, Microsoft.Net.Http.Headers.EntityTagHeaderValue? entityTag = null, bool enableRangeProcessing = false) -> Microsoft.AspNetCore.Http.HttpResults.FileStreamHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.Forbid(Microsoft.AspNetCore.Authentication.AuthenticationProperties? properties = null, System.Collections.Generic.IList<string!>? authenticationSchemes = null) -> Microsoft.AspNetCore.Http.HttpResults.ForbidHttpResult!
+static Microsoft.AspNetCore.Http.TypedResults.InternalServerError() -> Microsoft.AspNetCore.Http.HttpResults.InternalServerError!
+static Microsoft.AspNetCore.Http.TypedResults.InternalServerError<TValue>(TValue? error) -> Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>!
 static Microsoft.AspNetCore.Http.TypedResults.Json<TValue>(TValue? data, System.Text.Json.JsonSerializerOptions? options = null, string? contentType = null, int? statusCode = null) -> Microsoft.AspNetCore.Http.HttpResults.JsonHttpResult<TValue>!
 static Microsoft.AspNetCore.Http.TypedResults.Json<TValue>(TValue? data, System.Text.Json.Serialization.JsonSerializerContext! context, string? contentType = null, int? statusCode = null) -> Microsoft.AspNetCore.Http.HttpResults.JsonHttpResult<TValue>!
 static Microsoft.AspNetCore.Http.TypedResults.Json<TValue>(TValue? data, System.Text.Json.Serialization.Metadata.JsonTypeInfo<TValue>! jsonTypeInfo, string? contentType = null, int? statusCode = null) -> Microsoft.AspNetCore.Http.HttpResults.JsonHttpResult<TValue>!
@@ -328,7 +341,8 @@ static Microsoft.AspNetCore.Http.TypedResults.Ok() -> Microsoft.AspNetCore.Http.
 static Microsoft.AspNetCore.Http.TypedResults.Ok<TValue>(TValue? value) -> Microsoft.AspNetCore.Http.HttpResults.Ok<TValue>!
 static Microsoft.AspNetCore.Http.TypedResults.PhysicalFile(string! path, string? contentType = null, string? fileDownloadName = null, System.DateTimeOffset? lastModified = null, Microsoft.Net.Http.Headers.EntityTagHeaderValue? entityTag = null, bool enableRangeProcessing = false) -> Microsoft.AspNetCore.Http.HttpResults.PhysicalFileHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.Problem(Microsoft.AspNetCore.Mvc.ProblemDetails! problemDetails) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
-static Microsoft.AspNetCore.Http.TypedResults.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
+static Microsoft.AspNetCore.Http.TypedResults.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
+static Microsoft.AspNetCore.Http.TypedResults.Problem(string? detail, string? instance, int? statusCode, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.Redirect(string! url, bool permanent = false, bool preserveMethod = false) -> Microsoft.AspNetCore.Http.HttpResults.RedirectHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.RedirectToRoute(string? routeName = null, object? routeValues = null, bool permanent = false, bool preserveMethod = false, string? fragment = null) -> Microsoft.AspNetCore.Http.HttpResults.RedirectToRouteHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.RedirectToRoute(string? routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary? routeValues, bool permanent = false, bool preserveMethod = false, string? fragment = null) -> Microsoft.AspNetCore.Http.HttpResults.RedirectToRouteHttpResult!
@@ -344,5 +358,6 @@ static Microsoft.AspNetCore.Http.TypedResults.Text(System.ReadOnlySpan<byte> utf
 static Microsoft.AspNetCore.Http.TypedResults.Unauthorized() -> Microsoft.AspNetCore.Http.HttpResults.UnauthorizedHttpResult!
 static Microsoft.AspNetCore.Http.TypedResults.UnprocessableEntity() -> Microsoft.AspNetCore.Http.HttpResults.UnprocessableEntity!
 static Microsoft.AspNetCore.Http.TypedResults.UnprocessableEntity<TValue>(TValue? error) -> Microsoft.AspNetCore.Http.HttpResults.UnprocessableEntity<TValue>!
-static Microsoft.AspNetCore.Http.TypedResults.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail = null, string? instance = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ValidationProblem!
+static Microsoft.AspNetCore.Http.TypedResults.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail, string? instance, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.HttpResults.ValidationProblem!
+static Microsoft.AspNetCore.Http.TypedResults.ValidationProblem(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors, string? detail = null, string? instance = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ValidationProblem!
 static Microsoft.AspNetCore.Http.TypedResults.VirtualFile(string! path, string? contentType = null, string? fileDownloadName = null, System.DateTimeOffset? lastModified = null, Microsoft.Net.Http.Headers.EntityTagHeaderValue? entityTag = null, bool enableRangeProcessing = false) -> Microsoft.AspNetCore.Http.HttpResults.VirtualFileHttpResult!
diff --git a/src/Http/Http.Results/src/PublicAPI.Unshipped.txt b/src/Http/Http.Results/src/PublicAPI.Unshipped.txt
index c68c37c4f19c..65f0c286aa46 100644
--- a/src/Http/Http.Results/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Http.Results/src/PublicAPI.Unshipped.txt
@@ -1,24 +1,10 @@
-#nullable enable
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError.StatusCode.get -> int
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>.StatusCode.get -> int
-Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>.Value.get -> TValue?
-static Microsoft.AspNetCore.Http.Results.InternalServerError() -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.InternalServerError<TValue>(TValue? error) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
-*REMOVED*static Microsoft.AspNetCore.Http.Results.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.Problem(string? detail, string? instance, int? statusCode, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.IResult!
-*REMOVED*static Microsoft.AspNetCore.Http.Results.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail, string? instance, int? statusCode, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.Results.ValidationProblem(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors, string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.IResult!
-static Microsoft.AspNetCore.Http.TypedResults.InternalServerError() -> Microsoft.AspNetCore.Http.HttpResults.InternalServerError!
-static Microsoft.AspNetCore.Http.TypedResults.InternalServerError<TValue>(TValue? error) -> Microsoft.AspNetCore.Http.HttpResults.InternalServerError<TValue>!
-static Microsoft.AspNetCore.Http.TypedResults.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
-*REMOVED*static Microsoft.AspNetCore.Http.TypedResults.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
-static Microsoft.AspNetCore.Http.TypedResults.Problem(string? detail, string? instance, int? statusCode, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.HttpResults.ProblemHttpResult!
-*REMOVED*static Microsoft.AspNetCore.Http.TypedResults.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail = null, string? instance = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ValidationProblem!
-static Microsoft.AspNetCore.Http.TypedResults.ValidationProblem(System.Collections.Generic.IDictionary<string!, string![]!>! errors, string? detail, string? instance, string? title, string? type, System.Collections.Generic.IDictionary<string!, object?>? extensions) -> Microsoft.AspNetCore.Http.HttpResults.ValidationProblem!
-static Microsoft.AspNetCore.Http.TypedResults.ValidationProblem(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string![]!>>! errors, string? detail = null, string? instance = null, string? title = null, string? type = null, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, object?>>? extensions = null) -> Microsoft.AspNetCore.Http.HttpResults.ValidationProblem!
+Microsoft.AspNetCore.Http.HttpResults.ServerSentEventsResult<T>
+Microsoft.AspNetCore.Http.HttpResults.ServerSentEventsResult<T>.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Http.HttpResults.ServerSentEventsResult<T>.StatusCode.get -> int?
+static Microsoft.AspNetCore.Http.HttpResults.RedirectHttpResult.IsLocalUrl(string? url) -> bool
+static Microsoft.AspNetCore.Http.Results.ServerSentEvents(System.Collections.Generic.IAsyncEnumerable<string!>! values, string? eventType = null) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.ServerSentEvents<T>(System.Collections.Generic.IAsyncEnumerable<System.Net.ServerSentEvents.SseItem<T>>! values) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.Results.ServerSentEvents<T>(System.Collections.Generic.IAsyncEnumerable<T>! values, string? eventType = null) -> Microsoft.AspNetCore.Http.IResult!
+static Microsoft.AspNetCore.Http.TypedResults.ServerSentEvents(System.Collections.Generic.IAsyncEnumerable<string!>! values, string? eventType = null) -> Microsoft.AspNetCore.Http.HttpResults.ServerSentEventsResult<string!>!
+static Microsoft.AspNetCore.Http.TypedResults.ServerSentEvents<T>(System.Collections.Generic.IAsyncEnumerable<System.Net.ServerSentEvents.SseItem<T>>! values) -> Microsoft.AspNetCore.Http.HttpResults.ServerSentEventsResult<T>!
+static Microsoft.AspNetCore.Http.TypedResults.ServerSentEvents<T>(System.Collections.Generic.IAsyncEnumerable<T>! values, string? eventType = null) -> Microsoft.AspNetCore.Http.HttpResults.ServerSentEventsResult<T>!
diff --git a/src/Http/Http.Results/src/RedirectHttpResult.cs b/src/Http/Http.Results/src/RedirectHttpResult.cs
index a6b34c7a22bb..7cb159f8341c 100644
--- a/src/Http/Http.Results/src/RedirectHttpResult.cs
+++ b/src/Http/Http.Results/src/RedirectHttpResult.cs
@@ -121,6 +121,18 @@ public Task ExecuteAsync(HttpContext httpContext)
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// Returns a value that indicates whether the URL is local. A URL is considered
+    /// local if it does not have a host / authority part and it has an absolute path.
+    /// URLs using virtual paths (<c>'~/'</c>) are also local.
+    /// </summary>
+    /// <param name="url">The URL.</param>
+    /// <returns>
+    /// <see langword="true"/> if the URL is local; otherwise, <see langword="false"/>.
+    /// </returns>
+    public static bool IsLocalUrl([NotNullWhen(true)][StringSyntax(StringSyntaxAttribute.Uri)] string? url)
+        => SharedUrlHelper.IsLocalUrl(url);
+
     private static partial class Log
     {
         [LoggerMessage(1, LogLevel.Information,
diff --git a/src/Http/Http.Results/src/Results.cs b/src/Http/Http.Results/src/Results.cs
index 662fe0769cce..27c58d0eb22a 100644
--- a/src/Http/Http.Results/src/Results.cs
+++ b/src/Http/Http.Results/src/Results.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Pipelines;
+using System.Net.ServerSentEvents;
 using System.Security.Claims;
 using System.Text;
 using System.Text.Json;
@@ -978,6 +979,49 @@ public static IResult AcceptedAtRoute<TValue>(string? routeName, RouteValueDicti
 #pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
         => value is null ? TypedResults.AcceptedAtRoute(routeName, routeValues) : TypedResults.AcceptedAtRoute(value, routeName, routeValues);
 
+    /// <summary>
+    /// Produces a <see cref="ServerSentEventsResult{TValue}"/> response.
+    /// </summary>
+    /// <param name="values">The values to be included in the HTTP response body.</param>
+    /// <param name="eventType">The event type to be included in the HTTP response body.</param>
+    /// <returns>The created <see cref="ServerSentEventsResult{TValue}"/> for the response.</returns>
+    /// <remarks>
+    /// Strings serialized by this result type are serialized as raw strings without any additional formatting.
+    /// </remarks>
+#pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
+    public static IResult ServerSentEvents(IAsyncEnumerable<string> values, string? eventType = null)
+#pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
+        => new ServerSentEventsResult<string>(values, eventType);
+
+    /// <summary>
+    /// Produces a <see cref="ServerSentEventsResult{T}"/> response.
+    /// </summary>
+    /// <typeparam name="T">The type of object that will be serialized to the response body.</typeparam>
+    /// <param name="values">The values to be included in the HTTP response body.</param>
+    /// <param name="eventType">The event type to be included in the HTTP response body.</param>
+    /// <returns>The created <see cref="ServerSentEventsResult{T}"/> for the response.</returns>
+    /// <remarks>
+    /// Strings serialized by this result type are serialized as raw strings without any additional formatting.
+    /// Other types are serialized using the configured JSON serializer options.
+    /// </remarks>
+#pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
+    public static IResult ServerSentEvents<T>(IAsyncEnumerable<T> values, string? eventType = null)
+#pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
+        => new ServerSentEventsResult<T>(values, eventType);
+
+    /// <summary>
+    /// Produces a <see cref="ServerSentEventsResult{T}"/> response.
+    /// </summary>
+    /// <typeparam name="T">The type of object that will be serialized to the response body.</typeparam>
+    /// <param name="values">The values to be included in the HTTP response body.</param>
+    /// <returns>The created <see cref="ServerSentEventsResult{T}"/> for the response.</returns>
+    /// <remarks>
+    /// Strings serialized by this result type are serialized as raw strings without any additional formatting.
+    /// Other types are serialized using the configured JSON serializer options.
+    /// </remarks>
+    public static IResult ServerSentEvents<T>(IAsyncEnumerable<SseItem<T>> values)
+        => new ServerSentEventsResult<T>(values);
+
     /// <summary>
     /// Produces an empty result response, that when executed will do nothing.
     /// </summary>
diff --git a/src/Http/Http.Results/src/ServerSentEventsResult.cs b/src/Http/Http.Results/src/ServerSentEventsResult.cs
new file mode 100644
index 000000000000..5cbb9d871f60
--- /dev/null
+++ b/src/Http/Http.Results/src/ServerSentEventsResult.cs
@@ -0,0 +1,110 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Net.ServerSentEvents;
+using Microsoft.AspNetCore.Http.Metadata;
+using System.Reflection;
+using Microsoft.AspNetCore.Builder;
+using System.Text.Json;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http.Features;
+
+namespace Microsoft.AspNetCore.Http.HttpResults;
+
+/// <summary>
+/// Represents a result that writes a stream of server-sent events to the response.
+/// </summary>
+/// <typeparam name="T">The underlying type of the events emitted.</typeparam>
+public sealed class ServerSentEventsResult<T> : IResult, IEndpointMetadataProvider, IStatusCodeHttpResult
+{
+    private readonly IAsyncEnumerable<SseItem<T>> _events;
+
+    /// <inheritdoc/>
+    public int? StatusCode => StatusCodes.Status200OK;
+
+    internal ServerSentEventsResult(IAsyncEnumerable<T> events, string? eventType)
+    {
+        _events = WrapEvents(events, eventType);
+    }
+
+    internal ServerSentEventsResult(IAsyncEnumerable<SseItem<T>> events)
+    {
+        _events = events;
+    }
+
+    /// <inheritdoc />
+    public async Task ExecuteAsync(HttpContext httpContext)
+    {
+        ArgumentNullException.ThrowIfNull(httpContext);
+
+        httpContext.Response.ContentType = "text/event-stream";
+        httpContext.Response.Headers.CacheControl = "no-cache,no-store";
+        httpContext.Response.Headers.Pragma = "no-cache";
+        httpContext.Response.Headers.ContentEncoding = "identity";
+
+        var bufferingFeature = httpContext.Features.GetRequiredFeature<IHttpResponseBodyFeature>();
+        bufferingFeature.DisableBuffering();
+
+        var jsonOptions = httpContext.RequestServices.GetService<IOptions<JsonOptions>>()?.Value ?? new JsonOptions();
+
+        // If the event type is string, we can skip JSON serialization
+        // and directly use the SseFormatter's WriteAsync overload for strings.
+        if (_events is IAsyncEnumerable<SseItem<string>> stringEvents)
+        {
+            await SseFormatter.WriteAsync(stringEvents, httpContext.Response.Body, httpContext.RequestAborted);
+            return;
+        }
+
+        await SseFormatter.WriteAsync(_events, httpContext.Response.Body,
+            (item, writer) => FormatSseItem(item, writer, jsonOptions),
+            httpContext.RequestAborted);
+    }
+
+    private static void FormatSseItem(SseItem<T> item, IBufferWriter<byte> writer, JsonOptions jsonOptions)
+    {
+        if (item.Data is null)
+        {
+            writer.Write([]);
+            return;
+        }
+
+        // Handle byte arrays byt writing them directly as strings.
+        if (item.Data is byte[] byteArray)
+        {
+            writer.Write(byteArray);
+            return;
+        }
+
+        // For non-string types, use JSON serialization with options from DI
+        var runtimeType = item.Data.GetType();
+        var jsonTypeInfo = jsonOptions.SerializerOptions.GetTypeInfo(typeof(T));
+
+        // Use the appropriate JsonTypeInfo based on whether we need polymorphic serialization
+        var typeInfo = jsonTypeInfo.ShouldUseWith(runtimeType)
+            ? jsonTypeInfo
+            : jsonOptions.SerializerOptions.GetTypeInfo(typeof(object));
+
+        var json = JsonSerializer.SerializeToUtf8Bytes(item.Data, typeInfo);
+        writer.Write(json);
+    }
+
+    private static async IAsyncEnumerable<SseItem<T>> WrapEvents(IAsyncEnumerable<T> events, string? eventType = null)
+    {
+        await foreach (var item in events)
+        {
+            yield return new SseItem<T>(item, eventType);
+        }
+    }
+
+    static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, EndpointBuilder builder)
+    {
+        ArgumentNullException.ThrowIfNull(method);
+        ArgumentNullException.ThrowIfNull(builder);
+
+        builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status200OK, typeof(SseItem<T>), contentTypes: ["text/event-stream"]));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
+    }
+}
diff --git a/src/Http/Http.Results/src/TypedResults.cs b/src/Http/Http.Results/src/TypedResults.cs
index 8eb7c9fcd834..d3615c676de1 100644
--- a/src/Http/Http.Results/src/TypedResults.cs
+++ b/src/Http/Http.Results/src/TypedResults.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Pipelines;
+using System.Net.ServerSentEvents;
 using System.Security.Claims;
 using System.Text;
 using System.Text.Json;
@@ -1068,6 +1069,49 @@ public static AcceptedAtRoute<TValue> AcceptedAtRoute<TValue>(TValue? value, str
     public static AcceptedAtRoute<TValue> AcceptedAtRoute<TValue>(TValue? value, string? routeName, RouteValueDictionary? routeValues)
         => new(routeName, routeValues, value);
 
+    /// <summary>
+    /// Produces a <see cref="ServerSentEventsResult{TValue}"/> response.
+    /// </summary>
+    /// <param name="values">The values to be included in the HTTP response body.</param>
+    /// <param name="eventType">The event type to be included in the HTTP response body.</param>
+    /// <returns>The created <see cref="ServerSentEventsResult{TValue}"/> for the response.</returns>
+    /// <remarks>
+    /// Strings serialized by this result type are serialized as raw strings without any additional formatting.
+    /// </remarks>
+#pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
+    public static ServerSentEventsResult<string> ServerSentEvents(IAsyncEnumerable<string> values, string? eventType = null)
+#pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
+        => new(values, eventType);
+
+    /// <summary>
+    /// Produces a <see cref="ServerSentEventsResult{T}"/> response.
+    /// </summary>
+    /// <typeparam name="T">The type of object that will be serialized to the response body.</typeparam>
+    /// <param name="values">The values to be included in the HTTP response body.</param>
+    /// <param name="eventType">The event type to be included in the HTTP response body.</param>
+    /// <returns>The created <see cref="ServerSentEventsResult{T}"/> for the response.</returns>
+    /// <remarks>
+    /// Strings serialized by this result type are serialized as raw strings without any additional formatting.
+    /// Other types are serialized using the configured JSON serializer options.
+    /// </remarks>
+#pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
+    public static ServerSentEventsResult<T> ServerSentEvents<T>(IAsyncEnumerable<T> values, string? eventType = null)
+#pragma warning restore RS0026 // Do not add multiple public overloads with optional parameters
+        => new(values, eventType);
+
+    /// <summary>
+    /// Produces a <see cref="ServerSentEventsResult{T}"/> response.
+    /// </summary>
+    /// <typeparam name="T">The type of object that will be serialized to the response body.</typeparam>
+    /// <param name="values">The values to be included in the HTTP response body.</param>
+    /// <returns>The created <see cref="ServerSentEventsResult{T}"/> for the response.</returns>
+    /// <remarks>
+    /// Strings serialized by this result type are serialized as raw strings without any additional formatting.
+    /// Other types are serialized using the configured JSON serializer options.
+    /// </remarks>
+    public static ServerSentEventsResult<T> ServerSentEvents<T>(IAsyncEnumerable<SseItem<T>> values)
+        => new(values);
+
     /// <summary>
     /// Produces an empty result response, that when executed will do nothing.
     /// </summary>
diff --git a/src/Http/Http.Results/src/UnprocessableEntity.cs b/src/Http/Http.Results/src/UnprocessableEntity.cs
index eef96dc9f513..298e162c7ae0 100644
--- a/src/Http/Http.Results/src/UnprocessableEntity.cs
+++ b/src/Http/Http.Results/src/UnprocessableEntity.cs
@@ -52,5 +52,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(new ProducesResponseTypeMetadata(StatusCodes.Status422UnprocessableEntity, typeof(void)));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/UnprocessableEntityOfT.cs b/src/Http/Http.Results/src/UnprocessableEntityOfT.cs
index 475a0bc3ad2c..c59c519ec0fd 100644
--- a/src/Http/Http.Results/src/UnprocessableEntityOfT.cs
+++ b/src/Http/Http.Results/src/UnprocessableEntityOfT.cs
@@ -66,5 +66,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(TValue), StatusCodes.Status422UnprocessableEntity, ContentTypeConstants.ApplicationJsonContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/src/ValidationProblem.cs b/src/Http/Http.Results/src/ValidationProblem.cs
index ba738cfbcf3e..bd4c75dda703 100644
--- a/src/Http/Http.Results/src/ValidationProblem.cs
+++ b/src/Http/Http.Results/src/ValidationProblem.cs
@@ -77,5 +77,6 @@ static void IEndpointMetadataProvider.PopulateMetadata(MethodInfo method, Endpoi
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Metadata.Add(ProducesResponseTypeMetadata.CreateUnvalidated(typeof(HttpValidationProblemDetails), StatusCodes.Status400BadRequest, ContentTypeConstants.ProblemDetailsContentTypes));
+        builder.Metadata.Add(DisableCookieRedirectMetadata.Instance);
     }
 }
diff --git a/src/Http/Http.Results/test/AcceptedAtRouteOfTResultTests.cs b/src/Http/Http.Results/test/AcceptedAtRouteOfTResultTests.cs
index 27b23fc290be..9423fb06142d 100644
--- a/src/Http/Http.Results/test/AcceptedAtRouteOfTResultTests.cs
+++ b/src/Http/Http.Results/test/AcceptedAtRouteOfTResultTests.cs
@@ -134,17 +134,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status202Accepted, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new AcceptedAtRoute<object>(null, null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/AcceptedAtRouteResultTests.cs b/src/Http/Http.Results/test/AcceptedAtRouteResultTests.cs
index 3402fd9e8930..67c2657fb42c 100644
--- a/src/Http/Http.Results/test/AcceptedAtRouteResultTests.cs
+++ b/src/Http/Http.Results/test/AcceptedAtRouteResultTests.cs
@@ -87,17 +87,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status202Accepted, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new AcceptedAtRoute(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/AcceptedOfTResultTests.cs b/src/Http/Http.Results/test/AcceptedOfTResultTests.cs
index 669eba8d529c..b2d16737c4b6 100644
--- a/src/Http/Http.Results/test/AcceptedOfTResultTests.cs
+++ b/src/Http/Http.Results/test/AcceptedOfTResultTests.cs
@@ -75,17 +75,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status202Accepted, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Accepted<object>("location", null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/AcceptedResultTests.cs b/src/Http/Http.Results/test/AcceptedResultTests.cs
index b2dd17f6cd6b..fdb97dcc9e88 100644
--- a/src/Http/Http.Results/test/AcceptedResultTests.cs
+++ b/src/Http/Http.Results/test/AcceptedResultTests.cs
@@ -44,17 +44,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status202Accepted, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Accepted("location");
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/BadRequestOfTResultTests.cs b/src/Http/Http.Results/test/BadRequestOfTResultTests.cs
index 2123a5c4b755..c58041b203d8 100644
--- a/src/Http/Http.Results/test/BadRequestOfTResultTests.cs
+++ b/src/Http/Http.Results/test/BadRequestOfTResultTests.cs
@@ -118,17 +118,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status400BadRequest, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new BadRequest<object>(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/BadRequestResultTests.cs b/src/Http/Http.Results/test/BadRequestResultTests.cs
index bbbefff4fc2d..c8bac8d0282a 100644
--- a/src/Http/Http.Results/test/BadRequestResultTests.cs
+++ b/src/Http/Http.Results/test/BadRequestResultTests.cs
@@ -57,17 +57,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status400BadRequest, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new BadRequest();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/ChallengeResultTests.cs b/src/Http/Http.Results/test/ChallengeResultTests.cs
index 28ae90c01343..2587cfd668a1 100644
--- a/src/Http/Http.Results/test/ChallengeResultTests.cs
+++ b/src/Http/Http.Results/test/ChallengeResultTests.cs
@@ -42,14 +42,14 @@ public async Task ChallengeResult_ExecuteAsync_NoSchemes()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new ChallengeHttpResult();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     private static DefaultHttpContext GetHttpContext(Mock<IAuthenticationService> auth)
diff --git a/src/Http/Http.Results/test/ConflictOfTResultTests.cs b/src/Http/Http.Results/test/ConflictOfTResultTests.cs
index 5a249b05ad08..fb2a0b655915 100644
--- a/src/Http/Http.Results/test/ConflictOfTResultTests.cs
+++ b/src/Http/Http.Results/test/ConflictOfTResultTests.cs
@@ -96,17 +96,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status409Conflict, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Conflict<object>(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/ConflictResultTests.cs b/src/Http/Http.Results/test/ConflictResultTests.cs
index cae52b92d884..449eb7665b88 100644
--- a/src/Http/Http.Results/test/ConflictResultTests.cs
+++ b/src/Http/Http.Results/test/ConflictResultTests.cs
@@ -58,17 +58,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status409Conflict, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Conflict();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/ContentResultTests.cs b/src/Http/Http.Results/test/ContentResultTests.cs
index e380926b4846..658a1475988a 100644
--- a/src/Http/Http.Results/test/ContentResultTests.cs
+++ b/src/Http/Http.Results/test/ContentResultTests.cs
@@ -124,14 +124,14 @@ public async Task ContentResult_ExecuteAsync_SetContentTypeAndEncoding_OnRespons
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new ContentHttpResult("content", null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/CreatedAtRouteOfTResultTests.cs b/src/Http/Http.Results/test/CreatedAtRouteOfTResultTests.cs
index c9bd1736841e..82591bc7fc27 100644
--- a/src/Http/Http.Results/test/CreatedAtRouteOfTResultTests.cs
+++ b/src/Http/Http.Results/test/CreatedAtRouteOfTResultTests.cs
@@ -104,17 +104,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status201Created, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new CreatedAtRoute<object>(null, null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/CreatedAtRouteResultTests.cs b/src/Http/Http.Results/test/CreatedAtRouteResultTests.cs
index b201d23bfebf..077bd18bfd7a 100644
--- a/src/Http/Http.Results/test/CreatedAtRouteResultTests.cs
+++ b/src/Http/Http.Results/test/CreatedAtRouteResultTests.cs
@@ -85,17 +85,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status201Created, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new CreatedAtRoute(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/CreatedOfTResultTests.cs b/src/Http/Http.Results/test/CreatedOfTResultTests.cs
index b5544b0c13bf..600370f60386 100644
--- a/src/Http/Http.Results/test/CreatedOfTResultTests.cs
+++ b/src/Http/Http.Results/test/CreatedOfTResultTests.cs
@@ -110,17 +110,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status201Created, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Created<object>("location", null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/CreatedResultTests.cs b/src/Http/Http.Results/test/CreatedResultTests.cs
index c5c94d4e8008..fb5e5e7f9056 100644
--- a/src/Http/Http.Results/test/CreatedResultTests.cs
+++ b/src/Http/Http.Results/test/CreatedResultTests.cs
@@ -75,17 +75,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status201Created, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Created("location");
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/EmptyResultTests.cs b/src/Http/Http.Results/test/EmptyResultTests.cs
index f974a0211a18..7033a50c6693 100644
--- a/src/Http/Http.Results/test/EmptyResultTests.cs
+++ b/src/Http/Http.Results/test/EmptyResultTests.cs
@@ -24,14 +24,14 @@ public async Task EmptyResult_DoesNothing()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = EmptyHttpResult.Instance;
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     private static HttpContext GetHttpContext()
diff --git a/src/Http/Http.Results/test/ForbidResultTests.cs b/src/Http/Http.Results/test/ForbidResultTests.cs
index a28e20304528..cb08abab012d 100644
--- a/src/Http/Http.Results/test/ForbidResultTests.cs
+++ b/src/Http/Http.Results/test/ForbidResultTests.cs
@@ -56,7 +56,7 @@ public async Task ExecuteResultAsync_InvokesForbidAsyncOnAllConfiguredSchemes()
         auth.Verify();
     }
 
-    public static TheoryData ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData =>
+    public static TheoryData<AuthenticationProperties> ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData =>
         new TheoryData<AuthenticationProperties>
         {
                 null,
@@ -109,14 +109,14 @@ public async Task ExecuteResultAsync_InvokesForbidAsyncWithAuthProperties_WhenAu
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new ForbidHttpResult();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     private static DefaultHttpContext GetHttpContext(IAuthenticationService auth)
diff --git a/src/Http/Http.Results/test/HttpFileStreamResultTests.cs b/src/Http/Http.Results/test/HttpFileStreamResultTests.cs
index bc9ede59de03..4d4318f0478f 100644
--- a/src/Http/Http.Results/test/HttpFileStreamResultTests.cs
+++ b/src/Http/Http.Results/test/HttpFileStreamResultTests.cs
@@ -79,14 +79,14 @@ public void Constructor_SetsLastModifiedAndEtag()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new FileStreamHttpResult(new MemoryStream(), null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/InternalServerErrorOfTResultTests.cs b/src/Http/Http.Results/test/InternalServerErrorOfTResultTests.cs
index a60815d11bf1..900cfa3e3a36 100644
--- a/src/Http/Http.Results/test/InternalServerErrorOfTResultTests.cs
+++ b/src/Http/Http.Results/test/InternalServerErrorOfTResultTests.cs
@@ -118,17 +118,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status500InternalServerError, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new InternalServerError<object>(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/InternalServerErrorResultTests.cs b/src/Http/Http.Results/test/InternalServerErrorResultTests.cs
index 20e2b817e279..f24878e90cd0 100644
--- a/src/Http/Http.Results/test/InternalServerErrorResultTests.cs
+++ b/src/Http/Http.Results/test/InternalServerErrorResultTests.cs
@@ -60,14 +60,14 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new InternalServerError();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/JsonResultTests.cs b/src/Http/Http.Results/test/JsonResultTests.cs
index 3112cea8a2fc..6e2b05dbcc19 100644
--- a/src/Http/Http.Results/test/JsonResultTests.cs
+++ b/src/Http/Http.Results/test/JsonResultTests.cs
@@ -1,11 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Reflection;
 using System.Text;
 using System.Text.Json;
 using System.Text.Unicode;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Json;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Patterns;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -14,8 +19,6 @@ namespace Microsoft.AspNetCore.Http.HttpResults;
 
 public class JsonResultTests
 {
-    private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
-
     [Fact]
     public async Task JsonResult_ExecuteAsync_WithNullValue_Works()
     {
@@ -117,7 +120,7 @@ public async Task ExecuteAsync_UsesDefaults_ForProblemDetails()
         // Arrange
         var details = new ProblemDetails();
 
-        var result = new JsonHttpResult<ProblemDetails>(details, jsonSerializerOptions: SerializerOptions);
+        var result = new JsonHttpResult<ProblemDetails>(details, jsonSerializerOptions: JsonSerializerOptions.Web);
         var stream = new MemoryStream();
         var httpContext = new DefaultHttpContext()
         {
@@ -134,7 +137,7 @@ public async Task ExecuteAsync_UsesDefaults_ForProblemDetails()
         // Assert
         Assert.Equal(StatusCodes.Status500InternalServerError, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.6.1", responseDetails.Type);
         Assert.Equal("An error occurred while processing your request.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status500InternalServerError, responseDetails.Status);
@@ -146,7 +149,7 @@ public async Task ExecuteAsync_UsesDefaults_ForValidationProblemDetails()
         // Arrange
         var details = new HttpValidationProblemDetails();
 
-        var result = new JsonHttpResult<HttpValidationProblemDetails>(details, jsonSerializerOptions: SerializerOptions);
+        var result = new JsonHttpResult<HttpValidationProblemDetails>(details, jsonSerializerOptions: JsonSerializerOptions.Web);
         var stream = new MemoryStream();
         var httpContext = new DefaultHttpContext()
         {
@@ -163,7 +166,7 @@ public async Task ExecuteAsync_UsesDefaults_ForValidationProblemDetails()
         // Assert
         Assert.Equal(StatusCodes.Status400BadRequest, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.5.1", responseDetails.Type);
         Assert.Equal("One or more validation errors occurred.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status400BadRequest, responseDetails.Status);
@@ -195,7 +198,7 @@ public async Task ExecuteAsync_UsesDefaults_HttpStatusCodesWithoutTypes()
         // Assert
         Assert.Equal(StatusCodes.Status418ImATeapot, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Null(responseDetails.Type);
         Assert.Equal("I'm a teapot", responseDetails.Title);
         Assert.Equal(StatusCodes.Status418ImATeapot, responseDetails.Status);
@@ -243,14 +246,14 @@ public async Task ExecuteAsync_GetsStatusCodeFromProblemDetails()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new JsonHttpResult<object>(null, jsonSerializerOptions: null, null, null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
@@ -312,6 +315,24 @@ public void JsonResult_Implements_IValueHttpResultOfT_Correctly()
         Assert.Equal(value, result.Value);
     }
 
+    [Fact]
+    public void PopulateMetadata_AddsNonBrowserEndpointMetadata()
+    {
+        // Arrange
+        JsonHttpResult<Todo> MyApi() { throw new NotImplementedException(); }
+        var metadata = new List<object>();
+        var builder = new RouteEndpointBuilder(requestDelegate: null, RoutePatternFactory.Parse("/"), order: 0);
+
+        // Act
+        PopulateMetadata<JsonHttpResult<Todo>>(((Delegate)MyApi).GetMethodInfo(), builder);
+
+        // Assert
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
+    }
+
+    private static void PopulateMetadata<TResult>(MethodInfo method, EndpointBuilder builder)
+        where TResult : IEndpointMetadataProvider => TResult.PopulateMetadata(method, builder);
+
     private static IServiceProvider CreateServices()
     {
         var services = new ServiceCollection();
diff --git a/src/Http/Http.Results/test/NoContentResultTests.cs b/src/Http/Http.Results/test/NoContentResultTests.cs
index 4a589b905d81..ce6047dd25d7 100644
--- a/src/Http/Http.Results/test/NoContentResultTests.cs
+++ b/src/Http/Http.Results/test/NoContentResultTests.cs
@@ -54,17 +54,20 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status204NoContent, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        // Assert ApiEndpointMetadata is added
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new NoContent();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/NotFoundOfTResultTests.cs b/src/Http/Http.Results/test/NotFoundOfTResultTests.cs
index 029dd8f79815..4ee3c6a6eed7 100644
--- a/src/Http/Http.Results/test/NotFoundOfTResultTests.cs
+++ b/src/Http/Http.Results/test/NotFoundOfTResultTests.cs
@@ -78,17 +78,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status404NotFound, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new NotFound<object>(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/NotFoundResultTests.cs b/src/Http/Http.Results/test/NotFoundResultTests.cs
index 15538d341950..9c5baaa67eec 100644
--- a/src/Http/Http.Results/test/NotFoundResultTests.cs
+++ b/src/Http/Http.Results/test/NotFoundResultTests.cs
@@ -56,14 +56,14 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new NotFound();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/OkOfTResultTests.cs b/src/Http/Http.Results/test/OkOfTResultTests.cs
index 8accca9174d6..0fbd02fa3cd8 100644
--- a/src/Http/Http.Results/test/OkOfTResultTests.cs
+++ b/src/Http/Http.Results/test/OkOfTResultTests.cs
@@ -95,17 +95,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status200OK, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Ok<object>(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/OkResultTests.cs b/src/Http/Http.Results/test/OkResultTests.cs
index 9047a9595490..26a777a7c5e1 100644
--- a/src/Http/Http.Results/test/OkResultTests.cs
+++ b/src/Http/Http.Results/test/OkResultTests.cs
@@ -56,17 +56,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status200OK, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new Ok();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/ProblemResultTests.cs b/src/Http/Http.Results/test/ProblemResultTests.cs
index 701be73c9b74..c01c42a5d298 100644
--- a/src/Http/Http.Results/test/ProblemResultTests.cs
+++ b/src/Http/Http.Results/test/ProblemResultTests.cs
@@ -12,8 +12,6 @@ namespace Microsoft.AspNetCore.Http.HttpResults;
 
 public class ProblemResultTests
 {
-    private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
-
     [Fact]
     public async Task ExecuteAsync_UsesDefaults_ForProblemDetails()
     {
@@ -37,7 +35,7 @@ public async Task ExecuteAsync_UsesDefaults_ForProblemDetails()
         // Assert
         Assert.Equal(StatusCodes.Status500InternalServerError, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.6.1", responseDetails.Type);
         Assert.Equal("An error occurred while processing your request.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status500InternalServerError, responseDetails.Status);
@@ -69,7 +67,7 @@ public async Task ExecuteAsync_UsesDefaultsFromProblemDetailsService_ForProblemD
         // Assert
         Assert.Equal(StatusCodes.Status500InternalServerError, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Null(responseDetails.Type);
         Assert.Equal("An error occurred while processing your request.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status500InternalServerError, responseDetails.Status);
@@ -98,7 +96,7 @@ public async Task ExecuteAsync_UsesDefaults_ForValidationProblemDetails()
         // Assert
         Assert.Equal(StatusCodes.Status400BadRequest, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.5.1", responseDetails.Type);
         Assert.Equal("One or more validation errors occurred.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status400BadRequest, responseDetails.Status);
@@ -130,7 +128,7 @@ public async Task ExecuteAsync_SetsTitleFromReasonPhrases_WhenNotInDefaults()
         // Assert
         Assert.Equal(StatusCodes.Status418ImATeapot, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Null(responseDetails.Type);
         Assert.Equal("I'm a teapot", responseDetails.Title);
         Assert.Equal(StatusCodes.Status418ImATeapot, responseDetails.Status);
@@ -162,7 +160,7 @@ public async Task ExecuteAsync_IncludeErrors_ForValidationProblemDetails()
         // Assert
         Assert.Equal(StatusCodes.Status400BadRequest, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, SerializerOptions);
+        var responseDetails = JsonSerializer.Deserialize<HttpValidationProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Equal(StatusCodes.Status400BadRequest, responseDetails.Status);
         var error = Assert.Single(responseDetails.Errors);
         Assert.Equal("testError", error.Key);
@@ -191,14 +189,14 @@ public async Task ExecuteAsync_GetsStatusCodeFromProblemDetails()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new ProblemHttpResult(new());
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/PushStreamResultTests.cs b/src/Http/Http.Results/test/PushStreamResultTests.cs
index 512d0f3b854e..f3886dee257b 100644
--- a/src/Http/Http.Results/test/PushStreamResultTests.cs
+++ b/src/Http/Http.Results/test/PushStreamResultTests.cs
@@ -68,14 +68,14 @@ public void Constructor_SetsLastModifiedAndEtag()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new PushStreamHttpResult(s => Task.CompletedTask, "content-type");
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/RedirectResultTests.cs b/src/Http/Http.Results/test/RedirectResultTests.cs
index 6a41ab6acf6e..1c2da6698f1c 100644
--- a/src/Http/Http.Results/test/RedirectResultTests.cs
+++ b/src/Http/Http.Results/test/RedirectResultTests.cs
@@ -23,14 +23,64 @@ public void RedirectResult_Constructor_WithParameterUrlPermanentAndPreservesMeth
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new RedirectHttpResult("url");
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+    }
+
+    [Theory]
+    [InlineData("/")]
+    [InlineData("/test/path")]
+    [InlineData("/test/path?foo=bar#baz")]
+    [InlineData("~/")]
+    [InlineData("~/Home/About")]
+    public void IsLocalUrl_True_ForLocalUrl(string url)
+    {
+        // Act
+        var actual = RedirectHttpResult.IsLocalUrl(url);
+
+        // Assert
+        Assert.True(actual);
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("//")]
+    [InlineData("/\\")]
+    [InlineData("//foo")]
+    [InlineData("/\\foo")]
+    [InlineData("Home/About")]
+    [InlineData("test/path")]
+    [InlineData("http://www.example.com")]
+    [InlineData("https://example.com/non-local-url/example")]
+    [InlineData("https://example.com/non-local-url/example?foo=bar#baz")]
+    public void IsLocalUrl_False_ForNonLocalUrl(string url)
+    {
+        // Act
+        var actual = RedirectHttpResult.IsLocalUrl(url);
+
+        // Assert
+        Assert.False(actual);
+    }
+
+    [Theory]
+    [InlineData("~//")]
+    [InlineData("~/\\")]
+    [InlineData("~//foo")]
+    [InlineData("~/\\foo")]
+    public void IsLocalUrl_False_ForNonLocalUrlTilde(string url)
+    {
+        // Act
+        var actual = RedirectHttpResult.IsLocalUrl(url);
+
+        // Assert
+        Assert.False(actual);
     }
 
     protected override Task ExecuteAsync(HttpContext httpContext, string contentPath)
diff --git a/src/Http/Http.Results/test/RedirectToRouteResultTests.cs b/src/Http/Http.Results/test/RedirectToRouteResultTests.cs
index 5ee383e350da..5b877e8f8d76 100644
--- a/src/Http/Http.Results/test/RedirectToRouteResultTests.cs
+++ b/src/Http/Http.Results/test/RedirectToRouteResultTests.cs
@@ -85,14 +85,14 @@ public async Task ExecuteResultAsync_WithFragment_PassesCorrectValuesToRedirect_
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new RedirectToRouteHttpResult(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     private static HttpContext GetHttpContext(string path)
diff --git a/src/Http/Http.Results/test/ResultsOfTTests.Generated.cs b/src/Http/Http.Results/test/ResultsOfTTests.Generated.cs
index 9ad1e753eefa..7c519d892234 100644
--- a/src/Http/Http.Results/test/ResultsOfTTests.Generated.cs
+++ b/src/Http/Http.Results/test/ResultsOfTTests.Generated.cs
@@ -60,7 +60,7 @@ Results<ChecksumResult1, ChecksumResult2> MyApi(int checksum)
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2_Throws_ArgumentNullException_WhenHttpContextIsNull()
+    public async Task ResultsOfTResult1TResult2_Throws_ArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
@@ -72,26 +72,26 @@ Results<ChecksumResult1, NoContent> MyApi()
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2_Throws_InvalidOperationException_WhenResultIsNull()
+    public async Task ResultsOfTResult1TResult2_Throws_InvalidOperationException_WhenResultIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
         {
-            return new ChecksumResult1(1);
+            return (ChecksumResult1)null;
         }
         var httpContext = GetHttpContext();
 
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
@@ -275,7 +275,7 @@ Results<ChecksumResult1, ChecksumResult2, ChecksumResult3> MyApi(int checksum)
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3_Throws_ArgumentNullException_WhenHttpContextIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3_Throws_ArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
@@ -287,26 +287,26 @@ Results<ChecksumResult1, NoContent> MyApi()
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3_Throws_InvalidOperationException_WhenResultIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3_Throws_InvalidOperationException_WhenResultIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
         {
-            return new ChecksumResult1(1);
+            return (ChecksumResult1)null;
         }
         var httpContext = GetHttpContext();
 
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
@@ -559,7 +559,7 @@ Results<ChecksumResult1, ChecksumResult2, ChecksumResult3, ChecksumResult4> MyAp
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3TResult4_Throws_ArgumentNullException_WhenHttpContextIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3TResult4_Throws_ArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
@@ -571,26 +571,26 @@ Results<ChecksumResult1, NoContent> MyApi()
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3TResult4_Throws_InvalidOperationException_WhenResultIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3TResult4_Throws_InvalidOperationException_WhenResultIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
         {
-            return new ChecksumResult1(1);
+            return (ChecksumResult1)null;
         }
         var httpContext = GetHttpContext();
 
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
@@ -920,7 +920,7 @@ Results<ChecksumResult1, ChecksumResult2, ChecksumResult3, ChecksumResult4, Chec
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3TResult4TResult5_Throws_ArgumentNullException_WhenHttpContextIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3TResult4TResult5_Throws_ArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
@@ -932,26 +932,26 @@ Results<ChecksumResult1, NoContent> MyApi()
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3TResult4TResult5_Throws_InvalidOperationException_WhenResultIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3TResult4TResult5_Throws_InvalidOperationException_WhenResultIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
         {
-            return new ChecksumResult1(1);
+            return (ChecksumResult1)null;
         }
         var httpContext = GetHttpContext();
 
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
@@ -1366,7 +1366,7 @@ Results<ChecksumResult1, ChecksumResult2, ChecksumResult3, ChecksumResult4, Chec
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3TResult4TResult5TResult6_Throws_ArgumentNullException_WhenHttpContextIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3TResult4TResult5TResult6_Throws_ArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
@@ -1378,26 +1378,26 @@ Results<ChecksumResult1, NoContent> MyApi()
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
     }
 
     [Fact]
-    public void ResultsOfTResult1TResult2TResult3TResult4TResult5TResult6_Throws_InvalidOperationException_WhenResultIsNull()
+    public async Task ResultsOfTResult1TResult2TResult3TResult4TResult5TResult6_Throws_InvalidOperationException_WhenResultIsNull()
     {
         // Arrange
         Results<ChecksumResult1, NoContent> MyApi()
         {
-            return new ChecksumResult1(1);
+            return (ChecksumResult1)null;
         }
         var httpContext = GetHttpContext();
 
         // Act & Assert
         var result = MyApi();
 
-        Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        await Assert.ThrowsAsync<InvalidOperationException>(async () =>
         {
             await result.ExecuteAsync(httpContext);
         });
diff --git a/src/Http/Http.Results/test/ResultsTests.cs b/src/Http/Http.Results/test/ResultsTests.cs
index 3e7220e717d0..ce87ee10e907 100644
--- a/src/Http/Http.Results/test/ResultsTests.cs
+++ b/src/Http/Http.Results/test/ResultsTests.cs
@@ -1777,7 +1777,8 @@ private static string GetMemberName(Expression expression)
         (() => Results.Unauthorized(), typeof(UnauthorizedHttpResult)),
         (() => Results.UnprocessableEntity(null), typeof(UnprocessableEntity)),
         (() => Results.UnprocessableEntity(new()), typeof(UnprocessableEntity<object>)),
-        (() => Results.ValidationProblem(new Dictionary<string, string[]>(), null, null, null, null, null, null), typeof(ProblemHttpResult))
+        (() => Results.ValidationProblem(new Dictionary<string, string[]>(), null, null, null, null, null, null), typeof(ProblemHttpResult)),
+        (() => Results.ServerSentEvents(AsyncEnumerable.Empty<string>(), null), typeof(ServerSentEventsResult<string>)),
     };
 
     public static IEnumerable<object[]> FactoryMethodsFromTuples() => FactoryMethodsTuples.Select(t => new object[] { t.Item1, t.Item2 });
diff --git a/src/Http/Http.Results/test/ServerSentEventsResultTests.cs b/src/Http/Http.Results/test/ServerSentEventsResultTests.cs
new file mode 100644
index 000000000000..542cece0fbd5
--- /dev/null
+++ b/src/Http/Http.Results/test/ServerSentEventsResultTests.cs
@@ -0,0 +1,362 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO.Pipelines;
+using System.Net.ServerSentEvents;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Patterns;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Http.HttpResults;
+
+public class ServerSentEventsResultTests
+{
+    [Fact]
+    public async Task ExecuteAsync_SetsContentTypeAndHeaders()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = AsyncEnumerable.Empty<string>();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        Assert.Equal("text/event-stream", httpContext.Response.ContentType);
+        Assert.Equal("no-cache,no-store", httpContext.Response.Headers.CacheControl);
+        Assert.Equal("no-cache", httpContext.Response.Headers.Pragma);
+        Assert.Equal("identity", httpContext.Response.Headers.ContentEncoding);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WritesStringEventsToResponse()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = new[] { "event1\"with\"quotes", "event2" }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("data: event1\"with\"quotes\n\n", responseBody);
+        Assert.Contains("data: event2\n\n", responseBody);
+
+        // Verify strings are not JSON serialized
+        Assert.DoesNotContain("data: \"event1", responseBody);
+        Assert.DoesNotContain("data: \"event2", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WritesStringsEventsWithEventType()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = new[] { "event1", "event2" }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events, "test-event");
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("event: test-event\ndata: event1\n\n", responseBody);
+        Assert.Contains("event: test-event\ndata: event2\n\n", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithSseItems_WritesStringEventsDirectly()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = new[] { new SseItem<string>("event1", "custom-event") }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("event: custom-event\n", responseBody);
+        Assert.Contains("data: event1\n\n", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    {
+        // Arrange
+        var events = AsyncEnumerable.Empty<string>();
+        var result = TypedResults.ServerSentEvents(events);
+        HttpContext httpContext = null;
+
+        // Act & Assert
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_HandlesNullData()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = new string[] { null }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("data: \n\n", responseBody);
+    }
+
+    [Fact]
+    public void PopulateMetadata_AddsResponseTypeMetadata()
+    {
+        // Arrange
+        ServerSentEventsResult<string> MyApi() { throw new NotImplementedException(); }
+        var builder = new RouteEndpointBuilder(requestDelegate: null, RoutePatternFactory.Parse("/"), order: 0);
+
+        // Act
+        PopulateMetadata<ServerSentEventsResult<string>>(((Delegate)MyApi).GetMethodInfo(), builder);
+
+        // Assert
+        var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
+        Assert.Equal(StatusCodes.Status200OK, producesResponseTypeMetadata.StatusCode);
+        Assert.Equal(typeof(SseItem<string>), producesResponseTypeMetadata.Type);
+        Assert.Collection(producesResponseTypeMetadata.ContentTypes,
+            contentType => Assert.Equal("text/event-stream", contentType));
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithObjectData_SerializesAsJson()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var testObject = new TestObject { Name = "Test", Value = 42 };
+        var events = new[] { testObject }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains(@"data: {""name"":""Test"",""value"":42}", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithSsItems_SerializesDataAsJson()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var testObject = new TestObject { Name = "Test", Value = 42 };
+        var events = new[] { new SseItem<TestObject>(testObject) }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains(@"data: {""name"":""Test"",""value"":42}", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithCustomJsonOptions_UsesConfiguredOptions()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        services.AddLogging();
+        services.Configure<JsonOptions>(options =>
+        {
+            options.SerializerOptions.PropertyNamingPolicy = null; // Use PascalCase
+        });
+        var httpContext = new DefaultHttpContext
+        {
+            Response = { Body = new MemoryStream() },
+            RequestServices = services.BuildServiceProvider()
+        };
+
+        var testObject = new TestObject { Name = "Test", Value = 42 };
+        var events = new[] { testObject }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains(@"data: {""Name"":""Test"",""Value"":42}", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithPolymorphicType_SerializesCorrectly()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var baseClass = new DerivedTestObject { Name = "Test", Value = 42, Extra = "Additional" };
+        var events = new TestObject[] { baseClass }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains(@"data: {""extra"":""Additional"",""name"":""Test"",""value"":42}", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_ObservesCancellationViaRequestAborted()
+    {
+        // Arrange
+        var cts = new CancellationTokenSource();
+        var httpContext = GetHttpContext();
+        httpContext.RequestAborted = cts.Token;
+        var firstEventReceived = new TaskCompletionSource();
+        var secondEventAttempted = new TaskCompletionSource();
+        var cancellationObserved = new TaskCompletionSource();
+
+        var events = GetEvents(cts.Token);
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act & Assert
+        var executeTask = result.ExecuteAsync(httpContext);
+
+        // Wait for first event to be processed then cancel the request and wait
+        // to observe the cancellation
+        await firstEventReceived.Task;
+        cts.Cancel();
+        await secondEventAttempted.Task;
+
+        // Verify the execution was cancelled and only the first event was written
+        await Assert.ThrowsAsync<TaskCanceledException>(() => executeTask);
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("data: event1\n\n", responseBody);
+        Assert.DoesNotContain("data: event2\n\n", responseBody);
+
+        async IAsyncEnumerable<string> GetEvents([EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                yield return "event1";
+                firstEventReceived.SetResult();
+                cancellationToken.Register(cancellationObserved.SetResult);
+                await cancellationObserved.Task;
+                yield return "event2";
+            }
+            finally
+            {
+                secondEventAttempted.SetResult();
+            }
+        }
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_DisablesBuffering()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = AsyncEnumerable.Empty<string>();
+        var result = TypedResults.ServerSentEvents(events);
+        var bufferingDisabled = false;
+
+        var mockBufferingFeature = new MockHttpResponseBodyFeature(
+            onDisableBuffering: () => bufferingDisabled = true);
+
+        httpContext.Features.Set<IHttpResponseBodyFeature>(mockBufferingFeature);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        Assert.True(bufferingDisabled);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithByteArrayData_WritesDataDirectly()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var bytes = "event1"u8.ToArray();
+        var events = new[] { new SseItem<byte[]>(bytes) }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("data: event1\n\n", responseBody);
+
+        // Assert that string is not JSON serialized
+        Assert.DoesNotContain("data: \"event1", responseBody);
+    }
+
+    [Fact]
+    public async Task ExecuteAsync_WithByteArrayData_HandlesNullData()
+    {
+        // Arrange
+        var httpContext = GetHttpContext();
+        var events = new[] { new SseItem<byte[]>(null) }.ToAsyncEnumerable();
+        var result = TypedResults.ServerSentEvents(events);
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        var responseBody = Encoding.UTF8.GetString(((MemoryStream)httpContext.Response.Body).ToArray());
+        Assert.Contains("data: \n\n", responseBody);
+    }
+
+    private class MockHttpResponseBodyFeature(Action onDisableBuffering) : IHttpResponseBodyFeature
+    {
+        public Stream Stream => new MemoryStream();
+        public PipeWriter Writer => throw new NotImplementedException();
+        public Task CompleteAsync() => throw new NotImplementedException();
+        public void DisableBuffering() => onDisableBuffering();
+        public Task SendFileAsync(string path, long offset, long? count, CancellationToken cancellationToken = default)
+            => throw new NotImplementedException();
+        public Task StartAsync(CancellationToken cancellationToken = default)
+            => throw new NotImplementedException();
+    }
+
+    private static void PopulateMetadata<TResult>(MethodInfo method, EndpointBuilder builder)
+        where TResult : IEndpointMetadataProvider => TResult.PopulateMetadata(method, builder);
+
+    private static DefaultHttpContext GetHttpContext()
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Response.Body = new MemoryStream();
+        httpContext.RequestServices = CreateServices();
+        return httpContext;
+    }
+
+    private static ServiceProvider CreateServices()
+    {
+        var services = new ServiceCollection();
+        services.AddLogging();
+        return services.BuildServiceProvider();
+    }
+
+    private class TestObject
+    {
+        public string Name { get; set; }
+        public int Value { get; set; }
+    }
+
+    private class DerivedTestObject : TestObject
+    {
+        public string Extra { get; set; }
+    }
+}
diff --git a/src/Http/Http.Results/test/SignInResultTests.cs b/src/Http/Http.Results/test/SignInResultTests.cs
index 9fe069c41b21..e0de4294b444 100644
--- a/src/Http/Http.Results/test/SignInResultTests.cs
+++ b/src/Http/Http.Results/test/SignInResultTests.cs
@@ -75,14 +75,14 @@ public async Task ExecuteAsync_InvokesSignInAsyncOnConfiguredScheme()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new SignInHttpResult(new());
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     private static DefaultHttpContext GetHttpContext(IAuthenticationService auth)
diff --git a/src/Http/Http.Results/test/SignOutResultTests.cs b/src/Http/Http.Results/test/SignOutResultTests.cs
index 154901318212..56396dcee414 100644
--- a/src/Http/Http.Results/test/SignOutResultTests.cs
+++ b/src/Http/Http.Results/test/SignOutResultTests.cs
@@ -74,14 +74,14 @@ public async Task ExecuteAsync_InvokesSignOutAsyncOnAllConfiguredSchemes()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new SignOutHttpResult();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     private static DefaultHttpContext GetHttpContext(IAuthenticationService auth)
diff --git a/src/Http/Http.Results/test/StatusCodeResultTests.cs b/src/Http/Http.Results/test/StatusCodeResultTests.cs
index 91bafb4072b8..d8033e40d262 100644
--- a/src/Http/Http.Results/test/StatusCodeResultTests.cs
+++ b/src/Http/Http.Results/test/StatusCodeResultTests.cs
@@ -25,14 +25,14 @@ public void StatusCodeResult_ExecuteResultSetsResponseStatusCode()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new StatusCodeHttpResult(200);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/UnauthorizedResultTests.cs b/src/Http/Http.Results/test/UnauthorizedResultTests.cs
index 24cdbb7ee49a..8a93a77dfc7d 100644
--- a/src/Http/Http.Results/test/UnauthorizedResultTests.cs
+++ b/src/Http/Http.Results/test/UnauthorizedResultTests.cs
@@ -35,14 +35,14 @@ public void UnauthorizedResult_ExecuteResultSetsResponseStatusCode()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new UnauthorizedHttpResult();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/UnprocessableEntityOfTResultTests.cs b/src/Http/Http.Results/test/UnprocessableEntityOfTResultTests.cs
index 61d0191958ee..16a0dfa3e14e 100644
--- a/src/Http/Http.Results/test/UnprocessableEntityOfTResultTests.cs
+++ b/src/Http/Http.Results/test/UnprocessableEntityOfTResultTests.cs
@@ -95,17 +95,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         Assert.Equal(StatusCodes.Status422UnprocessableEntity, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(Todo), producesResponseTypeMetadata.Type);
         Assert.Single(producesResponseTypeMetadata.ContentTypes, "application/json");
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new UnprocessableEntity<object>(null);
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/UnprocessableEntityResultTests.cs b/src/Http/Http.Results/test/UnprocessableEntityResultTests.cs
index 412edb8bed05..ea6eba2d668d 100644
--- a/src/Http/Http.Results/test/UnprocessableEntityResultTests.cs
+++ b/src/Http/Http.Results/test/UnprocessableEntityResultTests.cs
@@ -57,17 +57,19 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
         var producesResponseTypeMetadata = builder.Metadata.OfType<ProducesResponseTypeMetadata>().Last();
         Assert.Equal(StatusCodes.Status422UnprocessableEntity, producesResponseTypeMetadata.StatusCode);
         Assert.Equal(typeof(void), producesResponseTypeMetadata.Type);
+
+        Assert.Contains(builder.Metadata, m => m is IDisableCookieRedirectMetadata);
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new UnprocessableEntity();
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/test/ValidationProblemResultTests.cs b/src/Http/Http.Results/test/ValidationProblemResultTests.cs
index f27e532bd1bd..745ded47cb30 100644
--- a/src/Http/Http.Results/test/ValidationProblemResultTests.cs
+++ b/src/Http/Http.Results/test/ValidationProblemResultTests.cs
@@ -39,7 +39,7 @@ public async Task ExecuteAsync_UsesDefaults_ForProblemDetails()
         Assert.Equal(StatusCodes.Status400BadRequest, httpContext.Response.StatusCode);
         Assert.Equal(details, result.ProblemDetails);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
+        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Equal("https://tools.ietf.org/html/rfc9110#section-15.5.1", responseDetails.Type);
         Assert.Equal("One or more validation errors occurred.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status400BadRequest, responseDetails.Status);
@@ -71,7 +71,7 @@ public async Task ExecuteAsync_UsesDefaultsFromProblemDetailsService_ForProblemD
         // Assert
         Assert.Equal(StatusCodes.Status400BadRequest, httpContext.Response.StatusCode);
         stream.Position = 0;
-        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
+        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.Null(responseDetails.Type);
         Assert.Equal("One or more validation errors occurred.", responseDetails.Title);
         Assert.Equal(StatusCodes.Status400BadRequest, responseDetails.Status);
@@ -109,14 +109,14 @@ public void PopulateMetadata_AddsResponseTypeMetadata()
     }
 
     [Fact]
-    public void ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
+    public async Task ExecuteAsync_ThrowsArgumentNullException_WhenHttpContextIsNull()
     {
         // Arrange
         var result = new ValidationProblem(new());
         HttpContext httpContext = null;
 
         // Act & Assert
-        Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
+        await Assert.ThrowsAsync<ArgumentNullException>("httpContext", () => result.ExecuteAsync(httpContext));
     }
 
     [Fact]
diff --git a/src/Http/Http.Results/tools/ResultsOfTGenerator/Program.cs b/src/Http/Http.Results/tools/ResultsOfTGenerator/Program.cs
index 6755ce04712f..89b1e138b3da 100644
--- a/src/Http/Http.Results/tools/ResultsOfTGenerator/Program.cs
+++ b/src/Http/Http.Results/tools/ResultsOfTGenerator/Program.cs
@@ -12,10 +12,10 @@ public class Program
 
     public static void Main(string[] args)
     {
-        // By default we assume we're being run in the context of the <repo>/src/Http/Http.Results/src
+        // By default we assume we're being run in the context of the <repo>/src/Http/Http.Results/tools/ResultsOfTGenerator directory
         var pwd = Directory.GetCurrentDirectory();
-        var classTargetFilePath = Path.Combine(pwd, "ResultsOfT.Generated.cs");
-        var testsTargetFilePath = Path.Combine(pwd, "..", "test", "ResultsOfTTests.Generated.cs");
+        var classTargetFilePath = Path.Combine(pwd, "..", "..", "src", "ResultsOfT.Generated.cs");
+        var testsTargetFilePath = Path.Combine(pwd, "..", "..", "test", "ResultsOfTTests.Generated.cs");
 
         if (args.Length > 0)
         {
@@ -482,7 +482,7 @@ static void GenerateTest_ExecuteResult_ExecutesAssignedResult(StreamWriter write
     static void GenerateTest_Throws_ArgumentNullException_WhenHttpContextIsNull(StreamWriter writer, int typeArgNumber)
     {
         //[Fact]
-        //public void ResultsOfTResult1TResult2_Throws_ArgumentNullException_WhenHttpContextIsNull()
+        //public async Task ResultsOfTResult1TResult2_Throws_ArgumentNullException_WhenHttpContextIsNull()
         //{
         //    // Arrange
         //    Results<ChecksumResult1, NoContent> MyApi()
@@ -494,7 +494,7 @@ static void GenerateTest_Throws_ArgumentNullException_WhenHttpContextIsNull(Stre
         //    // Act & Assert
         //    var result = MyApi();
 
-        //    Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        //    await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         //    {
         //        await result.ExecuteAsync(httpContext);
         //    });
@@ -504,7 +504,7 @@ static void GenerateTest_Throws_ArgumentNullException_WhenHttpContextIsNull(Stre
         writer.WriteIndentedLine("[Fact]");
 
         // Start method
-        writer.WriteIndent(1, "public void ResultsOf");
+        writer.WriteIndent(1, "public async Task ResultsOf");
         for (int j = 1; j <= typeArgNumber; j++)
         {
             writer.Write($"TResult{j}");
@@ -526,7 +526,7 @@ static void GenerateTest_Throws_ArgumentNullException_WhenHttpContextIsNull(Stre
         writer.WriteIndentedLine(2, "var result = MyApi();");
         writer.WriteLine();
 
-        writer.WriteIndentedLine(2, "Assert.ThrowsAsync<ArgumentNullException>(async () =>");
+        writer.WriteIndentedLine(2, "await Assert.ThrowsAsync<ArgumentNullException>(async () =>");
         writer.WriteIndentedLine(2, "{");
         writer.WriteIndentedLine(3, "await result.ExecuteAsync(httpContext);");
         writer.WriteIndentedLine(2, "});");
@@ -539,7 +539,7 @@ static void GenerateTest_Throws_ArgumentNullException_WhenHttpContextIsNull(Stre
     static void GenerateTest_Throws_InvalidOperationException_WhenResultIsNull(StreamWriter writer, int typeArgNumber)
     {
         //[Fact]
-        //public void ResultsOfTResult1TResult2_Throws_InvalidOperationException_WhenResultIsNull()
+        //public async Task ResultsOfTResult1TResult2_Throws_InvalidOperationException_WhenResultIsNull()
         //{
         //    // Arrange
         //    Results<ChecksumResult1, NoContent> MyApi()
@@ -551,7 +551,7 @@ static void GenerateTest_Throws_InvalidOperationException_WhenResultIsNull(Strea
         //    // Act & Assert
         //    var result = MyApi();
 
-        //    Assert.ThrowsAsync<InvalidOperationException>(async () =>
+        //    await Assert.ThrowsAsync<InvalidOperationException>(async () =>
         //    {
         //        await result.ExecuteAsync(httpContext);
         //    });
@@ -561,7 +561,7 @@ static void GenerateTest_Throws_InvalidOperationException_WhenResultIsNull(Strea
         writer.WriteIndentedLine("[Fact]");
 
         // Start method
-        writer.WriteIndent(1, "public void ResultsOf");
+        writer.WriteIndent(1, "public async Task ResultsOf");
         for (int j = 1; j <= typeArgNumber; j++)
         {
             writer.Write($"TResult{j}");
@@ -573,7 +573,7 @@ static void GenerateTest_Throws_InvalidOperationException_WhenResultIsNull(Strea
         writer.WriteIndentedLine(2, "// Arrange");
         writer.WriteIndentedLine(2, "Results<ChecksumResult1, NoContent> MyApi()");
         writer.WriteIndentedLine(2, "{");
-        writer.WriteIndentedLine(3, "return new ChecksumResult1(1);");
+        writer.WriteIndentedLine(3, "return (ChecksumResult1)null;");
         writer.WriteIndentedLine(2, "}");
         writer.WriteIndentedLine(2, "var httpContext = GetHttpContext();");
         writer.WriteLine();
@@ -583,7 +583,7 @@ static void GenerateTest_Throws_InvalidOperationException_WhenResultIsNull(Strea
         writer.WriteIndentedLine(2, "var result = MyApi();");
         writer.WriteLine();
 
-        writer.WriteIndentedLine(2, "Assert.ThrowsAsync<InvalidOperationException>(async () =>");
+        writer.WriteIndentedLine(2, "await Assert.ThrowsAsync<InvalidOperationException>(async () =>");
         writer.WriteIndentedLine(2, "{");
         writer.WriteIndentedLine(3, "await result.ExecuteAsync(httpContext);");
         writer.WriteIndentedLine(2, "});");
diff --git a/src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj b/src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj
index 216ac33d03c1..663745c85991 100644
--- a/src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj
+++ b/src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj
@@ -19,6 +19,7 @@
     <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.DependencyModel" />
+    <Reference Include="Microsoft.Extensions.Validation" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.RequestDelegateGenerator\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Http/Http/perf/Microbenchmarks/ValidatableTypesBenchmark.cs b/src/Http/Http/perf/Microbenchmarks/ValidatableTypesBenchmark.cs
new file mode 100644
index 000000000000..1d182e89c823
--- /dev/null
+++ b/src/Http/Http/perf/Microbenchmarks/ValidatableTypesBenchmark.cs
@@ -0,0 +1,368 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using BenchmarkDotNet.Attributes;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.AspNetCore.Http.Microbenchmarks;
+
+public class ValidatableTypeInfoBenchmark
+{
+    private IValidatableInfo _simpleTypeInfo = null!;
+    private IValidatableInfo _complexTypeInfo = null!;
+    private IValidatableInfo _hierarchicalTypeInfo = null!;
+    private IValidatableInfo _ivalidatableObjectTypeInfo = null!;
+
+    private ValidateContext _context = null!;
+    private SimpleModel _simpleModel = null!;
+    private ComplexModel _complexModel = null!;
+    private HierarchicalModel _hierarchicalModel = null!;
+    private ValidatableObjectModel _validatableObjectModel = null!;
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        var services = new ServiceCollection();
+        var mockResolver = new MockValidatableTypeInfoResolver();
+
+        services.AddValidation(options =>
+        {
+            // Register our mock resolver
+            options.Resolvers.Insert(0, mockResolver);
+        });
+
+        var serviceProvider = services.BuildServiceProvider();
+        var validationOptions = serviceProvider.GetRequiredService<IOptions<ValidationOptions>>().Value;
+
+        _context = new ValidateContext
+        {
+            ValidationOptions = validationOptions,
+            ValidationContext = new ValidationContext(new object(), serviceProvider, null),
+            ValidationErrors = new Dictionary<string, string[]>(StringComparer.Ordinal)
+        };
+
+        // Create the model instances
+        _simpleModel = new SimpleModel
+        {
+            Id = 1,
+            Name = "Test Name",
+            Email = "test@example.com"
+        };
+
+        _complexModel = new ComplexModel
+        {
+            Id = 1,
+            Name = "Complex Model",
+            Properties = new Dictionary<string, string>
+            {
+                ["Prop1"] = "Value1",
+                ["Prop2"] = "Value2"
+            },
+            Items = ["Item1", "Item2", "Item3"],
+            CreatedOn = DateTime.UtcNow
+        };
+
+        _hierarchicalModel = new HierarchicalModel
+        {
+            Id = 1,
+            Name = "Parent Model",
+            Child = new ChildModel
+            {
+                Id = 2,
+                Name = "Child Model",
+                ParentId = 1
+            },
+            Siblings =
+            [
+                new SimpleModel { Id = 3, Name = "Sibling 1", Email = "sibling1@example.com" },
+                new SimpleModel { Id = 4, Name = "Sibling 2", Email = "sibling2@example.com" }
+            ]
+        };
+
+        _validatableObjectModel = new ValidatableObjectModel
+        {
+            Id = 1,
+            Name = "Validatable Model",
+            CustomField = "Valid Value"
+        };
+
+        // Get the type info instances from validation options using the mock resolver
+        validationOptions.TryGetValidatableTypeInfo(typeof(SimpleModel), out _simpleTypeInfo);
+        validationOptions.TryGetValidatableTypeInfo(typeof(ComplexModel), out _complexTypeInfo);
+        validationOptions.TryGetValidatableTypeInfo(typeof(HierarchicalModel), out _hierarchicalTypeInfo);
+        validationOptions.TryGetValidatableTypeInfo(typeof(ValidatableObjectModel), out _ivalidatableObjectTypeInfo);
+
+        // Ensure we have all type infos (this should not be needed with our mock resolver)
+        if (_simpleTypeInfo == null || _complexTypeInfo == null ||
+            _hierarchicalTypeInfo == null || _ivalidatableObjectTypeInfo == null)
+        {
+            throw new InvalidOperationException("Failed to register one or more type infos with mock resolver");
+        }
+    }
+
+    [Benchmark(Description = "Validate Simple Model")]
+    [BenchmarkCategory("Simple")]
+    public async Task ValidateSimpleModel()
+    {
+        _context.ValidationErrors.Clear();
+        await _simpleTypeInfo.ValidateAsync(_simpleModel, _context, default);
+    }
+
+    [Benchmark(Description = "Validate Complex Model")]
+    [BenchmarkCategory("Complex")]
+    public async Task ValidateComplexModel()
+    {
+        _context.ValidationErrors.Clear();
+        await _complexTypeInfo.ValidateAsync(_complexModel, _context, default);
+    }
+
+    [Benchmark(Description = "Validate Hierarchical Model")]
+    [BenchmarkCategory("Hierarchical")]
+    public async Task ValidateHierarchicalModel()
+    {
+        _context.ValidationErrors.Clear();
+        await _hierarchicalTypeInfo.ValidateAsync(_hierarchicalModel, _context, default);
+    }
+
+    [Benchmark(Description = "Validate IValidatableObject Model")]
+    [BenchmarkCategory("IValidatableObject")]
+    public async Task ValidateIValidatableObjectModel()
+    {
+        _context.ValidationErrors.Clear();
+        await _ivalidatableObjectTypeInfo.ValidateAsync(_validatableObjectModel, _context, default);
+    }
+
+    [Benchmark(Description = "Validate invalid Simple Model")]
+    [BenchmarkCategory("Invalid")]
+    public async Task ValidateInvalidSimpleModel()
+    {
+        _context.ValidationErrors.Clear();
+        _simpleModel.Email = "invalid-email";
+        await _simpleTypeInfo.ValidateAsync(_simpleModel, _context, default);
+    }
+
+    [Benchmark(Description = "Validate invalid IValidatableObject Model")]
+    [BenchmarkCategory("Invalid")]
+    public async Task ValidateInvalidIValidatableObjectModel()
+    {
+        _context.ValidationErrors.Clear();
+        _validatableObjectModel.CustomField = "Invalid";
+        await _ivalidatableObjectTypeInfo.ValidateAsync(_validatableObjectModel, _context, default);
+    }
+
+    #region Helper methods to create type info instances manually if needed
+
+    private ValidatablePropertyInfo CreatePropertyInfo(string name, Type type, params ValidationAttribute[] attributes)
+    {
+        return new MockValidatablePropertyInfo(
+            typeof(SimpleModel),
+            type,
+            name,
+            name,
+            attributes);
+    }
+
+    #endregion
+
+    #region Test Models
+
+    public class SimpleModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        [EmailAddress]
+        public string Email { get; set; }
+    }
+
+    public class ComplexModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        public Dictionary<string, string> Properties { get; set; }
+
+        public List<string> Items { get; set; }
+
+        public DateTime CreatedOn { get; set; }
+    }
+
+    public class ChildModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        public int ParentId { get; set; }
+    }
+
+    public class HierarchicalModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        public ChildModel Child { get; set; }
+
+        public List<SimpleModel> Siblings { get; set; }
+    }
+
+    public class ValidatableObjectModel : IValidatableObject
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        public string CustomField { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (CustomField == "Invalid")
+            {
+                yield return new ValidationResult("CustomField has an invalid value", new[] { nameof(CustomField) });
+            }
+        }
+    }
+
+    #endregion
+
+    #region Mock Implementations for Testing
+
+    private class MockValidatableTypeInfo(Type type, ValidatablePropertyInfo[] members) : ValidatableTypeInfo(type, members)
+    {
+        protected override ValidationAttribute[] GetValidationAttributes() => [];
+    }
+
+    private class MockValidatablePropertyInfo(
+        Type containingType,
+        Type propertyType,
+        string name,
+        string displayName,
+        ValidationAttribute[] validationAttributes) : ValidatablePropertyInfo(containingType, propertyType, name, displayName)
+    {
+        private readonly ValidationAttribute[] _validationAttributes = validationAttributes;
+
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+    }
+
+    #endregion
+
+    #region Mock Resolver Implementation
+
+    private class MockValidatableTypeInfoResolver : IValidatableInfoResolver
+    {
+        private readonly Dictionary<Type, ValidatableTypeInfo> _typeInfoCache = [];
+
+        public MockValidatableTypeInfoResolver()
+        {
+            // Initialize the cache with our test models
+            _typeInfoCache[typeof(SimpleModel)] = CreateSimpleModelTypeInfo();
+            _typeInfoCache[typeof(ComplexModel)] = CreateComplexModelTypeInfo();
+            _typeInfoCache[typeof(HierarchicalModel)] = CreateHierarchicalModelTypeInfo();
+            _typeInfoCache[typeof(ValidatableObjectModel)] = CreateValidatableObjectModelTypeInfo();
+
+            // Add child models that might be validated separately
+            _typeInfoCache[typeof(ChildModel)] = CreateChildModelTypeInfo();
+        }
+
+        private ValidatableTypeInfo CreateSimpleModelTypeInfo()
+        {
+            return new MockValidatableTypeInfo(
+                typeof(SimpleModel),
+                [
+                    CreatePropertyInfo(typeof(SimpleModel), "Id", typeof(int)),
+                    CreatePropertyInfo(typeof(SimpleModel), "Name", typeof(string)),
+                    CreatePropertyInfo(typeof(SimpleModel), "Email", typeof(string), new EmailAddressAttribute())
+                ]);
+        }
+
+        private ValidatableTypeInfo CreateComplexModelTypeInfo()
+        {
+            return new MockValidatableTypeInfo(
+                typeof(ComplexModel),
+                [
+                    CreatePropertyInfo(typeof(ComplexModel), "Id", typeof(int)),
+                    CreatePropertyInfo(typeof(ComplexModel), "Name", typeof(string)),
+                    CreatePropertyInfo(typeof(ComplexModel), "Properties", typeof(Dictionary<string, string>)),
+                    CreatePropertyInfo(typeof(ComplexModel), "Items", typeof(List<string>)),
+                    CreatePropertyInfo(typeof(ComplexModel), "CreatedOn", typeof(DateTime))
+                ]);
+        }
+
+        private ValidatableTypeInfo CreateChildModelTypeInfo()
+        {
+            return new MockValidatableTypeInfo(
+                typeof(ChildModel),
+                [
+                    CreatePropertyInfo(typeof(ChildModel), "Id", typeof(int)),
+                    CreatePropertyInfo(typeof(ChildModel), "Name", typeof(string)),
+                    CreatePropertyInfo(typeof(ChildModel), "ParentId", typeof(int))
+                ]);
+        }
+
+        private ValidatableTypeInfo CreateHierarchicalModelTypeInfo()
+        {
+            return new MockValidatableTypeInfo(
+                typeof(HierarchicalModel),
+                [
+                    CreatePropertyInfo(typeof(HierarchicalModel), "Id", typeof(int)),
+                    CreatePropertyInfo(typeof(HierarchicalModel), "Name", typeof(string)),
+                    CreatePropertyInfo(typeof(HierarchicalModel), "Child", typeof(ChildModel)),
+                    CreatePropertyInfo(typeof(HierarchicalModel), "Siblings", typeof(List<SimpleModel>))
+                ]);
+        }
+
+        private ValidatableTypeInfo CreateValidatableObjectModelTypeInfo()
+        {
+            return new MockValidatableTypeInfo(
+                typeof(ValidatableObjectModel),
+                [
+                    CreatePropertyInfo(typeof(ValidatableObjectModel), "Id", typeof(int)),
+                    CreatePropertyInfo(typeof(ValidatableObjectModel), "Name", typeof(string)),
+                    CreatePropertyInfo(typeof(ValidatableObjectModel), "CustomField", typeof(string))
+                ]);
+        }
+
+        private ValidatablePropertyInfo CreatePropertyInfo(Type containingType, string name, Type type, params ValidationAttribute[] attributes)
+        {
+            return new MockValidatablePropertyInfo(
+                containingType,
+                type,
+                name,
+                name, // Use name as display name
+                attributes);
+        }
+
+        public bool TryGetValidatableTypeInfo(Type type, out IValidatableInfo validatableInfo)
+        {
+            if (_typeInfoCache.TryGetValue(type, out var typeInfo))
+            {
+                validatableInfo = typeInfo;
+                return true;
+            }
+            validatableInfo = null;
+            return false;
+        }
+
+        public bool TryGetValidatableParameterInfo(ParameterInfo parameterInfo, out IValidatableInfo validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+    #endregion
+}
diff --git a/src/Http/Http/src/HttpContextAccessor.cs b/src/Http/Http/src/HttpContextAccessor.cs
index f71a6ef7c00e..d306a8dbeb8b 100644
--- a/src/Http/Http/src/HttpContextAccessor.cs
+++ b/src/Http/Http/src/HttpContextAccessor.cs
@@ -22,12 +22,8 @@ public HttpContext? HttpContext
         }
         set
         {
-            var holder = _httpContextCurrent.Value;
-            if (holder != null)
-            {
-                // Clear current HttpContext trapped in the AsyncLocals, as its done.
-                holder.Context = null;
-            }
+            // Clear current HttpContext trapped in the AsyncLocals, as its done.
+            _httpContextCurrent.Value?.Context = null;
 
             if (value != null)
             {
diff --git a/src/Http/Http/src/PublicAPI.Shipped.txt b/src/Http/Http/src/PublicAPI.Shipped.txt
index 4cecf2612f3d..52fecbb04ab7 100644
--- a/src/Http/Http/src/PublicAPI.Shipped.txt
+++ b/src/Http/Http/src/PublicAPI.Shipped.txt
@@ -312,6 +312,7 @@ override Microsoft.AspNetCore.Http.DefaultHttpContext.TraceIdentifier.set -> voi
 override Microsoft.AspNetCore.Http.DefaultHttpContext.User.get -> System.Security.Claims.ClaimsPrincipal!
 override Microsoft.AspNetCore.Http.DefaultHttpContext.User.set -> void
 override Microsoft.AspNetCore.Http.DefaultHttpContext.WebSockets.get -> Microsoft.AspNetCore.Http.WebSocketManager!
+override Microsoft.AspNetCore.Http.Timeouts.DisableRequestTimeoutAttribute.ToString() -> string!
 static Microsoft.AspNetCore.Builder.RequestTimeoutsIApplicationBuilderExtensions.UseRequestTimeouts(this Microsoft.AspNetCore.Builder.IApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 static Microsoft.AspNetCore.Builder.RequestTimeoutsIEndpointConventionBuilderExtensions.DisableRequestTimeout(this Microsoft.AspNetCore.Builder.IEndpointConventionBuilder! builder) -> Microsoft.AspNetCore.Builder.IEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.RequestTimeoutsIEndpointConventionBuilderExtensions.WithRequestTimeout(this Microsoft.AspNetCore.Builder.IEndpointConventionBuilder! builder, Microsoft.AspNetCore.Http.Timeouts.RequestTimeoutPolicy! policy) -> Microsoft.AspNetCore.Builder.IEndpointConventionBuilder!
diff --git a/src/Http/Http/src/PublicAPI.Unshipped.txt b/src/Http/Http/src/PublicAPI.Unshipped.txt
index e87986053c89..7dc5c58110bf 100644
--- a/src/Http/Http/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Http/src/PublicAPI.Unshipped.txt
@@ -1,2 +1 @@
 #nullable enable
-override Microsoft.AspNetCore.Http.Timeouts.DisableRequestTimeoutAttribute.ToString() -> string!
diff --git a/src/Http/Http/test/CookieOptionsTests.cs b/src/Http/Http/test/CookieOptionsTests.cs
index 59c9db46fef0..62edd5651bd0 100644
--- a/src/Http/Http/test/CookieOptionsTests.cs
+++ b/src/Http/Http/test/CookieOptionsTests.cs
@@ -49,7 +49,7 @@ public void CopyCtor_AllPropertiesCopied()
                     Assert.NotSame(property.GetValue(original), property.GetValue(copy));
                     break;
                 default:
-                    Assert.True(false, "Not implemented: " + property.Name);
+                    Assert.Fail("Not implemented: " + property.Name);
                     break;
             }
         }
diff --git a/src/Http/Http/test/Features/FormFeatureTests.cs b/src/Http/Http/test/Features/FormFeatureTests.cs
index 01bdf1fa18a1..e3ab9b1b76fe 100644
--- a/src/Http/Http/test/Features/FormFeatureTests.cs
+++ b/src/Http/Http/test/Features/FormFeatureTests.cs
@@ -222,7 +222,7 @@ public async Task ReadForm_EmptyMultipart_ReturnsParsedFormCollection(bool buffe
         // Content
         Assert.Equal(0, formCollection.Count);
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(0, formCollection.Files.Count);
+        Assert.Empty(formCollection.Files);
 
         // Cleanup
         await responseFeature.CompleteAsync();
@@ -259,7 +259,7 @@ public async Task ReadForm_MultipartWithField_ReturnsParsedFormCollection(bool b
         Assert.Equal("Foo", formCollection["description"]);
 
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(0, formCollection.Files.Count);
+        Assert.Empty(formCollection.Files);
 
         // Cleanup
         await responseFeature.CompleteAsync();
@@ -295,7 +295,7 @@ public async Task ReadFormAsync_MultipartWithFile_ReturnsParsedFormCollection(bo
         Assert.Equal(0, formCollection.Count);
 
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(1, formCollection.Files.Count);
+        Assert.Single(formCollection.Files);
 
         var file = formCollection.Files["myfile1"];
         Assert.Equal("myfile1", file.Name);
@@ -344,7 +344,7 @@ public async Task ReadFormAsync_MultipartWithFileAndQuotedBoundaryString_Returns
         Assert.Equal("Foo", formCollection["description"]);
 
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(0, formCollection.Files.Count);
+        Assert.Empty(formCollection.Files);
 
         // Cleanup
         await responseFeature.CompleteAsync();
@@ -380,7 +380,7 @@ public async Task ReadFormAsync_MultipartWithEncodedFilename_ReturnsParsedFormCo
         Assert.Equal(0, formCollection.Count);
 
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(1, formCollection.Files.Count);
+        Assert.Single(formCollection.Files);
 
         var file = formCollection.Files["myfile1"];
         Assert.Equal("myfile1", file.Name);
@@ -429,7 +429,7 @@ public async Task ReadFormAsync_MultipartWithFieldAndFile_ReturnsParsedFormColle
         Assert.Equal("Foo", formCollection["description"]);
 
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(1, formCollection.Files.Count);
+        Assert.Single(formCollection.Files);
 
         var file = formCollection.Files["myfile1"];
         Assert.Equal("text/html", file.ContentType);
@@ -578,7 +578,7 @@ public async Task ReadFormAsync_MultipartWithFieldAndMediumFile_ReturnsParsedFor
         Assert.Equal("Foo", formCollection["description"]);
 
         Assert.NotNull(formCollection.Files);
-        Assert.Equal(1, formCollection.Files.Count);
+        Assert.Single(formCollection.Files);
 
         var file = formCollection.Files["myfile1"];
         Assert.Equal("text/html", file.ContentType);
diff --git a/src/Http/Http/test/Features/QueryFeatureTests.cs b/src/Http/Http/test/Features/QueryFeatureTests.cs
index 9e19f7f9df27..17479bd069c1 100644
--- a/src/Http/Http/test/Features/QueryFeatureTests.cs
+++ b/src/Http/Http/test/Features/QueryFeatureTests.cs
@@ -84,7 +84,7 @@ public void ParseQueryWithEmptyKeyWorks()
         var queryCollection = provider.Query;
 
         Assert.Single(queryCollection);
-        Assert.Equal(new[] { "value1", "" }, queryCollection[""]);
+        Assert.Equal(new[] { "value1", "" }, queryCollection[""].ToArray());
     }
 
     [Fact]
@@ -98,7 +98,7 @@ public void ParseQueryWithDuplicateKeysGroups()
         var queryCollection = provider.Query;
 
         Assert.Equal(2, queryCollection.Count);
-        Assert.Equal(new[] { "valueA", "valueC" }, queryCollection["key1"]);
+        Assert.Equal(new[] { "valueA", "valueC" }, queryCollection["key1"].ToArray());
         Assert.Equal("valueB", queryCollection["key2"].FirstOrDefault());
     }
 
@@ -113,7 +113,7 @@ public void ParseQueryWithThreefoldKeysGroups()
         var queryCollection = provider.Query;
 
         Assert.Equal(2, queryCollection.Count);
-        Assert.Equal(new[] { "valueA", "valueC", "valueD" }, queryCollection["key1"]);
+        Assert.Equal(new[] { "valueA", "valueC", "valueD" }, queryCollection["key1"].ToArray());
         Assert.Equal("valueB", queryCollection["key2"].FirstOrDefault());
     }
 
@@ -215,7 +215,7 @@ public void ParseQueryWithEncodedKeyEncodedValuesWorks()
         var queryCollection = provider.Query;
 
         Assert.Single(queryCollection);
-        Assert.Equal(new[] { "[ 1 ]", "[ 2 ]" }, queryCollection["fields [todoItems]"]);
+        Assert.Equal(new[] { "[ 1 ]", "[ 2 ]" }, queryCollection["fields [todoItems]"].ToArray());
     }
 
     [Fact]
@@ -234,7 +234,7 @@ public void CaseInsensitiveWithManyKeys()
         var queryCollection = provider.Query;
 
         Assert.Equal(12, queryCollection.Count);
-        Assert.Equal(new[] { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" }, queryCollection["KEY"]);
+        Assert.Equal(new[] { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" }, queryCollection["KEY"].ToArray());
     }
 
     [Fact]
@@ -249,6 +249,6 @@ public void CaseInsensitiveWithFewKeys()
         var queryCollection = provider.Query;
 
         Assert.Equal(1, queryCollection.Count);
-        Assert.Equal(new[] { "1", "2", "3", "4", "5" }, queryCollection["KEY"]);
+        Assert.Equal(new[] { "1", "2", "3", "4", "5" }, queryCollection["KEY"].ToArray());
     }
 }
diff --git a/src/Http/Http/test/HeaderDictionaryTests.cs b/src/Http/Http/test/HeaderDictionaryTests.cs
index 9459124a99db..65a11a6dfdee 100644
--- a/src/Http/Http/test/HeaderDictionaryTests.cs
+++ b/src/Http/Http/test/HeaderDictionaryTests.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Http;
 
 public class HeaderDictionaryTests
 {
-    public static TheoryData HeaderSegmentData => new TheoryData<IEnumerable<string>>
+    public static TheoryData<IEnumerable<string>> HeaderSegmentData => new()
         {
           new[] { "Value1", "Value2", "Value3", "Value4" },
           new[] { "Value1", "", "Value3", "Value4" },
diff --git a/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs b/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs
index bdf871b866e6..cb7d548d4507 100644
--- a/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs
+++ b/src/Http/Http/test/Internal/DefaultHttpRequestTests.cs
@@ -165,7 +165,7 @@ public void Cookies_GetAndSet()
     {
         var request = new DefaultHttpContext().Request;
         var cookieHeaders = request.Headers["Cookie"];
-        Assert.Empty(cookieHeaders);
+        Assert.Equal(0, cookieHeaders.Count);
         var cookies0 = request.Cookies;
         Assert.Empty(cookies0);
         Assert.Null(cookies0["key0"]);
@@ -180,7 +180,7 @@ public void Cookies_GetAndSet()
         Assert.Equal(2, cookies1.Count);
         Assert.Equal("value0,", cookies1["name0"]);
         Assert.Equal("value1", cookies1["name1"]);
-        Assert.Equal(newCookies, request.Headers["Cookie"]);
+        Assert.Equal(newCookies, request.Headers["Cookie"].ToArray());
 
         var cookies2 = new RequestCookieCollection(new Dictionary<string, string>()
             {
@@ -190,7 +190,7 @@ public void Cookies_GetAndSet()
         Assert.Equal(cookies2, request.Cookies);
         Assert.Equal("value2", request.Cookies["name2"]);
         cookieHeaders = request.Headers["Cookie"];
-        Assert.Equal(new[] { "name2=value2" }, cookieHeaders);
+        Assert.Equal(new[] { "name2=value2" }, cookieHeaders.ToArray());
     }
 
     [Fact]
diff --git a/src/Http/Http/test/RequestCookiesCollectionTests.cs b/src/Http/Http/test/RequestCookiesCollectionTests.cs
index e08a53f29711..d584f2db0599 100644
--- a/src/Http/Http/test/RequestCookiesCollectionTests.cs
+++ b/src/Http/Http/test/RequestCookiesCollectionTests.cs
@@ -33,11 +33,18 @@ public void ParseManyCookies()
     [Theory]
     [InlineData(",", null)]
     [InlineData(";", null)]
-    [InlineData("er=dd,cc,bb", new[] { "dd" })]
-    [InlineData("er=dd,err=cc,errr=bb", new[] { "dd", "cc", "bb" })]
-    [InlineData("errorcookie=dd,:(\"sa;", new[] { "dd" })]
+    [InlineData("er=dd,cc,bb", null)]
+    [InlineData("er=dd,err=cc,errr=bb", null)]
+    [InlineData("errorcookie=dd,:(\"sa;", null)]
     [InlineData("s;", null)]
     [InlineData("er=;,err=,errr=\\,errrr=\"", null)]
+    [InlineData("a@a=a;", null)]
+    [InlineData("a@ a=a;", null)]
+    [InlineData("a a=a;", null)]
+    [InlineData(",a=a;", null)]
+    [InlineData(",a=a", null)]
+    [InlineData("a=a;,b=b", new []{ "a" })] // valid cookie followed by invalid cookie
+    [InlineData(",a=a;b=b", new[] { "b" })] // invalid cookie followed by valid cookie
     public void ParseInvalidCookies(string cookieToParse, string[] expectedCookieValues)
     {
         var cookies = RequestCookieCollection.Parse(new StringValues(new[] { cookieToParse }));
diff --git a/src/Http/HttpAbstractions.slnf b/src/Http/HttpAbstractions.slnf
index dbf53c6c4c39..265e3674aa4a 100644
--- a/src/Http/HttpAbstractions.slnf
+++ b/src/Http/HttpAbstractions.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
@@ -20,7 +20,7 @@
       "src\\Http\\Http.Abstractions\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj",
       "src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
       "src\\Http\\Http.Abstractions\\test\\Microsoft.AspNetCore.Http.Abstractions.Tests.csproj",
-      "src\\Http\\Http.Extensions\\gen\\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj",
+      "src\\Http\\Http.Extensions\\gen\\Microsoft.AspNetCore.Http.RequestDelegateGenerator\\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj",
       "src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
       "src\\Http\\Http.Extensions\\test\\Microsoft.AspNetCore.Http.Extensions.Tests.csproj",
       "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
@@ -31,6 +31,7 @@
       "src\\Http\\Http\\src\\Microsoft.AspNetCore.Http.csproj",
       "src\\Http\\Http\\test\\Microsoft.AspNetCore.Http.Tests.csproj",
       "src\\Http\\Metadata\\src\\Microsoft.AspNetCore.Metadata.csproj",
+      "src\\Http\\Owin\\benchmarks\\Microsoft.AspNetCore.Owin.Microbenchmarks\\Microsoft.AspNetCore.Owin.Microbenchmarks.csproj",
       "src\\Http\\Owin\\src\\Microsoft.AspNetCore.Owin.csproj",
       "src\\Http\\Owin\\test\\Microsoft.AspNetCore.Owin.Tests.csproj",
       "src\\Http\\Routing.Abstractions\\src\\Microsoft.AspNetCore.Routing.Abstractions.csproj",
@@ -38,15 +39,16 @@
       "src\\Http\\Routing\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Routing.Microbenchmarks.csproj",
       "src\\Http\\Routing\\src\\Microsoft.AspNetCore.Routing.csproj",
       "src\\Http\\Routing\\test\\FunctionalTests\\Microsoft.AspNetCore.Routing.FunctionalTests.csproj",
+      "src\\Http\\Routing\\test\\UnitTests\\Microsoft.AspNetCore.Routing.Tests.csproj",
       "src\\Http\\Routing\\test\\testassets\\Benchmarks\\Benchmarks.csproj",
       "src\\Http\\Routing\\test\\testassets\\RoutingSandbox\\RoutingSandbox.csproj",
       "src\\Http\\Routing\\test\\testassets\\RoutingWebSite\\RoutingWebSite.csproj",
-      "src\\Http\\Routing\\test\\UnitTests\\Microsoft.AspNetCore.Routing.Tests.csproj",
-      "src\\Http\\samples\\MinimalSample\\MinimalSample.csproj",
-      "src\\Http\\samples\\SampleApp\\HttpAbstractions.SampleApp.csproj",
       "src\\Http\\WebUtilities\\perf\\Microbenchmarks\\Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj",
       "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
       "src\\Http\\WebUtilities\\test\\Microsoft.AspNetCore.WebUtilities.Tests.csproj",
+      "src\\Http\\samples\\MinimalSampleOwin\\MinimalSampleOwin.csproj",
+      "src\\Http\\samples\\MinimalSample\\MinimalSample.csproj",
+      "src\\Http\\samples\\SampleApp\\HttpAbstractions.SampleApp.csproj",
       "src\\Middleware\\CORS\\src\\Microsoft.AspNetCore.Cors.csproj",
       "src\\Middleware\\Diagnostics.Abstractions\\src\\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj",
       "src\\Middleware\\Diagnostics\\src\\Microsoft.AspNetCore.Diagnostics.csproj",
@@ -71,4 +73,4 @@
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/AssemblyInfo.cs b/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/AssemblyInfo.cs
new file mode 100644
index 000000000000..09f49228e9e6
--- /dev/null
+++ b/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+[assembly: BenchmarkDotNet.Attributes.AspNetCoreBenchmark]
diff --git a/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Benchmarks/OwinEnvironmentBenchmark.cs b/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Benchmarks/OwinEnvironmentBenchmark.cs
new file mode 100644
index 000000000000..0e2eead9e260
--- /dev/null
+++ b/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Benchmarks/OwinEnvironmentBenchmark.cs
@@ -0,0 +1,107 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using BenchmarkDotNet.Attributes;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Owin.Microbenchmarks.Benchmarks;
+
+[MemoryDiagnoser]
+public class OwinEnvironmentBenchmark
+{
+    const int RequestCount = 10000;
+
+    RequestDelegate _noOperationRequestDelegate;
+    RequestDelegate _accessPortsRequestDelegate;
+    RequestDelegate _accessHeadersRequestDelegate;
+
+    HttpContext _defaultHttpContext;
+    HttpContext _httpContextWithHeaders;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        _noOperationRequestDelegate = BuildRequestDelegate();
+        _accessPortsRequestDelegate = BuildRequestDelegate(beforeOwinInvokeAction: env =>
+        {
+            _ = env.TryGetValue("server.LocalPort", out var localPort);
+            _ = env.TryGetValue("server.RemotePort", out var remotePort);
+        });
+        _accessHeadersRequestDelegate = BuildRequestDelegate(
+            beforeOwinInvokeAction: env =>
+            {
+                _ = env.TryGetValue("owin.RequestHeaders", out var requestHeaders);
+            },
+            afterOwinInvokeAction: env =>
+            {
+                _ = env.TryGetValue("owin.ResponseHeaders", out var responseHeaders);
+            }
+        );
+
+        _defaultHttpContext = new DefaultHttpContext();
+
+        _httpContextWithHeaders = new DefaultHttpContext();
+        _httpContextWithHeaders.Request.Headers["CustomRequestHeader1"] = "CustomRequestValue";
+        _httpContextWithHeaders.Request.Headers["CustomRequestHeader2"] = "CustomRequestValue";
+        _httpContextWithHeaders.Response.Headers["CustomResponseHeader1"] = "CustomResponseValue";
+        _httpContextWithHeaders.Response.Headers["CustomResponseHeader2"] = "CustomResponseValue";
+    }
+
+    [Benchmark]
+    public async Task OwinRequest_NoOperation()
+    {
+        foreach (var i in Enumerable.Range(0, RequestCount))
+        {
+            await _noOperationRequestDelegate(_defaultHttpContext);
+        }
+    }
+
+    [Benchmark]
+    public async Task OwinRequest_AccessPorts()
+    {
+        foreach (var i in Enumerable.Range(0, RequestCount))
+        {
+            await _accessPortsRequestDelegate(_defaultHttpContext);
+        }
+    }
+
+    [Benchmark]
+    public async Task OwinRequest_AccessHeaders()
+    {
+        foreach (var i in Enumerable.Range(0, RequestCount))
+        {
+            await _accessHeadersRequestDelegate(_httpContextWithHeaders);
+        }
+    }
+
+    private static RequestDelegate BuildRequestDelegate(
+        Action<IDictionary<string, object>> beforeOwinInvokeAction = null,
+        Action<IDictionary<string, object>> afterOwinInvokeAction = null)
+    {
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var builder = new ApplicationBuilder(serviceProvider);
+
+        return builder.UseOwin(addToPipeline =>
+        {
+            addToPipeline(next =>
+            {
+                return async env =>
+                {
+                    if (beforeOwinInvokeAction is not null)
+                    {
+                        beforeOwinInvokeAction(env);
+                    }
+
+                    await next(env);
+
+                    if (afterOwinInvokeAction is not null)
+                    {
+                        afterOwinInvokeAction(env);
+                    }
+                };
+            });
+        }).Build();
+    }
+}
diff --git a/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks.csproj b/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks.csproj
new file mode 100644
index 000000000000..5ca0b8f6e5da
--- /dev/null
+++ b/src/Http/Owin/benchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks/Microsoft.AspNetCore.Owin.Microbenchmarks.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="BenchmarkDotNet" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Owin" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+
+    <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Http/Owin/src/DictionaryStringArrayWrapper.cs b/src/Http/Owin/src/DictionaryStringArrayWrapper.cs
index 00a726a6f682..e3b3e795458b 100644
--- a/src/Http/Owin/src/DictionaryStringArrayWrapper.cs
+++ b/src/Http/Owin/src/DictionaryStringArrayWrapper.cs
@@ -10,16 +10,16 @@ namespace Microsoft.AspNetCore.Owin;
 
 internal sealed class DictionaryStringArrayWrapper : IDictionary<string, string[]>
 {
+    public readonly IHeaderDictionary Inner;
+
     public DictionaryStringArrayWrapper(IHeaderDictionary inner)
     {
         Inner = inner;
     }
 
-    public readonly IHeaderDictionary Inner;
-
-    private static KeyValuePair<string, StringValues> Convert(KeyValuePair<string, string[]> item) => new KeyValuePair<string, StringValues>(item.Key, item.Value);
+    private static KeyValuePair<string, StringValues> Convert(KeyValuePair<string, string[]> item) => new(item.Key, item.Value);
 
-    private static KeyValuePair<string, string[]> Convert(KeyValuePair<string, StringValues> item) => new KeyValuePair<string, string[]>(item.Key, item.Value);
+    private static KeyValuePair<string, string[]> Convert(KeyValuePair<string, StringValues> item) => new(item.Key, item.Value);
 
     private string[] Convert(StringValues item) => item;
 
@@ -55,9 +55,11 @@ void ICollection<KeyValuePair<string, string[]>>.CopyTo(KeyValuePair<string, str
         }
     }
 
-    IEnumerator IEnumerable.GetEnumerator() => Inner.Select(Convert).GetEnumerator();
+    public ConvertingEnumerator GetEnumerator() => new ConvertingEnumerator(Inner);
+
+    IEnumerator<KeyValuePair<string, string[]>> IEnumerable<KeyValuePair<string, string[]>>.GetEnumerator() => new ConvertingEnumerator(Inner);
 
-    IEnumerator<KeyValuePair<string, string[]>> IEnumerable<KeyValuePair<string, string[]>>.GetEnumerator() => Inner.Select(Convert).GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => new ConvertingEnumerator(Inner);
 
     bool ICollection<KeyValuePair<string, string[]>>.Remove(KeyValuePair<string, string[]> item) => Inner.Remove(Convert(item));
 
@@ -74,4 +76,40 @@ bool IDictionary<string, string[]>.TryGetValue(string key, out string[] value)
         value = default(StringValues);
         return false;
     }
+
+    public struct ConvertingEnumerator : IEnumerator<KeyValuePair<string, string[]>>, IEnumerator
+    {
+        private IEnumerator<KeyValuePair<string, StringValues>> _inner;
+        private KeyValuePair<string, string[]> _current;
+
+        internal ConvertingEnumerator(IDictionary<string, StringValues> inner)
+        {
+            _inner = inner.GetEnumerator();
+            _current = default;
+        }
+
+        public void Dispose()
+        {
+            _inner?.Dispose();
+            _inner = null;
+        }
+
+        public bool MoveNext()
+        {
+            if (!_inner.MoveNext())
+            {
+                _current = default;
+                return false;
+            }
+
+            _current = Convert(_inner.Current);
+            return true;
+        }
+
+        public KeyValuePair<string, string[]> Current => _current;
+
+        object IEnumerator.Current => Current;
+
+        void IEnumerator.Reset() => throw new NotSupportedException();
+    }
 }
diff --git a/src/Http/Owin/src/DictionaryStringValuesWrapper.cs b/src/Http/Owin/src/DictionaryStringValuesWrapper.cs
index 50ab189ba5c2..171680772949 100644
--- a/src/Http/Owin/src/DictionaryStringValuesWrapper.cs
+++ b/src/Http/Owin/src/DictionaryStringValuesWrapper.cs
@@ -11,16 +11,16 @@ namespace Microsoft.AspNetCore.Owin;
 
 internal sealed class DictionaryStringValuesWrapper : IHeaderDictionary
 {
+    public readonly IDictionary<string, string[]> Inner;
+
     public DictionaryStringValuesWrapper(IDictionary<string, string[]> inner)
     {
         Inner = inner;
     }
 
-    public readonly IDictionary<string, string[]> Inner;
-
-    private static KeyValuePair<string, StringValues> Convert(KeyValuePair<string, string[]> item) => new KeyValuePair<string, StringValues>(item.Key, item.Value);
+    private static KeyValuePair<string, StringValues> Convert(KeyValuePair<string, string[]> item) => new(item.Key, item.Value);
 
-    private static KeyValuePair<string, string[]> Convert(KeyValuePair<string, StringValues> item) => new KeyValuePair<string, string[]>(item.Key, item.Value);
+    private static KeyValuePair<string, string[]> Convert(KeyValuePair<string, StringValues> item) => new(item.Key, item.Value);
 
     private StringValues Convert(string[] item) => item;
 
@@ -100,9 +100,11 @@ void ICollection<KeyValuePair<string, StringValues>>.CopyTo(KeyValuePair<string,
         }
     }
 
-    IEnumerator IEnumerable.GetEnumerator() => Inner.Select(Convert).GetEnumerator();
+    public ConvertingEnumerator GetEnumerator() => new ConvertingEnumerator(Inner);
+
+    IEnumerator<KeyValuePair<string, StringValues>> IEnumerable<KeyValuePair<string, StringValues>>.GetEnumerator() => new ConvertingEnumerator(Inner);
 
-    IEnumerator<KeyValuePair<string, StringValues>> IEnumerable<KeyValuePair<string, StringValues>>.GetEnumerator() => Inner.Select(Convert).GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => new ConvertingEnumerator(Inner);
 
     bool ICollection<KeyValuePair<string, StringValues>>.Remove(KeyValuePair<string, StringValues> item) => Inner.Remove(Convert(item));
 
@@ -119,4 +121,40 @@ bool IDictionary<string, StringValues>.TryGetValue(string key, out StringValues
         value = default(StringValues);
         return false;
     }
+
+    public struct ConvertingEnumerator : IEnumerator<KeyValuePair<string, StringValues>>, IEnumerator
+    {
+        private IEnumerator<KeyValuePair<string, string[]>> _inner;
+        private KeyValuePair<string, StringValues> _current;
+
+        internal ConvertingEnumerator(IDictionary<string, string[]> inner)
+        {
+            _inner = inner.GetEnumerator();
+            _current = default;
+        }
+
+        public void Dispose()
+        {
+            _inner?.Dispose();
+            _inner = null;
+        }
+
+        public bool MoveNext()
+        {
+            if (!_inner.MoveNext())
+            {
+                _current = default;
+                return false;
+            }
+
+            _current = Convert(_inner.Current);
+            return true;
+        }
+
+        public KeyValuePair<string, StringValues> Current => _current;
+
+        object IEnumerator.Current => Current;
+
+        void IEnumerator.Reset() => throw new NotSupportedException();
+    }
 }
diff --git a/src/Http/Owin/src/OwinEnvironment.cs b/src/Http/Owin/src/OwinEnvironment.cs
index cc2995a10afe..32322fb4d0b2 100644
--- a/src/Http/Owin/src/OwinEnvironment.cs
+++ b/src/Http/Owin/src/OwinEnvironment.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections;
+using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 using System.Net;
@@ -28,8 +29,8 @@ namespace Microsoft.AspNetCore.Owin;
 /// </summary>
 public class OwinEnvironment : IDictionary<string, object>
 {
+    private readonly OwinEntries _owinEntries;
     private readonly HttpContext _context;
-    private readonly IDictionary<string, FeatureMap> _entries;
 
     /// <summary>
     /// Initializes a new instance of <see cref="OwinEnvironment"/>.
@@ -47,65 +48,7 @@ public OwinEnvironment(HttpContext context)
         }
 
         _context = context;
-        _entries = new Dictionary<string, FeatureMap>()
-            {
-                { OwinConstants.RequestProtocol, new FeatureMap<IHttpRequestFeature>(feature => feature.Protocol, () => string.Empty, (feature, value) => feature.Protocol = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.RequestScheme, new FeatureMap<IHttpRequestFeature>(feature => feature.Scheme, () => string.Empty, (feature, value) => feature.Scheme = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.RequestMethod, new FeatureMap<IHttpRequestFeature>(feature => feature.Method, () => string.Empty, (feature, value) => feature.Method = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.RequestPathBase, new FeatureMap<IHttpRequestFeature>(feature => feature.PathBase, () => string.Empty, (feature, value) => feature.PathBase = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.RequestPath, new FeatureMap<IHttpRequestFeature>(feature => feature.Path, () => string.Empty, (feature, value) => feature.Path = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.RequestQueryString, new FeatureMap<IHttpRequestFeature>(feature => Utilities.RemoveQuestionMark(feature.QueryString), () => string.Empty,
-                    (feature, value) => feature.QueryString = Utilities.AddQuestionMark(Convert.ToString(value, CultureInfo.InvariantCulture))) },
-                { OwinConstants.RequestHeaders, new FeatureMap<IHttpRequestFeature>(feature => Utilities.MakeDictionaryStringArray(feature.Headers), (feature, value) => feature.Headers = Utilities.MakeHeaderDictionary((IDictionary<string, string[]>)value)) },
-                { OwinConstants.RequestBody, new FeatureMap<IHttpRequestFeature>(feature => feature.Body, () => Stream.Null, (feature, value) => feature.Body = (Stream)value) },
-                { OwinConstants.RequestUser, new FeatureMap<IHttpAuthenticationFeature>(feature => feature.User, () => null, (feature, value) => feature.User = (ClaimsPrincipal)value) },
-
-                { OwinConstants.ResponseStatusCode, new FeatureMap<IHttpResponseFeature>(feature => feature.StatusCode, () => 200, (feature, value) => feature.StatusCode = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.ResponseReasonPhrase, new FeatureMap<IHttpResponseFeature>(feature => feature.ReasonPhrase, (feature, value) => feature.ReasonPhrase = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.ResponseHeaders, new FeatureMap<IHttpResponseFeature>(feature => Utilities.MakeDictionaryStringArray(feature.Headers), (feature, value) => feature.Headers = Utilities.MakeHeaderDictionary((IDictionary<string, string[]>)value)) },
-                { OwinConstants.ResponseBody, new FeatureMap<IHttpResponseBodyFeature>(feature => feature.Stream, () => Stream.Null, (feature, value) => context.Response.Body = (Stream)value) }, // DefaultHttpResponse.Body.Set has built in logic to handle replacing the feature.
-                { OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap<IHttpResponseFeature>(
-                    feature => new Action<Action<object>, object>((cb, state) => {
-                        feature.OnStarting(s =>
-                        {
-                            cb(s);
-                            return Task.CompletedTask;
-                        }, state);
-                    }))
-                },
-
-                { OwinConstants.CommonKeys.ConnectionId, new FeatureMap<IHttpConnectionFeature>(feature => feature.ConnectionId,
-                    (feature, value) => feature.ConnectionId = Convert.ToString(value, CultureInfo.InvariantCulture)) },
-
-                { OwinConstants.CommonKeys.LocalPort, new FeatureMap<IHttpConnectionFeature>(feature => feature.LocalPort.ToString(CultureInfo.InvariantCulture),
-                    (feature, value) => feature.LocalPort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
-                { OwinConstants.CommonKeys.RemotePort, new FeatureMap<IHttpConnectionFeature>(feature => feature.RemotePort.ToString(CultureInfo.InvariantCulture),
-                    (feature, value) => feature.RemotePort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
-
-                { OwinConstants.CommonKeys.LocalIpAddress, new FeatureMap<IHttpConnectionFeature>(feature => feature.LocalIpAddress.ToString(),
-                    (feature, value) => feature.LocalIpAddress = IPAddress.Parse(Convert.ToString(value, CultureInfo.InvariantCulture))) },
-                { OwinConstants.CommonKeys.RemoteIpAddress, new FeatureMap<IHttpConnectionFeature>(feature => feature.RemoteIpAddress.ToString(),
-                    (feature, value) => feature.RemoteIpAddress = IPAddress.Parse(Convert.ToString(value, CultureInfo.InvariantCulture))) },
-
-                { OwinConstants.SendFiles.SendAsync, new FeatureMap<IHttpResponseBodyFeature>(feature => new SendFileFunc(feature.SendFileAsync)) },
-
-                { OwinConstants.Security.User, new FeatureMap<IHttpAuthenticationFeature>(feature => feature.User,
-                    ()=> null, (feature, value) => feature.User = Utilities.MakeClaimsPrincipal((IPrincipal)value),
-                    () => new HttpAuthenticationFeature())
-                },
-
-                { OwinConstants.RequestId, new FeatureMap<IHttpRequestIdentifierFeature>(feature => feature.TraceIdentifier,
-                    ()=> null, (feature, value) => feature.TraceIdentifier = (string)value,
-                    () => new HttpRequestIdentifierFeature())
-                }
-            };
-
-        // owin.CallCancelled is required but the feature may not be present.
-        if (context.Features.Get<IHttpRequestLifetimeFeature>() != null)
-        {
-            _entries[OwinConstants.CallCancelled] = new FeatureMap<IHttpRequestLifetimeFeature>(feature => feature.RequestAborted);
-        }
-        else if (!_context.Items.ContainsKey(OwinConstants.CallCancelled))
+        if (!_context.Items.ContainsKey(OwinConstants.CallCancelled))
         {
             _context.Items[OwinConstants.CallCancelled] = CancellationToken.None;
         }
@@ -116,57 +59,37 @@ public OwinEnvironment(HttpContext context)
             _context.Items[OwinConstants.OwinVersion] = "1.0";
         }
 
-        if (context.Request.IsHttps)
-        {
-            _entries.Add(OwinConstants.CommonKeys.ClientCertificate, new FeatureMap<ITlsConnectionFeature>(feature => feature.ClientCertificate,
-                (feature, value) => feature.ClientCertificate = (X509Certificate2)value));
-            _entries.Add(OwinConstants.CommonKeys.LoadClientCertAsync, new FeatureMap<ITlsConnectionFeature>(
-                feature => new Func<Task>(() => feature.GetClientCertificateAsync(CancellationToken.None))));
-        }
-
-        if (context.WebSockets.IsWebSocketRequest)
-        {
-            _entries.Add(OwinConstants.WebSocket.AcceptAlt, new FeatureMap<IHttpWebSocketFeature>(feature => new WebSocketAcceptAlt(feature.AcceptAsync)));
-        }
-
         _context.Items[typeof(HttpContext).FullName] = _context; // Store for lookup when we transition back out of OWIN
+
+        _owinEntries = new(context);
     }
 
     // Public in case there's a new/custom feature interface that needs to be added.
     /// <summary>
     /// Get the environment's feature maps.
     /// </summary>
-    public IDictionary<string, FeatureMap> FeatureMaps
-    {
-        get { return _entries; }
-    }
+    public IDictionary<string, FeatureMap> FeatureMaps => _owinEntries.GetFeatureMaps();
 
     void IDictionary<string, object>.Add(string key, object value)
     {
-        if (_entries.ContainsKey(key))
+        if (_owinEntries.ContainsKey(key))
         {
             throw new InvalidOperationException("Key already present");
         }
         _context.Items.Add(key, value);
     }
 
-    bool IDictionary<string, object>.ContainsKey(string key)
-    {
-        return ((IDictionary<string, object>)this).TryGetValue(key, out _);
-    }
+    bool IDictionary<string, object>.ContainsKey(string key) => ((IDictionary<string, object>)this).TryGetValue(key, out _);
 
     ICollection<string> IDictionary<string, object>.Keys
-    {
-        get
-        {
-            return _entries.Where(pair => pair.Value.TryGet(_context, out _))
-                .Select(pair => pair.Key).Concat(_context.Items.Keys.Select(key => Convert.ToString(key, CultureInfo.InvariantCulture))).ToList();
-        }
-    }
+        => _owinEntries
+            .Where(pair => pair.Value.TryGet(_context, out _)).Select(pair => pair.Key)
+            .Concat(_context.Items.Keys.Select(key => Convert.ToString(key, CultureInfo.InvariantCulture)))
+            .ToList();
 
     bool IDictionary<string, object>.Remove(string key)
     {
-        if (_entries.Remove(key))
+        if (_owinEntries.Remove(key))
         {
             return true;
         }
@@ -175,8 +98,7 @@ bool IDictionary<string, object>.Remove(string key)
 
     bool IDictionary<string, object>.TryGetValue(string key, out object value)
     {
-        FeatureMap entry;
-        if (_entries.TryGetValue(key, out entry) && entry.TryGet(_context, out value))
+        if (_owinEntries.TryGetValue(key, out var entry) && entry.TryGet(_context, out value))
         {
             return true;
         }
@@ -194,7 +116,7 @@ object IDictionary<string, object>.this[string key]
         {
             FeatureMap entry;
             object value;
-            if (_entries.TryGetValue(key, out entry) && entry.TryGet(_context, out value))
+            if (_owinEntries.TryGetValue(key, out entry) && entry.TryGet(_context, out value))
             {
                 return value;
             }
@@ -207,7 +129,7 @@ object IDictionary<string, object>.this[string key]
         set
         {
             FeatureMap entry;
-            if (_entries.TryGetValue(key, out entry))
+            if (_owinEntries.TryGetValue(key, out entry))
             {
                 if (entry.CanSet)
                 {
@@ -215,7 +137,7 @@ object IDictionary<string, object>.this[string key]
                 }
                 else
                 {
-                    _entries.Remove(key);
+                    _owinEntries.Remove(key);
                     if (value != null)
                     {
                         _context.Items[key] = value;
@@ -243,7 +165,7 @@ void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object>
 
     void ICollection<KeyValuePair<string, object>>.Clear()
     {
-        _entries.Clear();
+        _owinEntries.Clear();
         _context.Items.Clear();
     }
 
@@ -256,7 +178,7 @@ void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, objec
     {
         ArgumentNullException.ThrowIfNull(array);
         ArgumentOutOfRangeException.ThrowIfNegative(arrayIndex);
-        if (arrayIndex + _entries.Count + _context.Items.Count > array.Length)
+        if (arrayIndex + _owinEntries.Count + _context.Items.Count > array.Length)
         {
             throw new ArgumentException("Not enough available space in array", nameof(array));
         }
@@ -270,7 +192,7 @@ void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, objec
 
     int ICollection<KeyValuePair<string, object>>.Count
     {
-        get { return _entries.Count + _context.Items.Count; }
+        get { return _owinEntries.Count + _context.Items.Count; }
     }
 
     bool ICollection<KeyValuePair<string, object>>.IsReadOnly
@@ -286,7 +208,7 @@ bool ICollection<KeyValuePair<string, object>>.Remove(KeyValuePair<string, objec
     /// <inheritdoc />
     public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
     {
-        foreach (var entryPair in _entries)
+        foreach (var entryPair in _owinEntries)
         {
             object value;
             if (entryPair.Value.TryGet(_context, out value))
@@ -478,4 +400,229 @@ public FeatureMap(Func<TFeature, object> getter, Func<object> defaultFactory, Ac
         {
         }
     }
+
+    private sealed class OwinEntries : IEnumerable<KeyValuePair<string, FeatureMap>>
+    {
+        private static readonly IReadOnlyDictionary<string, FeatureMap> _entries = ImmutableDictionary.CreateRange(
+            new Dictionary<string, FeatureMap>
+            {
+                { OwinConstants.RequestProtocol, new FeatureMap<IHttpRequestFeature>(feature => feature.Protocol, () => string.Empty, (feature, value) => feature.Protocol = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.RequestScheme, new FeatureMap<IHttpRequestFeature>(feature => feature.Scheme, () => string.Empty, (feature, value) => feature.Scheme = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.RequestMethod, new FeatureMap<IHttpRequestFeature>(feature => feature.Method, () => string.Empty, (feature, value) => feature.Method = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.RequestPathBase, new FeatureMap<IHttpRequestFeature>(feature => feature.PathBase, () => string.Empty, (feature, value) => feature.PathBase = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.RequestPath, new FeatureMap<IHttpRequestFeature>(feature => feature.Path, () => string.Empty, (feature, value) => feature.Path = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.RequestQueryString, new FeatureMap<IHttpRequestFeature>(feature => Utilities.RemoveQuestionMark(feature.QueryString), () => string.Empty, (feature, value) => feature.QueryString = Utilities.AddQuestionMark(Convert.ToString(value, CultureInfo.InvariantCulture))) },
+                { OwinConstants.RequestHeaders, new FeatureMap<IHttpRequestFeature>(feature => Utilities.MakeDictionaryStringArray(feature.Headers), (feature, value) => feature.Headers = Utilities.MakeHeaderDictionary((IDictionary<string, string[]>)value)) },
+                { OwinConstants.RequestBody, new FeatureMap<IHttpRequestFeature>(feature => feature.Body, () => Stream.Null, (feature, value) => feature.Body = (Stream)value) },
+                { OwinConstants.RequestUser, new FeatureMap<IHttpAuthenticationFeature>(feature => feature.User, () => null, (feature, value) => feature.User = (ClaimsPrincipal)value) },
+
+                { OwinConstants.ResponseStatusCode, new FeatureMap<IHttpResponseFeature>(feature => feature.StatusCode, () => 200, (feature, value) => feature.StatusCode = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.ResponseReasonPhrase, new FeatureMap<IHttpResponseFeature>(feature => feature.ReasonPhrase, (feature, value) => feature.ReasonPhrase = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.ResponseHeaders, new FeatureMap<IHttpResponseFeature>(feature => Utilities.MakeDictionaryStringArray(feature.Headers), (feature, value) => feature.Headers = Utilities.MakeHeaderDictionary((IDictionary<string, string[]>)value)) },
+                { OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap<IHttpResponseFeature>(
+                    feature => new Action<Action<object>, object>((cb, state) => {
+                        feature.OnStarting(s =>
+                        {
+                            cb(s);
+                            return Task.CompletedTask;
+                        }, state);
+                    }))
+                },
+
+                { OwinConstants.CommonKeys.ConnectionId, new FeatureMap<IHttpConnectionFeature>(feature => feature.ConnectionId, (feature, value) => feature.ConnectionId = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+
+                { OwinConstants.CommonKeys.LocalPort, new FeatureMap<IHttpConnectionFeature>(feature => PortToString(feature.LocalPort), (feature, value) => feature.LocalPort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
+                { OwinConstants.CommonKeys.RemotePort, new FeatureMap<IHttpConnectionFeature>(feature => PortToString(feature.RemotePort), (feature, value) => feature.RemotePort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
+
+                { OwinConstants.CommonKeys.LocalIpAddress, new FeatureMap<IHttpConnectionFeature>(feature => feature.LocalIpAddress.ToString(), (feature, value) => feature.LocalIpAddress = IPAddress.Parse(Convert.ToString(value, CultureInfo.InvariantCulture))) },
+                { OwinConstants.CommonKeys.RemoteIpAddress, new FeatureMap<IHttpConnectionFeature>(feature => feature.RemoteIpAddress.ToString(), (feature, value) => feature.RemoteIpAddress = IPAddress.Parse(Convert.ToString(value, CultureInfo.InvariantCulture))) },
+
+                { OwinConstants.SendFiles.SendAsync, new FeatureMap<IHttpResponseBodyFeature>(feature => new SendFileFunc(feature.SendFileAsync)) },
+                { OwinConstants.Security.User, new FeatureMap<IHttpAuthenticationFeature>(feature => feature.User, ()=> null, (feature, value) => feature.User = Utilities.MakeClaimsPrincipal((IPrincipal)value), () => new HttpAuthenticationFeature()) },
+                { OwinConstants.RequestId, new FeatureMap<IHttpRequestIdentifierFeature>(feature => feature.TraceIdentifier, ()=> null, (feature, value) => feature.TraceIdentifier = (string)value, () => new HttpRequestIdentifierFeature()) },
+                { OwinConstants.CallCancelled, new FeatureMap<IHttpRequestLifetimeFeature>(feature => feature.RequestAborted) },
+
+                { OwinConstants.CommonKeys.ClientCertificate, new FeatureMap<ITlsConnectionFeature>(feature => feature.ClientCertificate, (feature, value) => feature.ClientCertificate = (X509Certificate2)value) },
+                { OwinConstants.CommonKeys.LoadClientCertAsync, new FeatureMap<ITlsConnectionFeature>(feature => new Func<Task>(() => feature.GetClientCertificateAsync(CancellationToken.None))) },
+                { OwinConstants.WebSocket.AcceptAlt, new FeatureMap<IHttpWebSocketFeature>(
+                    feature =>
+                    {
+                        if (feature.IsWebSocketRequest)
+                        {
+                            return new WebSocketAcceptAlt(feature.AcceptAsync);
+                        }
+
+                        return null;
+                    })
+                }
+            });
+
+        /// <remarks>
+        /// Will be used, only if <see cref="FeatureMaps"/> or <see cref="Clear"/> is called from user-code.
+        /// Is a deep-copy of the singleton <see cref="_entries"/>
+        /// </remarks>
+        private IDictionary<string, FeatureMap> _contextEntries;
+
+        /// <remarks>
+        /// In order not to copy the whole dictionary of featureMaps per request,
+        /// and since OWIN allows the <see cref="Remove(string)"/> operation,
+        /// it's more lightweight to keep track of deleted keys.
+        /// </remarks>
+        private HashSet<string> _deletedKeys;
+
+        /// <remarks>
+        /// There are some <see cref="FeatureMap"/> entries that are context-dependent.
+        /// This dictionary is allocated per request, but does not contain as many entries as <see cref="_entries"/>.
+        /// </remarks>
+        private readonly IDictionary<string, FeatureMap> _contextDependentEntries;
+
+        public OwinEntries(HttpContext context)
+        {
+            _contextDependentEntries = new Dictionary<string, FeatureMap>
+            {
+                { OwinConstants.ResponseBody, new FeatureMap<IHttpResponseBodyFeature>(feature => feature.Stream, () => Stream.Null, (feature, value) => context.Response.Body = (Stream)value) }, // DefaultHttpResponse.Body.Set has built in logic to handle replacing the feature.
+            };
+        }
+
+        static string PortToString(int port) => port switch
+        {
+            80 => "80",
+            443 => "443",
+            _ => port.ToString(CultureInfo.InvariantCulture),
+        };
+
+        public int Count
+        {
+            get
+            {
+                if (_contextEntries is not null)
+                {
+                    return _contextEntries.Count;
+                }
+
+                return _entries.Count + _contextDependentEntries.Count - (_deletedKeys?.Count ?? 0);
+            }
+        }
+
+        public IDictionary<string, FeatureMap> GetFeatureMaps()
+        {
+            InitializeContextEntries();
+            return _contextEntries;
+        }
+
+        public bool TryGetValue(string key, out FeatureMap entry)
+        {
+            if (_contextEntries is not null)
+            {
+                return _contextEntries.TryGetValue(key, out entry);
+            }
+
+            if (_deletedKeys?.Contains(key) == true)
+            {
+                entry = null;
+                return false;
+            }
+
+            if (_entries.TryGetValue(key, out entry))
+            {
+                return true;
+            }
+
+            return _contextDependentEntries.TryGetValue(key, out entry);
+        }
+
+        public bool ContainsKey(string key)
+        {
+            if (_contextEntries is not null)
+            {
+                return _contextEntries.ContainsKey(key);
+            }
+
+            if (_deletedKeys?.Contains(key) == true)
+            {
+                return false;
+            }
+
+            return _entries.ContainsKey(key) || _contextDependentEntries.ContainsKey(key);
+        }
+
+        public bool Remove(string key)
+        {
+            if (_contextEntries is not null)
+            {
+                return _contextEntries.Remove(key);
+            }
+
+            if (_entries.ContainsKey(key) || _contextDependentEntries.ContainsKey(key))
+            {
+                _deletedKeys ??= new HashSet<string>(StringComparer.Ordinal);
+                return _deletedKeys.Add(key);
+            }
+
+            return false;
+        }
+
+        public IEnumerator<KeyValuePair<string, FeatureMap>> GetEnumerator()
+        {
+            if (_contextEntries is not null)
+            {
+                foreach (var entry in _contextEntries)
+                {
+                    yield return entry;
+                }
+            }
+            else
+            {
+                foreach (var entry in _entries)
+                {
+                    if (_deletedKeys?.Contains(entry.Key) == true)
+                    {
+                        continue;
+                    }
+
+                    yield return entry;
+                }
+
+                foreach (var entry in _contextDependentEntries)
+                {
+                    if (_deletedKeys?.Contains(entry.Key) == true)
+                    {
+                        continue;
+                    }
+
+                    yield return entry;
+                }
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public void Clear()
+        {
+            InitializeContextEntries(emptyCollection: true);
+        }
+
+        void InitializeContextEntries(bool emptyCollection = false)
+        {
+            if (emptyCollection)
+            {
+                _contextEntries = new Dictionary<string, FeatureMap>(StringComparer.Ordinal);
+                return;
+            }
+
+            _contextEntries = new Dictionary<string, FeatureMap>(_entries, StringComparer.Ordinal);
+            foreach (var entry in _contextDependentEntries)
+            {
+                _contextEntries[entry.Key] = entry.Value;
+            }
+
+            if (_deletedKeys is not null)
+            {
+                foreach (var key in _deletedKeys)
+                {
+                    _contextEntries.Remove(key);
+                }
+            }
+        }
+    }
 }
diff --git a/src/Http/Owin/src/PACKAGE.md b/src/Http/Owin/src/PACKAGE.md
new file mode 100644
index 000000000000..350b6a9713d4
--- /dev/null
+++ b/src/Http/Owin/src/PACKAGE.md
@@ -0,0 +1,49 @@
+## About
+
+`Microsoft.AspNetCore.Owin` provides adapters for running OWIN middleware in an ASP.NET Core application, and to run ASP.NET Core middleware in an OWIN application.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Owin`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Owin
+```
+
+### Configuration
+
+To use OWIN middleware in an ASP.NET Core pipeline:
+1. Define the OWIN middleware, if not done already. Here's a basic "Hello World" example:
+    ```csharp
+    public Task OwinHello(IDictionary<string, object> environment)
+    {
+        var responseText = "Hello World via OWIN";
+        var responseBytes = Encoding.UTF8.GetBytes(responseText);
+
+        // OWIN Environment Keys: https://owin.org/spec/spec/owin-1.0.0.html
+        var responseStream = (Stream)environment["owin.ResponseBody"];
+        var responseHeaders = (IDictionary<string, string[]>)environment["owin.ResponseHeaders"];
+
+        responseHeaders["Content-Length"] = [responseBytes.Length.ToString(CultureInfo.InvariantCulture)];
+        responseHeaders["Content-Type"] = ["text/plain"];
+
+        return responseStream.WriteAsync(responseBytes, 0, responseBytes.Length);
+    }
+    ```
+2. Add the middleware to the ASP.NET Core pipeline with the `UseOwin` extension method. For example:
+    ```csharp
+    app.UseOwin(pipeline =>
+    {
+        pipeline(next => OwinHello);
+    });
+    ```
+
+## Additional Documentation
+
+For additional documentation, including examples on running ASP.NET Core on an OWIN-based server, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/fundamentals/owin) on OWIN with ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Owin` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Http/Owin/test/OwinEnvironmentTests.cs b/src/Http/Owin/test/OwinEnvironmentTests.cs
index 32eeba3d6768..272f61c257ee 100644
--- a/src/Http/Owin/test/OwinEnvironmentTests.cs
+++ b/src/Http/Owin/test/OwinEnvironmentTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections;
+using System.Net.Http;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Http;
 
@@ -159,6 +160,63 @@ public void OwinEnvironmentSupportsLinq()
         Assert.NotNull(orderedEnvironment);
     }
 
+    [Fact]
+    public void OwinEnvironmentRemoveCorrectlyRemovesEntryAndDoesNotImpactNextOwinEnvironment()
+    {
+        var httpContext1 = CreateContext();
+        IDictionary<string, object> env1 = new OwinEnvironment(httpContext1);
+        var initialEnv1Count = env1.Count;
+
+        Assert.True(env1.Remove("owin.RequestProtocol"));
+        Assert.Equal(initialEnv1Count, env1.Count + 1);
+        Assert.False(env1.ContainsKey("owin.RequestProtocol"));
+        foreach (var key in env1.Keys)
+        {
+            Assert.NotEqual("owin.RequestProtocol", key);
+        }
+
+        var httpContext2 = CreateContext();
+        IDictionary<string, object> env2 = new OwinEnvironment(httpContext2);
+        Assert.True(env2.ContainsKey("owin.RequestProtocol"));
+    }
+
+    [Fact]
+    public void OwinEnvironmentFeatureMapsRemoveDoesNotImpactNextOwinEnvironment()
+    {
+        var httpContext1 = CreateContext();
+        var httpContext2 = CreateContext();
+
+        var owinEnvironment1 = new OwinEnvironment(httpContext1);
+        owinEnvironment1.FeatureMaps.Remove("owin.RequestProtocol");
+
+        var owinEnvironment2 = new OwinEnvironment(httpContext2);
+        Assert.True(owinEnvironment2.FeatureMaps.ContainsKey("owin.RequestProtocol"));
+        Assert.Equal(owinEnvironment1.ToList().Count + 1, owinEnvironment2.ToList().Count);
+    }
+
+    [Fact]
+    public void OwinEnvironmentClearBehavesCorrectlyAndDoesNotImpactNextOwinEnvironment()
+    {
+        var httpContext1 = CreateContext();
+        IDictionary<string, object> owinEnvironment1 = new OwinEnvironment(httpContext1);
+        owinEnvironment1.Clear();
+        Assert.Empty(owinEnvironment1);
+
+        var httpContext2 = CreateContext();
+        IDictionary<string, object> owinEnvironment2 = new OwinEnvironment(httpContext2);
+        Assert.True(owinEnvironment2.Count != 0);
+    }
+
+    [Fact]
+    public void OwinEnvironmentAccessContextDependentFeatureBehavesCorrectly()
+    {
+        var httpContext = CreateContext();
+        IDictionary<string, object> owinEnvironment = new OwinEnvironment(httpContext);
+
+        Assert.True(owinEnvironment.TryGetValue("owin.ResponseBody", out var responseBody));
+        responseBody.Equals(httpContext.Response.Body);
+    }
+
     private HttpContext CreateContext()
     {
         var context = new DefaultHttpContext();
diff --git a/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableMultipleEntryBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableMultipleEntryBenchmark.cs
index 77dd0f85c0e0..340982a922f3 100644
--- a/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableMultipleEntryBenchmark.cs
+++ b/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableMultipleEntryBenchmark.cs
@@ -27,7 +27,7 @@ public void Setup()
 
         for (var i = 0; i < _strings.Length; i++)
         {
-            _segments[i] = new PathSegment(0, _strings[i].Length);
+            _segments[i] = new PathSegment(1, _strings[i].Length - 2);
         }
 
         var samples = new int[Count];
@@ -39,7 +39,9 @@ public void Setup()
         var entries = new List<(string text, int _)>();
         for (var i = 0; i < samples.Length; i++)
         {
-            entries.Add((_strings[samples[i]], i));
+            var sampleIndex = samples[i];
+            var segment = _segments[sampleIndex];
+            entries.Add((_strings[sampleIndex].Substring(segment.Start, segment.Length), i));
         }
 
         _linearSearch = new LinearSearchJumpTable(0, -1, entries.ToArray());
diff --git a/src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj b/src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj
index 872e85f13ace..200dc147c051 100644
--- a/src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj
+++ b/src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj
@@ -6,6 +6,9 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RootNamespace>Microsoft.AspNetCore.Routing</RootNamespace>
+
+    <!-- https://github.com/dotnet/aspnetcore/issues/61574 tracks re-enabling this -->
+    <SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
   </PropertyGroup>
 
   <!--
diff --git a/src/Http/Routing/src/Builder/RouteHandlerServices.cs b/src/Http/Routing/src/Builder/RouteHandlerServices.cs
index 0a11fd782172..ba3316ddbef1 100644
--- a/src/Http/Routing/src/Builder/RouteHandlerServices.cs
+++ b/src/Http/Routing/src/Builder/RouteHandlerServices.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
@@ -32,7 +33,7 @@ public static class RouteHandlerServices
     /// <returns>The <see cref="RouteHandlerBuilder"/>>.</returns>
     public static RouteHandlerBuilder Map(
             IEndpointRouteBuilder endpoints,
-            string pattern,
+            [StringSyntax("Route")] string pattern,
             Delegate handler,
             IEnumerable<string>? httpMethods,
             Func<MethodInfo, RequestDelegateFactoryOptions?, RequestDelegateMetadataResult> populateMetadata,
@@ -62,7 +63,7 @@ public static RouteHandlerBuilder Map(
     /// <returns>The <see cref="RouteHandlerBuilder"/>>.</returns>
     public static RouteHandlerBuilder Map(
             IEndpointRouteBuilder endpoints,
-            string pattern,
+            [StringSyntax("Route")] string pattern,
             Delegate handler,
             IEnumerable<string>? httpMethods,
             Func<MethodInfo, RequestDelegateFactoryOptions?, RequestDelegateMetadataResult> populateMetadata,
diff --git a/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs b/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs
index 8e49dd054e88..fbb25d95130f 100644
--- a/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs
+++ b/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs
@@ -112,10 +112,9 @@ public static TBuilder WithName<TBuilder>(this TBuilder builder, string endpoint
     }
 
     /// <summary>
-    /// Sets the <see cref="EndpointGroupNameAttribute"/> for all endpoints produced
-    /// on the target <see cref="IEndpointConventionBuilder"/> given the <paramref name="endpointGroupName" />.
-    /// The <see cref="IEndpointGroupNameMetadata" /> on the endpoint is used to set the endpoint's
-    /// GroupName in the OpenAPI specification.
+    /// Sets the <see cref="IEndpointGroupNameMetadata"/> with the given <paramref name="endpointGroupName"/>
+    /// in the endpoint <see cref="Http.Endpoint.Metadata"/> for all endpoints produced on the target
+    /// <see cref="IEndpointConventionBuilder"/>.
     /// </summary>
     /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
     /// <param name="endpointGroupName">The endpoint group name.</param>
diff --git a/src/Http/Routing/src/Builder/ValidationRouteHandlerBuilderExtensions.cs b/src/Http/Routing/src/Builder/ValidationRouteHandlerBuilderExtensions.cs
new file mode 100644
index 000000000000..6ab1792eec99
--- /dev/null
+++ b/src/Http/Routing/src/Builder/ValidationRouteHandlerBuilderExtensions.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http.Metadata;
+
+namespace Microsoft.AspNetCore.Builder;
+
+/// <summary>
+/// Extension methods for <see cref="IEndpointConventionBuilder"/> to interact with
+/// parameter validation features.
+/// </summary>
+public static class ValidationEndpointConventionBuilderExtensions
+{
+    /// <summary>
+    /// Disables validation for the specified endpoint.
+    /// </summary>
+    /// <typeparam name="TBuilder">The type of the builder.</typeparam>
+    /// <param name="builder">The endpoint convention builder.</param>
+    /// <returns>
+    /// The <see cref="IEndpointConventionBuilder"/> for chaining.
+    /// </returns>
+    public static TBuilder DisableValidation<TBuilder>(this TBuilder builder)
+        where TBuilder : IEndpointConventionBuilder
+    {
+        builder.WithMetadata(new DisableValidationMetadata());
+        return builder;
+    }
+
+    private sealed class DisableValidationMetadata : IDisableValidationMetadata
+    {
+    }
+}
diff --git a/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs
index d30097761650..422288ef0f01 100644
--- a/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs
+++ b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs
@@ -20,10 +20,10 @@ internal partial class AlphaRouteConstraint : RegexRouteConstraint
     /// <summary>
     /// Initializes a new instance of the <see cref="AlphaRouteConstraint" /> class.
     /// </summary>
-    public AlphaRouteConstraint() : base(GetAlphaRouteRegex())
+    public AlphaRouteConstraint() : base(AlphaRouteRegex)
     {
     }
 
     [GeneratedRegex(@"^[A-Za-z]*$")]
-    private static partial Regex GetAlphaRouteRegex();
+    private static partial Regex AlphaRouteRegex { get; }
 }
diff --git a/src/Http/Routing/src/HostAttribute.cs b/src/Http/Routing/src/HostAttribute.cs
index 7a85c03efa40..57620d52e928 100644
--- a/src/Http/Routing/src/HostAttribute.cs
+++ b/src/Http/Routing/src/HostAttribute.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.AspNetCore.Routing;
 
 /// <summary>
-/// Attribute for providing host metdata that is used during routing.
+/// Attribute for providing host metadata that is used during routing.
 /// </summary>
 [DebuggerDisplay("{ToString(),nq}")]
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
diff --git a/src/Http/Routing/src/Matching/DictionaryJumpTable.cs b/src/Http/Routing/src/Matching/DictionaryJumpTable.cs
index 18c7754bf83c..4e73cf840fde 100644
--- a/src/Http/Routing/src/Matching/DictionaryJumpTable.cs
+++ b/src/Http/Routing/src/Matching/DictionaryJumpTable.cs
@@ -12,6 +12,7 @@ internal sealed class DictionaryJumpTable : JumpTable
     private readonly int _defaultDestination;
     private readonly int _exitDestination;
     private readonly FrozenDictionary<string, int> _dictionary;
+    private readonly FrozenDictionary<string, int>.AlternateLookup<ReadOnlySpan<char>> _lookup;
 
     public DictionaryJumpTable(
         int defaultDestination,
@@ -22,6 +23,7 @@ public DictionaryJumpTable(
         _exitDestination = exitDestination;
 
         _dictionary = entries.ToFrozenDictionary(e => e.text, e => e.destination, StringComparer.OrdinalIgnoreCase);
+        _lookup = _dictionary.GetAlternateLookup<ReadOnlySpan<char>>();
     }
 
     public override int GetDestination(string path, PathSegment segment)
@@ -31,8 +33,8 @@ public override int GetDestination(string path, PathSegment segment)
             return _exitDestination;
         }
 
-        var text = path.Substring(segment.Start, segment.Length);
-        if (_dictionary.TryGetValue(text, out var destination))
+        var text = path.AsSpan(segment.Start, segment.Length);
+        if (_lookup.TryGetValue(text, out var destination))
         {
             return destination;
         }
diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
index 16a710df5ce4..fc7303fe15dd 100644
--- a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
+++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
@@ -38,6 +38,7 @@
     <Compile Include="$(SharedSourceRoot)AntiforgeryMetadata.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)HttpExtensions.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ContentTypeConstants.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Diagnostics\RouteDiagnosticsHelpers.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
@@ -51,6 +52,7 @@
     <Reference Include="Microsoft.Extensions.Features" />
     <Reference Include="Microsoft.Extensions.ObjectPool" />
     <Reference Include="Microsoft.Extensions.Options" />
+    <Reference Include="Microsoft.Extensions.Validation" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Http/Routing/src/PublicAPI.Shipped.txt b/src/Http/Routing/src/PublicAPI.Shipped.txt
index ec77b6b45e60..2589d8973199 100644
--- a/src/Http/Routing/src/PublicAPI.Shipped.txt
+++ b/src/Http/Routing/src/PublicAPI.Shipped.txt
@@ -166,6 +166,10 @@ Microsoft.AspNetCore.Routing.Constraints.RequiredRouteConstraint.RequiredRouteCo
 Microsoft.AspNetCore.Routing.Constraints.StringRouteConstraint
 Microsoft.AspNetCore.Routing.Constraints.StringRouteConstraint.Match(Microsoft.AspNetCore.Http.HttpContext? httpContext, Microsoft.AspNetCore.Routing.IRouter? route, string! routeKey, Microsoft.AspNetCore.Routing.RouteValueDictionary! values, Microsoft.AspNetCore.Routing.RouteDirection routeDirection) -> bool
 Microsoft.AspNetCore.Routing.Constraints.StringRouteConstraint.StringRouteConstraint(string! value) -> void
+Microsoft.AspNetCore.Routing.ContentEncodingMetadata
+Microsoft.AspNetCore.Routing.ContentEncodingMetadata.ContentEncodingMetadata(string! value, double quality) -> void
+Microsoft.AspNetCore.Routing.ContentEncodingMetadata.Quality.get -> double
+Microsoft.AspNetCore.Routing.ContentEncodingMetadata.Value.get -> string!
 Microsoft.AspNetCore.Routing.DataTokensMetadata
 Microsoft.AspNetCore.Routing.DataTokensMetadata.DataTokens.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object?>!
 Microsoft.AspNetCore.Routing.DataTokensMetadata.DataTokensMetadata(System.Collections.Generic.IReadOnlyDictionary<string!, object?>! dataTokens) -> void
@@ -616,7 +620,9 @@ static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ExcludeFro
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.Produces(this Microsoft.AspNetCore.Builder.RouteHandlerBuilder! builder, int statusCode, System.Type? responseType = null, string? contentType = null, params string![]! additionalContentTypes) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.Produces<TResponse>(this Microsoft.AspNetCore.Builder.RouteHandlerBuilder! builder, int statusCode = 200, string? contentType = null, params string![]! additionalContentTypes) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesProblem(this Microsoft.AspNetCore.Builder.RouteHandlerBuilder! builder, int statusCode, string? contentType = null) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
+static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesProblem<TBuilder>(this TBuilder builder, int statusCode, string? contentType = null) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesValidationProblem(this Microsoft.AspNetCore.Builder.RouteHandlerBuilder! builder, int statusCode = 400, string? contentType = null) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
+static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesValidationProblem<TBuilder>(this TBuilder builder, int statusCode = 400, string? contentType = null) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.WithDescription<TBuilder>(this TBuilder builder, string! description) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.WithSummary<TBuilder>(this TBuilder builder, string! summary) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.WithTags(this Microsoft.AspNetCore.Builder.RouteHandlerBuilder! builder, params string![]! tags) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
@@ -693,6 +699,7 @@ static Microsoft.AspNetCore.Routing.RouteBase.GetConstraints(Microsoft.AspNetCor
 static Microsoft.AspNetCore.Routing.RouteBase.GetDefaults(Microsoft.AspNetCore.Routing.Template.RouteTemplate! parsedTemplate, Microsoft.AspNetCore.Routing.RouteValueDictionary? defaults) -> Microsoft.AspNetCore.Routing.RouteValueDictionary!
 static Microsoft.AspNetCore.Routing.RouteConstraintMatcher.Match(System.Collections.Generic.IDictionary<string!, Microsoft.AspNetCore.Routing.IRouteConstraint!>! constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary! routeValues, Microsoft.AspNetCore.Http.HttpContext! httpContext, Microsoft.AspNetCore.Routing.IRouter! route, Microsoft.AspNetCore.Routing.RouteDirection routeDirection, Microsoft.Extensions.Logging.ILogger! logger) -> bool
 static Microsoft.AspNetCore.Routing.RouteHandlerServices.Map(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern, System.Delegate! handler, System.Collections.Generic.IEnumerable<string!>? httpMethods, System.Func<System.Reflection.MethodInfo!, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult!>! populateMetadata, System.Func<System.Delegate!, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions!, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult!>! createRequestDelegate) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
+static Microsoft.AspNetCore.Routing.RouteHandlerServices.Map(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern, System.Delegate! handler, System.Collections.Generic.IEnumerable<string!>? httpMethods, System.Func<System.Reflection.MethodInfo!, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult!>! populateMetadata, System.Func<System.Delegate!, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions!, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult!>! createRequestDelegate, System.Reflection.MethodInfo! methodInfo) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
 static Microsoft.AspNetCore.Routing.RouteShortCircuitEndpointRouteBuilderExtensions.MapShortCircuit(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! builder, int statusCode, params string![]! routePrefixes) -> Microsoft.AspNetCore.Builder.IEndpointConventionBuilder!
 static Microsoft.AspNetCore.Routing.Template.RoutePrecedence.ComputeInbound(Microsoft.AspNetCore.Routing.Template.RouteTemplate! template) -> decimal
 static Microsoft.AspNetCore.Routing.Template.RoutePrecedence.ComputeOutbound(Microsoft.AspNetCore.Routing.Template.RouteTemplate! template) -> decimal
diff --git a/src/Http/Routing/src/PublicAPI.Unshipped.txt b/src/Http/Routing/src/PublicAPI.Unshipped.txt
index f36374cf8952..0612dc9ff2b0 100644
--- a/src/Http/Routing/src/PublicAPI.Unshipped.txt
+++ b/src/Http/Routing/src/PublicAPI.Unshipped.txt
@@ -1,8 +1,3 @@
 #nullable enable
-Microsoft.AspNetCore.Routing.ContentEncodingMetadata
-Microsoft.AspNetCore.Routing.ContentEncodingMetadata.ContentEncodingMetadata(string! value, double quality) -> void
-Microsoft.AspNetCore.Routing.ContentEncodingMetadata.Quality.get -> double
-Microsoft.AspNetCore.Routing.ContentEncodingMetadata.Value.get -> string!
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesProblem<TBuilder>(this TBuilder builder, int statusCode, string? contentType = null) -> TBuilder
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesValidationProblem<TBuilder>(this TBuilder builder, int statusCode = 400, string? contentType = null) -> TBuilder
-static Microsoft.AspNetCore.Routing.RouteHandlerServices.Map(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern, System.Delegate! handler, System.Collections.Generic.IEnumerable<string!>? httpMethods, System.Func<System.Reflection.MethodInfo!, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions?, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult!>! populateMetadata, System.Func<System.Delegate!, Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions!, Microsoft.AspNetCore.Http.RequestDelegateMetadataResult?, Microsoft.AspNetCore.Http.RequestDelegateResult!>! createRequestDelegate, System.Reflection.MethodInfo! methodInfo) -> Microsoft.AspNetCore.Builder.RouteHandlerBuilder!
+Microsoft.AspNetCore.Builder.ValidationEndpointConventionBuilderExtensions
+static Microsoft.AspNetCore.Builder.ValidationEndpointConventionBuilderExtensions.DisableValidation<TBuilder>(this TBuilder builder) -> TBuilder
diff --git a/src/Http/Routing/src/RouteEndpointDataSource.cs b/src/Http/Routing/src/RouteEndpointDataSource.cs
index 2ed6ff242276..9586ceeff18f 100644
--- a/src/Http/Routing/src/RouteEndpointDataSource.cs
+++ b/src/Http/Routing/src/RouteEndpointDataSource.cs
@@ -2,13 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Http.Validation;
 using Microsoft.AspNetCore.Routing.Patterns;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.Validation;
 
 namespace Microsoft.AspNetCore.Routing;
 
@@ -100,7 +106,7 @@ public override IReadOnlyList<RouteEndpoint> Endpoints
     public override IReadOnlyList<RouteEndpoint> GetGroupedEndpoints(RouteGroupContext context)
     {
         var endpoints = new RouteEndpoint[_routeEntries.Count];
-        for (int i = 0; i < _routeEntries.Count; i++)
+        for (var i = 0; i < _routeEntries.Count; i++)
         {
             endpoints[i] = (RouteEndpoint)CreateRouteEndpointBuilder(_routeEntries[i], context.Prefix, context.Conventions, context.FinallyConventions).Build();
         }
@@ -155,7 +161,7 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
 
         // If we're not a route handler, we started with a fully realized (although unfiltered) RequestDelegate, so we can just redirect to that
         // while running any conventions. We'll put the original back if it remains unfiltered right before building the endpoint.
-        RequestDelegate? factoryCreatedRequestDelegate = isRouteHandler ? null : (RequestDelegate)entry.RouteHandler;
+        var factoryCreatedRequestDelegate = isRouteHandler ? null : (RequestDelegate)entry.RouteHandler;
 
         // Let existing conventions capture and call into builder.RequestDelegate as long as they do so after it has been created.
         RequestDelegate redirectRequestDelegate = context =>
@@ -232,6 +238,17 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
             entrySpecificConvention(builder);
         }
 
+        // Initialize this route endpoint builder with validation convention if validation options
+        // are registered and validation is not disabled on the endpoint.
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        var hasValidationResolvers = builder.ApplicationServices.GetService<IOptions<ValidationOptions>>() is { Value: { } options } && options.Resolvers.Count > 0;
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        var hasDisableValidationMetadata = builder.Metadata.OfType<IDisableValidationMetadata>().FirstOrDefault() is not null;
+        if (hasValidationResolvers && !hasDisableValidationMetadata)
+        {
+            builder.FilterFactories.Insert(0, ValidationEndpointFilterFactory.Create);
+        }
+
         // If no convention has modified builder.RequestDelegate, we can use the RequestDelegate returned by the RequestDelegateFactory directly.
         var conventionOverriddenRequestDelegate = ReferenceEquals(builder.RequestDelegate, redirectRequestDelegate) ? null : builder.RequestDelegate;
 
diff --git a/src/Http/Routing/src/RoutingMetrics.cs b/src/Http/Routing/src/RoutingMetrics.cs
index 7b1388b235bf..9024f41c850e 100644
--- a/src/Http/Routing/src/RoutingMetrics.cs
+++ b/src/Http/Routing/src/RoutingMetrics.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.Routing;
 
@@ -31,7 +32,7 @@ public RoutingMetrics(IMeterFactory meterFactory)
     public void MatchSuccess(string route, bool isFallback)
     {
         _matchAttemptsCounter.Add(1,
-            new KeyValuePair<string, object?>("http.route", route),
+            new KeyValuePair<string, object?>("http.route", RouteDiagnosticsHelpers.ResolveHttpRoute(route)),
             new KeyValuePair<string, object?>("aspnetcore.routing.match_status", "success"),
             new KeyValuePair<string, object?>("aspnetcore.routing.is_fallback", isFallback ? BoxedTrue : BoxedFalse));
     }
diff --git a/src/Http/Routing/src/ValidationEndpointFilterFactory.cs b/src/Http/Routing/src/ValidationEndpointFilterFactory.cs
new file mode 100644
index 000000000000..385b2bd36009
--- /dev/null
+++ b/src/Http/Routing/src/ValidationEndpointFilterFactory.cs
@@ -0,0 +1,142 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Net.Mime;
+using System.Reflection;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.AspNetCore.Http.Validation;
+
+internal static class ValidationEndpointFilterFactory
+{
+    // A small struct to hold the validatable parameter details to avoid allocating arrays for parameters that don't need validation
+    private readonly record struct ValidatableParameterEntry(int Index, IValidatableInfo Parameter, string DisplayName);
+
+    public static EndpointFilterDelegate Create(EndpointFilterFactoryContext context, EndpointFilterDelegate next)
+    {
+        var parameters = context.MethodInfo.GetParameters();
+        var options = context.ApplicationServices.GetService<IOptions<ValidationOptions>>()?.Value;
+        if (options is null || options.Resolvers.Count == 0)
+        {
+            return next;
+        }
+
+        var serviceProviderIsService = context.ApplicationServices.GetService<IServiceProviderIsService>();
+
+        // Use a list to only store validatable parameters instead of arrays for all parameters
+        List<ValidatableParameterEntry>? validatableParameters = null;
+
+        for (var i = 0; i < parameters.Length; i++)
+        {
+            // Ignore parameters that are resolved from the DI container.
+            if (IsServiceParameter(parameters[i], serviceProviderIsService))
+            {
+                continue;
+            }
+
+            if (options.TryGetValidatableParameterInfo(parameters[i], out var validatableParameter))
+            {
+                validatableParameters ??= [];
+                validatableParameters.Add(new ValidatableParameterEntry(
+                    i,
+                    validatableParameter,
+                    GetDisplayName(parameters[i])));
+            }
+        }
+
+        if (validatableParameters is null || validatableParameters.Count == 0)
+        {
+            return next;
+        }
+
+        return async (context) =>
+        {
+            ValidateContext? validateContext = null;
+
+            foreach (var entry in validatableParameters)
+            {
+                if (entry.Index >= context.Arguments.Count)
+                {
+                    break;
+                }
+
+                var argument = context.Arguments[entry.Index];
+                if (argument is null)
+                {
+                    continue;
+                }
+
+                var validationContext = new ValidationContext(argument, entry.DisplayName, context.HttpContext.RequestServices, items: null);
+
+                if (validateContext == null)
+                {
+                    validateContext = new ValidateContext
+                    {
+                        ValidationOptions = options,
+                        ValidationContext = validationContext
+                    };
+                }
+                else
+                {
+                    validateContext.ValidationContext = validationContext;
+                }
+
+                await entry.Parameter.ValidateAsync(argument, validateContext, context.HttpContext.RequestAborted);
+            }
+
+            if (validateContext is { ValidationErrors.Count: > 0 })
+            {
+                context.HttpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+
+                var problemDetails = new HttpValidationProblemDetails(validateContext.ValidationErrors);
+
+                var problemDetailsService = context.HttpContext.RequestServices.GetService<IProblemDetailsService>();
+                if (problemDetailsService is not null)
+                {
+                    if (await problemDetailsService.TryWriteAsync(new()
+                    {
+                        HttpContext = context.HttpContext,
+                        ProblemDetails = problemDetails
+                    }))
+                    {
+                        // We need to prevent further execution, because the actual
+                        // ProblemDetails response has already been written by ProblemDetailsService.
+                        return EmptyHttpResult.Instance;
+                    }
+                }
+
+                // Fallback to the default implementation.
+                context.HttpContext.Response.ContentType = MediaTypeNames.Application.ProblemJson;
+                return problemDetails;
+            }
+
+            return await next(context);
+        };
+    }
+
+    private static bool IsServiceParameter(ParameterInfo parameterInfo, IServiceProviderIsService? isService)
+        => HasFromServicesAttribute(parameterInfo) ||
+           (isService?.IsService(parameterInfo.ParameterType) == true);
+
+    private static bool HasFromServicesAttribute(ParameterInfo parameterInfo)
+        => parameterInfo.CustomAttributes.OfType<IFromServiceMetadata>().Any();
+
+    private static string GetDisplayName(ParameterInfo parameterInfo)
+    {
+        var displayAttribute = parameterInfo.GetCustomAttribute<DisplayAttribute>();
+        if (displayAttribute != null)
+        {
+            return displayAttribute.Name ?? parameterInfo.Name!;
+        }
+
+        return parameterInfo.Name!;
+    }
+}
diff --git a/src/Http/Routing/test/FunctionalTests/MinimalFormTests.cs b/src/Http/Routing/test/FunctionalTests/MinimalFormTests.cs
index 8affd06a34c5..b27a60b31d1e 100644
--- a/src/Http/Routing/test/FunctionalTests/MinimalFormTests.cs
+++ b/src/Http/Routing/test/FunctionalTests/MinimalFormTests.cs
@@ -19,7 +19,6 @@ namespace Microsoft.AspNetCore.Routing.FunctionalTests;
 
 public class MinimalFormTests
 {
-    private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
 
     [Fact]
     public async Task MapPost_WithForm_ValidToken_Works()
@@ -65,7 +64,7 @@ public async Task MapPost_WithForm_ValidToken_Works()
         var response = await client.SendAsync(request);
         response.EnsureSuccessStatusCode();
         var body = await response.Content.ReadAsStringAsync();
-        var result = JsonSerializer.Deserialize<Todo>(body, SerializerOptions);
+        var result = JsonSerializer.Deserialize<Todo>(body, JsonSerializerOptions.Web);
         Assert.Equal("Test task", result.Name);
         Assert.False(result.IsCompleted);
         Assert.Equal(DateTime.Today.AddDays(1), result.DueDate);
@@ -125,7 +124,7 @@ public async Task MapRequestDelegate_WithForm_RequiresValidation_ValidToken_Work
         var response = await client.SendAsync(request);
         response.EnsureSuccessStatusCode();
         var body = await response.Content.ReadAsStringAsync();
-        var result = JsonSerializer.Deserialize<Todo>(body, SerializerOptions);
+        var result = JsonSerializer.Deserialize<Todo>(body, JsonSerializerOptions.Web);
         Assert.Equal("Test task", result.Name);
         Assert.False(result.IsCompleted);
         Assert.Equal(DateTime.Today.AddDays(1), result.DueDate);
@@ -286,7 +285,7 @@ public async Task MapPost_WithForm_WithoutAntiforgery_WithoutMiddleware_Works()
         var response = await client.SendAsync(request);
         response.EnsureSuccessStatusCode();
         var body = await response.Content.ReadAsStringAsync();
-        var result = JsonSerializer.Deserialize<Todo>(body, SerializerOptions);
+        var result = JsonSerializer.Deserialize<Todo>(body, JsonSerializerOptions.Web);
         Assert.Equal("Test task", result.Name);
         Assert.False(result.IsCompleted);
         Assert.Equal(DateTime.Today.AddDays(1), result.DueDate);
@@ -333,7 +332,7 @@ public async Task MapPost_WithForm_WithoutAntiforgery_AndRouteGroup_WithoutMiddl
         var response = await client.SendAsync(request);
         response.EnsureSuccessStatusCode();
         var body = await response.Content.ReadAsStringAsync();
-        var result = JsonSerializer.Deserialize<Todo>(body, SerializerOptions);
+        var result = JsonSerializer.Deserialize<Todo>(body, JsonSerializerOptions.Web);
         Assert.Equal("Test task", result.Name);
         Assert.False(result.IsCompleted);
         Assert.Equal(DateTime.Today.AddDays(1), result.DueDate);
@@ -493,7 +492,7 @@ public async Task MapPost_WithForm_ValidToken_RequestSizeLimit_Works(bool hasLim
             var response = await client.SendAsync(request);
             response.EnsureSuccessStatusCode();
             var body = await response.Content.ReadAsStringAsync();
-            var result = JsonSerializer.Deserialize<Todo>(body, SerializerOptions);
+            var result = JsonSerializer.Deserialize<Todo>(body, JsonSerializerOptions.Web);
             Assert.Equal("Test task", result.Name);
             Assert.False(result.IsCompleted);
             Assert.Equal(DateTime.Today.AddDays(1), result.DueDate);
diff --git a/src/Http/Routing/test/UnitTests/Builder/RequestDelegateEndpointRouteBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/RequestDelegateEndpointRouteBuilderExtensionsTest.cs
index a5156c7fff05..2d0f692f264e 100644
--- a/src/Http/Routing/test/UnitTests/Builder/RequestDelegateEndpointRouteBuilderExtensionsTest.cs
+++ b/src/Http/Routing/test/UnitTests/Builder/RequestDelegateEndpointRouteBuilderExtensionsTest.cs
@@ -402,7 +402,7 @@ public void MapEndpoint_PrecedenceOfMetadata_BuilderMetadataReturned()
         var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(EmptyServiceProvider.Instance));
 
         // Act
-        var endpointBuilder = builder.MapMethods("/", new[] { "METHOD" }, HandleHttpMetdata);
+        var endpointBuilder = builder.MapMethods("/", new[] { "METHOD" }, HandleHttpMetadata);
         endpointBuilder.WithMetadata(new HttpMethodMetadata(new[] { "BUILDER" }));
 
         // Assert
@@ -526,7 +526,7 @@ public void MapEndpoint_Filter()
     private static Task Handle(HttpContext context) => Task.CompletedTask;
 
     [HttpMethod("ATTRIBUTE")]
-    private static Task HandleHttpMetdata(HttpContext context) => Task.CompletedTask;
+    private static Task HandleHttpMetadata(HttpContext context) => Task.CompletedTask;
 
     private class HttpMethodAttribute : Attribute, IHttpMethodMetadata
     {
diff --git a/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs
index ea8cb1cc0404..5f177b2afecc 100644
--- a/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs
+++ b/src/Http/Routing/test/UnitTests/Builder/RouteHandlerEndpointRouteBuilderExtensionsTest.cs
@@ -980,7 +980,7 @@ public async Task RequestDelegateFactory_CanInvokeEndpointFilter_ThatAccessesSer
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal("loggerErrorIsEnabled: True, parentName: RouteHandlerEndpointRouteBuilderExtensionsTest", body);
     }
 
diff --git a/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyTest.cs b/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyTest.cs
index b5cf4b1b7e2e..3c4c3e92e428 100644
--- a/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyTest.cs
+++ b/src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyTest.cs
@@ -169,8 +169,8 @@ public async Task IEndpointSelectorPolicy_ApplyAsync_ProcessesInvalidCandidate(i
 
         await policy.ApplyAsync(httpContext, candidates);
 
-        Assert.Equal(httpContext.GetEndpoint().Metadata, EndpointMetadataCollection.Empty);
-        Assert.True(string.Equals(httpContext.GetEndpoint().DisplayName, Http405EndpointDisplayName, StringComparison.OrdinalIgnoreCase));
+        Assert.Equal(EndpointMetadataCollection.Empty, httpContext.GetEndpoint().Metadata);
+        Assert.Equal(Http405EndpointDisplayName, httpContext.GetEndpoint().DisplayName, ignoreCase: true);
     }
 
     [Fact]
diff --git a/src/Http/Routing/test/UnitTests/RouteCollectionTest.cs b/src/Http/Routing/test/UnitTests/RouteCollectionTest.cs
index f50e4c3653d8..f83c78ad8cb5 100644
--- a/src/Http/Routing/test/UnitTests/RouteCollectionTest.cs
+++ b/src/Http/Routing/test/UnitTests/RouteCollectionTest.cs
@@ -179,7 +179,7 @@ public async Task RouteAsync_FirstMatches()
         route2.Verify(e => e.RouteAsync(It.IsAny<RouteContext>()), Times.Exactly(0));
         Assert.NotNull(context.Handler);
 
-        Assert.Equal(1, context.RouteData.Routers.Count);
+        Assert.Single(context.RouteData.Routers);
         Assert.Same(route1.Object, context.RouteData.Routers[0]);
     }
 
@@ -205,7 +205,7 @@ public async Task RouteAsync_SecondMatches()
         route2.Verify(e => e.RouteAsync(It.IsAny<RouteContext>()), Times.Exactly(1));
         Assert.NotNull(context.Handler);
 
-        Assert.Equal(1, context.RouteData.Routers.Count);
+        Assert.Single(context.RouteData.Routers);
         Assert.Same(route2.Object, context.RouteData.Routers[0]);
     }
 
diff --git a/src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs b/src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs
index b74b715c3c32..d4b788a987d7 100644
--- a/src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs
+++ b/src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs
@@ -23,7 +23,7 @@ public void AddConstraint_String_CreatesARegex()
         var result = builder.Build();
 
         // Assert
-        Assert.Equal(1, result.Count);
+        Assert.Single(result);
         Assert.Equal("controller", result.First().Key);
 
         Assert.IsType<RegexRouteConstraint>(Assert.Single(result).Value);
@@ -42,7 +42,7 @@ public void AddConstraint_IRouteConstraint()
         var result = builder.Build();
 
         // Assert
-        Assert.Equal(1, result.Count);
+        Assert.Single(result);
 
         var kvp = Assert.Single(result);
         Assert.Equal("controller", kvp.Key);
@@ -61,7 +61,7 @@ public void AddResolvedConstraint_IRouteConstraint()
         var result = builder.Build();
 
         // Assert
-        Assert.Equal(1, result.Count);
+        Assert.Single(result);
 
         var kvp = Assert.Single(result);
         Assert.Equal("controller", kvp.Key);
@@ -107,7 +107,7 @@ public void AddResolvedConstraint_ForOptionalParameter()
         builder.AddResolvedConstraint("id", "int");
 
         var result = builder.Build();
-        Assert.Equal(1, result.Count);
+        Assert.Single(result);
         Assert.Equal("id", result.First().Key);
         Assert.IsType<OptionalRouteConstraint>(Assert.Single(result).Value);
     }
@@ -120,7 +120,7 @@ public void AddResolvedConstraint_SetOptionalParameter_AfterAddingTheParameter()
         builder.SetOptional("id");
 
         var result = builder.Build();
-        Assert.Equal(1, result.Count);
+        Assert.Single(result);
         Assert.Equal("id", result.First().Key);
         Assert.IsType<OptionalRouteConstraint>(Assert.Single(result).Value);
     }
@@ -135,7 +135,7 @@ public void AddResolvedConstraint_And_AddConstraint_ForOptionalParameter()
         builder.AddConstraint("name", minLenConstraint);
 
         var result = builder.Build();
-        Assert.Equal(1, result.Count);
+        Assert.Single(result);
         Assert.Equal("name", result.First().Key);
         Assert.IsType<OptionalRouteConstraint>(Assert.Single(result).Value);
         var optionalConstraint = (OptionalRouteConstraint)result.First().Value;
diff --git a/src/Http/Routing/test/UnitTests/RouteEndpointBuilderTest.cs b/src/Http/Routing/test/UnitTests/RouteEndpointBuilderTest.cs
index 58010bdfa32c..e9a0bef4910b 100644
--- a/src/Http/Routing/test/UnitTests/RouteEndpointBuilderTest.cs
+++ b/src/Http/Routing/test/UnitTests/RouteEndpointBuilderTest.cs
@@ -137,7 +137,7 @@ public void Build_DoesNotChangeHttpMethodMetadata_WhenCorsNotPresent()
     }
 
     [Fact]
-    public async void Build_DoesNot_RunFilters()
+    public async Task Build_DoesNot_RunFilters()
     {
         var endpointFilterCallCount = 0;
         var invocationFilterCallCount = 0;
diff --git a/src/Http/Routing/test/UnitTests/RouteTest.cs b/src/Http/Routing/test/UnitTests/RouteTest.cs
index e1278dcd38fc..8be45c178e43 100644
--- a/src/Http/Routing/test/UnitTests/RouteTest.cs
+++ b/src/Http/Routing/test/UnitTests/RouteTest.cs
@@ -493,7 +493,7 @@ public async Task Match_SetsRouters()
 
         // Assert
         Assert.NotNull(context.Handler);
-        Assert.Equal(1, context.RouteData.Routers.Count);
+        Assert.Single(context.RouteData.Routers);
         Assert.Same(target, context.RouteData.Routers[0]);
     }
 
@@ -1658,7 +1658,7 @@ public void RegisteringRouteWithOneInlineConstraintAndOneUsingConstraintArgument
 
         // Assert
         var constraints = ((Route)routeBuilder.Routes[0]).Constraints;
-        Assert.Equal(1, constraints.Count);
+        Assert.Single(constraints);
         var constraint = (CompositeRouteConstraint)constraints["id"];
         Assert.IsType<CompositeRouteConstraint>(constraint);
         Assert.IsType<RegexRouteConstraint>(constraint.Constraints.ElementAt(0));
@@ -1679,7 +1679,7 @@ public void RegisteringRoute_WithOneInlineConstraint_AddsItToConstraintCollectio
 
         // Assert
         var constraints = ((Route)routeBuilder.Routes[0]).Constraints;
-        Assert.Equal(1, constraints.Count);
+        Assert.Single(constraints);
         Assert.IsType<IntRouteConstraint>(constraints["id"]);
     }
 
diff --git a/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs b/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs
index fb3ac0b30fc2..778f114404d4 100644
--- a/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs
+++ b/src/Http/Routing/test/UnitTests/RoutingMetricsTests.cs
@@ -48,6 +48,34 @@ public async Task Match_Success()
             m => AssertSuccess(m, "/{hi}", fallback: false));
     }
 
+    [Fact]
+    public async Task Match_EmptyRoute_ResolveForwardSlash()
+    {
+        // Arrange
+        var routeEndpointBuilder = new RouteEndpointBuilder(c => Task.CompletedTask, RoutePatternFactory.Parse(string.Empty), order: 0);
+        var meterFactory = new TestMeterFactory();
+        var middleware = CreateMiddleware(
+            matcherFactory: new TestMatcherFactory(true, c =>
+            {
+                c.SetEndpoint(routeEndpointBuilder.Build());
+            }),
+            meterFactory: meterFactory);
+        var httpContext = CreateHttpContext();
+        var meter = meterFactory.Meters.Single();
+
+        using var routingMatchAttemptsCollector = new MetricCollector<long>(meterFactory, RoutingMetrics.MeterName, "aspnetcore.routing.match_attempts");
+
+        // Act
+        await middleware.Invoke(httpContext);
+
+        // Assert
+        Assert.Equal(RoutingMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        Assert.Collection(routingMatchAttemptsCollector.GetMeasurementSnapshot(),
+            m => AssertSuccess(m, "/", fallback: false));
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
diff --git a/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs
index 74a05d8c0da3..db43d52dd054 100644
--- a/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs
+++ b/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs
@@ -11,8 +11,8 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests;
 
 public class TemplateBinderTests
 {
-    public static TheoryData EmptyAndNullDefaultValues =>
-        new TheoryData<string, RouteValueDictionary, RouteValueDictionary, string>
+    public static TheoryData<string, RouteValueDictionary, RouteValueDictionary, string> EmptyAndNullDefaultValues =>
+        new()
         {
                 {
                     "Test/{val1}/{val2}",
@@ -174,8 +174,8 @@ public void GetVirtualPathWithMultiSegmentParamsOnRightEndMatches()
             "/language/axx-yy");
     }
 
-    public static TheoryData OptionalParamValues =>
-        new TheoryData<string, RouteValueDictionary, RouteValueDictionary, RouteValueDictionary, string>
+    public static TheoryData<string, RouteValueDictionary, RouteValueDictionary, RouteValueDictionary, string> OptionalParamValues =>
+        new()
         {
                 // defaults
                 // ambient values
diff --git a/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs
index 951ebc1fd4c5..ad97a08408b0 100644
--- a/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs
+++ b/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.AspNetCore.Routing.Template;
@@ -100,7 +101,7 @@ public async Task TreeRouter_RouteAsync_MatchesRouteWithTheRightLength(string ur
 
         // We setup the route entries in reverse order of precedence to ensure that when we
         // try to route the request, the route with a higher precedence gets tried first.
-        foreach (var template in routes.Reverse())
+        foreach (var template in Enumerable.Reverse(routes))
         {
             MapInboundEntry(builder, template);
         }
@@ -147,7 +148,7 @@ public async Task TreeRouter_RouteAsync_MatchesRoutesWithDefaults(string url, ob
 
         // We setup the route entries in reverse order of precedence to ensure that when we
         // try to route the request, the route with a higher precedence gets tried first.
-        foreach (var template in routes.Reverse())
+        foreach (var template in Enumerable.Reverse(routes))
         {
             MapInboundEntry(builder, template);
         }
@@ -199,7 +200,7 @@ public async Task TreeRouter_RouteAsync_MatchesConstrainedRoutesWithDefaults(str
 
         // We setup the route entries in reverse order of precedence to ensure that when we
         // try to route the request, the route with a higher precedence gets tried first.
-        foreach (var template in routes.Reverse())
+        foreach (var template in Enumerable.Reverse(routes))
         {
             MapInboundEntry(builder, template);
         }
@@ -242,7 +243,7 @@ public async Task TreeRouter_RouteAsync_MatchesCatchAllRoutesWithDefaults()
 
         // We setup the route entries in reverse order of precedence to ensure that when we
         // try to route the request, the route with a higher precedence gets tried first.
-        foreach (var template in routes.Reverse())
+        foreach (var template in Enumerable.Reverse(routes))
         {
             MapInboundEntry(builder, template);
         }
@@ -340,7 +341,7 @@ public async Task TreeRouter_RouteAsync_DoesNotMatchShorterUrl()
 
         // We setup the route entries in reverse order of precedence to ensure that when we
         // try to route the request, the route with a higher precedence gets tried first.
-        foreach (var template in routes.Reverse())
+        foreach (var template in Enumerable.Reverse(routes))
         {
             MapInboundEntry(builder, template);
         }
diff --git a/src/Http/Shared/CookieHeaderParserShared.cs b/src/Http/Shared/CookieHeaderParserShared.cs
index e4b1d83e519a..0eb1c64d533a 100644
--- a/src/Http/Shared/CookieHeaderParserShared.cs
+++ b/src/Http/Shared/CookieHeaderParserShared.cs
@@ -89,6 +89,17 @@ public static bool TryParseValue(StringSegment value, ref int index, bool suppor
 
         if (!TryGetCookieLength(value, ref current, out parsedName, out parsedValue))
         {
+            var separatorIndex = value.IndexOf(';', current);
+            if (separatorIndex > 0)
+            {
+                // Skip the invalid values and keep trying.
+                index = separatorIndex;
+            }
+            else
+            {
+                // No more separators, so we're done.
+                index = value.Length;
+            }
             return false;
         }
 
@@ -97,6 +108,17 @@ public static bool TryParseValue(StringSegment value, ref int index, bool suppor
         // If we support multiple values and we've not reached the end of the string, then we must have a separator.
         if ((separatorFound && !supportsMultipleValues) || (!separatorFound && (current < value.Length)))
         {
+            var separatorIndex = value.IndexOf(';', current);
+            if (separatorIndex > 0)
+            {
+                // Skip the invalid values and keep trying.
+                index = separatorIndex;
+            }
+            else
+            {
+                // No more separators, so we're done.
+                index = value.Length;
+            }
             return false;
         }
 
@@ -112,7 +134,7 @@ private static int GetNextNonEmptyOrWhitespaceIndex(StringSegment input, int sta
         separatorFound = false;
         var current = startIndex + HttpRuleParser.GetWhitespaceLength(input, startIndex);
 
-        if ((current == input.Length) || (input[current] != ',' && input[current] != ';'))
+        if (current == input.Length || input[current] != ';')
         {
             return current;
         }
@@ -125,8 +147,8 @@ private static int GetNextNonEmptyOrWhitespaceIndex(StringSegment input, int sta
 
         if (skipEmptyValues)
         {
-            // Most headers only split on ',', but cookies primarily split on ';'
-            while ((current < input.Length) && ((input[current] == ',') || (input[current] == ';')))
+            // Cookies are split on ';'
+            while (current < input.Length && input[current] == ';')
             {
                 current++; // skip delimiter.
                 current = current + HttpRuleParser.GetWhitespaceLength(input, current);
@@ -136,6 +158,18 @@ private static int GetNextNonEmptyOrWhitespaceIndex(StringSegment input, int sta
         return current;
     }
 
+    /*
+     * https://www.rfc-editor.org/rfc/rfc6265#section-4.1.1
+     * cookie-pair       = cookie-name "=" cookie-value
+     * cookie-name       = token
+     * token          = 1*<any CHAR except CTLs or separators>
+       separators     = "(" | ")" | "<" | ">" | "@"
+                      | "," | ";" | ":" | "\" | <">
+                      | "/" | "[" | "]" | "?" | "="
+                      | "{" | "}" | SP | HT
+       CTL            = <any US-ASCII control character
+                        (octets 0 - 31) and DEL (127)>
+     */
     // name=value; name="value"
     internal static bool TryGetCookieLength(StringSegment input, ref int offset, [NotNullWhen(true)] out StringSegment? parsedName, [NotNullWhen(true)] out StringSegment? parsedValue)
     {
diff --git a/src/Http/WebUtilities/src/BufferedReadStream.cs b/src/Http/WebUtilities/src/BufferedReadStream.cs
index 1860e607b9f2..7d9221b915d8 100644
--- a/src/Http/WebUtilities/src/BufferedReadStream.cs
+++ b/src/Http/WebUtilities/src/BufferedReadStream.cs
@@ -108,8 +108,8 @@ public override long Position
                 if (innerOffset <= _bufferCount)
                 {
                     // Yes, just skip some of the buffered data
-                    _bufferOffset += innerOffset;
-                    _bufferCount -= innerOffset;
+                    _bufferOffset += _bufferCount - innerOffset;
+                    _bufferCount = innerOffset;
                 }
                 else
                 {
diff --git a/src/Http/WebUtilities/src/MultipartBoundary.cs b/src/Http/WebUtilities/src/MultipartBoundary.cs
index c14d8fca270f..8cac796402ee 100644
--- a/src/Http/WebUtilities/src/MultipartBoundary.cs
+++ b/src/Http/WebUtilities/src/MultipartBoundary.cs
@@ -10,11 +10,11 @@ internal sealed class MultipartBoundary
     private readonly byte[] _boundaryBytes;
     private bool _expectLeadingCrlf;
 
-    public MultipartBoundary(string boundary, bool expectLeadingCrlf = true)
+    public MultipartBoundary(string boundary)
     {
         ArgumentNullException.ThrowIfNull(boundary);
 
-        _expectLeadingCrlf = expectLeadingCrlf;
+        _expectLeadingCrlf = false;
         _boundaryBytes = Encoding.UTF8.GetBytes("\r\n--" + boundary);
 
         FinalBoundaryLength = BoundaryBytes.Length + 2; // Include the final '--' terminator.
@@ -25,6 +25,12 @@ public void ExpectLeadingCrlf()
         _expectLeadingCrlf = true;
     }
 
+    // Lets us throw a more specific error from MultipartReaderStream when reading any preamble data.
+    public bool BeforeFirstBoundary()
+    {
+        return !_expectLeadingCrlf;
+    }
+
     // Return either "--{boundary}" or "\r\n--{boundary}" depending on if we're looking for the end of a section
     public ReadOnlySpan<byte> BoundaryBytes => _boundaryBytes.AsSpan(_expectLeadingCrlf ? 0 : 2);
 
diff --git a/src/Http/WebUtilities/src/MultipartReader.cs b/src/Http/WebUtilities/src/MultipartReader.cs
index 7271f33a96d0..195d4184f69b 100644
--- a/src/Http/WebUtilities/src/MultipartReader.cs
+++ b/src/Http/WebUtilities/src/MultipartReader.cs
@@ -27,7 +27,7 @@ public class MultipartReader
 
     private readonly BufferedReadStream _stream;
     private readonly MultipartBoundary _boundary;
-    private MultipartReaderStream _currentStream;
+    private MultipartReaderStream? _currentStream;
 
     /// <summary>
     /// Initializes a new instance of <see cref="MultipartReader"/>.
@@ -56,10 +56,7 @@ public MultipartReader(string boundary, Stream stream, int bufferSize)
         }
         _stream = new BufferedReadStream(stream, bufferSize);
         boundary = HeaderUtilities.RemoveQuotes(new StringSegment(boundary)).ToString();
-        _boundary = new MultipartBoundary(boundary, false);
-        // This stream will drain any preamble data and remove the first boundary marker.
-        // TODO: HeadersLengthLimit can't be modified until after the constructor.
-        _currentStream = new MultipartReaderStream(_stream, _boundary) { LengthLimit = HeadersLengthLimit };
+        _boundary = new MultipartBoundary(boundary);
     }
 
     /// <summary>
@@ -86,6 +83,10 @@ public MultipartReader(string boundary, Stream stream, int bufferSize)
     /// <returns></returns>
     public async Task<MultipartSection?> ReadNextSectionAsync(CancellationToken cancellationToken = new CancellationToken())
     {
+        // Only occurs on first call
+        // This stream will drain any preamble data and remove the first boundary marker.
+        _currentStream ??= new MultipartReaderStream(_stream, _boundary) { LengthLimit = HeadersLengthLimit };
+
         // Drain the prior section.
         await _currentStream.DrainAsync(cancellationToken);
         // If we're at the end return null
diff --git a/src/Http/WebUtilities/src/MultipartReaderStream.cs b/src/Http/WebUtilities/src/MultipartReaderStream.cs
index 208d1b38f0e0..42f24d8de530 100644
--- a/src/Http/WebUtilities/src/MultipartReaderStream.cs
+++ b/src/Http/WebUtilities/src/MultipartReaderStream.cs
@@ -145,9 +145,19 @@ private int UpdatePosition(int read)
         if (_observedLength < _position)
         {
             _observedLength = _position;
-            if (LengthLimit.HasValue && _observedLength > LengthLimit.GetValueOrDefault())
+            if (LengthLimit.HasValue &&
+                LengthLimit.GetValueOrDefault() is var lengthLimit &&
+                _observedLength > lengthLimit)
             {
-                throw new InvalidDataException($"Multipart body length limit {LengthLimit.GetValueOrDefault()} exceeded.");
+                // If we hit the limit before the first boundary then we're using the header length limit, not the body length limit.
+                if (_boundary.BeforeFirstBoundary())
+                {
+                    throw new InvalidDataException($"Multipart header length limit {lengthLimit} exceeded. Too much data before the first boundary.");
+                }
+                else
+                {
+                    throw new InvalidDataException($"Multipart body length limit {lengthLimit} exceeded.");
+                }
             }
         }
         return read;
@@ -174,7 +184,7 @@ public override int Read(byte[] buffer, int offset, int count)
             if (index != 0)
             {
                 // Sync, it's already buffered
-                var slice = buffer.AsSpan(0, Math.Min(buffer.Length, index));
+                var slice = buffer.AsSpan(offset, Math.Min(count, index));
 
                 var readAmount = _innerStream.Read(slice);
                 return UpdatePosition(readAmount);
diff --git a/src/Http/WebUtilities/src/PublicAPI.Shipped.txt b/src/Http/WebUtilities/src/PublicAPI.Shipped.txt
index 6c0843f2c40d..bf0509e3760f 100644
--- a/src/Http/WebUtilities/src/PublicAPI.Shipped.txt
+++ b/src/Http/WebUtilities/src/PublicAPI.Shipped.txt
@@ -232,5 +232,6 @@ static Microsoft.AspNetCore.WebUtilities.WebEncoders.Base64UrlEncode(byte[]! inp
 static Microsoft.AspNetCore.WebUtilities.WebEncoders.Base64UrlEncode(byte[]! input, int offset, char[]! output, int outputOffset, int count) -> int
 static Microsoft.AspNetCore.WebUtilities.WebEncoders.Base64UrlEncode(byte[]! input, int offset, int count) -> string!
 static Microsoft.AspNetCore.WebUtilities.WebEncoders.Base64UrlEncode(System.ReadOnlySpan<byte> input) -> string!
+static Microsoft.AspNetCore.WebUtilities.WebEncoders.Base64UrlEncode(System.ReadOnlySpan<byte> input, System.Span<char> output) -> int
 static Microsoft.AspNetCore.WebUtilities.WebEncoders.GetArraySizeRequiredToDecode(int count) -> int
 static Microsoft.AspNetCore.WebUtilities.WebEncoders.GetArraySizeRequiredToEncode(int count) -> int
diff --git a/src/Http/WebUtilities/src/PublicAPI.Unshipped.txt b/src/Http/WebUtilities/src/PublicAPI.Unshipped.txt
index 1edfae904adf..7dc5c58110bf 100644
--- a/src/Http/WebUtilities/src/PublicAPI.Unshipped.txt
+++ b/src/Http/WebUtilities/src/PublicAPI.Unshipped.txt
@@ -1,2 +1 @@
 #nullable enable
-static Microsoft.AspNetCore.WebUtilities.WebEncoders.Base64UrlEncode(System.ReadOnlySpan<byte> input, System.Span<char> output) -> int
diff --git a/src/Http/WebUtilities/src/ReasonPhrases.cs b/src/Http/WebUtilities/src/ReasonPhrases.cs
index 14318b457871..846c9d1daa96 100644
--- a/src/Http/WebUtilities/src/ReasonPhrases.cs
+++ b/src/Http/WebUtilities/src/ReasonPhrases.cs
@@ -10,76 +10,170 @@ namespace Microsoft.AspNetCore.WebUtilities;
 public static class ReasonPhrases
 {
     // Status Codes listed at http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-    private static readonly Dictionary<int, string> Phrases = new()
-    {
-        { 100, "Continue" },
-        { 101, "Switching Protocols" },
-        { 102, "Processing" },
-
-        { 200, "OK" },
-        { 201, "Created" },
-        { 202, "Accepted" },
-        { 203, "Non-Authoritative Information" },
-        { 204, "No Content" },
-        { 205, "Reset Content" },
-        { 206, "Partial Content" },
-        { 207, "Multi-Status" },
-        { 208, "Already Reported" },
-        { 226, "IM Used" },
-
-        { 300, "Multiple Choices" },
-        { 301, "Moved Permanently" },
-        { 302, "Found" },
-        { 303, "See Other" },
-        { 304, "Not Modified" },
-        { 305, "Use Proxy" },
-        { 306, "Switch Proxy" },
-        { 307, "Temporary Redirect" },
-        { 308, "Permanent Redirect" },
-
-        { 400, "Bad Request" },
-        { 401, "Unauthorized" },
-        { 402, "Payment Required" },
-        { 403, "Forbidden" },
-        { 404, "Not Found" },
-        { 405, "Method Not Allowed" },
-        { 406, "Not Acceptable" },
-        { 407, "Proxy Authentication Required" },
-        { 408, "Request Timeout" },
-        { 409, "Conflict" },
-        { 410, "Gone" },
-        { 411, "Length Required" },
-        { 412, "Precondition Failed" },
-        { 413, "Payload Too Large" },
-        { 414, "URI Too Long" },
-        { 415, "Unsupported Media Type" },
-        { 416, "Range Not Satisfiable" },
-        { 417, "Expectation Failed" },
-        { 418, "I'm a teapot" },
-        { 419, "Authentication Timeout" },
-        { 421, "Misdirected Request" },
-        { 422, "Unprocessable Entity" },
-        { 423, "Locked" },
-        { 424, "Failed Dependency" },
-        { 426, "Upgrade Required" },
-        { 428, "Precondition Required" },
-        { 429, "Too Many Requests" },
-        { 431, "Request Header Fields Too Large" },
-        { 451, "Unavailable For Legal Reasons" },
-        { 499, "Client Closed Request" },
-
-        { 500, "Internal Server Error" },
-        { 501, "Not Implemented" },
-        { 502, "Bad Gateway" },
-        { 503, "Service Unavailable" },
-        { 504, "Gateway Timeout" },
-        { 505, "HTTP Version Not Supported" },
-        { 506, "Variant Also Negotiates" },
-        { 507, "Insufficient Storage" },
-        { 508, "Loop Detected" },
-        { 510, "Not Extended" },
-        { 511, "Network Authentication Required" },
-    };
+    private static readonly string[][] HttpReasonPhrases = [
+        [],
+        [
+            /* 100 */ "Continue",
+            /* 101 */ "Switching Protocols",
+            /* 102 */ "Processing"
+        ],
+        [
+            /* 200 */ "OK",
+            /* 201 */ "Created",
+            /* 202 */ "Accepted",
+            /* 203 */ "Non-Authoritative Information",
+            /* 204 */ "No Content",
+            /* 205 */ "Reset Content",
+            /* 206 */ "Partial Content",
+            /* 207 */ "Multi-Status",
+            /* 208 */ "Already Reported",
+            /* 209 */ string.Empty,
+            /* 210 */ string.Empty,
+            /* 211 */ string.Empty,
+            /* 212 */ string.Empty,
+            /* 213 */ string.Empty,
+            /* 214 */ string.Empty,
+            /* 215 */ string.Empty,
+            /* 216 */ string.Empty,
+            /* 217 */ string.Empty,
+            /* 218 */ string.Empty,
+            /* 219 */ string.Empty,
+            /* 220 */ string.Empty,
+            /* 221 */ string.Empty,
+            /* 222 */ string.Empty,
+            /* 223 */ string.Empty,
+            /* 224 */ string.Empty,
+            /* 225 */ string.Empty,
+            /* 226 */ "IM Used"
+        ],
+        [
+            /* 300 */ "Multiple Choices",
+            /* 301 */ "Moved Permanently",
+            /* 302 */ "Found",
+            /* 303 */ "See Other",
+            /* 304 */ "Not Modified",
+            /* 305 */ "Use Proxy",
+            /* 306 */ "Switch Proxy",
+            /* 307 */ "Temporary Redirect",
+            /* 308 */ "Permanent Redirect"
+        ],
+        [
+            /* 400 */ "Bad Request",
+            /* 401 */ "Unauthorized",
+            /* 402 */ "Payment Required",
+            /* 403 */ "Forbidden",
+            /* 404 */ "Not Found",
+            /* 405 */ "Method Not Allowed",
+            /* 406 */ "Not Acceptable",
+            /* 407 */ "Proxy Authentication Required",
+            /* 408 */ "Request Timeout",
+            /* 409 */ "Conflict",
+            /* 410 */ "Gone",
+            /* 411 */ "Length Required",
+            /* 412 */ "Precondition Failed",
+            /* 413 */ "Payload Too Large",
+            /* 414 */ "URI Too Long",
+            /* 415 */ "Unsupported Media Type",
+            /* 416 */ "Range Not Satisfiable",
+            /* 417 */ "Expectation Failed",
+            /* 418 */ "I'm a teapot",
+            /* 419 */ "Authentication Timeout",
+            /* 420 */ string.Empty,
+            /* 421 */ "Misdirected Request",
+            /* 422 */ "Unprocessable Entity",
+            /* 423 */ "Locked",
+            /* 424 */ "Failed Dependency",
+            /* 425 */ string.Empty,
+            /* 426 */ "Upgrade Required",
+            /* 427 */ string.Empty,
+            /* 428 */ "Precondition Required",
+            /* 429 */ "Too Many Requests",
+            /* 430 */ string.Empty,
+            /* 431 */ "Request Header Fields Too Large",
+            /* 432 */ string.Empty,
+            /* 433 */ string.Empty,
+            /* 434 */ string.Empty,
+            /* 435 */ string.Empty,
+            /* 436 */ string.Empty,
+            /* 437 */ string.Empty,
+            /* 438 */ string.Empty,
+            /* 439 */ string.Empty,
+            /* 440 */ string.Empty,
+            /* 441 */ string.Empty,
+            /* 442 */ string.Empty,
+            /* 443 */ string.Empty,
+            /* 444 */ string.Empty,
+            /* 445 */ string.Empty,
+            /* 446 */ string.Empty,
+            /* 447 */ string.Empty,
+            /* 448 */ string.Empty,
+            /* 449 */ string.Empty,
+            /* 450 */ string.Empty,
+            /* 451 */ "Unavailable For Legal Reasons",
+            /* 452 */ string.Empty,
+            /* 453 */ string.Empty,
+            /* 454 */ string.Empty,
+            /* 455 */ string.Empty,
+            /* 456 */ string.Empty,
+            /* 457 */ string.Empty,
+            /* 458 */ string.Empty,
+            /* 459 */ string.Empty,
+            /* 460 */ string.Empty,
+            /* 461 */ string.Empty,
+            /* 462 */ string.Empty,
+            /* 463 */ string.Empty,
+            /* 464 */ string.Empty,
+            /* 465 */ string.Empty,
+            /* 466 */ string.Empty,
+            /* 467 */ string.Empty,
+            /* 468 */ string.Empty,
+            /* 469 */ string.Empty,
+            /* 470 */ string.Empty,
+            /* 471 */ string.Empty,
+            /* 472 */ string.Empty,
+            /* 473 */ string.Empty,
+            /* 474 */ string.Empty,
+            /* 475 */ string.Empty,
+            /* 476 */ string.Empty,
+            /* 477 */ string.Empty,
+            /* 478 */ string.Empty,
+            /* 479 */ string.Empty,
+            /* 480 */ string.Empty,
+            /* 481 */ string.Empty,
+            /* 482 */ string.Empty,
+            /* 483 */ string.Empty,
+            /* 484 */ string.Empty,
+            /* 485 */ string.Empty,
+            /* 486 */ string.Empty,
+            /* 487 */ string.Empty,
+            /* 488 */ string.Empty,
+            /* 489 */ string.Empty,
+            /* 490 */ string.Empty,
+            /* 491 */ string.Empty,
+            /* 492 */ string.Empty,
+            /* 493 */ string.Empty,
+            /* 494 */ string.Empty,
+            /* 495 */ string.Empty,
+            /* 496 */ string.Empty,
+            /* 497 */ string.Empty,
+            /* 498 */ string.Empty,
+            /* 499 */ "Client Closed Request"
+        ],
+        [
+            /* 500 */ "Internal Server Error",
+            /* 501 */ "Not Implemented",
+            /* 502 */ "Bad Gateway",
+            /* 503 */ "Service Unavailable",
+            /* 504 */ "Gateway Timeout",
+            /* 505 */ "HTTP Version Not Supported",
+            /* 506 */ "Variant Also Negotiates",
+            /* 507 */ "Insufficient Storage",
+            /* 508 */ "Loop Detected",
+            /* 509 */ string.Empty,
+            /* 510 */ "Not Extended",
+            /* 511 */ "Network Authentication Required"
+        ]
+    ];
 
     /// <summary>
     /// Gets the reason phrase for the specified status code.
@@ -88,6 +182,15 @@ public static class ReasonPhrases
     /// <returns>The reason phrase, or <see cref="string.Empty"/> if the status code is unknown.</returns>
     public static string GetReasonPhrase(int statusCode)
     {
-        return Phrases.TryGetValue(statusCode, out var phrase) ? phrase : string.Empty;
+        if ((uint)(statusCode - 100) < 500)
+        {
+            var (i, j) = Math.DivRem((uint)statusCode, 100);
+            string[] phrases = HttpReasonPhrases[i];
+            if (j < (uint)phrases.Length)
+            {
+                return phrases[j];
+            }
+        }
+        return string.Empty;
     }
 }
diff --git a/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs b/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs
index c38dcbd2df91..51ec5de92648 100644
--- a/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs
+++ b/src/Http/WebUtilities/test/FileBufferingReadStreamTests.cs
@@ -488,7 +488,7 @@ public async Task CopyToAsyncWorksWithFileThreshold()
         // 4K is the lower bound on buffer sizes
         var bufferSize = 4096;
         var mostExpectedWrites = 8;
-        var data = Enumerable.Range(0, bufferSize * mostExpectedWrites).Select(b => (byte)b).Reverse().ToArray();
+        var data = Enumerable.Reverse(Enumerable.Range(0, bufferSize * mostExpectedWrites).Select(b => (byte)b)).ToArray();
         var inner = new MemoryStream(data);
 
         using var stream = new FileBufferingReadStream(inner, 100, bufferLimit: null, GetCurrentDirectory());
diff --git a/src/Http/WebUtilities/test/MultipartReaderTests.cs b/src/Http/WebUtilities/test/MultipartReaderTests.cs
index 8231ec472bc0..f97045e07b01 100644
--- a/src/Http/WebUtilities/test/MultipartReaderTests.cs
+++ b/src/Http/WebUtilities/test/MultipartReaderTests.cs
@@ -80,7 +80,6 @@ public class MultipartReaderTests
 "<!DOCTYPE html><title>Content of a.html.</title>\r\n" +
 "\r\n" +
 "--9051914041544843365972754266--\r\n";
-
     private const string TwoPartBodyIncompleteBuffer =
 "--9051914041544843365972754266\r\n" +
 "Content-Disposition: form-data; name=\"text\"\r\n" +
@@ -147,6 +146,43 @@ public async Task MultipartReader_HeadersLengthExceeded_Throws()
         Assert.Equal("Line length limit 17 exceeded.", exception.Message);
     }
 
+    [Fact]
+    public async Task MultipartReader_HeadersLengthExceeded_LargePreamble()
+    {
+        var body = $"preamble {new string('a', 17000)}\r\n" +
+            "--9051914041544843365972754266\r\n" +
+"\r\n" +
+"text default\r\n" +
+"--9051914041544843365972754266--\r\n";
+        var stream = MakeStream(body);
+        var reader = new MultipartReader(Boundary, stream);
+
+        var exception = await Assert.ThrowsAsync<InvalidDataException>(() => reader.ReadNextSectionAsync());
+        Assert.Equal("Multipart header length limit 16384 exceeded. Too much data before the first boundary.", exception.Message);
+    }
+
+    [Fact]
+    public async Task MultipartReader_HeadersLengthLimitSettable_LargePreamblePasses()
+    {
+        var body = $"preamble {new string('a', 100_000)}\r\n" +
+            "--9051914041544843365972754266\r\n" +
+"\r\n" +
+"text default\r\n" +
+"--9051914041544843365972754266--\r\n";
+        var stream = MakeStream(body);
+        var reader = new MultipartReader(Boundary, stream)
+        {
+            HeadersLengthLimit = 200_000,
+        };
+
+        var section = await reader.ReadNextSectionAsync();
+        Assert.NotNull(section);
+
+        var buffer = new MemoryStream();
+        await section.Body.CopyToAsync(buffer);
+        Assert.Equal("text default", Encoding.ASCII.GetString(buffer.ToArray()));
+    }
+
     [Fact]
     public async Task MultipartReader_ReadSinglePartBodyWithTrailingWhitespace_Success()
     {
@@ -278,6 +314,43 @@ public void MultipartReader_BufferSizeMustBeLargerThanBoundary_Throws()
         });
     }
 
+    [Fact]
+    public async Task MultipartReader_ReadMultipartBodyWithFilesForDeferredCopy_Success()
+    {
+        var stream = MakeStream(ThreePartBody);
+        var reader = new MultipartReader(Boundary, stream);
+
+        await reader.ReadNextSectionAsync(); // skip text field section
+
+        var section = await reader.ReadNextSectionAsync();
+        Assert.NotNull(section);
+        Assert.Equal(2, section.Headers.Count);
+        Assert.Equal("form-data; name=\"file1\"; filename=\"a.txt\"", section.Headers["Content-Disposition"][0]);
+        Assert.Equal("text/plain", section.Headers["Content-Type"][0]);
+        var stream1 = section.Body;
+
+        section = await reader.ReadNextSectionAsync();
+        Assert.NotNull(section);
+        Assert.Equal(2, section.Headers.Count);
+        Assert.Equal("form-data; name=\"file2\"; filename=\"a.html\"", section.Headers["Content-Disposition"][0]);
+        Assert.Equal("text/html", section.Headers["Content-Type"][0]);
+        var stream2 = section.Body;
+
+        Assert.Null(await reader.ReadNextSectionAsync());
+
+        Assert.True(stream1.CanSeek);
+        Assert.Equal(0, stream1.Seek(0, SeekOrigin.Begin));
+        var buffer = new MemoryStream();
+        await stream1.CopyToAsync(buffer);
+        Assert.Equal("Content of a.txt.\r\n", Encoding.ASCII.GetString(buffer.ToArray()));
+
+        Assert.True(stream2.CanSeek);
+        Assert.Equal(0, stream2.Seek(0, SeekOrigin.Begin));
+        buffer = new MemoryStream();
+        await stream2.CopyToAsync(buffer);
+        Assert.Equal("<!DOCTYPE html><title>Content of a.html.</title>\r\n", Encoding.ASCII.GetString(buffer.ToArray()));
+    }
+
     [Fact]
     public async Task MultipartReader_TwoPartBodyIncompleteBuffer_TwoSectionsReadSuccessfullyThirdSectionThrows()
     {
@@ -389,4 +462,28 @@ public async Task MultipartReader_StripQuotesFromBoundary()
         var section = await reader.ReadNextSectionAsync();
         Assert.NotNull(section);
     }
+
+    [Fact]
+    public async Task SyncReadWithOffsetWorks()
+    {
+        var stream = MakeStream(OnePartBody);
+        var reader = new MultipartReader(Boundary, stream);
+        var buffer = new byte[5];
+
+        var section = await reader.ReadNextSectionAsync();
+        Assert.NotNull(section);
+        Assert.Single(section.Headers);
+        Assert.Equal("form-data; name=\"text\"", section.Headers["Content-Disposition"][0]);
+
+        var read = section.Body.Read(buffer, 2, buffer.Length - 2);
+        Assert.Equal("\0\0tex", GetString(buffer, read + 2));
+
+        read = section.Body.Read(buffer, 1, buffer.Length - 1);
+        Assert.Equal("\0t de", GetString(buffer, read + 1));
+
+        read = section.Body.Read(buffer, 0, buffer.Length);
+        Assert.Equal("fault", GetString(buffer, read));
+
+        Assert.Null(await reader.ReadNextSectionAsync());
+    }
 }
diff --git a/src/Http/WebUtilities/test/QueryHelpersTests.cs b/src/Http/WebUtilities/test/QueryHelpersTests.cs
index 8707fe2411be..6f040e4146e4 100644
--- a/src/Http/WebUtilities/test/QueryHelpersTests.cs
+++ b/src/Http/WebUtilities/test/QueryHelpersTests.cs
@@ -30,7 +30,7 @@ public void ParseQueryWithDuplicateKeysGroups()
     {
         var collection = QueryHelpers.ParseQuery("?key1=valueA&key2=valueB&key1=valueC");
         Assert.Equal(2, collection.Count);
-        Assert.Equal(new[] { "valueA", "valueC" }, collection["key1"]);
+        Assert.Equal(new[] { "valueA", "valueC" }, collection["key1"].ToArray());
         Assert.Equal("valueB", collection["key2"].FirstOrDefault());
     }
 
@@ -48,7 +48,7 @@ public void ParseQueryWithEmptyKeyWorks()
     {
         var collection = QueryHelpers.ParseQuery("?=value1&=");
         Assert.Single(collection);
-        Assert.Equal(new[] { "value1", "" }, collection[""]);
+        Assert.Equal(new[] { "value1", "" }, collection[""].ToArray());
     }
 
     [Fact]
@@ -88,7 +88,7 @@ public void ParseQueryWithEncodedKeyEncodedValuesWorks()
     {
         var collection = QueryHelpers.ParseQuery("?fields+%5BtodoItems%5D=%5B+1+%5D&fields+%5BtodoItems%5D=%5B+2+%5D");
         Assert.Single(collection);
-        Assert.Equal(new[] { "[ 1 ]", "[ 2 ]" }, collection["fields [todoItems]"]);
+        Assert.Equal(new[] { "[ 1 ]", "[ 2 ]" }, collection["fields [todoItems]"].ToArray());
     }
 
     [Theory]
diff --git a/src/Http/samples/MinimalSample/MinimalSample.csproj b/src/Http/samples/MinimalSample/MinimalSample.csproj
index 7783a82fe5d8..f4a02094cafb 100644
--- a/src/Http/samples/MinimalSample/MinimalSample.csproj
+++ b/src/Http/samples/MinimalSample/MinimalSample.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" />
+    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Http/samples/MinimalSample/Program.cs b/src/Http/samples/MinimalSample/Program.cs
index 8d21ab71c671..b90c3a3cb48c 100644
--- a/src/Http/samples/MinimalSample/Program.cs
+++ b/src/Http/samples/MinimalSample/Program.cs
@@ -58,7 +58,7 @@
 
 superNested.MapGet("/", (string groupName, string nestedName) =>
 {
-   return $"Hello from {groupName}:{nestedName}!";
+    return $"Hello from {groupName}:{nestedName}!";
 });
 
 object Json() => new { message = "Hello, World!" };
diff --git a/src/Http/samples/MinimalSampleOwin/MinimalSampleOwin.csproj b/src/Http/samples/MinimalSampleOwin/MinimalSampleOwin.csproj
new file mode 100644
index 000000000000..b9b4ede801fe
--- /dev/null
+++ b/src/Http/samples/MinimalSampleOwin/MinimalSampleOwin.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <Nullable>enable</Nullable>
+    <EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <IsTrimmable>true</IsTrimmable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Http.Results" />
+    <Reference Include="Microsoft.AspNetCore.Owin" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Http/samples/MinimalSampleOwin/Program.cs b/src/Http/samples/MinimalSampleOwin/Program.cs
new file mode 100644
index 000000000000..62d500b974ea
--- /dev/null
+++ b/src/Http/samples/MinimalSampleOwin/Program.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Owin;
+
+var builder = WebApplication.CreateBuilder(args);
+var app = builder.Build();
+
+app.Logger.LogInformation($"Current process ID: {Environment.ProcessId}");
+
+#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
+#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
+string Plaintext() => "Hello, World!";
+app.MapGet("/plaintext", Plaintext);
+
+app.MapGet("/", () => $"""
+    Operating System: {Environment.OSVersion}
+    .NET version: {Environment.Version}
+    Username: {Environment.UserName}
+    Date and Time: {DateTime.Now}
+    """);
+#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
+#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
+
+app.UseOwin(pipeline =>
+{
+    pipeline(next =>
+    {
+        return async environment =>
+        {
+            // if you want to get OWIN environment properties
+            //if (environment is OwinEnvironment owin)
+            //{
+            //    foreach (var prop in owin)
+            //    {
+            //        app.Logger.LogInformation($"{prop.Key} - {prop.Value}");
+            //    }
+            //}
+
+            await next(environment);
+        };
+    });
+});
+
+app.Run();
diff --git a/src/Http/samples/MinimalSampleOwin/Properties/launchSettings.json b/src/Http/samples/MinimalSampleOwin/Properties/launchSettings.json
new file mode 100644
index 000000000000..e9dc44a7b3aa
--- /dev/null
+++ b/src/Http/samples/MinimalSampleOwin/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "MinimalSampleOwin": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/Http/samples/MinimalValidationSample/MinimalValidationSample.csproj b/src/Http/samples/MinimalValidationSample/MinimalValidationSample.csproj
new file mode 100644
index 000000000000..e01722e04559
--- /dev/null
+++ b/src/Http/samples/MinimalValidationSample/MinimalValidationSample.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <Nullable>enable</Nullable>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.Extensions.Validation.Generated</InterceptorsNamespaces>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
+    <Reference Include="Microsoft.AspNetCore.Http.Results" />
+    <Reference Include="Microsoft.Extensions.Validation" />
+    <!-- Mvc.Core is referenced only for its attributes -->
+    <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Validation/gen/Microsoft.Extensions.Validation.ValidationsGenerator.csproj"
+     OutputItemType="Analyzer"
+     ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Http/samples/MinimalValidationSample/MinimalValidationSample.http b/src/Http/samples/MinimalValidationSample/MinimalValidationSample.http
new file mode 100644
index 000000000000..1966d2733ff8
--- /dev/null
+++ b/src/Http/samples/MinimalValidationSample/MinimalValidationSample.http
@@ -0,0 +1,114 @@
+### Valid customer ID request
+GET http://localhost:5021/customers/42
+Accept: application/json
+
+### Invalid customer ID request (ID must be >= 1)
+GET http://localhost:5021/customers/0
+Accept: application/json
+
+### Valid customer POST request
+POST http://localhost:5021/customers
+Content-Type: application/json
+
+{
+  "name": "John Doe",
+  "email": "john.doe@example.com",
+  "age": 30,
+  "homeAddress": {
+    "street": "123 Main St",
+    "city": "Anytown",
+    "zipCode": "12345"
+  }
+}
+
+### Invalid customer POST request (missing required fields)
+POST http://localhost:5021/customers
+Content-Type: application/json
+
+{
+  "age": 15
+}
+
+### Invalid customer POST request (invalid email format)
+POST http://localhost:5021/customers
+Content-Type: application/json
+
+{
+  "name": "John Doe",
+  "email": "not-an-email",
+  "age": 30
+}
+
+### Invalid customer POST request (age out of range)
+POST http://localhost:5021/customers
+Content-Type: application/json
+
+{
+  "name": "John Doe",
+  "email": "john.doe@example.com",
+  "age": 15
+}
+
+### Invalid customer POST request (invalid zipCode length)
+POST http://localhost:5021/customers
+Content-Type: application/json
+
+{
+  "name": "John Doe",
+  "email": "john.doe@example.com",
+  "age": 30,
+  "homeAddress": {
+    "street": "123 Main St",
+    "city": "Anytown",
+    "zipCode": "1234567"
+  }
+}
+
+### Valid order POST request
+POST http://localhost:5021/orders
+Content-Type: application/json
+
+{
+  "orderId": 12345,
+  "productName": "Sample Product",
+  "quantity": 5
+}
+
+### Invalid order POST request (missing required field)
+POST http://localhost:5021/orders
+Content-Type: application/json
+
+{
+  "orderId": 12345,
+  "quantity": 5
+}
+
+### Invalid order POST request (IValidatableObject validation failure)
+POST http://localhost:5021/orders
+Content-Type: application/json
+
+{
+  "orderId": 12345,
+  "productName": "Sample Product",
+  "quantity": 0
+}
+
+### Invalid order POST request (negative orderId)
+POST http://localhost:5021/orders
+Content-Type: application/json
+
+{
+  "orderId": -1,
+  "productName": "Sample Product",
+  "quantity": 5
+}
+
+### Valid product POST request (validation disabled)
+# This endpoint has DisableValidation() applied, so even invalid data should be accepted
+POST http://localhost:5021/products?productId=2&name=TestProduct
+Content-Type: application/json
+
+### Invalid product POST request (validation disabled)
+# This has an odd productId and is missing name, but should still work because validation is disabled
+POST http://localhost:5021/products?productId=3
+Content-Type: application/json
diff --git a/src/Http/samples/MinimalValidationSample/Program.cs b/src/Http/samples/MinimalValidationSample/Program.cs
new file mode 100644
index 000000000000..266e2cf74c0a
--- /dev/null
+++ b/src/Http/samples/MinimalValidationSample/Program.cs
@@ -0,0 +1,99 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Validation;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+// ValidationEndpointFilterFactory is implicitly enabled on all endpoints
+app.MapGet("/customers/{id}", ([Range(1, int.MaxValue)] int id) =>
+    $"Getting customer with ID: {id}");
+
+app.MapPost("/customers", (Customer customer) => TypedResults.Created($"/customers/{customer.Name}", customer));
+
+app.MapPost("/orders", (Order order) => TypedResults.Created($"/orders/{order.OrderId}", order));
+
+app.MapPost("/products",
+    ([EvenNumber(ErrorMessage = "Product ID must be even")] int productId, [Required] string name)
+        => TypedResults.Ok(new { productId, name }))
+    .DisableValidation();
+
+app.Run();
+
+// Define validatable types with the ValidatableType attribute
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+[ValidatableType]
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+public class Customer
+{
+    [Required]
+    public required string Name { get; set; }
+
+    [EmailAddress]
+    public required string Email { get; set; }
+
+    [Range(18, 120)]
+    [Display(Name = "Customer Age")]
+    public int Age { get; set; }
+
+    // Complex property with nested validation
+    public Address HomeAddress { get; set; } = new Address
+    {
+        Street = "123 Main St",
+        City = "Anytown",
+        ZipCode = "12345"
+    };
+}
+
+public class Address
+{
+    [Required]
+    public required string Street { get; set; }
+
+    [Required]
+    public required string City { get; set; }
+
+    [StringLength(5)]
+    public required string ZipCode { get; set; }
+}
+
+// Define a type implementing IValidatableObject for custom validation
+public class Order : IValidatableObject
+{
+    [Range(1, int.MaxValue)]
+    public int OrderId { get; set; }
+
+    [Required]
+    public required string ProductName { get; set; }
+
+    public int Quantity { get; set; }
+
+    // Custom validation logic using IValidatableObject
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (Quantity <= 0)
+        {
+            yield return new ValidationResult(
+                "Quantity must be greater than zero",
+                [nameof(Quantity)]);
+        }
+    }
+}
+
+// Use a custom validation attribute
+public class EvenNumberAttribute : ValidationAttribute
+{
+    public override bool IsValid(object? value)
+    {
+        if (value is int number)
+        {
+            return number % 2 == 0;
+        }
+        return false;
+    }
+}
diff --git a/src/Http/samples/MinimalValidationSample/Properties/launchSettings.json b/src/Http/samples/MinimalValidationSample/Properties/launchSettings.json
new file mode 100644
index 000000000000..6e42095c6bd3
--- /dev/null
+++ b/src/Http/samples/MinimalValidationSample/Properties/launchSettings.json
@@ -0,0 +1,13 @@
+{
+  "profiles": {
+    "HttpApiSampleApp": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5022;http://localhost:5021",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/Http/samples/MinimalValidationSample/appsettings.Development.json b/src/Http/samples/MinimalValidationSample/appsettings.Development.json
new file mode 100644
index 000000000000..8983e0fc1c5e
--- /dev/null
+++ b/src/Http/samples/MinimalValidationSample/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/src/Http/samples/MinimalValidationSample/appsettings.json b/src/Http/samples/MinimalValidationSample/appsettings.json
new file mode 100644
index 000000000000..d9d9a9bff6fd
--- /dev/null
+++ b/src/Http/samples/MinimalValidationSample/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/Http/startvscode.cmd b/src/Http/startvscode.cmd
new file mode 100644
index 000000000000..d403f3028231
--- /dev/null
+++ b/src/Http/startvscode.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvscode.cmd %~dp0
diff --git a/src/Http/startvscode.sh b/src/Http/startvscode.sh
new file mode 100644
index 000000000000..346f74c01e76
--- /dev/null
+++ b/src/Http/startvscode.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../.."
+"$repo_root/startvscode.sh" $DIR
diff --git a/src/HttpClientFactory/HttpClientFactory.slnf b/src/HttpClientFactory/HttpClientFactory.slnf
index b6be5bd59bd4..3fb548df7ce5 100644
--- a/src/HttpClientFactory/HttpClientFactory.slnf
+++ b/src/HttpClientFactory/HttpClientFactory.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\HttpClientFactory\\Polly\\src\\Microsoft.Extensions.Http.Polly.csproj",
       "src\\HttpClientFactory\\Polly\\test\\Microsoft.Extensions.Http.Polly.Tests.csproj"
diff --git a/src/HttpClientFactory/Polly/src/PACKAGE.md b/src/HttpClientFactory/Polly/src/PACKAGE.md
new file mode 100644
index 000000000000..0c9058b9d7df
--- /dev/null
+++ b/src/HttpClientFactory/Polly/src/PACKAGE.md
@@ -0,0 +1,68 @@
+## About
+
+`Microsoft.Extensions.Http.Polly` integrates `IHttpClientFactory` with the [Polly](https://github.com/App-vNext/Polly) library to provide comprehensive resilience and transient fault-handling. It allows developers to express policies such as Retry, Circuit Breaker, Timeout, Bulkhead Isolation, and Fallback in a fluent and thread-safe manner.
+
+> [!NOTE]
+> This package is deprecated. Please use either [`Microsoft.Extensions.Resilience`](https://www.nuget.org/packages/Microsoft.Extensions.Resilience) or [`Microsoft.Extensions.Http.Resilience`](https://www.nuget.org/packages/Microsoft.Extensions.Http.Resilience) instead.
+
+## How to Use
+
+To use `Microsoft.Extensions.Http.Polly`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.Extensions.Http.Polly
+```
+
+### Usage
+
+#### Handle transient faults
+
+`AddTransientHttpErrorPolicy` can be used define a policy that handles transient errors:
+
+```csharp
+builder.Services.AddHttpClient("PollyWaitAndRetry")
+    .AddTransientHttpErrorPolicy(policyBuilder =>
+        policyBuilder.WaitAndRetryAsync(
+            retryCount: 3,
+            retryNumber => TimeSpan.FromMilliseconds(600)));
+```
+
+In the preceding example, failed requests are retried up to three times with a delay of 600 ms between attempts.
+
+#### Dynamically select policies
+
+To dynamically inspect a request and decide which policy apply, use the `AddPolicyHandler` extension method:
+
+```csharp
+var timeoutPolicy = Policy.TimeoutAsync<HttpResponseMessage>(
+    TimeSpan.FromSeconds(10));
+var longTimeoutPolicy = Policy.TimeoutAsync<HttpResponseMessage>(
+    TimeSpan.FromSeconds(30));
+
+builder.Services.AddHttpClient("PollyDynamic")
+    .AddPolicyHandler(httpRequestMessage =>
+        httpRequestMessage.Method == HttpMethod.Get
+            ? timeoutPolicy
+            : longTimeoutPolicy);
+```
+
+In this example, if the outgoing request is an HTTP GET, a 10-second timeout is applied. For any other HTTP method, a 30-second timeout is used.
+
+## Main Types
+
+The main types provided by this package are:
+
+* `PollyHttpClientBuilderExtensions`: Provides extension methods for configuring `PolicyHttpMessageHandler` message handlers as part of an `HttpClient` message handler pipeline
+* `PolicyHttpMessageHandler`: A `DelegatingHandler` implementation that executes request processing surrounded by a `Polly.Policy`
+* `PollyServiceCollectionExtensions`: Provides convenience extension methods to register `Polly.Registry.IPolicyRegistry<string>` and `Polly.Registry.IReadOnlyPolicyRegistry<string>` in a service collection
+* `HttpRequestMessageExtensions`: Provides extension methods for `HttpRequestMessage` Polly integration
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/fundamentals/http-requests?view#use-polly-based-handlers) on using Polly-based handlers in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.Extensions.Http.Polly` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs b/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs
index 2927839cd2e8..3ae275178afd 100644
--- a/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs
+++ b/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs
@@ -16,11 +16,11 @@ namespace Microsoft.Extensions.Http;
 /// <remarks>
 /// <para>
 /// This message handler implementation supports the use of policies provided by the Polly library for
-/// transient-fault-handling and resiliency.
+/// transient-fault handling and resiliency.
 /// </para>
 /// <para>
 /// The documentation provided here is focused guidance for using Polly together with the <see cref="IHttpClientFactory"/>.
-/// See the Polly project and its documentation (<see href="https://github.com/app-vnext/Polly"/>) for authoritative information on Polly.
+/// For authoritative information on Polly, see the Polly project and its documentation (<see href="https://github.com/app-vnext/Polly"/>).
 /// </para>
 /// <para>
 /// The extension methods on <see cref="PollyHttpClientBuilderExtensions"/> are designed as a convenient and correct
@@ -37,19 +37,17 @@ namespace Microsoft.Extensions.Http;
 /// by using the generic methods on <see cref="Policy"/> such as <see cref="Policy.TimeoutAsync{TResult}(int)"/>.
 /// </para>
 /// <para>
-/// To adapt an existing non-generic <see cref="IAsyncPolicy"/>, use code like the following:
-/// <example>
-/// Converting a non-generic <c>IAsyncPolicy policy</c> to <see cref="IAsyncPolicy{HttpResponseMessage}"/>.
-/// <code>
+/// To adapt an existing non-generic <see cref="IAsyncPolicy"/>, use code like the following that converts a 
+/// non-generic <c>IAsyncPolicy policy</c> to <see cref="IAsyncPolicy{HttpResponseMessage}"/>:
+/// <code lang="csharp">
 /// policy.AsAsyncPolicy&lt;HttpResponseMessage&gt;()
 /// </code>
-/// </example>
 /// </para>
 /// <para>
 /// The <see cref="PollyHttpClientBuilderExtensions.AddTransientHttpErrorPolicy(IHttpClientBuilder, Func{PolicyBuilder{HttpResponseMessage}, IAsyncPolicy{HttpResponseMessage}})"/>
 /// method is an opinionated convenience method that supports the application of a policy for requests that fail due
 /// to a connection failure or server error (5XX HTTP status code). This kind of method supports only reactive policies
-/// such as Retry, Circuit-Breaker or Fallback. This method is only provided for convenience; we recommend creating
+/// such as Retry, Circuit-Breaker, or Fallback. This method is only provided for convenience; we recommend creating
 /// your own policies as needed if this does not meet your requirements.
 /// </para>
 /// <para>
@@ -66,8 +64,8 @@ namespace Microsoft.Extensions.Http;
 /// and ensure that they can be used when the handler rotation feature is active.
 /// </para>
 /// <para>
-/// The <see cref="PolicyHttpMessageHandler"/> will attach a context to the <see cref="HttpRequestMessage"/> prior
-/// to executing a <see cref="Policy"/>, if one does not already exist. The <see cref="Context"/> will be provided
+/// The <see cref="PolicyHttpMessageHandler"/> attaches a context to the <see cref="HttpRequestMessage"/> prior
+/// to executing a <see cref="Policy"/>, if one does not already exist. The <see cref="Context"/> is provided
 /// to the policy for use inside the <see cref="Policy"/> and in other message handlers.
 /// </para>
 /// </remarks>
diff --git a/src/Identity/Core/src/EventIds.cs b/src/Identity/Core/src/EventIds.cs
index 9c4aa5ed7e78..05c7e6c25d16 100644
--- a/src/Identity/Core/src/EventIds.cs
+++ b/src/Identity/Core/src/EventIds.cs
@@ -7,12 +7,16 @@ namespace Microsoft.AspNetCore.Identity;
 
 internal static class EventIds
 {
-    public static EventId UserCannotSignInWithoutConfirmedEmail = new EventId(0, "UserCannotSignInWithoutConfirmedEmail");
-    public static EventId SecurityStampValidationFailed = new EventId(0, "SecurityStampValidationFailed");
-    public static EventId SecurityStampValidationFailedId4 = new EventId(4, "SecurityStampValidationFailed");
-    public static EventId UserCannotSignInWithoutConfirmedPhoneNumber = new EventId(1, "UserCannotSignInWithoutConfirmedPhoneNumber");
-    public static EventId InvalidPassword = new EventId(2, "InvalidPassword");
-    public static EventId UserLockedOut = new EventId(3, "UserLockedOut");
-    public static EventId UserCannotSignInWithoutConfirmedAccount = new EventId(4, "UserCannotSignInWithoutConfirmedAccount");
-    public static EventId TwoFactorSecurityStampValidationFailed = new EventId(5, "TwoFactorSecurityStampValidationFailed");
+    public static readonly EventId UserCannotSignInWithoutConfirmedEmail = new(0, "UserCannotSignInWithoutConfirmedEmail");
+    public static readonly EventId SecurityStampValidationFailed = new(0, "SecurityStampValidationFailed");
+    public static readonly EventId SecurityStampValidationFailedId4 = new(4, "SecurityStampValidationFailed");
+    public static readonly EventId UserCannotSignInWithoutConfirmedPhoneNumber = new(1, "UserCannotSignInWithoutConfirmedPhoneNumber");
+    public static readonly EventId InvalidPassword = new(2, "InvalidPassword");
+    public static readonly EventId UserLockedOut = new(3, "UserLockedOut");
+    public static readonly EventId UserCannotSignInWithoutConfirmedAccount = new(4, "UserCannotSignInWithoutConfirmedAccount");
+    public static readonly EventId TwoFactorSecurityStampValidationFailed = new(5, "TwoFactorSecurityStampValidationFailed");
+    public static readonly EventId NoPasskeyCreationOptions = new(6, "NoPasskeyCreationOptions");
+    public static readonly EventId UserDoesNotMatchPasskeyCreationOptions = new(7, "UserDoesNotMatchPasskeyCreationOptions");
+    public static readonly EventId PasskeyAttestationFailed = new(8, "PasskeyAttestationFailed");
+    public static readonly EventId PasskeyAssertionFailed = new(9, "PasskeyAssertionFailed");
 }
diff --git a/src/Identity/Core/src/IPasskeyHandler.cs b/src/Identity/Core/src/IPasskeyHandler.cs
new file mode 100644
index 000000000000..50898659edf0
--- /dev/null
+++ b/src/Identity/Core/src/IPasskeyHandler.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents a handler for generating passkey creation and request options and performing
+/// passkey assertion and attestation.
+/// </summary>
+public interface IPasskeyHandler<TUser>
+    where TUser : class
+{
+    /// <summary>
+    /// Generates passkey creation options for the specified user entity and HTTP context.
+    /// </summary>
+    /// <param name="userEntity">The passkey user entity for which to generate creation options.</param>
+    /// <param name="httpContext">The HTTP context associated with the request.</param>
+    /// <returns>A <see cref="PasskeyCreationOptionsResult"/> representing the result.</returns>
+    Task<PasskeyCreationOptionsResult> MakeCreationOptionsAsync(PasskeyUserEntity userEntity, HttpContext httpContext);
+
+    /// <summary>
+    /// Generates passkey request options for the specified user and HTTP context.
+    /// </summary>
+    /// <param name="user">The user for whom to generate request options.</param>
+    /// <param name="httpContext">The HTTP context associated with the request.</param>
+    /// <returns>A <see cref="PasskeyRequestOptionsResult"/> representing the result.</returns>
+    Task<PasskeyRequestOptionsResult> MakeRequestOptionsAsync(TUser? user, HttpContext httpContext);
+
+    /// <summary>
+    /// Performs passkey attestation using the provided <see cref="PasskeyAttestationContext"/>.
+    /// </summary>
+    /// <param name="context">The context containing necessary information for passkey attestation.</param>
+    /// <returns>A <see cref="PasskeyAttestationResult"/> representing the result.</returns>
+    Task<PasskeyAttestationResult> PerformAttestationAsync(PasskeyAttestationContext context);
+
+    /// <summary>
+    /// Performs passkey assertion using the provided <see cref="PasskeyAssertionContext"/>.
+    /// </summary>
+    /// <param name="context">The context containing necessary information for passkey assertion.</param>
+    /// <returns>A <see cref="PasskeyAssertionResult{TUser}"/> representing the result.</returns>
+    Task<PasskeyAssertionResult<TUser>> PerformAssertionAsync(PasskeyAssertionContext context);
+}
diff --git a/src/Identity/Core/src/IdentityApiEndpointRouteBuilderExtensions.cs b/src/Identity/Core/src/IdentityApiEndpointRouteBuilderExtensions.cs
index 115d151bdf56..4ccf2048e40e 100644
--- a/src/Identity/Core/src/IdentityApiEndpointRouteBuilderExtensions.cs
+++ b/src/Identity/Core/src/IdentityApiEndpointRouteBuilderExtensions.cs
@@ -274,12 +274,14 @@ await signInManager.ValidateSecurityStampAsync(refreshTicket.Principal) is not T
                     return CreateValidationProblem("CannotResetSharedKeyAndEnable",
                         "Resetting the 2fa shared key must disable 2fa until a 2fa token based on the new shared key is validated.");
                 }
-                else if (string.IsNullOrEmpty(tfaRequest.TwoFactorCode))
+
+                if (string.IsNullOrEmpty(tfaRequest.TwoFactorCode))
                 {
                     return CreateValidationProblem("RequiresTwoFactor",
                         "No 2fa token was provided by the request. A valid 2fa token is required to enable 2fa.");
                 }
-                else if (!await userManager.VerifyTwoFactorTokenAsync(user, userManager.Options.Tokens.AuthenticatorTokenProvider, tfaRequest.TwoFactorCode))
+
+                if (!await userManager.VerifyTwoFactorTokenAsync(user, userManager.Options.Tokens.AuthenticatorTokenProvider, tfaRequest.TwoFactorCode))
                 {
                     return CreateValidationProblem("InvalidTwoFactorCode",
                         "The 2fa token provided by the request was invalid. A valid 2fa token is required to enable 2fa.");
diff --git a/src/Identity/Core/src/IdentityBuilderExtensions.cs b/src/Identity/Core/src/IdentityBuilderExtensions.cs
index 264a88a5c23a..e97fec9ad6ac 100644
--- a/src/Identity/Core/src/IdentityBuilderExtensions.cs
+++ b/src/Identity/Core/src/IdentityBuilderExtensions.cs
@@ -41,6 +41,7 @@ public static IdentityBuilder AddDefaultTokenProviders(this IdentityBuilder buil
     private static void AddSignInManagerDeps(this IdentityBuilder builder)
     {
         builder.Services.AddHttpContextAccessor();
+        builder.Services.AddScoped(typeof(IPasskeyHandler<>).MakeGenericType(builder.UserType), typeof(PasskeyHandler<>).MakeGenericType(builder.UserType));
         builder.Services.AddScoped(typeof(ISecurityStampValidator), typeof(SecurityStampValidator<>).MakeGenericType(builder.UserType));
         builder.Services.AddScoped(typeof(ITwoFactorSecurityStampValidator), typeof(TwoFactorSecurityStampValidator<>).MakeGenericType(builder.UserType));
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<SecurityStampValidatorOptions>, PostConfigureSecurityStampValidatorOptions>());
diff --git a/src/Identity/Core/src/IdentityJsonSerializerContext.cs b/src/Identity/Core/src/IdentityJsonSerializerContext.cs
new file mode 100644
index 000000000000..34b5843b8f89
--- /dev/null
+++ b/src/Identity/Core/src/IdentityJsonSerializerContext.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.AspNetCore.Identity;
+
+[JsonSerializable(typeof(CollectedClientData))]
+[JsonSerializable(typeof(PublicKeyCredentialCreationOptions))]
+[JsonSerializable(typeof(PublicKeyCredentialRequestOptions))]
+[JsonSerializable(typeof(PublicKeyCredential<AuthenticatorAssertionResponse>))]
+[JsonSerializable(typeof(PublicKeyCredential<AuthenticatorAttestationResponse>))]
+[JsonSerializable(typeof(PasskeyAttestationState))]
+[JsonSerializable(typeof(PasskeyAssertionState))]
+[JsonSourceGenerationOptions(
+    JsonSerializerDefaults.Web,
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+    RespectNullableAnnotations = true)]
+internal partial class IdentityJsonSerializerContext : JsonSerializerContext;
diff --git a/src/Identity/Core/src/IdentityPasskeyOptions.cs b/src/Identity/Core/src/IdentityPasskeyOptions.cs
new file mode 100644
index 000000000000..d83ff848aaab
--- /dev/null
+++ b/src/Identity/Core/src/IdentityPasskeyOptions.cs
@@ -0,0 +1,186 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Specifies options for passkey requirements.
+/// </summary>
+public class IdentityPasskeyOptions
+{
+    /// <summary>
+    /// Gets or sets the time that the browser should wait for the authenticator to provide a passkey.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option applies to both creating a new passkey and requesting an existing passkey.
+    /// This is treated as a hint to the browser, and the browser may choose to ignore it.
+    /// </para>
+    /// <para>
+    /// The default value is 5 minutes.
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialcreationoptions-timeout"/>
+    /// and <see href="https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialrequestoptions-timeout"/>.
+    /// </para>
+    /// </remarks>
+    public TimeSpan AuthenticatorTimeout { get; set; } = TimeSpan.FromMinutes(5);
+
+    /// <summary>
+    /// Gets or sets the size of the challenge in bytes sent to the client during attestation and assertion.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option applies to both creating a new passkey and requesting an existing passkey.
+    /// </para>
+    /// <para>
+    /// The default value is 32 bytes.
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialcreationoptions-challenge"/>
+    /// and <see href="https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialrequestoptions-challenge"/>.
+    /// </para>
+    /// </remarks>
+    public int ChallengeSize { get; set; } = 32;
+
+    /// <summary>
+    /// Gets or sets the effective domain of the server.
+    /// This should be unique and will be used as the identity for the server.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option applies to both creating a new passkey and requesting an existing passkey.
+    /// </para>
+    /// <para>
+    /// If left <see langword="null"/>, the server's origin may be used instead.
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#rp-id"/>.
+    /// </para>
+    /// </remarks>
+    public string? ServerDomain { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user verification requirement.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option applies to both creating a new passkey and requesting an existing passkey.
+    /// </para>
+    /// <para>
+    /// Possible values are "required", "preferred", and "discouraged".
+    /// If set to <see langword="null"/>, the effective value is "preferred".
+    /// </para>
+    /// <para>
+    /// The default value is "required".
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-userverificationrequirement"/>.
+    /// </para>
+    /// </remarks>
+    public string? UserVerificationRequirement { get; set; } = "required";
+
+    /// <summary>
+    /// Gets or sets the extent to which the server desires to create a client-side discoverable credential.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option only applies when creating a new passkey, and is not enforced on the server.
+    /// </para>
+    /// <para>
+    /// Possible values are "discouraged", "preferred", "required", or <see langword="null"/>.
+    /// If set to <see langword="null"/>, the effective value is "discouraged".
+    /// </para>
+    /// <para>
+    /// The default value is "preferred".
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-residentkeyrequirement"/>.
+    /// </para>
+    /// </remarks>
+    public string? ResidentKeyRequirement { get; set; } = "preferred";
+
+    /// <summary>
+    /// Gets or sets the attestation conveyance preference.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option only applies when creating a new passkey, and already-registered passkeys are not affected by it.
+    /// To validate the attestation statement of a passkey during passkey creation, provide a value for the
+    /// <see cref="VerifyAttestationStatement"/> option.
+    /// </para>
+    /// <para>
+    /// Possible values are "none", "indirect", "direct", and "enterprise".
+    /// </para>
+    /// <para>
+    /// If left <see langword="null"/>, the browser defaults to "none".
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-attestationconveyancepreference"/>.
+    /// </para>
+    /// </remarks>
+    public string? AttestationConveyancePreference { get; set; }
+
+    /// <summary>
+    /// Gets or sets the allowed authenticator attachment.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option only applies when creating a new passkey, and already-registered passkeys are not affected by it.
+    /// </para>
+    /// <para>
+    /// Possible values are "platform" and "cross-platform".
+    /// </para>
+    /// <para>
+    /// If left <see langword="null"/>, any authenticator attachment modality is allowed.
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-authenticatorattachment"/>.
+    /// </para>
+    /// </remarks>
+    public string? AuthenticatorAttachment { get; set; }
+
+    /// <summary>
+    /// Gets or sets a function that determines whether the given COSE algorithm identifier
+    /// is allowed for passkey operations.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option only applies when creating a new passkey, and already-registered passkeys are not affected by it.
+    /// </para>
+    /// <para>
+    /// If left <see langword="null"/>, all supported algorithms are allowed.
+    /// </para>
+    /// <para>
+    /// See <see href="https://www.iana.org/assignments/cose/cose.xhtml#algorithms"/>.
+    /// </para>
+    /// </remarks>
+    public Func<int, bool>? IsAllowedAlgorithm { get; set; }
+
+    /// <summary>
+    /// Gets or sets a function that validates the origin of the request.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option applies to both creating a new passkey and requesting an existing passkey.
+    /// </para>
+    /// <para>
+    /// If left <see langword="null"/>, cross-origin requests are disallowed, and the request is only
+    /// considered valid if the request's origin header matches the credential's origin.
+    /// </para>
+    /// </remarks>
+    public Func<PasskeyOriginValidationContext, ValueTask<bool>>? ValidateOrigin { get; set; }
+
+    /// <summary>
+    /// Gets or sets a function that verifies the attestation statement of a passkey.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This option only applies when creating a new passkey, and already-registered passkeys are not affected by it.
+    /// </para>
+    /// <para>
+    /// If left <see langword="null"/>, this function does not perform any verification and always returns <see langword="true"/>.
+    /// </para>
+    /// </remarks>
+    public Func<PasskeyAttestationStatementVerificationContext, ValueTask<bool>>? VerifyAttestationStatement { get; set; }
+}
diff --git a/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
index 12034b3c8971..eceb93d32034 100644
--- a/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
+++ b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
@@ -102,6 +102,7 @@ public static class IdentityServiceCollectionExtensions
         services.TryAddScoped<ITwoFactorSecurityStampValidator, TwoFactorSecurityStampValidator<TUser>>();
         services.TryAddScoped<IUserClaimsPrincipalFactory<TUser>, UserClaimsPrincipalFactory<TUser, TRole>>();
         services.TryAddScoped<IUserConfirmation<TUser>, DefaultUserConfirmation<TUser>>();
+        services.TryAddScoped<IPasskeyHandler<TUser>, PasskeyHandler<TUser>>();
         services.TryAddScoped<UserManager<TUser>>();
         services.TryAddScoped<SignInManager<TUser>>();
         services.TryAddScoped<RoleManager<TRole>>();
diff --git a/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
index 3111899516c0..5f13920b61f5 100644
--- a/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
+++ b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj
@@ -13,7 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)DefaultMessageEmailSender.cs" />
+    <Compile Include="$(SharedSourceRoot)DefaultMessageEmailSender.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)ValueStopwatch\ValueStopwatch.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,6 +24,7 @@
     <Reference Include="Microsoft.AspNetCore.Authorization.Policy" />
     <Reference Include="Microsoft.AspNetCore.Http.Results" />
     <Reference Include="Microsoft.Extensions.Identity.Core" />
+    <Reference Include="System.Formats.Cbor" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,6 +36,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 </Project>
diff --git a/src/Identity/Core/src/PasskeyAssertionContext.cs b/src/Identity/Core/src/PasskeyAssertionContext.cs
new file mode 100644
index 000000000000..c80a5c5394d6
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyAssertionContext.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the context for passkey assertion.
+/// </summary>
+public sealed class PasskeyAssertionContext
+{
+    /// <summary>
+    /// Gets or sets the <see cref="Http.HttpContext"/> for the current request. 
+    /// </summary>
+    public required HttpContext HttpContext { get; init; }
+
+    /// <summary>
+    /// Gets or sets the credentials obtained by JSON-serializing the result of the
+    /// <c>navigator.credentials.get()</c> JavaScript function.
+    /// </summary>
+    public required string CredentialJson { get; init; }
+
+    /// <summary>
+    /// Gets or sets the state to be used in the assertion procedure.
+    /// </summary>
+    /// <remarks>
+    /// This is expected to match the <see cref="PasskeyRequestOptionsResult.AssertionState"/>
+    /// previously returned from <see cref="IPasskeyHandler{TUser}.MakeRequestOptionsAsync(TUser, HttpContext)"/>.
+    /// </remarks>
+    public required string? AssertionState { get; init; }
+}
diff --git a/src/Identity/Core/src/PasskeyAssertionResult.cs b/src/Identity/Core/src/PasskeyAssertionResult.cs
new file mode 100644
index 000000000000..088ddf4797c5
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyAssertionResult.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the result of a passkey assertion operation.
+/// </summary>
+public sealed class PasskeyAssertionResult<TUser>
+    where TUser : class
+{
+    /// <summary>
+    /// Gets whether the assertion was successful.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(Passkey))]
+    [MemberNotNullWhen(true, nameof(User))]
+    [MemberNotNullWhen(false, nameof(Failure))]
+    public bool Succeeded { get; }
+
+    /// <summary>
+    /// Gets the updated passkey information when assertion succeeds.
+    /// </summary>
+    public UserPasskeyInfo? Passkey { get; }
+
+    /// <summary>
+    /// Gets the user associated with the passkey when assertion succeeds.
+    /// </summary>
+    public TUser? User { get; }
+
+    /// <summary>
+    /// Gets the error that occurred during assertion.
+    /// </summary>
+    public PasskeyException? Failure { get; }
+
+    internal PasskeyAssertionResult(UserPasskeyInfo passkey, TUser user)
+    {
+        Succeeded = true;
+        Passkey = passkey;
+        User = user;
+    }
+
+    internal PasskeyAssertionResult(PasskeyException failure)
+    {
+        Succeeded = false;
+        Failure = failure;
+    }
+}
+
+/// <summary>
+/// A factory class for creating instances of <see cref="PasskeyAssertionResult{TUser}"/>.
+/// </summary>
+public static class PasskeyAssertionResult
+{
+    /// <summary>
+    /// Creates a successful result for a passkey assertion operation.
+    /// </summary>
+    /// <param name="passkey">The passkey information associated with the assertion.</param>
+    /// <param name="user">The user associated with the passkey.</param>
+    /// <returns>A <see cref="PasskeyAssertionResult{TUser}"/> instance representing a successful assertion.</returns>
+    public static PasskeyAssertionResult<TUser> Success<TUser>(UserPasskeyInfo passkey, TUser user)
+        where TUser : class
+    {
+        ArgumentNullException.ThrowIfNull(passkey);
+        ArgumentNullException.ThrowIfNull(user);
+        return new PasskeyAssertionResult<TUser>(passkey, user);
+    }
+
+    /// <summary>
+    /// Creates a failed result for a passkey assertion operation.
+    /// </summary>
+    /// <param name="failure">The exception that describes the reason for the failure.</param>
+    /// <returns>A <see cref="PasskeyAssertionResult{TUser}"/> instance representing the failure.</returns>
+    public static PasskeyAssertionResult<TUser> Fail<TUser>(PasskeyException failure)
+        where TUser : class
+    {
+        return new PasskeyAssertionResult<TUser>(failure);
+    }
+}
diff --git a/src/Identity/Core/src/PasskeyAttestationContext.cs b/src/Identity/Core/src/PasskeyAttestationContext.cs
new file mode 100644
index 000000000000..90e5687d2232
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyAttestationContext.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the context for passkey attestation.
+/// </summary>
+public sealed class PasskeyAttestationContext
+{
+    /// <summary>
+    /// Gets or sets the <see cref="Http.HttpContext"/> for the current request. 
+    /// </summary>
+    public required HttpContext HttpContext { get; init; }
+
+    /// <summary>
+    /// Gets or sets the credentials obtained by JSON-serializing the result of the
+    /// <c>navigator.credentials.create()</c> JavaScript function.
+    /// </summary>
+    public required string CredentialJson { get; init; }
+
+    /// <summary>
+    /// Gets or sets the state to be used in the attestation procedure.
+    /// </summary>
+    /// <remarks>
+    /// This is expected to match the <see cref="PasskeyCreationOptionsResult.AttestationState"/>
+    /// previously returned from <see cref="IPasskeyHandler{TUser}.MakeCreationOptionsAsync(PasskeyUserEntity, HttpContext)"/>.
+    /// </remarks>
+    public required string? AttestationState { get; init; }
+}
diff --git a/src/Identity/Core/src/PasskeyAttestationResult.cs b/src/Identity/Core/src/PasskeyAttestationResult.cs
new file mode 100644
index 000000000000..7d0966087512
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyAttestationResult.cs
@@ -0,0 +1,70 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the result of a passkey attestation operation.
+/// </summary>
+public sealed class PasskeyAttestationResult
+{
+    /// <summary>
+    /// Gets whether the attestation was successful.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(Passkey))]
+    [MemberNotNullWhen(true, nameof(UserEntity))]
+    [MemberNotNullWhen(false, nameof(Failure))]
+    public bool Succeeded { get; }
+
+    /// <summary>
+    /// Gets the passkey information collected during attestation when successful.
+    /// </summary>
+    public UserPasskeyInfo? Passkey { get; }
+
+    /// <summary>
+    /// Gets the user entity associated with the passkey when successful.
+    /// </summary>
+    public PasskeyUserEntity? UserEntity { get; }
+
+    /// <summary>
+    /// Gets the error that occurred during attestation.
+    /// </summary>
+    public PasskeyException? Failure { get; }
+
+    private PasskeyAttestationResult(UserPasskeyInfo passkey, PasskeyUserEntity userEntity)
+    {
+        Succeeded = true;
+        Passkey = passkey;
+        UserEntity = userEntity;
+    }
+
+    private PasskeyAttestationResult(PasskeyException failure)
+    {
+        Succeeded = false;
+        Failure = failure;
+    }
+
+    /// <summary>
+    /// Creates a successful result for a passkey attestation operation.
+    /// </summary>
+    /// <param name="passkey">The passkey information associated with the attestation.</param>
+    /// <param name="userEntity">The user entity associated with the attestation.</param>
+    /// <returns>A <see cref="PasskeyAttestationResult"/> instance representing a successful attestation.</returns>
+    public static PasskeyAttestationResult Success(UserPasskeyInfo passkey, PasskeyUserEntity userEntity)
+    {
+        ArgumentNullException.ThrowIfNull(passkey);
+        return new PasskeyAttestationResult(passkey, userEntity);
+    }
+
+    /// <summary>
+    /// Creates a failed result for a passkey attestation operation.
+    /// </summary>
+    /// <param name="failure">The exception that describes the reason for the failure.</param>
+    /// <returns>A <see cref="PasskeyAttestationResult"/> instance representing the failure.</returns>
+    public static PasskeyAttestationResult Fail(PasskeyException failure)
+    {
+        return new PasskeyAttestationResult(failure);
+    }
+}
diff --git a/src/Identity/Core/src/PasskeyAttestationStatementVerificationContext.cs b/src/Identity/Core/src/PasskeyAttestationStatementVerificationContext.cs
new file mode 100644
index 000000000000..2e986ff71ff0
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyAttestationStatementVerificationContext.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Contains the context for passkey attestation statement verification.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#verification-procedure"/>.
+/// </remarks>
+public sealed class PasskeyAttestationStatementVerificationContext
+{
+    /// <summary>
+    /// Gets or sets the <see cref="HttpContext"/> for the current request.
+    /// </summary>
+    public required HttpContext HttpContext { get; init; }
+
+    /// <summary>
+    /// Gets or sets the attestation object as a byte array.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-object"/>.
+    /// </remarks>
+    public required ReadOnlyMemory<byte> AttestationObject { get; init; }
+
+    /// <summary>
+    /// Gets or sets the hash of the client data as a byte array.
+    /// </summary>
+    public required ReadOnlyMemory<byte> ClientDataHash { get; init; }
+}
diff --git a/src/Identity/Core/src/PasskeyCreationOptionsResult.cs b/src/Identity/Core/src/PasskeyCreationOptionsResult.cs
new file mode 100644
index 000000000000..2c1565815744
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyCreationOptionsResult.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the result of a passkey creation options generation.
+/// </summary>
+public sealed class PasskeyCreationOptionsResult
+{
+    /// <summary>
+    /// Gets or sets the JSON representation of the creation options.
+    /// </summary>
+    /// <remarks>
+    /// The structure of this JSON is compatible with
+    /// <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialcreationoptionsjson"/>
+    /// and should be used with the <c>navigator.credentials.create()</c> JavaScript API.
+    /// </remarks>
+    public required string CreationOptionsJson { get; init; }
+
+    /// <summary>
+    /// Gets or sets the state to be used in the attestation procedure.
+    /// </summary>
+    /// <remarks>
+    /// This can be later retrieved during assertion with <see cref="PasskeyAttestationContext.AttestationState"/>.
+    /// </remarks>
+    public string? AttestationState { get; init; }
+}
diff --git a/src/Identity/Core/src/PasskeyException.cs b/src/Identity/Core/src/PasskeyException.cs
new file mode 100644
index 000000000000..f10a926fd333
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyException.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents an error that occurred during passkey attestation or assertion.
+/// </summary>
+public sealed class PasskeyException : Exception
+{
+    /// <summary>
+    /// Constructs a new <see cref="PasskeyException"/> instance.
+    /// </summary>
+    public PasskeyException(string message)
+        : base(message)
+    {
+    }
+
+    /// <summary>
+    /// Constructs a new <see cref="PasskeyException"/> instance.
+    /// </summary>
+    public PasskeyException(string message, Exception? innerException)
+        : base(message, innerException)
+    {
+    }
+}
diff --git a/src/Identity/Core/src/PasskeyExceptionExtensions.cs b/src/Identity/Core/src/PasskeyExceptionExtensions.cs
new file mode 100644
index 000000000000..3caac0ba81cd
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyExceptionExtensions.cs
@@ -0,0 +1,138 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal static class PasskeyExceptionExtensions
+{
+    extension(PasskeyException)
+    {
+        public static PasskeyException InvalidCredentialType(string expectedType, string actualType)
+            => new($"Expected credential type '{expectedType}', got '{actualType}'.");
+
+        public static PasskeyException InvalidClientDataType(string expectedType, string actualType)
+            => new($"Expected the client data JSON 'type' field to be '{expectedType}', got '{actualType}'.");
+
+        public static PasskeyException InvalidChallenge()
+            => new("The authenticator response challenge does not match original challenge.");
+
+        public static PasskeyException InvalidOrigin(string origin)
+            => new($"The authenticator response had an invalid origin '{origin}'.");
+
+        public static PasskeyException InvalidRelyingPartyIDHash()
+            => new("The authenticator data included an invalid Relying Party ID hash.");
+
+        public static PasskeyException UserNotPresent()
+            => new("The authenticator data flags did not include the 'UserPresent' flag.");
+
+        public static PasskeyException UserNotVerified()
+            => new("User verification is required, but the authenticator data flags did not have the 'UserVerified' flag.");
+
+        public static PasskeyException NotBackupEligibleYetBackedUp()
+            => new("The credential is backed up, but the authenticator data flags did not have the 'BackupEligible' flag.");
+
+        public static PasskeyException MissingAttestedCredentialData()
+            => new("No attested credential data was provided by the authenticator.");
+
+        public static PasskeyException UnsupportedCredentialPublicKeyAlgorithm()
+            => new("The credential public key algorithm does not match any of the supported algorithms.");
+
+        public static PasskeyException InvalidAttestationStatement()
+            => new("The attestation statement was not valid.");
+
+        public static PasskeyException InvalidCredentialIdLength(int length)
+            => new($"Expected the credential ID to have a length between 1 and 1023 bytes, but got {length}.");
+
+        public static PasskeyException CredentialIdMismatch()
+            => new("The provided credential ID does not match the credential ID in the attested credential data.");
+
+        public static PasskeyException CredentialAlreadyRegistered()
+            => new("The credential is already registered for a user.");
+
+        public static PasskeyException CredentialDoesNotBelongToUser()
+            => new("The provided credential does not belong to the specified user.");
+
+        public static PasskeyException UserHandleMismatch(string providedUserHandle, string credentialUserHandle)
+            => new($"The provided user handle '{providedUserHandle}' does not match the credential's user handle '{credentialUserHandle}'.");
+
+        public static PasskeyException MissingUserHandle()
+            => new("The authenticator response was missing a user handle.");
+
+        public static PasskeyException ExpectedBackupEligibleCredential()
+            => new("The stored credential is eligible for backup, but the provided credential was unexpectedly ineligible for backup.");
+
+        public static PasskeyException ExpectedBackupIneligibleCredential()
+            => new("The stored credential is ineligible for backup, but the provided credential was unexpectedly eligible for backup.");
+
+        public static PasskeyException InvalidAssertionSignature()
+            => new("The assertion signature was invalid.");
+
+        public static PasskeyException SignCountLessThanOrEqualToStoredSignCount()
+            => new("The authenticator's signature counter is unexpectedly less than or equal to the stored signature counter.");
+
+        public static PasskeyException InvalidAttestationObject(Exception ex)
+            => new($"An exception occurred while parsing the attestation object: {ex.Message}", ex);
+
+        public static PasskeyException InvalidAttestationObjectFormat(Exception ex)
+            => new("The attestation object had an invalid format.", ex);
+
+        public static PasskeyException MissingAttestationStatementFormat()
+            => new("The attestation object did not include an attestation statement format.");
+
+        public static PasskeyException MissingAttestationStatement()
+            => new("The attestation object did not include an attestation statement.");
+
+        public static PasskeyException MissingAuthenticatorData()
+            => new("The attestation object did not include authenticator data.");
+
+        public static PasskeyException InvalidAuthenticatorDataLength(int length)
+            => new($"The authenticator data had an invalid byte count of {length}.");
+
+        public static PasskeyException InvalidAuthenticatorDataFormat(Exception? ex = null)
+            => new($"The authenticator data had an invalid format.", ex);
+
+        public static PasskeyException InvalidAttestedCredentialDataLength(int length)
+            => new($"The attested credential data had an invalid byte count of {length}.");
+
+        public static PasskeyException InvalidAttestedCredentialDataFormat(Exception? ex = null)
+            => new($"The attested credential data had an invalid format.", ex);
+
+        public static PasskeyException InvalidTokenBindingStatus(string tokenBindingStatus)
+            => new($"Invalid token binding status '{tokenBindingStatus}'.");
+
+        public static PasskeyException NullAttestationCredentialJson()
+            => new("The attestation credential JSON was unexpectedly null.");
+
+        public static PasskeyException InvalidAttestationCredentialJsonFormat(JsonException ex)
+            => new($"The attestation credential JSON had an invalid format: {ex.Message}", ex);
+
+        public static PasskeyException NullAssertionCredentialJson()
+            => new("The assertion credential JSON was unexpectedly null.");
+
+        public static PasskeyException InvalidAssertionCredentialJsonFormat(JsonException ex)
+            => new($"The assertion credential JSON had an invalid format: {ex.Message}", ex);
+
+        public static PasskeyException NullClientDataJson()
+            => new("The client data JSON was unexpectedly null.");
+
+        public static PasskeyException InvalidClientDataJsonFormat(JsonException ex)
+            => new($"The client data JSON had an invalid format: {ex.Message}", ex);
+
+        public static PasskeyException InvalidCredentialPublicKey(Exception ex)
+            => new($"The credential public key was invalid.", ex);
+
+        public static PasskeyException NullAttestationStateJson()
+            => new("the assertion state json was unexpectedly null.");
+
+        public static PasskeyException NullAssertionStateJson()
+            => new("the assertion state json was unexpectedly null.");
+
+        public static PasskeyException InvalidAttestationStateJsonFormat(JsonException ex)
+            => new($"The attestation state JSON had an invalid format: {ex.Message}", ex);
+
+        public static PasskeyException InvalidAssertionStateJsonFormat(JsonException ex)
+            => new($"The assertion state JSON had an invalid format: {ex.Message}", ex);
+    }
+}
diff --git a/src/Identity/Core/src/PasskeyHandler.cs b/src/Identity/Core/src/PasskeyHandler.cs
new file mode 100644
index 000000000000..c3c7ff3e7cd2
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyHandler.cs
@@ -0,0 +1,679 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// The default passkey handler.
+/// </summary>
+public sealed class PasskeyHandler<TUser> : IPasskeyHandler<TUser>
+    where TUser : class
+{
+    private readonly UserManager<TUser> _userManager;
+    private readonly IdentityPasskeyOptions _options;
+
+    /// <summary>
+    /// Constructs a new <see cref="PasskeyHandler{TUser}"/> instance.
+    /// </summary>
+    /// <param name="userManager">The <see cref="UserManager{TUser}"/>.</param>
+    /// <param name="options">The <see cref="IdentityOptions"/>.</param>
+    public PasskeyHandler(UserManager<TUser> userManager, IOptions<IdentityPasskeyOptions> options)
+    {
+        ArgumentNullException.ThrowIfNull(userManager);
+        ArgumentNullException.ThrowIfNull(options);
+
+        _userManager = userManager;
+        _options = options.Value;
+    }
+
+    /// <inheritdoc />
+    public async Task<PasskeyCreationOptionsResult> MakeCreationOptionsAsync(PasskeyUserEntity userEntity, HttpContext httpContext)
+    {
+        ArgumentNullException.ThrowIfNull(userEntity);
+        ArgumentNullException.ThrowIfNull(httpContext);
+
+        var excludeCredentials = await GetExcludeCredentialsAsync().ConfigureAwait(false);
+        var serverDomain = GetServerDomain(httpContext);
+        var challenge = RandomNumberGenerator.GetBytes(_options.ChallengeSize);
+        var pubKeyCredParams = _options.IsAllowedAlgorithm is { } isAllowedAlgorithm
+            ? [.. CredentialPublicKey.AllSupportedParameters.Where(p => isAllowedAlgorithm((int)p.Alg))]
+            : CredentialPublicKey.AllSupportedParameters;
+        var options = new PublicKeyCredentialCreationOptions
+        {
+            Rp = new()
+            {
+                Name = serverDomain,
+                Id = serverDomain,
+            },
+            User = new()
+            {
+                Id = BufferSource.FromString(userEntity.Id),
+                Name = userEntity.Name,
+                DisplayName = userEntity.DisplayName,
+            },
+            Challenge = BufferSource.FromBytes(challenge),
+            Timeout = (uint)_options.AuthenticatorTimeout.TotalMilliseconds,
+            ExcludeCredentials = excludeCredentials,
+            PubKeyCredParams = pubKeyCredParams,
+            AuthenticatorSelection = new()
+            {
+                AuthenticatorAttachment = _options.AuthenticatorAttachment,
+                ResidentKey = _options.ResidentKeyRequirement,
+                UserVerification = _options.UserVerificationRequirement,
+            },
+            Attestation = _options.AttestationConveyancePreference,
+        };
+        var attestationState = new PasskeyAttestationState
+        {
+            Challenge = challenge,
+            UserEntity = userEntity,
+        };
+        var optionsJson = JsonSerializer.Serialize(options, IdentityJsonSerializerContext.Default.PublicKeyCredentialCreationOptions);
+        var attestationStateJson = JsonSerializer.Serialize(attestationState, IdentityJsonSerializerContext.Default.PasskeyAttestationState);
+        var creationOptions = new PasskeyCreationOptionsResult
+        {
+            CreationOptionsJson = optionsJson,
+            AttestationState = attestationStateJson,
+        };
+
+        return creationOptions;
+
+        async Task<PublicKeyCredentialDescriptor[]> GetExcludeCredentialsAsync()
+        {
+            var existingUser = await _userManager.FindByIdAsync(userEntity.Id).ConfigureAwait(false);
+            if (existingUser is null)
+            {
+                return [];
+            }
+
+            var passkeys = await _userManager.GetPasskeysAsync(existingUser).ConfigureAwait(false);
+            var excludeCredentials = passkeys
+                .Select(p => new PublicKeyCredentialDescriptor
+                {
+                    Type = "public-key",
+                    Id = BufferSource.FromBytes(p.CredentialId),
+                    Transports = p.Transports ?? [],
+                });
+            return [.. excludeCredentials];
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<PasskeyRequestOptionsResult> MakeRequestOptionsAsync(TUser? user, HttpContext httpContext)
+    {
+        ArgumentNullException.ThrowIfNull(httpContext);
+
+        var allowCredentials = await GetAllowCredentialsAsync().ConfigureAwait(false);
+        var serverDomain = GetServerDomain(httpContext);
+        var challenge = RandomNumberGenerator.GetBytes(_options.ChallengeSize);
+        var options = new PublicKeyCredentialRequestOptions
+        {
+            Challenge = BufferSource.FromBytes(challenge),
+            RpId = serverDomain,
+            Timeout = (uint)_options.AuthenticatorTimeout.TotalMilliseconds,
+            AllowCredentials = allowCredentials,
+            UserVerification = _options.UserVerificationRequirement,
+        };
+        var userId = user is not null ? await _userManager.GetUserIdAsync(user).ConfigureAwait(false) : null;
+        var assertionState = new PasskeyAssertionState
+        {
+            Challenge = challenge,
+            UserId = userId,
+        };
+        var optionsJson = JsonSerializer.Serialize(options, IdentityJsonSerializerContext.Default.PublicKeyCredentialRequestOptions);
+        var assertionStateJson = JsonSerializer.Serialize(assertionState, IdentityJsonSerializerContext.Default.PasskeyAssertionState);
+        var requestOptions = new PasskeyRequestOptionsResult
+        {
+            RequestOptionsJson = optionsJson,
+            AssertionState = assertionStateJson,
+        };
+
+        return requestOptions;
+
+        async Task<PublicKeyCredentialDescriptor[]> GetAllowCredentialsAsync()
+        {
+            if (user is null)
+            {
+                return [];
+            }
+
+            var passkeys = await _userManager.GetPasskeysAsync(user).ConfigureAwait(false);
+            var allowCredentials = passkeys
+                .Select(p => new PublicKeyCredentialDescriptor
+                {
+                    Type = "public-key",
+                    Id = BufferSource.FromBytes(p.CredentialId),
+                    Transports = p.Transports ?? [],
+                });
+            return [.. allowCredentials];
+        }
+    }
+
+    /// <inheritdoc/>
+    public async Task<PasskeyAttestationResult> PerformAttestationAsync(PasskeyAttestationContext context)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+
+        try
+        {
+            return await PerformAttestationCoreAsync(context).ConfigureAwait(false);
+        }
+        catch (PasskeyException ex)
+        {
+            return PasskeyAttestationResult.Fail(ex);
+        }
+        catch (Exception ex)
+        {
+            if (ex is OperationCanceledException)
+            {
+                throw;
+            }
+
+            return PasskeyAttestationResult.Fail(new PasskeyException($"An unexpected error occurred during passkey attestation: {ex.Message}", ex));
+        }
+    }
+
+    /// <inheritdoc/>
+    public async Task<PasskeyAssertionResult<TUser>> PerformAssertionAsync(PasskeyAssertionContext context)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+
+        try
+        {
+            return await PerformAssertionCoreAsync(context).ConfigureAwait(false);
+        }
+        catch (PasskeyException ex)
+        {
+            return PasskeyAssertionResult.Fail<TUser>(ex);
+        }
+        catch (Exception ex)
+        {
+            if (ex is OperationCanceledException)
+            {
+                throw;
+            }
+
+            return PasskeyAssertionResult.Fail<TUser>(new PasskeyException($"An unexpected error occurred during passkey assertion: {ex.Message}", ex));
+        }
+    }
+
+    /// <summary>
+    /// Performs passkey attestation using the provided credential JSON and original options JSON.
+    /// </summary>
+    /// <param name="context">The context containing necessary information for passkey attestation.</param>
+    /// <returns>A task object representing the asynchronous operation containing the <see cref="PasskeyAttestationResult"/>.</returns>
+    private async Task<PasskeyAttestationResult> PerformAttestationCoreAsync(PasskeyAttestationContext context)
+    {
+        // See: https://www.w3.org/TR/webauthn-3/#sctn-registering-a-new-credential
+        // NOTE: Quotes from the spec may have been modified.
+        // NOTE: Steps 1-3 are expected to have been performed prior to the execution of this method.
+
+        PublicKeyCredential<AuthenticatorAttestationResponse> credential;
+        PasskeyAttestationState attestationState;
+
+        try
+        {
+            credential = JsonSerializer.Deserialize(context.CredentialJson, IdentityJsonSerializerContext.Default.PublicKeyCredentialAuthenticatorAttestationResponse)
+                ?? throw PasskeyException.NullAttestationCredentialJson();
+        }
+        catch (JsonException ex)
+        {
+            throw PasskeyException.InvalidAttestationCredentialJsonFormat(ex);
+        }
+
+        try
+        {
+            if (context.AttestationState is not { } attestationStateJson)
+            {
+                throw PasskeyException.NullAttestationStateJson();
+            }
+
+            attestationState = JsonSerializer.Deserialize(attestationStateJson, IdentityJsonSerializerContext.Default.PasskeyAttestationState)
+                ?? throw PasskeyException.NullAttestationStateJson();
+        }
+        catch (JsonException ex)
+        {
+            throw PasskeyException.InvalidAttestationStateJsonFormat(ex);
+        }
+
+        VerifyCredentialType(credential);
+
+        // 3. Let response be credential.response.
+        var response = credential.Response;
+
+        // 4. Let clientExtensionResults be the result of calling credential.getClientExtensionResults().
+        // NOTE: Not currently supported.
+
+        // 5. Let JSONtext be the result of running UTF-8 decode on the value of response.clientDataJSON.
+        // 6. Let clientData, claimed as collected during the credential creation, be the result of running an implementation-specific JSON parser on JSONtext.
+        // 7. Verify that the value of clientData.type is webauthn.create.
+        // 8. Verify that the value of clientData.challenge equals the base64url encoding of pkOptions.challenge.
+        // 9-11. Verify that the value of C.origin matches the Relying Party's origin.
+        await VerifyClientDataAsync(
+            utf8Json: response.ClientDataJSON.AsMemory(),
+            originalChallenge: attestationState.Challenge,
+            expectedType: "webauthn.create",
+            context.HttpContext)
+            .ConfigureAwait(false);
+
+        // 12. Let clientDataHash be the result of computing a hash over response.clientDataJSON using SHA-256.
+        var clientDataHash = SHA256.HashData(response.ClientDataJSON.AsSpan());
+
+        // 13. Perform CBOR decoding on the attestationObject field of the AuthenticatorAttestationResponse structure and obtain the
+        //     the authenticator data authenticatorData.
+        var attestationObjectMemory = response.AttestationObject.AsMemory();
+        var attestationObject = AttestationObject.Parse(attestationObjectMemory);
+        var authenticatorData = AuthenticatorData.Parse(attestationObject.AuthenticatorData);
+
+        // 14. Verify that the rpIdHash in authenticatorData is the SHA-256 hash of the RP ID expected by the Relying Party.
+        // 15. If options.mediation is not set to conditional, verify that the UP bit of the flags in authData is set.
+        // 16. If user verification is required for this registration, verify that the User Verified bit of the flags in authData is set.
+        // 17. If the BE bit of the flags in authData is not set, verify that the BS bit is not set.
+        // 18. If the Relying Party uses the credential's backup eligibility to inform its user experience flows and/or policies,
+        //     evaluate the BE bit of the flags in authData.
+        // 19. If the Relying Party uses the credential's backup state to inform its user experience flows and/or policies, evaluate the BS
+        //     bit of the flags in authData.
+        //     NOTE: It's up to application code to evaluate BE and BS flags on the returned passkey and determine
+        //           whether any action should be taken based on them.
+        VerifyAuthenticatorData(authenticatorData, context.HttpContext);
+
+        if (!authenticatorData.HasAttestedCredentialData)
+        {
+            throw PasskeyException.MissingAttestedCredentialData();
+        }
+
+        // 20. Verify that the "alg" parameter in the credential public key in authData matches the alg attribute of one of the items in pkOptions.pubKeyCredParams.
+        var attestedCredentialData = authenticatorData.AttestedCredentialData;
+        var algorithm = attestedCredentialData.CredentialPublicKey.Alg;
+        if (!CredentialPublicKey.IsSupportedAlgorithm(algorithm))
+        {
+            // The algorithm is not implemented.
+            throw PasskeyException.UnsupportedCredentialPublicKeyAlgorithm();
+        }
+        if (_options.IsAllowedAlgorithm is { } isAllowedAlgorithm && !isAllowedAlgorithm((int)algorithm))
+        {
+            // The algorithm is disallowed by the application.
+            throw PasskeyException.UnsupportedCredentialPublicKeyAlgorithm();
+        }
+
+        // 21-24. Determine the attestation statement format by performing a USASCII case-sensitive match on fmt against the set of supported WebAuthn
+        //        Attestation Statement Format Identifier values...
+        //        Handles all validation related to the attestation statement (21-24).
+        if (_options.VerifyAttestationStatement is { } verifyAttestationStatement)
+        {
+            var isAttestationStatementValid = await verifyAttestationStatement(new()
+            {
+                HttpContext = context.HttpContext,
+                AttestationObject = attestationObjectMemory,
+                ClientDataHash = clientDataHash,
+            }).ConfigureAwait(false);
+
+            if (!isAttestationStatementValid)
+            {
+                throw PasskeyException.InvalidAttestationStatement();
+            }
+        }
+
+        // 25. Verify that the credentialId is <= 1023 bytes.
+        // NOTE: Handled while parsing the attested credential data.
+        if (!credential.Id.AsSpan().SequenceEqual(attestedCredentialData.CredentialId.Span))
+        {
+            throw PasskeyException.CredentialIdMismatch();
+        }
+
+        var credentialId = attestedCredentialData.CredentialId.ToArray();
+
+        // 26. Verify that the credentialId is not yet registered for any user.
+        var existingUser = await _userManager.FindByPasskeyIdAsync(credentialId).ConfigureAwait(false);
+        if (existingUser is not null)
+        {
+            throw PasskeyException.CredentialAlreadyRegistered();
+        }
+
+        // 27. Let credentialRecord be a new credential record with the following contents:
+        var credentialRecord = new UserPasskeyInfo(
+            credentialId,
+            publicKey: attestedCredentialData.CredentialPublicKey.ToArray(),
+            createdAt: DateTime.UtcNow,
+            signCount: authenticatorData.SignCount,
+            transports: response.Transports,
+            isUserVerified: authenticatorData.IsUserVerified,
+            isBackupEligible: authenticatorData.IsBackupEligible,
+            isBackedUp: authenticatorData.IsBackedUp,
+            attestationObject: response.AttestationObject.ToArray(),
+            clientDataJson: response.ClientDataJSON.ToArray());
+
+        // 28. Process the client extension outputs in clientExtensionResults and the authenticator extension
+        //     outputs in the extensions in authData as required by the Relying Party.
+        // NOTE: Not currently supported.
+
+        // 29. If all the above steps are successful, store credentialRecord in the user account that was denoted
+        // and continue the registration ceremony as appropriate.
+        return PasskeyAttestationResult.Success(credentialRecord, attestationState.UserEntity);
+    }
+
+    /// <summary>
+    /// Performs passkey assertion using the provided credential JSON, original options JSON, and optional user.
+    /// </summary>
+    /// <param name="context">The context containing necessary information for passkey assertion.</param>
+    /// <returns>A task object representing the asynchronous operation containing the <see cref="PasskeyAssertionResult{TUser}"/>.</returns>
+    private async Task<PasskeyAssertionResult<TUser>> PerformAssertionCoreAsync(PasskeyAssertionContext context)
+    {
+        // See https://www.w3.org/TR/webauthn-3/#sctn-verifying-assertion
+        // NOTE: Quotes from the spec may have been modified.
+        // NOTE: Steps 1-3 are expected to have been performed prior to the execution of this method.
+
+        PublicKeyCredential<AuthenticatorAssertionResponse> credential;
+        PasskeyAssertionState assertionState;
+
+        try
+        {
+            credential = JsonSerializer.Deserialize(context.CredentialJson, IdentityJsonSerializerContext.Default.PublicKeyCredentialAuthenticatorAssertionResponse)
+                ?? throw PasskeyException.NullAssertionCredentialJson();
+        }
+        catch (JsonException ex)
+        {
+            throw PasskeyException.InvalidAssertionCredentialJsonFormat(ex);
+        }
+
+        try
+        {
+            if (context.AssertionState is not { } assertionStateJson)
+            {
+                throw PasskeyException.NullAssertionStateJson();
+            }
+
+            assertionState = JsonSerializer.Deserialize(assertionStateJson, IdentityJsonSerializerContext.Default.PasskeyAssertionState)
+                ?? throw PasskeyException.NullAssertionStateJson();
+        }
+        catch (JsonException ex)
+        {
+            throw PasskeyException.InvalidAssertionStateJsonFormat(ex);
+        }
+
+        TUser? user = null;
+        var originalUserId = assertionState.UserId;
+        if (originalUserId is not null)
+        {
+            user = await _userManager.FindByIdAsync(originalUserId).ConfigureAwait(false)
+                ?? throw PasskeyException.CredentialDoesNotBelongToUser();
+        }
+
+        VerifyCredentialType(credential);
+
+        // 3. Let response be credential.response.
+        var response = credential.Response;
+
+        // 4. Let clientExtensionResults be the result of calling credential.getClientExtensionResults().
+        // NOTE: Not currently supported.
+
+        // 5. If originalOptions.allowCredentials is not empty, verify that credential.id identifies one of the public key
+        //    credentials listed in pkOptions.allowCredentials.
+        //    NOTE: Since we always include the user's full list of credentials in the options,
+        //          we can simply check that the credential ID is present on the user.
+        //          If we change this behavior, we may need to explicitly handle this step.
+
+        var credentialId = credential.Id.ToArray();
+        var userHandle = response.UserHandle?.ToString();
+        UserPasskeyInfo? storedPasskey;
+
+        // 6. Identify the user being authenticated and let credentialRecord be the credential record for the credential:
+        if (user is not null)
+        {
+            // The user should only be non-null if the user ID was provided in the properties.
+            Debug.Assert(originalUserId is not null);
+
+            // * If the user was identified before the authentication ceremony was initiated, e.g., via a username or cookie,
+            //   verify that the identified user account contains a credential record whose id equals
+            //   credential.rawId. Let credentialRecord be that credential record. If response.userHandle is
+            //   present, verify that it equals the user handle of the user account.
+            storedPasskey = await _userManager.GetPasskeyAsync(user, credentialId).ConfigureAwait(false);
+            if (storedPasskey is null)
+            {
+                throw PasskeyException.CredentialDoesNotBelongToUser();
+            }
+            if (userHandle is not null && !string.Equals(originalUserId, userHandle, StringComparison.Ordinal))
+            {
+                throw PasskeyException.UserHandleMismatch(originalUserId, userHandle);
+            }
+        }
+        else
+        {
+            // * If the user was not identified before the authentication ceremony was initiated,
+            //   verify that response.userHandle is present. Verify that the user account identified by
+            //   response.userHandle contains a credential record whose id equals credential.rawId. Let
+            //   credentialRecord be that credential record.
+            if (userHandle is null)
+            {
+                throw PasskeyException.MissingUserHandle();
+            }
+
+            user = await _userManager.FindByIdAsync(userHandle).ConfigureAwait(false);
+            if (user is null)
+            {
+                throw PasskeyException.CredentialDoesNotBelongToUser();
+            }
+            storedPasskey = await _userManager.GetPasskeyAsync(user, credentialId).ConfigureAwait(false);
+            if (storedPasskey is null)
+            {
+                throw PasskeyException.CredentialDoesNotBelongToUser();
+            }
+        }
+
+        // 7. Let cData, authData and sig denote the value of response's clientDataJSON, authenticatorData, and signature respectively.
+        var authenticatorData = AuthenticatorData.Parse(response.AuthenticatorData.AsMemory());
+
+        // 8. Let JSONtext be the result of running UTF-8 decode on the value of cData.
+        // 9. Let C, the client data claimed as used for the signature, be the result of running an implementation-specific JSON parser on JSONtext.
+        // 10. Verify that the value of C.type is the string webauthn.get.
+        // 11. Verify that the value of C.challenge equals the base64url encoding of originalOptions.challenge.
+        // 12-14. Verify that the value of C.origin is an origin expected by the Relying Party.
+        await VerifyClientDataAsync(
+            utf8Json: response.ClientDataJSON.AsMemory(),
+            originalChallenge: assertionState.Challenge,
+            expectedType: "webauthn.get",
+            context.HttpContext)
+            .ConfigureAwait(false);
+
+        // 15. Verify that the rpIdHash in authData is the SHA-256 hash of the RP ID expected by the Relying Party.
+        // 16. Verify that the UP bit of the flags in authData is set.
+        // 17. If user verification was determined to be required, verify that the UV bit of the flags in authData is set.
+        //     Otherwise, ignore the value of the UV flag.
+        // 18. If the BE bit of the flags in authData is not set, verify that the BS bit is not set.
+        VerifyAuthenticatorData(authenticatorData, context.HttpContext);
+
+        // 19. If the credential backup state is used as part of Relying Party business logic or policy, let currentBe and currentBs
+        //     be the values of the BE and BS bits, respectively, of the flags in authData. Compare currentBe and currentBs with
+        //     credentialRecord.backupEligible and credentialRecord.backupState:
+        //     1. If credentialRecord.backupEligible is set, verify that currentBe is set.
+        //     2. If credentialRecord.backupEligible is not set, verify that currentBe is not set.
+        //     3. Apply Relying Party policy, if any.
+        //        NOTE: Additional RP policies should be handled by application code.
+        if (storedPasskey.IsBackupEligible && !authenticatorData.IsBackupEligible)
+        {
+            throw PasskeyException.ExpectedBackupEligibleCredential();
+        }
+        if (!storedPasskey.IsBackupEligible && authenticatorData.IsBackupEligible)
+        {
+            throw PasskeyException.ExpectedBackupIneligibleCredential();
+        }
+
+        // 20. Let clientDataHash be the result of computing a hash over the cData using SHA-256.
+        var clientDataHash = SHA256.HashData(response.ClientDataJSON.AsSpan());
+
+        // 21. Using credentialRecord.publicKey, verify that sig is a valid signature over the binary concatenation of authData and hash.
+        byte[] data = [.. response.AuthenticatorData.AsSpan(), .. clientDataHash];
+        var cpk = CredentialPublicKey.Decode(storedPasskey.PublicKey);
+        if (!cpk.Verify(data, response.Signature.AsSpan()))
+        {
+            throw PasskeyException.InvalidAssertionSignature();
+        }
+
+        // 22. If authData.signCount is nonzero or credentialRecord.signCount is nonzero, then run the following sub-step:
+        if (authenticatorData.SignCount != 0 || storedPasskey.SignCount != 0)
+        {
+            // * If authData.signCount is greater than credentialRecord.signCount:
+            //       The signature counter is valid.
+            // * If authData.signCount is less than or equal to credentialRecord.signCount
+            //       This is a signal, but not proof, that the authenticator may be cloned.
+            //       NOTE: We simply fail the ceremony in this case.
+            if (authenticatorData.SignCount <= storedPasskey.SignCount)
+            {
+                throw PasskeyException.SignCountLessThanOrEqualToStoredSignCount();
+            }
+        }
+
+        // 23. Process the client extension outputs in clientExtensionResults and the authenticator extension outputs
+        //     in the extensions in authData as required by the Relying Party.
+        // NOTE: Not currently supported.
+
+        // 24. Update credentialRecord with new state values
+        //     1. Update credentialRecord.signCount to the value of authData.signCount.
+        storedPasskey.SignCount = authenticatorData.SignCount;
+
+        //     2. Update credentialRecord.backupState to the value of currentBs.
+        storedPasskey.IsBackedUp = authenticatorData.IsBackedUp;
+
+        //     3. If credentialRecord.uvInitialized is false, update it to the value of the UV bit in the flags in authData.
+        //     This change SHOULD require authorization by an additional authentication factor equivalent to WebAuthn user verification;
+        //     if not authorized, skip this step.
+        // NOTE: Not currently supported.
+
+        // 25. If all the above steps are successful, continue the authentication ceremony as appropriate.
+        return PasskeyAssertionResult.Success(storedPasskey, user);
+    }
+
+    private static void VerifyCredentialType<TResponse>(PublicKeyCredential<TResponse> credential)
+        where TResponse : AuthenticatorResponse
+    {
+        const string ExpectedType = "public-key";
+        if (!string.Equals(ExpectedType, credential.Type, StringComparison.Ordinal))
+        {
+            throw PasskeyException.InvalidCredentialType(ExpectedType, credential.Type);
+        }
+    }
+
+    private async Task VerifyClientDataAsync(
+        ReadOnlyMemory<byte> utf8Json,
+        ReadOnlyMemory<byte> originalChallenge,
+        string expectedType,
+        HttpContext httpContext)
+    {
+        // Let JSONtext be the result of running UTF-8 decode on the value of cData.
+        // Let C, the client data claimed as used for the signature, be the result of running an implementation-specific JSON parser on JSONtext.
+        CollectedClientData clientData;
+        try
+        {
+            clientData = JsonSerializer.Deserialize(utf8Json.Span, IdentityJsonSerializerContext.Default.CollectedClientData)
+                ?? throw PasskeyException.NullClientDataJson();
+        }
+        catch (JsonException ex)
+        {
+            throw PasskeyException.InvalidClientDataJsonFormat(ex);
+        }
+
+        // Verify that the value of C.type is either the string webauthn.create or webauthn.get.
+        // NOTE: The expected value depends on whether we're performing attestation or assertion.
+        if (!string.Equals(expectedType, clientData.Type, StringComparison.Ordinal))
+        {
+            throw PasskeyException.InvalidClientDataType(expectedType, clientData.Type);
+        }
+
+        // Verify that the value of C.challenge equals the base64url encoding of originalOptions.challenge.
+        if (!CryptographicOperations.FixedTimeEquals(clientData.Challenge.AsSpan(), originalChallenge.Span))
+        {
+            throw PasskeyException.InvalidChallenge();
+        }
+
+        // Verify that the value of C.origin is an origin expected by the Relying Party.
+        var isOriginValid = await ValidateOriginAsync(clientData, httpContext).ConfigureAwait(false);
+        if (!isOriginValid)
+        {
+            throw PasskeyException.InvalidOrigin(clientData.Origin);
+        }
+
+        // NOTE: The level 2 spec requires token binding validation, but the level 3 spec does not.
+        //       We'll just validate that the token binding object doesn't have an unexpected format.
+        if (clientData.TokenBinding is { } tokenBinding)
+        {
+            var status = tokenBinding.Status;
+            if (!string.Equals("supported", status, StringComparison.Ordinal) &&
+                !string.Equals("present", status, StringComparison.Ordinal) &&
+                !string.Equals("not-supported", status, StringComparison.Ordinal))
+            {
+                throw PasskeyException.InvalidTokenBindingStatus(status);
+            }
+        }
+    }
+
+    private void VerifyAuthenticatorData(
+        AuthenticatorData authenticatorData,
+        HttpContext httpContext)
+    {
+        // Verify that the rpIdHash in authenticatorData is the SHA-256 hash of the RP ID expected by the Relying Party.
+        var originalRpId = GetServerDomain(httpContext);
+        var originalRpIdHash = SHA256.HashData(Encoding.UTF8.GetBytes(originalRpId ?? string.Empty));
+        if (!CryptographicOperations.FixedTimeEquals(authenticatorData.RpIdHash.Span, originalRpIdHash.AsSpan()))
+        {
+            throw PasskeyException.InvalidRelyingPartyIDHash();
+        }
+
+        // If options.mediation is not set to conditional, verify that the UP bit of the flags in authData is set.
+        // NOTE: We currently check for the UserPresent flag unconditionally. Consider making this optional via options.mediation
+        //       after the level 3 draft becomes standard.
+        if (!authenticatorData.IsUserPresent)
+        {
+            throw PasskeyException.UserNotPresent();
+        }
+
+        // If user verification is required for this registration, verify that the User Verified bit of the flags in authData is set.
+        var originalUserVerificationRequirement = _options.UserVerificationRequirement;
+        if (string.Equals("required", originalUserVerificationRequirement, StringComparison.Ordinal) && !authenticatorData.IsUserVerified)
+        {
+            throw PasskeyException.UserNotVerified();
+        }
+
+        // If the BE bit of the flags in authData is not set, verify that the BS bit is not set.
+        if (!authenticatorData.IsBackupEligible && authenticatorData.IsBackedUp)
+        {
+            throw PasskeyException.NotBackupEligibleYetBackedUp();
+        }
+    }
+
+    private ValueTask<bool> ValidateOriginAsync(CollectedClientData clientData, HttpContext httpContext)
+    {
+        if (_options.ValidateOrigin is { } validateOrigin)
+        {
+            // The user has overridden the default origin validation,
+            // so we'll use that instead of the default behavior.
+            return validateOrigin(new PasskeyOriginValidationContext
+            {
+                HttpContext = httpContext,
+                Origin = clientData.Origin,
+                CrossOrigin = clientData.CrossOrigin == true,
+                TopOrigin = clientData.TopOrigin,
+            });
+        }
+
+        if (string.IsNullOrEmpty(clientData.Origin) ||
+            clientData.CrossOrigin == true ||
+            !Uri.TryCreate(clientData.Origin, UriKind.Absolute, out var originUri))
+        {
+            return ValueTask.FromResult(false);
+        }
+
+        // Uri.Equals correctly handles string comparands.
+        return ValueTask.FromResult(httpContext.Request.Headers.Origin is [var origin] && originUri.Equals(origin));
+    }
+
+    private string GetServerDomain(HttpContext httpContext)
+        => _options.ServerDomain ?? httpContext.Request.Host.Host;
+}
diff --git a/src/Identity/Core/src/PasskeyOriginValidationContext.cs b/src/Identity/Core/src/PasskeyOriginValidationContext.cs
new file mode 100644
index 000000000000..c7580eecdd34
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyOriginValidationContext.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Contains information used for determining whether a passkey's origin is valid.
+/// </summary>
+public sealed class PasskeyOriginValidationContext
+{
+    /// <summary>
+    /// Gets or sets the HTTP context associated with the request.
+    /// </summary>
+    public required HttpContext HttpContext { get; init; }
+
+    /// <summary>
+    /// Gets or sets the fully-qualified origin of the requester.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-collectedclientdata-origin"/>.
+    /// </remarks>
+    public required string Origin { get; init; }
+
+    /// <summary>
+    /// Gets or sets whether the request came from a cross-origin <c>&lt;iframe&gt;</c>.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-collectedclientdata-crossorigin"/>.
+    /// </remarks>
+    public required bool CrossOrigin { get; init; }
+
+    /// <summary>
+    /// Gets or sets the fully-qualified top-level origin of the requester.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-collectedclientdata-toporigin"/>.
+    /// </remarks>
+    public string? TopOrigin { get; init; }
+}
diff --git a/src/Identity/Core/src/PasskeyRequestOptionsResult.cs b/src/Identity/Core/src/PasskeyRequestOptionsResult.cs
new file mode 100644
index 000000000000..f5e78a2bcb3b
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyRequestOptionsResult.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the result of a passkey request options generation.
+/// </summary>
+public sealed class PasskeyRequestOptionsResult
+{
+    /// <summary>
+    /// Gets or sets the JSON representation of the request options.
+    /// </summary>
+    /// <remarks>
+    /// The structure of this JSON is compatible with
+    /// <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialrequestoptionsjson"/>
+    /// and should be used with the <c>navigator.credentials.get()</c> JavaScript API.
+    /// </remarks>
+    public required string RequestOptionsJson { get; init; }
+
+    /// <summary>
+    /// Gets or sets the state to be used in the assertion procedure.
+    /// </summary>
+    /// <remarks>
+    /// This can be later retrieved during assertion with <see cref="PasskeyAssertionContext.AssertionState"/>.
+    /// </remarks>
+    public string? AssertionState { get; init; }
+}
diff --git a/src/Identity/Core/src/PasskeyUserEntity.cs b/src/Identity/Core/src/PasskeyUserEntity.cs
new file mode 100644
index 000000000000..8b19c0d38783
--- /dev/null
+++ b/src/Identity/Core/src/PasskeyUserEntity.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents information about the user associated with a passkey.
+/// </summary>
+public sealed class PasskeyUserEntity
+{
+    /// <summary>
+    /// Gets the user ID associated with a passkey.
+    /// </summary>
+    public required string Id { get; init; }
+
+    /// <summary>
+    /// Gets the name of the user associated with a passkey.
+    /// </summary>
+    public required string Name { get; init; }
+
+    /// <summary>
+    /// Gets the display name of the user associated with a passkey.
+    /// </summary>
+    public required string DisplayName { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/AttestationObject.cs b/src/Identity/Core/src/Passkeys/AttestationObject.cs
new file mode 100644
index 000000000000..649df7249a6e
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AttestationObject.cs
@@ -0,0 +1,116 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Formats.Cbor;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents an authenticator attestation object, which contains the attestation statement and authenticator data.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-object"/>.
+/// </remarks>
+internal sealed class AttestationObject
+{
+    /// <summary>
+    /// Gets or sets the attestation statement format.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-statement-format"/>.
+    /// </remarks>
+    public required string Format { get; init; }
+
+    /// <summary>
+    /// Gets or sets the attestation statement.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-statement"/>.
+    /// </remarks>
+    public required ReadOnlyMemory<byte> AttestationStatement { get; init; }
+
+    /// <summary>
+    /// Gets or sets the authenticator data.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#authenticator-data"/>.
+    /// </remarks>
+    public required ReadOnlyMemory<byte> AuthenticatorData { get; init; }
+
+    public static AttestationObject Parse(ReadOnlyMemory<byte> data)
+    {
+        try
+        {
+            return ParseCore(data);
+        }
+        catch (PasskeyException)
+        {
+            throw;
+        }
+        catch (CborContentException ex)
+        {
+            throw PasskeyException.InvalidAttestationObjectFormat(ex);
+        }
+        catch (InvalidOperationException ex)
+        {
+            throw PasskeyException.InvalidAttestationObjectFormat(ex);
+        }
+        catch (Exception ex)
+        {
+            throw PasskeyException.InvalidAttestationObject(ex);
+        }
+    }
+
+    private static AttestationObject ParseCore(ReadOnlyMemory<byte> data)
+    {
+        var reader = new CborReader(data);
+        _ = reader.ReadStartMap();
+
+        string? format = null;
+        ReadOnlyMemory<byte>? attestationStatement = default;
+        ReadOnlyMemory<byte>? authenticatorData = default;
+
+        while (reader.PeekState() != CborReaderState.EndMap)
+        {
+            var key = reader.ReadTextString();
+            switch (key)
+            {
+                case "fmt":
+                    format = reader.ReadTextString();
+                    break;
+                case "attStmt":
+                    attestationStatement = reader.ReadEncodedValue();
+                    break;
+                case "authData":
+                    authenticatorData = reader.ReadByteString();
+                    break;
+                default:
+                    // Unknown key - skip.
+                    reader.SkipValue();
+                    break;
+            }
+        }
+
+        if (format is null)
+        {
+            throw PasskeyException.MissingAttestationStatementFormat();
+        }
+
+        if (!attestationStatement.HasValue)
+        {
+            throw PasskeyException.MissingAttestationStatement();
+        }
+
+        if (!authenticatorData.HasValue)
+        {
+            throw PasskeyException.MissingAuthenticatorData();
+        }
+
+        return new()
+        {
+            Format = format,
+            AttestationStatement = attestationStatement.Value,
+            AuthenticatorData = authenticatorData.Value
+        };
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/AttestedCredentialData.cs b/src/Identity/Core/src/Passkeys/AttestedCredentialData.cs
new file mode 100644
index 000000000000..7c09c3ba5e9c
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AttestedCredentialData.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers.Binary;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents attested credential data in an <see cref="AuthenticatorData"/>.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#attested-credential-data"/>.
+/// </remarks>
+internal sealed class AttestedCredentialData
+{
+    /// <summary>
+    /// Gets or sets the AAGUID of the authenticator that created the credential.
+    /// </summary>
+    public required ReadOnlyMemory<byte> Aaguid { get; init; }
+
+    /// <summary>
+    /// Gets or sets the credential ID.
+    /// </summary>
+    public required ReadOnlyMemory<byte> CredentialId { get; init; }
+
+    /// <summary>
+    /// Gets or sets the credential public key.
+    /// </summary>
+    public required CredentialPublicKey CredentialPublicKey { get; init; }
+
+    public static AttestedCredentialData Parse(ReadOnlyMemory<byte> data, out int bytesRead)
+    {
+        try
+        {
+            return ParseCore(data, out bytesRead);
+        }
+        catch (PasskeyException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw PasskeyException.InvalidAttestedCredentialDataFormat(ex);
+        }
+    }
+
+    private static AttestedCredentialData ParseCore(ReadOnlyMemory<byte> data, out int bytesRead)
+    {
+        const int AaguidLength = 16;
+        const int CredentialIdLengthLength = 2;
+        const int MinLength = AaguidLength + CredentialIdLengthLength;
+        const int MaxCredentialIdLength = 1023;
+
+        var offset = 0;
+
+        if (data.Length < MinLength)
+        {
+            throw PasskeyException.InvalidAttestedCredentialDataLength(data.Length);
+        }
+
+        var aaguid = data.Slice(offset, AaguidLength);
+        offset += AaguidLength;
+
+        var credentialIdLength = BinaryPrimitives.ReadUInt16BigEndian(data.Slice(offset, CredentialIdLengthLength).Span);
+        offset += CredentialIdLengthLength;
+
+        if (credentialIdLength > MaxCredentialIdLength)
+        {
+            throw PasskeyException.InvalidCredentialIdLength(credentialIdLength);
+        }
+
+        var credentialId = data.Slice(offset, credentialIdLength).ToArray();
+        offset += credentialIdLength;
+
+        var credentialPublicKey = CredentialPublicKey.Decode(data[offset..], out var read);
+        offset += read;
+
+        bytesRead = offset;
+        return new()
+        {
+            Aaguid = aaguid,
+            CredentialId = credentialId,
+            CredentialPublicKey = credentialPublicKey,
+        };
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/AuthenticatorAssertionResponse.cs b/src/Identity/Core/src/Passkeys/AuthenticatorAssertionResponse.cs
new file mode 100644
index 000000000000..3468ac46bffd
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AuthenticatorAssertionResponse.cs
@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the response returned by an authenticator during the assertion phase of a WebAuthn login
+/// process.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#authenticatorassertionresponse"/>.
+/// </remarks>
+internal sealed class AuthenticatorAssertionResponse : AuthenticatorResponse
+{
+    /// <summary>
+    /// Gets or sets the authenticator data.
+    /// </summary>
+    public required BufferSource AuthenticatorData { get; init; }
+
+    /// <summary>
+    /// Gets or sets the assertion signature.
+    /// </summary>
+    public required BufferSource Signature { get; init; }
+
+    /// <summary>
+    /// Gets or sets the opaque user identifier.
+    /// </summary>
+    public BufferSource? UserHandle { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/AuthenticatorAttestationResponse.cs b/src/Identity/Core/src/Passkeys/AuthenticatorAttestationResponse.cs
new file mode 100644
index 000000000000..b7dad16c0f25
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AuthenticatorAttestationResponse.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the response returned by an authenticator during the attestation phase of a WebAuthn registration
+/// process.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#authenticatorattestationresponse" />.
+/// </remarks>
+internal sealed class AuthenticatorAttestationResponse : AuthenticatorResponse
+{
+    /// <summary>
+    /// Gets or sets the attestation object.
+    /// </summary>
+    public required BufferSource AttestationObject { get; init; }
+
+    /// <summary>
+    /// Gets or sets the strings describing which transport methods (e.g., usb, nfc) are believed
+    /// to be supported with the authenticator.
+    /// </summary>
+    /// <remarks>
+    /// May be empty or <c>null</c> if the information is not available.
+    /// </remarks>
+    public string[]? Transports { get; init; } = [];
+}
diff --git a/src/Identity/Core/src/Passkeys/AuthenticatorData.cs b/src/Identity/Core/src/Passkeys/AuthenticatorData.cs
new file mode 100644
index 000000000000..bff5c1f5c246
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AuthenticatorData.cs
@@ -0,0 +1,147 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Formats.Cbor;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Encodes contextual bindings made by an authenticator.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#authenticator-data"/>
+/// </remarks>
+internal sealed class AuthenticatorData
+{
+    /// <summary>
+    /// Gets or sets the SHA-256 hash of the Relying Party ID the credential is scoped to.
+    /// </summary>
+    public required ReadOnlyMemory<byte> RpIdHash { get; init; }
+
+    /// <summary>
+    /// Gets or sets the flags for this authenticator data.
+    /// </summary>
+    public required AuthenticatorDataFlags Flags { get; init; }
+
+    /// <summary>
+    /// Gets or sets the signature counter.
+    /// </summary>
+    public required uint SignCount { get; init; }
+
+    /// <summary>
+    /// Gets or sets the attested credential data.
+    /// </summary>
+    public AttestedCredentialData? AttestedCredentialData { get; init; }
+
+    /// <summary>
+    /// Gets or sets the extension-defined authenticator data.
+    /// </summary>
+    public ReadOnlyMemory<byte>? Extensions { get; init; }
+
+    /// <summary>
+    /// Gets whether the user is present.
+    /// </summary>
+    public bool IsUserPresent => Flags.HasFlag(AuthenticatorDataFlags.UserPresent);
+
+    /// <summary>
+    /// Gets whether the user is verified.
+    /// </summary>
+    public bool IsUserVerified => Flags.HasFlag(AuthenticatorDataFlags.UserVerified);
+
+    /// <summary>
+    /// Gets whether the public key credential source is backup eligible.
+    /// </summary>
+    public bool IsBackupEligible => Flags.HasFlag(AuthenticatorDataFlags.BackupEligible);
+
+    /// <summary>
+    /// Gets whether the public key credential source is currently backed up.
+    /// </summary>
+    public bool IsBackedUp => Flags.HasFlag(AuthenticatorDataFlags.BackedUp);
+
+    /// <summary>
+    /// Gets whether the authenticator data has extensions.
+    /// </summary>
+    public bool HasExtensionsData => Flags.HasFlag(AuthenticatorDataFlags.HasExtensionData);
+
+    /// <summary>
+    /// Gets whether the authenticator added attested credential data.
+    /// </summary>
+    [MemberNotNullWhen(true, nameof(AttestedCredentialData))]
+    public bool HasAttestedCredentialData => Flags.HasFlag(AuthenticatorDataFlags.HasAttestedCredentialData);
+
+    public static AuthenticatorData Parse(ReadOnlyMemory<byte> bytes)
+    {
+        try
+        {
+            return ParseCore(bytes);
+        }
+        catch (PasskeyException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw PasskeyException.InvalidAuthenticatorDataFormat(ex);
+        }
+    }
+
+    private static AuthenticatorData ParseCore(ReadOnlyMemory<byte> bytes)
+    {
+        const int RpIdHashLength = 32;
+        const int AuthenticatorDataFlagsLength = 1;
+        const int SignCountLength = 4;
+        const int MinLength = RpIdHashLength + AuthenticatorDataFlagsLength + SignCountLength;
+
+        // Min length specified in https://www.w3.org/TR/webauthn-3/#authenticator-data
+        Debug.Assert(MinLength == 37);
+        if (bytes.Length < MinLength)
+        {
+            throw PasskeyException.InvalidAuthenticatorDataLength(bytes.Length);
+        }
+
+        var offset = 0;
+
+        var rpIdHash = bytes.Slice(offset, RpIdHashLength);
+        offset += RpIdHashLength;
+
+        var flags = (AuthenticatorDataFlags)bytes.Span[offset];
+        offset += AuthenticatorDataFlagsLength;
+
+        var signCount = BinaryPrimitives.ReadUInt32BigEndian(bytes.Slice(offset, SignCountLength).Span);
+        offset += SignCountLength;
+
+        AttestedCredentialData? attestedCredentialData = null;
+        if (flags.HasFlag(AuthenticatorDataFlags.HasAttestedCredentialData))
+        {
+            var remaining = bytes[offset..];
+            attestedCredentialData = AttestedCredentialData.Parse(remaining, out var bytesRead);
+            offset += bytesRead;
+        }
+
+        ReadOnlyMemory<byte>? extensions = default;
+        if (flags.HasFlag(AuthenticatorDataFlags.HasExtensionData))
+        {
+            var reader = new CborReader(bytes[offset..]);
+            extensions = reader.ReadEncodedValue();
+            offset += extensions.Value.Length;
+        }
+
+        if (offset != bytes.Length)
+        {
+            // Leftover bytes signifies a possible parsing error.
+            throw PasskeyException.InvalidAuthenticatorDataFormat();
+        }
+
+        return new()
+        {
+            RpIdHash = rpIdHash,
+            Flags = flags,
+            SignCount = signCount,
+            AttestedCredentialData = attestedCredentialData,
+            Extensions = extensions,
+        };
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/AuthenticatorDataFlags.cs b/src/Identity/Core/src/Passkeys/AuthenticatorDataFlags.cs
new file mode 100644
index 000000000000..ad9ff726855e
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AuthenticatorDataFlags.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents flags for <see cref="AuthenticatorData"/>.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#authenticator-data"/>.
+/// </remarks>
+[Flags]
+internal enum AuthenticatorDataFlags : byte
+{
+    /// <summary>
+    /// Indicates that the user is present.
+    /// </summary>
+    UserPresent = 1 << 0,
+
+    /// <summary>
+    /// Indicates that the user is verified.
+    /// </summary>
+    UserVerified = 1 << 2,
+
+    /// <summary>
+    /// Indicates that the public key credential source is backup eligible.
+    /// </summary>
+    BackupEligible = 1 << 3,
+
+    /// <summary>
+    /// Indicates that the public key credential source is currently backed up.
+    /// </summary>
+    BackedUp = 1 << 4,
+
+    /// <summary>
+    /// Indicates that the authenticator added attested credential data.
+    /// </summary>
+    HasAttestedCredentialData = 1 << 6,
+
+    /// <summary>
+    /// Indicates that the authenticator data has extensions.
+    /// </summary>
+    HasExtensionData = 1 << 7,
+}
diff --git a/src/Identity/Core/src/Passkeys/AuthenticatorResponse.cs b/src/Identity/Core/src/Passkeys/AuthenticatorResponse.cs
new file mode 100644
index 000000000000..d2760169faf2
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AuthenticatorResponse.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the base class for responses returned by an authenticator during credential creation or retrieval
+/// operations.
+/// </summary>
+internal abstract class AuthenticatorResponse
+{
+    /// <summary>
+    /// Gets or sets the client data passed to
+    /// <c>navigator.credentials.create()</c> or <c>navigator.credentials.get()</c>.
+    /// </summary>
+    public required BufferSource ClientDataJSON { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/AuthenticatorSelectionCriteria.cs b/src/Identity/Core/src/Passkeys/AuthenticatorSelectionCriteria.cs
new file mode 100644
index 000000000000..0247bab57954
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/AuthenticatorSelectionCriteria.cs
@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Used to specify requirements regarding authenticator attributes.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-authenticatorselectioncriteria"/>.
+/// </remarks>
+internal sealed class AuthenticatorSelectionCriteria
+{
+    /// <summary>
+    /// Gets or sets the authenticator attachment.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-authenticatorselectioncriteria-authenticatorattachment"/>.
+    /// </remarks>
+    public string? AuthenticatorAttachment { get; set; }
+
+    /// <summary>
+    /// Gets or sets the extent to which the server desires to create a client-side discoverable credential.
+    /// Supported values are "discouraged", "preferred", or "required".
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-authenticatorselectioncriteria-residentkey"/>
+    /// </remarks>
+    public string? ResidentKey { get; set; }
+
+    /// <summary>
+    /// Gets whether a resident key is required.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-authenticatorselectioncriteria-requireresidentkey"/>.
+    /// </remarks>
+    public bool RequireResidentKey => string.Equals("required", ResidentKey, StringComparison.Ordinal);
+
+    /// <summary>
+    /// Gets or sets the user verification requirement.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-authenticatorselectioncriteria-userverification"/>.
+    /// </remarks>
+    public string? UserVerification { get; set; }
+}
diff --git a/src/Identity/Core/src/Passkeys/BufferSource.cs b/src/Identity/Core/src/Passkeys/BufferSource.cs
new file mode 100644
index 000000000000..0db74ebac1f2
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/BufferSource.cs
@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents a base64url-encoded byte buffer for use in passkey operations.
+/// </summary>
+/// <remarks>
+/// This type is named after the JavaScript <c>BufferSource</c> type.
+/// When included in a JSON payload, it is serialized as a base64url-encoded string.
+/// When a member of type <c>BufferSource</c> is mentioned in the WebAuthn specification,
+/// this type can be used to represent it in .NET.
+/// </remarks>
+[JsonConverter(typeof(BufferSourceJsonConverter))]
+internal sealed class BufferSource : IEquatable<BufferSource>
+{
+    private readonly ReadOnlyMemory<byte> _bytes;
+
+    /// <summary>
+    /// Gets the length of the byte buffer.
+    /// </summary>
+    public int Length => _bytes.Length;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="BufferSource"/> from a byte array.
+    /// </summary>
+    public static BufferSource FromBytes(ReadOnlyMemory<byte> bytes)
+        => new(bytes);
+
+    /// <summary>
+    /// Creates a new instance of <see cref="BufferSource"/> from a string.
+    /// </summary>
+    public static BufferSource FromString(string value)
+    {
+        var buffer = Encoding.UTF8.GetBytes(value);
+        return new(buffer);
+    }
+
+    private BufferSource(ReadOnlyMemory<byte> buffer)
+    {
+        _bytes = buffer;
+    }
+
+    /// <summary>
+    /// Gets the byte buffer as a <see cref="ReadOnlyMemory{T}"/>.
+    /// </summary>
+    public ReadOnlyMemory<byte> AsMemory()
+        => _bytes;
+
+    /// <summary>
+    /// Gets the byte buffer as a <see cref="ReadOnlySpan{T}"/>.
+    /// </summary>
+    public ReadOnlySpan<byte> AsSpan()
+        => _bytes.Span;
+
+    /// <summary>
+    /// Gets the byte buffer as a byte array.
+    /// </summary>
+    public byte[] ToArray()
+        => _bytes.ToArray();
+
+    /// <summary>
+    /// Performs a value-based equality comparison with another <see cref="BufferSource"/> instance.
+    /// </summary>
+    public bool Equals(BufferSource? other)
+    {
+        if (ReferenceEquals(this, other))
+        {
+            return true;
+        }
+
+        return other is not null && _bytes.Span.SequenceEqual(other._bytes.Span);
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+        => obj is BufferSource other && Equals(other);
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+        => _bytes.GetHashCode();
+
+    /// <summary>
+    /// Performs a value-based equality comparison between two <see cref="BufferSource"/> instances.
+    /// </summary>
+    public static bool operator ==(BufferSource? left, BufferSource? right)
+    {
+        if (ReferenceEquals(left, right))
+        {
+            return true;
+        }
+
+        if (left is null || right is null)
+        {
+            return false;
+        }
+
+        return left.Equals(right);
+    }
+
+    /// <summary>
+    /// Performs a value-based inequality comparison between two <see cref="BufferSource"/> instances.
+    /// </summary>
+    public static bool operator !=(BufferSource? left, BufferSource? right)
+        => !(left == right);
+
+    /// <summary>
+    /// Gets the UTF-8 string representation of the byte buffer.
+    /// </summary>
+    public override string ToString()
+    {
+        var span = _bytes.Span;
+
+        if (span.IsEmpty)
+        {
+            return string.Empty;
+        }
+
+        return Encoding.UTF8.GetString(span);
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/BufferSourceJsonConverter.cs b/src/Identity/Core/src/Passkeys/BufferSourceJsonConverter.cs
new file mode 100644
index 000000000000..64d1618ac33b
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/BufferSourceJsonConverter.cs
@@ -0,0 +1,96 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Buffers.Text;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal sealed class BufferSourceJsonConverter : JsonConverter<BufferSource>
+{
+    private const int StackallocByteThreshold = 256;
+
+    public override BufferSource? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.ValueIsEscaped)
+        {
+            // We currently don't handle escaped base64url values, as we don't expect
+            // to encounter them when reading payloads produced by WebAuthn clients.
+            // See: https://www.w3.org/TR/webauthn-3/#base64url-encoding
+            throw new JsonException("Unexpected escaped value in base64url string.");
+        }
+
+        var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
+        if (!TryDecodeBase64Url(span, out var bytes))
+        {
+            throw new JsonException("Expected a valid base64url string.");
+        }
+
+        return BufferSource.FromBytes(bytes);
+    }
+
+    public override void Write(Utf8JsonWriter writer, BufferSource value, JsonSerializerOptions options)
+    {
+        var bytes = value.AsSpan();
+        WriteBase64UrlStringValue(writer, bytes);
+    }
+
+    // Based on https://github.com/dotnet/runtime/blob/624737eb3796e1a760465912b27ac349965d8ba5/src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.Unescaping.cs#L218
+    private static bool TryDecodeBase64Url(ReadOnlySpan<byte> utf8Unescaped, [NotNullWhen(true)] out byte[]? bytes)
+    {
+        byte[]? pooledArray = null;
+
+        Span<byte> byteSpan = utf8Unescaped.Length <= StackallocByteThreshold ?
+            stackalloc byte[StackallocByteThreshold] :
+            (pooledArray = ArrayPool<byte>.Shared.Rent(utf8Unescaped.Length));
+
+        var status = Base64Url.DecodeFromUtf8(utf8Unescaped, byteSpan, out var bytesConsumed, out var bytesWritten);
+        if (status != OperationStatus.Done)
+        {
+            bytes = null;
+
+            if (pooledArray != null)
+            {
+                ArrayPool<byte>.Shared.Return(pooledArray);
+            }
+
+            return false;
+        }
+        Debug.Assert(bytesConsumed == utf8Unescaped.Length);
+
+        bytes = byteSpan[..bytesWritten].ToArray();
+
+        if (pooledArray != null)
+        {
+            ArrayPool<byte>.Shared.Return(pooledArray);
+        }
+
+        return true;
+    }
+
+    private static void WriteBase64UrlStringValue(Utf8JsonWriter writer, ReadOnlySpan<byte> bytes)
+    {
+        byte[]? pooledArray = null;
+
+        var encodedLength = Base64Url.GetEncodedLength(bytes.Length);
+        var byteSpan = encodedLength <= StackallocByteThreshold ?
+            stackalloc byte[encodedLength] :
+            (pooledArray = ArrayPool<byte>.Shared.Rent(encodedLength));
+
+        var status = Base64Url.EncodeToUtf8(bytes, byteSpan, out var bytesConsumed, out var bytesWritten);
+        Debug.Assert(status == OperationStatus.Done);
+        Debug.Assert(bytesConsumed == bytes.Length);
+
+        var base64UrlUtf8 = byteSpan[..bytesWritten];
+        writer.WriteStringValue(base64UrlUtf8);
+
+        if (pooledArray != null)
+        {
+            ArrayPool<byte>.Shared.Return(pooledArray);
+        }
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/COSEAlgorithmIdentifier.cs b/src/Identity/Core/src/Passkeys/COSEAlgorithmIdentifier.cs
new file mode 100644
index 000000000000..c90dba23a77a
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/COSEAlgorithmIdentifier.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents a number identifying a cryptographic algorithm.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#typedefdef-cosealgorithmidentifier"/>.
+/// </remarks>
+internal enum COSEAlgorithmIdentifier : int
+{
+    RS1 = -65535,
+    RS512 = -259,
+    RS384 = -258,
+    RS256 = -257,
+    PS512 = -39,
+    PS384 = -38,
+    PS256 = -37,
+    ES512 = -36,
+    ES384 = -35,
+    EdDSA = -8,
+    ES256 = -7,
+    ES256K = -47,
+}
diff --git a/src/Identity/Core/src/Passkeys/CollectedClientData.cs b/src/Identity/Core/src/Passkeys/CollectedClientData.cs
new file mode 100644
index 000000000000..0d94864fcd6a
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/CollectedClientData.cs
@@ -0,0 +1,47 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents the client data passed to <c>navigator.credentials.get()</c> or <c>navigator.credentials.create()</c>.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-collectedclientdata"/>
+/// </remarks>
+internal sealed class CollectedClientData
+{
+    /// <summary>
+    /// Gets or sets the type of the operation that produced the client data.
+    /// </summary>
+    /// <remarks>
+    /// Will be either "webauthn.create" or "webauthn.get".
+    /// </remarks>
+    public required string Type { get; init; }
+
+    /// <summary>
+    /// Gets or sets the challenge provided by the relying party.
+    /// </summary>
+    public required BufferSource Challenge { get; init; }
+
+    /// <summary>
+    /// Gets or sets the fully qualified origin of the requester.
+    /// </summary>
+    public required string Origin { get; init; }
+
+    /// <summary>
+    /// Gets or sets whether the credential creation request was initiated from
+    /// a different origin than the one associated with the relying party.
+    /// </summary>
+    public bool? CrossOrigin { get; init; }
+
+    /// <summary>
+    /// Gets or sets the fully qualified top-level origin of the requester.
+    /// </summary>
+    public string? TopOrigin { get; init; }
+
+    /// <summary>
+    /// Gets or sets information about the state of the token binding protocol.
+    /// </summary>
+    public TokenBinding? TokenBinding { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/CredentialPublicKey.cs b/src/Identity/Core/src/Passkeys/CredentialPublicKey.cs
new file mode 100644
index 000000000000..8774524c2edb
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/CredentialPublicKey.cs
@@ -0,0 +1,291 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Formats.Cbor;
+using System.Security.Cryptography;
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal sealed class CredentialPublicKey
+{
+    private readonly COSEKeyType _type;
+    private readonly COSEAlgorithmIdentifier _alg;
+    private readonly ReadOnlyMemory<byte> _bytes;
+    private readonly RSA? _rsa;
+    private readonly ECDsa? _ecdsa;
+
+    public COSEAlgorithmIdentifier Alg => _alg;
+
+    /// <summary>
+    /// Contains all supported public key credential parameters.
+    /// </summary>
+    /// <remarks>
+    /// This list is sorted in the order of preference, with the most preferred algorithm first.
+    /// </remarks>
+    internal static IReadOnlyList<PublicKeyCredentialParameters> AllSupportedParameters { get; } =
+        // Keep this list in sync with IsSupportedAlgorithm.
+        [
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.ES256 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.PS256 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.ES384 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.PS384 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.PS512 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.RS256 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.ES512 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.RS384 },
+            new() { Type = "public-key", Alg = COSEAlgorithmIdentifier.RS512 },
+        ];
+
+    /// <summary>
+    /// Gets whether the specified COSE algorithm identifier is supported.
+    /// </summary>
+    /// <param name="alg">The algorithm identifier.</param>
+    internal static bool IsSupportedAlgorithm(COSEAlgorithmIdentifier alg)
+        // Keep this in sync with AllSupportedParameters.
+        => alg switch
+        {
+            COSEAlgorithmIdentifier.ES256 or
+            COSEAlgorithmIdentifier.PS256 or
+            COSEAlgorithmIdentifier.ES384 or
+            COSEAlgorithmIdentifier.PS384 or
+            COSEAlgorithmIdentifier.PS512 or
+            COSEAlgorithmIdentifier.RS256 or
+            COSEAlgorithmIdentifier.ES512 or
+            COSEAlgorithmIdentifier.RS384 or
+            COSEAlgorithmIdentifier.RS512 => true,
+            _ => false,
+        };
+
+    private CredentialPublicKey(ReadOnlyMemory<byte> bytes)
+    {
+        var reader = Ctap2CborReader.Create(bytes);
+
+        reader.ReadCoseKeyLabel((int)COSEKeyParameter.KeyType);
+        _type = (COSEKeyType)reader.ReadInt32();
+        _alg = ParseCoseKeyCommonParameters(reader);
+
+        switch (_type)
+        {
+            case COSEKeyType.EC2:
+            case COSEKeyType.OKP:
+                _ecdsa = ParseECDsa(_type, reader);
+                break;
+            case COSEKeyType.RSA:
+                _rsa = ParseRSA(reader);
+                break;
+            default:
+                throw new InvalidOperationException($"Unsupported key type '{_type}'.");
+        }
+
+        var keyLength = bytes.Length - reader.BytesRemaining;
+        _bytes = bytes[..keyLength];
+    }
+
+    public static CredentialPublicKey Decode(ReadOnlyMemory<byte> bytes)
+    {
+        try
+        {
+            return new CredentialPublicKey(bytes);
+        }
+        catch (PasskeyException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw PasskeyException.InvalidCredentialPublicKey(ex);
+        }
+    }
+
+    public static CredentialPublicKey Decode(ReadOnlyMemory<byte> bytes, out int bytesRead)
+    {
+        var key = Decode(bytes);
+        bytesRead = key._bytes.Length;
+        return key;
+    }
+
+    public bool Verify(ReadOnlySpan<byte> data, ReadOnlySpan<byte> signature)
+    {
+        return _type switch
+        {
+            COSEKeyType.EC2 => _ecdsa!.VerifyData(data, signature, HashAlgFromCOSEAlg(_alg), DSASignatureFormat.Rfc3279DerSequence),
+            COSEKeyType.RSA => _rsa!.VerifyData(data, signature, HashAlgFromCOSEAlg(_alg), GetRSASignaturePadding()),
+            _ => throw new InvalidOperationException($"Missing or unknown kty {_type}"),
+        };
+    }
+
+    private static COSEAlgorithmIdentifier ParseCoseKeyCommonParameters(Ctap2CborReader reader)
+    {
+        reader.ReadCoseKeyLabel((int)COSEKeyParameter.Alg);
+        var alg = (COSEAlgorithmIdentifier)reader.ReadInt32();
+
+        if (reader.TryReadCoseKeyLabel((int)COSEKeyParameter.KeyOps))
+        {
+            // No-op, simply tolerate potential key_ops labels
+            reader.SkipValue();
+        }
+
+        return alg;
+    }
+
+    private static RSA ParseRSA(Ctap2CborReader reader)
+    {
+        var rsaParams = new RSAParameters();
+
+        reader.ReadCoseKeyLabel((int)COSEKeyParameter.N);
+        rsaParams.Modulus = reader.ReadByteString();
+
+        if (!reader.TryReadCoseKeyLabel((int)COSEKeyParameter.E))
+        {
+            throw new CborContentException("The COSE key encodes a private key.");
+        }
+        rsaParams.Exponent = reader.ReadByteString();
+
+        reader.ReadEndMap();
+
+        return RSA.Create(rsaParams);
+    }
+
+    private static ECDsa ParseECDsa(COSEKeyType kty, Ctap2CborReader reader)
+    {
+        var ecParams = new ECParameters();
+
+        reader.ReadCoseKeyLabel((int)COSEKeyParameter.Crv);
+        var crv = (COSEEllipticCurve)reader.ReadInt32();
+
+        if (IsValidKtyCrvCombination(kty, crv))
+        {
+            ecParams.Curve = MapCoseCrvToECCurve(crv);
+        }
+
+        reader.ReadCoseKeyLabel((int)COSEKeyParameter.X);
+        ecParams.Q.X = reader.ReadByteString();
+
+        reader.ReadCoseKeyLabel((int)COSEKeyParameter.Y);
+        ecParams.Q.Y = reader.ReadByteString();
+
+        if (reader.TryReadCoseKeyLabel((int)COSEKeyParameter.D))
+        {
+            throw new CborContentException("The COSE key encodes a private key.");
+        }
+
+        reader.ReadEndMap();
+
+        return ECDsa.Create(ecParams);
+
+        static ECCurve MapCoseCrvToECCurve(COSEEllipticCurve crv)
+        {
+            return crv switch
+            {
+                COSEEllipticCurve.P256 => ECCurve.NamedCurves.nistP256,
+                COSEEllipticCurve.P384 => ECCurve.NamedCurves.nistP384,
+                COSEEllipticCurve.P521 => ECCurve.NamedCurves.nistP521,
+                COSEEllipticCurve.X25519 or
+                COSEEllipticCurve.X448 or
+                COSEEllipticCurve.Ed25519 or
+                COSEEllipticCurve.Ed448 => throw new NotSupportedException("OKP type curves not supported."),
+                _ => throw new CborContentException($"Unrecognized COSE crv value {crv}"),
+            };
+        }
+
+        static bool IsValidKtyCrvCombination(COSEKeyType kty, COSEEllipticCurve crv)
+        {
+            return (kty, crv) switch
+            {
+                (COSEKeyType.EC2, COSEEllipticCurve.P256 or COSEEllipticCurve.P384 or COSEEllipticCurve.P521) => true,
+                (COSEKeyType.OKP, COSEEllipticCurve.X25519 or COSEEllipticCurve.X448 or COSEEllipticCurve.Ed25519 or COSEEllipticCurve.Ed448) => true,
+                _ => false,
+            };
+        }
+    }
+
+    private RSASignaturePadding GetRSASignaturePadding()
+    {
+        if (_type != COSEKeyType.RSA)
+        {
+            throw new InvalidOperationException($"Cannot get RSA signature padding for key type {_type}.");
+        }
+
+        // https://www.iana.org/assignments/cose/cose.xhtml#algorithms
+        return _alg switch
+        {
+            COSEAlgorithmIdentifier.PS256 or
+            COSEAlgorithmIdentifier.PS384 or
+            COSEAlgorithmIdentifier.PS512
+            => RSASignaturePadding.Pss,
+
+            COSEAlgorithmIdentifier.RS1 or
+            COSEAlgorithmIdentifier.RS256 or
+            COSEAlgorithmIdentifier.RS384 or
+            COSEAlgorithmIdentifier.RS512
+            => RSASignaturePadding.Pkcs1,
+
+            _ => throw new InvalidOperationException($"Missing or unknown alg {_alg}"),
+        };
+    }
+
+    private static HashAlgorithmName HashAlgFromCOSEAlg(COSEAlgorithmIdentifier alg)
+    {
+        return alg switch
+        {
+            COSEAlgorithmIdentifier.RS1 => HashAlgorithmName.SHA1,
+            COSEAlgorithmIdentifier.ES256 => HashAlgorithmName.SHA256,
+            COSEAlgorithmIdentifier.ES384 => HashAlgorithmName.SHA384,
+            COSEAlgorithmIdentifier.ES512 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.PS256 => HashAlgorithmName.SHA256,
+            COSEAlgorithmIdentifier.PS384 => HashAlgorithmName.SHA384,
+            COSEAlgorithmIdentifier.PS512 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.RS256 => HashAlgorithmName.SHA256,
+            COSEAlgorithmIdentifier.RS384 => HashAlgorithmName.SHA384,
+            COSEAlgorithmIdentifier.RS512 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.ES256K => HashAlgorithmName.SHA256,
+            (COSEAlgorithmIdentifier)4 => HashAlgorithmName.SHA1,
+            (COSEAlgorithmIdentifier)11 => HashAlgorithmName.SHA256,
+            (COSEAlgorithmIdentifier)12 => HashAlgorithmName.SHA384,
+            (COSEAlgorithmIdentifier)13 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.EdDSA => HashAlgorithmName.SHA512,
+            _ => throw new InvalidOperationException("Invalid COSE algorithm value."),
+        };
+    }
+
+    public ReadOnlyMemory<byte> AsMemory() => _bytes;
+
+    public byte[] ToArray() => _bytes.ToArray();
+
+    private enum COSEKeyType
+    {
+        OKP = 1,
+        EC2 = 2,
+        RSA = 3,
+        Symmetric = 4
+    }
+
+    private enum COSEKeyParameter
+    {
+        Crv = -1,
+        K = -1,
+        X = -2,
+        Y = -3,
+        D = -4,
+        N = -1,
+        E = -2,
+        KeyType = 1,
+        KeyId = 2,
+        Alg = 3,
+        KeyOps = 4,
+        BaseIV = 5
+    }
+
+    private enum COSEEllipticCurve
+    {
+        Reserved = 0,
+        P256 = 1,
+        P384 = 2,
+        P521 = 3,
+        X25519 = 4,
+        X448 = 5,
+        Ed25519 = 6,
+        Ed448 = 7,
+        P256K = 8,
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/Ctap2CborReader.cs b/src/Identity/Core/src/Passkeys/Ctap2CborReader.cs
new file mode 100644
index 000000000000..f8c916c6cc7f
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/Ctap2CborReader.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Formats.Cbor;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// A variation of <see cref="CborReader"/> that is used to read COSE keys in a CTAP2 canonical CBOR encoding form.
+/// </summary>
+internal sealed class Ctap2CborReader : CborReader
+{
+    private int _remainingKeys;
+    private int? _lastReadLabel;
+
+    public static Ctap2CborReader Create(ReadOnlyMemory<byte> data)
+    {
+        var reader = new Ctap2CborReader(data);
+        if (reader.ReadStartMap() is not { } keyCount)
+        {
+            throw new CborContentException("CTAP2 canonical CBOR encoding form requires there to be a definite number of keys.");
+        }
+        reader._remainingKeys = keyCount;
+        return reader;
+    }
+
+    private Ctap2CborReader(ReadOnlyMemory<byte> data)
+        : base(data, CborConformanceMode.Ctap2Canonical)
+    {
+    }
+
+    public bool TryReadCoseKeyLabel(int expectedLabel)
+    {
+        // The 'expectedLabel' parameter can hold a label that
+        // was read when handling a previous optional field.
+        // We only need to read the next label if uninhabited.
+        if (_lastReadLabel is null)
+        {
+            // Check that we have not reached the end of the COSE key object.
+            if (_remainingKeys == 0)
+            {
+                return false;
+            }
+
+            _lastReadLabel = ReadInt32();
+        }
+
+        if (expectedLabel != _lastReadLabel.Value)
+        {
+            return false;
+        }
+
+        // Read was successful - vacate '_lastReadLabel' to advance reads.
+        _lastReadLabel = null;
+        _remainingKeys--;
+        return true;
+    }
+
+    public void ReadCoseKeyLabel(int expectedLabel)
+    {
+        if (!TryReadCoseKeyLabel(expectedLabel))
+        {
+            throw new CborContentException("Unexpected COSE key label");
+        }
+    }
+}
diff --git a/src/Identity/Core/src/Passkeys/PasskeyAssertionState.cs b/src/Identity/Core/src/Passkeys/PasskeyAssertionState.cs
new file mode 100644
index 000000000000..fd5f2ca01095
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PasskeyAssertionState.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+// Represents the state to persist between creating the passkey request options
+// and performing passkey assertion.
+internal sealed class PasskeyAssertionState
+{
+    public required ReadOnlyMemory<byte> Challenge { get; init; }
+
+    public string? UserId { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PasskeyAttestationState.cs b/src/Identity/Core/src/Passkeys/PasskeyAttestationState.cs
new file mode 100644
index 000000000000..95c91639c71e
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PasskeyAttestationState.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+// Represents the state to persist between creating the passkey creation options
+// and performing passkey attestation.
+internal sealed class PasskeyAttestationState
+{
+    public required ReadOnlyMemory<byte> Challenge { get; init; }
+
+    public required PasskeyUserEntity UserEntity { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredential.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredential.cs
new file mode 100644
index 000000000000..fd702da5e272
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredential.cs
@@ -0,0 +1,45 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents information about a public key/private key pair.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#typedefdef-publickeycredentialjson" />
+/// </remarks>
+internal sealed class PublicKeyCredential<TResponse>
+    where TResponse : notnull, AuthenticatorResponse
+{
+    /// <summary>
+    /// Gets or sets the credential ID.
+    /// </summary>
+    public required BufferSource Id { get; init; }
+
+    /// <summary>
+    /// Gets the type of the public key credential.
+    /// </summary>
+    /// <remarks>
+    /// This is always expected to have the value <c>"public-key"</c>.
+    /// </remarks>
+    public required string Type { get; init; }
+
+    /// <summary>
+    /// Gets the client extensions map.
+    /// </summary>
+    public required JsonElement ClientExtensionResults { get; init; }
+
+    /// <summary>
+    /// Gets or sets the authenticator response.
+    /// </summary>
+    public required TResponse Response { get; init; }
+
+    /// <summary>
+    /// Gets or sets a string indicating the mechanism by which the WebAuthn implementation
+    /// is attached to the authenticator.
+    /// </summary>
+    public string? AuthenticatorAttachment { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredentialCreationOptions.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredentialCreationOptions.cs
new file mode 100644
index 000000000000..5d92df9a796f
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredentialCreationOptions.cs
@@ -0,0 +1,70 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents options for credential creation.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialcreationoptionsjson"/>.
+/// </remarks>
+internal sealed class PublicKeyCredentialCreationOptions
+{
+    /// <summary>
+    /// Gets or sets the name and identifier for the relying party requesting attestation.
+    /// </summary>
+    public required PublicKeyCredentialRpEntity Rp { get; init; }
+
+    /// <summary>
+    /// Gets or sets the names and and identifier for the user account performing the registration.
+    /// </summary>
+    public required PublicKeyCredentialUserEntity User { get; init; }
+
+    /// <summary>
+    /// Gets or sets a challenge that the authenticator signs when producing an attestation object for the newly created credential.
+    /// </summary>
+    public required BufferSource Challenge { get; init; }
+
+    /// <summary>
+    /// Gets or sets the key types and signature algorithms the relying party supports, ordered from most preferred to least preferred.
+    /// </summary>
+    public IReadOnlyList<PublicKeyCredentialParameters> PubKeyCredParams { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets the time, in milliseconds, that the relying party is willing to wait for the call to complete.
+    /// </summary>
+    public ulong? Timeout { get; init; }
+
+    /// <summary>
+    /// Gets or sets the existing credentials mapped to the user account.
+    /// </summary>
+    public IReadOnlyList<PublicKeyCredentialDescriptor> ExcludeCredentials { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets settings that the authenticator should satisfy when creating a new credential.
+    /// </summary>
+    public AuthenticatorSelectionCriteria? AuthenticatorSelection { get; init; }
+
+    /// <summary>
+    /// Gets or sets hints that guide the user agent in interacting with the user.
+    /// </summary>
+    public IReadOnlyList<string> Hints { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets the attestation conveyance preference for the relying party.
+    /// </summary>
+    public string? Attestation { get; init; }
+
+    /// <summary>
+    /// Gets or sets the attestation statement format preferences of the relying party, ordered from most preferred to least preferred.
+    /// </summary>
+    public IReadOnlyList<string> AttestationFormats { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets the client extension inputs that the relying party supports.
+    /// </summary>
+    public JsonElement? Extensions { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredentialDescriptor.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredentialDescriptor.cs
new file mode 100644
index 000000000000..2cf52c82b72f
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredentialDescriptor.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Identifies a specific public key credential.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialdescriptorjson"/>
+/// </remarks>
+internal sealed class PublicKeyCredentialDescriptor
+{
+    /// <summary>
+    /// Gets or sets the type of the public key credential.
+    /// </summary>
+    public required string Type { get; init; }
+
+    /// <summary>
+    /// Gets or sets the identifier of the public key credential.
+    /// </summary>
+    public required BufferSource Id { get; init; }
+
+    /// <summary>
+    /// Gets or sets hints as to how the client might communicate with the authenticator.
+    /// </summary>
+    public IReadOnlyList<string> Transports { get; init; } = [];
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredentialParameters.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredentialParameters.cs
new file mode 100644
index 000000000000..399e81221e03
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredentialParameters.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Used to supply additional parameters when creating a new credential.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialparameters"/>
+/// </remarks>
+internal readonly struct PublicKeyCredentialParameters()
+{
+
+    /// <summary>
+    /// Gets the type of the credential.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialparameters-type"/>.
+    /// </remarks>
+    public required string Type { get; init; }
+
+    /// <summary>
+    /// Gets or sets the cryptographic signature algorithm identifier.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialparameters-alg"/>.
+    /// </remarks>
+    public required COSEAlgorithmIdentifier Alg { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredentialRequestOptions.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredentialRequestOptions.cs
new file mode 100644
index 000000000000..cd4a7fdc1b9e
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredentialRequestOptions.cs
@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents options for requesting a credential.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialrequestoptionsjson"/>
+/// </remarks>
+internal sealed class PublicKeyCredentialRequestOptions
+{
+    /// <summary>
+    /// Gets or sets the challenge that the authenticator signs when producing an assertion for the requested credential.
+    /// </summary>
+    public required BufferSource Challenge { get; init; }
+
+    /// <summary>
+    /// Gets or sets a time in milliseconds that the server is willing to wait for the call to complete.
+    /// </summary>
+    public ulong? Timeout { get; init; }
+
+    /// <summary>
+    /// Gets or sets the relying party identifier.
+    /// </summary>
+    public string? RpId { get; init; }
+
+    /// <summary>
+    /// Gets or sets the credentials of the identified user account, if any.
+    /// </summary>
+    public IReadOnlyList<PublicKeyCredentialDescriptor> AllowCredentials { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets the user verification requirement for the request.
+    /// </summary>
+    public string? UserVerification { get; init; }
+
+    /// <summary>
+    /// Gets or sets hints that guide the user agent in interacting with the user.
+    /// </summary>
+    public IReadOnlyList<string> Hints { get; init; } = [];
+
+    /// <summary>
+    /// Gets or sets the client extension inputs that the relying party supports.
+    /// </summary>
+    public JsonElement? Extensions { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredentialRpEntity.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredentialRpEntity.cs
new file mode 100644
index 000000000000..3b4fa13af2b0
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredentialRpEntity.cs
@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Used to supply Relying Party attributes when creating a new credential.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialrpentity"/>.
+/// </remarks>
+internal sealed class PublicKeyCredentialRpEntity
+{
+    /// <summary>
+    /// Gets or sets the human-palatable name for the entity.
+    /// </summary>
+    public required string Name { get; init; }
+
+    /// <summary>
+    /// Gets or sets the unique identifier for the replying party entity.
+    /// </summary>
+    public string? Id { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/PublicKeyCredentialUserEntity.cs b/src/Identity/Core/src/Passkeys/PublicKeyCredentialUserEntity.cs
new file mode 100644
index 000000000000..ca1d2613a4cc
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/PublicKeyCredentialUserEntity.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Used to supply additional user account attributes when creating a new credential.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-publickeycredentialuserentityjson"/>.
+/// </remarks>
+internal sealed class PublicKeyCredentialUserEntity
+{
+    /// <summary>
+    /// Gets or sets the user handle of the user account.
+    /// </summary>
+    public required BufferSource Id { get; init; }
+
+    /// <summary>
+    /// Gets or sets the human-palatable name for the entity.
+    /// </summary>
+    public required string Name { get; init; }
+
+    /// <summary>
+    /// Gets or sets the human-palatable name for the user account, intended only for display.
+    /// </summary>
+    public required string DisplayName { get; init; }
+}
diff --git a/src/Identity/Core/src/Passkeys/TokenBinding.cs b/src/Identity/Core/src/Passkeys/TokenBinding.cs
new file mode 100644
index 000000000000..2a46b2a8656d
--- /dev/null
+++ b/src/Identity/Core/src/Passkeys/TokenBinding.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Contains information about the state of the token binding protocol.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-tokenbinding"/>.
+/// </remarks>
+internal sealed class TokenBinding
+{
+    /// <summary>
+    /// Gets or sets the token binding status.
+    /// </summary>
+    /// <remarks>
+    /// Supported values are "supported", "present", and "not-supported".
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-tokenbinding-status"/>.
+    /// </remarks>
+    public required string Status { get; init; }
+
+    /// <summary>
+    /// Gets or sets the token binding ID.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dom-tokenbinding-id"/>.
+    /// </remarks>
+    public string? Id { get; init; }
+}
diff --git a/src/Identity/Core/src/PublicAPI.Unshipped.txt b/src/Identity/Core/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..a98e87ddd425 100644
--- a/src/Identity/Core/src/PublicAPI.Unshipped.txt
+++ b/src/Identity/Core/src/PublicAPI.Unshipped.txt
@@ -1 +1,111 @@
 #nullable enable
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AttestationConveyancePreference.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AttestationConveyancePreference.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorAttachment.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorAttachment.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorTimeout.get -> System.TimeSpan
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.AuthenticatorTimeout.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ChallengeSize.get -> int
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ChallengeSize.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.IdentityPasskeyOptions() -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.IsAllowedAlgorithm.get -> System.Func<int, bool>?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.IsAllowedAlgorithm.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ResidentKeyRequirement.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ResidentKeyRequirement.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ServerDomain.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ServerDomain.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.UserVerificationRequirement.get -> string?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.UserVerificationRequirement.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ValidateOrigin.get -> System.Func<Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext!, System.Threading.Tasks.ValueTask<bool>>?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.ValidateOrigin.set -> void
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.VerifyAttestationStatement.get -> System.Func<Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext!, System.Threading.Tasks.ValueTask<bool>>?
+Microsoft.AspNetCore.Identity.IdentityPasskeyOptions.VerifyAttestationStatement.set -> void
+Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>
+Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>.MakeCreationOptionsAsync(Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult!>!
+Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>.MakeRequestOptionsAsync(TUser? user, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult!>!
+Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>.PerformAssertionAsync(Microsoft.AspNetCore.Identity.PasskeyAssertionContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!>!
+Microsoft.AspNetCore.Identity.IPasskeyHandler<TUser>.PerformAttestationAsync(Microsoft.AspNetCore.Identity.PasskeyAttestationContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAttestationResult!>!
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.AssertionState.get -> string?
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.AssertionState.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.CredentialJson.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.CredentialJson.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext!
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.HttpContext.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAssertionContext.PasskeyAssertionContext() -> void
+Microsoft.AspNetCore.Identity.PasskeyAssertionResult
+Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser>
+Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser>.Failure.get -> Microsoft.AspNetCore.Identity.PasskeyException?
+Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser>.Passkey.get -> Microsoft.AspNetCore.Identity.UserPasskeyInfo?
+Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser>.Succeeded.get -> bool
+Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser>.User.get -> TUser?
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.AttestationState.get -> string?
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.AttestationState.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.CredentialJson.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.CredentialJson.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext!
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.HttpContext.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationContext.PasskeyAttestationContext() -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationResult
+Microsoft.AspNetCore.Identity.PasskeyAttestationResult.Failure.get -> Microsoft.AspNetCore.Identity.PasskeyException?
+Microsoft.AspNetCore.Identity.PasskeyAttestationResult.Passkey.get -> Microsoft.AspNetCore.Identity.UserPasskeyInfo?
+Microsoft.AspNetCore.Identity.PasskeyAttestationResult.Succeeded.get -> bool
+Microsoft.AspNetCore.Identity.PasskeyAttestationResult.UserEntity.get -> Microsoft.AspNetCore.Identity.PasskeyUserEntity?
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.AttestationObject.get -> System.ReadOnlyMemory<byte>
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.AttestationObject.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.ClientDataHash.get -> System.ReadOnlyMemory<byte>
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.ClientDataHash.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext!
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.HttpContext.init -> void
+Microsoft.AspNetCore.Identity.PasskeyAttestationStatementVerificationContext.PasskeyAttestationStatementVerificationContext() -> void
+Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult
+Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult.AttestationState.get -> string?
+Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult.AttestationState.init -> void
+Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult.CreationOptionsJson.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult.CreationOptionsJson.init -> void
+Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult.PasskeyCreationOptionsResult() -> void
+Microsoft.AspNetCore.Identity.PasskeyException
+Microsoft.AspNetCore.Identity.PasskeyException.PasskeyException(string! message) -> void
+Microsoft.AspNetCore.Identity.PasskeyException.PasskeyException(string! message, System.Exception? innerException) -> void
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.MakeCreationOptionsAsync(Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyCreationOptionsResult!>!
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.MakeRequestOptionsAsync(TUser? user, Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult!>!
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.PasskeyHandler(Microsoft.AspNetCore.Identity.UserManager<TUser!>! userManager, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Identity.IdentityPasskeyOptions!>! options) -> void
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.PerformAssertionAsync(Microsoft.AspNetCore.Identity.PasskeyAssertionContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!>!
+Microsoft.AspNetCore.Identity.PasskeyHandler<TUser>.PerformAttestationAsync(Microsoft.AspNetCore.Identity.PasskeyAttestationContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAttestationResult!>!
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.CrossOrigin.get -> bool
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.CrossOrigin.init -> void
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext!
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.HttpContext.init -> void
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.Origin.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.Origin.init -> void
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.PasskeyOriginValidationContext() -> void
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.TopOrigin.get -> string?
+Microsoft.AspNetCore.Identity.PasskeyOriginValidationContext.TopOrigin.init -> void
+Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult
+Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult.AssertionState.get -> string?
+Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult.AssertionState.init -> void
+Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult.PasskeyRequestOptionsResult() -> void
+Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult.RequestOptionsJson.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyRequestOptionsResult.RequestOptionsJson.init -> void
+Microsoft.AspNetCore.Identity.PasskeyUserEntity
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.DisplayName.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.DisplayName.init -> void
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.Id.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.Id.init -> void
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.Name.get -> string!
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.Name.init -> void
+Microsoft.AspNetCore.Identity.PasskeyUserEntity.PasskeyUserEntity() -> void
+static Microsoft.AspNetCore.Identity.PasskeyAssertionResult.Fail<TUser>(Microsoft.AspNetCore.Identity.PasskeyException! failure) -> Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!
+static Microsoft.AspNetCore.Identity.PasskeyAssertionResult.Success<TUser>(Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey, TUser! user) -> Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!
+static Microsoft.AspNetCore.Identity.PasskeyAttestationResult.Fail(Microsoft.AspNetCore.Identity.PasskeyException! failure) -> Microsoft.AspNetCore.Identity.PasskeyAttestationResult!
+static Microsoft.AspNetCore.Identity.PasskeyAttestationResult.Success(Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey, Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity) -> Microsoft.AspNetCore.Identity.PasskeyAttestationResult!
+virtual Microsoft.AspNetCore.Identity.SignInManager<TUser>.MakePasskeyCreationOptionsAsync(Microsoft.AspNetCore.Identity.PasskeyUserEntity! userEntity) -> System.Threading.Tasks.Task<string!>!
+virtual Microsoft.AspNetCore.Identity.SignInManager<TUser>.MakePasskeyRequestOptionsAsync(TUser? user) -> System.Threading.Tasks.Task<string!>!
+virtual Microsoft.AspNetCore.Identity.SignInManager<TUser>.PasskeySignInAsync(string! credentialJson) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.SignInResult!>!
+virtual Microsoft.AspNetCore.Identity.SignInManager<TUser>.PerformPasskeyAssertionAsync(string! credentialJson) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAssertionResult<TUser!>!>!
+virtual Microsoft.AspNetCore.Identity.SignInManager<TUser>.PerformPasskeyAttestationAsync(string! credentialJson) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.PasskeyAttestationResult!>!
diff --git a/src/Identity/Core/src/SignInManager.cs b/src/Identity/Core/src/SignInManager.cs
index b5659b329854..2391e36c0e72 100644
--- a/src/Identity/Core/src/SignInManager.cs
+++ b/src/Identity/Core/src/SignInManager.cs
@@ -1,12 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -20,12 +22,17 @@ public class SignInManager<TUser> where TUser : class
 {
     private const string LoginProviderKey = "LoginProvider";
     private const string XsrfKey = "XsrfId";
+    private const string PasskeyOperationKey = "PasskeyOperation";
+    private const string PasskeyStateKey = "PasskeyState";
 
     private readonly IHttpContextAccessor _contextAccessor;
     private readonly IAuthenticationSchemeProvider _schemes;
     private readonly IUserConfirmation<TUser> _confirmation;
+    private readonly IPasskeyHandler<TUser>? _passkeyHandler;
+    private readonly SignInManagerMetrics? _metrics;
     private HttpContext? _context;
     private TwoFactorAuthenticationInfo? _twoFactorInfo;
+    private PasskeyAuthenticationInfo? _passkeyInfo;
 
     /// <summary>
     /// Creates a new instance of <see cref="SignInManager{TUser}"/>.
@@ -56,6 +63,8 @@ public SignInManager(UserManager<TUser> userManager,
         Logger = logger;
         _schemes = schemes;
         _confirmation = confirmation;
+        _metrics = userManager.ServiceProvider?.GetService<SignInManagerMetrics>();
+        _passkeyHandler = userManager.ServiceProvider?.GetService<IPasskeyHandler<TUser>>();
     }
 
     /// <summary>
@@ -160,12 +169,41 @@ public virtual async Task<bool> CanSignInAsync(TUser user)
     /// <param name="user">The user to sign-in.</param>
     /// <returns>The task object representing the asynchronous operation.</returns>
     public virtual async Task RefreshSignInAsync(TUser user)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var (success, isPersistent) = await RefreshSignInCoreAsync(user);
+            var signInResult = success ? SignInResult.Success : SignInResult.Failed;
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, signInResult, SignInType.Refresh, isPersistent, startTimestamp);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.Refresh, isPersistent: null, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<(bool success, bool? isPersistent)> RefreshSignInCoreAsync(TUser user)
     {
         var auth = await Context.AuthenticateAsync(AuthenticationScheme);
-        IList<Claim> claims = Array.Empty<Claim>();
+        if (!auth.Succeeded || auth.Principal?.Identity?.IsAuthenticated != true)
+        {
+            Logger.LogError("RefreshSignInAsync prevented because the user is not currently authenticated. Use SignInAsync instead for initial sign in.");
+            return (false, auth.Properties?.IsPersistent);
+        }
 
-        var authenticationMethod = auth?.Principal?.FindFirst(ClaimTypes.AuthenticationMethod);
-        var amr = auth?.Principal?.FindFirst("amr");
+        var authenticatedUserId = UserManager.GetUserId(auth.Principal);
+        var newUserId = await UserManager.GetUserIdAsync(user);
+        if (authenticatedUserId == null || authenticatedUserId != newUserId)
+        {
+            Logger.LogError("RefreshSignInAsync prevented because currently authenticated user has a different UserId. Use SignInAsync instead to change users.");
+            return (false, auth.Properties?.IsPersistent);
+        }
+
+        IList<Claim> claims = Array.Empty<Claim>();
+        var authenticationMethod = auth.Principal?.FindFirst(ClaimTypes.AuthenticationMethod);
+        var amr = auth.Principal?.FindFirst("amr");
 
         if (authenticationMethod != null || amr != null)
         {
@@ -180,7 +218,8 @@ public virtual async Task RefreshSignInAsync(TUser user)
             }
         }
 
-        await SignInWithClaimsAsync(user, auth?.Properties, claims);
+        await SignInWithClaimsAsync(user, auth.Properties, claims);
+        return (true, auth.Properties?.IsPersistent ?? false);
     }
 
     /// <summary>
@@ -232,17 +271,29 @@ public virtual Task SignInWithClaimsAsync(TUser user, bool isPersistent, IEnumer
     /// <returns>The task object representing the asynchronous operation.</returns>
     public virtual async Task SignInWithClaimsAsync(TUser user, AuthenticationProperties? authenticationProperties, IEnumerable<Claim> additionalClaims)
     {
-        var userPrincipal = await CreateUserPrincipalAsync(user);
-        foreach (var claim in additionalClaims)
+        try
         {
-            userPrincipal.Identities.First().AddClaim(claim);
-        }
-        await Context.SignInAsync(AuthenticationScheme,
-            userPrincipal,
-            authenticationProperties ?? new AuthenticationProperties());
+            var userPrincipal = await CreateUserPrincipalAsync(user);
+            foreach (var claim in additionalClaims)
+            {
+                userPrincipal.Identities.First().AddClaim(claim);
+            }
 
-        // This is useful for updating claims immediately when hitting MapIdentityApi's /account/info endpoint with cookies.
-        Context.User = userPrincipal;
+            authenticationProperties ??= new AuthenticationProperties();
+            await Context.SignInAsync(AuthenticationScheme,
+                userPrincipal,
+                authenticationProperties);
+
+            // This is useful for updating claims immediately when hitting MapIdentityApi's /account/info endpoint with cookies.
+            Context.User = userPrincipal;
+
+            _metrics?.SignInUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme, authenticationProperties.IsPersistent);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.SignInUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme, isPersistent: null, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -250,15 +301,25 @@ await Context.SignInAsync(AuthenticationScheme,
     /// </summary>
     public virtual async Task SignOutAsync()
     {
-        await Context.SignOutAsync(AuthenticationScheme);
-
-        if (await _schemes.GetSchemeAsync(IdentityConstants.ExternalScheme) != null)
+        try
         {
-            await Context.SignOutAsync(IdentityConstants.ExternalScheme);
+            await Context.SignOutAsync(AuthenticationScheme);
+
+            if (await _schemes.GetSchemeAsync(IdentityConstants.ExternalScheme) != null)
+            {
+                await Context.SignOutAsync(IdentityConstants.ExternalScheme);
+            }
+            if (await _schemes.GetSchemeAsync(IdentityConstants.TwoFactorUserIdScheme) != null)
+            {
+                await Context.SignOutAsync(IdentityConstants.TwoFactorUserIdScheme);
+            }
+
+            _metrics?.SignOutUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme);
         }
-        if (await _schemes.GetSchemeAsync(IdentityConstants.TwoFactorUserIdScheme) != null)
+        catch (Exception ex)
         {
-            await Context.SignOutAsync(IdentityConstants.TwoFactorUserIdScheme);
+            _metrics?.SignOutUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme, ex);
+            throw;
         }
     }
 
@@ -327,17 +388,29 @@ public virtual async Task<bool> ValidateSecurityStampAsync(TUser? user, string?
     /// <param name="password">The password to attempt to sign in with.</param>
     /// <param name="isPersistent">Flag indicating whether the sign-in cookie should persist after the browser is closed.</param>
     /// <param name="lockoutOnFailure">Flag indicating if the user account should be locked if the sign in fails.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
     public virtual async Task<SignInResult> PasswordSignInAsync(TUser user, string password,
         bool isPersistent, bool lockoutOnFailure)
     {
-        ArgumentNullException.ThrowIfNull(user);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ArgumentNullException.ThrowIfNull(user);
 
-        var attempt = await CheckPasswordSignInAsync(user, password, lockoutOnFailure);
-        return attempt.Succeeded
-            ? await SignInOrTwoFactorAsync(user, isPersistent)
-            : attempt;
+            var attempt = await CheckPasswordSignInAsync(user, password, lockoutOnFailure);
+            var result = attempt.Succeeded
+                ? await SignInOrTwoFactorAsync(user, isPersistent)
+                : attempt;
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.Password, isPersistent, startTimestamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.Password, isPersistent, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -348,14 +421,16 @@ public virtual async Task<SignInResult> PasswordSignInAsync(TUser user, string p
     /// <param name="password">The password to attempt to sign in with.</param>
     /// <param name="isPersistent">Flag indicating whether the sign-in cookie should persist after the browser is closed.</param>
     /// <param name="lockoutOnFailure">Flag indicating if the user account should be locked if the sign in fails.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
     public virtual async Task<SignInResult> PasswordSignInAsync(string userName, string password,
         bool isPersistent, bool lockoutOnFailure)
     {
+        var startTimestamp = Stopwatch.GetTimestamp();
         var user = await UserManager.FindByNameAsync(userName);
         if (user == null)
         {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, SignInResult.Failed, SignInType.Password, isPersistent, startTimestamp);
             return SignInResult.Failed;
         }
 
@@ -368,13 +443,28 @@ public virtual async Task<SignInResult> PasswordSignInAsync(string userName, str
     /// <param name="user">The user to sign in.</param>
     /// <param name="password">The password to attempt to sign in with.</param>
     /// <param name="lockoutOnFailure">Flag indicating if the user account should be locked if the sign in fails.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
-    /// <returns></returns>
     public virtual async Task<SignInResult> CheckPasswordSignInAsync(TUser user, string password, bool lockoutOnFailure)
     {
-        ArgumentNullException.ThrowIfNull(user);
+        try
+        {
+            ArgumentNullException.ThrowIfNull(user);
+
+            var result = await CheckPasswordSignInCoreAsync(user, password, lockoutOnFailure);
+            _metrics?.CheckPasswordSignIn(typeof(TUser).FullName!, result);
 
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.CheckPasswordSignIn(typeof(TUser).FullName!, result: null, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> CheckPasswordSignInCoreAsync(TUser user, string password, bool lockoutOnFailure)
+    {
         var error = await PreSignInCheck(user);
         if (error != null)
         {
@@ -419,6 +509,220 @@ public virtual async Task<SignInResult> CheckPasswordSignInAsync(TUser user, str
         return SignInResult.Failed;
     }
 
+    /// <summary>
+    /// Generates passkey creation options for the specified <paramref name="userEntity"/>.
+    /// </summary>
+    /// <param name="userEntity">The user entity for which to create passkey options.</param>
+    /// <returns>A JSON string representing the created passkey options.</returns>
+    public virtual async Task<string> MakePasskeyCreationOptionsAsync(PasskeyUserEntity userEntity)
+    {
+        ThrowIfNoPasskeyHandler();
+        ArgumentNullException.ThrowIfNull(userEntity);
+
+        var result = await _passkeyHandler.MakeCreationOptionsAsync(userEntity, Context);
+        await StorePasskeyAuthenticationInfoAsync(PasskeyOperations.Attestation, result.AttestationState);
+        return result.CreationOptionsJson;
+    }
+
+    /// <summary>
+    /// Creates passkey assertion options for the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user for whom to create passkey assertion options.</param>
+    /// <returns>A JSON string representing the created passkey assertion options.</returns>
+    public virtual async Task<string> MakePasskeyRequestOptionsAsync(TUser? user)
+    {
+        ThrowIfNoPasskeyHandler();
+
+        var result = await _passkeyHandler.MakeRequestOptionsAsync(user, Context);
+        await StorePasskeyAuthenticationInfoAsync(PasskeyOperations.Assertion, result.AssertionState);
+        return result.RequestOptionsJson;
+    }
+
+    /// <summary>
+    /// Performs passkey attestation for the given <paramref name="credentialJson"/>.
+    /// </summary>
+    /// <remarks>
+    /// The <paramref name="credentialJson"/> should be obtained by JSON-serializing the result of the
+    /// <c>navigator.credentials.create()</c> JavaScript API. The argument to <c>navigator.credentials.create()</c>
+    /// should be obtained by calling <see cref="MakePasskeyCreationOptionsAsync(PasskeyUserEntity)"/>.
+    /// </remarks>
+    /// <param name="credentialJson">The credentials obtained by JSON-serializing the result of the <c>navigator.credentials.create()</c> JavaScript function.</param>
+    /// <returns>
+    /// A task object representing the asynchronous operation containing the <see cref="PasskeyAttestationResult"/>.
+    /// </returns>
+    public virtual async Task<PasskeyAttestationResult> PerformPasskeyAttestationAsync(string credentialJson)
+    {
+        ThrowIfNoPasskeyHandler();
+        ArgumentException.ThrowIfNullOrEmpty(credentialJson);
+
+        var passkeyInfo = await RetrievePasskeyAuthenticationInfoAsync()
+            ?? throw new InvalidOperationException(
+                "No passkey attestation is underway. " +
+                $"Make sure to call '{nameof(SignInManager<>)}.{nameof(MakePasskeyCreationOptionsAsync)}()' to initiate a passkey attestation.");
+        if (!string.Equals(PasskeyOperations.Attestation, passkeyInfo.Operation, StringComparison.Ordinal))
+        {
+            throw new InvalidOperationException(
+                $"Expected passkey operation '{PasskeyOperations.Attestation}', but got '{passkeyInfo.Operation}'. " +
+                $"This may indicate that you have not previously called '{nameof(SignInManager<>)}.{nameof(MakePasskeyCreationOptionsAsync)}()'.");
+        }
+        var context = new PasskeyAttestationContext
+        {
+            CredentialJson = credentialJson,
+            AttestationState = passkeyInfo.State,
+            HttpContext = Context,
+        };
+        var result = await _passkeyHandler.PerformAttestationAsync(context);
+        if (!result.Succeeded)
+        {
+            Logger.LogDebug(EventIds.PasskeyAttestationFailed, "Passkey attestation failed: {message}", result.Failure.Message);
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Performs passkey assertion for the given <paramref name="credentialJson"/>.
+    /// </summary>
+    /// <remarks>
+    /// The <paramref name="credentialJson"/> should be obtained by JSON-serializing the result of the
+    /// <c>navigator.credentials.get()</c> JavaScript API. The argument to <c>navigator.credentials.get()</c>
+    /// should be obtained by calling <see cref="MakePasskeyRequestOptionsAsync(TUser)"/>.
+    /// Upon success, the <see cref="PasskeyAssertionResult{TUser}.Passkey"/> should be stored on the
+    /// <see cref="PasskeyAssertionResult{TUser}.User"/> using <see cref="UserManager{TUser}.AddOrUpdatePasskeyAsync(TUser, UserPasskeyInfo)"/>.
+    /// </remarks>
+    /// <param name="credentialJson">The credentials obtained by JSON-serializing the result of the <c>navigator.credentials.get()</c> JavaScript function.</param>
+    /// <returns>
+    /// A task object representing the asynchronous operation containing the <see cref="PasskeyAssertionResult{TUser}"/>.
+    /// </returns>
+    public virtual async Task<PasskeyAssertionResult<TUser>> PerformPasskeyAssertionAsync(string credentialJson)
+    {
+        ThrowIfNoPasskeyHandler();
+        ArgumentException.ThrowIfNullOrEmpty(credentialJson);
+
+        var passkeyInfo = await RetrievePasskeyAuthenticationInfoAsync()
+            ?? throw new InvalidOperationException(
+                "No passkey assertion is underway. " +
+                $"Make sure to call '{nameof(SignInManager<>)}.{nameof(MakePasskeyRequestOptionsAsync)}()' to initiate a passkey assertion.");
+        if (!string.Equals(PasskeyOperations.Assertion, passkeyInfo.Operation, StringComparison.Ordinal))
+        {
+            throw new InvalidOperationException(
+                $"Expected passkey operation '{PasskeyOperations.Assertion}', but got '{passkeyInfo.Operation}'. " +
+                $"This may indicate that you have not previously called '{nameof(SignInManager<>)}.{nameof(MakePasskeyRequestOptionsAsync)}()'.");
+        }
+        var context = new PasskeyAssertionContext
+        {
+            CredentialJson = credentialJson,
+            AssertionState = passkeyInfo.State,
+            HttpContext = Context,
+        };
+        var result = await _passkeyHandler.PerformAssertionAsync(context);
+        if (!result.Succeeded)
+        {
+            Logger.LogDebug(EventIds.PasskeyAssertionFailed, "Passkey assertion failed: {message}", result.Failure.Message);
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Performs a passkey assertion and attempts to sign in the user.
+    /// </summary>
+    /// <remarks>
+    /// The <paramref name="credentialJson"/> should be obtained by JSON-serializing the result of the
+    /// <c>navigator.credentials.get()</c> JavaScript API. The argument to <c>navigator.credentials.get()</c>
+    /// should be obtained by calling <see cref="MakePasskeyRequestOptionsAsync(TUser)"/>.
+    /// </remarks>
+    /// <param name="credentialJson">The credentials obtained by JSON-serializing the result of the <c>navigator.credentials.get()</c> JavaScript function.</param>
+    /// <returns>
+    /// The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
+    /// for the sign-in attempt.
+    /// </returns>
+    public virtual async Task<SignInResult> PasskeySignInAsync(string credentialJson)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await PasskeySignInCoreAsync(credentialJson);
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.Passkey, isPersistent: false, startTimestamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.Passkey, isPersistent: false, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> PasskeySignInCoreAsync(string credentialJson)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(credentialJson);
+
+        var assertionResult = await PerformPasskeyAssertionAsync(credentialJson);
+        if (!assertionResult.Succeeded)
+        {
+            return SignInResult.Failed;
+        }
+
+        // After a successful assertion, we need to update the passkey so that it has the latest
+        // sign count and authenticator data.
+        var setPasskeyResult = await UserManager.AddOrUpdatePasskeyAsync(assertionResult.User, assertionResult.Passkey);
+        if (!setPasskeyResult.Succeeded)
+        {
+            return SignInResult.Failed;
+        }
+
+        return await SignInOrTwoFactorAsync(assertionResult.User, isPersistent: false, bypassTwoFactor: true);
+    }
+
+    [MemberNotNull(nameof(_passkeyHandler))]
+    private void ThrowIfNoPasskeyHandler()
+    {
+        if (_passkeyHandler is null)
+        {
+            throw new InvalidOperationException(
+                $"This operation requires an {nameof(IPasskeyHandler<>)} service to be registered.");
+        }
+    }
+
+    private async Task StorePasskeyAuthenticationInfoAsync(string operation, string? state)
+    {
+        var props = new AuthenticationProperties();
+        props.Items[PasskeyOperationKey] = operation;
+        props.Items[PasskeyStateKey] = state;
+        var claimsIdentity = new ClaimsIdentity(IdentityConstants.TwoFactorUserIdScheme);
+        var claimsPrincipal = new ClaimsPrincipal(claimsIdentity);
+        await Context.SignInAsync(IdentityConstants.TwoFactorUserIdScheme, claimsPrincipal, props);
+    }
+
+    private async Task<PasskeyAuthenticationInfo?> RetrievePasskeyAuthenticationInfoAsync()
+    {
+        return _passkeyInfo ??= await RetrievePasskeyInfoCoreAsync();
+
+        async Task<PasskeyAuthenticationInfo?> RetrievePasskeyInfoCoreAsync()
+        {
+            var result = await Context.AuthenticateAsync(IdentityConstants.TwoFactorUserIdScheme);
+            await Context.SignOutAsync(IdentityConstants.TwoFactorUserIdScheme);
+
+            if (result.Properties is not { } properties)
+            {
+                return null;
+            }
+
+            if (!properties.Items.TryGetValue(PasskeyOperationKey, out var operation) ||
+                !properties.Items.TryGetValue(PasskeyStateKey, out var state))
+            {
+                return null;
+            }
+
+            return new()
+            {
+                Operation = operation,
+                State = state,
+            };
+        }
+    }
+
     /// <summary>
     /// Returns a flag indicating if the current client browser has been remembered by two factor authentication
     /// for the user attempting to login, as an asynchronous operation.
@@ -448,19 +752,37 @@ public virtual async Task<bool> IsTwoFactorClientRememberedAsync(TUser user)
     /// <returns>The task object representing the asynchronous operation.</returns>
     public virtual async Task RememberTwoFactorClientAsync(TUser user)
     {
-        var principal = await StoreRememberClient(user);
-        await Context.SignInAsync(IdentityConstants.TwoFactorRememberMeScheme,
-            principal,
-            new AuthenticationProperties { IsPersistent = true });
+        try
+        {
+            var principal = await StoreRememberClient(user);
+            await Context.SignInAsync(IdentityConstants.TwoFactorRememberMeScheme,
+                principal,
+                new AuthenticationProperties { IsPersistent = true });
+            _metrics?.RememberTwoFactorClient(typeof(TUser).FullName!, IdentityConstants.TwoFactorRememberMeScheme);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.RememberTwoFactorClient(typeof(TUser).FullName!, IdentityConstants.TwoFactorRememberMeScheme, ex);
+            throw;
+        }
     }
 
     /// <summary>
     /// Clears the "Remember this browser flag" from the current browser, as an asynchronous operation.
     /// </summary>
     /// <returns>The task object representing the asynchronous operation.</returns>
-    public virtual Task ForgetTwoFactorClientAsync()
+    public virtual async Task ForgetTwoFactorClientAsync()
     {
-        return Context.SignOutAsync(IdentityConstants.TwoFactorRememberMeScheme);
+        try
+        {
+            await Context.SignOutAsync(IdentityConstants.TwoFactorRememberMeScheme);
+            _metrics?.ForgetTwoFactorClient(typeof(TUser).FullName!, IdentityConstants.TwoFactorRememberMeScheme);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.ForgetTwoFactorClient(typeof(TUser).FullName!, IdentityConstants.TwoFactorRememberMeScheme, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -469,6 +791,23 @@ public virtual Task ForgetTwoFactorClientAsync()
     /// <param name="recoveryCode">The two factor recovery code.</param>
     /// <returns></returns>
     public virtual async Task<SignInResult> TwoFactorRecoveryCodeSignInAsync(string recoveryCode)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await TwoFactorRecoveryCodeSignInCoreAsync(recoveryCode);
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.TwoFactorRecoveryCode, isPersistent: false, startTimestamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.TwoFactorRecoveryCode, isPersistent: false, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> TwoFactorRecoveryCodeSignInCoreAsync(string recoveryCode)
     {
         var twoFactorInfo = await RetrieveTwoFactorInfoAsync();
         if (twoFactorInfo == null)
@@ -497,8 +836,10 @@ private async Task<SignInResult> DoTwoFactorSignInAsync(TUser user, TwoFactorAut
             return SignInResult.Failed;
         }
 
-        var claims = new List<Claim>();
-        claims.Add(new Claim("amr", "mfa"));
+        var claims = new List<Claim>
+        {
+            new Claim("amr", "mfa")
+        };
 
         if (twoFactorInfo.LoginProvider != null)
         {
@@ -529,9 +870,26 @@ private async Task<SignInResult> DoTwoFactorSignInAsync(TUser user, TwoFactorAut
     /// <param name="isPersistent">Flag indicating whether the sign-in cookie should persist after the browser is closed.</param>
     /// <param name="rememberClient">Flag indicating whether the current browser should be remember, suppressing all further
     /// two factor authentication prompts.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
     public virtual async Task<SignInResult> TwoFactorAuthenticatorSignInAsync(string code, bool isPersistent, bool rememberClient)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await TwoFactorAuthenticatorSignInCoreAsync(code, isPersistent, rememberClient);
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.TwoFactorAuthenticator, isPersistent, startTimestamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.TwoFactorAuthenticator, isPersistent, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> TwoFactorAuthenticatorSignInCoreAsync(string code, bool isPersistent, bool rememberClient)
     {
         var twoFactorInfo = await RetrieveTwoFactorInfoAsync();
         if (twoFactorInfo == null)
@@ -577,9 +935,26 @@ public virtual async Task<SignInResult> TwoFactorAuthenticatorSignInAsync(string
     /// <param name="isPersistent">Flag indicating whether the sign-in cookie should persist after the browser is closed.</param>
     /// <param name="rememberClient">Flag indicating whether the current browser should be remember, suppressing all further
     /// two factor authentication prompts.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
     public virtual async Task<SignInResult> TwoFactorSignInAsync(string provider, string code, bool isPersistent, bool rememberClient)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await TwoFactorSignInCoreAsync(provider, code, isPersistent, rememberClient);
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.TwoFactor, isPersistent, startTimestamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.TwoFactor, isPersistent, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> TwoFactorSignInCoreAsync(string provider, string code, bool isPersistent, bool rememberClient)
     {
         var twoFactorInfo = await RetrieveTwoFactorInfoAsync();
         if (twoFactorInfo == null)
@@ -638,7 +1013,7 @@ public virtual async Task<SignInResult> TwoFactorSignInAsync(string provider, st
     /// <param name="loginProvider">The login provider to use.</param>
     /// <param name="providerKey">The unique provider identifier for the user.</param>
     /// <param name="isPersistent">Flag indicating whether the sign-in cookie should persist after the browser is closed.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
     public virtual Task<SignInResult> ExternalLoginSignInAsync(string loginProvider, string providerKey, bool isPersistent)
         => ExternalLoginSignInAsync(loginProvider, providerKey, isPersistent, bypassTwoFactor: false);
@@ -650,9 +1025,26 @@ public virtual Task<SignInResult> ExternalLoginSignInAsync(string loginProvider,
     /// <param name="providerKey">The unique provider identifier for the user.</param>
     /// <param name="isPersistent">Flag indicating whether the sign-in cookie should persist after the browser is closed.</param>
     /// <param name="bypassTwoFactor">Flag indicating whether to bypass two factor authentication.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="SignInResult"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="SignInResult"/>
     /// for the sign-in attempt.</returns>
     public virtual async Task<SignInResult> ExternalLoginSignInAsync(string loginProvider, string providerKey, bool isPersistent, bool bypassTwoFactor)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await ExternalLoginSignInCoreAsync(loginProvider, providerKey, isPersistent, bypassTwoFactor);
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result, SignInType.External, isPersistent, startTimestamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.AuthenticateSignIn(typeof(TUser).FullName!, AuthenticationScheme, result: null, SignInType.External, isPersistent, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<SignInResult> ExternalLoginSignInCoreAsync(string loginProvider, string providerKey, bool isPersistent, bool bypassTwoFactor)
     {
         var user = await UserManager.FindByLoginAsync(loginProvider, providerKey);
         if (user == null)
@@ -682,7 +1074,7 @@ public virtual async Task<IEnumerable<AuthenticationScheme>> GetExternalAuthenti
     /// Gets the external login information for the current login, as an asynchronous operation.
     /// </summary>
     /// <param name="expectedXsrf">Flag indication whether a Cross Site Request Forgery token was expected in the current request.</param>
-    /// <returns>The task object representing the asynchronous operation containing the <see name="ExternalLoginInfo"/>
+    /// <returns>The task object representing the asynchronous operation containing the <see cref="ExternalLoginInfo"/>
     /// for the sign-in attempt.</returns>
     public virtual async Task<ExternalLoginInfo?> GetExternalLoginInfoAsync(string? expectedXsrf = null)
     {
@@ -1010,4 +1402,17 @@ internal sealed class TwoFactorAuthenticationInfo
         public required TUser User { get; init; }
         public string? LoginProvider { get; init; }
     }
+
+    internal sealed class PasskeyAuthenticationInfo
+    {
+        public required string? Operation { get; init; }
+        public required string? State { get; init; }
+
+    }
+
+    private static class PasskeyOperations
+    {
+        public const string Attestation = "Attestation";
+        public const string Assertion = "Assertion";
+    }
 }
diff --git a/src/Identity/Core/src/SignInManagerMetrics.cs b/src/Identity/Core/src/SignInManagerMetrics.cs
new file mode 100644
index 000000000000..f55a37af2895
--- /dev/null
+++ b/src/Identity/Core/src/SignInManagerMetrics.cs
@@ -0,0 +1,227 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal sealed class SignInManagerMetrics : IDisposable
+{
+    public const string MeterName = "Microsoft.AspNetCore.Identity";
+
+    public const string AuthenticateDurationName = "aspnetcore.identity.sign_in.authenticate.duration";
+    public const string RememberedTwoFactorCounterName = "aspnetcore.identity.sign_in.two_factor_clients_remembered";
+    public const string ForgottenTwoFactorCounterName = "aspnetcore.identity.sign_in.two_factor_clients_forgotten";
+    public const string CheckPasswordAttemptsCounterName = "aspnetcore.identity.sign_in.check_password_attempts";
+    public const string SignInsCounterName = "aspnetcore.identity.sign_in.sign_ins";
+    public const string SignOutsCounterName = "aspnetcore.identity.sign_in.sign_outs";
+
+    private readonly Meter _meter;
+    private readonly Histogram<double> _authenticateDuration;
+    private readonly Counter<long> _rememberTwoFactorClientCounter;
+    private readonly Counter<long> _forgetTwoFactorCounter;
+    private readonly Counter<long> _checkPasswordCounter;
+    private readonly Counter<long> _signInsCounter;
+    private readonly Counter<long> _signOutsCounter;
+
+    public SignInManagerMetrics(IMeterFactory meterFactory)
+    {
+        _meter = meterFactory.Create(MeterName);
+
+        _authenticateDuration = _meter.CreateHistogram<double>(
+            AuthenticateDurationName,
+            unit: "s",
+            description: "The duration of authenticate attempts. The authenticate metrics is recorded by sign in methods such as PasswordSignInAsync and TwoFactorSignInAsync.",
+            advice: new() { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
+
+        _rememberTwoFactorClientCounter = _meter.CreateCounter<long>(
+            RememberedTwoFactorCounterName,
+            unit: "{client}",
+            description: "The total number of two factor clients remembered.");
+
+        _forgetTwoFactorCounter = _meter.CreateCounter<long>(
+            ForgottenTwoFactorCounterName,
+            unit: "{client}",
+            description: "The total number of two factor clients forgotten.");
+
+        _checkPasswordCounter = _meter.CreateCounter<long>(
+            CheckPasswordAttemptsCounterName,
+            unit: "{attempt}",
+            description: "The total number of check password attempts. Checks that the account is in a state that can log in and that the password is valid using the UserManager.CheckPasswordAsync method.");
+
+        _signInsCounter = _meter.CreateCounter<long>(
+            SignInsCounterName,
+            unit: "{sign_in}",
+            description: "The total number of calls to sign in user principals.");
+
+        _signOutsCounter = _meter.CreateCounter<long>(
+            SignOutsCounterName,
+            unit: "{sign_out}",
+            description: "The total number of calls to sign out user principals.");
+    }
+
+    internal void CheckPasswordSignIn(string userType, SignInResult? result, Exception? exception = null)
+    {
+        if (!_checkPasswordCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+        };
+        AddSignInResult(ref tags, result);
+        AddErrorTag(ref tags, exception);
+
+        _checkPasswordCounter.Add(1, tags);
+    }
+
+    internal void AuthenticateSignIn(string userType, string authenticationScheme, SignInResult? result, SignInType signInType, bool? isPersistent, long startTimestamp, Exception? exception = null)
+    {
+        if (!_authenticateDuration.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.authentication.scheme", authenticationScheme },
+            { "aspnetcore.identity.sign_in.type", GetSignInType(signInType) },
+        };
+        AddIsPersistent(ref tags, isPersistent);
+        AddSignInResult(ref tags, result);
+        AddErrorTag(ref tags, exception);
+
+        var duration = ValueStopwatch.GetElapsedTime(startTimestamp, Stopwatch.GetTimestamp());
+        _authenticateDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    internal void SignInUserPrincipal(string userType, string authenticationScheme, bool? isPersistent, Exception? exception = null)
+    {
+        if (!_signInsCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.authentication.scheme", authenticationScheme },
+        };
+        AddIsPersistent(ref tags, isPersistent);
+        AddErrorTag(ref tags, exception);
+
+        _signInsCounter.Add(1, tags);
+    }
+
+    internal void SignOutUserPrincipal(string userType, string authenticationScheme, Exception? exception = null)
+    {
+        if (!_signOutsCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.authentication.scheme", authenticationScheme },
+        };
+        AddErrorTag(ref tags, exception);
+
+        _signOutsCounter.Add(1, tags);
+    }
+
+    internal void RememberTwoFactorClient(string userType, string authenticationScheme, Exception? exception = null)
+    {
+        if (!_rememberTwoFactorClientCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.authentication.scheme", authenticationScheme }
+        };
+        AddErrorTag(ref tags, exception);
+
+        _rememberTwoFactorClientCounter.Add(1, tags);
+    }
+
+    internal void ForgetTwoFactorClient(string userType, string authenticationScheme, Exception? exception = null)
+    {
+        if (!_forgetTwoFactorCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.authentication.scheme", authenticationScheme }
+        };
+        AddErrorTag(ref tags, exception);
+
+        _forgetTwoFactorCounter.Add(1, tags);
+    }
+
+    public void Dispose()
+    {
+        _meter.Dispose();
+    }
+
+    private static void AddIsPersistent(ref TagList tags, bool? isPersistent)
+    {
+        if (isPersistent != null)
+        {
+            tags.Add("aspnetcore.authentication.is_persistent", isPersistent.Value);
+        }
+    }
+
+    private static void AddSignInResult(ref TagList tags, SignInResult? result)
+    {
+        if (result != null)
+        {
+            tags.Add("aspnetcore.identity.sign_in.result", GetSignInResult(result));
+        }
+    }
+
+    private static void AddErrorTag(ref TagList tags, Exception? exception)
+    {
+        if (exception != null)
+        {
+            tags.Add("error.type", exception.GetType().FullName!);
+        }
+    }
+
+    private static string GetSignInType(SignInType signInType)
+    {
+        return signInType switch
+        {
+            SignInType.Password => "password",
+            SignInType.TwoFactorRecoveryCode => "two_factor_recovery_code",
+            SignInType.TwoFactorAuthenticator => "two_factor_authenticator",
+            SignInType.TwoFactor => "two_factor",
+            SignInType.External => "external",
+            SignInType.Passkey => "passkey",
+            _ => "_OTHER"
+        };
+    }
+
+    private static string GetSignInResult(SignInResult result)
+    {
+        return result switch
+        {
+            { Succeeded: true } => "success",
+            { IsLockedOut: true } => "locked_out",
+            { IsNotAllowed: true } => "not_allowed",
+            { RequiresTwoFactor: true } => "requires_two_factor",
+            _ => "failure"
+        };
+    }
+}
diff --git a/src/Identity/Core/src/SignInType.cs b/src/Identity/Core/src/SignInType.cs
new file mode 100644
index 000000000000..04ce1513d29f
--- /dev/null
+++ b/src/Identity/Core/src/SignInType.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal enum SignInType
+{
+    Refresh,
+    Password,
+    TwoFactorRecoveryCode,
+    TwoFactorAuthenticator,
+    TwoFactor,
+    External,
+    Passkey
+}
diff --git a/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs
index fd297f425093..25f5076bc6ca 100644
--- a/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs
+++ b/src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs
@@ -74,7 +74,7 @@ protected IdentityDbContext() { }
 /// <typeparam name="TUserLogin">The type of the user login object.</typeparam>
 /// <typeparam name="TRoleClaim">The type of the role claim object.</typeparam>
 /// <typeparam name="TUserToken">The type of the user token object.</typeparam>
-public abstract class IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken> : IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>
+public class IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken> : IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, IdentityUserPasskey<TKey>>
     where TUser : IdentityUser<TKey>
     where TRole : IdentityRole<TKey>
     where TKey : IEquatable<TKey>
@@ -83,6 +83,41 @@ public abstract class IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRol
     where TUserLogin : IdentityUserLogin<TKey>
     where TRoleClaim : IdentityRoleClaim<TKey>
     where TUserToken : IdentityUserToken<TKey>
+{
+    /// <summary>
+    /// Initializes a new instance of the db context.
+    /// </summary>
+    /// <param name="options">The options to be used by a <see cref="DbContext"/>.</param>
+    public IdentityDbContext(DbContextOptions options) : base(options) { }
+
+    /// <summary>
+    /// Initializes a new instance of the class.
+    /// </summary>
+    protected IdentityDbContext() { }
+}
+
+/// <summary>
+/// Base class for the Entity Framework database context used for identity.
+/// </summary>
+/// <typeparam name="TUser">The type of user objects.</typeparam>
+/// <typeparam name="TRole">The type of role objects.</typeparam>
+/// <typeparam name="TKey">The type of the primary key for users and roles.</typeparam>
+/// <typeparam name="TUserClaim">The type of the user claim object.</typeparam>
+/// <typeparam name="TUserRole">The type of the user role object.</typeparam>
+/// <typeparam name="TUserLogin">The type of the user login object.</typeparam>
+/// <typeparam name="TRoleClaim">The type of the role claim object.</typeparam>
+/// <typeparam name="TUserToken">The type of the user token object.</typeparam>
+/// <typeparam name="TUserPasskey">The type of the user token object.</typeparam>
+public abstract class IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey> : IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>
+    where TUser : IdentityUser<TKey>
+    where TRole : IdentityRole<TKey>
+    where TKey : IEquatable<TKey>
+    where TUserClaim : IdentityUserClaim<TKey>
+    where TUserRole : IdentityUserRole<TKey>
+    where TUserLogin : IdentityUserLogin<TKey>
+    where TRoleClaim : IdentityRoleClaim<TKey>
+    where TUserToken : IdentityUserToken<TKey>
+    where TUserPasskey : IdentityUserPasskey<TKey>
 {
     /// <summary>
     /// Initializes a new instance of the class.
@@ -121,6 +156,49 @@ protected override void OnModelCreating(ModelBuilder builder)
         base.OnModelCreating(builder);
     }
 
+    /// <summary>
+    /// Configures the schema needed for the identity framework for schema version 3.0
+    /// </summary>
+    /// <param name="builder">
+    /// The builder being used to construct the model for this context.
+    /// </param>
+    internal override void OnModelCreatingVersion3(ModelBuilder builder)
+    {
+        base.OnModelCreatingVersion3(builder);
+
+        // Currently no differences between Version 3 and Version 2
+        builder.Entity<TUser>(b =>
+        {
+            b.HasMany<TUserRole>().WithOne().HasForeignKey(ur => ur.UserId).IsRequired();
+        });
+
+        builder.Entity<TRole>(b =>
+        {
+            b.HasKey(r => r.Id);
+            b.HasIndex(r => r.NormalizedName).HasDatabaseName("RoleNameIndex").IsUnique();
+            b.ToTable("AspNetRoles");
+            b.Property(r => r.ConcurrencyStamp).IsConcurrencyToken();
+
+            b.Property(u => u.Name).HasMaxLength(256);
+            b.Property(u => u.NormalizedName).HasMaxLength(256);
+
+            b.HasMany<TUserRole>().WithOne().HasForeignKey(ur => ur.RoleId).IsRequired();
+            b.HasMany<TRoleClaim>().WithOne().HasForeignKey(rc => rc.RoleId).IsRequired();
+        });
+
+        builder.Entity<TRoleClaim>(b =>
+        {
+            b.HasKey(rc => rc.Id);
+            b.ToTable("AspNetRoleClaims");
+        });
+
+        builder.Entity<TUserRole>(b =>
+        {
+            b.HasKey(r => new { r.UserId, r.RoleId });
+            b.ToTable("AspNetUserRoles");
+        });
+    }
+
     /// <summary>
     /// Configures the schema needed for the identity framework for schema version 2.0
     /// </summary>
@@ -131,7 +209,7 @@ internal override void OnModelCreatingVersion2(ModelBuilder builder)
     {
         base.OnModelCreatingVersion2(builder);
 
-        // Current no differences between Version 2 and Version 1
+        // No differences between Version 2 and Version 1
         builder.Entity<TUser>(b =>
         {
             b.HasMany<TUserRole>().WithOne().HasForeignKey(ur => ur.UserId).IsRequired();
diff --git a/src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs b/src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs
index 52beacac6f6d..50584e72a1af 100644
--- a/src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs
+++ b/src/Identity/EntityFrameworkCore/src/IdentityEntityFrameworkBuilderExtensions.cs
@@ -46,7 +46,7 @@ private static void AddStores(IServiceCollection services, Type userType, Type?
 
             Type userStoreType;
             Type roleStoreType;
-            var identityContext = FindGenericBaseType(contextType, typeof(IdentityDbContext<,,,,,,,>));
+            var identityContext = FindGenericBaseType(contextType, typeof(IdentityDbContext<,,,,,,,,>));
             if (identityContext == null)
             {
                 // If its a custom DbContext, we can only add the default POCOs
@@ -55,13 +55,14 @@ private static void AddStores(IServiceCollection services, Type userType, Type?
             }
             else
             {
-                userStoreType = typeof(UserStore<,,,,,,,,>).MakeGenericType(userType, roleType, contextType,
+                userStoreType = typeof(UserStore<,,,,,,,,,>).MakeGenericType(userType, roleType, contextType,
                     identityContext.GenericTypeArguments[2],
                     identityContext.GenericTypeArguments[3],
                     identityContext.GenericTypeArguments[4],
                     identityContext.GenericTypeArguments[5],
                     identityContext.GenericTypeArguments[7],
-                    identityContext.GenericTypeArguments[6]);
+                    identityContext.GenericTypeArguments[6],
+                    identityContext.GenericTypeArguments[8]);
                 roleStoreType = typeof(RoleStore<,,,,>).MakeGenericType(roleType, contextType,
                     identityContext.GenericTypeArguments[2],
                     identityContext.GenericTypeArguments[4],
@@ -73,7 +74,7 @@ private static void AddStores(IServiceCollection services, Type userType, Type?
         else
         {   // No Roles
             Type userStoreType;
-            var identityContext = FindGenericBaseType(contextType, typeof(IdentityUserContext<,,,,>));
+            var identityContext = FindGenericBaseType(contextType, typeof(IdentityUserContext<,,,,,>));
             if (identityContext == null)
             {
                 // If its a custom DbContext, we can only add the default POCOs
diff --git a/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
index 84e7bfc5282f..60a3d5d887d3 100644
--- a/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
+++ b/src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
@@ -57,12 +57,41 @@ protected IdentityUserContext() { }
 /// <typeparam name="TUserClaim">The type of the user claim object.</typeparam>
 /// <typeparam name="TUserLogin">The type of the user login object.</typeparam>
 /// <typeparam name="TUserToken">The type of the user token object.</typeparam>
-public abstract class IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken> : DbContext
+public class IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken> : IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, IdentityUserPasskey<TKey>>
     where TUser : IdentityUser<TKey>
     where TKey : IEquatable<TKey>
     where TUserClaim : IdentityUserClaim<TKey>
     where TUserLogin : IdentityUserLogin<TKey>
     where TUserToken : IdentityUserToken<TKey>
+{
+    /// <summary>
+    /// Initializes a new instance of the db context.
+    /// </summary>
+    /// <param name="options">The options to be used by a <see cref="DbContext"/>.</param>
+    public IdentityUserContext(DbContextOptions options) : base(options) { }
+
+    /// <summary>
+    /// Initializes a new instance of the class.
+    /// </summary>
+    protected IdentityUserContext() { }
+}
+
+/// <summary>
+/// Base class for the Entity Framework database context used for identity.
+/// </summary>
+/// <typeparam name="TUser">The type of user objects.</typeparam>
+/// <typeparam name="TKey">The type of the primary key for users and roles.</typeparam>
+/// <typeparam name="TUserClaim">The type of the user claim object.</typeparam>
+/// <typeparam name="TUserLogin">The type of the user login object.</typeparam>
+/// <typeparam name="TUserToken">The type of the user token object.</typeparam>
+/// <typeparam name="TUserPasskey">The type of the user passkey object.</typeparam>
+public abstract class IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey> : DbContext
+    where TUser : IdentityUser<TKey>
+    where TKey : IEquatable<TKey>
+    where TUserClaim : IdentityUserClaim<TKey>
+    where TUserLogin : IdentityUserLogin<TKey>
+    where TUserToken : IdentityUserToken<TKey>
+    where TUserPasskey : IdentityUserPasskey<TKey>
 {
     /// <summary>
     /// Initializes a new instance of the class.
@@ -95,6 +124,11 @@ protected IdentityUserContext() { }
     /// </summary>
     public virtual DbSet<TUserToken> UserTokens { get; set; } = default!;
 
+    /// <summary>
+    /// Gets or sets the <see cref="DbSet{TEntity}"/> of User passkeys.
+    /// </summary>
+    public virtual DbSet<TUserPasskey> UserPasskeys { get; set; } = default!;
+
     /// <summary>
     /// Gets the schema version used for versioning.
     /// </summary>
@@ -133,7 +167,11 @@ protected override void OnModelCreating(ModelBuilder builder)
     /// <param name="schemaVersion">The schema version.</param>
     internal virtual void OnModelCreatingVersion(ModelBuilder builder, Version schemaVersion)
     {
-        if (schemaVersion >= IdentitySchemaVersions.Version2)
+        if (schemaVersion >= IdentitySchemaVersions.Version3)
+        {
+            OnModelCreatingVersion3(builder);
+        }
+        else if (schemaVersion >= IdentitySchemaVersions.Version2)
         {
             OnModelCreatingVersion2(builder);
         }
@@ -143,6 +181,116 @@ internal virtual void OnModelCreatingVersion(ModelBuilder builder, Version schem
         }
     }
 
+    /// <summary>
+    /// Configures the schema needed for the identity framework for schema version 3.0
+    /// </summary>
+    /// <param name="builder">
+    /// The builder being used to construct the model for this context.
+    /// </param>
+    internal virtual void OnModelCreatingVersion3(ModelBuilder builder)
+    {
+        // Differences from Version 2:
+        // - Add a passkey entity
+
+        var storeOptions = GetStoreOptions();
+        var maxKeyLength = storeOptions?.MaxLengthForKeys ?? 0;
+        if (maxKeyLength == 0)
+        {
+            maxKeyLength = 128;
+        }
+        var encryptPersonalData = storeOptions?.ProtectPersonalData ?? false;
+        PersonalDataConverter? converter = null;
+
+        builder.Entity<TUser>(b =>
+        {
+            b.HasKey(u => u.Id);
+            b.HasIndex(u => u.NormalizedUserName).HasDatabaseName("UserNameIndex").IsUnique();
+            b.HasIndex(u => u.NormalizedEmail).HasDatabaseName("EmailIndex");
+            b.ToTable("AspNetUsers");
+            b.Property(u => u.ConcurrencyStamp).IsConcurrencyToken();
+
+            b.Property(u => u.UserName).HasMaxLength(256);
+            b.Property(u => u.NormalizedUserName).HasMaxLength(256);
+            b.Property(u => u.Email).HasMaxLength(256);
+            b.Property(u => u.NormalizedEmail).HasMaxLength(256);
+            b.Property(u => u.PhoneNumber).HasMaxLength(256);
+
+            if (encryptPersonalData)
+            {
+                converter = new PersonalDataConverter(this.GetService<IPersonalDataProtector>());
+                var personalDataProps = typeof(TUser).GetProperties().Where(
+                                prop => Attribute.IsDefined(prop, typeof(ProtectedPersonalDataAttribute)));
+                foreach (var p in personalDataProps)
+                {
+                    if (p.PropertyType != typeof(string))
+                    {
+                        throw new InvalidOperationException(Resources.CanOnlyProtectStrings);
+                    }
+                    b.Property(typeof(string), p.Name).HasConversion(converter);
+                }
+            }
+
+            b.HasMany<TUserClaim>().WithOne().HasForeignKey(uc => uc.UserId).IsRequired();
+            b.HasMany<TUserLogin>().WithOne().HasForeignKey(ul => ul.UserId).IsRequired();
+            b.HasMany<TUserToken>().WithOne().HasForeignKey(ut => ut.UserId).IsRequired();
+            b.HasMany<TUserPasskey>().WithOne().HasForeignKey(up => up.UserId).IsRequired();
+        });
+
+        builder.Entity<TUserClaim>(b =>
+        {
+            b.HasKey(uc => uc.Id);
+            b.ToTable("AspNetUserClaims");
+        });
+
+        builder.Entity<TUserLogin>(b =>
+        {
+            b.HasKey(l => new { l.LoginProvider, l.ProviderKey });
+
+            if (maxKeyLength > 0)
+            {
+                b.Property(l => l.LoginProvider).HasMaxLength(maxKeyLength);
+                b.Property(l => l.ProviderKey).HasMaxLength(maxKeyLength);
+            }
+
+            b.ToTable("AspNetUserLogins");
+        });
+
+        builder.Entity<TUserToken>(b =>
+        {
+            b.HasKey(t => new { t.UserId, t.LoginProvider, t.Name });
+
+            if (maxKeyLength > 0)
+            {
+                b.Property(t => t.LoginProvider).HasMaxLength(maxKeyLength);
+                b.Property(t => t.Name).HasMaxLength(maxKeyLength);
+            }
+
+            if (encryptPersonalData)
+            {
+                var tokenProps = typeof(TUserToken).GetProperties().Where(
+                                prop => Attribute.IsDefined(prop, typeof(ProtectedPersonalDataAttribute)));
+                foreach (var p in tokenProps)
+                {
+                    if (p.PropertyType != typeof(string))
+                    {
+                        throw new InvalidOperationException(Resources.CanOnlyProtectStrings);
+                    }
+                    b.Property(typeof(string), p.Name).HasConversion(converter);
+                }
+            }
+
+            b.ToTable("AspNetUserTokens");
+        });
+
+        builder.Entity<TUserPasskey>(b =>
+        {
+            b.HasKey(p => p.CredentialId);
+            b.ToTable("AspNetUserPasskeys");
+            b.Property(p => p.CredentialId).HasMaxLength(1024); // Defined in WebAuthn spec to be no longer than 1023 bytes
+            b.OwnsOne(p => p.Data).ToJson();
+        });
+    }
+
     /// <summary>
     /// Configures the schema needed for the identity framework for schema version 2.0
     /// </summary>
@@ -243,6 +391,8 @@ internal virtual void OnModelCreatingVersion2(ModelBuilder builder)
 
             b.ToTable("AspNetUserTokens");
         });
+
+        builder.Ignore<TUserPasskey>();
     }
 
     /// <summary>
@@ -336,5 +486,7 @@ internal virtual void OnModelCreatingVersion1(ModelBuilder builder)
 
             b.ToTable("AspNetUserTokens");
         });
+
+        builder.Ignore<TUserPasskey>();
     }
 }
diff --git a/src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs
new file mode 100644
index 000000000000..4e2f4a040a58
--- /dev/null
+++ b/src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+
+internal static class IdentityUserPasskeyExtensions
+{
+    extension<TKey>(IdentityUserPasskey<TKey> passkey)
+        where TKey : IEquatable<TKey>
+    {
+        public void UpdateFromUserPasskeyInfo(UserPasskeyInfo passkeyInfo)
+        {
+            passkey.Data.Name = passkeyInfo.Name;
+            passkey.Data.SignCount = passkeyInfo.SignCount;
+            passkey.Data.IsBackedUp = passkeyInfo.IsBackedUp;
+            passkey.Data.IsUserVerified = passkeyInfo.IsUserVerified;
+        }
+
+        public UserPasskeyInfo ToUserPasskeyInfo()
+            => new(
+                passkey.CredentialId,
+                passkey.Data.PublicKey,
+                passkey.Data.CreatedAt,
+                passkey.Data.SignCount,
+                passkey.Data.Transports,
+                passkey.Data.IsUserVerified,
+                passkey.Data.IsBackupEligible,
+                passkey.Data.IsBackedUp,
+                passkey.Data.AttestationObject,
+                passkey.Data.ClientDataJson)
+            {
+                Name = passkey.Data.Name
+            };
+    }
+}
diff --git a/src/Identity/EntityFrameworkCore/src/PACKAGE.md b/src/Identity/EntityFrameworkCore/src/PACKAGE.md
new file mode 100644
index 000000000000..ca45a656f9b1
--- /dev/null
+++ b/src/Identity/EntityFrameworkCore/src/PACKAGE.md
@@ -0,0 +1,58 @@
+## About
+
+`Microsoft.AspNetCore.Identity.EntityFrameworkCore` utilizes Entity Framework Core to provide functionality enabling the storage of user, role, and other identity-related data in a database.
+
+## Key Features
+
+* Provides user and role management
+* Enables secure authentication and authorization mechanisms
+* Allows storage and validatation of user passwords using hashing
+* Tracks email confirmation for user account validation
+* Tracks two-factor authentication to provide an extra layer of security
+* Tracks failed login attempts to help protect against brute-force attacks enabling locking out user accounts after multiple failed login attempts
+* Uses claims to define fine-grained access control policies
+* Seamlessly integrates with Entity Framework Core for data storage and retrieval
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Identity.EntityFrameworkCore`, follow these steps:
+
+### Installation
+
+```sh
+dotnet add package Microsoft.AspNetCore.Identity.EntityFrameworkCore
+```
+
+### Configuration
+
+Add the following code to the `Program.cs` of your ASP.NET Core app:
+
+```csharp
+builder.Services.AddDbContext<ApplicationDbContext>(options =>
+    options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection")));
+
+builder.Services.AddDefaultIdentity<ApplicationUser>()
+    .AddEntityFrameworkStores<ApplicationDbContext>();
+```
+
+You can replace `ApplicationDbContext` with your own database context class derived from `IdentityDbContext` and `ApplicationUser` with your own user class containing additional properties derived from `IdentityUser`.
+
+Make sure to [configure the connection string](https://learn.microsoft.com/ef/core/miscellaneous/connection-strings#aspnet-core) via "ConnectionStrings:DefaultConnection" (or whatever you rename it to) so it can connect to your database.
+
+## Main Types
+
+The main types provided by `Microsoft.AspNetCore.Identity.EntityFrameworkCore` include:
+
+* `IdentityDbContext`: Provides the database context for storing and managing user, role, and other identity-related data
+* `IdentityUserContext`: Provides methods and properties for querying and manipulating user information
+* `RoleStore`: Provides methods for creating, updating, and deleting roles, as well as querying and managing role-related data
+* `UserStore`: Provides methods for creating, updating, and deleting users, as well as querying and managing user-related data
+* `UserOnlyStore`: Provides methods for creating, updating, and deleting users, as well as querying and managing user-related data for users without roles
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/identity) on ASP.NET Core Identity.
+
+## Feedback & Contributing
+
+`Microsoft.AspNetCore.Identity.EntityFrameworkCore` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Identity/EntityFrameworkCore/src/PublicAPI.Unshipped.txt b/src/Identity/EntityFrameworkCore/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..ce6365507d75 100644
--- a/src/Identity/EntityFrameworkCore/src/PublicAPI.Unshipped.txt
+++ b/src/Identity/EntityFrameworkCore/src/PublicAPI.Unshipped.txt
@@ -1 +1,186 @@
 #nullable enable
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.IdentityDbContext() -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions! options) -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.IdentityUserContext() -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions! options) -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.AutoSaveChanges.get -> bool
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.AutoSaveChanges.set -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.SaveChanges(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserClaims.get -> Microsoft.EntityFrameworkCore.DbSet<TUserClaim!>!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserLogins.get -> Microsoft.EntityFrameworkCore.DbSet<TUserLogin!>!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserOnlyStore(TContext! context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber? describer = null) -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserPasskeys.get -> Microsoft.EntityFrameworkCore.DbSet<TUserPasskey!>!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UsersSet.get -> Microsoft.EntityFrameworkCore.DbSet<TUser!>!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserTokens.get -> Microsoft.EntityFrameworkCore.DbSet<TUserToken!>!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AutoSaveChanges.get -> bool
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AutoSaveChanges.set -> void
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.SaveChanges(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.UserStore(TContext! context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber? describer = null) -> void
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder! builder) -> void
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder! builder) -> void
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.AddClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.AddLoginAsync(TUser! user, Microsoft.AspNetCore.Identity.UserLoginInfo! login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.AddUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.CreateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.DeleteAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindByEmailAsync(string! normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindByIdAsync(string! userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindByLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindByNameAsync(string! normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindTokenAsync(TUser! user, string! loginProvider, string! name, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserToken?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindUserLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindUserLoginAsync(TKey userId, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.GetClaimsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.GetLoginsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserLoginInfo!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.GetUsersForClaimAsync(System.Security.Claims.Claim! claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.RemoveClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.RemoveLoginAsync(TUser! user, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.RemoveUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.ReplaceClaimAsync(TUser! user, System.Security.Claims.Claim! claim, System.Security.Claims.Claim! newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UpdateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.Users.get -> System.Linq.IQueryable<TUser!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AddClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AddLoginAsync(TUser! user, Microsoft.AspNetCore.Identity.UserLoginInfo! login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AddToRoleAsync(TUser! user, string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AddUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.CreateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.DeleteAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindByEmailAsync(string! normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindByIdAsync(string! userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindByLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindByNameAsync(string! normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindRoleAsync(string! normalizedRoleName, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TRole?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindTokenAsync(TUser! user, string! loginProvider, string! name, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserToken?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindUserLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindUserLoginAsync(TKey userId, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindUserRoleAsync(TKey userId, TKey roleId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserRole?>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.GetClaimsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.GetLoginsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserLoginInfo!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.GetRolesAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<string!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.GetUsersForClaimAsync(System.Security.Claims.Claim! claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.GetUsersInRoleAsync(string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser!>!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.IsInRoleAsync(TUser! user, string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<bool>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.RemoveClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.RemoveFromRoleAsync(TUser! user, string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.RemoveLoginAsync(TUser! user, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.RemoveUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.ReplaceClaimAsync(TUser! user, System.Security.Claims.Claim! claim, System.Security.Claims.Claim! newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.UpdateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.Users.get -> System.Linq.IQueryable<TUser!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.RoleClaims.get -> Microsoft.EntityFrameworkCore.DbSet<TRoleClaim!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.RoleClaims.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.Roles.get -> Microsoft.EntityFrameworkCore.DbSet<TRole!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.Roles.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.UserRoles.get -> Microsoft.EntityFrameworkCore.DbSet<TUserRole!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken, TUserPasskey>.UserRoles.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.SchemaVersion.get -> System.Version!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserClaims.get -> Microsoft.EntityFrameworkCore.DbSet<TUserClaim!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserClaims.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserLogins.get -> Microsoft.EntityFrameworkCore.DbSet<TUserLogin!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserLogins.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserPasskeys.get -> Microsoft.EntityFrameworkCore.DbSet<TUserPasskey!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserPasskeys.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.Users.get -> Microsoft.EntityFrameworkCore.DbSet<TUser!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.Users.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserTokens.get -> Microsoft.EntityFrameworkCore.DbSet<TUserToken!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.UserTokens.set -> void
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.AddOrUpdatePasskeyAsync(TUser! user, Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.Context.get -> TContext!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.CreateUserPasskey(TUser! user, Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey) -> TUserPasskey!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindByPasskeyIdAsync(byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.FindPasskeyAsync(TUser! user, byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.UserPasskeyInfo?>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.GetPasskeysAsync(TUser! user, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserPasskeyInfo!>!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey>.RemovePasskeyAsync(TUser! user, byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.AddOrUpdatePasskeyAsync(TUser! user, Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.Context.get -> TContext!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.CreateUserPasskey(TUser! user, Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey) -> TUserPasskey!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindByPasskeyIdAsync(byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.FindPasskeyAsync(TUser! user, byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.UserPasskeyInfo?>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.GetPasskeysAsync(TUser! user, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserPasskeyInfo!>!>!
+virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey>.RemovePasskeyAsync(TUser! user, byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.AutoSaveChanges.get -> bool
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.AutoSaveChanges.set -> void
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.SaveChanges(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.UserClaims.get -> Microsoft.EntityFrameworkCore.DbSet<TUserClaim!>!
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.UserLogins.get -> Microsoft.EntityFrameworkCore.DbSet<TUserLogin!>!
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.UsersSet.get -> Microsoft.EntityFrameworkCore.DbSet<TUser!>!
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.UserTokens.get -> Microsoft.EntityFrameworkCore.DbSet<TUserToken!>!
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.AutoSaveChanges.get -> bool
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.AutoSaveChanges.set -> void
+*REMOVED*Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.SaveChanges(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder! builder) -> void
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder! builder) -> void
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.AddClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.AddLoginAsync(TUser! user, Microsoft.AspNetCore.Identity.UserLoginInfo! login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.AddUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.CreateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.DeleteAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindByEmailAsync(string! normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindByIdAsync(string! userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindByLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindByNameAsync(string! normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindTokenAsync(TUser! user, string! loginProvider, string! name, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserToken?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindUserLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.FindUserLoginAsync(TKey userId, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.GetClaimsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.GetLoginsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserLoginInfo!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.GetUsersForClaimAsync(System.Security.Claims.Claim! claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.RemoveClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.RemoveLoginAsync(TUser! user, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.RemoveUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.ReplaceClaimAsync(TUser! user, System.Security.Claims.Claim! claim, System.Security.Claims.Claim! newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.UpdateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.Users.get -> System.Linq.IQueryable<TUser!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.AddClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.AddLoginAsync(TUser! user, Microsoft.AspNetCore.Identity.UserLoginInfo! login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.AddToRoleAsync(TUser! user, string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.AddUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.CreateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.DeleteAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindByEmailAsync(string! normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindByIdAsync(string! userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindByLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindByNameAsync(string! normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindRoleAsync(string! normalizedRoleName, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TRole?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindTokenAsync(TUser! user, string! loginProvider, string! name, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserToken?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindUserLoginAsync(string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindUserLoginAsync(TKey userId, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserLogin?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.FindUserRoleAsync(TKey userId, TKey roleId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUserRole?>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.GetClaimsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.GetLoginsAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserLoginInfo!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.GetRolesAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<string!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.GetUsersForClaimAsync(System.Security.Claims.Claim! claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.GetUsersInRoleAsync(string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser!>!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.IsInRoleAsync(TUser! user, string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<bool>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.RemoveClaimsAsync(TUser! user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim!>! claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.RemoveFromRoleAsync(TUser! user, string! normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.RemoveLoginAsync(TUser! user, string! loginProvider, string! providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.RemoveUserTokenAsync(TUserToken! token) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.ReplaceClaimAsync(TUser! user, System.Security.Claims.Claim! claim, System.Security.Claims.Claim! newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.UpdateAsync(TUser! user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+*REMOVED*override Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.Users.get -> System.Linq.IQueryable<TUser!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.RoleClaims.get -> Microsoft.EntityFrameworkCore.DbSet<TRoleClaim!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.RoleClaims.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.Roles.get -> Microsoft.EntityFrameworkCore.DbSet<TRole!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.Roles.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.UserRoles.get -> Microsoft.EntityFrameworkCore.DbSet<TUserRole!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken>.UserRoles.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.SchemaVersion.get -> System.Version!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.UserClaims.get -> Microsoft.EntityFrameworkCore.DbSet<TUserClaim!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.UserClaims.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.UserLogins.get -> Microsoft.EntityFrameworkCore.DbSet<TUserLogin!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.UserLogins.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.Users.get -> Microsoft.EntityFrameworkCore.DbSet<TUser!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.Users.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.UserTokens.get -> Microsoft.EntityFrameworkCore.DbSet<TUserToken!>!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken>.UserTokens.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken>.Context.get -> TContext!
+*REMOVED*virtual Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>.Context.get -> TContext!
diff --git a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
index 7a7974c74791..2e711f498eef 100644
--- a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
+++ b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
@@ -67,6 +67,33 @@ public UserOnlyStore(TContext context, IdentityErrorDescriber? describer = null)
 /// <typeparam name="TUserLogin">The type representing a user external login.</typeparam>
 /// <typeparam name="TUserToken">The type representing a user token.</typeparam>
 public class UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken> :
+    UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, IdentityUserPasskey<TKey>>
+    where TUser : IdentityUser<TKey>
+    where TContext : DbContext
+    where TKey : IEquatable<TKey>
+    where TUserClaim : IdentityUserClaim<TKey>, new()
+    where TUserLogin : IdentityUserLogin<TKey>, new()
+    where TUserToken : IdentityUserToken<TKey>, new()
+{
+    /// <summary>
+    /// Constructs a new instance of <see cref="UserStore{TUser, TRole, TContext, TKey}"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="DbContext"/>.</param>
+    /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
+    public UserOnlyStore(TContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
+}
+
+/// <summary>
+/// Represents a new instance of a persistence store for the specified user and role types.
+/// </summary>
+/// <typeparam name="TUser">The type representing a user.</typeparam>
+/// <typeparam name="TContext">The type of the data context class used to access the store.</typeparam>
+/// <typeparam name="TKey">The type of the primary key for a role.</typeparam>
+/// <typeparam name="TUserClaim">The type representing a claim.</typeparam>
+/// <typeparam name="TUserLogin">The type representing a user external login.</typeparam>
+/// <typeparam name="TUserToken">The type representing a user token.</typeparam>
+/// <typeparam name="TUserPasskey">The type representing a user passkey.</typeparam>
+public class UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken, TUserPasskey> :
     UserStoreBase<TUser, TKey, TUserClaim, TUserLogin, TUserToken>,
     IUserLoginStore<TUser>,
     IUserClaimStore<TUser>,
@@ -80,14 +107,18 @@ public class UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserT
     IUserAuthenticationTokenStore<TUser>,
     IUserAuthenticatorKeyStore<TUser>,
     IUserTwoFactorRecoveryCodeStore<TUser>,
-    IProtectedUserStore<TUser>
+    IProtectedUserStore<TUser>,
+    IUserPasskeyStore<TUser>
     where TUser : IdentityUser<TKey>
     where TContext : DbContext
     where TKey : IEquatable<TKey>
     where TUserClaim : IdentityUserClaim<TKey>, new()
     where TUserLogin : IdentityUserLogin<TKey>, new()
     where TUserToken : IdentityUserToken<TKey>, new()
+    where TUserPasskey : IdentityUserPasskey<TKey>, new()
 {
+    private bool? _dbContextSupportsPasskeys;
+
     /// <summary>
     /// Creates a new instance of the store.
     /// </summary>
@@ -124,6 +155,18 @@ public class UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserT
     /// </summary>
     protected DbSet<TUserToken> UserTokens { get { return Context.Set<TUserToken>(); } }
 
+    /// <summary>
+    /// DbSet of user passkeys.
+    /// </summary>
+    protected DbSet<TUserPasskey> UserPasskeys
+    {
+        get
+        {
+            ThrowIfPasskeysNotSupported();
+            return Context.Set<TUserPasskey>();
+        }
+    }
+
     /// <summary>
     /// Gets or sets a flag indicating if changes should be persisted after CreateAsync, UpdateAsync and DeleteAsync are called.
     /// </summary>
@@ -510,4 +553,188 @@ protected override Task RemoveUserTokenAsync(TUserToken token)
         UserTokens.Remove(token);
         return Task.CompletedTask;
     }
+
+    /// <summary>
+    /// Called to create a new instance of a <see cref="IdentityUserPasskey{TKey}"/>.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <param name="passkey">The passkey.</param>
+    /// <returns></returns>
+    protected virtual TUserPasskey CreateUserPasskey(TUser user, UserPasskeyInfo passkey)
+    {
+        return new TUserPasskey
+        {
+            UserId = user.Id,
+            CredentialId = passkey.CredentialId,
+            Data = new IdentityPasskeyData()
+            {
+                PublicKey = passkey.PublicKey,
+                Name = passkey.Name,
+                CreatedAt = passkey.CreatedAt,
+                Transports = passkey.Transports,
+                SignCount = passkey.SignCount,
+                IsUserVerified = passkey.IsUserVerified,
+                IsBackupEligible = passkey.IsBackupEligible,
+                IsBackedUp = passkey.IsBackedUp,
+                AttestationObject = passkey.AttestationObject,
+                ClientDataJson = passkey.ClientDataJson,
+            },
+        };
+    }
+
+    /// <summary>
+    /// Find a passkey with the specified credential id for a user.
+    /// </summary>
+    /// <param name="userId">The user's id.</param>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The user passkey if it exists.</returns>
+    private Task<TUserPasskey?> FindUserPasskeyAsync(TKey userId, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        return UserPasskeys.SingleOrDefaultAsync(
+            userPasskey => userPasskey.UserId.Equals(userId) && userPasskey.CredentialId.SequenceEqual(credentialId),
+            cancellationToken);
+    }
+
+    /// <summary>
+    /// Find a passkey with the specified credential id.
+    /// </summary>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The user passkey if it exists.</returns>
+    private Task<TUserPasskey?> FindUserPasskeyByIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+    {
+        return UserPasskeys.SingleOrDefaultAsync(userPasskey => userPasskey.CredentialId.SequenceEqual(credentialId), cancellationToken);
+    }
+
+    /// <summary>
+    /// Creates a new passkey credential in the store for the specified <paramref name="user"/>,
+    /// or updates an existing passkey.
+    /// </summary>
+    /// <param name="user">The user to create the passkey credential for.</param>
+    /// <param name="passkey"></param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
+    public virtual async Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(passkey);
+
+        var userPasskey = await FindUserPasskeyByIdAsync(passkey.CredentialId, cancellationToken).ConfigureAwait(false);
+        if (userPasskey != null)
+        {
+            userPasskey.UpdateFromUserPasskeyInfo(passkey);
+            UserPasskeys.Update(userPasskey);
+        }
+        else
+        {
+            userPasskey = CreateUserPasskey(user, passkey);
+            UserPasskeys.Add(userPasskey);
+        }
+
+        await SaveChanges(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Gets the passkey credentials for the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user whose passkeys should be retrieved.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing a list of the user's passkeys.</returns>
+    public virtual async Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+
+        var userId = user.Id;
+        var passkeys = await UserPasskeys
+            .Where(p => p.UserId.Equals(userId))
+            .Select(p => p.ToUserPasskeyInfo())
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        return passkeys;
+    }
+
+    /// <summary>
+    /// Finds and returns a user, if any, associated with the specified passkey credential identifier.
+    /// </summary>
+    /// <param name="credentialId">The passkey credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the user, if any, associated with the specified passkey credential id.
+    /// </returns>
+    public virtual async Task<TUser?> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+
+        var passkey = await FindUserPasskeyByIdAsync(credentialId, cancellationToken).ConfigureAwait(false);
+        if (passkey != null)
+        {
+            return await FindUserAsync(passkey.UserId, cancellationToken).ConfigureAwait(false);
+        }
+        return null;
+    }
+
+    /// <summary>
+    /// Finds a passkey for the specified user with the specified credential id.
+    /// </summary>
+    /// <param name="user">The user whose passkey should be retrieved.</param>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the user's passkey information.</returns>
+    public virtual async Task<UserPasskeyInfo?> FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(credentialId);
+
+        var passkey = await FindUserPasskeyAsync(user.Id, credentialId, cancellationToken).ConfigureAwait(false);
+        return passkey?.ToUserPasskeyInfo();
+    }
+
+    /// <summary>
+    /// Removes a passkey credential from the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user to remove the passkey credential from.</param>
+    /// <param name="credentialId">The credential id of the passkey to remove.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
+    public virtual async Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(credentialId);
+
+        var passkey = await FindUserPasskeyAsync(user.Id, credentialId, cancellationToken).ConfigureAwait(false);
+        if (passkey != null)
+        {
+            UserPasskeys.Remove(passkey);
+            await SaveChanges(cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    private void ThrowIfPasskeysNotSupported()
+    {
+        if (_dbContextSupportsPasskeys == true)
+        {
+            return;
+        }
+
+        _dbContextSupportsPasskeys ??= Context.Model.FindEntityType(typeof(TUserPasskey)) is not null;
+        if (_dbContextSupportsPasskeys == false)
+        {
+            throw new InvalidOperationException(
+                $"This operation is not permitted because the underlying '{nameof(DbContext)}' does not include '{typeof(TUserPasskey).Name}' in its model. " +
+                $"When using '{nameof(IdentityDbContext)}', make sure that '{nameof(IdentityOptions)}.{nameof(IdentityOptions.Stores)}.{nameof(StoreOptions.SchemaVersion)}' " +
+                $"is set to '{nameof(IdentitySchemaVersions)}.{nameof(IdentitySchemaVersions.Version3)}' or higher. " +
+                $"See https://aka.ms/aspnet/passkeys for more information.");
+        }
+    }
 }
diff --git a/src/Identity/EntityFrameworkCore/src/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs
index 51c63c694928..50bf2f71b01b 100644
--- a/src/Identity/EntityFrameworkCore/src/UserStore.cs
+++ b/src/Identity/EntityFrameworkCore/src/UserStore.cs
@@ -91,8 +91,42 @@ public UserStore(TContext context, IdentityErrorDescriber? describer = null) : b
 /// <typeparam name="TUserToken">The type representing a user token.</typeparam>
 /// <typeparam name="TRoleClaim">The type representing a role claim.</typeparam>
 public class UserStore<TUser, TRole, TContext, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim> :
+    UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, IdentityUserPasskey<TKey>>
+    where TUser : IdentityUser<TKey>
+    where TRole : IdentityRole<TKey>
+    where TContext : DbContext
+    where TKey : IEquatable<TKey>
+    where TUserClaim : IdentityUserClaim<TKey>, new()
+    where TUserRole : IdentityUserRole<TKey>, new()
+    where TUserLogin : IdentityUserLogin<TKey>, new()
+    where TUserToken : IdentityUserToken<TKey>, new()
+    where TRoleClaim : IdentityRoleClaim<TKey>, new()
+{
+    /// <summary>
+    /// Constructs a new instance of <see cref="UserStore{TUser, TRole, TContext, TKey}"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="DbContext"/>.</param>
+    /// <param name="describer">The <see cref="IdentityErrorDescriber"/>.</param>
+    public UserStore(TContext context, IdentityErrorDescriber? describer = null) : base(context, describer) { }
+}
+
+/// <summary>
+/// Represents a new instance of a persistence store for the specified user and role types.
+/// </summary>
+/// <typeparam name="TUser">The type representing a user.</typeparam>
+/// <typeparam name="TRole">The type representing a role.</typeparam>
+/// <typeparam name="TContext">The type of the data context class used to access the store.</typeparam>
+/// <typeparam name="TKey">The type of the primary key for a role.</typeparam>
+/// <typeparam name="TUserClaim">The type representing a claim.</typeparam>
+/// <typeparam name="TUserRole">The type representing a user role.</typeparam>
+/// <typeparam name="TUserLogin">The type representing a user external login.</typeparam>
+/// <typeparam name="TUserToken">The type representing a user token.</typeparam>
+/// <typeparam name="TRoleClaim">The type representing a role claim.</typeparam>
+/// <typeparam name="TUserPasskey">The type representing a user passkey.</typeparam>
+public class UserStore<TUser, TRole, TContext, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim, TUserPasskey> :
     UserStoreBase<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>,
-    IProtectedUserStore<TUser>
+    IProtectedUserStore<TUser>,
+    IUserPasskeyStore<TUser>
     where TUser : IdentityUser<TKey>
     where TRole : IdentityRole<TKey>
     where TContext : DbContext
@@ -102,7 +136,10 @@ public class UserStore<TUser, TRole, TContext, [DynamicallyAccessedMembers(Dynam
     where TUserLogin : IdentityUserLogin<TKey>, new()
     where TUserToken : IdentityUserToken<TKey>, new()
     where TRoleClaim : IdentityRoleClaim<TKey>, new()
+    where TUserPasskey : IdentityUserPasskey<TKey>, new()
 {
+    private bool? _dbContextSupportsPasskeys;
+
     /// <summary>
     /// Creates a new instance of the store.
     /// </summary>
@@ -125,6 +162,14 @@ public class UserStore<TUser, TRole, TContext, [DynamicallyAccessedMembers(Dynam
     private DbSet<TUserRole> UserRoles { get { return Context.Set<TUserRole>(); } }
     private DbSet<TUserLogin> UserLogins { get { return Context.Set<TUserLogin>(); } }
     private DbSet<TUserToken> UserTokens { get { return Context.Set<TUserToken>(); } }
+    private DbSet<TUserPasskey> UserPasskeys
+    {
+        get
+        {
+            ThrowIfPasskeysNotSupported();
+            return Context.Set<TUserPasskey>();
+        }
+    }
 
     /// <summary>
     /// Gets or sets a flag indicating if changes should be persisted after CreateAsync, UpdateAsync and DeleteAsync are called.
@@ -653,4 +698,188 @@ protected override Task RemoveUserTokenAsync(TUserToken token)
         UserTokens.Remove(token);
         return Task.CompletedTask;
     }
+
+    /// <summary>
+    /// Called to create a new instance of a <see cref="IdentityUserPasskey{TKey}"/>.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <param name="passkey">The passkey.</param>
+    /// <returns></returns>
+    protected virtual TUserPasskey CreateUserPasskey(TUser user, UserPasskeyInfo passkey)
+    {
+        return new TUserPasskey
+        {
+            UserId = user.Id,
+            CredentialId = passkey.CredentialId,
+            Data = new()
+            {
+                PublicKey = passkey.PublicKey,
+                Name = passkey.Name,
+                CreatedAt = passkey.CreatedAt,
+                Transports = passkey.Transports,
+                SignCount = passkey.SignCount,
+                IsUserVerified = passkey.IsUserVerified,
+                IsBackupEligible = passkey.IsBackupEligible,
+                IsBackedUp = passkey.IsBackedUp,
+                AttestationObject = passkey.AttestationObject,
+                ClientDataJson = passkey.ClientDataJson,
+            }
+        };
+    }
+
+    /// <summary>
+    /// Find a passkey with the specified credential id for a user.
+    /// </summary>
+    /// <param name="userId">The user's id.</param>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The user passkey if it exists.</returns>
+    private Task<TUserPasskey?> FindUserPasskeyAsync(TKey userId, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        return UserPasskeys.SingleOrDefaultAsync(
+            userPasskey => userPasskey.UserId.Equals(userId) && userPasskey.CredentialId.SequenceEqual(credentialId),
+            cancellationToken);
+    }
+
+    /// <summary>
+    /// Find a passkey with the specified credential id.
+    /// </summary>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The user passkey if it exists.</returns>
+    private Task<TUserPasskey?> FindUserPasskeyByIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+    {
+        return UserPasskeys.SingleOrDefaultAsync(userPasskey => userPasskey.CredentialId.SequenceEqual(credentialId), cancellationToken);
+    }
+
+    /// <summary>
+    /// Creates a new passkey credential in the store for the specified <paramref name="user"/>,
+    /// or updates an existing passkey.
+    /// </summary>
+    /// <param name="user">The user to create the passkey credential for.</param>
+    /// <param name="passkey"></param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
+    public virtual async Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(passkey);
+
+        var userPasskey = await FindUserPasskeyByIdAsync(passkey.CredentialId, cancellationToken).ConfigureAwait(false);
+        if (userPasskey != null)
+        {
+            userPasskey.UpdateFromUserPasskeyInfo(passkey);
+            UserPasskeys.Update(userPasskey);
+        }
+        else
+        {
+            userPasskey = CreateUserPasskey(user, passkey);
+            UserPasskeys.Add(userPasskey);
+        }
+
+        await SaveChanges(cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Gets the passkey credentials for the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user whose passkeys should be retrieved.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing a list of the user's passkeys.</returns>
+    public virtual async Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+
+        var userId = user.Id;
+        var passkeys = await UserPasskeys
+            .Where(p => p.UserId.Equals(userId))
+            .Select(p => p.ToUserPasskeyInfo())
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        return passkeys;
+    }
+
+    /// <summary>
+    /// Finds and returns a user, if any, associated with the specified passkey credential identifier.
+    /// </summary>
+    /// <param name="credentialId">The passkey credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the user, if any, associated with the specified passkey credential id.
+    /// </returns>
+    public virtual async Task<TUser?> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+
+        var passkey = await FindUserPasskeyByIdAsync(credentialId, cancellationToken).ConfigureAwait(false);
+        if (passkey != null)
+        {
+            return await FindUserAsync(passkey.UserId, cancellationToken).ConfigureAwait(false);
+        }
+        return null;
+    }
+
+    /// <summary>
+    /// Finds a passkey for the specified user with the specified credential id.
+    /// </summary>
+    /// <param name="user">The user whose passkey should be retrieved.</param>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the user's passkey information.</returns>
+    public virtual async Task<UserPasskeyInfo?> FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(credentialId);
+
+        var passkey = await FindUserPasskeyAsync(user.Id, credentialId, cancellationToken).ConfigureAwait(false);
+        return passkey?.ToUserPasskeyInfo();
+    }
+
+    /// <summary>
+    /// Removes a passkey credential from the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user to remove the passkey credential from.</param>
+    /// <param name="credentialId">The credential id of the passkey to remove.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
+    public virtual async Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfDisposed();
+        ArgumentNullException.ThrowIfNull(user);
+        ArgumentNullException.ThrowIfNull(credentialId);
+
+        var passkey = await FindUserPasskeyAsync(user.Id, credentialId, cancellationToken).ConfigureAwait(false);
+        if (passkey != null)
+        {
+            UserPasskeys.Remove(passkey);
+            await SaveChanges(cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    private void ThrowIfPasskeysNotSupported()
+    {
+        if (_dbContextSupportsPasskeys == true)
+        {
+            return;
+        }
+
+        _dbContextSupportsPasskeys ??= Context.Model.FindEntityType(typeof(TUserPasskey)) is not null;
+        if (_dbContextSupportsPasskeys == false)
+        {
+            throw new InvalidOperationException(
+                $"This operation is not permitted because the underlying '{nameof(DbContext)}' does not include '{typeof(TUserPasskey).Name}' in its model. " +
+                $"When using '{nameof(IdentityDbContext)}', make sure that '{nameof(IdentityOptions)}.{nameof(IdentityOptions.Stores)}.{nameof(StoreOptions.SchemaVersion)}' " +
+                $"is set to '{nameof(IdentitySchemaVersions)}.{nameof(IdentitySchemaVersions.Version3)}' or higher. " +
+                $"See https://aka.ms/aspnet/passkeys for more information.");
+        }
+    }
 }
diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs
index d5e292d7404f..37cb9ba7785f 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs
@@ -3,17 +3,31 @@
 
 using System.Data.Common;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test;
 
 public class InMemoryContext :
     InMemoryContext<IdentityUser, IdentityRole, string>
 {
-    private InMemoryContext(DbConnection connection) : base(connection)
+    private InMemoryContext(DbConnection connection, IServiceProvider serviceProvider) : base(connection, serviceProvider)
     { }
 
-    public static new InMemoryContext Create(DbConnection connection)
-        => Initialize(new InMemoryContext(connection));
+    public static new InMemoryContext Create(DbConnection connection, IServiceCollection services = null)
+    {
+        services = ConfigureDbServices(services);
+        return Initialize(new InMemoryContext(connection, services.BuildServiceProvider()));
+    }
+
+    public static IServiceCollection ConfigureDbServices(IServiceCollection services = null)
+    {
+        services ??= new ServiceCollection();
+        services.Configure<IdentityOptions>(options =>
+        {
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
+        });
+        return services;
+    }
 
     public static TContext Initialize<TContext>(TContext context) where TContext : DbContext
     {
@@ -28,17 +42,25 @@ public class InMemoryContext<TUser> :
     where TUser : IdentityUser
 {
     private readonly DbConnection _connection;
+    private readonly IServiceProvider _serviceProvider;
 
-    private InMemoryContext(DbConnection connection)
+    private InMemoryContext(DbConnection connection, IServiceProvider serviceProvider)
     {
         _connection = connection;
+        _serviceProvider = serviceProvider;
     }
 
-    public static InMemoryContext<TUser> Create(DbConnection connection)
-        => InMemoryContext.Initialize(new InMemoryContext<TUser>(connection));
+    public static InMemoryContext<TUser> Create(DbConnection connection, IServiceCollection services = null)
+    {
+        services = InMemoryContext.ConfigureDbServices(services);
+        return InMemoryContext.Initialize(new InMemoryContext<TUser>(connection, services.BuildServiceProvider()));
+    }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseSqlite(_connection);
+    {
+        optionsBuilder.UseSqlite(_connection);
+        optionsBuilder.UseApplicationServiceProvider(_serviceProvider);
+    }
 }
 
 public class InMemoryContext<TUser, TRole, TKey> : IdentityDbContext<TUser, TRole, TKey>
@@ -47,17 +69,25 @@ public class InMemoryContext<TUser, TRole, TKey> : IdentityDbContext<TUser, TRol
     where TKey : IEquatable<TKey>
 {
     private readonly DbConnection _connection;
+    private readonly IServiceProvider _serviceProvider;
 
-    protected InMemoryContext(DbConnection connection)
+    protected InMemoryContext(DbConnection connection, IServiceProvider serviceProvider)
     {
         _connection = connection;
+        _serviceProvider = serviceProvider;
     }
 
-    public static InMemoryContext<TUser, TRole, TKey> Create(DbConnection connection)
-        => InMemoryContext.Initialize(new InMemoryContext<TUser, TRole, TKey>(connection));
+    public static InMemoryContext<TUser, TRole, TKey> Create(DbConnection connection, IServiceCollection services = null)
+    {
+        services = InMemoryContext.ConfigureDbServices(services);
+        return InMemoryContext.Initialize(new InMemoryContext<TUser, TRole, TKey>(connection, services.BuildServiceProvider()));
+    }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseSqlite(_connection);
+    {
+        optionsBuilder.UseSqlite(_connection);
+        optionsBuilder.UseApplicationServiceProvider(_serviceProvider);
+    }
 }
 
 public abstract class InMemoryContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken> :
diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
index 367fcc16c000..d4516b0b45b0 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs
@@ -24,6 +24,10 @@ public InMemoryEFUserStoreTestWithGenerics(InMemoryDatabaseFixture fixture)
 
         var services = new ServiceCollection();
         services.AddHttpContextAccessor();
+        services.Configure<IdentityOptions>(options =>
+        {
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
+        });
         services.AddDbContext<InMemoryContextWithGenerics>(
             options => options
                 .UseSqlite(_fixture.Connection)
@@ -105,10 +109,10 @@ public async Task CanAddRemoveUserClaimWithIssuer()
         Assert.Equal(2, userClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[1]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[2]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(0, userClaims.Count);
+        Assert.Empty(userClaims);
     }
 
     [Fact]
@@ -132,10 +136,10 @@ public async Task RemoveClaimWithIssuerOnlyAffectsUser()
         Assert.Equal(2, userClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[1]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[2]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(0, userClaims.Count);
+        Assert.Empty(userClaims);
         var userClaims2 = await manager.GetClaimsAsync(user2);
         Assert.Equal(3, userClaims2.Count);
     }
@@ -148,12 +152,12 @@ public async Task CanReplaceUserClaimWithIssuer()
         IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(user, new Claim("c", "a", "i")));
         var userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         Claim claim = new Claim("c", "b", "i");
         Claim oldClaim = userClaims.FirstOrDefault();
         IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
         var newUserClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, newUserClaims.Count);
+        Assert.Single(newUserClaims);
         Claim newClaim = newUserClaims.FirstOrDefault();
         Assert.Equal(claim.Type, newClaim.Type);
         Assert.Equal(claim.Value, newClaim.Value);
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs
index 4bfb6bb171e7..a17c48bff2a0 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs
@@ -30,6 +30,11 @@ public static IServiceCollection ConfigureDbServices<TContext>(
                 .UseSqlite(connection);
         });
 
+        services.Configure<IdentityOptions>(options =>
+        {
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
+        });
+
         return services;
     }
 
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
index bc6bf103e291..cb8bc472636e 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
@@ -167,7 +167,7 @@ public async Task LoadFromDbFindByIdTest()
 
         var userById = await manager.FindByIdAsync(user.Id.ToString());
         Assert.Equal(2, (await manager.GetClaimsAsync(userById)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userById)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userById)));
         Assert.Equal(2, (await manager.GetRolesAsync(userById)).Count);
     }
 
@@ -182,7 +182,7 @@ public async Task LoadFromDbFindByNameTest()
         var manager = CreateManager(db);
         var userByName = await manager.FindByNameAsync(user.UserName);
         Assert.Equal(2, (await manager.GetClaimsAsync(userByName)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userByName)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userByName)));
         Assert.Equal(2, (await manager.GetRolesAsync(userByName)).Count);
     }
 
@@ -197,7 +197,7 @@ public async Task LoadFromDbFindByLoginTest()
         var manager = CreateManager(db);
         var userByLogin = await manager.FindByLoginAsync("provider", user.Id.ToString());
         Assert.Equal(2, (await manager.GetClaimsAsync(userByLogin)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userByLogin)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userByLogin)));
         Assert.Equal(2, (await manager.GetRolesAsync(userByLogin)).Count);
     }
 
@@ -213,7 +213,7 @@ public async Task LoadFromDbFindByEmailTest()
         var manager = CreateManager(db);
         var userByEmail = await manager.FindByEmailAsync(user.Email);
         Assert.Equal(2, (await manager.GetClaimsAsync(userByEmail)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userByEmail)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userByEmail)));
         Assert.Equal(2, (await manager.GetRolesAsync(userByEmail)).Count);
     }
 }
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
index 2a2e1fb665f1..6d1718c79ae2 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
@@ -37,6 +37,7 @@ protected virtual void SetupAddIdentity(IServiceCollection services)
             options.Password.RequireNonAlphanumeric = false;
             options.Password.RequireUppercase = false;
             options.User.AllowedUserNameCharacters = null;
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
         })
         .AddRoles<TRole>()
         .AddDefaultTokenProviders()
@@ -273,7 +274,7 @@ public async Task LoadFromDbFindByIdTest()
 
         var userById = await manager.FindByIdAsync(user.Id.ToString());
         Assert.Equal(2, (await manager.GetClaimsAsync(userById)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userById)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userById)));
         Assert.Equal(2, (await manager.GetRolesAsync(userById)).Count);
     }
 
@@ -288,7 +289,7 @@ public async Task LoadFromDbFindByNameTest()
         var manager = CreateManager(db);
         var userByName = await manager.FindByNameAsync(user.UserName);
         Assert.Equal(2, (await manager.GetClaimsAsync(userByName)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userByName)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userByName)));
         Assert.Equal(2, (await manager.GetRolesAsync(userByName)).Count);
     }
 
@@ -303,7 +304,7 @@ public async Task LoadFromDbFindByLoginTest()
         var manager = CreateManager(db);
         var userByLogin = await manager.FindByLoginAsync("provider", user.Id.ToString());
         Assert.Equal(2, (await manager.GetClaimsAsync(userByLogin)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userByLogin)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userByLogin)));
         Assert.Equal(2, (await manager.GetRolesAsync(userByLogin)).Count);
     }
 
@@ -330,7 +331,7 @@ public async Task LoadFromDbFindByEmailTest()
         var manager = CreateManager(db);
         var userByEmail = await manager.FindByEmailAsync(user.Email);
         Assert.Equal(2, (await manager.GetClaimsAsync(userByEmail)).Count);
-        Assert.Equal(1, (await manager.GetLoginsAsync(userByEmail)).Count);
+        Assert.Single((await manager.GetLoginsAsync(userByEmail)));
         Assert.Equal(2, (await manager.GetRolesAsync(userByEmail)).Count);
     }
 }
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs
index 01d3637ccce8..5d143464c239 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs
@@ -25,6 +25,7 @@ protected override void SetupAddIdentity(IServiceCollection services)
             options.Password.RequireNonAlphanumeric = false;
             options.Password.RequireUppercase = false;
             options.User.AllowedUserNameCharacters = null;
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
         })
         .AddDefaultTokenProviders()
         .AddEntityFrameworkStores<TestDbContext>()
@@ -133,7 +134,7 @@ private bool FindInk(DbConnection conn, string column, string id)
                 }
             }
         }
-        Assert.False(true, "Didn't find user");
+        Assert.Fail("Didn't find user");
         return false;
     }
 
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
index f55c2b48340d..4cc3e43918c4 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
@@ -19,6 +19,12 @@ public UserStoreTest(ScratchDatabaseFixture fixture)
         _fixture = fixture;
     }
 
+    public class UserStoreTestDbContext : IdentityDbContext
+    {
+        public UserStoreTestDbContext(DbContextOptions<UserStoreTestDbContext> options) : base(options)
+        { }
+    }
+
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options)
@@ -38,9 +44,9 @@ public void CanCreateUserUsingEF()
         }
     }
 
-    private IdentityDbContext CreateContext()
+    private UserStoreTestDbContext CreateContext()
     {
-        var db = DbUtil.Create<IdentityDbContext>(_fixture.Connection);
+        var db = DbUtil.Create<UserStoreTestDbContext>(_fixture.Connection);
         db.Database.EnsureCreated();
         return db;
     }
@@ -52,18 +58,18 @@ protected override object CreateTestContext()
 
     protected override void AddUserStore(IServiceCollection services, object context = null)
     {
-        services.AddSingleton<IUserStore<IdentityUser>>(new UserStore<IdentityUser, IdentityRole, IdentityDbContext>((IdentityDbContext)context));
+        services.AddSingleton<IUserStore<IdentityUser>>(new UserStore<IdentityUser, IdentityRole, UserStoreTestDbContext>((UserStoreTestDbContext)context));
     }
 
     protected override void AddRoleStore(IServiceCollection services, object context = null)
     {
-        services.AddSingleton<IRoleStore<IdentityRole>>(new RoleStore<IdentityRole, IdentityDbContext>((IdentityDbContext)context));
+        services.AddSingleton<IRoleStore<IdentityRole>>(new RoleStore<IdentityRole, UserStoreTestDbContext>((UserStoreTestDbContext)context));
     }
 
     [Fact]
     public async Task SqlUserStoreMethodsThrowWhenDisposedTest()
     {
-        var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder<IdentityDbContext>().Options));
+        var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder<UserStoreTestDbContext>().Options));
         store.Dispose();
         await Assert.ThrowsAsync<ObjectDisposedException>(async () => await store.AddClaimsAsync(null, null));
         await Assert.ThrowsAsync<ObjectDisposedException>(async () => await store.AddLoginAsync(null, null));
@@ -97,7 +103,7 @@ await Assert.ThrowsAsync<ObjectDisposedException>(
     public async Task UserStorePublicNullCheckTest()
     {
         Assert.Throws<ArgumentNullException>("context", () => new UserStore(null));
-        var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder<IdentityDbContext>().Options));
+        var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder<UserStoreTestDbContext>().Options));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetUserIdAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetUserNameAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.SetUserNameAsync(null, null));
@@ -144,6 +150,9 @@ await Assert.ThrowsAsync<ArgumentNullException>("user",
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetTwoFactorEnabledAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user",
             async () => await store.SetTwoFactorEnabledAsync(null, true));
+        await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.RedeemCodeAsync(user: null, code: "fake", default));
+        await Assert.ThrowsAsync<ArgumentNullException>("code", async () => await store.RedeemCodeAsync(new IdentityUser("fake"), code: null, default));
+        await Assert.ThrowsAsync<ArgumentException>("code", async () => await store.RedeemCodeAsync(new IdentityUser("fake"), code: "", default));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetAccessFailedCountAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetLockoutEnabledAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.SetLockoutEnabledAsync(null, false));
@@ -192,7 +201,6 @@ public async Task FindByEmailThrowsWithTwoUsersWithSameEmail()
         userB.Email = "dupe@dupe.com";
         IdentityResultAssert.IsSuccess(await manager.CreateAsync(userB, "password"));
         await Assert.ThrowsAsync<InvalidOperationException>(async () => await manager.FindByEmailAsync("dupe@dupe.com"));
-
     }
 
     [ConditionalFact]
@@ -208,17 +216,17 @@ await Assert.ThrowsAsync<InvalidOperationException>(
     [ConditionalFact]
     public async Task ConcurrentUpdatesWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var user = CreateTestUser();
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateManager(db);
             var manager2 = CreateManager(db2);
@@ -239,17 +247,17 @@ public async Task ConcurrentUpdatesWillFail()
     [ConditionalFact]
     public async Task ConcurrentUpdatesWillFailWithDetachedUser()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var user = CreateTestUser();
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateManager(db);
             var manager2 = CreateManager(db2);
@@ -268,17 +276,17 @@ public async Task ConcurrentUpdatesWillFailWithDetachedUser()
     [ConditionalFact]
     public async Task DeleteAModifiedUserWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var user = CreateTestUser();
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateManager(db);
             var manager2 = CreateManager(db2);
@@ -298,17 +306,17 @@ public async Task DeleteAModifiedUserWillFail()
     [ConditionalFact]
     public async Task ConcurrentRoleUpdatesWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var role = new IdentityRole(Guid.NewGuid().ToString());
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateRoleManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateRoleManager(db);
             var manager2 = CreateRoleManager(db2);
@@ -329,17 +337,17 @@ public async Task ConcurrentRoleUpdatesWillFail()
     [ConditionalFact]
     public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var role = new IdentityRole(Guid.NewGuid().ToString());
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateRoleManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateRoleManager(db);
             var manager2 = CreateRoleManager(db2);
@@ -359,17 +367,17 @@ public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole()
     [ConditionalFact]
     public async Task DeleteAModifiedRoleWillFail()
     {
-        var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
+        var options = new DbContextOptionsBuilder<UserStoreTestDbContext>().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options;
         var role = new IdentityRole(Guid.NewGuid().ToString());
-        using (var db = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
         {
             db.Database.EnsureCreated();
 
             var manager = CreateRoleManager(db);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         }
-        using (var db = new IdentityDbContext(options))
-        using (var db2 = new IdentityDbContext(options))
+        using (var db = new UserStoreTestDbContext(options))
+        using (var db2 = new UserStoreTestDbContext(options))
         {
             var manager1 = CreateRoleManager(db);
             var manager2 = CreateRoleManager(db2);
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs
index 86f2c1ccd93b..0889dd2ba1c2 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreWithGenericsTest.cs
@@ -115,10 +115,10 @@ public async Task CanAddRemoveUserClaimWithIssuer()
         Assert.Equal(2, userClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[1]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[2]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(0, userClaims.Count);
+        Assert.Empty(userClaims);
     }
 
     [Fact]
@@ -142,10 +142,10 @@ public async Task RemoveClaimWithIssuerOnlyAffectsUser()
         Assert.Equal(2, userClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[1]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[2]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(0, userClaims.Count);
+        Assert.Empty(userClaims);
         var userClaims2 = await manager.GetClaimsAsync(user2);
         Assert.Equal(3, userClaims2.Count);
     }
@@ -158,12 +158,12 @@ public async Task CanReplaceUserClaimWithIssuer()
         IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(user, new Claim("c", "a", "i")));
         var userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         Claim claim = new Claim("c", "b", "i");
         Claim oldClaim = userClaims.FirstOrDefault();
         IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
         var newUserClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, newUserClaims.Count);
+        Assert.Single(newUserClaims);
         Claim newClaim = newUserClaims.FirstOrDefault();
         Assert.Equal(claim.Type, newClaim.Type);
         Assert.Equal(claim.Value, newClaim.Value);
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
index b29a046cff3f..80b88e97387b 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs
@@ -4,6 +4,7 @@
 using System.Data.Common;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test;
 
@@ -23,7 +24,14 @@ public ScratchDatabaseFixture()
     }
 
     private DbContext CreateEmptyContext()
-        => new DbContext(new DbContextOptionsBuilder().UseSqlite(_connection).Options);
+    {
+        var services = new ServiceCollection();
+        services.Configure<IdentityOptions>(options => options.Stores.SchemaVersion = IdentitySchemaVersions.Version3);
+        return new DbContext(new DbContextOptionsBuilder()
+            .UseSqlite(_connection)
+            .UseApplicationServiceProvider(services.BuildServiceProvider())
+            .Options);
+    }
 
     public DbConnection Connection => _connection;
 
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs
index 0e0c29407052..8e4ed3143493 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/VersionTestDbContext.cs
@@ -24,6 +24,14 @@ public VersionTwoDbContext(DbContextOptions options)
     }
 }
 
+public class VersionThreeDbContext : IdentityDbContext<IdentityUser, IdentityRole, string>
+{
+    public VersionThreeDbContext(DbContextOptions options)
+        : base(options)
+    {
+    }
+}
+
 public class EmptyDbContext : IdentityDbContext<IdentityUser, IdentityRole, string>
 {
     public EmptyDbContext(DbContextOptions options)
@@ -49,6 +57,7 @@ protected override void OnModelCreating(ModelBuilder builder)
 
             builder.Ignore<IdentityUserRole<string>>();
 
+            builder.Ignore<IdentityUserPasskey<string>>();
         }
         else
         {
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/VersionThreeSchemaTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/VersionThreeSchemaTest.cs
new file mode 100644
index 000000000000..6df5064bf8cc
--- /dev/null
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/VersionThreeSchemaTest.cs
@@ -0,0 +1,72 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test;
+
+public class VersionThreeSchemaTest : IClassFixture<ScratchDatabaseFixture>
+{
+    private readonly ApplicationBuilder _builder;
+
+    public VersionThreeSchemaTest(ScratchDatabaseFixture fixture)
+    {
+        var services = new ServiceCollection();
+
+        services
+            .AddSingleton<IConfiguration>(new ConfigurationBuilder().Build())
+            .AddDbContext<VersionThreeDbContext>(o =>
+                o.UseSqlite(fixture.Connection)
+                    .ConfigureWarnings(b => b.Log(CoreEventId.ManyServiceProvidersCreatedWarning)))
+            .AddIdentity<IdentityUser, IdentityRole>(o =>
+            {
+                // MaxKeyLength does not need to be set in version 3
+                o.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
+            })
+            .AddEntityFrameworkStores<VersionThreeDbContext>();
+
+        services.AddLogging();
+
+        _builder = new ApplicationBuilder(services.BuildServiceProvider());
+        var scope = _builder.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<VersionThreeDbContext>();
+        db.Database.EnsureCreated();
+    }
+
+    [Fact]
+    public void EnsureDefaultSchema()
+    {
+        using var scope = _builder.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<VersionThreeDbContext>();
+        VerifyVersion3Schema(db);
+    }
+
+    internal static void VerifyVersion3Schema(DbContext dbContext)
+    {
+        using var sqlConn = (SqliteConnection)dbContext.Database.GetDbConnection();
+        sqlConn.Open();
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUsers", "Id", "UserName", "Email", "PasswordHash", "SecurityStamp",
+            "EmailConfirmed", "PhoneNumber", "PhoneNumberConfirmed", "TwoFactorEnabled", "LockoutEnabled",
+            "LockoutEnd", "AccessFailedCount", "ConcurrencyStamp", "NormalizedUserName", "NormalizedEmail"));
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetRoles", "Id", "Name", "NormalizedName", "ConcurrencyStamp"));
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserRoles", "UserId", "RoleId"));
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserClaims", "Id", "UserId", "ClaimType", "ClaimValue"));
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserLogins", "UserId", "ProviderKey", "LoginProvider", "ProviderDisplayName"));
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserTokens", "UserId", "LoginProvider", "Name", "Value"));
+        Assert.True(DbUtil.VerifyColumns(sqlConn, "AspNetUserPasskeys", "UserId", "CredentialId", "Data"));
+
+        Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUsers", 256, "UserName", "Email", "NormalizedUserName", "NormalizedEmail", "PhoneNumber"));
+        Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetRoles", 256, "Name", "NormalizedName"));
+        Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUserLogins", 128, "LoginProvider", "ProviderKey"));
+        Assert.True(DbUtil.VerifyMaxLength(dbContext, "AspNetUserTokens", 128, "LoginProvider", "Name"));
+
+        DbUtil.VerifyIndex(sqlConn, "AspNetRoles", "RoleNameIndex", isUnique: true);
+        DbUtil.VerifyIndex(sqlConn, "AspNetUsers", "UserNameIndex", isUnique: true);
+        DbUtil.VerifyIndex(sqlConn, "AspNetUsers", "EmailIndex");
+    }
+}
diff --git a/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs b/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
index bf3ba590ea1f..1b2b17ff84d8 100644
--- a/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
+++ b/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
@@ -24,7 +24,7 @@ public interface IUserAuthenticatorKeyStore<TUser> : IUserStore<TUser> where TUs
     /// <summary>
     /// Get the authenticator key for the specified <paramref name="user" />.
     /// </summary>
-    /// <param name="user">The user whose security stamp should be set.</param>
+    /// <param name="user">The user whose authenticator key should be retrieved.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the security stamp for the specified <paramref name="user"/>.</returns>
     Task<string?> GetAuthenticatorKeyAsync(TUser user, CancellationToken cancellationToken);
diff --git a/src/Identity/Extensions.Core/src/IUserPasskeyStore.cs b/src/Identity/Extensions.Core/src/IUserPasskeyStore.cs
new file mode 100644
index 000000000000..4ab531a19150
--- /dev/null
+++ b/src/Identity/Extensions.Core/src/IUserPasskeyStore.cs
@@ -0,0 +1,62 @@
+// 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.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Provides an abstraction for storing passkey credentials for a user.
+/// </summary>
+/// <typeparam name="TUser">The type that represents a user.</typeparam>
+public interface IUserPasskeyStore<TUser> : IUserStore<TUser> where TUser : class
+{
+    /// <summary>
+    /// Adds a new passkey credential in the store for the specified <paramref name="user"/>,
+    /// or updates an existing passkey.
+    /// </summary>
+    /// <param name="user">The user to create the passkey credential for.</param>
+    /// <param name="passkey">The passkey to add.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
+    Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets the passkey credentials for the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user whose passkeys should be retrieved.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing a list of the user's passkeys.</returns>
+    Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Finds and returns a user, if any, associated with the specified passkey credential identifier.
+    /// </summary>
+    /// <param name="credentialId">The passkey credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the user, if any, associated with the specified passkey credential id.
+    /// </returns>
+    Task<TUser?> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Finds a passkey for the specified user with the specified credential id.
+    /// </summary>
+    /// <param name="user">The user whose passkey should be retrieved.</param>
+    /// <param name="credentialId">The credential id to search for.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the user's passkey information.</returns>
+    Task<UserPasskeyInfo?> FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Removes a passkey credential from the specified <paramref name="user"/>.
+    /// </summary>
+    /// <param name="user">The user to remove the passkey credential from.</param>
+    /// <param name="credentialId">The credential id of the passkey to remove.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
+    Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken);
+}
diff --git a/src/Identity/Extensions.Core/src/IdentitySchemaVersions.cs b/src/Identity/Extensions.Core/src/IdentitySchemaVersions.cs
index 76f8e892485a..973e4c9c42ab 100644
--- a/src/Identity/Extensions.Core/src/IdentitySchemaVersions.cs
+++ b/src/Identity/Extensions.Core/src/IdentitySchemaVersions.cs
@@ -25,4 +25,8 @@ public static class IdentitySchemaVersions
     /// </summary>
     public static readonly Version Version2 = new Version(2, 0);
 
+    /// <summary>
+    /// Represents the 3.0 version of the identity schema
+    /// </summary>
+    public static readonly Version Version3 = new Version(3, 0);
 }
diff --git a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
index 1174c460f250..538396395fc3 100644
--- a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
+++ b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
@@ -15,14 +15,16 @@
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Options" />
 
+    <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)TrimmingAttributes.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)ValueStopwatch\ValueStopwatch.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentNullThrowHelper.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentOutOfRangeThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ObjectDisposedThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)CallerArgument\CallerArgumentExpressionAttribute.cs" LinkBase="Shared" />
   </ItemGroup>
 
-  <ItemGroup
-      Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
     <Reference Include="System.ComponentModel.Annotations" />
   </ItemGroup>
 
diff --git a/src/Identity/Extensions.Core/src/PasswordHasher.cs b/src/Identity/Extensions.Core/src/PasswordHasher.cs
index cdd9a1ff3cec..a8115f68eefc 100644
--- a/src/Identity/Extensions.Core/src/PasswordHasher.cs
+++ b/src/Identity/Extensions.Core/src/PasswordHasher.cs
@@ -264,8 +264,7 @@ private static bool VerifyHashedPasswordV3(byte[] hashedPassword, string passwor
             {
                 return false;
             }
-            byte[] salt = new byte[saltLength];
-            Buffer.BlockCopy(hashedPassword, 13, salt, 0, salt.Length);
+            byte[] salt = hashedPassword.AsSpan(13, saltLength).ToArray();
 
             // Read the subkey (the rest of the payload): must be >= 128 bits
             int subkeyLength = hashedPassword.Length - 13 - salt.Length;
diff --git a/src/Identity/Extensions.Core/src/PasswordValidator.cs b/src/Identity/Extensions.Core/src/PasswordValidator.cs
index 719918fb435d..82b1f32f8015 100644
--- a/src/Identity/Extensions.Core/src/PasswordValidator.cs
+++ b/src/Identity/Extensions.Core/src/PasswordValidator.cs
@@ -39,10 +39,10 @@ public PasswordValidator(IdentityErrorDescriber? errors = null)
     /// <returns>The task object representing the asynchronous operation.</returns>
     public virtual Task<IdentityResult> ValidateAsync(UserManager<TUser> manager, TUser user, string? password)
     {
-        ArgumentNullThrowHelper.ThrowIfNull(password);
         ArgumentNullThrowHelper.ThrowIfNull(manager);
         List<IdentityError>? errors = null;
         var options = manager.Options.Password;
+        password ??= "";
         if (string.IsNullOrWhiteSpace(password) || password.Length < options.RequiredLength)
         {
             errors ??= new List<IdentityError>();
diff --git a/src/Identity/Extensions.Core/src/PersonalDataAttribute.cs b/src/Identity/Extensions.Core/src/PersonalDataAttribute.cs
index bd01f0df1728..f048c13aab6b 100644
--- a/src/Identity/Extensions.Core/src/PersonalDataAttribute.cs
+++ b/src/Identity/Extensions.Core/src/PersonalDataAttribute.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.AspNetCore.Identity;
 
 /// <summary>
-/// Used to indicate that a something is considered personal data.
+/// Used to indicate that something is considered personal data.
 /// </summary>
 [AttributeUsage(AttributeTargets.Property)]
 public class PersonalDataAttribute : Attribute
diff --git a/src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs b/src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs
index a0b5b30cc36e..d838a5d2e876 100644
--- a/src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs
+++ b/src/Identity/Extensions.Core/src/ProtectedPersonalDataAttribute.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.AspNetCore.Identity;
 
 /// <summary>
-/// Used to indicate that a something is considered personal data and should be protected.
+/// Used to indicate that something is considered personal data and should be protected.
 /// </summary>
 public class ProtectedPersonalDataAttribute : PersonalDataAttribute
 { }
diff --git a/src/Identity/Extensions.Core/src/PublicAPI.Unshipped.txt b/src/Identity/Extensions.Core/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..0645235929f0 100644
--- a/src/Identity/Extensions.Core/src/PublicAPI.Unshipped.txt
+++ b/src/Identity/Extensions.Core/src/PublicAPI.Unshipped.txt
@@ -1 +1,34 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Identity.UserLoginInfo.UserLoginInfo(string! loginProvider, string! providerKey, string? displayName) -> void
+Microsoft.AspNetCore.Identity.IUserPasskeyStore<TUser>
+Microsoft.AspNetCore.Identity.IUserPasskeyStore<TUser>.AddOrUpdatePasskeyAsync(TUser! user, Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Identity.IUserPasskeyStore<TUser>.FindByPasskeyIdAsync(byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<TUser?>!
+Microsoft.AspNetCore.Identity.IUserPasskeyStore<TUser>.FindPasskeyAsync(TUser! user, byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.UserPasskeyInfo?>!
+Microsoft.AspNetCore.Identity.IUserPasskeyStore<TUser>.GetPasskeysAsync(TUser! user, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserPasskeyInfo!>!>!
+Microsoft.AspNetCore.Identity.IUserPasskeyStore<TUser>.RemovePasskeyAsync(TUser! user, byte[]! credentialId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Identity.UserLoginInfo.UserLoginInfo(string! loginProvider, string! providerKey, string? providerDisplayName) -> void
+Microsoft.AspNetCore.Identity.UserPasskeyInfo
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.AttestationObject.get -> byte[]!
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.ClientDataJson.get -> byte[]!
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.CreatedAt.get -> System.DateTimeOffset
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.CredentialId.get -> byte[]!
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.IsBackedUp.get -> bool
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.IsBackedUp.set -> void
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.IsBackupEligible.get -> bool
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.IsUserVerified.get -> bool
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.IsUserVerified.set -> void
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.Name.get -> string?
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.Name.set -> void
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.PublicKey.get -> byte[]!
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.SignCount.get -> uint
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.SignCount.set -> void
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.Transports.get -> string![]?
+Microsoft.AspNetCore.Identity.UserPasskeyInfo.UserPasskeyInfo(byte[]! credentialId, byte[]! publicKey, System.DateTimeOffset createdAt, uint signCount, string![]? transports, bool isUserVerified, bool isBackupEligible, bool isBackedUp, byte[]! attestationObject, byte[]! clientDataJson) -> void
+static readonly Microsoft.AspNetCore.Identity.IdentitySchemaVersions.Version3 -> System.Version!
+virtual Microsoft.AspNetCore.Identity.UserManager<TUser>.AddOrUpdatePasskeyAsync(TUser! user, Microsoft.AspNetCore.Identity.UserPasskeyInfo! passkey) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+virtual Microsoft.AspNetCore.Identity.UserManager<TUser>.FindByPasskeyIdAsync(byte[]! credentialId) -> System.Threading.Tasks.Task<TUser?>!
+virtual Microsoft.AspNetCore.Identity.UserManager<TUser>.GetPasskeyAsync(TUser! user, byte[]! credentialId) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.UserPasskeyInfo?>!
+virtual Microsoft.AspNetCore.Identity.UserManager<TUser>.GetPasskeysAsync(TUser! user) -> System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserPasskeyInfo!>!>!
+virtual Microsoft.AspNetCore.Identity.UserManager<TUser>.RemovePasskeyAsync(TUser! user, byte[]! credentialId) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult!>!
+virtual Microsoft.AspNetCore.Identity.UserManager<TUser>.SupportsUserPasskey.get -> bool
+Microsoft.AspNetCore.Identity.UserManager<TUser>.ServiceProvider.get -> System.IServiceProvider!
diff --git a/src/Identity/Extensions.Core/src/Resources.resx b/src/Identity/Extensions.Core/src/Resources.resx
index fe35a8b7868a..f95299d9d219 100644
--- a/src/Identity/Extensions.Core/src/Resources.resx
+++ b/src/Identity/Extensions.Core/src/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -269,6 +269,10 @@
     <value>Store does not implement IUserTwoFactorStore&lt;TUser&gt;.</value>
     <comment>Error when the store does not implement this interface</comment>
   </data>
+  <data name="StoreNotIUserPasskeyStore" xml:space="preserve">
+    <value>Store does not implement IUserPasskeyStore&lt;TUser&gt;.</value>
+    <comment>Error when the store does not implement this interface</comment>
+  </data>
   <data name="RecoveryCodeRedemptionFailed" xml:space="preserve">
     <value>Recovery code redemption failed.</value>
     <comment>Error when a recovery code is not redeemed.</comment>
diff --git a/src/Identity/Extensions.Core/src/UserLoginInfo.cs b/src/Identity/Extensions.Core/src/UserLoginInfo.cs
index 4c030b664f1b..09e42253223d 100644
--- a/src/Identity/Extensions.Core/src/UserLoginInfo.cs
+++ b/src/Identity/Extensions.Core/src/UserLoginInfo.cs
@@ -13,12 +13,12 @@ public class UserLoginInfo
     /// </summary>
     /// <param name="loginProvider">The provider associated with this login information.</param>
     /// <param name="providerKey">The unique identifier for this user provided by the login provider.</param>
-    /// <param name="displayName">The display name for the login provider.</param>
-    public UserLoginInfo(string loginProvider, string providerKey, string? displayName)
+    /// <param name="providerDisplayName">The display name for the login provider.</param>
+    public UserLoginInfo(string loginProvider, string providerKey, string? providerDisplayName)
     {
         LoginProvider = loginProvider;
         ProviderKey = providerKey;
-        ProviderDisplayName = displayName;
+        ProviderDisplayName = providerDisplayName;
     }
 
     /// <summary>
diff --git a/src/Identity/Extensions.Core/src/UserManager.cs b/src/Identity/Extensions.Core/src/UserManager.cs
index cca2005d10d0..e184534b41ce 100644
--- a/src/Identity/Extensions.Core/src/UserManager.cs
+++ b/src/Identity/Extensions.Core/src/UserManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -47,7 +48,7 @@ public class UserManager<TUser> : IDisposable where TUser : class
 #if NETSTANDARD2_0 || NETFRAMEWORK
     private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
-    private readonly IServiceProvider _services;
+    private readonly UserManagerMetrics? _metrics;
 
     /// <summary>
     /// The cancellation token used to cancel operations.
@@ -83,6 +84,8 @@ public UserManager(IUserStore<TUser> store,
         KeyNormalizer = keyNormalizer;
         ErrorDescriber = errors;
         Logger = logger;
+        ServiceProvider = services;
+        _metrics = services?.GetService<UserManagerMetrics>();
 
         if (userValidators != null)
         {
@@ -99,7 +102,6 @@ public UserManager(IUserStore<TUser> store,
             }
         }
 
-        _services = services;
         if (services != null)
         {
             foreach (var providerName in Options.Tokens.ProviderMap.Keys)
@@ -176,6 +178,11 @@ public UserManager(IUserStore<TUser> store,
     /// </summary>
     public IdentityOptions Options { get; set; }
 
+    /// <summary>
+    /// The <see cref="IServiceProvider"/> used to resolve Identity services.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; }
+
     /// <summary>
     /// Gets a flag indicating whether the backing user store supports authentication tokens.
     /// </summary>
@@ -373,6 +380,21 @@ public virtual bool SupportsQueryableUsers
         }
     }
 
+    /// <summary>
+    /// Gets a flag indicating whether the backing user store supports passkeys.
+    /// </summary>
+    /// <value>
+    /// true if the backing user store supports passkeys, otherwise false.
+    /// </value>
+    public virtual bool SupportsUserPasskey
+    {
+        get
+        {
+            ThrowIfDisposed();
+            return Store is IUserPasskeyStore<TUser>;
+        }
+    }
+
     /// <summary>
     ///     Returns an IQueryable of users if the store is an IQueryableUserStore
     /// </summary>
@@ -459,13 +481,30 @@ public virtual Task<string> GenerateConcurrencyStampAsync(TUser user)
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> CreateAsync(TUser user)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+
+        try
+        {
+            var result = await CreateCoreAsync(user).ConfigureAwait(false);
+            _metrics?.CreateUser(typeof(TUser).FullName!, result, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.CreateUser(typeof(TUser).FullName!, result: null, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> CreateCoreAsync(TUser user)
     {
         ThrowIfDisposed();
         await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        var result = await ValidateUserAsync(user).ConfigureAwait(false);
-        if (!result.Succeeded)
+        var validateUserResult = await ValidateUserAsync(user).ConfigureAwait(false);
+        if (!validateUserResult.Succeeded)
         {
-            return result;
+            return validateUserResult;
         }
         if (Options.Lockout.AllowedForNewUsers && SupportsUserLockout)
         {
@@ -485,12 +524,22 @@ public virtual async Task<IdentityResult> CreateAsync(TUser user)
     /// The <see cref="Task"/> that represents the asynchronous operation, containing the <see cref="IdentityResult"/>
     /// of the operation.
     /// </returns>
-    public virtual Task<IdentityResult> UpdateAsync(TUser user)
+    public virtual async Task<IdentityResult> UpdateAsync(TUser user)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+
+        try
+        {
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        return UpdateUserAsync(user);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.Update, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.Update, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -501,12 +550,25 @@ public virtual Task<IdentityResult> UpdateAsync(TUser user)
     /// The <see cref="Task"/> that represents the asynchronous operation, containing the <see cref="IdentityResult"/>
     /// of the operation.
     /// </returns>
-    public virtual Task<IdentityResult> DeleteAsync(TUser user)
+    public virtual async Task<IdentityResult> DeleteAsync(TUser user)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
 
-        return Store.DeleteAsync(user, CancellationToken);
+        try
+        {
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+
+            var result = await Store.DeleteAsync(user, CancellationToken).ConfigureAwait(false);
+            _metrics?.DeleteUser(typeof(TUser).FullName!, result, startTimeStamp);
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.DeleteUser(typeof(TUser).FullName!, result: null, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -540,8 +602,8 @@ public virtual Task<IdentityResult> DeleteAsync(TUser user)
         // Need to potentially check all keys
         if (user == null && Options.Stores.ProtectPersonalData)
         {
-            var keyRing = _services.GetService<ILookupProtectorKeyRing>();
-            var protector = _services.GetService<ILookupProtector>();
+            var keyRing = ServiceProvider.GetService<ILookupProtectorKeyRing>();
+            var protector = ServiceProvider.GetService<ILookupProtector>();
             if (keyRing != null && protector != null)
             {
                 foreach (var key in keyRing.GetAllKeyIds())
@@ -570,15 +632,28 @@ public virtual Task<IdentityResult> DeleteAsync(TUser user)
     /// </returns>
     public virtual async Task<IdentityResult> CreateAsync(TUser user, string password)
     {
-        ThrowIfDisposed();
-        var passwordStore = GetPasswordStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(password);
-        var result = await UpdatePasswordHash(passwordStore, user, password).ConfigureAwait(false);
-        if (!result.Succeeded)
+        var startTimeStamp = Stopwatch.GetTimestamp();
+
+        try
         {
-            return result;
+            ThrowIfDisposed();
+            var passwordStore = GetPasswordStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(password);
+            var result = await UpdatePasswordHash(passwordStore, user, password).ConfigureAwait(false);
+            if (!result.Succeeded)
+            {
+                _metrics?.CreateUser(typeof(TUser).FullName!, result, startTimeStamp);
+                return result;
+            }
         }
+        catch (Exception ex)
+        {
+            _metrics?.CreateUser(typeof(TUser).FullName!, result: null, startTimeStamp, ex);
+            throw;
+        }
+
+        // Already has a try/catch.
         return await CreateAsync(user).ConfigureAwait(false);
     }
 
@@ -605,8 +680,8 @@ public virtual async Task<IdentityResult> CreateAsync(TUser user, string passwor
     {
         if (Options.Stores.ProtectPersonalData)
         {
-            var keyRing = _services.GetRequiredService<ILookupProtectorKeyRing>();
-            var protector = _services.GetRequiredService<ILookupProtector>();
+            var keyRing = ServiceProvider.GetRequiredService<ILookupProtectorKeyRing>();
+            var protector = ServiceProvider.GetRequiredService<ILookupProtector>();
             return protector.Protect(keyRing.CurrentKeyId, data);
         }
         return data;
@@ -644,12 +719,21 @@ public virtual async Task UpdateNormalizedUserNameAsync(TUser user)
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
     public virtual async Task<IdentityResult> SetUserNameAsync(TUser user, string? userName)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await Store.SetUserNameAsync(user, userName, CancellationToken).ConfigureAwait(false);
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await Store.SetUserNameAsync(user, userName, CancellationToken).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.SetUserName, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetUserName, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -673,27 +757,46 @@ public virtual async Task<string> GetUserIdAsync(TUser user)
     /// the specified <paramref name="password" /> matches the one store for the <paramref name="user"/>,
     /// otherwise false.</returns>
     public virtual async Task<bool> CheckPasswordAsync(TUser user, string password)
+    {
+        try
+        {
+            var (result, userMissing) = await CheckPasswordCoreAsync(user, password).ConfigureAwait(false);
+            _metrics?.CheckPassword(typeof(TUser).FullName!, userMissing, result);
+
+            if (result == PasswordVerificationResult.Failed)
+            {
+                Logger.LogDebug(LoggerEventIds.InvalidPassword, "Invalid password for user.");
+                return false;
+            }
+
+            return result != null;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.CheckPassword(typeof(TUser).FullName!, userMissing: null, result: null, ex);
+            throw;
+        }
+    }
+
+    private async Task<(PasswordVerificationResult? result, bool userMissing)> CheckPasswordCoreAsync(TUser user, string password)
     {
         ThrowIfDisposed();
         var passwordStore = GetPasswordStore();
         if (user == null)
         {
-            return false;
+            return (null, true);
         }
 
         var result = await VerifyPasswordAsync(passwordStore, user, password).ConfigureAwait(false);
+
         if (result == PasswordVerificationResult.SuccessRehashNeeded)
         {
+            var startTimeStamp = Stopwatch.GetTimestamp();
             await UpdatePasswordHash(passwordStore, user, password, validatePassword: false).ConfigureAwait(false);
-            await UpdateUserAsync(user).ConfigureAwait(false);
+            await UpdateUserAndRecordMetricAsync(user, UserUpdateType.PasswordRehash, startTimeStamp).ConfigureAwait(false);
         }
 
-        var success = result != PasswordVerificationResult.Failed;
-        if (!success)
-        {
-            Logger.LogDebug(LoggerEventIds.InvalidPassword, "Invalid password for user.");
-        }
-        return success;
+        return (result, false);
     }
 
     /// <summary>
@@ -724,6 +827,22 @@ public virtual Task<bool> HasPasswordAsync(TUser user)
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> AddPasswordAsync(TUser user, string password)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await AddPasswordCoreAsync(user, password).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.AddPassword, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.AddPassword, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> AddPasswordCoreAsync(TUser user, string password)
     {
         ThrowIfDisposed();
         var passwordStore = GetPasswordStore();
@@ -755,6 +874,22 @@ public virtual async Task<IdentityResult> AddPasswordAsync(TUser user, string pa
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> ChangePasswordAsync(TUser user, string currentPassword, string newPassword)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await ChangePasswordCoreAsync(user, currentPassword, newPassword).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.ChangePassword, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ChangePassword, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> ChangePasswordCoreAsync(TUser user, string currentPassword, string newPassword)
     {
         ThrowIfDisposed();
         var passwordStore = GetPasswordStore();
@@ -762,10 +897,10 @@ public virtual async Task<IdentityResult> ChangePasswordAsync(TUser user, string
 
         if (await VerifyPasswordAsync(passwordStore, user, currentPassword).ConfigureAwait(false) != PasswordVerificationResult.Failed)
         {
-            var result = await UpdatePasswordHash(passwordStore, user, newPassword).ConfigureAwait(false);
-            if (!result.Succeeded)
+            var updateResult = await UpdatePasswordHash(passwordStore, user, newPassword).ConfigureAwait(false);
+            if (!updateResult.Succeeded)
             {
-                return result;
+                return updateResult;
             }
             return await UpdateUserAsync(user).ConfigureAwait(false);
         }
@@ -783,12 +918,21 @@ public virtual async Task<IdentityResult> ChangePasswordAsync(TUser user, string
     /// </returns>
     public virtual async Task<IdentityResult> RemovePasswordAsync(TUser user)
     {
-        ThrowIfDisposed();
-        var passwordStore = GetPasswordStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var passwordStore = GetPasswordStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await UpdatePasswordHash(passwordStore, user, null, validatePassword: false).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await UpdatePasswordHash(passwordStore, user, null, validatePassword: false).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.RemovePassword, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemovePassword, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -808,7 +952,9 @@ protected virtual async Task<PasswordVerificationResult> VerifyPasswordAsync(IUs
         {
             return PasswordVerificationResult.Failed;
         }
-        return PasswordHasher.VerifyHashedPassword(user, hash, password);
+        var result = PasswordHasher.VerifyHashedPassword(user, hash, password);
+
+        return result;
     }
 
     /// <summary>
@@ -843,12 +989,21 @@ public virtual async Task<string> GetSecurityStampAsync(TUser user)
     /// </remarks>
     public virtual async Task<IdentityResult> UpdateSecurityStampAsync(TUser user)
     {
-        ThrowIfDisposed();
-        GetSecurityStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            GetSecurityStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.UpdateSecurityStamp, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.UpdateSecurityStamp, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -877,20 +1032,26 @@ public virtual Task<string> GeneratePasswordResetTokenAsync(TUser user)
     /// </returns>
     public virtual async Task<IdentityResult> ResetPasswordAsync(TUser user, string token, string newPassword)
     {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+
         ThrowIfDisposed();
         ArgumentNullThrowHelper.ThrowIfNull(user);
 
         // Make sure the token is valid and the stamp matches
         if (!await VerifyUserTokenAsync(user, Options.Tokens.PasswordResetTokenProvider, ResetPasswordTokenPurpose, token).ConfigureAwait(false))
         {
-            return IdentityResult.Failed(ErrorDescriber.InvalidToken());
+            var failureResult = IdentityResult.Failed(ErrorDescriber.InvalidToken());
+            _metrics?.UpdateUser(typeof(TUser).FullName!, failureResult, UserUpdateType.ResetPassword, startTimeStamp);
+
+            return failureResult;
         }
         var result = await UpdatePasswordHash(user, newPassword, validatePassword: true).ConfigureAwait(false);
         if (!result.Succeeded)
         {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.ResetPassword, startTimeStamp);
             return result;
         }
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+        return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.ResetPassword, startTimeStamp).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -923,15 +1084,24 @@ public virtual async Task<IdentityResult> ResetPasswordAsync(TUser user, string
     /// </returns>
     public virtual async Task<IdentityResult> RemoveLoginAsync(TUser user, string loginProvider, string providerKey)
     {
-        ThrowIfDisposed();
-        var loginStore = GetLoginStore();
-        ArgumentNullThrowHelper.ThrowIfNull(loginProvider);
-        ArgumentNullThrowHelper.ThrowIfNull(providerKey);
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var loginStore = GetLoginStore();
+            ArgumentNullThrowHelper.ThrowIfNull(loginProvider);
+            ArgumentNullThrowHelper.ThrowIfNull(providerKey);
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await loginStore.RemoveLoginAsync(user, loginProvider, providerKey, CancellationToken).ConfigureAwait(false);
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await loginStore.RemoveLoginAsync(user, loginProvider, providerKey, CancellationToken).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.RemoveLogin, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemoveLogin, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -944,6 +1114,22 @@ public virtual async Task<IdentityResult> RemoveLoginAsync(TUser user, string lo
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> AddLoginAsync(TUser user, UserLoginInfo login)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await AddLoginCoreAsync(user, login).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.AddLogin, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.AddLogin, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> AddLoginCoreAsync(TUser user, UserLoginInfo login)
     {
         ThrowIfDisposed();
         var loginStore = GetLoginStore();
@@ -986,11 +1172,7 @@ public virtual async Task<IList<UserLoginInfo>> GetLoginsAsync(TUser user)
     /// </returns>
     public virtual Task<IdentityResult> AddClaimAsync(TUser user, Claim claim)
     {
-        ThrowIfDisposed();
-        GetClaimStore();
-        ArgumentNullThrowHelper.ThrowIfNull(claim);
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        return AddClaimsAsync(user, new Claim[] { claim });
+        return AddClaimsAsync(user, [claim]);
     }
 
     /// <summary>
@@ -1004,13 +1186,22 @@ public virtual Task<IdentityResult> AddClaimAsync(TUser user, Claim claim)
     /// </returns>
     public virtual async Task<IdentityResult> AddClaimsAsync(TUser user, IEnumerable<Claim> claims)
     {
-        ThrowIfDisposed();
-        var claimStore = GetClaimStore();
-        ArgumentNullThrowHelper.ThrowIfNull(claims);
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var claimStore = GetClaimStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(claims);
 
-        await claimStore.AddClaimsAsync(user, claims, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await claimStore.AddClaimsAsync(user, claims, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.AddClaims, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.AddClaims, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1025,14 +1216,23 @@ public virtual async Task<IdentityResult> AddClaimsAsync(TUser user, IEnumerable
     /// </returns>
     public virtual async Task<IdentityResult> ReplaceClaimAsync(TUser user, Claim claim, Claim newClaim)
     {
-        ThrowIfDisposed();
-        var claimStore = GetClaimStore();
-        ArgumentNullThrowHelper.ThrowIfNull(claim);
-        ArgumentNullThrowHelper.ThrowIfNull(newClaim);
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var claimStore = GetClaimStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(claim);
+            ArgumentNullThrowHelper.ThrowIfNull(newClaim);
 
-        await claimStore.ReplaceClaimAsync(user, claim, newClaim, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await claimStore.ReplaceClaimAsync(user, claim, newClaim, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.ReplaceClaim, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ReplaceClaim, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1046,11 +1246,7 @@ public virtual async Task<IdentityResult> ReplaceClaimAsync(TUser user, Claim cl
     /// </returns>
     public virtual Task<IdentityResult> RemoveClaimAsync(TUser user, Claim claim)
     {
-        ThrowIfDisposed();
-        GetClaimStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(claim);
-        return RemoveClaimsAsync(user, new Claim[] { claim });
+        return RemoveClaimsAsync(user, [claim]);
     }
 
     /// <summary>
@@ -1064,13 +1260,22 @@ public virtual Task<IdentityResult> RemoveClaimAsync(TUser user, Claim claim)
     /// </returns>
     public virtual async Task<IdentityResult> RemoveClaimsAsync(TUser user, IEnumerable<Claim> claims)
     {
-        ThrowIfDisposed();
-        var claimStore = GetClaimStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(claims);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var claimStore = GetClaimStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(claims);
 
-        await claimStore.RemoveClaimsAsync(user, claims, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await claimStore.RemoveClaimsAsync(user, claims, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.RemoveClaims, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemoveClaims, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1098,6 +1303,22 @@ public virtual async Task<IList<Claim>> GetClaimsAsync(TUser user)
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> AddToRoleAsync(TUser user, string role)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await AddToRoleCoreAsync(user, role).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.AddToRoles, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.AddToRoles, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> AddToRoleCoreAsync(TUser user, string role)
     {
         ThrowIfDisposed();
         var userRoleStore = GetUserRoleStore();
@@ -1122,6 +1343,22 @@ public virtual async Task<IdentityResult> AddToRoleAsync(TUser user, string role
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> AddToRolesAsync(TUser user, IEnumerable<string> roles)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await AddToRolesCoreAsync(user, roles).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.AddToRoles, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.AddToRoles, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> AddToRolesCoreAsync(TUser user, IEnumerable<string> roles)
     {
         ThrowIfDisposed();
         var userRoleStore = GetUserRoleStore();
@@ -1151,6 +1388,8 @@ public virtual async Task<IdentityResult> AddToRolesAsync(TUser user, IEnumerabl
     /// </returns>
     public virtual async Task<IdentityResult> RemoveFromRoleAsync(TUser user, string role)
     {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+
         ThrowIfDisposed();
         var userRoleStore = GetUserRoleStore();
         ArgumentNullThrowHelper.ThrowIfNull(user);
@@ -1158,10 +1397,13 @@ public virtual async Task<IdentityResult> RemoveFromRoleAsync(TUser user, string
         var normalizedRole = NormalizeName(role);
         if (!await userRoleStore.IsInRoleAsync(user, normalizedRole, CancellationToken).ConfigureAwait(false))
         {
-            return UserNotInRoleError(role);
+            var failureResult = UserNotInRoleError(role);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, failureResult, UserUpdateType.RemoveFromRoles, startTimeStamp);
+
+            return failureResult;
         }
         await userRoleStore.RemoveFromRoleAsync(user, normalizedRole, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+        return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.RemoveFromRoles, startTimeStamp).ConfigureAwait(false);
     }
 
     private IdentityResult UserAlreadyInRoleError(string role)
@@ -1192,6 +1434,22 @@ private IdentityResult UserNotInRoleError(string role)
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> RemoveFromRolesAsync(TUser user, IEnumerable<string> roles)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await RemoveFromRolesCoreAsync(user, roles).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.RemoveFromRoles, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemoveFromRoles, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> RemoveFromRolesCoreAsync(TUser user, IEnumerable<string> roles)
     {
         ThrowIfDisposed();
         var userRoleStore = GetUserRoleStore();
@@ -1264,14 +1522,23 @@ public virtual async Task<bool> IsInRoleAsync(TUser user, string role)
     /// </returns>
     public virtual async Task<IdentityResult> SetEmailAsync(TUser user, string? email)
     {
-        ThrowIfDisposed();
-        var store = GetEmailStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetEmailStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await store.SetEmailAsync(user, email, CancellationToken).ConfigureAwait(false);
-        await store.SetEmailConfirmedAsync(user, false, CancellationToken).ConfigureAwait(false);
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await store.SetEmailAsync(user, email, CancellationToken).ConfigureAwait(false);
+            await store.SetEmailConfirmedAsync(user, false, CancellationToken).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.SetEmail, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetEmail, startTimeStamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1295,8 +1562,8 @@ public virtual async Task<IdentityResult> SetEmailAsync(TUser user, string? emai
         // Need to potentially check all keys
         if (user == null && Options.Stores.ProtectPersonalData)
         {
-            var keyRing = _services.GetService<ILookupProtectorKeyRing>();
-            var protector = _services.GetService<ILookupProtector>();
+            var keyRing = ServiceProvider.GetService<ILookupProtectorKeyRing>();
+            var protector = ServiceProvider.GetService<ILookupProtector>();
             if (keyRing != null && protector != null)
             {
                 foreach (var key in keyRing.GetAllKeyIds())
@@ -1351,6 +1618,22 @@ public virtual Task<string> GenerateEmailConfirmationTokenAsync(TUser user)
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> ConfirmEmailAsync(TUser user, string token)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await ConfirmEmailCoreAsync(user, token).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.ConfirmEmail, startTimeStamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ConfirmEmail, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> ConfirmEmailCoreAsync(TUser user, string token)
     {
         ThrowIfDisposed();
         var store = GetEmailStore();
@@ -1406,6 +1689,20 @@ public virtual Task<string> GenerateChangeEmailTokenAsync(TUser user, string new
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> ChangeEmailAsync(TUser user, string newEmail, string token)
+    {
+        var startTimeStamp = Stopwatch.GetTimestamp();
+        try
+        {
+            return await ChangeEmailCoreAsync(user, newEmail, token, startTimeStamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ChangeEmail, startTimeStamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> ChangeEmailCoreAsync(TUser user, string newEmail, string token, long startTimestamp)
     {
         ThrowIfDisposed();
         ArgumentNullThrowHelper.ThrowIfNull(user);
@@ -1419,7 +1716,7 @@ public virtual async Task<IdentityResult> ChangeEmailAsync(TUser user, string ne
         await store.SetEmailAsync(user, newEmail, CancellationToken).ConfigureAwait(false);
         await store.SetEmailConfirmedAsync(user, true, CancellationToken).ConfigureAwait(false);
         await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+        return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.ChangeEmail, startTimestamp).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -1446,14 +1743,23 @@ public virtual async Task<IdentityResult> ChangeEmailAsync(TUser user, string ne
     /// </returns>
     public virtual async Task<IdentityResult> SetPhoneNumberAsync(TUser user, string? phoneNumber)
     {
-        ThrowIfDisposed();
-        var store = GetPhoneNumberStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetPhoneNumberStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await store.SetPhoneNumberAsync(user, phoneNumber, CancellationToken).ConfigureAwait(false);
-        await store.SetPhoneNumberConfirmedAsync(user, false, CancellationToken).ConfigureAwait(false);
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await store.SetPhoneNumberAsync(user, phoneNumber, CancellationToken).ConfigureAwait(false);
+            await store.SetPhoneNumberConfirmedAsync(user, false, CancellationToken).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.SetPhoneNumber, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetPhoneNumber, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1468,6 +1774,22 @@ public virtual async Task<IdentityResult> SetPhoneNumberAsync(TUser user, string
     /// of the operation.
     /// </returns>
     public virtual async Task<IdentityResult> ChangePhoneNumberAsync(TUser user, string phoneNumber, string token)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await ChangePhoneNumberCoreAsync(user, phoneNumber, token).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.ChangePhoneNumber, startTimestamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ChangePhoneNumber, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> ChangePhoneNumberCoreAsync(TUser user, string phoneNumber, string token)
     {
         ThrowIfDisposed();
         var store = GetPhoneNumberStore();
@@ -1510,7 +1832,6 @@ public virtual Task<bool> IsPhoneNumberConfirmedAsync(TUser user)
     /// </returns>
     public virtual Task<string> GenerateChangePhoneNumberTokenAsync(TUser user, string phoneNumber)
     {
-        ThrowIfDisposed();
         return GenerateUserTokenAsync(user, Options.Tokens.ChangePhoneNumberTokenProvider, ChangePhoneNumberTokenPurpose + ":" + phoneNumber);
     }
 
@@ -1548,22 +1869,31 @@ public virtual Task<bool> VerifyChangePhoneNumberTokenAsync(TUser user, string t
     /// </returns>
     public virtual async Task<bool> VerifyUserTokenAsync(TUser user, string tokenProvider, string purpose, string token)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(tokenProvider);
-
-        if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+        try
         {
-            throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
-        }
-        // Make sure the token is valid
-        var result = await provider.ValidateAsync(purpose, token, this, user).ConfigureAwait(false);
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(tokenProvider);
+
+            if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+            {
+                throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
+            }
+            // Make sure the token is valid
+            var result = await provider.ValidateAsync(purpose, token, this, user).ConfigureAwait(false);
+            _metrics?.VerifyToken(typeof(TUser).FullName!, result, purpose);
 
-        if (!result && Logger.IsEnabled(LogLevel.Debug))
+            if (!result && Logger.IsEnabled(LogLevel.Debug))
+            {
+                Logger.LogDebug(LoggerEventIds.VerifyUserTokenFailed, "VerifyUserTokenAsync() failed with purpose: {purpose} for user.", purpose);
+            }
+            return result;
+        }
+        catch (Exception ex)
         {
-            Logger.LogDebug(LoggerEventIds.VerifyUserTokenFailed, "VerifyUserTokenAsync() failed with purpose: {purpose} for user.", purpose);
+            _metrics?.VerifyToken(typeof(TUser).FullName!, result: null, purpose, ex);
+            throw;
         }
-        return result;
     }
 
     /// <summary>
@@ -1578,16 +1908,25 @@ public virtual async Task<bool> VerifyUserTokenAsync(TUser user, string tokenPro
     /// </returns>
     public virtual Task<string> GenerateUserTokenAsync(TUser user, string tokenProvider, string purpose)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(tokenProvider);
+        try
+        {
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(tokenProvider);
+
+            if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+            {
+                throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
+            }
 
-        if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+            _metrics?.GenerateToken(typeof(TUser).FullName!, purpose);
+            return provider.GenerateAsync(purpose, this, user);
+        }
+        catch (Exception ex)
         {
-            throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
+            _metrics?.GenerateToken(typeof(TUser).FullName!, purpose, ex);
+            throw;
         }
-
-        return provider.GenerateAsync(purpose, this, user);
     }
 
     /// <summary>
@@ -1638,20 +1977,30 @@ public virtual async Task<IList<string>> GetValidTwoFactorProvidersAsync(TUser u
     /// </returns>
     public virtual async Task<bool> VerifyTwoFactorTokenAsync(TUser user, string tokenProvider, string token)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+        try
         {
-            throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
-        }
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+            {
+                throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
+            }
+
+            // Make sure the token is valid
+            var result = await provider.ValidateAsync("TwoFactor", token, this, user).ConfigureAwait(false);
+            _metrics?.VerifyToken(typeof(TUser).FullName!, result, "TwoFactor");
 
-        // Make sure the token is valid
-        var result = await provider.ValidateAsync("TwoFactor", token, this, user).ConfigureAwait(false);
-        if (!result)
+            if (!result)
+            {
+                Logger.LogDebug(LoggerEventIds.VerifyTwoFactorTokenFailed, $"{nameof(VerifyTwoFactorTokenAsync)}() failed for user.");
+            }
+            return result;
+        }
+        catch (Exception ex)
         {
-            Logger.LogDebug(LoggerEventIds.VerifyTwoFactorTokenFailed, $"{nameof(VerifyTwoFactorTokenAsync)}() failed for user.");
+            _metrics?.VerifyToken(typeof(TUser).FullName!, result: null, "TwoFactor", ex);
+            throw;
         }
-        return result;
     }
 
     /// <summary>
@@ -1665,14 +2014,23 @@ public virtual async Task<bool> VerifyTwoFactorTokenAsync(TUser user, string tok
     /// </returns>
     public virtual Task<string> GenerateTwoFactorTokenAsync(TUser user, string tokenProvider)
     {
-        ThrowIfDisposed();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+        try
         {
-            throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
-        }
+            ThrowIfDisposed();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
+            {
+                throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
+            }
 
-        return provider.GenerateAsync("TwoFactor", this, user);
+            _metrics?.GenerateToken(typeof(TUser).FullName!, "TwoFactor");
+            return provider.GenerateAsync("TwoFactor", this, user);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.GenerateToken(typeof(TUser).FullName!, "TwoFactor", ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1703,13 +2061,22 @@ public virtual async Task<bool> GetTwoFactorEnabledAsync(TUser user)
     /// </returns>
     public virtual async Task<IdentityResult> SetTwoFactorEnabledAsync(TUser user, bool enabled)
     {
-        ThrowIfDisposed();
-        var store = GetUserTwoFactorStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetUserTwoFactorStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await store.SetTwoFactorEnabledAsync(user, enabled, CancellationToken).ConfigureAwait(false);
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await store.SetTwoFactorEnabledAsync(user, enabled, CancellationToken).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.SetTwoFactorEnabled, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetTwoFactorEnabled, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1745,12 +2112,21 @@ public virtual async Task<bool> IsLockedOutAsync(TUser user)
     /// </returns>
     public virtual async Task<IdentityResult> SetLockoutEnabledAsync(TUser user, bool enabled)
     {
-        ThrowIfDisposed();
-        var store = GetUserLockoutStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetUserLockoutStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await store.SetLockoutEnabledAsync(user, enabled, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await store.SetLockoutEnabledAsync(user, enabled, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.SetLockoutEnabled, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetLockoutEnabled, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1791,6 +2167,22 @@ public virtual async Task<bool> GetLockoutEnabledAsync(TUser user)
     /// <param name="lockoutEnd">The <see cref="DateTimeOffset"/> after which the <paramref name="user"/>'s lockout should end.</param>
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the <see cref="IdentityResult"/> of the operation.</returns>
     public virtual async Task<IdentityResult> SetLockoutEndDateAsync(TUser user, DateTimeOffset? lockoutEnd)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await SetLockoutEndDateCoreAsync(user, lockoutEnd).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.SetLockoutEndDate, startTimestamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetLockoutEndDate, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> SetLockoutEndDateCoreAsync(TUser user, DateTimeOffset? lockoutEnd)
     {
         ThrowIfDisposed();
         var store = GetUserLockoutStore();
@@ -1814,21 +2206,30 @@ public virtual async Task<IdentityResult> SetLockoutEndDateAsync(TUser user, Dat
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the <see cref="IdentityResult"/> of the operation.</returns>
     public virtual async Task<IdentityResult> AccessFailedAsync(TUser user)
     {
-        ThrowIfDisposed();
-        var store = GetUserLockoutStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetUserLockoutStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        // If this puts the user over the threshold for lockout, lock them out and reset the access failed count
-        var count = await store.IncrementAccessFailedCountAsync(user, CancellationToken).ConfigureAwait(false);
-        if (count < Options.Lockout.MaxFailedAccessAttempts)
+            // If this puts the user over the threshold for lockout, lock them out and reset the access failed count
+            var count = await store.IncrementAccessFailedCountAsync(user, CancellationToken).ConfigureAwait(false);
+            if (count < Options.Lockout.MaxFailedAccessAttempts)
+            {
+                return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.IncrementAccessFailed, startTimestamp).ConfigureAwait(false);
+            }
+            Logger.LogDebug(LoggerEventIds.UserLockedOut, "User is locked out.");
+            await store.SetLockoutEndDateAsync(user, DateTimeOffset.UtcNow.Add(Options.Lockout.DefaultLockoutTimeSpan),
+                CancellationToken).ConfigureAwait(false);
+            await store.ResetAccessFailedCountAsync(user, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.IncrementAccessFailed, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
         {
-            return await UpdateUserAsync(user).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.IncrementAccessFailed, startTimestamp, ex);
+            throw;
         }
-        Logger.LogDebug(LoggerEventIds.UserLockedOut, "User is locked out.");
-        await store.SetLockoutEndDateAsync(user, DateTimeOffset.UtcNow.Add(Options.Lockout.DefaultLockoutTimeSpan),
-            CancellationToken).ConfigureAwait(false);
-        await store.ResetAccessFailedCountAsync(user, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -1837,6 +2238,22 @@ await store.SetLockoutEndDateAsync(user, DateTimeOffset.UtcNow.Add(Options.Locko
     /// <param name="user">The user whose failed access count should be reset.</param>
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the <see cref="IdentityResult"/> of the operation.</returns>
     public virtual async Task<IdentityResult> ResetAccessFailedCountAsync(TUser user)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await ResetAccessFailedCountCoreAsync(user).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.ResetAccessFailedCount, startTimestamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ResetAccessFailedCount, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> ResetAccessFailedCountCoreAsync(TUser user)
     {
         ThrowIfDisposed();
         var store = GetUserLockoutStore();
@@ -1925,15 +2342,24 @@ public virtual Task<IList<TUser>> GetUsersInRoleAsync(string roleName)
     /// <returns>Whether the user was successfully updated.</returns>
     public virtual async Task<IdentityResult> SetAuthenticationTokenAsync(TUser user, string loginProvider, string tokenName, string? tokenValue)
     {
-        ThrowIfDisposed();
-        var store = GetAuthenticationTokenStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(loginProvider);
-        ArgumentNullThrowHelper.ThrowIfNull(tokenName);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetAuthenticationTokenStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(loginProvider);
+            ArgumentNullThrowHelper.ThrowIfNull(tokenName);
 
-        // REVIEW: should updating any tokens affect the security stamp?
-        await store.SetTokenAsync(user, loginProvider, tokenName, tokenValue, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            // REVIEW: should updating any tokens affect the security stamp?
+            await store.SetTokenAsync(user, loginProvider, tokenName, tokenValue, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.SetAuthenticationToken, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.SetAuthenticationToken, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1945,14 +2371,23 @@ public virtual async Task<IdentityResult> SetAuthenticationTokenAsync(TUser user
     /// <returns>Whether a token was removed.</returns>
     public virtual async Task<IdentityResult> RemoveAuthenticationTokenAsync(TUser user, string loginProvider, string tokenName)
     {
-        ThrowIfDisposed();
-        var store = GetAuthenticationTokenStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(loginProvider);
-        ArgumentNullThrowHelper.ThrowIfNull(tokenName);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetAuthenticationTokenStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            ArgumentNullThrowHelper.ThrowIfNull(loginProvider);
+            ArgumentNullThrowHelper.ThrowIfNull(tokenName);
 
-        await store.RemoveTokenAsync(user, loginProvider, tokenName, CancellationToken).ConfigureAwait(false);
-        return await UpdateUserAsync(user).ConfigureAwait(false);
+            await store.RemoveTokenAsync(user, loginProvider, tokenName, CancellationToken).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.RemoveAuthenticationToken, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemoveAuthenticationToken, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1975,12 +2410,21 @@ public virtual async Task<IdentityResult> RemoveAuthenticationTokenAsync(TUser u
     /// <returns>Whether the user was successfully updated.</returns>
     public virtual async Task<IdentityResult> ResetAuthenticatorKeyAsync(TUser user)
     {
-        ThrowIfDisposed();
-        var store = GetAuthenticatorKeyStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-        await store.SetAuthenticatorKeyAsync(user, GenerateNewAuthenticatorKey(), CancellationToken).ConfigureAwait(false);
-        await UpdateSecurityStampInternal(user).ConfigureAwait(false);
-        return await UpdateAsync(user).ConfigureAwait(false);
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            ThrowIfDisposed();
+            var store = GetAuthenticatorKeyStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
+            await store.SetAuthenticatorKeyAsync(user, GenerateNewAuthenticatorKey(), CancellationToken).ConfigureAwait(false);
+            await UpdateSecurityStampInternal(user).ConfigureAwait(false);
+            return await UpdateUserAndRecordMetricAsync(user, UserUpdateType.ResetAuthenticatorKey, startTimestamp).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.ResetAuthenticatorKey, startTimestamp, ex);
+            throw;
+        }
     }
 
     /// <summary>
@@ -1998,23 +2442,32 @@ public virtual string GenerateNewAuthenticatorKey()
     /// <returns>The new recovery codes for the user.  Note: there may be less than number returned, as duplicates will be removed.</returns>
     public virtual async Task<IEnumerable<string>?> GenerateNewTwoFactorRecoveryCodesAsync(TUser user, int number)
     {
-        ThrowIfDisposed();
-        var store = GetRecoveryCodeStore();
-        ArgumentNullThrowHelper.ThrowIfNull(user);
-
-        var newCodes = new List<string>(number);
-        for (var i = 0; i < number; i++)
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
         {
-            newCodes.Add(CreateTwoFactorRecoveryCode());
-        }
+            ThrowIfDisposed();
+            var store = GetRecoveryCodeStore();
+            ArgumentNullThrowHelper.ThrowIfNull(user);
 
-        await store.ReplaceCodesAsync(user, newCodes.Distinct(), CancellationToken).ConfigureAwait(false);
-        var update = await UpdateAsync(user).ConfigureAwait(false);
-        if (update.Succeeded)
+            var newCodes = new List<string>(number);
+            for (var i = 0; i < number; i++)
+            {
+                newCodes.Add(CreateTwoFactorRecoveryCode());
+            }
+
+            await store.ReplaceCodesAsync(user, newCodes.Distinct(), CancellationToken).ConfigureAwait(false);
+            var update = await UpdateUserAndRecordMetricAsync(user, UserUpdateType.GenerateNewTwoFactorRecoveryCodes, startTimestamp).ConfigureAwait(false);
+            if (update.Succeeded)
+            {
+                return newCodes;
+            }
+            return null;
+        }
+        catch (Exception ex)
         {
-            return newCodes;
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.GenerateNewTwoFactorRecoveryCodes, startTimestamp, ex);
+            throw;
         }
-        return null;
     }
 
     /// <summary>
@@ -2101,6 +2554,22 @@ private static char GetRandomRecoveryCodeChar()
     /// <param name="code">The recovery code to use.</param>
     /// <returns>True if the recovery code was found for the user.</returns>
     public virtual async Task<IdentityResult> RedeemTwoFactorRecoveryCodeAsync(TUser user, string code)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await RedeemTwoFactorRecoveryCodeCoreAsync(user, code).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.RedeemTwoFactorRecoveryCode, startTimestamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RedeemTwoFactorRecoveryCode, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> RedeemTwoFactorRecoveryCodeCoreAsync(TUser user, string code)
     {
         ThrowIfDisposed();
         var store = GetRecoveryCodeStore();
@@ -2109,7 +2578,7 @@ public virtual async Task<IdentityResult> RedeemTwoFactorRecoveryCodeAsync(TUser
         var success = await store.RedeemCodeAsync(user, code, CancellationToken).ConfigureAwait(false);
         if (success)
         {
-            return await UpdateAsync(user).ConfigureAwait(false);
+            return await UpdateUserAsync(user).ConfigureAwait(false);
         }
         return IdentityResult.Failed(ErrorDescriber.RecoveryCodeRedemptionFailed());
     }
@@ -2128,6 +2597,125 @@ public virtual Task<int> CountRecoveryCodesAsync(TUser user)
         return store.CountCodesAsync(user, CancellationToken);
     }
 
+    /// <summary>
+    /// Adds a new passkey for the given user or updates an existing one.
+    /// </summary>
+    /// <param name="user">The user for whom the passkey should be added or updated.</param>
+    /// <param name="passkey">The passkey to add or update.</param>
+    /// <returns>Whether the passkey was successfully set.</returns>
+    public virtual async Task<IdentityResult> AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await AddOrUpdatePasskeyCoreAsync(user, passkey).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.AddOrUpdatePasskey, startTimestamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.AddOrUpdatePasskey, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> AddOrUpdatePasskeyCoreAsync(TUser user, UserPasskeyInfo passkey)
+    {
+        ThrowIfDisposed();
+        var passkeyStore = GetUserPasskeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(user);
+        ArgumentNullThrowHelper.ThrowIfNull(passkey);
+
+        await passkeyStore.AddOrUpdatePasskeyAsync(user, passkey, CancellationToken).ConfigureAwait(false);
+        return await UpdateUserAsync(user).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Gets a user's passkeys.
+    /// </summary>
+    /// <param name="user">The user whose passkeys should be retrieved.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing a list of the user's passkeys.
+    /// </returns>
+    public virtual Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user)
+    {
+        ThrowIfDisposed();
+        var passkeyStore = GetUserPasskeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(user);
+
+        return passkeyStore.GetPasskeysAsync(user, CancellationToken);
+    }
+
+    /// <summary>
+    /// Finds a user's passkey by its credential id.
+    /// </summary>
+    /// <param name="user">The user whose passkey should be retrieved.</param>
+    /// <param name="credentialId">The credential ID to search for.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the passkey if found; otherwise <see langword="null"/>.
+    /// </returns>
+    public virtual Task<UserPasskeyInfo?> GetPasskeyAsync(TUser user, byte[] credentialId)
+    {
+        ThrowIfDisposed();
+        var passkeyStore = GetUserPasskeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(user);
+        ArgumentNullThrowHelper.ThrowIfNull(credentialId);
+
+        return passkeyStore.FindPasskeyAsync(user, credentialId, CancellationToken);
+    }
+
+    /// <summary>
+    /// Finds the user associated with a passkey.
+    /// </summary>
+    /// <param name="credentialId">The credential ID to search for.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the user if found, otherwise <see langword="null"/>.
+    /// </returns>
+    public virtual Task<TUser?> FindByPasskeyIdAsync(byte[] credentialId)
+    {
+        ThrowIfDisposed();
+        var passkeyStore = GetUserPasskeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(credentialId);
+
+        return passkeyStore.FindByPasskeyIdAsync(credentialId, CancellationToken);
+    }
+
+    /// <summary>
+    /// Removes a passkey credential from a user.
+    /// </summary>
+    /// <param name="user">The user whose passkey should be removed.</param>
+    /// <param name="credentialId">The credential id of the passkey to remove.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the <see cref="IdentityResult"/>
+    /// of the operation.
+    /// </returns>
+    public virtual async Task<IdentityResult> RemovePasskeyAsync(TUser user, byte[] credentialId)
+    {
+        var startTimestamp = Stopwatch.GetTimestamp();
+        try
+        {
+            var result = await RemovePasskeyCoreAsync(user, credentialId).ConfigureAwait(false);
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result, UserUpdateType.RemovePasskey, startTimestamp);
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _metrics?.UpdateUser(typeof(TUser).FullName!, result: null, UserUpdateType.RemovePasskey, startTimestamp, ex);
+            throw;
+        }
+    }
+
+    private async Task<IdentityResult> RemovePasskeyCoreAsync(TUser user, byte[] credentialId)
+    {
+        ThrowIfDisposed();
+        var passkeyStore = GetUserPasskeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(user);
+        ArgumentNullThrowHelper.ThrowIfNull(credentialId);
+
+        await passkeyStore.RemovePasskeyAsync(user, credentialId, CancellationToken).ConfigureAwait(false);
+        return await UpdateUserAsync(user).ConfigureAwait(false);
+    }
+
     /// <summary>
     /// Releases the unmanaged resources used by the role manager and optionally releases the managed resources.
     /// </summary>
@@ -2298,6 +2886,8 @@ private IUserClaimStore<TUser> GetClaimStore()
     /// <returns>A <see cref="IdentityResult"/> representing whether validation was successful.</returns>
     protected async Task<IdentityResult> ValidateUserAsync(TUser user)
     {
+        // NOTE: Metrics aren't recorded here. Instead, the result is used in other methods.
+
         if (SupportsUserSecurityStamp)
         {
             var stamp = await GetSecurityStampAsync(user).ConfigureAwait(false);
@@ -2370,6 +2960,8 @@ protected async Task<IdentityResult> ValidatePasswordAsync(TUser user, string? p
     /// <returns>Whether the operation was successful.</returns>
     protected virtual async Task<IdentityResult> UpdateUserAsync(TUser user)
     {
+        // NOTE: Metrics aren't recorded here. Instead, the result is used in other methods.
+
         var result = await ValidateUserAsync(user).ConfigureAwait(false);
         if (!result.Succeeded)
         {
@@ -2380,6 +2972,14 @@ protected virtual async Task<IdentityResult> UpdateUserAsync(TUser user)
         return await Store.UpdateAsync(user, CancellationToken).ConfigureAwait(false);
     }
 
+    private async Task<IdentityResult> UpdateUserAndRecordMetricAsync(TUser user, UserUpdateType updateType, long startTimestamp)
+    {
+        var result = await UpdateUserAsync(user).ConfigureAwait(false);
+        _metrics?.UpdateUser(typeof(TUser).FullName!, result, updateType, startTimestamp);
+
+        return result;
+    }
+
     private IUserAuthenticatorKeyStore<TUser> GetAuthenticatorKeyStore()
     {
         var cast = Store as IUserAuthenticatorKeyStore<TUser>;
@@ -2420,6 +3020,16 @@ private IUserPasswordStore<TUser> GetPasswordStore()
         return cast;
     }
 
+    private IUserPasskeyStore<TUser> GetUserPasskeyStore()
+    {
+        var cast = Store as IUserPasskeyStore<TUser>;
+        if (cast == null)
+        {
+            throw new NotSupportedException(Resources.StoreNotIUserPasskeyStore);
+        }
+        return cast;
+    }
+
     /// <summary>
     /// Throws if this class has been disposed.
     /// </summary>
diff --git a/src/Identity/Extensions.Core/src/UserManagerMetrics.cs b/src/Identity/Extensions.Core/src/UserManagerMetrics.cs
new file mode 100644
index 000000000000..b54b24887a2c
--- /dev/null
+++ b/src/Identity/Extensions.Core/src/UserManagerMetrics.cs
@@ -0,0 +1,294 @@
+// 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.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Internal;
+using static Microsoft.AspNetCore.Identity.UserManagerMetrics;
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal sealed class UserManagerMetrics : IDisposable
+{
+    public const string MeterName = "Microsoft.AspNetCore.Identity";
+
+    public const string CreateDurationName = "aspnetcore.identity.user.create.duration";
+    public const string UpdateDurationName = "aspnetcore.identity.user.update.duration";
+    public const string DeleteDurationName = "aspnetcore.identity.user.delete.duration";
+    public const string CheckPasswordAttemptsCounterName = "aspnetcore.identity.user.check_password_attempts";
+    public const string VerifyTokenAttemptsCounterName = "aspnetcore.identity.user.verify_token_attempts";
+    public const string GenerateTokensCounterName = "aspnetcore.identity.user.generated_tokens";
+
+    private readonly Meter _meter;
+    private readonly Histogram<double> _createDuration;
+    private readonly Histogram<double> _updateDuration;
+    private readonly Histogram<double> _deleteDuration;
+    private readonly Counter<long> _checkPasswordAttemptsCounter;
+    private readonly Counter<long> _verifyTokenAttemptsCounter;
+    private readonly Counter<long> _generateTokensCounter;
+
+    public UserManagerMetrics(IMeterFactory meterFactory)
+    {
+        _meter = meterFactory.Create(MeterName);
+
+        _createDuration = _meter.CreateHistogram<double>(
+            CreateDurationName,
+            unit: "s",
+            description: "The duration of user creation operations.",
+            advice: new() { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
+
+        _updateDuration = _meter.CreateHistogram<double>(
+            UpdateDurationName,
+            unit: "s",
+            description: "The duration of user update operations.",
+            advice: new() { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
+
+        _deleteDuration = _meter.CreateHistogram<double>(
+            DeleteDurationName,
+            unit: "s",
+            description: "The duration of user deletion operations.",
+            advice: new() { HistogramBucketBoundaries = MetricsConstants.ShortSecondsBucketBoundaries });
+
+        _checkPasswordAttemptsCounter = _meter.CreateCounter<long>(
+            CheckPasswordAttemptsCounterName,
+            unit: "{attempt}",
+            description: "The total number of check password attempts. Only checks whether the password is valid and not whether the user account is in a state that can log in.");
+
+        _verifyTokenAttemptsCounter = _meter.CreateCounter<long>(
+            VerifyTokenAttemptsCounterName,
+            unit: "{attempt}",
+            description: "The total number of token verification attempts.");
+
+        _generateTokensCounter = _meter.CreateCounter<long>(
+            GenerateTokensCounterName,
+            unit: "{count}",
+            description: "The total number of token generations.");
+    }
+
+    internal void CreateUser(string userType, IdentityResult? result, long startTimestamp, Exception? exception = null)
+    {
+        if (!_createDuration.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType }
+        };
+        AddIdentityResultTags(ref tags, result);
+        AddErrorTag(ref tags, exception, result: result);
+
+        var duration = GetElapsedTime(startTimestamp);
+        _createDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    internal void UpdateUser(string userType, IdentityResult? result, UserUpdateType updateType, long startTimestamp, Exception? exception = null)
+    {
+        if (!_updateDuration.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.identity.user.update_type", GetUpdateType(updateType) },
+        };
+        AddIdentityResultTags(ref tags, result);
+        AddErrorTag(ref tags, exception, result: result);
+
+        var duration = GetElapsedTime(startTimestamp);
+        _updateDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    internal void DeleteUser(string userType, IdentityResult? result, long startTimestamp, Exception? exception = null)
+    {
+        if (!_deleteDuration.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType }
+        };
+        AddIdentityResultTags(ref tags, result);
+        AddErrorTag(ref tags, exception, result: result);
+
+        var duration = GetElapsedTime(startTimestamp);
+        _deleteDuration.Record(duration.TotalSeconds, tags);
+    }
+
+    internal void CheckPassword(string userType, bool? userMissing, PasswordVerificationResult? result, Exception? exception = null)
+    {
+        if (!_checkPasswordAttemptsCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+        };
+        if (userMissing != null || result != null)
+        {
+            tags.Add("aspnetcore.identity.password_check_result", GetPasswordResult(result, passwordMissing: null, userMissing));
+        }
+        AddErrorTag(ref tags, exception);
+
+        _checkPasswordAttemptsCounter.Add(1, tags);
+    }
+
+    internal void VerifyToken(string userType, bool? result, string purpose, Exception? exception = null)
+    {
+        if (!_verifyTokenAttemptsCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.identity.token_purpose", GetTokenPurpose(purpose) },
+        };
+        if (result != null)
+        {
+            tags.Add("aspnetcore.identity.token_verified", result == true ? "success" : "failure");
+        }
+        AddErrorTag(ref tags, exception);
+
+        _verifyTokenAttemptsCounter.Add(1, tags);
+    }
+
+    internal void GenerateToken(string userType, string purpose, Exception? exception = null)
+    {
+        if (!_generateTokensCounter.Enabled)
+        {
+            return;
+        }
+
+        var tags = new TagList
+        {
+            { "aspnetcore.identity.user_type", userType },
+            { "aspnetcore.identity.token_purpose", GetTokenPurpose(purpose) },
+        };
+        AddErrorTag(ref tags, exception);
+
+        _generateTokensCounter.Add(1, tags);
+    }
+
+    private static TimeSpan GetElapsedTime(long startTimestamp)
+    {
+        return ValueStopwatch.GetElapsedTime(startTimestamp, Stopwatch.GetTimestamp());
+    }
+
+    private static string GetTokenPurpose(string purpose)
+    {
+        // Purpose could be any value and can't be used directly as a tag value. However, there are known purposes
+        // on UserManager that we can detect and use as a tag value. Some could have a ':' in them followed by user data.
+        // We need to trim them to content before ':' and then match to known values.
+        ReadOnlySpan<char> trimmedPurpose = purpose;
+        var colonIndex = purpose.IndexOf(':');
+        if (colonIndex >= 0)
+        {
+            trimmedPurpose = purpose.AsSpan(0, colonIndex);
+        }
+
+        // These are known purposes that are specified in ASP.NET Core Identity.
+        return trimmedPurpose switch
+        {
+            "ResetPassword" => "reset_password",
+            "ChangePhoneNumber" => "change_phone_number",
+            "EmailConfirmation" => "email_confirmation",
+            "ChangeEmail" => "change_email",
+            "TwoFactor" => "two_factor",
+            _ => "_OTHER"
+        };
+    }
+
+    private static void AddIdentityResultTags(ref TagList tags, IdentityResult? result)
+    {
+        if (result == null)
+        {
+            return;
+        }
+
+        tags.Add("aspnetcore.identity.result", result.Succeeded ? "success" : "failure");
+        if (!result.Succeeded && result.Errors.FirstOrDefault()?.Code is { Length: > 0 } code)
+        {
+            tags.Add("aspnetcore.identity.error_code", code);
+        }
+    }
+
+    private static void AddErrorTag(ref TagList tags, Exception? exception, IdentityResult? result = null)
+    {
+        var value = exception?.GetType().FullName ?? result?.Errors.FirstOrDefault()?.Code;
+        if (value != null)
+        {
+            tags.Add("error.type", value);
+        }
+    }
+
+    private static string GetPasswordResult(PasswordVerificationResult? result, bool? passwordMissing, bool? userMissing)
+    {
+        return (result, passwordMissing ?? false, userMissing ?? false) switch
+        {
+            (PasswordVerificationResult.Success, false, false) => "success",
+            (PasswordVerificationResult.SuccessRehashNeeded, false, false) => "success_rehash_needed",
+            (PasswordVerificationResult.Failed, false, false) => "failure",
+            (null, true, false) => "password_missing",
+            (null, false, true) => "user_missing",
+            _ => "_OTHER"
+        };
+    }
+
+    private static string GetUpdateType(UserUpdateType updateType)
+    {
+        return updateType switch
+        {
+            UserUpdateType.Update => "update",
+            UserUpdateType.SetUserName => "set_user_name",
+            UserUpdateType.AddPassword => "add_password",
+            UserUpdateType.ChangePassword => "change_password",
+            UserUpdateType.UpdateSecurityStamp => "update_security_stamp",
+            UserUpdateType.ResetPassword => "reset_password",
+            UserUpdateType.RemoveLogin => "remove_login",
+            UserUpdateType.AddLogin => "add_login",
+            UserUpdateType.AddClaims => "add_claims",
+            UserUpdateType.ReplaceClaim => "replace_claim",
+            UserUpdateType.RemoveClaims => "remove_claims",
+            UserUpdateType.AddToRoles => "add_to_roles",
+            UserUpdateType.RemoveFromRoles => "remove_from_roles",
+            UserUpdateType.SetEmail => "set_email",
+            UserUpdateType.ConfirmEmail => "confirm_email",
+            UserUpdateType.PasswordRehash => "password_rehash",
+            UserUpdateType.RemovePassword => "remove_password",
+            UserUpdateType.ChangeEmail => "change_email",
+            UserUpdateType.SetPhoneNumber => "set_phone_number",
+            UserUpdateType.ChangePhoneNumber => "change_phone_number",
+            UserUpdateType.SetTwoFactorEnabled => "set_two_factor_enabled",
+            UserUpdateType.SetLockoutEnabled => "set_lockout_enabled",
+            UserUpdateType.SetLockoutEndDate => "set_lockout_end_date",
+            UserUpdateType.IncrementAccessFailed => "increment_access_failed",
+            UserUpdateType.ResetAccessFailedCount => "reset_access_failed_count",
+            UserUpdateType.SetAuthenticationToken => "set_authentication_token",
+            UserUpdateType.RemoveAuthenticationToken => "remove_authentication_token",
+            UserUpdateType.ResetAuthenticatorKey => "reset_authenticator_key",
+            UserUpdateType.GenerateNewTwoFactorRecoveryCodes => "generate_new_two_factor_recovery_codes",
+            UserUpdateType.RedeemTwoFactorRecoveryCode => "redeem_two_factor_recovery_code",
+            UserUpdateType.AddOrUpdatePasskey => "add_or_update_passkey",
+            UserUpdateType.RemovePasskey => "remove_passkey",
+            _ => "_OTHER"
+        };
+    }
+
+    public void Dispose()
+    {
+        _meter.Dispose();
+    }
+}
diff --git a/src/Identity/Extensions.Core/src/UserPasskeyInfo.cs b/src/Identity/Extensions.Core/src/UserPasskeyInfo.cs
new file mode 100644
index 000000000000..9fde211e9390
--- /dev/null
+++ b/src/Identity/Extensions.Core/src/UserPasskeyInfo.cs
@@ -0,0 +1,113 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Provides information for a user's passkey credential.
+/// </summary>
+public sealed class UserPasskeyInfo
+{
+    /// <summary>
+    /// Initializes a new instance of <see cref="UserPasskeyInfo"/>.
+    /// </summary>
+    /// <param name="credentialId">The credential ID for the passkey.</param>
+    /// <param name="publicKey">The public key for the passkey.</param>
+    /// <param name="createdAt">The time when the passkey was created.</param>
+    /// <param name="signCount">The signature counter for the passkey.</param>
+    /// <param name="attestationObject">The passkey's attestation object.</param>
+    /// <param name="clientDataJson">The passkey's client data JSON.</param>
+    /// <param name="transports">The transports supported by this passkey.</param>
+    /// <param name="isUserVerified">Indicates if the passkey has a verified user.</param>
+    /// <param name="isBackupEligible">Indicates if the passkey is eligible for backup.</param>
+    /// <param name="isBackedUp">Indicates if the passkey is currently backed up.</param>
+    public UserPasskeyInfo(
+        byte[] credentialId,
+        byte[] publicKey,
+        DateTimeOffset createdAt,
+        uint signCount,
+        string[]? transports,
+        bool isUserVerified,
+        bool isBackupEligible,
+        bool isBackedUp,
+        byte[] attestationObject,
+        byte[] clientDataJson)
+    {
+        CredentialId = credentialId;
+        PublicKey = publicKey;
+        CreatedAt = createdAt;
+        SignCount = signCount;
+        Transports = transports;
+        IsUserVerified = isUserVerified;
+        IsBackupEligible = isBackupEligible;
+        IsBackedUp = isBackedUp;
+        AttestationObject = attestationObject;
+        ClientDataJson = clientDataJson;
+    }
+
+    /// <summary>
+    /// Gets the credential ID for this passkey.
+    /// </summary>
+    public byte[] CredentialId { get; }
+
+    /// <summary>
+    /// Gets the public key associated with this passkey.
+    /// </summary>
+    public byte[] PublicKey { get; }
+
+    /// <summary>
+    /// Gets or sets the friendly name for this passkey.
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Gets the time this passkey was created.
+    /// </summary>
+    public DateTimeOffset CreatedAt { get; }
+
+    /// <summary>
+    /// Gets or sets the signature counter for this passkey.
+    /// </summary>
+    public uint SignCount { get; set; }
+
+    /// <summary>
+    /// Gets the transports supported by this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-authenticatortransport"/>.
+    /// </remarks>
+    public string[]? Transports { get; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey has a verified user.
+    /// </summary>
+    public bool IsUserVerified { get; set; }
+
+    /// <summary>
+    /// Gets whether the passkey is eligible for backup.
+    /// </summary>
+    public bool IsBackupEligible { get; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey is currently backed up.
+    /// </summary>
+    public bool IsBackedUp { get; set; }
+
+    /// <summary>
+    /// Gets the attestation object associated with this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-object"/>.
+    /// </remarks>
+    public byte[] AttestationObject { get; }
+
+    /// <summary>
+    /// Gets the collected client data JSON associated with this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-collectedclientdata"/>.
+    /// </remarks>
+    public byte[] ClientDataJson { get; }
+}
diff --git a/src/Identity/Extensions.Core/src/UserUpdateType.cs b/src/Identity/Extensions.Core/src/UserUpdateType.cs
new file mode 100644
index 000000000000..4e9eeb06baae
--- /dev/null
+++ b/src/Identity/Extensions.Core/src/UserUpdateType.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity;
+
+internal enum UserUpdateType
+{
+    Update,
+    SetUserName,
+    AddPassword,
+    ChangePassword,
+    UpdateSecurityStamp,
+    ResetPassword,
+    RemoveLogin,
+    AddLogin,
+    AddClaims,
+    ReplaceClaim,
+    RemoveClaims,
+    AddToRoles,
+    RemoveFromRoles,
+    SetEmail,
+    ConfirmEmail,
+    PasswordRehash,
+    RemovePassword,
+    ChangeEmail,
+    SetPhoneNumber,
+    ChangePhoneNumber,
+    SetTwoFactorEnabled,
+    SetLockoutEnabled,
+    SetLockoutEndDate,
+    IncrementAccessFailed,
+    ResetAccessFailedCount,
+    SetAuthenticationToken,
+    RemoveAuthenticationToken,
+    ResetAuthenticatorKey,
+    GenerateNewTwoFactorRecoveryCodes,
+    RedeemTwoFactorRecoveryCode,
+    AddOrUpdatePasskey,
+    RemovePasskey
+}
diff --git a/src/Identity/Extensions.Stores/src/IdentityPasskeyData.cs b/src/Identity/Extensions.Stores/src/IdentityPasskeyData.cs
new file mode 100644
index 000000000000..16930dde1e40
--- /dev/null
+++ b/src/Identity/Extensions.Stores/src/IdentityPasskeyData.cs
@@ -0,0 +1,71 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents data associated with a passkey.
+/// </summary>
+public class IdentityPasskeyData
+{
+    /// <summary>
+    /// Gets or sets the public key associated with this passkey.
+    /// </summary>
+    public virtual byte[] PublicKey { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets the friendly name for this passkey.
+    /// </summary>
+    public virtual string? Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the time this passkey was created.
+    /// </summary>
+    public virtual DateTimeOffset CreatedAt { get; set; }
+
+    /// <summary>
+    /// Gets or sets the signature counter for this passkey.
+    /// </summary>
+    public virtual uint SignCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the transports supported by this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-authenticatortransport"/>.
+    /// </remarks>
+    public virtual string[]? Transports { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey has a verified user.
+    /// </summary>
+    public virtual bool IsUserVerified { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey is eligible for backup.
+    /// </summary>
+    public virtual bool IsBackupEligible { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey is currently backed up.
+    /// </summary>
+    public virtual bool IsBackedUp { get; set; }
+
+    /// <summary>
+    /// Gets or sets the attestation object associated with this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-object"/>.
+    /// </remarks>
+    public virtual byte[] AttestationObject { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets the collected client data JSON associated with this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-collectedclientdata"/>.
+    /// </remarks>
+    public virtual byte[] ClientDataJson { get; set; } = default!;
+}
diff --git a/src/Identity/Extensions.Stores/src/IdentityRole.cs b/src/Identity/Extensions.Stores/src/IdentityRole.cs
index 02da6b7eb095..eef92abe586a 100644
--- a/src/Identity/Extensions.Stores/src/IdentityRole.cs
+++ b/src/Identity/Extensions.Stores/src/IdentityRole.cs
@@ -72,7 +72,7 @@ public IdentityRole(string roleName) : this()
     /// <summary>
     /// A random value that should change whenever a role is persisted to the store
     /// </summary>
-    public virtual string? ConcurrencyStamp { get; set; }
+    public virtual string? ConcurrencyStamp { get; set; } = Guid.NewGuid().ToString();
 
     /// <summary>
     /// Returns the name of the role.
diff --git a/src/Identity/Extensions.Stores/src/IdentityUserPasskey.cs b/src/Identity/Extensions.Stores/src/IdentityUserPasskey.cs
new file mode 100644
index 000000000000..dad396fd68f2
--- /dev/null
+++ b/src/Identity/Extensions.Stores/src/IdentityUserPasskey.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.AspNetCore.Identity;
+
+/// <summary>
+/// Represents a passkey credential for a user in the identity system.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#credential-record"/>.
+/// </remarks>
+/// <typeparam name="TKey">The type used for the primary key for this passkey credential.</typeparam>
+public class IdentityUserPasskey<TKey> where TKey : IEquatable<TKey>
+{
+    /// <summary>
+    /// Gets or sets the primary key of the user that owns this passkey.
+    /// </summary>
+    public virtual TKey UserId { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets the credential ID for this passkey.
+    /// </summary>
+    public virtual byte[] CredentialId { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets additional data associated with this passkey.
+    /// </summary>
+    public virtual IdentityPasskeyData Data { get; set; } = default!;
+}
diff --git a/src/Identity/Extensions.Stores/src/PublicAPI.Unshipped.txt b/src/Identity/Extensions.Stores/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..6c0240f93f85 100644
--- a/src/Identity/Extensions.Stores/src/PublicAPI.Unshipped.txt
+++ b/src/Identity/Extensions.Stores/src/PublicAPI.Unshipped.txt
@@ -1 +1,31 @@
 #nullable enable
+Microsoft.AspNetCore.Identity.IdentityPasskeyData
+Microsoft.AspNetCore.Identity.IdentityPasskeyData.IdentityPasskeyData() -> void
+Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>
+Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.IdentityUserPasskey() -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.AttestationObject.get -> byte[]!
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.AttestationObject.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.ClientDataJson.get -> byte[]!
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.ClientDataJson.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.CreatedAt.get -> System.DateTimeOffset
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.CreatedAt.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.IsBackedUp.get -> bool
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.IsBackedUp.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.IsBackupEligible.get -> bool
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.IsBackupEligible.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.IsUserVerified.get -> bool
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.IsUserVerified.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.Name.get -> string?
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.Name.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.PublicKey.get -> byte[]!
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.PublicKey.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.SignCount.get -> uint
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.SignCount.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.Transports.get -> string![]?
+virtual Microsoft.AspNetCore.Identity.IdentityPasskeyData.Transports.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.CredentialId.get -> byte[]!
+virtual Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.CredentialId.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.Data.get -> Microsoft.AspNetCore.Identity.IdentityPasskeyData!
+virtual Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.Data.set -> void
+virtual Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.UserId.get -> TKey
+virtual Microsoft.AspNetCore.Identity.IdentityUserPasskey<TKey>.UserId.set -> void
diff --git a/src/Identity/Extensions.Stores/src/UserStoreBase.cs b/src/Identity/Extensions.Stores/src/UserStoreBase.cs
index c45dd197e4a2..804ebcbad7dc 100644
--- a/src/Identity/Extensions.Stores/src/UserStoreBase.cs
+++ b/src/Identity/Extensions.Stores/src/UserStoreBase.cs
@@ -969,7 +969,7 @@ public virtual async Task<bool> RedeemCodeAsync(TUser user, string code, Cancell
         ThrowIfDisposed();
 
         ArgumentNullThrowHelper.ThrowIfNull(user);
-        ArgumentNullThrowHelper.ThrowIfNull(code);
+        ArgumentNullThrowHelper.ThrowIfNullOrEmpty(code);
 
         var mergedCodes = await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken).ConfigureAwait(false) ?? "";
         var splitCodes = mergedCodes.Split(';');
diff --git a/src/Identity/Identity.slnf b/src/Identity/Identity.slnf
index c04a7e9af558..3741c16a8578 100644
--- a/src/Identity/Identity.slnf
+++ b/src/Identity/Identity.slnf
@@ -1,17 +1,23 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
+      "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
       "src\\Components\\Components\\src\\Microsoft.AspNetCore.Components.csproj",
+      "src\\Components\\Endpoints\\src\\Microsoft.AspNetCore.Components.Endpoints.csproj",
+      "src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
       "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
       "src\\DataProtection\\Cryptography.KeyDerivation\\src\\Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj",
       "src\\DataProtection\\DataProtection\\src\\Microsoft.AspNetCore.DataProtection.csproj",
       "src\\DataProtection\\Extensions\\src\\Microsoft.AspNetCore.DataProtection.Extensions.csproj",
+      "src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj",
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\Features\\JsonPatch\\src\\Microsoft.AspNetCore.JsonPatch.csproj",
+      "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
+      "src\\FileProviders\\Manifest.MSBuildTask\\src\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj",
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
       "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
@@ -21,7 +27,7 @@
       "src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
       "src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
       "src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
-      "src\\Http\\Http.Extensions\\gen\\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj",
+      "src\\Http\\Http.Extensions\\gen\\Microsoft.AspNetCore.Http.RequestDelegateGenerator\\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj",
       "src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
       "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
       "src\\Http\\Http.Results\\src\\Microsoft.AspNetCore.Http.Results.csproj",
@@ -41,18 +47,24 @@
       "src\\Identity\\samples\\IdentitySample.ApiEndpoints\\IdentitySample.ApiEndpoints.csproj",
       "src\\Identity\\samples\\IdentitySample.DefaultUI\\IdentitySample.DefaultUI.csproj",
       "src\\Identity\\samples\\IdentitySample.Mvc\\IdentitySample.Mvc.csproj",
+      "src\\Identity\\samples\\IdentitySample.PasskeyConformance\\IdentitySample.PasskeyConformance.csproj",
+      "src\\Identity\\samples\\IdentitySample.PasskeyUI\\IdentitySample.PasskeyUI.csproj",
       "src\\Identity\\test\\Identity.FunctionalTests\\Microsoft.AspNetCore.Identity.FunctionalTests.csproj",
       "src\\Identity\\test\\Identity.Test\\Microsoft.AspNetCore.Identity.Test.csproj",
       "src\\Identity\\test\\InMemory.Test\\Microsoft.AspNetCore.Identity.InMemory.Test.csproj",
       "src\\Identity\\testassets\\Identity.DefaultUI.WebSite\\Identity.DefaultUI.WebSite.csproj",
+      "src\\JSInterop\\Microsoft.JSInterop\\src\\Microsoft.JSInterop.csproj",
       "src\\Localization\\Abstractions\\src\\Microsoft.Extensions.Localization.Abstractions.csproj",
+      "src\\Localization\\Localization\\src\\Microsoft.Extensions.Localization.csproj",
       "src\\Middleware\\CORS\\src\\Microsoft.AspNetCore.Cors.csproj",
       "src\\Middleware\\Diagnostics.Abstractions\\src\\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj",
       "src\\Middleware\\Diagnostics.EntityFrameworkCore\\src\\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj",
       "src\\Middleware\\Diagnostics\\src\\Microsoft.AspNetCore.Diagnostics.csproj",
+      "src\\Middleware\\HostFiltering\\src\\Microsoft.AspNetCore.HostFiltering.csproj",
       "src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
       "src\\Middleware\\HttpsPolicy\\src\\Microsoft.AspNetCore.HttpsPolicy.csproj",
       "src\\Middleware\\Localization\\src\\Microsoft.AspNetCore.Localization.csproj",
+      "src\\Middleware\\OutputCaching\\src\\Microsoft.AspNetCore.OutputCaching.csproj",
       "src\\Middleware\\ResponseCaching.Abstractions\\src\\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj",
       "src\\Middleware\\Rewrite\\src\\Microsoft.AspNetCore.Rewrite.csproj",
       "src\\Middleware\\StaticFiles\\src\\Microsoft.AspNetCore.StaticFiles.csproj",
@@ -62,6 +74,7 @@
       "src\\Mvc\\Mvc.Core\\src\\Microsoft.AspNetCore.Mvc.Core.csproj",
       "src\\Mvc\\Mvc.Cors\\src\\Microsoft.AspNetCore.Mvc.Cors.csproj",
       "src\\Mvc\\Mvc.DataAnnotations\\src\\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj",
+      "src\\Mvc\\Mvc.Formatters.Json\\src\\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj",
       "src\\Mvc\\Mvc.Localization\\src\\Microsoft.AspNetCore.Mvc.Localization.csproj",
       "src\\Mvc\\Mvc.NewtonsoftJson\\src\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj",
       "src\\Mvc\\Mvc.RazorPages\\src\\Microsoft.AspNetCore.Mvc.RazorPages.csproj",
@@ -74,25 +87,33 @@
       "src\\Razor\\Razor.Runtime\\src\\Microsoft.AspNetCore.Razor.Runtime.csproj",
       "src\\Razor\\Razor\\src\\Microsoft.AspNetCore.Razor.csproj",
       "src\\Security\\Authentication\\BearerToken\\src\\Microsoft.AspNetCore.Authentication.BearerToken.csproj",
+      "src\\Security\\Authentication\\Certificate\\src\\Microsoft.AspNetCore.Authentication.Certificate.csproj",
       "src\\Security\\Authentication\\Cookies\\src\\Microsoft.AspNetCore.Authentication.Cookies.csproj",
       "src\\Security\\Authentication\\Core\\src\\Microsoft.AspNetCore.Authentication.csproj",
       "src\\Security\\Authentication\\Facebook\\src\\Microsoft.AspNetCore.Authentication.Facebook.csproj",
       "src\\Security\\Authentication\\Google\\src\\Microsoft.AspNetCore.Authentication.Google.csproj",
       "src\\Security\\Authentication\\JwtBearer\\src\\Microsoft.AspNetCore.Authentication.JwtBearer.csproj",
+      "src\\Security\\Authentication\\MicrosoftAccount\\src\\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj",
       "src\\Security\\Authentication\\OAuth\\src\\Microsoft.AspNetCore.Authentication.OAuth.csproj",
+      "src\\Security\\Authentication\\OpenIdConnect\\src\\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj",
       "src\\Security\\Authentication\\Twitter\\src\\Microsoft.AspNetCore.Authentication.Twitter.csproj",
+      "src\\Security\\Authentication\\WsFederation\\src\\Microsoft.AspNetCore.Authentication.WsFederation.csproj",
       "src\\Security\\Authentication\\test\\Microsoft.AspNetCore.Authentication.Test.csproj",
       "src\\Security\\Authorization\\Core\\src\\Microsoft.AspNetCore.Authorization.csproj",
       "src\\Security\\Authorization\\Policy\\src\\Microsoft.AspNetCore.Authorization.Policy.csproj",
       "src\\Security\\CookiePolicy\\src\\Microsoft.AspNetCore.CookiePolicy.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
+      "src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj",
       "src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj",
+      "src\\Servers\\IIS\\IIS\\src\\Microsoft.AspNetCore.Server.IIS.csproj",
       "src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
       "src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
       "src\\Servers\\Kestrel\\Transport.NamedPipes\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj",
       "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
+      "src\\StaticAssets\\src\\Microsoft.AspNetCore.StaticAssets.csproj",
       "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
+      "src\\Validation\\src\\Microsoft.Extensions.Validation.csproj",
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
diff --git a/src/Identity/IdentityNoDeps.slnf b/src/Identity/IdentityNoDeps.slnf
index 6e943d87549b..91b29612267c 100644
--- a/src/Identity/IdentityNoDeps.slnf
+++ b/src/Identity/IdentityNoDeps.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Identity\\Core\\src\\Microsoft.AspNetCore.Identity.csproj",
       "src\\Identity\\EntityFrameworkCore\\src\\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj",
diff --git a/src/Identity/Specification.Tests/src/IdentityResultAssert.cs b/src/Identity/Specification.Tests/src/IdentityResultAssert.cs
index f93b9d483a2a..81b9b20e3480 100644
--- a/src/Identity/Specification.Tests/src/IdentityResultAssert.cs
+++ b/src/Identity/Specification.Tests/src/IdentityResultAssert.cs
@@ -69,7 +69,7 @@ public static void VerifyLogMessage(ILogger logger, string expectedLog)
         }
         else
         {
-            Assert.False(true, "No logger registered");
+            Assert.Fail("No logger registered");
         }
     }
 }
diff --git a/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs
index d426f18aee1e..7f587d5f87ee 100644
--- a/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs
+++ b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs
@@ -48,6 +48,7 @@ protected override void SetupIdentityServices(IServiceCollection services, objec
             options.Password.RequireNonAlphanumeric = false;
             options.Password.RequireUppercase = false;
             options.User.AllowedUserNameCharacters = null;
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
         }).AddDefaultTokenProviders();
         AddUserStore(services, context);
         AddRoleStore(services, context);
@@ -236,7 +237,7 @@ public async Task CanAddRemoveRoleClaim()
         var roleSafe = CreateTestRole("ClaimsAdd");
         IdentityResultAssert.IsSuccess(await manager.CreateAsync(role));
         IdentityResultAssert.IsSuccess(await manager.CreateAsync(roleSafe));
-        Claim[] claims = { new Claim("c", "v"), new Claim("c2", "v2"), new Claim("c2", "v3") };
+        Claim[] claims = [new Claim("c", "v"), new Claim("c2", "v2"), new Claim("c2", "v3")];
         foreach (Claim c in claims)
         {
             IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(role, c));
@@ -254,12 +255,12 @@ public async Task CanAddRemoveRoleClaim()
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(role, claims[1]));
         roleClaims = await manager.GetClaimsAsync(role);
         safeRoleClaims = await manager.GetClaimsAsync(roleSafe);
-        Assert.Equal(1, roleClaims.Count);
+        Assert.Single(roleClaims);
         Assert.Equal(3, safeRoleClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(role, claims[2]));
         roleClaims = await manager.GetClaimsAsync(role);
         safeRoleClaims = await manager.GetClaimsAsync(roleSafe);
-        Assert.Equal(0, roleClaims.Count);
+        Assert.Empty(roleClaims);
         Assert.Equal(3, safeRoleClaims.Count);
     }
 
@@ -366,9 +367,9 @@ public async Task CanAddUsersToRole()
         var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true);
         IdentityResultAssert.IsSuccess(await roleManager.CreateAsync(role));
         TUser[] users =
-        {
+        [
                 CreateTestUser("1"),CreateTestUser("2"),CreateTestUser("3"),CreateTestUser("4"),
-            };
+            ];
         foreach (var u in users)
         {
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(u));
@@ -592,7 +593,7 @@ public async Task CanGetUsersInRole()
             Assert.Equal(3, (await manager.GetUsersInRoleAsync(await roleManager.GetRoleNameAsync(role))).Count);
         }
 
-        Assert.Equal(0, (await manager.GetUsersInRoleAsync("123456")).Count);
+        Assert.Empty((await manager.GetUsersInRoleAsync("123456")));
     }
 
     private List<TRole> GenerateRoles(string namePrefix, int count)
@@ -604,4 +605,219 @@ private List<TRole> GenerateRoles(string namePrefix, int count)
         }
         return roles;
     }
+
+    /// <summary>
+    /// Test.
+    /// </summary>
+    /// <returns>Task</returns>
+    [Fact]
+    public async Task CanAddAndRetrievePasskey()
+    {
+        var context = CreateTestContext();
+        var manager = CreateManager(context);
+        Assert.True(manager.SupportsUserPasskey);
+        var user = CreateTestUser();
+        IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
+
+        var credentialId = Guid.NewGuid().ToByteArray();
+        var passkey = new UserPasskeyInfo(
+            credentialId,
+            publicKey: [1, 2, 3, 4],
+            DateTimeOffset.UtcNow,
+            signCount: 0,
+            transports: ["usb"],
+            isUserVerified: false,
+            isBackupEligible: true,
+            isBackedUp: false,
+            attestationObject: [5, 6, 7],
+            clientDataJson: [8, 9])
+        {
+            Name = "InitialName"
+        };
+
+        IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey));
+
+        var fetchedPasskey = await manager.GetPasskeyAsync(user, credentialId);
+        AssertPasskeysEqual(passkey, fetchedPasskey);
+
+        var fetchedPasskeys = await manager.GetPasskeysAsync(user);
+        Assert.Single(fetchedPasskeys);
+        AssertPasskeysEqual(passkey, fetchedPasskeys[0]);
+    }
+
+    /// <summary>
+    /// Test.
+    /// </summary>
+    /// <returns>Task</returns>
+    [Fact]
+    public async Task CanRemovePasskey()
+    {
+        var context = CreateTestContext();
+        var manager = CreateManager(context);
+        Assert.True(manager.SupportsUserPasskey);
+        var user = CreateTestUser();
+        IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
+
+        var passkey = new UserPasskeyInfo(
+            credentialId: Guid.NewGuid().ToByteArray(),
+            publicKey: [1],
+            DateTimeOffset.UtcNow,
+            signCount: 0,
+            transports: null,
+            isUserVerified: false,
+            isBackupEligible: false,
+            isBackedUp: false,
+            attestationObject: [2],
+            clientDataJson: [3])
+        {
+            Name = "ToRemove"
+        };
+
+        IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey));
+        Assert.Single(await manager.GetPasskeysAsync(user));
+        IdentityResultAssert.IsSuccess(await manager.RemovePasskeyAsync(user, passkey.CredentialId));
+        Assert.Empty(await manager.GetPasskeysAsync(user));
+
+        // Second removal should not throw or change anything
+        IdentityResultAssert.IsSuccess(await manager.RemovePasskeyAsync(user, passkey.CredentialId));
+        Assert.Empty(await manager.GetPasskeysAsync(user));
+    }
+
+    /// <summary>
+    /// Test.
+    /// </summary>
+    /// <returns>Task</returns>
+    [Fact]
+    public async Task CanAddMultiplePasskeys()
+    {
+        var context = CreateTestContext();
+        var manager = CreateManager(context);
+        Assert.True(manager.SupportsUserPasskey);
+        var user = CreateTestUser();
+        IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
+
+        var passkey1 = new UserPasskeyInfo(
+            credentialId: Guid.NewGuid().ToByteArray(),
+            publicKey: [1],
+            DateTimeOffset.UtcNow,
+            signCount: 0,
+            transports: ["usb"],
+            isUserVerified: false,
+            isBackupEligible: false,
+            isBackedUp: false,
+            attestationObject: [10],
+            clientDataJson: [11])
+        {
+            Name = "One"
+        };
+        var passkey2 = new UserPasskeyInfo(
+            credentialId: Guid.NewGuid().ToByteArray(),
+            publicKey: [2],
+            DateTimeOffset.UtcNow,
+            signCount: 5,
+            transports: ["nfc"],
+            isUserVerified: true,
+            isBackupEligible: false,
+            isBackedUp: false,
+            attestationObject: [12],
+            clientDataJson: [13])
+        {
+            Name = "Two"
+        };
+
+        IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey1));
+        IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey2));
+
+        var all = await manager.GetPasskeysAsync(user);
+        Assert.Equal(2, all.Count);
+        Assert.Contains(all, p => p.Name == "One");
+        Assert.Contains(all, p => p.Name == "Two");
+
+        var fetchedPasskey1 = await manager.GetPasskeyAsync(user, passkey1.CredentialId);
+        var fetchedPasskey2 = await manager.GetPasskeyAsync(user, passkey2.CredentialId);
+        AssertPasskeysEqual(passkey1, fetchedPasskey1);
+        AssertPasskeysEqual(passkey2, fetchedPasskey2);
+    }
+
+    /// <summary>
+    /// Test.
+    /// </summary>
+    /// <returns>Task</returns>
+    [Fact]
+    public async Task UpdatingPasskeyChangesOnlyMutableFields()
+    {
+        var context = CreateTestContext();
+        var manager = CreateManager(context);
+        var user = CreateTestUser();
+        IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
+
+        var original = new UserPasskeyInfo(
+            credentialId: Guid.NewGuid().ToByteArray(),
+            publicKey: [9, 9],
+            createdAt: DateTimeOffset.UtcNow,
+            signCount: 1,
+            transports: ["usb", "nfc"],
+            isUserVerified: false,
+            isBackupEligible: true,
+            isBackedUp: false,
+            attestationObject: [5],
+            clientDataJson: [6])
+        {
+            Name = "ImmutableTest"
+        };
+        IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, original));
+
+        // Attempt to modify both mutable and immutable fields
+        var updated = new UserPasskeyInfo(
+            credentialId: original.CredentialId,
+            publicKey: [0xFF, 0xFF],
+            createdAt: original.CreatedAt.AddMinutes(5),
+            signCount: 3,
+            transports: ["ble"],
+            isUserVerified: true,
+            isBackupEligible: false,
+            isBackedUp: true,
+            attestationObject: [7],
+            clientDataJson: [8])
+        {
+            Name = "Changed"
+        };
+
+        var expected = new UserPasskeyInfo(
+            credentialId: original.CredentialId,
+            publicKey: original.PublicKey,
+            createdAt: original.CreatedAt,
+            signCount: updated.SignCount,
+            transports: original.Transports,
+            isUserVerified: updated.IsUserVerified,
+            isBackupEligible: original.IsBackupEligible,
+            isBackedUp: updated.IsBackedUp,
+            attestationObject: original.AttestationObject,
+            clientDataJson: original.ClientDataJson)
+        {
+            Name = updated.Name,
+        };
+
+        IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, updated));
+
+        var stored = await manager.GetPasskeyAsync(user, original.CredentialId);
+        AssertPasskeysEqual(expected, stored);
+    }
+
+    private static void AssertPasskeysEqual(UserPasskeyInfo expected, UserPasskeyInfo actual)
+    {
+        Assert.NotNull(expected);
+        Assert.NotNull(actual);
+
+        Assert.Equal(expected.Name, actual.Name);
+        Assert.Equal(expected.SignCount, actual.SignCount);
+        Assert.Equal(expected.IsBackedUp, actual.IsBackedUp);
+        Assert.Equal(expected.IsUserVerified, actual.IsUserVerified);
+        Assert.Equal(expected.PublicKey, actual.PublicKey);
+        Assert.Equal(expected.CreatedAt, actual.CreatedAt);
+        Assert.Equal(expected.IsBackupEligible, actual.IsBackupEligible);
+        Assert.Equal(expected.AttestationObject, actual.AttestationObject);
+        Assert.Equal(expected.ClientDataJson, actual.ClientDataJson);
+        Assert.Equal(expected.Transports, actual.Transports);
+    }
 }
diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
index 4031bf5f2ba9..5d58387bdfa7 100644
--- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
+++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
@@ -61,6 +61,7 @@ protected virtual IdentityBuilder SetupBuilder(IServiceCollection services, obje
             options.Password.RequireNonAlphanumeric = false;
             options.Password.RequireUppercase = false;
             options.User.AllowedUserNameCharacters = null;
+            options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
         }).AddDefaultTokenProviders();
         AddUserStore(services, context);
         services.AddLogging();
@@ -719,10 +720,10 @@ public async Task CanAddRemoveUserClaim()
         Assert.Equal(2, userClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[1]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[2]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(0, userClaims.Count);
+        Assert.Empty(userClaims);
     }
 
     /// <summary>
@@ -750,10 +751,10 @@ public async Task RemoveClaimOnlyAffectsUser()
         Assert.Equal(2, userClaims.Count);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[1]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         IdentityResultAssert.IsSuccess(await manager.RemoveClaimAsync(user, claims[2]));
         userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(0, userClaims.Count);
+        Assert.Empty(userClaims);
         var userClaims2 = await manager.GetClaimsAsync(user2);
         Assert.Equal(3, userClaims2.Count);
     }
@@ -770,12 +771,12 @@ public async Task CanReplaceUserClaim()
         IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
         IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(user, new Claim("c", "a")));
         var userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         Claim claim = new Claim("c", "b");
         Claim oldClaim = userClaims.Count == 0 ? null : userClaims[0];
         IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
         var newUserClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, newUserClaims.Count);
+        Assert.Single(newUserClaims);
         Claim newClaim = newUserClaims.Count == 0 ? null : newUserClaims[0];
         Assert.Equal(claim.Type, newClaim.Type);
         Assert.Equal(claim.Value, newClaim.Value);
@@ -796,19 +797,19 @@ public async Task ReplaceUserClaimOnlyAffectsUser()
         IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(user, new Claim("c", "a")));
         IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(user2, new Claim("c", "a")));
         var userClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims.Count);
+        Assert.Single(userClaims);
         var userClaims2 = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, userClaims2.Count);
+        Assert.Single(userClaims2);
         Claim claim = new Claim("c", "b");
         Claim oldClaim = userClaims.Count == 0 ? null : userClaims[0];
         IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
         var newUserClaims = await manager.GetClaimsAsync(user);
-        Assert.Equal(1, newUserClaims.Count);
+        Assert.Single(newUserClaims);
         Claim newClaim = newUserClaims.Count == 0 ? null : newUserClaims[0];
         Assert.Equal(claim.Type, newClaim.Type);
         Assert.Equal(claim.Value, newClaim.Value);
         userClaims2 = await manager.GetClaimsAsync(user2);
-        Assert.Equal(1, userClaims2.Count);
+        Assert.Single(userClaims2);
         Claim oldClaim2 = userClaims2.Count == 0 ? null : userClaims2[0];
         Assert.Equal("c", oldClaim2.Type);
         Assert.Equal("a", oldClaim2.Value);
@@ -1930,7 +1931,7 @@ public async Task CanGetUsersWithClaims()
 
         Assert.Equal(3, (await manager.GetUsersForClaimAsync(new Claim("foo", "bar"))).Count);
 
-        Assert.Equal(0, (await manager.GetUsersForClaimAsync(new Claim("123", "456"))).Count);
+        Assert.Empty((await manager.GetUsersForClaimAsync(new Claim("123", "456"))));
     }
 
     /// <summary>
diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
index a43b8e998eec..d36fe09d60c4 100644
--- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
@@ -90,11 +90,27 @@
         <RelativePath>%(RecursiveDir)%(FileName)%(Extension)</RelativePath>
       </V5AssetsCandidates>
     </ItemGroup>
-    
-    <DefineStaticWebAssets Condition="'@(V4AssetsCandidates->Count())' != '0'" CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V4" BasePath="$(StaticWebAssetBasePath)">
+
+    <DefineStaticWebAssets
+      Condition="'@(V4AssetsCandidates->Count())' != '0'"
+      CandidateAssets="@(V4AssetsCandidates)" SourceId="$(PackageId)"
+      SourceType="Package"
+      AssetKind="All"
+      ContentRoot="assets/V4"
+      BasePath="$(StaticWebAssetBasePath)"
+    >
       <Output TaskParameter="Assets" ItemName="V4Assets" />
     </DefineStaticWebAssets>
-    <DefineStaticWebAssets Condition="'@(V5AssetsCandidates->Count())' != '0'" CandidateAssets="@(V5AssetsCandidates)" SourceId="$(PackageId)" SourceType="Discovered" AssetKind="All" ContentRoot="assets/V5" BasePath="$(StaticWebAssetBasePath)">
+
+    <DefineStaticWebAssets
+      Condition="'@(V5AssetsCandidates->Count())' != '0'"
+      CandidateAssets="@(V5AssetsCandidates)"
+      SourceId="$(PackageId)"
+      SourceType="Package"
+      AssetKind="All"
+      ContentRoot="assets/V5"
+      BasePath="$(StaticWebAssetBasePath)"
+    >
       <Output TaskParameter="Assets" ItemName="V5Assets" />
     </DefineStaticWebAssets>
 
@@ -106,7 +122,7 @@
     >
       <Output TaskParameter="Endpoints" ItemName="V4AssetEndpoints" />
     </DefineStaticWebAssetEndpoints>
-    
+
     <DefineStaticWebAssetEndpoints
       Condition="'@(V5Assets)' != ''"
       CandidateAssets="@(V5Assets)"
@@ -116,23 +132,34 @@
       <Output TaskParameter="Endpoints" ItemName="V5AssetEndpoints" />
     </DefineStaticWebAssetEndpoints>
 
-    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
-    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(V5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
+    <ItemGroup>
+      <FinalV4Assets Include="@(V4Assets)">
+        <SourceType>Discovered</SourceType>
+      </FinalV4Assets>
+      <FinalV5Assets Include="@(V5Assets)">
+        <SourceType>Discovered</SourceType>
+      </FinalV5Assets>
+    </ItemGroup>
+
+    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV4Assets)" PackagePathPrefix="staticwebassets/V4" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.targets" />
+    <GenerateStaticWebAssetsPropsFile StaticWebAssets="@(FinalV5Assets)" PackagePathPrefix="staticwebassets/V5" TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.targets" />
 
     <GenerateStaticWebAssetEndpointsPropsFile
       StaticWebAssets="@(V4Assets)"
+      PackagePathPrefix="staticwebassets/V4"
       StaticWebAssetEndpoints="@(V4AssetEndpoints)"
       TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V4.endpoints.targets" />
 
     <GenerateStaticWebAssetEndpointsPropsFile
       StaticWebAssets="@(V5Assets)"
+      PackagePathPrefix="staticwebassets/V5"
       StaticWebAssetEndpoints="@(V5AssetEndpoints)"
       TargetPropsFilePath="$(IntermediateOutputPath)IdentityUI.V5.endpoints.targets" />
 
-    <ComputeStaticWebAssetsTargetPaths Assets="@(V4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
+    <ComputeStaticWebAssetsTargetPaths Assets="@(FinalV4Assets)" PathPrefix="staticwebassets/V4" AdjustPathsForPack="true">
       <Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
     </ComputeStaticWebAssetsTargetPaths>
-    <ComputeStaticWebAssetsTargetPaths Assets="@(V5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">
+    <ComputeStaticWebAssetsTargetPaths Assets="@(FinalV5Assets)" PathPrefix="staticwebassets/V5" AdjustPathsForPack="true">
       <Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
     </ComputeStaticWebAssetsTargetPaths>
 
diff --git a/src/Identity/UI/src/PACKAGE.md b/src/Identity/UI/src/PACKAGE.md
new file mode 100644
index 000000000000..fbdf2e91e1fc
--- /dev/null
+++ b/src/Identity/UI/src/PACKAGE.md
@@ -0,0 +1,43 @@
+## About
+
+`Microsoft.AspNetCore.Identity.UI` provides the default Razor Pages UI for the ASP.NET Core Identity framework.
+
+## Key Features
+
+* User registration and login functionality
+* Account management
+* Two-factor authentication
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Identity.UI`, follow these steps:
+
+### Installation
+
+```sh
+dotnet add package Microsoft.AspNetCore.Identity.UI
+```
+
+### Configuration
+
+Add the following code to the `Program.cs` of your ASP.NET Core app:
+
+```csharp
+builder.Services.AddDefaultIdentity<IdentityUser>()
+    .AddEntityFrameworkStores<ApplicationDbContext>();
+
+var app = builder.Build();
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+app.MapRazorPages();
+```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official ASP.NET Core Identity documentation](https://docs.microsoft.com/aspnet/core/security/authentication/identity).
+
+## Feedback & Contributing
+
+`Microsoft.AspNetCore.Identity.UI` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.js b/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.js
index e54cd1dc48f7..a0c72625666d 100644
--- a/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.js
+++ b/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.js
@@ -1,9 +1,9 @@
 /*!
- * jQuery Validation Plugin v1.21.0
+ * jQuery Validation Plugin v1.20.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2024 Jörn Zaefferer
+ * Copyright (c) 2023 Jörn Zaefferer
  * Released under the MIT license
  */
 (function( factory ) {
@@ -293,7 +293,6 @@ $.extend( $.validator, {
 		onsubmit: true,
 		ignore: ":hidden",
 		ignoreTitle: false,
-		customElements: [],
 		onfocusin: function( element ) {
 			this.lastActive = element;
 
@@ -441,17 +440,17 @@ $.extend( $.validator, {
 					settings[ eventType ].call( validator, this, event );
 				}
 			}
-			var focusListeners = [ ":text", "[type='password']", "[type='file']", "select", "textarea", "[type='number']", "[type='search']",
-								"[type='tel']", "[type='url']", "[type='email']", "[type='datetime']", "[type='date']", "[type='month']",
-								"[type='week']", "[type='time']", "[type='datetime-local']", "[type='range']", "[type='color']",
-								"[type='radio']", "[type='checkbox']", "[contenteditable]", "[type='button']" ];
-			var clickListeners = [ "select", "option", "[type='radio']", "[type='checkbox']" ];
+
 			$( this.currentForm )
-				.on( "focusin.validate focusout.validate keyup.validate", focusListeners.concat( this.settings.customElements ).join( ", " ), delegate )
+				.on( "focusin.validate focusout.validate keyup.validate",
+					":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
+					"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
+					"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
+					"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
 
 				// Support: Chrome, oldIE
 				// "select" is provided as event.target when clicking a option
-				.on( "click.validate", clickListeners.concat( this.settings.customElements ).join( ", " ), delegate );
+				.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
 
 			if ( this.settings.invalidHandler ) {
 				$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
@@ -648,12 +647,11 @@ $.extend( $.validator, {
 
 		elements: function() {
 			var validator = this,
-				rulesCache = {},
-				selectors = [ "input", "select", "textarea", "[contenteditable]" ];
+				rulesCache = {};
 
 			// Select all valid inputs inside the form (no submit or reset buttons)
 			return $( this.currentForm )
-			.find( selectors.concat( this.settings.customElements ).join( ", " ) )
+			.find( "input, select, textarea, [contenteditable]" )
 			.not( ":submit, :reset, :image, :disabled" )
 			.not( this.settings.ignore )
 			.filter( function() {
@@ -1503,7 +1501,7 @@ $.extend( $.validator, {
 
 		// https://jqueryvalidation.org/number-method/
 		number: function( value, element ) {
-			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test( value );
+			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
 		},
 
 		// https://jqueryvalidation.org/digits-method/
@@ -1614,12 +1612,11 @@ $.extend( $.validator, {
 
 			param = typeof param === "string" && { url: param } || param;
 			optionDataString = $.param( $.extend( { data: value }, param.data ) );
-			if ( previous.valid !== null && previous.old === optionDataString ) {
+			if ( previous.old === optionDataString ) {
 				return previous.valid;
 			}
 
 			previous.old = optionDataString;
-			previous.valid = null;
 			validator = this;
 			this.startRequest( element );
 			data = {};
diff --git a/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.min.js b/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.min.js
index 14340cc9c9aa..44d3a43705a2 100644
--- a/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.min.js
+++ b/src/Identity/UI/src/assets/V5/lib/jquery-validation/dist/jquery.validate.min.js
@@ -1,4 +1,4 @@
-/*! jQuery Validation Plugin - v1.21.0 - 7/17/2024
+/*! jQuery Validation Plugin - v1.20.0 - 10/10/2023
  * https://jqueryvalidation.org/
- * Copyright (c) 2024 Jörn Zaefferer; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,customElements:[],onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)});var f=[":text","[type='password']","[type='file']","select","textarea","[type='number']","[type='search']","[type='tel']","[type='url']","[type='email']","[type='datetime']","[type='date']","[type='month']","[type='week']","[type='time']","[type='datetime-local']","[type='range']","[type='color']","[type='radio']","[type='checkbox']","[contenteditable]","[type='button']"],g=["select","option","[type='radio']","[type='checkbox']"];a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",f.concat(this.settings.customElements).join(", "),b).on("click.validate",g.concat(this.settings.customElements).join(", "),b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={},d=["input","select","textarea","[contenteditable]"];return a(this.currentForm).find(d.concat(this.settings.customElements).join(", ")).not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),null!==i.valid&&i.old===h?i.valid:(i.old=h,i.valid=null,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
+ * Copyright (c) 2023 Jörn Zaefferer; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], [type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox'], [contenteditable], [type='button']",b).on("click.validate","select, option, [type='radio'], [type='checkbox']",b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea, [contenteditable]").not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
diff --git a/src/Identity/samples/IdentitySample.Mvc/Program.cs b/src/Identity/samples/IdentitySample.Mvc/Program.cs
index a8c1e8cb5661..1cfe3c78f5dc 100644
--- a/src/Identity/samples/IdentitySample.Mvc/Program.cs
+++ b/src/Identity/samples/IdentitySample.Mvc/Program.cs
@@ -1,6 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+
 namespace IdentitySample;
 
 public static class Program
@@ -12,10 +16,14 @@ public static void Main(string[] args)
         host.Run();
     }
 
-    public static IWebHostBuilder CreateHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseIISIntegration()
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseIISIntegration()
+                    .UseStartup<Startup>();
+            });
 }
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/FailedResponse.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/FailedResponse.cs
new file mode 100644
index 000000000000..f55774624040
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/FailedResponse.cs
@@ -0,0 +1,6 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal sealed class FailedResponse(string errorMessage) : ServerResponse(status: "failed", errorMessage);
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/OkResponse.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/OkResponse.cs
new file mode 100644
index 000000000000..9ba9a1d5e8b4
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/OkResponse.cs
@@ -0,0 +1,6 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal class OkResponse() : ServerResponse(status: "ok");
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/PasskeyAssertionState.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/PasskeyAssertionState.cs
new file mode 100644
index 000000000000..a0ebcd439240
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/PasskeyAssertionState.cs
@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal sealed class PasskeyAssertionState
+{
+    public required ServerPublicKeyCredentialGetOptionsRequest Request { get; init; }
+    public required string? AssertionState { get; init; }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/PasskeyAttestationState.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/PasskeyAttestationState.cs
new file mode 100644
index 000000000000..3c9d3f699712
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/PasskeyAttestationState.cs
@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal sealed class PasskeyAttestationState
+{
+    public required ServerPublicKeyCredentialCreationOptionsRequest Request { get; init; }
+    public required string? AttestationState { get; init; }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialCreationOptionsRequest.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialCreationOptionsRequest.cs
new file mode 100644
index 000000000000..ad4b541aaddb
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialCreationOptionsRequest.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal sealed class ServerPublicKeyCredentialCreationOptionsRequest(string username, string displayName)
+{
+    public string Username { get; } = username;
+    public string DisplayName { get; } = displayName;
+    public AuthenticatorSelectionCriteria? AuthenticatorSelection { get; set; }
+    public JsonElement? Extensions { get; set; }
+    public string? Attestation { get; set; } = "none";
+
+    internal sealed class AuthenticatorSelectionCriteria
+    {
+        public string? ResidentKey { get; set; }
+        public string? AuthenticatorAttachment { get; set; }
+        public string? UserVerification { get; set; }
+    }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialGetOptionsRequest.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialGetOptionsRequest.cs
new file mode 100644
index 000000000000..6fa8873ed441
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialGetOptionsRequest.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal sealed class ServerPublicKeyCredentialGetOptionsRequest(string username, string userVerification)
+{
+    public string Username { get; } = username;
+    public string UserVerification { get; } = userVerification;
+    public JsonElement? Extensions { get; set; }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialOptionsResponse.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialOptionsResponse.cs
new file mode 100644
index 000000000000..c2a3e70b245b
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerPublicKeyCredentialOptionsResponse.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+[JsonConverter(typeof(JsonConverter))]
+internal sealed class ServerPublicKeyCredentialOptionsResponse(string optionsJson) : OkResponse()
+{
+    public string OptionsJson { get; } = optionsJson;
+
+    public sealed class JsonConverter : JsonConverter<ServerPublicKeyCredentialOptionsResponse>
+    {
+        public override ServerPublicKeyCredentialOptionsResponse? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => throw new NotSupportedException();
+
+        public override void Write(Utf8JsonWriter writer, ServerPublicKeyCredentialOptionsResponse value, JsonSerializerOptions options)
+        {
+            var optionsObject = JsonNode.Parse(value.OptionsJson)?.AsObject()
+                ?? throw new JsonException("Could not parse the creation options JSON.");
+
+            writer.WriteStartObject();
+            writer.WriteString("status", value.Status);
+            writer.WriteString("errorMessage", value.ErrorMessage);
+            foreach (var (propertyName, propertyValue) in optionsObject)
+            {
+                writer.WritePropertyName(propertyName);
+                if (propertyValue is not null)
+                {
+                    propertyValue.WriteTo(writer);
+                }
+                else
+                {
+                    writer.WriteNullValue();
+                }
+            }
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerResponse.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerResponse.cs
new file mode 100644
index 000000000000..2446c5a1e414
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Data/ServerResponse.cs
@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace IdentitySample.PasskeyConformance.Data;
+
+internal abstract class ServerResponse(string status, string errorMessage = "")
+{
+    public string Status { get; } = status;
+    public string ErrorMessage { get; } = errorMessage;
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/IdentitySample.PasskeyConformance.csproj b/src/Identity/samples/IdentitySample.PasskeyConformance/IdentitySample.PasskeyConformance.csproj
new file mode 100644
index 000000000000..3e50af823bc5
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/IdentitySample.PasskeyConformance.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <Description>Passkey conformance testing for ASP.NET Core Identity</Description>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <IsShippingPackage>false</IsShippingPackage>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Tools" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(IdentityTestSharedSourceRoot)PocoModel\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/InMemoryUserStore.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/InMemoryUserStore.cs
new file mode 100644
index 000000000000..5f7fccdf9b4f
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/InMemoryUserStore.cs
@@ -0,0 +1,139 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.Test;
+
+namespace IdentitySample.PasskeyConformance;
+
+public sealed class InMemoryUserStore<TUser> :
+    IQueryableUserStore<TUser>,
+    IUserPasskeyStore<TUser>
+    where TUser : PocoUser
+{
+    private readonly Dictionary<string, TUser> _users = [];
+
+    public IQueryable<TUser> Users => _users.Values.AsQueryable();
+
+    public Task<IdentityResult> CreateAsync(TUser user, CancellationToken cancellationToken)
+    {
+        _users[user.Id] = user;
+        return Task.FromResult(IdentityResult.Success);
+    }
+
+    public Task<IdentityResult> DeleteAsync(TUser user, CancellationToken cancellationToken)
+    {
+        if (!_users.Remove(user.Id))
+        {
+            throw new InvalidOperationException($"Unknown user with ID '{user.Id}'.");
+        }
+        return Task.FromResult(IdentityResult.Success);
+    }
+
+    public Task<TUser?> FindByIdAsync(string userId, CancellationToken cancellationToken)
+        => Task.FromResult(_users.TryGetValue(userId, out var result) ? result : null);
+
+    public Task<TUser?> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken)
+        => Task.FromResult(_users.Values.FirstOrDefault(u => string.Equals(u.NormalizedUserName, normalizedUserName, StringComparison.Ordinal)));
+
+    public Task<TUser?> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+        => Task.FromResult(_users.Values.FirstOrDefault(u => u.Passkeys.Any(p => p.CredentialId.SequenceEqual(credentialId))));
+
+    public Task<UserPasskeyInfo?> FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+        => Task.FromResult(ToUserPasskeyInfo(user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(credentialId))));
+
+    public Task<string?> GetNormalizedUserNameAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult<string?>(user.NormalizedUserName);
+
+    public Task<string> GetUserIdAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult(user.Id);
+
+    public Task<string?> GetUserNameAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult<string?>(user.UserName);
+
+    public Task SetNormalizedUserNameAsync(TUser user, string? normalizedName, CancellationToken cancellationToken)
+    {
+        user.NormalizedUserName = normalizedName;
+        return Task.CompletedTask;
+    }
+
+    public Task SetUserNameAsync(TUser user, string? userName, CancellationToken cancellationToken)
+    {
+        user.UserName = userName;
+        return Task.CompletedTask;
+    }
+
+    public Task<IdentityResult> UpdateAsync(TUser user, CancellationToken cancellationToken)
+    {
+        _users[user.Id] = user;
+        return Task.FromResult(IdentityResult.Success);
+    }
+
+    public Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+    {
+        var passkeyEntity = user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(passkey.CredentialId));
+        if (passkeyEntity is null)
+        {
+            user.Passkeys.Add(ToPocoUserPasskey(user, passkey));
+        }
+        else
+        {
+            passkeyEntity.Name = passkey.Name;
+            passkeyEntity.SignCount = passkey.SignCount;
+            passkeyEntity.IsBackedUp = passkey.IsBackedUp;
+            passkeyEntity.IsUserVerified = passkey.IsUserVerified;
+        }
+        return Task.CompletedTask;
+    }
+
+    public Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult<IList<UserPasskeyInfo>>(user.Passkeys.Select(ToUserPasskeyInfo).ToList()!);
+
+    public Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        var passkey = user.Passkeys.SingleOrDefault(p => p.CredentialId.SequenceEqual(credentialId));
+        if (passkey is not null)
+        {
+            user.Passkeys.Remove(passkey);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    [return: NotNullIfNotNull(nameof(p))]
+    private static UserPasskeyInfo? ToUserPasskeyInfo(PocoUserPasskey<string>? p)
+        => p is null ? null : new(
+            p.CredentialId,
+            p.PublicKey,
+            p.CreatedAt,
+            p.SignCount,
+            p.Transports,
+            p.IsUserVerified,
+            p.IsBackupEligible,
+            p.IsBackedUp,
+            p.AttestationObject,
+            p.ClientDataJson);
+
+    [return: NotNullIfNotNull(nameof(p))]
+    private static PocoUserPasskey<string>? ToPocoUserPasskey(TUser user, UserPasskeyInfo? p)
+        => p is null ? null : new PocoUserPasskey<string>
+        {
+            UserId = user.Id,
+            CredentialId = p.CredentialId,
+            PublicKey = p.PublicKey,
+            Name = p.Name,
+            CreatedAt = p.CreatedAt,
+            Transports = p.Transports,
+            SignCount = p.SignCount,
+            IsUserVerified = p.IsUserVerified,
+            IsBackupEligible = p.IsBackupEligible,
+            IsBackedUp = p.IsBackedUp,
+            AttestationObject = p.AttestationObject,
+            ClientDataJson = p.ClientDataJson,
+        };
+
+    public void Dispose()
+    {
+    }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Program.cs b/src/Identity/samples/IdentitySample.PasskeyConformance/Program.cs
new file mode 100644
index 000000000000..f8a0e95eebd4
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Program.cs
@@ -0,0 +1,264 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text;
+using System.Text.Json;
+using IdentitySample.PasskeyConformance;
+using IdentitySample.PasskeyConformance.Data;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.Test;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddAuthentication(options =>
+    {
+        options.DefaultScheme = IdentityConstants.ApplicationScheme;
+        options.DefaultSignInScheme = IdentityConstants.ExternalScheme;
+    })
+    .AddIdentityCookies(builder =>
+    {
+        builder.TwoFactorUserIdCookie!.Configure(options =>
+        {
+            options.Cookie.SameSite = SameSiteMode.None;
+        });
+    });
+
+builder.Services.AddIdentityCore<PocoUser>()
+    .AddSignInManager();
+
+builder.Services.AddSingleton<IUserStore<PocoUser>, InMemoryUserStore<PocoUser>>();
+builder.Services.AddSingleton<IUserPasskeyStore<PocoUser>, InMemoryUserStore<PocoUser>>();
+
+// In a real app, you'd rely on the SignInManager to securely store passkey state in
+// an auth cookie, but we bypass the SignInManager for this sample so that we can
+// customize the passkey options on a per-request basis. This cookie is a simple
+// way for us to persist passkey attestation and assertion state across requests.
+var passkeyStateCookie = new CookieBuilder
+{
+    Name = "PasskeyConformance.PasskeyState",
+    HttpOnly = true,
+    SameSite = SameSiteMode.None,
+    SecurePolicy = CookieSecurePolicy.SameAsRequest,
+};
+
+var app = builder.Build();
+
+var attestationGroup = app.MapGroup("/attestation");
+
+attestationGroup.MapPost("/options", async (
+    [FromServices] UserManager<PocoUser> userManager,
+    [FromBody] ServerPublicKeyCredentialCreationOptionsRequest request,
+    HttpContext context) =>
+{
+    var passkeyOptions = GetPasskeyOptionsFromCreationRequest(request);
+    var userId = (await userManager.FindByNameAsync(request.Username) ?? new PocoUser()).Id;
+    var userEntity = new PasskeyUserEntity
+    {
+        Id = userId,
+        Name = request.Username,
+        DisplayName = request.DisplayName
+    };
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
+    var result = await passkeyHandler.MakeCreationOptionsAsync(userEntity, context);
+    var response = new ServerPublicKeyCredentialOptionsResponse(result.CreationOptionsJson);
+    var state = new PasskeyAttestationState
+    {
+        Request = request,
+        AttestationState = result.AttestationState,
+    };
+    var stateJson = JsonSerializer.Serialize(state, JsonSerializerOptions.Web);
+    context.Response.Cookies.Append(passkeyStateCookie.Name, stateJson, passkeyStateCookie.Build(context));
+    return Results.Ok(response);
+});
+
+attestationGroup.MapPost("/result", async (
+    [FromServices] IUserPasskeyStore<PocoUser> passkeyStore,
+    [FromServices] UserManager<PocoUser> userManager,
+    [FromBody] JsonElement result,
+    HttpContext context,
+    CancellationToken cancellationToken) =>
+{
+    var credentialJson = ServerPublicKeyCredentialToJson(result);
+
+    if (!context.Request.Cookies.TryGetValue(passkeyStateCookie.Name, out var stateJson))
+    {
+        return Results.BadRequest(new FailedResponse("There is no passkey attestation state present."));
+    }
+
+    var state = JsonSerializer.Deserialize<PasskeyAttestationState>(stateJson, JsonSerializerOptions.Web);
+    if (state is null)
+    {
+        return Results.BadRequest(new FailedResponse("The passkey attestation state is invalid or missing."));
+    }
+
+    var passkeyOptions = GetPasskeyOptionsFromCreationRequest(state.Request);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
+
+    var attestationResult = await passkeyHandler.PerformAttestationAsync(new()
+    {
+        HttpContext = context,
+        AttestationState = state.AttestationState,
+        CredentialJson = credentialJson,
+    });
+
+    if (!attestationResult.Succeeded)
+    {
+        return Results.BadRequest(new FailedResponse($"Attestation failed: {attestationResult.Failure.Message}"));
+    }
+
+    // Create the user if they don't exist yet.
+    var userEntity = attestationResult.UserEntity;
+    var user = await userManager.FindByIdAsync(userEntity.Id);
+    if (user is null)
+    {
+        user = new PocoUser(userName: userEntity.Name)
+        {
+            Id = userEntity.Id,
+        };
+        var createUserResult = await userManager.CreateAsync(user);
+        if (!createUserResult.Succeeded)
+        {
+            return Results.InternalServerError(new FailedResponse("Failed to create the user."));
+        }
+    }
+
+    await passkeyStore.AddOrUpdatePasskeyAsync(user, attestationResult.Passkey, cancellationToken).ConfigureAwait(false);
+    var updateResult = await userManager.UpdateAsync(user).ConfigureAwait(false);
+    if (!updateResult.Succeeded)
+    {
+        return Results.InternalServerError(new FailedResponse("Unable to update the user."));
+    }
+
+    return Results.Ok(new OkResponse());
+});
+
+var assertionGroup = app.MapGroup("/assertion");
+
+assertionGroup.MapPost("/options", async (
+    [FromServices] UserManager<PocoUser> userManager,
+    [FromBody] ServerPublicKeyCredentialGetOptionsRequest request,
+    HttpContext context) =>
+{
+    var user = await userManager.FindByNameAsync(request.Username);
+    if (user is null)
+    {
+        return Results.BadRequest($"User with username {request.Username} does not exist.");
+    }
+
+    var passkeyOptions = GetPasskeyOptionsFromGetRequest(request);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
+
+    var result = await passkeyHandler.MakeRequestOptionsAsync(user, context);
+    var response = new ServerPublicKeyCredentialOptionsResponse(result.RequestOptionsJson);
+    var state = new PasskeyAssertionState
+    {
+        Request = request,
+        AssertionState = result.AssertionState,
+    };
+    var stateJson = JsonSerializer.Serialize(state, JsonSerializerOptions.Web);
+    context.Response.Cookies.Append(passkeyStateCookie.Name, stateJson, passkeyStateCookie.Build(context));
+    return Results.Ok(response);
+});
+
+assertionGroup.MapPost("/result", async (
+    [FromServices] UserManager<PocoUser> userManager,
+    [FromBody] JsonElement result,
+    HttpContext context) =>
+{
+    var credentialJson = ServerPublicKeyCredentialToJson(result);
+
+    if (!context.Request.Cookies.TryGetValue(passkeyStateCookie.Name, out var stateJson))
+    {
+        return Results.BadRequest(new FailedResponse("There is no passkey assertion state present."));
+    }
+
+    var state = JsonSerializer.Deserialize<PasskeyAssertionState>(stateJson, JsonSerializerOptions.Web);
+    if (state is null)
+    {
+        return Results.BadRequest(new FailedResponse("The passkey assertion state is invalid or missing."));
+    }
+
+    var passkeyOptions = GetPasskeyOptionsFromGetRequest(state.Request);
+    var passkeyHandler = new PasskeyHandler<PocoUser>(userManager, passkeyOptions);
+
+    var assertionResult = await passkeyHandler.PerformAssertionAsync(new()
+    {
+        HttpContext = context,
+        CredentialJson = credentialJson,
+        AssertionState = state.AssertionState,
+    });
+    if (!assertionResult.Succeeded)
+    {
+        return Results.BadRequest(new FailedResponse($"Assertion failed: {assertionResult.Failure.Message}"));
+    }
+
+    await userManager.AddOrUpdatePasskeyAsync(assertionResult.User, assertionResult.Passkey);
+
+    return Results.Ok(new OkResponse());
+});
+
+app.UseHttpsRedirection();
+
+app.Run();
+
+static string ServerPublicKeyCredentialToJson(JsonElement serverPublicKeyCredential)
+{
+    // The response from the conformance testing tool comes in this format:
+    // https://github.com/fido-alliance/conformance-test-tools-resources/blob/main/docs/FIDO2/Server/Conformance-Test-API.md#serverpublickeycredential
+    // ...but we want it to be in this format:
+    // https://www.w3.org/TR/webauthn-3/#dictdef-registrationresponsejson
+    // This mainly entails renaming the 'getClientExtensionResults' property
+    using var stream = new MemoryStream();
+    using var writer = new Utf8JsonWriter(stream, new JsonWriterOptions()
+    {
+        Indented = true,
+    });
+    writer.WriteStartObject();
+    foreach (var property in serverPublicKeyCredential.EnumerateObject())
+    {
+        switch (property.Name)
+        {
+            case "getClientExtensionResults":
+                writer.WritePropertyName("clientExtensionResults");
+                break;
+            default:
+                writer.WritePropertyName(property.Name);
+                break;
+        }
+        property.Value.WriteTo(writer);
+    }
+    writer.WriteEndObject();
+    writer.Flush();
+    var resultBytes = stream.ToArray();
+    var resultJson = Encoding.UTF8.GetString(resultBytes);
+    return resultJson;
+}
+
+static ValueTask<bool> ValidateOriginAsync(PasskeyOriginValidationContext context)
+{
+    if (!Uri.TryCreate(context.Origin, UriKind.Absolute, out var uri))
+    {
+        return ValueTask.FromResult(false);
+    }
+
+    return ValueTask.FromResult(uri.Host == "localhost" && uri.Port == 7020);
+}
+
+static IOptions<IdentityPasskeyOptions> GetPasskeyOptionsFromCreationRequest(ServerPublicKeyCredentialCreationOptionsRequest request)
+    => Options.Create(new IdentityPasskeyOptions()
+    {
+        ValidateOrigin = ValidateOriginAsync,
+        AttestationConveyancePreference = request.Attestation,
+        AuthenticatorAttachment = request.AuthenticatorSelection?.AuthenticatorAttachment,
+        ResidentKeyRequirement = request.AuthenticatorSelection?.ResidentKey,
+        UserVerificationRequirement = request.AuthenticatorSelection?.UserVerification,
+    });
+
+static IOptions<IdentityPasskeyOptions> GetPasskeyOptionsFromGetRequest(ServerPublicKeyCredentialGetOptionsRequest request)
+    => Options.Create(new IdentityPasskeyOptions()
+    {
+        ValidateOrigin = ValidateOriginAsync,
+        UserVerificationRequirement = request.UserVerification,
+    });
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/Properties/launchSettings.json b/src/Identity/samples/IdentitySample.PasskeyConformance/Properties/launchSettings.json
new file mode 100644
index 000000000000..d8a374fe0b6f
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:7020",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:7020",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/appsettings.Development.json b/src/Identity/samples/IdentitySample.PasskeyConformance/appsettings.Development.json
new file mode 100644
index 000000000000..00520a6ab864
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.AspNetCore.Identity": "Debug"
+    }
+  }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyConformance/appsettings.json b/src/Identity/samples/IdentitySample.PasskeyConformance/appsettings.json
new file mode 100644
index 000000000000..10f68b8c8b4f
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyConformance/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Components/App.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/App.razor
new file mode 100644
index 000000000000..0bd026cc6a0e
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/App.razor
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+    <link rel="stylesheet" href="@Assets["app.css"]" />
+    <ImportMap />
+    <HeadOutlet />
+</head>
+
+<body>
+    <Routes />
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
+    <script src="@Assets["app.js"]"></script>
+</body>
+
+</html>
+
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/Authenticated.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/Authenticated.razor
new file mode 100644
index 000000000000..79d19ae4e32d
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/Authenticated.razor
@@ -0,0 +1,18 @@
+@page "/authenticated"
+
+@using Microsoft.AspNetCore.Authorization
+
+@attribute [Authorize]
+
+<PageTitle>Authenticated</PageTitle>
+
+<h1>You are authenticated!</h1>
+
+<AuthorizeView>
+    <p>Hello, @context.User.Identity?.Name!</p>
+</AuthorizeView>
+
+<form id="logout-form" action="account/logout" method="post">
+    <AntiforgeryToken />
+    <button type="submit">Log out</button>
+</form>
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/Home.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/Home.razor
new file mode 100644
index 000000000000..86603f89a268
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/Home.razor
@@ -0,0 +1,131 @@
+@page "/"
+
+@using Microsoft.AspNetCore.Authentication
+@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity.Test
+
+@inject NavigationManager NavigationManager
+@inject SignInManager<PocoUser> SignInManager
+@inject UserManager<PocoUser> UserManager
+
+<h1>Welcome!</h1>
+
+<PageTitle>Passkey sample</PageTitle>
+
+<p>
+    This app demonstrates how to use passkeys for authentication with ASP.NET Core Identity.
+</p>
+
+<p>
+    See <a href="https://learn.microsoft.com/microsoft-edge/devtools-guide-chromium/webauthn/" target="_blank">these docs</a>
+    to learn how to simplify passkey testing with a virtual authenticator.
+</p>
+
+<p>
+    <b>NOTE:</b> For simplicity, users are stored in memory, so passkeys will be lost when the app restarts.
+</p>
+
+<h3>Log in or register here</h3>
+
+<form id="auth-form" method="post" @formname="auth" @onsubmit="OnSubmitAsync">
+    <AntiforgeryToken />
+    <div>
+        <input type="text" id="input-username" name="username" placeholder="Username" autocomplete="username webauthn" />
+    </div>
+    <div>
+        <button type="submit" name="action" value="register" id="input-register">Register</button>
+        <button type="submit" name="action" value="authenticate" id="input-authenticate">Authenticate</button>
+    </div>
+</form>
+
+<p id="status-message">@statusMessage</p>
+
+@code {
+    private string? statusMessage;
+
+    [CascadingParameter]
+    private HttpContext HttpContext { get; set; } = default!;
+
+    [SupplyParameterFromForm(Name = "username")]
+    private string? Username { get; set; }
+
+    [SupplyParameterFromForm(Name = "credential")]
+    private string? CredentialJson { get; set; }
+
+    [SupplyParameterFromForm(Name = "action")]
+    private string? Action { get; set; }
+
+    private Task OnSubmitAsync()
+        => Action switch
+        {
+            "register" => RegisterAsync(),
+            "authenticate" => AuthenticateAsync(),
+            var x => throw new InvalidOperationException($"Unknown action '{x}'"),
+        };
+
+    private async Task RegisterAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Username))
+        {
+            statusMessage = "Error: A username is required for registration.";
+            return;
+        }
+
+        if (string.IsNullOrWhiteSpace(CredentialJson))
+        {
+            statusMessage = "Error: No credential was submitted by the browser.";
+            return;
+        }
+
+        var attestationResult = await SignInManager.PerformPasskeyAttestationAsync(CredentialJson);
+        if (!attestationResult.Succeeded)
+        {
+            statusMessage = $"Error: Could not validate credential: {attestationResult.Failure.Message}";
+            return;
+        }
+
+        // Create the user if they don't exist yet.
+        var userEntity = attestationResult.UserEntity;
+        var user = await UserManager.FindByIdAsync(userEntity.Id);
+        if (user is null)
+        {
+            user = new PocoUser(userName: userEntity.Name)
+            {
+                Id = userEntity.Id,
+            };
+            var createUserResult = await UserManager.CreateAsync(user);
+            if (!createUserResult.Succeeded)
+            {
+                statusMessage = "Error: Could not create a new user.";
+                return;
+            }
+        }
+
+        var setPasskeyResult = await UserManager.AddOrUpdatePasskeyAsync(user, attestationResult.Passkey);
+        if (!setPasskeyResult.Succeeded)
+        {
+            statusMessage = "Error: Could not update the user with the new passkey.";
+            return;
+        }
+
+        statusMessage = "Registration successful! You can now authenticate with your passkey.";
+    }
+
+    private async Task AuthenticateAsync()
+    {
+        if (string.IsNullOrWhiteSpace(CredentialJson))
+        {
+            statusMessage = "Error: No credential was submitted by the browser.";
+            return;
+        }
+
+        var signInResult = await SignInManager.PasskeySignInAsync(CredentialJson);
+        if (!signInResult.Succeeded)
+        {
+            statusMessage = "Error: Could not sign in with the provided credential.";
+            return;
+        }
+
+        NavigationManager.NavigateTo("authenticated", forceLoad: true);
+    }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/NotFound.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/NotFound.razor
new file mode 100644
index 000000000000..0fc601939bfd
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Pages/NotFound.razor
@@ -0,0 +1,3 @@
+@page "/not-found"
+
+<h3>Not Found</h3>
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Components/RedirectToHome.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/RedirectToHome.razor
new file mode 100644
index 000000000000..95d0281f7a1f
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/RedirectToHome.razor
@@ -0,0 +1,8 @@
+@inject NavigationManager NavigationManager
+
+@code {
+    protected override void OnInitialized()
+    {
+        NavigationManager.NavigateTo("/");
+    }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Components/Routes.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Routes.razor
new file mode 100644
index 000000000000..0499aaa02370
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/Routes.razor
@@ -0,0 +1,12 @@
+@inject NavigationManager NavigationManager
+
+<Router AppAssembly="typeof(Program).Assembly" NotFoundPage="typeof(Pages.NotFound)">
+    <Found Context="routeData">
+        <AuthorizeRouteView RouteData="routeData">
+            <NotAuthorized>
+                <RedirectToHome />
+            </NotAuthorized>
+        </AuthorizeRouteView>
+        <FocusOnNavigate RouteData="routeData" Selector="h1" />
+    </Found>
+</Router>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/_Imports.razor b/src/Identity/samples/IdentitySample.PasskeyUI/Components/_Imports.razor
similarity index 84%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/_Imports.razor
rename to src/Identity/samples/IdentitySample.PasskeyUI/Components/_Imports.razor
index c311ee7d72d8..2c9c57bfc8b9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/_Imports.razor
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Components/_Imports.razor
@@ -1,12 +1,9 @@
 @using System.Net.Http
 @using System.Net.Http.Json
-@*#if (IndividualLocalAuth)
 @using Microsoft.AspNetCore.Components.Authorization
-##endif*@
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using BlazorWeb_CSharp.Client
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/IdentitySample.PasskeyUI.csproj b/src/Identity/samples/IdentitySample.PasskeyUI/IdentitySample.PasskeyUI.csproj
new file mode 100644
index 000000000000..92a0db3006a0
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/IdentitySample.PasskeyUI.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <Description>Passkey conformance testing for ASP.NET Core Identity</Description>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <IsShippingPackage>false</IsShippingPackage>
+    <Nullable>enable</Nullable>
+    <NoWarn>$(TS6385);$(NoWarn)</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Components.Endpoints" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Tools" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.AspNetCore.StaticAssets" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(IdentityTestSharedSourceRoot)PocoModel\**\*.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+  <!-- Workaround to add Blazor framework static assets without requiring a package reference -->
+  <PropertyGroup>
+    <UseBlazorFrameworkDebugAssets>true</UseBlazorFrameworkDebugAssets>
+    <BlazorFrameworkStaticWebAssetRoot Condition="'$(Configuration)' == 'Debug'">$(RepoRoot)src\Components\Web.JS\dist\Debug</BlazorFrameworkStaticWebAssetRoot>
+    <BlazorFrameworkStaticWebAssetRoot Condition="'$(Configuration)' == 'Release'">$(RepoRoot)src\Components\Web.JS\dist\Release</BlazorFrameworkStaticWebAssetRoot>
+  </PropertyGroup>
+
+  <Import Project="$(RepoRoot)\src\Assets\build\Microsoft.AspNetCore.App.Internal.Assets.targets" />
+
+</Project>
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/InMemoryUserStore.cs b/src/Identity/samples/IdentitySample.PasskeyUI/InMemoryUserStore.cs
new file mode 100644
index 000000000000..b45a7d255a40
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/InMemoryUserStore.cs
@@ -0,0 +1,142 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.Test;
+
+namespace IdentitySample.PasskeyUI;
+
+public sealed class InMemoryUserStore<TUser> :
+    IQueryableUserStore<TUser>,
+    IUserPasskeyStore<TUser>
+    where TUser : PocoUser
+{
+    private readonly Dictionary<string, TUser> _users = [];
+
+    public IQueryable<TUser> Users => _users.Values.AsQueryable();
+
+    public Task<IdentityResult> CreateAsync(TUser user, CancellationToken cancellationToken)
+    {
+        _users[user.Id] = user;
+        return Task.FromResult(IdentityResult.Success);
+    }
+
+    public Task<IdentityResult> DeleteAsync(TUser user, CancellationToken cancellationToken)
+    {
+        if (!_users.Remove(user.Id))
+        {
+            throw new InvalidOperationException($"Unknown user with ID '{user.Id}'.");
+        }
+        return Task.FromResult(IdentityResult.Success);
+    }
+
+    public Task<TUser?> FindByIdAsync(string userId, CancellationToken cancellationToken)
+        => Task.FromResult(_users.TryGetValue(userId, out var result) ? result : null);
+
+    public Task<TUser?> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken)
+        => Task.FromResult(_users.Values.FirstOrDefault(u => string.Equals(u.NormalizedUserName, normalizedUserName, StringComparison.Ordinal)));
+
+    public Task<TUser?> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+        => Task.FromResult(_users.Values.FirstOrDefault(u => u.Passkeys.Any(p => p.CredentialId.SequenceEqual(credentialId))));
+
+    public Task<UserPasskeyInfo?> FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+        => Task.FromResult(ToUserPasskeyInfo(user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(credentialId))));
+
+    public Task<string?> GetNormalizedUserNameAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult<string?>(user.NormalizedUserName);
+
+    public Task<string> GetUserIdAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult(user.Id);
+
+    public Task<string?> GetUserNameAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult<string?>(user.UserName);
+
+    public Task SetNormalizedUserNameAsync(TUser user, string? normalizedName, CancellationToken cancellationToken)
+    {
+        user.NormalizedUserName = normalizedName;
+        return Task.CompletedTask;
+    }
+
+    public Task SetUserNameAsync(TUser user, string? userName, CancellationToken cancellationToken)
+    {
+        user.UserName = userName;
+        return Task.CompletedTask;
+    }
+
+    public Task<IdentityResult> UpdateAsync(TUser user, CancellationToken cancellationToken)
+    {
+        _users[user.Id] = user;
+        return Task.FromResult(IdentityResult.Success);
+    }
+
+    public Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+    {
+        var passkeyEntity = user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(passkey.CredentialId));
+        if (passkeyEntity is null)
+        {
+            user.Passkeys.Add(ToPocoUserPasskey(user, passkey));
+        }
+        else
+        {
+            passkeyEntity.Name = passkey.Name;
+            passkeyEntity.SignCount = passkey.SignCount;
+            passkeyEntity.IsBackedUp = passkey.IsBackedUp;
+            passkeyEntity.IsUserVerified = passkey.IsUserVerified;
+        }
+        return Task.CompletedTask;
+    }
+
+    public Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, CancellationToken cancellationToken)
+        => Task.FromResult<IList<UserPasskeyInfo>>(user.Passkeys.Select(ToUserPasskeyInfo).ToList()!);
+
+    public Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        var passkey = user.Passkeys.SingleOrDefault(p => p.CredentialId.SequenceEqual(credentialId));
+        if (passkey is not null)
+        {
+            user.Passkeys.Remove(passkey);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    [return: NotNullIfNotNull(nameof(p))]
+    private static UserPasskeyInfo? ToUserPasskeyInfo(PocoUserPasskey<string>? p)
+        => p is null ? null : new(
+            p.CredentialId,
+            p.PublicKey,
+            p.CreatedAt,
+            p.SignCount,
+            p.Transports,
+            p.IsUserVerified,
+            p.IsBackupEligible,
+            p.IsBackedUp,
+            p.AttestationObject,
+            p.ClientDataJson)
+        {
+            Name = p.Name,
+        };
+
+    [return: NotNullIfNotNull(nameof(p))]
+    private static PocoUserPasskey<string>? ToPocoUserPasskey(TUser user, UserPasskeyInfo? p)
+        => p is null ? null : new PocoUserPasskey<string>
+        {
+            UserId = user.Id,
+            CredentialId = p.CredentialId,
+            PublicKey = p.PublicKey,
+            Name = p.Name,
+            CreatedAt = p.CreatedAt,
+            Transports = p.Transports,
+            SignCount = p.SignCount,
+            IsUserVerified = p.IsUserVerified,
+            IsBackupEligible = p.IsBackupEligible,
+            IsBackedUp = p.IsBackedUp,
+            AttestationObject = p.AttestationObject,
+            ClientDataJson = p.ClientDataJson,
+        };
+
+    public void Dispose()
+    {
+    }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Program.cs b/src/Identity/samples/IdentitySample.PasskeyUI/Program.cs
new file mode 100644
index 000000000000..178973e84b93
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Program.cs
@@ -0,0 +1,90 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using IdentitySample.PasskeyUI;
+using IdentitySample.PasskeyUI.Components;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.Test;
+using Microsoft.AspNetCore.Mvc;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddRazorComponents();
+builder.Services.AddCascadingAuthenticationState();
+
+builder.Services.AddAuthentication(options =>
+    {
+        options.DefaultScheme = IdentityConstants.ApplicationScheme;
+        options.DefaultSignInScheme = IdentityConstants.ExternalScheme;
+    })
+    .AddIdentityCookies();
+
+builder.Services.ConfigureApplicationCookie(options =>
+{
+    options.Events.OnRedirectToLogin = options =>
+    {
+        options.HttpContext.Response.Redirect("/");
+        return Task.CompletedTask;
+    };
+});
+
+builder.Services.AddAuthorization();
+
+builder.Services.AddIdentityCore<PocoUser>()
+    .AddSignInManager()
+    .AddDefaultTokenProviders();
+
+builder.Services.AddSingleton<IUserStore<PocoUser>, InMemoryUserStore<PocoUser>>();
+builder.Services.AddSingleton<IUserPasskeyStore<PocoUser>, InMemoryUserStore<PocoUser>>();
+
+var app = builder.Build();
+
+app.UseHttpsRedirection();
+app.UseAntiforgery();
+app.MapStaticAssets();
+app.MapRazorComponents<App>();
+
+app.MapPost("attestation/options", async (
+    [FromServices] UserManager<PocoUser> userManager,
+    [FromServices] SignInManager<PocoUser> signInManager,
+    [FromBody] PublicKeyCredentialCreationOptionsRequest request) =>
+{
+    var userId = (await userManager.FindByNameAsync(request.Username) ?? new PocoUser()).Id;
+    var userEntity = new PasskeyUserEntity
+    {
+        Id = userId,
+        Name = request.Username,
+        DisplayName = request.Username
+    };
+    var optionsJson = await signInManager.MakePasskeyCreationOptionsAsync(userEntity);
+    return Results.Content(optionsJson, contentType: "application/json");
+});
+
+app.MapPost("assertion/options", async (
+    [FromServices] UserManager<PocoUser> userManager,
+    [FromServices] SignInManager<PocoUser> signInManager,
+    [FromBody] PublicKeyCredentialGetOptionsRequest request) =>
+{
+    var user = !string.IsNullOrEmpty(request.Username) ? await userManager.FindByNameAsync(request.Username) : null;
+    var optionsJson = await signInManager.MakePasskeyRequestOptionsAsync(user);
+    return Results.Content(optionsJson, contentType: "application/json");
+});
+
+app.MapPost("account/logout", async (
+    [FromServices] SignInManager<PocoUser> signInManager) =>
+{
+    await signInManager.SignOutAsync();
+    return TypedResults.LocalRedirect($"~/");
+});
+
+app.Run();
+
+sealed class PublicKeyCredentialCreationOptionsRequest
+{
+    public required string Username { get; set; }
+}
+
+sealed class PublicKeyCredentialGetOptionsRequest
+{
+    public string? Username { get; set; }
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/Properties/launchSettings.json b/src/Identity/samples/IdentitySample.PasskeyUI/Properties/launchSettings.json
new file mode 100644
index 000000000000..d8362d8fcaf9
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/Properties/launchSettings.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5021",
+      "hotReloadEnabled": false,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7021;http://localhost:5021",
+      "hotReloadEnabled": false,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/wwwroot/appsettings.Development.json b/src/Identity/samples/IdentitySample.PasskeyUI/appsettings.Development.json
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/wwwroot/appsettings.Development.json
rename to src/Identity/samples/IdentitySample.PasskeyUI/appsettings.Development.json
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/appsettings.json b/src/Identity/samples/IdentitySample.PasskeyUI/appsettings.json
new file mode 100644
index 000000000000..10f68b8c8b4f
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/wwwroot/app.css b/src/Identity/samples/IdentitySample.PasskeyUI/wwwroot/app.css
new file mode 100644
index 000000000000..0f16b65a571e
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/wwwroot/app.css
@@ -0,0 +1,17 @@
+html, body {
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+h1:focus {
+    outline: none;
+}
+
+.blazor-error-boundary {
+    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
+    padding: 1rem 1rem 1rem 3.7rem;
+    color: white;
+}
+
+    .blazor-error-boundary::after {
+        content: "An error has occurred."
+    }
diff --git a/src/Identity/samples/IdentitySample.PasskeyUI/wwwroot/app.js b/src/Identity/samples/IdentitySample.PasskeyUI/wwwroot/app.js
new file mode 100644
index 000000000000..43df207e5ace
--- /dev/null
+++ b/src/Identity/samples/IdentitySample.PasskeyUI/wwwroot/app.js
@@ -0,0 +1,117 @@
+(function () {
+    // Following is a quick and dirty way to execute scripts based on the current route.
+    const routeScripts = {};
+
+    function addRouteScript(path, callback) {
+        routeScripts[path] = callback;
+    }
+
+    function executeScript() {
+        const routeScript = routeScripts[location.pathname];
+        routeScript?.();
+    }
+
+    function enableRouteScripts() {
+        Blazor.addEventListener('enhancednavigationend', executeScript);
+
+        if (document.readyState === 'loading') {
+            document.addEventListener('DOMContentLoaded', executeScript);
+        } else {
+            executeScript();
+        }
+    }
+
+    // Define home page JS functionality.
+    addRouteScript('/', async () => {
+        let abortController;
+        const form = document.getElementById('auth-form');
+        const statusMessage = document.getElementById('status-message');
+
+        async function fetchNewCredential(username) {
+            if (!username) {
+                throw new Error('Please enter a username.');
+            }
+
+            const optionsResponse = await fetch('/attestation/options', {
+                method: 'POST',
+                body: JSON.stringify({
+                    username,
+                }),
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                credentials: 'include',
+            });
+            const optionsJson = await optionsResponse.json();
+            const options = PublicKeyCredential.parseCreationOptionsFromJSON(optionsJson);
+            abortController?.abort();
+            abortController = new AbortController();
+            return await navigator.credentials.create({
+                publicKey: options,
+                signal: abortController.signal,
+            });
+        }
+
+        async function fetchExistingCredential(username, useConditionalMediation) {
+            // The username is optional for authentication, so we don't validate it here.
+            const optionsResponse = await fetch('/assertion/options', {
+                method: 'POST',
+                body: JSON.stringify({
+                    username,
+                }),
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                credentials: 'include',
+            });
+            const optionsJson = await optionsResponse.json();
+            const options = PublicKeyCredential.parseRequestOptionsFromJSON(optionsJson);
+            abortController?.abort();
+            abortController = new AbortController();
+            return await navigator.credentials.get({
+                publicKey: options,
+                mediation: useConditionalMediation ? 'conditional' : undefined,
+                signal: abortController.signal,
+            });
+        }
+
+        async function fetchAndSubmitCredential(action, useConditionalMediation = false) {
+            try {
+                const username = new FormData(form).get('username');
+                let credential;
+                if (action === 'register') {
+                    credential = await fetchNewCredential(username);
+                } else if (action === 'authenticate') {
+                    credential = await fetchExistingCredential(username, useConditionalMediation);
+                } else {
+                    throw new Error('Unknown action: ' + action);
+                }
+                var credentialJson = JSON.stringify(credential);
+                form.addEventListener('formdata', (e) => {
+                    e.formData.append('action', action);
+                    e.formData.append('credential', credentialJson);
+                }, { once: true });
+                form.submit();
+            } catch (error) {
+                // Ignore abort errors, they are expected when the user cancels the operation.
+                if (error.name !== 'AbortError') {
+                    statusMessage.textContent = 'Error: ' + error.message;
+                    throw error;
+                }
+            }
+        }
+
+        form.addEventListener('submit', (e) => {
+            if (e.submitter?.name == 'action') {
+                e.preventDefault();
+                fetchAndSubmitCredential(e.submitter.value);
+            }
+        });
+
+        if (await PublicKeyCredential.isConditionalMediationAvailable()) {
+            await fetchAndSubmitCredential('authenticate', /* useConditionalMediation */ true);
+        }
+    });
+
+    enableRouteScripts();
+})();
diff --git a/src/Identity/startvscode.cmd b/src/Identity/startvscode.cmd
new file mode 100644
index 000000000000..d403f3028231
--- /dev/null
+++ b/src/Identity/startvscode.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvscode.cmd %~dp0
diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
index 91aef38de10b..fd1d02df6206 100644
--- a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
+++ b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
@@ -63,6 +63,7 @@ protected override IHost CreateHost(IHostBuilder builder)
         return result;
     }
 
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.", DiagnosticId = "ASPDEPR008")]
     protected override TestServer CreateServer(IWebHostBuilder builder)
     {
         var result = base.CreateServer(builder);
diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
index 3a29cbd5fd55..88bbd988b1f3 100644
--- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
+++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@@ -24,7 +24,6 @@
     <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
     <Reference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
 
     <None Update="Testing.DefaultWebSite.StaticWebAssets.V4.xml" CopyToOutputDirectory="PreserveNewest" />
     <None Update="Testing.DefaultWebSite.StaticWebAssets.V5.xml" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/Identity/test/Identity.Test/IdentityOptionsTest.cs b/src/Identity/test/Identity.Test/IdentityOptionsTest.cs
index 0b6e7d67343d..a078cea31911 100644
--- a/src/Identity/test/Identity.Test/IdentityOptionsTest.cs
+++ b/src/Identity/test/Identity.Test/IdentityOptionsTest.cs
@@ -89,5 +89,4 @@ public void CanConfigureCookieOptions()
         Assert.Equal("c", options.Get(IdentityConstants.TwoFactorRememberMeScheme).Cookie.Name);
         Assert.Equal("d", options.Get(IdentityConstants.TwoFactorUserIdScheme).Cookie.Name);
     }
-
 }
diff --git a/src/Identity/test/Identity.Test/IdentityPasskeyOptionsTest.cs b/src/Identity/test/Identity.Test/IdentityPasskeyOptionsTest.cs
new file mode 100644
index 000000000000..e9aa6cf31237
--- /dev/null
+++ b/src/Identity/test/Identity.Test/IdentityPasskeyOptionsTest.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+public class IdentityPasskeyOptionsTest
+{
+    [Fact]
+    public void VerifyDefaultOptions()
+    {
+        var options = new IdentityPasskeyOptions();
+
+        Assert.Equal(TimeSpan.FromMinutes(5), options.AuthenticatorTimeout);
+        Assert.Equal(32, options.ChallengeSize);
+        Assert.Equal("preferred", options.ResidentKeyRequirement);
+        Assert.Equal("required", options.UserVerificationRequirement);
+        Assert.Null(options.ServerDomain);
+        Assert.Null(options.AttestationConveyancePreference);
+        Assert.Null(options.AuthenticatorAttachment);
+        Assert.Null(options.IsAllowedAlgorithm);
+        Assert.Null(options.ValidateOrigin);
+        Assert.Null(options.VerifyAttestationStatement);
+    }
+}
diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
index 7d5bf22a80d1..456637020d55 100644
--- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
+++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -6,17 +6,18 @@
 
   <ItemGroup>
     <Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
     <Reference Include="Microsoft.AspNetCore.Identity" />
     <Reference Include="Microsoft.AspNetCore.Identity.UI" />
     <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
     <Reference Include="Microsoft.Extensions.TimeProvider.Testing" />
   </ItemGroup>
diff --git a/src/Identity/test/Identity.Test/Passkeys/AttestationObjectArgs.cs b/src/Identity/test/Identity.Test/Passkeys/AttestationObjectArgs.cs
new file mode 100644
index 000000000000..15940c6816ea
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/AttestationObjectArgs.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+internal readonly struct AttestationObjectArgs
+{
+    public required int? CborMapLength { get; init; }
+    public required string? Format { get; init; }
+    public required ReadOnlyMemory<byte>? AttestationStatement { get; init; }
+    public required ReadOnlyMemory<byte>? AuthenticatorData { get; init; }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/AttestedCredentialDataArgs.cs b/src/Identity/test/Identity.Test/Passkeys/AttestedCredentialDataArgs.cs
new file mode 100644
index 000000000000..95456788c370
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/AttestedCredentialDataArgs.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+internal readonly struct AttestedCredentialDataArgs
+{
+    public required ReadOnlyMemory<byte> Aaguid { get; init; }
+    public required ReadOnlyMemory<byte> CredentialId { get; init; }
+    public required ReadOnlyMemory<byte> CredentialPublicKey { get; init; }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/AuthenticatorDataArgs.cs b/src/Identity/test/Identity.Test/Passkeys/AuthenticatorDataArgs.cs
new file mode 100644
index 000000000000..9c98f9daa663
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/AuthenticatorDataArgs.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+internal readonly struct AuthenticatorDataArgs
+{
+    public required AuthenticatorDataFlags Flags { get; init; }
+    public required ReadOnlyMemory<byte> RpIdHash { get; init; }
+    public required uint SignCount { get; init; }
+    public ReadOnlyMemory<byte>? AttestedCredentialData { get; init; }
+    public ReadOnlyMemory<byte>? Extensions { get; init; }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/CredentialHelpers.cs b/src/Identity/test/Identity.Test/Passkeys/CredentialHelpers.cs
new file mode 100644
index 000000000000..51d35b839f9f
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/CredentialHelpers.cs
@@ -0,0 +1,104 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers.Binary;
+using System.Formats.Cbor;
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+internal static class CredentialHelpers
+{
+    public static ReadOnlyMemory<byte> MakeAttestedCredentialData(in AttestedCredentialDataArgs args)
+    {
+        const int AaguidLength = 16;
+        const int CredentialIdLengthLength = 2;
+        var length = AaguidLength + CredentialIdLengthLength + args.CredentialId.Length + args.CredentialPublicKey.Length;
+        var result = new byte[length];
+        var offset = 0;
+
+        args.Aaguid.Span.CopyTo(result.AsSpan(offset, AaguidLength));
+        offset += AaguidLength;
+
+        BinaryPrimitives.WriteUInt16BigEndian(result.AsSpan(offset, CredentialIdLengthLength), (ushort)args.CredentialId.Length);
+        offset += CredentialIdLengthLength;
+
+        args.CredentialId.Span.CopyTo(result.AsSpan(offset));
+        offset += args.CredentialId.Length;
+
+        args.CredentialPublicKey.Span.CopyTo(result.AsSpan(offset));
+        offset += args.CredentialPublicKey.Length;
+
+        if (offset != result.Length)
+        {
+            throw new InvalidOperationException($"Expected attested credential data length '{length}', but got '{offset}'.");
+        }
+
+        return result;
+    }
+
+    public static ReadOnlyMemory<byte> MakeAuthenticatorData(in AuthenticatorDataArgs args)
+    {
+        const int RpIdHashLength = 32;
+        const int AuthenticatorDataFlagsLength = 1;
+        const int SignCountLength = 4;
+        var length =
+            RpIdHashLength +
+            AuthenticatorDataFlagsLength +
+            SignCountLength +
+            (args.AttestedCredentialData?.Length ?? 0) +
+            (args.Extensions?.Length ?? 0);
+        var result = new byte[length];
+        var offset = 0;
+
+        args.RpIdHash.Span.CopyTo(result.AsSpan(offset, RpIdHashLength));
+        offset += RpIdHashLength;
+
+        result[offset] = (byte)args.Flags;
+        offset += AuthenticatorDataFlagsLength;
+
+        BinaryPrimitives.WriteUInt32BigEndian(result.AsSpan(offset, SignCountLength), args.SignCount);
+        offset += SignCountLength;
+
+        if (args.AttestedCredentialData is { } attestedCredentialData)
+        {
+            attestedCredentialData.Span.CopyTo(result.AsSpan(offset));
+            offset += attestedCredentialData.Length;
+        }
+
+        if (args.Extensions is { } extensions)
+        {
+            extensions.Span.CopyTo(result.AsSpan(offset));
+            offset += extensions.Length;
+        }
+
+        if (offset != result.Length)
+        {
+            throw new InvalidOperationException($"Expected authenticator data length '{length}', but got '{offset}'.");
+        }
+
+        return result;
+    }
+
+    public static ReadOnlyMemory<byte> MakeAttestationObject(in AttestationObjectArgs args)
+    {
+        var writer = new CborWriter(CborConformanceMode.Ctap2Canonical);
+        writer.WriteStartMap(args.CborMapLength);
+        if (args.Format is { } format)
+        {
+            writer.WriteTextString("fmt");
+            writer.WriteTextString(format);
+        }
+        if (args.AttestationStatement is { } attestationStatement)
+        {
+            writer.WriteTextString("attStmt");
+            writer.WriteEncodedValue(attestationStatement.Span);
+        }
+        if (args.AuthenticatorData is { } authenticatorData)
+        {
+            writer.WriteTextString("authData");
+            writer.WriteByteString(authenticatorData.Span);
+        }
+        writer.WriteEndMap();
+        return writer.Encode();
+    }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/CredentialKeyPair.cs b/src/Identity/test/Identity.Test/Passkeys/CredentialKeyPair.cs
new file mode 100644
index 000000000000..210751c740fe
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/CredentialKeyPair.cs
@@ -0,0 +1,231 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using System.Formats.Cbor;
+using System.Security.Cryptography;
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+internal sealed class CredentialKeyPair
+{
+    private readonly RSA? _rsa;
+    private readonly ECDsa? _ecdsa;
+    private readonly COSEAlgorithmIdentifier _alg;
+    private readonly COSEKeyType _keyType;
+    private readonly COSEEllipticCurve _curve;
+
+    private CredentialKeyPair(RSA rsa, COSEAlgorithmIdentifier alg)
+    {
+        _rsa = rsa;
+        _alg = alg;
+        _keyType = COSEKeyType.RSA;
+    }
+
+    private CredentialKeyPair(ECDsa ecdsa, COSEAlgorithmIdentifier alg, COSEEllipticCurve curve)
+    {
+        _ecdsa = ecdsa;
+        _alg = alg;
+        _keyType = COSEKeyType.EC2;
+        _curve = curve;
+    }
+
+    public static CredentialKeyPair Generate(COSEAlgorithmIdentifier alg)
+    {
+        return alg switch
+        {
+            COSEAlgorithmIdentifier.RS1 or
+            COSEAlgorithmIdentifier.RS256 or
+            COSEAlgorithmIdentifier.RS384 or
+            COSEAlgorithmIdentifier.RS512 or
+            COSEAlgorithmIdentifier.PS256 or
+            COSEAlgorithmIdentifier.PS384 or
+            COSEAlgorithmIdentifier.PS512 => GenerateRsaKeyPair(alg),
+
+            COSEAlgorithmIdentifier.ES256 => GenerateEcKeyPair(alg, ECCurve.NamedCurves.nistP256, COSEEllipticCurve.P256),
+            COSEAlgorithmIdentifier.ES384 => GenerateEcKeyPair(alg, ECCurve.NamedCurves.nistP384, COSEEllipticCurve.P384),
+            COSEAlgorithmIdentifier.ES512 => GenerateEcKeyPair(alg, ECCurve.NamedCurves.nistP521, COSEEllipticCurve.P521),
+            COSEAlgorithmIdentifier.ES256K => GenerateEcKeyPair(alg, ECCurve.CreateFromFriendlyName("secP256k1"), COSEEllipticCurve.P256K),
+
+            _ => throw new NotSupportedException($"Algorithm {alg} is not supported for key pair generation")
+        };
+    }
+
+    public ReadOnlyMemory<byte> SignData(ReadOnlySpan<byte> data)
+    {
+        return _keyType switch
+        {
+            COSEKeyType.RSA => SignRsaData(data),
+            COSEKeyType.EC2 => SignEcData(data),
+            _ => throw new InvalidOperationException($"Unsupported key type {_keyType}")
+        };
+    }
+
+    private byte[] SignRsaData(ReadOnlySpan<byte> data)
+    {
+        if (_rsa is null)
+        {
+            throw new InvalidOperationException("RSA key is not available for signing");
+        }
+
+        var hashAlgorithm = GetHashAlgorithmFromCoseAlg(_alg);
+        var padding = GetRsaPaddingFromCoseAlg(_alg);
+
+        return _rsa.SignData(data.ToArray(), hashAlgorithm, padding);
+    }
+
+    private byte[] SignEcData(ReadOnlySpan<byte> data)
+    {
+        if (_ecdsa is null)
+        {
+            throw new InvalidOperationException("ECDSA key is not available for signing");
+        }
+
+        var hashAlgorithm = GetHashAlgorithmFromCoseAlg(_alg);
+        return _ecdsa.SignData(data.ToArray(), hashAlgorithm, DSASignatureFormat.Rfc3279DerSequence);
+    }
+
+    private static CredentialKeyPair GenerateRsaKeyPair(COSEAlgorithmIdentifier alg)
+    {
+        const int KeySize = 2048;
+        var rsa = RSA.Create(KeySize);
+        return new CredentialKeyPair(rsa, alg);
+    }
+
+    private static CredentialKeyPair GenerateEcKeyPair(COSEAlgorithmIdentifier alg, ECCurve curve, COSEEllipticCurve coseCurve)
+    {
+        var ecdsa = ECDsa.Create(curve);
+        return new CredentialKeyPair(ecdsa, alg, coseCurve);
+    }
+
+    public ReadOnlyMemory<byte> EncodePublicKeyCbor()
+        => _keyType switch
+        {
+            COSEKeyType.RSA => EncodeCoseRsaPublicKey(_rsa!, _alg),
+            COSEKeyType.EC2 => EncodeCoseEcPublicKey(_ecdsa!, _alg, _curve),
+            _ => throw new InvalidOperationException($"Unsupported key type {_keyType}")
+        };
+
+    private static byte[] EncodeCoseRsaPublicKey(RSA rsa, COSEAlgorithmIdentifier alg)
+    {
+        var parameters = rsa.ExportParameters(false);
+
+        var writer = new CborWriter(CborConformanceMode.Ctap2Canonical);
+        writer.WriteStartMap(4); // kty, alg, n, e
+
+        writer.WriteInt32((int)COSEKeyParameter.KeyType);
+        writer.WriteInt32((int)COSEKeyType.RSA);
+
+        writer.WriteInt32((int)COSEKeyParameter.Alg);
+        writer.WriteInt32((int)alg);
+
+        writer.WriteInt32((int)COSEKeyParameter.N);
+        writer.WriteByteString(parameters.Modulus!);
+
+        writer.WriteInt32((int)COSEKeyParameter.E);
+        writer.WriteByteString(parameters.Exponent!);
+
+        writer.WriteEndMap();
+        return writer.Encode();
+    }
+
+    private static byte[] EncodeCoseEcPublicKey(ECDsa ecdsa, COSEAlgorithmIdentifier alg, COSEEllipticCurve curve)
+    {
+        var parameters = ecdsa.ExportParameters(false);
+
+        var writer = new CborWriter(CborConformanceMode.Ctap2Canonical);
+        writer.WriteStartMap(5); // kty, alg, crv, x, y
+
+        writer.WriteInt32((int)COSEKeyParameter.KeyType);
+        writer.WriteInt32((int)COSEKeyType.EC2);
+
+        writer.WriteInt32((int)COSEKeyParameter.Alg);
+        writer.WriteInt32((int)alg);
+
+        writer.WriteInt32((int)COSEKeyParameter.Crv);
+        writer.WriteInt32((int)curve);
+
+        writer.WriteInt32((int)COSEKeyParameter.X);
+        writer.WriteByteString(parameters.Q.X!);
+
+        writer.WriteInt32((int)COSEKeyParameter.Y);
+        writer.WriteByteString(parameters.Q.Y!);
+
+        writer.WriteEndMap();
+        return writer.Encode();
+    }
+
+    private static HashAlgorithmName GetHashAlgorithmFromCoseAlg(COSEAlgorithmIdentifier alg)
+    {
+        return alg switch
+        {
+            COSEAlgorithmIdentifier.RS1 => HashAlgorithmName.SHA1,
+            COSEAlgorithmIdentifier.ES256 => HashAlgorithmName.SHA256,
+            COSEAlgorithmIdentifier.ES384 => HashAlgorithmName.SHA384,
+            COSEAlgorithmIdentifier.ES512 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.PS256 => HashAlgorithmName.SHA256,
+            COSEAlgorithmIdentifier.PS384 => HashAlgorithmName.SHA384,
+            COSEAlgorithmIdentifier.PS512 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.RS256 => HashAlgorithmName.SHA256,
+            COSEAlgorithmIdentifier.RS384 => HashAlgorithmName.SHA384,
+            COSEAlgorithmIdentifier.RS512 => HashAlgorithmName.SHA512,
+            COSEAlgorithmIdentifier.ES256K => HashAlgorithmName.SHA256,
+            _ => throw new InvalidOperationException($"Unsupported algorithm: {alg}")
+        };
+    }
+
+    private static RSASignaturePadding GetRsaPaddingFromCoseAlg(COSEAlgorithmIdentifier alg)
+    {
+        return alg switch
+        {
+            COSEAlgorithmIdentifier.PS256 or
+            COSEAlgorithmIdentifier.PS384 or
+            COSEAlgorithmIdentifier.PS512 => RSASignaturePadding.Pss,
+
+            COSEAlgorithmIdentifier.RS1 or
+            COSEAlgorithmIdentifier.RS256 or
+            COSEAlgorithmIdentifier.RS384 or
+            COSEAlgorithmIdentifier.RS512 => RSASignaturePadding.Pkcs1,
+
+            _ => throw new InvalidOperationException($"Unsupported RSA algorithm: {alg}")
+        };
+    }
+
+    private enum COSEKeyType
+    {
+        OKP = 1,
+        EC2 = 2,
+        RSA = 3,
+        Symmetric = 4
+    }
+
+    private enum COSEKeyParameter
+    {
+        Crv = -1,
+        K = -1,
+        X = -2,
+        Y = -3,
+        D = -4,
+        N = -1,
+        E = -2,
+        KeyType = 1,
+        KeyId = 2,
+        Alg = 3,
+        KeyOps = 4,
+        BaseIV = 5
+    }
+
+    private enum COSEEllipticCurve
+    {
+        Reserved = 0,
+        P256 = 1,
+        P384 = 2,
+        P521 = 3,
+        X25519 = 4,
+        X448 = 5,
+        Ed25519 = 6,
+        Ed448 = 7,
+        P256K = 8,
+    }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/JsonHelpers.cs b/src/Identity/test/Identity.Test/Passkeys/JsonHelpers.cs
new file mode 100644
index 000000000000..5a8b4f46b96d
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/JsonHelpers.cs
@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using System.Buffers.Text;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+internal static class JsonHelpers
+{
+    public static string ToJsonValue(string? value)
+        => value is null ? "null" : $"\"{value}\"";
+
+    public static string ToBase64UrlJsonValue(ReadOnlyMemory<byte>? bytes)
+        => !bytes.HasValue ? "null" : $"\"{Base64Url.EncodeToString(bytes.Value.Span)}\"";
+
+    public static string ToBase64UrlJsonValue(string? value)
+        => value is null ? "null" : $"\"{Base64Url.EncodeToString(Encoding.UTF8.GetBytes(value))}\"";
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAssertionTest.cs b/src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAssertionTest.cs
new file mode 100644
index 000000000000..0b368969c004
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAssertionTest.cs
@@ -0,0 +1,1104 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using System.Buffers.Text;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Moq;
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+using static JsonHelpers;
+using static CredentialHelpers;
+
+public class PasskeyHandlerAssertionTest
+{
+    [Fact]
+    public async Task CanSucceed()
+    {
+        var test = new AssertionTest();
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialIdIsMissing()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            Assert.True(credentialJson.Remove("id"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'id'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenCredentialIdIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["id"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialIdIsNotBase64UrlEncoded()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var base64UrlCredentialId = (string)credentialJson["id"]!;
+            credentialJson["id"] = GetInvalidBase64UrlValue(base64UrlCredentialId);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("base64url string", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialTypeIsMissing()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            Assert.True(credentialJson.Remove("type"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'type'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenCredentialTypeIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["type"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialTypeIsNotPublicKey()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["type"] = "unexpected-value";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Expected credential type 'public-key', got 'unexpected-value'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialResponseIsMissing()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            Assert.True(credentialJson.Remove("response"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'response'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("\"hello\"")]
+    public async Task Fails_WhenCredentialResponseIsNotAnObject(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAssertionStateChallengeIsMissing()
+    {
+        var test = new AssertionTest();
+        test.AssertionStateJson.TransformAsJsonObject(originalOptionsJson =>
+        {
+            Assert.True(originalOptionsJson.Remove("challenge"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+
+        Assert.StartsWith("The assertion state JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'challenge'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAssertionStateChallengeIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.AssertionStateJson.TransformAsJsonObject(assertionStateJson =>
+        {
+            assertionStateJson["challenge"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion state JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonIsMissing()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var response = credentialJson["response"]!.AsObject();
+            Assert.True(response.Remove("clientDataJSON"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'clientDataJSON'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["clientDataJSON"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonIsEmptyString()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["clientDataJSON"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataIsMissing()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var response = credentialJson["response"]!.AsObject();
+            Assert.True(response.Remove("authenticatorData"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'authenticatorData'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAuthenticatorDataIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["authenticatorData"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataIsNotBase64UrlEncoded()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var base64UrlAuthenticatorData = (string)credentialJson["response"]!["authenticatorData"]!;
+            credentialJson["response"]!["authenticatorData"] = GetInvalidBase64UrlValue(base64UrlAuthenticatorData);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("base64url string", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataIsEmptyString()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["authenticatorData"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data had an invalid byte count of 0", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenResponseSignatureIsMissing()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var response = credentialJson["response"]!.AsObject();
+            Assert.True(response.Remove("signature"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'signature'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenResponseSignatureIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["signature"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenResponseSignatureIsNotBase64UrlEncoded()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var base64UrlSignature = (string)credentialJson["response"]!["signature"]!;
+            credentialJson["response"]!["signature"] = GetInvalidBase64UrlValue(base64UrlSignature);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("base64url string", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenResponseSignatureIsEmptyString()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["signature"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion signature was invalid", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenResponseSignatureIsInvalid()
+    {
+        var test = new AssertionTest();
+        test.Signature.Transform(signature =>
+        {
+            // Add some invalid bytes to the signature
+            var invalidSignature = (byte[])[.. signature.Span, 0xFF, 0xFF, 0xFF, 0xFF];
+            return invalidSignature;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion signature was invalid", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("{}")]
+    public async Task Fails_WhenResponseUserHandleIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["userHandle"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenResponseUserHandleIsNull()
+    {
+        var test = new AssertionTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["userHandle"] = null;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response was missing a user handle", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenResponseUserHandleDoesNotMatchUserId()
+    {
+        var test = new AssertionTest
+        {
+            IsUserIdentified = true,
+        };
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var newUserId = test.User.Id[..^1];
+            credentialJson["response"]!["userHandle"] = Base64Url.EncodeToString(Encoding.UTF8.GetBytes(newUserId));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The provided user handle", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonTypeIsMissing()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            Assert.True(clientDataJson.Remove("type"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'type'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonTypeIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["type"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("webauthn.create")]
+    [InlineData("unexpected-value")]
+    public async Task Fails_WhenClientDataJsonTypeIsNotExpected(string value)
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["type"] = value;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Expected the client data JSON 'type' field to be 'webauthn.get'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsMissing()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            Assert.True(clientDataJson.Remove("challenge"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'challenge'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonChallengeIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["challenge"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsEmptyString()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["challenge"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response challenge does not match original challenge", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsNotBase64UrlEncoded()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            var base64UrlChallenge = (string)clientDataJson["challenge"]!;
+            clientDataJson["challenge"] = GetInvalidBase64UrlValue(base64UrlChallenge);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("base64url string", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsNotRequestChallenge()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            var challenge = Base64Url.DecodeFromChars((string)clientDataJson["challenge"]!);
+            challenge[0]++;
+            clientDataJson["challenge"] = Base64Url.EncodeToString(challenge);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response challenge does not match original challenge", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonOriginIsMissing()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            Assert.True(clientDataJson.Remove("origin"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'origin'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonOriginIsNotString(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["origin"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonOriginIsEmptyString()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["origin"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response had an invalid origin ''", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("https://example.com", "http://example.com")]
+    [InlineData("http://example.com", "https://example.com")]
+    [InlineData("https://example.com", "https://foo.example.com")]
+    [InlineData("https://example.com", "https://example.com:5000")]
+    public async Task Fails_WhenClientDataJsonOriginDoesNotMatchTheExpectedOrigin(string expectedOrigin, string returnedOrigin)
+    {
+        var test = new AssertionTest
+        {
+            Origin = expectedOrigin,
+        };
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["origin"] = returnedOrigin;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith($"The authenticator response had an invalid origin '{returnedOrigin}'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("\"hello\"")]
+    public async Task Fails_WhenClientDataJsonTokenBindingIsNotObject(string jsonValue)
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["tokenBinding"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonTokenBindingStatusIsMissing()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["tokenBinding"] = JsonNode.Parse("{}");
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'status'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonTokenBindingStatusIsInvalid()
+    {
+        var test = new AssertionTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["tokenBinding"] = JsonNode.Parse("""
+                {
+                  "status": "unexpected-value"
+                }
+                """);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Invalid token binding status 'unexpected-value'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Succeeds_WhenUserVerificationIsRequiredAndUserIsVerified()
+    {
+        var test = new AssertionTest();
+        test.PasskeyOptions.UserVerificationRequirement = "required";
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags | AuthenticatorDataFlags.UserVerified,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Succeeds_WhenUserVerificationIsDiscouragedAndUserIsVerified()
+    {
+        var test = new AssertionTest();
+        test.PasskeyOptions.UserVerificationRequirement = "discouraged";
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags | AuthenticatorDataFlags.UserVerified,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenUserVerificationIsRequiredAndUserIsNotVerified()
+    {
+        var test = new AssertionTest();
+        test.PasskeyOptions.UserVerificationRequirement = "required";
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith(
+            "User verification is required, but the authenticator data flags did not have the 'UserVerified' flag",
+            result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenUserIsNotPresent()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags & ~AuthenticatorDataFlags.UserPresent,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data flags did not include the 'UserPresent' flag", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Succeeds_WhenAuthenticatorDataContainsExtensionData()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags | AuthenticatorDataFlags.HasExtensionData,
+            Extensions = (byte[])[0xA0] // Empty CBOR map.
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataContainsExtraBytes()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorData.Transform(authenticatorData =>
+        {
+            return (byte[])[.. authenticatorData.Span, 0xFF, 0xFF, 0xFF, 0xFF];
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataRpIdHashIsInvalid()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args =>
+        {
+            var newRpIdHash = args.RpIdHash.ToArray();
+            newRpIdHash[0]++;
+            return args with { RpIdHash = newRpIdHash };
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data included an invalid Relying Party ID hash", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataClientDataHashIsInvalid()
+    {
+        var test = new AssertionTest();
+        test.ClientDataHash.Transform(clientDataHash =>
+        {
+            var newClientDataHash = clientDataHash.ToArray();
+            newClientDataHash[0]++;
+            return newClientDataHash;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The assertion signature was invalid", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Succeeds_WhenSignCountIsZero()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            SignCount = 0, // Usually 1 by default
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    // Having both sign counts be '0' is allowed, per the above test case,
+    // so we don't test for its invalidity here.
+    [Theory]
+    [InlineData(42, 42)]
+    [InlineData(41, 42)]
+    [InlineData(0, 1)]
+    public async Task Fails_WhenAuthenticatorDataSignCountLessThanOrEqualToStoredSignCount(
+        uint authenticatorDataSignCount,
+        uint storedSignCount)
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            SignCount = authenticatorDataSignCount,
+        });
+        test.StoredPasskey.Transform(passkey =>
+        {
+            passkey.SignCount = storedSignCount;
+            return passkey;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith(
+            "The authenticator's signature counter is unexpectedly less than or equal to the stored signature counter",
+            result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData((int)COSEAlgorithmIdentifier.PS256)]
+    [InlineData((int)COSEAlgorithmIdentifier.PS384)]
+    [InlineData((int)COSEAlgorithmIdentifier.PS512)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS256)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS384)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS512)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES256)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES384)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES512)]
+    public async Task Succeeds_WithSupportedAlgorithms(int algorithm)
+    {
+        var test = new AssertionTest
+        {
+            Algorithm = (COSEAlgorithmIdentifier)algorithm,
+        };
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataIsNotBackupEligibleButBackedUp()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = (args.Flags | AuthenticatorDataFlags.BackedUp) & ~AuthenticatorDataFlags.BackupEligible,
+        });
+
+        // This test simulates an RP policy failure, not a mismatch between the stored passkey
+        // and the authenticator data flags, so we'll make the stored passkey match the
+        // authenticator data flags
+        test.IsStoredPasskeyBackedUp = true;
+        test.IsStoredPasskeyBackupEligible = false;
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The credential is backed up, but the authenticator data flags did not have the 'BackupEligible' flag", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataIsNotBackupEligibleButStoredPasskeyIs()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags & ~AuthenticatorDataFlags.BackupEligible,
+        });
+        test.IsStoredPasskeyBackupEligible = true;
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith(
+            "The stored credential is eligible for backup, but the provided credential was unexpectedly ineligible for backup.",
+            result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthenticatorDataIsBackupEligibleButStoredPasskeyIsNot()
+    {
+        var test = new AssertionTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags | AuthenticatorDataFlags.BackupEligible,
+        });
+        test.IsStoredPasskeyBackupEligible = false;
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith(
+            "The stored credential is ineligible for backup, but the provided credential was unexpectedly eligible for backup",
+            result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task Fails_WhenCredentialDoesNotExistOnTheUser(bool isUserIdentified)
+    {
+        var test = new AssertionTest
+        {
+            IsUserIdentified = isUserIdentified,
+            DoesCredentialExistOnUser = false
+        };
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The provided credential does not belong to the specified user", result.Failure.Message);
+    }
+
+    private static string GetInvalidBase64UrlValue(string base64UrlValue)
+    {
+        var rawValue = Base64Url.DecodeFromChars(base64UrlValue);
+        return Convert.ToBase64String(rawValue) + "==";
+    }
+
+    private sealed class AssertionTest : PasskeyScenarioTest<PasskeyAssertionResult<PocoUser>>
+    {
+        private static readonly byte[] _defaultCredentialId = [1, 2, 3, 4, 5, 6, 7, 8];
+
+        public IdentityPasskeyOptions PasskeyOptions { get; } = new()
+        {
+            UserVerificationRequirement = "preferred",
+        };
+        public string Origin { get; set; } = "https://example.com";
+        public PocoUser User { get; set; } = new()
+        {
+            Id = "df0a3af4-bd65-440f-82bd-5b839e300dcd",
+            UserName = "johndoe",
+        };
+        public bool IsUserIdentified { get; set; }
+        public bool IsStoredPasskeyBackupEligible { get; set; }
+        public bool IsStoredPasskeyBackedUp { get; set; }
+        public bool DoesCredentialExistOnUser { get; set; } = true;
+        public COSEAlgorithmIdentifier Algorithm { get; set; } = COSEAlgorithmIdentifier.ES256;
+        public ReadOnlyMemory<byte> CredentialId { get; set; } = _defaultCredentialId;
+        public ComputedValue<AuthenticatorDataArgs> AuthenticatorDataArgs { get; } = new();
+        public ComputedValue<ReadOnlyMemory<byte>> AuthenticatorData { get; } = new();
+        public ComputedValue<ReadOnlyMemory<byte>> ClientDataHash { get; } = new();
+        public ComputedValue<ReadOnlyMemory<byte>> Signature { get; } = new();
+        public ComputedJsonObject AssertionStateJson { get; } = new();
+        public ComputedJsonObject ClientDataJson { get; } = new();
+        public ComputedJsonObject CredentialJson { get; } = new();
+        public ComputedValue<UserPasskeyInfo> StoredPasskey { get; } = new();
+
+        protected override async Task<PasskeyAssertionResult<PocoUser>> RunCoreAsync()
+        {
+            var credential = CredentialKeyPair.Generate(Algorithm);
+            var credentialPublicKey = credential.EncodePublicKeyCbor();
+            var storedPasskey = StoredPasskey.Compute(new(
+                CredentialId.ToArray(),
+                credentialPublicKey.ToArray(),
+                createdAt: default,
+                signCount: 0,
+                transports: null,
+                isUserVerified: true,
+                isBackupEligible: IsStoredPasskeyBackupEligible,
+                isBackedUp: IsStoredPasskeyBackedUp,
+                attestationObject: [],
+                clientDataJson: []));
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Request.Headers.Origin).Returns(new StringValues(Origin));
+
+            var userManager = MockHelpers.MockUserManager<PocoUser>();
+            userManager
+                .Setup(m => m.FindByIdAsync(User.Id))
+                .Returns(Task.FromResult<PocoUser?>(User));
+            userManager
+                .Setup(m => m.GetPasskeyAsync(It.IsAny<PocoUser>(), It.IsAny<byte[]>()))
+                .Returns((PocoUser user, byte[] credentialId) => Task.FromResult(
+                    DoesCredentialExistOnUser && user == User && CredentialId.Span.SequenceEqual(credentialId)
+                        ? storedPasskey
+                        : null));
+            userManager
+                .Setup(m => m.GetPasskeysAsync(It.IsAny<PocoUser>()))
+                .Returns((PocoUser user) => Task.FromResult<IList<UserPasskeyInfo>>(
+                    DoesCredentialExistOnUser && user == User ? [storedPasskey] : []));
+
+            if (IsUserIdentified)
+            {
+                userManager
+                    .Setup(m => m.GetUserIdAsync(User))
+                    .Returns(Task.FromResult(User.Id));
+            }
+
+            var passkeyOptions = Options.Create(PasskeyOptions);
+            var handler = new PasskeyHandler<PocoUser>(userManager.Object, passkeyOptions);
+
+            var requestOptionsResult = await handler.MakeRequestOptionsAsync(
+                IsUserIdentified ? User : null,
+                httpContext.Object);
+
+            var requestOptions = JsonSerializer.Deserialize(
+                requestOptionsResult.RequestOptionsJson,
+                IdentityJsonSerializerContext.Default.PublicKeyCredentialRequestOptions)
+                ?? throw new InvalidOperationException("Failed to deserialize request options JSON.");
+            var assertionStateJson = AssertionStateJson.Compute(requestOptionsResult.AssertionState);
+            var authenticatorDataArgs = AuthenticatorDataArgs.Compute(new()
+            {
+                RpIdHash = SHA256.HashData(Encoding.UTF8.GetBytes(requestOptions.RpId ?? string.Empty)),
+                Flags = AuthenticatorDataFlags.UserPresent,
+                SignCount = 1,
+            });
+            var authenticatorData = AuthenticatorData.Compute(MakeAuthenticatorData(authenticatorDataArgs));
+            var clientDataJson = ClientDataJson.Compute($$"""
+                {
+                  "challenge": {{ToBase64UrlJsonValue(requestOptions.Challenge.AsMemory())}},
+                  "origin": {{ToJsonValue(Origin)}},
+                  "type": "webauthn.get"
+                }
+                """);
+            var clientDataJsonBytes = Encoding.UTF8.GetBytes(clientDataJson?.ToString() ?? string.Empty);
+            var clientDataHash = ClientDataHash.Compute(SHA256.HashData(clientDataJsonBytes));
+            var dataToSign = (byte[])[.. authenticatorData.Span, .. clientDataHash.Span];
+            var signature = Signature.Compute(credential.SignData(dataToSign));
+            var credentialJson = CredentialJson.Compute($$"""
+                {
+                  "id": {{ToBase64UrlJsonValue(CredentialId)}},
+                  "response": {
+                    "authenticatorData": {{ToBase64UrlJsonValue(authenticatorData)}},
+                    "clientDataJSON": {{ToBase64UrlJsonValue(clientDataJson)}},
+                    "signature": {{ToBase64UrlJsonValue(signature)}},
+                    "userHandle": {{ToBase64UrlJsonValue(User.Id)}}
+                  },
+                  "type": "public-key",
+                  "clientExtensionResults": {},
+                  "authenticatorAttachment": "platform"
+                }
+                """);
+
+            var context = new PasskeyAssertionContext
+            {
+                CredentialJson = credentialJson!,
+                AssertionState = assertionStateJson,
+                HttpContext = httpContext.Object,
+            };
+
+            return await handler.PerformAssertionAsync(context);
+        }
+    }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAttestationTest.cs b/src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAttestationTest.cs
new file mode 100644
index 000000000000..32f066e877d1
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/PasskeyHandlerAttestationTest.cs
@@ -0,0 +1,1098 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using System.Buffers.Text;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Moq;
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+using static JsonHelpers;
+using static CredentialHelpers;
+
+public class PasskeyHandlerAttestationTest
+{
+    [Fact]
+    public async Task CanSucceed()
+    {
+        var test = new AttestationTest();
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialIdIsMissing()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            Assert.True(credentialJson.Remove("id"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'id'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenCredentialIdIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["id"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialIdIsNotBase64UrlEncoded()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var base64UrlCredentialId = (string)credentialJson["id"]!;
+            credentialJson["id"] = GetInvalidBase64UrlValue(base64UrlCredentialId);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("base64url string", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialTypeIsMissing()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            Assert.True(credentialJson.Remove("type"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'type'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenCredentialTypeIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["type"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialTypeIsNotPublicKey()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["type"] = "unexpected-value";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Expected credential type 'public-key', got 'unexpected-value'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialResponseIsMissing()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            Assert.True(credentialJson.Remove("response"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'response'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("\"hello\"")]
+    public async Task Fails_WhenCredentialResponseIsNotAnObject(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationStateUserEntityIdIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            var user = attestationStateJson["userEntity"]!.AsObject();
+            Assert.True(user.Remove("id"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'id'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAttestationStateUserEntityIdIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            attestationStateJson["userEntity"]!["id"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationStateUserEntityNameIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            var user = attestationStateJson["userEntity"]!.AsObject();
+            Assert.True(user.Remove("name"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'name'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAttestationStateUserEntityNameIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            attestationStateJson["userEntity"]!["name"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationStateUserEntityDisplayNameIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            var user = attestationStateJson["userEntity"]!.AsObject();
+            Assert.True(user.Remove("displayName"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'displayName'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAttestationStateUserEntityDisplayNameIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            attestationStateJson["userEntity"]!["displayName"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationStateUserEntityIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            Assert.True(attestationStateJson.Remove("userEntity"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'userEntity'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationStateChallengeIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            Assert.True(attestationStateJson.Remove("challenge"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'challenge'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAttestationStateChallengeIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.AttestationStateJson.TransformAsJsonObject(attestationStateJson =>
+        {
+            attestationStateJson["challenge"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation state JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonIsMissing()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var response = credentialJson["response"]!.AsObject();
+            Assert.True(response.Remove("clientDataJSON"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'clientDataJSON'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["clientDataJSON"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonIsEmptyString()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["clientDataJSON"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectIsMissing()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            var response = credentialJson["response"]!.AsObject();
+            Assert.True(response.Remove("attestationObject"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'attestationObject'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenAttestationObjectIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["attestationObject"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation credential JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectIsEmptyString()
+    {
+        var test = new AttestationTest();
+        test.CredentialJson.TransformAsJsonObject(credentialJson =>
+        {
+            credentialJson["response"]!["attestationObject"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation object had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonTypeIsMissing()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            Assert.True(clientDataJson.Remove("type"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'type'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonTypeIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["type"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("webauthn.get")]
+    [InlineData("unexpected-value")]
+    public async Task Fails_WhenClientDataJsonTypeIsNotExpected(string value)
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["type"] = value;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Expected the client data JSON 'type' field to be 'webauthn.create'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsMissing()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            Assert.True(clientDataJson.Remove("challenge"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'challenge'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonChallengeIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["challenge"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsEmptyString()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["challenge"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response challenge does not match original challenge", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsNotBase64UrlEncoded()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            var base64UrlChallenge = (string)clientDataJson["challenge"]!;
+            clientDataJson["challenge"] = GetInvalidBase64UrlValue(base64UrlChallenge);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("base64url string", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonChallengeIsNotRequestChallenge()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            var challenge = Base64Url.DecodeFromChars((string)clientDataJson["challenge"]!);
+            challenge[0]++;
+            clientDataJson["challenge"] = Base64Url.EncodeToString(challenge);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response challenge does not match original challenge", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonOriginIsMissing()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            Assert.True(clientDataJson.Remove("origin"));
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'origin'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("null")]
+    [InlineData("{}")]
+    public async Task Fails_WhenClientDataJsonOriginIsNotString(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["origin"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonOriginIsEmptyString()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["origin"] = "";
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator response had an invalid origin ''", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("https://example.com", "http://example.com")]
+    [InlineData("http://example.com", "https://example.com")]
+    [InlineData("https://example.com", "https://foo.example.com")]
+    [InlineData("https://example.com", "https://example.com:5000")]
+    public async Task Fails_WhenClientDataJsonOriginDoesNotMatchTheExpectedOrigin(string expectedOrigin, string returnedOrigin)
+    {
+        var test = new AttestationTest
+        {
+            Origin = expectedOrigin,
+        };
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["origin"] = returnedOrigin;
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith($"The authenticator response had an invalid origin '{returnedOrigin}'", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData("42")]
+    [InlineData("\"hello\"")]
+    public async Task Fails_WhenClientDataJsonTokenBindingIsNotObject(string jsonValue)
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["tokenBinding"] = JsonNode.Parse(jsonValue);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonTokenBindingStatusIsMissing()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["tokenBinding"] = JsonNode.Parse("{}");
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The client data JSON had an invalid format", result.Failure.Message);
+        Assert.Contains("was missing required properties including: 'status'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenClientDataJsonTokenBindingStatusIsInvalid()
+    {
+        var test = new AttestationTest();
+        test.ClientDataJson.TransformAsJsonObject(clientDataJson =>
+        {
+            clientDataJson["tokenBinding"] = JsonNode.Parse("""
+                {
+                  "status": "unexpected-value"
+                }
+                """);
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Invalid token binding status 'unexpected-value'", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Succeeds_WhenAuthDataContainsExtensionData()
+    {
+        var test = new AttestationTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags | AuthenticatorDataFlags.HasExtensionData,
+            Extensions = (byte[])[0xA0] // Empty CBOR map.
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAuthDataIsNotBackupEligibleButBackedUp()
+    {
+        var test = new AttestationTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = (args.Flags | AuthenticatorDataFlags.BackedUp) & ~AuthenticatorDataFlags.BackupEligible,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The credential is backed up, but the authenticator data flags did not have the 'BackupEligible' flag", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Succeeds_WhenAuthDataIsBackupEligible()
+    {
+        var test = new AttestationTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags | AuthenticatorDataFlags.BackupEligible,
+        });
+
+        var result = await test.RunAsync();
+        Assert.True(result.Succeeded);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectIsNotCborEncoded()
+    {
+        var test = new AttestationTest();
+        test.AttestationObject.Transform(bytes => Encoding.UTF8.GetBytes("Not a CBOR map"));
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation object had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectFmtIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationObjectArgs.Transform(args => args with
+        {
+            Format = null,
+            CborMapLength = args.CborMapLength - 1, // Because of the removed format
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation object did not include an attestation statement format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectStmtFieldIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationObjectArgs.Transform(args => args with
+        {
+            AttestationStatement = null,
+            CborMapLength = args.CborMapLength - 1, // Because of the removed attestation statement
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation object did not include an attestation statement", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectAuthDataFieldIsMissing()
+    {
+        var test = new AttestationTest();
+        test.AttestationObjectArgs.Transform(args => args with
+        {
+            AuthenticatorData = null,
+            CborMapLength = args.CborMapLength - 1, // Because of the removed authenticator data
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation object did not include authenticator data", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestationObjectAuthDataFieldIsEmpty()
+    {
+        var test = new AttestationTest();
+        test.AttestationObjectArgs.Transform(args => args with
+        {
+            AuthenticatorData = ReadOnlyMemory<byte>.Empty,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data had an invalid byte count of 0", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestedCredentialDataIsPresentButWithoutFlag()
+    {
+        var test = new AttestationTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            // Remove the flag without removing the attested credential data
+            Flags = args.Flags & ~AuthenticatorDataFlags.HasAttestedCredentialData,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data had an invalid format", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestedCredentialDataIsNotPresentButWithFlag()
+    {
+        var test = new AttestationTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            // Remove the attested credential data without changing the flags
+            AttestedCredentialData = null,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attested credential data had an invalid byte count of 0", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestedCredentialDataIsNotPresent()
+    {
+        var test = new AttestationTest();
+        test.AuthenticatorDataArgs.Transform(args => args with
+        {
+            Flags = args.Flags & ~AuthenticatorDataFlags.HasAttestedCredentialData,
+            AttestedCredentialData = null,
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("No attested credential data was provided by the authenticator", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenAttestedCredentialDataHasExtraBytes()
+    {
+        var test = new AttestationTest();
+        test.AttestedCredentialData.Transform(attestedCredentialData =>
+        {
+            return (byte[])[.. attestedCredentialData.Span, 0xFF, 0xFF, 0xFF, 0xFF];
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The authenticator data had an invalid format", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData((int)COSEAlgorithmIdentifier.PS256)]
+    [InlineData((int)COSEAlgorithmIdentifier.PS384)]
+    [InlineData((int)COSEAlgorithmIdentifier.PS512)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS256)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS384)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS512)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES256)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES384)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES512)]
+    public async Task Succeeds_WithSupportedAlgorithms(int algorithm)
+    {
+        var test = new AttestationTest
+        {
+            Algorithm = (COSEAlgorithmIdentifier)algorithm,
+        };
+        test.PasskeyOptions.IsAllowedAlgorithm = alg => alg == algorithm;
+
+        var result = await test.RunAsync();
+
+        Assert.True(result.Succeeded);
+    }
+
+    [Theory]
+    [InlineData((int)COSEAlgorithmIdentifier.PS256)]
+    [InlineData((int)COSEAlgorithmIdentifier.PS384)]
+    [InlineData((int)COSEAlgorithmIdentifier.PS512)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS256)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS384)]
+    [InlineData((int)COSEAlgorithmIdentifier.RS512)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES256)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES384)]
+    [InlineData((int)COSEAlgorithmIdentifier.ES512)]
+    public async Task Fails_WhenAlgorithmIsNotSupported(int algorithm)
+    {
+        var test = new AttestationTest
+        {
+            Algorithm = (COSEAlgorithmIdentifier)algorithm,
+        };
+        test.PasskeyOptions.IsAllowedAlgorithm = alg => alg != algorithm;
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The credential public key algorithm does not match any of the supported algorithms", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenVerifyAttestationStatementAsyncReturnsFalse()
+    {
+        var test = new AttestationTest();
+        test.PasskeyOptions.VerifyAttestationStatement = context => ValueTask.FromResult(false);
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The attestation statement was not valid", result.Failure.Message);
+    }
+
+    [Theory]
+    [InlineData(1024)]
+    [InlineData(2048)]
+    public async Task Fails_WhenCredentialIdIsTooLong(int length)
+    {
+        var test = new AttestationTest
+        {
+            CredentialId = RandomNumberGenerator.GetBytes(length),
+        };
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("Expected the credential ID to have a length between 1 and 1023 bytes", result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialIdDoesNotMatchAttestedCredentialId()
+    {
+        var test = new AttestationTest();
+        test.AttestedCredentialDataArgs.Transform(args =>
+        {
+            var newCredentialId = args.CredentialId.ToArray();
+            newCredentialId[0]++;
+            return args with { CredentialId = newCredentialId };
+        });
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith(
+            "The provided credential ID does not match the credential ID in the attested credential data",
+            result.Failure.Message);
+    }
+
+    [Fact]
+    public async Task Fails_WhenCredentialIdAlreadyExistsForAnotherUser()
+    {
+        var test = new AttestationTest
+        {
+            DoesCredentialAlreadyExistForAnotherUser = true,
+        };
+
+        var result = await test.RunAsync();
+
+        Assert.False(result.Succeeded);
+        Assert.StartsWith("The credential is already registered for a user", result.Failure.Message);
+    }
+
+    private static string GetInvalidBase64UrlValue(string base64UrlValue)
+    {
+        var rawValue = Base64Url.DecodeFromChars(base64UrlValue);
+        return Convert.ToBase64String(rawValue) + "==";
+    }
+
+    private sealed class AttestationTest : PasskeyScenarioTest<PasskeyAttestationResult>
+    {
+        private static readonly byte[] _defaultCredentialId = [1, 2, 3, 4, 5, 6, 7, 8];
+        private static readonly byte[] _defaultAaguid = new byte[16];
+        private static readonly byte[] _defaultAttestationStatement = [0xA0]; // Empty CBOR map
+
+        public IdentityPasskeyOptions PasskeyOptions { get; } = new()
+        {
+            UserVerificationRequirement = "preferred",
+        };
+        public string? UserId { get; set; } = "df0a3af4-bd65-440f-82bd-5b839e300dcd";
+        public string? UserName { get; set; } = "johndoe";
+        public string? UserDisplayName { get; set; } = "John Doe";
+        public string? Origin { get; set; } = "https://example.com";
+        public bool DoesCredentialAlreadyExistForAnotherUser { get; set; }
+        public COSEAlgorithmIdentifier Algorithm { get; set; } = COSEAlgorithmIdentifier.ES256;
+        public ReadOnlyMemory<byte> CredentialId { get; set; } = _defaultCredentialId;
+        public ComputedValue<AttestedCredentialDataArgs> AttestedCredentialDataArgs { get; } = new();
+        public ComputedValue<AuthenticatorDataArgs> AuthenticatorDataArgs { get; } = new();
+        public ComputedValue<AttestationObjectArgs> AttestationObjectArgs { get; } = new();
+        public ComputedValue<ReadOnlyMemory<byte>> AttestedCredentialData { get; } = new();
+        public ComputedValue<ReadOnlyMemory<byte>> AuthenticatorData { get; } = new();
+        public ComputedValue<ReadOnlyMemory<byte>> AttestationObject { get; } = new();
+        public ComputedJsonObject AttestationStateJson { get; } = new();
+        public ComputedJsonObject ClientDataJson { get; } = new();
+        public ComputedJsonObject CredentialJson { get; } = new();
+
+        protected override async Task<PasskeyAttestationResult> RunCoreAsync()
+        {
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Request.Headers.Origin).Returns(new StringValues(Origin));
+
+            var userManager = MockHelpers.MockUserManager<PocoUser>();
+
+            if (DoesCredentialAlreadyExistForAnotherUser)
+            {
+                var existingUser = new PocoUser(userName: "existing_user");
+                userManager
+                    .Setup(m => m.FindByPasskeyIdAsync(It.IsAny<byte[]>()))
+                    .Returns((byte[] credentialId) =>
+                    {
+                        if (CredentialId.Span.SequenceEqual(credentialId))
+                        {
+                            return Task.FromResult<PocoUser?>(existingUser);
+                        }
+
+                        return Task.FromResult<PocoUser?>(null);
+                    });
+            }
+
+            var passkeyOptions = Options.Create(PasskeyOptions);
+            var handler = new PasskeyHandler<PocoUser>(userManager.Object, passkeyOptions);
+            var userEntity = new PasskeyUserEntity()
+            {
+                Id = UserId!,
+                Name = UserName!,
+                DisplayName = UserDisplayName!,
+            };
+
+            var creationOptionsResult = await handler.MakeCreationOptionsAsync(userEntity, httpContext.Object);
+            var creationOptions = JsonSerializer.Deserialize(
+                creationOptionsResult.CreationOptionsJson,
+                IdentityJsonSerializerContext.Default.PublicKeyCredentialCreationOptions)
+                ?? throw new InvalidOperationException("Failed to deserialize creation options JSON.");
+
+            var attestationState = AttestationStateJson.Compute(creationOptionsResult.AttestationState);
+            var credential = CredentialKeyPair.Generate(Algorithm);
+            var credentialPublicKey = credential.EncodePublicKeyCbor();
+            var attestedCredentialDataArgs = AttestedCredentialDataArgs.Compute(new()
+            {
+                Aaguid = _defaultAaguid,
+                CredentialId = CredentialId,
+                CredentialPublicKey = credentialPublicKey,
+            });
+            var attestedCredentialData = AttestedCredentialData.Compute(MakeAttestedCredentialData(attestedCredentialDataArgs));
+            var authenticatorDataArgs = AuthenticatorDataArgs.Compute(new()
+            {
+                SignCount = 1,
+                RpIdHash = SHA256.HashData(Encoding.UTF8.GetBytes(creationOptions.Rp.Id ?? string.Empty)),
+                AttestedCredentialData = attestedCredentialData,
+                Flags = AuthenticatorDataFlags.UserPresent | AuthenticatorDataFlags.HasAttestedCredentialData,
+            });
+            var authenticatorData = AuthenticatorData.Compute(MakeAuthenticatorData(authenticatorDataArgs));
+            var attestationObjectArgs = AttestationObjectArgs.Compute(new()
+            {
+                CborMapLength = 3, // Format, AuthenticatorData, AttestationStatement
+                Format = "none",
+                AuthenticatorData = authenticatorData,
+                AttestationStatement = _defaultAttestationStatement,
+            });
+            var attestationObject = AttestationObject.Compute(MakeAttestationObject(attestationObjectArgs));
+            var clientDataJson = ClientDataJson.Compute($$"""
+                {
+                  "challenge": {{ToBase64UrlJsonValue(creationOptions.Challenge.AsMemory())}},
+                  "origin": {{ToJsonValue(Origin)}},
+                  "type": "webauthn.create"
+                }
+                """);
+            var credentialJson = CredentialJson.Compute($$"""
+                {
+                  "id": {{ToBase64UrlJsonValue(CredentialId)}},
+                  "response": {
+                    "attestationObject": {{ToBase64UrlJsonValue(attestationObject)}},
+                    "clientDataJSON": {{ToBase64UrlJsonValue(clientDataJson)}},
+                    "transports": [
+                      "internal"
+                    ]
+                  },
+                  "type": "public-key",
+                  "clientExtensionResults": {},
+                  "authenticatorAttachment": "platform"
+                }
+                """);
+            var context = new PasskeyAttestationContext
+            {
+                CredentialJson = credentialJson!,
+                HttpContext = httpContext.Object,
+                AttestationState = attestationState,
+            };
+
+            return await handler.PerformAttestationAsync(context);
+        }
+    }
+}
diff --git a/src/Identity/test/Identity.Test/Passkeys/PasskeyScenarioTest.cs b/src/Identity/test/Identity.Test/Passkeys/PasskeyScenarioTest.cs
new file mode 100644
index 000000000000..fa8d552a2a60
--- /dev/null
+++ b/src/Identity/test/Identity.Test/Passkeys/PasskeyScenarioTest.cs
@@ -0,0 +1,127 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable enable
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+// Represents a test for a passkey scenario (attestation or assertion)
+internal abstract class PasskeyScenarioTest<TResult>
+{
+    private bool _hasStarted;
+
+    public Task<TResult> RunAsync()
+    {
+        if (_hasStarted)
+        {
+            throw new InvalidOperationException("The test can only be run once.");
+        }
+
+        _hasStarted = true;
+        return RunCoreAsync();
+    }
+
+    protected abstract Task<TResult> RunCoreAsync();
+
+    // While some test configuration can be set directly on scenario classes (AttestationTest and AssertionTest),
+    // individual tests may need to modify values computed during execution (e.g., JSON payloads, hashes).
+    // This helper enables trivial customization of test scenarios by allowing injection of custom logic to
+    // transform runtime values.
+    public class ComputedValue<TValue>
+    {
+        private bool _isComputed;
+        private TValue? _computedValue;
+        private Func<TValue, TValue?>? _transformFunc;
+
+        public TValue GetValue()
+        {
+            if (!_isComputed)
+            {
+                throw new InvalidOperationException("Cannot get the value because it has not yet been computed.");
+            }
+
+            return _computedValue!;
+        }
+
+        public virtual TValue Compute(TValue initialValue)
+        {
+            if (_isComputed)
+            {
+                throw new InvalidOperationException("Cannot compute a value multiple times.");
+            }
+
+            if (_transformFunc is not null)
+            {
+                initialValue = _transformFunc(initialValue) ?? initialValue;
+            }
+
+            _isComputed = true;
+            _computedValue = initialValue;
+            return _computedValue;
+        }
+
+        public virtual void Transform(Func<TValue, TValue?> transform)
+        {
+            if (_transformFunc is not null)
+            {
+                throw new InvalidOperationException("Cannot transform a value multiple times.");
+            }
+
+            _transformFunc = transform;
+        }
+    }
+
+    public sealed class ComputedJsonObject : ComputedValue<string?>
+    {
+        private static readonly JsonSerializerOptions _jsonSerializerOptions = new()
+        {
+            WriteIndented = true,
+        };
+
+        private JsonElement? _jsonElementValue;
+
+        public JsonElement GetValueAsJsonElement()
+        {
+            if (_jsonElementValue is null)
+            {
+                var rawValue = GetValue() ?? throw new InvalidOperationException("Cannot get the value as a JSON element because it is null.");
+                try
+                {
+                    _jsonElementValue = JsonSerializer.Deserialize<JsonElement>(rawValue, _jsonSerializerOptions);
+                }
+                catch (JsonException ex)
+                {
+                    throw new InvalidOperationException("Cannot get the value as a JSON element because it is not valid JSON.", ex);
+                }
+            }
+
+            return _jsonElementValue.Value;
+        }
+
+        public void TransformAsJsonObject(Action<JsonObject> transform)
+        {
+            Transform(value =>
+            {
+                try
+                {
+                    if (value is null)
+                    {
+                        throw new InvalidOperationException("Cannot transform a null JSON value.");
+                    }
+
+                    var jsonObject = JsonNode.Parse(value)?.AsObject()
+                        ?? throw new InvalidOperationException("Could not transform the JSON value because it was unexpectedly null.");
+                    transform(jsonObject);
+                    return jsonObject.ToJsonString(_jsonSerializerOptions);
+                }
+                catch (JsonException ex)
+                {
+                    throw new InvalidOperationException("Could not transform the value because it was not valid JSON.", ex);
+                }
+            });
+        }
+    }
+}
diff --git a/src/Identity/test/Identity.Test/PasswordHasherTest.cs b/src/Identity/test/Identity.Test/PasswordHasherTest.cs
index e31a877e67f5..74cf2d152dad 100644
--- a/src/Identity/test/Identity.Test/PasswordHasherTest.cs
+++ b/src/Identity/test/Identity.Test/PasswordHasherTest.cs
@@ -112,6 +112,9 @@ public void HashPassword_Version3()
     [InlineData("AQAAAAAAAAD6AAAAEAhftMyfTJyAAAAAAAAAAAAAAAAAAAih5WsjXaR3PA9M")] // incorrect password
     [InlineData("AQAAAAIAAAAyAAAAEOMwvh3+FZxqkdMBz2ekgGhwQ4A=")] // too short
     [InlineData("AQAAAAIAAAAyAAAAEOMwvh3+FZxqkdMBz2ekgGhwQ4B6pZWND6zgESBuWiHwAAAAAAAAAAAA")] // extra data at end
+    [InlineData("AQAAAAIAAYagAP///wABAgMEBQYHCAkKCwwNDg/Q8A0WMKbtHQJQ2DHCdoEeeFBrgNlldq6vH4qX/CGqGQ==")] // salt length greater than data length
+    [InlineData("AQAAAAEAACcQf////4r8+J3NDEnMWKlHbhJQ6N5oooZ7hUi3cr/qAjd7Lc1Sv6GhorP7Ly0AzCv9PAmKww==")] // salt length is Int32.MaxValue
+    [InlineData("AQAAAAIAAYagAAAACAABAgMEBQYH4qLSh7iNSI12qySxAkyR0XgpXpvNiwqhBJFNLbJKKFw=")] // salt length (8 bytes) less than minimum allowed
     public void VerifyHashedPassword_FailureCases(string hashedPassword)
     {
         // Arrange
diff --git a/src/Identity/test/Identity.Test/PasswordValidatorTest.cs b/src/Identity/test/Identity.Test/PasswordValidatorTest.cs
index 05a04ea6cffb..e1db5b5d0d74 100644
--- a/src/Identity/test/Identity.Test/PasswordValidatorTest.cs
+++ b/src/Identity/test/Identity.Test/PasswordValidatorTest.cs
@@ -24,15 +24,15 @@ public async Task ValidateThrowsWithNullTest()
 
         // Act
         // Assert
-        await Assert.ThrowsAsync<ArgumentNullException>("password", () => validator.ValidateAsync(null, null, null));
         await Assert.ThrowsAsync<ArgumentNullException>("manager", () => validator.ValidateAsync(null, null, "foo"));
     }
 
     [Theory]
+    [InlineData(null)]
     [InlineData("")]
     [InlineData("abc")]
     [InlineData("abcde")]
-    public async Task FailsIfTooShortTests(string input)
+    public async Task FailsIfPasswordIsNullOrTooShortTests(string input)
     {
         const string error = "Passwords must be at least 6 characters.";
         var manager = MockHelpers.TestUserManager<PocoUser>();
diff --git a/src/Identity/test/Identity.Test/SignInManagerTest.cs b/src/Identity/test/Identity.Test/SignInManagerTest.cs
index d1072676138a..c71662ecc295 100644
--- a/src/Identity/test/Identity.Test/SignInManagerTest.cs
+++ b/src/Identity/test/Identity.Test/SignInManagerTest.cs
@@ -1,11 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers.Text;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
 using System.Security.Claims;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -31,8 +38,12 @@ public void ConstructorNullChecks()
     public async Task PasswordSignInReturnsLockedOutWhenLockedOut()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateDurationName);
+        using var signInUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignInsCounterName);
+
         var user = new PocoUser { UserName = "Foo" };
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
         manager.Setup(m => m.SupportsUserLockout).Returns(true).Verifiable();
         manager.Setup(m => m.IsLockedOutAsync(user)).ReturnsAsync(true).Verifiable();
 
@@ -55,14 +66,28 @@ public async Task PasswordSignInReturnsLockedOutWhenLockedOut()
         Assert.True(result.IsLockedOut);
         Assert.Contains($"User is currently locked out.", logger.LogMessages);
         manager.Verify();
+
+        Assert.Collection(authenticate.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.type", "password"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "locked_out"),
+            ]));
+        Assert.Empty(signInUserPrincipal.GetMeasurementSnapshot());
     }
 
     [Fact]
     public async Task CheckPasswordSignInReturnsLockedOutWhenLockedOut()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var checkPasswordSignIn = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.CheckPasswordAttemptsCounterName);
+
         var user = new PocoUser { UserName = "Foo" };
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
         manager.Setup(m => m.SupportsUserLockout).Returns(true).Verifiable();
         manager.Setup(m => m.IsLockedOutAsync(user)).ReturnsAsync(true).Verifiable();
 
@@ -85,11 +110,21 @@ public async Task CheckPasswordSignInReturnsLockedOutWhenLockedOut()
         Assert.True(result.IsLockedOut);
         Assert.Contains($"User is currently locked out.", logger.LogMessages);
         manager.Verify();
+
+        Assert.Collection(checkPasswordSignIn.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "locked_out"),
+            ]));
     }
 
-    private static Mock<UserManager<PocoUser>> SetupUserManager(PocoUser user)
+    private static Mock<UserManager<PocoUser>> SetupUserManager(
+        PocoUser user,
+        IMeterFactory meterFactory = null,
+        IPasskeyHandler<PocoUser> passkeyHandler = null)
     {
-        var manager = MockHelpers.MockUserManager<PocoUser>();
+        var manager = MockHelpers.MockUserManager<PocoUser>(meterFactory, passkeyHandler);
         manager.Setup(m => m.FindByNameAsync(user.UserName)).ReturnsAsync(user);
         manager.Setup(m => m.FindByIdAsync(user.Id)).ReturnsAsync(user);
         manager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.Id.ToString());
@@ -97,7 +132,12 @@ private static Mock<UserManager<PocoUser>> SetupUserManager(PocoUser user)
         return manager;
     }
 
-    private static SignInManager<PocoUser> SetupSignInManager(UserManager<PocoUser> manager, HttpContext context, ILogger logger = null, IdentityOptions identityOptions = null, IAuthenticationSchemeProvider schemeProvider = null)
+    private static SignInManager<PocoUser> SetupSignInManager(
+        UserManager<PocoUser> manager,
+        HttpContext context,
+        ILogger logger = null,
+        IdentityOptions identityOptions = null,
+        IAuthenticationSchemeProvider schemeProvider = null)
     {
         var contextAccessor = new Mock<IHttpContextAccessor>();
         contextAccessor.Setup(a => a.HttpContext).Returns(context);
@@ -107,7 +147,14 @@ private static SignInManager<PocoUser> SetupSignInManager(UserManager<PocoUser>
         options.Setup(a => a.Value).Returns(identityOptions);
         var claimsFactory = new UserClaimsPrincipalFactory<PocoUser, PocoRole>(manager, roleManager.Object, options.Object);
         schemeProvider = schemeProvider ?? new MockSchemeProvider();
-        var sm = new SignInManager<PocoUser>(manager, contextAccessor.Object, claimsFactory, options.Object, null, schemeProvider, new DefaultUserConfirmation<PocoUser>());
+        var sm = new SignInManager<PocoUser>(
+            manager,
+            contextAccessor.Object,
+            claimsFactory,
+            options.Object,
+            null,
+            schemeProvider,
+            new DefaultUserConfirmation<PocoUser>());
         sm.Logger = logger ?? NullLogger<SignInManager<PocoUser>>.Instance;
         return sm;
     }
@@ -300,10 +347,14 @@ public async Task PasswordSignInRequiresVerification(bool supportsLockout)
     public async Task ExternalSignInRequiresVerificationIfNotBypassed(bool bypass)
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateDurationName);
+        using var signInUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignInsCounterName);
+
         var user = new PocoUser { UserName = "Foo" };
         const string loginProvider = "login";
         const string providerKey = "fookey";
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
         manager.Setup(m => m.SupportsUserLockout).Returns(false).Verifiable();
         manager.Setup(m => m.FindByLoginAsync(loginProvider, providerKey)).ReturnsAsync(user).Verifiable();
         if (!bypass)
@@ -337,6 +388,141 @@ public async Task ExternalSignInRequiresVerificationIfNotBypassed(bool bypass)
         Assert.Equal(!bypass, result.RequiresTwoFactor);
         manager.Verify();
         auth.Verify();
+
+        if (bypass)
+        {
+            Assert.Collection(authenticate.GetMeasurementSnapshot(),
+                m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+                [
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                    KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.type", "external"),
+                    KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "success"),
+                ]));
+            Assert.Collection(signInUserPrincipal.GetMeasurementSnapshot(),
+                m => MetricsHelpers.AssertContainsTags(m.Tags,
+                [
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                    KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                    KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+                ]));
+        }
+        else
+        {
+            Assert.Collection(authenticate.GetMeasurementSnapshot(),
+                m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+                [
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                    KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.type", "external"),
+                    KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "requires_two_factor"),
+                ]));
+            Assert.Empty(signInUserPrincipal.GetMeasurementSnapshot());
+        }
+    }
+
+    [Fact]
+    public async Task CanPasskeySignIn()
+    {
+        // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateDurationName);
+        using var signInUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignInsCounterName);
+
+        var user = new PocoUser { UserName = "Foo" };
+        var passkey = new UserPasskeyInfo(null, null, default, 0, null, false, false, false, null, null);
+        var assertionResult = PasskeyAssertionResult.Success(passkey, user);
+        var passkeyHandler = new Mock<IPasskeyHandler<PocoUser>>();
+        var expectedOptionsJson = "<some-options-json>";
+        passkeyHandler
+            .Setup(h => h.MakeRequestOptionsAsync(user, It.IsAny<HttpContext>()))
+            .Returns(Task.FromResult(new PasskeyRequestOptionsResult
+            {
+                AssertionState = "<some-assertion-state>",
+                RequestOptionsJson = expectedOptionsJson,
+            }));
+        passkeyHandler
+            .Setup(h => h.PerformAssertionAsync(It.IsAny<PasskeyAssertionContext>()))
+            .Returns(Task.FromResult(assertionResult));
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory, passkeyHandler: passkeyHandler.Object);
+        manager
+            .Setup(m => m.AddOrUpdatePasskeyAsync(user, passkey))
+            .Returns(Task.FromResult(IdentityResult.Success))
+            .Verifiable();
+        var context = new DefaultHttpContext();
+        var auth = MockAuth(context);
+        SetupSignIn(context, auth, user.Id, isPersistent: false, loginProvider: null);
+        SetupPasskeyAuth(context, auth);
+        var helper = SetupSignInManager(manager.Object, context);
+
+        // Act
+        var optionsJson = await helper.MakePasskeyRequestOptionsAsync(user);
+        var signInResult = await helper.PasskeySignInAsync(credentialJson: "<some-passkey>");
+
+        // Assert
+        Assert.Equal(expectedOptionsJson, optionsJson);
+        Assert.True(assertionResult.Succeeded);
+        Assert.Same(SignInResult.Success, signInResult);
+        manager.Verify();
+        auth.Verify();
+
+        Assert.Collection(authenticate.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.type", "passkey"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "success"),
+            ]));
+        Assert.Collection(signInUserPrincipal.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+            ]));
+    }
+
+    private static void SetupPasskeyAuth(HttpContext context, Mock<IAuthenticationService> auth)
+    {
+        // Calling AuthenticateAsync will return a failure result
+        // unless SignInAsync has been called first.
+        var failedAuthenticateResult = AuthenticateResult.Fail("Not currently signed in.");
+        var authenticateResult = failedAuthenticateResult;
+
+        auth.Setup(a => a.SignInAsync(
+            context,
+            IdentityConstants.TwoFactorUserIdScheme,
+            It.IsAny<ClaimsPrincipal>(),
+            It.IsAny<AuthenticationProperties>()))
+            .Callback((HttpContext context, string scheme, ClaimsPrincipal claimsPrincipal, AuthenticationProperties authenticationProperties) =>
+            {
+                var authenticationTicket = new AuthenticationTicket(
+                    claimsPrincipal,
+                    authenticationProperties,
+                    IdentityConstants.TwoFactorUserIdScheme);
+                authenticateResult = AuthenticateResult.Success(authenticationTicket);
+            })
+            .Returns(Task.CompletedTask)
+            .Verifiable();
+
+        auth.Setup(a => a.SignOutAsync(
+            context,
+            IdentityConstants.TwoFactorUserIdScheme,
+            It.IsAny<AuthenticationProperties>()))
+            .Callback(() =>
+            {
+                authenticateResult = failedAuthenticateResult;
+            })
+            .Returns(Task.CompletedTask)
+            .Verifiable();
+
+        auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.TwoFactorUserIdScheme))
+            .Returns(() => Task.FromResult(authenticateResult))
+            .Verifiable();
     }
 
     private class GoodTokenProvider : AuthenticatorTokenProvider<PocoUser>
@@ -587,43 +773,78 @@ public async Task CanExternalSignIn(bool isPersistent, bool supportsLockout)
         auth.Verify();
     }
 
+    [Fact]
+    public async Task SignInAsync_Failure()
+    {
+        // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var signInUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignInsCounterName);
+
+        var user = new PocoUser { UserName = "Foo" };
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
+
+        var context = new DefaultHttpContext();
+        var auth = MockAuth(context);
+        var helper = SetupSignInManager(manager.Object, context);
+        auth.Setup(a => a.SignInAsync(context, IdentityConstants.ApplicationScheme, It.IsAny<ClaimsPrincipal>(), It.IsAny<AuthenticationProperties>()))
+            .Throws(new InvalidOperationException("SignInAsync failed")).Verifiable();
+
+        // Act
+        await Assert.ThrowsAsync<InvalidOperationException>(() => helper.SignInAsync(user, isPersistent: false));
+
+        // Assert
+        manager.Verify();
+        auth.Verify();
+
+        Assert.Collection(signInUserPrincipal.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("error.type", "System.InvalidOperationException"),
+            ]));
+    }
+
     [Theory]
     [InlineData(true, true)]
     [InlineData(true, false)]
     [InlineData(false, true)]
     [InlineData(false, false)]
-    public async Task CanResignIn(
-        // Suppress warning that says theory methods should use all of their parameters.
-        // See comments below about why this isn't used.
-#pragma warning disable xUnit1026
-        bool isPersistent,
-#pragma warning restore xUnit1026
-        bool externalLogin)
+    public async Task CanResignIn(bool isPersistent, bool externalLogin)
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateDurationName);
+
         var user = new PocoUser { UserName = "Foo" };
         var context = new DefaultHttpContext();
         var auth = MockAuth(context);
         var loginProvider = "loginprovider";
-        var id = new ClaimsIdentity();
+        var id = new ClaimsIdentity("authscheme");
         if (externalLogin)
         {
             id.AddClaim(new Claim(ClaimTypes.AuthenticationMethod, loginProvider));
         }
-        // REVIEW: auth changes we lost the ability to mock is persistent
-        //var properties = new AuthenticationProperties { IsPersistent = isPersistent };
-        var authResult = AuthenticateResult.NoResult();
+
+        var claimsPrincipal = new ClaimsPrincipal(id);
+        var properties = new AuthenticationProperties { IsPersistent = isPersistent };
+        var authResult = AuthenticateResult.Success(new AuthenticationTicket(claimsPrincipal, properties, "authscheme"));
         auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.ApplicationScheme))
             .Returns(Task.FromResult(authResult)).Verifiable();
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
+        manager.Setup(m => m.GetUserId(claimsPrincipal)).Returns(user.Id.ToString());
         var signInManager = new Mock<SignInManager<PocoUser>>(manager.Object,
             new HttpContextAccessor { HttpContext = context },
             new Mock<IUserClaimsPrincipalFactory<PocoUser>>().Object,
             null, null, new Mock<IAuthenticationSchemeProvider>().Object, null)
         { CallBase = true };
-        //signInManager.Setup(s => s.SignInAsync(user, It.Is<AuthenticationProperties>(p => p.IsPersistent == isPersistent),
-        //externalLogin? loginProvider : null)).Returns(Task.FromResult(0)).Verifiable();
-        signInManager.Setup(s => s.SignInWithClaimsAsync(user, It.IsAny<AuthenticationProperties>(), It.IsAny<IEnumerable<Claim>>())).Returns(Task.FromResult(0)).Verifiable();
+
+        signInManager.Setup(s => s.SignInWithClaimsAsync(user,
+                It.Is<AuthenticationProperties>(properties => properties.IsPersistent == isPersistent),
+                It.Is<IEnumerable<Claim>>(claims => !externalLogin ||
+                    claims.Any(claim => claim.Type == ClaimTypes.AuthenticationMethod && claim.Value == loginProvider))))
+            .Returns(Task.FromResult(0)).Verifiable();
+
         signInManager.Object.Context = context;
 
         // Act
@@ -632,6 +853,80 @@ public async Task CanResignIn(
         // Assert
         auth.Verify();
         signInManager.Verify();
+
+        Assert.Collection(authenticate.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", isPersistent),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "success"),
+            ]));
+    }
+
+    [Fact]
+    public async Task ResignInNoOpsAndLogsErrorIfNotAuthenticated()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateDurationName);
+        using var signInUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignInsCounterName);
+
+        var user = new PocoUser { UserName = "Foo" };
+        var context = new DefaultHttpContext();
+        var auth = MockAuth(context);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
+        var logger = new TestLogger<SignInManager<PocoUser>>();
+        var signInManager = new Mock<SignInManager<PocoUser>>(manager.Object,
+            new HttpContextAccessor { HttpContext = context },
+            new Mock<IUserClaimsPrincipalFactory<PocoUser>>().Object,
+            null, logger, new Mock<IAuthenticationSchemeProvider>().Object, null)
+        { CallBase = true };
+        auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.ApplicationScheme))
+            .Returns(Task.FromResult(AuthenticateResult.NoResult())).Verifiable();
+
+        await signInManager.Object.RefreshSignInAsync(user);
+
+        Assert.Contains("RefreshSignInAsync prevented because the user is not currently authenticated. Use SignInAsync instead for initial sign in.", logger.LogMessages);
+        auth.Verify();
+        signInManager.Verify(s => s.SignInWithClaimsAsync(It.IsAny<PocoUser>(), It.IsAny<AuthenticationProperties>(), It.IsAny<IEnumerable<Claim>>()),
+            Times.Never());
+
+        Assert.Collection(authenticate.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "failure"),
+            ]));
+        Assert.Empty(signInUserPrincipal.GetMeasurementSnapshot());
+    }
+
+    [Fact]
+    public async Task ResignInNoOpsAndLogsErrorIfAuthenticatedWithDifferentUser()
+    {
+        var user = new PocoUser { UserName = "Foo" };
+        var context = new DefaultHttpContext();
+        var auth = MockAuth(context);
+        var manager = SetupUserManager(user);
+        var logger = new TestLogger<SignInManager<PocoUser>>();
+        var signInManager = new Mock<SignInManager<PocoUser>>(manager.Object,
+            new HttpContextAccessor { HttpContext = context },
+            new Mock<IUserClaimsPrincipalFactory<PocoUser>>().Object,
+            null, logger, new Mock<IAuthenticationSchemeProvider>().Object, null)
+        { CallBase = true };
+        var id = new ClaimsIdentity("authscheme");
+        var claimsPrincipal = new ClaimsPrincipal(id);
+        var authResult = AuthenticateResult.Success(new AuthenticationTicket(claimsPrincipal, new AuthenticationProperties(), "authscheme"));
+        auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.ApplicationScheme))
+            .Returns(Task.FromResult(authResult)).Verifiable();
+        manager.Setup(m => m.GetUserId(claimsPrincipal)).Returns("different");
+
+        await signInManager.Object.RefreshSignInAsync(user);
+
+        Assert.Contains("RefreshSignInAsync prevented because currently authenticated user has a different UserId. Use SignInAsync instead to change users.", logger.LogMessages);
+        auth.Verify();
+        signInManager.Verify(s => s.SignInWithClaimsAsync(It.IsAny<PocoUser>(), It.IsAny<AuthenticationProperties>(), It.IsAny<IEnumerable<Claim>>()),
+            Times.Never());
     }
 
     [Theory]
@@ -748,8 +1043,11 @@ public async Task TwoFactorSignInAsyncReturnsLockedOut()
     public async Task RememberClientStoresUserId()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var rememberTwoFactorClient = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.RememberedTwoFactorCounterName);
+
         var user = new PocoUser { UserName = "Foo" };
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
         var context = new DefaultHttpContext();
         var auth = MockAuth(context);
         var helper = SetupSignInManager(manager.Object, context);
@@ -766,6 +1064,46 @@ public async Task RememberClientStoresUserId()
         // Assert
         manager.Verify();
         auth.Verify();
+
+        Assert.Collection(rememberTwoFactorClient.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.TwoFactorRememberMe"),
+            ]));
+    }
+
+    [Fact]
+    public async Task ForgetTwoFactorClient()
+    {
+        // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var forgetTwoFactorClient = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.ForgottenTwoFactorCounterName);
+
+        var user = new PocoUser { UserName = "Foo" };
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
+        var context = new DefaultHttpContext();
+        var auth = MockAuth(context);
+        var helper = SetupSignInManager(manager.Object, context);
+        auth.Setup(a => a.SignOutAsync(
+            context,
+            IdentityConstants.TwoFactorRememberMeScheme,
+            It.IsAny<AuthenticationProperties>())).Returns(Task.FromException(new InvalidOperationException())).Verifiable();
+
+        // Act
+        await Assert.ThrowsAsync<InvalidOperationException>(() => helper.ForgetTwoFactorClientAsync());
+
+        // Assert
+        manager.Verify();
+        auth.Verify();
+
+        Assert.Collection(forgetTwoFactorClient.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.TwoFactorRememberMe"),
+                KeyValuePair.Create<string, object>("error.type", "System.InvalidOperationException"),
+            ]));
     }
 
     [Theory]
@@ -810,10 +1148,13 @@ private Mock<IAuthenticationService> MockAuth(HttpContext context)
     }
 
     [Fact]
-    public async Task SignOutCallsContextResponseSignOut()
+    public async Task SignOutCallsContextResponseSignOut_Success()
     {
         // Setup
-        var manager = MockHelpers.TestUserManager<PocoUser>();
+        var testMeterFactory = new TestMeterFactory();
+        using var signOutUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignOutsCounterName);
+
+        var manager = MockHelpers.TestUserManager<PocoUser>(meterFactory: testMeterFactory);
         var context = new DefaultHttpContext();
         var auth = MockAuth(context);
         auth.Setup(a => a.SignOutAsync(context, IdentityConstants.ApplicationScheme, It.IsAny<AuthenticationProperties>())).Returns(Task.FromResult(0)).Verifiable();
@@ -826,14 +1167,50 @@ public async Task SignOutCallsContextResponseSignOut()
 
         // Assert
         auth.Verify();
+
+        Assert.Collection(signOutUserPrincipal.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+            ]));
+    }
+
+    [Fact]
+    public async Task SignOutCallsContextResponseSignOut_Failure()
+    {
+        // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var signOutUserPrincipal = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.SignOutsCounterName);
+
+        var manager = MockHelpers.TestUserManager<PocoUser>(meterFactory: testMeterFactory);
+        var context = new DefaultHttpContext();
+        var auth = MockAuth(context);
+        auth.Setup(a => a.SignOutAsync(context, IdentityConstants.ApplicationScheme, It.IsAny<AuthenticationProperties>())).Returns(Task.FromException(new InvalidOperationException("error!"))).Verifiable();
+        var helper = SetupSignInManager(manager, context, null, manager.Options);
+
+        // Act
+        await Assert.ThrowsAsync<InvalidOperationException>(() => helper.SignOutAsync());
+
+        // Assert
+        Assert.Collection(signOutUserPrincipal.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("error.type", "System.InvalidOperationException"),
+            ]));
     }
 
     [Fact]
     public async Task PasswordSignInFailsWithWrongPassword()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var authenticate = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", SignInManagerMetrics.AuthenticateDurationName);
+
         var user = new PocoUser { UserName = "Foo" };
-        var manager = SetupUserManager(user);
+        var manager = SetupUserManager(user, meterFactory: testMeterFactory);
         manager.Setup(m => m.SupportsUserLockout).Returns(true).Verifiable();
         manager.Setup(m => m.IsLockedOutAsync(user)).ReturnsAsync(false).Verifiable();
         manager.Setup(m => m.CheckPasswordAsync(user, "[PLACEHOLDER]-bogus1")).ReturnsAsync(false).Verifiable();
@@ -851,6 +1228,16 @@ public async Task PasswordSignInFailsWithWrongPassword()
         Assert.Contains($"User failed to provide the correct password.", logger.LogMessages);
         manager.Verify();
         context.Verify();
+
+        Assert.Collection(authenticate.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.authentication.is_persistent", false),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.result", "failure"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.type", "password"),
+            ]));
     }
 
     [Fact]
diff --git a/src/Identity/test/Identity.Test/UserManagerTest.cs b/src/Identity/test/Identity.Test/UserManagerTest.cs
index f7017df33ef1..74c18d5c133b 100644
--- a/src/Identity/test/Identity.Test/UserManagerTest.cs
+++ b/src/Identity/test/Identity.Test/UserManagerTest.cs
@@ -1,10 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Globalization;
 using System.Security.Claims;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
 using Moq;
 
 namespace Microsoft.AspNetCore.Identity.Test;
@@ -121,13 +124,16 @@ public async Task CreateCallsUpdateEmailStore()
     }
 
     [Fact]
-    public async Task DeleteCallsStore()
+    public async Task DeleteCallsStore_Success()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var deleteUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.DeleteDurationName);
+
         var store = new Mock<IUserStore<PocoUser>>();
         var user = new PocoUser { UserName = "Foo" };
         store.Setup(s => s.DeleteAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
-        var userManager = MockHelpers.TestUserManager(store.Object);
+        var userManager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
 
         // Act
         var result = await userManager.DeleteAsync(user);
@@ -135,6 +141,41 @@ public async Task DeleteCallsStore()
         // Assert
         Assert.True(result.Succeeded);
         store.VerifyAll();
+
+        Assert.Collection(deleteUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "success")
+            ]));
+    }
+
+    [Fact]
+    public async Task DeleteCallsStore_Failure()
+    {
+        // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var deleteUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.DeleteDurationName);
+
+        var store = new Mock<IUserStore<PocoUser>>();
+        var user = new PocoUser { UserName = "Foo" };
+        store.Setup(s => s.DeleteAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Failed(new IdentityErrorDescriber().ConcurrencyFailure())).Verifiable();
+        var userManager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
+
+        // Act
+        var result = await userManager.DeleteAsync(user);
+
+        // Assert
+        Assert.False(result.Succeeded);
+        store.VerifyAll();
+
+        Assert.Collection(deleteUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "failure"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.error_code", "ConcurrencyFailure")
+            ]));
     }
 
     [Fact]
@@ -522,6 +563,9 @@ public async Task AddClaimsCallsStore()
     public async Task AddClaimCallsStore()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
         var store = new Mock<IUserClaimStore<PocoUser>>();
         var user = new PocoUser { UserName = "Foo" };
         var claim = new Claim("1", "1");
@@ -529,7 +573,7 @@ public async Task AddClaimCallsStore()
             .Returns(Task.FromResult(0))
             .Verifiable();
         store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
-        var userManager = MockHelpers.TestUserManager(store.Object);
+        var userManager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
 
         // Act
         var result = await userManager.AddClaimAsync(user, claim);
@@ -537,12 +581,22 @@ public async Task AddClaimCallsStore()
         // Assert
         Assert.True(result.Succeeded);
         store.VerifyAll();
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "add_claims"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "success")
+            ]));
     }
 
     [Fact]
     public async Task UpdateClaimCallsStore()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
         var store = new Mock<IUserClaimStore<PocoUser>>();
         var user = new PocoUser { UserName = "Foo" };
         var claim = new Claim("1", "1");
@@ -551,7 +605,7 @@ public async Task UpdateClaimCallsStore()
             .Returns(Task.FromResult(0))
             .Verifiable();
         store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).Returns(Task.FromResult(IdentityResult.Success)).Verifiable();
-        var userManager = MockHelpers.TestUserManager(store.Object);
+        var userManager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
 
         // Act
         var result = await userManager.ReplaceClaimAsync(user, claim, newClaim);
@@ -559,12 +613,23 @@ public async Task UpdateClaimCallsStore()
         // Assert
         Assert.True(result.Succeeded);
         store.VerifyAll();
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "replace_claim"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "success")
+            ]));
     }
 
     [Fact]
     public async Task CheckPasswordWillRehashPasswordWhenNeeded()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+        using var checkPassword = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.CheckPasswordAttemptsCounterName);
+
         var store = new Mock<IUserPasswordStore<PocoUser>>();
         var hasher = new Mock<IPasswordHasher<PocoUser>>();
         var user = new PocoUser { UserName = "Foo" };
@@ -580,7 +645,7 @@ public async Task CheckPasswordWillRehashPasswordWhenNeeded()
 
         hasher.Setup(s => s.VerifyHashedPassword(user, hashed, pwd)).Returns(PasswordVerificationResult.SuccessRehashNeeded).Verifiable();
         hasher.Setup(s => s.HashPassword(user, pwd)).Returns(rehashed).Verifiable();
-        var userManager = MockHelpers.TestUserManager(store.Object);
+        var userManager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
         userManager.PasswordHasher = hasher.Object;
 
         // Act
@@ -590,14 +655,29 @@ public async Task CheckPasswordWillRehashPasswordWhenNeeded()
         Assert.True(result);
         store.VerifyAll();
         hasher.VerifyAll();
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "password_rehash"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "success")
+            ]));
+        Assert.Collection(checkPassword.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.password_check_result", "success_rehash_needed")
+            ]));
     }
 
     [Fact]
     public async Task CreateFailsWithNullSecurityStamp()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var createUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.CreateDurationName);
+
         var store = new Mock<IUserSecurityStampStore<PocoUser>>();
-        var manager = MockHelpers.TestUserManager(store.Object);
+        var manager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
         var user = new PocoUser { UserName = "nulldude" };
         store.Setup(s => s.GetSecurityStampAsync(user, It.IsAny<CancellationToken>())).ReturnsAsync(default(string)).Verifiable();
 
@@ -607,14 +687,24 @@ public async Task CreateFailsWithNullSecurityStamp()
         Assert.Contains(Extensions.Identity.Core.Resources.NullSecurityStamp, ex.Message);
 
         store.VerifyAll();
+
+        Assert.Collection(createUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
+                KeyValuePair.Create<string, object>("error.type", "System.InvalidOperationException")
+            ]));
     }
 
     [Fact]
     public async Task UpdateFailsWithNullSecurityStamp()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
         var store = new Mock<IUserSecurityStampStore<PocoUser>>();
-        var manager = MockHelpers.TestUserManager(store.Object);
+        var manager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
         var user = new PocoUser { UserName = "nulldude" };
         store.Setup(s => s.GetSecurityStampAsync(user, It.IsAny<CancellationToken>())).ReturnsAsync(default(string)).Verifiable();
 
@@ -624,12 +714,22 @@ public async Task UpdateFailsWithNullSecurityStamp()
         Assert.Contains(Extensions.Identity.Core.Resources.NullSecurityStamp, ex.Message);
 
         store.VerifyAll();
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "update"),
+                KeyValuePair.Create<string, object>("error.type", "System.InvalidOperationException")
+            ]));
     }
 
     [Fact]
     public async Task RemoveClaimsCallsStore()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
         var store = new Mock<IUserClaimStore<PocoUser>>();
         var user = new PocoUser { UserName = "Foo" };
         var claims = new Claim[] { new Claim("1", "1"), new Claim("2", "2"), new Claim("3", "3") };
@@ -637,7 +737,7 @@ public async Task RemoveClaimsCallsStore()
             .Returns(Task.FromResult(0))
             .Verifiable();
         store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
-        var userManager = MockHelpers.TestUserManager(store.Object);
+        var userManager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
 
         // Act
         var result = await userManager.RemoveClaimsAsync(user, claims);
@@ -645,12 +745,22 @@ public async Task RemoveClaimsCallsStore()
         // Assert
         Assert.True(result.Succeeded);
         store.VerifyAll();
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "remove_claims"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "success")
+            ]));
     }
 
     [Fact]
     public async Task RemoveClaimCallsStore()
     {
         // Setup
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
         var store = new Mock<IUserClaimStore<PocoUser>>();
         var user = new PocoUser { UserName = "Foo" };
         var claim = new Claim("1", "1");
@@ -658,7 +768,7 @@ public async Task RemoveClaimCallsStore()
             .Returns(Task.FromResult(0))
             .Verifiable();
         store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
-        var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
+        var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object, meterFactory: testMeterFactory);
 
         // Act
         var result = await userManager.RemoveClaimAsync(user, claim);
@@ -666,13 +776,104 @@ public async Task RemoveClaimCallsStore()
         // Assert
         Assert.True(result.Succeeded);
         store.VerifyAll();
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "remove_claims"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.result", "success")
+            ]));
+    }
+
+    [Fact]
+    public async Task AddOrUpdatePasskeyAsyncCallsStore()
+    {
+        // Setup
+        var store = new Mock<IUserPasskeyStore<PocoUser>>();
+        var user = new PocoUser { UserName = "Foo" };
+        var passkey = new UserPasskeyInfo(null, null, default, 0, null, false, false, false, null, null);
+        store.Setup(s => s.AddOrUpdatePasskeyAsync(user, passkey, CancellationToken.None)).Returns(Task.CompletedTask).Verifiable();
+        store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
+        var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
+
+        // Act
+        var result = await userManager.AddOrUpdatePasskeyAsync(user, passkey);
+
+        // Assert
+        Assert.True(result.Succeeded);
+        store.VerifyAll();
+    }
+
+    [Fact]
+    public async Task GetPasskeysAsyncCallsStore()
+    {
+        // Setup
+        var store = new Mock<IUserPasskeyStore<PocoUser>>();
+        var user = new PocoUser { UserName = "Foo" };
+        var passkey = new UserPasskeyInfo(null, null, default, 0, null, false, false, false, null, null);
+        var passkeys = (IList<UserPasskeyInfo>)[passkey];
+        store.Setup(s => s.GetPasskeysAsync(user, CancellationToken.None)).Returns(Task.FromResult(passkeys)).Verifiable();
+        var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
+
+        // Act
+        var result = await userManager.GetPasskeysAsync(user);
+
+        // Assert
+        Assert.Same(passkeys, result);
+        store.VerifyAll();
+    }
+
+    [Fact]
+    public async Task FindByPasskeyIdCallsStore()
+    {
+        // Setup
+        var store = new Mock<IUserPasskeyStore<PocoUser>>();
+        var user = new PocoUser { UserName = "Foo" };
+        var credentialId = (byte[])[1, 2, 3, 4, 5, 6, 7, 8];
+        store.Setup(s => s.FindByPasskeyIdAsync(credentialId, CancellationToken.None)).Returns(Task.FromResult(user)).Verifiable();
+        var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
+
+        // Act
+        var result = await userManager.FindByPasskeyIdAsync(credentialId);
+
+        // Assert
+        Assert.Equal(user, result);
+        store.VerifyAll();
+    }
+
+    [Fact]
+    public async Task RemovePasskeyAsyncCallsStore()
+    {
+        // Setup
+        var store = new Mock<IUserPasskeyStore<PocoUser>>();
+        var user = new PocoUser { UserName = "Foo" };
+        var credentialId = (byte[])[1, 2, 3, 4, 5, 6, 7, 8];
+        store.Setup(s => s.RemovePasskeyAsync(user, credentialId, CancellationToken.None)).Returns(Task.CompletedTask).Verifiable();
+        store.Setup(s => s.UpdateAsync(user, CancellationToken.None)).ReturnsAsync(IdentityResult.Success).Verifiable();
+        var userManager = MockHelpers.TestUserManager<PocoUser>(store.Object);
+
+        // Act
+        var result = await userManager.RemovePasskeyAsync(user, credentialId);
+
+        // Assert
+        Assert.True(result.Succeeded);
+        store.VerifyAll();
     }
 
     [Fact]
     public async Task CheckPasswordWithNullUserReturnsFalse()
     {
-        var manager = MockHelpers.TestUserManager(new EmptyStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var checkPassword = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.CheckPasswordAttemptsCounterName);
+
+        var manager = MockHelpers.TestUserManager(new EmptyStore(), meterFactory: testMeterFactory);
         Assert.False(await manager.CheckPasswordAsync(null, "whatevs"));
+
+        Assert.Collection(checkPassword.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.password_check_result", "user_missing")
+            ]));
     }
 
     [Fact]
@@ -686,40 +887,92 @@ public void UsersQueryableFailWhenStoreNotImplemented()
     [Fact]
     public async Task UsersEmailMethodsFailWhenStoreNotImplemented()
     {
-        var manager = MockHelpers.TestUserManager(new NoopUserStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
+        var manager = MockHelpers.TestUserManager(new NoopUserStore(), meterFactory: testMeterFactory);
         Assert.False(manager.SupportsUserEmail);
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.FindByEmailAsync(null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.SetEmailAsync(null, null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.GetEmailAsync(null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.IsEmailConfirmedAsync(null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.ConfirmEmailAsync(null, null));
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "set_email"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "confirm_email"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     [Fact]
     public async Task UsersPhoneNumberMethodsFailWhenStoreNotImplemented()
     {
-        var manager = MockHelpers.TestUserManager(new NoopUserStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
+        var manager = MockHelpers.TestUserManager(new NoopUserStore(), meterFactory: testMeterFactory);
         Assert.False(manager.SupportsUserPhoneNumber);
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.SetPhoneNumberAsync(null, null));
-        await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.SetPhoneNumberAsync(null, null));
+        await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.ChangePhoneNumberAsync(null, null, null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.GetPhoneNumberAsync(null));
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "set_phone_number"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "change_phone_number"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     [Fact]
     public async Task TokenMethodsThrowWithNoTokenProvider()
     {
-        var manager = MockHelpers.TestUserManager(new NoopUserStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var generateToken = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.GenerateTokensCounterName);
+        using var verifyToken = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.VerifyTokenAttemptsCounterName);
+
+        var manager = MockHelpers.TestUserManager(new NoopUserStore(), meterFactory: testMeterFactory);
         var user = new PocoUser();
         await Assert.ThrowsAsync<NotSupportedException>(
-            async () => await manager.GenerateUserTokenAsync(user, "bogus", null));
+            async () => await manager.GenerateUserTokenAsync(user, "bogus", "test-purpose"));
         await Assert.ThrowsAsync<NotSupportedException>(
-            async () => await manager.VerifyUserTokenAsync(user, "bogus", null, null));
+            async () => await manager.VerifyUserTokenAsync(user, "bogus", "test-purpose", null));
+
+        Assert.Collection(generateToken.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_OTHER"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
+        Assert.Collection(verifyToken.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_OTHER"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     [Fact]
     public async Task PasswordMethodsFailWhenStoreNotImplemented()
     {
-        var manager = MockHelpers.TestUserManager(new NoopUserStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var createUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.CreateDurationName);
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+        using var checkPassword = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.CheckPasswordAttemptsCounterName);
+
+        var manager = MockHelpers.TestUserManager(new NoopUserStore(), meterFactory: testMeterFactory);
         Assert.False(manager.SupportsUserPassword);
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.CreateAsync(null, null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.ChangePasswordAsync(null, null, null));
@@ -727,14 +980,45 @@ public async Task PasswordMethodsFailWhenStoreNotImplemented()
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.RemovePasswordAsync(null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.CheckPasswordAsync(null, null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.HasPasswordAsync(null));
+
+        Assert.Collection(createUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "change_password"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "add_password"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "remove_password"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
+        Assert.Collection(checkPassword.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     [Fact]
     public async Task SecurityStampMethodsFailWhenStoreNotImplemented()
     {
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+        using var generateToken = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.GenerateTokensCounterName);
+
         var store = new Mock<IUserStore<PocoUser>>();
         store.Setup(x => x.GetUserIdAsync(It.IsAny<PocoUser>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(Guid.NewGuid().ToString()));
-        var manager = MockHelpers.TestUserManager(store.Object);
+        var manager = MockHelpers.TestUserManager(store.Object, meterFactory: testMeterFactory);
         Assert.False(manager.SupportsUserSecurityStamp);
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.UpdateSecurityStampAsync(null));
         await Assert.ThrowsAsync<NotSupportedException>(() => manager.GetSecurityStampAsync(null));
@@ -742,28 +1026,76 @@ await Assert.ThrowsAsync<NotSupportedException>(
                 () => manager.VerifyChangePhoneNumberTokenAsync(new PocoUser(), "1", "111-111-1111"));
         await Assert.ThrowsAsync<NotSupportedException>(
                 () => manager.GenerateChangePhoneNumberTokenAsync(new PocoUser(), "111-111-1111"));
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "update_security_stamp"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
+        Assert.Collection(generateToken.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertContainsTags(m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "change_phone_number"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     [Fact]
     public async Task LoginMethodsFailWhenStoreNotImplemented()
     {
-        var manager = MockHelpers.TestUserManager(new NoopUserStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
+        var manager = MockHelpers.TestUserManager(new NoopUserStore(), meterFactory: testMeterFactory);
         Assert.False(manager.SupportsUserLogin);
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.AddLoginAsync(null, null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.RemoveLoginAsync(null, null, null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.GetLoginsAsync(null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.FindByLoginAsync(null, null));
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "add_login"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "remove_login"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     [Fact]
     public async Task ClaimMethodsFailWhenStoreNotImplemented()
     {
-        var manager = MockHelpers.TestUserManager(new NoopUserStore());
+        var testMeterFactory = new TestMeterFactory();
+        using var updateUser = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Identity", UserManagerMetrics.UpdateDurationName);
+
+        var manager = MockHelpers.TestUserManager(new NoopUserStore(), meterFactory: testMeterFactory);
         Assert.False(manager.SupportsUserClaim);
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.AddClaimAsync(null, null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.ReplaceClaimAsync(null, null, null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.RemoveClaimAsync(null, null));
         await Assert.ThrowsAsync<NotSupportedException>(async () => await manager.GetClaimsAsync(null));
+
+        Assert.Collection(updateUser.GetMeasurementSnapshot(),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "add_claims"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "replace_claim"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]),
+            m => MetricsHelpers.AssertHasDurationAndContainsTags(m.Value, m.Tags,
+            [
+                KeyValuePair.Create<string, object>("aspnetcore.identity.user.update_type", "remove_claims"),
+                KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
+            ]));
     }
 
     private class ATokenProvider : IUserTwoFactorTokenProvider<PocoUser>
@@ -785,7 +1117,7 @@ public Task<bool> ValidateAsync(string purpose, string token, UserManager<PocoUs
     }
 
     [Fact]
-    public void UserManagerWillUseTokenProviderInstance()
+    public async Task UserManagerWillUseTokenProviderInstance()
     {
         var provider = new ATokenProvider();
         var config = new ConfigurationBuilder().Build();
@@ -798,7 +1130,7 @@ public void UserManagerWillUseTokenProviderInstance()
             ProviderInstance = provider
         })).AddUserStore<NoopUserStore>();
         var manager = services.BuildServiceProvider().GetService<UserManager<PocoUser>>();
-        Assert.ThrowsAsync<NotImplementedException>(() => manager.GenerateUserTokenAsync(new PocoUser(), "A", "purpose"));
+        await Assert.ThrowsAsync<NotImplementedException>(() => manager.GenerateUserTokenAsync(new PocoUser(), "A", "purpose"));
     }
 
     [Fact]
@@ -881,8 +1213,8 @@ public Task<IdentityResult> UpdateAsync(PocoUser user, CancellationToken cancell
         }
     }
 
-    [Fact]
-    public void UserManagerWillUseTokenProviderInstanceOverDefaults()
+    [Fact(Skip = "This test fails, NotImplementedException isn't thrown: https://github.com/dotnet/aspnetcore/issues/57361")]
+    public async Task UserManagerWillUseTokenProviderInstanceOverDefaults()
     {
         var provider = new ATokenProvider();
         var config = new ConfigurationBuilder().Build();
@@ -895,7 +1227,7 @@ public void UserManagerWillUseTokenProviderInstanceOverDefaults()
             ProviderInstance = provider
         })).AddUserStore<NoopUserStore>().AddDefaultTokenProviders();
         var manager = services.BuildServiceProvider().GetService<UserManager<PocoUser>>();
-        Assert.ThrowsAsync<NotImplementedException>(() => manager.GenerateUserTokenAsync(new PocoUser(), TokenOptions.DefaultProvider, "purpose"));
+        await Assert.ThrowsAsync<NotImplementedException>(() => manager.GenerateUserTokenAsync(new PocoUser(), TokenOptions.DefaultProvider, "purpose"));
     }
 
     [Fact]
@@ -1027,9 +1359,9 @@ public async Task ManagerPublicNullChecks()
                 async () => await manager.CreateAsync(new PocoUser(), null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await manager.UpdateAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await manager.DeleteAsync(null));
-        await Assert.ThrowsAsync<ArgumentNullException>("claim", async () => await manager.AddClaimAsync(null, null));
-        await Assert.ThrowsAsync<ArgumentNullException>("claim", async () => await manager.ReplaceClaimAsync(null, null, null));
-        await Assert.ThrowsAsync<ArgumentNullException>("claims", async () => await manager.AddClaimsAsync(null, null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await manager.AddClaimAsync(null, null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await manager.ReplaceClaimAsync(null, null, null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await manager.AddClaimsAsync(null, null));
         await Assert.ThrowsAsync<ArgumentNullException>("userName", async () => await manager.FindByNameAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("login", async () => await manager.AddLoginAsync(null, null));
         await Assert.ThrowsAsync<ArgumentNullException>("loginProvider",
@@ -1040,6 +1372,10 @@ await Assert.ThrowsAsync<ArgumentNullException>("providerKey",
         Assert.Throws<ArgumentNullException>("provider", () => manager.RegisterTokenProvider("whatever", null));
         await Assert.ThrowsAsync<ArgumentNullException>("roles", async () => await manager.AddToRolesAsync(new PocoUser(), null));
         await Assert.ThrowsAsync<ArgumentNullException>("roles", async () => await manager.RemoveFromRolesAsync(new PocoUser(), null));
+        await Assert.ThrowsAsync<ArgumentNullException>("passkey", async () => await manager.AddOrUpdatePasskeyAsync(new PocoUser(), null));
+        await Assert.ThrowsAsync<ArgumentNullException>("credentialId", async () => await manager.GetPasskeyAsync(new PocoUser(), null));
+        await Assert.ThrowsAsync<ArgumentNullException>("credentialId", async () => await manager.FindByPasskeyIdAsync(null));
+        await Assert.ThrowsAsync<ArgumentNullException>("credentialId", async () => await manager.RemovePasskeyAsync(new PocoUser(), null));
     }
 
     [Fact]
@@ -1141,6 +1477,14 @@ await Assert.ThrowsAsync<ArgumentNullException>("user",
             async () => await manager.GetLockoutEndDateAsync(null));
         await Assert.ThrowsAsync<ArgumentNullException>("user",
             async () => await manager.IsLockedOutAsync(null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user",
+            async () => await manager.AddOrUpdatePasskeyAsync(null, null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user",
+            async () => await manager.GetPasskeysAsync(null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user",
+            async () => await manager.GetPasskeyAsync(null, null));
+        await Assert.ThrowsAsync<ArgumentNullException>("user",
+            async () => await manager.RemovePasskeyAsync(null, null));
     }
 
     [Fact]
@@ -1180,6 +1524,11 @@ public async Task MethodsThrowWhenDisposedTest()
         await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.GenerateEmailConfirmationTokenAsync(null));
         await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.IsEmailConfirmedAsync(null));
         await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.ConfirmEmailAsync(null, null));
+        await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.AddOrUpdatePasskeyAsync(null, null));
+        await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.GetPasskeysAsync(null));
+        await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.GetPasskeyAsync(null, null));
+        await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.FindByPasskeyIdAsync(null));
+        await Assert.ThrowsAsync<ObjectDisposedException>(() => manager.RemovePasskeyAsync(null, null));
     }
 
     private class BadPasswordValidator<TUser> : IPasswordValidator<TUser> where TUser : class
@@ -1213,7 +1562,8 @@ private class EmptyStore :
         IUserLockoutStore<PocoUser>,
         IUserTwoFactorStore<PocoUser>,
         IUserRoleStore<PocoUser>,
-        IUserSecurityStampStore<PocoUser>
+        IUserSecurityStampStore<PocoUser>,
+        IUserPasskeyStore<PocoUser>
     {
         public Task<IList<Claim>> GetClaimsAsync(PocoUser user, CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -1463,6 +1813,31 @@ public void Dispose()
         {
             return Task.FromResult(0);
         }
+
+        public Task AddOrUpdatePasskeyAsync(PocoUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+        {
+            return Task.CompletedTask;
+        }
+
+        public Task<IList<UserPasskeyInfo>> GetPasskeysAsync(PocoUser user, CancellationToken cancellationToken)
+        {
+            return Task.FromResult<IList<UserPasskeyInfo>>([]);
+        }
+
+        public Task<PocoUser> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+        {
+            return Task.FromResult<PocoUser>(null);
+        }
+
+        public Task<UserPasskeyInfo> FindPasskeyAsync(PocoUser user, byte[] credentialId, CancellationToken cancellationToken)
+        {
+            return Task.FromResult<UserPasskeyInfo>(null);
+        }
+
+        public Task RemovePasskeyAsync(PocoUser user, byte[] credentialId, CancellationToken cancellationToken)
+        {
+            return Task.CompletedTask;
+        }
     }
 
     private class NoOpTokenProvider : IUserTwoFactorTokenProvider<PocoUser>
@@ -1493,7 +1868,8 @@ private class NotImplementedStore :
         IUserEmailStore<PocoUser>,
         IUserPhoneNumberStore<PocoUser>,
         IUserLockoutStore<PocoUser>,
-        IUserTwoFactorStore<PocoUser>
+        IUserTwoFactorStore<PocoUser>,
+        IUserPasskeyStore<PocoUser>
     {
         public Task<IList<Claim>> GetClaimsAsync(PocoUser user, CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -1734,6 +2110,31 @@ Task<IdentityResult> IUserStore<PocoUser>.DeleteAsync(PocoUser user, Cancellatio
         {
             throw new NotImplementedException();
         }
+
+        public Task AddOrUpdatePasskeyAsync(PocoUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<IList<UserPasskeyInfo>> GetPasskeysAsync(PocoUser user, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<PocoUser> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<UserPasskeyInfo> FindPasskeyAsync(PocoUser user, byte[] credentialId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task RemovePasskeyAsync(PocoUser user, byte[] credentialId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [Fact]
diff --git a/src/Identity/test/InMemory.Test/InMemoryStore.cs b/src/Identity/test/InMemory.Test/InMemoryStore.cs
index 23598c8b8ce8..c5860db84589 100644
--- a/src/Identity/test/InMemory.Test/InMemoryStore.cs
+++ b/src/Identity/test/InMemory.Test/InMemoryStore.cs
@@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Identity.InMemory;
 public class InMemoryStore<TUser, TRole> :
     InMemoryUserStore<TUser>,
     IUserRoleStore<TUser>,
+    IUserPasskeyStore<TUser>,
     IQueryableRoleStore<TRole>,
     IRoleClaimStore<TRole>
     where TRole : PocoRole
@@ -158,6 +159,82 @@ Task<TRole> IRoleStore<TRole>.FindByNameAsync(string roleName, CancellationToken
         return Task.FromResult(0);
     }
 
+    public Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken)
+    {
+        var passkeyEntity = user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(passkey.CredentialId));
+        if (passkeyEntity is null)
+        {
+            user.Passkeys.Add(ToPocoUserPasskey(user, passkey));
+        }
+        else
+        {
+            passkeyEntity.Name = passkey.Name;
+            passkeyEntity.SignCount = passkey.SignCount;
+            passkeyEntity.IsBackedUp = passkey.IsBackedUp;
+            passkeyEntity.IsUserVerified = passkey.IsUserVerified;
+        }
+        return Task.CompletedTask;
+    }
+
+    public Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, CancellationToken cancellationToken)
+    {
+        return Task.FromResult<IList<UserPasskeyInfo>>(user.Passkeys.Select(ToUserPasskeyInfo).ToList()!);
+    }
+
+    public Task<TUser> FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken)
+    {
+        return Task.FromResult(Users.FirstOrDefault(u => u.Passkeys.Any(p => p.CredentialId.SequenceEqual(credentialId))));
+    }
+
+    public Task<UserPasskeyInfo> FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        return Task.FromResult(ToUserPasskeyInfo(user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(credentialId))));
+    }
+
+    public Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken)
+    {
+        var passkey = user.Passkeys.SingleOrDefault(p => p.CredentialId.SequenceEqual(credentialId));
+        if (passkey is not null)
+        {
+            user.Passkeys.Remove(passkey);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private static UserPasskeyInfo ToUserPasskeyInfo(PocoUserPasskey<string> p)
+        => p is null ? null : new(
+            p.CredentialId,
+            p.PublicKey,
+            p.CreatedAt,
+            p.SignCount,
+            p.Transports,
+            p.IsUserVerified,
+            p.IsBackupEligible,
+            p.IsBackedUp,
+            p.AttestationObject,
+            p.ClientDataJson)
+        {
+            Name = p.Name
+        };
+
+    private static PocoUserPasskey<string> ToPocoUserPasskey(TUser user, UserPasskeyInfo p)
+        => new()
+        {
+            UserId = user.Id,
+            CredentialId = p.CredentialId,
+            PublicKey = p.PublicKey,
+            Name = p.Name,
+            CreatedAt = p.CreatedAt,
+            Transports = p.Transports,
+            SignCount = p.SignCount,
+            IsUserVerified = p.IsUserVerified,
+            IsBackupEligible = p.IsBackupEligible,
+            IsBackedUp = p.IsBackedUp,
+            AttestationObject = p.AttestationObject,
+            ClientDataJson = p.ClientDataJson,
+        };
+
     public IQueryable<TRole> Roles
     {
         get { return _roles.Values.AsQueryable(); }
diff --git a/src/Identity/test/Shared/MetricsHelpers.cs b/src/Identity/test/Shared/MetricsHelpers.cs
new file mode 100644
index 000000000000..afeff728e06e
--- /dev/null
+++ b/src/Identity/test/Shared/MetricsHelpers.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+public static class MetricsHelpers
+{
+    public static void AssertHasDurationAndContainsTags(double duration, IReadOnlyDictionary<string, object> tags, List<KeyValuePair<string, object>> expectedTags)
+    {
+        Assert.True(duration > 0, "Duration should be greater than 0.");
+        AssertContainsTags(tags, expectedTags);
+    }
+
+    public static void AssertContainsTags(IReadOnlyDictionary<string, object> tags, List<KeyValuePair<string, object>> expectedTags)
+    {
+        var found = 0;
+        foreach (var expectedTag in expectedTags)
+        {
+            if (tags.TryGetValue(expectedTag.Key, out var value) && EqualityComparer<object>.Default.Equals(value, expectedTag.Value))
+            {
+                found++;
+            }
+        }
+        if (found != expectedTags.Count)
+        {
+            throw new InvalidOperationException(
+                $"""
+                Expected: {string.Join(", ", expectedTags.OrderBy(t => t.Key).Select(kvp => $"{kvp.Key}={kvp.Value}"))}
+                Actual: {string.Join(", ", tags.OrderBy(t => t.Key).Select(kvp => $"{kvp.Key}={kvp.Value}"))}
+                """);
+        }
+    }
+}
diff --git a/src/Identity/test/Shared/MockHelpers.cs b/src/Identity/test/Shared/MockHelpers.cs
index 3e3371083bda..f6d374c6769e 100644
--- a/src/Identity/test/Shared/MockHelpers.cs
+++ b/src/Identity/test/Shared/MockHelpers.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.Metrics;
 using System.Text;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -12,10 +14,24 @@ public static class MockHelpers
 {
     public static StringBuilder LogMessage = new StringBuilder();
 
-    public static Mock<UserManager<TUser>> MockUserManager<TUser>() where TUser : class
+    public static Mock<UserManager<TUser>> MockUserManager<TUser>(
+        IMeterFactory meterFactory = null,
+        IPasskeyHandler<TUser> passkeyHandler = null)
+        where TUser : class
     {
+        var services = new ServiceCollection();
+        if (meterFactory != null)
+        {
+            services.AddSingleton<SignInManagerMetrics>();
+            services.AddSingleton(meterFactory);
+        }
+        if (passkeyHandler != null)
+        {
+            services.AddSingleton(passkeyHandler);
+        }
+
         var store = new Mock<IUserStore<TUser>>();
-        var mgr = new Mock<UserManager<TUser>>(store.Object, null, null, null, null, null, null, null, null);
+        var mgr = new Mock<UserManager<TUser>>(store.Object, null, null, null, null, null, null, services.BuildServiceProvider(), null);
         mgr.Object.UserValidators.Add(new UserValidator<TUser>());
         mgr.Object.PasswordValidators.Add(new PasswordValidator<TUser>());
         return mgr;
@@ -30,7 +46,7 @@ public static Mock<RoleManager<TRole>> MockRoleManager<TRole>(IRoleStore<TRole>
             new IdentityErrorDescriber(), null);
     }
 
-    public static UserManager<TUser> TestUserManager<TUser>(IUserStore<TUser> store = null) where TUser : class
+    public static UserManager<TUser> TestUserManager<TUser>(IUserStore<TUser> store = null, IMeterFactory meterFactory = null) where TUser : class
     {
         store = store ?? new Mock<IUserStore<TUser>>().Object;
         var options = new Mock<IOptions<IdentityOptions>>();
@@ -42,9 +58,16 @@ public static UserManager<TUser> TestUserManager<TUser>(IUserStore<TUser> store
         userValidators.Add(validator.Object);
         var pwdValidators = new List<PasswordValidator<TUser>>();
         pwdValidators.Add(new PasswordValidator<TUser>());
+        var services = new ServiceCollection();
+        if (meterFactory != null)
+        {
+            services.AddSingleton<UserManagerMetrics>();
+            services.AddSingleton<SignInManagerMetrics>();
+            services.AddSingleton(meterFactory);
+        }
         var userManager = new UserManager<TUser>(store, options.Object, new PasswordHasher<TUser>(),
             userValidators, pwdValidators, MockLookupNormalizer(),
-            new IdentityErrorDescriber(), null,
+            new IdentityErrorDescriber(), services.BuildServiceProvider(),
             new Mock<ILogger<UserManager<TUser>>>().Object);
         validator.Setup(v => v.ValidateAsync(userManager, It.IsAny<TUser>()))
             .Returns(Task.FromResult(IdentityResult.Success)).Verifiable();
diff --git a/src/Identity/test/Shared/PocoModel/PocoRole.cs b/src/Identity/test/Shared/PocoModel/PocoRole.cs
index 5b0b84e65ab4..b5d5c61b310b 100644
--- a/src/Identity/test/Shared/PocoModel/PocoRole.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoRole.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
diff --git a/src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs b/src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs
index 5b251c20537b..c8c6b921a924 100644
--- a/src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoRoleClaim.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
diff --git a/src/Identity/test/Shared/PocoModel/PocoUser.cs b/src/Identity/test/Shared/PocoModel/PocoUser.cs
index 342506ae1c0a..b9a04eb52894 100644
--- a/src/Identity/test/Shared/PocoModel/PocoUser.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoUser.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
@@ -144,4 +146,8 @@ public PocoUser(string userName) : this()
     /// Navigation property
     /// </summary>
     public virtual ICollection<PocoUserToken<TKey>> Tokens { get; private set; } = new List<PocoUserToken<TKey>>();
+    /// <summary>
+    /// Navigation property
+    /// </summary>
+    public virtual ICollection<PocoUserPasskey<TKey>> Passkeys { get; private set; } = new List<PocoUserPasskey<TKey>>();
 }
diff --git a/src/Identity/test/Shared/PocoModel/PocoUserClaim.cs b/src/Identity/test/Shared/PocoModel/PocoUserClaim.cs
index ebd5a24515c2..2d1343891410 100644
--- a/src/Identity/test/Shared/PocoModel/PocoUserClaim.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoUserClaim.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
diff --git a/src/Identity/test/Shared/PocoModel/PocoUserLogin.cs b/src/Identity/test/Shared/PocoModel/PocoUserLogin.cs
index ab7162fe230a..e62fd55aad6c 100644
--- a/src/Identity/test/Shared/PocoModel/PocoUserLogin.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoUserLogin.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
diff --git a/src/Identity/test/Shared/PocoModel/PocoUserPasskey.cs b/src/Identity/test/Shared/PocoModel/PocoUserPasskey.cs
new file mode 100644
index 000000000000..9a4ec0e610a5
--- /dev/null
+++ b/src/Identity/test/Shared/PocoModel/PocoUserPasskey.cs
@@ -0,0 +1,87 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+namespace Microsoft.AspNetCore.Identity.Test;
+
+public class PocoUserPasskey : PocoUserPasskey<string>;
+
+/// <summary>
+/// Represents a passkey credential for a user in the identity system.
+/// </summary>
+/// <remarks>
+/// See <see href="https://www.w3.org/TR/webauthn-3/#credential-record"/>.
+/// </remarks>
+/// <typeparam name="TKey">The type used for the primary key for this passkey credential.</typeparam>
+public class PocoUserPasskey<TKey> where TKey : IEquatable<TKey>
+{
+    /// <summary>
+    /// Gets or sets the primary key of the user that owns this passkey.
+    /// </summary>
+    public virtual TKey UserId { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets the credential ID for this passkey.
+    /// </summary>
+    public virtual byte[] CredentialId { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the public key associated with this passkey.
+    /// </summary>
+    public virtual byte[] PublicKey { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the friendly name for this passkey.
+    /// </summary>
+    public virtual string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the time this passkey was created.
+    /// </summary>
+    public virtual DateTimeOffset CreatedAt { get; set; }
+
+    /// <summary>
+    /// Gets or sets the signature counter for this passkey.
+    /// </summary>
+    public virtual uint SignCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the transports supported by this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#enumdef-authenticatortransport"/>.
+    /// </remarks>
+    public virtual string[] Transports { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey has a verified user.
+    /// </summary>
+    public virtual bool IsUserVerified { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey is eligible for backup.
+    /// </summary>
+    public virtual bool IsBackupEligible { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the passkey is currently backed up.
+    /// </summary>
+    public virtual bool IsBackedUp { get; set; }
+
+    /// <summary>
+    /// Gets or sets the attestation object associated with this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#attestation-object"/>.
+    /// </remarks>
+    public virtual byte[] AttestationObject { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the collected client data JSON associated with this passkey.
+    /// </summary>
+    /// <remarks>
+    /// See <see href="https://www.w3.org/TR/webauthn-3/#dictdef-collectedclientdata"/>.
+    /// </remarks>
+    public virtual byte[] ClientDataJson { get; set; } = [];
+}
diff --git a/src/Identity/test/Shared/PocoModel/PocoUserRole.cs b/src/Identity/test/Shared/PocoModel/PocoUserRole.cs
index 19b7d1b0c56a..5637d35cff5d 100644
--- a/src/Identity/test/Shared/PocoModel/PocoUserRole.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoUserRole.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
diff --git a/src/Identity/test/Shared/PocoModel/PocoUserToken.cs b/src/Identity/test/Shared/PocoModel/PocoUserToken.cs
index 22af469fd298..a57721225449 100644
--- a/src/Identity/test/Shared/PocoModel/PocoUserToken.cs
+++ b/src/Identity/test/Shared/PocoModel/PocoUserToken.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Identity.Test;
 
 /// <summary>
diff --git a/src/Installers/Debian/Directory.Build.props b/src/Installers/Debian/Directory.Build.props
deleted file mode 100644
index df42b93c0fa9..000000000000
--- a/src/Installers/Debian/Directory.Build.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <OutputPath>$(InstallersOutputPath)</OutputPath>
-    <IntermediateOutputPath>$(IntermediateOutputPath)$(TargetRuntimeIdentifier)\</IntermediateOutputPath>
-
-    <!-- Installer settings -->
-    <DebianPackageInstallRoot>/usr/share/dotnet</DebianPackageInstallRoot>
-
-    <DebianPackageArch Condition=" '$(TargetArchitecture)' == 'x64' ">amd64</DebianPackageArch>
-
-    <DebianBuildScript>$(MSBuildThisFileDirectory)tools/build.sh</DebianBuildScript>
-
-    <!-- All installers are shipping assets. -->
-    <IsShipping>true</IsShipping>
-    <IsPackable>true</IsPackable>
-
-    <!--
-      For installers project, build acceleration may not work correctly.
-      Read more here => https://github.com/dotnet/project-system/blob/main/docs/build-acceleration.md#limitations
-    -->
-    <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
-  </PropertyGroup>
-</Project>
diff --git a/src/Installers/Debian/Directory.Build.targets b/src/Installers/Debian/Directory.Build.targets
deleted file mode 100644
index 2d854470f156..000000000000
--- a/src/Installers/Debian/Directory.Build.targets
+++ /dev/null
@@ -1,64 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <TargetPath>$(OutputPath)$(TargetFileName)</TargetPath>
-    <DebBuildDependsOn>
-      $(DebBuildDependsOn);
-      PrepareForBuild;
-      ResolveProjectReferences;
-      GetTargetPath;
-    </DebBuildDependsOn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" AllowExplicitReference="true" PrivateAssets="All" IsImplicitlyDefined="true" />
-  </ItemGroup>
-
-  <Target Name="PrepareForBuild">
-    <MakeDir Directories="$(IntermediateOutputPath);$(OutputPath)" />
-
-    <Error Text="Currently only linux-x64 is supported by Debian installers." Condition=" '$(TargetRuntimeIdentifier)' != 'linux-x64' " />
-    <Error Text="Missing required property: PackageContentRoot" Condition=" '$(PackageContentRoot)' == '' " />
-  </Target>
-
-  <Target Name="GetTargetPath" Returns="$(TargetPath)" />
-
-  <Target Name="Build" DependsOnTargets="DebBuild" />
-  <Target Name="Pack" />
-
-  <Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)">
-    <!-- Generate debian_config.json. We can't simply use WriteLinesToFile because of https://github.com/Microsoft/msbuild/issues/1622. Use our custom GenerateFileFromTemplate task instead -->
-    <PropertyGroup>
-      <DebianConfigProperties>
-        $(DebianConfigProperties);
-        AspNetCoreMajorVersion=$(AspNetCoreMajorVersion);
-        AspNetCoreMinorVersion=$(AspNetCoreMinorVersion);
-        Authors=$(Authors);
-        DebianPackageInstallRoot=$(DebianPackageInstallRoot);
-        MaintainerEmail=$(MaintainerEmail);
-        PackageId=$(PackageId);
-        PackageLicenseExpression=$(PackageLicenseExpression);
-        PackageProjectUrl=$(PackageProjectUrl);
-        PackageRevision=$(PackageRevision);
-        PackageVersion=$(DebPackageVersion);
-        PackageSummary=$(PackageSummary);
-        PackageDescription=$(PackageDescription);
-      </DebianConfigProperties>
-    </PropertyGroup>
-
-    <GenerateFileFromTemplate TemplateFile="debian_config.json.in"
-      Properties="$(DebianConfigProperties)"
-      OutputPath="$(IntermediateOutputPath)debian_config.json" />
-
-    <!-- Build SharedFx Bundle Deb package -->
-
-    <Exec Command="$(DebianBuildScript) -i '$(IntermediateOutputPath)' -o '$(IntermediateOutputPath)out/' -C '$(PackageContentRoot)'" />
-
-    <PropertyGroup>
-      <BuildScriptOutputFileName>$(PackageId)_$(DebPackageVersion)-$(PackageRevision)_$(DebianPackageArch).deb</BuildScriptOutputFileName>
-    </PropertyGroup>
-
-    <Copy SourceFiles="$(IntermediateOutputPath)out/$(BuildScriptOutputFileName)" DestinationFiles="$(TargetPath)" />
-  </Target>
-</Project>
diff --git a/src/Installers/Debian/Runtime/Debian.Runtime.debproj b/src/Installers/Debian/Runtime/Debian.Runtime.debproj
deleted file mode 100644
index 343216335618..000000000000
--- a/src/Installers/Debian/Runtime/Debian.Runtime.debproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  This project produces a debian installer for Linux x64 platforms only.
--->
-<Project DefaultTargets="Build">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
-  <PropertyGroup>
-    <PackageContentRoot>$(SharedFrameworkLayoutRoot)</PackageContentRoot>
-
-    <!-- CLI would take a dependency such as 'aspnetcore-runtime-M.N >= M.N.P'. Here M.N is part of the id and M.N.P is the PackageVersion -->
-    <PackageId>$(RuntimeInstallerBaseName)-$(AspNetCoreMajorMinorVersion)</PackageId>
-
-    <!-- Needed some creativity to convert the PackageVersion M.N.P-PreReleaseVersionLabel-Build to the installer version M.N.P~PreReleaseVersionLabel-Build, The conditional handles stabilized builds -->
-    <DotnetRuntimeDependencyVersion>$(MicrosoftNETCoreAppRuntimeVersion)</DotnetRuntimeDependencyVersion>
-    <DotnetRuntimeDependencyVersion Condition="$(DotnetRuntimeDependencyVersion.Contains('-'))">$(DotnetRuntimeDependencyVersion.Substring(0, $(DotnetRuntimeDependencyVersion.IndexOf('-'))))~$(DotnetRuntimeDependencyVersion.Substring($([MSBuild]::Add($(DotnetRuntimeDependencyVersion.IndexOf('-')), 1))))</DotnetRuntimeDependencyVersion>
-    <DotnetRuntimeDependencyMajorMinorVersion>$(MicrosoftNETCoreAppRuntimeVersion.Split('.')[0]).$(MicrosoftNETCoreAppRuntimeVersion.Split('.')[1])</DotnetRuntimeDependencyMajorMinorVersion>
-
-    <PackageSummary>$(SharedFxProductName)</PackageSummary>
-    <PackageDescription>$(SharedFxDescription)</PackageDescription>
-    <DebianConfigProperties>
-      DotnetRuntimeDependencyMajorMinorVersion=$(DotnetRuntimeDependencyMajorMinorVersion);
-      DotnetRuntimeDependencyVersion=$(DotnetRuntimeDependencyVersion);
-    </DebianConfigProperties>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-
-  <PropertyGroup>
-    <TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.deb</TargetFileName>
-    <TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
-    <!-- DebPackageVersion does not match the ASP.NET Core runtime verison. -->
-    <DebPackageVersion>$(VersionPrefix)</DebPackageVersion>
-    <!-- Deb installers are versioned as M.N.P~PreReleaseVersionLabel-Build following the core-setup convention -->
-    <DebPackageVersion Condition="'$(VersionSuffix)' != ''">$(DebPackageVersion)~$(VersionSuffix)</DebPackageVersion>
-    <PackageRevision>1</PackageRevision>
-  </PropertyGroup>
-</Project>
diff --git a/src/Installers/Debian/Runtime/debian_config.json.in b/src/Installers/Debian/Runtime/debian_config.json.in
deleted file mode 100644
index 0bd5417702d7..000000000000
--- a/src/Installers/Debian/Runtime/debian_config.json.in
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "maintainer_name": "${Authors}",
-  "maintainer_email": "${MaintainerEmail}",
-
-  "package_name": "${PackageId}",
-  "install_root": "${DebianPackageInstallRoot}",
-
-  "short_description": "${PackageSummary}",
-  "long_description": "${PackageDescription}",
-  "homepage": "${PackageProjectUrl}",
-
-  "release":{
-    "package_version":"${PackageVersion}",
-    "package_revision":"${PackageRevision}",
-    "urgency" : "low",
-    "changelog_message" : ""
-  },
-
-  "control": {
-    "priority":"standard",
-    "section":"devel",
-    "architecture":"any"
-  },
-
-  "copyright": ".NET Foundation and Contributors",
-  "license": {
-    "type": "${PackageLicenseExpression}",
-    "full_text": "The MIT License (MIT)\n\nCopyright (c) .NET Foundation and Contributors\n\nAll rights reserved.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-  },
-
-  "debian_dependencies": {
-    "dotnet-runtime-${DotnetRuntimeDependencyMajorMinorVersion}": {
-      "package_version": "${DotnetRuntimeDependencyVersion}"
-    }
-  }
-}
diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj
deleted file mode 100644
index 5295906837c5..000000000000
--- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  This project produces a debian installer for Linux x64 platforms only.
--->
-<Project DefaultTargets="Build">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
-  <PropertyGroup>
-    <PackageContentRoot>$(TargetingPackLayoutRoot)</PackageContentRoot>
-
-    <!-- CLI would take a dependency such as 'aspnetcore-targeting-pack-M.N >= M.N.P'. Here M.N is part of the id and M.N.P is the PackageVersion -->
-    <PackageId>$(TargetingPackInstallerBaseName)-$(AspNetCoreMajorMinorVersion)</PackageId>
-
-    <PackageSummary>ASP.NET Core Targeting Pack</PackageSummary>
-    <PackageDescription>Provides a default set of APIs for building an ASP.NET Core $(AspNetCoreMajorMinorVersion) application. Contains reference assemblies, documentation, and other design-time assets.</PackageDescription>
-
-    <!-- Needed some creativity to convert the PackageVersion M.N.P-PreReleaseVersionLabel-Build to the installer version M.N.P~PreReleaseVersionLabel-Build, The conditional handles stabilized builds -->
-    <DotnetTargetingPackDependencyVersion>$(MicrosoftNETCoreAppRefVersion)</DotnetTargetingPackDependencyVersion>
-    <DotnetTargetingPackDependencyVersion Condition="$(DotnetTargetingPackDependencyVersion.Contains('-'))">$(DotnetTargetingPackDependencyVersion.Substring(0, $(DotnetTargetingPackDependencyVersion.IndexOf('-'))))~$(DotnetTargetingPackDependencyVersion.Substring($([MSBuild]::Add($(DotnetTargetingPackDependencyVersion.IndexOf('-')), 1))))</DotnetTargetingPackDependencyVersion>
-    <DotnetTargetingPackDependencyMajorMinorVersion>$(MicrosoftNETCoreAppRefVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefVersion.Split('.')[1])</DotnetTargetingPackDependencyMajorMinorVersion>
-
-    <PackageSummary>$(SharedFxProductName)</PackageSummary>
-    <PackageDescription>$(SharedFxDescription)</PackageDescription>
-    <DebianConfigProperties>
-      DotnetTargetingPackDependencyMajorMinorVersion=$(DotnetTargetingPackDependencyMajorMinorVersion);
-      DotnetTargetingPackDependencyVersion=$(DotnetTargetingPackDependencyVersion);
-    </DebianConfigProperties>
-
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-
-  <PropertyGroup>
-    <TargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(TargetArchitecture).deb</TargetFileName>
-    <TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
-
-    <DebPackageVersion>$(TargetingPackVersionPrefix)</DebPackageVersion>
-    <!-- Deb installers are versioned as M.N.P~PreReleaseVersionLabel-Build following the core-setup convention -->
-    <DebPackageVersion Condition="'$(VersionSuffix)' != ''">$(DebPackageVersion)~$(VersionSuffix)</DebPackageVersion>
-    <PackageRevision>1</PackageRevision>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Installers/Debian/TargetingPack/debian_config.json.in b/src/Installers/Debian/TargetingPack/debian_config.json.in
deleted file mode 100644
index 6ed5718d885b..000000000000
--- a/src/Installers/Debian/TargetingPack/debian_config.json.in
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "maintainer_name": "${Authors}",
-  "maintainer_email": "${MaintainerEmail}",
-
-  "package_name": "${PackageId}",
-  "install_root": "${DebianPackageInstallRoot}",
-
-  "short_description": "${PackageSummary}",
-  "long_description": "${PackageDescription}",
-  "homepage": "${PackageProjectUrl}",
-
-  "release":{
-    "package_version":"${PackageVersion}",
-    "package_revision":"${PackageRevision}",
-    "urgency" : "low",
-    "changelog_message" : ""
-  },
-
-  "control": {
-    "priority":"standard",
-    "section":"devel",
-    "architecture":"any"
-  },
-
-  "copyright": ".NET Foundation and Contributors",
-  "license": {
-    "type": "${PackageLicenseExpression}",
-    "full_text": "The MIT License (MIT)\n\nCopyright (c) .NET Foundation and Contributors\n\nAll rights reserved.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
-  },
-
-  "debian_dependencies": {
-    "dotnet-targeting-pack-${DotnetTargetingPackDependencyMajorMinorVersion}": {
-      "package_version": "${DotnetTargetingPackDependencyVersion}"
-    }
-  }
-}
diff --git a/src/Installers/Debian/tools/build.sh b/src/Installers/Debian/tools/build.sh
deleted file mode 100755
index 1ea557d7e3df..000000000000
--- a/src/Installers/Debian/tools/build.sh
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-set -e
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-## Load Functions ##
-source $SCRIPT_DIR/scripts/debian_build_lib.sh
-
-## Debian Package Creation Functions ##
-execute(){
-    if ! parse_args_and_set_env_vars "$@"; then
-        exit 1
-    fi
-
-    # Exit if required validation fails
-    if ! validate_inputs; then
-        exit 1
-    fi
-
-    parse_config_and_set_env_vars
-    clean_or_create_build_dirs
-    package_all
-    generate_all
-    create_source_tarball
-
-    # Actually Build Package Files
-    (cd ${PACKAGE_SOURCE_DIR}; debuild -us -uc)
-
-    copy_files_to_output
-}
-
-parse_args_and_set_env_vars(){
-    OPTIND=1 # Reset in case getopts has been used previously in the shell.
-
-    while getopts ":n:v:i:o:h:C:" opt; do
-      case $opt in
-        n)
-          export PACKAGE_NAME="$OPTARG"
-          ;;
-        v)
-          export PACKAGE_VERSION="$OPTARG"
-          ;;
-        i)
-          export INPUT_DIR="$OPTARG"
-          ;;
-        C)
-          export CONTENT_DIR="$OPTARG"
-          ;;
-        o)
-          export OUTPUT_DIR="$OPTARG"
-          ;;
-        h)
-          print_help
-          return 1
-          ;;
-        \?)
-          echo "Invalid option: -$OPTARG" >&2
-          return 1
-          ;;
-        :)
-          echo "Option -$OPTARG requires an argument." >&2
-          return 1
-          ;;
-      esac
-    done
-
-     # Special Input Directories + Paths
-    ABSOLUTE_PLACEMENT_DIR="${INPUT_DIR}/\$"
-    PACKAGE_ROOT_PLACEMENT_DIR="${CONTENT_DIR}"
-    CONFIG="$INPUT_DIR/debian_config.json"
-
-    return 0
-}
-
-print_help(){
-    echo "Usage: package_tool [-i <INPUT_DIR>] [-o <OUTPUT_DIRECTORY>]
-    [-n <PACKAGE_NAME>] [-v <PACKAGE_VERSION>] [-h]
-
-    REQUIRED:
-        -i <INPUT_DIR>: Input directory conforming to package_tool conventions and debian_config.json
-        -C <CONTENT_DIR>: Directory containing the files which should be packaged.
-        -o <OUTPUT_DIR>: Output directory for debian package and other artifacts
-
-    OPTIONAL:
-        -n <PACKAGE_NAME>: name of created package, will override value in debian_config.json
-        -v <PACKAGE_VERSION>: version of created package, will override value in debian_config.json
-        -h: Show this message
-
-    NOTES:
-        See Readme for more information on package_tool conventions and debian_config.json format
-        https://github.com/dotnet/cli/tree/master/packaging/debian/package_tool
-    "
-}
-
-validate_inputs(){
-    local ret=0
-    if [[ -z "$INPUT_DIR" ]]; then
-        echo "ERROR: -i <INPUT_DIRECTORY> Not Specified"
-        ret=1
-    fi
-
-    if [[ -z "$OUTPUT_DIR" ]]; then
-        echo "ERROR: -o <OUTPUT_DIRECTORY> Not Specified."
-        ret=1
-    fi
-
-    if [[ -z "$CONTENT_DIR" ]]; then
-        echo "ERROR: -C <CONTENT_DIR> Not Specified."
-        ret=1
-    elif [[ ! -d "$PACKAGE_ROOT_PLACEMENT_DIR" ]]; then
-        echo "ERROR: '$PACKAGE_ROOT_PLACEMENT_DIR' directory does not exist"
-        ret=1
-    fi
-
-    if [[ ! -f "$CONFIG" ]]; then
-        echo "ERROR: debian_config.json file does not exist"
-        echo $CONFIG
-        ret=1
-    fi
-
-    return $ret
-}
-
-parse_config_and_set_env_vars(){
-    extract_base_cmd="python3 $SCRIPT_DIR/scripts/extract_json_value.py"
-
-    # Arguments Take Precedence over Config
-    [ -z "$PACKAGE_VERSION" ] && PACKAGE_VERSION="$($extract_base_cmd $CONFIG "release.package_version")"
-    [ -z "$PACKAGE_NAME" ] && PACKAGE_NAME="$($extract_base_cmd $CONFIG "package_name")"
-
-    # Inputs
-    INPUT_SAMPLES_DIR="$INPUT_DIR/samples"
-    INPUT_DOCS_DIR="$INPUT_DIR/docs"
-    DOCS_JSON_PATH="$INPUT_DIR/docs.json"
-
-    PACKAGE_SOURCE_DIR="${OUTPUT_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
-
-    if ! INSTALL_ROOT="$($extract_base_cmd $CONFIG "install_root")"; then
-        INSTALL_ROOT="/usr/share/$PACKAGE_NAME"
-    fi
-
-    DEBIAN_DIR="${PACKAGE_SOURCE_DIR}/debian"
-    DOCS_DIR="${PACKAGE_SOURCE_DIR}/docs"
-}
-
-clean_or_create_build_dirs(){
-    rm -rf ${PACKAGE_SOURCE_DIR}
-    mkdir -p $DEBIAN_DIR
-}
-
-package_all(){
-    package_static_files
-    package_package_root_placement
-    package_absolute_placement
-    package_samples
-    package_docs
-    package_install_scripts
-}
-
-generate_all(){
-    generate_config_templates
-    generate_manpages
-    generate_manpage_manifest
-    generate_sample_manifest
-    write_debian_install_file
-}
-
-create_source_tarball(){
-    rm -f ${OUTPUT_DIR}/${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz
-    tar -cvzf ${OUTPUT_DIR}/${PACKAGE_NAME}_${PACKAGE_VERSION}.orig.tar.gz -C $PACKAGE_SOURCE_DIR .
-}
-
-copy_files_to_output(){
-    # .deb, .dsc, etc.. Already in output dir
-    # Copy Test files
-
-    cp $SCRIPT_DIR/test/integration_tests/test_package.bats $OUTPUT_DIR
-}
-
-## Packaging Functions ##
-package_static_files(){
-    cp -a $SCRIPT_DIR/package_files/debian/* ${PACKAGE_SOURCE_DIR}/debian
-}
-
-package_package_root_placement(){
-    add_dir_to_install ${PACKAGE_ROOT_PLACEMENT_DIR} ""
-}
-
-package_absolute_placement(){
-    if [[ -d "$ABSOLUTE_PLACEMENT_DIR" ]]; then
-        abs_in_package_dir="\$"
-
-        add_dir_to_install ${ABSOLUTE_PLACEMENT_DIR} $abs_in_package_dir
-
-        # Get List of all files in directory tree, relative to ABSOLUTE_PLACEMENT_DIR
-        abs_files=( $(_get_files_in_dir_tree $ABSOLUTE_PLACEMENT_DIR) )
-
-        # For each file add a a system placement
-        for abs_file in ${abs_files[@]}
-        do
-            parent_dir=$(dirname $abs_file)
-            filename=$(basename $abs_file)
-
-            add_system_file_placement "$abs_in_package_dir/$abs_file" "/$parent_dir"
-        done
-    fi
-}
-
-package_samples(){
-    if [[ -d "$INPUT_SAMPLES_DIR" ]]; then
-        cp -a $INPUT_SAMPLES_DIR/. $PACKAGE_SOURCE_DIR
-    fi
-}
-
-package_docs(){
-    if [[ -d "$INPUT_DOCS_DIR" ]]; then
-        mkdir -p $DOCS_DIR
-        cp -a $INPUT_DOCS_DIR/. $DOCS_DIR
-    fi
-}
-
-package_install_scripts(){
-    # copy scripts for the package's control section like preinst, postint, etc
-    if [[ -d "$INPUT_DIR/debian" ]]; then
-        cp -a "$INPUT_DIR/debian/." $DEBIAN_DIR
-    fi
-}
-
-## Generation Functions ##
-generate_config_templates(){
-    python3 ${SCRIPT_DIR}/scripts/config_template_generator.py $CONFIG $SCRIPT_DIR/templates/debian $DEBIAN_DIR $PACKAGE_NAME $PACKAGE_VERSION
-}
-
-generate_manpages(){
-    if [[ -f "$DOCS_JSON_PATH" ]]; then
-        mkdir -p $DOCS_DIR
-
-        # Generate the manpages from json spec
-        python3 ${SCRIPT_DIR}/scripts/manpage_generator.py ${DOCS_JSON_PATH} ${DOCS_DIR}
-    fi
-}
-
-generate_manpage_manifest(){
-    # Get a list of files generated relative to $DOCS_DIR
-    generated_manpages=( $(_get_files_in_dir_tree $DOCS_DIR) )
-
-    # Get path relative to $PACKAGE_SOURCE_DIR to prepend to each filename
-    # This syntax is bash substring removal
-    docs_rel_path=${DOCS_DIR#${PACKAGE_SOURCE_DIR}/}
-
-    # Remove any existing manifest
-    rm -f ${DEBIAN_DIR}/${PACKAGE_NAME}.manpages
-
-    for manpage in ${generated_manpages[@]}
-    do
-        echo "${docs_rel_path}/${manpage}" >> "${DEBIAN_DIR}/${PACKAGE_NAME}.manpages"
-    done
-}
-
-generate_sample_manifest(){
-    if [[ -d "$INPUT_SAMPLES_DIR" ]]; then
-        generated_manpages=( $(_get_files_in_dir_tree $INPUT_SAMPLES_DIR) )
-
-        rm -f sample_manifest
-        for sample in ${samples[@]}
-        do
-            echo "$sample" >> "${DEBIAN_DIR}/${PACKAGE_NAME}.examples"
-        done
-    else
-        echo "Provide a 'samples' directory in INPUT_DIR to package samples"
-    fi
-}
-
-execute "$@"
diff --git a/src/Installers/Debian/tools/package_files/debian/compat b/src/Installers/Debian/tools/package_files/debian/compat
deleted file mode 100644
index f599e28b8ab0..000000000000
--- a/src/Installers/Debian/tools/package_files/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/src/Installers/Debian/tools/package_files/debian/source/format b/src/Installers/Debian/tools/package_files/debian/source/format
deleted file mode 100644
index 163aaf8d82b6..000000000000
--- a/src/Installers/Debian/tools/package_files/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/src/Installers/Debian/tools/scripts/config_template_generator.py b/src/Installers/Debian/tools/scripts/config_template_generator.py
deleted file mode 100755
index 3ce9f2c7c188..000000000000
--- a/src/Installers/Debian/tools/scripts/config_template_generator.py
+++ /dev/null
@@ -1,267 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Parses debian_config.json and generates appropriate templates
-# Where optional defaults exist, they are defined in the template_dict
-#     of the appropriate generation function
-
-import os
-import sys
-import json
-import datetime
-
-FILE_CHANGELOG = 'changelog'
-FILE_CONTROL = 'control'
-FILE_COPYRIGHT = 'copyright'
-FILE_SYMLINK_FORMAT = '{package_name}.links'
-FILE_RULES = 'rules'
-
-PACKAGE_ROOT_FORMAT = "usr/share/{package_name}"
-CHANGELOG_DATE_FORMAT = "%a, %d %b %Y %H:%M:%S %z"
-
-# UTC Timezone for Changelog date
-class UTC(datetime.tzinfo):
-    def utcoffset(self, dt):
-        return datetime.timedelta(0)
-
-    def tzname(self, dt):
-        return "UTC"
-
-    def dst(self, dt):
-        return datetime.timedelta(0)
-
-# Generation Functions
-def generate_and_write_all(config_data, template_dir, output_dir, package_name=None, package_version=None):
-    try:
-        changelog_contents = generate_changelog(
-            config_data, 
-            template_dir, 
-            package_name=package_name, 
-            package_version=package_version)
-
-        control_contents = generate_control(config_data, template_dir, package_name=package_name)
-        copyright_contents = generate_copyright(config_data, template_dir)
-        symlink_contents = generate_symlinks(config_data, package_name=package_name)
-        rules_contents = generate_rules(config_data, template_dir)
-    except Exception as exc:
-      print(exc)
-      help_and_exit("Error: Generation Failed, check your config file.")
-
-    write_file(changelog_contents, output_dir, FILE_CHANGELOG)
-    write_file(control_contents, output_dir, FILE_CONTROL)
-    write_file(copyright_contents, output_dir, FILE_COPYRIGHT)
-    write_file(rules_contents, output_dir, FILE_RULES)
-
-    # Symlink File is optional
-    if symlink_contents:
-        symlink_filename = get_symlink_filename(config_data, package_name=package_name)
-        write_file(symlink_contents, output_dir, symlink_filename)
-
-    return
-
-def generate_rules(config_data, template_dir):
-    template = get_template(template_dir, FILE_RULES)
-
-    ignored_dependency_packages = config_data.get("debian_ignored_dependencies", None)
-    override_text = ""
-
-    if ignored_dependency_packages != None:
-        override_text = "override_dh_shlibdeps:\n\tdh_shlibdeps --dpkg-shlibdeps-params=\""
-
-        for package in ignored_dependency_packages:
-            override_text += "-x{0} ".format(package)
-
-        override_text += "\""
-
-    return template.format(overrides=override_text)
-
-def generate_changelog(config_data, template_dir, package_version=None, package_name=None):
-    template = get_template(template_dir, FILE_CHANGELOG)
-
-    release_data = config_data["release"]
-    
-    # Allow for Version Override
-    config_package_version = release_data["package_version"]
-    package_version = package_version or config_package_version
-
-    template_dict = dict(\
-        PACKAGE_VERSION=package_version,
-        PACKAGE_REVISION=release_data["package_revision"],
-        CHANGELOG_MESSAGE=release_data["changelog_message"],
-        URGENCY=release_data.get("urgency", "low"),
-
-        PACKAGE_NAME=package_name or config_data["package_name"],
-        MAINTAINER_NAME=config_data["maintainer_name"],
-        MAINTAINER_EMAIL=config_data["maintainer_email"], 
-        DATE=datetime.datetime.now(UTC()).strftime(CHANGELOG_DATE_FORMAT)
-    )
-
-    contents = template.format(**template_dict)
-
-    return contents
-
-def generate_control(config_data, template_dir, package_name=None):
-    template = get_template(template_dir, FILE_CONTROL)
-
-    dependency_data = config_data.get("debian_dependencies", None)
-    dependency_str = get_dependendent_packages_string(dependency_data)
-
-    conflict_data = config_data.get("package_conflicts", [])
-    conflict_str = ', '.join(conflict_data)
-
-    # Default to empty dict, so we don't explode on nested optional values
-    control_data = config_data.get("control", dict())
-
-    template_dict = dict(\
-        SHORT_DESCRIPTION=config_data["short_description"],
-        LONG_DESCRIPTION=config_data["long_description"],
-        HOMEPAGE=config_data.get("homepage", ""),
-
-        SECTION=control_data.get("section", "misc"),
-        PRIORITY=control_data.get("priority", "low"),
-        ARCH=control_data.get("architecture", "all"),
-
-        DEPENDENT_PACKAGES=dependency_str,
-        CONFLICT_PACKAGES=conflict_str,
-
-        PACKAGE_NAME=package_name or config_data["package_name"],
-        MAINTAINER_NAME=config_data["maintainer_name"],
-        MAINTAINER_EMAIL=config_data["maintainer_email"]
-    )
-
-    contents = template.format(**template_dict)
-
-    return contents
-
-def generate_copyright(config_data, template_dir):
-    template = get_template(template_dir, FILE_COPYRIGHT)
-
-    license_data = config_data["license"]
-
-    template_dict = dict(\
-        COPYRIGHT_TEXT=config_data["copyright"],
-        LICENSE_NAME=license_data["type"],
-        LICENSE_TEXT=license_data["full_text"]
-    )
-
-    contents = template.format(**template_dict)
-
-    return contents
-
-def generate_symlinks(config_data, package_name=None):
-    symlink_entries = []
-    package_root_path = get_package_root(config_data, package_name=package_name)
-
-    symlink_data = config_data.get("symlinks", dict())
-
-    for package_rel_path, symlink_path in iter(symlink_data.items()):
-
-        package_abs_path = os.path.join(package_root_path, package_rel_path)
-
-        symlink_entries.append( '%s %s' % (package_abs_path, symlink_path) )
-
-    return '\n'.join(symlink_entries)
-    
-# Helper Functions
-def get_package_root(config_data, package_name=None):
-    config_install_root = config_data.get("install_root", None)
-    package_name = package_name or config_data["package_name"]
-
-    return config_install_root or PACKAGE_ROOT_FORMAT.format(package_name=package_name)
-
-def get_symlink_filename(config_data, package_name=None):
-    package_name = package_name or config_data["package_name"]
-    return FILE_SYMLINK_FORMAT.format(package_name=package_name)
-
-def get_dependendent_packages_string(debian_dependency_data):
-    if debian_dependency_data is None:
-        return ""
-
-    dependencies = []
-        
-    for debian_package_name in debian_dependency_data:
-        dep_str = debian_package_name
-
-        if debian_dependency_data[debian_package_name].get("package_version", None):
-            debian_package_version = debian_dependency_data[debian_package_name].get("package_version")
-
-            dep_str += " (>= %s)" % debian_package_version
-
-        dependencies.append(dep_str)
-
-    # Leading Comma is important here
-    return ', ' + ', '.join(dependencies)
-
-
-def load_json(json_path):
-    json_data = None
-    with open(json_path, 'r') as json_file:
-        json_data = json.load(json_file)
-
-    return json_data
-
-def get_template(template_dir, name):
-    path = os.path.join(template_dir, name)
-    template_contents = None
-
-    with open(path, 'r') as template_file:
-        template_contents = template_file.read()
-
-    return template_contents
-
-def write_file(contents, output_dir, name):
-    path = os.path.join(output_dir, name)
-
-    with open(path, 'w') as out_file:
-        out_file.write(contents)
-
-    return
-
-# Tool Functions
-def help_and_exit(msg):
-    print(msg)
-    sys.exit(1)
-
-def print_usage():
-    print("Usage: config_template_generator.py [config file path] [template directory path] [output directory] (package name) (package version)")
-
-def parse_and_validate_args():
-    if len(sys.argv) < 4:
-        print_usage()
-        help_and_exit("Error: Invalid Arguments")
-
-    config_path = sys.argv[1]
-    template_dir = sys.argv[2]
-    output_dir = sys.argv[3]
-    name_override = None
-    version_override = None
-    
-    if len(sys.argv) >= 5:
-        name_override = sys.argv[4]
-
-    if len(sys.argv) >= 6:
-        version_override = sys.argv[5]
-
-    if not os.path.isfile(config_path):
-        help_and_exit("Error: Invalid config file path")
-
-    if not os.path.isdir(template_dir):
-        help_and_exit("Error: Invalid template directory path")
-
-    if not os.path.isdir(output_dir):
-        help_and_exit("Error: Invalid output directory path")
-
-    return (config_path, template_dir, output_dir, name_override, version_override)
-
-def execute():
-    config_path, template_dir, output_dir, name_override, version_override = parse_and_validate_args()
-
-    config_data = load_json(config_path)
-
-    generate_and_write_all(config_data, template_dir, output_dir, package_name = name_override, package_version=version_override)
-
-if __name__ == "__main__":
-    execute()
diff --git a/src/Installers/Debian/tools/scripts/debian_build_lib.sh b/src/Installers/Debian/tools/scripts/debian_build_lib.sh
deleted file mode 100755
index 8aa53420f9f7..000000000000
--- a/src/Installers/Debian/tools/scripts/debian_build_lib.sh
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# This file is not intended to be executed directly
-# Import these functions using source
-#
-# Relies on these environment variables:
-# PACKAGE_SOURCE_DIR :: Package Source Staging Directory
-# INSTALL_ROOT :: Absolute path of package installation root
-
-# write_debian_install_file
-# Summary: Writes the contents of the "install_placement" array to the debian/install
-#   This array is populated by calls to the "add_system_file_placement" function
-# Usage: write_debian_install_file
-write_debian_install_file(){
-    # Remove any existing install file, we need to overwrite it
-    rm -f ${PACKAGE_SOURCE_DIR}/debian/install
-
-    for i in "${install_placement[@]}"
-    do
-        echo "${i}" >> "${PACKAGE_SOURCE_DIR}/debian/install"
-    done
-}
-
-# add_system_file_placement
-# Summary:  Registers a file placement on the filesystem from the package by populating the "install_placement" array
-# Usage: add_system_file_placement {local path of file in package} {absolute path of directory to place file in}
-add_system_file_placement(){
-    #Initialize placement_index variable
-    if [[ -z "$placement_index" ]]; then
-        placement_index=0
-    fi
-
-    install_placement[${placement_index}]="${1} ${2}"
-    placement_index=$((${placement_index}+1))
-}
-
-# add_system_dir_placement
-# Summary: Registers a directory placement on the post-installation package from an in-package path
-add_system_dir_placement(){
-
-    in_package_dir=$1
-    abs_installation_dir=$2
-
-    dir_files=( $(_get_files_in_dir_tree $PACKAGE_SOURCE_DIR/$in_package_dir) )
-    
-    # If in_package_dir isn't empty include a slash
-    if [ ! -z "$in_package_dir" ]; then
-        in_package_dir="${in_package_dir}/"
-    fi
-
-    for rel_filepath in ${dir_files[@]}
-    do
-        local parent_path=$(dirname $rel_filepath)
-
-        # If there is no parent, parent_path = "."
-        if [[ "$parent_path" == "." ]]; then
-            add_system_file_placement "${in_package_dir}${rel_filepath}" "${abs_installation_dir}"
-        else
-            add_system_file_placement "${in_package_dir}${rel_filepath}" "${abs_installation_dir}/${parent_path}"
-        fi
-
-    done
-}
-
-# add_file_to_install
-# Summary: Adds a file from the local filesystem to the package and installs it rooted at INSTALL_ROOT
-# Usage: add_install_file {relative path to local file} {relative path to INSTALL_ROOT to place file}
-add_file_to_install(){
-    copy_from_file=$1
-    rel_install_path=$2
-
-    local filename=$(basename $copy_from_file)
-    local parent_dir=$(dirname $copy_from_file)
-
-    # Create Relative Copy From Path
-    rel_copy_from_file=${copy_from_file#$parent_dir/}
-
-    # Delete any existing file and ensure path exists
-    rm -f ./${PACKAGE_SOURCE_DIR}/${rel_install_path}/${filename}
-    mkdir -p ./${PACKAGE_SOURCE_DIR}/${rel_install_path}
-
-    dir_files=( "$rel_copy_from_file" )
-
-    _copy_files_to_package $parent_dir $rel_install_path "${dir_files[@]}"
-
-    add_system_file_placement "${rel_install_path}/${filename}" "${INSTALL_ROOT}/$rel_install_path"
-}
-
-# add_dir_to_install
-# Summary: Adds contents of a directory on the local filesystem to the package and installs them rooted at INSTALL_ROOT
-#     Note: Does not install the directory passed, only its contents 
-# Usage: add_dir_to_install {relative path of directory to copy} {relative path to INSTALL_ROOT to place directory tree}
-add_dir_to_install(){
-    
-    copy_from_dir=$1
-    rel_install_path=$2
-
-    # Delete and Create any existing directory
-    mkdir -p ${PACKAGE_SOURCE_DIR}/${rel_install_path}
-
-    dir_files=( $(_get_files_in_dir_tree $copy_from_dir) )
-
-    _copy_files_to_package "$copy_from_dir" "$rel_install_path" "${dir_files[@]}"
-
-    for file in "${dir_files[@]}"
-    do
-        file_rel_dir="$(dirname $file)"
-        add_system_file_placement "${rel_install_path}/${file}" "${INSTALL_ROOT}/$rel_install_path/${file_rel_dir}"
-    done
-}
-
-# Usage: _copy_files_to_package {local files root directory} {relative directory in package to copy to} "${filepath_array[@]}"
-# Note: The specific syntax on the parameter shows how to pass an array
-_copy_files_to_package(){
-    local_root_dir=$1
-    package_dest_dir=$2
-
-    # Consume the remaining input as an array
-    shift; shift;
-    rel_filepath_list=( $@ )
-
-    for rel_filepath in ${rel_filepath_list[@]}
-    do
-        local parent_dir=$(dirname $rel_filepath)
-        local filename=$(basename $rel_filepath)
-            
-        mkdir -p ${PACKAGE_SOURCE_DIR}/${package_dest_dir}/${parent_dir}
-
-        # Ignore $parent_dir if it there isn't one
-        if [[ "$parent_dir" == "." ]]; then
-            cp "${local_root_dir}/${rel_filepath}" "${PACKAGE_SOURCE_DIR}/${package_dest_dir}"
-        else
-            cp "${local_root_dir}/${rel_filepath}" "${PACKAGE_SOURCE_DIR}/${package_dest_dir}/${parent_dir}"
-        fi
-        
-    done
-}
-
-# Usage: _get_files_in_dir_tree {path of directory}
-_get_files_in_dir_tree(){
-
-    root_dir=$1
-
-    # Use Globstar expansion to enumerate all directories and files in the tree
-    shopt -s globstar
-    shopt -s dotglob
-    dir_tree_list=( "${root_dir}/"** )
-
-    # Build a new array with only the Files contained in $dir_tree_list
-    local index=0
-    for file_path in "${dir_tree_list[@]}"
-    do
-        if [ -f $file_path ]; then
-            dir_tree_file_list[${index}]=$file_path
-            index=$(($index+1))
-        fi
-    done
-
-    # Remove $root_dir prefix from each path in dir_tree_file_list
-    # This is confusing syntax, so here's a reference link (Substring Removal)
-    #     http://wiki.bash-hackers.org/syntax/pe
-    dir_tree_file_list=( "${dir_tree_file_list[@]#${root_dir}/}" )
-
-    # Echo is the return mechanism
-    echo "${dir_tree_file_list[@]}"
-}
-
diff --git a/src/Installers/Debian/tools/scripts/extract_json_value.py b/src/Installers/Debian/tools/scripts/extract_json_value.py
deleted file mode 100755
index 45f26833f5bb..000000000000
--- a/src/Installers/Debian/tools/scripts/extract_json_value.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Extract Json Value
-#
-# Very simple tool to ease extracting json values from the cmd line.
-import os
-import sys
-import json
-
-def print_usage():
-	print("""
-		Usage: extract_json_value.py [json file path] [key of value to extract]
-		For nested keys, use . separator
-	""")
-
-def help_and_exit(msg=None):
-	print(msg)
-	print_usage()
-	sys.exit(1)
-
-def parse_and_validate_args():
-	
-	if len(sys.argv) < 3:
-		help_and_exit(msg="Error: Invalid Args")
-
-	json_path = sys.argv[1]
-	json_key = sys.argv[2]
-
-	if not os.path.isfile(json_path):
-		help_and_exit("Error: Invalid json file path")
-
-	return json_path, json_key
-
-def extract_key(json_path, json_key):
-	json_data = None
-
-	with open(json_path, 'r') as json_file:
-		json_data = json.load(json_file)
-
-	nested_keys = json_key.split('.')
-	json_context = json_data
-
-	for key in nested_keys:
-		json_context = json_context.get(key, None)
-
-		if json_context is None:
-			help_and_exit("Error: Invalid json key")
-
-	return str(json_context)
-
-def execute():
-	json_path, json_key = parse_and_validate_args()
-
-	value = extract_key(json_path, json_key)
-
-	return value
-
-if __name__ == "__main__":
-	print(execute())
-
diff --git a/src/Installers/Debian/tools/scripts/manpage_generator.py b/src/Installers/Debian/tools/scripts/manpage_generator.py
deleted file mode 100755
index 56a2c2a1e1d0..000000000000
--- a/src/Installers/Debian/tools/scripts/manpage_generator.py
+++ /dev/null
@@ -1,303 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# manpage_generator
-#       Converts top level docs.json format command info to
-#       nroff manpage format. Done in python for easy json parsing.
-#
-#   Usage: argv[1] = path to docs.json; argv[2] = output path
-
-import sys
-import os
-import json
-import datetime
-
-SECTION_SEPARATOR = "\n.P \n"
-MANPAGE_EXTENSION = ".1"
-
-# For now this is a magic number
-# See https://www.debian.org/doc/manuals/maint-guide/dother.en.html#manpage
-SECTION_NUMBER = 1
-
-def generate_man_pages(doc_path, output_dir):
-
-    with open(doc_path) as doc_file:
-        doc_json = None
-        try:
-            doc_json = json.load(doc_file)
-        except:
-            raise Exception("Failed to load json file. Check formatting.")
-
-        tools = doc_json.get("tools", None)
-
-        if tools is None:
-            raise Exception("No tool sections in doc.json")
-
-        for tool_name in tools:
-            tool_data = tools[tool_name]
-
-            man_page_content = generate_man_page(tool_name, tool_data)
-            man_page_path = get_output_path(tool_name, output_dir)
-
-            write_man_page(man_page_path, man_page_content)
-
-def get_output_path(toolname, output_dir):
-    out_filename = toolname + MANPAGE_EXTENSION
-
-    return os.path.join(output_dir, out_filename)
-
-def write_man_page(path, content):
-    with open(path, 'w') as man_file:
-        man_file.write(content)
-
-	#Build Fails without a final newline
-	man_file.write('\n')
-
-def generate_man_page(tool_name, tool_data):
-
-    sections = [
-            generate_header_section(tool_name, tool_data),
-            generate_name_section(tool_name, tool_data),
-            generate_synopsis_section(tool_name, tool_data),
-            generate_description_section(tool_name, tool_data),
-            generate_options_section(tool_name, tool_data),
-            generate_author_section(tool_name, tool_data),
-            generate_copyright_section(tool_name, tool_data)
-    ]
-
-    return SECTION_SEPARATOR.join(sections)
-
-def generate_header_section(tool_name, tool_data):#
-    roff_text_builder = []
-
-    header_format = ".TH {program_name} {section_number} {center_footer} {left_footer} {center_header}"
-
-    today = datetime.date.today()
-    today_string = today.strftime("%B %d, %Y")
-
-    format_args = {
-            "program_name" : tool_name,
-            "section_number" : SECTION_NUMBER,
-            "center_footer" : "",   # Omitted
-            "left_footer" : "",     # Omitted
-            "center_header" : ""    # Omitted
-    }
-
-    roff_text_builder.append(header_format.format(**format_args))
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def generate_name_section(tool_name, tool_data):#
-    roff_text_builder = []
-    roff_text_builder.append(".SH NAME")
-
-    tool_short_description = tool_data.get("short_description", "")
-    name_format = ".B {program_name} - {short_description}"
-
-    name_format_args = {
-            "program_name": tool_name,
-            "short_description" : tool_short_description
-    }
-
-    roff_text_builder.append(name_format.format(**name_format_args))
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def generate_synopsis_section(tool_name, tool_data):#
-    roff_text_builder = []
-    roff_text_builder.append(".SH SYNOPSIS")
-
-    synopsis_format = '.B {program_name} {command_name} \n.RI {options} " "\n.I "{argument_list_name}"'
-
-    tool_commands = tool_data.get("commands", [])
-    for command_name in tool_commands:
-        command_data = tool_commands[command_name]
-
-        # Default options to empty list so the loop doesn't blow up
-        options = command_data.get("options", [])
-        argument_list = command_data.get("argumentlist", None)
-
-        # Construct Option Strings
-        option_string_list = []
-        argument_list_name = ""
-
-        for option_name in options:
-            option_data = options[option_name]
-
-            specifier_short = option_data.get("short", None)
-            specifier_long = option_data.get("long", None)
-            parameter = option_data.get("parameter", None)
-
-            option_string = _option_string_helper(specifier_short, specifier_long, parameter)
-
-            option_string_list.append(option_string)
-
-        # Populate Argument List Name
-        if argument_list:
-            argument_list_name = argument_list.get("name", "")
-
-        cmd_format_args = {
-                'program_name' : tool_name,
-                'command_name' : command_name,
-                'options' : '" "'.join(option_string_list),
-                'argument_list_name' : argument_list_name
-        }
-
-        cmd_string = synopsis_format.format(**cmd_format_args)
-
-        roff_text_builder.append(cmd_string)
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def generate_description_section(tool_name, tool_data):#
-    roff_text_builder = []
-    roff_text_builder.append(".SH DESCRIPTION")
-
-    # Tool Description
-    long_description = tool_data.get("long_description", "")
-    roff_text_builder.append(".PP {0}".format(long_description))
-
-    # Command Descriptions
-    cmd_description_format = ".B {program_name} {command_name}\n{command_description}"
-
-    tool_commands = tool_data.get("commands", [])
-    for command_name in tool_commands:
-        command_data = tool_commands[command_name]
-
-        command_description = command_data.get("description", "")
-
-        format_args = {
-            "program_name" : tool_name,
-            "command_name" : command_name,
-            "command_description" : command_description
-        }
-
-        cmd_string = cmd_description_format.format(**format_args)
-
-        roff_text_builder.append(cmd_string)
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def generate_options_section(tool_name, tool_data):#
-    roff_text_builder = []
-    roff_text_builder.append(".SH OPTIONS")
-
-    options_format = '.TP\n.B {option_specifiers}\n{option_description}'
-
-    tool_commands = tool_data.get("commands", [])
-    for command_name in tool_commands:
-        command_data = tool_commands[command_name]
-
-        # Default to empty list so the loop doesn't blow up
-        options = command_data.get("options", [])
-
-        for option_name in options:
-            option_data = options[option_name]
-
-            specifier_short = option_data.get("short", None)
-            specifier_long = option_data.get("long", None)
-            parameter = option_data.get("parameter", None)
-            description = option_data.get("description", "")
-
-            option_specifiers_string = _option_string_helper(specifier_short, 
-                specifier_long, 
-                parameter, 
-                include_brackets = False, 
-                delimiter=' ", " ')
-
-            format_args = {
-                "option_specifiers": option_specifiers_string,
-                "option_description" : description
-            }
-
-            roff_text_builder.append(options_format.format(**format_args))
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def generate_author_section(tool_name, tool_data):#
-    roff_text_builder = []
-    roff_text_builder.append(".SH AUTHOR")
-    
-    author_format = '.B "{author_name}" " " \n.RI ( "{author_email}" )'
-    
-    author_name = tool_data.get("author", "")
-    author_email = tool_data.get("author_email", "")
-    
-    format_args = {
-        "author_name" : author_name,
-        "author_email" : author_email
-    }
-    
-    roff_text_builder.append(author_format.format(**format_args))
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def generate_copyright_section(tool_name, tool_data):#
-    roff_text_builder = []
-    roff_text_builder.append(".SH COPYRIGHT")
-    
-    copyright_data = tool_data.get("copyright")
-    
-    roff_text_builder.append('.B "{0}"'.format(copyright_data))
-
-    return SECTION_SEPARATOR.join(roff_text_builder)
-
-def _option_string_helper(specifier_short, specifier_long, parameter, include_brackets = True, delimiter = " | "):
-    option_string = ""
-
-    if include_brackets:
-        option_string = " [ "
-
-    if specifier_short:
-        option_string += ' "{0}" '.format(specifier_short)
-
-    if specifier_short and specifier_long:
-        option_string += delimiter
-
-    if specifier_long:
-        option_string += ' "{0}" '.format(specifier_long)
-
-    if parameter:
-    	option_string += ' " " '
-        option_string += ' "{0}" '.format(parameter)
-
-    if include_brackets:
-        option_string += " ] "
-
-    return option_string
-
-
-def print_usage():
-    print("Usage: argv[1] = path to docs.json; argv[2] = output path")
-    print("Example: manpage_generator.py ../docs.json ./dotnet-1.0/debian")
-
-def parse_args():
-    doc_path = sys.argv[1]
-    output_dir = sys.argv[2]
-
-    return (doc_path, output_dir)
-
-def validate_args(doc_path, output_dir):
-    if not os.path.isfile(doc_path):
-        raise Exception("Docs.json path is not valid.")
-
-    if not os.path.isdir(output_dir):
-        raise Exception("Output Directory Path is not valid.")
-
-def execute_command_line():
-    try:
-        doc_path, output_dir = parse_args()
-
-        validate_args(doc_path, output_dir)
-
-        generate_man_pages(doc_path, output_dir)
-
-    except Exception as exc:
-        print("Error: ", exc)
-        print_usage()
-
-if __name__ == "__main__":
-    execute_command_line()
diff --git a/src/Installers/Debian/tools/setup/build_setup.sh b/src/Installers/Debian/tools/setup/build_setup.sh
deleted file mode 100755
index 269aff50ef7d..000000000000
--- a/src/Installers/Debian/tools/setup/build_setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-install_dependencies(){
-    # Add LLdb 3.6 package source
-    echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list
-    wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
-
-    #Install Deps
-    apt-get update
-    apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev
-}
-
-setup(){
-    install_dependencies
-}
-
-setup
\ No newline at end of file
diff --git a/src/Installers/Debian/tools/setup/test_setup.sh b/src/Installers/Debian/tools/setup/test_setup.sh
deleted file mode 100755
index 47442fd60356..000000000000
--- a/src/Installers/Debian/tools/setup/test_setup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-install_dependencies(){
-    # Add LLdb 3.6 package source
-    echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list
-    wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
-
-    #Install Deps
-    apt-get update
-    apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev
-}
-
-install_bats(){
-    git clone https://github.com/sstephenson/bats.git
-    cd bats
-    ./install.sh /usr/local
-}
-
-setup(){
-    install_dependencies
-    install_bats
-}
-
-setup
\ No newline at end of file
diff --git a/src/Installers/Debian/tools/templates/debian/changelog b/src/Installers/Debian/tools/templates/debian/changelog
deleted file mode 100644
index 8eccaab397c6..000000000000
--- a/src/Installers/Debian/tools/templates/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-{PACKAGE_NAME} ({PACKAGE_VERSION}-{PACKAGE_REVISION}) unstable; urgency={URGENCY}
-
-  * {CHANGELOG_MESSAGE}
-
- -- {MAINTAINER_NAME} <{MAINTAINER_EMAIL}>  {DATE}
diff --git a/src/Installers/Debian/tools/templates/debian/control b/src/Installers/Debian/tools/templates/debian/control
deleted file mode 100644
index 739c37b4ed5c..000000000000
--- a/src/Installers/Debian/tools/templates/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-Source: {PACKAGE_NAME}
-Maintainer: {MAINTAINER_NAME} <{MAINTAINER_EMAIL}>
-Section: {SECTION}
-Priority: {PRIORITY}
-Standards-Version: 3.9.2
-Build-Depends: debhelper (>=9)
-Homepage: {HOMEPAGE}
-
-Package: {PACKAGE_NAME}
-Architecture: {ARCH}
-Depends: ${{misc:Depends}}{DEPENDENT_PACKAGES}
-Conflicts: {CONFLICT_PACKAGES}
-Description: {SHORT_DESCRIPTION}
- {LONG_DESCRIPTION}
diff --git a/src/Installers/Debian/tools/templates/debian/copyright b/src/Installers/Debian/tools/templates/debian/copyright
deleted file mode 100644
index 1fe22df1b722..000000000000
--- a/src/Installers/Debian/tools/templates/debian/copyright
+++ /dev/null
@@ -1,10 +0,0 @@
-Comment: Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-
-Files: *
-Copyright: {COPYRIGHT_TEXT}
-License: {LICENSE_NAME}
-
-License: {LICENSE_NAME}
- {LICENSE_TEXT}
\ No newline at end of file
diff --git a/src/Installers/Debian/tools/templates/debian/rules b/src/Installers/Debian/tools/templates/debian/rules
deleted file mode 100644
index 6f32006c48a5..000000000000
--- a/src/Installers/Debian/tools/templates/debian/rules
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/make -f
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-{overrides}
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
-%:
-	dh $@
-
diff --git a/src/Installers/Debian/tools/test.sh b/src/Installers/Debian/tools/test.sh
deleted file mode 100755
index 9adde436f4dc..000000000000
--- a/src/Installers/Debian/tools/test.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-current_user=$(whoami)
-if [ $current_user != "root" ]; then
-    echo "test.sh requires superuser privileges to run"
-    exit 1
-fi
-
-run_unit_tests(){
-    bats $DIR/test/unit_tests/test_debian_build_lib.bats
-    bats $DIR/test/unit_tests/test_scripts.bats
-}
-
-run_integration_tests(){
-    input_dir=$DIR/test/test_assets/test_package_layout
-    output_dir=$DIR/bin
-
-    # Create output dir
-    mkdir -p $output_dir
-
-    # Build the actual package
-    $DIR/package_tool -i $input_dir -o $output_dir
-
-    # Integration Test Entrypoint placed by package_tool
-    bats $output_dir/test_package.bats
-
-    # Cleanup output dir
-    rm -rf $DIR/test/test_assets/test_package_output
-}
-
-run_all(){
-    run_unit_tests
-    run_integration_tests
-}
-
-run_all
diff --git a/src/Installers/Debian/tools/test/integration_tests/test_package.bats b/src/Installers/Debian/tools/test/integration_tests/test_package.bats
deleted file mode 100755
index 8f4c7505388b..000000000000
--- a/src/Installers/Debian/tools/test/integration_tests/test_package.bats
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-# This script is used to test the debian package after it's creation.
-# The package tool will drop it next to the .deb file it creates.
-# Environment Variables:
-#   LAST_VERSION_URL: Url for last version .deb (to test upgrades) [required for upgrade test]
-
-#Ensure running with superuser privileges
-current_user=$(whoami)
-if [ $current_user != "root" ]; then
-	echo "WARNING: test_package.bats requires superuser privileges to run, trying sudo..."
-	SUDO_PREFIX="sudo"
-fi
-
-setup(){
-	DIR="$BATS_TEST_DIRNAME"
-
-	PACKAGE_FILENAME="$(ls $DIR | grep .deb -m 1)"
-	PACKAGE_PATH="$DIR/*.deb"
-
-	# Get Package name from package path, 
-	PACKAGE_NAME=${PACKAGE_FILENAME%%_*}
-}
-
-install_package(){
-	$SUDO_PREFIX dpkg -i $PACKAGE_PATH
-}
-
-remove_package(){
-	$SUDO_PREFIX dpkg -r $PACKAGE_NAME
-}
-
-purge_package(){
-	$SUDO_PREFIX dpkg -P $PACKAGE_NAME
-}
-
-install_last_version(){
-	$SUDO_PREFIX dpkg -i "$DIR/last_version.deb"
-}
-
-download_and_install_last_version(){
-	curl "$LAST_VERSION_URL" -o "$DIR/last_version.deb"
-	
-	install_last_version
-}
-
-delete_last_version(){
-        rm -f "$DIR/last_version.deb"
-}
-
-teardown(){
-        delete_last_version
-}
-
-@test "package install + removal test" {
-	install_package
-	remove_package
-}
-
-@test "package install + purge test" {
-	install_package
-	purge_package
-}
-
-# Ultimate Package Test
-# https://www.debian.org/doc/manuals/maint-guide/checkit.en.html#pmaintscripts
-@test "package install + upgrade + purge + install + remove + install + purge test" {
-	if [ ! -z "$LAST_VERSION_URL" ]; then
-		download_and_install_last_version
-		install_package
-		purge_package
-		install_package
-		remove_package
-		install_package
-		purge_package
-	fi
-}
diff --git a/src/Installers/Debian/tools/test/test_assets/lkgtestman.1 b/src/Installers/Debian/tools/test/test_assets/lkgtestman.1
deleted file mode 100644
index 57915b0a615f..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/lkgtestman.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH tool1 1   
-.P 
-.SH NAME
-.P 
-.B tool1 - A tool to Vestibulum lacinia arcu eget nulla.
-.P 
-.SH SYNOPSIS
-.P 
-.B tool1 noOptionsCommand 
-.RI  " "
-.I "argument list stuff"
-.P 
-.B tool1 noArgumentListFullOptions 
-.RI  [  "-t"  |  "--target"  " "  "TARGET"  ] " " [  "--noshortparam"  ] " " [  "-l"  ] " " [  "-p"  |  "--noparam"  ] " " [  "-n"  " "  "NOLONG"  ] " " [  "--noshort"  " "  "NOSHORT"  ] " " [  "-a"  |  "--another"  " "  "ANOTHER"  ]  " "
-.I ""
-.P 
-.B tool1 fullcommand1 
-.RI  [  "-t"  |  "--target"  " "  "TARGET"  ] " " [  "--noshortparam"  ] " " [  "-l"  ] " " [  "-p"  |  "--noparam"  ] " " [  "-n"  " "  "NOLONG"  ] " " [  "--noshort"  " "  "NOSHORT"  ] " " [  "-a"  |  "--another"  " "  "ANOTHER"  ]  " "
-.I "argument list stuff"
-.P 
-.SH DESCRIPTION
-.P 
-.PP Tool1 is a really great Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. 
-.P 
-.B tool1 noOptionsCommand
-builds a native executable from specified source files
-.P 
-.B tool1 noArgumentListFullOptions
-builds a native executable from specified source files
-.P 
-.B tool1 fullcommand1
-builds a native executable from specified source files
-.P 
-.SH OPTIONS
-.P 
-.TP
-.B  "-t"  ", "  "--target"  " "  "TARGET" 
-Specifies target binary output type. EXE or DLL
-.P 
-.TP
-.B  "--noshortparam" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.TP
-.B  "-l" 
-Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet
-.P 
-.TP
-.B  "-p"  ", "  "--noparam" 
-Specifies noparam metus vitae pharetra auctor, sem
-.P 
-.TP
-.B  "-n"  " "  "NOLONG" 
-Specifies nolong Nunc feugiat mi a tellus consequat 
-.P 
-.TP
-.B  "--noshort"  " "  "NOSHORT" 
-Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt
-.P 
-.TP
-.B  "-a"  ", "  "--another"  " "  "ANOTHER" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.TP
-.B  "-t"  ", "  "--target"  " "  "TARGET" 
-Specifies target binary output type. EXE or DLL
-.P 
-.TP
-.B  "--noshortparam" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.TP
-.B  "-l" 
-Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet
-.P 
-.TP
-.B  "-p"  ", "  "--noparam" 
-Specifies noparam metus vitae pharetra auctor, sem
-.P 
-.TP
-.B  "-n"  " "  "NOLONG" 
-Specifies nolong Nunc feugiat mi a tellus consequat 
-.P 
-.TP
-.B  "--noshort"  " "  "NOSHORT" 
-Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt
-.P 
-.TP
-.B  "-a"  ", "  "--another"  " "  "ANOTHER" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.SH AUTHOR
-.P 
-.B "Test Author" " " 
-.RI ( "testing@testing.com" )
-.P 
-.SH COPYRIGHT
-.P 
-.B "This is the copyright of tool1."
diff --git a/src/Installers/Debian/tools/test/test_assets/test_package_layout/debian_config.json b/src/Installers/Debian/tools/test/test_assets/test_package_layout/debian_config.json
deleted file mode 100644
index 2150baab15d7..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/test_package_layout/debian_config.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "maintainer_name":"Microsoft",
-    "maintainer_email": "optimus@service.microsoft.com",        
-
-    "package_name": "packagetooltest",                           
-
-    "short_description": "This is a test package",              
-    "long_description": "This is a longer description of the test package", 
-    "homepage": "http://testpackage.com",                        
-
-    "release":{
-        "package_version":"0.1",                               
-        "package_revision":"1",                                 
-        "urgency" : "low",                                      
-        "changelog_message" : "some stuff here"                
-    },
-
-    "control": {                                               
-        "priority":"standard",                                  
-        "section":"devel",                                      
-        "architecture":"any"                                    
-    },
-
-    "copyright": "2015 Microsoft",                              
-    "license": {                                                
-        "type": "some_license",                                 
-        "full_text": "full license text here"                   
-    },
-
-    "debian_dependencies" : {                                   
-        "curl": {
-            "package_version" : "0.5.3"                         
-        },
-        "python3":{}
-    }, 
-
-    "symlinks": {                                               
-        "path_relative_to_package_root/test_exe.sh" : "usr/bin/test_exe.sh" 
-    }
-}
\ No newline at end of file
diff --git a/src/Installers/Debian/tools/test/test_assets/test_package_layout/docs.json b/src/Installers/Debian/tools/test/test_assets/test_package_layout/docs.json
deleted file mode 100644
index e35fdb3bfd78..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/test_package_layout/docs.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "tools": {
-        "tool1": { 
-            "copyright": "This is the copyright of tool1.",
-            "license" : "This is the license of tool1",
-            "author":"Test Author",
-            "author_email":"testing@testing.com",
-            "short_description":"A tool to Vestibulum lacinia arcu eget nulla.",
-            "long_description":"Tool1 is a really great Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. ",
-            "commands": {     
-                "fullcommand1":{
-                    "description":"builds a native executable from specified source files",
-                    "options" : {
-                        "target": {
-                            "short": "-t",
-                            "long":"--target",
-                            "description":"Specifies target binary output type. EXE or DLL",
-                            "parameter":"TARGET"
-                        },
-                        "target2": {
-                            "short": "-a",
-                            "long":"--another",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra",
-                            "parameter":"ANOTHER"
-                        },
-                        "noshort": {
-                            "long":"--noshort",
-                            "description":"Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt",
-                            "parameter":"NOSHORT"
-                        },
-                        "nolong": {
-                            "short": "-n",
-                            "description":"Specifies nolong Nunc feugiat mi a tellus consequat ",
-                            "parameter":"NOLONG"
-                        },
-                        "noparam": {
-                            "short": "-p",
-                            "long":"--noparam",
-                            "description":"Specifies noparam metus vitae pharetra auctor, sem"
-                        },
-                        "noParamNoShort": {
-                            "long":"--noshortparam",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra"
-                        },
-                        "noParamNoLong": {
-                            "short": "-l",
-                            "description":"Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet"
-                        }
-                    },
-                    "argumentlist" : {
-                        "name":"argument list stuff",
-                        "description":"ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;"
-                    }
-                    
-                },
-                "noOptionsCommand":{
-                    "description":"builds a native executable from specified source files",
-                    "argumentlist" : {
-                        "name":"argument list stuff",
-                        "description":"ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;"
-                    }
-                    
-                },
-                "noArgumentListFullOptions":{
-                    "description":"builds a native executable from specified source files",
-                    "options" : {
-                        "target": {
-                            "short": "-t",
-                            "long":"--target",
-                            "description":"Specifies target binary output type. EXE or DLL",
-                            "parameter":"TARGET"
-                        },
-                        "target2": {
-                            "short": "-a",
-                            "long":"--another",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra",
-                            "parameter":"ANOTHER"
-                        },
-                        "noshort": {
-                            "long":"--noshort",
-                            "description":"Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt",
-                            "parameter":"NOSHORT"
-                        },
-                        "nolong": {
-                            "short": "-n",
-                            "description":"Specifies nolong Nunc feugiat mi a tellus consequat ",
-                            "parameter":"NOLONG"
-                        },
-                        "noparam": {
-                            "short": "-p",
-                            "long":"--noparam",
-                            "description":"Specifies noparam metus vitae pharetra auctor, sem"
-                        },
-                        "noParamNoShort": {
-                            "long":"--noshortparam",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra"
-                        },
-                        "noParamNoLong": {
-                            "short": "-l",
-                            "description":"Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet"
-                        }
-                    }
-                }
-            }
-        
-        }
-    }
-}
diff --git a/src/Installers/Debian/tools/test/test_assets/test_package_layout/docs/testdocs.1 b/src/Installers/Debian/tools/test/test_assets/test_package_layout/docs/testdocs.1
deleted file mode 100644
index 57915b0a615f..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/test_package_layout/docs/testdocs.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH tool1 1   
-.P 
-.SH NAME
-.P 
-.B tool1 - A tool to Vestibulum lacinia arcu eget nulla.
-.P 
-.SH SYNOPSIS
-.P 
-.B tool1 noOptionsCommand 
-.RI  " "
-.I "argument list stuff"
-.P 
-.B tool1 noArgumentListFullOptions 
-.RI  [  "-t"  |  "--target"  " "  "TARGET"  ] " " [  "--noshortparam"  ] " " [  "-l"  ] " " [  "-p"  |  "--noparam"  ] " " [  "-n"  " "  "NOLONG"  ] " " [  "--noshort"  " "  "NOSHORT"  ] " " [  "-a"  |  "--another"  " "  "ANOTHER"  ]  " "
-.I ""
-.P 
-.B tool1 fullcommand1 
-.RI  [  "-t"  |  "--target"  " "  "TARGET"  ] " " [  "--noshortparam"  ] " " [  "-l"  ] " " [  "-p"  |  "--noparam"  ] " " [  "-n"  " "  "NOLONG"  ] " " [  "--noshort"  " "  "NOSHORT"  ] " " [  "-a"  |  "--another"  " "  "ANOTHER"  ]  " "
-.I "argument list stuff"
-.P 
-.SH DESCRIPTION
-.P 
-.PP Tool1 is a really great Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. 
-.P 
-.B tool1 noOptionsCommand
-builds a native executable from specified source files
-.P 
-.B tool1 noArgumentListFullOptions
-builds a native executable from specified source files
-.P 
-.B tool1 fullcommand1
-builds a native executable from specified source files
-.P 
-.SH OPTIONS
-.P 
-.TP
-.B  "-t"  ", "  "--target"  " "  "TARGET" 
-Specifies target binary output type. EXE or DLL
-.P 
-.TP
-.B  "--noshortparam" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.TP
-.B  "-l" 
-Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet
-.P 
-.TP
-.B  "-p"  ", "  "--noparam" 
-Specifies noparam metus vitae pharetra auctor, sem
-.P 
-.TP
-.B  "-n"  " "  "NOLONG" 
-Specifies nolong Nunc feugiat mi a tellus consequat 
-.P 
-.TP
-.B  "--noshort"  " "  "NOSHORT" 
-Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt
-.P 
-.TP
-.B  "-a"  ", "  "--another"  " "  "ANOTHER" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.TP
-.B  "-t"  ", "  "--target"  " "  "TARGET" 
-Specifies target binary output type. EXE or DLL
-.P 
-.TP
-.B  "--noshortparam" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.TP
-.B  "-l" 
-Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet
-.P 
-.TP
-.B  "-p"  ", "  "--noparam" 
-Specifies noparam metus vitae pharetra auctor, sem
-.P 
-.TP
-.B  "-n"  " "  "NOLONG" 
-Specifies nolong Nunc feugiat mi a tellus consequat 
-.P 
-.TP
-.B  "--noshort"  " "  "NOSHORT" 
-Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt
-.P 
-.TP
-.B  "-a"  ", "  "--another"  " "  "ANOTHER" 
-Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra
-.P 
-.SH AUTHOR
-.P 
-.B "Test Author" " " 
-.RI ( "testing@testing.com" )
-.P 
-.SH COPYRIGHT
-.P 
-.B "This is the copyright of tool1."
diff --git a/src/Installers/Debian/tools/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh b/src/Installers/Debian/tools/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh
deleted file mode 100755
index 370bc40f3a95..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Resolve symlinks until we have the parent dir of the actual file
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-# This is how tools should be called
-exec bash $DIR/../test_called.sh
diff --git a/src/Installers/Debian/tools/test/test_assets/test_package_layout/package_root/test_called.sh b/src/Installers/Debian/tools/test/test_assets/test_package_layout/package_root/test_called.sh
deleted file mode 100755
index e14e427cf67f..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/test_package_layout/package_root/test_called.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-echo "script called"
diff --git a/src/Installers/Debian/tools/test/test_assets/testdocs.json b/src/Installers/Debian/tools/test/test_assets/testdocs.json
deleted file mode 100644
index e35fdb3bfd78..000000000000
--- a/src/Installers/Debian/tools/test/test_assets/testdocs.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "tools": {
-        "tool1": { 
-            "copyright": "This is the copyright of tool1.",
-            "license" : "This is the license of tool1",
-            "author":"Test Author",
-            "author_email":"testing@testing.com",
-            "short_description":"A tool to Vestibulum lacinia arcu eget nulla.",
-            "long_description":"Tool1 is a really great Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. ",
-            "commands": {     
-                "fullcommand1":{
-                    "description":"builds a native executable from specified source files",
-                    "options" : {
-                        "target": {
-                            "short": "-t",
-                            "long":"--target",
-                            "description":"Specifies target binary output type. EXE or DLL",
-                            "parameter":"TARGET"
-                        },
-                        "target2": {
-                            "short": "-a",
-                            "long":"--another",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra",
-                            "parameter":"ANOTHER"
-                        },
-                        "noshort": {
-                            "long":"--noshort",
-                            "description":"Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt",
-                            "parameter":"NOSHORT"
-                        },
-                        "nolong": {
-                            "short": "-n",
-                            "description":"Specifies nolong Nunc feugiat mi a tellus consequat ",
-                            "parameter":"NOLONG"
-                        },
-                        "noparam": {
-                            "short": "-p",
-                            "long":"--noparam",
-                            "description":"Specifies noparam metus vitae pharetra auctor, sem"
-                        },
-                        "noParamNoShort": {
-                            "long":"--noshortparam",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra"
-                        },
-                        "noParamNoLong": {
-                            "short": "-l",
-                            "description":"Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet"
-                        }
-                    },
-                    "argumentlist" : {
-                        "name":"argument list stuff",
-                        "description":"ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;"
-                    }
-                    
-                },
-                "noOptionsCommand":{
-                    "description":"builds a native executable from specified source files",
-                    "argumentlist" : {
-                        "name":"argument list stuff",
-                        "description":"ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;"
-                    }
-                    
-                },
-                "noArgumentListFullOptions":{
-                    "description":"builds a native executable from specified source files",
-                    "options" : {
-                        "target": {
-                            "short": "-t",
-                            "long":"--target",
-                            "description":"Specifies target binary output type. EXE or DLL",
-                            "parameter":"TARGET"
-                        },
-                        "target2": {
-                            "short": "-a",
-                            "long":"--another",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra",
-                            "parameter":"ANOTHER"
-                        },
-                        "noshort": {
-                            "long":"--noshort",
-                            "description":"Specifies noshortNam nec ante. Sed lacinia, urna non tincidunt",
-                            "parameter":"NOSHORT"
-                        },
-                        "nolong": {
-                            "short": "-n",
-                            "description":"Specifies nolong Nunc feugiat mi a tellus consequat ",
-                            "parameter":"NOLONG"
-                        },
-                        "noparam": {
-                            "short": "-p",
-                            "long":"--noparam",
-                            "description":"Specifies noparam metus vitae pharetra auctor, sem"
-                        },
-                        "noParamNoShort": {
-                            "long":"--noshortparam",
-                            "description":"Specifies another aptent taciti sociosqu ad litora torquent per conubia nostra"
-                        },
-                        "noParamNoLong": {
-                            "short": "-l",
-                            "description":"Specifies noparam nolong congue elementum. Morbi in ipsum sit amet pede facilisis laoreet"
-                        }
-                    }
-                }
-            }
-        
-        }
-    }
-}
diff --git a/src/Installers/Debian/tools/test/unit_tests/test_debian_build_lib.bats b/src/Installers/Debian/tools/test/unit_tests/test_debian_build_lib.bats
deleted file mode 100755
index 193868f835f7..000000000000
--- a/src/Installers/Debian/tools/test/unit_tests/test_debian_build_lib.bats
+++ /dev/null
@@ -1,279 +0,0 @@
-#!/usr/bin/env bats
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Tests for debian_build_lib.sh
-
-setup(){
-    DIR="$BATS_TEST_DIRNAME"
-    PACKAGIFY_DIR="$(readlink -f $DIR/../../)"
-
-    PACKAGE_DIR="$BATS_TMPDIR/test-package"
-    PACKAGE_SOURCE_DIR="$BATS_TMPDIR/test-source-package"
-    INSTALL_ROOT="test-install-root"
-
-    # # Create Mock Package Directory
-    mkdir -p $PACKAGE_SOURCE_DIR/debian
-    mkdir $PACKAGE_DIR
-
-    source $PACKAGIFY_DIR/scripts/debian_build_lib.sh
-
-}
-
-teardown(){
-    # Remove Mock Package Directory
-    rm -r $PACKAGE_DIR
-    rm -r $PACKAGE_SOURCE_DIR
-}
-
-@test "add_system_file_placement populates placement array" {
-    
-    add_system_file_placement "testfile0" "testdir0"
-    add_system_file_placement "testfile1" "testdir1"
-
-    [ $placement_index -eq "2" ]
-    [ "${install_placement[0]}" = "testfile0 testdir0" ]
-    [ "${install_placement[1]}" = "testfile1 testdir1" ]
-}
-
-@test "add_system_dir_placement adds files in dir to placement array" {
-    test_package_rel_dir="test-dir"
-    abs_test_path="/abs/test/path"
-
-    mkdir $PACKAGE_SOURCE_DIR/$test_package_rel_dir
-    echo "file0 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/file0
-    echo "file1 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/file1
-    echo "file2 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/file2
-
-    add_system_dir_placement $test_package_rel_dir $abs_test_path
-
-    rm -r $PACKAGE_SOURCE_DIR/$test_package_rel_dir
-
-    [ "$placement_index" -eq 3 ]
-    [ "${install_placement[0]}" = "$test_package_rel_dir/file0 $abs_test_path" ]
-    [ "${install_placement[1]}" = "$test_package_rel_dir/file1 $abs_test_path" ]
-    [ "${install_placement[2]}" = "$test_package_rel_dir/file2 $abs_test_path" ]
-}
-
-@test "add_system_dir_placement adds all files in subdir to placement array" {
-    test_package_rel_dir="test-dir"
-    test_package_rel_subdir="test-subdir"
-    abs_test_path="/abs/test/path"
-
-    mkdir -p $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir
-    echo "file0 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir/file0
-    echo "file1 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir/file1
-    echo "file2 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir/file2
-
-    add_system_dir_placement $test_package_rel_dir $abs_test_path
-
-    rm -r $PACKAGE_SOURCE_DIR/$test_package_rel_dir
-
-    [ "$placement_index" -eq "3" ]
-    [ "${install_placement[0]}" = "$test_package_rel_dir/$test_package_rel_subdir/file0 $abs_test_path/$test_package_rel_subdir" ]
-    [ "${install_placement[1]}" = "$test_package_rel_dir/$test_package_rel_subdir/file1 $abs_test_path/$test_package_rel_subdir" ]
-    [ "${install_placement[2]}" = "$test_package_rel_dir/$test_package_rel_subdir/file2 $abs_test_path/$test_package_rel_subdir" ]
-}
-
-@test "add_system_dir_placement adds all files in subdir and dir to placement array" {
-    test_package_rel_dir="test-dir"
-    test_package_rel_subdir="test-subdir"
-    abs_test_path="/abs/test/path"
-
-    mkdir -p $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir
-    echo "file0 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/file0
-    echo "file1 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/file1
-    echo "file2 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/file2
-    echo "file3 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir/file3
-    echo "file4 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir/file4
-    echo "file5 contents" > $PACKAGE_SOURCE_DIR/$test_package_rel_dir/$test_package_rel_subdir/file5
-
-    add_system_dir_placement $test_package_rel_dir $abs_test_path
-
-    rm -r $PACKAGE_SOURCE_DIR/$test_package_rel_dir
-
-    [ "$placement_index" -eq "6" ]
-    [ "${install_placement[0]}" = "$test_package_rel_dir/file0 $abs_test_path" ]
-    [ "${install_placement[1]}" = "$test_package_rel_dir/file1 $abs_test_path" ]
-    [ "${install_placement[2]}" = "$test_package_rel_dir/file2 $abs_test_path" ]
-    [ "${install_placement[3]}" = "$test_package_rel_dir/$test_package_rel_subdir/file3 $abs_test_path/$test_package_rel_subdir" ]
-    [ "${install_placement[4]}" = "$test_package_rel_dir/$test_package_rel_subdir/file4 $abs_test_path/$test_package_rel_subdir" ]
-    [ "${install_placement[5]}" = "$test_package_rel_dir/$test_package_rel_subdir/file5 $abs_test_path/$test_package_rel_subdir" ]
-}
-
-@test "write_debian_install_file writes to debian/install" {
-    add_system_file_placement "somefile" "/some/abs/path"
-    write_debian_install_file
-
-    [ -f "$PACKAGE_SOURCE_DIR/debian/install" ]
-    [ "$(cat $PACKAGE_SOURCE_DIR/debian/install)" = "somefile /some/abs/path" ]
-}
-
-@test "add_file_to_install adds file to package_dest_dir" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    local_subdir="the/path/should/not/matter"
-    package_test_dir="package-dir"
-
-    mkdir $PACKAGE_SOURCE_DIR/$package_test_dir
-    mkdir -p $local_test_dir/$local_subdir
-    echo "file0 contents" > $local_test_dir/$local_subdir/file0
-    echo "file1 contents" > $local_test_dir/$local_subdir/file1
-    echo "file2 contents" > $local_test_dir/$local_subdir/file2
-
-    add_file_to_install "$local_test_dir/$local_subdir/file0" "$package_test_dir"
-    add_file_to_install "$local_test_dir/$local_subdir/file1" "$package_test_dir"
-    add_file_to_install "$local_test_dir/$local_subdir/file2" "$package_test_dir"
-
-    rm -r $local_test_dir
-
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file0" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file1" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file2" ]
-}
-
-@test "add_file_to_install added files written to install file after write_debian_install_file" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    local_subdir="the/path/should/not/matter"
-    package_test_dir="package-dir"
-
-    mkdir $PACKAGE_SOURCE_DIR/$package_test_dir
-    mkdir -p $local_test_dir/$local_subdir
-    echo "file0 contents" > $local_test_dir/$local_subdir/file0
-
-    add_file_to_install "$local_test_dir/$local_subdir/file0" "$package_test_dir"
-
-    rm -r $local_test_dir
-
-    [ ! -e $PACKAGE_SOURCE_DIR/debian/install ]
-    write_debian_install_file
-    [ -f $PACKAGE_SOURCE_DIR/debian/install ]
-    [ "$(cat $PACKAGE_SOURCE_DIR/debian/install)" = "$package_test_dir/file0 $INSTALL_ROOT/$package_test_dir" ]
-}
-
-@test "add_dir_to_install adds files in dir to package_dest_dir" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    package_test_dir="package-dir"
-
-    mkdir $PACKAGE_SOURCE_DIR/$package_test_dir
-    mkdir $local_test_dir
-    echo "file0 contents" > $local_test_dir/file0
-    echo "file1 contents" > $local_test_dir/file1
-    echo "file2 contents" > $local_test_dir/file2
-
-    add_dir_to_install "$local_test_dir" "$package_test_dir"
-
-    rm -r $local_test_dir
-
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file0" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file1" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file2" ]
-}
-
-@test "add_dir_to_install adds files in subdirectory tree to package_dest_dir" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    local_test_subdir="local-subdir"
-
-    package_test_dir="package-dir"
-
-    mkdir $PACKAGE_SOURCE_DIR/$package_test_dir
-    mkdir -p $local_test_dir/$local_test_subdir
-    echo "file0 contents" > $local_test_dir/$local_test_subdir/file0
-    echo "file1 contents" > $local_test_dir/$local_test_subdir/file1
-    echo "file2 contents" > $local_test_dir/$local_test_subdir/file2
-
-    add_dir_to_install "$local_test_dir" "$package_test_dir"
-
-    rm -r $local_test_dir
-
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/$local_test_subdir/file0" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/$local_test_subdir/file1" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/$local_test_subdir/file2" ]
-}
-
-@test "add_dir_to_install adds files in directory and subdirectory tree to package_dest_dir" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    local_test_subdir="local-subdir"
-
-    package_test_dir="package-dir"
-
-    mkdir $PACKAGE_SOURCE_DIR/$package_test_dir
-    mkdir -p $local_test_dir/$local_test_subdir
-
-    echo "file0 contents" > $local_test_dir/file0
-    echo "file1 contents" > $local_test_dir/file1
-    echo "file2 contents" > $local_test_dir/file2
-    echo "file3 contents" > $local_test_dir/$local_test_subdir/file3
-    echo "file4 contents" > $local_test_dir/$local_test_subdir/file4
-    echo "file5 contents" > $local_test_dir/$local_test_subdir/file5
-
-    add_dir_to_install "$local_test_dir" "$package_test_dir"
-
-    rm -r $local_test_dir
-
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file0" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file1" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/file2" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/$local_test_subdir/file3" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/$local_test_subdir/file4" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$package_test_dir/$local_test_subdir/file5" ]
-}
-
-@test "add_dir_to_install added files written to install file after write_debian_install_file" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    package_test_dir="package-dir"
-
-    mkdir $PACKAGE_SOURCE_DIR/$package_test_dir
-    mkdir -p $local_test_dir
-
-    echo "file0 contents" > $local_test_dir/file0
-
-    add_dir_to_install "$local_test_dir" "$package_test_dir"
-
-    rm -r $local_test_dir
-
-    [ ! -e $PACKAGE_SOURCE_DIR/debian/install ]
-    write_debian_install_file
-    [ -f $PACKAGE_SOURCE_DIR/debian/install ]
-    [ "$(cat $PACKAGE_SOURCE_DIR/debian/install)" = "$package_test_dir/file0 $INSTALL_ROOT/$package_test_dir" ]
-}
-
-@test "add_dir_to_install with empty dest dir outputs to PACKAGE_SOURCE_DIR" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    mkdir -p $local_test_dir
-
-    echo "file0 contents" > $local_test_dir/file0
-
-    add_dir_to_install "$local_test_dir" ""
-
-    rm -r $local_test_dir
-
-    [ -f "$PACKAGE_SOURCE_DIR/file0" ]
-}
-
-
-@test "add_dir_to_install with empty dest dir adds files in directory and subdirectory tree to $PACKAGE_SOURCE_DIR" {
-    local_test_dir="$BATS_TMPDIR/local-dir"
-    local_test_subdir="local-subdir"
-
-    mkdir -p $local_test_dir/$local_test_subdir
-
-    echo "file0 contents" > $local_test_dir/file0
-    echo "file1 contents" > $local_test_dir/file1
-    echo "file2 contents" > $local_test_dir/file2
-    echo "file3 contents" > $local_test_dir/$local_test_subdir/file3
-    echo "file4 contents" > $local_test_dir/$local_test_subdir/file4
-    echo "file5 contents" > $local_test_dir/$local_test_subdir/file5
-
-    add_dir_to_install "$local_test_dir" ""
-
-    rm -r $local_test_dir
-
-    [ -f "$PACKAGE_SOURCE_DIR/file0" ]
-    [ -f "$PACKAGE_SOURCE_DIR/file1" ]
-    [ -f "$PACKAGE_SOURCE_DIR/file2" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$local_test_subdir/file3" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$local_test_subdir/file4" ]
-    [ -f "$PACKAGE_SOURCE_DIR/$local_test_subdir/file5" ]
-}
diff --git a/src/Installers/Debian/tools/test/unit_tests/test_scripts.bats b/src/Installers/Debian/tools/test/unit_tests/test_scripts.bats
deleted file mode 100755
index 86f95b9ba52b..000000000000
--- a/src/Installers/Debian/tools/test/unit_tests/test_scripts.bats
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bats
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Tests for debian_build_lib.sh
-
-setup(){
-    DIR="$BATS_TEST_DIRNAME"
-    PACKAGIFY_DIR="$(readlink -f $DIR/../../)"
-}
-
-@test "manpage generation is identical to lkg file" {
-    # Output is file "tool1.1"
-    # LKG file is "lkgtestman.1"
-    python3 $PACKAGIFY_DIR/scripts/manpage_generator.py $PACKAGIFY_DIR/test/test_assets/testdocs.json $PACKAGIFY_DIR/test/test_assets
-
-    # Test Output existence
-    [ -f $PACKAGIFY_DIR/test/test_assets/tool1.1 ]
-    
-    # Test Output matches LKG
-    # If this is failing double check line ending style
-    [ -z "$(diff "$PACKAGIFY_DIR/test/test_assets/tool1.1" "$PACKAGIFY_DIR/test/test_assets/lkgtestman.1")" ]
-
-    # Cleanup
-    rm $PACKAGIFY_DIR/test/test_assets/tool1.1
-}
\ No newline at end of file
diff --git a/src/Installers/Rpm/Directory.Build.props b/src/Installers/Rpm/Directory.Build.props
deleted file mode 100644
index 252ab60311c5..000000000000
--- a/src/Installers/Rpm/Directory.Build.props
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  Common properties for building RPM installers.
--->
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <!-- Output paths -->
-    <IntermediateOutputPath>$(IntermediateOutputPath)$(TargetRuntimeIdentifier)\</IntermediateOutputPath>
-    <OutputPath>$(InstallersOutputPath)</OutputPath>
-
-    <CblMariner1VersionSuffix>-cm.1</CblMariner1VersionSuffix>
-    <CblMariner2VersionSuffix>-cm.2</CblMariner2VersionSuffix>
-
-    <!-- All installers are shipping assets. -->
-    <IsShipping>true</IsShipping>
-    <IsPackable>true</IsPackable>
-
-    <!-- RPM files are platform-specific and should be named appropriately. -->
-    <RpmArch Condition=" '$(TargetArchitecture)' == 'x64' ">x64</RpmArch>
-    <RpmArch Condition=" '$(TargetArchitecture)' == 'arm64' ">aarch64</RpmArch>
-
-    <!--
-      For installers project, build acceleration may not work correctly.
-      Read more here => https://github.com/dotnet/project-system/blob/main/docs/build-acceleration.md#limitations
-    -->
-    <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
-  </PropertyGroup>
-</Project>
diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets
deleted file mode 100644
index 30d705abb1dc..000000000000
--- a/src/Installers/Rpm/Directory.Build.targets
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--
-  Common targets for building RPM.
--->
-<Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
-
-  <!-- Output paths -->
-  <PropertyGroup>
-    <RpmPackageInstallRoot Condition="'$(RpmPackageInstallRoot)' != '' AND !HasTrailingSlash('$(RpmPackageInstallRoot)')">$(RpmPackageInstallRoot)/</RpmPackageInstallRoot>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" AllowExplicitReference="true" PrivateAssets="All" IsImplicitlyDefined="true" />
-  </ItemGroup>
-
-  <Target Name="GetTargetPath" Returns="$(TargetPath)" />
-
-  <Target Name="PrepareForBuild">
-    <MakeDir Directories="$(IntermediateOutputPath)" />
-
-    <Error Text="Currently only linux-x64 and linux-arm64 are supported by Rpm installers." Condition=" '$(TargetRuntimeIdentifier)' != 'linux-x64' AND '$(TargetRuntimeIdentifier)' != 'linux-arm64'" />
-
-    <Error Text="Missing required property: RpmPackageInstallRoot" Condition=" '$(RpmPackageInstallRoot)' == '' " />
-    <Error Text="Missing required property: PackageContentRoot" Condition=" '$(PackageContentRoot)' == '' " />
-  </Target>
-
-  <PropertyGroup>
-    <RpmBuildDependsOn>
-      $(RpmBuildDependsOn);
-      PrepareForBuild;
-      ResolveProjectReferences;
-      GetTargetPath;
-    </RpmBuildDependsOn>
-  </PropertyGroup>
-
-  <Target Name="Build" DependsOnTargets="RpmBuild" />
-  <Target Name="Pack" />
-
-  <Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)">
-    <PropertyGroup>
-      <CblMariner1TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension)</CblMariner1TargetPath>
-      <CblMariner2TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension)</CblMariner2TargetPath>
-    </PropertyGroup>
-
-    <!-- Create layout: Create changelog -->
-    <PropertyGroup>
-      <ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>
-      <ChangeLogProps>$(ChangeLogProps);MAINTAINER_NAME=$(Authors)</ChangeLogProps>
-      <ChangeLogProps>$(ChangeLogProps);MAINTAINER_EMAIL=$(MaintainerEmail)</ChangeLogProps>
-      <ChangeLogProps>$(ChangeLogProps);PACKAGE_VERSION=$(PackageVersion)</ChangeLogProps>
-      <ChangeLogProps>$(ChangeLogProps);PACKAGE_REVISION=$(PackageRevision)</ChangeLogProps>
-
-      <!--
-        RpmArch is used to match our naming conventions but
-        https://fedoraproject.org/wiki/Architectures#Primary_Architectures lists the canonical names `fpm` and
-        `rpmbuild` expect on the command line. Aliases like ARMv8, arm-64 and amd64 should also work.
-      -->
-      <CommandLineArch Condition=" '$(TargetArchitecture)' == 'x64' ">x86_64</CommandLineArch>
-      <CommandLineArch Condition=" '$(TargetArchitecture)' == 'arm64' ">aarch64</CommandLineArch>
-
-      <GeneratedChangeLog>$(IntermediateOutputPath)changelog</GeneratedChangeLog>
-    </PropertyGroup>
-
-    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)changelog.in" OutputPath="$(GeneratedChangeLog)" Properties="$(ChangeLogProps)" />
-
-    <!-- Run fpm -->
-    <ItemGroup>
-      <FpmArgs Include="--verbose" />
-      <FpmArgs Include="--input-type=dir" />
-      <FpmArgs Include="--output-type=rpm" />
-      <FpmArgs Include="--name=$(PackageId)" />
-      <FpmArgs Include="--package=$(TargetPath)" />
-      <FpmArgs Include="--version=$(PackageVersion)" />
-      <FpmArgs Include="--iteration=$(PackageRevision)" />
-      <FpmArgs Include="--architecture=$(CommandLineArch)" />
-      <FpmArgs Include="--depends=&quot;%(RpmDependency.Identity) &gt;= %(RpmDependency.Version)&quot;" Condition=" '%(RpmDependency.Identity)' != '' "  />
-      <FpmArgs Include="--rpm-changelog=&quot;$(GeneratedChangeLog)&quot;" />
-      <FpmArgs Include="--rpm-summary=&quot;$(PackageSummary)&quot;" />
-      <FpmArgs Include="--rpm-digest=sha256" />
-      <FpmArgs Include="--description=&quot;$(PackageDescription)&quot;" />
-      <FpmArgs Include="--maintainer=&quot;$(Authors) &lt;$(MaintainerEmail)&gt;&quot;" />
-      <FpmArgs Include="--vendor=&quot;$(Company)&quot;" />
-      <FpmArgs Include="--license=$(PackageLicenseExpression)" />
-      <FpmArgs Include="--url=$(PackageProjectUrl)" />
-      <FpmArgs Include="--directories=&quot;%(InstallerOwnedDirectory.Identity)&quot;" Condition=" '%(InstallerOwnedDirectory.Identity)' != '' " />
-      <FpmArgs Include="&quot;$(PackageContentRoot)=$(RpmPackageInstallRoot)&quot;" />
-    </ItemGroup>
-
-    <Exec Command="fpm @(FpmArgs,' ')" />
-
-    <Copy SourceFiles="$(TargetPath)"
-          DestinationFiles="$(CblMariner1TargetPath)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-    <Message Text="$(TargetPath) -> $(CblMariner1TargetPath)" Importance="high" />
-
-    <Copy SourceFiles="$(TargetPath)"
-          DestinationFiles="$(CblMariner2TargetPath)"
-          OverwriteReadOnlyFiles="True"
-          SkipUnchangedFiles="False"
-          UseHardlinksIfPossible="False" />
-
-    <Message Text="$(TargetPath) -> $(CblMariner2TargetPath)" Importance="high" />
-  </Target>
-</Project>
diff --git a/src/Installers/Rpm/Rpm.Runtime.Common.targets b/src/Installers/Rpm/Rpm.Runtime.Common.targets
deleted file mode 100644
index e679ff625e91..000000000000
--- a/src/Installers/Rpm/Rpm.Runtime.Common.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- This file is for properties shared by the generic aspnetcore-runtime rpm and RHEL rpm.  -->
-<Project>
-
-  <PropertyGroup>
-    <!-- installer versions -->
-    <!-- CLI would take a dependency such as 'aspnetcore-runtime-M.N >= M.N.P'. Here M.N is the part of the id and M.N.P is the package version -->
-    <PackageId>$(RuntimeInstallerBaseName)-$(AspNetCoreMajorMinorVersion)</PackageId>
-    <PackageVersion>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion)</PackageVersion>
-
-    <!-- Set package revision to '1' for RTM releases, but include the build number in pre-releases -->
-    <PackageRevision Condition=" '$(VersionSuffix)' == '' ">1</PackageRevision>
-    <PackageRevision Condition=" '$(VersionSuffix)' != '' ">0.1.$(VersionSuffix.Replace('-', '_'))</PackageRevision>
-
-    <PackageSummary>$(SharedFxProductName)</PackageSummary>
-    <PackageDescription>$(SharedFxDescription)</PackageDescription>
-
-    <PackageContentRoot>$(SharedFrameworkLayoutRoot)</PackageContentRoot>
-
-    <MicrosoftNETCoreAppRuntimeMajorMinorVersion>$(MicrosoftNETCoreAppRuntimeVersion.Split('.')[0]).$(MicrosoftNETCoreAppRuntimeVersion.Split('.')[1])</MicrosoftNETCoreAppRuntimeMajorMinorVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
-
-    <InstallerOwnedDirectory Include="$(RpmPackageInstallRoot)shared/Microsoft.AspNetCore.App" />
-    <RpmDependency Include="dotnet-runtime-$(MicrosoftNETCoreAppRuntimeMajorMinorVersion)" Version="$(MicrosoftNETCoreAppRuntimeVersion.Split('-')[0])" />
-  </ItemGroup>
-</Project>
diff --git a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj
deleted file mode 100644
index 5e0427aea7f8..000000000000
--- a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  This project produces a generic RPM installer for Linux x64/arm64 platforms only.
--->
-<Project DefaultTargets="Build">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
-  <PropertyGroup>
-    <RpmPackageInstallRoot>/usr/share/dotnet/</RpmPackageInstallRoot>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-  <Import Project="..\Rpm.Runtime.Common.targets" />
-
-  <PropertyGroup>
-    <TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-$(RpmArch).rpm</TargetFileName>
-    <TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
-    <CblMarinerBaseName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)</CblMarinerBaseName>
-    <CblMarinerExtension>-$(RpmArch).rpm</CblMarinerExtension>
-  </PropertyGroup>
-</Project>
diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
deleted file mode 100644
index a29db936bd79..000000000000
--- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-
-  <PropertyGroup>
-    <RpmPackageInstallRoot>/usr/share/dotnet/</RpmPackageInstallRoot>
-
-    <PackageContentRoot>$(TargetingPackLayoutRoot)</PackageContentRoot>
-
-    <!-- installer versions -->
-    <!-- CLI would take a dependency such as 'aspnetcore-targeting-pack-M.N >= M.N.P'. Here M.N is the part of the id and M.N.P is the package version -->
-    <PackageId>$(TargetingPackInstallerBaseName)-$(AspNetCoreMajorMinorVersion)</PackageId>
-
-    <PackageSummary>ASP.NET Core Targeting Pack</PackageSummary>
-    <PackageDescription>Provides a default set of APIs for building an ASP.NET Core $(AspNetCoreMajorMinorVersion) application. Contains reference assemblies, documentation, and other design-time assets.</PackageDescription>
-
-    <MicrosoftNETCoreAppRefMajorMinorVersion>$(MicrosoftNETCoreAppRefVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefVersion.Split('.')[1])</MicrosoftNETCoreAppRefMajorMinorVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
-
-    <InstallerOwnedDirectory Include="$(RpmPackageInstallRoot)packs/$(TargetingPackName)/" />
-    <RpmDependency Include="dotnet-targeting-pack-$(MicrosoftNETCoreAppRefMajorMinorVersion)" Version="$(MicrosoftNETCoreAppRefVersion.Split('-')[0])" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-
-  <PropertyGroup>
-    <TargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(RpmArch).rpm</TargetFileName>
-    <TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
-    <CblMarinerBaseName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)</CblMarinerBaseName>
-    <CblMarinerExtension>-$(RpmArch).rpm</CblMarinerExtension>
-
-    <PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>
-
-    <!-- Set package revision to '1' for RTM releases, but include the build number in pre-releases -->
-    <PackageRevision Condition=" '$(VersionSuffix)' == '' ">1</PackageRevision>
-    <PackageRevision Condition=" '$(VersionSuffix)' != '' ">0.1.$(VersionSuffix.Replace('-', '_'))</PackageRevision>
-  </PropertyGroup>
-</Project>
diff --git a/src/Installers/Rpm/changelog.in b/src/Installers/Rpm/changelog.in
deleted file mode 100644
index 919601192419..000000000000
--- a/src/Installers/Rpm/changelog.in
+++ /dev/null
@@ -1,2 +0,0 @@
-* ${DATE} ${MAINTAINER_NAME} <${MAINTAINER_EMAIL}> - ${PACKAGE_VERSION}-${PACKAGE_REVISION}
--
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCM-Setup.slnf b/src/Installers/Windows/AspNetCoreModule-Setup/ANCM-Setup.slnf
index 2935d492d7af..cb7b5f15aeb0 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCM-Setup.slnf
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCM-Setup.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\CustomAction\\aspnetcoreCA.vcxproj",
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj",
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec
index fada190bc386..2ca3afbd2458 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec
@@ -16,7 +16,6 @@
     </metadata>
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
-        <file src="$ASPNETCORE_CAB_FILE$" />
         <file src="$PackageIconFullPath$" target="$PackageIcon$" />
     </files>
 </package>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
index 60e782886a35..7be6ad56465a 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
@@ -1,43 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
   <PropertyGroup>
-    <Name>AspNetCoreModuleV2IISExpress</Name>
     <IsShipping>true</IsShipping>
     <ProjectGuid>17c76489-4c09-4e14-b81c-7a86cd937144</ProjectGuid>
     <OutputType>Package</OutputType>
-    <OutputName>$(Name)_$(Platform)</OutputName>
+    <OutputName>httpbridge_iis_express_$(Platform)_en_$(_ProductVersionForInstallers)</OutputName>
     <SuppressIces>ICE03</SuppressIces>
     <DisableGuidGeneration>true</DisableGuidGeneration>
     <SchemaVersion>2.0</SchemaVersion>
     <TempPlatform Condition="'$(Platform)' == 'x64'">x64</TempPlatform>
     <TempPlatform Condition="'$(Platform)' == 'x86'">Win32</TempPlatform>
     <TempPlatform Condition="'$(Platform)' == 'arm64'">ARM64</TempPlatform>
-    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
+    <!-- <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile> -->
+    <!-- We import D.B.T ourselves in this file -->
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+    <!-- False positive in ancm_iis_expressv2.wxs -->
+    <SuppressSpecificWarnings>5437</SuppressSpecificWarnings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixDependencyExtension">
-      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
-      <Name>WixDependencyExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
+  <PropertyGroup>
+    <ANCMDepProviderKey Condition="'$(Platform)' == 'x86'">IISExpress_HttpBridge,x86</ANCMDepProviderKey>
+    <ANCMDepProviderKey Condition="'$(Platform)' != 'x86'">IISExpress_HttpBridge,x64</ANCMDepProviderKey>
+    <DefineConstants>$(DefineConstants);ANCMDepProviderKey=$(ANCMDepProviderKey)</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="ancm_iis_expressv2.wxs" />
-    <Compile Include="$(IIS-Setup)iisca\wix3\iisca.wxs">
+    <Compile Include="$(IIS-Setup)iisca\wix5\iisca.wxs">
       <Link>iisca.wxs</Link>
     </Compile>
-    <EmbeddedResource Include="..\setupstrings.wxl">
+    <EmbeddedResource Include="..\LCID\1033\setupstrings.wxl">
       <Link>setupstrings.wxl</Link>
     </EmbeddedResource>
     <Content Include="$(IIS-Setup)include.wxi">
@@ -66,15 +58,16 @@
     <Copy SourceFiles="@(BuildContentForAncmHandler)" DestinationFolder="$(InstallersOutputPath)\IISExpressSymbols\$(TempPlatform)" />
   </Target>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.WixToolset.Sdk" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Import Project="..\build\settings.props" />
 
   <PropertyGroup>
-    <PackageFileName>ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
-    <ProductNameShort>ASP.NET Core Module IIS Express V2</ProductNameShort>
+    <PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
+    <ProductNameShort>HTTP Bridge Module IIS Express</ProductNameShort>
   </PropertyGroup>
 
-  <Target Name="CreateANCMIISExpressNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
+  <!-- <Target Name="CreateANCMIISExpressNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
     <PropertyGroup>
       <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
     </PropertyGroup>
@@ -82,7 +75,6 @@
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ProductNameShort)' ^
                       '$(MsiFullPath)' ^
-                      '$(CabFullPath)' ^
                       '$(ToolsetInstallerNuspecFile)' ^
                       '$(ArtifactsNonShippingPackagesDir)' ^
                       '$(Platform)' ^
@@ -93,5 +85,9 @@
                       '$(PackageIcon)' ^
                       '$(PackageIconFullPath)' ^
                       '$(PackageLicenseExpression)' " />
+  </Target> -->
+
+  <Target Name="BeforeBuild" Condition="'$(Platform)' == 'arm64'" >
+    <MSBuild Projects="..\Forwarders\build.proj" />
   </Target>
 </Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
index 973049c973d6..eebd4c0bfb03 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
+<!--
     AspNetCoreModule setup. v1 for initial release.
 -->
 
@@ -8,83 +6,66 @@
 <?include ..\IIS-Setup\include.wxi ?>
 
 <?define ProductCode = "*" ?>
-<?if $(var.IsWin64)=no ?>
-  <?define ANCMUpgradeCode = "de400ae0-3cd7-4a35-a234-b5a41b90893c" ?>
-  <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module_V2,x86" ?>
+<?if $(InstallerPlatform)=x64?>
+  <?define ANCMUpgradeCode = "cf2e8dec-5beb-4167-9391-ce972c71a4b8" ?>
 <?else?>
-  <?define ANCMUpgradeCode = "da062c0f-12c2-4703-8ed7-0cad342a53a1" ?>
-  <?define ANCMDepProviderKey = "IISExpress_AspNetCore_Module_V2,x64" ?>
+  <?define ANCMUpgradeCode = "77a51b95-fb6c-4d6b-95a1-33cd72f54890" ?>
 <?endif?>
 
-<?define ProductShortName="IIS Express AspNetCore Module V2" ?>
-<?define ProductNameShort="IISExpress_ANCM_V2" ?>
+<?define ProductShortName="IIS Express HTTP Bridge Module" ?>
+<?define ProductNameShort="IISExpress_HTTP_BRID" ?>
 <?define ProductVersionString = "V2"?>
-<?define ProductName="Asp.Net Core Module"?>
+<?define ProductName="HTTP Bridge Module"?>
 
-<?if $(var.PlatformValue)="Intel" ?>
+<?if $(PlatformValue)="Intel" ?>
   <?undef PlatformValue ?>
   <?define PlatformValue = "x86" ?>
 <?endif?>
 
-<?define AspNetCoreSectionName = "aspNetCore" ?>
-<?define AspNetCoreTraceProviderName = "ANCM" ?>
+<?define AspNetCoreSectionName = "httpPlatform" ?>
+<?define AspNetCoreTraceProviderName = "HTTP_PLATFORM" ?>
 <?define AspNetCoreTraceProviderValue = "65536" ?>
-<?define AspNetCoreModuleName = "AspNetCoreModuleV2" ?>
+<?define AspNetCoreModuleName = "httpPlatformHandler" ?>
 
-<?if $(var.Platform) = "x86" ?>
-    <?define SchemaGuid = "e629b31a-3d56-4b5c-959c-586fc1c55599" ?>
-    <?define AspNetCoreV2ProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(var.Configuration)\aspnetcorev2.dll" ?>
-    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(var.Configuration)\aspnetcorev2_outofprocess.dll" ?>
+<?if $(InstallerPlatform) = "x86" ?>
+    <?define SchemaGuid = "ACBF369C-B646-4A9E-90E3-446DD0034374" ?>
+    <?define AspNetCoreV2ProgramFilesTargetPath = "$(ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(Configuration)\httpbridge.dll" ?>
+    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(Configuration)\httpbridge_outofprocess.dll" ?>
 <?else?>
-    <?define SchemaGuid = "ab582af2-d6c0-43f7-8412-76a19c65d7f2" ?>
-    <?define SchemaGuid32 = "e629b31a-3d56-4b5c-959c-586fc1c55599" ?>
-    <?define AspNetCoreV2ProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\$(var.Platform)\$(var.Configuration)\aspnetcorev2.dll" ?>
-    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\$(var.Platform)\$(var.Configuration)\aspnetcorev2_outofprocess.dll" ?>
-<?endif ?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
-    <Product Id="$(var.ProductCode)"
-          Name="!(loc.AspNetCoreIISExpressModuleProductNameV2)"
-          Manufacturer="!(loc.Manufacturer)"
-          Version="$(var.ANCMMsiVersion)"
-          Language="!(loc.Language)"
-          Codepage="$(var.Codepage)"
-          UpgradeCode="$(var.ANCMUpgradeCode)" >
-
-        <Package Id="*"
-                 Description="!(loc.AspNetCoreIISExpressModuleProductNameV2)"
-                 Manufacturer="!(loc.Manufacturer)"
-                 Compressed="yes"
-                 InstallPrivileges="elevated"
-                 InstallerVersion="$(var.ANCMInstallerVersion)"
-                 Platform="$(var.PlatformValue)" />
-
-        <Media Id="1" Cabinet="aspnetcoremodule.cab" EmbedCab="yes" CompressionLevel="high"/>
-
-        <Property Id="ARPCONTACT">Microsoft Corporation</Property>
+    <?define SchemaGuid = "51FBFCD7-C462-4226-A734-E6E4B2C2C664" ?>
+    <?define SchemaGuid32 = "ACBF369C-B646-4A9E-90E3-446DD0034374" ?>
+    <?define AspNetCoreV2ProgramFilesTargetPath = "$(ArtifactsDir)\bin\AspNetCoreModuleShim\$(InstallerPlatform)\$(Configuration)\httpbridge.dll" ?>
+    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(ArtifactsDir)\bin\OutOfProcessRequestHandler\$(InstallerPlatform)\$(Configuration)\httpbridge_outofprocess.dll" ?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+    <Package Name="!(loc.AspNetCoreIISExpressModuleProductNameV2)" Manufacturer="!(loc.Manufacturer)" Version="$(ANCMMsiVersion)" Language="!(loc.Language)" Codepage="$(Codepage)" UpgradeCode="$(ANCMUpgradeCode)" InstallerVersion="$(ANCMInstallerVersion)" ProductCode="$(ProductCode)" Scope="perMachine">
+        <SummaryInformation Description="!(loc.AspNetCoreIISExpressModuleProductNameV2)" Manufacturer="!(loc.Manufacturer)" />
+
+        <Media Id="1" Cabinet="aspnetcoremodule.cab" EmbedCab="yes" CompressionLevel="high" />
+
+        <Property Id="ARPCONTACT" Value="LeXtudio Inc." />
         <Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
         <Icon Id="AspNetCoreModule.ico" SourceFile="..\Bitmaps\AspNetCoreModule.ico" />
 
         <WixVariable Id="WixUILicenseRtf" Value="..\license\license.rtf" />
 
-        <Upgrade Id="$(var.ANCMUpgradeCode)">
-            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
+        <Upgrade Id="$(ANCMUpgradeCode)">
+            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(ANCMMsiVersion)" IncludeMinimum="no" />
         </Upgrade>
 
-        <Condition Message="!(loc.NewerVersionFound)">(NOT NEWERVERSIONFOUND)  OR Installed</Condition>
+        <Launch Condition="(NOT NEWERVERSIONFOUND) OR Installed" Message="!(loc.NewerVersionFound)" />
 
         <!-- Require the user be an admin to install -->
-        <Condition Message="!(loc.AdminRequired)">Privileged</Condition>
-
-        <Property Id="ALLUSERS">1</Property>
+        <Launch Condition="Privileged" Message="!(loc.AdminRequired)" />
 
         <Property Id="IISEXPRESS_INSTALL" Secure="yes">
-            <RegistrySearch Id="IISExpressInstallRegSearch" Root="HKLM" Key="SOFTWARE\Microsoft\IISExpress" Name="Version" Type="raw" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="IISExpressInstallRegSearch" Root="HKLM" Key="SOFTWARE\Microsoft\IISExpress" Name="Version" Type="raw" Bitness="$(Bitness)" />
         </Property>
 
         <Property Id="IISEXPRESS_INSTALL_PATH" Secure="yes">
-            <DirectorySearch Id="ProgramFilesSearch" Path="[$(var.ProgramFilesFolder)]">
+            <DirectorySearch Id="ProgramFilesSearch" Path="[$(ProgramFilesFolder)]">
                <DirectorySearch Id="IISExpressInstallPathSearch" Path="IIS Express" AssignToProperty="yes">
                    <FileSearch Id="IISExpressExe" Name="iisexpress.exe" />
                </DirectorySearch>
@@ -92,7 +73,7 @@
         </Property>
 
         <Property Id="IISEXPRESS_APPHOST_CONFIG" Secure="yes">
-            <DirectorySearchRef Id="ProgramFilesSearch" Path="[$(var.ProgramFilesFolder)]">
+            <DirectorySearchRef Id="ProgramFilesSearch" Path="[$(ProgramFilesFolder)]">
                <DirectorySearch Id="IISExpressAppServerPathSearch" Path="IIS Express\AppServer">
                   <FileSearch Id="AppHostConfig" Name="applicationhost.config" />
                </DirectorySearch>
@@ -100,33 +81,29 @@
         </Property>
 
         <Property Id="IISEXPRESS_APPHOST_CONFIG_TMP" Secure="yes">
-            <DirectorySearchRef Id="ProgramFilesSearch" Path="[$(var.ProgramFilesFolder)]">
+            <DirectorySearchRef Id="ProgramFilesSearch" Path="[$(ProgramFilesFolder)]">
                <DirectorySearch Id="IISExpressTmpPathSearch" Path="IIS Express\config\templates\PersonalWebServer">
                   <FileSearch Id="AppHostConfigTmp" Name="applicationhost.config" />
                </DirectorySearch>
             </DirectorySearchRef>
         </Property>
 
-        <Condition Message="!(loc.AspNetCoreModuleIISExpressPrereq)"><![CDATA[Installed Or IISEXPRESS_INSTALL_PATH]]></Condition>
-        <?if $(var.Platform) != "x86" ?>
-          <Condition Message="!(loc.AspNetCoreModuleIISExpressPrereq)"><![CDATA[Installed Or IISEXPRESS_INSTALL_PATH32]]></Condition>
+        <Launch Condition="Installed Or IISEXPRESS_INSTALL_PATH" Message="!(loc.AspNetCoreModuleIISExpressPrereq)" />
+        <?if $(InstallerPlatform) != "x86" ?>
+          <Launch Condition="Installed Or IISEXPRESS_INSTALL_PATH32" Message="!(loc.AspNetCoreModuleIISExpressPrereq)" />
         <?endif?>
 
         <!-- prevent install of 32 bit product on 64 bit machine -->
-        <?if "x86" = "$(var.Platform)" ?>
-        <Condition Message="!(loc.LaunchCondition_64BIT)">
-            <![CDATA[Installed Or NOT VersionNT64]]>
-        </Condition>
-        <?endif ?>
+        <?if "x86" = "$(InstallerPlatform)" ?>
+        <Launch Condition="Installed Or NOT VersionNT64" Message="!(loc.LaunchCondition_64BIT)" />
+        <?endif?>
 
         <!-- also prevent install of 64-bit product on 32-bit machine -->
-        <?if $(var.Platform) != "x86"?>
-        <Condition Message="!(loc.LaunchCondition_32BIT)">
-            <![CDATA[(Installed And NOT PATCH) Or VersionNT64]]>
-        </Condition>
-        <?endif ?>
+        <?if $(InstallerPlatform) != "x86"?>
+        <Launch Condition="(Installed And NOT PATCH) Or VersionNT64" Message="!(loc.LaunchCondition_32BIT)" />
+        <?endif?>
 
-        <?if $(var.Platform) != "x86" ?>
+        <?if $(InstallerPlatform) != "x86" ?>
             <Property Id="IISEXPRESS_INSTALL_PATH32" Secure="yes">
                 <DirectorySearch Id="ProgramFilesSearch32" Path="[ProgramFilesFolder]">
                    <DirectorySearch Id="IISExpressInstallPathSearch32" Path="IIS Express" AssignToProperty="yes">
@@ -151,469 +128,388 @@
                 </DirectorySearchRef>
             </Property>
 
-           <SetProperty Id="INSTALLDIR32" Value="[IISEXPRESS_INSTALL_PATH32]" After="CostInitialize"/>
+           <SetProperty Id="INSTALLDIR32" Value="[IISEXPRESS_INSTALL_PATH32]" After="CostInitialize" />
         <?endif?>
 
-        <Directory Id="TARGETDIR" Name="SourceDir" >
-            <Directory Id="$(var.ProgramFilesFolder)" >
-                <Directory Id="INSTALLDIR" Name="IIS Express" />
-            </Directory>
-        </Directory>
-
         <!-- Directory Structure and Component Definitions -->
-      <DirectoryRef Id="INSTALLDIR">
-        <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(var.ProductName)">
-          <Directory Id="VersionDir" Name="$(var.ProductVersionString)">
-            <Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
-                <File Id="AspNetCoreModuleDll"
-                    Name="aspnetcorev2.dll"
-                    Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
-                    DiskId="1"
-                    Vital="yes">
-                </File>
-              <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]"/>
-                <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-              </RegistryKey>
-            </Component>
-              <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
-              <Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
-                    <File Id="AspNetCoreModuleHandlerDll"
-                        Name="aspnetcorev2_outofprocess.dll"
-                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
-                        DiskId="1"
-                        Vital="yes">
-                    </File>
+        <DirectoryRef Id="INSTALLDIR">
+          <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(ProductName)">
+            <Directory Id="VersionDir" Name="$(ProductVersionString)">
+              <Component Id="AspNetCoreModule" Guid="08968573-05c1-4bf1-8879-7b818ac9525b" Bitness="$(Bitness)">
+                  <?if $(InstallerPlatform) = "arm64" ?>
+                  <File Id="AspNetCoreModuleDll" Name="httpbridge.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\httpbridge.dll" DiskId="1" Vital="yes" KeyPath="yes"/>
+                  <?else?>
+                  <File Id="AspNetCoreModuleDll" Name="httpbridge.dll" Source="$(AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" KeyPath="yes"/>
+                  <?endif?>
+                <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                  <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll]" />
+                  <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                </RegistryKey>
+              </Component>
+              <Directory Id="HandlerVersionDir" Name="$(ANCMFolderVersion)">
+                <Component Id="AspNetCoreModuleHandler" Guid="CCCCD6DE-C70C-4B6F-87D5-B512A04F89D0" Bitness="$(Bitness)">
+                      <?if $(InstallerPlatform) = "arm64" ?>
+                      <File Id="AspNetCoreModuleHandlerDll" Name="httpbridge_outofprocess.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\httpbridge_outofprocess.dll" DiskId="1" Vital="yes" />
+                      <?else?>
+                      <File Id="AspNetCoreModuleHandlerDll" Name="httpbridge_outofprocess.dll" Source="$(AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes">
+                      </File>
+                      <?endif?>
+                </Component>
+                <?if $(InstallerPlatform) = "arm64" ?>
+                  <Component Id="AspNetCoreModuleHandler.x64" Guid="34C8E145-BAC8-4116-BE50-C97B92132FFC" Bitness="$(Bitness)">
+                      <File Id="AspNetCoreModuleHandlerDll.x64" Name="httpbridge_outofprocess_x64.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(Configuration)\httpbridge_outofprocess.dll" DiskId="1" Vital="yes" />
+                  </Component>
+                  <Component Id="AspNetCoreModuleHandler.arm64" Guid="D8DA4A6F-C226-4088-BDE6-EF4AD40F0AA1" Bitness="$(Bitness)">
+                    <File Id="AspNetCoreModuleHandlerDll.arm64" Name="httpbridge_outofprocess_arm64.dll" Source="$(AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes" />
+                  </Component>
+                <?endif?>
+              </Directory>
+              <?if $(InstallerPlatform) = "arm64" ?>
+              <Component Id="AspNetCoreModuleV2.x64" Guid="B081BBBD-60BF-4BED-82D4-92C90D653A5E" Bitness="$(Bitness)">
+                  <File Id="AspNetCoreModuleV2Dll.x64" Name="httpbridge_x64.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\x64\$(Configuration)\httpbridge.dll" DiskId="1" Vital="yes" KeyPath="yes"/>
+                  <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                      <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.x64]" />
+                      <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                  </RegistryKey>
+              </Component>
+              <Component Id="AspNetCoreModuleV2.arm64" Guid="EEE0482B-DDEF-402D-BEF4-7B821997AA4B" Bitness="$(Bitness)">
+                  <File Id="AspNetCoreModuleV2Dll.arm64" Name="httpbridge_arm64.dll" Source="$(AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" KeyPath="yes" />
+                  <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                      <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]" />
+                      <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                  </RegistryKey>
               </Component>
+              <?endif?>
             </Directory>
           </Directory>
-        </Directory>
-        <Directory Id="IISConfigDir" Name="config">
-          <Directory Id="IISSchemaDir" Name="schema">
-            <Component Id="AspNetCoreSchema" Guid="$(var.SchemaGuid)" Win64="$(var.IsWin64)" >
-              <File Id="AspNetCoreSchemaFile"
-                    Name="aspnetcore_schema_v2.xml"
-                    Source="$(var.AspNetCoreSchemaPath)"
-                    DiskId="1"
-                    Vital="yes"/>
-            </Component>
+          <Directory Id="IISConfigDir" Name="config">
+            <Directory Id="IISSchemaDir" Name="schema">
+              <Component Id="AspNetCoreSchema" Guid="$(SchemaGuid)" Bitness="$(Bitness)">
+                <File Id="AspNetCoreSchemaFile" Name="httpplatform_schema.xml" Source="$(AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
+              </Component>
+            </Directory>
           </Directory>
-        </Directory>
-
-        <!-- WOW64 Support -->
-        <?if $(var.Platform) != "x86" ?>
-        <Directory Id="$(var.ProgramFilesFolder32)">
-          <Directory Id="INSTALLDIR32" Name="IIS Express" >
-            <Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="$(var.ProductName)">
-              <Directory Id="VersionDir32" Name="$(var.ProductVersionString)">
-                <!-- Originally created with same component GUID as IIS installer. Must remain the same so upgrade doesn't remove this file -->
-                <Component Id="AspNetCoreModule.wow" Guid="45ba5011-a619-4d06-8a8d-155b1f9732b3" Win64="no">
-                  <File Id="AspNetCoreModuleDll.wow"
-                        Name="aspnetcorev2.dll"
-                        Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(var.Configuration)\aspnetcorev2.dll"
-                        DiskId="1"
-                        Vital="yes">
-                  </File>
-                  <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                    <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll.wow]"/>
-                    <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-                  </RegistryKey>
-                </Component>
-                <Directory Id="HandlerVersionDir32" Name="$(var.ANCMFolderVersion)" >
-                  <Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Win64="no">
-                    <File Id="AspNetCoreModuleHandlerDll.wow"
-                          Name="aspnetcorev2_outofprocess.dll"
-                          Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
-                          DiskId="1"
-                          Vital="yes">
+
+          <!-- WOW64 Support -->
+          <?if $(InstallerPlatform) != "x86" ?>
+          <Directory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLDIR32" Name="IIS Express">
+              <Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="$(ProductName)">
+                <Directory Id="VersionDir32" Name="$(ProductVersionString)">
+                  <!-- Originally created with same component GUID as IIS installer. Must remain the same so upgrade doesn't remove this file -->
+                  <Component Id="AspNetCoreModule.wow" Guid="45ba5011-a619-4d06-8a8d-155b1f9732b3" Bitness="always32">
+                    <File Id="AspNetCoreModuleDll.wow" Name="httpbridge.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(Configuration)\httpbridge.dll" DiskId="1" Vital="yes">
                     </File>
+                    <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                      <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleDll.wow]" />
+                      <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                    </RegistryKey>
                   </Component>
+                  <Directory Id="HandlerVersionDir32" Name="$(ANCMFolderVersion)">
+                    <Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Bitness="always32">
+                      <File Id="AspNetCoreModuleHandlerDll.wow" Name="httpbridge_outofprocess.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(Configuration)\httpbridge_outofprocess.dll" DiskId="1" Vital="yes">
+                      </File>
+                    </Component>
+                  </Directory>
                 </Directory>
               </Directory>
-            </Directory>
-            <Directory Id="IISConfigDir.wow" Name="config">
-              <Directory Id="IISSchemaDir.wow" Name="schema">
-                <Component Id="AspNetCoreSchema.wow" Guid="$(var.SchemaGuid32)" Win64="no" >
-                  <File Id="AspNetCoreSchemaFile.wow"
-                        Name="aspnetcore_schema_v2.xml"
-                        Source="$(var.AspNetCoreSchemaPath)"
-                        DiskId="1"
-                        Vital="yes"/>
-                </Component>
+              <Directory Id="IISConfigDir.wow" Name="config">
+                <Directory Id="IISSchemaDir.wow" Name="schema">
+                  <Component Id="AspNetCoreSchema.wow" Guid="$(SchemaGuid32)" Bitness="always32">
+                    <File Id="AspNetCoreSchemaFile.wow" Name="httpplatform_schema.xml" Source="$(AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
+                  </Component>
+                </Directory>
               </Directory>
             </Directory>
           </Directory>
-        </Directory>
-        <?endif?>
-      </DirectoryRef>
+          <?endif?>
+        </DirectoryRef>
 
         <!-- Feature Definition -->
         <Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
-            <ComponentRef Id="AspNetCoreModule"/>
-            <ComponentRef Id="AspNetCoreModuleHandler"/>
-            <ComponentRef Id="AspNetCoreSchema"/>
-            <?if $(var.Platform) != "x86" ?>
-                <ComponentRef Id="AspNetCoreModule.wow"/>
-                <ComponentRef Id="AspNetCoreModuleHandler.wow"/>
-                <ComponentRef Id="AspNetCoreSchema.wow"/>
-            <?endif ?>
+            <ComponentRef Id="AspNetCoreModule" />
+            <ComponentRef Id="AspNetCoreModuleHandler" />
+            <?if $(InstallerPlatform) = "arm64" ?>
+            <ComponentRef Id="AspNetCoreModuleV2.x64" />
+            <ComponentRef Id="AspNetCoreModuleHandler.x64" />
+            <ComponentRef Id="AspNetCoreModuleV2.arm64" />
+            <ComponentRef Id="AspNetCoreModuleHandler.arm64" />
+            <?endif?>
+            <ComponentRef Id="AspNetCoreSchema" />
+            <?if $(InstallerPlatform) != "x86" ?>
+                <ComponentRef Id="AspNetCoreModule.wow" />
+                <ComponentRef Id="AspNetCoreModuleHandler.wow" />
+                <ComponentRef Id="AspNetCoreSchema.wow" />
+            <?endif?>
         </Feature>
 
         <!-- User Interface -->
-        <UIRef Id="WixUI_Minimal"/>
-        <UIRef Id="WixUI_ErrorProgressText"/>
+        <ui:WixUI Id="WixUI_Minimal" />
+        <UIRef Id="WixUI_ErrorProgressText" />
 
         <UI>
-            <DialogRef Id="WelcomeEulaDlg"/>
+            <DialogRef Id="WelcomeEulaDlg" />
 
             <!--CUSTOM errors specific to OOB setup-->
-            <Error Id="30001">!(loc.Error30001)</Error>
-            <Error Id="30002">!(loc.Error30002)</Error>
+            <Error Id="30001" Message="!(loc.Error30001)" />
+            <Error Id="30002" Message="!(loc.Error30002)" />
             <!-- Require WAS and WMSVC be stopped to avoid restarts -->
-            <Error Id="30003">!(loc.WebServicesRunning)</Error>
+            <Error Id="30003" Message="!(loc.WebServicesRunning)" />
         </UI>
 
         <!-- Standard IIS Custom Actions -->
 
-        <SetProperty Id="INSTALLDIR" Value="[IISEXPRESS_INSTALL_PATH]" After="CostInitialize"/>
+        <SetProperty Id="INSTALLDIR" Value="[IISEXPRESS_INSTALL_PATH]" After="CostInitialize" />
 
         <!--   All this magic just to set the handlers section OverrideModeDefault=allow -->
-        <CustomAction Id="CA_UNLOCK_HANDLER_PROPERTY"
-                          Property="CA_UNLOCK_HANDLER"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
-        <CustomAction Id="CA_UNLOCK_HANDLER" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-        <CustomAction Id="CA_UNLOCK_HANDLER_TMP_PROPERTY"
-                          Property="CA_UNLOCK_HANDLER_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
-        <CustomAction Id="CA_UNLOCK_HANDLER_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+        <CustomAction Id="CA_UNLOCK_HANDLER_PROPERTY" Property="CA_UNLOCK_HANDLER" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_UNLOCK_HANDLER" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+        <CustomAction Id="CA_UNLOCK_HANDLER_TMP_PROPERTY" Property="CA_UNLOCK_HANDLER_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_UNLOCK_HANDLER_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
 
         <!-- CA's to install/add module in appserver/applicationhost.config -->
-        <CustomAction Id="CA_UNINSTALL_MODULE_PROPERTY"
-                          Property="CA_UNINSTALL_MODULE"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_UNINSTALL_MODULE" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ADD_MODULE_PROPERTY"
-                          Property="CA_ADD_MODULE"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; install module /name:$(var.AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(var.ProductName)\$(var.ProductVersionString)\aspnetcorev2.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_ADD_MODULE" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ROLLBACK_MODULE_PROPERTY"
-                          Property="CA_ROLLBACK_MODULE"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_ROLLBACK_MODULE" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="rollback" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_SET_MODULE_PROPERTY"
-                          Property="CA_SET_MODULE"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set module $(var.AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_SET_MODULE" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_REMOVE_MODULE_PROPERTY"
-                          Property="CA_REMOVE_MODULE"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_REMOVE_MODULE" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_PROPERTY"
-                          Property="CA_ADD_TRACE_PROVIDER_DEFINITION"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_PROPERTY"
-                          Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+        <CustomAction Id="CA_UNINSTALL_MODULE_PROPERTY" Property="CA_UNINSTALL_MODULE" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_UNINSTALL_MODULE" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ADD_MODULE_PROPERTY" Property="CA_ADD_MODULE" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; install module /name:$(AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(ProductName)\$(ProductVersionString)\httpbridge.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_ADD_MODULE" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ROLLBACK_MODULE_PROPERTY" Property="CA_ROLLBACK_MODULE" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_ROLLBACK_MODULE" DllEntry="WixQuietExec" Execute="rollback" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_SET_MODULE_PROPERTY" Property="CA_SET_MODULE" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set module $(AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_SET_MODULE" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_REMOVE_MODULE_PROPERTY" Property="CA_REMOVE_MODULE" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_REMOVE_MODULE" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_PROPERTY" Property="CA_ADD_TRACE_PROVIDER_DEFINITION" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_PROPERTY" Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
 
         <!-- CAs to install/add module in config/templates/.../applicationhost.config -->
-        <CustomAction Id="CA_UNINSTALL_MODULE_TMP_PROPERTY"
-                          Property="CA_UNINSTALL_MODULE_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_UNINSTALL_MODULE_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ADD_MODULE_TMP_PROPERTY"
-                          Property="CA_ADD_MODULE_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; install module /name:$(var.AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(var.ProductName)\$(var.ProductVersionString)\aspnetcorev2.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_ADD_MODULE_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ROLLBACK_MODULE_TMP_PROPERTY"
-                          Property="CA_ROLLBACK_MODULE_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_ROLLBACK_MODULE_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="rollback" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_SET_MODULE_TMP_PROPERTY"
-                          Property="CA_SET_MODULE_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set module $(var.AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_SET_MODULE_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_REMOVE_MODULE_TMP_PROPERTY"
-                          Property="CA_REMOVE_MODULE_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_REMOVE_MODULE_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY"
-                          Property="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY"
-                          Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_PROPERTY"
-                          Property="CA_UPDATE_DYNAMIC_COMPRESSION"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;"/>
-        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP_PROPERTY"
-                          Property="CA_UPDATE_DYNAMIC_COMPRESSION_TMP"
-                          Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;"/>
-        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-        <CustomAction Id="CA_ADD_CONFIGSECTION_PROPERTY"
-                          Property="CA_ADD_CONFIGSECTION"
-                          Value="[IISEXPRESS_APPHOST_CONFIG]"/>
-        <CustomAction BinaryKey="IISCustomActionDll" Id="CA_ADD_CONFIGSECTION" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no"/>
-
-        <CustomAction Id="CA_ADD_CONFIGSECTION_PROPERTY_TMP"
-                          Property="CA_ADD_CONFIGSECTION_TMP"
-                          Value="[IISEXPRESS_APPHOST_CONFIG_TMP]"/>
-        <CustomAction BinaryKey="IISCustomActionDll" Id="CA_ADD_CONFIGSECTION_TMP" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no"/>
-
-        <CustomAction Id="CA_REMOVE_CONFIGSECTION_PROPERTY"
-                            Property="CA_REMOVE_CONFIGSECTION"
-                            Value="[IISEXPRESS_APPHOST_CONFIG]"/>
-        <CustomAction Id="CA_REMOVE_CONFIGSECTION" BinaryKey="IISCustomActionDll" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" />
-
-        <CustomAction Id="CA_REMOVE_CONFIGSECTION_PROPERTY_TMP"
-                Property="CA_REMOVE_CONFIGSECTION_TMP"
-                Value="[IISEXPRESS_APPHOST_CONFIG_TMP]"/>
-        <CustomAction Id="CA_REMOVE_CONFIGSECTION_TMP" BinaryKey="IISCustomActionDll" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" />
-
-        <?if $(var.Platform) != "x86" ?>
-            <CustomAction Id="CA_UNLOCK_HANDLER32_PROPERTY"
-                              Property="CA_UNLOCK_HANDLER32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
-            <CustomAction Id="CA_UNLOCK_HANDLER32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-            <CustomAction Id="CA_UNLOCK_HANDLER_TMP32_PROPERTY"
-                              Property="CA_UNLOCK_HANDLER_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
-            <CustomAction Id="CA_UNLOCK_HANDLER_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+        <CustomAction Id="CA_UNINSTALL_MODULE_TMP_PROPERTY" Property="CA_UNINSTALL_MODULE_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_UNINSTALL_MODULE_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ADD_MODULE_TMP_PROPERTY" Property="CA_ADD_MODULE_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; install module /name:$(AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(ProductName)\$(ProductVersionString)\httpbridge.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_ADD_MODULE_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ROLLBACK_MODULE_TMP_PROPERTY" Property="CA_ROLLBACK_MODULE_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_ROLLBACK_MODULE_TMP" DllEntry="WixQuietExec" Execute="rollback" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_SET_MODULE_TMP_PROPERTY" Property="CA_SET_MODULE_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set module $(AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_SET_MODULE_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_REMOVE_MODULE_TMP_PROPERTY" Property="CA_REMOVE_MODULE_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_REMOVE_MODULE_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" Property="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_PROPERTY" Property="CA_UPDATE_DYNAMIC_COMPRESSION" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG]&quot;" />
+        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP_PROPERTY" Property="CA_UPDATE_DYNAMIC_COMPRESSION_TMP" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP]&quot;" />
+        <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+        <CustomAction Id="CA_ADD_CONFIGSECTION_PROPERTY" Property="CA_ADD_CONFIGSECTION" Value="[IISEXPRESS_APPHOST_CONFIG]" />
+        <CustomAction Id="CA_ADD_CONFIGSECTION" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+        <CustomAction Id="CA_ADD_CONFIGSECTION_PROPERTY_TMP" Property="CA_ADD_CONFIGSECTION_TMP" Value="[IISEXPRESS_APPHOST_CONFIG_TMP]" />
+        <CustomAction Id="CA_ADD_CONFIGSECTION_TMP" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+        <CustomAction Id="CA_REMOVE_CONFIGSECTION_PROPERTY" Property="CA_REMOVE_CONFIGSECTION" Value="[IISEXPRESS_APPHOST_CONFIG]" />
+        <CustomAction Id="CA_REMOVE_CONFIGSECTION" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+        <CustomAction Id="CA_REMOVE_CONFIGSECTION_PROPERTY_TMP" Property="CA_REMOVE_CONFIGSECTION_TMP" Value="[IISEXPRESS_APPHOST_CONFIG_TMP]" />
+        <CustomAction Id="CA_REMOVE_CONFIGSECTION_TMP" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+        <?if $(InstallerPlatform) != "x86" ?>
+            <CustomAction Id="CA_UNLOCK_HANDLER32_PROPERTY" Property="CA_UNLOCK_HANDLER32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_UNLOCK_HANDLER32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+            <CustomAction Id="CA_UNLOCK_HANDLER_TMP32_PROPERTY" Property="CA_UNLOCK_HANDLER_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; unlock config /section:system.webserver/handlers /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_UNLOCK_HANDLER_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
 
             <!-- CA's to install/add module in appserver/applicationhost.config -->
 
-            <CustomAction Id="CA_UNINSTALL_MODULE32_PROPERTY"
-                              Property="CA_UNINSTALL_MODULE32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_UNINSTALL_MODULE32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ADD_MODULE32_PROPERTY"
-                              Property="CA_ADD_MODULE32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; install module /name:$(var.AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(var.ProductName)\$(var.ProductVersionString)\aspnetcorev2.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_ADD_MODULE32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ROLLBACK_MODULE32_PROPERTY"
-                              Property="CA_ROLLBACK_MODULE32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_ROLLBACK_MODULE32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="rollback" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_SET_MODULE32_PROPERTY"
-                              Property="CA_SET_MODULE32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set module $(var.AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_SET_MODULE32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_REMOVE_MODULE32_PROPERTY"
-                              Property="CA_REMOVE_MODULE32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_REMOVE_MODULE32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION32_PROPERTY"
-                              Property="CA_ADD_TRACE_PROVIDER_DEFINITION32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION32_PROPERTY"
-                              Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+            <CustomAction Id="CA_UNINSTALL_MODULE32_PROPERTY" Property="CA_UNINSTALL_MODULE32" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_UNINSTALL_MODULE32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ADD_MODULE32_PROPERTY" Property="CA_ADD_MODULE32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; install module /name:$(AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(ProductName)\$(ProductVersionString)\httpbridge.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_ADD_MODULE32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ROLLBACK_MODULE32_PROPERTY" Property="CA_ROLLBACK_MODULE32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_ROLLBACK_MODULE32" DllEntry="WixQuietExec" Execute="rollback" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_SET_MODULE32_PROPERTY" Property="CA_SET_MODULE32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set module $(AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_SET_MODULE32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_REMOVE_MODULE32_PROPERTY" Property="CA_REMOVE_MODULE32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_REMOVE_MODULE32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION32_PROPERTY" Property="CA_ADD_TRACE_PROVIDER_DEFINITION32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION32_PROPERTY" Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
 
             <!-- CAs to install/add module in config/templates/.../applicationhost.config -->
-            <CustomAction Id="CA_UNINSTALL_MODULE_TMP32_PROPERTY"
-                              Property="CA_UNINSTALL_MODULE_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_UNINSTALL_MODULE_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ADD_MODULE_TMP32_PROPERTY"
-                              Property="CA_ADD_MODULE_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; install module /name:$(var.AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(var.ProductName)\$(var.ProductVersionString)\aspnetcorev2.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_ADD_MODULE_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ROLLBACK_MODULE_TMP32_PROPERTY"
-                              Property="CA_ROLLBACK_MODULE_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_ROLLBACK_MODULE_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="rollback" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_SET_MODULE_TMP32_PROPERTY"
-                              Property="CA_SET_MODULE_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set module $(var.AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_SET_MODULE_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_REMOVE_MODULE_TMP32_PROPERTY"
-                              Property="CA_REMOVE_MODULE_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(var.AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_REMOVE_MODULE_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY"
-                              Property="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY"
-                              Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(var.AspNetCoreTraceProviderName)',value='$(var.AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;"/>
-            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION32_PROPERTY"
-                              Property="CA_UPDATE_DYNAMIC_COMPRESSION32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32_PROPERTY"
-                              Property="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32"
-                              Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;"/>
-            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
-            <CustomAction Id="CA_ADD_CONFIGSECTION32_PROPERTY"
-                            Property="CA_ADD_CONFIGSECTION32"
-                            Value="[IISEXPRESS_APPHOST_CONFIG32]"/>
-            <CustomAction BinaryKey="IISCustomActionDll" Id="CA_ADD_CONFIGSECTION32" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no"/>
-
-            <CustomAction Id="CA_ADD_CONFIGSECTION32_PROPERTY_TMP"
-                            Property="CA_ADD_CONFIGSECTION32_TMP"
-                            Value="[IISEXPRESS_APPHOST_CONFIG_TMP32]"/>
-            <CustomAction BinaryKey="IISCustomActionDll" Id="CA_ADD_CONFIGSECTION32_TMP" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no"/>
-
-            <CustomAction Id="CA_REMOVE_CONFIGSECTION32_PROPERTY"
-                              Property="CA_REMOVE_CONFIGSECTION32"
-                              Value="[IISEXPRESS_APPHOST_CONFIG32]"/>
-            <CustomAction Id="CA_REMOVE_CONFIGSECTION32" BinaryKey="IISCustomActionDll" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" />
-
-            <CustomAction Id="CA_REMOVE_CONFIGSECTION32_PROPERTY_TMP"
-                    Property="CA_REMOVE_CONFIGSECTION32_TMP"
-                    Value="[IISEXPRESS_APPHOST_CONFIG_TMP32]"/>
-            <CustomAction Id="CA_REMOVE_CONFIGSECTION32_TMP" BinaryKey="IISCustomActionDll" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" />
+            <CustomAction Id="CA_UNINSTALL_MODULE_TMP32_PROPERTY" Property="CA_UNINSTALL_MODULE_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_UNINSTALL_MODULE_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ADD_MODULE_TMP32_PROPERTY" Property="CA_ADD_MODULE_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; install module /name:$(AspNetCoreModuleName) /image:&quot;%IIS_BIN%\$(ProductName)\$(ProductVersionString)\httpbridge.dll&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_ADD_MODULE_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ROLLBACK_MODULE_TMP32_PROPERTY" Property="CA_ROLLBACK_MODULE_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_ROLLBACK_MODULE_TMP32" DllEntry="WixQuietExec" Execute="rollback" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_SET_MODULE_TMP32_PROPERTY" Property="CA_SET_MODULE_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set module $(AspNetCoreModuleName) /lockItem:true /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_SET_MODULE_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_REMOVE_MODULE_TMP32_PROPERTY" Property="CA_REMOVE_MODULE_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; uninstall module $(AspNetCoreModuleName) /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_REMOVE_MODULE_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" Property="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /+&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" Property="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/tracing/traceProviderDefinitions /-&quot;[\[]name='WWW Server'[\]].areas.[\[]name='$(AspNetCoreTraceProviderName)',value='$(AspNetCoreTraceProviderValue)'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG_TMP32]&quot;" />
+            <CustomAction Id="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION32_PROPERTY" Property="CA_UPDATE_DYNAMIC_COMPRESSION32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32_PROPERTY" Property="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32" Value="&quot;[IISEXPRESS_INSTALL_PATH32]appcmd.exe&quot; set config -section:system.webServer/httpCompression /+&quot;dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]&quot; /apphostconfig:&quot;[IISEXPRESS_APPHOST_CONFIG32]&quot;" />
+            <CustomAction Id="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+
+            <CustomAction Id="CA_ADD_CONFIGSECTION32_PROPERTY" Property="CA_ADD_CONFIGSECTION32" Value="[IISEXPRESS_APPHOST_CONFIG32]" />
+            <CustomAction Id="CA_ADD_CONFIGSECTION32" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+            <CustomAction Id="CA_ADD_CONFIGSECTION32_PROPERTY_TMP" Property="CA_ADD_CONFIGSECTION32_TMP" Value="[IISEXPRESS_APPHOST_CONFIG_TMP32]" />
+            <CustomAction Id="CA_ADD_CONFIGSECTION32_TMP" DllEntry="AddConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+            <CustomAction Id="CA_REMOVE_CONFIGSECTION32_PROPERTY" Property="CA_REMOVE_CONFIGSECTION32" Value="[IISEXPRESS_APPHOST_CONFIG32]" />
+            <CustomAction Id="CA_REMOVE_CONFIGSECTION32" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+            <CustomAction Id="CA_REMOVE_CONFIGSECTION32_PROPERTY_TMP" Property="CA_REMOVE_CONFIGSECTION32_TMP" Value="[IISEXPRESS_APPHOST_CONFIG_TMP32]" />
+            <CustomAction Id="CA_REMOVE_CONFIGSECTION32_TMP" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
         <?endif?>
 
         <InstallExecuteSequence>
             <AppSearch Before="LaunchConditions" />
             <LaunchConditions After="FindRelatedProducts" />
             <MigrateFeatureStates />
-            <Custom Action="CA_UNLOCK_HANDLER_PROPERTY" After="InstallFiles"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UNLOCK_HANDLER" After="CA_UNLOCK_HANDLER_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UNINSTALL_MODULE_PROPERTY" After="CA_UNLOCK_HANDLER"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UNINSTALL_MODULE" After="CA_UNINSTALL_MODULE_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_MODULE_PROPERTY" After="CA_UNINSTALL_MODULE"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_MODULE" After="CA_ADD_MODULE_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ROLLBACK_MODULE_PROPERTY" Before="CA_ROLLBACK_MODULE"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ROLLBACK_MODULE" Before="CA_ADD_MODULE_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_SET_MODULE_PROPERTY" After="CA_ADD_MODULE"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_SET_MODULE" After="CA_SET_MODULE_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_CONFIGSECTION_PROPERTY" After="CA_SET_MODULE"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_CONFIGSECTION" After="CA_ADD_CONFIGSECTION_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_CONFIGSECTION_PROPERTY_TMP" After="CA_ADD_CONFIGSECTION"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_CONFIGSECTION_TMP" After="CA_ADD_CONFIGSECTION_PROPERTY_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_PROPERTY" After="CA_ADD_CONFIGSECTION_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION" After="CA_ADD_TRACE_PROVIDER_DEFINITION_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP" After="CA_UPDATE_DYNAMIC_COMPRESSION_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_REMOVE_MODULE_PROPERTY" Before="CA_REMOVE_MODULE"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_MODULE" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_CONFIGSECTION_PROPERTY" Before="CA_REMOVE_CONFIGSECTION"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_CONFIGSECTION" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_CONFIGSECTION_PROPERTY_TMP" Before="CA_REMOVE_CONFIGSECTION_TMP"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_CONFIGSECTION_TMP" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_UNLOCK_HANDLER_TMP_PROPERTY" After="CA_ADD_CONFIGSECTION"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UNLOCK_HANDLER_TMP" After="CA_UNLOCK_HANDLER_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UNINSTALL_MODULE_TMP_PROPERTY" After="CA_UNLOCK_HANDLER_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_UNINSTALL_MODULE_TMP" After="CA_UNINSTALL_MODULE_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_MODULE_TMP_PROPERTY" After="CA_UNINSTALL_MODULE_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ADD_MODULE_TMP" After="CA_ADD_MODULE_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ROLLBACK_MODULE_TMP_PROPERTY" Before="CA_ROLLBACK_MODULE_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_ROLLBACK_MODULE_TMP" Before="CA_ADD_MODULE_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_SET_MODULE_TMP_PROPERTY" After="CA_ADD_MODULE_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_SET_MODULE_TMP" After="CA_SET_MODULE_TMP_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-            <Custom Action="CA_REMOVE_MODULE_TMP_PROPERTY" Before="CA_REMOVE_MODULE_TMP"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-            <Custom Action="CA_REMOVE_MODULE_TMP" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-
-            <?if $(var.Platform) != "x86" ?>
-                <Custom Action="CA_UNLOCK_HANDLER32_PROPERTY" After="InstallFiles"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_UNLOCK_HANDLER32" After="CA_UNLOCK_HANDLER32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_UNINSTALL_MODULE32_PROPERTY" After="CA_UNLOCK_HANDLER32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_UNINSTALL_MODULE32" After="CA_UNINSTALL_MODULE32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ADD_MODULE32_PROPERTY" After="CA_UNINSTALL_MODULE32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ADD_MODULE32" After="CA_ADD_MODULE32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ROLLBACK_MODULE32_PROPERTY" Before="CA_ROLLBACK_MODULE32"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ROLLBACK_MODULE32" Before="CA_ADD_MODULE32_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_SET_MODULE32_PROPERTY" After="CA_ADD_MODULE32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_SET_MODULE32" After="CA_ADD_MODULE32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ADD_CONFIGSECTION32_PROPERTY" After="CA_SET_MODULE32"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_CONFIGSECTION32" After="CA_ADD_CONFIGSECTION32_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_CONFIGSECTION32_PROPERTY_TMP" After="CA_ADD_CONFIGSECTION32"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_CONFIGSECTION32_TMP" After="CA_ADD_CONFIGSECTION32_PROPERTY_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION32_PROPERTY" After="CA_ADD_CONFIGSECTION32_TMP"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION32" After="CA_ADD_TRACE_PROVIDER_DEFINITION32_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION32"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32" After="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_REMOVE_MODULE32_PROPERTY" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND IISEXPRESS_INSTALL_PATH32 AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_MODULE32" After="CA_REMOVE_MODULE32_PROPERTY"><![CDATA[(REMOVE~="ALL" AND IISEXPRESS_INSTALL_PATH32 AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_CONFIGSECTION32_PROPERTY" Before="CA_REMOVE_CONFIGSECTION32"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_CONFIGSECTION32" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_CONFIGSECTION32_PROPERTY_TMP" Before="CA_REMOVE_CONFIGSECTION32_TMP"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_CONFIGSECTION32_TMP" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION32_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION32"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION32" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_UNLOCK_HANDLER_TMP32_PROPERTY" After="CA_ADD_CONFIGSECTION32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_UNLOCK_HANDLER_TMP32" After="CA_UNLOCK_HANDLER_TMP32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_UNINSTALL_MODULE_TMP32_PROPERTY" After="CA_UNLOCK_HANDLER_TMP32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_UNINSTALL_MODULE_TMP32" After="CA_UNINSTALL_MODULE_TMP32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ADD_MODULE_TMP32_PROPERTY" After="CA_UNINSTALL_MODULE_TMP32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ADD_MODULE_TMP32" After="CA_ADD_MODULE_TMP32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_ROLLBACK_MODULE_TMP32_PROPERTY" Before="CA_ROLLBACK_MODULE_TMP32"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_ROLLBACK_MODULE_TMP32" Before="CA_ADD_MODULE_TMP32_PROPERTY"><![CDATA[(NOT REMOVE)]]></Custom>
-                <Custom Action="CA_SET_MODULE_TMP32_PROPERTY" After="CA_ADD_MODULE_TMP32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_SET_MODULE_TMP32"  After="CA_SET_MODULE_TMP32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom>
-                <Custom Action="CA_REMOVE_MODULE_TMP32_PROPERTY" Before="CA_REMOVE_MODULE_TMP32"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
-                <Custom Action="CA_REMOVE_MODULE_TMP32" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom>
+            <Custom Action="CA_UNLOCK_HANDLER_PROPERTY" After="InstallFiles" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UNLOCK_HANDLER" After="CA_UNLOCK_HANDLER_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UNINSTALL_MODULE_PROPERTY" After="CA_UNLOCK_HANDLER" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UNINSTALL_MODULE" After="CA_UNINSTALL_MODULE_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_MODULE_PROPERTY" After="CA_UNINSTALL_MODULE" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_MODULE" After="CA_ADD_MODULE_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ROLLBACK_MODULE_PROPERTY" Before="CA_ROLLBACK_MODULE" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ROLLBACK_MODULE" Before="CA_ADD_MODULE_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_SET_MODULE_PROPERTY" After="CA_ADD_MODULE" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_SET_MODULE" After="CA_SET_MODULE_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_CONFIGSECTION_PROPERTY" After="CA_SET_MODULE" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_CONFIGSECTION" After="CA_ADD_CONFIGSECTION_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_CONFIGSECTION_PROPERTY_TMP" After="CA_ADD_CONFIGSECTION" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_CONFIGSECTION_TMP" After="CA_ADD_CONFIGSECTION_PROPERTY_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_PROPERTY" After="CA_ADD_CONFIGSECTION_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION" After="CA_ADD_TRACE_PROVIDER_DEFINITION_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP" After="CA_UPDATE_DYNAMIC_COMPRESSION_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_REMOVE_MODULE_PROPERTY" Before="CA_REMOVE_MODULE" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_MODULE" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_CONFIGSECTION_PROPERTY" Before="CA_REMOVE_CONFIGSECTION" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_CONFIGSECTION" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_CONFIGSECTION_PROPERTY_TMP" Before="CA_REMOVE_CONFIGSECTION_TMP" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_CONFIGSECTION_TMP" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_UNLOCK_HANDLER_TMP_PROPERTY" After="CA_ADD_CONFIGSECTION" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UNLOCK_HANDLER_TMP" After="CA_UNLOCK_HANDLER_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UNINSTALL_MODULE_TMP_PROPERTY" After="CA_UNLOCK_HANDLER_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_UNINSTALL_MODULE_TMP" After="CA_UNINSTALL_MODULE_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_MODULE_TMP_PROPERTY" After="CA_UNINSTALL_MODULE_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ADD_MODULE_TMP" After="CA_ADD_MODULE_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ROLLBACK_MODULE_TMP_PROPERTY" Before="CA_ROLLBACK_MODULE_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_ROLLBACK_MODULE_TMP" Before="CA_ADD_MODULE_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_SET_MODULE_TMP_PROPERTY" After="CA_ADD_MODULE_TMP" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_SET_MODULE_TMP" After="CA_SET_MODULE_TMP_PROPERTY" Condition="(NOT REMOVE)" />
+            <Custom Action="CA_REMOVE_MODULE_TMP_PROPERTY" Before="CA_REMOVE_MODULE_TMP" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+            <Custom Action="CA_REMOVE_MODULE_TMP" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+
+            <?if $(InstallerPlatform) != "x86" ?>
+                <Custom Action="CA_UNLOCK_HANDLER32_PROPERTY" After="InstallFiles" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_UNLOCK_HANDLER32" After="CA_UNLOCK_HANDLER32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_UNINSTALL_MODULE32_PROPERTY" After="CA_UNLOCK_HANDLER32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_UNINSTALL_MODULE32" After="CA_UNINSTALL_MODULE32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ADD_MODULE32_PROPERTY" After="CA_UNINSTALL_MODULE32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ADD_MODULE32" After="CA_ADD_MODULE32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ROLLBACK_MODULE32_PROPERTY" Before="CA_ROLLBACK_MODULE32" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ROLLBACK_MODULE32" Before="CA_ADD_MODULE32_PROPERTY" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_SET_MODULE32_PROPERTY" After="CA_ADD_MODULE32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_SET_MODULE32" After="CA_ADD_MODULE32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ADD_CONFIGSECTION32_PROPERTY" After="CA_SET_MODULE32" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_CONFIGSECTION32" After="CA_ADD_CONFIGSECTION32_PROPERTY" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_CONFIGSECTION32_PROPERTY_TMP" After="CA_ADD_CONFIGSECTION32" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_CONFIGSECTION32_TMP" After="CA_ADD_CONFIGSECTION32_PROPERTY_TMP" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION32_PROPERTY" After="CA_ADD_CONFIGSECTION32_TMP" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION32" After="CA_ADD_TRACE_PROVIDER_DEFINITION32_PROPERTY" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION32" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32_PROPERTY" After="CA_ADD_TRACE_PROVIDER_DEFINITION_TMP32" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32" After="CA_UPDATE_DYNAMIC_COMPRESSION_TMP32_PROPERTY" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_REMOVE_MODULE32_PROPERTY" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND IISEXPRESS_INSTALL_PATH32 AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_MODULE32" After="CA_REMOVE_MODULE32_PROPERTY" Condition="(REMOVE~=&quot;ALL&quot; AND IISEXPRESS_INSTALL_PATH32 AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_CONFIGSECTION32_PROPERTY" Before="CA_REMOVE_CONFIGSECTION32" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_CONFIGSECTION32" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_CONFIGSECTION32_PROPERTY_TMP" Before="CA_REMOVE_CONFIGSECTION32_TMP" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_CONFIGSECTION32_TMP" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION32_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION32" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION32" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32_PROPERTY" Before="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_TRACE_PROVIDER_DEFINITION_TMP32" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_UNLOCK_HANDLER_TMP32_PROPERTY" After="CA_ADD_CONFIGSECTION32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_UNLOCK_HANDLER_TMP32" After="CA_UNLOCK_HANDLER_TMP32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_UNINSTALL_MODULE_TMP32_PROPERTY" After="CA_UNLOCK_HANDLER_TMP32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_UNINSTALL_MODULE_TMP32" After="CA_UNINSTALL_MODULE_TMP32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ADD_MODULE_TMP32_PROPERTY" After="CA_UNINSTALL_MODULE_TMP32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ADD_MODULE_TMP32" After="CA_ADD_MODULE_TMP32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_ROLLBACK_MODULE_TMP32_PROPERTY" Before="CA_ROLLBACK_MODULE_TMP32" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_ROLLBACK_MODULE_TMP32" Before="CA_ADD_MODULE_TMP32_PROPERTY" Condition="(NOT REMOVE)" />
+                <Custom Action="CA_SET_MODULE_TMP32_PROPERTY" After="CA_ADD_MODULE_TMP32" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_SET_MODULE_TMP32" After="CA_SET_MODULE_TMP32_PROPERTY" Condition="(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)" />
+                <Custom Action="CA_REMOVE_MODULE_TMP32_PROPERTY" Before="CA_REMOVE_MODULE_TMP32" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
+                <Custom Action="CA_REMOVE_MODULE_TMP32" Before="RemoveFiles" Condition="(REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE)" />
             <?endif?>
-            <RemoveExistingProducts After="InstallFinalize"/>
+            <RemoveExistingProducts After="InstallFinalize" />
         </InstallExecuteSequence>
 
-        <FeatureRef Id="FT_DepProvider_$(var.ProductNameShort)" />
-    </Product>
+        <FeatureRef Id="FT_DepProvider_$(ProductNameShort)" />
 
-    <Fragment>
-        <Feature Id="FT_DepProvider_$(var.ProductNameShort)" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install">
-            <ComponentRef Id="C_DepProvider_$(var.ProductNameShort)" />
-        </Feature>
+        <StandardDirectory Id="ProgramFiles6432Folder">
+            <Directory Id="INSTALLDIR" Name="IIS Express" />
+        </StandardDirectory>
+    </Package>
 
-        <DirectoryRef Id="TARGETDIR">
-            <Component Id="C_DepProvider_$(var.ProductNameShort)" Win64="no">
-                <dep:Provides Key="$(var.ANCMDepProviderKey)" />
+    <Fragment>
+        <Feature Id="FT_DepProvider_$(ProductNameShort)" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install" AllowAbsent="no">
+            <Component Id="C_DepProvider_$(ProductNameShort)" Directory="TARGETDIR" Bitness="always32" Guid="$(DepProviderGuid)">
+                <Provides Key="$(ANCMDepProviderKey)" dep:Check="yes" />
             </Component>
-        </DirectoryRef>
+        </Feature>
     </Fragment>
 
     <Fragment>
-        <Binary Id="IISCustomActionDll" SourceFile="$(var.aspnetcoreCA.TargetPath)"/>
+        <Binary Id="IISCustomActionDll" SourceFile="$(aspnetcoreCA.TargetPath)" />
     </Fragment>
 
-</Wix>
+</Wix>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec
index beff88e44574..e367bce5287d 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec
@@ -16,7 +16,6 @@
     </metadata>
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
-        <file src="$ASPNETCORE_CAB_FILE$" />
         <file src="$PackageIconFullPath$" target="$PackageIcon$" />
     </files>
 </package>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
index bfae51ff3fa7..c71960ed156e 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
@@ -1,40 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
   <PropertyGroup>
-    <Name>AspNetCoreModuleV2</Name>
     <IsShipping>true</IsShipping>
     <ProjectGuid>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</ProjectGuid>
     <OutputType>Package</OutputType>
-    <OutputName>$(Name)_$(Platform)</OutputName>
+    <OutputName>httpbridge_$(Platform)_en_$(_ProductVersionForInstallers)</OutputName>
     <GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <DisableGuidGeneration>true</DisableGuidGeneration>
-    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
+    <!-- <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile> -->
+    <!-- We import D.B.T ourselves in this file -->
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
   </PropertyGroup>
 
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixDependencyExtension">
-      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
-      <Name>WixDependencyExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
+  <PropertyGroup>
+    <ANCMDepProviderKey Condition="'$(Platform)' == 'x86'">IIS_HttpBridge,x86</ANCMDepProviderKey>
+    <ANCMDepProviderKey Condition="'$(Platform)' != 'x86'">IIS_HttpBRidge,x64</ANCMDepProviderKey>
+    <DefineConstants>$(DefineConstants);ANCMDepProviderKey=$(ANCMDepProviderKey)</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="aspnetcoremodulev2.wxs" />
-    <Compile Include="$(IIS-Setup)iisca\wix3\iisca.wxs">
+    <Compile Include="$(IIS-Setup)iisca\wix5\iisca.wxs">
       <Link>iisca.wxs</Link>
     </Compile>
-    <EmbeddedResource Include="..\setupstrings.wxl">
+    <EmbeddedResource Include="..\LCID\1033\setupstrings.wxl">
       <Link>setupstrings.wxl</Link>
     </EmbeddedResource>
     <Content Include="$(IIS-Setup)include.wxi">
@@ -53,15 +43,16 @@
     </ProjectReference>
   </ItemGroup>
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.WixToolset.Sdk" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Import Project="..\build\settings.props" />
 
   <PropertyGroup>
-    <PackageFileName>aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
-    <ProductNameShort>ASP.NET Core Module V2</ProductNameShort>
+    <PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
+    <ProductNameShort>HTTP Bridge Module</ProductNameShort>
   </PropertyGroup>
 
-  <Target Name="CreateANCMNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
+  <!-- <Target Name="CreateANCMNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
     <PropertyGroup>
       <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
     </PropertyGroup>
@@ -69,7 +60,6 @@
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ProductNameShort)' ^
                       '$(MsiFullPath)' ^
-                      '$(CabFullPath)' ^
                       '$(ToolsetInstallerNuspecFile)' ^
                       '$(ArtifactsNonShippingPackagesDir)' ^
                       '$(Platform)' ^
@@ -80,5 +70,9 @@
                       '$(PackageIcon)' ^
                       '$(PackageIconFullPath)' ^
                       '$(PackageLicenseExpression)' " />
+  </Target> -->
+
+  <Target Name="BeforeBuild" Condition="'$(Platform)' == 'arm64'">
+    <MSBuild Projects="..\Forwarders\build.proj" />
   </Target>
 </Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
index 471f789666d1..948554c0ca6b 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
+<!--
     AspNetCoreModule setup. v1 for initial release.
 -->
 
@@ -8,355 +6,298 @@
 <?include ..\IIS-Setup\include.wxi ?>
 
 <?define ProductCode = "*" ?>
-<?if $(var.IsWin64)=no ?>
-  <?define ANCMUpgradeCode = "d7168f76-9dd0-407d-bf22-0b450139e6a7" ?>
-  <?define ANCMDepProviderKey = "IIS_AspNetCore_Module_V2,x86" ?>
+<?if $(InstallerPlatform)=x64?>
+  <?define ANCMUpgradeCode = "6E038984-D117-4944-ACEA-3A7FAA317B4F" ?>
 <?else?>
-  <?define ANCMUpgradeCode = "8d50fde7-0b84-4900-b60d-bd952979ba0b" ?>
-  <?define ANCMDepProviderKey = "IIS_AspNetCore_Module_V2,x64" ?>
+  <?define ANCMUpgradeCode = "6E038984-D117-4944-ACEA-3A7FAA317B4F" ?>
 <?endif?>
-<?define ProductShortName="IIS AspNetCore Module V2" ?>
-<?define ProductNameShort="IIS_ANCM_V2" ?>
+<?define ProductShortName="IIS HTTP Bridge Module" ?>
+<?define ProductNameShort="IIS_HTTP_Bridge" ?>
 <?define ProductVersionString = "V2"?>
 
-<?if $(var.PlatformValue)="Intel" ?>
+<?if $(PlatformValue)="Intel" ?>
 <?undef PlatformValue ?>
 <?define PlatformValue = "x86" ?>
 <?endif?>
 
-<?if $(var.Platform) = "x86" ?>
-    <?define AspNetCoreV2ProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(var.Configuration)\aspnetcorev2.dll" ?>
-    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(var.Configuration)\aspnetcorev2_outofprocess.dll" ?>
-<?else ?>
-    <?define AspNetCoreV2ProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\$(var.Platform)\$(var.Configuration)\aspnetcorev2.dll" ?>
-    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\$(var.Platform)\$(var.Configuration)\aspnetcorev2_outofprocess.dll" ?>
-<?endif ?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
-    <Product Id="$(var.ProductCode)"
-          Name="!(loc.AspNetCoreModuleProductNameV2)"
-          Manufacturer="!(loc.Manufacturer)"
-          Version="$(var.ANCMMsiVersion)"
-          Language="!(loc.Language)"
-          Codepage="$(var.Codepage)"
-          UpgradeCode="$(var.ANCMUpgradeCode)" >
-
-        <Package Id="*"
-                 Description="!(loc.AspNetCoreModuleProductNameV2)"
-                 Manufacturer="!(loc.Manufacturer)"
-                 Compressed="yes"
-                 InstallPrivileges="elevated"
-                 InstallerVersion="$(var.ANCMInstallerVersion)"
-                 Platform="$(var.PlatformValue)" />
-
-        <Media Id="1" Cabinet="aspnetcoremodule.cab" EmbedCab="yes" CompressionLevel="high"/>
+<?if $(InstallerPlatform) = "x86" ?>
+    <?define AspNetCoreV2ProgramFilesTargetPath = "$(ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(Configuration)\httpbridge.dll" ?>
+    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(Configuration)\httpbridge_outofprocess.dll" ?>
+<?else?>
+    <?define AspNetCoreV2ProgramFilesTargetPath = "$(ArtifactsDir)\bin\AspNetCoreModuleShim\$(InstallerPlatform)\$(Configuration)\httpbridge.dll" ?>
+    <?define AspNetCoreV2HandlerProgramFilesTargetPath = "$(ArtifactsDir)\bin\OutOfProcessRequestHandler\$(InstallerPlatform)\$(Configuration)\httpbridge_outofprocess.dll" ?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+    <Package Name="!(loc.AspNetCoreModuleProductNameV2)" Manufacturer="!(loc.Manufacturer)" Version="$(ANCMMsiVersion)" Language="!(loc.Language)" Codepage="$(Codepage)" UpgradeCode="$(ANCMUpgradeCode)" InstallerVersion="$(ANCMInstallerVersion)" ProductCode="$(ProductCode)" Scope="perMachine">
+        <SummaryInformation Description="!(loc.AspNetCoreModuleProductNameV2)" Manufacturer="!(loc.Manufacturer)" />
+
+        <Media Id="1" Cabinet="aspnetcoremodule.cab" EmbedCab="yes" CompressionLevel="high" />
 
         <!-- include the standard app searches -->
-        <?include  ..\IIS-Setup\appsearch\appsearch.wxi ?>
+        <?include ..\IIS-Setup\appsearch\appsearch.wxi ?>
 
         <!-- make patching UI go from welcome to ready to repair -->
-        <?include  ..\IIS-Setup\iisca\wix3\FixPatchingBehavior.wxi ?>
+        <?include ..\IIS-Setup\iisca\wix5\FixPatchingBehavior.wxi ?>
 
-        <Property Id="ARPCONTACT">Microsoft Corporation</Property>
+        <Property Id="ARPCONTACT" Value="LeXtudio Inc." />
         <Property Id="ARPPRODUCTICON" Value="AspNetCoreModule.ico" />
-        <Property Id="OPT_NO_SHARED_CONFIG_CHECK"  Value="0"/>
+        <Property Id="OPT_NO_SHARED_CONFIG_CHECK" Value="0" />
         <Icon Id="AspNetCoreModule.ico" SourceFile="..\Bitmaps\AspNetCoreModule.ico" />
         <!-- <Property Id="REINSTALLMODE" Value="emus"/> -->
 
         <WixVariable Id="WixUILicenseRtf" Value="..\license\license.rtf" />
 
-        <Upgrade Id="$(var.ANCMUpgradeCode)">
-            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(var.ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" Maximum="$(var.ANCMMsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
-            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(var.ANCMMsiVersion)" IncludeMinimum="no" />
+        <Upgrade Id="$(ANCMUpgradeCode)">
+            <UpgradeVersion OnlyDetect="no" Property="OLDERVERSIONFOUND" Maximum="$(ANCMMsiVersion)" IncludeMaximum="no" MigrateFeatures="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="DUPLICATEVERSIONFOUND" Minimum="$(ANCMMsiVersion)" Maximum="$(ANCMMsiVersion)" IncludeMinimum="yes" IncludeMaximum="yes" />
+            <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONFOUND" Minimum="$(ANCMMsiVersion)" IncludeMinimum="no" />
         </Upgrade>
 
-        <Condition Message="!(loc.NewerVersionFound)">(NOT NEWERVERSIONFOUND)  OR Installed</Condition>
+        <Launch Condition="(NOT NEWERVERSIONFOUND) OR Installed" Message="!(loc.NewerVersionFound)" />
         <!--<Condition Message="$(loc.DuplicateVersionFound)">(NOT DUPLICATEVERSIONFOUND) OR Installed</Condition>-->
 
         <!-- Require the user be an admin to install -->
-        <Condition Message="!(loc.AdminRequired)">Privileged</Condition>
+        <Launch Condition="Privileged" Message="!(loc.AdminRequired)" />
 
         <!-- prevent install of 32 bit product on 64 bit machine -->
-        <?if $(var.Platform) = "x86" ?>
-        <Condition Message="!(loc.LaunchCondition_64BIT)">
-            <![CDATA[Installed Or NOT VersionNT64]]>
-        </Condition>
-        <?endif ?>
+        <?if $(InstallerPlatform) = "x86" ?>
+        <Launch Condition="Installed Or NOT VersionNT64" Message="!(loc.LaunchCondition_64BIT)" />
+        <?endif?>
 
         <!-- also prevent install of 64-bit product on 32-bit machine -->
-        <?if $(var.Platform) = "x64" OR  $(var.Platform) = "arm64"?>
-        <Condition Message="!(loc.LaunchCondition_32BIT)">
-            <![CDATA[(Installed And NOT PATCH) Or VersionNT64]]>
-        </Condition>
-        <?endif ?>
-
-        <Property Id="ALLUSERS">1</Property>
+        <?if $(InstallerPlatform) != "x86"?>
+        <Launch Condition="(Installed And NOT PATCH) Or VersionNT64" Message="!(loc.LaunchCondition_32BIT)" />
+        <?endif?>
 
         <!-- Detect IIS version and require 7.5 -->
-        <Condition Message="!(loc.IIS75OrGreater)">
-            <![CDATA[Installed OR (VersionNT >= 601)]]>
-        </Condition>
+        <Launch Condition="Installed OR (VersionNT &gt;= 601)" Message="!(loc.IIS75OrGreater)" />
 
         <!-- Detect and require core web server and w3svc -->
-        <Condition Message="!(loc.CoreWebW3SVC)">
-            ((IISCOREWEBENGINEINSTALLED = "#1") AND (IISW3SVCINSTALLED = "#1")) OR (Installed)
-        </Condition>
+        <Launch Condition="((IISCOREWEBENGINEINSTALLED = &quot;#1&quot;) AND (IISW3SVCINSTALLED = &quot;#1&quot;)) OR (Installed)" Message="!(loc.CoreWebW3SVC)" />
 
         <!-- Windows Update sevice is require to be enabled to install the patches -->
-        <Condition Message="!(loc.WindowsUpdateEnabled)">
-            NOT ( (VersionNT = 600) AND (ServicePackLevel = 1) AND (WINDOWSUPDATE_START_TYPE = "#4") )
-        </Condition>
+        <Launch Condition="NOT ( (VersionNT = 600) AND (ServicePackLevel = 1) AND (WINDOWSUPDATE_START_TYPE = &quot;#4&quot;) )" Message="!(loc.WindowsUpdateEnabled)" />
 
         <!-- Directory Structure and Component Definitions -->
-        <Directory Id="TARGETDIR" Name="SourceDir">
+
+
+        <!-- Feature Definition -->
+        <Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
+            <ComponentRef Id="C_DiscoverabilityKey" />
+            <ComponentRef Id="AspNetCoreSchemaV2" />
+            <ComponentRef Id="AspNetCoreModuleV2" />
+            <ComponentRef Id="AspNetCoreModuleHandler" />
+            <?if $(InstallerPlatform) = "arm64"?>
+            <ComponentRef Id="AspNetCoreModuleV2.x64" />
+            <ComponentRef Id="AspNetCoreModuleHandler.x64" />
+            <ComponentRef Id="AspNetCoreModuleV2.arm64" />
+            <ComponentRef Id="AspNetCoreModuleHandler.arm64" />
+            <?endif?>
+            <?if $(InstallerPlatform) != "x86" ?>
+            <ComponentRef Id="C_DiscoverabilityKeyWow" />
+            <ComponentRef Id="AspNetCoreModuleV2.wow" />
+            <ComponentRef Id="AspNetCoreModuleHandler.wow" />
+            <?endif?>
+        </Feature>
+
+        <!-- User Interface -->
+        <ui:WixUI Id="WixUI_Minimal" />
+        <UIRef Id="WixUI_ErrorProgressText" />
+
+        <UI>
+            <DialogRef Id="WelcomeEulaDlg" />
+
+            <!--CUSTOM errors specific to OOB setup-->
+            <Error Id="30001" Message="!(loc.Error30001)" />
+            <Error Id="30002" Message="!(loc.Error30002)" />
+            <!-- Require WAS and WMSVC be stopped to avoid restarts -->
+            <Error Id="30003" Message="!(loc.WebServicesRunning)" />
+        </UI>
+
+        <!-- Standard IIS Custom Actions -->
+        <CustomTableRef Id="IISGlobalModule">
+            <Row>
+                <Data Column="Name" Value="httpPlatformHandler" />
+                <Data Column="File_" Value="AspNetCoreModuleV2Dll" />
+            </Row>
+        </CustomTableRef>
+
+        <CustomTableRef Id="IISConfigSections">
+            <Row>
+                <Data Column="Name" Value="system.webServer/httpPlatform" />
+                <Data Column="File_" Value="AspNetCoreSchemaV2File" />
+                <Data Column="OverrideModeDefault" Value="Allow" />
+            </Row>
+        </CustomTableRef>
+
+        <!-- <?if $(InstallerPlatform) = "x86" OR $(InstallerPlatform) = "x64" ?> -->
+        <CustomTableRef Id="IISTraceArea">
+          <Row>
+            <Data Column="ProviderName" Value="WWW Server" />
+            <Data Column="ProviderGuid" Value="{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}" />
+            <Data Column="AreaName" Value="HTTP_PLATFORM" />
+            <Data Column="AreaValue" Value="65536" />
+            <Data Column="BinaryName_" Value="AncmMofFile" />
+            <Data Column="Component_" Value="AspNetCoreModuleV2" />
+          </Row>
+        </CustomTableRef>
+        <!-- <?endif ?> -->
+
+        <!--   All this magic just to set the handlers section OverrideModeDefault=allow -->
+        <CustomAction Id="CA_UNLOCk_HANDLER_PROPERTY" Property="CA_UNLOCk_HANDLER" Value="&quot;[IISInstallDir]appcmd.exe&quot; unlock config /section:system.webserver/handlers" />
+        <CustomAction Id="CA_UNLOCk_HANDLER" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
+        <CustomAction Id="UpdateDynamicCompression" DllEntry="RegisterANCMCompressionCA" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="CheckForSharedConfiguration" DllEntry="CheckForSharedConfigurationCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+        <InstallExecuteSequence>
+            <AppSearch Before="LaunchConditions" />
+            <LaunchConditions After="FindRelatedProducts" />
+            <MigrateFeatureStates />
+            <!-- OPT_NO_SHARED_CONFIG_CHECK could be numeric 0, string 0, or empty - all of which correspond to "false" -->
+            <Custom Action="CheckForSharedConfiguration" After="InstallInitialize" Condition="(NOT OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=&quot;&quot; OR OPT_NO_SHARED_CONFIG_CHECK=&quot;0&quot;) AND NOT Installed AND NOT REMOVE=&quot;ALL&quot;" />
+            <Custom Action="CA_UNLOCk_HANDLER_PROPERTY" After="InstallFiles" Condition="(NOT PATCH)" />
+            <Custom Action="CA_UNLOCk_HANDLER" After="CA_UNLOCk_HANDLER_PROPERTY" Condition="(NOT PATCH)" />
+            <Custom Action="UpdateDynamicCompression" After="InstallFiles" Condition="(NOT PATCH)" />
+            <RemoveExistingProducts After="InstallFinalize" />
+        </InstallExecuteSequence>
+        <FeatureRef Id="FT_DepProvider_$(ProductNameShort)" />
+
 
             <!-- Discoverability-->
-            <Component Id="C_DiscoverabilityKey" Guid="94efd0a4-ea3d-40c6-98d0-3138b5cc6813" Win64="$(var.IsWin64)">
-                <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
-                    <RegistryKey Key="$(var.ProductShortName)">
+            <Component Id="C_DiscoverabilityKey" Guid="94efd0a4-ea3d-40c6-98d0-3138b5cc6813" Directory="TARGETDIR" Bitness="$(Bitness)">
+                <RegistryKey Root="HKLM" Key="$(DiscoverabilityKeyRoot)">
+                    <RegistryKey Key="$(ProductShortName)">
                         <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
+                        <RegistryValue Type="string" Name="Version" Value="$(ANCMMsiVersion)" />
                     </RegistryKey>
                 </RegistryKey>
             </Component>
 
             <!-- Schema always to platform config directory -->
-            <Directory Id="$(var.SystemFolder)">
+            <StandardDirectory Id="System6432Folder">
                 <Directory Id="IISInstallDir" Name="inetsrv">
                     <Directory Id="IISConfigDir" Name="config">
                         <Directory Id="IISSchemaDir" Name="schema">
-                            <Component Id="AspNetCoreSchemaV2" Guid="9e5b7b62-6f9c-4595-b75c-a7cf77e98141" Win64="$(var.IsWin64)" >
-                                <File Id="AspNetCoreSchemaV2File"
-                                      Name="aspnetcore_schema_v2.xml"
-                                      Source="$(var.AspNetCoreSchemaPath)"
-                                      DiskId="1"
-                                      Vital="yes"/>
-                                <RemoveFile Id="AspNetCoreSchemaV2File_Remove" Name="aspnetcore_schema_v2.xml" On="install" />
+                            <Component Id="AspNetCoreSchemaV2" Guid="01C6B2AF-B3E3-491F-98C3-5253A8C430F6" Bitness="$(Bitness)">
+                                <File Id="AspNetCoreSchemaV2File" Name="httpplatform_schema.xml" Source="$(AspNetCoreSchemaPath)" DiskId="1" Vital="yes" />
+                                <RemoveFile Id="AspNetCoreSchemaV2File_Remove" Name="httpplatform_schema.xml" On="install" />
                            </Component>
                        </Directory>
                    </Directory>
                </Directory>
-           </Directory>
+           </StandardDirectory>
 
            <!-- Platform specific core module -->
-           <Directory Id="$(var.ProgramFilesFolder)">
+           <StandardDirectory Id="ProgramFiles6432Folder">
                <Directory Id="IISModuleDirectory" Name="IIS">
-                   <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="Asp.Net Core Module">
-                       <Directory Id="VersionDir" Name="$(var.ProductVersionString)">
-                           <Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
-                                <File Id="AspNetCoreModuleV2Dll"
-                                    Name="aspnetcorev2.dll"
-                                    Source="$(var.AspNetCoreV2ProgramFilesTargetPath)"
-                                    DiskId="1"
-                                    Vital="yes">
-                                </File>
-                               <RemoveFile Id="AspNetCoreModuleV2Dll_Remove" Name="aspnetcorev2.dll" On="install" />
-                               <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                                   <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll]"/>
-                                   <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-                               </RegistryKey>
+                   <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="HTTP Bridge Module">
+                       <Directory Id="VersionDir" Name="$(ProductVersionString)">
+                           <Component Id="AspNetCoreModuleV2" Guid="FEAA07A2-B928-48B8-A82F-D145ACB27F50" Bitness="$(Bitness)">
+                             <?if $(InstallerPlatform) = "arm64" ?>
+                             <File Id="AspNetCoreModuleV2Dll" Name="httpbridge.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\httpbridge.dll" DiskId="1" Vital="yes" KeyPath="yes"/>
+                             <?else?>
+                             <File Id="AspNetCoreModuleV2Dll" Name="httpbridge.dll" Source="$(AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" KeyPath="yes"/>
+                             <?endif?>
+                             <RemoveFile Id="AspNetCoreModuleV2Dll_Remove" Name="httpbridge.dll" On="install" />
+                             <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                               <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll]" />
+                               <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                             </RegistryKey>
                            </Component>
-                           <Directory Id="HandlerVersionDir" Name="$(var.ANCMFolderVersion)" >
-                               <Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
-                                    <File Id="AspNetCoreModuleHandlerDll"
-                                        Name="aspnetcorev2_outofprocess.dll"
-                                        Source="$(var.AspNetCoreV2HandlerProgramFilesTargetPath)"
-                                        DiskId="1"
-                                        Vital="yes">
+                           <Directory Id="HandlerVersionDir" Name="$(ANCMFolderVersion)">
+                             <Component Id="AspNetCoreModuleHandler" Guid="6004F81E-7C05-41C2-853B-5A568281D55A" Bitness="$(Bitness)">
+                               <?if $(InstallerPlatform) = "arm64" ?>
+                               <File Id="AspNetCoreModuleHandlerDll" Name="httpbridge_outofprocess.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleForwarders\httpbridge_outofprocess.dll" DiskId="1" Vital="yes" />
+                               <?else?>
+                               <File Id="AspNetCoreModuleHandlerDll" Name="httpbridge_outofprocess.dll" Source="$(AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes" />
+                               <?endif?>
+                             </Component>
+                             <?if $(InstallerPlatform) = "arm64" ?>
+                             <Component Id="AspNetCoreModuleHandler.x64" Guid="CFD75D0F-9C17-4602-A0A3-5F8DE913E323" Bitness="$(Bitness)">
+                                    <File Id="AspNetCoreModuleHandlerDll.x64" Name="httpbridge_outofprocess_x64.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\x64\$(Configuration)\httpbridge_outofprocess.dll" DiskId="1" Vital="yes">
+                                    </File>
+                             </Component>
+                             <Component Id="AspNetCoreModuleHandler.arm64" Guid="DEFB6893-8FD6-4602-8EFA-15BCA20C5326" Bitness="$(Bitness)">
+                                    <File Id="AspNetCoreModuleHandlerDll.arm64" Name="httpbridge_outofprocess_arm64.dll" Source="$(AspNetCoreV2HandlerProgramFilesTargetPath)" DiskId="1" Vital="yes">
                                     </File>
-                               </Component>
+                             </Component>
+                             <?endif?>
                            </Directory>
+                           <?if $(InstallerPlatform) = "arm64" ?>
+                           <Component Id="AspNetCoreModuleV2.x64" Guid="d9b0b5c9-8bbe-46f2-97d5-ba23d1a1ffed" Bitness="$(Bitness)">
+                                <File Id="AspNetCoreModuleV2Dll.x64" Name="httpbridge_x64.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\x64\$(Configuration)\httpbridge.dll" DiskId="1" Vital="yes" KeyPath="yes">
+                                </File>
+                               <RemoveFile Id="AspNetCoreModuleV2Dll_Remove.x64" Name="httpbridge_x64.dll" On="install" />
+                               <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                                   <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.x64]" />
+                                   <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                               </RegistryKey>
+                           </Component>
+                           <Component Id="AspNetCoreModuleV2.arm64" Guid="ab249ab5-9203-4fd5-87b6-8acc3e1a0702" Bitness="$(Bitness)">
+                                <File Id="AspNetCoreModuleV2Dll.arm64" Name="httpbridge_arm64.dll" Source="$(AspNetCoreV2ProgramFilesTargetPath)" DiskId="1" Vital="yes" KeyPath="yes">
+                                </File>
+                               <RemoveFile Id="AspNetCoreModuleV2Dll_Remove.arm64" Name="httpbridge_arm64.dll" On="install" />
+                               <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                                   <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]" />
+                                   <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                               </RegistryKey>
+                           </Component>
+                           <?endif?>
                        </Directory>
                    </Directory>
                </Directory>
-           </Directory>
+           </StandardDirectory>
 
            <!-- WOW64 Support -->
-           <?if $(var.Platform) = "x64" ?>
-           <Component Id="C_DiscoverabilityKeyWow" Guid="2eeb90e8-28d0-4543-9c2f-843b03bd6d05" Win64="no">
-               <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
-                    <RegistryKey Key="$(var.ProductShortName)">
+           <?if $(InstallerPlatform) != "x86" ?>
+           <Component Id="C_DiscoverabilityKeyWow" Guid="DD5DA1AF-EF33-49DC-A454-B01420B8F49A" Directory="TARGETDIR" Bitness="always32">
+               <RegistryKey Root="HKLM" Key="$(DiscoverabilityKeyRoot)">
+                    <RegistryKey Key="$(ProductShortName)">
                         <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
+                        <RegistryValue Type="string" Name="Version" Value="$(ANCMMsiVersion)" />
                     </RegistryKey>
                 </RegistryKey>
             </Component>
 
-            <Directory Id="$(var.ProgramFilesFolder32)">
+            <StandardDirectory Id="ProgramFilesFolder">
                  <Directory Id="IISModuleDirectory32" Name="IIS">
-                    <Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="Asp.Net Core Module">
-                        <Directory Id="VersionDir32" Name="$(var.ProductVersionString)" SourceName="WowOnly" >
-                            <Component Id="AspNetCoreModuleV2.wow" Guid="1b8ecba0-c002-442a-92c0-0fa9c0f21df4" Win64="no">
-                                <File Id="AspNetCoreModuleV2Dll.wow"
-                                    Name="aspnetcorev2.dll"
-                                    Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(var.Configuration)\aspnetcorev2.dll"
-                                    DiskId="1"
-                                    Vital="yes">
+                    <Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="HTTP Bridge Module">
+                        <Directory Id="VersionDir32" Name="$(ProductVersionString)" SourceName="WowOnly">
+                            <Component Id="AspNetCoreModuleV2.wow" Guid="416CC3BE-C258-4D82-9DC6-EFCEA07267B4" Bitness="always32">
+                                <File Id="AspNetCoreModuleV2Dll.wow" Name="httpbridge.dll" Source="$(ArtifactsDir)\bin\AspNetCoreModuleShim\Win32\$(Configuration)\httpbridge.dll" DiskId="1" Vital="yes">
                                 </File>
-                                <RemoveFile Id="AspNetCoreModuleV2Dll.wow_Remove" Name="aspnetcorev2.dll" On="install" />
-                                <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                                    <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.wow]"/>
-                                    <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
+                                <RemoveFile Id="AspNetCoreModuleV2Dll.wow_Remove" Name="httpbridge.dll" On="install" />
+                                <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(ProductShortName)">
+                                    <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.wow]" />
+                                    <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
                                 </RegistryKey>
                             </Component>
-                            <Directory Id="HandlerVersionDir32" Name="$(var.ANCMFolderVersion)" SourceName="WowOnly">
-                                <Component Id="AspNetCoreModuleHandler.wow" Guid="d927e5d3-c8b2-400c-b85c-ae5c2772d6c3" Win64="no">
-                                    <File Id="AspNetCoreModuleHandlerDll.wow"
-                                          Name="aspnetcorev2_outofprocess.dll"
-                                          Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(var.Configuration)\aspnetcorev2_outofprocess.dll"
-                                          DiskId="1"
-                                          Vital="yes">
+                            <Directory Id="HandlerVersionDir32" Name="$(ANCMFolderVersion)" SourceName="WowOnly">
+                                <Component Id="AspNetCoreModuleHandler.wow" Guid="42C7C412-6DD9-4FA5-A5C1-E96CC48078C6" Bitness="always32">
+                                    <File Id="AspNetCoreModuleHandlerDll.wow" Name="httpbridge_outofprocess.dll" Source="$(ArtifactsDir)\bin\OutOfProcessRequestHandler\Win32\$(Configuration)\httpbridge_outofprocess.dll" DiskId="1" Vital="yes">
                                     </File>
                                 </Component>
                             </Directory>
                         </Directory>
                     </Directory>
                 </Directory>
-            </Directory>
-            <?endif ?>
-            
-           <!-- ARM64 Support -->
-           <?if $(var.Platform) = "arm64" ?>
-           <Component Id="C_DiscoverabilityKeyARM64" Guid="2eeb90e8-28d0-4543-9c2f-843b03bd6d05" Win64="no">
-               <RegistryKey Root="HKLM" Key="$(var.DiscoverabilityKeyRoot)">
-                    <RegistryKey Key="$(var.ProductShortName)">
-                        <RegistryValue Type="integer" Name="Install" Value="1" />
-                        <RegistryValue Type="string" Name="Version" Value="$(var.ANCMMsiVersion)" />
-                    </RegistryKey>
-                </RegistryKey>
-            </Component>
-
-            <Directory Id="$(var.ProgramFilesFolder32)">
-                 <Directory Id="IISModuleDirectory32" Name="IIS">
-                    <Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="Asp.Net Core Module">
-                        <Directory Id="VersionDir32" Name="$(var.ProductVersionString)" SourceName="Arm64Only" >
-                            <Component Id="AspNetCoreModuleV2.arm64" Guid="1b8ecba0-c002-442a-92c0-0fa9c0f21df4" Win64="no">
-                                <File Id="AspNetCoreModuleV2Dll.arm64"
-                                    Name="aspnetcorev2.dll"
-                                    Source="$(var.ArtifactsDir)\bin\AspNetCoreModuleShim\arm64\Release\aspnetcorev2.dll"
-                                    DiskId="1"
-                                    Vital="yes">
-                                </File>
-                                <RemoveFile Id="AspNetCoreModuleV2Dll.arm64_Remove" Name="aspnetcorev2.dll" On="install" />
-                                <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductShortName)">
-                                    <RegistryValue Name="EventMessageFile" Type="expandable" Value="[#AspNetCoreModuleV2Dll.arm64]"/>
-                                    <RegistryValue Name="TypesSupported" Type="integer" Value="7"/>
-                                </RegistryKey>
-                            </Component>
-                            <Directory Id="HandlerVersionDir32" Name="$(var.ANCMFolderVersion)" SourceName="Arm64Only">
-                                <Component Id="AspNetCoreModuleHandler.arm64" Guid="d927e5d3-c8b2-400c-b85c-ae5c2772d6c3" Win64="no">
-                                    <File Id="AspNetCoreModuleHandlerDll.arm64"
-                                          Name="aspnetcorev2_outofprocess.dll"
-                                          Source="$(var.ArtifactsDir)\bin\OutOfProcessRequestHandler\arm64\Release\aspnetcorev2_outofprocess.dll"
-                                          DiskId="1"
-                                          Vital="yes">
-                                    </File>
-                                </Component>
-                            </Directory>
-                        </Directory>
-                    </Directory>
-                </Directory>
-            </Directory>
-            <?endif ?>
-        </Directory>
-
-        <!-- Feature Definition -->
-        <Feature Id="AspNetCoreModuleFeature" Title="!(loc.AspNetCoreModuleProductTitle)" Description="!(loc.AspNetCoreModuleProductDescription)" Level="1">
-            <ComponentRef Id="C_DiscoverabilityKey"/>
-            <ComponentRef Id="AspNetCoreModuleV2"/>
-            <ComponentRef Id="AspNetCoreModuleHandler"/>
-            <ComponentRef Id="AspNetCoreSchemaV2"/>
-            <?if $(var.Platform) = "x64" ?>
-            <ComponentRef Id="C_DiscoverabilityKeyWow"/>
-            <ComponentRef Id="AspNetCoreModuleV2.wow"/>
-            <ComponentRef Id="AspNetCoreModuleHandler.wow"/>
-            <?endif ?>
-            <?if $(var.Platform) = "arm64" ?>
-            <ComponentRef Id="C_DiscoverabilityKeyARM64"/>
-            <ComponentRef Id="AspNetCoreModuleV2.arm64"/>
-            <ComponentRef Id="AspNetCoreModuleHandler.arm64"/>
-            <?endif ?>
-        </Feature>
-
-        <!-- User Interface -->
-        <UIRef Id="WixUI_Minimal"/>
-        <UIRef Id="WixUI_ErrorProgressText"/>
-
-        <UI>
-            <DialogRef Id="WelcomeEulaDlg"/>
-
-            <!--CUSTOM errors specific to OOB setup-->
-            <Error Id="30001">!(loc.Error30001)</Error>
-            <Error Id="30002">!(loc.Error30002)</Error>
-            <!-- Require WAS and WMSVC be stopped to avoid restarts -->
-            <Error Id="30003">!(loc.WebServicesRunning)</Error>
-        </UI>
-
-        <!-- Standard IIS Custom Actions -->
-        <CustomTable Id="IISGlobalModule">
-            <Row>
-                <Data Column="Name">AspNetCoreModuleV2</Data>
-                <Data Column="File_">AspNetCoreModuleV2Dll</Data>
-            </Row>
-        </CustomTable>
-
-        <CustomTable Id="IISConfigSections">
-            <Row>
-                <Data Column="Name">system.webServer/aspNetCore</Data>
-                <Data Column="File_">AspNetCoreSchemaV2File</Data>
-                <Data Column="OverrideModeDefault">Allow</Data>
-            </Row>
-        </CustomTable>
-
-        <CustomTable Id="IISTraceArea">
-          <Row>
-            <Data Column="ProviderName">WWW Server</Data>
-            <Data Column="ProviderGuid">{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}</Data>
-            <Data Column="AreaName">ANCM</Data>
-            <Data Column="AreaValue">65536</Data>
-            <Data Column="BinaryName_">AncmMofFile</Data>
-            <Data Column="Component_">AspNetCoreModuleV2</Data>
-          </Row>
-        </CustomTable>
-
-        <!--   All this magic just to set the handlers section OverrideModeDefault=allow -->
-        <CustomAction Id="CA_UNLOCk_HANDLER_PROPERTY"
-                          Property="CA_UNLOCk_HANDLER"
-                          Value="&quot;[IISInstallDir]appcmd.exe&quot; unlock config /section:system.webserver/handlers" />
-        <CustomAction Id="CA_UNLOCk_HANDLER" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-        <CustomAction Id="UpdateDynamicCompression" BinaryKey="IISCustomActionDll" DllEntry ="RegisterANCMCompressionCA" Execute ="deferred" Return ="ignore" Impersonate ="no" />
-        <CustomAction BinaryKey="IISCustomActionDll" Id="CheckForSharedConfiguration" DllEntry="CheckForSharedConfigurationCA" Execute="deferred" Return="check" Impersonate="no"/>
-
-        <InstallExecuteSequence>
-            <AppSearch Before="LaunchConditions" />
-            <LaunchConditions After="FindRelatedProducts" />
-            <MigrateFeatureStates />
-            <!-- OPT_NO_SHARED_CONFIG_CHECK could be numeric 0, string 0, or empty - all of which correspond to "false" -->
-            <Custom Action="CheckForSharedConfiguration" After="InstallInitialize">(NOT OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK="" OR OPT_NO_SHARED_CONFIG_CHECK="0") AND NOT Installed AND NOT REMOVE="ALL"</Custom>
-            <Custom Action="CA_UNLOCk_HANDLER_PROPERTY" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
-            <Custom Action="CA_UNLOCk_HANDLER" After="CA_UNLOCk_HANDLER_PROPERTY"><![CDATA[(NOT PATCH)]]></Custom>
-            <Custom Action="UpdateDynamicCompression" After="InstallFiles"><![CDATA[(NOT PATCH)]]></Custom>
-            <RemoveExistingProducts After="InstallFinalize"/>
-        </InstallExecuteSequence>
-        <FeatureRef Id="FT_DepProvider_$(var.ProductNameShort)" />
-    </Product>
+            </StandardDirectory>
+            <?endif?>
+        </Package>
 
     <Fragment>
-        <Feature Id="FT_DepProvider_$(var.ProductNameShort)" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install">
-            <ComponentRef Id="C_DepProvider_$(var.ProductNameShort)" />
+        <Feature Id="FT_DepProvider_$(ProductNameShort)" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install" AllowAbsent="no">
+            <ComponentRef Id="C_DepProvider_$(ProductNameShort)" />
         </Feature>
 
-        <DirectoryRef Id="TARGETDIR">
-            <Component Id="C_DepProvider_$(var.ProductNameShort)" Win64="no">
-                <dep:Provides Key="$(var.ANCMDepProviderKey)" />
-            </Component>
-        </DirectoryRef>
+        <Component Id="C_DepProvider_$(ProductNameShort)" Directory="TARGETDIR" Bitness="always32" Guid="$(DepProviderGuid)">
+            <Provides Key="$(ANCMDepProviderKey)" dep:Check="yes" />
+        </Component>
     </Fragment>
 
     <Fragment>
-        <Binary Id="IISCustomActionDll" SourceFile="$(var.aspnetcoreCA.TargetPath)"/>
-        <Binary Id="AncmMofFile" SourceFile="$(var.AspNetCoreMofPath)"/>
+        <Binary Id="IISCustomActionDll" SourceFile="$(aspnetcoreCA.TargetPath)" />
+        <Binary Id="AncmMofFile" SourceFile="$(AspNetCoreMofPath)" />
     </Fragment>
 </Wix>
-
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
index feba505d0fe7..892b722bfb3b 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
@@ -54,7 +54,7 @@ COMPRESSION_MIME_TYPE gMimeTypes[] =
 
 #define RETURN_IF_FAILED(hrr)                                 do { _HR_RET(hrr); if (FAILED(__hrRet)) { hr = __hrRet; IISLogWrite(SETUP_LOG_SEVERITY_INFORMATION, L"Exiting hr=0x%x", hr); return hr; }} while (0, 0)
 
-// Modifies the configSections to include the aspNetCore section
+// Modifies the configSections to include the httpPlatform section
 UINT
 WINAPI
 AddConfigSection(
@@ -73,10 +73,10 @@ AddConfigSection(
 	CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage");
 	CComBSTR xPath = SysAllocString(L"XPath");
 	CComBSTR webServerPath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]");
-	CComBSTR aspNetCorePath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]/section[@name=\"aspNetCore\"]");
+	CComBSTR aspNetCorePath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]/section[@name=\"httpPlatform\"]");
 	CComBSTR section = SysAllocString(L"section");
 	CComBSTR name = SysAllocString(L"name");
-	CComBSTR aspNetCore = SysAllocString(L"aspNetCore");
+	CComBSTR aspNetCore = SysAllocString(L"httpPlatform");
 	CComBSTR overrideMode = SysAllocString(L"overrideModeDefault");
 	CComBSTR allow = SysAllocString(L"Allow");
 
@@ -135,10 +135,10 @@ RemoveConfigSection(
     CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage");
     CComBSTR xPath = SysAllocString(L"XPath");
     CComBSTR webServerPath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]");
-    CComBSTR aspNetCorePath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]/section[@name=\"aspNetCore\"]");
+    CComBSTR aspNetCorePath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]/section[@name=\"httpPlatform\"]");
     CComBSTR section = SysAllocString(L"section");
     CComBSTR name = SysAllocString(L"name");
-    CComBSTR aspNetCore = SysAllocString(L"aspNetCore");
+    CComBSTR aspNetCore = SysAllocString(L"httpPlatform");
     CComBSTR overrideMode = SysAllocString(L"overrideModeDefault");
     CComBSTR allow = SysAllocString(L"Allow");
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
index 3672d1c285c0..9b6ce27765ba 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
@@ -63,6 +63,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;Version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -92,4 +93,13 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+
+  <Target Name="_CopySymbolsToPublishDir" AfterTargets="Build" >
+    <ItemGroup>
+      <_BuiltPdbPath Include="$([System.IO.Path]::ChangeExtension($(TargetPath), '.pdb'))" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_BuiltPdbPath)" DestinationFiles="$(SymbolsOutputPath)$(TargetName)\$(TargetName).pdb" />
+    <Copy SourceFiles="@(_BuiltPdbPath)" DestinationFiles="$(SymbolsOutputPath)IISCustomActionDll\IISCustomActionDll.pdb" />
+  </Target>
 </Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
index 1b02ebf435b2..c3990adf5e95 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
@@ -34,13 +34,13 @@
     <DefineConstants>BLDVERMAJOR=$(BLDVERMAJOR);BLDVERMINOR=$(BLDVERMINOR);BLDNUMMAJOR=$(BLDNUMMAJOR);BLDNUMMINOR=$(BLDNUMMINOR);$(DefineConstants)</DefineConstants>
     <DefineConstants>ArtifactsDir=$(ArtifactsDir);ANCMMsiVersion=$(ANCMMsiVersion);ANCMFolderVersion=$(ANCMFolderVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants)</DefineConstants>
     <DefineConstants>
-      AspNetCoreSchemaPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml;
-      AspNetCoreMofPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\ancm.mof;
+      AspNetCoreSchemaPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\httpplatform_schema.xml;
+      AspNetCoreMofPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\httpbridge.mof;
       $(DefineConstants)
     </DefineConstants>
   </PropertyGroup>
 
- <ItemGroup Condition="'$(BuildNative)' == 'true'">
+ <ItemGroup Condition="'$(BuildNative)' == 'true' AND ('$(DotNetBuild)' != 'true' OR '$(DotNetBuildPass)' == '2') ">
     <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
       <Name>AspNetCoreV2</Name>
       <Private>True</Private>
@@ -70,7 +70,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <SetPlatform>Platform=Win32</SetPlatform>
     </ProjectReference>
-   
+
     <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
       <Name>AspNetCoreV2ARM64</Name>
       <Private>True</Private>
@@ -87,6 +87,23 @@
     </ProjectReference>
   </ItemGroup>
 
+ <ItemGroup Condition="'$(BuildNative)' == 'true' AND '$(DotNetBuild)' == 'true' AND '$(DotNetBuildPass)' != '2' ">
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj">
+      <Name>AspNetCoreV2</Name>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <SetPlatform>Platform=$(NativePlatform)</SetPlatform>
+    </ProjectReference>
+    <ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj">
+      <Name>AspNetCoreV2Handler</Name>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <SetPlatform>Platform=$(NativePlatform)</SetPlatform>
+    </ProjectReference>
+  </ItemGroup>
+
   <Target Name="CopyANCM" BeforeTargets="_PrepareForBuild" Condition=" '$(BuildNative)' != 'true' ">
     <ItemGroup>
       <None Include="%(RunShimComponents.DllLocation)" CopyToOutputDirectory="PreserveNewest" Condition="Exists('%(RunShimComponents.DllLocation)')" Link="%(RunShimComponents.Platform)\%(RunShimComponents.NativeAsset).dll" />
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd
new file mode 100644
index 000000000000..49c4ba0aab19
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd
@@ -0,0 +1,3 @@
+call %1 -host_arch=x64 -arch=arm64 -no_logo
+call build.cmd %2 %3 %4
+exit /b 0
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd
new file mode 100644
index 000000000000..62c30e1a8fe8
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd
@@ -0,0 +1,19 @@
+SET objDir=%1
+SET binDir=%2
+SET configuration=%3
+
+cl /nologo /c /Fo%objDir%\httpbridge_arm64.obj empty.cpp
+cl /nologo /c /arm64EC /Fo%objDir%\httpbridge_x64.obj empty.cpp
+
+link /lib /nologo /machine:arm64 /def:httpbridge_arm64.def /out:%objDir%\httpbridge_arm64.lib
+link /lib /nologo /machine:x64 /def:httpbridge_x64.def /out:%objDir%\httpbridge_x64.lib
+
+link /dll /nologo /noentry /machine:arm64x /defArm64Native:httpbridge_arm64.def /def:httpbridge_x64.def %objDir%\httpbridge_arm64.obj %objDir%\httpbridge_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\httpbridge.dll %objDir%\httpbridge_arm64.lib %objDir%\httpbridge_x64.lib /FORCE:UNRESOLVED
+
+cl /nologo /nologo /c /Fo%objDir%\httpbridge_outofprocess_arm64.obj empty.cpp
+cl /nologo /nologo /c /arm64EC /Fo%objDir%\httpbridge_outofprocess_x64.obj empty.cpp
+
+link /lib /nologo /machine:arm64 /def:httpbridge_outofprocess_arm64.def /out:%objDir%\httpbridge_outofprocess_arm64.lib
+link /lib /nologo /machine:x64 /def:httpbridge_outofprocess_x64.def /out:%objDir%\httpbridge_outofprocess_x64.lib
+
+link /dll /nologo /noentry /machine:arm64x /defArm64Native:httpbridge_outofprocess_arm64.def /def:httpbridge_outofprocess_x64.def %objDir%\httpbridge_outofprocess_arm64.obj %objDir%\httpbridge_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\httpbridge_outofprocess.dll %objDir%\httpbridge_outofprocess_arm64.lib %objDir%\httpbridge_outofprocess_x64.lib /FORCE:UNRESOLVED
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj
new file mode 100644
index 000000000000..49e3afcbaae2
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj
@@ -0,0 +1,23 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0" DefaultTargets="Build">
+  <PropertyGroup Label="Globals">
+    <RootNamespace>httpbridge</RootNamespace>
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
+  <Import Project="..\build\settings.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <ObjDir>$(ArtifactsObjDir)\AspNetCoreModuleForwarders</ObjDir>
+    <BinDir>$(ArtifactsBinDir)\AspNetCoreModuleForwarders</BinDir>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <Prompt>&quot;$(VSInstallDir)Common7\Tools\VsDevCmd&quot;</Prompt>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
+    <MakeDir Directories="$(ObjDir);$(BinDir)" />
+     <!-- Ignore link.exe ARM64X pure forwarder bug -->
+     <!-- Revert once https://developercommunity.visualstudio.com/t/LINK-:-error-LNK2001:-unresolved-extern/10932429 is fixed -->
+    <Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" ContinueOnError="true" IgnoreStandardErrorWarningFormat="true" />
+  </Target>
+</Project>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_arm64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_arm64.def
new file mode 100644
index 000000000000..aa04fdc1acb8
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_arm64.def
@@ -0,0 +1,2 @@
+EXPORTS
+    RegisterModule = httpbridge_arm64.RegisterModule
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_outofprocess_arm64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_outofprocess_arm64.def
new file mode 100644
index 000000000000..f4f964bf6c32
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_outofprocess_arm64.def
@@ -0,0 +1,2 @@
+EXPORTS
+    CreateApplication = httpbridge_outofprocess_arm64.CreateApplication
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_outofprocess_x64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_outofprocess_x64.def
new file mode 100644
index 000000000000..79070c8442a2
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_outofprocess_x64.def
@@ -0,0 +1,2 @@
+EXPORTS
+    CreateApplication = httpbridge_outofprocess_x64.CreateApplication
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_x64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_x64.def
new file mode 100644
index 000000000000..27ba92a0d4f9
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/httpbridge_x64.def
@@ -0,0 +1,2 @@
+EXPORTS
+    RegisterModule = httpbridge_x64.RegisterModule
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.slnf b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.slnf
index 71040c9e9dbb..dfb24cd59164 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.slnf
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\..\\..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj"
     ]
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.slnf b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.slnf
index 36e1467ee6d6..044046e1270e 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.slnf
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj",
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj"
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi
index 820cc86f4ed9..6e64b5657d85 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
+<!--
     Copyright (c) Microsoft Corporation. All rights reserved.
     Licensed under the MIT license.
 -->
 
 <!-- Be sure to include the common setup include file in your project if using this file! 
 
-<?include $(var.PROJECT_ROOT)\setup\include.wxi ?>
+<?include $(PROJECT_ROOT)\setup\include.wxi ?>
 
 -->
 
-<Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
         <!-- 
           all these properties are marked secure because that is the mechanism by 
           which they can be passed from the client side of msiexec to the server
@@ -23,36 +21,36 @@
 
         <!-- iis installation lookup -->
         <Property Id="IISINSTALLPATH" Admin="no" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISINSTALLPATH" Type="raw" Root="HKLM" Key="Software\Microsoft\InetStp" Name="InstallPath" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="RegistrySearch_IISINSTALLPATH" Type="raw" Root="HKLM" Key="Software\Microsoft\InetStp" Name="InstallPath" Bitness="$(Bitness)" />
         </Property>
 
         <!-- iis features lookup -->
         <Property Id="IISCOREWEBENGINEINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISCOREWEBENGINEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="CoreWebEngine" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="RegistrySearch_IISCOREWEBENGINEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="CoreWebEngine" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISW3SVCINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISW3SVCINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="W3SVC" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_IISW3SVCINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="W3SVC" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISADMINSERVICEINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISADMINSERVICEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="AdminService" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_IISADMINSERVICEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="AdminService" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISMANAGEMENTCONSOLEINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISMANAGEMENTCONSOLEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ManagementConsole" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="RegistrySearch_IISMANAGEMENTCONSOLEINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ManagementConsole" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISNETFXEXTENSIBILITYINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISNETFXEXTENSIBILITYINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="NetFxExtensibility" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="RegistrySearch_IISNETFXEXTENSIBILITYINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="NetFxExtensibility" Bitness="$(Bitness)" />
         </Property>
         <Property Id="IISASPNET" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISASPNETINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="RegistrySearch_IISASPNETINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Bitness="$(Bitness)" />
         </Property>
 
         <Property Id="IISMETABASEIMAGEPATH" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_IISMETABASEIMAGEPATH" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\IISADMIN" Name="ImagePath" Win64="$(var.IsWin64)" />
+            <RegistrySearch Id="RegistrySearch_IISMETABASEIMAGEPATH" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\IISADMIN" Name="ImagePath" Bitness="$(Bitness)" />
         </Property>
 
         <!-- UI features lookup -->
         <Property Id="IISREMOTECHANNELINSTALLED" Secure="yes">
-            <RegistrySearch Id ="RegistrySearch_IISREMOTECHANNELINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Inetmgr\7.0" Name="RemoteChannel" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_IISREMOTECHANNELINSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Inetmgr\7.0" Name="RemoteChannel" Bitness="$(Bitness)" />
         </Property>
 
         <!--
@@ -63,36 +61,36 @@
             (NOT NETFRAMEWORK20) Or (NETFRAMEWORK20_SP_LEVEL ~>= "#1") Or Installed
         -->
         <Property Id="NETFRAMEWORK20" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="Install" Bitness="$(Bitness)" />
         </Property>
         <Property Id="NETFRAMEWORK20_SP_LEVEL" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20_SP_LEVEL" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK20_SP_LEVEL" Type="raw" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v2.0.50727" Name="SP" Bitness="$(Bitness)" />
         </Property>
         <Property Id="NETFRAMEWORK35_SP_LEVEL" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK35_SP_LEVEL" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_NETFRAMEWORK35_SP_LEVEL" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5" Name="SP" Bitness="$(Bitness)" />
         </Property>
 
         <!-- search for powershell v1 -->
         <Property Id="POWERSHELLINSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_POWERSHELLINSTALLED" Type="raw" Root="HKLM" Key="Software\Microsoft\PowerShell\1" Name="Install" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_POWERSHELLINSTALLED" Type="raw" Root="HKLM" Key="Software\Microsoft\PowerShell\1" Name="Install" Bitness="$(Bitness)" />
         </Property>
 
         <!-- Read the start type for the Windows Update service -->
         <Property Id="WINDOWSUPDATE_START_TYPE" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WINDOWSUPDATE_START_TYPE" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\wuauserv" Name="Start" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_WINDOWSUPDATE_START_TYPE" Type="raw" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\wuauserv" Name="Start" Bitness="$(Bitness)" />
         </Property>
 
         <!-- Figure out the windows sku -->
         <Property Id="WINDOWSEDITION" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WINDOWSEDITION" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_WINDOWSEDITION" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Bitness="$(Bitness)" />
         </Property>
 
         <!-- search for web pi -->
         <Property Id="WEBPI3INSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WEBPI3INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\3" Name="Install" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_WEBPI3INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\3" Name="Install" Bitness="$(Bitness)" />
         </Property>
 
         <Property Id="WEBPI4INSTALLED" Secure="yes">
-            <RegistrySearch Id="RegistrySearch_WEBPI4INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\4" Name="Install" Win64="$(var.IsWin64)"/>
+            <RegistrySearch Id="RegistrySearch_WEBPI4INSTALLED" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\WebPlatformInstaller\4" Name="Install" Bitness="$(Bitness)" />
         </Property>
 </Include>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs
index 5bf076f74d20..8c52809043d0 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs
@@ -1,191 +1,189 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
+<!--
     Copyright (c) Microsoft Corporation. All rights reserved.
     Licensed under the MIT license.
 -->
 
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
     <Fragment Id="Fragment.IIS.OOB.Common.IISCA">
         <!-- Immediate custom actions which will package and schedule deferred actions for module installation -->
-        <CustomAction Id="IISScheduleInstallCA" BinaryKey="IISCustomActionDll" DllEntry="IISScheduleInstallCA" Execute="immediate" Return="check" />
-        <CustomAction Id="IISScheduleUninstallCA" BinaryKey="IISCustomActionDll" DllEntry="IISScheduleUninstallCA" Execute="immediate" Return="check" />
+        <CustomAction Id="IISScheduleInstallCA" DllEntry="IISScheduleInstallCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISScheduleUninstallCA" DllEntry="IISScheduleUninstallCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
 
         <!-- Deferred custom actions scheduled by the immediate actions above -->
-        <CustomAction Id="IISExecuteCA" BinaryKey="IISCustomActionDll" DllEntry="IISExecuteCA" Execute="deferred" Return="check" Impersonate="no" />
-        <CustomAction Id="IISBeginTransactionCA" BinaryKey="IISCustomActionDll" DllEntry="IISBeginTransactionCA" Execute="deferred" Return="check" Impersonate="no" />
-        <CustomAction Id="IISRollbackTransactionCA" BinaryKey="IISCustomActionDll" DllEntry="IISRollbackTransactionCA" Execute="rollback" Return="check" Impersonate="no" />
-        <CustomAction Id="IISCommitTransactionCA" BinaryKey="IISCustomActionDll" DllEntry="IISCommitTransactionCA" Execute="commit" Return="check" Impersonate="no" />
+        <CustomAction Id="IISExecuteCA" DllEntry="IISExecuteCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISBeginTransactionCA" DllEntry="IISBeginTransactionCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISRollbackTransactionCA" DllEntry="IISRollbackTransactionCA" Execute="rollback" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISCommitTransactionCA" DllEntry="IISCommitTransactionCA" Execute="commit" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
 
         <InstallExecuteSequence>
-            <Custom Action='IISScheduleInstallCA' After='InstallFiles'>NOT SKIPINSTALLCA AND NOT( REMOVE="ALL" )</Custom>
-            <Custom Action='IISScheduleUninstallCA' Before='RemoveFiles'>NOT SKIPUNINSTALLCA</Custom>
+            <Custom Action="IISScheduleInstallCA" After="InstallFiles" Condition="NOT SKIPINSTALLCA AND NOT( REMOVE=&quot;ALL&quot; )" />
+            <Custom Action="IISScheduleUninstallCA" Before="RemoveFiles" Condition="NOT SKIPUNINSTALLCA" />
         </InstallExecuteSequence>
 
         <!-- Define a table to hold Handler registration parameters -->
-        <CustomTable Id='IISGlobalHandler'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='Path' Type='string' Nullable='no' />
-            <Column Id='Verb' Type='string' Nullable='no' />
-            <Column Id='Type' Type='string' Nullable='yes' />
-            <Column Id='Index' Type='string' Nullable='yes' />
+        <CustomTable Id="IISGlobalHandler">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="Path" Type="string" Nullable="no" />
+            <Column Id="Verb" Type="string" Nullable="no" />
+            <Column Id="Type" Type="string" Nullable="yes" />
+            <Column Id="Index" Type="string" Nullable="yes" />
             <!--  Index = one of { FIRST | LAST | BEFORE_STATICFILE } -->
-            <Column Id='Modules' Type='string' Nullable='yes' />
-            <Column Id='ScriptProcessor' Type='string' Nullable='yes' />
-            <Column Id='ResourceType' Type='string' Nullable='yes' />
-            <Column Id='RequiredAccess' Type='string' Nullable='yes' />
-            <Column Id='PreCondition' Type='string' Nullable='yes' />
+            <Column Id="Modules" Type="string" Nullable="yes" />
+            <Column Id="ScriptProcessor" Type="string" Nullable="yes" />
+            <Column Id="ResourceType" Type="string" Nullable="yes" />
+            <Column Id="RequiredAccess" Type="string" Nullable="yes" />
+            <Column Id="PreCondition" Type="string" Nullable="yes" />
         </CustomTable>
         <!-- Define a table to hold Module registration parameters -->
-        <CustomTable Id='IISGlobalModule'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='File_' Type='string' KeyTable='File' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='PreCondition' Type='string' Nullable='yes' />
-            <Column Id='TypeName' Type='string' Nullable='yes' />
+        <CustomTable Id="IISGlobalModule">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="PreCondition" Type="string" Nullable="yes" />
+            <Column Id="TypeName" Type="string" Nullable="yes" />
         </CustomTable>
         <!-- Define a table to hold Trace Area and MOF registration parameters -->
-        <CustomTable Id='IISTraceArea'>
-            <Column Id='ProviderName' Type='string' PrimaryKey='yes' />
-            <Column Id='ProviderGuid' Type='string' Nullable='yes' />
-            <Column Id='AreaName' Type='string' />
-            <Column Id='AreaValue' Type='string' Nullable='yes' />
-            <Column Id='BinaryName_' Type='string' KeyTable='Binary' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
+        <CustomTable Id="IISTraceArea">
+            <Column Id="ProviderName" Type="string" PrimaryKey="yes" />
+            <Column Id="ProviderGuid" Type="string" Nullable="yes" />
+            <Column Id="AreaName" Type="string" />
+            <Column Id="AreaValue" Type="string" Nullable="yes" />
+            <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
         </CustomTable>
         <!-- Define a table to hold Section Schema registration parameters -->
-        <CustomTable Id='IISConfigSections'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='File_' Type='string' KeyTable='File' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='OverrideModeDefault' Type='string' />
-            <Column Id='AllowDefinition' Type='string' Nullable='yes' />
-            <Column Id='Type' Type='string' Nullable='yes' />
-            <Column Id='InAdminConfig' Type='string' Nullable='yes' Set='yes;no' />
+        <CustomTable Id="IISConfigSections">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="OverrideModeDefault" Type="string" />
+            <Column Id="AllowDefinition" Type="string" Nullable="yes" />
+            <Column Id="Type" Type="string" Nullable="yes" />
+            <Column Id="InAdminConfig" Type="string" Nullable="yes" Set="yes;no" />
         </CustomTable>
         <!-- Define a table to hold Section Defaults registration parameters -->
-        <CustomTable Id='IISConfigSectionDefaults'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='SectionName' Type='string' Nullable='no' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='BinaryName_' Type='string' KeyTable='Binary' KeyColumn='1' Category='Identifier' Width='72'/>
+        <CustomTable Id="IISConfigSectionDefaults">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="SectionName" Type="string" Nullable="no" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
         </CustomTable>
         <!-- Define a table to hold Section additions registration parameters -->
-        <CustomTable Id='IISConfigSectionAdditions'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='SectionName' Type='string' Nullable='no' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='BinaryName_' Type='string' KeyTable='Binary' KeyColumn='1' Category='Identifier' Width='72'/>
+        <CustomTable Id="IISConfigSectionAdditions">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="SectionName" Type="string" Nullable="no" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
         </CustomTable>
         <!-- Define a table to hold UI Module registration parameters -->
-        <CustomTable Id='IISUIModule'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='AssemblyInfoComponent_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72' Nullable='yes'/>
-            <Column Id='TypeName' Type='string' />
-            <Column Id='RegisterInModulesSection' Type='string' Nullable='yes' />
-            <Column Id='PrependToList' Type='string' Nullable='yes' />
+        <CustomTable Id="IISUIModule">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="AssemblyInfoComponent_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" Modularize="column" Nullable="yes" />
+            <Column Id="TypeName" Type="string" />
+            <Column Id="RegisterInModulesSection" Type="string" Nullable="yes" />
+            <Column Id="PrependToList" Type="string" Nullable="yes" />
         </CustomTable>
         <!-- Define a table to hold CGI Restriction registration parameters -->
-        <CustomTable Id='IISCgiRestriction'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='Path' Type='string' Nullable='no'/>
-            <Column Id='Allowed' Type='string' Nullable='no' />
-            <Column Id='GroupId' Type='string' Nullable='no' />
-            <Column Id='Description' Type='string' Nullable='no' />
+        <CustomTable Id="IISCgiRestriction">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="Path" Type="string" Nullable="no" />
+            <Column Id="Allowed" Type="string" Nullable="no" />
+            <Column Id="GroupId" Type="string" Nullable="no" />
+            <Column Id="Description" Type="string" Nullable="no" />
         </CustomTable>
 
     </Fragment>
 
     <Fragment Id="Fragment.IIS.OOB.Common.WindowsHotfix">
 
-    <CustomAction Id="ScheduleInstallWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ScheduleInstallWindowsHotfixCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ScheduleInstallWindowsHotfix" DllEntry="ScheduleInstallWindowsHotfixCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
     <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteInstallWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteInstallWindowsHotfixCA" Execute="deferred" Return="check" Impersonate="no" />
-    <CustomAction Id="RollbackCleanUpWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="rollback" Return="check" Impersonate="no" />
-    <CustomAction Id="CommitCleanUpWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="commit" Return="check" Impersonate="no" />
+    <CustomAction Id="ExecuteInstallWindowsHotfix" DllEntry="ExecuteInstallWindowsHotfixCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="RollbackCleanUpWindowsHotfix" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="rollback" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="CommitCleanUpWindowsHotfix" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="commit" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
 
-    <CustomAction Id="ScheduleRebootIfRequired" BinaryKey="IISCustomActionDll" DllEntry="ScheduleRebootIfRequiredCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ScheduleRebootIfRequired" DllEntry="ScheduleRebootIfRequiredCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
 
     <CustomTable Id="IISWindowsHotfix">
-      <Column Id="Name" Type="string" PrimaryKey="yes"/>
-      <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="Identifier" Width="72"/>
-      <Column Id="OSMajorVersion" Type="int" Width="4" Nullable="yes"/>
-      <Column Id="OSMinorVersion" Type="int" Width="4" Nullable="yes"/>
-      <Column Id="SPMajorVersion" Type="int" Width="2" Nullable="yes"/>
-      <Column Id="Condition" Type="string" Category="Condition" Nullable="yes"/>
+      <Column Id="Name" Type="string" PrimaryKey="yes" />
+      <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+      <Column Id="OSMajorVersion" Type="int" Width="4" Nullable="yes" />
+      <Column Id="OSMinorVersion" Type="int" Width="4" Nullable="yes" />
+      <Column Id="SPMajorVersion" Type="int" Width="2" Nullable="yes" />
+      <Column Id="Condition" Type="string" Category="condition" Nullable="yes" />
     </CustomTable>
 
     <InstallExecuteSequence>
-      <Custom Action="ScheduleInstallWindowsHotfix" Before="RemoveFiles">NOT SKIPINSTALLWINDOWSHOTFIX</Custom>
-      <Custom Action="ScheduleRebootIfRequired" After="InstallFinalize">NOT SKIPREBOOTIFREQUIRED</Custom>
+      <Custom Action="ScheduleInstallWindowsHotfix" Before="RemoveFiles" Condition="NOT SKIPINSTALLWINDOWSHOTFIX" />
+      <Custom Action="ScheduleRebootIfRequired" After="InstallFinalize" Condition="NOT SKIPREBOOTIFREQUIRED" />
     </InstallExecuteSequence>
 
   </Fragment>
 
   <Fragment Id="Fragment.IIS.OOB.Common.ElevatedShortcut">
-    <CustomAction Id="ScheduleMakeShortcutElevated" BinaryKey="IISCustomActionDll" DllEntry="ScheduleMakeShortcutElevatedCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ScheduleMakeShortcutElevated" DllEntry="ScheduleMakeShortcutElevatedCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
 
     <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteMakeShortcutElevated" BinaryKey="IISCustomActionDll" DllEntry="ExecuteMakeShortcutElevatedCA" Execute="deferred" Return="check" Impersonate="no" />
+    <CustomAction Id="ExecuteMakeShortcutElevated" DllEntry="ExecuteMakeShortcutElevatedCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
 
     <CustomTable Id="IISElevatedShortcut">
       <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
-      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="Identifier" Width="72"/>
+      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
     </CustomTable>
 
     <InstallExecuteSequence>
-      <Custom Action='ScheduleMakeShortcutElevated' After='CreateShortcuts'>NOT SKIPMAKESHORTCUTELEVATED</Custom>
+      <Custom Action="ScheduleMakeShortcutElevated" After="CreateShortcuts" Condition="NOT SKIPMAKESHORTCUTELEVATED" />
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment Id="Fragment.IIS.OOB.Common.ShortcutConsoleProperties">
-    <CustomAction Id="ScheduleSetConsoleProperties" BinaryKey="IISCustomActionDll" DllEntry="ScheduleSetConsolePropertiesCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ScheduleSetConsoleProperties" DllEntry="ScheduleSetConsolePropertiesCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
 
     <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteSetConsoleProperties" BinaryKey="IISCustomActionDll" DllEntry="ExecuteSetConsolePropertiesCA" Execute="deferred" Return="check" Impersonate="no" />
+    <CustomAction Id="ExecuteSetConsoleProperties" DllEntry="ExecuteSetConsolePropertiesCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
 
     <CustomTable Id="IISShortcutConsoleProperties">
       <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
-      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="Identifier" Width="72"/>
+      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
       <Column Id="QuickEdit" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
-      <Column Id="InsertMode" Type="int" Width="2"  MinValue="0" MaxValue="1" Nullable="no"/>
-      <Column Id="WindowWidth" Type="int" Width="2" Nullable="no"/>
-      <Column Id="WindowHeight" Type="int" Width="2" Nullable="no"/>
-      <Column Id="BufferWidth" Type="int" Width="2" Nullable="no"/>
-      <Column Id="BufferHeight" Type="int" Width="2" Nullable="no"/>
+      <Column Id="InsertMode" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
+      <Column Id="WindowWidth" Type="int" Width="2" Nullable="no" />
+      <Column Id="WindowHeight" Type="int" Width="2" Nullable="no" />
+      <Column Id="BufferWidth" Type="int" Width="2" Nullable="no" />
+      <Column Id="BufferHeight" Type="int" Width="2" Nullable="no" />
       <!--<Column Id="TextColor" Type="string"  Width="11" Nullable="yes"/>
       <Column Id="BackgroundColor" Type="string" Width="11" Nullable="yes" Category="Formatted"/>-->
     </CustomTable>
 
     <InstallExecuteSequence>
-      <Custom Action='ScheduleSetConsoleProperties' After='CreateShortcuts'>NOT SKIPSETCONSOLEPROPERTIES</Custom>
+      <Custom Action="ScheduleSetConsoleProperties" After="CreateShortcuts" Condition="NOT SKIPSETCONSOLEPROPERTIES" />
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment Id="Fragment.IIS.OOB.Common.HttpListener">
     <!-- Immediate custom actions which will package and schedule deferred actions for httpsys -->
-    <CustomAction Id="ScheduleInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ScheduleInstallHttpListenerCA" Execute="immediate" Return="check" />
-    <CustomAction Id="ScheduleUnInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ScheduleUnInstallHttpListenerCA" Execute="immediate" Return="check"  />
+    <CustomAction Id="ScheduleInstallHttpListener" DllEntry="ScheduleInstallHttpListenerCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="ScheduleUnInstallHttpListener" DllEntry="ScheduleUnInstallHttpListenerCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
 
     <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ExecuteInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" />
-    <CustomAction Id="ExecuteUnInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ExecuteUnInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" />
+    <CustomAction Id="ExecuteInstallHttpListener" DllEntry="ExecuteInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="ExecuteUnInstallHttpListener" DllEntry="ExecuteUnInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
 
     <!-- Setup Custom Action Parameters -->
 
     <!-- Define a table to hold registration parameters -->
-    <CustomTable Id='IISHttpListener'>
-      <Column Id='Name' Type='string' PrimaryKey='yes' />
-      <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-      <Column Id='Account' Type='string' />
-      <Column Id='Prefix' Type='string' />
+    <CustomTable Id="IISHttpListener">
+      <Column Id="Name" Type="string" PrimaryKey="yes" />
+      <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+      <Column Id="Account" Type="string" />
+      <Column Id="Prefix" Type="string" />
     </CustomTable>
 
     <InstallExecuteSequence>
-      <Custom Action='ScheduleInstallHttpListener' After='InstallFiles'>NOT SKIPINSTALLHTTPLISTENER</Custom>
-      <Custom Action='ScheduleUnInstallHttpListener' Before='RemoveFiles'>NOT SKIPUNINSTALLHTTPLISTENER</Custom>
+      <Custom Action="ScheduleInstallHttpListener" After="InstallFiles" Condition="NOT SKIPINSTALLHTTPLISTENER" />
+      <Custom Action="ScheduleUnInstallHttpListener" Before="RemoveFiles" Condition="NOT SKIPUNINSTALLHTTPLISTENER" />
     </InstallExecuteSequence>
   </Fragment>
 
@@ -195,14 +193,14 @@
         we decided that it is confusing to see a remove button when the intention was to patch the product.
     -->
   <Fragment Id="Fragment.IIS.OOB.Common.FixPatchingBehavior">
-    <CustomAction Id="CustomAction_ChangeInstallMode" Property="WixUI_InstallMode" Value="Repair"/>
-    <CustomAction Id="CustomAction_ChangeNextOnPatch" Property="WixUI_MaintenanceWelcomeDlg_Next" Value="VerifyReadyDlg"/>
-    <CustomAction Id="CustomAction_ChangeBackOnPatch" Property="WixUI_VerifyReadyDlg_BackRepair" Value="MaintenanceWelcomeDlg"/>
+    <CustomAction Id="CustomAction_ChangeInstallMode" Property="WixUI_InstallMode" Value="Repair" />
+    <CustomAction Id="CustomAction_ChangeNextOnPatch" Property="WixUI_MaintenanceWelcomeDlg_Next" Value="VerifyReadyDlg" />
+    <CustomAction Id="CustomAction_ChangeBackOnPatch" Property="WixUI_VerifyReadyDlg_BackRepair" Value="MaintenanceWelcomeDlg" />
 
     <InstallUISequence>
-      <Custom Action="CustomAction_ChangeInstallMode" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
-      <Custom Action="CustomAction_ChangeNextOnPatch" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
-      <Custom Action="CustomAction_ChangeBackOnPatch" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
+      <Custom Action="CustomAction_ChangeInstallMode" Before="MaintenanceWelcomeDlg" Condition="Installed And PATCH" />
+      <Custom Action="CustomAction_ChangeNextOnPatch" Before="MaintenanceWelcomeDlg" Condition="Installed And PATCH" />
+      <Custom Action="CustomAction_ChangeBackOnPatch" Before="MaintenanceWelcomeDlg" Condition="Installed And PATCH" />
     </InstallUISequence>
   </Fragment>
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi
deleted file mode 100644
index ee5e988a1bf3..000000000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.
--->
-
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Fragment Id="Fragment.IIS.OOB.Common.ElevatedShortcut">
-    <CustomAction Id="ScheduleMakeShortcutElevated" BinaryKey="IISCustomActionDll" DllEntry="ScheduleMakeShortcutElevatedCA" Execute="immediate" Return="check" />
-    
-    <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteMakeShortcutElevated" BinaryKey="IISCustomActionDll" DllEntry="ExecuteMakeShortcutElevatedCA" Execute="deferred" Return="check" Impersonate="no" />
-    
-    <CustomTable Id="IISElevatedShortcut">
-      <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
-      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="Identifier" Width="72"/>
-    </CustomTable>
-    
-    <InstallExecuteSequence>
-      <Custom Action='ScheduleMakeShortcutElevated' After='CreateShortcuts'>NOT SKIPMAKESHORTCUTELEVATED</Custom>
-    </InstallExecuteSequence>
-  </Fragment>
-</Include>  
-
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi
deleted file mode 100644
index 68db6852d11a..000000000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.
--->
-
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-<!-- This is the old fragment:
-
-  <Fragment Id="Fragment.IIS.OOB.Common.HttpListener">
-
-To add this to your wxs file, add:
-
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
-
--->
-
-
-    <!-- Immediate custom actions which will package and schedule deferred actions for httpsys -->
-    <CustomAction Id="ScheduleInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ScheduleInstallHttpListenerCA" Execute="immediate" Return="check" />
-    <CustomAction Id="ScheduleUnInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ScheduleUnInstallHttpListenerCA" Execute="immediate" Return="check"  />
-    
-    <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ExecuteInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" />
-    <CustomAction Id="ExecuteUnInstallHttpListener" BinaryKey="IISCustomActionDll" DllEntry="ExecuteUnInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" />
-    
-    <!-- Setup Custom Action Parameters -->
-    
-    <!-- Define a table to hold registration parameters -->
-    <CustomTable Id='IISHttpListener'>
-      <Column Id='Name' Type='string' PrimaryKey='yes' />
-      <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-      <Column Id='Account' Type='string' />
-      <Column Id='Prefix' Type='string' />
-    </CustomTable>
-    
-    <InstallExecuteSequence>
-      <Custom Action='ScheduleInstallHttpListener' After='InstallFiles'>NOT SKIPINSTALLHTTPLISTENER</Custom>
-      <Custom Action='ScheduleUnInstallHttpListener' Before='RemoveFiles'>NOT SKIPUNINSTALLHTTPLISTENER</Custom>
-    </InstallExecuteSequence>
-</Include>  
-
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi
deleted file mode 100644
index 78b26d6404c7..000000000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.
--->
-
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-<!-- This is the old fragment:
-
-  <Fragment Id="Fragment.IIS.OOB.Common.WindowsHotfix">
-
-To add this to your wxs file, add:
-
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
-
--->
-
-    <CustomAction Id="ScheduleInstallWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ScheduleInstallWindowsHotfixCA" Execute="immediate" Return="check" />
-    <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteInstallWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteInstallWindowsHotfixCA" Execute="deferred" Return="check" Impersonate="no" />
-    <CustomAction Id="RollbackCleanUpWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="rollback" Return="check" Impersonate="no" />
-    <CustomAction Id="CommitCleanUpWindowsHotfix" BinaryKey="IISCustomActionDll" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="commit" Return="check" Impersonate="no" />
-    
-    <CustomAction Id="ScheduleRebootIfRequired" BinaryKey="IISCustomActionDll" DllEntry="ScheduleRebootIfRequiredCA" Execute="immediate" Return="check" />
-    
-    <CustomTable Id="IISWindowsHotfix">
-      <Column Id="Name" Type="string" PrimaryKey="yes"/>
-      <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="Identifier" Width="72"/>
-      <Column Id="OSMajorVersion" Type="int" Width="4" Nullable="yes"/>
-      <Column Id="OSMinorVersion" Type="int" Width="4" Nullable="yes"/>
-      <Column Id="SPMajorVersion" Type="int" Width="2" Nullable="yes"/>
-      <Column Id="Condition" Type="string" Category="Condition" Nullable="yes"/>
-    </CustomTable>
-    
-    <InstallExecuteSequence>
-      <Custom Action="ScheduleInstallWindowsHotfix" Before="RemoveFiles">NOT SKIPINSTALLWINDOWSHOTFIX</Custom>
-      <Custom Action="ScheduleRebootIfRequired" After="InstallFinalize">NOT SKIPREBOOTIFREQUIRED</Custom>
-    </InstallExecuteSequence>
-</Include>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs
deleted file mode 100644
index 68324e148430..000000000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.
--->
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-    <Fragment Id="Fragment.IIS.OOB.Common.IISCA">
-        <!-- Immediate custom actions which will package and schedule deferred actions for module installation -->
-        <CustomAction Id="IISScheduleInstallCA" BinaryKey="IISCustomActionDll" DllEntry="IISScheduleInstallCA" Execute="immediate" Return="check" />
-        <CustomAction Id="IISScheduleUninstallCA" BinaryKey="IISCustomActionDll" DllEntry="IISScheduleUninstallCA" Execute="immediate" Return="check" />
-
-        <!-- Deferred custom actions scheduled by the immediate actions above -->
-        <CustomAction Id="IISExecuteCA" BinaryKey="IISCustomActionDll" DllEntry="IISExecuteCA" Execute="deferred" Return="check" Impersonate="no" />
-        <CustomAction Id="IISBeginTransactionCA" BinaryKey="IISCustomActionDll" DllEntry="IISBeginTransactionCA" Execute="deferred" Return="check" Impersonate="no" />
-        <CustomAction Id="IISRollbackTransactionCA" BinaryKey="IISCustomActionDll" DllEntry="IISRollbackTransactionCA" Execute="rollback" Return="check" Impersonate="no" />
-        <CustomAction Id="IISCommitTransactionCA" BinaryKey="IISCustomActionDll" DllEntry="IISCommitTransactionCA" Execute="commit" Return="check" Impersonate="no" />
-
-        <InstallExecuteSequence>
-            <Custom Action='IISScheduleInstallCA' After='InstallFiles'>NOT SKIPINSTALLCA</Custom>
-            <Custom Action='IISScheduleUninstallCA' Before='RemoveFiles'>(NOT SKIPUNINSTALLCA)  AND (IISCOREWEBENGINEINSTALLED = "#1") AND (IISW3SVCINSTALLED = "#1")</Custom>
-        </InstallExecuteSequence>
-
-        <!-- Define a table to hold Handler registration parameters -->
-        <CustomTable Id='IISGlobalHandler'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='Path' Type='string' Nullable='no' />
-            <Column Id='Verb' Type='string' Nullable='no' />
-            <Column Id='Type' Type='string' Nullable='yes' />
-            <Column Id='Index' Type='string' Nullable='yes' />
-            <!--  Index = one of { FIRST | LAST | BEFORE_STATICFILE } -->
-            <Column Id='Modules' Type='string' Nullable='yes' />
-            <Column Id='ScriptProcessor' Type='string' Nullable='yes' />
-            <Column Id='ResourceType' Type='string' Nullable='yes' />
-            <Column Id='RequiredAccess' Type='string' Nullable='yes' />
-            <Column Id='PreCondition' Type='string' Nullable='yes' />
-        </CustomTable>
-        <!-- Define a table to hold Module registration parameters -->
-        <CustomTable Id='IISGlobalModule'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='File_' Type='string' KeyTable='File' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='PreCondition' Type='string' Nullable='yes' />
-            <Column Id='TypeName' Type='string' Nullable='yes' />
-        </CustomTable>
-        <!-- Define a table to hold Trace Area and MOF registration parameters -->
-        <CustomTable Id='IISTraceArea'>
-            <Column Id='ProviderName' Type='string' PrimaryKey='yes' />
-            <Column Id='ProviderGuid' Type='string' Nullable='yes' />
-            <Column Id='AreaName' Type='string' />
-            <Column Id='AreaValue' Type='string' Nullable='yes' />
-            <Column Id='BinaryName_' Type='string' KeyTable='Binary' KeyColumn='1' Category='Identifier' Nullable='yes' Width='72'/>
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-        </CustomTable>
-        <!-- Define a table to hold Section Schema registration parameters -->
-        <CustomTable Id='IISConfigSections'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='File_' Type='string' KeyTable='File' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='OverrideModeDefault' Type='string' />
-            <Column Id='AllowDefinition' Type='string' Nullable='yes' />
-            <Column Id='Type' Type='string' Nullable='yes' />
-            <Column Id='InAdminConfig' Type='string' Nullable='yes' Set='yes;no' />
-        </CustomTable>
-        <!-- Define a table to hold Section Defaults registration parameters -->
-        <CustomTable Id='IISConfigSectionDefaults'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='SectionName' Type='string' Nullable='no' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='BinaryName_' Type='string' KeyTable='Binary' KeyColumn='1' Category='Identifier' Width='72'/>
-        </CustomTable>
-        <!-- Define a table to hold Section additions registration parameters -->
-        <CustomTable Id='IISConfigSectionAdditions'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='SectionName' Type='string' Nullable='no' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='BinaryName_' Type='string' KeyTable='Binary' KeyColumn='1' Category='Identifier' Width='72'/>
-        </CustomTable>
-        <!-- Define a table to hold UI Module registration parameters -->
-        <CustomTable Id='IISUIModule'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='AssemblyInfoComponent_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72' Nullable='yes'/>
-            <Column Id='TypeName' Type='string' />
-            <Column Id='RegisterInModulesSection' Type='string' Nullable='yes' />
-            <Column Id='PrependToList' Type='string' Nullable='yes' />
-        </CustomTable>
-        <!-- Define a table to hold CGI Restriction registration parameters -->
-        <CustomTable Id='IISCgiRestriction'>
-            <Column Id='Name' Type='string' PrimaryKey='yes' />
-            <Column Id='Component_' Type='string' KeyTable='Component' KeyColumn='1' Category='Identifier' Width='72'/>
-            <Column Id='Path' Type='string' Nullable='no'/>
-            <Column Id='Allowed' Type='string' Nullable='no' />
-            <Column Id='GroupId' Type='string' Nullable='no' />
-            <Column Id='Description' Type='string' Nullable='no' />
-        </CustomTable>
-
-    </Fragment>
-</Wix>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi
new file mode 100644
index 000000000000..199f602e1988
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi
@@ -0,0 +1,23 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment Id="Fragment.IIS.OOB.Common.ElevatedShortcut">
+    <CustomAction Id="ScheduleMakeShortcutElevated" DllEntry="ScheduleMakeShortcutElevatedCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+    
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteMakeShortcutElevated" DllEntry="ExecuteMakeShortcutElevatedCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    
+    <CustomTable Id="IISElevatedShortcut">
+      <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
+      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Width="72" />
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action="ScheduleMakeShortcutElevated" After="CreateShortcuts" Condition="NOT SKIPMAKESHORTCUTELEVATED" />
+    </InstallExecuteSequence>
+  </Fragment>
+</Include>  
+
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi
similarity index 68%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi
rename to src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi
index ae6e3b76d55e..8f2f608b1356 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi
@@ -1,11 +1,9 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
+<!--
     Copyright (c) Microsoft Corporation. All rights reserved.
     Licensed under the MIT license.
 -->
 
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
 <!-- This is the old fragment:
 
@@ -13,7 +11,7 @@
 
 To add this to your wxs file, add:
 
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
 
 -->
 
@@ -23,14 +21,14 @@ To add this to your wxs file, add:
           we decided that it is confusing to see a remove button when the intention was to patch the product.
       -->
   
-    <CustomAction Id="CustomAction_ChangeInstallMode" Property="WixUI_InstallMode" Value="Repair"/>
-    <CustomAction Id="CustomAction_ChangeNextOnPatch" Property="WixUI_MaintenanceWelcomeDlg_Next" Value="VerifyReadyDlg"/>
-    <CustomAction Id="CustomAction_ChangeBackOnPatch" Property="WixUI_VerifyReadyDlg_BackRepair" Value="MaintenanceWelcomeDlg"/>
+    <CustomAction Id="CustomAction_ChangeInstallMode" Property="WixUI_InstallMode" Value="Repair" />
+    <CustomAction Id="CustomAction_ChangeNextOnPatch" Property="WixUI_MaintenanceWelcomeDlg_Next" Value="VerifyReadyDlg" />
+    <CustomAction Id="CustomAction_ChangeBackOnPatch" Property="WixUI_VerifyReadyDlg_BackRepair" Value="MaintenanceWelcomeDlg" />
     
     <InstallUISequence>
-      <Custom Action="CustomAction_ChangeInstallMode" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
-      <Custom Action="CustomAction_ChangeNextOnPatch" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
-      <Custom Action="CustomAction_ChangeBackOnPatch" Before="MaintenanceWelcomeDlg">Installed And PATCH</Custom>
+      <Custom Action="CustomAction_ChangeInstallMode" Before="MaintenanceWelcomeDlg" Condition="Installed And PATCH" />
+      <Custom Action="CustomAction_ChangeNextOnPatch" Before="MaintenanceWelcomeDlg" Condition="Installed And PATCH" />
+      <Custom Action="CustomAction_ChangeBackOnPatch" Before="MaintenanceWelcomeDlg" Condition="Installed And PATCH" />
     </InstallUISequence>
 
 </Include>  
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi
new file mode 100644
index 000000000000..75842735605e
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi
@@ -0,0 +1,42 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+<!-- This is the old fragment:
+
+  <Fragment Id="Fragment.IIS.OOB.Common.HttpListener">
+
+To add this to your wxs file, add:
+
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
+
+-->
+
+
+    <!-- Immediate custom actions which will package and schedule deferred actions for httpsys -->
+    <CustomAction Id="ScheduleInstallHttpListener" DllEntry="ScheduleInstallHttpListenerCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="ScheduleUnInstallHttpListener" DllEntry="ScheduleUnInstallHttpListenerCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+    
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteInstallHttpListener" DllEntry="ExecuteInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="ExecuteUnInstallHttpListener" DllEntry="ExecuteUnInstallHttpListenerCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    
+    <!-- Setup Custom Action Parameters -->
+    
+    <!-- Define a table to hold registration parameters -->
+    <CustomTable Id="IISHttpListener">
+      <Column Id="Name" Type="string" PrimaryKey="yes" />
+      <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Width="72" />
+      <Column Id="Account" Type="string" />
+      <Column Id="Prefix" Type="string" />
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action="ScheduleInstallHttpListener" After="InstallFiles" Condition="NOT SKIPINSTALLHTTPLISTENER" />
+      <Custom Action="ScheduleUnInstallHttpListener" Before="RemoveFiles" Condition="NOT SKIPUNINSTALLHTTPLISTENER" />
+    </InstallExecuteSequence>
+</Include>  
+
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi
similarity index 58%
rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi
rename to src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi
index 236e0f51ef96..47b37015336e 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi
@@ -1,11 +1,9 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!--
+<!--
     Copyright (c) Microsoft Corporation. All rights reserved.
     Licensed under the MIT license.
 -->
 
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
 <!-- This is the old fragment:
 
@@ -13,29 +11,29 @@
 
 To add this to your wxs file, add:
 
-    <?include $(var.PROJECT_ROOT)\setup\iisca\wix3\filename.wxi ?>
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
 
 -->
 
-    <CustomAction Id="ScheduleSetConsoleProperties" BinaryKey="IISCustomActionDll" DllEntry="ScheduleSetConsolePropertiesCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ScheduleSetConsoleProperties" DllEntry="ScheduleSetConsolePropertiesCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
     
     <!-- Deferred custom actions scheduled by the immediate actions above -->
-    <CustomAction Id="ExecuteSetConsoleProperties" BinaryKey="IISCustomActionDll" DllEntry="ExecuteSetConsolePropertiesCA" Execute="deferred" Return="check" Impersonate="no" />
+    <CustomAction Id="ExecuteSetConsoleProperties" DllEntry="ExecuteSetConsolePropertiesCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
     
     <CustomTable Id="IISShortcutConsoleProperties">
       <!--<Column Id='Name' Type='string' PrimaryKey='yes' />-->
-      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="Identifier" Width="72"/>
+      <Column Id="Shortcut_" Type="string" PrimaryKey="yes" KeyTable="Shortcut" KeyColumn="1" Category="identifier" Width="72" />
       <Column Id="QuickEdit" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
-      <Column Id="InsertMode" Type="int" Width="2"  MinValue="0" MaxValue="1" Nullable="no"/>
-      <Column Id="WindowWidth" Type="int" Width="2" Nullable="no"/>
-      <Column Id="WindowHeight" Type="int" Width="2" Nullable="no"/>
-      <Column Id="BufferWidth" Type="int" Width="2" Nullable="no"/>
-      <Column Id="BufferHeight" Type="int" Width="2" Nullable="no"/>
+      <Column Id="InsertMode" Type="int" Width="2" MinValue="0" MaxValue="1" Nullable="no" />
+      <Column Id="WindowWidth" Type="int" Width="2" Nullable="no" />
+      <Column Id="WindowHeight" Type="int" Width="2" Nullable="no" />
+      <Column Id="BufferWidth" Type="int" Width="2" Nullable="no" />
+      <Column Id="BufferHeight" Type="int" Width="2" Nullable="no" />
       <!--<Column Id="TextColor" Type="string"  Width="11" Nullable="yes"/>
       <Column Id="BackgroundColor" Type="string" Width="11" Nullable="yes" Category="Formatted"/>-->
     </CustomTable>
     
     <InstallExecuteSequence>
-      <Custom Action='ScheduleSetConsoleProperties' After='CreateShortcuts'>NOT SKIPSETCONSOLEPROPERTIES</Custom>
+      <Custom Action="ScheduleSetConsoleProperties" After="CreateShortcuts" Condition="NOT SKIPSETCONSOLEPROPERTIES" />
     </InstallExecuteSequence>
 </Include>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi
new file mode 100644
index 000000000000..bb6e0973bba7
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi
@@ -0,0 +1,39 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+<!-- This is the old fragment:
+
+  <Fragment Id="Fragment.IIS.OOB.Common.WindowsHotfix">
+
+To add this to your wxs file, add:
+
+    <?include $(PROJECT_ROOT)\setup\iisca\wix5\filename.wxi ?>
+
+-->
+
+    <CustomAction Id="ScheduleInstallWindowsHotfix" DllEntry="ScheduleInstallWindowsHotfixCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+    <!-- Deferred custom actions scheduled by the immediate actions above -->
+    <CustomAction Id="ExecuteInstallWindowsHotfix" DllEntry="ExecuteInstallWindowsHotfixCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="RollbackCleanUpWindowsHotfix" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="rollback" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    <CustomAction Id="CommitCleanUpWindowsHotfix" DllEntry="ExecuteCleanUpWindowsHotfixCA" Execute="commit" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+    
+    <CustomAction Id="ScheduleRebootIfRequired" DllEntry="ScheduleRebootIfRequiredCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+    
+    <CustomTable Id="IISWindowsHotfix">
+      <Column Id="Name" Type="string" PrimaryKey="yes" />
+      <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Width="72" />
+      <Column Id="OSMajorVersion" Type="int" Width="4" Nullable="yes" />
+      <Column Id="OSMinorVersion" Type="int" Width="4" Nullable="yes" />
+      <Column Id="SPMajorVersion" Type="int" Width="2" Nullable="yes" />
+      <Column Id="Condition" Type="string" Category="condition" Nullable="yes" />
+    </CustomTable>
+    
+    <InstallExecuteSequence>
+      <Custom Action="ScheduleInstallWindowsHotfix" Before="RemoveFiles" Condition="NOT SKIPINSTALLWINDOWSHOTFIX" />
+      <Custom Action="ScheduleRebootIfRequired" After="InstallFinalize" Condition="NOT SKIPREBOOTIFREQUIRED" />
+    </InstallExecuteSequence>
+</Include>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs
new file mode 100644
index 000000000000..557b3cd44c2a
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs
@@ -0,0 +1,97 @@
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the MIT license.
+-->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment Id="Fragment.IIS.OOB.Common.IISCA">
+        <!-- Immediate custom actions which will package and schedule deferred actions for module installation -->
+        <CustomAction Id="IISScheduleInstallCA" DllEntry="IISScheduleInstallCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISScheduleUninstallCA" DllEntry="IISScheduleUninstallCA" Execute="immediate" Return="check" BinaryRef="IISCustomActionDll" />
+
+        <!-- Deferred custom actions scheduled by the immediate actions above -->
+        <CustomAction Id="IISExecuteCA" DllEntry="IISExecuteCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISBeginTransactionCA" DllEntry="IISBeginTransactionCA" Execute="deferred" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISRollbackTransactionCA" DllEntry="IISRollbackTransactionCA" Execute="rollback" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+        <CustomAction Id="IISCommitTransactionCA" DllEntry="IISCommitTransactionCA" Execute="commit" Return="check" Impersonate="no" BinaryRef="IISCustomActionDll" />
+
+        <InstallExecuteSequence>
+            <Custom Action="IISScheduleInstallCA" After="InstallFiles" Condition="NOT SKIPINSTALLCA" />
+            <Custom Action="IISScheduleUninstallCA" Before="RemoveFiles" Condition="(NOT SKIPUNINSTALLCA) AND (IISCOREWEBENGINEINSTALLED = &quot;#1&quot;) AND (IISW3SVCINSTALLED = &quot;#1&quot;)" />
+        </InstallExecuteSequence>
+
+        <!-- Define a table to hold Handler registration parameters -->
+        <CustomTable Id="IISGlobalHandler">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="Path" Type="string" Nullable="no" />
+            <Column Id="Verb" Type="string" Nullable="no" />
+            <Column Id="Type" Type="string" Nullable="yes" />
+            <Column Id="Index" Type="string" Nullable="yes" />
+            <!--  Index = one of { FIRST | LAST | BEFORE_STATICFILE } -->
+            <Column Id="Modules" Type="string" Nullable="yes" />
+            <Column Id="ScriptProcessor" Type="string" Nullable="yes" />
+            <Column Id="ResourceType" Type="string" Nullable="yes" />
+            <Column Id="RequiredAccess" Type="string" Nullable="yes" />
+            <Column Id="PreCondition" Type="string" Nullable="yes" />
+        </CustomTable>
+        <!-- Define a table to hold Module registration parameters -->
+        <CustomTable Id="IISGlobalModule">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="PreCondition" Type="string" Nullable="yes" />
+            <Column Id="TypeName" Type="string" Nullable="yes" />
+        </CustomTable>
+        <!-- Define a table to hold Trace Area and MOF registration parameters -->
+        <CustomTable Id="IISTraceArea">
+            <Column Id="ProviderName" Type="string" PrimaryKey="yes" />
+            <Column Id="ProviderGuid" Type="string" Nullable="yes" />
+            <Column Id="AreaName" Type="string" />
+            <Column Id="AreaValue" Type="string" Nullable="yes" />
+            <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Nullable="yes" Width="72" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+        </CustomTable>
+        <!-- Define a table to hold Section Schema registration parameters -->
+        <CustomTable Id="IISConfigSections">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="File_" Type="string" KeyTable="File" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="OverrideModeDefault" Type="string" />
+            <Column Id="AllowDefinition" Type="string" Nullable="yes" />
+            <Column Id="Type" Type="string" Nullable="yes" />
+            <Column Id="InAdminConfig" Type="string" Nullable="yes" Set="yes;no" />
+        </CustomTable>
+        <!-- Define a table to hold Section Defaults registration parameters -->
+        <CustomTable Id="IISConfigSectionDefaults">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="SectionName" Type="string" Nullable="no" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+        </CustomTable>
+        <!-- Define a table to hold Section additions registration parameters -->
+        <CustomTable Id="IISConfigSectionAdditions">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="SectionName" Type="string" Nullable="no" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="BinaryName_" Type="string" KeyTable="Binary" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+        </CustomTable>
+        <!-- Define a table to hold UI Module registration parameters -->
+        <CustomTable Id="IISUIModule">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="AssemblyInfoComponent_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" Nullable="yes" />
+            <Column Id="TypeName" Type="string" />
+            <Column Id="RegisterInModulesSection" Type="string" Nullable="yes" />
+            <Column Id="PrependToList" Type="string" Nullable="yes" />
+        </CustomTable>
+        <!-- Define a table to hold CGI Restriction registration parameters -->
+        <CustomTable Id="IISCgiRestriction">
+            <Column Id="Name" Type="string" PrimaryKey="yes" />
+            <Column Id="Component_" Type="string" KeyTable="Component" KeyColumn="1" Category="identifier" Modularize="column" Width="72" />
+            <Column Id="Path" Type="string" Nullable="no" />
+            <Column Id="Allowed" Type="string" Nullable="no" />
+            <Column Id="GroupId" Type="string" Nullable="no" />
+            <Column Id="Description" Type="string" Nullable="no" />
+        </CustomTable>
+
+    </Fragment>
+</Wix>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi
index 449acd06a346..dd27aeffe026 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?define DiscoverabilityKeyRoot = "SOFTWARE\Microsoft\IIS Extensions"?>
 
   <!-- NativeMachine values match the expected values for image file machine constants
@@ -9,8 +7,8 @@
   <?define NativeMachine_x64=34404?>
   <?define NativeMachine_arm64=43620?>
 
-  <?if $(var.Platform) = "x64"?>
-    <?define IsWin64 = yes ?>
+  <?if $(InstallerPlatform)=x64?>
+    <?define Bitness = always64 ?>
     <?define PlatformArchitecture = x64 ?>
     <?define ProgramFilesFolder = ProgramFiles64Folder ?>
     <?define ProgramFilesFolder32 = ProgramFilesFolder ?>
@@ -18,15 +16,15 @@
     <?define SysWow64Folder = SystemFolder ?>
     <?define PlatformValue = x64 ?>
     <?define ANCMInstallerVersion = 400 ?>
-  <?elseif $(var.Platform) = "x86" ?>
-    <?define IsWin64 = no ?>
+  <?elseif $(InstallerPlatform)=x86?>
+    <?define Bitness = always32 ?>
     <?define PlatformArchitecture = x86 ?>
     <?define ProgramFilesFolder = ProgramFilesFolder ?>
     <?define SystemFolder = SystemFolder ?>
     <?define PlatformValue = Intel ?>
     <?define ANCMInstallerVersion = 400 ?>
-  <?elseif $(var.Platform) ~= "arm64" ?>
-    <?define IsWin64 = yes ?>
+  <?elseif $(InstallerPlatform)~=arm64?>
+    <?define Bitness = always64 ?>
     <?define PlatformArchitecture = ARM64 ?>
     <?define ProgramFilesFolder = ProgramFiles64Folder ?>
     <?define ProgramFilesFolder32 = ProgramFilesFolder ?>
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1028/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1028/setupstrings.wxl
new file mode 100644
index 000000000000..183291136e45
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1028/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge 模組"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge 模組 V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="HTTP Bridge for IIS 執行階段"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="將 HTTP 應用程式的支援新增至 IIS。"/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="適用於 IIS Express 的 LeXtudio HTTP Bridge 模組"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="適用於 IIS Express 的 LeXtudio HTTP Bridge 模組 V2"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="未安裝 IIS Express 8.0 或更新版本。"/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="此電腦上有不相容的產品 [CONFLICTING_PRODUCT_NAME]。無法繼續安裝 [ProductName]。若要安裝此產品，請使用控制面板 上的新增/移除程式來移除 [CONFLICTING_PRODUCT_NAME]。"/>
+  <String Id="AdminRequired" Overridable="yes" Value="需要系統管理員權限才能安裝 [ProductName]。"/>
+  <String Id="IIS7Only" Overridable="yes" Value="需要 IIS 版本 7.0 才能使用 [ProductName]。"/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="需要 IIS 版本 7.0 或更新版本才能安裝 [ProductName]。"/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="需要 IIS 版本 7.5 或更新版本才能安裝 [ProductName]。"/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="需要 IIS 版本 7 或 7.5 才能安裝 [ProductName]。"/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="需要 IIS 版本 8.0 或更新版本才能安裝 [ProductName]。"/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="在此電腦上發現 [ProductName] 的技術預覽版。"/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="在此電腦上發現較新版本的 [ProductName]。"/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="安裝程式無法繼續，因為此電腦已安裝另一個 [ProductName] 執行個體。請先解除安裝，然後再重新啟動此安裝。"/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="必須安裝 IIS 7.0 CoreWebEngine 和 W3SVC 功能，以使用 [ProductName]。"/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="必須安裝 IIS 管理控制台，以使用 [ProductName]。"/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="安裝 [ProductName] 之前，請先停止 Windows 處理序啟用服務 (WAS) 和 Web Management Service (WMSvc)。[ProductName] 安裝完成後，請重新啟動這些服務。"/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="需要 IIS Metabase 才能安裝 [ProductName]。"/>
+  <String Id="LaunchCondition_32BIT" Value="64 位元版本的 [ProductName] 無法安裝在 32 位元版本的 Microsoft Windows 上。"/>
+  <String Id="LaunchCondition_64BIT" Value="32 位元版本的 [ProductName] 無法安裝在 64 位元版本的 Microsoft Windows 上。"/>
+  <String Id="NetFX2OrGreaterRequired" Value="需要 Microsoft .NET Framework 版本 2.0 或更新版本才能安裝 [ProductName]。"/>
+  <String Id="NetFX35OrGreaterRequired" Value="需要 Microsoft .NET Framework 版本 3.5 或更新版本才能安裝 [ProductName]。請使用伺服器管理員中的新增功能來安裝 Microsoft .NET 版本 3.5。"/>
+  <String Id="NetFX4OrGreaterRequired" Value="需要 Microsoft .NET Framework 版本 4.0 或更新版本才能安裝 [ProductName]。"/>
+  <String Id="NetFX20SP1IsRequired" Value="在安裝 [ProductName] 之前，請先安裝 Microsoft .NET Framework 版本 2.0 Service Pack 1 (或更新的 Service Pack)。"/>
+  <String Id="WindowsUpdateEnabled" Value="Windows Update (wuauserv) 服務無法停用，此服務是安裝 [ProductName] 的必要條件。"/>
+  <String Id="GetFromOSforWin7" Value="PowerShell 嵌入式管理單元是 Windows 作業系統的一部分。請透過「程式和功能」或「伺服器管理員」安裝。"/>
+  <String Id="WebPI3OrGreaterRequired" Value="安裝 [ProductName] 需要 Microsoft Web Platform Installer 版本 3.0 或更新版本。"/>
+
+  <String Id="Error30001" Overridable="yes" Value="安裝程式無法偵測共用設定。"/>
+  <String Id="Error30002" Overridable="yes" Value="IIS 已啟用共用設定。使用共用設定時不支援安裝 [ProductName]。安裝此功能之前，請先停用共用設定。"/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="安裝 [ProductName] 之前，請先停止 World Wide Web Publishing 服務 (W3SVC)。安裝完成後，請重新啟動該服務。"/>
+  <String Id="IISPowershellConsole" Value="IIS PowerShell 管理主控台"/>
+  <String Id="IISPowershellSnapin" Value="IIS PowerShell 嵌入式管理單元"/>
+  <String Id="PowerShellRequired" Value="IIS PowerShell 嵌入式管理單元需要安裝 PowerShell v1.0 或 v2.0"/>
+  <String Id="WasAndConfigRequired" Value="IIS PowerShell 嵌入式管理單元需要安裝 WAS 和設定"/>
+  <String Id="TestBogusString" Overridable="yes" Value="這是一個虛假的字串。"/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1029/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1029/setupstrings.wxl
new file mode 100644
index 000000000000..91bbb9ffedcc
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1029/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="Modul LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="Modul LeXtudio HTTP Bridge V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="HTTP Bridge for IIS Runtime"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Přidá do služby IIS podporu aplikace HTTP Bridge."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="Modul LeXtudio HTTP Bridge pro IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="Modul LeXtudio HTTP Bridge V2 pro IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="Není nainstalovaná služba IIS Express 8.0 nebo novější."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Na tomto počítači je nekompatibilní produkt [CONFLICTING_PRODUCT_NAME]. Instalace produktu [ProductName] nemůže pokračovat. Chcete-li tento produkt nainstalovat, odeberte [CONFLICTING_PRODUCT_NAME] pomocí možnosti Přidat/Odebrat programy v Ovládacích panelech."/>
+  <String Id="AdminRequired" Overridable="yes" Value="Instalace produktu [ProductName] vyžaduje oprávnění správce."/>
+  <String Id="IIS7Only" Overridable="yes" Value="K použití produktu [ProductName] je vyžadována služba IIS verze 7.0."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="K instalaci [ProductName] je vyžadována služba IIS verze 7.0 nebo novější."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="K instalaci [ProductName] je vyžadována služba IIS verze 7.5 nebo novější."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="K instalaci [ProductName] je vyžadována služba IIS verze 7 nebo 7.5."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="K instalaci [ProductName] je vyžadována služba IIS verze 8.0 nebo novější."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="Na tomto počítači byla nalezena beta verze produktu [ProductName]."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Na tomto počítači byla nalezena novější verze produktu [ProductName]."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Instalace nemůže pokračovat, protože je na tomto počítači již nainstalována jiná instance produktu [ProductName]. Nejprve ji odinstalujte a pak tuto instalaci spusťte znovu."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Pro používání produktu [ProductName] musí být nainstalované funkce IIS 7.0 CoreWebEngine a W3SVC."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="Aby bylo možné používat produkt [ProductName], musí být nainstalovaná konzola pro správu služby IIS."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Před instalací produktu [ProductName] zastavte jak Aktivační službu procesů systému Windows (WAS), tak Službu webové správy služby IIS (WMSvc). Po instalaci produktu [ProductName] budete muset služby spustit."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="Instalace produktu [ProductName] vyžaduje metabázi služby IIS."/>
+  <String Id="LaunchCondition_32BIT" Value="64bitovou verzi produktu [ProductName] nelze nainstalovat v 32bitové edici systému Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="32bitovou verzi produktu [ProductName] nelze nainstalovat v 64bitové edici systému Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="Instalace produktu [ProductName] vyžaduje Microsoft .NET Framework verze 2.0 nebo vyšší."/>
+  <String Id="NetFX35OrGreaterRequired" Value="Instalace produktu [ProductName] vyžaduje Microsoft .NET Framework verze 3.5 nebo vyšší. Pro instalaci Microsoft .NET verze 3.5 použijte možnost Přidat funkce ve Správci serveru."/>
+  <String Id="NetFX4OrGreaterRequired" Value="Instalace produktu [ProductName] vyžaduje Microsoft .NET Framework verze 4.0 nebo vyšší."/>
+  <String Id="NetFX20SP1IsRequired" Value="Před instalací produktu [ProductName] nainstalujte Microsoft .NET Framework verze 2.0 Service Pack 1 (nebo novější aktualizaci Service Pack)."/>
+  <String Id="WindowsUpdateEnabled" Value="Službu Windows Update (wuauserv) nelze zakázat, je vyžadována k instalaci produktu [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="Modul snap-in pro PowerShell je součástí operačního systému Windows. Nainstalujte ho prosím přes Programy a funkce nebo Správce serveru."/>
+  <String Id="WebPI3OrGreaterRequired" Value="K instalaci produktu [ProductName] se vyžaduje Instalace webové platformy Microsoft verze 3.0 nebo vyšší."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Instalační program nezjistil sdílenou konfiguraci."/>
+  <String Id="Error30002" Overridable="yes" Value="Sdílená konfigurace je pro službu IIS povolená. Instalace produktu [ProductName] není při použití sdílené konfigurace podporována. Před instalací této funkce prosím sdílenou konfiguraci zakažte."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Před instalací produktu [ProductName] zastavte Službu publikování na webu (W3SVC). Po instalaci budete muset službu spustit."/>
+  <String Id="IISPowershellConsole" Value="Konzola pro správu prostředí PowerShell služby IIS"/>
+  <String Id="IISPowershellSnapin" Value="Modul snap-in pro PowerShell služby IIS"/>
+  <String Id="PowerShellRequired" Value="Modul snap-in pro PowerShell služby IIS vyžaduje nainstalované Prostředí PowerShell verze 1.0 nebo 2.0."/>
+  <String Id="WasAndConfigRequired" Value="Modul snap-in pro PowerShell služby IIS vyžaduje službu WAS a nainstalovanou konfiguraci."/>
+  <String Id="TestBogusString" Overridable="yes" Value="Toto je falešný řetězec."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl
new file mode 100644
index 000000000000..8a5f1311cac5
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge-Modul"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge-Modul V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="HTTP Bridge für IIS-Runtime"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Fügt IIS die Unterstützung der HTTP-Anwendung hinzu."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="LeXtudio HTTP Bridge-Modul für IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="LeXtudio HTTP Bridge-Modul V2 für IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 oder höher ist nicht installiert."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Auf diesem Computer befindet sich das inkompatible Produkt [CONFLICTING_PRODUCT_NAME]. Die Installation von [ProductName] kann nicht fortgesetzt werden. Um dieses Produkt zu installieren, entfernen Sie [CONFLICTING_PRODUCT_NAME] in der Systemsteuerung über &quot;Programme hinzufügen oder entfernen&quot;."/>
+  <String Id="AdminRequired" Overridable="yes" Value="Zum Installieren von [ProductName] sind Administratorrechte erforderlich."/>
+  <String Id="IIS7Only" Overridable="yes" Value="Für die Verwendung von [ProductName] ist IIS Version 7.0 erforderlich."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="IIS Version 7.0 oder höher ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="IIS Version 7.5 oder höher ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="IIS Version 7 oder 7.5 ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="IIS Version 8.0 oder höher ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="Die Betaversion von [ProductName] wurde auf diesem Computer gefunden."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Auf diesem Computer wurde eine neuere Version von [ProductName] gefunden."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Setup kann nicht fortgesetzt werden, da bereits eine andere Instanz von [ProductName] auf diesem Computer installiert ist. Deinstallieren Sie sie zuerst, und starten Sie diese Installation dann erneut."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Die Features IIS 7.0 CoreWebEngine und W3SVC müssen installiert sein, um [ProductName] verwenden zu können."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="Die IIS-Verwaltungskonsole muss installiert sein, um [ProductName] verwenden zu können."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Beenden Sie vor der Installation von [ProductName] sowohl den Windows-Prozessaktivierungsdienst (WAS) als auch den Webverwaltungsdienst (WMSvc). Sie müssen die Dienste nach der Installation von [ProductName] starten."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="Die IIS-Metabasis ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="LaunchCondition_32BIT" Value="Die 64-Bit-Version von [ProductName] kann nicht unter einer 32-Bit-Edition von Microsoft Windows installiert werden."/>
+  <String Id="LaunchCondition_64BIT" Value="Die 32-Bit-Version von [ProductName] kann nicht unter einer 64-Bit-Edition von Microsoft Windows installiert werden."/>
+  <String Id="NetFX2OrGreaterRequired" Value="Microsoft .NET Framework Version 2.0 oder höher ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="NetFX35OrGreaterRequired" Value="Microsoft .NET Framework Version 3.5 oder höher ist erforderlich, um [ProductName] zu installieren. Verwenden Sie „Features hinzufügen“ unter Server-Manager, um Microsoft .NET Version 3.5 zu installieren."/>
+  <String Id="NetFX4OrGreaterRequired" Value="Microsoft .NET Framework Version 4.0 oder höher ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="NetFX20SP1IsRequired" Value="Installieren Sie Microsoft .NET Framework Version 2.0 Service Pack 1 (oder ein höheres Service Pack), bevor Sie [ProductName] installieren."/>
+  <String Id="WindowsUpdateEnabled" Value="Der Windows Update (wuauserv)-Dienst kann nicht deaktiviert werden, er ist erforderlich, um [ProductName] zu installieren."/>
+  <String Id="GetFromOSforWin7" Value="Das PowerShell-Snap-In ist Teil des Windows-Betriebssystems. Installieren Sie es über „Programme und Features“ oder „Server-Manager“."/>
+  <String Id="WebPI3OrGreaterRequired" Value="Microsoft-Webplattform-Installer Version 3.0 oder höher ist erforderlich, um [ProductName] zu installieren."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Setup konnte die freigegebene Konfiguration nicht erkennen."/>
+  <String Id="Error30002" Overridable="yes" Value="Die freigegebene Konfiguration ist für IIS aktiviert. Die Installation von [ProductName] wird bei Verwendung der freigegebenen Konfiguration nicht unterstützt. Deaktivieren Sie die freigegebene Konfiguration, bevor Sie dieses Feature installieren."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Beenden Sie World Wide Web Publishing Service (W3SVC), bevor Sie [ProductName] installieren. Sie müssen den Dienst nach der Installation starten."/>
+  <String Id="IISPowershellConsole" Value="IIS PowerShell-Verwaltungskonsole"/>
+  <String Id="IISPowershellSnapin" Value="IIS-PowerShell-Snap-In"/>
+  <String Id="PowerShellRequired" Value="Für das IIS-PowerShell-Snap-In muss PowerShell v1.0 oder v2.0 installiert sein"/>
+  <String Id="WasAndConfigRequired" Value="Für das IIS-PowerShell-Snap-In ist WAS erforderlich, und die Konfiguration muss installiert sein"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Dies ist eine falsche Zeichenfolge."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1033/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1033/setupstrings.wxl
new file mode 100644
index 000000000000..e77eca469fc8
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1033/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033" />
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge Module" />
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge Module V2" />
+  <String Id="AspNetCoreModuleProductTitle" Value="HTTP Bridge for IIS Runtime" />
+  <String Id="AspNetCoreModuleProductDescription" Value="Adds the support of HTTP application to IIS." />
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="LeXtudio HTTP Bridge Module for IIS Express" />
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="LeXtudio HTTP Bridge Module V2 for IIS Express" />
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 or higher is not installed." />
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc." />
+  <String Id="ConflictingProduct" Overridable="yes" Value="An incompatible product, [CONFLICTING_PRODUCT_NAME], is on this computer. Installation of [ProductName] cannot continue. To install this product, use Add/Remove Programs on the Control Panel to remove [CONFLICTING_PRODUCT_NAME]." />
+  <String Id="AdminRequired" Overridable="yes" Value="Administrator privilege is required to install [ProductName]." />
+  <String Id="IIS7Only" Overridable="yes" Value="IIS Version 7.0 is required to use [ProductName]." />
+  <String Id="IIS7OrGreater" Overridable="yes" Value="IIS Version 7.0 or greater is required to install [ProductName]." />
+  <String Id="IIS75OrGreater" Overridable="yes" Value="IIS Version 7.5 or greater is required to install [ProductName]." />
+  <String Id="IIS7Or75Only" Overridable="yes" Value="IIS Version 7 or 7.5 is required to install [ProductName]." />
+  <String Id="IIS8OrGreater" Overridable="yes" Value="IIS Version 8.0 or greater is required to install [ProductName]." />
+  <String Id="BetaVersionFound" Overridable="yes" Value="The beta version of [ProductName] was found on this machine." />
+  <String Id="NewerVersionFound" Overridable="yes" Value="A newer version of [ProductName] was found on this machine." />
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Setup cannot continue because another instance of [ProductName] is already installed on this computer. Please uninstall it first and then re-launch this installation." />
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="The IIS 7.0 CoreWebEngine and W3SVC features must be installed to use [ProductName]." />
+  <String Id="IISManagementConsole" Overridable="yes" Value="The IIS Management Console must be installed to use [ProductName]." />
+  <String Id="WebServicesRunning" Overridable="yes" Value="Please stop both services Windows Process Activation Service (WAS) and Web Management Service (WMSvc) before installing [ProductName]. You will need to start the services after installing [ProductName]." />
+  <String Id="MetabaseRequired" Overridable="yes" Value="IIS Metabase is required to install [ProductName]." />
+  <String Id="LaunchCondition_32BIT" Value="The 64-bit version of [ProductName] cannot be installed on a 32-bit edition of Microsoft Windows." />
+  <String Id="LaunchCondition_64BIT" Value="The 32-bit version of [ProductName] cannot be installed on a 64-bit edition of Microsoft Windows." />
+  <String Id="NetFX2OrGreaterRequired" Value="Microsoft .NET Framework Version 2.0 or greater is required to install [ProductName]." />
+  <String Id="NetFX35OrGreaterRequired" Value="Microsoft .NET Framework Version 3.5 or greater is required to install [ProductName]. Use 'Add Features' under the Server Manager to install Microsoft .Net Version 3.5." />
+  <String Id="NetFX4OrGreaterRequired" Value="Microsoft .NET Framework Version 4.0 or greater is required to install [ProductName]." />
+  <String Id="NetFX20SP1IsRequired" Value="Please install Microsoft .NET Framework Version 2.0 Service Pack 1 (or a later service pack), before installing [ProductName]." />
+  <String Id="WindowsUpdateEnabled" Value="The Windows Update (wuauserv) service cannot be disabled, it is required to install [ProductName]." />
+  <String Id="GetFromOSforWin7" Value="The PowerShell snap-in is part of Windows Operating System. Please install it via 'Programs and Features' or 'Server Manager'." />
+  <String Id="WebPI3OrGreaterRequired" Value="Microsoft Web Platform Installer Version 3.0 or greater is required to install [ProductName]." />
+
+  <String Id="Error30001" Overridable="yes" Value="Setup failed to detect shared configuration." />
+  <String Id="Error30002" Overridable="yes" Value="Shared configuration is enabled for IIS. Installing [ProductName] is not supported when using shared configuration. Please disable shared configuration before installing this feature." />
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Please stop World Wide Web Publishing Service (W3SVC) before installing [ProductName]. You will need to start the service after installation." />
+  <String Id="IISPowershellConsole" Value="IIS PowerShell Management Console" />
+  <String Id="IISPowershellSnapin" Value="IIS PowerShell snap-in" />
+  <String Id="PowerShellRequired" Value="IIS PowerShell snap-in requires PowerShell v1.0 or v2.0 installed" />
+  <String Id="WasAndConfigRequired" Value="IIS PowerShell snap-in requires WAS and configuration installed" />
+  <String Id="TestBogusString" Overridable="yes" Value="This is a bogus string." />
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1036/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1036/setupstrings.wxl
new file mode 100644
index 000000000000..9dcf11f7a2e8
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1036/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="Module LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="Module V2 LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="Runtime IIS LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Ajoute la prise en charge des applications HTTP dans IIS."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="Module LeXtudio HTTP Bridge pour IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="Module V2 LeXtudio HTTP Bridge pour IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 ou version ultérieure n’est pas installé."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Un produit incompatible, [CONFLICTING_PRODUCT_NAME], est présent sur cet ordinateur. L’installation de [ProductName] ne peut pas continuer. Pour installer ce produit, utilisez l’option Ajouter/Supprimer des programme dans le Panneau de contrôle pour supprimer [CONFLICTING_PRODUCT_NAME]."/>
+  <String Id="AdminRequired" Overridable="yes" Value="Un privilège d’administrateur(-trice) est requis pour installer [ProductName]."/>
+  <String Id="IIS7Only" Overridable="yes" Value="La version 7.0 d’IIS est requise pour utiliser [ProductName]."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="IIS version 7.0 ou ultérieure est nécessaire pour installer [ProductName]."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="IIS version 7.5 ou ultérieure est nécessaire pour installer [ProductName]."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="IIS version 7 ou 7.5 est nécessaire pour installer [ProductName]."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="IIS version 8.0 ou ultérieure est nécessaire pour installer [ProductName]."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="La version bêta de [ProductName] a été détectée sur cet ordinateur."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Une nouvelle version de [ProductName] a été détectée sur cet ordinateur."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="L’installation ne peut pas continuer car une autre instance de [ProductName] est déjà installée sur cet ordinateur. Veuillez la désinstaller d’abord, puis relancez cette installation."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Les fonctionnalités IIS 7.0 CoreWebEngine et W3SVC doivent être installées pour utiliser [ProductName]."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="La console de gestion IIS doit être installée pour utiliser [ProductName]."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Veuillez arrêter les services Windows Process Activation Service (WAS) et Web Management Service (WMSvc) avant d’installer [ProductName]. Vous devrez les redémarrer après l’installation de [ProductName]."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="La métabase IIS est requise pour installer [ProductName]."/>
+  <String Id="LaunchCondition_32BIT" Value="La version 64 bits de [ProductName] ne peut pas être installée sur une édition 32 bits de Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="La version 32 bits de [ProductName] ne peut pas être installée sur une édition 64 bits de Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="La version Microsoft .NET Framework 2.0 ou ultérieure est nécessaire pour installer [ProductName]."/>
+  <String Id="NetFX35OrGreaterRequired" Value="La version Microsoft .NET Framework 3.5 ou ultérieure est nécessaire pour installer [ProductName]. Utilisez « Ajouter des fonctionnalités » dans le Gestionnaire de serveur pour installer Microsoft .NET version 3.5."/>
+  <String Id="NetFX4OrGreaterRequired" Value="La version Microsoft .NET Framework 4.0 ou ultérieure est nécessaire pour installer [ProductName]."/>
+  <String Id="NetFX20SP1IsRequired" Value="Veuillez installer Microsoft .NET Framework version 2.0 Service Pack 1 (ou un Service Pack ultérieur) avant d’installer [ProductName]."/>
+  <String Id="WindowsUpdateEnabled" Value="Le service Windows Update (wuauserv) ne peut pas être désactivé, il est requis pour installer [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="Le composant logiciel enfichable PowerShell fait partie du système d’exploitation Windows. Veuillez l’installer via « Programmes et fonctionnalités » ou le « Gestionnaire de serveur »."/>
+  <String Id="WebPI3OrGreaterRequired" Value="Microsoft Web Platform Installer version 3.0 ou ultérieure est nécessaire pour installer [ProductName]."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Le programme d’installation n’a pas pu détecter la configuration partagée."/>
+  <String Id="Error30002" Overridable="yes" Value="La configuration partagée est activée pour IIS. L’installation de [ProductName] n’est pas prise en charge avec la configuration partagée. Veuillez la désactiver avant d’installer cette fonctionnalité."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Veuillez arrêter le service de publication World Wide Web (W3SVC) avant d’installer [ProductName]. Vous devrez redémarrer ce service après l’installation."/>
+  <String Id="IISPowershellConsole" Value="Console de gestion IIS PowerShell"/>
+  <String Id="IISPowershellSnapin" Value="Composant logiciel enfichable PowerShell pour IIS"/>
+  <String Id="PowerShellRequired" Value="Le composant logiciel enfichable IIS PowerShell nécessite l’installation de PowerShell v1.0 ou v2.0"/>
+  <String Id="WasAndConfigRequired" Value="Le composant logiciel enfichable IIS PowerShell nécessite que WAS et la configuration soient installés"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Il s’agit d’une chaîne invalide."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl
new file mode 100644
index 000000000000..1ee4bc918d71
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="Runtime di LeXtudio HTTP Bridge IIS"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Aggiunge il supporto dell'applicazione HTTP a IIS."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="LeXtudio HTTP Bridge per IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="LeXtudio HTTP Bridge V2 per IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 o versioni successive non è installato."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Nel computer è presente un prodotto incompatibile, [CONFLICTING_PRODUCT_NAME]. L'installazione di [ProductName] non può continuare. Per installare il prodotto, utilizzare Installazione applicazioni nel Pannello di controllo per rimuovere [CONFLICTING_PRODUCT_NAME].	"/>
+  <String Id="AdminRequired" Overridable="yes" Value="Per installare [ProductName] sono necessari privilegi di Amministratore."/>
+  <String Id="IIS7Only" Overridable="yes" Value="Per usare [ProductName] è necessaria la versione 7.0 di IIS."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="Per installare [ProductName] è necessaria la versione 7.0 o successiva di IIS."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="Per installare [ProductName] è necessaria la versione 7.5 o successiva di IIS."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="Per installare [ProductName] è necessaria la versione 7 o 7.5 di IIS."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="Per installare [ProductName] è necessaria la versione 8.0 o successiva di IIS."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="È stata trovata la versione beta di [ProductName] sul computer."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="È stata trovata una versione più recente di [ProductName] sul computer."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Non è possibile continuare l'installazione perché un'altra istanza di [ProductName] è già installata sul computer. Disinstallarla prima e quindi riavviare l'installazione."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Per usare [ProductName] è necessario installare le funzionalità CoreWebEngine e W3SVC di IIS 7.0."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="Per usare [ProductName] è necessario installare la console di gestione di IIS."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Arrestare il servizio Attivazione processo Windows (WAS) e Servizio di gestione Web (WMSvc) prima di installare [ProductName]. Sarà necessario riavviarli dopo l'installazione di [ProductName]."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="Per installare [ProductName] è necessario il metabase di IIS."/>
+  <String Id="LaunchCondition_32BIT" Value="Non è possibile installare la versione a 64 bit di [ProductName] su un'edizione a 32 bit di Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="Non è possibile installare la versione a 32 bit di [ProductName] su un'edizione a 64 bit di Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="Per installare [ProductName] è necessaria la versione 2.0 o successiva di Microsoft .NET Framework."/>
+  <String Id="NetFX35OrGreaterRequired" Value="Per installare [ProductName] è necessaria la versione 3.5 o successiva di Microsoft .NET Framework. Usare 'Aggiungi funzionalità' in Server Manager per installare Microsoft .NET versione 3.5."/>
+  <String Id="NetFX4OrGreaterRequired" Value="Per installare [ProductName] è necessaria la versione 4.0 o successiva di Microsoft .NET Framework."/>
+  <String Id="NetFX20SP1IsRequired" Value="Installare Microsoft .NET Framework versione 2.0 (o un Service Pack o successivo) prima di installare [ProductName]."/>
+  <String Id="WindowsUpdateEnabled" Value="Non è possibile disabilitare il servizio Windows Update (wuauserv) perché è necessario per installare [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="Lo snap-in di PowerShell fa parte del sistema operativo Windows. Installarlo tramite 'Programmi e funzionalità' o 'Server Manager'."/>
+  <String Id="WebPI3OrGreaterRequired" Value="Per installare [ProductName] è necessario Installazione guidata piattaforma Web Microsoft versione 3.0 o successiva."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Il programma di installazione non è riuscito a rilevare la configurazione condivisa."/>
+  <String Id="Error30002" Overridable="yes" Value="La configurazione condivisa è abilitata per IIS. L'installazione di [ProductName] non è supportata con la configurazione condivisa in uso. Disabilitare la configurazione condivisa prima di installare questa funzionalità."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Arrestare Servizio Pubblicazione sul Web (W3SVC) prima di installare [ProductName]. Sarà necessario riavviare il servizio dopo l'installazione."/>
+  <String Id="IISPowershellConsole" Value="Console di gestione di PowerShell con IIS"/>
+  <String Id="IISPowershellSnapin" Value="Snap-in di PowerShell con IIS"/>
+  <String Id="PowerShellRequired" Value="Lo snap-in di PowerShell con IIS richiede l'installazione di PowerShell versione 1.0 o 2.0"/>
+  <String Id="WasAndConfigRequired" Value="Lo snap-in di PowerShell con IIS richiede l'installazione di WAS e della configurazione"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Questa è una stringa fittizia."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl
new file mode 100644
index 000000000000..d60d30b2919f
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge モジュール"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge モジュール V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="LeXtudio HTTP Bridge IIS ランタイム"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="HTTP アプリケーションのサポートを IIS に追加します。"/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="IIS Express 用の LeXtudio HTTP Bridge モジュール"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="IIS Express 用の LeXtudio HTTP Bridge モジュール V2"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 以降がインストールされていません。"/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="互換性のない製品 [CONFLICTING_PRODUCT_NAME] がこのコンピューター上にあります。[ProductName] のインストールを続行できません。この製品をインストールするには、コントロール パネルの \\[プログラムの追加と削除\\] を使用して [CONFLICTING_PRODUCT_NAME] を削除します。"/>
+  <String Id="AdminRequired" Overridable="yes" Value="[ProductName] をインストールするには管理者権限が必要です。"/>
+  <String Id="IIS7Only" Overridable="yes" Value="[ProductName] を使用するには、IIS バージョン 7.0 が必要です。"/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="[ProductName] をインストールするには、IIS バージョン 7.0 以降が必要です。"/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="[ProductName] をインストールするには、IIS バージョン 7.5 以降が必要です。"/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="[ProductName] をインストールするには、IIS バージョン 7 または 7.5 が必要です。"/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="[ProductName] をインストールするには、IIS バージョン 8.0 以降が必要です。"/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="[ProductName] のベータ版がこのコンピューターで見つかりました。"/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="[ProductName] の新しいバージョンがこのコンピューターで見つかりました。"/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="[ProductName] の別のインスタンスがこのコンピューターに既にインストールされているため、セットアップを続行できません。最初にアンインストールしてから、このインストールを再起動してください。"/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="[ProductName] を使用するには、IIS 7.0 CoreWebEngine および W3SVC 機能をインストールする必要があります。"/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="[ProductName] を使用するには、IIS 管理コンソールをインストールする必要があります。"/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="[ProductName] をインストールする前に、Windows プロセス アクティブ化サービス (WAS) と Web 管理サービス (WMSvc) の両方のサービスを停止してください。[ProductName] のインストール後にサービスを開始する必要があります。"/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="[ProductName] をインストールするには、IIS メタベースが必要です。"/>
+  <String Id="LaunchCondition_32BIT" Value="64 ビット版の [ProductName] を 32 ビット版の Microsoft Windows にインストールすることはできません。"/>
+  <String Id="LaunchCondition_64BIT" Value="32 ビット版の [ProductName] を 64 ビット版の Microsoft Windows にインストールすることはできません。"/>
+  <String Id="NetFX2OrGreaterRequired" Value="[ProductName] をインストールするには、Microsoft .NET Framework バージョン 2.0 以降が必要です。"/>
+  <String Id="NetFX35OrGreaterRequired" Value="[ProductName] をインストールするには、Microsoft .NET Framework バージョン 3.5 以降が必要です。Microsoft .Net バージョン 3.5 をインストールするには、サーバー マネージャーの 機能の追加を使用します。"/>
+  <String Id="NetFX4OrGreaterRequired" Value="[ProductName] をインストールするには、Microsoft .NET Framework バージョン 4.0 以降が必要です。"/>
+  <String Id="NetFX20SP1IsRequired" Value="[ProductName] をインストールする前に、Microsoft .NET Framework バージョン 2.0 Service Pack 1 (またはそれ以降の Service Pack) をインストールしてください。"/>
+  <String Id="WindowsUpdateEnabled" Value="Windows Update (wuauserv) サービスを無効にすることはできません。[ProductName] をインストールする必要があります。"/>
+  <String Id="GetFromOSforWin7" Value="PowerShell スナップインは、Windows オペレーティング システムの一部です。'プログラムと機能' または 'サーバー マネージャー' を使用してインストールしてください。"/>
+  <String Id="WebPI3OrGreaterRequired" Value="[ProductName] をインストールするには、Microsoft Web Platform Installer バージョン 3.0 以降が必要です。"/>
+
+  <String Id="Error30001" Overridable="yes" Value="共有構成を検出するためのセットアップに失敗しました。"/>
+  <String Id="Error30002" Overridable="yes" Value="IIS に対して共有構成が有効になっています。共有構成を使用する場合、[ProductName] のインストールはサポートされていません。この機能をインストールする前に、共有構成を無効にしてください。"/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="[ProductName] をインストールする前に、World Wide Web 発行サービス (W3SVC) を停止してください。インストール後にサービスを開始する必要があります。"/>
+  <String Id="IISPowershellConsole" Value="IIS PowerShell 管理コンソール"/>
+  <String Id="IISPowershellSnapin" Value="IIS PowerShell スナップイン"/>
+  <String Id="PowerShellRequired" Value="IIS PowerShell スナップインには、PowerShell v1.0 または v2.0 がインストールされている必要があります"/>
+  <String Id="WasAndConfigRequired" Value="IIS PowerShell スナップインには、WAS と構成のインストールが必要です"/>
+  <String Id="TestBogusString" Overridable="yes" Value="これは偽の文字列です。"/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1042/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1042/setupstrings.wxl
new file mode 100644
index 000000000000..699434873459
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1042/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge Module"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge Module V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="LeXtudio HTTP Bridge IIS 런타임"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="IIS에 HTTP 애플리케이션 지원을 추가합니다."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="LeXtudio HTTP Bridge 모듈 for IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="LeXtudio HTTP Bridge 모듈 V2 for IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 이상이 설치되어 있지 않습니다."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="이 컴퓨터에 호환되지 않는 제품([CONFLICTING_PRODUCT_NAME])이(가) 있습니다. [ProductName] 설치를 계속할 수 없습니다. 이 제품을 설치하려면 제어 패널의 프로그램 추가/제거에서 [CONFLICTING_PRODUCT_NAME]을(를) 제거하세요."/>
+  <String Id="AdminRequired" Overridable="yes" Value="[ProductName]을(를) 설치하려면 관리자 권한이 필요합니다."/>
+  <String Id="IIS7Only" Overridable="yes" Value="[ProductName]을(를) 사용하려면 IIS 버전 7.0이 필요합니다."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="[ProductName]을(를) 설치하려면 IIS 버전 7.0 이상이 필요합니다."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="[ProductName]을(를) 설치하려면 IIS 버전 7.5 이상이 필요합니다."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="[ProductName]을(를) 설치하려면 IIS 버전 7 또는 7.5가 필요합니다."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="[ProductName]을(를) 설치하려면 IIS 버전 8.0 이상이 필요합니다."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="이 컴퓨터에 [ProductName] 베타 버전이 설치되어 있습니다."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="이 컴퓨터에 [ProductName] 최신 버전이 설치되어 있습니다."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="이 컴퓨터에 이미 다른 [ProductName] 인스턴스가 설치되어 있어 설치를 계속할 수 없습니다. 먼저 제거한 후 설치를 다시 시작하세요."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="[ProductName]을(를) 사용하려면 IIS 7.0 CoreWebEngine 및 W3SVC 기능이 설치되어 있어야 합니다."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="[ProductName]을(를) 사용하려면 IIS 관리 콘솔이 설치되어 있어야 합니다."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="[ProductName]을(를) 설치하기 전에 Windows Process Activation Service(WAS)와 웹 관리 서비스(WMSvc)를 모두 중지하세요. [ProductName]을(를) 설치한 후 서비스를 시작해야 합니다."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="[ProductName]을(를) 설치하려면 IIS 메타베이스가 필요합니다."/>
+  <String Id="LaunchCondition_32BIT" Value="64비트 버전의 [ProductName](는) 32비트 버전의 Microsoft Windows에 설치할 수 없습니다."/>
+  <String Id="LaunchCondition_64BIT" Value="32비트 버전의 [ProductName]은(는) 64비트 버전의 Microsoft Windows에 설치할 수 없습니다."/>
+  <String Id="NetFX2OrGreaterRequired" Value="[ProductName]을(를) 설치하려면 Microsoft .NET Framework 버전 2.0 이상이 필요합니다."/>
+  <String Id="NetFX35OrGreaterRequired" Value="[ProductName]을(를) 설치하려면 Microsoft .NET Framework 버전 3.5 이상이 필요합니다. 서버 관리자에서 '기능 추가'를 사용해 Microsoft .NET 버전 3.5를 설치하세요."/>
+  <String Id="NetFX4OrGreaterRequired" Value="[ProductName]을(를) 설치하려면 Microsoft .NET Framework 버전 4.0 이상이 필요합니다."/>
+  <String Id="NetFX20SP1IsRequired" Value="[ProductName]을(를) 설치하기 전에 Microsoft .NET Framework 버전 2.0 서비스 팩 1 이상을 설치하세요."/>
+  <String Id="WindowsUpdateEnabled" Value="Windows 업데이트(wuauserv) 서비스는 비활성화할 수 없습니다. [ProductName] 설치에 필요합니다."/>
+  <String Id="GetFromOSforWin7" Value="PowerShell 스냅인은 Windows 운영 체제의 일부입니다. '프로그램 및 기능' 또는 '서버 관리자'에서 설치하세요."/>
+  <String Id="WebPI3OrGreaterRequired" Value="[ProductName]을(를) 설치하려면 Microsoft 웹 플랫폼 설치 관리자 버전 3.0 이상이 필요합니다."/>
+
+  <String Id="Error30001" Overridable="yes" Value="설치 프로그램이 공유 구성을 감지하지 못했습니다."/>
+  <String Id="Error30002" Overridable="yes" Value="IIS에서 공유 구성이 활성화되어 있습니다. 공유 구성을 사용하는 경우 [ProductName] 설치를 지원하지 않습니다. 이 기능을 설치하기 전에 공유 구성을 비활성화하세요."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="[ProductName]을(를) 설치하기 전에 World Wide Web 게시 서비스(W3SVC)를 중지하세요. 설치 후 서비스를 다시 시작해야 합니다."/>
+  <String Id="IISPowershellConsole" Value="IIS PowerShell 관리 콘솔"/>
+  <String Id="IISPowershellSnapin" Value="IIS PowerShell 스냅인"/>
+  <String Id="PowerShellRequired" Value="IIS PowerShell 스냅인을 사용하려면 PowerShell v1.0 또는 v2.0이 설치되어 있어야 합니다."/>
+  <String Id="WasAndConfigRequired" Value="IIS PowerShell 스냅인을 사용하려면 WAS와 구성이 설치되어 있어야 합니다."/>
+  <String Id="TestBogusString" Overridable="yes" Value="이 문자열은 잘못된 문자열입니다."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1045/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1045/setupstrings.wxl
new file mode 100644
index 000000000000..5c451cf23cf3
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1045/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="Moduł platformy LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="Moduł w wersji 2 platformy LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="Środowisko uruchomieniowe programu IIS na platformie LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Dodaje obsługę aplikacji platformy HTTP do programu IIS."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="Moduł platformy LeXtudio HTTP Bridge dla programu IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="Moduł w wersji 2 platformy LeXtudio HTTP Bridge dla programu IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="Program IIS Express w wersji 8.0 lub nowszej nie jest zainstalowany."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Na tym komputerze znajduje się niezgodny produkt [CONFLICTING_PRODUCT_NAME]. Nie można kontynuować instalacji produktu [ProductName]. Aby zainstalować ten produkt, użyj przycisku Dodaj/Usuń programy w obszarze Panel sterowania, aby usunąć [CONFLICTING_PRODUCT_NAME]."/>
+  <String Id="AdminRequired" Overridable="yes" Value="Do zainstalowania produktu [ProductName] jest wymagane uprawnienie administratora."/>
+  <String Id="IIS7Only" Overridable="yes" Value="Do korzystania z produktu [ProductName] jest wymagany program IIS w wersji 7.0."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="Do zainstalowania produktu [ProductName] jest wymagany program IIS w wersji 7.0 lub nowszej."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="Do zainstalowania produktu [ProductName] jest wymagany program IIS w wersji 7.5 lub nowszej."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="Do zainstalowania produktu [ProductName] jest wymagany program IIS w wersji 7 lub 7.5."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="Do zainstalowania produktu [ProductName] jest wymagany program IIS w wersji 8.0 lub nowszej."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="Na tym komputerze znaleziono wersję beta produktu [ProductName]."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Na tym komputerze znaleziono nowszą wersję produktu [ProductName]."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Instalator nie może kontynuować, ponieważ na tym komputerze jest już zainstalowane inne wystąpienie produktu [ProductName]. Najpierw odinstaluj je, a następnie uruchom ponownie tę instalację."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Aby korzystać z produktu [ProductName], należy zainstalować funkcje programu IIS 7.0 CoreWebEngine i W3SVC."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="Konsola zarządzania programu IIS musi być zainstalowana, aby można było korzystać z produktu [ProductName]."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Przed zainstalowaniem produktu [ProductName] zatrzymaj obie usługi: Usługa aktywacji procesów systemu Windows (WAS) i Usługa zarządzania Siecią Web (WMSvc). Usługi należy uruchomić po zainstalowaniu produktu [ProductName]."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="Do zainstalowania produktu [ProductName] jest wymagana metabaza programu IIS."/>
+  <String Id="LaunchCondition_32BIT" Value="Nie można zainstalować 64-bitowej wersji produktu [ProductName] w 32-bitowej wersji systemu Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="Nie można zainstalować 32-bitowej wersji produktu [ProductName] w 64-bitowej wersji systemu Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="Do zainstalowania produktu [ProductName] jest wymagana platforma Microsoft .NET Framework w wersji 2.0 lub nowszej."/>
+  <String Id="NetFX35OrGreaterRequired" Value="Do zainstalowania produktu [ProductName] jest wymagany program Microsoft .NET Framework w wersji 3.5 lub nowszej. Użyj opcji „Dodaj funkcje” w Menedżerze serwera, aby zainstalować program Microsoft .Net w wersji 3.5."/>
+  <String Id="NetFX4OrGreaterRequired" Value="Do zainstalowania produktu [ProductName] jest wymagany program Microsoft .NET Framework w wersji 4.0 lub nowszej."/>
+  <String Id="NetFX20SP1IsRequired" Value="Przed zainstalowaniem programu [ProductName] zainstaluj program Microsoft .NET Framework w wersji 2.0 z dodatkiem Service Pack 1 (lub nowszym)."/>
+  <String Id="WindowsUpdateEnabled" Value="Nie można wyłączyć usługi Windows Update (wuauserv). Jest ona wymagana do zainstalowania produktu [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="Przystawka programu PowerShell jest częścią systemu operacyjnego Windows. Zainstaluj ją za pośrednictwem opcji „Programy i funkcje” lub „Menedżer serwera”."/>
+  <String Id="WebPI3OrGreaterRequired" Value="Instalator platformy Microsoft Web w wersji 3.0 lub nowszej jest wymagany do zainstalowania produktu [ProductName]."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Instalator nie wykrył konfiguracji udostępnionej."/>
+  <String Id="Error30002" Overridable="yes" Value="Konfiguracja udostępniona jest włączona dla programu IIS. Instalowanie produktu [ProductName] nie jest obsługiwane w przypadku korzystania z konfiguracji udostępnionej. Przed zainstalowaniem tej funkcji wyłącz konfigurację udostępnioną."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Przed zainstalowaniem produktu [ProductName] zatrzymaj usługę publikowania w sieci World Wide Web (W3SVC). Należy uruchomić usługę po instalacji."/>
+  <String Id="IISPowershellConsole" Value="Konsola zarządzania IIS PowerShell"/>
+  <String Id="IISPowershellSnapin" Value="Przystawka IIS PowerShell"/>
+  <String Id="PowerShellRequired" Value="Przystawka IIS PowerShell wymaga zainstalowanego programu PowerShell w wersji 1.0 lub 2.0"/>
+  <String Id="WasAndConfigRequired" Value="Przystawka IIS PowerShell wymaga zainstalowanej usługi WAS i konfiguracji"/>
+  <String Id="TestBogusString" Overridable="yes" Value="To jest fałszywy ciąg."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1046/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1046/setupstrings.wxl
new file mode 100644
index 000000000000..87e108b516b5
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1046/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1046"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="Módulo LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="Módulo LeXtudio HTTP Bridge V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="Runtime do IIS do LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Adiciona o suporte do aplicativo HTTP ao IIS."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="Módulo LeXtudio HTTP Bridge para IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="Módulo LeXtudio HTTP Bridge V2 para IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="O IIS Express 8.0 ou superior não está instalado."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Um produto incompatível, [CONFLICTING_PRODUCT_NAME], está neste computador. A instalação de [ProductName] não pode continuar. Para instalar este produto, use Adicionar/Remover Programas no Painel de Controle para remover [CONFLICTING_PRODUCT_NAME]."/>
+  <String Id="AdminRequired" Overridable="yes" Value="O privilégio de administrador é necessário para instalar o [ProductName]."/>
+  <String Id="IIS7Only" Overridable="yes" Value="O IIS Versão 7.0 é necessário para usar o [ProductName]."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="O IIS Versão 7.0 ou superior é necessário para instalar o [ProductName]."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="O IIS Versão 7.5 ou superior é necessário para instalar o [ProductName]."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="É necessário o IIS Versão 7 ou 7.5 para instalar o [ProductName]."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="O IIS Versão 8.0 ou superior é necessário para instalar o [ProductName]."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="A versão beta do [ProductName] foi encontrada neste computador."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Uma versão mais recente do [ProductName] foi encontrada neste computador."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="A configuração não pode continuar, pois outra instância do [ProductName] já está instalada neste computador. Desinstale-a primeiro e depois reinicie essa instalação."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Os recursos do IIS 7.0 CoreWebEngine e do W3SVC devem ser instalados para usar o [ProductName]."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="O Console de Gerenciamento do IIS deve ser instalado para usar o [ProductName]."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Interrompa os serviços do Serviço de Ativação de Processos do Windows (WAS) e do Serviço de Gerenciamento da Web (WMSvc) antes de instalar o [ProductName]. Você precisará iniciar os serviços após a instalação do [ProductName]."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="O IIS Metabase é necessário para instalar o [ProductName]."/>
+  <String Id="LaunchCondition_32BIT" Value="A versão de 64 bits do [ProductName] não pode ser instalada em uma edição de 32 bits do Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="A versão de 32 bits do [ProductName] não pode ser instalada em uma edição de 64 bits do Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="O Microsoft .NET Framework versão 2.0 ou superior é necessário para instalar o [ProductName]."/>
+  <String Id="NetFX35OrGreaterRequired" Value="O Microsoft .NET Framework versão 3.5 ou superior é necessário para instalar [ProductName]. Use 'Adicionar Recursos' no Gerenciador de Servidores para instalar o Microsoft .NET versão 3.5."/>
+  <String Id="NetFX4OrGreaterRequired" Value="O Microsoft .NET Framework versão 4.0 ou superior é necessário para instalar o [ProductName]."/>
+  <String Id="NetFX20SP1IsRequired" Value="Instale o Microsoft .NET Framework Versão 2.0 Service Pack 1 (ou um service pack posterior) antes de instalar o [ProductName]."/>
+  <String Id="WindowsUpdateEnabled" Value="O serviço Windows Update (wuauserv) não pode ser desativado, é necessário instalar o [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="O snap-in do PowerShell faz parte do sistema operacional Windows. Instale-o por meio de 'Programas e Recursos' ou do 'Gerenciador do Servidor'."/>
+  <String Id="WebPI3OrGreaterRequired" Value="O Microsoft Web Platform Installer Versão 3.0 ou superior é necessário para instalar o [ProductName]."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Falha na instalação ao detectar a configuração compartilhada."/>
+  <String Id="Error30002" Overridable="yes" Value="A configuração compartilhada está habilitada para o IIS. A instalação do [ProductName] não é suportada ao usar a configuração compartilhada. Desative a configuração compartilhada antes de instalar esse recurso."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Pare o serviço World Wide Web Publishing (W3SVC) antes de instalar o [ProductName]. Você precisará iniciar o serviço após a instalação."/>
+  <String Id="IISPowershellConsole" Value="Console de Gerenciamento do IIS do PowerShell"/>
+  <String Id="IISPowershellSnapin" Value="Snap-in do PowerShell do IIS"/>
+  <String Id="PowerShellRequired" Value="O snap-in do IIS PowerShell exige o PowerShell v1.0 ou v2.0 instalado"/>
+  <String Id="WasAndConfigRequired" Value="O snap-in do IIS PowerShell exige o WAS e configuração instaladas"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Esta é uma cadeia de caracteres falsa."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl
new file mode 100644
index 000000000000..6ee2e54c9ab9
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="Модуль LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="Модуль LeXtudio HTTP Bridge V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="Среда выполнения IIS LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Добавляет поддержку приложений HTTP в IIS."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="Модуль LeXtudio HTTP Bridge для IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="Модуль LeXtudio HTTP Bridge V2 для IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 или более поздней версии не установлен."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="На этом компьютере установлен несовместимый продукт [CONFLICTING_PRODUCT_NAME]. Невозможно продолжить установку [ProductName]. Чтобы установить этот продукт, удалите [CONFLICTING_PRODUCT_NAME] с помощью раздела установки и удаления программ в панели управления."/>
+  <String Id="AdminRequired" Overridable="yes" Value="Для установки [ProductName] требуются права администратора."/>
+  <String Id="IIS7Only" Overridable="yes" Value="Для использования [ProductName] требуется IIS версии 7.0."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="Для установки [ProductName] требуется IIS версии 7.0 или более поздней."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="Для установки [ProductName] требуется IIS версии 7.5 или более поздней."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="Для установки [ProductName] требуется IIS версии 7 или 7.5."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="Для установки [ProductName] требуется IIS версии 8.0 или более поздней."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="На этом компьютере обнаружена бета-версия [ProductName]."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="На этом компьютере обнаружена более поздняя версия [ProductName]."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Невозможно продолжить настройку, так как на этом компьютере уже установлен другой экземпляр [ProductName]. Сначала удалите его, а затем запустите установку снова."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Для использования [ProductName] необходимо установить компоненты IIS 7.0 CoreWebEngine и W3SVC."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="Для использования [ProductName] необходимо установить консоль управления IIS."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Перед установкой [ProductName] остановите Службу активации Windows (WAS) и службу веб-управления IIS (WMSvc). После установки [ProductName] потребуется снова запустить эти службы."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="Для установки [ProductName] требуется метабаза IIS."/>
+  <String Id="LaunchCondition_32BIT" Value="Невозможно установить 64-разрядную версию [ProductName] в 32-разрядном выпуске Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="Невозможно установить 32-разрядную версию [ProductName] в 64-разрядном выпуске Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="Для установки [ProductName] требуется Microsoft .NET Framework версии 2.0 или более поздней."/>
+  <String Id="NetFX35OrGreaterRequired" Value="Для установки [ProductName] требуется Microsoft .NET Framework версии 3.5 или более поздней. Чтобы установить Microsoft .NET версии 3.5, используйте &quot;Добавить компоненты&quot; в диспетчере сервера."/>
+  <String Id="NetFX4OrGreaterRequired" Value="Для установки [ProductName] требуется Microsoft .NET Framework версии 4.0 или более поздней."/>
+  <String Id="NetFX20SP1IsRequired" Value="Перед установкой [ProductName] установите Microsoft .NET Framework версии 2.0 с пакетом обновления 1 (или более поздним)."/>
+  <String Id="WindowsUpdateEnabled" Value="Невозможно отключить службу Центра обновления Windows (wuauserv). Она необходима для установки [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="Оснастка PowerShell входит в состав операционной системы Windows. Установите ее через раздел &quot;Программы и компоненты&quot; или &quot;Диспетчер сервера&quot;."/>
+  <String Id="WebPI3OrGreaterRequired" Value="Для установки [ProductName] требуется установщик веб-платформы Майкрософт версии 3.0 или более поздней."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Настройке не удалось обнаружить общую конфигурацию."/>
+  <String Id="Error30002" Overridable="yes" Value="Общая конфигурация включена для IIS. Установка [ProductName] не поддерживается при использовании общей конфигурации. Отключите общую конфигурацию перед установкой этой функции."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Перед установкой [ProductName] остановите службу веб-публикаций (W3SVC). После установки потребуется снова запустить эту службу."/>
+  <String Id="IISPowershellConsole" Value="Консоль управления IIS PowerShell"/>
+  <String Id="IISPowershellSnapin" Value="Оснастка IIS PowerShell"/>
+  <String Id="PowerShellRequired" Value="Для оснастки IIS PowerShell требуется установка PowerShell версии 1.0 или 2.0"/>
+  <String Id="WasAndConfigRequired" Value="Для оснастки IIS PowerShell требуется установка WAS и конфигурации"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Это фиктивная строка."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1055/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1055/setupstrings.wxl
new file mode 100644
index 000000000000..9c9ac58568df
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1055/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge Modülü"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge Modülü V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="LeXtudio HTTP Bridge IIS Çalışma Zamanı"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="IIS'ye HTTP uygulaması desteği ekler."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="IIS Express için LeXtudio HTTP Bridge Modülü"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="IIS Express için LeXtudio HTTP Bridge Modülü V2"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 veya üzeri yüklü değil."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Bu bilgisayarda uyumsuz bir ürün olan [CONFLICTING_PRODUCT_NAME] bulunuyor. [ProductName] kurulumu devam edemiyor. Bu ürünü yüklemek için, Denetim Masası'ndaki Program Ekle/Kaldır'ı kullanarak [CONFLICTING_PRODUCT_NAME ]'i kaldırın."/>
+  <String Id="AdminRequired" Overridable="yes" Value="[ProductName] yüklemek için yönetici ayrıcalığı gereklidir."/>
+  <String Id="IIS7Only" Overridable="yes" Value="[ProductName] kullanmak için IIS Sürüm 7.0 gereklidir."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="[ProductName] yüklemek için IIS Sürüm 7.0 veya üzeri gereklidir."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="[ProductName] yüklemek için IIS Sürüm 7.5 veya üzeri gereklidir."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="[ProductName] yüklemek için IIS Sürüm 7 veya 7.5 gereklidir."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="[ProductName] yüklemek için IIS Sürüm 8.0 veya üzeri gereklidir."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="Bu makinede [ProductName] beta sürümü bulundu."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Bu makinede [ProductName]’in daha yeni bir sürümü bulundu."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="Bu bilgisayarda başka bir [ProductName] örneği zaten yüklü olduğu için kurulum devam edemiyor. Lütfen önce onu kaldırın ve ardından bu yüklemeyi yeniden başlatın."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="[ProductName] kullanmak için IIS 7.0 CoreWebEngine ve W3SVC özellikleri yüklü olmalıdır."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="[ProductName] kullanmak için IIS Yönetim Konsolu yüklü olmalıdır."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="[ProductName] yüklemeden önce Windows İşlem Etkinleştirme Hizmeti (WAS) ve Web Yönetimi Hizmeti (WMSvc) hizmetlerini durdurun. [ProductName] yüklemesinden sonra bu hizmetleri başlatmanız gerekecek."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="[ProductName] yüklemek için IIS Metatabanı gereklidir."/>
+  <String Id="LaunchCondition_32BIT" Value="[ProductName]'in 64 bit sürümü, 32 bit Microsoft Windows sürümüne yüklenemez."/>
+  <String Id="LaunchCondition_64BIT" Value="[ProductName]'in 32 bit sürümü, 64 bit Microsoft Windows sürümüne yüklenemez."/>
+  <String Id="NetFX2OrGreaterRequired" Value="[ProductName] yüklemek için Microsoft .NET Framework Sürüm 2.0 veya üzeri gereklidir."/>
+  <String Id="NetFX35OrGreaterRequired" Value="[ProductName] yüklemek için Microsoft .NET Framework Sürüm 3.5 veya üzeri gereklidir. Microsoft .NET Sürüm 3.5'i yüklemek için Sunucu Yöneticisi altındaki 'Özellik Ekle' seçeneğini kullanın."/>
+  <String Id="NetFX4OrGreaterRequired" Value="[ProductName] yüklemek için Microsoft .NET Framework Sürüm 4.0 veya üzeri gereklidir."/>
+  <String Id="NetFX20SP1IsRequired" Value="[ProductName] yüklemeden önce lütfen Microsoft .NET Framework Sürüm 2.0 Hizmet Paketi 1 (veya daha yeni bir hizmet paketi) yükleyin."/>
+  <String Id="WindowsUpdateEnabled" Value="Windows Update (wuauserv) hizmeti devre dışı bırakılamaz, [ProductName] yüklemek için gereklidir."/>
+  <String Id="GetFromOSforWin7" Value="PowerShell ek bileşeni Windows İşletim Sistemi'nin bir parçasıdır. Lütfen 'Programlar ve Özellikler' veya 'Sunucu Yöneticisi' üzerinden yükleyin."/>
+  <String Id="WebPI3OrGreaterRequired" Value="[ProductName] yüklemek için Microsoft Web Platformu Yükleyicisi Sürüm 3.0 veya üzeri gereklidir."/>
+
+  <String Id="Error30001" Overridable="yes" Value="Kurulum paylaşılan yapılandırmayı algılayamadı."/>
+  <String Id="Error30002" Overridable="yes" Value="IIS için paylaşılan yapılandırma etkin. Paylaşılan yapılandırma kullanılırken [ProductName] yüklenemez. Bu özelliği yüklemeden önce paylaşılan yapılandırmayı devre dışı bırakın."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="[ProductName] yüklemeden önce lütfen World Wide Web Yayımlama Hizmeti’ni (W3SVC) durdurun. Yüklemeden sonra hizmeti başlatmanız gerekir."/>
+  <String Id="IISPowershellConsole" Value="IIS PowerShell Yönetim Konsolu"/>
+  <String Id="IISPowershellSnapin" Value="IIS PowerShell ek bileşeni"/>
+  <String Id="PowerShellRequired" Value="IIS PowerShell ek bileşeni için PowerShell v1.0 veya v2.0 yüklü olmalıdır"/>
+  <String Id="WasAndConfigRequired" Value="IIS PowerShell ek bileşeni için WAS ve yapılandırma yüklü olmalıdır"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Bu sahte bir dizedir."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/2052/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/2052/setupstrings.wxl
new file mode 100644
index 000000000000..8610de9336e1
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/2052/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="LeXtudio HTTP Bridge 模块"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="LeXtudio HTTP Bridge 模块 V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="LeXtudio HTTP Bridge IIS 运行时"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="将 HTTP 应用程序的支持添加到 IIS。"/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="LeXtudio HTTP Bridge 模块(IIS Express)"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="LeXtudio HTTP Bridge 模块 V2 (IIS Express)"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="IIS Express 8.0 或更高版本未安装。"/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="此计算机上存在不兼容的产品 [CONFLICTING_PRODUCT_NAME]。无法继续安装 [ProductName]。若要安装此产品，请使用控制面板上的“添加/移除程序”移除 [CONFLICTING_PRODUCT_NAME]。"/>
+  <String Id="AdminRequired" Overridable="yes" Value="安装 [ProductName] 需要管理员权限。"/>
+  <String Id="IIS7Only" Overridable="yes" Value="使用 [ProductName] 需要 IIS 版本 7.0。"/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="安装 [ProductName] 需要 IIS 版本 7.0 或更高版本。"/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="安装 [ProductName] 需要 IIS 版本 7.5 或更高版本。"/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="安装 [ProductName] 需要 IIS 版本 7 或 7.5。"/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="安装 [ProductName] 需要 IIS 版本 8.0 或更高版本。"/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="在此计算机上发现了 beta 版本的 [ProductName]。"/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="在此计算机上发现了更新版本的 [ProductName]。"/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="无法继续安装，因为此计算机上已安装另一个 [ProductName] 实例。请先卸载该实例，然后重新启动此安装。"/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="必须安装 IIS 7.0 CoreWebEngine 和 W3SVC 功能才能使用 [ProductName]。"/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="必须安装 IIS 管理控制台才能使用 [ProductName]。"/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="请先停止 Windows Process Activation Service (WAS)和 Web 管理服务(WMSvc)这两项服务，然后再安装 [ProductName]。安装 [ProductName] 后需要启动这些服务。"/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="安装 [ProductName] 需要 IIS 元数据库。"/>
+  <String Id="LaunchCondition_32BIT" Value="无法在 32 位版本的 Microsoft Windows 上安装 64 位版本的 [ProductName]。"/>
+  <String Id="LaunchCondition_64BIT" Value="无法在 64 位版本的 Microsoft Windows 上安装 32 位版本的 [ProductName]。"/>
+  <String Id="NetFX2OrGreaterRequired" Value="安装 [ProductName] 需要 Microsoft .NET Framework 版本 2.0 或更高版本。"/>
+  <String Id="NetFX35OrGreaterRequired" Value="安装 [ProductName] 需要 Microsoft .NET Framework 版本 3.5 或更高版本。使用服务器管理器中的“添加功能”安装 Microsoft .NET 版本 3.5。"/>
+  <String Id="NetFX4OrGreaterRequired" Value="安装 [ProductName] 需要 Microsoft .NET Framework 版本 4.0 或更高版本。"/>
+  <String Id="NetFX20SP1IsRequired" Value="请先安装 Microsoft .NET Framework 版本 2.0 Service Pack 1 (或更高版本的服务包)，然后再安装 [ProductName]。"/>
+  <String Id="WindowsUpdateEnabled" Value="无法禁用 Windows 更新(wuauserv)服务，安装 [ProductName] 需要该服务。"/>
+  <String Id="GetFromOSforWin7" Value="PowerShell 管理单元是 Windows 操作系统的一部分。请通过“程序和功能”或“服务器管理器”安装。"/>
+  <String Id="WebPI3OrGreaterRequired" Value="安装 [ProductName] 需要 Microsoft Web 平台安装程序版本 3.0 或更高版本。"/>
+
+  <String Id="Error30001" Overridable="yes" Value="安装未能检测到共享配置。"/>
+  <String Id="Error30002" Overridable="yes" Value="IIS 已启用共享配置。使用共享配置时不支持安装 [ProductName]。请先禁用共享配置，然后再安装此功能。"/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="请先停止 World Wide Web 发布服务(W3SVC)，然后再安装 [ProductName]。安装后需要启动该服务。"/>
+  <String Id="IISPowershellConsole" Value="IIS PowerShell 管理控制台"/>
+  <String Id="IISPowershellSnapin" Value="IIS PowerShell 管理单元"/>
+  <String Id="PowerShellRequired" Value="IIS PowerShell 管理单元需要安装 PowerShell v1.0 或 v2.0"/>
+  <String Id="WasAndConfigRequired" Value="IIS PowerShell 管理单元需要安装 WAS 和配置"/>
+  <String Id="TestBogusString" Overridable="yes" Value="这是一个虚假字符串。"/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/3082/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/3082/setupstrings.wxl
new file mode 100644
index 000000000000..135714d985c7
--- /dev/null
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/3082/setupstrings.wxl
@@ -0,0 +1,51 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+
+  <String Id="Language" Value="1033"/>
+
+  <!-- Strings for AspNetCore Module -->
+  <String Id="AspNetCoreModuleProductName" Value="Módulo de LeXtudio HTTP Bridge"/>
+  <String Id="AspNetCoreModuleProductNameV2" Value="Módulo de LeXtudio HTTP Bridge V2"/>
+  <String Id="AspNetCoreModuleProductTitle" Value="Runtime de LeXtudio HTTP Bridge de IIS"/>
+  <String Id="AspNetCoreModuleProductDescription" Value="Agrega el soporte de aplicación HTTP en IIS."/>
+  <String Id="AspNetCoreIISExpressModuleProductName" Value="Módulo LeXtudio HTTP Bridge para IIS Express"/>
+  <String Id="AspNetCoreIISExpressModuleProductNameV2" Value="Módulo LeXtudio HTTP Bridge V2 para IIS Express"/>
+  <String Id="AspNetCoreModuleIISExpressPrereq" Value="No está instalado IIS Express 8.0 o posterior."/>
+
+  <!--Custom errors for OOB Projects -->
+
+  <String Id="Manufacturer" Overridable="yes" Value="LeXtudio Inc."/>
+  <String Id="ConflictingProduct" Overridable="yes" Value="Hay un producto incompatible, [CONFLICTING_PRODUCT_NAME], en este equipo. La instalación de [ProductName] no puede continuar. Para instalar este producto, usa Agregar o quitar programas en el Panel de control para eliminar [CONFLICTING_PRODUCT_NAME]."/>
+  <String Id="AdminRequired" Overridable="yes" Value="Se requieren privilegios de administrador para instalar [ProductName]."/>
+  <String Id="IIS7Only" Overridable="yes" Value="Se requiere IIS versión 7.0 para usar [ProductName]."/>
+  <String Id="IIS7OrGreater" Overridable="yes" Value="Se requiere IIS versión 7.0 o posterior para instalar [ProductName]."/>
+  <String Id="IIS75OrGreater" Overridable="yes" Value="Se requiere IIS versión 7.5 o posterior para instalar [ProductName]."/>
+  <String Id="IIS7Or75Only" Overridable="yes" Value="Se requiere IIS versión 7 o 7.5 para instalar [ProductName]."/>
+  <String Id="IIS8OrGreater" Overridable="yes" Value="Se requiere IIS versión 8.0 o posterior para instalar [ProductName]."/>
+  <String Id="BetaVersionFound" Overridable="yes" Value="Se encontró la versión beta de [ProductName] en este equipo."/>
+  <String Id="NewerVersionFound" Overridable="yes" Value="Se encontró una versión más reciente de [ProductName] en este equipo."/>
+  <String Id="DuplicateVersionFound" Overridable="yes" Value="La instalación no puede continuar porque ya hay otra instancia de [ProductName] instalada en este equipo. Desinstálela primero y luego vuelva a iniciar esta instalación."/>
+  <String Id="CoreWebW3SVC" Overridable="yes" Value="Las características CoreWebEngine y W3SVC de IIS 7.0 deben estar instaladas para usar [ProductName]."/>
+  <String Id="IISManagementConsole" Overridable="yes" Value="La consola de administración de IIS debe estar instalada para usar [ProductName]."/>
+  <String Id="WebServicesRunning" Overridable="yes" Value="Detenga los servicios de Servicio de activación de procesos de Windows (WAS) y el servicio de administración web (WMSvc) antes de instalar [ProductName]. Tendrá que iniciar los servicios después de instalar [ProductName]."/>
+  <String Id="MetabaseRequired" Overridable="yes" Value="Se necesita la metabase de IIS para instalar [ProductName]."/>
+  <String Id="LaunchCondition_32BIT" Value="La versión de 64 bits de [ProductName] no se puede instalar en una edición de 32 bits de Microsoft Windows."/>
+  <String Id="LaunchCondition_64BIT" Value="La versión de 32 bits de [ProductName] no se puede instalar en una edición de 64 bits de Microsoft Windows."/>
+  <String Id="NetFX2OrGreaterRequired" Value="Se requiere IIS versión 2.0 de Microsoft .NET Framework o posterior para instalar [ProductName]."/>
+  <String Id="NetFX35OrGreaterRequired" Value="Se requiere IIS versión 3.5 de Microsoft .NET Framework o posterior para instalar [ProductName]. Use &quot;Agregar características&quot; en el Administrador del servidor para instalar Microsoft .NET versión 3.5."/>
+  <String Id="NetFX4OrGreaterRequired" Value="Se requiere IIS versión 4.0 de Microsoft .NET Framework o posterior para instalar [ProductName]."/>
+  <String Id="NetFX20SP1IsRequired" Value="Instale Microsoft .NET Framework versión 2.0 Service Pack 1 (o un Service Pack posterior) antes de instalar [ProductName]."/>
+  <String Id="WindowsUpdateEnabled" Value="No se puede deshabilitar el servicio de Windows Update (wuauserv); es necesario para instalar [ProductName]."/>
+  <String Id="GetFromOSforWin7" Value="El complemento de PowerShell forma parte del sistema operativo Windows. Instálelo a través de &quot;Programas y características&quot; o &quot;Administrador del servidor&quot;."/>
+  <String Id="WebPI3OrGreaterRequired" Value="Se requiere la versión 3.0 o posterior del instalador de plataforma Web de Microsoft para instalar [ProductName]."/>
+
+  <String Id="Error30001" Overridable="yes" Value="El programa de instalación no pudo detectar la configuración compartida."/>
+  <String Id="Error30002" Overridable="yes" Value="La configuración compartida está habilitada en IIS. No se admite la instalación de [ProductName] con configuración compartida. Desactívela antes de instalar esta característica."/>
+
+  <String Id="W3SVCRunning" Overridable="yes" Value="Detenga el servicio de publicación World Wide Web (W3SVC) antes de instalar [ProductName]. Tendrá que iniciar el servicio después de la instalación."/>
+  <String Id="IISPowershellConsole" Value="Consola de administración de PowerShell de IIS"/>
+  <String Id="IISPowershellSnapin" Value="Complemento de PowerShell para IIS"/>
+  <String Id="PowerShellRequired" Value="El complemento de PowerShell de IIS requiere que PowerShell v1.0 o v2.0 esté instalado"/>
+  <String Id="WasAndConfigRequired" Value="El complemento de PowerShell de IIS requiere que WAS y la configuración estén instalados"/>
+  <String Id="TestBogusString" Overridable="yes" Value="Esta es una cadena falsa."/>
+
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
index 1e3896890e4d..615736764578 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props
@@ -27,6 +27,7 @@
       <!-- See https://github.com/dotnet/aspnetcore/issues/40525 -->
       <WarningLevel>Level4</WarningLevel>
       <TreatSpecificWarningsAsErrors>$(TreatSpecificWarningsAsErrors);4018;4055;4146;4242;4244;4267;4302;4308;4509;4510;4532;4533;4610;4611;4700;4701;4703;4789;4995;4996</TreatSpecificWarningsAsErrors>
+      <AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/license/license.rtf b/src/Installers/Windows/AspNetCoreModule-Setup/license/license.rtf
index 91c46e44c4b2..0c6d156a5914 100644
Binary files a/src/Installers/Windows/AspNetCoreModule-Setup/license/license.rtf and b/src/Installers/Windows/AspNetCoreModule-Setup/license/license.rtf differ
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/setupstrings.wxl
deleted file mode 100644
index 5ac48523c584..000000000000
--- a/src/Installers/Windows/AspNetCoreModule-Setup/setupstrings.wxl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-
-  <String Id="Language">1033</String>
-
-  <!-- Strings for AspNetCore Module -->
-  <String Id="AspNetCoreModuleProductName">Microsoft ASP.NET Core Module</String>
-  <String Id="AspNetCoreModuleProductNameV2">Microsoft ASP.NET Core Module V2</String>
-  <String Id="AspNetCoreModuleProductTitle">ASP.NET Core IIS Runtime</String>
-  <String Id="AspNetCoreModuleProductDescription">Adds the support of asp.net core application to IIS.</String>
-  <String Id="AspNetCoreIISExpressModuleProductName">Microsoft ASP.NET Core Module for IIS Express</String>
-  <String Id="AspNetCoreIISExpressModuleProductNameV2">Microsoft ASP.NET Core Module V2 for IIS Express</String>
-  <String Id="AspNetCoreModuleIISExpressPrereq">IIS Express 8.0 or higher is not installed.</String>
-
-  <!--Custom errors for OOB Projects -->
-
-  <String Id="Manufacturer" Overridable="yes">Microsoft Corporation</String>
-  <String Id="ConflictingProduct" Overridable="yes">An incompatible product, [CONFLICTING_PRODUCT_NAME], is on this computer.  Installation of [ProductName] cannot continue.  To install this product, use Add/Remove Programs on the Control Panel to remove [CONFLICTING_PRODUCT_NAME].</String>
-  <String Id="AdminRequired" Overridable="yes">Administrator privilege is required to install [ProductName].</String>
-  <String Id="IIS7Only" Overridable="yes">IIS Version 7.0 is required to use [ProductName].</String>
-  <String Id="IIS7OrGreater" Overridable="yes">IIS Version 7.0 or greater is required to install [ProductName].</String>
-  <String Id="IIS75OrGreater" Overridable="yes">IIS Version 7.5 or greater is required to install [ProductName].</String>
-  <String Id="IIS7Or75Only" Overridable="yes">IIS Version 7 or 7.5 is required to install [ProductName].</String>
-  <String Id="IIS8OrGreater" Overridable="yes">IIS Version 8.0 or greater is required to install [ProductName].</String>
-  <String Id="BetaVersionFound" Overridable="yes">The beta version of [ProductName] was found on this machine.</String>
-  <String Id="NewerVersionFound" Overridable="yes">A newer version of [ProductName] was found on this machine.</String>
-  <String Id="DuplicateVersionFound" Overridable="yes">Setup cannot continue because another instance of [ProductName] is already installed on this computer. Please uninstall it first and then re-launch this installation.</String>
-  <String Id="CoreWebW3SVC" Overridable="yes">The IIS 7.0 CoreWebEngine and W3SVC features must be installed to use [ProductName].</String>
-  <String Id="IISManagementConsole" Overridable="yes">The IIS Management Console must be installed to use [ProductName].</String>
-  <String Id="WebServicesRunning" Overridable="yes">Please stop both services Windows Process Activation Service (WAS) and Web Management Service (WMSvc) before installing [ProductName]. You will need to start the services after installing [ProductName].</String>
-  <String Id="MetabaseRequired" Overridable="yes">IIS Metabase is required to install [ProductName].</String>
-  <String Id="LaunchCondition_32BIT">The 64-bit version of [ProductName] cannot be installed on a 32-bit edition of Microsoft Windows.</String>
-  <String Id="LaunchCondition_64BIT">The 32-bit version of [ProductName] cannot be installed on a 64-bit edition of Microsoft Windows.</String>
-  <String Id="NetFX2OrGreaterRequired">Microsoft .NET Framework Version 2.0 or greater is required to install [ProductName].</String>
-  <String Id="NetFX35OrGreaterRequired">Microsoft .NET Framework Version 3.5 or greater is required to install [ProductName].  Use 'Add Features' under the Server Manager to install Microsoft .Net Version 3.5.</String>
-  <String Id="NetFX4OrGreaterRequired">Microsoft .NET Framework Version 4.0 or greater is required to install [ProductName].</String>
-  <String Id="NetFX20SP1IsRequired">Please install Microsoft .NET Framework Version 2.0 Service Pack 1 (or a later service pack), before installing [ProductName].</String>
-  <String Id="WindowsUpdateEnabled">The Windows Update (wuauserv) service cannot be disabled, it is required to install [ProductName].</String>
-  <String Id="GetFromOSforWin7">The PowerShell snap-in is part of Windows Operating System. Please install it via 'Programs and Features'  or 'Server Manager'.</String>
-  <String Id="WebPI3OrGreaterRequired">Microsoft Web Platform Installer Version 3.0 or greater is required to install [ProductName].</String>
-
-  <String Id="Error30001" Overridable="yes">Setup failed to detect shared configuration.</String>
-  <String Id="Error30002" Overridable="yes">Shared configuration is enabled for IIS. Installing [ProductName] is not supported when using shared configuration. Please disable shared configuration before installing this feature.</String>
-
-  <String Id="W3SVCRunning" Overridable="yes">Please stop World Wide Web Publishing Service (W3SVC) before installing [ProductName]. You will need to start the service after installation. </String>
-  <String Id="IISPowershellConsole">IIS PowerShell Management Console</String>
-  <String Id="IISPowershellSnapin">IIS PowerShell snap-in</String>
-  <String Id="PowerShellRequired">IIS PowerShell snap-in requires PowerShell v1.0 or v2.0 installed</String>
-  <String Id="WasAndConfigRequired">IIS PowerShell snap-in requires WAS and configuration installed</String>
-  <String Id="TestBogusString" Overridable="yes">This is a bogus string.</String>
-
-</WixLocalization>
diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs
deleted file mode 100644
index 74bd4cf5e7e3..000000000000
--- a/src/Installers/Windows/Common/dotnethome_x64.wxs
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?ifndef Platform?>
-    <?define Platform = "$(sys.BUILDARCH)"?>
-  <?endif?>
-
-  <!-- InstallerNativeMachine matches the expected values for image file machine constants
-       https://learn.microsoft.com/windows/win32/sysinfo/image-file-machine-constants -->
-  <?if $(var.Platform)~=x86?>
-    <?define InstallerNativeMachine=332?>
-  <?elseif $(var.Platform)~=x64?>
-    <?define InstallerNativeMachine=34404?>
-  <?elseif $(var.Platform)~=arm64?>
-    <?define InstallerNativeMachine=43620?>
-  <?else?>
-    <?error Unknown platform, $(var.Platform) ?>
-  <?endif?>
-
-  <Fragment>
-    <!-- Identify when installing in emulation as when WIX_NATIVE_MACHINE does not match the installer
-         native machine (where supported).  Also detect running under WOW on x86 using VersionNT64,
-         since WIX_NATIVE_MACHINE cannot be retrieved on older Windows builds. -->
-    <PropertyRef Id="WIX_NATIVE_MACHINE" />
-    <SetProperty Action="Set_NON_NATIVE_ARCHITECTURE" Id="NON_NATIVE_ARCHITECTURE" Value="true" Before="CostFinalize">
-     <?if $(var.Platform)~=x86?>
-      VersionNT64 OR
-     <?endif?>
-      WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)"
-    </SetProperty>
-  </Fragment>
-
-  <?if $(var.Platform)~=x64?>
-  <Fragment>
-    <!-- When running in a non-native architecture and user hasn't specified install directory,
-         install to an x64 subdirectory.
-         This is only define for x64, since x86 has redirection and no other native architecture can install ARM64 today -->
-    <SetProperty Action="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" Id="DOTNETHOME" Value="[ProgramFiles64Folder]dotnet\x64\" After="Set_NON_NATIVE_ARCHITECTURE">
-      NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME
-    </SetProperty>
-  </Fragment>
-  <?endif?>
-</Wix>
\ No newline at end of file
diff --git a/src/Installers/Windows/Directory.Build.props b/src/Installers/Windows/Directory.Build.props
index 7b5c76d821ff..3329e45c613b 100644
--- a/src/Installers/Windows/Directory.Build.props
+++ b/src/Installers/Windows/Directory.Build.props
@@ -9,6 +9,9 @@
       Read more here => https://github.com/dotnet/project-system/blob/main/docs/build-acceleration.md#limitations
     -->
     <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
+
+    <!-- Suppress validation to avoid Applocker failures when running light.exe on dev machines. -->
+    <SuppressValidation>true</SuppressValidation>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
index 8c37066400ac..ab8ed02951b0 100644
--- a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
+++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
@@ -4,7 +4,6 @@
 param(
     [Parameter(Mandatory=$true)][string]$Name,
     [Parameter(Mandatory=$true)][string]$MsiPath,
-    [Parameter(Mandatory=$false)][string]$CabPath,
     [Parameter(Mandatory=$true)][string]$NuspecFile,
     [Parameter(Mandatory=$true)][string]$OutputDirectory,
     [Parameter(Mandatory=$true)][string]$Architecture,
@@ -34,5 +33,5 @@ if (-not (Test-Path $NuGetExe)) {
     -OutputDirectory $OutputDirectory `
     -NoDefaultExcludes `
     -NoPackageAnalysis `
-    -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PackageIcon=$PackageIcon`;PackageIconFullPath=$PackageIconFullPath`;PackageLicenseExpression=$PackageLicenseExpression`;
+    -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PackageIcon=$PackageIcon`;PackageIconFullPath=$PackageIconFullPath`;PackageLicenseExpression=$PackageLicenseExpression`;
 Exit $LastExitCode
diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj
index 79e671455dfb..82ffd6654dad 100644
--- a/src/Installers/Windows/HostOptions/HostOptions.wixproj
+++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
   <PropertyGroup>
-    <Name>$(HostOptionsName)</Name>
-    <OutputName>$(HostOptionsName)</OutputName>
+    <Name>dotnet-hosting-options-$(_ProductVersionForInstallers)-win</Name>
+    <OutputName>$(Name)</OutputName>
+    <PackageFileName>$(Name).msi</PackageFileName>
     <OutputType>Package</OutputType>
     <ProductNameFolder>Microsoft ASP.NET Core Hosting Bundle Options</ProductNameFolder>
     <ProductNameShort>AspNetCore.HostOptions</ProductNameShort>
@@ -12,19 +12,17 @@
     <ProjectGuid>20248cd1-c5aa-4f42-ad88-bc260d64deea</ProjectGuid>
     <IsShipping>true</IsShipping>
     <SchemaVersion>2.0</SchemaVersion>
+    <!-- We import D.B.T ourselves in this file -->
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 
     <!-- Namespace used to generate stable UUID3 GUIDs for MSI ProductCode, etc. DO NOT CHANGE THIS. -->
     <NamespaceGuid>$(HostingBundleNamespaceGuid)</NamespaceGuid>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="Product.wxs" />
-  </ItemGroup>
-
+  <Import Project="Sdk.targets" Sdk="Microsoft.WixToolset.Sdk" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <PropertyGroup>
-    <PackageFileName>dotnet-hosting-options-$(PackageVersion)-win$(TargetExt)</PackageFileName>
     <ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options</ProductName>
     <DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
   </PropertyGroup>
diff --git a/src/Installers/Windows/HostOptions/Product.wxs b/src/Installers/Windows/HostOptions/Product.wxs
index 127ce886b0f0..21ce26559710 100644
--- a/src/Installers/Windows/HostOptions/Product.wxs
+++ b/src/Installers/Windows/HostOptions/Product.wxs
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)" 
-             Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
-        <Package InstallerVersion="$(var.InstallerVersion)" Compressed="yes" InstallScope="perMachine" />
-
+<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Package Name="$(ProductName)" Language="1033" Version="$(Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(UpgradeCode)" InstallerVersion="$(InstallerVersion)" ProductCode="$(ProductCode)">
+        
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
         <Media Id="1" />
 
@@ -20,26 +17,24 @@
             <!-- First option is to use user input, if they passed any (if they explicitly set an option to the empty string, we convert that to 0 here). -->
             <!-- Second option is to use registry values, if present. -->
             <!-- Third option is to set the options all to 0, which we do here. -->
-            <Custom Action="Set_OPT_NO_ANCM" After="AppSearch">NOT OPT_NO_ANCM OR OPT_NO_ANCM=""</Custom>
-            <Custom Action="Set_OPT_NO_SHAREDFX" After="AppSearch">NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=""</Custom>
-            <Custom Action="Set_OPT_NO_RUNTIME" After="AppSearch">NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=""</Custom>
-            <Custom Action="Set_OPT_NO_X86" After="AppSearch">NOT OPT_NO_X86 OR OPT_NO_X86=""</Custom>
-            <Custom Action="Set_OPT_NO_SHARED_CONFIG_CHECK" After="AppSearch">NOT OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=""</Custom>
+            <Custom Action="Set_OPT_NO_ANCM" After="AppSearch" Condition="NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;&quot;" />
+            <Custom Action="Set_OPT_NO_SHAREDFX" After="AppSearch" Condition="NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;&quot;" />
+            <Custom Action="Set_OPT_NO_RUNTIME" After="AppSearch" Condition="NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;&quot;" />
+            <Custom Action="Set_OPT_NO_X86" After="AppSearch" Condition="NOT OPT_NO_X86 OR OPT_NO_X86=&quot;&quot;" />
+            <Custom Action="Set_OPT_NO_SHARED_CONFIG_CHECK" After="AppSearch" Condition="NOT OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=&quot;&quot;" />
         </InstallExecuteSequence>
 
         <Feature Id="ProductFeature" Title="HostOptions" Level="1">
             <ComponentGroupRef Id="ProductComponents" />
         </Feature>
-    </Product>
+    </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="$(var.ProgramFilesFolder)">
-                <Directory Id="INSTALLFOLDER" Name="dotnet">
-                    <Directory Id="MM" Name="$(var.MajorVersion).$(var.MinorVersion)" />
-                </Directory>
+        <StandardDirectory Id="ProgramFiles6432Folder">
+            <Directory Id="INSTALLFOLDER" Name="dotnet">
+                <Directory Id="MM" Name="$(MajorVersion).$(MinorVersion)" />
             </Directory>
-        </Directory>
+        </StandardDirectory>
     </Fragment>
 
     <Fragment>
@@ -49,10 +44,10 @@
             <?undef ProductOptionsKey?>
             <?endif?>
 
-            <?define ProductOptionsKey=SOFTWARE\Microsoft\dotnet\host\options\$(var.MajorVersion).$(var.MinorVersion)?>
+            <?define ProductOptionsKey=SOFTWARE\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)?>
 
-            <Component Id="OPT" Guid="*">
-                <RegistryKey Root="HKLM" Key="$(var.ProductOptionsKey)">
+            <Component Id="OPT">
+                <RegistryKey Root="HKLM" Key="$(ProductOptionsKey)">
                     <RegistryValue Name="OPT_NO_ANCM" Type="integer" Value="[OPT_NO_ANCM]" KeyPath="yes" />
                     <RegistryValue Name="OPT_NO_SHAREDFX" Type="integer" Value="[OPT_NO_SHAREDFX]" />
                     <RegistryValue Name="OPT_NO_RUNTIME" Type="integer" Value="[OPT_NO_RUNTIME]" />
diff --git a/src/Installers/Windows/Installers.slnf b/src/Installers/Windows/Installers.slnf
index 58edd65f7da2..f730a38a3ed6 100644
--- a/src/Installers/Windows/Installers.slnf
+++ b/src/Installers/Windows/Installers.slnf
@@ -1,14 +1,11 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\CustomAction\\aspnetcoreCA.vcxproj",
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj",
       "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj",
-      "src\\Installers\\Windows\\SharedFrameworkLib\\SharedFrameworkLib.wixproj",
-      "src\\Installers\\Windows\\SharedFrameworkBundle\\SharedFrameworkBundle.wixproj",
-      "src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj",
-      "src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj"
+      "src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj"
     ]
   }
 }
diff --git a/src/Installers/Windows/SharedFramework/DependencyProvider.wxs b/src/Installers/Windows/SharedFramework/DependencyProvider.wxs
deleted file mode 100644
index d62c3dfe7ddb..000000000000
--- a/src/Installers/Windows/SharedFramework/DependencyProvider.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
-    <Fragment>
-        <Feature Id="FT_DepProvider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install">
-            <ComponentRef Id="C_DepProvider" />
-        </Feature>
-
-        <DirectoryRef Id="TARGETDIR">
-            <Component Id="C_DepProvider" Win64="no">
-                <dep:Provides Key="$(var.DepProviderKey)" />
-            </Component>
-        </DirectoryRef>
-    </Fragment>
-</Wix>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs
deleted file mode 100644
index 30d8d6025817..000000000000
--- a/src/Installers/Windows/SharedFramework/Product.wxs
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)"
-             Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
-        <Package InstallerVersion="$(var.InstallerVersion)" Compressed="yes" InstallScope="perMachine" />
-
-        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallFinalize" />
-        <Media Id="1" Cabinet="$(var.Cabinet)" CompressionLevel="high" EmbedCab="$(var.EmbedCab)" />
-
-        <WixVariable Id="WixUILicenseRtf" Value="$(var.files)\eula.txt" />
-        <UIRef Id="WixUI_Minimal" />
-
-        <FeatureRef Id="FT_DepProvider" />
-        <FeatureRef Id="FT_AspNetCoreSharedFramework" />
-        <FeatureRef Id="FT_ProductInfo" />
-    </Product>
-
-    <?ifdef PFilesFolder?>
-    <?undef PFilesFolder?>
-    <?endif?>
-
-    <?if $(var.Platform)=x86?>
-    <?define PFilesFolder=ProgramFilesFolder?>
-    <?elseif $(var.Platform)=x64 or $(var.Platform)=arm64?>
-    <?define PFilesFolder=ProgramFiles64Folder?>
-    <?else?>
-    <?error Invalid Platform ($(var.Platform))?>
-    <?endif?>
-
-    <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="$(var.PFilesFolder)">
-                <Directory Id="DOTNETHOME" Name="dotnet">
-                    <Directory Id="SharedFolder" Name="shared" />
-                </Directory>
-            </Directory>
-        </Directory>
-
-        <?if $(var.Platform)=x64?>
-        <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
-        <?endif?>
-    </Fragment>
-
-    <Fragment>
-        <Feature Id="FT_AspNetCoreSharedFramework" Absent="allow" Description="!(loc.FT_AspNetCoreSharedFrameworkDescription)" Display="2" Level="1" Title="!(loc.FT_AspNetCoreSharedFrameworkTitle)">
-            <ComponentGroupRef Id="CG_AspNetCoreSharedFramework" />
-        </Feature>
-    </Fragment>
-
-    <Fragment>
-        <Feature Id="FT_ProductInfo">
-            <ComponentGroupRef Id="CG_ProductInfo" />
-        </Feature>
-
-        <ComponentGroup Id="CG_ProductInfo">
-            <ComponentRef Id="C_eula.txt" />
-            <ComponentRef Id="C_ProductVersion"/>
-            <ComponentRef Id="C_ProductInstallDir"/>
-            <?if $(var.Platform)=x64 ?>
-            <ComponentRef Id="C_ProductVersion_NonNative" />
-            <ComponentRef Id="C_ProductInstallDir_NonNative" />
-            <?endif?>
-            <ComponentRef Id="C_ProductCentralVersion" />
-        </ComponentGroup>
-
-        <DirectoryRef Id="SharedFolder">
-            <Component Id="C_eula.txt">
-                <File Name="eula.txt" Source="$(var.files)\eula.txt" />
-            </Component>
-
-            <?ifdef ProductVersionKey?>
-            <?undef ProductVersionKey?>
-            <?endif?>
-
-            <?define ProductVersionKey=SOFTWARE\Microsoft\ASP.NET Core\Shared Framework\v$(var.MajorVersion).$(var.MinorVersion)\$(var.PackageVersion)?>
-
-            <?ifdef ProductVersionCentralKey?>
-            <?undef ProductVersionCentralKey?>
-            <?endif?>
-
-            <?define ProductVersionCentralKey=SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sharedfx\Microsoft.AspNetCore.App?>
-
-            <Component Id="C_ProductVersion">
-                <?if $(var.Platform)=x64 ?>
-                <!-- Only install when actually on native architecture -->
-                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
-                <?endif?>
-                <RegistryKey Key="$(var.ProductVersionKey)" Root="HKLM">
-                    <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="C_ProductInstallDir">
-                <?if $(var.Platform)=x64 ?>
-                <!-- Only install when actually on native architecture -->
-                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
-                <?endif?>
-                <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework" Root="HKLM">
-                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
-                </RegistryKey>
-            </Component>
-
-            <?if $(var.Platform)=x64 ?>
-            <!-- Install keys to a different path when not native architecture -->
-            <Component Id="C_ProductVersion_NonNative">
-                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
-                <RegistryKey Key="$(var.ProductVersionKey)\$(var.Platform)" Root="HKLM">
-                    <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="C_ProductInstallDir_NonNative">
-                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
-                <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Shared Framework\$(var.Platform)" Root="HKLM">
-                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
-                </RegistryKey>
-            </Component>
-            <?endif?>
-        </DirectoryRef>
-
-        <Component Id="C_ProductCentralVersion" Directory="TARGETDIR" Win64="no">
-            <RegistryKey Key="$(var.ProductVersionCentralKey)" Root="HKLM">
-                <RegistryValue Action="write" Name="$(var.PackageVersion)" Type="integer" Value="1" KeyPath="yes"/>
-            </RegistryKey>
-        </Component>
-    </Fragment>
-</Wix>
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.nuspec b/src/Installers/Windows/SharedFramework/SharedFramework.nuspec
deleted file mode 100644
index 99a350d5462c..000000000000
--- a/src/Installers/Windows/SharedFramework/SharedFramework.nuspec
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$</id>
-        <version>1.0.0</version>
-        <title>VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$</title>
-        <authors>Microsoft</authors>
-        <owners>Microsoft</owners>
-        <license type="expression">$PackageLicenseExpression$</license>
-        <projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
-        <icon>$PackageIcon$</icon>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>$MAJOR$.$MINOR$ ASP.NET Core Shared Framework ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
-        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <serviceable>true</serviceable>
-    </metadata>
-    <files>
-        <file src="$ASPNETCORE_RUNTIME_MSI$" />
-        <file src="$ASPNETCORE_CAB_FILE$" />
-        <file src="$PackageIconFullPath$" target="$PackageIcon$" />
-    </files>
-</package>
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
deleted file mode 100644
index 92eeef609891..000000000000
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <OutputNamePrefix>$(RuntimeInstallerBaseName)-</OutputNamePrefix>
-    <OutputNameSuffix>-win-$(Platform)</OutputNameSuffix>
-    <ProductNameFolder>Microsoft ASP.NET Core Shared Framework</ProductNameFolder>
-    <ProductNameShort>AspNetCore.SharedFramework</ProductNameShort>
-    <OutputType>Package</OutputType>
-    <EmbedCab>yes</EmbedCab>
-    <Cabinet>sfx_$(Platform).cab</Cabinet>
-    <ProjectGuid>C681D730-4505-42C6-9E6C-87F757C4FB32</ProjectGuid>
-    <HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
-    <HarvestDirectorySuppressSpecificWarnings>5150;5151</HarvestDirectorySuppressSpecificWarnings>
-    <HarvestDirectorySuppressRegistry>true</HarvestDirectorySuppressRegistry>
-    <HarvestSource>$(IntermediateOutputPath)fx\</HarvestSource>
-    <ExtractPath>$(IntermediateOutputPath)fxExtractPath\</ExtractPath>
-    <IsShipping>true</IsShipping>
-    <DefineConstants>$(DefineConstants);ProductNameFolder=$(ProductNameFolder)</DefineConstants>
-    <DefineConstants>$(DefineConstants);ProductNameShort=$(ProductNameShort)</DefineConstants>
-    <DefineConstants>$(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource)</DefineConstants>
-    <NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <WixExtension Include="WixDependencyExtension">
-      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
-      <Name>WixDependencyExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixNetFxExtension">
-      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
-      <Name>WixNetFxExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="DependencyProvider.wxs" />
-    <Compile Include="Product.wxs" />
-    <Compile Include="..\Common\dotnethome_x64.wxs" Link="dotnethome_x64.wxs" />
-    <EmbeddedResource Include="Strings.wxl" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
-    <HarvestDirectory Include="$(HarvestSource)">
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-      <ComponentGroupName>CG_AspNetCoreSharedFramework</ComponentGroupName>
-      <DirectoryRefId>DOTNETHOME</DirectoryRefId>
-      <PreprocessorVariable>var.AspNetCoreSharedFrameworkSource</PreprocessorVariable>
-    </HarvestDirectory>
-  </ItemGroup>
-
-  <!-- TODO: https://github.com/dotnet/aspnetcore/issues/6304. Harvest shared frameworks from a project reference -->
-  <Target Name="ExtractIntermediateSharedFx" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <SharedFrameworkArm64HarvestRootPath Condition="'$(SharedFrameworkArm64HarvestRootPath)' == ''">$(InstallersOutputPath)</SharedFrameworkArm64HarvestRootPath>
-      <SharedFrameworkX64HarvestRootPath Condition="'$(SharedFrameworkX64HarvestRootPath)' == ''">$(InstallersOutputPath)</SharedFrameworkX64HarvestRootPath>
-      <SharedFrameworkX86HarvestRootPath Condition="'$(SharedFrameworkX86HarvestRootPath)' == ''">$(InstallersOutputPath)</SharedFrameworkX86HarvestRootPath>
-      <IntermediateArm64SharedFxZip>$(SharedFrameworkArm64HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-arm64.zip</IntermediateArm64SharedFxZip>
-      <IntermediateX64SharedFxZip>$(SharedFrameworkX64HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-x64.zip</IntermediateX64SharedFxZip>
-      <IntermediateX86SharedFxZip>$(SharedFrameworkX86HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-x86.zip</IntermediateX86SharedFxZip>
-    </PropertyGroup>
-
-    <Unzip Condition="'$(Platform)' == 'arm64'"
-           SourceFiles="$(IntermediateArm64SharedFxZip)" DestinationFolder="$(ExtractPath)" />
-    <Unzip Condition="'$(Platform)' == 'x64'"
-           SourceFiles="$(IntermediateX64SharedFxZip)" DestinationFolder="$(ExtractPath)" />
-    <Unzip Condition="'$(Platform)' == 'x86'"
-           SourceFiles="$(IntermediateX86SharedFxZip)" DestinationFolder="$(ExtractPath)" />
-
-    <!-- The runtime zips also contain the core runtime shared framework, which we don't want when harvesting.
-         Copy just the aspnetcore shared Fx to the harvest location -->
-    <ItemGroup>
-      <SharedFxFilesToHarvest Include="$(ExtractPath)\shared\Microsoft.AspNetCore.App\**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(SharedFxFilesToHarvest)" DestinationFolder="$(HarvestSource)\shared\Microsoft.AspNetCore.App\%(RecursiveDir)" />
-  </Target>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
-    <ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform))</ProductName>
-    <DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
-  </PropertyGroup>
-
-  <Target Name="CreateSharedFrameworkNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
-    <PropertyGroup>
-      <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
-    </PropertyGroup>
-
-    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
-                      '$(ProductNameShort)' ^
-                      '$(MsiFullPath)' ^
-                      '$(CabFullPath)' ^
-                      '$(ToolsetInstallerNuspecFile)' ^
-                      '$(ArtifactsNonShippingPackagesDir)' ^
-                      '$(Platform)' ^
-                      '$(_GeneratedPackageVersion)' ^
-                      '$(RepoRoot)' ^
-                      '$(AspNetCoreMajorVersion)' ^
-                      '$(AspNetCoreMinorVersion)' ^
-                      '$(PackageIcon)' ^
-                      '$(PackageIconFullPath)' ^
-                      '$(PackageLicenseExpression)' " />
-  </Target>
-</Project>
diff --git a/src/Installers/Windows/SharedFramework/Strings.wxl b/src/Installers/Windows/SharedFramework/Strings.wxl
deleted file mode 100644
index ffac28752f89..000000000000
--- a/src/Installers/Windows/SharedFramework/Strings.wxl
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-    <String Id="FT_AspNetCoreSharedFrameworkTitle">ASP.NET Core Shared Framework</String>
-    <String Id="FT_AspNetCoreSharedFrameworkDescription">ASP.NET Core Shared Framework</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl
deleted file mode 100644
index 04d9933dd9fb..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[BundleNameFull] 安裝程式</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">版本 [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">您確定要取消嗎?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">前一版</String>
-  <String Id="HelpHeader">安裝說明</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]目錄[\]] - 在目錄中安裝、修復、解除安裝或
-   建立搭售方案的完整本機複本。預設為安裝。
-
-/passive | /quiet -  顯示最少 UI 且不含提示，或者不顯示 UI，也
-   不顯示提示。預設會顯示 UI 和所有提示。
-
-/norestart   - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。
-/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。</String>
-  <String Id="HelpCloseButton">關閉(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">我同意授權條款及條件(&amp;A)</String>
-  <String Id="InstallInstallButton">安裝(&amp;I)</String>
-  <String Id="InstallCloseButton">關閉(&amp;C)</String>
-  <String Id="ProgressHeader">安裝進度</String>
-  <String Id="ProgressLabel">處理中: </String>
-  <String Id="OverallProgressPackageText">正在初始化...</String>
-  <String Id="ProgressCancelButton">取消(&amp;C)</String>
-  <String Id="ModifyHeader">修改安裝</String>
-  <String Id="ModifyRepairButton">修復(&amp;R)</String>
-  <String Id="ModifyUninstallButton">解除安裝(&amp;U)</String>
-  <String Id="ModifyCloseButton">關閉(&amp;C)</String>
-  <String Id="SuccessRepairHeader">修復已成功完成</String>
-  <String Id="SuccessUninstallHeader">解除安裝已成功完成</String>
-  <String Id="SuccessInstallHeader">安裝已成功完成</String>
-  <String Id="SuccessHeader">設定成功</String>
-  <String Id="SuccessLaunchButton">啟動(&amp;L)</String>
-  <String Id="SuccessRestartText">必須重新啟動電腦，才能使用此軟體。</String>
-  <String Id="SuccessRestartButton">重新啟動(&amp;R)</String>
-  <String Id="SuccessCloseButton">關閉(&amp;C)</String>
-  <String Id="FailureHeader">安裝失敗</String>
-  <String Id="FailureInstallHeader">設定失敗</String>
-  <String Id="FailureUninstallHeader">解除安裝失敗</String>
-  <String Id="FailureRepairHeader">修復失敗</String>
-  <String Id="FailureHyperlinkLogText">有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱&lt;a href="#"&gt;記錄檔&lt;/a&gt;。</String>
-  <String Id="FailureRestartText">必須重新啟動電腦，才能完成軟體的復原。</String>
-  <String Id="FailureRestartButton">重新啟動(&amp;R)</String>
-  <String Id="FailureCloseButton">關閉(&amp;C)</String>
-  <String Id="FilesInUseHeader">使用中的檔案</String>
-  <String Id="FilesInUseLabel">以下應用程式正在使用需要進行更新的檔案:</String>
-  <String Id="FilesInUseCloseRadioButton">關閉應用程式並嘗試重新啟動(&amp;A)</String>
-  <String Id="FilesInUseDontCloseRadioButton">不關閉應用程式，需要重新啟動(&amp;D)</String>
-  <String Id="FilesInUseOkButton">確定(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">取消(&amp;C)</String>
-
-  <String Id="Welcome">歡迎使用 [WixBundleName] 安裝程式。</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;授權條款&lt;/a&gt;和&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隱私權聲明&lt;/a&gt;。</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl
deleted file mode 100644
index e6d2354063a8..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Instalační program pro [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Verze [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Opravdu chcete akci zrušit?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Předchozí verze</String>
-  <String Id="HelpHeader">Nápověda nastavení</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]adresář[\]] – Nainstaluje, opraví, odinstaluje nebo
-   vytvoří úplnou místní kopii svazku v adresáři. Výchozí možností je instalace.
-
-/passive | /quiet –  Zobrazí minimální uživatelské rozhraní bez výzev nebo nezobrazí žádné uživatelské rozhraní a
-   žádné výzvy. Výchozí možností je zobrazení uživatelského rozhraní a všech výzev.
-
-/norestart   – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní před restartováním zobrazí výzvu.
-/log log.txt – Uloží protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Zavřít</String>
-  <String Id="InstallAcceptCheckbox">Souhl&amp;asím s licenčními podmínkami</String>
-  <String Id="InstallInstallButton">&amp;Instalovat</String>
-  <String Id="InstallCloseButton">&amp;Zavřít</String>
-  <String Id="ProgressHeader">Průběh instalace</String>
-  <String Id="ProgressLabel">Probíhá zpracování:</String>
-  <String Id="OverallProgressPackageText">Inicializace...</String>
-  <String Id="ProgressCancelButton">&amp;Storno</String>
-  <String Id="ModifyHeader">Změnit instalaci</String>
-  <String Id="ModifyRepairButton">Op&amp;ravit</String>
-  <String Id="ModifyUninstallButton">O&amp;dinstalovat</String>
-  <String Id="ModifyCloseButton">&amp;Zavřít</String>
-  <String Id="SuccessRepairHeader">Oprava byla úspěšně dokončena</String>
-  <String Id="SuccessUninstallHeader">Odinstalace se úspěšně dokončila</String>
-  <String Id="SuccessInstallHeader">Instalace se úspěšně dokončila</String>
-  <String Id="SuccessHeader">Instalace byla úspěšná.</String>
-  <String Id="SuccessLaunchButton">&amp;Spustit</String>
-  <String Id="SuccessRestartText">Před použitím tohoto softwaru musíte restartovat počítač.</String>
-  <String Id="SuccessRestartButton">&amp;Restartovat</String>
-  <String Id="SuccessCloseButton">&amp;Zavřít</String>
-  <String Id="FailureHeader">Instalace se nepovedla</String>
-  <String Id="FailureInstallHeader">Instalace se nepovedla</String>
-  <String Id="FailureUninstallHeader">Odinstalace se nepovedla</String>
-  <String Id="FailureRepairHeader">Oprava se nepovedla</String>
-  <String Id="FailureHyperlinkLogText">Jeden nebo více problémů způsobilo selhání instalace. Opravte tyto problémy a znovu spusťte instalaci. Pro více informací se podívejte do &lt;a href="#"&gt;souboru protokolu&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač.</String>
-  <String Id="FailureRestartButton">&amp;Restartovat</String>
-  <String Id="FailureCloseButton">&amp;Zavřít</String>
-  <String Id="FilesInUseHeader">Soubory jsou používány</String>
-  <String Id="FilesInUseLabel">Následující aplikace používají soubory, které je potřeba aktualizovat:</String>
-  <String Id="FilesInUseCloseRadioButton">Zavřete &amp;aplikace a zkuste je restartovat.</String>
-  <String Id="FilesInUseDontCloseRadioButton">A&amp;plikace nezavírejte. Bude potřeba provést restart.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Zrušit</String>
-
-  <String Id="Welcome">Vítá vás instalační program produktu [WixBundleName]</String>
-  <String Id="EulaPrivacy">[WixBundleName] – &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;licenční podmínky&lt;/a&gt; a &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl
deleted file mode 100644
index 47d56196cb5a..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[BundleNameFull]-Setup</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Version von [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Möchten Sie den Vorgang wirklich abbrechen?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Vorherige Version</String>
-  <String Id="HelpHeader">Setup-Hilfe</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]Verzeichnis[\]] – installiert, repariert, deinstalliert oder
-   erstellt eine vollständige lokale Kopie des Bundles im Verzeichnis. Installieren ist die Standardeinstellung.
-
-/passive | /quiet –  zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen oder keine Benutzeroberfläche
-   und keine Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt.
-
-/norestart   – unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf.
-/log log.txt – protokolliert in eine bestimmte Datei. Standardmäßig wird eine Protokolldatei in %TEMP% erstellt.</String>
-  <String Id="HelpCloseButton">S&amp;chließen</String>
-  <String Id="InstallAcceptCheckbox">Ich &amp;stimme den Bedingungen des Lizenzvertrags zu</String>
-  <String Id="InstallInstallButton">&amp;Installieren</String>
-  <String Id="InstallCloseButton">S&amp;chließen</String>
-  <String Id="ProgressHeader">Setupstatus</String>
-  <String Id="ProgressLabel">Wird verarbeitet:</String>
-  <String Id="OverallProgressPackageText">Initialisierung...</String>
-  <String Id="ProgressCancelButton">&amp;Abbrechen</String>
-  <String Id="ModifyHeader">Setup ändern</String>
-  <String Id="ModifyRepairButton">&amp;Reparieren</String>
-  <String Id="ModifyUninstallButton">&amp;Deinstallieren</String>
-  <String Id="ModifyCloseButton">S&amp;chließen</String>
-  <String Id="SuccessRepairHeader">Reparatur erfolgreich abgeschlossen</String>
-  <String Id="SuccessUninstallHeader">Deinstallation erfolgreich abgeschlossen</String>
-  <String Id="SuccessInstallHeader">Installation erfolgreich abgeschlossen</String>
-  <String Id="SuccessHeader">Setup wurde erfolgreich abgeschlossen</String>
-  <String Id="SuccessLaunchButton">&amp;Starten</String>
-  <String Id="SuccessRestartText">Sie müssen den Computer neu starten, bevor Sie die Software verwenden können.</String>
-  <String Id="SuccessRestartButton">&amp;Neustart</String>
-  <String Id="SuccessCloseButton">S&amp;chließen</String>
-  <String Id="FailureHeader">Setupfehler</String>
-  <String Id="FailureInstallHeader">Fehler beim Setup</String>
-  <String Id="FailureUninstallHeader">Fehler bei der Deinstallation</String>
-  <String Id="FailureRepairHeader">Fehler bei der Reparatur</String>
-  <String Id="FailureHyperlinkLogText">Setup ist aufgrund eines oder mehrerer Probleme fehlgeschlagen. Beheben Sie die Probleme, und führen Sie Setup erneut aus. Weitere Informationen finden Sie in der &lt;a href="#"&gt;Protokolldatei&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen.</String>
-  <String Id="FailureRestartButton">&amp;Neustart</String>
-  <String Id="FailureCloseButton">&amp;Schließen</String>
-  <String Id="FilesInUseHeader">Dateien in Verwendung</String>
-  <String Id="FilesInUseLabel">Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen:</String>
-  <String Id="FilesInUseCloseRadioButton">Schließen Sie die &amp;Anwendungen, und versuchen Sie sie erneut zu starten.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Anwendungen nicht schließen. Ein Neustart ist erforderlich.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Abbrechen</String>
-
-  <String Id="Welcome">Willkommen beim Setup von [WixBundleName].</String>
-  <String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Lizenzbedingungen&lt;/a&gt; und &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;Datenschutzerklärung&lt;/a&gt; für [WixBundleName].</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl
deleted file mode 100644
index e09cfca96274..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption"><!--_locComment_text="{Locked='[BundleNameFull]'}"-->[BundleNameFull] Setup</String>
-  <String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
-  <String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
-  <String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
-  <String Id="HelpHeader">Setup Help</String>
-  <String Id="HelpText"><!--_locComment_text="'directory' is to be translated in both places"-->/install | /repair | /uninstall | /layout [\[]directory[\]] - installs, repairs, uninstalls or
-   creates a complete local copy of the bundle in directory. Install is the default.
-
-/passive | /quiet -  displays minimal UI with no prompts or displays no UI and
-   no prompts. By default UI and all prompts are displayed.
-
-/norestart   - suppress any attempts to restart. By default UI will prompt before restart.
-/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Close</String>
-  <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
-  <String Id="InstallInstallButton">&amp;Install</String>
-  <String Id="InstallCloseButton">&amp;Close</String>
-  <String Id="ProgressHeader">Setup Progress</String>
-  <String Id="ProgressLabel">Processing:</String>
-  <String Id="OverallProgressPackageText">Initializing...</String>
-  <String Id="ProgressCancelButton">&amp;Cancel</String>
-  <String Id="ModifyHeader">Modify Setup</String>
-  <String Id="ModifyRepairButton">&amp;Repair</String>
-  <String Id="ModifyUninstallButton">&amp;Uninstall</String>
-  <String Id="ModifyCloseButton">&amp;Close</String>
-  <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
-  <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
-  <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
-  <String Id="SuccessHeader">Setup Successful</String>
-  <String Id="SuccessLaunchButton">&amp;Launch</String>
-  <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
-  <String Id="SuccessRestartButton">&amp;Restart</String>
-  <String Id="SuccessCloseButton">&amp;Close</String>
-  <String Id="FailureHeader">Setup Failed</String>
-  <String Id="FailureInstallHeader">Setup Failed</String>
-  <String Id="FailureUninstallHeader">Uninstall Failed</String>
-  <String Id="FailureRepairHeader">Repair Failed</String>
-  <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
-  <String Id="FailureRestartButton">&amp;Restart</String>
-  <String Id="FailureCloseButton">&amp;Close</String>
-  <String Id="FilesInUseHeader">Files In Use</String>
-  <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String>
-  <String Id="FilesInUseCloseRadioButton">Close the &amp;applications and attempt to restart them.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Do not close applications. A reboot will be required.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Cancel</String>
-
-  <String Id="Welcome"><!--_locComment_text="{Locked='[WixBundleName]'}"-->Welcome to the [WixBundleName] Setup.</String>
-  <String Id="EulaPrivacy"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl
deleted file mode 100644
index 2c22783f0417..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Installation de [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Version [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Êtes-vous sûr de vouloir annuler ?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Version précédente</String>
-  <String Id="HelpHeader">Aide du programme d'installation</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]répertoire[\]] - installe, répare, désinstalle ou
-   crée une copie locale complète du bundle dans le répertoire. Install est l'option par défaut.
-
-/passive | /quiet -  affiche une interface utilisateur minimale, sans invite, ou n'affiche 
-   ni interface utilisateur, ni invite. Par défaut, l'interface utilisateur et toutes les invites sont affichées.
-
-/norestart   - supprime toutes les tentatives de redémarrage. Par défaut, l'interface utilisateur affiche une invite avant le redémarrage.
-/log log.txt - enregistre les informations dans un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Fermer</String>
-  <String Id="InstallAcceptCheckbox">J'&amp;accepte les conditions générales de la licence</String>
-  <String Id="InstallInstallButton">&amp;Installer</String>
-  <String Id="InstallCloseButton">&amp;Fermer</String>
-  <String Id="ProgressHeader">Progression de l’opération</String>
-  <String Id="ProgressLabel">En cours :</String>
-  <String Id="OverallProgressPackageText">Initialisation...</String>
-  <String Id="ProgressCancelButton">&amp;Annuler</String>
-  <String Id="ModifyHeader">Modifier l'installation</String>
-  <String Id="ModifyRepairButton">&amp;Réparer</String>
-  <String Id="ModifyUninstallButton">&amp;Désinstaller</String>
-  <String Id="ModifyCloseButton">&amp;Fermer</String>
-  <String Id="SuccessRepairHeader">Réparation terminée avec succès</String>
-  <String Id="SuccessUninstallHeader">Désinstallation terminée avec succès</String>
-  <String Id="SuccessInstallHeader">Installation terminée avec succès</String>
-  <String Id="SuccessHeader">Opération réussie</String>
-  <String Id="SuccessLaunchButton">&amp;Démarrer</String>
-  <String Id="SuccessRestartText">Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel.</String>
-  <String Id="SuccessRestartButton">&amp;Redémarrer</String>
-  <String Id="SuccessCloseButton">&amp;Fermer</String>
-  <String Id="FailureHeader">Échec de l’opération</String>
-  <String Id="FailureInstallHeader">Échec de l'installation</String>
-  <String Id="FailureUninstallHeader">Échec de la désinstallation</String>
-  <String Id="FailureRepairHeader">Échec de la réparation</String>
-  <String Id="FailureHyperlinkLogText">Le programme d’installation a échoué en raison d’un ou de plusieurs problèmes. Veuillez corriger ces problèmes, puis relancez le programme d’installation. Pour plus d’informations, consultez le &lt;a href="#"&gt;fichier journal&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel.</String>
-  <String Id="FailureRestartButton">&amp;Redémarrer</String>
-  <String Id="FailureCloseButton">&amp;Fermer</String>
-  <String Id="FilesInUseHeader">Fichiers en cours d'utilisation</String>
-  <String Id="FilesInUseLabel">Les applications suivantes utilisent des fichiers nécessitant une mise à jour :</String>
-  <String Id="FilesInUseCloseRadioButton">&amp;Fermer les applications essayer de les ouvrir de nouveau.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Ne pas fermer les applications. Un redémarrage sera nécessaire.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Annuler</String>
-
-  <String Id="Welcome">Bienvenue dans le programme d'installation de [WixBundleName].</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;termes du contrat de licence&lt;/a&gt; et &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;déclaration de confidentialité&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1040/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1040/thm.wxl
deleted file mode 100644
index 884ffc574eb7..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1040/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Installazione di [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Versione [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Annullare?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Versione precedente</String>
-  <String Id="HelpHeader">Guida all'installazione</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]directory[\]] - installa, ripara, disinstalla o
-   crea una copia locale completa del bundle nella directory. L'opzione predefinita è install.
-
-/passive | /quiet -  visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente
-   né prompt. Per impostazione predefinita, vengono visualizzati l'intera interfaccia utente e tutti i prompt.
-
-/norestart   - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio.
-/log log.txt - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Chiudi</String>
-  <String Id="InstallAcceptCheckbox">&amp;Accetto i termini e le condizioni di licenza</String>
-  <String Id="InstallInstallButton">&amp;Installa</String>
-  <String Id="InstallCloseButton">&amp;Chiudi</String>
-  <String Id="ProgressHeader">Stato installazione</String>
-  <String Id="ProgressLabel">Elaborazione di:</String>
-  <String Id="OverallProgressPackageText">Inizializzazione in corso...</String>
-  <String Id="ProgressCancelButton">&amp;Annulla</String>
-  <String Id="ModifyHeader">Modifica installazione</String>
-  <String Id="ModifyRepairButton">&amp;Ripristina</String>
-  <String Id="ModifyUninstallButton">&amp;Disinstalla</String>
-  <String Id="ModifyCloseButton">&amp;Chiudi</String>
-  <String Id="SuccessRepairHeader">La riparazione è stata completata</String>
-  <String Id="SuccessUninstallHeader">La disinstallazione è stata completata</String>
-  <String Id="SuccessInstallHeader">L'installazione è stata completata</String>
-  <String Id="SuccessHeader">Installazione completata</String>
-  <String Id="SuccessLaunchButton">&amp;Avvia</String>
-  <String Id="SuccessRestartText">È necessario riavviare il computer prima di utilizzare il software.</String>
-  <String Id="SuccessRestartButton">&amp;Riavvia</String>
-  <String Id="SuccessCloseButton">&amp;Chiudi</String>
-  <String Id="FailureHeader">Installazione non riuscita</String>
-  <String Id="FailureInstallHeader">L'installazione non è riuscita</String>
-  <String Id="FailureUninstallHeader">La disinstallazione non è riuscita</String>
-  <String Id="FailureRepairHeader">La riparazione non è riuscita</String>
-  <String Id="FailureHyperlinkLogText">Installazione non riuscita a causa di uno o più problemi. Risolvere i problemi e ritentare l'installazione. Per ulteriori informazioni, vedere il &lt;a href="#"&gt;file di log&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">È necessario riavviare il computer per completare il rollback del software.</String>
-  <String Id="FailureRestartButton">&amp;Riavvia</String>
-  <String Id="FailureCloseButton">&amp;Chiudi</String>
-  <String Id="FilesInUseHeader">File in uso</String>
-  <String Id="FilesInUseLabel">Le applicazioni seguenti usano file che necessitano di aggiornamento:</String>
-  <String Id="FilesInUseCloseRadioButton">Chiudere le &amp;applicazioni e provare a riavviarle.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Non chiudere le applicazioni; sarà necessario riavviare il sistema</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Annulla</String>
-
-  <String Id="Welcome">Installazione di [WixBundleName].</String>
-  <String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Condizioni di licenza&lt;/a&gt; e &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;informativa sulla privacy&lt;/a&gt; di [WixBundleName].</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1041/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1041/thm.wxl
deleted file mode 100644
index 3b3bde413dc0..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1041/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[BundleNameFull] のセットアップ</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">バージョン [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">取り消しますか?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">以前のバージョン</String>
-  <String Id="HelpHeader">セットアップのヘルプ</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]ディレクトリ[\]] - バンドルの完全なローカル コピーに対する
-  ディレクトリへのインストール、修復、ディレクトリからのアンインストール、またはディレクトリ内への作成を行います。既定の設定はインストールです。
-
-/passive | /quiet -  最小限の UI だけを表示しプロンプトは表示しない、または UI もプロンプトも
-   表示しません。既定では UI とすべてのプロンプトが表示されます。
-
-/norestart   - 再起動を抑制します。既定では再起動前に確認メッセージが表示されます。
-/log log.txt - 特定のファイルに記録します。ログ ファイルは既定では %TEMP% に作成されます。</String>
-  <String Id="HelpCloseButton">閉じる(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">ライセンス条項および使用条件に同意する(&amp;A)</String>
-  <String Id="InstallInstallButton">インストール(&amp;I)</String>
-  <String Id="InstallCloseButton">閉じる(&amp;C)</String>
-  <String Id="ProgressHeader">セットアップの進行状況</String>
-  <String Id="ProgressLabel">処理中:</String>
-  <String Id="OverallProgressPackageText">初期化しています...</String>
-  <String Id="ProgressCancelButton">キャンセル(&amp;C)</String>
-  <String Id="ModifyHeader">セットアップの変更</String>
-  <String Id="ModifyRepairButton">修復(&amp;R)</String>
-  <String Id="ModifyUninstallButton">アンインストール(&amp;U)</String>
-  <String Id="ModifyCloseButton">閉じる(&amp;C)</String>
-  <String Id="SuccessRepairHeader">修復が正常に完了しました</String>
-  <String Id="SuccessUninstallHeader">アンインストールが正常に完了しました</String>
-  <String Id="SuccessInstallHeader">インストールが正常に完了しました</String>
-  <String Id="SuccessHeader">セットアップ完了</String>
-  <String Id="SuccessLaunchButton">起動(&amp;L)</String>
-  <String Id="SuccessRestartText">ソフトウェアを使用する前にコンピューターを再起動する必要があります。</String>
-  <String Id="SuccessRestartButton">再起動(&amp;R)</String>
-  <String Id="SuccessCloseButton">閉じる(&amp;C)</String>
-  <String Id="FailureHeader">セットアップに失敗しました</String>
-  <String Id="FailureInstallHeader">セットアップに失敗しました</String>
-  <String Id="FailureUninstallHeader">アンインストールに失敗しました</String>
-  <String Id="FailureRepairHeader">修復に失敗しました</String>
-  <String Id="FailureHyperlinkLogText">1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、&lt;a href="#"&gt;ログ ファイル&lt;/a&gt;を参照してください。</String>
-  <String Id="FailureRestartText">ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。</String>
-  <String Id="FailureRestartButton">再起動(&amp;R)</String>
-  <String Id="FailureCloseButton">閉じる(&amp;C)</String>
-  <String Id="FilesInUseHeader">ファイルが使用中</String>
-  <String Id="FilesInUseLabel">次のアプリケーションは、更新の必要があるファイルを使用しています:</String>
-  <String Id="FilesInUseCloseRadioButton">アプリケーションを閉じて再起動を試みる。(&amp;A)</String>
-  <String Id="FilesInUseDontCloseRadioButton">アプリケーションを終了させない (コンピューターの再起動が必要になります)(&amp;D)</String>
-  <String Id="FilesInUseOkButton">OK(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">キャンセル(&amp;C)</String>
-
-  <String Id="Welcome">[WixBundleName] のセットアップへようこそ。</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;ライセンス条項&lt;/a&gt;および&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;プライバシーに関する声明&lt;/a&gt;。</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1042/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1042/thm.wxl
deleted file mode 100644
index c937e2bfc1f9..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1042/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[BundleNameFull] 설치</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">버전 [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">취소하시겠습니까?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">이전 버전</String>
-  <String Id="HelpHeader">설치 도움말</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]디렉터리[\]] - 디렉터리에 번들의 전체 로컬 복사본을
-   설치, 복구, 제거 또는 작성합니다. 설치가 기본값입니다.
-
-/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및
-   프롬프트를 표시하지 않습니다. 기본값으로 UI와 모든 프롬프트가 표시됩니다.
-
-/norestart   - 다시 시작하지 않게 합니다. 기본값으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다.
-/log log.txt - 특정 파일에 기록합니다. 기본값으로 로그 파일은 %TEMP%에 만들어집니다.</String>
-  <String Id="HelpCloseButton">닫기(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">동의함(&amp;A)</String>
-  <String Id="InstallInstallButton">설치(&amp;I)</String>
-  <String Id="InstallCloseButton">닫기(&amp;C)</String>
-  <String Id="ProgressHeader">설치 진행률</String>
-  <String Id="ProgressLabel">처리 중:</String>
-  <String Id="OverallProgressPackageText">초기화 중...</String>
-  <String Id="ProgressCancelButton">취소(&amp;C)</String>
-  <String Id="ModifyHeader">설치 수정</String>
-  <String Id="ModifyRepairButton">복구(&amp;R)</String>
-  <String Id="ModifyUninstallButton">제거(&amp;U)</String>
-  <String Id="ModifyCloseButton">닫기(&amp;C)</String>
-  <String Id="SuccessRepairHeader">복구 완료됨</String>
-  <String Id="SuccessUninstallHeader">제거 완료됨</String>
-  <String Id="SuccessInstallHeader">설치 완료됨</String>
-  <String Id="SuccessHeader">설치 완료</String>
-  <String Id="SuccessLaunchButton">시작(&amp;L)</String>
-  <String Id="SuccessRestartText">소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다.</String>
-  <String Id="SuccessRestartButton">다시 시작(&amp;R)</String>
-  <String Id="SuccessCloseButton">닫기(&amp;C)</String>
-  <String Id="FailureHeader">설치 실패</String>
-  <String Id="FailureInstallHeader">설치 실패</String>
-  <String Id="FailureUninstallHeader">제거 실패</String>
-  <String Id="FailureRepairHeader">복구 실패</String>
-  <String Id="FailureHyperlinkLogText">하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 &lt;a href="#"&gt;로그 파일&lt;/a&gt;을 참조하십시오.</String>
-  <String Id="FailureRestartText">소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다.</String>
-  <String Id="FailureRestartButton">다시 시작(&amp;R)</String>
-  <String Id="FailureCloseButton">닫기(&amp;C)</String>
-  <String Id="FilesInUseHeader">사용 중인 파일</String>
-  <String Id="FilesInUseLabel">다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다.</String>
-  <String Id="FilesInUseCloseRadioButton">응용 프로그램을 닫고 다시 시작합니다(&amp;A).</String>
-  <String Id="FilesInUseDontCloseRadioButton">응용 프로그램을 닫지 않습니다(&amp;D). 다시 부팅해야 합니다.</String>
-  <String Id="FilesInUseOkButton">확인(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">취소(&amp;C)</String>
-
-  <String Id="Welcome">[WixBundleName] 설치를 시작합니다.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;사용 조건&lt;/a&gt; 및 &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;개인정보처리방침&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1045/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1045/thm.wxl
deleted file mode 100644
index c3deae827aa6..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1045/thm.wxl
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Konfiguracja pakietu [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Wersja [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Czy na pewno chcesz anulować?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Poprzednia wersja</String>
-  <String Id="HelpHeader">Instalator — Pomoc</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]katalog[\]] — instaluje, naprawia, odinstalowuje lub
-    tworzy pełną lokalną kopię pakietu w katalogu. Instalacja jest domyślna.
-
-/passive | /quiet — wyświetla minimalny interfejs użytkownika bez monitów albo nie wyświetla żadnego interfejsu użytkownika ani monitów
-.
-   Domyślnie jest wyświetlany interfejs użytkownika oraz wszystkie monity.
-
-/norestart  — pomija próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetla monit przed ponownym uruchomieniem.
-/log log.txt — tworzy dziennik w określonym pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Zamknij</String>
-  <String Id="InstallAcceptCheckbox">&amp;Zgadzam się na warunki licencji</String>
-  <String Id="InstallInstallButton">&amp;Zainstaluj</String>
-  <String Id="InstallCloseButton">&amp;Zamknij</String>
-  <String Id="ProgressHeader">Postęp instalacji</String>
-  <String Id="ProgressLabel">Przetwarzanie:</String>
-  <String Id="OverallProgressPackageText">Trwa inicjowanie...</String>
-  <String Id="ProgressCancelButton">&amp;Anuluj</String>
-  <String Id="ModifyHeader">Zmodyfikuj instalatora</String>
-  <String Id="ModifyRepairButton">&amp;Napraw</String>
-  <String Id="ModifyUninstallButton">&amp;Odinstaluj</String>
-  <String Id="ModifyCloseButton">&amp;Zamknij</String>
-  <String Id="SuccessRepairHeader">Pomyślnie ukończono naprawę</String>
-  <String Id="SuccessUninstallHeader">Pomyślnie ukończono operację odinstalowania</String>
-  <String Id="SuccessInstallHeader">Pomyślnie ukończono instalację</String>
-  <String Id="SuccessHeader">Instalacja przebiegła pomyślnie</String>
-  <String Id="SuccessLaunchButton">&amp;Uruchom</String>
-  <String Id="SuccessRestartText">Aby korzystać z oprogramowania, należy ponownie uruchomić komputer.</String>
-  <String Id="SuccessRestartButton">&amp;Uruchom ponownie</String>
-  <String Id="SuccessCloseButton">&amp;Zamknij</String>
-  <String Id="FailureHeader">Instalacja nie powiodła się</String>
-  <String Id="FailureInstallHeader">Konfiguracja nie powiodła się</String>
-  <String Id="FailureUninstallHeader">Operacja odinstalowania nie powiodła się</String>
-  <String Id="FailureRepairHeader">Naprawa nie powiodła się</String>
-  <String Id="FailureHyperlinkLogText">Jeden lub więcej problemów spowodował niepowodzenie instalacji. Napraw błędy, a następnie uruchom ponownie instalację. Aby uzyskać więcej informacji zobacz &lt;a href="#"&gt;plik dziennika&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Należy ponownie uruchomić komputer, aby dokończyć wycofywanie oprogramowania.</String>
-  <String Id="FailureRestartButton">&amp;Uruchom ponownie</String>
-  <String Id="FailureCloseButton">&amp;Zamknij</String>
-  <String Id="FilesInUseHeader">Pliki w użyciu</String>
-  <String Id="FilesInUseLabel">Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane:</String>
-  <String Id="FilesInUseCloseRadioButton">Zamknij &amp;aplikacje i spróbuj je ponownie uruchomić.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Nie zamykaj aplikacji. Będzie konieczne ponowne uruchomienie.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Anuluj</String>
-
-  <String Id="Welcome">Witamy w instalatorze produktu [WixBundleName].</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;postanowienia licencyjne&lt;/a&gt; i &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;oświadczenie o ochronie prywatności&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1046/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1046/thm.wxl
deleted file mode 100644
index 5811683986dd..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1046/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Instalação do [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Versão [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Tem certeza de que deseja cancelar?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Versão anterior</String>
-  <String Id="HelpHeader">Ajuda da Instalação</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]diretório[\]] - instala, repara, desinstala ou
-   cria uma cópia local completa do pacote no diretório. Install é o padrão
-
-/passive | /quiet -  exibe a interface do usuário mínima sem nenhum prompt ou não exibe nenhuma interface do usuário e
-   nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos.
-
-/norestart   - suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar.
-/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Fechar</String>
-  <String Id="InstallAcceptCheckbox">Eu &amp;concordo com os termos e condições da licença</String>
-  <String Id="InstallInstallButton">&amp;Instalar</String>
-  <String Id="InstallCloseButton">&amp;Fechar</String>
-  <String Id="ProgressHeader">Progresso da Instalação</String>
-  <String Id="ProgressLabel">Processando:</String>
-  <String Id="OverallProgressPackageText">Inicializando...</String>
-  <String Id="ProgressCancelButton">&amp;Cancelar</String>
-  <String Id="ModifyHeader">Modificar Instalação</String>
-  <String Id="ModifyRepairButton">&amp;Reparar</String>
-  <String Id="ModifyUninstallButton">&amp;Desinstalar</String>
-  <String Id="ModifyCloseButton">&amp;Fechar</String>
-  <String Id="SuccessRepairHeader">Reparação Concluída com Êxito</String>
-  <String Id="SuccessUninstallHeader">Desinstalação Concluída com Êxito</String>
-  <String Id="SuccessInstallHeader">Instalação Concluída com Êxito</String>
-  <String Id="SuccessHeader">Instalação com Êxito</String>
-  <String Id="SuccessLaunchButton">&amp;Iniciar</String>
-  <String Id="SuccessRestartText">Reinicie o computador para poder usar o software.</String>
-  <String Id="SuccessRestartButton">&amp;Reiniciar</String>
-  <String Id="SuccessCloseButton">&amp;Fechar</String>
-  <String Id="FailureHeader">Falha na Instalação</String>
-  <String Id="FailureInstallHeader">Falha na Instalação</String>
-  <String Id="FailureUninstallHeader">Falha na Desinstalação</String>
-  <String Id="FailureRepairHeader">Falha ao Reparar</String>
-  <String Id="FailureHyperlinkLogText">Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o &lt;a href="#"&gt;arquivo de log&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Reinicie o computador para concluir a reversão do software.</String>
-  <String Id="FailureRestartButton">&amp;Reiniciar</String>
-  <String Id="FailureCloseButton">&amp;Fechar</String>
-  <String Id="FilesInUseHeader">Arquivos em Uso</String>
-  <String Id="FilesInUseLabel">Os aplicativos a seguir estão usando arquivos que precisam ser atualizados:</String>
-  <String Id="FilesInUseCloseRadioButton">Feche os &amp;aplicativos e tente reiniciá-los.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Não feche os aplicativos. Uma reinicialização será necessária.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Cancelar</String>
-
-  <String Id="Welcome">Bem-vindo à Instalação do [WixBundleName].</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;termos de licença&lt;/a&gt; e &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;política de privacidade&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1049/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1049/thm.wxl
deleted file mode 100644
index ad057e6393cf..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1049/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Установка [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Версия [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Отменить?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Предыдущая версия</String>
-  <String Id="HelpHeader">Справка по установке</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]каталог[\]] — установка, восстановление, удаление или
- создание полной локальной копии пакета в каталоге. По умолчанию — установка.
-
-/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и
- без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы.
-
-/norestart — отключение всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос.
-/log log.txt — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Закрыть</String>
-  <String Id="InstallAcceptCheckbox">Я &amp;принимаю условия лицензии</String>
-  <String Id="InstallInstallButton">&amp;Установить</String>
-  <String Id="InstallCloseButton">&amp;Закрыть</String>
-  <String Id="ProgressHeader">Ход установки</String>
-  <String Id="ProgressLabel">Обработка:</String>
-  <String Id="OverallProgressPackageText">Инициализация...</String>
-  <String Id="ProgressCancelButton">Отм&amp;ена</String>
-  <String Id="ModifyHeader">Изменение установки</String>
-  <String Id="ModifyRepairButton">&amp;Исправить</String>
-  <String Id="ModifyUninstallButton">&amp;Удалить</String>
-  <String Id="ModifyCloseButton">&amp;Закрыть</String>
-  <String Id="SuccessRepairHeader">Восстановление успешно завершено</String>
-  <String Id="SuccessUninstallHeader">Удаление успешно завершено</String>
-  <String Id="SuccessInstallHeader">Установка успешно завершена</String>
-  <String Id="SuccessHeader">Установка успешно завершена</String>
-  <String Id="SuccessLaunchButton">&amp;Запустить</String>
-  <String Id="SuccessRestartText">Перед использованием программного обеспечения необходимо перезапустить компьютер.</String>
-  <String Id="SuccessRestartButton">&amp;Перезапустить</String>
-  <String Id="SuccessCloseButton">&amp;Закрыть</String>
-  <String Id="FailureHeader">Сбой установки</String>
-  <String Id="FailureInstallHeader">Сбой установки</String>
-  <String Id="FailureUninstallHeader">Сбой удаления</String>
-  <String Id="FailureRepairHeader">Сбой восстановления</String>
-  <String Id="FailureHyperlinkLogText">Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в &lt;a href="#"&gt;файле журнала&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения.</String>
-  <String Id="FailureRestartButton">&amp;Перезапустить</String>
-  <String Id="FailureCloseButton">З&amp;акрыть</String>
-  <String Id="FilesInUseHeader">Используемые файлы</String>
-  <String Id="FilesInUseLabel">Следующие приложения используют файлы, которые нуждаются в обновлении:</String>
-  <String Id="FilesInUseCloseRadioButton">Закройте &amp;приложения и попробуйте перезапустить их.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Не закрывайте приложения. Потребуется перезагрузка компьютера.</String>
-  <String Id="FilesInUseOkButton">О&amp;К</String>
-  <String Id="FilesInUseCancelButton">&amp;Отменить</String>
-
-  <String Id="Welcome">Вас приветствует мастер установки [WixBundleName].</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;условия лицензии&lt;/a&gt; и &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;заявление о конфиденциальности&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/1055/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/1055/thm.wxl
deleted file mode 100644
index f9bd28efaa75..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/1055/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[BundleNameFull] Kurulumu</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">[WixBundleVersion] Sürümü</String>
-  <String Id="ConfirmCancelMessage">İptal etmek istediğinizden emin misiniz?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Önceki sürüm</String>
-  <String Id="HelpHeader">Kurulum Yardımı</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]dizin[\]] - yükler, onarır, kaldırır ya da
-   dizindeki paketin tam bir yerel kopyasını oluşturur. Varsayılan install değeridir.
-
-/passive | /quiet -  en az düzeyde istemsiz UI gösterir ya da hiç UI göstermez ve
-   istem yoktur. Varsayılan olarak UI ve tüm istemler görüntülenir.
-
-/norestart   - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar.
-/log log.txt - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur.</String>
-  <String Id="HelpCloseButton">&amp;Kapat</String>
-  <String Id="InstallAcceptCheckbox">Lisans &amp;hüküm ve koşullarını kabul ediyorum</String>
-  <String Id="InstallInstallButton">&amp;Yükle</String>
-  <String Id="InstallCloseButton">&amp;Kapat</String>
-  <String Id="ProgressHeader">Kurulum İlerleme Durumu</String>
-  <String Id="ProgressLabel">İşleniyor:</String>
-  <String Id="OverallProgressPackageText">Başlatılıyor...</String>
-  <String Id="ProgressCancelButton">&amp;İptal</String>
-  <String Id="ModifyHeader">Kurulumu değiştir</String>
-  <String Id="ModifyRepairButton">&amp;Onar</String>
-  <String Id="ModifyUninstallButton">K&amp;aldır</String>
-  <String Id="ModifyCloseButton">&amp;Kapat</String>
-  <String Id="SuccessRepairHeader">Onarım Başarıyla Tamamlandı</String>
-  <String Id="SuccessUninstallHeader">Kaldırma Başarıyla Tamamlandı</String>
-  <String Id="SuccessInstallHeader">Yükleme Başarıyla Tamamlandı</String>
-  <String Id="SuccessHeader">Kurulum Başarılı</String>
-  <String Id="SuccessLaunchButton">&amp;Başlat</String>
-  <String Id="SuccessRestartText">Yazılımı kullanabilmeniz için bilgisayarınızı yeniden başlatmanız gerekiyor.</String>
-  <String Id="SuccessRestartButton">Yeniden &amp;Başlat</String>
-  <String Id="SuccessCloseButton">&amp;Kapat</String>
-  <String Id="FailureHeader">Kurulum Başarısız</String>
-  <String Id="FailureInstallHeader">Kurulum Başarısız</String>
-  <String Id="FailureUninstallHeader">Kaldırma Başarısız</String>
-  <String Id="FailureRepairHeader">Onarım Başarısız</String>
-  <String Id="FailureHyperlinkLogText">Bir ya da daha fazla sorun nedeniyle kurulum başarısız oldu. Lütfen bu sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için &lt;a href="#"&gt;günlük dosyasına&lt;/a&gt; bakın.</String>
-  <String Id="FailureRestartText">Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor.</String>
-  <String Id="FailureRestartButton">Yeniden &amp;Başlat</String>
-  <String Id="FailureCloseButton">&amp;Kapat</String>
-  <String Id="FilesInUseHeader">Kullanımda Olan Dosyalar</String>
-  <String Id="FilesInUseLabel">Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor:</String>
-  <String Id="FilesInUseCloseRadioButton">&amp;Uygulamaları kapatın ve yeniden başlatmayı deneyin.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Uygulamaları kapatmayın. Sistemi yeniden başlatmanız gerekir.</String>
-  <String Id="FilesInUseOkButton">&amp;Tamam</String>
-  <String Id="FilesInUseCancelButton">&amp;İptal</String>
-
-  <String Id="Welcome">[WixBundleName] Kurulumu'na Hoş Geldiniz.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;lisans koşulları&lt;/a&gt; ve &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;gizlilik bildirimi&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/2052/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/2052/thm.wxl
deleted file mode 100644
index bf92e27877ac..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/2052/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[BundleNameFull] 安装</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">版本 [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">是否确实要取消?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">上一版本</String>
-  <String Id="HelpHeader">安装程序帮助</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]目录[\]] - 安装、修复、卸载
-   目录中的捆绑包或创建其完整本地副本。Install 为默认选择。
-
-/passive | /quiet -  显示最少的 UI 且无提示，或不显示 UI 且
-   无提示。默认情况下，显示 UI 及全部提示。
-
-/norestart   - 禁止任何重启尝试。默认情况下将在重启前显示提示 UI。
-/log log.txt - 向特定文件写入日志。默认情况下在 %TEMP% 中创建日志文件。</String>
-  <String Id="HelpCloseButton">关闭(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">我同意许可条款和条件(&amp;A)</String>
-  <String Id="InstallInstallButton">安装(&amp;I)</String>
-  <String Id="InstallCloseButton">关闭(&amp;C)</String>
-  <String Id="ProgressHeader">安装进度</String>
-  <String Id="ProgressLabel">正在处理:</String>
-  <String Id="OverallProgressPackageText">正在初始化...</String>
-  <String Id="ProgressCancelButton">取消(&amp;C)</String>
-  <String Id="ModifyHeader">修改安装程序</String>
-  <String Id="ModifyRepairButton">修复(&amp;R)</String>
-  <String Id="ModifyUninstallButton">卸载(&amp;U)</String>
-  <String Id="ModifyCloseButton">关闭(&amp;C)</String>
-  <String Id="SuccessRepairHeader">已成功完成修复</String>
-  <String Id="SuccessUninstallHeader">已成功完成卸载</String>
-  <String Id="SuccessInstallHeader">已成功完成安装</String>
-  <String Id="SuccessHeader">设置成功</String>
-  <String Id="SuccessLaunchButton">启动(&amp;L)</String>
-  <String Id="SuccessRestartText">您必须先重新启动计算机，然后才能使用该软件。</String>
-  <String Id="SuccessRestartButton">重新启动(&amp;R)</String>
-  <String Id="SuccessCloseButton">关闭(&amp;C)</String>
-  <String Id="FailureHeader">安装失败</String>
-  <String Id="FailureInstallHeader">安装失败</String>
-  <String Id="FailureUninstallHeader">卸载失败</String>
-  <String Id="FailureRepairHeader">修复失败</String>
-  <String Id="FailureHyperlinkLogText">一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅&lt;a href="#"&gt;日志文件&lt;/a&gt;。</String>
-  <String Id="FailureRestartText">必须重新启动计算机才能完成软件回退。</String>
-  <String Id="FailureRestartButton">重新启动(&amp;R)</String>
-  <String Id="FailureCloseButton">关闭(&amp;C)</String>
-  <String Id="FilesInUseHeader">文件正在使用</String>
-  <String Id="FilesInUseLabel">以下应用程序正在使用的文件需要更新:</String>
-  <String Id="FilesInUseCloseRadioButton">关闭应用程序并尝试重启(&amp;A)。</String>
-  <String Id="FilesInUseDontCloseRadioButton">不关闭应用程序(&amp;D)。需要重启。</String>
-  <String Id="FilesInUseOkButton">确定(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">取消(&amp;C)</String>
-
-  <String Id="Welcome">欢迎使用 [WixBundleName] 安装程序。</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;许可条款&lt;/a&gt;和&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隐私声明&lt;/a&gt;。</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/3082/thm.wxl b/src/Installers/Windows/SharedFrameworkBundle/3082/thm.wxl
deleted file mode 100644
index e6c32bd70c27..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/3082/thm.wxl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Configuración de [BundleNameFull]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Versión [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">¿Está seguro de que desea cancelar la operación?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Versión anterior</String>
-  <String Id="HelpHeader">Ayuda del programa de instalación</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]directorio[\]] - instala, repara, desinstala o
-   crea una copia local completa del paquete en el directorio. Install es la opción predeterminada.
-
-/passive | /quiet -  muestra una IU mínima sin peticiones, o bien no muestra la IU 
-  ni las peticiones. De forma predeterminada, se muestran la IU y todas las peticiones.
-
-/norestart   - suprime los intentos de reiniciar. De forma predeterminada, la IU preguntará antes de reiniciar.
-/log log.txt - se registra en un archivo específico. De forma predeterminada, se crea un archivo de registro en %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Cerrar</String>
-  <String Id="InstallAcceptCheckbox">&amp;Acepto los términos y condiciones de licencia</String>
-  <String Id="InstallInstallButton">&amp;Instalar</String>
-  <String Id="InstallCloseButton">&amp;Cerrar</String>
-  <String Id="ProgressHeader">Progreso de la instalación</String>
-  <String Id="ProgressLabel">Procesando:</String>
-  <String Id="OverallProgressPackageText">Inicializando...</String>
-  <String Id="ProgressCancelButton">&amp;Cancelar</String>
-  <String Id="ModifyHeader">Modificar instalación</String>
-  <String Id="ModifyRepairButton">&amp;Reparar</String>
-  <String Id="ModifyUninstallButton">&amp;Desinstalar</String>
-  <String Id="ModifyCloseButton">&amp;Cerrar</String>
-  <String Id="SuccessRepairHeader">La reparación se completó correctamente</String>
-  <String Id="SuccessUninstallHeader">La desinstalación se completó correctamente</String>
-  <String Id="SuccessInstallHeader">La instalación se completó correctamente</String>
-  <String Id="SuccessHeader">La instalación o desinstalación se realizó correctamente</String>
-  <String Id="SuccessLaunchButton">&amp;Iniciar</String>
-  <String Id="SuccessRestartText">Debe reiniciar el equipo para poder usar el software.</String>
-  <String Id="SuccessRestartButton">&amp;Reiniciar</String>
-  <String Id="SuccessCloseButton">&amp;Cerrar</String>
-  <String Id="FailureHeader">Error de instalación</String>
-  <String Id="FailureInstallHeader">Error de instalación</String>
-  <String Id="FailureUninstallHeader">No se pudo desinstalar</String>
-  <String Id="FailureRepairHeader">No se pudo reparar</String>
-  <String Id="FailureHyperlinkLogText">Error de instalación debido a uno o varios problemas. Corrija los problemas e intente de nuevo la instalación. Para obtener más información, consulte el &lt;a href="#"&gt;archivo de registro&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Debe reiniciar el equipo para completar la reversión del software.</String>
-  <String Id="FailureRestartButton">&amp;Reiniciar</String>
-  <String Id="FailureCloseButton">&amp;Cerrar</String>
-  <String Id="FilesInUseHeader">Archivos en uso</String>
-  <String Id="FilesInUseLabel">Las siguientes aplicaciones usan archivos que se deben actualizar:</String>
-  <String Id="FilesInUseCloseRadioButton">Cerrar las &amp;aplicaciones e intentar reiniciarlas.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;No cerrar las aplicaciones. Será necesario un reinicio.</String>
-  <String Id="FilesInUseOkButton">&amp;Aceptar</String>
-  <String Id="FilesInUseCancelButton">&amp;Cancelar</String>
-
-  <String Id="Welcome">Programa de instalación de [WixBundleName].</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Términos de licencia&lt;/a&gt; y &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;declaración de privacidad&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
deleted file mode 100644
index 52e85b9a96ce..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
-     xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-    <Bundle Name="$(var.BundleName)" Version="$(var.BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.BundleUpgradeCode)">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="https://go.microsoft.com/fwlink/?LinkId=329770"
-                                                    LogoFile="DotNetLogo.bmp"
-                                                    SuppressDowngradeFailure="yes"
-                                                    SuppressOptionsUI="yes"
-                                                    ThemeFile="thm.xml"
-                                                    LocalizationFile="1033\thm.wxl"/>
-            <PayloadGroupRef Id="PG_Resources"/>
-        </BootstrapperApplicationRef>
-
-        <util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
-        <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
-        <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>
-
-        <!-- Ensure upgrades from 3.0.0 preview 1, 2, and 3. Conditioned for the 3.0.0 family. -->
-        <?if $(var.Version)=3.0.0.0?>
-        <?if $(var.Platform)=x86?>
-        <RelatedBundle Action="Upgrade" Id="{EC5CFEAE-D169-3A4A-AA09-F446BBC39AD9}"/>
-        <RelatedBundle Action="Upgrade" Id="{1D6E2BA3-B920-3C74-8F3E-F38E6097A297}"/>
-        <RelatedBundle Action="Upgrade" Id="{D73B587E-7C85-3418-9B07-6A8469CF7E94}"/>
-        <?elseif $(var.Platform)=x64?>
-        <RelatedBundle Action="Upgrade" Id="{F5C19B0F-77DF-3353-96D9-3F398FA38CF7}"/>
-        <RelatedBundle Action="Upgrade" Id="{DFC9DEC7-307D-39B5-AF9C-4E8CE923B1BA}"/>
-        <RelatedBundle Action="Upgrade" Id="{FDCA5106-C69E-34BB-A3B8-A24ADD0B4769}"/>
-        <?endif?>
-        <?endif?>
-
-        <!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
-        <?if $(var.MajorVersion)=3 and $(var.MinorVersion)=1?>
-        <?if $(var.Platform)=x64?>
-        <!--'Microsoft ASP.NET Core 3.1.9 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{9BD9F5C9-7DE4-3A3C-AB10-29B30D48CB39}"/>
-        <!--'Microsoft ASP.NET Core 3.1.8 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{BA264433-7668-3F63-BA27-0B842B591B41}"/>
-        <!--'Microsoft ASP.NET Core 3.1.7 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{E843D8AB-9AE4-3BBA-B417-E920A145D4D2}"/>
-        <!--'Microsoft ASP.NET Core 3.1.6 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{598E3E3B-DFA5-3F58-B2CF-EA59B0CD04E6}"/>
-        <!--'Microsoft ASP.NET Core 3.1.5 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{C2718AD8-4EC1-300D-A871-E98A1AC69180}"/>
-        <!--'Microsoft ASP.NET Core 3.1.4 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{F6D32B6E-2736-3FCC-B0F8-CB4C5AF95B2E}"/>
-        <!--'Microsoft ASP.NET Core 3.1.3 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{33468842-C5B0-3189-96D7-8CD8D28585B9}"/>
-        <!--'Microsoft ASP.NET Core 3.1.2 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{54EE87B3-B909-37F1-85AD-EE2296ABD2F1}"/>
-        <!--'Microsoft ASP.NET Core 3.1.1 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{90F6AF22-13B2-3D34-9CF0-C7F407DF4195}"/>
-        <!--'Microsoft ASP.NET Core 3.1.0 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{A65A6022-E10B-3AEF-802C-B9AFE0B000E2}"/>
-        <?endif?>
-
-        <!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x86. -->
-        <?if $(var.Platform)=x86?>
-        <!--'Microsoft ASP.NET Core 3.1.9 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{BE2349EF-BC78-3E42-B29C-E61D12E02FE4}"/>
-        <!--'Microsoft ASP.NET Core 3.1.8 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{F9E1048A-39B9-3AE1-8AA1-6B054A204A84}"/>
-        <!--'Microsoft ASP.NET Core 3.1.7 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{48272B78-3954-3D58-AB75-27B31E0D0DBD}"/>
-        <!--'Microsoft ASP.NET Core 3.1.6 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{52FF933A-F022-3A0A-8200-4C0E8E3934C3}"/>
-        <!--'Microsoft ASP.NET Core 3.1.5 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{F8C888A3-46C2-3306-8C90-5622C65BEBE3}"/>
-        <!--'Microsoft ASP.NET Core 3.1.4 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{EC496CB3-526B-366D-B667-3A20354DB136}"/>
-        <!--'Microsoft ASP.NET Core 3.1.3 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{05780385-0142-3FAA-9B97-F785C4798EC1}"/>
-        <!--'Microsoft ASP.NET Core 3.1.2 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{4EBEC6A2-DB4C-396B-BAE7-890D1D7EB9B3}"/>
-        <!--'Microsoft ASP.NET Core 3.1.1 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{5F160755-5B95-32A7-8D4F-ED1BA9F959D1}"/>
-        <!--'Microsoft ASP.NET Core 3.1.0 - Shared Framework'-->
-        <RelatedBundle Action="Upgrade" Id="{AC05AAAB-C217-3B65-95FE-11D2CB07A485}"/>
-        <?endif?>
-        <?endif?>
-
-        <PayloadGroup Id="PG_Resources">
-            <?foreach lcid in 2052;1028;1029;1031;3082;1033;1036;1040;1041;1042;1045;1046;1049;1055?>
-            <Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>
-            <?endforeach?>
-        </PayloadGroup>
-
-        <!-- Customizations of the default BA -->
-        <Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" />
-        <OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" />
-
-        <Variable Name="BundleNameShort" Value="$(var.BundleNameShort)"/>
-        <Variable Name="BundleNameSub" Value="$(var.BundleNameSub)"/>
-        <Variable Name="BundleNameFull" Value="$(var.BundleNameFull)"/>
-
-        <Chain>
-            <?if $(var.Platform)=x86?>
-            <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>
-            <?elseif $(var.Platform)=x64?>
-            <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x64"/>
-            <?elseif $(var.Platform)=arm64?>
-            <PackageGroupRef Id="PG_AspNetCoreSharedFramework_arm64"/>
-            <?endif?>
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp b/src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp
deleted file mode 100644
index 6299d4e8cd36..000000000000
Binary files a/src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp and /dev/null differ
diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
deleted file mode 100644
index 5f47072f1fee..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <Name>AspNetCoreSharedFrameworkBundle</Name>
-    <OutputName>$(Name)-$(Platform)</OutputName>
-    <IsShipping>true</IsShipping>
-    <OutputType>Bundle</OutputType>
-    <NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
-    <ProjectGuid>{D6C54D8B-043F-4877-B751-60E7390F9EC6}</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixDependencyExtension">
-      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
-      <Name>WixDependencyExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixBalExtension">
-      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
-      <Name>WixBalExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="Bundle.wxs" />
-    <Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
-    <Content Include="thm.xml" />
-  </ItemGroup>
-
-  <Choose>
-    <When Condition="'$(Platform)' == 'arm64'">
-      <ItemGroup>
-        <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=arm64">
-          <Name>SharedFrameworkLib</Name>
-          <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
-          <Private>True</Private>
-          <DoNotHarvest>True</DoNotHarvest>
-        </ProjectReference>
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=x86">
-          <Name>SharedFrameworkLib</Name>
-          <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
-          <Private>True</Private>
-          <DoNotHarvest>True</DoNotHarvest>
-        </ProjectReference>
-        <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=x64">
-          <Name>SharedFrameworkLib</Name>
-          <Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
-          <Private>True</Private>
-          <DoNotHarvest>True</DoNotHarvest>
-        </ProjectReference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <PackageFileName>$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
-
-    <BundleNameShort>Microsoft ASP.NET Core $(PackageBrandingVersion)</BundleNameShort>
-    <BundleNameSub>Shared Framework</BundleNameSub>
-    <BundleName>$(BundleNameShort) - $(BundleNameSub) ($(Platform))</BundleName>
-    <BundleNameFull>$(BundleName)</BundleNameFull>
-    <BundleRegName>$(BundleNameFull)</BundleRegName>
-
-    <BundleManufacturer>Microsoft Corporation</BundleManufacturer>
-    <BundleLogPrefix>dd_AspNetCoreSharedFramework_</BundleLogPrefix>
-
-    <!-- Registration -->
-    <BundleRegManufacturer>Microsoft</BundleRegManufacturer>
-    <BundleRegFamily>.NET</BundleRegFamily>
-
-    <DefineConstants>$(DefineConstants);BundleNameShort=$(BundleNameShort)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleName=$(BundleName)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleNameFull=$(BundleNameFull)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleNameSub=$(BundleNameSub)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleManufacturer=$(BundleManufacturer)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleLogPrefix=$(BundleLogPrefix)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleRegFamily=$(BundleRegFamily)</DefineConstants>
-    <DefineConstants>$(DefineConstants);BundleRegName=$(BundleRegName)</DefineConstants>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Installers/Windows/SharedFrameworkBundle/thm.xml b/src/Installers/Windows/SharedFrameworkBundle/thm.xml
deleted file mode 100644
index ac50c0db3593..000000000000
--- a/src/Installers/Windows/SharedFrameworkBundle/thm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
-    <Window Width="585" Height="347" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
-    <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
-    <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
-    <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
-
-    <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" Visible="yes"/>
-    <Text X="80" Y="11" Width="-11" Height="40" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
-    <Text X="80" Y="40" Width="-11" Height="40" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
-
-    <Page Name="Help">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
-        <Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
-        <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
-    </Page>
-    <Page Name="Install">
-        <Text X="11" Y="90" Width="-11" Height="30" FontId="3">#(loc.Welcome)</Text>
-        <Hypertext Name="EulaAndPrivacyHyperlink" X="11" Y="131" Width="-11" Height="51" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
-        <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="34" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
-        <Button Name="InstallButton" X="-91" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
-        <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
-    </Page>
-    <Page Name="FilesInUse">
-      <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
-      <Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
-      <Text Name="FilesInUseText"  X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
-
-      <Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
-      <Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
-
-      <Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
-      <Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
-    </Page>
-    <Page Name="Progress">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
-        <Text X="11" Y="121" Width="90" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="105" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
-        <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
-        <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
-    </Page>
-    <Page Name="Modify">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
-        <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
-        <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
-        <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
-    </Page>
-    <Page Name="Success">
-        <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-        <Text Name="SuccessInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
-        <Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text> 	
-        <Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text> 
-        <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-        <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
-        <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
-        <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
-    </Page>
-    <Page Name="Failure">
-        <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
-        <Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
-        <Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
-        <Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>	
-        <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-        <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-        <Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
-        <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
-        <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
-    </Page>
-</Theme>
diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
deleted file mode 100644
index 26a9d2cbca57..000000000000
--- a/src/Installers/Windows/SharedFrameworkLib/Library.wxs
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-	<Fragment>
-        <PackageGroup Id="PG_AspNetCoreSharedFramework_$(var.Platform)">
-            <RollbackBoundary Id="RB_AspNetCoreSharedFramework_$(var.Platform)" />
-
-            <?ifdef SharedFrameworkInstallCondition?>
-            <?undef SharedFrameworkInstallCondition?>
-            <?endif?>
-            <?ifdef DotNetHome?>
-            <?undef DotNetHome?>
-            <?endif?>
-            <?if $(var.Platform)=x86?>
-            <!-- These variables could be unset at this point, which we explicitly treat as 'false' -->
-            <?define SharedFrameworkInstallCondition=(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX="0") AND (NOT OPT_NO_X86 OR OPT_NO_X86="0")?>
-            <?define DotNetHome=DOTNETHOME_X86?>
-            <?elseif $(var.Platform)=x64?>
-            <?define SharedFrameworkInstallCondition=VersionNT64 AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX="0")?>
-            <?define DotNetHome=DOTNETHOME_X64?>
-            <?elseif $(var.Platform)=arm64?>
-            <?define SharedFrameworkInstallCondition=VersionNT64 AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX="0")?>
-            <?define DotNetHome=DOTNETHOME_ARM64?>
-            <?endif?>
-
-            <MsiPackage Id="AspNetCoreSharedFramework_$(var.Platform)"
-                        SourceFile="$(var.SharedFramework.TargetPath)"
-                        Compressed="yes"
-                        Visible="no"
-                        Vital="yes"
-                        InstallCondition="$(var.SharedFrameworkInstallCondition)">
-                <MsiProperty Name="DOTNETHOME" Value="[$(var.DotNetHome)]" />
-            </MsiPackage>
-        </PackageGroup>
-	</Fragment>
-</Wix>
diff --git a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
deleted file mode 100644
index 38742baf5847..000000000000
--- a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <Name>AspNetCoreSharedFrameworkLib$(Platform)</Name>
-    <OutputName>$(Name)</OutputName>
-    <!-- Use the internal installer name because .wixlib files are only produced so we can hand them off to the dotnet/cli repo. -->
-    <!-- This is still marked as 'shipping' because is needs to copied to artifact outputs. -->
-    <IsShipping>true</IsShipping>
-    <OutputType>Library</OutputType>
-    <LibBindFiles>true</LibBindFiles>
-    <NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
-    <ProjectGuid>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <WixExtension Include="WixBalExtension">
-      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
-      <Name>WixBalExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="Library.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SharedFramework\SharedFramework.wixproj">
-      <Project>{C681D730-4505-42C6-9E6C-87F757C4FB32}</Project>
-      <Name>SharedFramework</Name>
-      <Private>True</Private>
-      <DoNotHarvest>true</DoNotHarvest>
-    </ProjectReference>
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <PackageFileName>$(RuntimeInstallerBaseName)-internal-$(PackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
-  </PropertyGroup>
-
-  <!-- Overwrite the wix package drop creation target to create a lit
-       package instead. -->
-  <Target Name="CreateWixPackageDrop" AfterTargets="CopyToArtifactsDirectory">
-    <ItemGroup>
-      <WixInstallerFilesToProcess Include="$(InstallersOutputPath)$(OutputName).wixlib" />
-      <WixInstallerFilesToProcess Include="$(InstallersOutputPath)$(PackageFileName)"
-        Condition=" '$(SkipCopyToArtifactsDirectory)' != 'true' " />
-    </ItemGroup>
-
-    <CreateLitCommandPackageDrop
-      LitCommandWorkingDir="$(WixCommandObjDir)"
-      OutputFolder="$(WixCommandPackagesDir)"
-      WixExtensions="@(WixExtension)"
-      Bf="true"
-      InstallerFile="%(WixInstallerFilesToProcess.Identity)"
-      WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
-      <Output TaskParameter="OutputFile" PropertyName="_LitCommandPackageNameOutput" />
-    </CreateLitCommandPackageDrop>
-  </Target>
-</Project>
diff --git a/src/Installers/Windows/TargetingPack/DependencyProvider.wxs b/src/Installers/Windows/TargetingPack/DependencyProvider.wxs
deleted file mode 100644
index d62c3dfe7ddb..000000000000
--- a/src/Installers/Windows/TargetingPack/DependencyProvider.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
-    <Fragment>
-        <Feature Id="FT_DepProvider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" InstallDefault="local" Level="1" Title="RefCounting" TypicalDefault="install">
-            <ComponentRef Id="C_DepProvider" />
-        </Feature>
-
-        <DirectoryRef Id="TARGETDIR">
-            <Component Id="C_DepProvider" Win64="no">
-                <dep:Provides Key="$(var.DepProviderKey)" />
-            </Component>
-        </DirectoryRef>
-    </Fragment>
-</Wix>
\ No newline at end of file
diff --git a/src/Installers/Windows/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs
deleted file mode 100644
index 5b28e5e417fc..000000000000
--- a/src/Installers/Windows/TargetingPack/Product.wxs
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)"
-             Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)">
-        <Package InstallerVersion="$(var.InstallerVersion)" Compressed="yes" InstallScope="perMachine" />
-
-        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallFinalize" />
-
-        <?if $(var.EmbedCab)=yes?>
-            <!-- Ignore var.Cabinet This element should choose an appropriate name for the embedded CAB. -->
-            <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
-        <?else?>
-            <Media Id="1" Cabinet="$(var.Cabinet)" CompressionLevel="high" EmbedCab="no" />
-        <?endif?>
-
-        <WixVariable Id="WixUILicenseRtf" Value="$(var.files)\eula.txt" />
-        <UIRef Id="WixUI_Minimal" />
-
-        <FeatureRef Id="FT_DepProvider" />
-        <FeatureRef Id="FT_AspNetCoreTargetingPack" />
-        <FeatureRef Id="FT_ProductInfo" />
-    </Product>
-
-    <?ifdef PFilesFolder?>
-    <?undef PFilesFolder?>
-    <?endif?>
-
-    <?if $(var.Platform)=x86?>
-    <?define PFilesFolder=ProgramFilesFolder?>
-    <?elseif $(var.Platform)=x64 or $(var.Platform)=arm64?>
-    <?define PFilesFolder=ProgramFiles64Folder?>
-    <?else?>
-    <?error Invalid Platform ($(var.Platform))?>
-    <?endif?>
-
-    <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="$(var.PFilesFolder)">
-                <Directory Id="DOTNETHOME" Name="dotnet" />
-            </Directory>
-        </Directory>
-
-        <?if $(var.Platform)=x64?>
-        <CustomActionRef Id="Set_DOTNETHOME_NON_NATIVE_ARCHITECTURE" />
-        <?endif?>
-    </Fragment>
-
-    <Fragment>
-        <Feature Id="FT_AspNetCoreTargetingPack" Absent="allow" Description="!(loc.FT_AspNetCoreTargetingPackDescription)" Display="2" Level="1" Title="!(loc.FT_AspNetCoreTargetingPackTitle)">
-            <ComponentGroupRef Id="CG_AspNetCoreTargetingPack" />
-        </Feature>
-    </Fragment>
-
-    <Fragment>
-        <Feature Id="FT_ProductInfo">
-            <ComponentGroupRef Id="CG_ProductInfo" />
-        </Feature>
-
-        <ComponentGroup Id="CG_ProductInfo">
-            <ComponentRef Id="C_ProductVersion"/>
-            <ComponentRef Id="C_ProductInstallDir"/>
-            <?if $(var.Platform)=x64 ?>
-            <ComponentRef Id="C_ProductVersion_NonNative"/>
-            <ComponentRef Id="C_ProductInstallDir_NonNative"/>
-            <?endif?>
-        </ComponentGroup>
-
-        <DirectoryRef Id="DOTNETHOME">
-            <?ifdef ProductVersionKey?>
-            <?undef ProductVersionKey?>
-            <?endif?>
-
-            <?define ProductVersionKey=SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack\v$(var.MajorVersion).$(var.MinorVersion)\$(var.PackageVersion)?>
-
-            <Component Id="C_ProductVersion">
-                <?if $(var.Platform)=x64 ?>
-                <!-- Only install when actually on native architecture -->
-                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
-                <?endif?>
-                <RegistryKey Key="$(var.ProductVersionKey)" Root="HKLM">
-                    <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
-                </RegistryKey>
-            </Component>
-
-            <Component Id="C_ProductInstallDir">
-                <?if $(var.Platform)=x64 ?>
-                <!-- Only install when actually on native architecture -->
-                <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
-                <?endif?>
-                <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack" Root="HKLM">
-                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
-                </RegistryKey>
-            </Component>
-
-
-            <?if $(var.Platform)=x64 ?>
-            <!-- Install keys to a different path when not native architecture -->
-            <Component Id="C_ProductVersion_NonNative">
-                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
-                <RegistryKey Key="$(var.ProductVersionKey)\$(var.Platform)" Root="HKLM">
-                    <RegistryValue Name="Version" Type="string" Value="$(var.Version)" />
-                </RegistryKey>
-            </Component>
-            <Component Id="C_ProductInstallDir_NonNative">
-                <Condition>NON_NATIVE_ARCHITECTURE</Condition>
-                <RegistryKey Key="SOFTWARE\Microsoft\ASP.NET Core\Targeting Pack\$(var.Platform)" Root="HKLM">
-                    <RegistryValue Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
-                </RegistryKey>
-            </Component>
-            <?endif?>
-        </DirectoryRef>
-    </Fragment>
-</Wix>
diff --git a/src/Installers/Windows/TargetingPack/Strings.wxl b/src/Installers/Windows/TargetingPack/Strings.wxl
deleted file mode 100644
index 8b327078538b..000000000000
--- a/src/Installers/Windows/TargetingPack/Strings.wxl
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-    <String Id="FT_AspNetCoreTargetingPackTitle">ASP.NET Core Targeting Pack</String>
-    <String Id="FT_AspNetCoreTargetingPackDescription">ASP.NET Core Targeting Pack</String>
-</WixLocalization>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.nuspec b/src/Installers/Windows/TargetingPack/TargetingPack.nuspec
deleted file mode 100644
index 5427cd8c93d4..000000000000
--- a/src/Installers/Windows/TargetingPack/TargetingPack.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$</id>
-        <version>1.0.0</version>
-        <title>VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$</title>
-        <authors>Microsoft</authors>
-        <owners>Microsoft</owners>
-        <license type="expression">$PackageLicenseExpression$</license>
-        <projectUrl>https://github.com/dotnet/aspnetcore</projectUrl>
-        <icon>$PackageIcon$</icon>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
-        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <serviceable>true</serviceable>
-    </metadata>
-    <files>
-        <file src="$ASPNETCORE_RUNTIME_MSI$" />
-        <file src="$PackageIconFullPath$" target="$PackageIcon$" />
-    </files>
-</package>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
deleted file mode 100644
index 4823d1c89f33..000000000000
--- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
-  <PropertyGroup>
-    <OutputNamePrefix>$(TargetingPackInstallerBaseName)-</OutputNamePrefix>
-    <OutputNameSuffix>-win-$(Platform)</OutputNameSuffix>
-    <ProductNameFolder>Microsoft ASP.NET Core Targeting Pack</ProductNameFolder>
-    <ProductNameShort>AspNetCore.TargetingPack</ProductNameShort>
-    <OutputType>Package</OutputType>
-    <Cabinet>targeting_pack_$(Platform).cab</Cabinet>
-    <IsShipping>true</IsShipping>
-    <ProjectGuid>0AC34F1B-8056-4FFB-A398-E6BB7D67B48D</ProjectGuid>
-    <HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
-    <HarvestDirectorySuppressSpecificWarnings>5150;5151</HarvestDirectorySuppressSpecificWarnings>
-    <HarvestDirectorySuppressRegistry>true</HarvestDirectorySuppressRegistry>
-    <HarvestSource>$(IntermediateOutputPath)dn\</HarvestSource>
-    <DefineConstants>$(DefineConstants);ProductNameShort=$(ProductNameShort)</DefineConstants>
-    <DefineConstants>$(DefineConstants);ProductNameFolder=$(ProductNameFolder)</DefineConstants>
-    <DefineConstants>$(DefineConstants);AspNetCoreTargetingPackSource=$(HarvestSource)</DefineConstants>
-    <NamespaceGuid>DDBB771F-963F-47D3-8510-9ABD04DBE1D1</NamespaceGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ToolsetInstallerNuspecFile>$(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec</ToolsetInstallerNuspecFile>
-    <PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>
-    <BundleVersion>$(TargetingPackVersionPrefix)</BundleVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <WixExtension Include="WixDependencyExtension">
-      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
-      <Name>WixDependencyExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixNetFxExtension">
-      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
-      <Name>WixNetFxExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="DependencyProvider.wxs" />
-    <Compile Include="Product.wxs" />
-    <Compile Include="..\Common\dotnethome_x64.wxs" Link="dotnethome_x64.wxs" />
-    <EmbeddedResource Include="Strings.wxl" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <HarvestDirectory Include="$(HarvestSource)">
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-      <ComponentGroupName>CG_AspNetCoreTargetingPack</ComponentGroupName>
-      <DirectoryRefId>DOTNETHOME</DirectoryRefId>
-      <PreprocessorVariable>var.AspNetCoreTargetingPackSource</PreprocessorVariable>
-    </HarvestDirectory>
-  </ItemGroup>
-
-  <!-- TODO: https://github.com/dotnet/aspnetcore/issues/6304. harvest from TargetingPackLayoutRoot directly. Unzipping is currently required because the zip has the signed versions of .dll files. -->
-  <Target Name="ExtractIntermediateTargetingPack" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <TargetingPackHarvestRoot Condition="'$(TargetingPackHarvestRoot)' == ''">$(InstallersOutputPath)</TargetingPackHarvestRoot>
-      <TargetingPackZipVersion>$(TargetingPackVersionPrefix)</TargetingPackZipVersion>
-      <TargetingPackZipVersion Condition="'$(VersionSuffix)' != ''">$(TargetingPackZipVersion)-$(VersionSuffix)</TargetingPackZipVersion>
-      <IntermediateTargetingPackZip>$(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackZipVersion)-$(TargetRuntimeIdentifier).zip</IntermediateTargetingPackZip>
-    </PropertyGroup>
-
-    <Unzip SourceFiles="$(IntermediateTargetingPackZip)" DestinationFolder="$(HarvestSource)" />
-  </Target>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <ProductName>Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform))</ProductName>
-    <PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
-    <DefineConstants>$(DefineConstants);ProductName=$(ProductName)</DefineConstants>
-  </PropertyGroup>
-
-   <Target Name="CreateTargetingPackNugetPackage" DependsOnTargets="CopyToArtifactsDirectory" BeforeTargets="Build">
-    <PropertyGroup>
-      <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
-    </PropertyGroup>
-
-    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
-                      '$(ProductNameShort)' ^
-                      '$(MsiFullPath)' ^
-                      '$(CabFullPath)' ^
-                      '$(ToolsetInstallerNuspecFile)' ^
-                      '$(ArtifactsNonShippingPackagesDir)' ^
-                      '$(Platform)' ^
-                      '$(_GeneratedPackageVersion)' ^
-                      '$(RepoRoot)' ^
-                      '$(AspNetCoreMajorVersion)' ^
-                      '$(AspNetCoreMinorVersion)' ^
-                      '$(PackageIcon)' ^
-                      '$(PackageIconFullPath)' ^
-                      '$(PackageLicenseExpression)' " />
-  </Target>
-</Project>
diff --git a/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl
deleted file mode 100644
index 46f5e7b30c2b..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName]安裝程式</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">版本 [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">您確定要取消嗎?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">前一版</String>
-  <String Id="HelpHeader">安裝說明</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]目錄[\]] - 在目錄中安裝、修復、解除安裝或
-   建立搭售方案的完整本機複本。預設為安裝。
-
-/passive | /quiet -  顯示最少 UI 且不含提示，或者不顯示 UI，也
-   不顯示提示。預設會顯示 UI 和所有提示。
-
-/norestart   - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。
-/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。</String>
-  <String Id="HelpCloseButton">關閉(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">我同意授權條款及條件(&amp;A)</String>
-  <String Id="InstallInstallButton">安裝(&amp;I)</String>
-  <String Id="InstallCloseButton">關閉(&amp;C)</String>
-  <String Id="ProgressHeader">安裝進度</String>
-  <String Id="ProgressLabel">處理中: </String>
-  <String Id="OverallProgressPackageText">正在初始化...</String>
-  <String Id="ProgressCancelButton">取消(&amp;C)</String>
-  <String Id="ModifyHeader">修改安裝</String>
-  <String Id="ModifyRepairButton">修復(&amp;R)</String>
-  <String Id="ModifyUninstallButton">解除安裝(&amp;U)</String>
-  <String Id="ModifyCloseButton">關閉(&amp;C)</String>
-  <String Id="SuccessRepairHeader">修復已成功完成</String>
-  <String Id="SuccessUninstallHeader">解除安裝已成功完成</String>
-  <String Id="SuccessInstallHeader">安裝已成功完成</String>
-  <String Id="SuccessHeader">設定成功</String>
-  <String Id="SuccessLaunchButton">啟動(&amp;L)</String>
-  <String Id="SuccessRestartText">必須重新啟動電腦，才能使用此軟體。</String>
-  <String Id="SuccessRestartButton">重新啟動(&amp;R)</String>
-  <String Id="SuccessCloseButton">關閉(&amp;C)</String>
-  <String Id="FailureHeader">安裝失敗</String>
-  <String Id="FailureInstallHeader">設定失敗</String>
-  <String Id="FailureUninstallHeader">解除安裝失敗</String>
-  <String Id="FailureRepairHeader">修復失敗</String>
-  <String Id="FailureHyperlinkLogText">有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱&lt;a href="#"&gt;記錄檔&lt;/a&gt;。</String>
-  <String Id="FailureRestartText">必須重新啟動電腦，才能完成軟體的復原。</String>
-  <String Id="FailureRestartButton">重新啟動(&amp;R)</String>
-  <String Id="FailureCloseButton">關閉(&amp;C)</String>
-  <String Id="FilesInUseHeader">使用中的檔案</String>
-  <String Id="FilesInUseLabel">以下應用程式正在使用需要進行更新的檔案:</String>
-  <String Id="FilesInUseCloseRadioButton">關閉應用程式並嘗試重新啟動(&amp;A)</String>
-  <String Id="FilesInUseDontCloseRadioButton">不關閉應用程式，需要重新啟動(&amp;D)</String>
-  <String Id="FilesInUseOkButton">確定(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">取消(&amp;C)</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">歡迎使用 [WixBundleName] 安裝程式。</String>
-  <String Id="InstallResetIIS">請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此處&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此處&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;授權條款&lt;/a&gt;和&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隱私權聲明&lt;/a&gt;。</String>
-  <String Id="ModifyResetIIS">請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此處&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此處&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl
deleted file mode 100644
index 5006b351d62f..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Instalační program [WixBundleName]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Verze [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Opravdu chcete akci zrušit?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Předchozí verze</String>
-  <String Id="HelpHeader">Nápověda nastavení</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]adresář[\]] – Nainstaluje, opraví, odinstaluje nebo
-   vytvoří úplnou místní kopii svazku v adresáři. Výchozí možností je instalace.
-
-/passive | /quiet –  Zobrazí minimální uživatelské rozhraní bez výzev nebo nezobrazí žádné uživatelské rozhraní a
-   žádné výzvy. Výchozí možností je zobrazení uživatelského rozhraní a všech výzev.
-
-/norestart   – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní před restartováním zobrazí výzvu.
-/log log.txt – Uloží protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Zavřít</String>
-  <String Id="InstallAcceptCheckbox">Souhl&amp;asím s licenčními podmínkami</String>
-  <String Id="InstallInstallButton">&amp;Instalovat</String>
-  <String Id="InstallCloseButton">&amp;Zavřít</String>
-  <String Id="ProgressHeader">Průběh instalace</String>
-  <String Id="ProgressLabel">Probíhá zpracování:</String>
-  <String Id="OverallProgressPackageText">Inicializace...</String>
-  <String Id="ProgressCancelButton">&amp;Storno</String>
-  <String Id="ModifyHeader">Změnit instalaci</String>
-  <String Id="ModifyRepairButton">Op&amp;ravit</String>
-  <String Id="ModifyUninstallButton">O&amp;dinstalovat</String>
-  <String Id="ModifyCloseButton">&amp;Zavřít</String>
-  <String Id="SuccessRepairHeader">Oprava byla úspěšně dokončena</String>
-  <String Id="SuccessUninstallHeader">Odinstalace se úspěšně dokončila</String>
-  <String Id="SuccessInstallHeader">Instalace se úspěšně dokončila</String>
-  <String Id="SuccessHeader">Instalace byla úspěšná.</String>
-  <String Id="SuccessLaunchButton">&amp;Spustit</String>
-  <String Id="SuccessRestartText">Před použitím tohoto softwaru musíte restartovat počítač.</String>
-  <String Id="SuccessRestartButton">&amp;Restartovat</String>
-  <String Id="SuccessCloseButton">&amp;Zavřít</String>
-  <String Id="FailureHeader">Instalace se nepovedla</String>
-  <String Id="FailureInstallHeader">Instalace se nepovedla</String>
-  <String Id="FailureUninstallHeader">Odinstalace se nepovedla</String>
-  <String Id="FailureRepairHeader">Oprava se nepovedla</String>
-  <String Id="FailureHyperlinkLogText">Jeden nebo více problémů způsobilo selhání instalace. Opravte tyto problémy a znovu spusťte instalaci. Pro více informací se podívejte do &lt;a href="#"&gt;souboru protokolu&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač.</String>
-  <String Id="FailureRestartButton">&amp;Restartovat</String>
-  <String Id="FailureCloseButton">&amp;Zavřít</String>
-  <String Id="FilesInUseHeader">Soubory jsou používány</String>
-  <String Id="FilesInUseLabel">Následující aplikace používají soubory, které je potřeba aktualizovat:</String>
-  <String Id="FilesInUseCloseRadioButton">Zavřete &amp;aplikace a zkuste je restartovat.</String>
-  <String Id="FilesInUseDontCloseRadioButton">A&amp;plikace nezavírejte. Bude potřeba provést restart.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Zrušit</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Vítá vás instalační program produktu [WixBundleName]</String>
-  <String Id="InstallResetIIS">Po dokončení instalace restartujte službu IIS. Další informace najdete na &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;zde&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete na &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;zde&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] – &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;licenční podmínky&lt;/a&gt; a &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;</String>
-  <String Id="ModifyResetIIS">Po dokončení instalace restartujte službu IIS. Další informace najdete na &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;zde&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete na &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;zde&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl
deleted file mode 100644
index 96a72e0b8895..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName] - Setup</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Version von [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Möchten Sie den Vorgang wirklich abbrechen?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Vorherige Version</String>
-  <String Id="HelpHeader">Setup-Hilfe</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]Verzeichnis[\]] – installiert, repariert, deinstalliert oder
-   erstellt eine vollständige lokale Kopie des Bundles im Verzeichnis. Installieren ist die Standardeinstellung.
-
-/passive | /quiet –  zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen oder keine Benutzeroberfläche
-   und keine Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt.
-
-/norestart   – unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf.
-/log log.txt – protokolliert in eine bestimmte Datei. Standardmäßig wird eine Protokolldatei in %TEMP% erstellt.</String>
-  <String Id="HelpCloseButton">S&amp;chließen</String>
-  <String Id="InstallAcceptCheckbox">Ich &amp;stimme den Bedingungen des Lizenzvertrags zu</String>
-  <String Id="InstallInstallButton">&amp;Installieren</String>
-  <String Id="InstallCloseButton">S&amp;chließen</String>
-  <String Id="ProgressHeader">Setupstatus</String>
-  <String Id="ProgressLabel">Wird verarbeitet:</String>
-  <String Id="OverallProgressPackageText">Initialisierung...</String>
-  <String Id="ProgressCancelButton">&amp;Abbrechen</String>
-  <String Id="ModifyHeader">Setup ändern</String>
-  <String Id="ModifyRepairButton">&amp;Reparieren</String>
-  <String Id="ModifyUninstallButton">&amp;Deinstallieren</String>
-  <String Id="ModifyCloseButton">S&amp;chließen</String>
-  <String Id="SuccessRepairHeader">Reparatur erfolgreich abgeschlossen</String>
-  <String Id="SuccessUninstallHeader">Deinstallation erfolgreich abgeschlossen</String>
-  <String Id="SuccessInstallHeader">Installation erfolgreich abgeschlossen</String>
-  <String Id="SuccessHeader">Setup wurde erfolgreich abgeschlossen</String>
-  <String Id="SuccessLaunchButton">&amp;Starten</String>
-  <String Id="SuccessRestartText">Sie müssen den Computer neu starten, bevor Sie die Software verwenden können.</String>
-  <String Id="SuccessRestartButton">&amp;Neustart</String>
-  <String Id="SuccessCloseButton">S&amp;chließen</String>
-  <String Id="FailureHeader">Setupfehler</String>
-  <String Id="FailureInstallHeader">Fehler beim Setup</String>
-  <String Id="FailureUninstallHeader">Fehler bei der Deinstallation</String>
-  <String Id="FailureRepairHeader">Fehler bei der Reparatur</String>
-  <String Id="FailureHyperlinkLogText">Setup ist aufgrund eines oder mehrerer Probleme fehlgeschlagen. Beheben Sie die Probleme, und führen Sie Setup erneut aus. Weitere Informationen finden Sie in der &lt;a href="#"&gt;Protokolldatei&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen.</String>
-  <String Id="FailureRestartButton">&amp;Neustart</String>
-  <String Id="FailureCloseButton">&amp;Schließen</String>
-  <String Id="FilesInUseHeader">Dateien in Verwendung</String>
-  <String Id="FilesInUseLabel">Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen:</String>
-  <String Id="FilesInUseCloseRadioButton">Schließen Sie die &amp;Anwendungen, und versuchen Sie sie erneut zu starten.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Anwendungen nicht schließen. Ein Neustart ist erforderlich.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Abbrechen</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Willkommen beim Setup von [WixBundleName].</String>
-  <String Id="InstallResetIIS">Starten Sie IIS nach Abschluss der Installation neu. Zusätzliche Informationen finden Sie &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;hier&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">IIS ist auf diesem Computer nicht aktiviert. Wenn Sie ASP.NET Core-Anwendungen mit IIS ausführen möchten, müssen Sie IIS installieren, bevor Sie diesen Installer ausführen. Zusätzliche Informationen finden Sie &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;hier&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Lizenzbedingungen&lt;/a&gt; und &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;Datenschutzerklärung&lt;/a&gt; für [WixBundleName].</String>
-  <String Id="ModifyResetIIS">Starten Sie IIS nach Abschluss der Installation neu. Zusätzliche Informationen finden Sie &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;hier&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">IIS ist auf diesem Computer nicht aktiviert. Wenn Sie ASP.NET Core-Anwendungen mit IIS ausführen möchten, müssen Sie IIS installieren, bevor Sie diesen Installer ausführen. Zusätzliche Informationen finden Sie &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;hier&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl
deleted file mode 100644
index ec4d8463e65f..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] Setup</String>
-  <String Id="Title"><!--_locComment_text="{Locked}"-->[BundleNameShort]</String>
-  <String Id="SubTitle"><!--_locComment_text="{Locked}"-->[BundleNameSub]</String>
-  <String Id="InstallVersion"><!--_locComment_text="{Locked='[WixBundleVersion]'}"-->Version [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
-  <String Id="HelpHeader">Setup Help</String>
-  <String Id="HelpText"><!--_locComment_text="'directory' is to be translated in both places"-->/install | /repair | /uninstall | /layout [\[]directory[\]] - installs, repairs, uninstalls or
-   creates a complete local copy of the bundle in directory. Install is the default.
-
-/passive | /quiet -  displays minimal UI with no prompts or displays no UI and
-   no prompts. By default UI and all prompts are displayed.
-
-/norestart   - suppress any attempts to restart. By default UI will prompt before restart.
-/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Close</String>
-  <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
-  <String Id="InstallInstallButton">&amp;Install</String>
-  <String Id="InstallCloseButton">&amp;Close</String>
-  <String Id="ProgressHeader">Setup Progress</String>
-  <String Id="ProgressLabel">Processing:</String>
-  <String Id="OverallProgressPackageText">Initializing...</String>
-  <String Id="ProgressCancelButton">&amp;Cancel</String>
-  <String Id="ModifyHeader">Modify Setup</String>
-  <String Id="ModifyRepairButton">&amp;Repair</String>
-  <String Id="ModifyUninstallButton">&amp;Uninstall</String>
-  <String Id="ModifyCloseButton">&amp;Close</String>
-  <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
-  <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
-  <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
-  <String Id="SuccessHeader">Setup Successful</String>
-  <String Id="SuccessLaunchButton">&amp;Launch</String>
-  <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
-  <String Id="SuccessRestartButton">&amp;Restart</String>
-  <String Id="SuccessCloseButton">&amp;Close</String>
-  <String Id="FailureHeader">Setup Failed</String>
-  <String Id="FailureInstallHeader">Setup Failed</String>
-  <String Id="FailureUninstallHeader">Uninstall Failed</String>
-  <String Id="FailureRepairHeader">Repair Failed</String>
-  <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
-  <String Id="FailureRestartButton">&amp;Restart</String>
-  <String Id="FailureCloseButton">&amp;Close</String>
-  <String Id="FilesInUseHeader">Files In Use</String>
-  <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String>
-  <String Id="FilesInUseCloseRadioButton">Close the &amp;applications and attempt to restart them.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Do not close applications. A reboot will be required.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Cancel</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome"><!--_locComment_text="{Locked='[WixBundleName]'}"-->Welcome to the [WixBundleName] Setup.</String>
-  <String Id="InstallResetIIS"><!--_locComment_text="'here' is to be translated"-->Please restart IIS after the installation completes. You can find additional information &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;here&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS"><!--_locComment_text="'here' is to be translated"-->IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;here&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy"><!--_locComment_text="{Locked='[WixBundleName]'}"-->[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS"><!--_locComment_text="'here' is to be translated"-->Please restart IIS after the installation completes. You can find additional information &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;here&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS"><!--_locComment_text="'here' is to be translated"-->IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;here&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl
deleted file mode 100644
index fd344b47184d..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Installation de [WixBundleName]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Version [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Êtes-vous sûr de vouloir annuler ?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Version précédente</String>
-  <String Id="HelpHeader">Aide du programme d'installation</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]répertoire[\]] - installe, répare, désinstalle ou
-   crée une copie locale complète du bundle dans le répertoire. Install est l'option par défaut.
-
-/passive | /quiet -  affiche une interface utilisateur minimale, sans invite, ou n'affiche 
-   ni interface utilisateur, ni invite. Par défaut, l'interface utilisateur et toutes les invites sont affichées.
-
-/norestart   - supprime toutes les tentatives de redémarrage. Par défaut, l'interface utilisateur affiche une invite avant le redémarrage.
-/log log.txt - enregistre les informations dans un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Fermer</String>
-  <String Id="InstallAcceptCheckbox">J'&amp;accepte les conditions générales de la licence</String>
-  <String Id="InstallInstallButton">&amp;Installer</String>
-  <String Id="InstallCloseButton">&amp;Fermer</String>
-  <String Id="ProgressHeader">Progression de l’opération</String>
-  <String Id="ProgressLabel">En cours :</String>
-  <String Id="OverallProgressPackageText">Initialisation...</String>
-  <String Id="ProgressCancelButton">&amp;Annuler</String>
-  <String Id="ModifyHeader">Modifier l'installation</String>
-  <String Id="ModifyRepairButton">&amp;Réparer</String>
-  <String Id="ModifyUninstallButton">&amp;Désinstaller</String>
-  <String Id="ModifyCloseButton">&amp;Fermer</String>
-  <String Id="SuccessRepairHeader">Réparation terminée avec succès</String>
-  <String Id="SuccessUninstallHeader">Désinstallation terminée avec succès</String>
-  <String Id="SuccessInstallHeader">Installation terminée avec succès</String>
-  <String Id="SuccessHeader">Opération réussie</String>
-  <String Id="SuccessLaunchButton">&amp;Démarrer</String>
-  <String Id="SuccessRestartText">Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel.</String>
-  <String Id="SuccessRestartButton">&amp;Redémarrer</String>
-  <String Id="SuccessCloseButton">&amp;Fermer</String>
-  <String Id="FailureHeader">Échec de l’opération</String>
-  <String Id="FailureInstallHeader">Échec de l'installation</String>
-  <String Id="FailureUninstallHeader">Échec de la désinstallation</String>
-  <String Id="FailureRepairHeader">Échec de la réparation</String>
-  <String Id="FailureHyperlinkLogText">Le programme d’installation a échoué en raison d’un ou de plusieurs problèmes. Veuillez corriger ces problèmes, puis relancez le programme d’installation. Pour plus d’informations, consultez le &lt;a href="#"&gt;fichier journal&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel.</String>
-  <String Id="FailureRestartButton">&amp;Redémarrer</String>
-  <String Id="FailureCloseButton">&amp;Fermer</String>
-  <String Id="FilesInUseHeader">Fichiers en cours d'utilisation</String>
-  <String Id="FilesInUseLabel">Les applications suivantes utilisent des fichiers nécessitant une mise à jour :</String>
-  <String Id="FilesInUseCloseRadioButton">&amp;Fermer les applications essayer de les ouvrir de nouveau.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Ne pas fermer les applications. Un redémarrage sera nécessaire.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Annuler</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Bienvenue dans le programme d'installation de [WixBundleName].</String>
-  <String Id="InstallResetIIS">Veuillez redémarrer IIS une fois l'installation terminée. Vous trouverez des informations supplémentaires &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;ici&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">IIS n'est pas activé sur cette machine. Si vous avez l'intention d'exécuter des applications ASP.NET Core avec IIS, vous devez installer IIS avant d'exécuter ce programme d'installation. Vous trouverez des informations supplémentaires &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;ici&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;termes du contrat de licence&lt;/a&gt; et &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;déclaration de confidentialité&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">Veuillez redémarrer IIS une fois l'installation terminée. Vous trouverez des informations supplémentaires &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;ici&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">IIS n'est pas activé sur cette machine. Si vous avez l'intention d'exécuter des applications ASP.NET Core avec IIS, vous devez installer IIS avant d'exécuter ce programme d'installation. Vous trouverez des informations supplémentaires &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;ici&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl
deleted file mode 100644
index 849900259104..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Installazione di [WixBundleName]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Versione [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Annullare?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Versione precedente</String>
-  <String Id="HelpHeader">Guida all'installazione</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]directory[\]] - installa, ripara, disinstalla o
-   crea una copia locale completa del bundle nella directory. L'opzione predefinita è install.
-
-/passive | /quiet -  visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente
-   né prompt. Per impostazione predefinita, viene visualizzata l'intera interfaccia utente e tutti i prompt.
-
-/norestart   - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio.
-/log log.txt - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Chiudi</String>
-  <String Id="InstallAcceptCheckbox">&amp;Accetto i termini e le condizioni di licenza</String>
-  <String Id="InstallInstallButton">&amp;Installa</String>
-  <String Id="InstallCloseButton">&amp;Chiudi</String>
-  <String Id="ProgressHeader">Stato installazione</String>
-  <String Id="ProgressLabel">Elaborazione di:</String>
-  <String Id="OverallProgressPackageText">Inizializzazione in corso...</String>
-  <String Id="ProgressCancelButton">&amp;Annulla</String>
-  <String Id="ModifyHeader">Modifica installazione</String>
-  <String Id="ModifyRepairButton">&amp;Ripristina</String>
-  <String Id="ModifyUninstallButton">&amp;Disinstalla</String>
-  <String Id="ModifyCloseButton">&amp;Chiudi</String>
-  <String Id="SuccessRepairHeader">Riparazione completata correttamente</String>
-  <String Id="SuccessUninstallHeader">Disinstallazione completata correttamente</String>
-  <String Id="SuccessInstallHeader">Installazione completata correttamente</String>
-  <String Id="SuccessHeader">Installazione completata</String>
-  <String Id="SuccessLaunchButton">&amp;Avvia</String>
-  <String Id="SuccessRestartText">È necessario riavviare il computer prima di utilizzare il software.</String>
-  <String Id="SuccessRestartButton">&amp;Riavvia</String>
-  <String Id="SuccessCloseButton">&amp;Chiudi</String>
-  <String Id="FailureHeader">Installazione non riuscita</String>
-  <String Id="FailureInstallHeader">Installazione non riuscita</String>
-  <String Id="FailureUninstallHeader">Disinstallazione non riuscita</String>
-  <String Id="FailureRepairHeader">Riparazione non riuscita</String>
-  <String Id="FailureHyperlinkLogText">Installazione non riuscita a causa di uno o più problemi. Risolvere i problemi e ritentare l'installazione. Per ulteriori informazioni, vedere il &lt;a href="#"&gt;file di log&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">È necessario riavviare il computer per completare il rollback del software.</String>
-  <String Id="FailureRestartButton">&amp;Riavvia</String>
-  <String Id="FailureCloseButton">&amp;Chiudi</String>
-  <String Id="FilesInUseHeader">File in uso</String>
-  <String Id="FilesInUseLabel">Le applicazioni seguenti usano file che necessitano di aggiornamento:</String>
-  <String Id="FilesInUseCloseRadioButton">Chiudere le &amp;applicazioni e provare a riavviarle.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Non chiudere le applicazioni; sarà necessario riavviare il sistema</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Annulla</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Installazione di [WixBundleName].</String>
-  <String Id="InstallResetIIS">Al termine dell'installazione, riavviare IIS. È possibile trovare altre informazioni &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;qui&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">IIS non è abilitato su questo computer. Se si intende eseguire applicazioni ASP.NET Core con IIS, è necessario installare IIS prima di eseguire questo programma di installazione. Altre informazioni &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;qui&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Condizioni di licenza&lt;/a&gt; e &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;informativa sulla privacy&lt;/a&gt; di [WixBundleName].</String>
-  <String Id="ModifyResetIIS">Al termine dell'installazione, riavviare IIS. È possibile trovare altre informazioni &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;qui&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">IIS non è abilitato su questo computer. Se si intende eseguire applicazioni ASP.NET Core con IIS, è necessario installare IIS prima di eseguire questo programma di installazione. Altre informazioni &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;qui&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl
deleted file mode 100644
index 4e78b735ae8d..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName]のセットアップ</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">バージョン [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">取り消しますか?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">以前のバージョン</String>
-  <String Id="HelpHeader">セットアップのヘルプ</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]ディレクトリ[\]] - バンドルの完全なローカル コピーに対する
-  ディレクトリへのインストール、修復、ディレクトリからのアンインストール、またはディレクトリ内への作成を行います。既定の設定はインストールです。
-
-/passive | /quiet -  最小限の UI だけを表示しプロンプトは表示しない、または UI もプロンプトも
-   表示しません。既定では UI とすべてのプロンプトが表示されます。
-
-/norestart   - 再起動を抑制します。既定では再起動前に確認メッセージが表示されます。
-/log log.txt - 特定のファイルに記録します。ログ ファイルは既定では %TEMP% に作成されます。</String>
-  <String Id="HelpCloseButton">閉じる(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">ライセンス条項および使用条件に同意する(&amp;A)</String>
-  <String Id="InstallInstallButton">インストール(&amp;I)</String>
-  <String Id="InstallCloseButton">閉じる(&amp;C)</String>
-  <String Id="ProgressHeader">セットアップの進行状況</String>
-  <String Id="ProgressLabel">処理中:</String>
-  <String Id="OverallProgressPackageText">初期化しています...</String>
-  <String Id="ProgressCancelButton">キャンセル(&amp;C)</String>
-  <String Id="ModifyHeader">セットアップの変更</String>
-  <String Id="ModifyRepairButton">修復(&amp;R)</String>
-  <String Id="ModifyUninstallButton">アンインストール(&amp;U)</String>
-  <String Id="ModifyCloseButton">閉じる(&amp;C)</String>
-  <String Id="SuccessRepairHeader">修復が正常に完了しました</String>
-  <String Id="SuccessUninstallHeader">アンインストールが正常に完了しました</String>
-  <String Id="SuccessInstallHeader">インストールが正常に完了しました</String>
-  <String Id="SuccessHeader">セットアップ完了</String>
-  <String Id="SuccessLaunchButton">起動(&amp;L)</String>
-  <String Id="SuccessRestartText">ソフトウェアを使用する前にコンピューターを再起動する必要があります。</String>
-  <String Id="SuccessRestartButton">再起動(&amp;R)</String>
-  <String Id="SuccessCloseButton">閉じる(&amp;C)</String>
-  <String Id="FailureHeader">セットアップに失敗しました</String>
-  <String Id="FailureInstallHeader">セットアップに失敗しました</String>
-  <String Id="FailureUninstallHeader">アンインストールに失敗しました</String>
-  <String Id="FailureRepairHeader">修復に失敗しました</String>
-  <String Id="FailureHyperlinkLogText">1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、&lt;a href="#"&gt;ログ ファイル&lt;/a&gt;を参照してください。</String>
-  <String Id="FailureRestartText">ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。</String>
-  <String Id="FailureRestartButton">再起動(&amp;R)</String>
-  <String Id="FailureCloseButton">閉じる(&amp;C)</String>
-  <String Id="FilesInUseHeader">ファイルが使用中</String>
-  <String Id="FilesInUseLabel">次のアプリケーションは、更新の必要があるファイルを使用しています:</String>
-  <String Id="FilesInUseCloseRadioButton">アプリケーションを閉じて再起動を試みる。(&amp;A)</String>
-  <String Id="FilesInUseDontCloseRadioButton">アプリケーションを終了させない (コンピューターの再起動が必要になります)(&amp;D)</String>
-  <String Id="FilesInUseOkButton">OK(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">キャンセル(&amp;C)</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">[WixBundleName] のセットアップへようこそ。</String>
-  <String Id="InstallResetIIS">インストールが完了したら、IIS を再起動してください。追加情報については、&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;こちら&lt;/a&gt;をご覧ください。</String>
-  <String Id="InstallNoIIS">このコンピューターでは IIS が有効になっていません。IIS ASP.NET Core アプリケーションを実行する場合は、このインストーラーを実行する前に IIS をインストールする必要があります。追加情報については、&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;こちら&lt;/a&gt;を参照してください。</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;ライセンス条項&lt;/a&gt;および&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;プライバシーに関する声明&lt;/a&gt;。</String>
-  <String Id="ModifyResetIIS">インストールが完了したら、IIS を再起動してください。追加情報については、&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;こちら&lt;/a&gt;をご覧ください。</String>
-  <String Id="ModifyNoIIS">このコンピューターでは IIS が有効になっていません。IIS ASP.NET Core アプリケーションを実行する場合は、このインストーラーを実行する前に IIS をインストールする必要があります。追加情報については、&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;こちら&lt;/a&gt;を参照してください。</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl
deleted file mode 100644
index 18bda1fc3960..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName] 설치 프로그램</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">버전 [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">취소하시겠습니까?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">이전 버전</String>
-  <String Id="HelpHeader">설치 도움말</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]디렉터리[\]] - 디렉터리에 번들의 전체 로컬 복사본을
-   설치, 복구, 제거 또는 작성합니다. 설치가 기본값입니다.
-
-/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및
-   프롬프트를 표시하지 않습니다. 기본값으로 UI와 모든 프롬프트가 표시됩니다.
-
-/norestart   - 다시 시작하지 않게 합니다. 기본값으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다.
-/log log.txt - 특정 파일에 기록합니다. 기본값으로 로그 파일은 %TEMP%에 만들어집니다.</String>
-  <String Id="HelpCloseButton">닫기(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">동의함(&amp;A)</String>
-  <String Id="InstallInstallButton">설치(&amp;I)</String>
-  <String Id="InstallCloseButton">닫기(&amp;C)</String>
-  <String Id="ProgressHeader">설치 진행률</String>
-  <String Id="ProgressLabel">처리 중:</String>
-  <String Id="OverallProgressPackageText">초기화 중...</String>
-  <String Id="ProgressCancelButton">취소(&amp;C)</String>
-  <String Id="ModifyHeader">설치 수정</String>
-  <String Id="ModifyRepairButton">복구(&amp;R)</String>
-  <String Id="ModifyUninstallButton">제거(&amp;U)</String>
-  <String Id="ModifyCloseButton">닫기(&amp;C)</String>
-  <String Id="SuccessRepairHeader">복구 완료됨</String>
-  <String Id="SuccessUninstallHeader">제거 완료됨</String>
-  <String Id="SuccessInstallHeader">설치 완료됨</String>
-  <String Id="SuccessHeader">설치 완료</String>
-  <String Id="SuccessLaunchButton">시작(&amp;L)</String>
-  <String Id="SuccessRestartText">소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다.</String>
-  <String Id="SuccessRestartButton">다시 시작(&amp;R)</String>
-  <String Id="SuccessCloseButton">닫기(&amp;C)</String>
-  <String Id="FailureHeader">설치 실패</String>
-  <String Id="FailureInstallHeader">설치 실패</String>
-  <String Id="FailureUninstallHeader">제거 실패</String>
-  <String Id="FailureRepairHeader">복구 실패</String>
-  <String Id="FailureHyperlinkLogText">하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 &lt;a href="#"&gt;로그 파일&lt;/a&gt;을 참조하십시오.</String>
-  <String Id="FailureRestartText">소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다.</String>
-  <String Id="FailureRestartButton">다시 시작(&amp;R)</String>
-  <String Id="FailureCloseButton">닫기(&amp;C)</String>
-  <String Id="FilesInUseHeader">사용 중인 파일</String>
-  <String Id="FilesInUseLabel">다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다.</String>
-  <String Id="FilesInUseCloseRadioButton">응용 프로그램을 닫고 다시 시작합니다(&amp;A).</String>
-  <String Id="FilesInUseDontCloseRadioButton">응용 프로그램을 닫지 않습니다(&amp;D). 다시 부팅해야 합니다.</String>
-  <String Id="FilesInUseOkButton">확인(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">취소(&amp;C)</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">[WixBundleName] 설치를 시작합니다.</String>
-  <String Id="InstallResetIIS">설치가 완료된 후 IIS를 다시 시작하세요. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다.</String>
-  <String Id="InstallNoIIS">이 컴퓨터에서 IIS를 사용하도록 설정되어 있지 않습니다. IIS에서 ASP.NET Core 애플리케이션을 실행하려면 이 설치 관리자를 실행하기 전에 IIS를 설치해야 합니다. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;사용 조건&lt;/a&gt; 및 &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;개인정보처리방침&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">설치가 완료된 후 IIS를 다시 시작하세요. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다.</String>
-  <String Id="ModifyNoIIS">이 컴퓨터에서 IIS를 사용하도록 설정되어 있지 않습니다. IIS에서 ASP.NET Core 애플리케이션을 실행하려면 이 설치 관리자를 실행하기 전에 IIS를 설치해야 합니다. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl
deleted file mode 100644
index 9add93d65004..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Instalator [WixBundleName]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Wersja [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Czy na pewno chcesz anulować?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Poprzednia wersja</String>
-  <String Id="HelpHeader">Instalator — Pomoc</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]katalog[\]] — instaluje, naprawia, odinstalowuje lub
-    tworzy pełną lokalną kopię pakietu w katalogu. Instalacja jest domyślna.
-
-/passive | /quiet — wyświetla minimalny interfejs użytkownika bez monitów albo nie wyświetla żadnego interfejsu użytkownika ani monitów
-.
-   Domyślnie jest wyświetlany interfejs użytkownika oraz wszystkie monity.
-
-/norestart  — pomija próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetla monit przed ponownym uruchomieniem.
-/log log.txt — tworzy dziennik w określonym pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Zamknij</String>
-  <String Id="InstallAcceptCheckbox">&amp;Zgadzam się na warunki licencji</String>
-  <String Id="InstallInstallButton">&amp;Zainstaluj</String>
-  <String Id="InstallCloseButton">&amp;Zamknij</String>
-  <String Id="ProgressHeader">Postęp instalacji</String>
-  <String Id="ProgressLabel">Przetwarzanie:</String>
-  <String Id="OverallProgressPackageText">Trwa inicjowanie...</String>
-  <String Id="ProgressCancelButton">&amp;Anuluj</String>
-  <String Id="ModifyHeader">Zmodyfikuj instalatora</String>
-  <String Id="ModifyRepairButton">&amp;Napraw</String>
-  <String Id="ModifyUninstallButton">&amp;Odinstaluj</String>
-  <String Id="ModifyCloseButton">&amp;Zamknij</String>
-  <String Id="SuccessRepairHeader">Pomyślnie ukończono naprawę</String>
-  <String Id="SuccessUninstallHeader">Pomyślnie ukończono operację odinstalowania</String>
-  <String Id="SuccessInstallHeader">Pomyślnie ukończono instalację</String>
-  <String Id="SuccessHeader">Instalacja przebiegła pomyślnie</String>
-  <String Id="SuccessLaunchButton">&amp;Uruchom</String>
-  <String Id="SuccessRestartText">Aby korzystać z oprogramowania, należy ponownie uruchomić komputer.</String>
-  <String Id="SuccessRestartButton">&amp;Uruchom ponownie</String>
-  <String Id="SuccessCloseButton">&amp;Zamknij</String>
-  <String Id="FailureHeader">Instalacja nie powiodła się</String>
-  <String Id="FailureInstallHeader">Konfiguracja nie powiodła się</String>
-  <String Id="FailureUninstallHeader">Operacja odinstalowania nie powiodła się</String>
-  <String Id="FailureRepairHeader">Naprawa nie powiodła się</String>
-  <String Id="FailureHyperlinkLogText">Jeden lub więcej problemów spowodował niepowodzenie instalacji. Napraw błędy, a następnie uruchom ponownie instalację. Aby uzyskać więcej informacji zobacz &lt;a href="#"&gt;plik dziennika&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Należy ponownie uruchomić komputer, aby dokończyć wycofywanie oprogramowania.</String>
-  <String Id="FailureRestartButton">&amp;Uruchom ponownie</String>
-  <String Id="FailureCloseButton">&amp;Zamknij</String>
-  <String Id="FilesInUseHeader">Pliki w użyciu</String>
-  <String Id="FilesInUseLabel">Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane:</String>
-  <String Id="FilesInUseCloseRadioButton">Zamknij &amp;aplikacje i spróbuj je ponownie uruchomić.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Nie zamykaj aplikacji. Będzie konieczne ponowne uruchomienie.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Anuluj</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Witamy w instalatorze produktu [WixBundleName].</String>
-  <String Id="InstallResetIIS">Uruchom ponownie usługi IIS po zakończeniu instalacji. Dodatkowe informacje można znaleźć &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;tutaj&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">Usługi IIS nie są włączone na tym komputerze. Jeśli zamierzasz uruchamiać aplikacje ASP.NET Core z usługami IIS, musisz zainstalować usługi IIS przed uruchomieniem tego instalatora. Dodatkowe informacje można znaleźć &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;tutaj&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;postanowienia licencyjne&lt;/a&gt; i &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;oświadczenie o ochronie prywatności&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">Uruchom ponownie usługi IIS po zakończeniu instalacji. Dodatkowe informacje można znaleźć &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;tutaj&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">Usługi IIS nie są włączone na tym komputerze. Jeśli zamierzasz uruchamiać aplikacje ASP.NET Core z usługami IIS, musisz zainstalować usługi IIS przed uruchomieniem tego instalatora. Dodatkowe informacje można znaleźć &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;tutaj&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl
deleted file mode 100644
index afee27c6b4fc..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName] Instalação</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Versão [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Tem certeza de que deseja cancelar?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Versão anterior</String>
-  <String Id="HelpHeader">Ajuda da Instalação</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]diretório[\]] - instala, repara, desinstala ou
-   cria uma cópia local completa do pacote no diretório. Install é o padrão
-
-/passive | /quiet -  exibe a interface do usuário mínima sem nenhum prompt ou não exibe nenhuma interface do usuário e
-   nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos.
-
-/norestart   - suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar.
-/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Fechar</String>
-  <String Id="InstallAcceptCheckbox">Eu &amp;concordo com os termos e condições da licença</String>
-  <String Id="InstallInstallButton">&amp;Instalar</String>
-  <String Id="InstallCloseButton">&amp;Fechar</String>
-  <String Id="ProgressHeader">Progresso da Instalação</String>
-  <String Id="ProgressLabel">Processando:</String>
-  <String Id="OverallProgressPackageText">Inicializando...</String>
-  <String Id="ProgressCancelButton">&amp;Cancelar</String>
-  <String Id="ModifyHeader">Modificar Instalação</String>
-  <String Id="ModifyRepairButton">&amp;Reparar</String>
-  <String Id="ModifyUninstallButton">&amp;Desinstalar</String>
-  <String Id="ModifyCloseButton">&amp;Fechar</String>
-  <String Id="SuccessRepairHeader">Reparo Concluído com Êxito</String>
-  <String Id="SuccessUninstallHeader">Desinstalação Concluída com Êxito</String>
-  <String Id="SuccessInstallHeader">Instalação Concluída com Êxito</String>
-  <String Id="SuccessHeader">Instalação com Êxito</String>
-  <String Id="SuccessLaunchButton">&amp;Iniciar</String>
-  <String Id="SuccessRestartText">Reinicie o computador para poder usar o software.</String>
-  <String Id="SuccessRestartButton">&amp;Reiniciar</String>
-  <String Id="SuccessCloseButton">&amp;Fechar</String>
-  <String Id="FailureHeader">Falha na Instalação</String>
-  <String Id="FailureInstallHeader">Falha na Instalação</String>
-  <String Id="FailureUninstallHeader">Falha na Desinstalação</String>
-  <String Id="FailureRepairHeader">Falha ao Reparar</String>
-  <String Id="FailureHyperlinkLogText">Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o &lt;a href="#"&gt;arquivo de log&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Reinicie o computador para concluir a reversão do software.</String>
-  <String Id="FailureRestartButton">&amp;Reiniciar</String>
-  <String Id="FailureCloseButton">&amp;Fechar</String>
-  <String Id="FilesInUseHeader">Arquivos em Uso</String>
-  <String Id="FilesInUseLabel">Os aplicativos a seguir estão usando arquivos que precisam ser atualizados:</String>
-  <String Id="FilesInUseCloseRadioButton">Feche os &amp;aplicativos e tente reiniciá-los.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Não feche os aplicativos. Uma reinicialização será necessária.</String>
-  <String Id="FilesInUseOkButton">&amp;OK</String>
-  <String Id="FilesInUseCancelButton">&amp;Cancelar</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Bem-vindo à Instalação do [WixBundleName].</String>
-  <String Id="InstallResetIIS">Reinicie o IIS após a conclusão da instalação. Você pode encontrar informações adicionais &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aqui&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">O IIS não está habilitado neste computador. Se pretende executar aplicativos ASP.NET Core com o IIS, você deve instalar o IIS antes de executar este instalador. Você pode encontrar informações adicionais &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aqui&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;termos de licença&lt;/a&gt; e &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;política de privacidade&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">Reinicie o IIS após a conclusão da instalação. Você pode encontrar informações adicionais &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aqui&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">O IIS não está habilitado neste computador. Se pretende executar aplicativos ASP.NET Core com o IIS, você deve instalar o IIS antes de executar este instalador. Você pode encontrar informações adicionais &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aqui&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl
deleted file mode 100644
index e522fb2b8de7..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Программа установки [WixBundleName]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Версия [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">Отменить?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Предыдущая версия</String>
-  <String Id="HelpHeader">Справка по установке</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]каталог[\]] — установка, восстановление, удаление или
- создание полной локальной копии пакета в каталоге. По умолчанию — установка.
-
-/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и
- без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы.
-
-/norestart — отключение всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос.
-/log log.txt — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Закрыть</String>
-  <String Id="InstallAcceptCheckbox">Я &amp;принимаю условия лицензии</String>
-  <String Id="InstallInstallButton">&amp;Установить</String>
-  <String Id="InstallCloseButton">&amp;Закрыть</String>
-  <String Id="ProgressHeader">Ход установки</String>
-  <String Id="ProgressLabel">Обработка:</String>
-  <String Id="OverallProgressPackageText">Инициализация...</String>
-  <String Id="ProgressCancelButton">Отм&amp;ена</String>
-  <String Id="ModifyHeader">Изменение установки</String>
-  <String Id="ModifyRepairButton">&amp;Исправить</String>
-  <String Id="ModifyUninstallButton">&amp;Удалить</String>
-  <String Id="ModifyCloseButton">&amp;Закрыть</String>
-  <String Id="SuccessRepairHeader">Исправление успешно завершено</String>
-  <String Id="SuccessUninstallHeader">Удаление успешно завершено</String>
-  <String Id="SuccessInstallHeader">Установка успешно завершена</String>
-  <String Id="SuccessHeader">Установка успешно завершена</String>
-  <String Id="SuccessLaunchButton">&amp;Запустить</String>
-  <String Id="SuccessRestartText">Перед использованием программного обеспечения необходимо перезапустить компьютер.</String>
-  <String Id="SuccessRestartButton">&amp;Перезапустить</String>
-  <String Id="SuccessCloseButton">&amp;Закрыть</String>
-  <String Id="FailureHeader">Сбой установки</String>
-  <String Id="FailureInstallHeader">Сбой установки</String>
-  <String Id="FailureUninstallHeader">Сбой удаления</String>
-  <String Id="FailureRepairHeader">Сбой восстановления</String>
-  <String Id="FailureHyperlinkLogText">Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в &lt;a href="#"&gt;файле журнала&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения.</String>
-  <String Id="FailureRestartButton">&amp;Перезапустить</String>
-  <String Id="FailureCloseButton">З&amp;акрыть</String>
-  <String Id="FilesInUseHeader">Используемые файлы</String>
-  <String Id="FilesInUseLabel">Следующие приложения используют файлы, которые нуждаются в обновлении:</String>
-  <String Id="FilesInUseCloseRadioButton">Закройте &amp;приложения и попробуйте перезапустить их.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Не закрывайте приложения. Потребуется перезагрузка компьютера.</String>
-  <String Id="FilesInUseOkButton">О&amp;К</String>
-  <String Id="FilesInUseCancelButton">&amp;Отменить</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Вас приветствует мастер установки [WixBundleName].</String>
-  <String Id="InstallResetIIS">Перезапустите службы IIS после завершения установки. Дополнительные сведения см. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;здесь&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">Службы IIS не включены на этом компьютере. Если вы планируете запускать приложения ASP.NET Core с IIS, перед запуском этого установщика необходимо установить службы IIS. Дополнительные сведения см. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;здесь&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;условия лицензии&lt;/a&gt; и &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;заявление о конфиденциальности&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">Перезапустите службы IIS после завершения установки. Дополнительные сведения см. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;здесь&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">Службы IIS не включены на этом компьютере. Если вы планируете запускать приложения ASP.NET Core с IIS, перед запуском этого установщика необходимо установить службы IIS. Дополнительные сведения см. &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;здесь&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl
deleted file mode 100644
index 0d383b14fb4f..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName] Kurulumu</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">[WixBundleVersion] Sürümü</String>
-  <String Id="ConfirmCancelMessage">İptal etmek istediğinizden emin misiniz?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Önceki sürüm</String>
-  <String Id="HelpHeader">Kurulum Yardımı</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]dizin[\]] - yükler, onarır, kaldırır ya da
-   dizindeki paketin tam bir yerel kopyasını oluşturur. Varsayılan install değeridir.
-
-/passive | /quiet -  en az düzeyde istemsiz UI gösterir ya da hiç UI göstermez ve
-   istem yoktur. Varsayılan olarak UI ve tüm istemler görüntülenir.
-
-/norestart   - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar.
-/log log.txt - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur.</String>
-  <String Id="HelpCloseButton">&amp;Kapat</String>
-  <String Id="InstallAcceptCheckbox">Lisans &amp;hüküm ve koşullarını kabul ediyorum</String>
-  <String Id="InstallInstallButton">&amp;Yükle</String>
-  <String Id="InstallCloseButton">&amp;Kapat</String>
-  <String Id="ProgressHeader">Kurulum İlerleme Durumu</String>
-  <String Id="ProgressLabel">İşleniyor:</String>
-  <String Id="OverallProgressPackageText">Başlatılıyor...</String>
-  <String Id="ProgressCancelButton">&amp;İptal</String>
-  <String Id="ModifyHeader">Kurulumu değiştir</String>
-  <String Id="ModifyRepairButton">&amp;Onar</String>
-  <String Id="ModifyUninstallButton">K&amp;aldır</String>
-  <String Id="ModifyCloseButton">&amp;Kapat</String>
-  <String Id="SuccessRepairHeader">Onarım Başarıyla Tamamlandı</String>
-  <String Id="SuccessUninstallHeader">Kaldırma Başarıyla Tamamlandı</String>
-  <String Id="SuccessInstallHeader">Yükleme Başarıyla Tamamlandı</String>
-  <String Id="SuccessHeader">Kurulum Başarılı</String>
-  <String Id="SuccessLaunchButton">&amp;Başlat</String>
-  <String Id="SuccessRestartText">Yazılımı kullanabilmeniz için bilgisayarınızı yeniden başlatmanız gerekiyor.</String>
-  <String Id="SuccessRestartButton">Yeniden &amp;Başlat</String>
-  <String Id="SuccessCloseButton">&amp;Kapat</String>
-  <String Id="FailureHeader">Kurulum Başarısız</String>
-  <String Id="FailureInstallHeader">Kurulum Başarısız</String>
-  <String Id="FailureUninstallHeader">Kaldırma Başarısız</String>
-  <String Id="FailureRepairHeader">Onarım Başarısız</String>
-  <String Id="FailureHyperlinkLogText">Bir ya da daha fazla sorun nedeniyle kurulum başarısız oldu. Lütfen bu sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için &lt;a href="#"&gt;günlük dosyasına&lt;/a&gt; bakın.</String>
-  <String Id="FailureRestartText">Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor.</String>
-  <String Id="FailureRestartButton">Yeniden &amp;Başlat</String>
-  <String Id="FailureCloseButton">&amp;Kapat</String>
-  <String Id="FilesInUseHeader">Kullanımda Olan Dosyalar</String>
-  <String Id="FilesInUseLabel">Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor:</String>
-  <String Id="FilesInUseCloseRadioButton">&amp;Uygulamaları kapatın ve yeniden başlatmayı deneyin.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;Uygulamaları kapatmayın. Sistemi yeniden başlatmanız gerekir.</String>
-  <String Id="FilesInUseOkButton">&amp;Tamam</String>
-  <String Id="FilesInUseCancelButton">&amp;İptal</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">[WixBundleName] Kurulumu'na Hoş Geldiniz.</String>
-  <String Id="InstallResetIIS">Yükleme tamamlandıktan sonra lütfen IIS'yi yeniden başlatın. Daha fazla bilgiyi &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;bu sayfada&lt;/a&gt; bulabilirsiniz.</String>
-  <String Id="InstallNoIIS">IIS bu makinede etkin değil. ASP.NET Core uygulamalarını IIS ile çalıştırmak istiyorsanız, bu yükleyiciyi çalıştırmadan önce IIS'yi yüklemeniz gerekir. Daha fazla bilgiyi &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;bu sayfada&lt;/a&gt; bulabilirsiniz.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;lisans koşulları&lt;/a&gt; ve &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;gizlilik bildirimi&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">Yükleme tamamlandıktan sonra lütfen IIS'yi yeniden başlatın. Daha fazla bilgiyi &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;bu sayfada&lt;/a&gt; bulabilirsiniz.</String>
-  <String Id="ModifyNoIIS">IIS bu makinede etkin değil. ASP.NET Core uygulamalarını IIS ile çalıştırmak istiyorsanız, bu yükleyiciyi çalıştırmadan önce IIS'yi yüklemeniz gerekir. Daha fazla bilgiyi &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;bu sayfada&lt;/a&gt; bulabilirsiniz.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl
deleted file mode 100644
index 2609681be5c6..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">[WixBundleName]安装程序</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">版本 [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">是否确实要取消?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">上一版本</String>
-  <String Id="HelpHeader">安装程序帮助</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]目录[\]] - 安装、修复、卸载
-   目录中的捆绑包或创建其完整本地副本。Install 为默认选择。
-
-/passive | /quiet -  显示最少的 UI 且无提示，或不显示 UI 且
-   无提示。默认情况下，显示 UI 及全部提示。
-
-/norestart   - 禁止任何重启尝试。默认情况下将在重启前显示提示 UI。
-/log log.txt - 向特定文件写入日志。默认情况下在 %TEMP% 中创建日志文件。</String>
-  <String Id="HelpCloseButton">关闭(&amp;C)</String>
-  <String Id="InstallAcceptCheckbox">我同意许可条款和条件(&amp;A)</String>
-  <String Id="InstallInstallButton">安装(&amp;I)</String>
-  <String Id="InstallCloseButton">关闭(&amp;C)</String>
-  <String Id="ProgressHeader">安装进度</String>
-  <String Id="ProgressLabel">正在处理:</String>
-  <String Id="OverallProgressPackageText">正在初始化...</String>
-  <String Id="ProgressCancelButton">取消(&amp;C)</String>
-  <String Id="ModifyHeader">修改安装程序</String>
-  <String Id="ModifyRepairButton">修复(&amp;R)</String>
-  <String Id="ModifyUninstallButton">卸载(&amp;U)</String>
-  <String Id="ModifyCloseButton">关闭(&amp;C)</String>
-  <String Id="SuccessRepairHeader">成功完成了修复</String>
-  <String Id="SuccessUninstallHeader">成功完成了卸载</String>
-  <String Id="SuccessInstallHeader">成功完成了安装</String>
-  <String Id="SuccessHeader">设置成功</String>
-  <String Id="SuccessLaunchButton">启动(&amp;L)</String>
-  <String Id="SuccessRestartText">您必须先重新启动计算机，然后才能使用该软件。</String>
-  <String Id="SuccessRestartButton">重新启动(&amp;R)</String>
-  <String Id="SuccessCloseButton">关闭(&amp;C)</String>
-  <String Id="FailureHeader">安装失败</String>
-  <String Id="FailureInstallHeader">安装失败</String>
-  <String Id="FailureUninstallHeader">卸载失败</String>
-  <String Id="FailureRepairHeader">修复失败</String>
-  <String Id="FailureHyperlinkLogText">一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅&lt;a href="#"&gt;日志文件&lt;/a&gt;。</String>
-  <String Id="FailureRestartText">必须重新启动计算机才能完成软件回退。</String>
-  <String Id="FailureRestartButton">重新启动(&amp;R)</String>
-  <String Id="FailureCloseButton">关闭(&amp;C)</String>
-  <String Id="FilesInUseHeader">文件正在使用</String>
-  <String Id="FilesInUseLabel">以下应用程序正在使用的文件需要更新:</String>
-  <String Id="FilesInUseCloseRadioButton">关闭应用程序并尝试重启(&amp;A)。</String>
-  <String Id="FilesInUseDontCloseRadioButton">不关闭应用程序(&amp;D)。需要重启。</String>
-  <String Id="FilesInUseOkButton">确定(&amp;O)</String>
-  <String Id="FilesInUseCancelButton">取消(&amp;C)</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">欢迎使用 [WixBundleName] 安装程序。</String>
-  <String Id="InstallResetIIS">请在安装完成后重启 IIS。可在&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此处&lt;/a&gt;找到其他信息。</String>
-  <String Id="InstallNoIIS">此计算机上未启用 IIS。如果打算通过 IIS 运行 ASP.NET Core 应用程序，必须先安装 IIS，然后再运行此安装程序。可在&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此处&lt;/a&gt;找到其他信息。</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;许可条款&lt;/a&gt;和&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隐私声明&lt;/a&gt;。</String>
-  <String Id="ModifyResetIIS">请在安装完成后重启 IIS。可在&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此处&lt;/a&gt;找到其他信息。</String>
-  <String Id="ModifyNoIIS">此计算机上未启用 IIS。如果打算通过 IIS 运行 ASP.NET Core 应用程序，必须先安装 IIS，然后再运行此安装程序。可在&lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;此处&lt;/a&gt;找到其他信息。</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl
deleted file mode 100644
index f43bb07bd8f7..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="Caption">Instalación de [WixBundleName]</String>
-  <String Id="Title">[BundleNameShort]</String>
-  <String Id="SubTitle">[BundleNameSub]</String>
-  <String Id="InstallVersion">Versión [WixBundleVersion]</String>
-  <String Id="ConfirmCancelMessage">¿Está seguro de que desea cancelar la operación?</String>
-  <String Id="ExecuteUpgradeRelatedBundleMessage">Versión anterior</String>
-  <String Id="HelpHeader">Ayuda del programa de instalación</String>
-  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]directorio[\]] - instala, repara, desinstala o
-   crea una copia local completa del paquete en el directorio. Install es la opción predeterminada.
-
-/passive | /quiet -  muestra una IU mínima sin peticiones, o bien no muestra la IU 
-  ni las peticiones. De forma predeterminada, se muestran la IU y todas las peticiones.
-
-/norestart   - suprime los intentos de reiniciar. De forma predeterminada, la IU preguntará antes de reiniciar.
-/log log.txt - se registra en un archivo específico. De forma predeterminada, se crea un archivo de registro en %TEMP%.</String>
-  <String Id="HelpCloseButton">&amp;Cerrar</String>
-  <String Id="InstallAcceptCheckbox">&amp;Acepto los términos y condiciones de licencia</String>
-  <String Id="InstallInstallButton">&amp;Instalar</String>
-  <String Id="InstallCloseButton">&amp;Cerrar</String>
-  <String Id="ProgressHeader">Progreso de la instalación</String>
-  <String Id="ProgressLabel">Procesando:</String>
-  <String Id="OverallProgressPackageText">Inicializando...</String>
-  <String Id="ProgressCancelButton">&amp;Cancelar</String>
-  <String Id="ModifyHeader">Modificar instalación</String>
-  <String Id="ModifyRepairButton">&amp;Reparar</String>
-  <String Id="ModifyUninstallButton">&amp;Desinstalar</String>
-  <String Id="ModifyCloseButton">&amp;Cerrar</String>
-  <String Id="SuccessRepairHeader">La reparación se completó correctamente</String>
-  <String Id="SuccessUninstallHeader">La desinstalación se completó correctamente</String>
-  <String Id="SuccessInstallHeader">La instalación se completó correctamente</String>
-  <String Id="SuccessHeader">La instalación o desinstalación se realizó correctamente</String>
-  <String Id="SuccessLaunchButton">&amp;Iniciar</String>
-  <String Id="SuccessRestartText">Debe reiniciar el equipo para poder usar el software.</String>
-  <String Id="SuccessRestartButton">&amp;Reiniciar</String>
-  <String Id="SuccessCloseButton">&amp;Cerrar</String>
-  <String Id="FailureHeader">Error de instalación</String>
-  <String Id="FailureInstallHeader">Error de instalación</String>
-  <String Id="FailureUninstallHeader">No se pudo desinstalar</String>
-  <String Id="FailureRepairHeader">No se pudo reparar</String>
-  <String Id="FailureHyperlinkLogText">Error de instalación debido a uno o varios problemas. Corrija los problemas e intente de nuevo la instalación. Para obtener más información, consulte el &lt;a href="#"&gt;archivo de registro&lt;/a&gt;.</String>
-  <String Id="FailureRestartText">Debe reiniciar el equipo para completar la reversión del software.</String>
-  <String Id="FailureRestartButton">&amp;Reiniciar</String>
-  <String Id="FailureCloseButton">&amp;Cerrar</String>
-  <String Id="FilesInUseHeader">Archivos en uso</String>
-  <String Id="FilesInUseLabel">Las siguientes aplicaciones usan archivos que se deben actualizar:</String>
-  <String Id="FilesInUseCloseRadioButton">Cerrar las &amp;aplicaciones e intentar reiniciarlas.</String>
-  <String Id="FilesInUseDontCloseRadioButton">&amp;No cerrar las aplicaciones. Será necesario un reinicio.</String>
-  <String Id="FilesInUseOkButton">&amp;Aceptar</String>
-  <String Id="FilesInUseCancelButton">&amp;Cancelar</String>
-
-  <!-- Custom UI strings -->
-  <String Id="Welcome">Programa de instalación de [WixBundleName].</String>
-  <String Id="InstallResetIIS">Reinicie IIS una vez completada la instalación. Puede encontrar información adicional &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aquí&lt;/a&gt;.</String>
-  <String Id="InstallNoIIS">IIS no está habilitado en esta máquina. Si pretende ejecutar aplicaciones ASP.NET Core con IIS, debe instalar IIS antes de ejecutar este instalador. Puede encontrar información adicional &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aquí&lt;/a&gt;.</String>
-  <String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Términos de licencia&lt;/a&gt; y &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;declaración de privacidad&lt;/a&gt;.</String>
-  <String Id="ModifyResetIIS">Reinicie IIS una vez completada la instalación. Puede encontrar información adicional &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aquí&lt;/a&gt;.</String>
-  <String Id="ModifyNoIIS">IIS no está habilitado en esta máquina. Si pretende ejecutar aplicaciones ASP.NET Core con IIS, debe instalar IIS antes de ejecutar este instalador. Puede encontrar información adicional &lt;a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis"&gt;aquí&lt;/a&gt;.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs
index fe2e19b3024e..2b200b1df23d 100644
--- a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs
+++ b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs
@@ -1,116 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Fragment>
         <PackageGroup Id="PG_ANCM">
             <RollbackBoundary Id="RB_ANCM" />
 
             <!-- OPT_NO_ANCM could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="AspNetCoreModuleV2_x86" SourceFile="$(var.AspNetCoreModuleV2_x86.TargetPath)"
-                        Name="$(var.AspNetCoreModuleV2_x86.TargetFileName)"
-                        Compressed="yes"
-                        Vital="yes"
-                        Visible="no"
-                        InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
+            <MsiPackage Id="AspNetCoreModuleV2_x86" SourceFile="$(AspNetCoreModuleV2_x86.TargetPath)" Name="$(AspNetCoreModuleV2_x86.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="NOT VersionNT64 AND (VersionNT &gt;= v6.1) AND (IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
                 <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
 
             <!-- OPT_NO_SHARED_CONFIG_CHECK could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="AspNetCoreModuleV2_x64" SourceFile="$(var.AspNetCoreModuleV2_x64.TargetPath)"
-                        Name="$(var.AspNetCoreModuleV2_x64.TargetFileName)"
-                        Compressed="yes"
-                        Vital="yes"
-                        Visible="no"
-                        InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
+            <MsiPackage Id="AspNetCoreModuleV2_x64" SourceFile="$(AspNetCoreModuleV2_x64.TargetPath)" Name="$(AspNetCoreModuleV2_x64.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="VersionNT64 AND (VersionNT64 &gt;= v6.1) AND NOT (NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
                 <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
             
             <!-- OPT_NO_SHARED_CONFIG_CHECK could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="AspNetCoreModuleV2_arm64" SourceFile="$(var.AspNetCoreModuleV2_arm64.TargetPath)"
-                        Name="$(var.AspNetCoreModuleV2_arm64.TargetFileName)"
-                        Compressed="yes"
-                        Vital="yes"
-                        Visible="no"
-                        InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
+            <MsiPackage Id="AspNetCoreModuleV2_arm64" SourceFile="$(AspNetCoreModuleV2_arm64.TargetPath)" Name="$(AspNetCoreModuleV2_arm64.TargetFileName)" Compressed="yes" Vital="yes" Visible="no" InstallCondition="(NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1) AND (NOT OPT_NO_ANCM OR OPT_NO_ANCM=&quot;0&quot;)">
                 <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
             
         </PackageGroup>
         
-        <util:RegistrySearch Id="IISCoreWebEngineInstalledSearch_x86"
-                             Variable="IISCoreWebEngineInstalled_x86"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="CoreWebEngine"
-                             Result="value" />
+        <util:RegistrySearch Id="IISCoreWebEngineInstalledSearch_x86" Variable="IISCoreWebEngineInstalled_x86" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" />
 
-        <util:RegistrySearch Id="IISW3SVCInstalledSearch_x86"
-                             Variable="IISW3SVCInstalled_x86"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="W3SVC"
-                             After="IISCoreWebEngineInstalledSearch_x86"
-                             Result="value" />
+        <util:RegistrySearch Id="IISW3SVCInstalledSearch_x86" Variable="IISW3SVCInstalled_x86" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="W3SVC" After="IISCoreWebEngineInstalledSearch_x86" Result="value" />
 
-        <util:RegistrySearch Id="IISCoreWebEngineInstalledSearch_x64"
-                             Variable="IISCoreWebEngineInstalled_x64"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="CoreWebEngine"
-                             Result="value"
-                             After="IISW3SVCInstalledSearch_x86"
-                             Win64="yes" />
+        <util:RegistrySearch Id="IISCoreWebEngineInstalledSearch_x64" Variable="IISCoreWebEngineInstalled_x64" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x86" Bitness="always64" />
 
-        <util:RegistrySearch Id="IISW3SVCInstalledSearch_x64"
-                             Variable="IISW3SVCInstalled_x64"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="W3SVC"
-                             Result="value"
-                             After="IISCoreWebEngineInstalledSearch_x64"
-                             Win64="yes" />
+        <util:RegistrySearch Id="IISW3SVCInstalledSearch_x64" Variable="IISW3SVCInstalled_x64" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="W3SVC" Result="value" After="IISCoreWebEngineInstalledSearch_x64" Bitness="always64" />
 
-        <!-- We don't care about the results of the searches below. They are conditioned to execute if we've detected IIS.
-             If IIS is found, the search will execute and the default "disable" value of the relevant variables will be changed, allowing the UI
-             text to be displayed. All these searches need to execute after all the primary util:RegistrySearch operations for IIS. -->
-        <util:RegistrySearch Id="InstallResetIISStateSearch"
-                             Condition="((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1))"
-                             Variable="InstallResetIISState"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="CoreWebEngine"
-                             Result="value"
-                             After="IISW3SVCInstalledSearch_x64"
-                             Win64="yes" />
-
-        <util:RegistrySearch Id="InstallNoIISStateSearch"
-                             Condition="NOT (((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1)))"
-                             Variable="InstallNoIISState"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="CoreWebEngine"
-                             Result="value"
-                             After="IISW3SVCInstalledSearch_x64"
-                             Win64="yes" />
-
-        <util:RegistrySearch Id="ModifyResetIISStateSearch"
-                             Condition="((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1))"
-                             Variable="ModifyResetIISState"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="CoreWebEngine"
-                             Result="value"
-                             After="IISW3SVCInstalledSearch_x64"
-                             Win64="yes" />
-
-        <util:RegistrySearch Id="ModifyNoIISStateSearch"
-                             Condition="NOT (((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1)))"
-                             Variable="ModifyNoIISState"
-                             Root="HKLM"
-                             Key="SOFTWARE\Microsoft\InetStp\Components"
-                             Value="CoreWebEngine"
-                             Result="value"
-                             After="IISW3SVCInstalledSearch_x64"
-                             Win64="yes" />
+        <!-- We don't care about the result of the search below. It is conditioned to execute if we've detected IIS.
+             If IIS is found, the search will execute and the default "0" value of the IISEnabled variable will be changed to 1, allowing the UI
+             text to be displayed. This search needs to execute after all the primary util:RegistrySearch operations for IIS. -->
+        <util:RegistrySearch Id="IISEnabledSearch" Condition="((IISCoreWebEngineInstalled_x86=1) AND (IISW3SVCInstalled_x86=1)) OR ((IISCoreWebEngineInstalled_x64=1) AND (IISW3SVCInstalled_x64=1))" Variable="IISEnabled" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="CoreWebEngine" Result="value" After="IISW3SVCInstalledSearch_x64" Bitness="always64" />
     </Fragment>
 </Wix>
diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
index 6131a49404f4..c9cfbf141bfe 100644
--- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
+++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
@@ -1,71 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
-     xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-    <Bundle Name="$(var.BundleName)" Version="$(var.BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.BundleUpgradeCode)"
-            dep:ProviderKey="$(var.BundleProviderKey)">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="https://go.microsoft.com/fwlink/?LinkId=329770"
-                                                    LogoFile="DotNetLogo.bmp"
-                                                    SuppressDowngradeFailure="yes"
-                                                    SuppressOptionsUI="yes"
-                                                    ThemeFile="thm.xml"
-                                                    LocalizationFile="1033\thm.wxl"/>
-            <PayloadGroupRef Id="PG_Resources"/>
-        </BootstrapperApplicationRef>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="$(BundleName)" Version="$(BundleVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="$(BundleUpgradeCode)">
+        <BootstrapperApplication>
+          <bal:WixStandardBootstrapperApplication LicenseUrl="https://go.microsoft.com/fwlink/?LinkId=329770" SuppressDowngradeFailure="yes" SuppressOptionsUI="yes" ThemeFile="bundle.thm" LocalizationFile="LCID\1033\thm.wxl" Theme="hyperlinkLicense" />
+          <?foreach lcid in 2052;1028;1029;1031;3082;1033;1036;1040;1041;1042;1045;1046;1049;1055?>
+          <Payload Id="PL_thm_$(lcid)" SourceFile="LCID\$(lcid)\thm.wxl" Name="$(lcid)\thm.wxl" Compressed="yes" />
+          <?endforeach?>
+          <Payload Name="DotNetLogo_256x.png" Compressed="yes" SourceFile="DotNetLogo_256x.png" />
+          <Payload Name="dotnet.ico" Compressed="yes" SourceFile="dotnet.ico" />
+        </BootstrapperApplication>
 
         <!-- Search references for upgrade policy keys -->
-        <util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>
-        <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch"/>
-        <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch"/>
-
-        <!-- Ensure upgrades from 3.0.0 preview 1 and 2 (Preview 3 was not shipped). Conditioned for the 3.0.0 family. Hosting bundle simships x86/x64 so there's
-             a single set of upgrade codes. -->
-        <?if $(var.Version)=3.0.0.0?>
-        <RelatedBundle Action="Upgrade" Id="{D8BFC3A1-72B1-36C1-9E5A-49FE36A5563B}"/>
-        <RelatedBundle Action="Upgrade" Id="{EA47395A-BC9B-3ECC-8229-229BC9528DF6}"/>
-        <?endif?>
-
-        <!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
-        <?if $(var.MajorVersion)=3 and $(var.MinorVersion)=1?>
-        <!--'Microsoft .NET Core 3.1.9 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{E4913286-9840-380A-8743-3DF839147FF0}"/>
-        <!--'Microsoft .NET Core 3.1.8 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{81D96996-6F29-3BAC-82C6-9156FE1BD5FB}"/>
-        <!--'Microsoft .NET Core 3.1.7 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{44D6EE78-0248-36AD-9B2C-26FA728E477D}"/>
-        <!--'Microsoft .NET Core 3.1.6 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{C0453F97-42DD-3CD5-9FCE-018DD1F1A020}"/>
-        <!--'Microsoft .NET Core 3.1.5 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{8BF71BDA-9BF7-3AD5-9E6B-3656FEEC95AA}"/>
-        <!--'Microsoft .NET Core 3.1.4 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{6CF8B606-EE26-3536-BEFE-410EA70DBB94}"/>
-        <!--'Microsoft .NET Core 3.1.3 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{71F4232E-75BF-32AF-9A8F-1E87CC17CC6C}"/>
-        <!--'Microsoft .NET Core 3.1.2 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{3CDBE509-D166-335B-BD17-EA6FDAC4E03A}"/>
-        <!--'Microsoft .NET Core 3.1.1 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{62155173-E27B-3936-997F-56DA96ED19B5}"/>
-        <!--'Microsoft .NET Core 3.1.0 - Windows Server Hosting'-->
-        <RelatedBundle Action="Upgrade" Id="{6F741175-2F75-3845-B30B-6C364101EAA2}"/>
-        <?endif?>
-
-        <PayloadGroup Id="PG_Resources">
-            <?foreach lcid in 2052;1028;1029;1031;3082;1033;1036;1040;1041;1042;1045;1046;1049;1055?>
-            <Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>
-            <?endforeach?>
-        </PayloadGroup>
+        <util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch" />
+        <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeyExistsSearch" />
+        <util:RegistrySearchRef Id="RemoveSpecificPreviousVersionRegistryKeySearch" />
 
         <!-- Customizations of the default BA -->
-        <Log Prefix="dd_$(var.BundleLogPrefix)_" Extension=".log" />
-        <OptionalUpdateRegistration Manufacturer="$(var.BundleRegManufacturer)" ProductFamily="$(var.BundleRegFamily)" Name="$(var.BundleRegName)" />
+        <Log Prefix="dd_$(BundleLogPrefix)_" Extension=".log" />
+        <OptionalUpdateRegistration Manufacturer="$(BundleRegManufacturer)" ProductFamily="$(BundleRegFamily)" Name="$(BundleRegName)" />
 
         <!-- Bundle variables -->
-        <Variable Name="BundleNameShort" Value="$(var.BundleNameShort)"/>
-        <Variable Name="BundleNameSub" Value="$(var.BundleNameSub)"/>
-        <Variable Name="OPT_NO_ANCM" bal:Overridable="yes"/>
-        <Variable Name="OPT_NO_SHAREDFX" bal:Overridable="yes"/>
-        <Variable Name="OPT_NO_RUNTIME" bal:Overridable="yes"/>
-        <Variable Name="OPT_NO_X86" bal:Overridable="yes"/>
+        <Variable Name="BundleNameShort" Value="$(BundleNameShort)" Type="formatted" />
+        <Variable Name="BundleNameSub" Value="$(BundleNameSub)" Type="formatted" />
+        <Variable Name="OPT_NO_ANCM" bal:Overridable="yes" />
+        <Variable Name="OPT_NO_SHAREDFX" bal:Overridable="yes" />
+        <Variable Name="OPT_NO_RUNTIME" bal:Overridable="yes" />
+        <Variable Name="OPT_NO_X86" bal:Overridable="yes" />
         <Variable Name="OPT_NO_SHARED_CONFIG_CHECK" bal:Overridable="yes" />
 
         <!-- Use values from the registry for switches, if the registry values are set & the user hasn't passed any switches from the command line -->
@@ -73,37 +32,23 @@
         <?define Options=OPT_NO_ANCM;OPT_NO_SHAREDFX;OPT_NO_RUNTIME;OPT_NO_X86;OPT_NO_SHARED_CONFIG_CHECK ?>
         <?define RegistrySeachCondition="NOT (OPT_NO_ANCM OR OPT_NO_ANCM=0 OR OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=0 OR OPT_NO_RUNTIME OR OPT_NO_RUNTIME=0 OR OPT_NO_X86 OR OPT_NO_X86=0 OR OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=0)" ?>
 
-        <?foreach Option in $(var.Options) ?>
-            <util:RegistrySearch Id="$(var.Option)_should_be_set"
-                             Condition="$(var.RegistrySeachCondition)"
-                             Root="HKLM"
-                             Key="Software\Microsoft\dotnet\host\options\$(var.MajorVersion).$(var.MinorVersion)"
-                             Value="$(var.Option)"
-                             Result="exists"
-                             Variable="$(var.Option)_Exists"/>
+        <?foreach Option in $(Options) ?>
+            <util:RegistrySearch Id="$(Option)_should_be_set" Condition="$(RegistrySeachCondition)" Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)" Value="$(Option)" Result="exists" Variable="$(Option)_Exists" />
 
-            <util:RegistrySearch Condition="$(var.Option)_Exists"
-                             After="$(var.Option)_should_be_set"
-                             Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(var.MajorVersion).$(var.MinorVersion)"
-                             Value="$(var.Option)"
-                             Variable="$(var.Option)"
-                             Result="value" />
+            <util:RegistrySearch Condition="$(Option)_Exists" After="$(Option)_should_be_set" Root="HKLM" Key="Software\Microsoft\dotnet\host\options\$(MajorVersion).$(MinorVersion)" Value="$(Option)" Variable="$(Option)" Result="value" />
         <?endforeach?>
 
         <!-- These variables control the state of conditional UI text elements.
              They are disabled by default and enabled based on whether or not we detect that IIS is installed -->
-        <Variable Name="InstallResetIISState" Value="disable"/>
-        <Variable Name="InstallNoIISState" Value="disable"/>
-        <Variable Name="ModifyResetIISState" Value="disable"/>
-        <Variable Name="ModifyNoIISState" Value="disable"/>
+        <Variable Name="IISEnabled" Value="0" Type="numeric" />
 
         <Chain ParallelCache="yes">
-            <MsiPackage SourceFile="$(var.HostOptions.TargetPath)">
-                <MsiProperty Name="OPT_NO_ANCM" Value="[OPT_NO_ANCM]"/>
-                <MsiProperty Name="OPT_NO_SHAREDFX" Value="[OPT_NO_SHAREDFX]"/>
-                <MsiProperty Name="OPT_NO_RUNTIME" Value="[OPT_NO_RUNTIME]"/>
-                <MsiProperty Name="OPT_NO_X86" Value="[OPT_NO_X86]"/>
-                <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]"/>
+            <MsiPackage SourceFile="$(HostOptions.TargetPath)">
+                <MsiProperty Name="OPT_NO_ANCM" Value="[OPT_NO_ANCM]" />
+                <MsiProperty Name="OPT_NO_SHAREDFX" Value="[OPT_NO_SHAREDFX]" />
+                <MsiProperty Name="OPT_NO_RUNTIME" Value="[OPT_NO_RUNTIME]" />
+                <MsiProperty Name="OPT_NO_X86" Value="[OPT_NO_X86]" />
+                <MsiProperty Name="OPT_NO_SHARED_CONFIG_CHECK" Value="[OPT_NO_SHARED_CONFIG_CHECK]" />
             </MsiPackage>
             <PackageGroupRef Id="PG_ANCM" />
             <PackageGroupRef Id="PG_DOTNET_REDIST_LTS_BUNDLE" />
diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs b/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs
index 932d6bab74de..c24572b09698 100644
--- a/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs
+++ b/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs
@@ -1,80 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <PackageGroup Id="PG_DOTNET_REDIST_LTS_BUNDLE">
             <RollbackBoundary Id="RB_DOTNET_REDIST_LTS_BUNDLE" />
 
             <!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistLts_arm64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerarm64)"
-                        Name="$(var.DotNetRedistLtsInstallerarm64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistLts_arm64" SourceFile="$(DepsPath)\$(DotNetRedistLtsInstallerarm64)" Name="$(DotNetRedistLtsInstallerarm64)" Compressed="yes" Vital="yes" InstallCondition="(NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
             </MsiPackage>            
             
             <!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistLts_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerx64)"
-                        Name="$(var.DotNetRedistLtsInstallerx64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistLts_x64" SourceFile="$(DepsPath)\$(DotNetRedistLtsInstallerx64)" Name="$(DotNetRedistLtsInstallerx64)" Compressed="yes" Vital="yes" InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
             </MsiPackage>
 
             <!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistLts_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistLtsInstallerx86)"
-                        Name="$(var.DotNetRedistLtsInstallerx86)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistLts_x86" SourceFile="$(DepsPath)\$(DotNetRedistLtsInstallerx86)" Name="$(DotNetRedistLtsInstallerx86)" Compressed="yes" Vital="yes" InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
             </MsiPackage>
 
             <!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistHost_arm64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostInstallerarm64)"
-                        Name="$(var.DotNetRedistHostInstallerarm64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistHost_arm64" SourceFile="$(DepsPath)\$(DotNetRedistHostInstallerarm64)" Name="$(DotNetRedistHostInstallerarm64)" Compressed="yes" Vital="yes" InstallCondition="(NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
             </MsiPackage>            
             
             <!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistHost_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostInstallerx64)"
-                        Name="$(var.DotNetRedistHostInstallerx64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistHost_x64" SourceFile="$(DepsPath)\$(DotNetRedistHostInstallerx64)" Name="$(DotNetRedistHostInstallerx64)" Compressed="yes" Vital="yes" InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
             </MsiPackage>
 
             <!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistHost_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostInstallerx86)"
-                        Name="$(var.DotNetRedistHostInstallerx86)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistHost_x86" SourceFile="$(DepsPath)\$(DotNetRedistHostInstallerx86)" Name="$(DotNetRedistHostInstallerx86)" Compressed="yes" Vital="yes" InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
             </MsiPackage>
 
             <!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistHostfxr_arm64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostfxrInstallerarm64)"
-                        Name="$(var.DotNetRedistHostfxrInstallerarm64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistHostfxr_arm64" SourceFile="$(DepsPath)\$(DotNetRedistHostfxrInstallerarm64)" Name="$(DotNetRedistHostfxrInstallerarm64)" Compressed="yes" Vital="yes" InstallCondition="(NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
             </MsiPackage>            
             
             <!-- OPT_NO_RUNTIME could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistHostfxr_x64" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostfxrInstallerx64)"
-                        Name="$(var.DotNetRedistHostfxrInstallerx64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistHostfxr_x64" SourceFile="$(DepsPath)\$(DotNetRedistHostfxrInstallerx64)" Name="$(DotNetRedistHostfxrInstallerx64)" Compressed="yes" Vital="yes" InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)">
             </MsiPackage>
 
             <!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="DotNetRedistHostfxr_x86" SourceFile="$(var.DepsPath)\$(var.DotNetRedistHostfxrInstallerx86)"
-                        Name="$(var.DotNetRedistHostfxrInstallerx86)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
+            <MsiPackage Id="DotNetRedistHostfxr_x86" SourceFile="$(DepsPath)\$(DotNetRedistHostfxrInstallerx86)" Name="$(DotNetRedistHostfxrInstallerx86)" Compressed="yes" Vital="yes" InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
             </MsiPackage>
         </PackageGroup>
     </Fragment>
diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp b/src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp
deleted file mode 100644
index 6299d4e8cd36..000000000000
Binary files a/src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp and /dev/null differ
diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetLogo_256x.png b/src/Installers/Windows/WindowsHostingBundle/DotNetLogo_256x.png
new file mode 100644
index 000000000000..3ff052f8302a
Binary files /dev/null and b/src/Installers/Windows/WindowsHostingBundle/DotNetLogo_256x.png differ
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl
new file mode 100644
index 000000000000..94663921e880
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] 設定"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="版本 [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="您確定要取消嗎?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="先前的版本"/>
+  <String Id="HelpHeader" Value="安裝程式說明"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - 安裝、修復、解除安裝或在目錄中建立搭售方案的完整本機複本。預設會進行安裝。
+
+/passive | /quiet - 顯示最基本的 UI 且不出現提示，或是不顯示任何 UI 且不出現提示。預設會顯示 UI 及所有提示。
+
+/norestart - 抑制任何重新啟動嘗試。根據預設，UI 在重新啟動前會先提示。
+
+/log &lt;LOG_FILE&gt; - 記錄到特定檔案。預設會在 %TEMP% 中建立記錄檔。"/>
+  <String Id="HelpCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="我同意授權條款和條件(&amp;A)"/>
+  <String Id="InstallInstallButton" Value="安裝(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="ProgressHeader" Value="安裝程式進度"/>
+  <String Id="ProgressLabel" Value="正在處理:"/>
+  <String Id="OverallProgressPackageText" Value="正在初始化..."/>
+  <String Id="ProgressCancelButton" Value="取消(&amp;C)"/>
+  <String Id="ModifyHeader" Value="修改安裝程式"/>
+  <String Id="ModifyRepairButton" Value="修復(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="解除安裝(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="快取已成功完成"/>
+  <String Id="SuccessModifyHeader" Value="修改已成功完成"/>
+  <String Id="SuccessRepairHeader" Value="修復已成功完成"/>
+  <String Id="SuccessUninstallHeader" Value="解除安裝已成功完成"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="解除安裝已成功完成"/>
+  <String Id="SuccessInstallHeader" Value="安裝已成功完成"/>
+  <String Id="SuccessHeader" Value="安裝程式成功"/>
+  <String Id="SuccessLaunchButton" Value="啟動(&amp;L)"/>
+  <String Id="SuccessLayoutHeader" Value="配置已成功完成"/>
+  <String Id="SuccessRestartText" Value="必須重新啟動電腦，才能使用此軟體。"/>
+  <String Id="SuccessUninstallRestartText" Value="您必須重新啟動電腦，才能完成軟體移除。"/>
+  <String Id="SuccessRestartButton" Value="重新啟動(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="FailureHeader" Value="安裝程式失敗"/>
+  <String Id="FailureCacheHeader" Value="快取失敗"/>
+  <String Id="FailureLayoutHeader" Value="配置失敗"/>
+  <String Id="FailureModifyHeader" Value="修改失敗"/>
+  <String Id="FailureInstallHeader" Value="安裝程式失敗"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="解除安裝失敗"/>
+  <String Id="FailureUninstallHeader" Value="解除安裝失敗"/>
+  <String Id="FailureRepairHeader" Value="修復失敗"/>
+  <String Id="FailureHyperlinkLogText" Value="一或多個問題導致設定失敗。請修正問題，然後重試安裝程式。如需詳細資訊，請參考&lt;a href=&quot;#&quot;&gt;記錄檔&lt;/a&gt;。"/>
+  <String Id="FailureRestartText" Value="必須重新啟動電腦，才能完成軟體的復原。"/>
+  <String Id="FailureRestartButton" Value="重新啟動(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="關閉(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="使用中的檔案"/>
+  <String Id="FilesInUseLabel" Value="以下應用程式正在使用需要進行更新的檔案:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="請關閉應用程式然後嘗試重新啟動。(&amp;A)"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="關閉應用程式(&amp;A)。"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="不要關閉應用程式(&amp;D)。需要重新啟動。"/>
+  <String Id="FilesInUseOkButton" Value="確定(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="取消(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="重試(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="略過(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="結束(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="使用中的檔案"/>
+  <String Id="LicenseAssent" Value="按一下 “安裝” 即表示您同意下列條款:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;隱私權聲明&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET 授權資訊&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;遙測收集和選擇退出&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="歡迎使用 [WixBundleName] 安裝程式。"/>
+  
+  <String Id="InstallResetIIS" Value="請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;此處&lt;/a&gt; (部分內容可能是機器或 AI 翻譯)。"/>
+  
+  <String Id="InstallNoIIS" Value="這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;此處&lt;/a&gt; (部分內容可能是機器或 AI 翻譯)。"/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;授權條款&lt;/a&gt; (英文) 和&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;隱私權聲明&lt;/a&gt;。"/>
+  
+  <String Id="ModifyResetIIS" Value="請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱&lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;此處&lt;/a&gt; (部分內容可能是機器或 AI 翻譯)。"/>
+  
+  <String Id="ModifyNoIIS" Value="這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱&lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;此處&lt;/a&gt; (部分內容可能是機器或 AI 翻譯)。"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl
new file mode 100644
index 000000000000..e11617a2fafc
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Instalace [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Verze [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Opravdu chcete akci zrušit?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Předchozí verze"/>
+  <String Id="HelpHeader" Value="Nápověda k nastavení"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]adresář[\]] – Nainstaluje, opraví, odinstaluje nebo vytvoří úplnou místní kopii sady v adresáři. Výchozí možností je instalace.
+
+/passive | /quiet – Zobrazí minimální uživatelské rozhraní bez jakýchkoli výzev nebo nezobrazí žádné rozhraní ani výzvy. Ve výchozím nastavení se zobrazí uživatelské rozhraní a všechny výzvy.
+
+/norestart – Potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní zobrazí před restartováním výzvu.
+
+/log &lt;LOG_FILE&gt; – zapíše protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Zavřít"/>
+  <String Id="InstallAcceptCheckbox" Value="&amp;Souhlasím s licenčními podmínkami a ujednáními"/>
+  <String Id="InstallInstallButton" Value="Na&amp;instalovat"/>
+  <String Id="InstallCloseButton" Value="&amp;Zavřít"/>
+  <String Id="ProgressHeader" Value="Průběh instalace"/>
+  <String Id="ProgressLabel" Value="Zpracování:"/>
+  <String Id="OverallProgressPackageText" Value="Probíhá inicializace..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Zrušit"/>
+  <String Id="ModifyHeader" Value="Upravit nastavení"/>
+  <String Id="ModifyRepairButton" Value="&amp;Opravit"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Odinstalovat"/>
+  <String Id="ModifyCloseButton" Value="&amp;Zavřít"/>
+  <String Id="SuccessCacheHeader" Value="Úspěšné dokončení mezipaměti"/>
+  <String Id="SuccessModifyHeader" Value="Úprava byla úspěšně dokončena."/>
+  <String Id="SuccessRepairHeader" Value="Oprava byla úspěšně dokončena."/>
+  <String Id="SuccessUninstallHeader" Value="Odinstalace se úspěšně dokončila."/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Odinstalace se úspěšně dokončila."/>
+  <String Id="SuccessInstallHeader" Value="Instalace se úspěšně dokončila"/>
+  <String Id="SuccessHeader" Value="Instalace byla úspěšná"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Spustit"/>
+  <String Id="SuccessLayoutHeader" Value="Rozložení se úspěšně dokončilo."/>
+  <String Id="SuccessRestartText" Value="Před použitím tohoto softwaru musíte restartovat počítač."/>
+  <String Id="SuccessUninstallRestartText" Value="Odebrání softwaru dokončíte restartováním počítače."/>
+  <String Id="SuccessRestartButton" Value="&amp;Restartovat"/>
+  <String Id="SuccessCloseButton" Value="&amp;Zavřít"/>
+  <String Id="FailureHeader" Value="Instalace selhala."/>
+  <String Id="FailureCacheHeader" Value="Mezipaměť selhala."/>
+  <String Id="FailureLayoutHeader" Value="Rozložení selhalo."/>
+  <String Id="FailureModifyHeader" Value="Úprava selhala."/>
+  <String Id="FailureInstallHeader" Value="Instalace selhala."/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Odinstalace selhala."/>
+  <String Id="FailureUninstallHeader" Value="Odinstalace selhala."/>
+  <String Id="FailureRepairHeader" Value="Oprava selhala."/>
+  <String Id="FailureHyperlinkLogText" Value="Nejméně jeden problém způsobil, že instalace selhala. Opravte prosím tyto problémy a zkuste instalaci zopakovat. Další informace najdete v &lt;a href=&quot;#&quot;&gt;souboru protokolu&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač."/>
+  <String Id="FailureRestartButton" Value="&amp;Restartovat"/>
+  <String Id="FailureCloseButton" Value="&amp;Zavřít"/>
+  <String Id="FilesInUseHeader" Value="Soubory jsou používány"/>
+  <String Id="FilesInUseLabel" Value="Následující aplikace používají soubory, které je potřeba aktualizovat:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Zavřít aplikace a pokusit se je znovu spustit"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="&amp;Zavřít aplikace"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Nezavírat aplikace Bude nutné restartovat počítač."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Zrušit"/>
+  <String Id="FilesInUseRetryButton" Value="Opakov&amp;at"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Přeskočit"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Ukončit"/>
+  <String Id="FilesInUseTitle" Value="Soubory jsou používány."/>
+  <String Id="LicenseAssent" Value="Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Prohlášení o zásadách ochrany osobních údajů&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informace o licencování pro .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Shromažďování telemetrie a výslovný nesouhlas&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Vítá vás instalační program produktu [WixBundleName]"/>
+  
+  <String Id="InstallResetIIS" Value="Po dokončení instalace restartujte službu IIS. Další informace najdete na &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;zde&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete na &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;zde&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] – &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;licenční podmínky&lt;/a&gt; a &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;"/>
+  
+  <String Id="ModifyResetIIS" Value="Po dokončení instalace restartujte službu IIS. Další informace najdete na &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;zde&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete na &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;zde&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl
new file mode 100644
index 000000000000..dbb61e806f0a
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName]-Setup"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Version von [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Möchten Sie den Vorgang wirklich abbrechen?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Vorherige Version"/>
+  <String Id="HelpHeader" Value="Setuphilfe"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]]: Installiert, repariert, deinstalliert oder erstellt eine vollständige lokale Kopie des Pakets im Verzeichnis. Standardmäßig wird eine Installation durchgeführt.
+
+/passive | /quiet: Zeigt eine minimale Benutzeroberfläche ohne Prompts oder keine Benutzeroberfläche und keine Prompts an. Standardmäßig werden die Benutzeroberfläche und alle Prompts angezeigt.
+
+/norestart: Unterdrückt alle Neustartversuche. Standardmäßig wird die Benutzeroberfläche vor dem Neustart aufgefordert.
+
+/log &lt;LOG_FILE&gt;: Protokolliert eine bestimmte Datei. Standardmäßig wird die Protokolldatei in %TEMP% erstellt."/>
+  <String Id="HelpCloseButton" Value="&amp;Schließen"/>
+  <String Id="InstallAcceptCheckbox" Value="Ich &amp;stimme den Bedingungen des Lizenzvertrags zu"/>
+  <String Id="InstallInstallButton" Value="&amp;Installieren"/>
+  <String Id="InstallCloseButton" Value="&amp;Schließen"/>
+  <String Id="ProgressHeader" Value="Setupstatus"/>
+  <String Id="ProgressLabel" Value="Verarbeitung:"/>
+  <String Id="OverallProgressPackageText" Value="Initialisierung wird ausgeführt..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Abbrechen"/>
+  <String Id="ModifyHeader" Value="Setup ändern"/>
+  <String Id="ModifyRepairButton" Value="&amp;Reparieren"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Deinstallieren"/>
+  <String Id="ModifyCloseButton" Value="&amp;Schließen"/>
+  <String Id="SuccessCacheHeader" Value="Zwischenspeichern erfolgreich abgeschlossen"/>
+  <String Id="SuccessModifyHeader" Value="Änderung erfolgreich abgeschlossen"/>
+  <String Id="SuccessRepairHeader" Value="Reparatur erfolgreich abgeschlossen"/>
+  <String Id="SuccessUninstallHeader" Value="Deinstallation erfolgreich abgeschlossen"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Deinstallation erfolgreich abgeschlossen"/>
+  <String Id="SuccessInstallHeader" Value="Installation erfolgreich abgeschlossen"/>
+  <String Id="SuccessHeader" Value="Setup wurde erfolgreich abgeschlossen"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Starten"/>
+  <String Id="SuccessLayoutHeader" Value="Layout erfolgreich abgeschlossen"/>
+  <String Id="SuccessRestartText" Value="Sie müssen den Computer neu starten, bevor Sie die Software verwenden können."/>
+  <String Id="SuccessUninstallRestartText" Value="Sie müssen den Computer neu starten, um das Entfernen der Software abzuschließen."/>
+  <String Id="SuccessRestartButton" Value="&amp;Neu starten"/>
+  <String Id="SuccessCloseButton" Value="&amp;Schließen"/>
+  <String Id="FailureHeader" Value="Fehler beim Setup"/>
+  <String Id="FailureCacheHeader" Value="Fehler beim Zwischenspeichern"/>
+  <String Id="FailureLayoutHeader" Value="Fehler beim Layout"/>
+  <String Id="FailureModifyHeader" Value="Fehler beim Ändern"/>
+  <String Id="FailureInstallHeader" Value="Fehler beim Setup"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Fehler bei der Deinstallation"/>
+  <String Id="FailureUninstallHeader" Value="Fehler bei der Deinstallation"/>
+  <String Id="FailureRepairHeader" Value="Fehler bei der Reparatur"/>
+  <String Id="FailureHyperlinkLogText" Value="Mindestens ein Problem hat zu einem Fehler beim Setup geführt. Beheben Sie die Probleme, und wiederholen Sie dann die Einrichtung. Weitere Informationen finden Sie in der &lt;a href=&quot;#&quot;&gt;Protokolldatei&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen."/>
+  <String Id="FailureRestartButton" Value="&amp;Neu starten"/>
+  <String Id="FailureCloseButton" Value="&amp;Schließen"/>
+  <String Id="FilesInUseHeader" Value="Dateien in Verwendung"/>
+  <String Id="FilesInUseLabel" Value="Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Schließen Sie die &amp;Anwendungen, und versuchen Sie sie erneut zu starten."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Schließen Sie die &amp;Anwendungen."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Schließen Sie die Anwendungen nicht. Ein Neustart ist erforderlich."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Abbrechen"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Wiederholen"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignorieren"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Beenden"/>
+  <String Id="FilesInUseTitle" Value="Dateien in Verwendung"/>
+  <String Id="LicenseAssent" Value="Durch Klicken auf „Installieren“ stimmen Sie den nachstehenden Bedingungen zu:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Datenschutzerklärung&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Lizenzierungsinformationen für .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetriesammlung und Kündigen&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Willkommen beim Setup von [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Starten Sie IIS nach Abschluss der Installation neu. Zusätzliche Informationen finden Sie &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;hier&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="IIS ist auf diesem Computer nicht aktiviert. Wenn Sie ASP.NET Core-Anwendungen mit IIS ausführen möchten, müssen Sie IIS installieren, bevor Sie diesen Installer ausführen. Zusätzliche Informationen finden Sie &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;hier&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;Lizenzbedingungen&lt;/a&gt; und &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;Datenschutzbestimmungen&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="Starten Sie IIS nach Abschluss der Installation neu. Zusätzliche Informationen finden Sie &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;hier&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="IIS ist auf diesem Computer nicht aktiviert. Wenn Sie ASP.NET Core-Anwendungen mit IIS ausführen möchten, müssen Sie IIS installieren, bevor Sie diesen Installer ausführen. Zusätzliche Informationen finden Sie &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;hier&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl
new file mode 100644
index 000000000000..5c2e7c738aab
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl
@@ -0,0 +1,81 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  <!--_locComment_text="{Locked='[WixBundleName]'}"-->
+  <String Id="Caption" Value="[WixBundleName] Setup" />
+  <!--_locComment_text="{Locked}"-->
+  <String Id="Title" Value="[BundleNameShort]" />
+  <!--_locComment_text="{Locked}"-->
+  <String Id="SubTitle" Value="[BundleNameSub]" />
+  <!--_locComment_text="{Locked='[WixBundleVersion]'}"-->
+  <String Id="InstallVersion" Value="Version [WixBundleVersion]" />
+  <String Id="ConfirmCancelMessage" Value="Are you sure you want to cancel?" />
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Previous version" />
+  <String Id="HelpHeader" Value="Setup Help" />
+  <!--_locComment_text="'directory' is to be translated in both places"-->
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - installs, repairs, uninstalls or creates a complete local copy of the bundle in directory. Install is the default.&#xA;&#xA;/passive | /quiet - displays minimal UI with no prompts or displays no UI and no prompts. By default UI and all prompts are displayed.&#xA;&#xA;/norestart - suppress any attempts to restart. By default UI will prompt before restart.&#xA;&#xA;/log &lt;LOG_FILE&gt; - logs to a specific file. By default a log file is created in %TEMP%." />
+  <String Id="HelpCloseButton" Value="&amp;Close" />
+  <String Id="InstallAcceptCheckbox" Value="I &amp;agree to the license terms and conditions" />
+  <String Id="InstallInstallButton" Value="&amp;Install" />
+  <String Id="InstallCloseButton" Value="&amp;Close" />
+  <String Id="ProgressHeader" Value="Setup Progress" />
+  <String Id="ProgressLabel" Value="Processing:" />
+  <String Id="OverallProgressPackageText" Value="Initializing..." />
+  <String Id="ProgressCancelButton" Value="&amp;Cancel" />
+  <String Id="ModifyHeader" Value="Modify Setup" />
+  <String Id="ModifyRepairButton" Value="&amp;Repair" />
+  <String Id="ModifyUninstallButton" Value="&amp;Uninstall" />
+  <String Id="ModifyCloseButton" Value="&amp;Close" />
+  <String Id="SuccessCacheHeader" Value="Cache Successfully Completed" />
+  <String Id="SuccessModifyHeader" Value="Modify Successfully Completed" />
+  <String Id="SuccessRepairHeader" Value="Repair Successfully Completed" />
+  <String Id="SuccessUninstallHeader" Value="Uninstall Successfully Completed" />
+  <String Id="SuccessUnsafeUninstallHeader" Value="Uninstall Successfully Completed" />
+  <String Id="SuccessInstallHeader" Value="Installation Successfully Completed" />
+  <String Id="SuccessHeader" Value="Setup Successful" />
+  <String Id="SuccessLaunchButton" Value="&amp;Launch" />
+  <String Id="SuccessLayoutHeader" Value="Layout Successfully Completed" />
+  <String Id="SuccessRestartText" Value="You must restart your computer before you can use the software." />
+  <String Id="SuccessUninstallRestartText" Value="You must restart your computer to complete the removal of the software." />
+  <String Id="SuccessRestartButton" Value="&amp;Restart" />
+  <String Id="SuccessCloseButton" Value="&amp;Close" />
+  <String Id="FailureHeader" Value="Setup Failed" />
+  <String Id="FailureCacheHeader" Value="Cache Failed" />
+  <String Id="FailureLayoutHeader" Value="Layout Failed" />
+  <String Id="FailureModifyHeader" Value="Modify Failed" />
+  <String Id="FailureInstallHeader" Value="Setup Failed" />
+  <String Id="FailureUnsafeUninstallHeader" Value="Uninstall Failed" />
+  <String Id="FailureUninstallHeader" Value="Uninstall Failed" />
+  <String Id="FailureRepairHeader" Value="Repair Failed" />
+  <String Id="FailureHyperlinkLogText" Value="One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href=&quot;#&quot;&gt;log file&lt;/a&gt;." />
+  <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
+  <String Id="FailureRestartButton" Value="&amp;Restart" />
+  <String Id="FailureCloseButton" Value="&amp;Close" />
+  <String Id="FilesInUseHeader" Value="Files In Use" />
+  <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
+  <String Id="FilesInUseCloseRadioButton" Value="Close the &amp;applications and attempt to restart them." />
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close applications. A reboot will be required." />
+  <String Id="FilesInUseOkButton" Value="&amp;OK" />
+  <String Id="FilesInUseCancelButton" Value="&amp;Cancel" />
+  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
+  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
+  <String Id="FilesInUseTitle" Value="Files In Use" />
+  <String Id="LicenseAssent" Value="By clicking Install, you agree to the following terms:" />
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Privacy Statement&lt;/A&gt;" />
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Licensing Information for .NET&lt;/A&gt;" />
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetry collection and opt-out&lt;/A&gt;" />
+
+  <!-- Custom UI strings -->
+  <!--_locComment_text="{Locked='[WixBundleName]'}"-->
+  <String Id="Welcome" Value="Welcome to the [WixBundleName] Setup." />
+  <!--_locComment_text="'here' is to be translated"-->
+  <String Id="InstallResetIIS" Value="Please restart IIS after the installation completes. You can find additional information &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;here&lt;/a&gt;." />
+  <!--_locComment_text="'here' is to be translated"-->
+  <String Id="InstallNoIIS" Value="IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;here&lt;/a&gt;." />
+  <!--_locComment_text="{Locked='[WixBundleName]'}"-->
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;license terms&lt;/a&gt; and &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;privacy statement&lt;/a&gt;." />
+  <!--_locComment_text="'here' is to be translated"-->
+  <String Id="ModifyResetIIS" Value="Please restart IIS after the installation completes. You can find additional information &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;here&lt;/a&gt;." />
+  <!--_locComment_text="'here' is to be translated"-->
+  <String Id="ModifyNoIIS" Value="IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;here&lt;/a&gt;." />
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl
new file mode 100644
index 000000000000..aea0327ac7ed
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Installation de [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Version [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Voulez-vous vraiment annuler ?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Version précédente"/>
+  <String Id="HelpHeader" Value="Aide sur l’installation"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] : installe, répare, désinstalle ou crée une copie locale complète du lot dans le répertoire. L’installation constitue la valeur par défaut.
+
+/passive | /quiet : permet d’afficher une interface utilisateur minimale sans aucune requête ou de n’afficher ni interface utilisateur, ni requêtes. Par défaut, l’interface utilisateur et toutes les requêtes sont affichées.
+
+/norestart : permet de supprimer toutes les tentatives de redémarrage. Par défaut, l’interface utilisateur vous invite à redémarrer.
+
+/log &lt;LOG_FILE&gt; : permet d’enregistrer dans un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Fermer"/>
+  <String Id="InstallAcceptCheckbox" Value="J’&amp;accepte les conditions générales de la licence"/>
+  <String Id="InstallInstallButton" Value="&amp;Installer"/>
+  <String Id="InstallCloseButton" Value="&amp;Fermer"/>
+  <String Id="ProgressHeader" Value="Progression de l’opération"/>
+  <String Id="ProgressLabel" Value="Traitement :"/>
+  <String Id="OverallProgressPackageText" Value="Initialisation en cours... Merci de patienter."/>
+  <String Id="ProgressCancelButton" Value="&amp;Annuler"/>
+  <String Id="ModifyHeader" Value="Modifier la configuration"/>
+  <String Id="ModifyRepairButton" Value="&amp;Réparer"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Désinstaller"/>
+  <String Id="ModifyCloseButton" Value="&amp;Fermer"/>
+  <String Id="SuccessCacheHeader" Value="Cache correctement terminé"/>
+  <String Id="SuccessModifyHeader" Value="Modification correctement terminée"/>
+  <String Id="SuccessRepairHeader" Value="Réparation correctement terminée"/>
+  <String Id="SuccessUninstallHeader" Value="Désinstallation correctement terminée"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Désinstallation correctement terminée"/>
+  <String Id="SuccessInstallHeader" Value="Installation correctement terminée"/>
+  <String Id="SuccessHeader" Value="Installation réussie"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Lancement"/>
+  <String Id="SuccessLayoutHeader" Value="Mise en page correctement terminée"/>
+  <String Id="SuccessRestartText" Value="Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel."/>
+  <String Id="SuccessUninstallRestartText" Value="Vous devez redémarrer votre ordinateur pour terminer la suppression du logiciel."/>
+  <String Id="SuccessRestartButton" Value="&amp;Redémarrer"/>
+  <String Id="SuccessCloseButton" Value="&amp;Fermer"/>
+  <String Id="FailureHeader" Value="Nous n’avons pas pu effectuer l’installation"/>
+  <String Id="FailureCacheHeader" Value="Échec du cache"/>
+  <String Id="FailureLayoutHeader" Value="Échec de la mise en page"/>
+  <String Id="FailureModifyHeader" Value="Modification échouée"/>
+  <String Id="FailureInstallHeader" Value="Nous n’avons pas pu effectuer l’installation"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Nous n’avons pas pu effectuer la désinstallation"/>
+  <String Id="FailureUninstallHeader" Value="Nous n’avons pas pu effectuer la désinstallation"/>
+  <String Id="FailureRepairHeader" Value="Nous n’avons pas pu effectuer la réparation"/>
+  <String Id="FailureHyperlinkLogText" Value="Un ou plusieurs problèmes ont provoqué l’échec de l’installation. Veuillez résoudre les problèmes, puis réessayer la configuration. Pour découvrir plus d’informations, consultez le &lt;a href=&quot;#&quot;&gt;fichier journal&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel."/>
+  <String Id="FailureRestartButton" Value="&amp;Redémarrer"/>
+  <String Id="FailureCloseButton" Value="&amp;Fermer"/>
+  <String Id="FilesInUseHeader" Value="Fichiers en cours d’utilisation"/>
+  <String Id="FilesInUseLabel" Value="Les applications suivantes utilisent des fichiers qui doivent être mis à jour :"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Fermer les &amp;applications et essayer de les redémarrer."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Fermez les &amp;applications."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Ne fermez pas les applications. Un redémarrage sera nécessaire."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Annuler"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Recommencer"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignorer"/>
+  <String Id="FilesInUseExitButton" Value="Q&amp;uitter"/>
+  <String Id="FilesInUseTitle" Value="Fichiers en cours d’utilisation"/>
+  <String Id="LicenseAssent" Value="En cliquant sur Installer, vous acceptez les conditions suivantes :"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Déclaration de confidentialité&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informations de licence pour .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Collecte de données de télémétrie et option de refus&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Bienvenue dans le programme d'installation de [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Veuillez redémarrer IIS une fois l'installation terminée. Vous trouverez des informations supplémentaires &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;ici&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="IIS n'est pas activé sur cette machine. Si vous avez l'intention d'exécuter des applications ASP.NET Core avec IIS, vous devez installer IIS avant d'exécuter ce programme d'installation. Vous trouverez des informations supplémentaires &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;ici&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;conditions de licence&lt;/a&gt; et &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;déclaration de confidentialité&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="Veuillez redémarrer IIS une fois l'installation terminée. Vous trouverez des informations supplémentaires &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;ici&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="IIS n'est pas activé sur cette machine. Si vous avez l'intention d'exécuter des applications ASP.NET Core avec IIS, vous devez installer IIS avant d'exécuter ce programme d'installation. Vous trouverez des informations supplémentaires &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;ici&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl
new file mode 100644
index 000000000000..6d7e60ad9fe3
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Installazione di [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Versione di [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Annullare?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versione precedente"/>
+  <String Id="HelpHeader" Value="Guida all'installazione"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - Consente di installare, riparare, disinstallare o creare una copia locale completa del pacchetto nella directory. /install è l'opzione predefinita.
+
+/passive | /quiet - Consente di visualizzare un'interfaccia utente minima senza richieste o di non visualizzare alcuna interfaccia utente e alcuna richiesta. Per impostazione predefinita, vengono visualizzate l'interfaccia utente e tutte le richieste.
+
+/norestart - Consente di impedire qualsiasi tentativo di riavvio. Per impostazione predefinita, prima del riavvio verrà visualizzata una richiesta nell'interfaccia utente.
+
+/log &lt;LOG_FILE&gt; - Consente di eseguire la registrazione in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Chiudi"/>
+  <String Id="InstallAcceptCheckbox" Value="A&amp;ccetto i termini e le condizioni di licenza"/>
+  <String Id="InstallInstallButton" Value="&amp;Installa"/>
+  <String Id="InstallCloseButton" Value="&amp;Chiudi"/>
+  <String Id="ProgressHeader" Value="Stato dell'installazione"/>
+  <String Id="ProgressLabel" Value="Elaborazione:"/>
+  <String Id="OverallProgressPackageText" Value="Inizializzazione in corso..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Annulla"/>
+  <String Id="ModifyHeader" Value="Modifica installazione"/>
+  <String Id="ModifyRepairButton" Value="&amp;Ripristina"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Disinstalla"/>
+  <String Id="ModifyCloseButton" Value="&amp;Chiudi"/>
+  <String Id="SuccessCacheHeader" Value="Memorizzazione nella cache completata"/>
+  <String Id="SuccessModifyHeader" Value="Modifica completata"/>
+  <String Id="SuccessRepairHeader" Value="Riparazione completata"/>
+  <String Id="SuccessUninstallHeader" Value="Disinstallazione completata"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Disinstallazione completata"/>
+  <String Id="SuccessInstallHeader" Value="Installazione completata correttamente"/>
+  <String Id="SuccessHeader" Value="Configurazione completata"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Avvio"/>
+  <String Id="SuccessLayoutHeader" Value="Layout completato"/>
+  <String Id="SuccessRestartText" Value="Per poter usare il software, è necessario riavviare il computer."/>
+  <String Id="SuccessUninstallRestartText" Value="È necessario riavviare il computer per completare la rimozione del software."/>
+  <String Id="SuccessRestartButton" Value="&amp;Riavvia"/>
+  <String Id="SuccessCloseButton" Value="&amp;Chiudi"/>
+  <String Id="FailureHeader" Value="Configurazione non riuscita"/>
+  <String Id="FailureCacheHeader" Value="Memorizzazione nella cache non riuscita"/>
+  <String Id="FailureLayoutHeader" Value="Layout non riuscito"/>
+  <String Id="FailureModifyHeader" Value="Modifica non riuscita"/>
+  <String Id="FailureInstallHeader" Value="Configurazione non riuscita"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Disinstallazione non riuscita"/>
+  <String Id="FailureUninstallHeader" Value="Disinstallazione non riuscita"/>
+  <String Id="FailureRepairHeader" Value="Riparazione non riuscita"/>
+  <String Id="FailureHyperlinkLogText" Value="L'installazione non è stata completata a causa di uno o più problemi. Risolvere i problemi e quindi riprovare a eseguire l'installazione. Per altre informazioni, vedere il &lt;a href=&quot;#&quot;&gt;file di log&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Per completare il rollback del software, è necessario riavviare il computer."/>
+  <String Id="FailureRestartButton" Value="&amp;Riavvia"/>
+  <String Id="FailureCloseButton" Value="&amp;Chiudi"/>
+  <String Id="FilesInUseHeader" Value="File in uso"/>
+  <String Id="FilesInUseLabel" Value="Le applicazioni seguenti usano file che necessitano di aggiornamento:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Chiudi tutte le applicazioni e tenta di riavviarle."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Chiudi le &amp;applicazioni."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Non chiudere le applicazioni. Sarà necessario riavviare il sistema."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Annulla"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Riprova"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignora"/>
+  <String Id="FilesInUseExitButton" Value="E&amp;sci"/>
+  <String Id="FilesInUseTitle" Value="File in uso"/>
+  <String Id="LicenseAssent" Value="Facendo clic su Installa, si accettano le condizioni seguenti:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Informativa sulla privacy&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informazioni sulle licenze per .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Raccolta di telemetria e rifiuto esplicito&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Installazione di [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Al termine dell'installazione, riavviare IIS. Altre informazioni sono disponibili &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;qui&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="IIS non è abilitato su questo computer. Per eseguire applicazioni ASP.NET Core con IIS, è necessario installare IIS prima di eseguire il programma di installazione. Altre informazioni sono disponibili &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;qui&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;Condizioni di licenza&lt;/a&gt; e &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;Informativa sulla privacy&lt;/a&gt; di [WixBundleName]"/>
+  
+  <String Id="ModifyResetIIS" Value="Al termine dell'installazione, riavviare IIS. Altre informazioni sono disponibili &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;qui&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="IIS non è abilitato su questo computer. Per eseguire applicazioni ASP.NET Core con IIS, è necessario installare IIS prima di eseguire il programma di installazione. Altre informazioni sono disponibili &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;qui&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl
new file mode 100644
index 000000000000..a1bb66ae24ad
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] のセットアップ"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="バージョン [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="取り消しますか?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="以前のバージョン"/>
+  <String Id="HelpHeader" Value="セットアップのヘルプ"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - ディレクトリ内のバンドルの完全なローカル コピーをインストール、修復、アンインストール、または作成します。install が既定値です。
+
+/passive | /quiet - プロンプトなしで最小限の UI を表示するか、UI もプロンプトも表示しません。既定では、UI とすべてのプロンプトが表示されます。
+
+/norestart - 再起動の試行をすべて抑止します。既定では、再起動の前に UI が表示されます。
+
+/log &lt;LOG_FILE&gt; - 特定のファイルにログを記録します。既定では、ログ ファイルは %TEMP% に作成されます。"/>
+  <String Id="HelpCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="ライセンス条項および条件に同意します(&amp;A)"/>
+  <String Id="InstallInstallButton" Value="インストール(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="ProgressHeader" Value="セットアップの進行状況"/>
+  <String Id="ProgressLabel" Value="処理中:"/>
+  <String Id="OverallProgressPackageText" Value="初期化しています..."/>
+  <String Id="ProgressCancelButton" Value="キャンセル(&amp;C)"/>
+  <String Id="ModifyHeader" Value="セットアップの変更"/>
+  <String Id="ModifyRepairButton" Value="修復(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="アンインストール(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="キャッシュが正常に完了しました"/>
+  <String Id="SuccessModifyHeader" Value="変更が正常に完了しました"/>
+  <String Id="SuccessRepairHeader" Value="修復が正常に完了しました"/>
+  <String Id="SuccessUninstallHeader" Value="アンインストールが正常に完了しました"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="アンインストールが正常に完了しました"/>
+  <String Id="SuccessInstallHeader" Value="インストールが正常に完了しました"/>
+  <String Id="SuccessHeader" Value="セットアップに成功しました"/>
+  <String Id="SuccessLaunchButton" Value="起動(&amp;L)"/>
+  <String Id="SuccessLayoutHeader" Value="レイアウトが正常に完了しました"/>
+  <String Id="SuccessRestartText" Value="ソフトウェアを使用する前にコンピューターを再起動する必要があります。"/>
+  <String Id="SuccessUninstallRestartText" Value="ソフトウェアの削除を完了するには、コンピューターを再起動する必要があります。"/>
+  <String Id="SuccessRestartButton" Value="再起動(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="FailureHeader" Value="セットアップに失敗しました"/>
+  <String Id="FailureCacheHeader" Value="キャッシュに失敗しました"/>
+  <String Id="FailureLayoutHeader" Value="レイアウトに失敗しました"/>
+  <String Id="FailureModifyHeader" Value="変更に失敗しました"/>
+  <String Id="FailureInstallHeader" Value="セットアップに失敗しました"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="アンインストールに失敗しました"/>
+  <String Id="FailureUninstallHeader" Value="アンインストールに失敗しました"/>
+  <String Id="FailureRepairHeader" Value="修復に失敗しました"/>
+  <String Id="FailureHyperlinkLogText" Value="1 つ以上の問題が原因でセットアップが失敗しました。問題を修正してから、セットアップを再試行してください。詳細については、&lt;a href=&quot;#&quot;&gt;ログ ファイル&lt;/a&gt;を参照してください。"/>
+  <String Id="FailureRestartText" Value="ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。"/>
+  <String Id="FailureRestartButton" Value="再起動(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="閉じる(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="ファイルは使用中です"/>
+  <String Id="FilesInUseLabel" Value="次のアプリケーションは、更新の必要があるファイルを使用しています:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="アプリケーションを終了してから再起動します(&amp;A)。"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="アプリケーションを閉じます(&amp;A)。"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="アプリケーションを閉じません(&amp;D)。再起動が必要です。"/>
+  <String Id="FilesInUseOkButton" Value="OK(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="キャンセル(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="再試行(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="無視(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="終了(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="ファイルが使用中"/>
+  <String Id="LicenseAssent" Value="インストール をクリックすると、次の条項に同意したものと見なされます:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;プライバシーに関する声明&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET のライセンス情報&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;テレメトリの収集とオプトアウト&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="[WixBundleName] のセットアップへようこそ。"/>
+  
+  <String Id="InstallResetIIS" Value="インストールが完了したら、IIS を再起動してください。その他の情報については、&lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;こちら&lt;/a&gt;でご確認ください。"/>
+  
+  <String Id="InstallNoIIS" Value="このコンピューターでは IIS が有効になっていません。IIS を使用して ASP.NET Core アプリケーションを実行する場合は、このインストーラーを実行する前に、IIS をインストールする必要があります。その他の情報については、&lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;こちら&lt;/a&gt;でご確認ください。"/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] の &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;ライセンス条項&lt;/a&gt; および &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;プライバシーに関する声明&lt;/a&gt;。"/>
+  
+  <String Id="ModifyResetIIS" Value="インストールが完了したら、IIS を再起動してください。その他の情報については、&lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;こちら&lt;/a&gt;でご確認ください。"/>
+  
+  <String Id="ModifyNoIIS" Value="このコンピューターでは IIS が有効になっていません。IIS を使用して ASP.NET Core アプリケーションを実行する場合は、このインストーラーを実行する前に、IIS をインストールする必要があります。その他の情報については、&lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;こちら&lt;/a&gt;でご確認ください。"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl
new file mode 100644
index 000000000000..b68016d16866
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] 설치"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="버전 [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="취소하시겠습니까?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="이전 버전"/>
+  <String Id="HelpHeader" Value="설치 도움말"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - 디렉터리에서 번들의 전체 로컬 복사본을 설치, 복구, 제거하거나 만드세요. 설치가 기본값입니다.
+
+/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 프롬프트를 모두 표시하지 않습니다. 기본적으로 UI와 모든 프롬프트가 표시됩니다.
+
+/norestart - 다시 시작 시도를 중지합니다. 기본적으로 UI는 다시 시작하기 전에 메시지를 표시합니다.
+
+/log &lt;LOG_FILE&gt; - 특정 파일에 로그합니다. 기본적으로 로그 파일은 %TEMP%에 만들어집니다."/>
+  <String Id="HelpCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="라이선스 사용 약관에 동의합니다(&amp;A)."/>
+  <String Id="InstallInstallButton" Value="설치(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="ProgressHeader" Value="설치 진행률"/>
+  <String Id="ProgressLabel" Value="처리하는 중:"/>
+  <String Id="OverallProgressPackageText" Value="초기화하는 중..."/>
+  <String Id="ProgressCancelButton" Value="취소(&amp;C)"/>
+  <String Id="ModifyHeader" Value="설치 수정"/>
+  <String Id="ModifyRepairButton" Value="복구(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="제거(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="캐시가 완료됨"/>
+  <String Id="SuccessModifyHeader" Value="수정 완료됨"/>
+  <String Id="SuccessRepairHeader" Value="복구 완료됨"/>
+  <String Id="SuccessUninstallHeader" Value="제거 완료됨"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="제거 완료됨"/>
+  <String Id="SuccessInstallHeader" Value="설치 완료됨"/>
+  <String Id="SuccessHeader" Value="설치 완료"/>
+  <String Id="SuccessLaunchButton" Value="시작(&amp;L)"/>
+  <String Id="SuccessLayoutHeader" Value="레이아웃 완료됨"/>
+  <String Id="SuccessRestartText" Value="소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다."/>
+  <String Id="SuccessUninstallRestartText" Value="소프트웨어 제거를 완료하려면 컴퓨터를 다시 시작해야 합니다."/>
+  <String Id="SuccessRestartButton" Value="다시 시작(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="FailureHeader" Value="설치 실패"/>
+  <String Id="FailureCacheHeader" Value="캐시 실패"/>
+  <String Id="FailureLayoutHeader" Value="레이아웃 실패"/>
+  <String Id="FailureModifyHeader" Value="수정 실패"/>
+  <String Id="FailureInstallHeader" Value="설치 실패"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="제거 실패"/>
+  <String Id="FailureUninstallHeader" Value="제거 실패"/>
+  <String Id="FailureRepairHeader" Value="복구 실패"/>
+  <String Id="FailureHyperlinkLogText" Value="하나 이상의 문제로 인해 설치가 실패했습니다. 문제를 해결한 후 설치를 다시 시도하세요. 자세한 내용은 &lt;a href=&quot;#&quot;&gt;로그 파일&lt;/a&gt;을 참조하세요."/>
+  <String Id="FailureRestartText" Value="소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다."/>
+  <String Id="FailureRestartButton" Value="다시 시작(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="닫기(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="사용 중인 파일"/>
+  <String Id="FilesInUseLabel" Value="다음의 애플리케이션이 업데이트해야 할 파일을 사용 중입니다."/>
+  <String Id="FilesInUseCloseRadioButton" Value="애플리케이션을 닫고 다시 시작합니다(&amp;A)."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="애플리케이션을 닫습니다(&amp;A)."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="애플리케이션을 닫지 마세요(&amp;D). 다시 부팅해야 합니다."/>
+  <String Id="FilesInUseOkButton" Value="확인(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="취소(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="다시 시도(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="무시(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="끝내기(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="사용 중인 파일"/>
+  <String Id="LicenseAssent" Value="설치를 클릭하면 다음 사용 약관에 동의하는 것입니다."/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;개인정보처리방침&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET에 대한 라이선싱 정보&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;원격 분석 수집 및 옵트아웃&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="[WixBundleName] 설치를 시작합니다."/>
+  
+  <String Id="InstallResetIIS" Value="설치가 완료된 후 IIS를 다시 시작하세요. &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다."/>
+  
+  <String Id="InstallNoIIS" Value="이 컴퓨터에서 IIS를 사용하도록 설정되어 있지 않습니다. IIS에서 ASP.NET Core 애플리케이션을 실행하려면 이 설치 관리자를 실행하기 전에 IIS를 설치해야 합니다. &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;사용 조건&lt;/a&gt;과 &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;개인정보 처리방침&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="설치가 완료된 후 IIS를 다시 시작하세요. &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다."/>
+  
+  <String Id="ModifyNoIIS" Value="이 컴퓨터에서 IIS를 사용하도록 설정되어 있지 않습니다. IIS에서 ASP.NET Core 애플리케이션을 실행하려면 이 설치 관리자를 실행하기 전에 IIS를 설치해야 합니다. &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;여기&lt;/a&gt;에서 자세한 내용을 확인할 수 있습니다."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl
new file mode 100644
index 000000000000..85aed5f3987a
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] — instalacja"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Wersja [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Czy na pewno chcesz anulować?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Poprzednia wersja"/>
+  <String Id="HelpHeader" Value="Konfiguracja — Pomoc"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] – instaluje, naprawia, odinstalowuje lub tworzy pełną lokalną kopię pakietu w katalogu. Instalacja jest domyślna.
+
+/passive | /quiet – wyświetla minimalny interfejs użytkownika bez monitów lub nie wyświetla żadnego interfejsu użytkownika ani żadnych monitów. Domyślnie wyświetlane są interfejsy użytkownika i wszystkie monity.
+
+/norestart – wstrzymaj próby ponownego uruchomienia. Domyślnie interfejs użytkownika będzie monitować przed ponownym uruchomieniem.
+
+/log &lt;LOG_FILE&gt; – zapisuje dziennik do określonego pliku. Domyślnie plik dziennika jest tworzony w folderze %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Zamknij"/>
+  <String Id="InstallAcceptCheckbox" Value="&amp;Akceptuję postanowienia licencyjne"/>
+  <String Id="InstallInstallButton" Value="&amp;Zainstaluj"/>
+  <String Id="InstallCloseButton" Value="&amp;Zamknij"/>
+  <String Id="ProgressHeader" Value="Postęp konfiguracji"/>
+  <String Id="ProgressLabel" Value="Przetwarzanie:"/>
+  <String Id="OverallProgressPackageText" Value="Trwa inicjowanie..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Anuluj"/>
+  <String Id="ModifyHeader" Value="Modyfikowanie instalacji"/>
+  <String Id="ModifyRepairButton" Value="&amp;Napraw"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Odinstaluj"/>
+  <String Id="ModifyCloseButton" Value="&amp;Zamknij"/>
+  <String Id="SuccessCacheHeader" Value="Buforowanie zostało ukończone pomyślnie"/>
+  <String Id="SuccessModifyHeader" Value="Modyfikowanie zostało ukończone pomyślnie"/>
+  <String Id="SuccessRepairHeader" Value="Pomyślnie ukończono naprawę"/>
+  <String Id="SuccessUninstallHeader" Value="Pomyślnie ukończono operację odinstalowania"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Pomyślnie ukończono operację odinstalowania"/>
+  <String Id="SuccessInstallHeader" Value="Pomyślnie ukończono instalację"/>
+  <String Id="SuccessHeader" Value="Konfiguracja powiodła się"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Uruchom"/>
+  <String Id="SuccessLayoutHeader" Value="Układ został ukończony pomyślnie"/>
+  <String Id="SuccessRestartText" Value="Aby móc korzystać z oprogramowania, musisz uruchomić ponownie komputer."/>
+  <String Id="SuccessUninstallRestartText" Value="Aby zakończyć usuwanie oprogramowania, należy ponownie uruchomić komputer."/>
+  <String Id="SuccessRestartButton" Value="&amp;Uruchom ponownie"/>
+  <String Id="SuccessCloseButton" Value="&amp;Zamknij"/>
+  <String Id="FailureHeader" Value="Konfiguracja nie powiodła się"/>
+  <String Id="FailureCacheHeader" Value="Buforowanie nie powiodło się"/>
+  <String Id="FailureLayoutHeader" Value="Układ nie powiódł się"/>
+  <String Id="FailureModifyHeader" Value="Modyfikacja nie powiodła się"/>
+  <String Id="FailureInstallHeader" Value="Konfiguracja nie powiodła się"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Operacja odinstalowania nie powiodła się"/>
+  <String Id="FailureUninstallHeader" Value="Operacja odinstalowania nie powiodła się"/>
+  <String Id="FailureRepairHeader" Value="Naprawa nie powiodła się"/>
+  <String Id="FailureHyperlinkLogText" Value="Co najmniej jeden problem spowodował niepowodzenie konfiguracji. Rozwiąż problemy, a następnie ponów próbę konfiguracji. Aby uzyskać więcej informacji, zobacz &lt;a href=&quot;#&quot;&gt;plik dziennika&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Aby ukończyć wycofywanie oprogramowania, musisz uruchomić ponownie komputer."/>
+  <String Id="FailureRestartButton" Value="&amp;Uruchom ponownie"/>
+  <String Id="FailureCloseButton" Value="&amp;Zamknij"/>
+  <String Id="FilesInUseHeader" Value="Pliki w użyciu"/>
+  <String Id="FilesInUseLabel" Value="Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Zamknij &amp;aplikacje i spróbuj je ponownie uruchomić."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Zamknij &amp;aplikacje."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Nie zamykaj aplikacji. Wymagany będzie ponowny rozruch."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Anuluj"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Ponów próbę"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignoruj"/>
+  <String Id="FilesInUseExitButton" Value="Za&amp;kończ"/>
+  <String Id="FilesInUseTitle" Value="Pliki w użyciu"/>
+  <String Id="LicenseAssent" Value="Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Oświadczenie o ochronie prywatności&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informacje licencyjne dla platformy .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Zbieranie telemetrii i rezygnacja&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Witamy w instalatorze produktu [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Uruchom ponownie usługi IIS po zakończeniu instalacji. Dodatkowe informacje można znaleźć &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;tutaj&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="Usługi IIS nie są włączone na tym komputerze. Jeśli zamierzasz uruchamiać aplikacje ASP.NET Core z usługami IIS, musisz zainstalować usługi IIS przed uruchomieniem tego instalatora. Dodatkowe informacje można znaleźć &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;tutaj&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;postanowienia licencyjne&lt;/a&gt; i &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;zasady zachowania poufności informacji&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="Uruchom ponownie usługi IIS po zakończeniu instalacji. Dodatkowe informacje można znaleźć &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;tutaj&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="Usługi IIS nie są włączone na tym komputerze. Jeśli zamierzasz uruchamiać aplikacje ASP.NET Core z usługami IIS, musisz zainstalować usługi IIS przed uruchomieniem tego instalatora. Dodatkowe informacje można znaleźć &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;tutaj&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl
new file mode 100644
index 000000000000..bdf95eb8452a
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] Configuração"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Versão [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Tem certeza de que deseja cancelar?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versão anterior"/>
+  <String Id="HelpHeader" Value="Ajuda de Configuração"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - instala, repara, desinstala ou cria uma cópia local completa do pacote no diretório. A instalação é padrão.
+
+/passive | /quiet — exibe a interface do usuário mínima sem prompts ou não exibe nenhuma interface do usuário e nenhum prompt. Por padrão, a interface do usuário e todas as solicitações são exibidas.
+
+/norestart — suprime quaisquer tentativas de reinicialização. Por padrão, a interface do usuário exibirá uma solicitação antes de reiniciar.
+
+/log &lt;LOG_FILE&gt; — registra em log em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Fechar"/>
+  <String Id="InstallAcceptCheckbox" Value="Eu &amp;concordo com os termos e condições da licença"/>
+  <String Id="InstallInstallButton" Value="I&amp;nstalar"/>
+  <String Id="InstallCloseButton" Value="&amp;Fechar"/>
+  <String Id="ProgressHeader" Value="Progresso da Instalação"/>
+  <String Id="ProgressLabel" Value="Processamento:"/>
+  <String Id="OverallProgressPackageText" Value="Inicializando..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Cancelar"/>
+  <String Id="ModifyHeader" Value="Modificar Instalação"/>
+  <String Id="ModifyRepairButton" Value="&amp;Reparar"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Desinstalar"/>
+  <String Id="ModifyCloseButton" Value="&amp;Fechar"/>
+  <String Id="SuccessCacheHeader" Value="Cache Concluído com Sucesso"/>
+  <String Id="SuccessModifyHeader" Value="Modificação Concluída com Sucesso"/>
+  <String Id="SuccessRepairHeader" Value="Reparo Concluído com Sucesso"/>
+  <String Id="SuccessUninstallHeader" Value="Desinstalação Concluída com Sucesso"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Desinstalação Concluída com Sucesso"/>
+  <String Id="SuccessInstallHeader" Value="Instalação Concluída com Sucesso"/>
+  <String Id="SuccessHeader" Value="Instalação bem-sucedida"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Iniciar"/>
+  <String Id="SuccessLayoutHeader" Value="Layout Concluído com Sucesso"/>
+  <String Id="SuccessRestartText" Value="Você deve reiniciar seu computador antes de usar o software."/>
+  <String Id="SuccessUninstallRestartText" Value="Você precisa reiniciar o seu computador para concluir a remoção do software."/>
+  <String Id="SuccessRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="SuccessCloseButton" Value="&amp;Fechar"/>
+  <String Id="FailureHeader" Value="Falha na Instalação"/>
+  <String Id="FailureCacheHeader" Value="Falha no Cache"/>
+  <String Id="FailureLayoutHeader" Value="Falha no Layout"/>
+  <String Id="FailureModifyHeader" Value="Falha ao Modificar"/>
+  <String Id="FailureInstallHeader" Value="Falha na Instalação"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Falha ao Desinstalar"/>
+  <String Id="FailureUninstallHeader" Value="Falha ao Desinstalar"/>
+  <String Id="FailureRepairHeader" Value="Falha no Reparo"/>
+  <String Id="FailureHyperlinkLogText" Value="Um ou mais problemas fizeram com que a instalação falhasse. Corrija os problemas e, em seguida, tente a instalação novamente. Para mais informações, consulte o &lt;a href=&quot;#&quot;&gt;arquivo de log&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Você deve reiniciar seu computador para concluir a reversão do software."/>
+  <String Id="FailureRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="FailureCloseButton" Value="&amp;Fechar"/>
+  <String Id="FilesInUseHeader" Value="Arquivos em Uso"/>
+  <String Id="FilesInUseLabel" Value="Os aplicativos a seguir estão usando arquivos que precisam ser atualizados:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Feche os &amp;aplicativos e tente reiniciá-los."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Feche os &amp;aplicativos."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Não fechar aplicativos. Uma reinicialização será necessária."/>
+  <String Id="FilesInUseOkButton" Value="&amp;OK"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Cancelar"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Repetir"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignorar"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Saída"/>
+  <String Id="FilesInUseTitle" Value="Arquivos em Uso"/>
+  <String Id="LicenseAssent" Value="Ao clicar em Instalar, você concorda com os termos a seguir:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Política de privacidade&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Informações de licenciamento para .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Coleta e recusa de telemetria&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Bem-vindo à Instalação do [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Reinicie o IIS após a conclusão da instalação. Você pode encontrar informações adicionais &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;aqui&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="O IIS não está habilitado nesta máquina. Se você pretende executar aplicações ASP.NET Core com o IIS, é necessário instalar o IIS antes de executar este instalador. Você pode encontrar informações adicionais &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;aqui&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;termos de licença&lt;/a&gt; e &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;declaração de privacidade&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="Reinicie o IIS após a conclusão da instalação. Você pode encontrar informações adicionais &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;aqui&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="O IIS não está habilitado nesta máquina. Se você pretende executar aplicações ASP.NET Core com o IIS, é necessário instalar o IIS antes de executar este instalador. Você pode encontrar informações adicionais &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;aqui&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl
new file mode 100644
index 000000000000..11960f0328cd
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Установка [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Версия [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="Выполнить отмену?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Предыдущая версия"/>
+  <String Id="HelpHeader" Value="Справка по установке"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] — устанавливает, восстанавливает, удаляет или создает полную локальную копию пакета в каталоге. По умолчанию выполняется установка.
+
+/passive | /quiet — выводит минимальный пользовательский интерфейс без запросов или вообще не выводит пользовательский интерфейс и запросы. По умолчанию отображаются пользовательский интерфейс и все запросы.
+
+/norestart — подавляет все попытки перезапуска. По умолчанию пользовательский интерфейс запрашивает подтверждение перед перезапуском.
+
+/log &lt;LOG_FILE&gt; — вывод журналов в определенный файл. По умолчанию файл журнала создается в папке %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Закрыть"/>
+  <String Id="InstallAcceptCheckbox" Value="Я &amp;принимаю условия лицензии"/>
+  <String Id="InstallInstallButton" Value="&amp;Установить"/>
+  <String Id="InstallCloseButton" Value="&amp;Закрыть"/>
+  <String Id="ProgressHeader" Value="Ход установки"/>
+  <String Id="ProgressLabel" Value="Выполняется обработка:"/>
+  <String Id="OverallProgressPackageText" Value="Выполняется инициализация…"/>
+  <String Id="ProgressCancelButton" Value="&amp;Отмена"/>
+  <String Id="ModifyHeader" Value="Изменение установки"/>
+  <String Id="ModifyRepairButton" Value="&amp;Исправить"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Удалить"/>
+  <String Id="ModifyCloseButton" Value="&amp;Закрыть"/>
+  <String Id="SuccessCacheHeader" Value="Кэширование успешно завершено"/>
+  <String Id="SuccessModifyHeader" Value="Изменение успешно завершено"/>
+  <String Id="SuccessRepairHeader" Value="Исправление успешно завершено"/>
+  <String Id="SuccessUninstallHeader" Value="Удаление успешно завершено"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Удаление успешно завершено"/>
+  <String Id="SuccessInstallHeader" Value="Установка успешно завершена"/>
+  <String Id="SuccessHeader" Value="Настройка успешно завершена"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Запустить"/>
+  <String Id="SuccessLayoutHeader" Value="Компоновка успешно завершена"/>
+  <String Id="SuccessRestartText" Value="Чтобы использовать установленное программное обеспечение, необходимо перезагрузить компьютер."/>
+  <String Id="SuccessUninstallRestartText" Value="Чтобы завершить удаление программного обеспечения, перезагрузите компьютер."/>
+  <String Id="SuccessRestartButton" Value="&amp;Перезагрузить"/>
+  <String Id="SuccessCloseButton" Value="&amp;Закрыть"/>
+  <String Id="FailureHeader" Value="Не удалось выполнить установку"/>
+  <String Id="FailureCacheHeader" Value="Сбой кэша"/>
+  <String Id="FailureLayoutHeader" Value="Сбой макета"/>
+  <String Id="FailureModifyHeader" Value="Сбой изменения"/>
+  <String Id="FailureInstallHeader" Value="Не удалось выполнить установку"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Не удалось выполнить удаление"/>
+  <String Id="FailureUninstallHeader" Value="Не удалось выполнить удаление"/>
+  <String Id="FailureRepairHeader" Value="Не удалось выполнить исправление"/>
+  <String Id="FailureHyperlinkLogText" Value="Возникли ошибки, вызвавшие сбой настройки. Устраните проблемы и повторите попытку настройки. Дополнительные сведения см. в &lt;a href=&quot;#&quot;&gt;файле журнала&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Необходимо перезагрузить компьютер перед тем, как выполнять откат программного обеспечения."/>
+  <String Id="FailureRestartButton" Value="&amp;Перезагрузить"/>
+  <String Id="FailureCloseButton" Value="&amp;Закрыть"/>
+  <String Id="FilesInUseHeader" Value="Используемые файлы"/>
+  <String Id="FilesInUseLabel" Value="Следующие приложения используют файлы, которые нуждаются в обновлении:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Закрыть приложения и попробовать перезапустить их."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="&amp;Закрыть приложения."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Не закрывать приложения. Потребуется перезагрузка."/>
+  <String Id="FilesInUseOkButton" Value="&amp;ОК"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Отмена"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Повторить"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Пропустить"/>
+  <String Id="FilesInUseExitButton" Value="Вы&amp;ход"/>
+  <String Id="FilesInUseTitle" Value="Используемые файлы"/>
+  <String Id="LicenseAssent" Value="Нажимая кнопку &quot;Установить&quot;, вы принимаете следующие условия."/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Заявление о конфиденциальности&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Сведения о лицензировании для .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Сбор данных телеметрии и возможность отказа&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Вас приветствует мастер установки [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Перезапустите службы IIS после завершения установки. Дополнительные сведения см. &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;здесь&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="Службы IIS не включены на этом компьютере. Если вы планируете запускать приложения ASP.NET Core с IIS, перед запуском этого установщика необходимо установить службы IIS. Дополнительные сведения см. &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;здесь&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;Условия лицензии&lt;/a&gt; и &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;заявление о конфиденциальности&lt;/a&gt; [WixBundleName]."/>
+  
+  <String Id="ModifyResetIIS" Value="Перезапустите службы IIS после завершения установки. Дополнительные сведения см. &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;здесь&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="Службы IIS не включены на этом компьютере. Если вы планируете запускать приложения ASP.NET Core с IIS, перед запуском этого установщика необходимо установить службы IIS. Дополнительные сведения см. &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;здесь&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl
new file mode 100644
index 000000000000..28f4b29ca640
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] Kurulumu"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="[WixBundleVersion] Sürümü"/>
+  <String Id="ConfirmCancelMessage" Value="İptal etmek istediğinizden emin misiniz?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Önceki sürüm"/>
+  <String Id="HelpHeader" Value="Kurulum Yardımı"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]] - dizindeki paketin eksiksiz bir yerel kopyasını yükler, onarır, kaldırır veya oluşturur. Yükleme varsayılan eylemdir.
+
+/passive | /quiet - kullanıcı arabirimini istem olmadan minimum düzeyde görüntüler veya kullanıcı arabirimi ve istem görüntülemez. Varsayılan olarak kullanıcı arabirimi ve tüm istemler görüntülenir.
+
+/norestart - yeniden başlatma girişimlerini durdurur. Varsayılan olarak kullanıcı arabirimi yeniden başlatmadan önce sorar.
+
+/log &lt;LOG_FILE&gt; - belirli bir dosyaya kaydeder. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur."/>
+  <String Id="HelpCloseButton" Value="&amp;Kapat"/>
+  <String Id="InstallAcceptCheckbox" Value="Lisans hüküm ve koşullarını &amp;kabul ediyorum"/>
+  <String Id="InstallInstallButton" Value="&amp;Yükle"/>
+  <String Id="InstallCloseButton" Value="&amp;Kapat"/>
+  <String Id="ProgressHeader" Value="Kurulum İlerleme Durumu"/>
+  <String Id="ProgressLabel" Value="İşleniyor:"/>
+  <String Id="OverallProgressPackageText" Value="Başlatılıyor..."/>
+  <String Id="ProgressCancelButton" Value="İ&amp;ptal"/>
+  <String Id="ModifyHeader" Value="Kurulumu Değiştir"/>
+  <String Id="ModifyRepairButton" Value="&amp;Onar"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Kaldır"/>
+  <String Id="ModifyCloseButton" Value="&amp;Kapat"/>
+  <String Id="SuccessCacheHeader" Value="Önbellek Başarıyla Tamamlandı"/>
+  <String Id="SuccessModifyHeader" Value="Değiştirme Başarıyla Tamamlandı"/>
+  <String Id="SuccessRepairHeader" Value="Onarım Başarıyla Tamamlandı"/>
+  <String Id="SuccessUninstallHeader" Value="Kaldırma Başarıyla Tamamlandı"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="Kaldırma Başarıyla Tamamlandı"/>
+  <String Id="SuccessInstallHeader" Value="Yükleme Başarıyla Tamamlandı"/>
+  <String Id="SuccessHeader" Value="Kurulum Başarılı"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Başlatma"/>
+  <String Id="SuccessLayoutHeader" Value="Düzen Başarıyla Tamamlandı"/>
+  <String Id="SuccessRestartText" Value="Yazılımı kullanabilmek için bilgisayarınızı yeniden başlatmanız gerekiyor."/>
+  <String Id="SuccessUninstallRestartText" Value="Yazılımın kaldırılmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor."/>
+  <String Id="SuccessRestartButton" Value="&amp;Yeniden Başlat"/>
+  <String Id="SuccessCloseButton" Value="&amp;Kapat"/>
+  <String Id="FailureHeader" Value="Kurulum Başarısız"/>
+  <String Id="FailureCacheHeader" Value="Önbellek Başarısız"/>
+  <String Id="FailureLayoutHeader" Value="Düzen Başarısız"/>
+  <String Id="FailureModifyHeader" Value="Değiştirme Başarısız"/>
+  <String Id="FailureInstallHeader" Value="Kurulum Başarısız"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="Kaldırılamadı"/>
+  <String Id="FailureUninstallHeader" Value="Kaldırılamadı"/>
+  <String Id="FailureRepairHeader" Value="Onarım Başarısız"/>
+  <String Id="FailureHyperlinkLogText" Value="Bir veya daha fazla sorun kurulumun başarısız olmasına neden oldu. Lütfen sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için &lt;a href=&quot;#&quot;&gt;günlük dosyasına&lt;/a&gt; bakın."/>
+  <String Id="FailureRestartText" Value="Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor."/>
+  <String Id="FailureRestartButton" Value="&amp;Yeniden Başlat"/>
+  <String Id="FailureCloseButton" Value="&amp;Kapat"/>
+  <String Id="FilesInUseHeader" Value="Kullanımda Olan Dosyalar"/>
+  <String Id="FilesInUseLabel" Value="Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="&amp;Uygulamaları kapatın ve yeniden başlatmayı deneyin."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="&amp;Uygulamaları kapatın."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Uygulamaları kapatmayın. Yeniden başlatma gerekiyor."/>
+  <String Id="FilesInUseOkButton" Value="&amp;Tamam"/>
+  <String Id="FilesInUseCancelButton" Value="İ&amp;ptal"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Yeniden Dene"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Yoksay"/>
+  <String Id="FilesInUseExitButton" Value="Çı&amp;k"/>
+  <String Id="FilesInUseTitle" Value="Kullanımda Olan Dosyalar"/>
+  <String Id="LicenseAssent" Value="Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Gizlilik Bildirimi&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET için Lisans Bilgileri&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Telemetri toplama ve geri çevirme&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="[WixBundleName] Kurulumu'na Hoş Geldiniz."/>
+  
+  <String Id="InstallResetIIS" Value="Yükleme tamamlandıktan sonra lütfen IIS'yi yeniden başlatın. Daha fazla bilgiyi &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;bu sayfada&lt;/a&gt; bulabilirsiniz."/>
+  
+  <String Id="InstallNoIIS" Value="IIS bu makinede etkin değil. ASP.NET Core uygulamalarını IIS ile çalıştırmak istiyorsanız, bu yükleyiciyi çalıştırmadan önce IIS'yi yüklemeniz gerekir. Daha fazla bilgiyi &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;bu sayfada&lt;/a&gt; bulabilirsiniz."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;lisans koşulları&lt;/a&gt; ve &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;gizlilik bildirimi&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="Yükleme tamamlandıktan sonra lütfen IIS'yi yeniden başlatın. Daha fazla bilgiyi &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;bu sayfada&lt;/a&gt; bulabilirsiniz."/>
+  
+  <String Id="ModifyNoIIS" Value="IIS bu makinede etkin değil. ASP.NET Core uygulamalarını IIS ile çalıştırmak istiyorsanız, bu yükleyiciyi çalıştırmadan önce IIS'yi yüklemeniz gerekir. Daha fazla bilgiyi &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;bu sayfada&lt;/a&gt; bulabilirsiniz."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl
new file mode 100644
index 000000000000..a094db252697
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="[WixBundleName] 安装"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="版本 [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="是否确实要取消?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="上一个版本"/>
+  <String Id="HelpHeader" Value="安装帮助"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]目录[\]] - 在目录中安装、修复、卸载或创建捆绑包的完整本地副本。Install 为默认值。
+
+/passive | /quiet - 在无提示的情况下显示最小 UI 或不显示 UI 和提示。默认情况下，将显示 UI 和所有提示。
+
+/norestart - 抑制任何重启尝试。默认情况下，UI 将在重启前提示。
+
+/log &lt;LOG_FILE&gt; - 记录到特定文件。默认在 %TEMP% 中创建日志文件。"/>
+  <String Id="HelpCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="InstallAcceptCheckbox" Value="我同意(&amp;A)许可条款和条件"/>
+  <String Id="InstallInstallButton" Value="安装(&amp;I)"/>
+  <String Id="InstallCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="ProgressHeader" Value="安装进度"/>
+  <String Id="ProgressLabel" Value="正在处理:"/>
+  <String Id="OverallProgressPackageText" Value="正在初始化..."/>
+  <String Id="ProgressCancelButton" Value="取消(&amp;C)"/>
+  <String Id="ModifyHeader" Value="修改安装"/>
+  <String Id="ModifyRepairButton" Value="修复(&amp;R)"/>
+  <String Id="ModifyUninstallButton" Value="卸载(&amp;U)"/>
+  <String Id="ModifyCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="SuccessCacheHeader" Value="已成功完成缓存"/>
+  <String Id="SuccessModifyHeader" Value="已成功完成修改"/>
+  <String Id="SuccessRepairHeader" Value="已成功完成修复"/>
+  <String Id="SuccessUninstallHeader" Value="已成功完成卸载"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="已成功完成卸载"/>
+  <String Id="SuccessInstallHeader" Value="已成功完成安装"/>
+  <String Id="SuccessHeader" Value="安装成功"/>
+  <String Id="SuccessLaunchButton" Value="启动(&amp;L)"/>
+  <String Id="SuccessLayoutHeader" Value="已成功完成布局"/>
+  <String Id="SuccessRestartText" Value="在使用此软件之前，您必须重新启动计算机。"/>
+  <String Id="SuccessUninstallRestartText" Value="必须重启计算机才能完成软件移除。"/>
+  <String Id="SuccessRestartButton" Value="重启(&amp;R)"/>
+  <String Id="SuccessCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="FailureHeader" Value="安装失败"/>
+  <String Id="FailureCacheHeader" Value="缓存失败"/>
+  <String Id="FailureLayoutHeader" Value="布局失败"/>
+  <String Id="FailureModifyHeader" Value="修改失败"/>
+  <String Id="FailureInstallHeader" Value="安装失败"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="卸载失败"/>
+  <String Id="FailureUninstallHeader" Value="卸载失败"/>
+  <String Id="FailureRepairHeader" Value="修复失败"/>
+  <String Id="FailureHyperlinkLogText" Value="一个或多个问题导致了安装失败。请修复问题，然后重试安装。有关详细信息，请参阅&lt;a href=&quot;#&quot;&gt;日志文件&lt;/a&gt;。"/>
+  <String Id="FailureRestartText" Value="必须重新启动计算机才能完成软件回退。"/>
+  <String Id="FailureRestartButton" Value="重启(&amp;R)"/>
+  <String Id="FailureCloseButton" Value="关闭(&amp;C)"/>
+  <String Id="FilesInUseHeader" Value="文件正在使用"/>
+  <String Id="FilesInUseLabel" Value="以下应用程序正在使用的文件需要更新:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="关闭应用程序，并尝试重启它们(&amp;A)。"/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="关闭应用程序(&amp;A)。"/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="不关闭应用程序(&amp;D)。需要重新启动。"/>
+  <String Id="FilesInUseOkButton" Value="确定(&amp;O)"/>
+  <String Id="FilesInUseCancelButton" Value="取消(&amp;C)"/>
+  <String Id="FilesInUseRetryButton" Value="重试(&amp;R)"/>
+  <String Id="FilesInUseIgnoreButton" Value="忽略(&amp;I)"/>
+  <String Id="FilesInUseExitButton" Value="退出(&amp;X)"/>
+  <String Id="FilesInUseTitle" Value="文件正在使用"/>
+  <String Id="LicenseAssent" Value="单击“安装”即表示你同意以下条款:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;隐私声明&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;.NET 的许可信息&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;遥测收集和选择退出&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="欢迎使用 [WixBundleName] 安装程序。"/>
+  
+  <String Id="InstallResetIIS" Value="请在安装完成后重启 IIS。可在&lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;此处&lt;/a&gt;找到其他信息。"/>
+  
+  <String Id="InstallNoIIS" Value="此计算机上未启用 IIS。如果打算通过 IIS 运行 ASP.NET Core 应用程序，必须先安装 IIS，然后再运行此安装程序。可在&lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;此处&lt;/a&gt;找到其他信息。"/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;许可条款&lt;/a&gt;和&lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;隐私声明&lt;/a&gt;。"/>
+  
+  <String Id="ModifyResetIIS" Value="请在安装完成后重启 IIS。可在&lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;此处&lt;/a&gt;找到其他信息。"/>
+  
+  <String Id="ModifyNoIIS" Value="此计算机上未启用 IIS。如果打算通过 IIS 运行 ASP.NET Core 应用程序，必须先安装 IIS，然后再运行此安装程序。可在&lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;此处&lt;/a&gt;找到其他信息。"/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl
new file mode 100644
index 000000000000..d2bedbd1f614
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl
@@ -0,0 +1,87 @@
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+  
+  <String Id="Caption" Value="Configuración de [WixBundleName]"/>
+  
+  <String Id="Title" Value="[BundleNameShort]"/>
+  
+  <String Id="SubTitle" Value="[BundleNameSub]"/>
+  
+  <String Id="InstallVersion" Value="Versión [WixBundleVersion]"/>
+  <String Id="ConfirmCancelMessage" Value="¿Está seguro de que desea cancelar?"/>
+  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versión anterior"/>
+  <String Id="HelpHeader" Value="Ayuda del programa de configuración"/>
+  
+  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [\[]directory[\]]: instala, repara, desinstala o crea una copia local completa del conjunto en el directorio. Install es el valor predeterminado.
+
+/passive | /quiet: muestra una interfaz de usuario mínima sin indicaciones o no muestra ninguna interfaz de usuario ni ninguna indicación. De manera predeterminada, se muestran la interfaz de usuario y todas las indicaciones.
+
+/norestart: suprime los intentos de reinicio. De manera predeterminada, la interfaz de usuario le avisará antes del reinicio.
+
+/log &lt;LOG_FILE&gt;: registra en un archivo específico. De manera predeterminada, se crea un archivo de registro en %TEMP%."/>
+  <String Id="HelpCloseButton" Value="&amp;Cerrar"/>
+  <String Id="InstallAcceptCheckbox" Value="&amp;Acepto los términos y las condiciones de la licencia"/>
+  <String Id="InstallInstallButton" Value="&amp;Instalar"/>
+  <String Id="InstallCloseButton" Value="&amp;Cerrar"/>
+  <String Id="ProgressHeader" Value="Progreso de la instalación"/>
+  <String Id="ProgressLabel" Value="Procesando:"/>
+  <String Id="OverallProgressPackageText" Value="Inicializando..."/>
+  <String Id="ProgressCancelButton" Value="&amp;Cancelar"/>
+  <String Id="ModifyHeader" Value="Modificar configuración"/>
+  <String Id="ModifyRepairButton" Value="&amp;Reparar"/>
+  <String Id="ModifyUninstallButton" Value="&amp;Desinstalar"/>
+  <String Id="ModifyCloseButton" Value="&amp;Cerrar"/>
+  <String Id="SuccessCacheHeader" Value="El almacenamiento en caché se completó correctamente"/>
+  <String Id="SuccessModifyHeader" Value="La modificación se completó correctamente"/>
+  <String Id="SuccessRepairHeader" Value="La reparación se completó correctamente"/>
+  <String Id="SuccessUninstallHeader" Value="La desinstalación se completó correctamente"/>
+  <String Id="SuccessUnsafeUninstallHeader" Value="La desinstalación se completó correctamente"/>
+  <String Id="SuccessInstallHeader" Value="La instalación se completó correctamente"/>
+  <String Id="SuccessHeader" Value="La configuración se realizó correctamente"/>
+  <String Id="SuccessLaunchButton" Value="&amp;Iniciar"/>
+  <String Id="SuccessLayoutHeader" Value="El diseño se completó correctamente"/>
+  <String Id="SuccessRestartText" Value="Debe reiniciar el equipo para poder usar el software."/>
+  <String Id="SuccessUninstallRestartText" Value="Debe reiniciar su equipo para completar la eliminación del software."/>
+  <String Id="SuccessRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="SuccessCloseButton" Value="&amp;Cerrar"/>
+  <String Id="FailureHeader" Value="No se pudo configurar"/>
+  <String Id="FailureCacheHeader" Value="No se pudo almacenar en caché"/>
+  <String Id="FailureLayoutHeader" Value="Error de diseño"/>
+  <String Id="FailureModifyHeader" Value="No se pudo modificar"/>
+  <String Id="FailureInstallHeader" Value="No se pudo configurar"/>
+  <String Id="FailureUnsafeUninstallHeader" Value="No se pudo desinstalar"/>
+  <String Id="FailureUninstallHeader" Value="No se pudo desinstalar"/>
+  <String Id="FailureRepairHeader" Value="No se pudo reparar"/>
+  <String Id="FailureHyperlinkLogText" Value="Ha habido algún problema que ha provocado un error en la configuración. Corrija los problemas y vuelva a intentar la instalación. Para más información, consulte el &lt;a href=&quot;#&quot;&gt;archivo de registro&lt;/a&gt;."/>
+  <String Id="FailureRestartText" Value="Debe reiniciar el equipo para completar la reversión del software."/>
+  <String Id="FailureRestartButton" Value="&amp;Reiniciar"/>
+  <String Id="FailureCloseButton" Value="&amp;Cerrar"/>
+  <String Id="FilesInUseHeader" Value="Archivos en uso"/>
+  <String Id="FilesInUseLabel" Value="Las siguientes aplicaciones usan archivos que se deben actualizar:"/>
+  <String Id="FilesInUseCloseRadioButton" Value="Cierre las &amp;aplicaciones e intente reiniciarlas."/>
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Cierre las &amp;aplicaciones."/>
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;No cerrar aplicaciones. Será necesario un reinicio."/>
+  <String Id="FilesInUseOkButton" Value="&amp;Aceptar"/>
+  <String Id="FilesInUseCancelButton" Value="&amp;Cancelar"/>
+  <String Id="FilesInUseRetryButton" Value="&amp;Reintentar"/>
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Omitir"/>
+  <String Id="FilesInUseExitButton" Value="&amp;Salir"/>
+  <String Id="FilesInUseTitle" Value="Archivos en uso"/>
+  <String Id="LicenseAssent" Value="Al hacer clic en Instalar, acepta los siguientes términos:"/>
+  <String Id="PrivacyStatementLink" Value="&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Declaración de privacidad&lt;/A&gt;"/>
+  <String Id="DotNetEulaLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-license-windows&quot;&gt;Información de licencias para .NET&lt;/A&gt;"/>
+  <String Id="DotNetCLITelemetryLink" Value="&lt;A HREF=&quot;https://aka.ms/dotnet-cli-telemetry&quot;&gt;Recopilación y rechazo de telemetría&lt;/A&gt;"/>
+
+  <!-- Custom UI strings -->
+  
+  <String Id="Welcome" Value="Programa de instalación de [WixBundleName]."/>
+  
+  <String Id="InstallResetIIS" Value="Reinicie IIS una vez completada la instalación. Puede encontrar información adicional &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;aquí&lt;/a&gt;."/>
+  
+  <String Id="InstallNoIIS" Value="IIS no está habilitado en esta máquina. Si pretende ejecutar aplicaciones ASP.NET Core con IIS, debe instalar IIS antes de ejecutar este instalador. Puede encontrar información adicional &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;aquí&lt;/a&gt;."/>
+  
+  <String Id="EulaPrivacy" Value="[WixBundleName] &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=329770&quot;&gt;términos de licencia&lt;/a&gt; y &lt;a href=&quot;https://go.microsoft.com/fwlink/?LinkId=786378&quot;&gt;declaración de privacidad&lt;/a&gt;."/>
+  
+  <String Id="ModifyResetIIS" Value="Reinicie IIS una vez completada la instalación. Puede encontrar información adicional &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;aquí&lt;/a&gt;."/>
+  
+  <String Id="ModifyNoIIS" Value="IIS no está habilitado en esta máquina. Si pretende ejecutar aplicaciones ASP.NET Core con IIS, debe instalar IIS antes de ejecutar este instalador. Puede encontrar información adicional &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;aquí&lt;/a&gt;."/>
+</WixLocalization>
\ No newline at end of file
diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets
index 3b1cf82c1076..c4c54cae812d 100644
--- a/src/Installers/Windows/WindowsHostingBundle/Product.targets
+++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets
@@ -7,31 +7,31 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi">
       <BundleNameProperty>DotNetRedistLtsInstallerx64</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi">
       <BundleNameProperty>DotNetRedistLtsInstallerx86</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi">
       <BundleNameProperty>DotNetRedistLtsInstallerarm64</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi">
       <BundleNameProperty>DotNetRedistHostInstallerx64</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi">
       <BundleNameProperty>DotNetRedistHostInstallerx86</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi">
       <BundleNameProperty>DotNetRedistHostInstallerarm64</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi">
       <BundleNameProperty>DotNetRedistHostfxrInstallerx64</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi">
       <BundleNameProperty>DotNetRedistHostfxrInstallerx86</BundleNameProperty>
     </RuntimeInstallers>
-    <RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi">
+    <RuntimeInstallers Include="$(DepsPath)dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi">
       <BundleNameProperty>DotNetRedistHostfxrInstallerarm64</BundleNameProperty>
     </RuntimeInstallers>
   </ItemGroup>
@@ -43,32 +43,32 @@
   <Target Name="CollectDependencies" BeforeTargets="Restore;CollectPackageReferences">
     <!-- Use the BrowserDebugHost as a sentinel for the nonshipping version for NETCoreApp. -->
     <ItemGroup>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
-        <TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi">
+        <TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
-        <TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi">
+        <TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi">
-        <TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi">
+        <TargetFileName>dotnet-runtime-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
-        <TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi">
+        <TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
-        <TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi">
+        <TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi">
-        <TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi">
+        <TargetFileName>dotnet-host-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi">
-        <TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi">
+        <TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-x64.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi">
-        <TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi">
+        <TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-x86.msi</TargetFileName>
       </RemoteAsset>
-      <RemoteAsset Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi">
-        <TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.msi</TargetFileName>
+      <RemoteAsset Include="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)/dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi">
+        <TargetFileName>dotnet-hostfxr-$(MicrosoftNETCoreAppRefVersion)-win-arm64.msi</TargetFileName>
       </RemoteAsset>
     </ItemGroup>
 
@@ -77,18 +77,12 @@
 
   <Target Name="FetchDependencies" BeforeTargets="Restore;CollectPackageReferences"
       Outputs="$(DepsPath)%(RemoteAsset.TargetFilename)">
-    <!--
-      Try various places to find the runtime. It's either released (use official version), public but
-      unreleased (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal).
-    -->
+    <PropertyGroup>
+      <_CurrentRemoteAsset>%(RemoteAsset.Identity)</_CurrentRemoteAsset>
+    </PropertyGroup>
     <ItemGroup>
       <UrisToDownload Remove="@(UrisToDownload)" />
-      <UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/Runtime/%(RemoteAsset.Identity)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/public/Runtime/%(RemoteAsset.Identity)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/internal/Runtime/%(RemoteAsset.Identity)"
-          Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
-        <token>$(DotnetRuntimeSourceFeedKey)</token>
-      </UrisToDownload>
+      <UrisToDownload Include="@(RemoteAssetBaseURL->'%(Identity)Runtime/$(_CurrentRemoteAsset)')" />
     </ItemGroup>
 
     <DownloadFile Condition=" ! Exists('$(DepsPath)%(RemoteAsset.TargetFilename)') "
diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs
index 9523cd755f45..bb00b6ef2ee4 100644
--- a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs
+++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs
@@ -1,34 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Fragment>                           
+<?include ..\AspNetCoreModule-Setup\IIS-Setup\include.wxi ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
         <PackageGroup Id="PG_SHAREDFX_REDIST_BUNDLE">
             <RollbackBoundary Id="RB_SHAREDFX_REDIST_BUNDLE" />
 
             <!-- OPT_NO_SHAREDFX could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="SharedFxRedist_arm64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerarm64)"
-                        Name="$(var.SharedFxRedistInstallerarm64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
+            <MsiPackage Id="SharedFxRedist_arm64" SourceFile="$(CrossArchitectureInstallerBasePath)\$(SharedFxRedistInstallerarm64)" Name="$(SharedFxRedistInstallerarm64)" Compressed="yes" Vital="yes" InstallCondition="(NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
             </MsiPackage>
-            
+
             <!-- OPT_NO_SHAREDFX could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="SharedFxRedist_x64" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx64)"
-                        Name="$(var.SharedFxRedistInstallerx64)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
+            <MsiPackage Id="SharedFxRedist_x64" SourceFile="$(CrossArchitectureInstallerBasePath)\$(SharedFxRedistInstallerx64)" Name="$(SharedFxRedistInstallerx64)" Compressed="yes" Vital="yes" InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)">
             </MsiPackage>
 
             <!-- OPT_NO_X86 could be unset at this point, which we explicitly treat as 'false' -->
-            <MsiPackage Id="SharedFxRedist_x86" SourceFile="$(var.InstallersOutputPath)\$(var.SharedFxRedistInstallerx86)"
-                        Name="$(var.SharedFxRedistInstallerx86)"
-                        Compressed="yes"
-                        Vital="yes"
-                        InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
+            <MsiPackage Id="SharedFxRedist_x86" SourceFile="$(CrossArchitectureInstallerBasePath)\$(SharedFxRedistInstallerx86)" Name="$(SharedFxRedistInstallerx86)" Compressed="yes" Vital="yes" InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)">
             </MsiPackage>
-            
+
         </PackageGroup>
     </Fragment>
 </Wix>
diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
index 2e5c010ed0e7..fbbe261ac48d 100644
--- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
+++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
@@ -1,48 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
   <PropertyGroup>
-    <Name>WindowsServerHostingBundle</Name>
-    <OutputName>WindowsServerHostingBundle</OutputName>
+    <Name>dotnet-hosting-$(_ProductVersionForInstallers)-win</Name>
+    <OutputName>$(Name)</OutputName>
+    <PackageFileName>$(Name).exe</PackageFileName>
     <IsShipping>true</IsShipping>
     <ProjectGuid>6F1B115C-1903-40CB-837D-7961AB610F4E</ProjectGuid>
     <OutputType>Bundle</OutputType>
     <Platform>x86</Platform>
     <SchemaVersion>2.0</SchemaVersion>
+    <!-- We import D.B.T ourselves in this file -->
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 
     <!-- Namespace used to generate stable UUID3 GUIDs for MSI ProductCode, etc. DO NOT CHANGE THIS. -->
     <NamespaceGuid>$(HostingBundleNamespaceGuid)</NamespaceGuid>
-  </PropertyGroup>
 
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixDependencyExtension">
-      <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
-      <Name>WixDependencyExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixBalExtension">
-      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
-      <Name>WixBalExtension</Name>
-    </WixExtension>
-  </ItemGroup>
+    <!-- Globbing will automatically find any .wxl relative to the project file. Since we're simshipping localized content for
+         the bundle UI, we either need to exclude the .wxl files or place them in a directory outside of the project. For simshipping
+         we only need to ensure the files are pulled in as additional payloads into the UX container. -->
+    <DefaultItemExcludes>$(DefaultItemExcludes);LCID\**\*</DefaultItemExcludes>
+  </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="thm.xml" />
-    <Compile Include="ANCM.wxs" />
-    <Compile Include="Bundle.wxs" />
-    <Compile Include="DotNetCore.wxs" />
-    <Compile Include="SharedFramework.wxs" />
-    <Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs" />
+    <Content Include="bundle.thm" />
+    <Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix5\bundle\upgradePolicies.wxs" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj">
       <SetPlatform>Platform=x86</SetPlatform>
       <Name>AspNetCoreModuleV2_x86</Name>
+      <BindName>AspNetCoreModuleV2_x86</BindName>
       <Project>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</Project>
       <Private>True</Private>
       <DoNotHarvest>true</DoNotHarvest>
@@ -50,6 +39,7 @@
     <ProjectReference Include="..\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj">
       <SetPlatform>Platform=x64</SetPlatform>
       <Name>AspNetCoreModuleV2_x64</Name>
+      <BindName>AspNetCoreModuleV2_x64</BindName>
       <Project>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</Project>
       <Private>True</Private>
       <DoNotHarvest>true</DoNotHarvest>
@@ -57,16 +47,14 @@
     <ProjectReference Include="..\AspNetCoreModule-Setup\ANCMV2\ANCMV2.wixproj">
       <SetPlatform>Platform=arm64</SetPlatform>
       <Name>AspNetCoreModuleV2_arm64</Name>
+      <BindName>AspNetCoreModuleV2_arm64</BindName>
       <Project>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</Project>
       <Private>True</Private>
       <DoNotHarvest>true</DoNotHarvest>
     </ProjectReference>
-    <ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
     <ProjectReference Include="..\HostOptions\HostOptions.wixproj">
       <Name>HostOptions</Name>
+      <BindName>HostOptions</BindName>
       <Project>20248cd1-c5aa-4f42-ad88-bc260d64deea</Project>
       <Private>True</Private>
       <DoNotHarvest>True</DoNotHarvest>
@@ -75,18 +63,40 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuild)' == 'true'" >
+    <ProjectReference Include="..\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj">
+      <SetPlatform>Platform=x86</SetPlatform>
+      <Name>AspNetCoreModuleV2IISExpress_x86</Name>
+      <BindName>AspNetCoreModuleV2IISExpress_x86</BindName>
+      <Private>True</Private>
+      <DoNotHarvest>true</DoNotHarvest>
+    </ProjectReference>
+    <ProjectReference Include="..\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj">
+      <SetPlatform>Platform=x64</SetPlatform>
+      <Name>AspNetCoreModuleV2IISExpress_x64</Name>
+      <BindName>AspNetCoreModuleV2IISExpress_x64</BindName>
+      <Private>True</Private>
+      <DoNotHarvest>true</DoNotHarvest>
+    </ProjectReference>
+    <ProjectReference Include="..\AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj">
+      <SetPlatform>Platform=arm64</SetPlatform>
+      <Name>AspNetCoreModuleV2IISExpress_arm64</Name>
+      <BindName>AspNetCoreModuleV2IISExpress_arm64</BindName>
+      <Private>True</Private>
+      <DoNotHarvest>true</DoNotHarvest>
+    </ProjectReference>
+  </ItemGroup>
+
   <Import Project="Product.targets" />
 
+  <Import Project="Sdk.targets" Sdk="Microsoft.WixToolset.Sdk" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <PropertyGroup>
-    <PackageFileName>dotnet-hosting-$(PackageVersion)-win$(TargetExt)</PackageFileName>
-
     <BundleNameShort>Microsoft .NET $(PackageBrandingVersion)</BundleNameShort>
     <SharedFxPackageVersion>$(PackageVersion)</SharedFxPackageVersion>
     <SharedFxMsiVersion>$(PackageVersion)</SharedFxMsiVersion>
-    <SharedFxMsiVersion
-        Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</SharedFxMsiVersion>
+    <NonStableVersion>$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)</NonStableVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -103,18 +113,27 @@
     <BundleRegName>$(BundleNameFull)</BundleRegName>
   </PropertyGroup>
 
+  <!-- CrossArchitectureInstallerBasePath is a global property, so use a new property instead of modifying it -->
+  <PropertyGroup Condition="'$(AddVersionToCrossArchitectureInstallerBasePath)' == 'true'">
+    <CrossArchitectureInstallerBasePathNormalized>$([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime', '$(NonStableVersion)'))</CrossArchitectureInstallerBasePathNormalized>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(AddVersionToCrossArchitectureInstallerBasePath)' != 'true'">
+    <CrossArchitectureInstallerBasePathNormalized>$(CrossArchitectureInstallerBasePath)</CrossArchitectureInstallerBasePathNormalized>
+  </PropertyGroup>
+
   <ItemGroup>
-    <SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x64.msi">
+    <SharedFxInstallers Include="$(CrossArchitectureInstallerBasePathNormalized)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x64.msi">
       <TargetPlatform>x64</TargetPlatform>
       <BundleNameProperty>SharedFxRedistInstallerx64</BundleNameProperty>
       <Version>$(SharedFxPackageVersion)</Version>
     </SharedFxInstallers>
-    <SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x86.msi">
+    <SharedFxInstallers Include="$(CrossArchitectureInstallerBasePathNormalized)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-x86.msi">
       <TargetPlatform>x86</TargetPlatform>
       <BundleNameProperty>SharedFxRedistInstallerx86</BundleNameProperty>
       <Version>$(SharedFxPackageVersion)</Version>
     </SharedFxInstallers>
-    <SharedFxInstallers Include="$(InstallersOutputPath)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-arm64.msi">
+    <SharedFxInstallers Include="$(CrossArchitectureInstallerBasePathNormalized)$(RuntimeInstallerBaseName)-$(SharedFxMsiVersion)-win-arm64.msi">
       <TargetPlatform>arm64</TargetPlatform>
       <BundleNameProperty>SharedFxRedistInstallerarm64</BundleNameProperty>
       <Version>$(SharedFxPackageVersion)</Version>
@@ -131,6 +150,7 @@
     <DefineConstants>$(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer)</DefineConstants>
     <DefineConstants>$(DefineConstants);BundleRegFamily=$(BundleRegFamily)</DefineConstants>
     <DefineConstants>$(DefineConstants);BundleRegName=$(BundleRegName)</DefineConstants>
+    <DefineConstants>$(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePathNormalized)</DefineConstants>
   </PropertyGroup>
 
   <Target Name="ExtractPropertiesFromSharedFxMsi" DependsOnTargets="FetchDependencies" AfterTargets="ResolveProjectReferences">
diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm
new file mode 100644
index 000000000000..de0485d67584
--- /dev/null
+++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm
@@ -0,0 +1,126 @@
+<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
+      <!-- Use system colors where possible as they change based on themes and are automatically adjusted for high contrast.
+       For custom colors, ensure the contrast ratio is at least 4.5:1 (3:1 for large text and other UI components).
+       The WinUI 3 Gallery app can be used to calculate contrast settings. Take note that custom colors for <Font>
+       elements use BGR instead of RGB ordering.
+
+       Line spacing for fonts should be rounded to the nearest multiple of 4. For example, Segoe UI with a height of 24 has
+       a line spacing of 31.9, so 32 should be used when calculating the height of a control that contains a single line of text,
+       like a label. For a height of 12, the line spacing to use is 16. -->
+    <Font Id="DefaultFont" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
+    <Font Id="WindowBannerFont" Height="-24" Weight="900" Foreground="000000" Background="D42B52">Segoe UI</Font>
+    <Font Id="PageHeaderFont" Height="-20" Weight="500" Foreground="graytext" Background="window">Segoe UI</Font>
+    <Font Id="ErrorFont" Height="-12" Weight="900" Foreground="windowtext" Background="window">Segoe UI</Font>
+    <Window Width="644" Height="460" HexStyle="100a0000" FontId="DefaultFont" Caption="#(loc.Caption)" IconFile="dotnet.ico">
+        <ImageControl Name="DotNetLogo" X="12" Y="-48" Width="124" Height="124" ImageFile="DotNetLogo_256x.png" Visible="yes" />
+        <Text X="80" Y="12" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
+        <Text X="80" Y="40" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
+
+        <Page Name="Help">
+            <Label Name="HelpHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpHeader)</Label>
+            <Label Name="HelpText" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpText)</Label>
+
+            <Button Name="HelpCancelButton"  X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.HelpCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Install">
+            <Label Name="WelcomeHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="000000">#(loc.Welcome)</Label>
+
+            <Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallResetIIS" EnableCondition="IISEnabled" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
+            <Hypertext X="148" Y="120" Width="-12" Height="44" FontId="DefaultFont" Name="InstallNoIIS" EnableCondition="NOT IISEnabled" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
+
+            <!-- Align the label with the top of the logo on the left. -->
+            <Label Name="LicenseTermsAndPolicies" X="148" Y="288" Width="-12" Height="32" FontId="DefaultFont" HexStyle="000000">#(loc.LicenseAssent)</Label>
+
+            <!-- These controls have larger vertical spacing to improve readability (20 instead of 16). -->
+            <Hypertext Name="PrivacyStatementLink" X="172" Y="320" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">#(loc.PrivacyStatementLink)</Hypertext>
+            <Hypertext Name="DotNetCLITelemetryLink" X="172" Y="340" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">#(loc.DotNetCLITelemetryLink)</Hypertext>
+            <Hypertext Name="DotNetEulaLink" X="172" Y="360" Width="-12" Height="16" FontId="DefaultFont" TabStop="yes" HexStyle="000000" HideWhenDisabled="yes">#(loc.DotNetEulaLink)</Hypertext>
+            <Button Name="InstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
+            <Button Name="InstallCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.InstallCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Progress">
+            <Label HexStyle="000000" Name="ProgressHeader" X="12" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ProgressHeader)</Label>
+            <Label HexStyle="000000" Name="ProgressLabel" X="12" Y="124" Width="96" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.ProgressLabel)</Label>
+            <Label HexStyle="000000" Name="OverallProgressPackageText" X="108" Y="124" Width="-12" Height="16" FontId="DefaultFont" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Label>
+
+            <Progressbar Name="OverallCalculatedProgressbar" X="12" Y="152" Width="-12" Height="20" />
+
+            <Button Name="ProgressCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.ProgressCancelButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Modify">
+            <Label Name="ModifyHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
+
+            <Hypertext Name="ModifyTextIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes" EnableCondition="IISEnabled" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
+            <Hypertext Name="ModifyTextNoIIS" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes" EnableCondition="NOT IISEnabled" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
+
+            <Button Name="RepairButton" X="-236" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
+            <Button Name="UninstallButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>
+            <Button Name="ModifyCancelButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.ModifyCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+        <Page Name="Success">
+            <Label Name="SuccessHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
+                <!-- Default text to display if none of the conditions are true. -->
+                <Text>#(loc.SuccessHeader)</Text>
+                <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
+            </Label>
+
+            <Label X="148" Y="-48" Width="-12" Height="34" FontId="DefaultFont" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
+                <Text>#(loc.SuccessRestartText)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallRestartText)</Text>
+            </Label>
+
+            <!-- Calculate the relative offset as follows, assuming there are two buttons, right aligned:
+               First button, X="-12" Width="100"
+               Second button, X="-124" (-12 - 100 (width of first button) - 12 (gap between buttons)) -->
+            <Button Name="SuccessRestartButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
+            <Button Name="SuccessCloseButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.SuccessCloseButton)</Text>
+                <CloseWindowAction />
+            </Button>
+        </Page>
+        <Page Name="Failure">
+            <Label Name="FailureHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
+                <Text>#(loc.FailureHeader)</Text>
+                <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
+            </Label>
+
+            <!-- Reserve three lines of space (2 for the message plus a 3rd for a line break. -->
+            <Hypertext HexStyle="000000" Name="FailureLogFileLink" X="148" Y="124" Width="-12" Height="48" FontId="DefaultFont" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
+
+            <!-- This element is updated by the bootstrapper application. Reserve 3 lines of space. -->
+            <Hypertext HexStyle="000000" Name="FailureMessageText" X="148" Y="172" Width="-12" Height="48" FontId="ErrorFont" TabStop="yes" HideWhenDisabled="yes" />
+
+            <!-- Reserve two lines of space to accommodate localized content. -->
+            <Label X="148" Y="-48" Width="-12" Height="32" FontId="DefaultFont" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
+            <Button Name="FailureRestartButton" X="-124" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
+            <Button Name="FailureCloseButton" X="-12" Y="-12" Width="100" Height="24" TabStop="yes" FontId="DefaultFont">
+                <Text>#(loc.FailureCloseButton)</Text>
+                <CloseWindowAction/>
+            </Button>
+        </Page>
+    </Window>
+</Theme>
diff --git a/src/Installers/Windows/WindowsHostingBundle/dotnet.ico b/src/Installers/Windows/WindowsHostingBundle/dotnet.ico
new file mode 100644
index 000000000000..16c9148e8609
Binary files /dev/null and b/src/Installers/Windows/WindowsHostingBundle/dotnet.ico differ
diff --git a/src/Installers/Windows/WindowsHostingBundle/thm.xml b/src/Installers/Windows/WindowsHostingBundle/thm.xml
deleted file mode 100644
index 0fe7443e7f92..000000000000
--- a/src/Installers/Windows/WindowsHostingBundle/thm.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
-    <Window Width="485" Height="347" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
-    <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
-    <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
-    <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
-    <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
-
-    <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" Visible="yes"/>
-    <Text X="80" Y="11" Width="-11" Height="40" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
-    <Text X="80" Y="40" Width="-11" Height="40" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
-
-    <Page Name="Help">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
-        <Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
-        <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
-    </Page>
-    <Page Name="Install">
-        <Hypertext X="11" Y="90" Width="-11" Height="15" FontId="3">#(loc.Welcome)</Hypertext>
-        <Hypertext X="11" Y="119" Width="-11" Height="45" FontId="3" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
-        <Hypertext X="11" Y="119" Width="-11" Height="45" FontId="3" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
-        <Hypertext Name="EulaAndPrivacyHyperlink" X="11" Y="178" Width="-11" Height="51" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
-        <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="34" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
-        <Button Name="InstallButton" X="-91" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
-        <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
-    </Page>
-    <Page Name="FilesInUse">
-      <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
-      <Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
-      <Text Name="FilesInUseText"  X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
-
-      <Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
-      <Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
-
-      <Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
-      <Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
-    </Page>
-    <Page Name="Progress">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
-        <Text X="11" Y="121" Width="90" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="105" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
-        <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
-        <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
-    </Page>
-    <Page Name="Modify">
-        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
-        <Hypertext X="11" Y="121" Width="-11" Height="45" FontId="3" Name="ModifyResetIIS" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
-        <Hypertext X="11" Y="121" Width="-11" Height="45" FontId="3" Name="ModifyNoIIS" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
-        <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
-        <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
-        <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
-    </Page>
-    <Page Name="Success">
-        <Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-        <Text Name="SuccessInstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
-        <Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text> 	
-        <Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text> 
-        <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-        <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
-        <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
-        <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
-    </Page>
-    <Page Name="Failure">
-        <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
-        <Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
-        <Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
-        <Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>	
-        <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-        <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-        <Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
-        <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
-        <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
-    </Page>
-</Theme>
diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props
index a95545808fc9..0b629899a1bc 100644
--- a/src/Installers/Windows/Wix.props
+++ b/src/Installers/Windows/Wix.props
@@ -9,18 +9,20 @@
 
   <!-- Additional parameters for Light/Candle-->
   <PropertyGroup>
-    <LinkerAdditionalOptions>-fv</LinkerAdditionalOptions>
     <SuppressIces>ICE61</SuppressIces>
     <SuppressWarnings>1033</SuppressWarnings>
+    <!-- Currently, WiX only supports 'full' for the -pdbType option. This affects both bundle and package projects. -->
+    <DebugType>full</DebugType>
   </PropertyGroup>
 
   <PropertyGroup>
     <DefineSolutionProperties>false</DefineSolutionProperties>
-    <HostOptionsName>WindowsServerHostingBundleOptions</HostOptionsName>
+    <HostOptionsNameShort>AspNetCore.HostOptions</HostOptionsNameShort>
 
     <!-- Namespace used to generate stable UUID3 GUIDs for MSI ProductCode, etc. DO NOT CHANGE THESE. -->
     <HostingBundleNamespaceGuid>E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E</HostingBundleNamespaceGuid>
     <SharedFrameworkNamespaceGuid>C43D5520-11B3-4D62-B6FE-5D6840B04101</SharedFrameworkNamespaceGuid>
+    <ANCMNamespaceGuid>EC59D6F5-B7E6-4E46-A617-EC8329960614</ANCMNamespaceGuid>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index 7b0a4577492b..2d29fd599a7e 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -24,6 +24,10 @@
     <InstallDir>$(ProductName)</InstallDir>
     <DepProviderKey>Microsoft.$(ProductNameShort)_$(Platform)_$(Lang),v$(_GeneratedPackageVersion)</DepProviderKey>
     <DefineConstants>$(DefineConstants);DepProviderKey=$(DepProviderKey)</DefineConstants>
+    <!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
+    <_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
+    <_GeneratedPackageVersion
+        Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -35,27 +39,26 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
-    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
+    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
+    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netframework\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
   </PropertyGroup>
 
   <UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
-  <UsingTask TaskName="CreateLitCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
 
   <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />
 
   <Target Name="_GeneratePackageGuids" Condition="'$(OutputType)' == 'package'">
-    <GenerateGuid Condition="'$(OutputName)' != '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs)">
+    <GenerateGuid Condition="'$(ProductNameShort)' != '$(HostOptionsNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs)">
       <Output TaskParameter="Guid" PropertyName="ProductCode" />
     </GenerateGuid>
-    <GenerateGuid Condition="'$(OutputName)' != '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs);$(OutputType)">
+    <GenerateGuid Condition="'$(ProductNameShort)' != '$(HostOptionsNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(GuidInputs);$(OutputType)">
       <Output TaskParameter="Guid" PropertyName="UpgradeCode" />
     </GenerateGuid>
 
-    <GenerateGuid Condition="'$(OutputName)' == '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(Version)">
+    <GenerateGuid Condition="'$(ProductNameShort)' == '$(HostOptionsNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(Version)">
       <Output TaskParameter="Guid" PropertyName="ProductCode" />
     </GenerateGuid>
-    <GenerateGuid Condition="'$(OutputName)' == '$(HostOptionsName)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(AspNetCoreMajorMinorVersion);$(OutputType)">
+    <GenerateGuid Condition="'$(ProductNameShort)' == '$(HostOptionsNameShort)'" NamespaceGuid="$(NamespaceGuid)" Values="$(ProductNameShort);$(AspNetCoreMajorMinorVersion);$(OutputType)">
       <Output TaskParameter="Guid" PropertyName="UpgradeCode" />
     </GenerateGuid>
 
@@ -83,6 +86,16 @@
     </PropertyGroup>
   </Target>
 
+  <Target Name="_GenerateANCMGuids" Condition="'$(ANCMDepProviderKey)' != ''" BeforeTargets="CoreCompile">
+    <GenerateGuid NamespaceGuid="$(ANCMNamespaceGuid)" Values="$(ANCMDepProviderKey)">
+      <Output TaskParameter="Guid" PropertyName="DepProviderGuid" />
+    </GenerateGuid>
+
+    <PropertyGroup>
+      <DefineConstants>$(DefineConstants);DepProviderGuid=$(DepProviderGuid)</DefineConstants>
+    </PropertyGroup>
+  </Target>
+
   <Target Name="_CheckPackageFileNameIsSet" BeforeTargets="PrepareForBuild">
     <Error Text="Missing required property: PackageFileName" Condition="'$(PackageFileName)' == ''" />
   </Target>
@@ -97,28 +110,43 @@
     <Copy SourceFiles="@(_cabs)" DestinationFolder="$(InstallersOutputPath)" />
   </Target>
 
-  <Target Name="CreateWixPackageDrop" AfterTargets="CopyToArtifactsDirectory">
-    <MakeDir Directories="$(WixCommandPackagesDir)" />
-    <ItemGroup>
-      <WixInstallerFilesToProcess Include="$(TargetPath)" />
-      <WixInstallerFilesToProcess Include="$(InstallersOutputPath)$(PackageFileName)"
-        Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' " />
-    </ItemGroup>
-    <CreateLightCommandPackageDrop
-      LightCommandWorkingDir="$(WixCommandObjDir)"
-      OutputFolder="$(WixCommandPackagesDir)"
-      NoLogo="true"
-      Cultures="en-us"
-      InstallerFile="%(WixInstallerFilesToProcess.Identity)"
-      AdditionalBasePaths="$(MSBuildProjectDirectory);$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle"
-      WixExtensions="@(WixExtension)"
-      Loc="@(EmbeddedResource)"
-      Sice="$(SuppressIces)"
-      WixProjectFile="$(MSBuildProjectFile)"
-      Fv="true"
-      WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
-      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
-    </CreateLightCommandPackageDrop>
+  <!-- This target can be used to set additional Wix options. -->
+  <Target Name="SetAdditionalWixOptions" BeforeTargets="CoreCompile">
+    <PropertyGroup>
+      <!-- Use backwards compatible GUID generation. -->
+      <CompilerAdditionalOptions>$(CompilerAdditionalOptions) -bcgg</CompilerAdditionalOptions>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="GenerateWixpackPackage" AfterTargets="CoreCompile">
+    <PropertyGroup>
+      <WixpackWorkingDir>$(IntermediateOutputPath)wixpack</WixpackWorkingDir>
+      <WixpackOutputDir>$(ArtifactsNonShippingPackagesDir)</WixpackOutputDir>
+    </PropertyGroup>
+
+    <CreateWixBuildWixpack
+      AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)"
+      BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)"
+      Cultures="%(CultureGroup.Identity)"
+      DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"
+      Extensions="@(_ResolvedWixExtensionPaths)"
+      InstallerPlatform="$(InstallerPlatform)"
+      InstallerFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"
+      IntermediateDirectory="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)"
+      OutputFolder="$(WixpackOutputDir)"
+      OutputType="$(OutputType)"
+      PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
+      PdbType="$(DebugType)"
+      SourceFiles="@(Compile)"
+      SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
+      LocalizationFiles="@(_WixLocalizationFile)"
+      BindPaths="@(BindPath)"
+      WixpackWorkingDir="$(WixpackWorkingDir)">
+      <Output TaskParameter="OutputFile" PropertyName="_WixBuildCommandPackageNameOutput" />
+    </CreateWixBuildWixpack>
   </Target>
 
+  <!-- wixprojs don't do any packaging but the target is called from Arcade's Build.proj. -->
+  <Target Name="Pack" />
+
 </Project>
diff --git a/src/JSInterop/JSInterop.slnf b/src/JSInterop/JSInterop.slnf
index e6ab22ed4833..4875a62e1c2f 100644
--- a/src/JSInterop/JSInterop.slnf
+++ b/src/JSInterop/JSInterop.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\JSInterop\\Microsoft.JSInterop\\src\\Microsoft.JSInterop.csproj",
       "src\\JSInterop\\Microsoft.JSInterop\\test\\Microsoft.JSInterop.Tests.csproj"
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/babel.config.js b/src/JSInterop/Microsoft.JSInterop.JS/src/babel.config.js
new file mode 100644
index 000000000000..8bd00d8d7eb0
--- /dev/null
+++ b/src/JSInterop/Microsoft.JSInterop.JS/src/babel.config.js
@@ -0,0 +1,4 @@
+export const presets = [
+    ['@babel/preset-env', { targets: { node: 'current' } }],
+    '@babel/preset-typescript',
+];
\ No newline at end of file
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/jest.config.mjs b/src/JSInterop/Microsoft.JSInterop.JS/src/jest.config.mjs
new file mode 100644
index 000000000000..757fa59aa88c
--- /dev/null
+++ b/src/JSInterop/Microsoft.JSInterop.JS/src/jest.config.mjs
@@ -0,0 +1,33 @@
+/*
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const ROOT_DIR = path.resolve(__dirname, "..", "..", "..", "..");
+
+/** @type {import('jest').Config} */
+
+const config = {
+    roots: ["<rootDir>/src", "<rootDir>/test"],
+    testMatch: ["**/*.test.(ts|js)"],
+    moduleFileExtensions: ["js", "ts"],
+    transform: {
+        "^.+\\.(js|ts)$": "babel-jest",
+    },
+    moduleDirectories: ["node_modules", "src"],
+    testEnvironment: "jsdom",
+    reporters: [
+        "default",
+        [
+            path.resolve(ROOT_DIR, "node_modules", "jest-junit", "index.js"),
+            { "outputDirectory": path.resolve(ROOT_DIR, "artifacts", "log"), "outputName": `${process.platform}` + ".jsinterop.junit.xml" }
+        ]
+    ],
+};
+
+export default config;
\ No newline at end of file
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/package.json b/src/JSInterop/Microsoft.JSInterop.JS/src/package.json
index 76a5ad8e4cb9..8f480f3052c6 100644
--- a/src/JSInterop/Microsoft.JSInterop.JS/src/package.json
+++ b/src/JSInterop/Microsoft.JSInterop.JS/src/package.json
@@ -1,12 +1,15 @@
 {
   "name": "@microsoft/dotnet-js-interop",
-  "version": "9.0.0-dev",
+  "version": "10.0.0-dev",
   "description": "Provides abstractions and features for interop between .NET and JavaScript code.",
   "main": "dist/src/Microsoft.JSInterop.js",
   "types": "dist/src/Microsoft.JSInterop.d.ts",
   "type": "module",
   "scripts": {
     "clean": "rimraf ./dist",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:debug": "node --nolazy --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --colors --verbose",
     "build": "npm run clean && npm run build:esm",
     "build:lint": "eslint -c .eslintrc.json --ext .ts ./src",
     "build:esm": "tsc --project ./tsconfig.json",
@@ -26,11 +29,18 @@
     "dist/**"
   ],
   "devDependencies": {
+    "@babel/core": "^7.23.6",
+    "@babel/preset-env": "^7.23.6",
+    "@babel/preset-typescript": "^7.26.0",
     "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
+    "babel-jest": "^29.7.0",
     "eslint": "^8.56.0",
     "eslint-plugin-jsdoc": "^46.9.1",
     "eslint-plugin-prefer-arrow": "^1.2.3",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-junit": "^16.0.0",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3"
   }
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts b/src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts
index 4a237e391c9a..8c0a3d9c6999 100644
--- a/src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts
+++ b/src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts
@@ -19,47 +19,56 @@ export module DotNet {
   let defaultCallDispatcher: CallDispatcher | null | undefined;
 
   // Provides access to the "current" call dispatcher without having to flow it through nested function calls.
-  let currentCallDispatcher : CallDispatcher | undefined;
+  let currentCallDispatcher: CallDispatcher | undefined;
+
+  type InvocationHandlerCache = Map<string, { [k in JSCallType]?: Function }>;
 
   class JSObject {
-      _cachedFunctions: Map<string, Function>;
+      // We cache resolved members. Note that this means we can return stale values if the object has been modified since then.
+      _cachedHandlers: InvocationHandlerCache;;
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       constructor(private _jsObject: any) {
-          this._cachedFunctions = new Map<string, Function>();
+          this._cachedHandlers = new Map();
       }
 
-      public findFunction(identifier: string) {
-          const cachedFunction = this._cachedFunctions.get(identifier);
+      public resolveInvocationHandler(identifier: string, callType: JSCallType): Function {
+          const cachedFunction = this._cachedHandlers.get(identifier)?.[callType];
 
           if (cachedFunction) {
               return cachedFunction;
           }
 
-          let result: any = this._jsObject;
-          let lastSegmentValue: any;
-
-          identifier.split(".").forEach(segment => {
-              if (segment in result) {
-                  lastSegmentValue = result;
-                  result = result[segment];
-              } else {
-                  throw new Error(`Could not find '${identifier}' ('${segment}' was undefined).`);
-              }
-          });
+          const [parent, memberName] = findObjectMember(this._jsObject, identifier);
+          const func = wrapJSCallAsFunction(parent, memberName, callType, identifier);
+          this.addHandlerToCache(identifier, func, callType);
 
-          if (result instanceof Function) {
-              result = result.bind(lastSegmentValue);
-              this._cachedFunctions.set(identifier, result);
-              return result;
-          }
-
-          throw new Error(`The value '${identifier}' is not a function.`);
+          return func;
       }
 
       public getWrappedObject() {
           return this._jsObject;
       }
+
+      private addHandlerToCache(identifier: string, func: Function, callType: JSCallType) {
+          const cachedIdentifier = this._cachedHandlers.get(identifier);
+
+          if (cachedIdentifier) {
+            cachedIdentifier[callType] = func;
+          } else {
+            this._cachedHandlers.set(identifier, { [callType]: func });
+          }
+      }
+  }
+
+   /**
+   * Represents the type of operation that should be performed in JS.
+   */
+  export enum JSCallType {
+      FunctionCall = 1,
+      ConstructorCall = 2,
+      GetValue = 3,
+      SetValue = 4
   }
 
   const windowJSObjectId = 0;
@@ -67,16 +76,17 @@ export module DotNet {
       [windowJSObjectId]: new JSObject(window)
   };
 
-  cachedJSObjectsById[windowJSObjectId]._cachedFunctions.set("import", (url: any) => {
+  const windowObject = cachedJSObjectsById[windowJSObjectId];
+  windowObject._cachedHandlers.set("import", { [JSCallType.FunctionCall]: (url: any) => {
       // In most cases developers will want to resolve dynamic imports relative to the base HREF.
       // However since we're the one calling the import keyword, they would be resolved relative to
       // this framework bundle URL. Fix this by providing an absolute URL.
       if (typeof url === "string" && url.startsWith("./")) {
-          url = new URL(url.substr(2), document.baseURI).toString();
+          url = new URL(url.substring(2), document.baseURI).toString();
       }
 
       return import(/* webpackIgnore: true */ url);
-  });
+  }});
 
   let nextJsObjectId = 1; // Start at 1 because zero is reserved for "window"
 
@@ -118,7 +128,7 @@ export module DotNet {
    * @param args Arguments to pass to the method, each of which must be JSON-serializable.
    * @returns The result of the operation.
    */
-  export function invokeMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T {
+  export function invokeMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T | null {
       const dispatcher = getDefaultCallDispatcher();
       return dispatcher.invokeDotNetStaticMethod<T>(assemblyName, methodIdentifier, ...args);
   }
@@ -145,7 +155,13 @@ export module DotNet {
    * @throws Error if the given value is not an Object.
    */
   export function createJSObjectReference(jsObject: any): any {
-      if (jsObject && typeof jsObject === "object") {
+      if (jsObject === null || jsObject === undefined) {
+          return {
+              [jsObjectIdKey]: -1
+          };
+      }
+
+      if (jsObject && (typeof jsObject === "object" || jsObject instanceof Function)) {
           cachedJSObjectsById[nextJsObjectId] = new JSObject(jsObject);
 
           const result = {
@@ -210,7 +226,7 @@ export module DotNet {
   export function disposeJSObjectReference(jsObjectReference: any): void {
       const id = jsObjectReference && jsObjectReference[jsObjectIdKey];
 
-      if (typeof id === "number") {
+      if (typeof id === "number" && id !== -1) {
           disposeJSObjectReferenceById(id);
       }
   }
@@ -310,9 +326,10 @@ export module DotNet {
      * @param argsJson JSON representation of arguments to be passed to the function.
      * @param resultType The type of result expected from the JS interop call.
      * @param targetInstanceId The instance ID of the target JS object.
+     * @param callType The type of operation that should be performed in JS.
      * @returns JSON representation of the invocation result.
      */
-    invokeJSFromDotNet(identifier: string, argsJson: string, resultType: JSCallResultType, targetInstanceId: number): string | null;
+    invokeJSFromDotNet(identifier: string, argsJson: string, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): string | null;
 
     /**
      * Invokes the specified synchronous or asynchronous JavaScript function.
@@ -322,8 +339,9 @@ export module DotNet {
      * @param argsJson JSON representation of arguments to be passed to the function.
      * @param resultType The type of result expected from the JS interop call.
      * @param targetInstanceId The ID of the target JS object instance.
+     * @param callType The type of operation that should be performed in JS.
      */
-    beginInvokeJSFromDotNet(asyncHandle: number, identifier: string, argsJson: string | null, resultType: JSCallResultType, targetInstanceId: number): void;
+    beginInvokeJSFromDotNet(asyncHandle: number, identifier: string, argsJson: string | null, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): Promise<any>;
 
     /**
      * Receives notification that an async call from JS to .NET has completed.
@@ -342,7 +360,7 @@ export module DotNet {
      * @param args Arguments to pass to the method, each of which must be JSON-serializable.
      * @returns The result of the operation.
      */
-    invokeDotNetStaticMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T;
+    invokeDotNetStaticMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): | null;
 
     /**
      * Invokes the specified .NET public static method asynchronously.
@@ -387,10 +405,8 @@ export module DotNet {
           return this._dotNetCallDispatcher;
       }
 
-      invokeJSFromDotNet(identifier: string, argsJson: string, resultType: JSCallResultType, targetInstanceId: number): string | null {
-          const args = parseJsonWithRevivers(this, argsJson);
-          const jsFunction = findJSFunction(identifier, targetInstanceId);
-          const returnValue = jsFunction(...(args || []));
+      invokeJSFromDotNet(identifier: string, argsJson: string, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): string | null {
+          const returnValue = this.processJSCall(targetInstanceId, identifier, callType, argsJson);
           const result = createJSCallResult(returnValue, resultType);
 
           return result === null || result === undefined
@@ -398,37 +414,40 @@ export module DotNet {
               : stringifyArgs(this, result);
       }
 
-      beginInvokeJSFromDotNet(asyncHandle: number, identifier: string, argsJson: string | null, resultType: JSCallResultType, targetInstanceId: number): void {
-          // Coerce synchronous functions into async ones, plus treat
-          // synchronous exceptions the same as async ones
-          const promise = new Promise<any>(resolve => {
-              const args = parseJsonWithRevivers(this, argsJson);
-              const jsFunction = findJSFunction(identifier, targetInstanceId);
-              const synchronousResultOrPromise = jsFunction(...(args || []));
-              resolve(synchronousResultOrPromise);
-          });
-
-          // We only listen for a result if the caller wants to be notified about it
-          if (asyncHandle) {
-              // On completion, dispatch result back to .NET
-              // Not using "await" because it codegens a lot of boilerplate
-              promise.
-                  then(result => stringifyArgs(this, [
-                      asyncHandle,
-                      true,
-                      createJSCallResult(result, resultType)
-                  ])).
-                  then(
-                      result => this._dotNetCallDispatcher.endInvokeJSFromDotNet(asyncHandle, true, result),
-                      error => this._dotNetCallDispatcher.endInvokeJSFromDotNet(asyncHandle, false, JSON.stringify([
-                          asyncHandle,
-                          false,
-                          formatError(error)
-                      ]))
-                  );
+      async beginInvokeJSFromDotNet(asyncHandle: number, identifier: string, argsJson: string | null, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): Promise<any> {
+          try {
+            const valueOrPromise = this.processJSCall(targetInstanceId, identifier, callType, argsJson);
+
+            // We only await the result if the caller wants to be notified about it
+            if (asyncHandle) {
+                const result = await valueOrPromise;
+                const serializedResult = stringifyArgs(this, [
+                    asyncHandle,
+                    true,
+                    createJSCallResult(result, resultType)
+                ]);
+                // On success, dispatch result back to .NET
+                this._dotNetCallDispatcher.endInvokeJSFromDotNet(asyncHandle, true, serializedResult);
+            }
+          } catch(error: any) {
+            if (asyncHandle) {
+                const serializedError = JSON.stringify([
+                    asyncHandle,
+                    false,
+                    formatError(error)
+                ]);
+                // On failure, dispatch error back to .NET
+                this._dotNetCallDispatcher.endInvokeJSFromDotNet(asyncHandle, false, serializedError);
+            }
           }
       }
 
+      processJSCall(targetInstanceId: number, identifier: string, callType: JSCallType, argsJson: string | null) {
+          const args = parseJsonWithRevivers(this, argsJson) ?? [];
+          const func = findJSFunction(identifier, targetInstanceId, callType);
+          return func(...args);
+      }
+
       endInvokeDotNetFromJS(asyncCallId: string, success: boolean, resultJsonOrExceptionMessage: string): void {
           const resultOrError = success
               ? parseJsonWithRevivers(this, resultJsonOrExceptionMessage)
@@ -436,7 +455,7 @@ export module DotNet {
           this.completePendingCall(parseInt(asyncCallId, 10), success, resultOrError);
       }
 
-      invokeDotNetStaticMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T {
+      invokeDotNetStaticMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T | null {
           return this.invokeDotNetMethod<T>(assemblyName, methodIdentifier, null, args);
       }
 
@@ -444,15 +463,15 @@ export module DotNet {
           return this.invokeDotNetMethodAsync<T>(assemblyName, methodIdentifier, null, args);
       }
 
-      invokeDotNetMethod<T>(assemblyName: string | null, methodIdentifier: string, dotNetObjectId: number | null, args: any[] | null): T {
-          if (this._dotNetCallDispatcher.invokeDotNetFromJS) {
-              const argsJson = stringifyArgs(this, args);
-              const resultJson = this._dotNetCallDispatcher.invokeDotNetFromJS(assemblyName, methodIdentifier, dotNetObjectId, argsJson);
-              return resultJson ? parseJsonWithRevivers(this, resultJson) : null;
-          }
+      invokeDotNetMethod<T>(assemblyName: string | null, methodIdentifier: string, dotNetObjectId: number | null, args: any[] | null): T | null {
+        if (this._dotNetCallDispatcher.invokeDotNetFromJS) {
+            const argsJson = stringifyArgs(this, args);
+            const resultJson = this._dotNetCallDispatcher.invokeDotNetFromJS(assemblyName, methodIdentifier, dotNetObjectId, argsJson);
+            return resultJson ? parseJsonWithRevivers(this, resultJson) : null;
+        }
 
-          throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeDotNetMethodAsync instead.");
-      }
+        throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeDotNetMethodAsync instead.");
+    }
 
       invokeDotNetMethodAsync<T>(assemblyName: string | null, methodIdentifier: string, dotNetObjectId: number | null, args: any[] | null): Promise<T> {
           if (assemblyName && dotNetObjectId) {
@@ -545,11 +564,11 @@ export module DotNet {
       return error ? error.toString() : "null";
   }
 
-  export function findJSFunction(identifier: string, targetInstanceId: number): Function {
+  export function findJSFunction(identifier: string, targetInstanceId: number, callType?: JSCallType): Function {
       const targetInstance = cachedJSObjectsById[targetInstanceId];
 
       if (targetInstance) {
-          return targetInstance.findFunction(identifier);
+          return targetInstance.resolveInvocationHandler(identifier, callType ?? JSCallType.FunctionCall);
       }
 
       throw new Error(`JS object instance with ID ${targetInstanceId} does not exist (has it been disposed?).`);
@@ -559,12 +578,127 @@ export module DotNet {
       delete cachedJSObjectsById[id];
   }
 
+  /** Traverses the object hierarchy to find an object member specified by the identifier.
+   *
+   * @param obj Root object to search in.
+   * @param identifier Complete identifier of the member to find, e.g. "document.location.href".
+   * @returns A tuple containing the immediate parent of the member and the member name.
+   */
+  export function findObjectMember(obj: any, identifier: string): [any, string] {
+      const keys = identifier.split(".");
+      let current = obj;
+
+      // First, we iterate over all but the last key. We throw error for missing intermediate keys.
+      // Error handling in case of undefined last key depends on the type of operation.
+      for (let i = 0; i < keys.length - 1; i++) {
+          const key = keys[i];
+
+          if (current && typeof current === 'object' && key in current) {
+              current = current[key];
+          } else {
+              throw new Error(`Could not find '${identifier}' ('${key}' was undefined).`);
+          }
+      }
+
+      return [current, keys[keys.length - 1]];
+  }
+
+  /** Takes an object member and a call type and returns a function that performs the operation specified by the call type on the member.
+   *
+   * @param parent Immediate parent of the accessed object member.
+   * @param memberName Name (key) of the accessed member.
+   * @param callType The type of the operation to perform on the member.
+   * @param identifier The full member identifier. Only used for error messages.
+   * @returns A function that performs the operation on the member.
+   */
+  function wrapJSCallAsFunction(parent: any, memberName: string, callType: JSCallType, identifier: string): Function {
+      switch (callType) {
+          case JSCallType.FunctionCall:
+              const func = parent[memberName];
+              if (func instanceof Function) {
+                  return func.bind(parent);
+              } else {
+                  throw new Error(`The value '${identifier}' is not a function.`);
+              }
+          case JSCallType.ConstructorCall:
+              const ctor = parent[memberName];
+              if (ctor instanceof Function) {
+                  const bound = ctor.bind(parent);
+                  return (...args: any[]) => new bound(...args);
+              } else {
+                  throw new Error(`The value '${identifier}' is not a function.`);
+              }
+          case JSCallType.GetValue:
+              if (!isReadableProperty(parent, memberName)) {
+                  throw new Error(`The property '${identifier}' is not defined or is not readable.`);
+              }
+              return () => parent[memberName];
+          case JSCallType.SetValue:
+              if (!isWritableProperty(parent, memberName)) {
+                  throw new Error(`The property '${identifier}' is not writable.`);
+              }
+              return (...args: any[]) => parent[memberName] = args[0];
+      }
+  }
+
+  function isReadableProperty(obj: any, propName: string) {
+      // Return false for missing property.
+      if (!(propName in obj)) {
+          return false;
+      }
+
+      // If the property is present we examine its descriptor, potentially needing to walk up the prototype chain.
+      while (obj !== undefined) {
+          const descriptor = Object.getOwnPropertyDescriptor(obj, propName);
+
+          if (descriptor) {
+              // Return true for data property
+              if (descriptor.hasOwnProperty('value')) {
+                  return true
+              }
+
+              // Return true for accessor property with defined getter.
+              return descriptor.hasOwnProperty('get') && typeof descriptor.get === 'function';
+          }
+
+          obj = Object.getPrototypeOf(obj);
+      }
+
+      return false;
+  }
+
+  function isWritableProperty(obj: any, propName: string) {
+      // Return true for missing property if the property can be added.
+      if (!(propName in obj)) {
+          return Object.isExtensible(obj);
+      }
+
+      // If the property is present we examine its descriptor, potentially needing to walk up the prototype chain.
+      while (obj !== undefined) {
+          const descriptor = Object.getOwnPropertyDescriptor(obj, propName);
+
+          if (descriptor) {
+              // Return true for writable data property.
+              if (descriptor.hasOwnProperty('value') && descriptor.writable) {
+                  return true;
+              }
+
+              // Return true for accessor property with defined setter.
+              return descriptor.hasOwnProperty('set') && typeof descriptor.set === 'function';
+          }
+
+          obj = Object.getPrototypeOf(obj);
+      }
+
+      return false;
+  }
+
   export class DotNetObject {
       // eslint-disable-next-line no-empty-function
       constructor(private readonly _id: number, private readonly _callDispatcher: CallDispatcher) {
       }
 
-      public invokeMethod<T>(methodIdentifier: string, ...args: any[]): T {
+      public invokeMethod<T>(methodIdentifier: string, ...args: any[]): T | null {
           return this._callDispatcher.invokeDotNetMethod<T>(null, methodIdentifier, this._id, args);
       }
 
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/test/CallDispatcher.test.ts b/src/JSInterop/Microsoft.JSInterop.JS/src/test/CallDispatcher.test.ts
new file mode 100644
index 000000000000..fbf2b23261b0
--- /dev/null
+++ b/src/JSInterop/Microsoft.JSInterop.JS/src/test/CallDispatcher.test.ts
@@ -0,0 +1,449 @@
+import { expect } from "@jest/globals";
+import { DotNet } from "../src/Microsoft.JSInterop";
+
+const jsObjectId = "__jsObjectId";
+let lastAsyncResult: null | { callId: number, succeeded: boolean, resultOrError: any } = null;
+const dotNetCallDispatcher: DotNet.DotNetCallDispatcher = {
+    beginInvokeDotNetFromJS: function (callId: number, assemblyName: string | null, methodIdentifier: string, dotNetObjectId: number | null, argsJson: string): void { },
+    sendByteArray: function (id: number, data: Uint8Array): void { },
+    endInvokeJSFromDotNet: function (callId: number, succeeded: boolean, resultOrError: any): void {
+        lastAsyncResult = { callId, succeeded, resultOrError };
+    },
+};
+const dispatcher: DotNet.ICallDispatcher = DotNet.attachDispatcher(dotNetCallDispatcher);
+const getObjectReferenceId = (obj: any) => DotNet.createJSObjectReference(obj)[jsObjectId];
+
+describe("CallDispatcher", () => {
+    test("FunctionCall: Function with no arguments is invoked and returns value", () => {
+        const testFunc = () => 1;
+        const objectId = getObjectReferenceId({ testFunc });
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "testFunc",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.FunctionCall
+        );
+        expect(result).toBe("1");
+    });
+
+    test("FunctionCall: Function with arguments is invoked and returns value", () => {
+        const testFunc = (a: number, b: number) => a + b;
+        const objectId = getObjectReferenceId({ testFunc });
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "testFunc",
+            JSON.stringify([1, 2]),
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.FunctionCall
+        );
+
+        expect(result).toBe("3");
+    });
+
+    test("FunctionCall: Non-function value is invoked and throws", () => {
+        const objectId = getObjectReferenceId({ x: 1 });
+
+        expect(() => dispatcher.invokeJSFromDotNet(
+            "x",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.FunctionCall
+        )).toThrowError("The value 'x' is not a function.");
+    });
+
+    test("FunctionCall: Function is invoked via async interop and returns value", () => {
+        const testFunc = (a: number, b: number) => a + b;
+        const objectId = getObjectReferenceId({ testFunc });
+
+        const promise = dispatcher.beginInvokeJSFromDotNet(
+            1,
+            "testFunc",
+            JSON.stringify([1, 2]),
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.FunctionCall
+        );
+
+        promise?.then(() => {
+            expect(lastAsyncResult).toStrictEqual({ callId: 1, succeeded: true, resultOrError: "[1,true,3]" });
+        });
+    });
+
+    test("FunctionCall: Non-function value is invoked via async interop and throws", () => {
+        const objectId = getObjectReferenceId({ x: 1 });
+
+        const promise = dispatcher.beginInvokeJSFromDotNet(
+            1,
+            "x",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.FunctionCall
+        );
+
+        promise?.then(() => {
+            expect(lastAsyncResult?.succeeded).toBe(false);
+            expect(lastAsyncResult?.resultOrError).toMatch("The value 'x' is not a function.");
+        });
+    });
+
+    test("FunctionCall: should handle functions that throw errors", () => {
+        const testFunc = () => { throw new Error("Test error"); };
+        const objectId = getObjectReferenceId({ testFunc });
+
+        expect(() => dispatcher.invokeJSFromDotNet(
+            "testFunc",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.FunctionCall
+        )).toThrowError("Test error");
+    });
+
+    test("ConstructorCall: Constructor function is invoked and returns reference to new object", () => {
+        window["testCtor"] = function () { this.a = 10; };
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "testCtor",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            0,
+            DotNet.JSCallType.ConstructorCall
+        );
+
+        expect(result).toMatch("__jsObjectId");
+    });
+
+    test("ConstructorCall: Class constructor is invoked and returns reference to the new instance", () => {
+        const TestClass = class {
+            a: number;
+            constructor() { this.a = 10; }
+        };
+        const objectId = getObjectReferenceId({ TestClass });
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "TestClass",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            objectId,
+            DotNet.JSCallType.ConstructorCall
+        );
+
+        expect(result).toMatch("__jsObjectId");
+    });
+
+    test("GetValue: Simple property value is retrieved", () => {
+        const testObject = { a: 10 };
+        const objectId = getObjectReferenceId(testObject);
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "a",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe("10");
+    });
+
+    test("GetValue: Nested property value is retrieved", () => {
+        const testObject = { a: { b: 20 } };
+        const objectId = getObjectReferenceId(testObject);
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "a.b",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe("20");
+    });
+
+    test("GetValue: Property defined on prototype is retrieved", () => {
+        const grandParentPrototype = { a: 30 };
+        const parentPrototype = Object.create(grandParentPrototype);
+        const testObject = Object.create(parentPrototype);
+        const objectId = getObjectReferenceId(testObject);
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "a",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe("30");
+    });
+
+    test("GetValue: Reading undefined property throws", () => {
+        const testObject = { a: 10 };
+        const objectId = getObjectReferenceId(testObject);
+
+        expect(() => dispatcher.invokeJSFromDotNet(
+            "b",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.GetValue
+        )).toThrowError("The property 'b' is not defined or is not readable.");
+    });
+
+    test("GetValue: Object reference is retrieved", () => {
+        const testObject = { a: { b: 20 } };
+        const objectId = getObjectReferenceId(testObject);
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "a",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toMatch("__jsObjectId");
+    });
+
+    test("GetValue: Reading from setter-only property throws", () => {
+        const testObject = { set a(_: any) { } };
+        const objectId = getObjectReferenceId(testObject);
+
+        expect(() => dispatcher.invokeJSFromDotNet(
+            "a",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.GetValue
+        )).toThrowError("The property 'a' is not defined or is not readable");
+    });
+
+    test("SetValue: Simple property is updated", () => {
+        const testObject = { a: 10 };
+        const objectId = getObjectReferenceId(testObject);
+
+        dispatcher.invokeJSFromDotNet(
+            "a",
+            JSON.stringify([20]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objectId,
+            DotNet.JSCallType.SetValue
+        );
+
+        expect(testObject.a).toBe(20);
+    });
+
+    test("SetValue: Nested property is updated", () => {
+        const testObject = { a: { b: 10 } };
+        const objectId = getObjectReferenceId(testObject);
+
+        dispatcher.invokeJSFromDotNet(
+            "a.b",
+            JSON.stringify([20]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objectId,
+            DotNet.JSCallType.SetValue
+        );
+
+        expect(testObject.a.b).toBe(20);
+    });
+
+    test("SetValue: Undefined property can be set", () => {
+        const testObject = { a: 10 };
+        const objectId = getObjectReferenceId(testObject);
+
+        dispatcher.invokeJSFromDotNet(
+            "b",
+            JSON.stringify([30]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objectId,
+            DotNet.JSCallType.SetValue
+        );
+
+        expect((testObject as any).b).toBe(30);
+    });
+
+    test("SetValue: Writing to getter-only property throws", () => {
+        const testObject = { get a() { return 10; } };
+        const objectId = getObjectReferenceId(testObject);
+
+        expect(() => dispatcher.invokeJSFromDotNet(
+            "a",
+            JSON.stringify([20]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objectId,
+            DotNet.JSCallType.SetValue
+        )).toThrowError("The property 'a' is not writable.");
+    });
+
+    test("SetValue: Writing to non-writable data property throws", () => {
+        const testObject = Object.create({}, { a: { value: 10, writable: false } });
+        const objectId = getObjectReferenceId(testObject);
+
+        expect(() => dispatcher.invokeJSFromDotNet(
+            "a",
+            JSON.stringify([20]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objectId,
+            DotNet.JSCallType.SetValue
+        )).toThrowError("The property 'a' is not writable.");
+    });
+
+    test("SetValue + GetValue: Updated primitive value is read", () => {
+        const testObject = { a: 10 };
+        const objectId = getObjectReferenceId(testObject);
+
+        dispatcher.invokeJSFromDotNet(
+            "a",
+            JSON.stringify([20]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objectId,
+            DotNet.JSCallType.SetValue
+        );
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "a",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe("20");
+    });
+
+    test("SetValue + GetValue: Updated object value is read", () => {
+        const objA = {};
+        const objARef = DotNet.createJSObjectReference(objA);
+        const objB = { x: 30 };
+        const objBRef = DotNet.createJSObjectReference(objB);
+
+        dispatcher.invokeJSFromDotNet(
+            "b",
+            JSON.stringify([objBRef]),
+            DotNet.JSCallResultType.JSVoidResult,
+            objARef[jsObjectId],
+            DotNet.JSCallType.SetValue
+        );
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "b.x",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            objARef[jsObjectId],
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe("30");
+    });
+
+    test("ConstructorCall + GetValue: Class constructor is invoked and the new instance value is retrieved", () => {
+        const TestClass = class {
+            a: number;
+            constructor() { this.a = 20; }
+        };
+        const objectId = getObjectReferenceId({ TestClass });
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "TestClass",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            objectId,
+            DotNet.JSCallType.ConstructorCall
+        );
+        const newObjectId = JSON.parse(result ?? "")[jsObjectId];
+
+        const result2 = dispatcher.invokeJSFromDotNet(
+            "a",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            newObjectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result2).toBe("20");
+    });
+
+    test("ConstructorCall + FunctionCall: Class constructor is invoked and method is invoked on the new instance", () => {
+        const TestClass = class {
+            f() { return 30; }
+        };
+        const objectId = getObjectReferenceId({ TestClass });
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "TestClass",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            objectId,
+            DotNet.JSCallType.ConstructorCall
+        );
+        const newObjectId = JSON.parse(result ?? "")[jsObjectId];
+
+        const result2 = dispatcher.invokeJSFromDotNet(
+            "f",
+            "[]",
+            DotNet.JSCallResultType.Default,
+            newObjectId,
+            DotNet.JSCallType.FunctionCall
+        );
+
+        expect(result2).toBe("30");
+    });
+
+    test("createJSObjectReference: Handles null values without throwing", () => {
+        const nullRef = DotNet.createJSObjectReference(null);
+        expect(nullRef).toEqual({ [jsObjectId]: -1 });
+    });
+
+    test("createJSObjectReference: Handles undefined values without throwing", () => {
+        const undefinedRef = DotNet.createJSObjectReference(undefined);
+        expect(undefinedRef).toEqual({ [jsObjectId]: -1 });
+    });
+
+    test("disposeJSObjectReference: Safely handles null reference disposal", () => {
+        const nullRef = DotNet.createJSObjectReference(null);
+        expect(() => DotNet.disposeJSObjectReference(nullRef)).not.toThrow();
+    });
+
+    test("createJSObjectReference: Still throws for invalid types", () => {
+        expect(() => DotNet.createJSObjectReference("string")).toThrow();
+        expect(() => DotNet.createJSObjectReference(123)).toThrow();
+        expect(() => DotNet.createJSObjectReference(true)).toThrow();
+    });
+
+    test("GetValue: Returns JSObjectReference with sentinel value for null property", () => {
+        const testObject = { nullProp: null };
+        const objectId = getObjectReferenceId(testObject);
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "nullProp",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe('{"__jsObjectId":-1}');
+    });
+
+    test("GetValue: Returns JSObjectReference with sentinel value for undefined property", () => {
+        const testObject = { undefinedProp: undefined };
+        const objectId = getObjectReferenceId(testObject);
+
+        const result = dispatcher.invokeJSFromDotNet(
+            "undefinedProp",
+            "[]",
+            DotNet.JSCallResultType.JSObjectReference,
+            objectId,
+            DotNet.JSCallType.GetValue
+        );
+
+        expect(result).toBe('{"__jsObjectId":-1}');
+    });
+});
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/test/findObjectMember.test.ts b/src/JSInterop/Microsoft.JSInterop.JS/src/test/findObjectMember.test.ts
new file mode 100644
index 000000000000..a905936d59d4
--- /dev/null
+++ b/src/JSInterop/Microsoft.JSInterop.JS/src/test/findObjectMember.test.ts
@@ -0,0 +1,28 @@
+import { expect } from "@jest/globals";
+import { DotNet } from "../src/Microsoft.JSInterop";
+
+describe("findObjectMember", () => {
+    const testObject = {
+        a: {
+            b: {
+                c: 42,
+                d: function () { return "hello"; },
+                e: class { constructor() { } }
+            }
+        }
+    };
+
+    test("Resolves nested member", () => {
+        const result = DotNet.findObjectMember(testObject, "a.b.c");
+        expect(result).toEqual([testObject.a.b, "c"]);
+    });
+
+    test("Resolves undefined last-level member", () => {
+        const result = DotNet.findObjectMember(testObject, "a.f");
+        expect(result).toEqual([testObject.a, "f"]);
+    });
+
+    test("Throws for undefined intermediate member", () => {
+        expect(() => DotNet.findObjectMember(testObject, "a.f.g")).toThrow("Could not find 'a.f.g' ('f' was undefined).");
+    });
+});
diff --git a/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessObjectReference.cs
index d7e352659199..e399c3822ac5 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessObjectReference.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessObjectReference.cs
@@ -20,4 +20,34 @@ public interface IJSInProcessObjectReference : IJSObjectReference, IDisposable
     /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
     [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
     TValue Invoke<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, params object?[]? args);
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function synchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSInProcessObjectReference"/> instance that represents the created JS object.</returns>
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    IJSInProcessObjectReference InvokeConstructor(string identifier, object?[]? args)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property synchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    TValue GetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property synchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    void SetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => throw new NotImplementedException();
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessRuntime.cs
index 82a49f14acc2..79e01ea15ccb 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessRuntime.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessRuntime.cs
@@ -20,4 +20,34 @@ public interface IJSInProcessRuntime : IJSRuntime
     /// <returns>An instance of <typeparamref name="TResult"/> obtained by JSON-deserializing the return value.</returns>
     [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
     TResult Invoke<[DynamicallyAccessedMembers(JsonSerialized)] TResult>(string identifier, params object?[]? args);
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function synchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    IJSInProcessObjectReference InvokeConstructor(string identifier, params object?[]? args)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property synchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    TValue GetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property synchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    void SetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => throw new NotImplementedException();
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/IJSObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/IJSObjectReference.cs
index 55a99827849d..628f587bde15 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/IJSObjectReference.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/IJSObjectReference.cs
@@ -36,4 +36,72 @@ public interface IJSObjectReference : IAsyncDisposable
     /// <param name="args">JSON-serializable arguments.</param>
     /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
     ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken, object?[]? args);
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c> on the target instance.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object?[]? args)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c> on the target instance.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>someScope.someProp</c> on the target instance.</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>someScope.someProp</c> on the target instance.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>someScope.someProp</c> on the target instance.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+        => throw new NotImplementedException();
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/IJSRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/IJSRuntime.cs
index 0313bf613470..2e9329af3eac 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/IJSRuntime.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/IJSRuntime.cs
@@ -36,4 +36,72 @@ public interface IJSRuntime
     /// <param name="args">JSON-serializable arguments.</param>
     /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
     ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken, object?[]? args);
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object?[]? args)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+       => throw new NotImplementedException();
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => throw new NotImplementedException();
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+        => throw new NotImplementedException();
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSInProcessObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSInProcessObjectReference.cs
index 46e4af57b4d7..a52749d0dd67 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSInProcessObjectReference.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSInProcessObjectReference.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices.JavaScript;
+using Microsoft.JSInterop.Infrastructure;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.JSInterop.Implementation;
@@ -30,7 +31,34 @@ protected internal JSInProcessObjectReference(JSInProcessRuntime jsRuntime, long
     {
         ThrowIfDisposed();
 
-        return _jsRuntime.Invoke<TValue>(identifier, Id, args);
+        return _jsRuntime.Invoke<TValue>(identifier, Id, JSCallType.FunctionCall, args);
+    }
+
+    /// <inheritdoc />
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public IJSInProcessObjectReference InvokeConstructor(string identifier, object?[]? args)
+    {
+        ThrowIfDisposed();
+
+        return _jsRuntime.Invoke<IJSInProcessObjectReference>(identifier, Id, JSCallType.ConstructorCall, args);
+    }
+
+    /// <inheritdoc />
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public TValue GetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+    {
+        ThrowIfDisposed();
+
+        return _jsRuntime.Invoke<TValue>(identifier, Id, JSCallType.GetValue);
+    }
+
+    /// <inheritdoc />
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public void SetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+    {
+        ThrowIfDisposed();
+
+        _jsRuntime.Invoke<TValue>(identifier, Id, JSCallType.SetValue, value);
     }
 
     /// <inheritdoc />
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSObjectReference.cs
index 8661dd4b5ad8..21b3420b8f78 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSObjectReference.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/Implementation/JSObjectReference.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.JSInterop.Infrastructure;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.JSInterop.Implementation;
@@ -37,7 +38,7 @@ protected internal JSObjectReference(JSRuntime jsRuntime, long id)
     {
         ThrowIfDisposed();
 
-        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, args);
+        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.FunctionCall, args);
     }
 
     /// <inheritdoc />
@@ -45,7 +46,55 @@ protected internal JSObjectReference(JSRuntime jsRuntime, long id)
     {
         ThrowIfDisposed();
 
-        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, cancellationToken, args);
+        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.FunctionCall, cancellationToken, args);
+    }
+
+    /// <inheritdoc />
+    public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object?[]? args)
+    {
+        ThrowIfDisposed();
+
+        return _jsRuntime.InvokeAsync<IJSObjectReference>(Id, identifier, JSCallType.ConstructorCall, args);
+    }
+
+    /// <inheritdoc />
+    public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
+    {
+        ThrowIfDisposed();
+
+        return _jsRuntime.InvokeAsync<IJSObjectReference>(Id, identifier, JSCallType.ConstructorCall, cancellationToken, args);
+    }
+
+    /// <inheritdoc />
+    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+    {
+        ThrowIfDisposed();
+
+        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.GetValue, null);
+    }
+
+    /// <inheritdoc />
+    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken)
+    {
+        ThrowIfDisposed();
+
+        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.GetValue, cancellationToken, null);
+    }
+
+    /// <inheritdoc />
+    public async ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+    {
+        ThrowIfDisposed();
+
+        await _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.SetValue, [value]);
+    }
+
+    /// <inheritdoc />
+    public async ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+    {
+        ThrowIfDisposed();
+
+        await _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.SetValue, cancellationToken, [value]);
     }
 
     /// <inheritdoc />
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs
index 893c30f2cb5b..0624ee6a8457 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/DotNetDispatcher.cs
@@ -407,18 +407,21 @@ private static (MethodInfo methodInfo, Type[] parameterTypes) GetCachedMethodInf
                     continue;
                 }
 
-                var identifier = method.GetCustomAttribute<JSInvokableAttribute>(false)!.Identifier ?? method.Name!;
-                var parameterTypes = GetParameterTypes(method);
-
-                if (result.ContainsKey(identifier))
+                foreach (var attr in method.GetCustomAttributes<JSInvokableAttribute>(false))
                 {
-                    throw new InvalidOperationException($"The type {type.Name} contains more than one " +
-                        $"[JSInvokable] method with identifier '{identifier}'. All [JSInvokable] methods within the same " +
-                        "type must have different identifiers. You can pass a custom identifier as a parameter to " +
-                        $"the [JSInvokable] attribute.");
+                    var identifier = attr.Identifier ?? method.Name;
+                    var parameterTypes = GetParameterTypes(method);
+
+                    if (result.ContainsKey(identifier))
+                    {
+                        throw new InvalidOperationException($"The type {type.Name} contains more than one " +
+                            $"[JSInvokable] method with identifier '{identifier}'. All [JSInvokable] methods within the same " +
+                            "type must have different identifiers. You can pass a custom identifier as a parameter to " +
+                            $"the [JSInvokable] attribute.");
+                    }
+
+                    result.Add(identifier, (method, parameterTypes));
                 }
-
-                result.Add(identifier, (method, parameterTypes));
             }
 
             return result;
@@ -443,18 +446,21 @@ private static (MethodInfo methodInfo, Type[] parameterTypes) GetCachedMethodInf
                     continue;
                 }
 
-                var identifier = method.GetCustomAttribute<JSInvokableAttribute>(false)!.Identifier ?? method.Name;
-                var parameterTypes = GetParameterTypes(method);
-
-                if (result.ContainsKey(identifier))
+                foreach (var attr in method.GetCustomAttributes<JSInvokableAttribute>(false))
                 {
-                    throw new InvalidOperationException($"The assembly '{assemblyKey.AssemblyName}' contains more than one " +
-                        $"[JSInvokable] method with identifier '{identifier}'. All [JSInvokable] methods within the same " +
-                        $"assembly must have different identifiers. You can pass a custom identifier as a parameter to " +
-                        $"the [JSInvokable] attribute.");
+                    var identifier = attr.Identifier ?? method.Name;
+                    var parameterTypes = GetParameterTypes(method);
+
+                    if (result.ContainsKey(identifier))
+                    {
+                        throw new InvalidOperationException($"The assembly '{assemblyKey.AssemblyName}' contains more than one " +
+                            $"[JSInvokable] method with identifier '{identifier}'. All [JSInvokable] methods within the same " +
+                            $"assembly must have different identifiers. You can pass a custom identifier as a parameter to " +
+                            $"the [JSInvokable] attribute.");
+                    }
+
+                    result.Add(identifier, (method, parameterTypes));
                 }
-
-                result.Add(identifier, (method, parameterTypes));
             }
         }
 
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSCallType.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSCallType.cs
new file mode 100644
index 000000000000..1ab9dbb0fe08
--- /dev/null
+++ b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSCallType.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.JSInterop.Infrastructure;
+
+/// <summary>
+/// Describes type of operation invoked in JavaScript via interop.
+/// </summary>
+public enum JSCallType : int
+{
+    /// <summary>
+    /// Represents a regular function invocation.
+    /// </summary>
+    FunctionCall = 1,
+
+    /// <summary>
+    /// Represents a constructor function invocation with the <c>new</c> operator.
+    /// </summary>
+    ConstructorCall = 2,
+
+    /// <summary>
+    /// Represents reading a property value.
+    /// </summary>
+    GetValue = 3,
+
+    /// <summary>
+    /// Represents updating or defining a property value.
+    /// </summary>
+    SetValue = 4,
+}
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSInvocationInfo.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSInvocationInfo.cs
new file mode 100644
index 000000000000..209530e2b2c8
--- /dev/null
+++ b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSInvocationInfo.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.JSInterop.Infrastructure;
+
+/// <summary>
+/// Configuration of an interop call from .NET to JavaScript.
+/// </summary>
+public readonly struct JSInvocationInfo
+{
+    private readonly string? _argsJson;
+
+    /// <summary>
+    /// The identifier for the interop call, or zero if no async callback is required.
+    /// </summary>
+    public required long AsyncHandle { get; init; }
+
+    /// <summary>
+    /// The instance ID of the target JS object.
+    /// </summary>
+    public required long TargetInstanceId { get; init; }
+
+    /// <summary>
+    /// The identifier of the function to invoke or property to access.
+    /// </summary>
+    public required string Identifier { get; init; }
+
+    /// <summary>
+    /// The type of operation that should be performed in JS.
+    /// </summary>
+    public required JSCallType CallType { get; init; }
+
+    /// <summary>
+    /// The type of result expected from the invocation.
+    /// </summary>
+    public required JSCallResultType ResultType { get; init; }
+
+    /// <summary>
+    /// A JSON representation of the arguments.
+    /// </summary>
+    [StringSyntax(StringSyntaxAttribute.Json)]
+    public required string ArgsJson
+    {
+        get => _argsJson ?? "[]";
+        init => _argsJson = value;
+    }
+}
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSObjectReferenceJsonConverter.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSObjectReferenceJsonConverter.cs
index 563291822a4a..e4bf9db0c409 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSObjectReferenceJsonConverter.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSObjectReferenceJsonConverter.cs
@@ -22,6 +22,12 @@ public override bool CanConvert(Type typeToConvert)
     public override IJSObjectReference? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = JSObjectReferenceJsonWorker.ReadJSObjectReferenceIdentifier(ref reader);
+
+        if (id == -1)
+        {
+            return null;
+        }
+
         return new JSObjectReference(_jsRuntime, id);
     }
 
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/TaskGenericsUtil.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/TaskGenericsUtil.cs
index a03d87536db1..d18eecab82e6 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/TaskGenericsUtil.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/TaskGenericsUtil.cs
@@ -89,7 +89,9 @@ public void SetResult(object tcs, object? result)
             // If necessary, attempt a cast
             var typedResult = result is T resultT
                 ? resultT
-                : (T)Convert.ChangeType(result, typeof(T), CultureInfo.InvariantCulture)!;
+                : result == null && typeof(T).IsGenericType && typeof(T).GetGenericTypeDefinition() == typeof(Nullable<>) // ChangeType can't convert null to value types
+                    ? default(T)
+                    : (T)Convert.ChangeType(result, typeof(T), CultureInfo.InvariantCulture)!;
 
             typedTcs.SetResult(typedResult!);
         }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs
index 4092349c3882..280c57003066 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using Microsoft.JSInterop.Infrastructure;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.JSInterop;
@@ -12,14 +13,50 @@ namespace Microsoft.JSInterop;
 /// </summary>
 public abstract class JSInProcessRuntime : JSRuntime, IJSInProcessRuntime
 {
+    internal const long SyncCallIndicator = 0;
+
+    /// <summary>
+    /// Invokes the specified JavaScript function synchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>window.someScope.someFunction</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
     [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
-    internal TValue Invoke<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, long targetInstanceId, params object?[]? args)
+    public TValue Invoke<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, params object?[]? args)
+        => Invoke<TValue>(identifier, WindowObjectId, JSCallType.FunctionCall, args);
+
+    /// <inheritdoc />
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public IJSInProcessObjectReference InvokeConstructor(string identifier, params object?[]? args)
+        => Invoke<IJSInProcessObjectReference>(identifier, WindowObjectId, JSCallType.ConstructorCall, args);
+
+    /// <inheritdoc />
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public TValue GetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+        => Invoke<TValue>(identifier, WindowObjectId, JSCallType.GetValue);
+
+    /// <inheritdoc />
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    public void SetValue<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => Invoke<IJSVoidResult>(identifier, WindowObjectId, JSCallType.SetValue, value);
+
+    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
+    internal TValue Invoke<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, long targetInstanceId, JSCallType callType, params object?[]? args)
     {
-        var resultJson = InvokeJS(
-            identifier,
-            JsonSerializer.Serialize(args, JsonSerializerOptions),
-            JSCallResultTypeHelper.FromGeneric<TValue>(),
-            targetInstanceId);
+        var argsJson = args is not null && args.Length != 0 ? JsonSerializer.Serialize(args, JsonSerializerOptions) : "[]";
+        var resultType = JSCallResultTypeHelper.FromGeneric<TValue>();
+        var invocationInfo = new JSInvocationInfo
+        {
+            AsyncHandle = SyncCallIndicator,
+            TargetInstanceId = targetInstanceId,
+            Identifier = identifier,
+            CallType = callType,
+            ResultType = resultType,
+            ArgsJson = argsJson,
+        };
+
+        var resultJson = InvokeJS(invocationInfo);
 
         // While the result of deserialization could be null, we're making a
         // quality of life decision and letting users explicitly determine if they expect
@@ -34,17 +71,6 @@ public abstract class JSInProcessRuntime : JSRuntime, IJSInProcessRuntime
         return result;
     }
 
-    /// <summary>
-    /// Invokes the specified JavaScript function synchronously.
-    /// </summary>
-    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
-    /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>window.someScope.someFunction</c>.</param>
-    /// <param name="args">JSON-serializable arguments.</param>
-    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
-    [RequiresUnreferencedCode("JSON serialization and deserialization might require types that cannot be statically analyzed.")]
-    public TValue Invoke<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, params object?[]? args)
-        => Invoke<TValue>(identifier, 0, args);
-
     /// <summary>
     /// Performs a synchronous function invocation.
     /// </summary>
@@ -52,10 +78,11 @@ public abstract class JSInProcessRuntime : JSRuntime, IJSInProcessRuntime
     /// <param name="argsJson">A JSON representation of the arguments.</param>
     /// <returns>A JSON representation of the result.</returns>
     protected virtual string? InvokeJS(string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson)
-        => InvokeJS(identifier, argsJson, JSCallResultType.Default, 0);
+        => InvokeJS(identifier, argsJson, JSCallResultType.Default, WindowObjectId);
 
     /// <summary>
-    /// Performs a synchronous function invocation.
+    /// Performs a synchronous function invocation with the call type <see cref="JSCallType.FunctionCall"/>.
+    /// For more configuration options, use the overload <see cref="InvokeJS(in JSInvocationInfo)" />.
     /// </summary>
     /// <param name="identifier">The identifier for the function to invoke.</param>
     /// <param name="argsJson">A JSON representation of the arguments.</param>
@@ -63,4 +90,14 @@ public abstract class JSInProcessRuntime : JSRuntime, IJSInProcessRuntime
     /// <param name="targetInstanceId">The instance ID of the target JS object.</param>
     /// <returns>A JSON representation of the result.</returns>
     protected abstract string? InvokeJS(string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId);
+
+    /// <summary>
+    /// Performs a synchronous function invocation.
+    /// </summary>
+    /// <param name="invocationInfo">Configuration of the interop call.</param>
+    /// <returns>A JSON representation of the result.</returns>
+    protected virtual string? InvokeJS(in JSInvocationInfo invocationInfo)
+    {
+        return InvokeJS(invocationInfo.Identifier, invocationInfo.ArgsJson, invocationInfo.ResultType, invocationInfo.TargetInstanceId);
+    }
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs b/src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs
index 01066efb3dc5..06d476c74081 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs
@@ -117,4 +117,91 @@ public static async ValueTask InvokeVoidAsync(this IJSObjectReference jsObjectRe
 
         await jsObjectReference.InvokeAsync<IJSVoidResult>(identifier, cancellationToken, args);
     }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSObjectReference jsObjectReference, string identifier, params object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        return jsObjectReference.InvokeConstructorAsync(identifier, args);
+    }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c>.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSObjectReference jsObjectReference, string identifier, CancellationToken cancellationToken, object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        return jsObjectReference.InvokeConstructorAsync(identifier, cancellationToken, args);
+    }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSObjectReference jsObjectReference, string identifier, TimeSpan timeout, object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsObjectReference.InvokeConstructorAsync(identifier, cancellationToken, args);
+    }
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>someScope.someProp</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    public static ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSObjectReference jsObjectReference, string identifier, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsObjectReference.GetValueAsync<TValue>(identifier, cancellationToken);
+    }
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    public static ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSObjectReference jsObjectReference, string identifier, TValue value, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsObjectReference.SetValueAsync<TValue>(identifier, value, cancellationToken);
+    }
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs
index 3cbd024d2755..53400106f4d1 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs
@@ -15,6 +15,8 @@ namespace Microsoft.JSInterop;
 /// </summary>
 public abstract partial class JSRuntime : IJSRuntime, IDisposable
 {
+    internal const long WindowObjectId = 0;
+
     private long _nextObjectReferenceId; // Initial value of 0 signals no object, but we increment prior to assignment. The first tracked object should have id 1
     private long _nextPendingTaskId = 1; // Start at 1 because zero signals "no response needed"
     private readonly ConcurrentDictionary<long, object> _pendingTasks = new();
@@ -66,7 +68,7 @@ protected JSRuntime()
     /// <param name="args">JSON-serializable arguments.</param>
     /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
     public ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, object?[]? args)
-        => InvokeAsync<TValue>(0, identifier, args);
+        => InvokeAsync<TValue>(WindowObjectId, identifier, JSCallType.FunctionCall, args);
 
     /// <summary>
     /// Invokes the specified JavaScript function asynchronously.
@@ -80,24 +82,49 @@ protected JSRuntime()
     /// <param name="args">JSON-serializable arguments.</param>
     /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
     public ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken, object?[]? args)
-        => InvokeAsync<TValue>(0, identifier, cancellationToken, args);
+        => InvokeAsync<TValue>(WindowObjectId, identifier, JSCallType.FunctionCall, cancellationToken, args);
+
+    /// <inheritdoc />
+    public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, object?[]? args)
+        => InvokeAsync<IJSObjectReference>(WindowObjectId, identifier, JSCallType.ConstructorCall, args);
+
+    /// <inheritdoc />
+    public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
+        => InvokeAsync<IJSObjectReference>(WindowObjectId, identifier, JSCallType.ConstructorCall, cancellationToken, args);
+
+    /// <inheritdoc />
+    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier)
+        => InvokeAsync<TValue>(WindowObjectId, identifier, JSCallType.GetValue, null);
 
-    internal async ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(long targetInstanceId, string identifier, object?[]? args)
+    /// <inheritdoc />
+    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, CancellationToken cancellationToken)
+        => InvokeAsync<TValue>(WindowObjectId, identifier, JSCallType.GetValue, cancellationToken, null);
+
+    /// <inheritdoc />
+    public async ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value)
+        => await InvokeAsync<IJSVoidResult>(WindowObjectId, identifier, JSCallType.SetValue, [value]);
+
+    /// <inheritdoc />
+    public async ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+        => await InvokeAsync<IJSVoidResult>(WindowObjectId, identifier, JSCallType.SetValue, cancellationToken, [value]);
+
+    internal async ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(long targetInstanceId, string identifier, JSCallType callType, object?[]? args)
     {
         if (DefaultAsyncTimeout.HasValue)
         {
             using var cts = new CancellationTokenSource(DefaultAsyncTimeout.Value);
             // We need to await here due to the using
-            return await InvokeAsync<TValue>(targetInstanceId, identifier, cts.Token, args);
+            return await InvokeAsync<TValue>(targetInstanceId, identifier, callType, cts.Token, args);
         }
 
-        return await InvokeAsync<TValue>(targetInstanceId, identifier, CancellationToken.None, args);
+        return await InvokeAsync<TValue>(targetInstanceId, identifier, callType, CancellationToken.None, args);
     }
 
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "We expect application code is configured to ensure JS interop arguments are linker friendly.")]
     internal ValueTask<TValue> InvokeAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(
         long targetInstanceId,
         string identifier,
+        JSCallType callType,
         CancellationToken cancellationToken,
         object?[]? args)
     {
@@ -123,12 +150,19 @@ protected JSRuntime()
                 return new ValueTask<TValue>(tcs.Task);
             }
 
-            var argsJson = args is not null && args.Length != 0 ?
-                JsonSerializer.Serialize(args, JsonSerializerOptions) :
-                null;
+            var argsJson = args is not null && args.Length != 0 ? JsonSerializer.Serialize(args, JsonSerializerOptions) : "[]";
             var resultType = JSCallResultTypeHelper.FromGeneric<TValue>();
+            var invocationInfo = new JSInvocationInfo
+            {
+                AsyncHandle = taskId,
+                TargetInstanceId = targetInstanceId,
+                Identifier = identifier,
+                CallType = callType,
+                ResultType = resultType,
+                ArgsJson = argsJson,
+            };
 
-            BeginInvokeJS(taskId, identifier, argsJson, resultType, targetInstanceId);
+            BeginInvokeJS(invocationInfo);
 
             return new ValueTask<TValue>(tcs.Task);
         }
@@ -155,10 +189,11 @@ private void CleanupTasksAndRegistrations(long taskId)
     /// <param name="identifier">The identifier for the function to invoke.</param>
     /// <param name="argsJson">A JSON representation of the arguments.</param>
     protected virtual void BeginInvokeJS(long taskId, string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson)
-        => BeginInvokeJS(taskId, identifier, argsJson, JSCallResultType.Default, 0);
+        => BeginInvokeJS(taskId, identifier, argsJson, JSCallResultType.Default, WindowObjectId);
 
     /// <summary>
-    /// Begins an asynchronous function invocation.
+    /// Begins an asynchronous function invocation with the call type <see cref="JSCallType.FunctionCall"/>.
+    /// For more configuration options, use the overload <see cref="BeginInvokeJS(in JSInvocationInfo)" />.
     /// </summary>
     /// <param name="taskId">The identifier for the function invocation, or zero if no async callback is required.</param>
     /// <param name="identifier">The identifier for the function to invoke.</param>
@@ -167,6 +202,15 @@ protected virtual void BeginInvokeJS(long taskId, string identifier, [StringSynt
     /// <param name="targetInstanceId">The instance ID of the target JS object.</param>
     protected abstract void BeginInvokeJS(long taskId, string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId);
 
+    /// <summary>
+    /// Begins an asynchronous function invocation.
+    /// </summary>
+    /// <param name="invocationInfo">Configuration of the interop call from .NET to JavaScript.</param>
+    protected virtual void BeginInvokeJS(in JSInvocationInfo invocationInfo)
+    {
+        BeginInvokeJS(invocationInfo.AsyncHandle, invocationInfo.Identifier, invocationInfo.ArgsJson, invocationInfo.ResultType, invocationInfo.TargetInstanceId);
+    }
+
     /// <summary>
     /// Completes an async JS interop call from JavaScript to .NET
     /// </summary>
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSRuntimeExtensions.cs b/src/JSInterop/Microsoft.JSInterop/src/JSRuntimeExtensions.cs
index 5a4202ed15da..8a8cf34313ac 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/JSRuntimeExtensions.cs
+++ b/src/JSInterop/Microsoft.JSInterop/src/JSRuntimeExtensions.cs
@@ -117,4 +117,91 @@ public static async ValueTask InvokeVoidAsync(this IJSRuntime jsRuntime, string
 
         await jsRuntime.InvokeAsync<IJSVoidResult>(identifier, cancellationToken, args);
     }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSRuntime jsRuntime, string identifier, params object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        return jsRuntime.InvokeConstructorAsync(identifier, args);
+    }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSRuntime jsRuntime, string identifier, CancellationToken cancellationToken, object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        return jsRuntime.InvokeConstructorAsync(identifier, cancellationToken, args);
+    }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>window.someScope.SomeClass</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSRuntime jsRuntime, string identifier, TimeSpan timeout, object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsRuntime.InvokeConstructorAsync(identifier, cancellationToken, args);
+    }
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    public static ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSRuntime jsRuntime, string identifier, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsRuntime.GetValueAsync<TValue>(identifier, cancellationToken);
+    }
+
+        /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    public static ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSRuntime jsRuntime, string identifier, TValue value, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsRuntime.SetValueAsync<TValue>(identifier, value, cancellationToken);
+    }
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Shipped.txt b/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Shipped.txt
index 526b0d8f43d8..fb198e235585 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Shipped.txt
+++ b/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Shipped.txt
@@ -24,16 +24,6 @@ Microsoft.JSInterop.IJSRuntime.InvokeAsync<TValue>(string! identifier, System.Th
 Microsoft.JSInterop.IJSStreamReference
 Microsoft.JSInterop.IJSStreamReference.Length.get -> long
 Microsoft.JSInterop.IJSStreamReference.OpenReadStreamAsync(long maxAllowedSize = 512000, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<System.IO.Stream!>
-Microsoft.JSInterop.IJSUnmarshalledObjectReference
-Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<T0, T1, T2, TResult>(string! identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<T0, T1, TResult>(string! identifier, T0 arg0, T1 arg1) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<T0, TResult>(string! identifier, T0 arg0) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<TResult>(string! identifier) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledRuntime
-Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string! identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, T1, TResult>(string! identifier, T0 arg0, T1 arg1) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, TResult>(string! identifier, T0 arg0) -> TResult
-Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<TResult>(string! identifier) -> TResult
 Microsoft.JSInterop.Implementation.JSInProcessObjectReference
 Microsoft.JSInterop.Implementation.JSInProcessObjectReference.Dispose() -> void
 Microsoft.JSInterop.Implementation.JSInProcessObjectReference.Invoke<TValue>(string! identifier, params object?[]? args) -> TValue
diff --git a/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt b/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt
index 3759e9ad0478..cbcf93893832 100644
--- a/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt
+++ b/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt
@@ -1,11 +1,68 @@
 #nullable enable
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledObjectReference
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<T0, T1, T2, TResult>(string! identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<T0, T1, TResult>(string! identifier, T0 arg0, T1 arg1) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<T0, TResult>(string! identifier, T0 arg0) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledObjectReference.InvokeUnmarshalled<TResult>(string! identifier) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledRuntime
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string! identifier, T0 arg0, T1 arg1, T2 arg2) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, T1, TResult>(string! identifier, T0 arg0, T1 arg1) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, TResult>(string! identifier, T0 arg0) -> TResult
-*REMOVED*Microsoft.JSInterop.IJSUnmarshalledRuntime.InvokeUnmarshalled<TResult>(string! identifier) -> TResult
+Microsoft.JSInterop.IJSInProcessObjectReference.GetValue<TValue>(string! identifier) -> TValue
+Microsoft.JSInterop.IJSInProcessObjectReference.InvokeConstructor(string! identifier, object?[]? args) -> Microsoft.JSInterop.IJSInProcessObjectReference!
+Microsoft.JSInterop.IJSInProcessObjectReference.SetValue<TValue>(string! identifier, TValue value) -> void
+Microsoft.JSInterop.IJSInProcessRuntime.GetValue<TValue>(string! identifier) -> TValue
+Microsoft.JSInterop.IJSInProcessRuntime.InvokeConstructor(string! identifier, params object?[]? args) -> Microsoft.JSInterop.IJSInProcessObjectReference!
+Microsoft.JSInterop.IJSInProcessRuntime.SetValue<TValue>(string! identifier, TValue value) -> void
+Microsoft.JSInterop.IJSObjectReference.GetValueAsync<TValue>(string! identifier) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.IJSObjectReference.GetValueAsync<TValue>(string! identifier, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.IJSObjectReference.InvokeConstructorAsync(string! identifier, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.IJSObjectReference.InvokeConstructorAsync(string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.IJSObjectReference.SetValueAsync<TValue>(string! identifier, TValue value) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.IJSObjectReference.SetValueAsync<TValue>(string! identifier, TValue value, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.IJSRuntime.GetValueAsync<TValue>(string! identifier) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.IJSRuntime.GetValueAsync<TValue>(string! identifier, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.IJSRuntime.InvokeConstructorAsync(string! identifier, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.IJSRuntime.InvokeConstructorAsync(string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.IJSRuntime.SetValueAsync<TValue>(string! identifier, TValue value) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.IJSRuntime.SetValueAsync<TValue>(string! identifier, TValue value, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.Implementation.JSInProcessObjectReference.GetValue<TValue>(string! identifier) -> TValue
+Microsoft.JSInterop.Implementation.JSInProcessObjectReference.InvokeConstructor(string! identifier, object?[]? args) -> Microsoft.JSInterop.IJSInProcessObjectReference!
+Microsoft.JSInterop.Implementation.JSInProcessObjectReference.SetValue<TValue>(string! identifier, TValue value) -> void
+Microsoft.JSInterop.Implementation.JSObjectReference.GetValueAsync<TValue>(string! identifier) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.Implementation.JSObjectReference.GetValueAsync<TValue>(string! identifier, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.Implementation.JSObjectReference.InvokeConstructorAsync(string! identifier, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.Implementation.JSObjectReference.InvokeConstructorAsync(string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.Implementation.JSObjectReference.SetValueAsync<TValue>(string! identifier, TValue value) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.Implementation.JSObjectReference.SetValueAsync<TValue>(string! identifier, TValue value, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.Infrastructure.JSCallType
+Microsoft.JSInterop.Infrastructure.JSCallType.FunctionCall = 1 -> Microsoft.JSInterop.Infrastructure.JSCallType
+Microsoft.JSInterop.Infrastructure.JSCallType.GetValue = 3 -> Microsoft.JSInterop.Infrastructure.JSCallType
+Microsoft.JSInterop.Infrastructure.JSCallType.ConstructorCall = 2 -> Microsoft.JSInterop.Infrastructure.JSCallType
+Microsoft.JSInterop.Infrastructure.JSCallType.SetValue = 4 -> Microsoft.JSInterop.Infrastructure.JSCallType
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.ArgsJson.get -> string!
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.ArgsJson.init -> void
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.AsyncHandle.get -> long
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.AsyncHandle.init -> void
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.CallType.get -> Microsoft.JSInterop.Infrastructure.JSCallType
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.CallType.init -> void
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.Identifier.get -> string!
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.Identifier.init -> void
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.JSInvocationInfo() -> void
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.ResultType.get -> Microsoft.JSInterop.JSCallResultType
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.ResultType.init -> void
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.TargetInstanceId.get -> long
+Microsoft.JSInterop.Infrastructure.JSInvocationInfo.TargetInstanceId.init -> void
+Microsoft.JSInterop.JSInProcessRuntime.GetValue<TValue>(string! identifier) -> TValue
+Microsoft.JSInterop.JSInProcessRuntime.InvokeConstructor(string! identifier, params object?[]? args) -> Microsoft.JSInterop.IJSInProcessObjectReference!
+Microsoft.JSInterop.JSInProcessRuntime.SetValue<TValue>(string! identifier, TValue value) -> void
+Microsoft.JSInterop.JSRuntime.GetValueAsync<TValue>(string! identifier) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.JSRuntime.GetValueAsync<TValue>(string! identifier, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<TValue>
+Microsoft.JSInterop.JSRuntime.InvokeConstructorAsync(string! identifier, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.JSRuntime.InvokeConstructorAsync(string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+Microsoft.JSInterop.JSRuntime.SetValueAsync<TValue>(string! identifier, TValue value) -> System.Threading.Tasks.ValueTask
+Microsoft.JSInterop.JSRuntime.SetValueAsync<TValue>(string! identifier, TValue value, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, params object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.TimeSpan timeout, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.GetValueAsync<TValue>(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask<TValue>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.SetValueAsync<TValue>(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, TValue value, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask
+static Microsoft.JSInterop.JSRuntimeExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, params object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSRuntimeExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSRuntimeExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.TimeSpan timeout, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSRuntimeExtensions.GetValueAsync<TValue>(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask<TValue>
+static Microsoft.JSInterop.JSRuntimeExtensions.SetValueAsync<TValue>(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, TValue value, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask
+virtual Microsoft.JSInterop.JSInProcessRuntime.InvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> string?
+virtual Microsoft.JSInterop.JSRuntime.BeginInvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> void
diff --git a/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/DotNetDispatcherTest.cs b/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/DotNetDispatcherTest.cs
index 3c52d6a359e5..35233afd497d 100644
--- a/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/DotNetDispatcherTest.cs
+++ b/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/DotNetDispatcherTest.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable disable
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using Microsoft.AspNetCore.InternalTesting;
 
@@ -273,7 +274,9 @@ public void EndInvokeJS_WithSuccessValue()
 
         // Assert
         Assert.True(task.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         var result = task.Result;
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(testDTO.StringVal, result.StringVal);
         Assert.Equal(testDTO.IntVal, result.IntVal);
     }
@@ -407,7 +410,9 @@ public void EndInvokeJS_Works()
 
         // Assert
         Assert.True(task.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(7, task.Result.IntVal);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
@@ -419,7 +424,9 @@ public void EndInvokeJS_WithArrayValue()
         DotNetDispatcher.EndInvokeJS(jsRuntime, $"[{jsRuntime.LastInvocationAsyncHandle}, true, [1, 2, 3]]");
 
         Assert.True(task.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(new[] { 1, 2, 3 }, task.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
@@ -431,7 +438,9 @@ public void EndInvokeJS_WithNullValue()
         DotNetDispatcher.EndInvokeJS(jsRuntime, $"[{jsRuntime.LastInvocationAsyncHandle}, true, null]");
 
         Assert.True(task.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.Null(task.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
@@ -488,6 +497,42 @@ public void CanInvokeMethodsThatAcceptGenericParametersOnGenericTypes()
         Assert.Equal("\"hello world\"", resultJson);
     }
 
+    
+    [Fact]
+    public void CanInvokeMethodsWithMultipleIdentifiers() {
+        var jsRuntime = new TestJSRuntime();
+        var targetInstance = new MultipleJSInvokableAttributes();
+        jsRuntime.Invoke<object>("_setup",
+            DotNetObjectReference.Create(targetInstance));
+        var argsJson = "[\"hello Alias\"]";
+
+        // Act
+        var resultJson = DotNetDispatcher.Invoke(jsRuntime, new DotNetInvocationInfo(null, "MultipleJSInvokableAttributesInstance", 1, default), argsJson);
+        var resultJson2 = DotNetDispatcher.Invoke(jsRuntime, new DotNetInvocationInfo(null, "Alias", 1, default), argsJson);
+
+        // Assert
+        Assert.Equal("\"hello Alias\"", resultJson);
+        Assert.Equal("\"hello Alias\"", resultJson2);
+    }
+    [Fact]
+    public void CanInvokeMethodsWithMultipleIdentifiers_Static()
+    {
+        // Arrange/Act
+        var jsRuntime = new TestJSRuntime();
+        var resultJson = DotNetDispatcher.Invoke(jsRuntime, new DotNetInvocationInfo(thisAssemblyName, "InvocableStaticNonVoidAlias1", default, default), null);
+        var result = JsonSerializer.Deserialize<TestDTO>(resultJson, jsRuntime.JsonSerializerOptions);
+
+        var resultJson2 = DotNetDispatcher.Invoke(jsRuntime, new DotNetInvocationInfo(thisAssemblyName, "InvocableStaticNonVoidAlias2", default, default), null);
+        var result2 = JsonSerializer.Deserialize<TestDTO>(resultJson2, jsRuntime.JsonSerializerOptions);
+
+        // Assert
+        Assert.Equal("Test", result.StringVal);
+        Assert.Equal(456, result.IntVal);
+
+        Assert.Equal("Test", result2.StringVal);
+        Assert.Equal(456, result2.IntVal);
+    }
+
     [Fact]
     public void CannotInvokeStaticOpenGenericMethods()
     {
@@ -866,6 +911,10 @@ public static void MyInvocableVoid()
         public static object MyInvocableNonVoid()
             => new TestDTO { StringVal = "Test", IntVal = 123 };
 
+        [JSInvokable("InvocableStaticNonVoidAlias1"), JSInvokable("InvocableStaticNonVoidAlias2")]
+        public static object MyInvocableNonVoidWithAlias()
+            => new TestDTO { StringVal = "Test", IntVal = 456 };
+
         [JSInvokable("InvocableStaticWithParams")]
         public static object[] MyInvocableWithParams(TestDTO dtoViaJson, int[] incrementAmounts, DotNetObjectReference<TestDTO> dtoByRef)
             => new object[]
@@ -1009,12 +1058,17 @@ public class GenericType<TValue>
         [JSInvokable] public TValue EchoParameter(TValue input) => input;
     }
 
+    public class MultipleJSInvokableAttributes
+    {
+        [JSInvokable, JSInvokable("Alias")] public string MultipleJSInvokableAttributesInstance(string input) => input;
+    }
+
     public class GenericMethodClass
     {
         [JSInvokable("StaticGenericMethod")] public static string StaticGenericMethod<TValue>(TValue input) => input.ToString();
         [JSInvokable("InstanceGenericMethod")] public string GenericMethod<TValue>(TValue input) => input.ToString();
     }
-
+   
     public class TestJSRuntime : JSInProcessRuntime
     {
         private TaskCompletionSource _nextInvocationTcs = new TaskCompletionSource();
@@ -1026,25 +1080,35 @@ public class TestJSRuntime : JSInProcessRuntime
         public string LastCompletionCallId { get; private set; }
         public DotNetInvocationResult LastCompletionResult { get; private set; }
 
-        protected override void BeginInvokeJS(long asyncHandle, string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
         {
-            LastInvocationAsyncHandle = asyncHandle;
-            LastInvocationIdentifier = identifier;
-            LastInvocationArgsJson = argsJson;
+            LastInvocationAsyncHandle = invocationInfo.AsyncHandle;
+            LastInvocationIdentifier = invocationInfo.Identifier;
+            LastInvocationArgsJson = invocationInfo.ArgsJson;
             _nextInvocationTcs.SetResult();
             _nextInvocationTcs = new TaskCompletionSource();
         }
 
-        protected override string InvokeJS(string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override string InvokeJS(in JSInvocationInfo invocationInfo)
         {
             LastInvocationAsyncHandle = default;
-            LastInvocationIdentifier = identifier;
-            LastInvocationArgsJson = argsJson;
+            LastInvocationIdentifier = invocationInfo.Identifier;
+            LastInvocationArgsJson = invocationInfo.ArgsJson;
             _nextInvocationTcs.SetResult();
             _nextInvocationTcs = new TaskCompletionSource();
             return null;
         }
 
+        protected override string InvokeJS(string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
             LastCompletionCallId = invocationInfo.CallId;
diff --git a/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/JSObjectReferenceJsonConverterTest.cs b/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/JSObjectReferenceJsonConverterTest.cs
index 63b5a889782a..383c06819317 100644
--- a/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/JSObjectReferenceJsonConverterTest.cs
+++ b/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/JSObjectReferenceJsonConverterTest.cs
@@ -87,4 +87,17 @@ public void Write_WritesValidJson()
         // Assert
         Assert.Equal($"{{\"__jsObjectId\":{jsObjectRef.Id}}}", json);
     }
+
+    [Fact]
+    public void Read_ReturnsNull_WhenJSObjectIdIsMinusOne()
+    {
+        // Arrange
+        var json = "{\"__jsObjectId\":-1}";
+
+        // Act
+        var deserialized = JsonSerializer.Deserialize<IJSObjectReference>(json, JsonSerializerOptions);
+
+        // Assert
+        Assert.Null(deserialized);
+    }
 }
diff --git a/src/JSInterop/Microsoft.JSInterop/test/JSInProcessRuntimeTest.cs b/src/JSInterop/Microsoft.JSInterop/test/JSInProcessRuntimeTest.cs
index 5ad8aaa94159..f879c6ff528e 100644
--- a/src/JSInterop/Microsoft.JSInterop/test/JSInProcessRuntimeTest.cs
+++ b/src/JSInterop/Microsoft.JSInterop/test/JSInProcessRuntimeTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.JSInterop;
@@ -91,23 +92,25 @@ class TestDTO
 
     class TestJSInProcessRuntime : JSInProcessRuntime
     {
-        public List<InvokeArgs> InvokeCalls { get; set; } = new List<InvokeArgs>();
+        public List<JSInvocationInfo> InvokeCalls { get; set; } = [];
 
         public string? NextResultJson { get; set; }
 
         protected override string? InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
         {
-            InvokeCalls.Add(new InvokeArgs { Identifier = identifier, ArgsJson = argsJson });
-            return NextResultJson;
+            throw new NotImplementedException();
         }
 
-        public class InvokeArgs
+        protected override string? InvokeJS(in JSInvocationInfo invocationInfo)
         {
-            public string? Identifier { get; set; }
-            public string? ArgsJson { get; set; }
+            InvokeCalls.Add(invocationInfo);
+            return NextResultJson;
         }
 
-        protected override void BeginInvokeJS(long asyncHandle, string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+            => throw new NotImplementedException("This test only covers sync calls");
+
+        protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
             => throw new NotImplementedException("This test only covers sync calls");
 
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
diff --git a/src/JSInterop/Microsoft.JSInterop/test/JSObjectReferenceTest.cs b/src/JSInterop/Microsoft.JSInterop/test/JSObjectReferenceTest.cs
index 909f3f0ddb28..2864c7fcc327 100644
--- a/src/JSInterop/Microsoft.JSInterop/test/JSObjectReferenceTest.cs
+++ b/src/JSInterop/Microsoft.JSInterop/test/JSObjectReferenceTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop.Implementation;
 using Microsoft.JSInterop.Infrastructure;
 
@@ -69,11 +70,16 @@ class TestJSRuntime : JSRuntime
     {
         public int BeginInvokeJSInvocationCount { get; private set; }
 
-        protected override void BeginInvokeJS(long taskId, string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
         {
             BeginInvokeJSInvocationCount++;
         }
 
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
         }
@@ -83,17 +89,27 @@ class TestJSInProcessRuntime : JSInProcessRuntime
     {
         public int InvokeJSInvocationCount { get; private set; }
 
-        protected override void BeginInvokeJS(long taskId, string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
         {
         }
 
-        protected override string? InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override string? InvokeJS(in JSInvocationInfo invocationInfo)
         {
             InvokeJSInvocationCount++;
 
             return null;
         }
 
+        protected override string? InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
         }
diff --git a/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeTest.cs b/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeTest.cs
index 8e4731131d85..65ce56f65ac9 100644
--- a/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeTest.cs
+++ b/src/JSInterop/Microsoft.JSInterop/test/JSRuntimeTest.cs
@@ -121,7 +121,9 @@ public void CanCompleteAsyncCallsAsSuccess()
             ref reader);
         Assert.False(unrelatedTask.IsCompleted);
         Assert.True(task.IsCompleted);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal("my result", task.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
@@ -140,7 +142,9 @@ public void CanCompleteAsyncCallsWithComplexType()
             /* succeeded: */ true,
             ref reader);
         Assert.True(task.IsCompleted);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         var poco = task.Result;
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Debug.Assert(poco != null);
         Assert.Equal(10, poco.Id);
         Assert.Equal("Test", poco.Name);
@@ -163,7 +167,9 @@ public void CanCompleteAsyncCallsWithComplexTypeUsingPropertyCasing()
             /* succeeded: */ true,
             ref reader);
         Assert.True(task.IsCompleted);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         var poco = task.Result;
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Debug.Assert(poco != null);
         Assert.Equal(10, poco.Id);
         Assert.Equal("Test", poco.Name);
@@ -405,7 +411,7 @@ public void BeginTransmittingStream_MultipleStreams()
     }
 
     [Fact]
-    public async void ReadJSDataAsStreamAsync_ThrowsNotSupportedException()
+    public async Task ReadJSDataAsStreamAsync_ThrowsNotSupportedException()
     {
         // Arrange
         var runtime = new TestJSRuntime();
@@ -439,8 +445,8 @@ private class TestPoco
 
     class TestJSRuntime : JSRuntime
     {
-        public List<BeginInvokeAsyncArgs> BeginInvokeCalls = new List<BeginInvokeAsyncArgs>();
-        public List<EndInvokeDotNetArgs> EndInvokeDotNetCalls = new List<EndInvokeDotNetArgs>();
+        public List<JSInvocationInfo> BeginInvokeCalls = [];
+        public List<EndInvokeDotNetArgs> EndInvokeDotNetCalls = [];
 
         public TimeSpan? DefaultTimeout
         {
@@ -450,13 +456,6 @@ public TimeSpan? DefaultTimeout
             }
         }
 
-        public class BeginInvokeAsyncArgs
-        {
-            public long AsyncHandle { get; set; }
-            public string? Identifier { get; set; }
-            public string? ArgsJson { get; set; }
-        }
-
         public class EndInvokeDotNetArgs
         {
             public string? CallId { get; set; }
@@ -478,12 +477,12 @@ protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocation
 
         protected override void BeginInvokeJS(long asyncHandle, string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
         {
-            BeginInvokeCalls.Add(new BeginInvokeAsyncArgs
-            {
-                AsyncHandle = asyncHandle,
-                Identifier = identifier,
-                ArgsJson = argsJson,
-            });
+            throw new NotImplementedException();
+        }
+
+        protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
+        {
+            BeginInvokeCalls.Add(invocationInfo);
         }
 
         protected internal override Task TransmitStreamAsync(long streamId, DotNetStreamReference dotNetStreamReference)
diff --git a/src/JSInterop/Microsoft.JSInterop/test/TestJSRuntime.cs b/src/JSInterop/Microsoft.JSInterop/test/TestJSRuntime.cs
index accd66db1934..ffa182667c3b 100644
--- a/src/JSInterop/Microsoft.JSInterop/test/TestJSRuntime.cs
+++ b/src/JSInterop/Microsoft.JSInterop/test/TestJSRuntime.cs
@@ -1,13 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.JSInterop;
 
 internal class TestJSRuntime : JSRuntime
 {
-    protected override void BeginInvokeJS(long asyncHandle, string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+    protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+    {
+        throw new NotImplementedException();
+    }
+
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
         throw new NotImplementedException();
     }
diff --git a/src/Localization/Localization.slnf b/src/Localization/Localization.slnf
index 8ad3d3848027..44bc9860d77a 100644
--- a/src/Localization/Localization.slnf
+++ b/src/Localization/Localization.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Localization\\Abstractions\\src\\Microsoft.Extensions.Localization.Abstractions.csproj",
       "src\\Localization\\Localization\\src\\Microsoft.Extensions.Localization.csproj",
diff --git a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs
index 8f43ec03c5e6..0c8aef94ff39 100644
--- a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs
+++ b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs
@@ -52,15 +52,11 @@ private void AssertContainsSingle(
 
         if (matches.Length == 0)
         {
-            Assert.True(
-                false,
-                $"Could not find an instance of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Could not find an instance of {implementationType} registered as {serviceType}");
         }
         else if (matches.Length > 1)
         {
-            Assert.True(
-                false,
-                $"Found multiple instances of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Found multiple instances of {implementationType} registered as {serviceType}");
         }
     }
 }
diff --git a/src/Logging.AzureAppServices/Logging.AzureAppServices.slnf b/src/Logging.AzureAppServices/Logging.AzureAppServices.slnf
index 235c7d719daf..c4c948009327 100644
--- a/src/Logging.AzureAppServices/Logging.AzureAppServices.slnf
+++ b/src/Logging.AzureAppServices/Logging.AzureAppServices.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Logging.AzureAppServices\\src\\Microsoft.Extensions.Logging.AzureAppServices.csproj",
       "src\\Logging.AzureAppServices\\test\\Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj"
diff --git a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
index 8c75d85a4ff9..b69adf63522a 100644
--- a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
+++ b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
@@ -18,7 +18,7 @@
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Logging.Configuration" />
     <Reference Include="Microsoft.Extensions.Logging" />
-    <Reference Include="System.ValueTuple" />
+    <Reference Include="System.ValueTuple" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
diff --git a/src/Logging.AzureAppServices/src/PACKAGE.md b/src/Logging.AzureAppServices/src/PACKAGE.md
new file mode 100644
index 000000000000..aada333b3bb4
--- /dev/null
+++ b/src/Logging.AzureAppServices/src/PACKAGE.md
@@ -0,0 +1,55 @@
+## About
+
+`Microsoft.Extensions.Logging.AzureAppServices` provides a logger implementation that logs to text files in an Azure App Service app's file system and to blob storage in an Azure Storage account.
+
+## Key Features
+
+* Loging messages with the "Diagnostics Logger" and "Log Streaming" features of Azure App Service
+* Integration with Azure App Service logging infrastructure
+* Seamless integration with other components of `Microsoft.Extensions.Logging`
+
+## How to Use
+
+To use `Microsoft.Extensions.Logging.AzureAppServices`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.Extensions.Logging.AzureAppServices
+```
+
+### Configuration
+
+To configure provider settings, use `AzureFileLoggerOptions` and `AzureBlobLoggerOptions`, as shown in the following example:
+
+```csharp
+using Microsoft.Extensions.Logging.AzureAppServices;
+
+var builder = WebApplication.CreateBuilder();
+builder.Logging.AddAzureWebAppDiagnostics();
+builder.Services.Configure<AzureFileLoggerOptions>(options =>
+{
+    options.FileName = "azure-diagnostics-";
+    options.FileSizeLimit = 50 * 1024;
+    options.RetainedFileCountLimit = 5;
+});
+builder.Services.Configure<AzureBlobLoggerOptions>(options =>
+{
+    options.BlobName = "log.txt";
+});
+```
+
+## Main Types
+
+* `FileLoggerProvider`: A `BatchingLoggerProvider` which writes out to a file
+* `BlobLoggerProvider`: The `ILoggerProvider` implementation that stores messages by appending them to Azure Blob in batches
+* `AzureFileLoggerOptions`: Options for configuring Azure diagnostics file logging
+* `AzureBlobLoggerOptions`: Options for configuring Azure diagnostics blob logging
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/fundamentals/logging#azure-app-service) on logging with ASP.NEt Core and Azure App Service.
+
+## Feedback &amp; Contributing
+
+`Microsoft.Extensions.Logging.AzureAppServices` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Logging.AzureAppServices/test/WebConfigurationLevelSwitchTests.cs b/src/Logging.AzureAppServices/test/WebConfigurationLevelSwitchTests.cs
index 2b9349d12414..94a18ac51214 100644
--- a/src/Logging.AzureAppServices/test/WebConfigurationLevelSwitchTests.cs
+++ b/src/Logging.AzureAppServices/test/WebConfigurationLevelSwitchTests.cs
@@ -29,7 +29,7 @@ public void AddsRuleWithCorrectLevel(string levelValue, LogLevel expectedLevel)
         var filterConfiguration = new LoggerFilterOptions();
         levelSwitcher.Configure(filterConfiguration);
 
-        Assert.Equal(1, filterConfiguration.Rules.Count);
+        Assert.Single(filterConfiguration.Rules);
 
         var rule = filterConfiguration.Rules[0];
         Assert.Equal(typeof(TestFileLoggerProvider).FullName, rule.ProviderName);
diff --git a/src/Middleware/CORS/CORS.slnf b/src/Middleware/CORS/CORS.slnf
index 3beb9aa13edf..729430f380fe 100644
--- a/src/Middleware/CORS/CORS.slnf
+++ b/src/Middleware/CORS/CORS.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Middleware\\CORS\\src\\Microsoft.AspNetCore.Cors.csproj",
       "src\\Middleware\\CORS\\test\\UnitTests\\Microsoft.AspNetCore.Cors.Test.csproj",
diff --git a/src/Middleware/CORS/src/Infrastructure/IDisableCorsAttribute.cs b/src/Middleware/CORS/src/Infrastructure/IDisableCorsAttribute.cs
index fc0e5ee9fad1..bab016c6b54d 100644
--- a/src/Middleware/CORS/src/Infrastructure/IDisableCorsAttribute.cs
+++ b/src/Middleware/CORS/src/Infrastructure/IDisableCorsAttribute.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.AspNetCore.Cors.Infrastructure;
 
 /// <summary>
-/// An interface which can be used to identify a type which provides metdata to disable cors for a resource.
+/// An interface which can be used to identify a type which provides metadata to disable cors for a resource.
 /// </summary>
 public interface IDisableCorsAttribute : ICorsMetadata
 {
diff --git a/src/Middleware/CORS/src/PublicAPI.Shipped.txt b/src/Middleware/CORS/src/PublicAPI.Shipped.txt
index 8b3524c03289..2dcbbded8825 100644
--- a/src/Middleware/CORS/src/PublicAPI.Shipped.txt
+++ b/src/Middleware/CORS/src/PublicAPI.Shipped.txt
@@ -175,6 +175,8 @@ static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AccessCon
 static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AccessControlMaxAge -> string!
 static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AccessControlRequestHeaders -> string!
 static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AccessControlRequestMethod -> string!
+static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AnyHeader -> string!
+static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AnyMethod -> string!
 static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AnyOrigin -> string!
 static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.Origin -> string!
 static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.PreflightHttpMethod -> string!
diff --git a/src/Middleware/CORS/src/PublicAPI.Unshipped.txt b/src/Middleware/CORS/src/PublicAPI.Unshipped.txt
index 91f8b182bd09..7dc5c58110bf 100644
--- a/src/Middleware/CORS/src/PublicAPI.Unshipped.txt
+++ b/src/Middleware/CORS/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AnyHeader -> string!
-static readonly Microsoft.AspNetCore.Cors.Infrastructure.CorsConstants.AnyMethod -> string!
diff --git a/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf b/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf
index e59adc0c2cb1..7d62ecbf1aea 100644
--- a/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf
+++ b/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
diff --git a/src/Middleware/ConcurrencyLimiter/test/ConcurrencyLimiterEventSourceTests.cs b/src/Middleware/ConcurrencyLimiter/test/ConcurrencyLimiterEventSourceTests.cs
index b556899a79c5..61b5b99b9d87 100644
--- a/src/Middleware/ConcurrencyLimiter/test/ConcurrencyLimiterEventSourceTests.cs
+++ b/src/Middleware/ConcurrencyLimiter/test/ConcurrencyLimiterEventSourceTests.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics.Tracing;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.ConcurrencyLimiter.Tests;
 
@@ -55,7 +56,7 @@ public async Task TracksQueueLength()
 
         using var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
 
-        var lengthValues = eventListener.GetCounterValues("queue-length", timeoutTokenSource.Token).GetAsyncEnumerator();
+        var lengthValues = eventListener.GetCounterValues("queue-length", timeoutTokenSource.Token);
 
         eventListener.EnableEvents(eventSource, EventLevel.Informational, EventKeywords.None,
             new Dictionary<string, string>
@@ -66,20 +67,20 @@ public async Task TracksQueueLength()
         // Act
         eventSource.RequestRejected();
 
-        Assert.True(await UntilValueMatches(lengthValues, 0));
+        await WaitForCounterValue(lengthValues, expectedValue: 0, Logger);
         using (eventSource.QueueTimer())
         {
-            Assert.True(await UntilValueMatches(lengthValues, 1));
+            await WaitForCounterValue(lengthValues, expectedValue: 1, Logger);
 
             using (eventSource.QueueTimer())
             {
-                Assert.True(await UntilValueMatches(lengthValues, 2));
+                await WaitForCounterValue(lengthValues, expectedValue: 2, Logger);
             }
 
-            Assert.True(await UntilValueMatches(lengthValues, 1));
+            await WaitForCounterValue(lengthValues, expectedValue: 1, Logger);
         }
 
-        Assert.True(await UntilValueMatches(lengthValues, 0));
+        await WaitForCounterValue(lengthValues, expectedValue: 0, Logger);
     }
 
     [Fact]
@@ -96,7 +97,7 @@ public async Task TracksDurationSpentInQueue()
 
         using var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
 
-        var durationValues = eventListener.GetCounterValues("queue-duration", timeoutTokenSource.Token).GetAsyncEnumerator();
+        var durationValues = eventListener.GetCounterValues("queue-duration", timeoutTokenSource.Token);
 
         eventListener.EnableEvents(eventSource, EventLevel.Informational, EventKeywords.None,
             new Dictionary<string, string>
@@ -105,17 +106,17 @@ public async Task TracksDurationSpentInQueue()
             });
 
         // Act
-        Assert.True(await UntilValueMatches(durationValues, 0));
+        await WaitForCounterValue(durationValues, expectedValue: 0, Logger);
 
         using (eventSource.QueueTimer())
         {
-            Assert.True(await UntilValueMatches(durationValues, 0));
+            await WaitForCounterValue(durationValues, expectedValue: 0, Logger);
         }
 
         // check that something (anything!) has been written
-        while (await durationValues.MoveNextAsync())
+        while (await durationValues.Values.MoveNextAsync())
         {
-            if (durationValues.Current > 0)
+            if (durationValues.Values.Current > 0)
             {
                 return;
             }
@@ -124,17 +125,9 @@ public async Task TracksDurationSpentInQueue()
         throw new TimeoutException();
     }
 
-    private async Task<bool> UntilValueMatches(IAsyncEnumerator<double> enumerator, int value)
+    private static async Task WaitForCounterValue(CounterValues values, double expectedValue, ILogger logger)
     {
-        while (await enumerator.MoveNextAsync())
-        {
-            if (enumerator.Current == value)
-            {
-                return true;
-            }
-        }
-
-        return false;
+        await values.Values.WaitForValueAsync(expectedValue, values.CounterName, logger);
     }
 
     private static ConcurrencyLimiterEventSource GetConcurrencyLimiterEventSource()
diff --git a/src/Middleware/ConcurrencyLimiter/test/Microsoft.AspNetCore.ConcurrencyLimiter.Tests.csproj b/src/Middleware/ConcurrencyLimiter/test/Microsoft.AspNetCore.ConcurrencyLimiter.Tests.csproj
index 5bb19e39bebf..ad2734d58177 100644
--- a/src/Middleware/ConcurrencyLimiter/test/Microsoft.AspNetCore.ConcurrencyLimiter.Tests.csproj
+++ b/src/Middleware/ConcurrencyLimiter/test/Microsoft.AspNetCore.ConcurrencyLimiter.Tests.csproj
@@ -7,6 +7,7 @@
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)EventSource.Testing\TestCounterListener.cs" />
     <Compile Include="$(SharedSourceRoot)EventSource.Testing\TestEventListener.cs" />
+    <Compile Include="$(SharedSourceRoot)AsyncEnumerableExtensions.cs" LinkBase="shared" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Middleware/ConcurrencyLimiter/test/PolicyTests/QueuePolicyTests.cs b/src/Middleware/ConcurrencyLimiter/test/PolicyTests/QueuePolicyTests.cs
index f648eb3df01a..da34fdf83d64 100644
--- a/src/Middleware/ConcurrencyLimiter/test/PolicyTests/QueuePolicyTests.cs
+++ b/src/Middleware/ConcurrencyLimiter/test/PolicyTests/QueuePolicyTests.cs
@@ -40,6 +40,7 @@ public void DoesNotWaitIfQueueFull()
     {
         using var s = TestUtils.CreateQueuePolicy(2, 1);
 
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         var t1 = s.TryEnterAsync();
         Assert.True(t1.IsCompleted);
         Assert.True(t1.Result);
@@ -54,6 +55,7 @@ public void DoesNotWaitIfQueueFull()
         var t4 = s.TryEnterAsync();
         Assert.True(t4.IsCompleted);
         Assert.False(t4.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/PACKAGE.md b/src/Middleware/Diagnostics.EntityFrameworkCore/src/PACKAGE.md
new file mode 100644
index 000000000000..2f157658d2bc
--- /dev/null
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/PACKAGE.md
@@ -0,0 +1,42 @@
+## About
+
+`Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore` provides an ASP.NET Core middleware for EF Core error pages, allowing detection and diagnosis of errors with EF Core migrations.
+
+## Key Features
+
+* Captures and displays detailed error information from Entity Framework Core database operations
+* Helps developers diagnose and troubleshoot database-related issues in ASP.NET Core applications
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
+```
+
+### Configuration
+
+To use the middleware, add it to the ASP.NET Core pipeline defined in your app's `Program.cs`:
+
+```csharp
+builder.Services.AddDatabaseDeveloperPageExceptionFilter();
+
+var app = builder.build();
+
+if (app.Environment.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
+    app.UseMigrationsEndPoint();
+}
+```
+
+## Additional Documentation
+
+For more information on using Entity Framework Core in ASP.NET Core applications, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/data/ef-rp/intro).
+
+## Feedback & Contributing
+
+`Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseDeveloperPageExceptionFilterTests.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseDeveloperPageExceptionFilterTests.cs
index a418b9e84202..6f19dd90e1dc 100644
--- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseDeveloperPageExceptionFilterTests.cs
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/DatabaseDeveloperPageExceptionFilterTests.cs
@@ -58,7 +58,7 @@ await filter.HandleExceptionAsync(
             });
 
         Assert.True(nextFilterInvoked);
-        Assert.Equal(1, sink.Writes.Count);
+        Assert.Single(sink.Writes);
         var message = sink.Writes.Single();
         Assert.Equal(LogLevel.Error, message.LogLevel);
         Assert.Contains("An exception occurred while calculating the database error page content.", message.Message);
@@ -84,7 +84,7 @@ await filter.HandleExceptionAsync(
             });
 
         Assert.True(nextFilterInvoked);
-        Assert.Equal(1, sink.Writes.Count);
+        Assert.Single(sink.Writes);
         var message = sink.Writes.Single();
         Assert.Equal(LogLevel.Error, message.LogLevel);
         Assert.Contains("An exception occurred while calculating the database error page content.", message.Message);
diff --git a/src/Middleware/Diagnostics/Diagnostics.slnf b/src/Middleware/Diagnostics/Diagnostics.slnf
index 8ad36221d65b..aa65d51ec9ac 100644
--- a/src/Middleware/Diagnostics/Diagnostics.slnf
+++ b/src/Middleware/Diagnostics/Diagnostics.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddlewareImpl.cs b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddlewareImpl.cs
index 2f33111ccb3b..5d2589052eed 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddlewareImpl.cs
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddlewareImpl.cs
@@ -67,7 +67,7 @@ public DeveloperExceptionPageMiddlewareImpl(
         _exceptionHandler = DisplayException;
         _serializationContext = CreateSerializationContext(jsonOptions?.Value);
         _problemDetailsService = problemDetailsService;
-        foreach (var filter in filters.Reverse())
+        foreach (var filter in Enumerable.Reverse(filters))
         {
             var nextFilter = _exceptionHandler;
             _exceptionHandler = errorContext => filter.HandleExceptionAsync(errorContext, nextFilter);
@@ -228,8 +228,8 @@ private async Task DisplayExceptionContent(ErrorContext errorContext)
         if (_problemDetailsService == null || !await _problemDetailsService.TryWriteAsync(new()
             {
                 HttpContext = httpContext,
-                ProblemDetails = CreateProblemDetails(errorContext, httpContext), 
-                Exception = errorContext.Exception 
+                ProblemDetails = CreateProblemDetails(errorContext, httpContext),
+                Exception = errorContext.Exception
             }))
         {
             httpContext.Response.ContentType = "text/plain; charset=utf-8";
diff --git a/src/Middleware/Diagnostics/src/DiagnosticsTelemetry.cs b/src/Middleware/Diagnostics/src/DiagnosticsTelemetry.cs
index 36ab75c70ad2..62e29c93d032 100644
--- a/src/Middleware/Diagnostics/src/DiagnosticsTelemetry.cs
+++ b/src/Middleware/Diagnostics/src/DiagnosticsTelemetry.cs
@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Diagnostics;
diff --git a/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandledType.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandledType.cs
new file mode 100644
index 000000000000..c15ef9061aba
--- /dev/null
+++ b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandledType.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Diagnostics;
+
+/// <summary>
+/// The result of handling an exception with the <see cref="ExceptionHandlerMiddleware"/>.
+/// </summary>
+public enum ExceptionHandledType
+{
+    /// <summary>
+    /// Exception was unhandled.
+    /// </summary>
+    Unhandled,
+    /// <summary>
+    /// Exception was handled by an <see cref="Diagnostics.IExceptionHandler"/> service instance registered in the DI container.
+    /// </summary>
+    ExceptionHandlerService,
+    /// <summary>
+    /// Exception was handled by an <see cref="Http.IProblemDetailsService"/> instance registered in the DI container.
+    /// </summary>
+    ProblemDetailsService,
+    /// <summary>
+    /// Exception was handled by by <see cref="Builder.ExceptionHandlerOptions.ExceptionHandler"/>.
+    /// </summary>
+    ExceptionHandlerDelegate,
+    /// <summary>
+    /// Exception was handled by by <see cref="Builder.ExceptionHandlerOptions.ExceptionHandlingPath"/>.
+    /// </summary>
+    ExceptionHandlingPath
+}
diff --git a/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddlewareImpl.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddlewareImpl.cs
index c8361522d1ef..f6f5bed77f60 100644
--- a/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddlewareImpl.cs
+++ b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddlewareImpl.cs
@@ -127,13 +127,12 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
             return;
         }
 
-        DiagnosticsTelemetry.ReportUnhandledException(_logger, context, edi.SourceException);
-
         // We can't do anything if the response has already started, just abort.
         if (context.Response.HasStarted)
         {
             _logger.ResponseStartedErrorHandler();
 
+            DiagnosticsTelemetry.ReportUnhandledException(_logger, context, edi.SourceException);
             _metrics.RequestException(exceptionName, ExceptionResult.Skipped, handler: null);
             edi.Throw();
         }
@@ -168,52 +167,97 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
             context.Response.StatusCode = _options.StatusCodeSelector?.Invoke(edi.SourceException) ?? DefaultStatusCode;
             context.Response.OnStarting(_clearCacheHeadersDelegate, context.Response);
 
-            string? handler = null;
-            var handled = false;
+            string? handlerTag = null;
+            var result = ExceptionHandledType.Unhandled;
             foreach (var exceptionHandler in _exceptionHandlers)
             {
-                handled = await exceptionHandler.TryHandleAsync(context, edi.SourceException, context.RequestAborted);
-                if (handled)
+                if (await exceptionHandler.TryHandleAsync(context, edi.SourceException, context.RequestAborted))
                 {
-                    handler = exceptionHandler.GetType().FullName;
+                    result = ExceptionHandledType.ExceptionHandlerService;
+                    handlerTag = exceptionHandler.GetType().FullName;
                     break;
                 }
             }
 
-            if (!handled)
+            if (result == ExceptionHandledType.Unhandled)
             {
                 if (_options.ExceptionHandler is not null)
                 {
                     await _options.ExceptionHandler!(context);
+
+                    // If the response has started, assume exception handler was successful.
+                    if (context.Response.HasStarted)
+                    {
+                        if (_options.ExceptionHandlingPath.HasValue)
+                        {
+                            result = ExceptionHandledType.ExceptionHandlingPath;
+                            handlerTag = _options.ExceptionHandlingPath.Value;
+                        }
+                        else
+                        {
+                            result = ExceptionHandledType.ExceptionHandlerDelegate;
+                        }
+                    }
                 }
                 else
                 {
-                    handled = await _problemDetailsService!.TryWriteAsync(new()
+                    if (await _problemDetailsService!.TryWriteAsync(new()
                     {
                         HttpContext = context,
                         AdditionalMetadata = exceptionHandlerFeature.Endpoint?.Metadata,
                         ProblemDetails = { Status = context.Response.StatusCode },
                         Exception = edi.SourceException,
-                    });
-                    if (handled)
+                    }))
                     {
-                        handler = _problemDetailsService.GetType().FullName;
+                        result = ExceptionHandledType.ProblemDetailsService;
+                        handlerTag = _problemDetailsService.GetType().FullName;
                     }
                 }
             }
-            // If the response has already started, assume exception handler was successful.
-            if (context.Response.HasStarted || handled || _options.StatusCodeSelector != null || context.Response.StatusCode != StatusCodes.Status404NotFound || _options.AllowStatusCode404Response)
+
+            if (result != ExceptionHandledType.Unhandled || _options.StatusCodeSelector != null || context.Response.StatusCode != StatusCodes.Status404NotFound || _options.AllowStatusCode404Response)
             {
-                const string eventName = "Microsoft.AspNetCore.Diagnostics.HandledException";
-                if (_diagnosticListener.IsEnabled() && _diagnosticListener.IsEnabled(eventName))
+                var suppressDiagnostics = false;
+
+                // Customers may prefer to handle the exception and to do their own diagnostics.
+                // In that case, it can be undesirable for the middleware to log the exception at an error level.
+                // Run the configured callback to determine if exception diagnostics in the middleware should be suppressed.
+                if (_options.SuppressDiagnosticsCallback is { } suppressCallback)
+                {
+                    var suppressDiagnosticsContext = new ExceptionHandlerSuppressDiagnosticsContext
+                    {
+                        HttpContext = context,
+                        Exception = edi.SourceException,
+                        ExceptionHandledBy = result
+                    };
+                    suppressDiagnostics = suppressCallback(suppressDiagnosticsContext);
+                }
+                else
+                {
+                    // Default behavior is to suppress diagnostics if the exception was handled by an IExceptionHandler service instance.
+                    suppressDiagnostics = result == ExceptionHandledType.ExceptionHandlerService;
+                }
+
+                if (!suppressDiagnostics)
                 {
-                    WriteDiagnosticEvent(_diagnosticListener, eventName, new { httpContext = context, exception = edi.SourceException });
+                    // Note: Microsoft.AspNetCore.Diagnostics.HandledException is used by AppInsights to log errors.
+                    // The diagnostics event is run together with standard exception logging.
+                    const string eventName = "Microsoft.AspNetCore.Diagnostics.HandledException";
+                    if (_diagnosticListener.IsEnabled() && _diagnosticListener.IsEnabled(eventName))
+                    {
+                        WriteDiagnosticEvent(_diagnosticListener, eventName, new { httpContext = context, exception = edi.SourceException });
+                    }
+
+                    DiagnosticsTelemetry.ReportUnhandledException(_logger, context, edi.SourceException);
                 }
 
-                _metrics.RequestException(exceptionName, ExceptionResult.Handled, handler);
+                _metrics.RequestException(exceptionName, ExceptionResult.Handled, handlerTag);
                 return;
             }
 
+            // Exception is unhandled. Record diagnostics for the unhandled exception before it is wrapped.
+            DiagnosticsTelemetry.ReportUnhandledException(_logger, context, edi.SourceException);
+
             edi = ExceptionDispatchInfo.Capture(new InvalidOperationException($"The exception handler configured on {nameof(ExceptionHandlerOptions)} produced a 404 status response. " +
                 $"This {nameof(InvalidOperationException)} containing the original exception was thrown since this is often due to a misconfigured {nameof(ExceptionHandlerOptions.ExceptionHandlingPath)}. " +
                 $"If the exception handler is expected to return 404 status responses then set {nameof(ExceptionHandlerOptions.AllowStatusCode404Response)} to true.", edi.SourceException));
@@ -222,6 +266,9 @@ private async Task HandleException(HttpContext context, ExceptionDispatchInfo ed
         {
             // Suppress secondary exceptions, re-throw the original.
             _logger.ErrorHandlerException(ex2);
+
+            // There was an error handling the exception. Log original unhandled exception.
+            DiagnosticsTelemetry.ReportUnhandledException(_logger, context, edi.SourceException);
         }
         finally
         {
diff --git a/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerOptions.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerOptions.cs
index f345e19e8514..a38352d93715 100644
--- a/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerOptions.cs
+++ b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerOptions.cs
@@ -1,8 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.Tracing;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -40,10 +42,38 @@ public class ExceptionHandlerOptions
     public bool AllowStatusCode404Response { get; set; }
 
     /// <summary>
-    /// Gets or sets a delegate used to map an exception to a http status code.
+    /// Gets or sets a delegate used to map an exception to an HTTP status code.
     /// </summary>
     /// <remarks>
     /// If <see cref="StatusCodeSelector"/> is <c>null</c>, the default exception status code 500 is used.
     /// </remarks>
     public Func<Exception, int>? StatusCodeSelector { get; set; }
+
+    /// <summary>
+    /// Gets or sets a callback that can return <see langword="true" /> to suppress diagnostics in <see cref="ExceptionHandlerMiddleware" />.
+    /// <para>
+    /// If <see cref="SuppressDiagnosticsCallback"/> is <c>null</c>, the default behavior is to suppress diagnostics if the exception was handled by
+    /// an <see cref="IExceptionHandler"/> service instance registered in the DI container.
+    /// To always record diagnostics for handled exceptions, set a callback that returns <see langword="false" />.
+    /// </para>
+    /// <para>
+    /// This callback is only run if the exception was handled by the middleware.
+    /// Unhandled exceptions and exceptions thrown after the response has started are always logged.
+    /// </para>
+    /// <para>
+    /// Suppressed diagnostics include:
+    /// </para>
+    /// <list type="bullet">
+    ///   <item>
+    ///     <description>Logging <c>UnhandledException</c> to <see cref="ILogger"/>.</description>
+    ///   </item>
+    ///   <item>
+    ///     <description>Writing the <c>Microsoft.AspNetCore.Diagnostics.HandledException</c> event to <see cref="EventSource" />.</description>
+    ///   </item>
+    ///   <item>
+    ///     <description>Adding the <c>error.type</c> tag to the <c>http.server.request.duration</c> metric.</description>
+    ///   </item>
+    /// </list>
+    /// </summary>
+    public Func<ExceptionHandlerSuppressDiagnosticsContext, bool>? SuppressDiagnosticsCallback { get; set; }
 }
diff --git a/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerSuppressDiagnosticsContext.cs b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerSuppressDiagnosticsContext.cs
new file mode 100644
index 000000000000..2a02bc5f4986
--- /dev/null
+++ b/src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerSuppressDiagnosticsContext.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Diagnostics;
+
+/// <summary>
+/// The context used to determine whether <see cref="ExceptionHandlerMiddleware"/> should record diagnostics for an exception.
+/// </summary>
+public sealed class ExceptionHandlerSuppressDiagnosticsContext
+{
+    /// <summary>
+    /// Gets the <see cref="Http.HttpContext"/> of the current request.
+    /// </summary>
+    public required HttpContext HttpContext { get; init; }
+
+    /// <summary>
+    /// Gets the <see cref="System.Exception"/> that the exception handler middleware is processing.
+    /// </summary>
+    public required Exception Exception { get; init; }
+
+    /// <summary>
+    /// Gets the result of exception handling by <see cref="ExceptionHandlerMiddleware"/>.
+    /// </summary>
+    public required ExceptionHandledType ExceptionHandledBy { get; init; }
+}
diff --git a/src/Middleware/Diagnostics/src/PublicAPI.Shipped.txt b/src/Middleware/Diagnostics/src/PublicAPI.Shipped.txt
index 48f720a53c80..3201cd61f75c 100644
--- a/src/Middleware/Diagnostics/src/PublicAPI.Shipped.txt
+++ b/src/Middleware/Diagnostics/src/PublicAPI.Shipped.txt
@@ -17,6 +17,8 @@ Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.ExceptionHandler.set -> voi
 Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.ExceptionHandlerOptions() -> void
 Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.ExceptionHandlingPath.get -> Microsoft.AspNetCore.Http.PathString
 Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.ExceptionHandlingPath.set -> void
+Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.StatusCodeSelector.get -> System.Func<System.Exception!, int>?
+Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.StatusCodeSelector.set -> void
 Microsoft.AspNetCore.Builder.StatusCodePagesExtensions
 Microsoft.AspNetCore.Builder.StatusCodePagesOptions
 Microsoft.AspNetCore.Builder.StatusCodePagesOptions.HandleAsync.get -> System.Func<Microsoft.AspNetCore.Diagnostics.StatusCodeContext!, System.Threading.Tasks.Task!>!
diff --git a/src/Middleware/Diagnostics/src/PublicAPI.Unshipped.txt b/src/Middleware/Diagnostics/src/PublicAPI.Unshipped.txt
index c47812f983e8..c18db3d5eee7 100644
--- a/src/Middleware/Diagnostics/src/PublicAPI.Unshipped.txt
+++ b/src/Middleware/Diagnostics/src/PublicAPI.Unshipped.txt
@@ -1,3 +1,22 @@
 #nullable enable
-Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.StatusCodeSelector.get -> System.Func<System.Exception!, int>?
-Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.StatusCodeSelector.set -> void
+Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.SuppressDiagnosticsCallback.get -> System.Func<Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext!, bool>?
+Microsoft.AspNetCore.Builder.ExceptionHandlerOptions.SuppressDiagnosticsCallback.set -> void
+Microsoft.AspNetCore.Builder.StatusCodePagesOptions.CreateScopeForStatusCodePages.get -> bool
+Microsoft.AspNetCore.Builder.StatusCodePagesOptions.CreateScopeForStatusCodePages.set -> void
+Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandledType.ExceptionHandlerDelegate = 3 -> Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandledType.ExceptionHandlerService = 1 -> Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandledType.ExceptionHandlingPath = 4 -> Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandledType.ProblemDetailsService = 2 -> Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandledType.Unhandled = 0 -> Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.Exception.get -> System.Exception!
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.Exception.init -> void
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.ExceptionHandledBy.get -> Microsoft.AspNetCore.Diagnostics.ExceptionHandledType
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.ExceptionHandledBy.init -> void
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.ExceptionHandlerSuppressDiagnosticsContext() -> void
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.HttpContext.get -> Microsoft.AspNetCore.Http.HttpContext!
+Microsoft.AspNetCore.Diagnostics.ExceptionHandlerSuppressDiagnosticsContext.HttpContext.init -> void
+static Microsoft.AspNetCore.Builder.StatusCodePagesExtensions.UseStatusCodePagesWithReExecute(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app, string! pathFormat, string? queryFormat = null, bool createScopeForStatusCodePages = false) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
+*REMOVED*static Microsoft.AspNetCore.Builder.StatusCodePagesExtensions.UseStatusCodePagesWithReExecute(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app, string! pathFormat, string? queryFormat = null) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
+static Microsoft.AspNetCore.Builder.StatusCodePagesExtensions.UseStatusCodePagesWithReExecute(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app, string! pathFormat, string! queryFormat) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
\ No newline at end of file
diff --git a/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs
index a431f35582f8..b6d760efcdd4 100644
--- a/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs
+++ b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs
@@ -1,11 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Builder;
@@ -142,7 +144,7 @@ public static IApplicationBuilder UseStatusCodePages(this IApplicationBuilder ap
     public static IApplicationBuilder UseStatusCodePagesWithReExecute(
         this IApplicationBuilder app,
         string pathFormat,
-        string? queryFormat = null)
+        string queryFormat)
     {
         ArgumentNullException.ThrowIfNull(app);
 
@@ -160,6 +162,50 @@ public static IApplicationBuilder UseStatusCodePagesWithReExecute(
         return app.UseStatusCodePages(CreateHandler(pathFormat, queryFormat));
     }
 
+    /// <summary>
+    /// Adds a StatusCodePages middleware to the pipeline. Specifies that the response body should be generated by
+    /// re-executing the request pipeline using an alternate path. This path may contain a '{0}' placeholder of the status code.
+    /// </summary>
+    /// <param name="app"></param>
+    /// <param name="pathFormat"></param>
+    /// <param name="queryFormat"></param>
+    /// <param name="createScopeForStatusCodePages">Whether or not to create a new <see cref="IServiceProvider"/> scope.</param>
+    /// <returns></returns>
+    [SuppressMessage("ApiDesign", "RS0026:Do not add multiple overloads with optional parameters", Justification = "Required to maintain compatibility")]
+    public static IApplicationBuilder UseStatusCodePagesWithReExecute(
+        this IApplicationBuilder app,
+        string pathFormat,
+        string? queryFormat = null,
+        bool createScopeForStatusCodePages = false)
+    {
+        ArgumentNullException.ThrowIfNull(app);
+
+        // Only use this path if there's a global router (in the 'WebApplication' case).
+        if (app.Properties.TryGetValue(RerouteHelper.GlobalRouteBuilderKey, out var routeBuilder) && routeBuilder is not null)
+        {
+            return app.Use(next =>
+            {
+                var newNext = RerouteHelper.Reroute(app, routeBuilder, next);
+                return new StatusCodePagesMiddleware(next,
+                    Options.Create(new StatusCodePagesOptions()
+                    {
+                        HandleAsync = CreateHandler(pathFormat, queryFormat, newNext),
+                        CreateScopeForStatusCodePages = createScopeForStatusCodePages,
+                        PathFormat = pathFormat
+                    })).Invoke;
+            });
+        }
+
+        var options = new StatusCodePagesOptions
+        {
+            HandleAsync = CreateHandler(pathFormat, queryFormat),
+            CreateScopeForStatusCodePages = createScopeForStatusCodePages,
+            PathFormat = pathFormat
+        };
+        var wrappedOptions = new OptionsWrapper<StatusCodePagesOptions>(options);
+        return app.UseMiddleware<StatusCodePagesMiddleware>(wrappedOptions);
+    }
+
     private static Func<StatusCodeContext, Task> CreateHandler(string pathFormat, string? queryFormat, RequestDelegate? next = null)
     {
         var handler = async (StatusCodeContext context) =>
@@ -176,6 +222,10 @@ private static Func<StatusCodeContext, Task> CreateHandler(string pathFormat, st
             var originalQueryString = context.HttpContext.Request.QueryString;
 
             var routeValuesFeature = context.HttpContext.Features.Get<IRouteValuesFeature>();
+            var oldScope = context.Options.CreateScopeForStatusCodePages ? context.HttpContext.RequestServices : null;
+            await using AsyncServiceScope? scope = context.Options.CreateScopeForStatusCodePages
+                ? context.HttpContext.RequestServices.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope()
+                : null;
 
             // Store the original paths so the app can check it.
             context.HttpContext.Features.Set<IStatusCodeReExecuteFeature>(new StatusCodeReExecuteFeature()
@@ -188,6 +238,11 @@ private static Func<StatusCodeContext, Task> CreateHandler(string pathFormat, st
                 RouteValues = routeValuesFeature?.RouteValues
             });
 
+            if (scope.HasValue)
+            {
+                context.HttpContext.RequestServices = scope.Value.ServiceProvider;
+            }
+
             // An endpoint may have already been set. Since we're going to re-invoke the middleware pipeline we need to reset
             // the endpoint and route values to ensure things are re-calculated.
             HttpExtensions.ClearEndpoint(context.HttpContext);
@@ -210,6 +265,10 @@ private static Func<StatusCodeContext, Task> CreateHandler(string pathFormat, st
                 context.HttpContext.Request.QueryString = originalQueryString;
                 context.HttpContext.Request.Path = originalPath;
                 context.HttpContext.Features.Set<IStatusCodeReExecuteFeature?>(null);
+                if (oldScope != null)
+                {
+                    context.HttpContext.RequestServices = oldScope;
+                }
             }
         };
 
diff --git a/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesMiddleware.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesMiddleware.cs
index 87994f6c7011..7b821aa01b2e 100644
--- a/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesMiddleware.cs
+++ b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesMiddleware.cs
@@ -48,8 +48,14 @@ public async Task Invoke(HttpContext context)
             statusCodeFeature.Enabled = false;
         }
 
+        // Attach pathFormat to HttpContext.Items early in the pipeline
+        context.Items[nameof(StatusCodePagesOptions)] = _options.PathFormat;
+
         await _next(context);
 
+        // Remove pathFormat from HttpContext.Items after handler execution
+        context.Items.Remove(nameof(StatusCodePagesOptions));
+
         if (!statusCodeFeature.Enabled)
         {
             // Check if the feature is still available because other middleware (such as a web API written in MVC) could
diff --git a/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesOptions.cs b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesOptions.cs
index d3d946ab1763..9e91cbdef915 100644
--- a/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesOptions.cs
+++ b/src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesOptions.cs
@@ -55,4 +55,13 @@ private static string BuildResponseBody(int httpStatusCode)
     /// The handler that generates the response body for the given <see cref="StatusCodeContext"/>. By default this produces a plain text response that includes the status code.
     /// </summary>
     public Func<StatusCodeContext, Task> HandleAsync { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the handler needs to create a separate <see cref="IServiceProvider"/> scope and
+    /// replace it on <see cref="HttpContext.RequestServices"/> when re-executing the request.
+    /// </summary>
+    /// <remarks>The default value is <see langword="false"/>.</remarks>
+    public bool CreateScopeForStatusCodePages { get; set; }
+
+    internal string? PathFormat { get; set; }
 }
diff --git a/src/Middleware/Diagnostics/src/_package.json b/src/Middleware/Diagnostics/src/_package.json
index a89dd3241cf6..7262c61e559d 100644
--- a/src/Middleware/Diagnostics/src/_package.json
+++ b/src/Middleware/Diagnostics/src/_package.json
@@ -1,5 +1,5 @@
 {
-  "name": "DiagnosticsPages",
+  "name": "@microsoft/DiagnosticsPages",
   "version": "0.0.0",
   "description": "",
   "private": true,
diff --git a/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs b/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs
index 1e2147c34341..3ac1b05d4220 100644
--- a/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs
+++ b/src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs
@@ -477,7 +477,7 @@ public async Task ExceptionPageFiltersAreAppliedInOrder()
         Assert.Equal("An error occurred", await response.Content.ReadAsStringAsync());
     }
 
-    public static TheoryData CompilationExceptionData
+    public static TheoryData<List<CompilationFailure>> CompilationExceptionData
     {
         get
         {
diff --git a/src/Middleware/Diagnostics/test/UnitTests/ExceptionDetailsProviderTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ExceptionDetailsProviderTest.cs
index f5f59a959ba9..9ff640c22aa6 100644
--- a/src/Middleware/Diagnostics/test/UnitTests/ExceptionDetailsProviderTest.cs
+++ b/src/Middleware/Diagnostics/test/UnitTests/ExceptionDetailsProviderTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Extensions.Internal;
 
 public class ExceptionDetailsProviderTest
 {
-    public static TheoryData RelativePathsData
+    public static TheoryData<string> RelativePathsData
     {
         get
         {
diff --git a/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs
index b5513d9cf0e1..eaf419889b72 100644
--- a/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs
+++ b/src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerMiddlewareTest.cs
@@ -22,6 +22,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
 using Moq;
 
@@ -33,6 +34,7 @@ public class ExceptionHandlerMiddlewareTest : LoggedTest
     public async Task ExceptionIsSetOnProblemDetailsContext()
     {
         // Arrange
+        ExceptionHandlerSuppressDiagnosticsContext suppressContext = null;
         using var host = new HostBuilder()
             .ConfigureServices(services =>
             {
@@ -53,7 +55,14 @@ public async Task ExceptionIsSetOnProblemDetailsContext()
                 .UseTestServer()
                 .Configure(app =>
                 {
-                    app.UseExceptionHandler();
+                    app.UseExceptionHandler(new ExceptionHandlerOptions
+                    {
+                        SuppressDiagnosticsCallback = context =>
+                        {
+                            suppressContext = context;
+                            return true;
+                        }
+                    });
                     app.Run(context =>
                     {
                         throw new Exception("Test exception");
@@ -75,12 +84,16 @@ public async Task ExceptionIsSetOnProblemDetailsContext()
         var body = await response.Content.ReadFromJsonAsync<ProblemDetails>();
         var originalExceptionMessage = ((JsonElement)body.Extensions["OriginalExceptionMessage"]).GetString();
         Assert.Equal("Test exception", originalExceptionMessage);
+
+        Assert.IsType<Exception>(suppressContext.Exception);
+        Assert.Equal(ExceptionHandledType.ProblemDetailsService, suppressContext.ExceptionHandledBy);
     }
 
     [Fact]
     public async Task Invoke_ExceptionThrownResultsInClearedRouteValuesAndEndpoint()
     {
         // Arrange
+        var sink = new TestSink();
         var httpContext = CreateHttpContext();
         httpContext.SetEndpoint(new Endpoint((_) => Task.CompletedTask, new EndpointMetadataCollection(), "Test"));
         httpContext.Request.RouteValues["John"] = "Doe";
@@ -92,10 +105,48 @@ public async Task Invoke_ExceptionThrownResultsInClearedRouteValuesAndEndpoint()
                 Assert.Null(context.GetEndpoint());
                 return Task.CompletedTask;
             });
-        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor);
+        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, loggerFactory: new TestLoggerFactory(sink, true));
 
         // Act & Assert
         await middleware.Invoke(httpContext);
+
+        Assert.Collection(sink.Writes, w => Assert.Equal("UnhandledException", w.EventId.Name));
+    }
+
+    [Theory]
+    [InlineData(ExceptionHandledType.ExceptionHandlerDelegate, false)]
+    [InlineData(ExceptionHandledType.ProblemDetailsService, true)]
+    public async Task Invoke_HasExceptionHandler_SuppressDiagnostics_CallbackRun(ExceptionHandledType suppressResult, bool logged)
+    {
+        // Arrange
+        var sink = new TestSink();
+        var httpContext = CreateHttpContext();
+
+        var optionsAccessor = CreateOptionsAccessor(
+            exceptionHandler: context =>
+            {
+                context.Features.Set<IHttpResponseFeature>(new TestHttpResponseFeature());
+                return Task.CompletedTask;
+            },
+            suppressDiagnosticsCallback: c => c.ExceptionHandledBy == suppressResult);
+        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, loggerFactory: new TestLoggerFactory(sink, true));
+
+        // Act & Assert
+        await middleware.Invoke(httpContext);
+
+        if (logged)
+        {
+            Assert.Collection(sink.Writes, w => Assert.Equal("UnhandledException", w.EventId.Name));
+        }
+        else
+        {
+            Assert.Empty(sink.Writes);
+        }
+    }
+
+    private sealed class TestHttpResponseFeature : HttpResponseFeature
+    {
+        public override bool HasStarted => true;
     }
 
     [Fact]
@@ -126,6 +177,7 @@ public async Task Invoke_ExceptionHandlerCaptureRouteValuesAndEndpoint()
     public async Task IExceptionHandlers_CallNextIfNotHandled()
     {
         // Arrange
+        var sink = new TestSink();
         var httpContext = CreateHttpContext();
 
         var optionsAccessor = CreateOptionsAccessor();
@@ -137,7 +189,7 @@ public async Task IExceptionHandlers_CallNextIfNotHandled()
             new TestExceptionHandler(true, "3"),
         };
 
-        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, exceptionHandlers);
+        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, exceptionHandlers, loggerFactory: new TestLoggerFactory(sink, true));
 
         // Act & Assert
         await middleware.Invoke(httpContext);
@@ -145,6 +197,56 @@ public async Task IExceptionHandlers_CallNextIfNotHandled()
         Assert.True(httpContext.Items.ContainsKey("1"));
         Assert.True(httpContext.Items.ContainsKey("2"));
         Assert.True(httpContext.Items.ContainsKey("3"));
+
+        // IExceptionHandlers handling an exception suppress diagnostics by default.
+        Assert.Empty(sink.Writes);
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task IExceptionHandlers_SuppressDiagnostics_TestLogs(bool? suppressDiagnostics)
+    {
+        // Arrange
+        var sink = new TestSink();
+        var httpContext = CreateHttpContext();
+
+        var metricsTagsFeature = new TestHttpMetricsTagsFeature();
+        httpContext.Features.Set<IHttpMetricsTagsFeature>(metricsTagsFeature);
+
+        Func<ExceptionHandlerSuppressDiagnosticsContext, bool> suppressDiagnosticsCallback = null;
+        if (suppressDiagnostics != null)
+        {
+            suppressDiagnosticsCallback = c => suppressDiagnostics.Value;
+        }
+
+        var optionsAccessor = CreateOptionsAccessor(suppressDiagnosticsCallback: suppressDiagnosticsCallback);
+
+        var exceptionHandlers = new List<IExceptionHandler>
+        {
+            new TestExceptionHandler(true, "1")
+        };
+
+        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, exceptionHandlers, loggerFactory: new TestLoggerFactory(sink, true));
+
+        // Act & Assert
+        await middleware.Invoke(httpContext);
+
+        Assert.True(httpContext.Items.ContainsKey("1"));
+
+        if (suppressDiagnostics == null || suppressDiagnostics == true)
+        {
+            Assert.Empty(sink.Writes);
+            Assert.Empty(metricsTagsFeature.Tags);
+        }
+        else
+        {
+            Assert.Collection(sink.Writes, w => Assert.Equal("UnhandledException", w.EventId.Name));
+            var errorTag = Assert.Single(metricsTagsFeature.Tags);
+            Assert.Equal("error.type", errorTag.Key);
+            Assert.Equal("System.InvalidOperationException", errorTag.Value);
+        }
     }
 
     [Fact]
@@ -445,6 +547,32 @@ public async Task Metrics_ExceptionThrown_Unhandled_Reported()
             m => AssertRequestException(m, "System.InvalidOperationException", "unhandled"));
     }
 
+    [Fact]
+    public async Task Metrics_ExceptionThrown_ErrorPathHandled_Reported()
+    {
+        // Arrange
+        var httpContext = CreateHttpContext();
+        var optionsAccessor = CreateOptionsAccessor(
+            exceptionHandler: context =>
+            {
+                context.Features.Set<IHttpResponseFeature>(new TestHttpResponseFeature());
+                return Task.CompletedTask;
+            },
+            exceptionHandlingPath: "/error");
+        var meterFactory = new TestMeterFactory();
+        var middleware = CreateMiddleware(_ => throw new InvalidOperationException(), optionsAccessor, meterFactory: meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var diagnosticsRequestExceptionCollector = new MetricCollector<long>(meterFactory, DiagnosticsMetrics.MeterName, "aspnetcore.diagnostics.exceptions");
+
+        // Act
+        await middleware.Invoke(httpContext);
+
+        // Assert
+        Assert.Collection(diagnosticsRequestExceptionCollector.GetMeasurementSnapshot(),
+            m => AssertRequestException(m, "System.InvalidOperationException", "handled", "/error"));
+    }
+
     private static void AssertRequestException(CollectedMeasurement<long> measurement, string exceptionName, string result, string handler = null)
     {
         Assert.Equal(1, measurement.Value);
@@ -490,7 +618,8 @@ private HttpContext CreateHttpContext()
 
     private IOptions<ExceptionHandlerOptions> CreateOptionsAccessor(
         RequestDelegate exceptionHandler = null,
-        string exceptionHandlingPath = null)
+        string exceptionHandlingPath = null,
+        Func<ExceptionHandlerSuppressDiagnosticsContext, bool> suppressDiagnosticsCallback = null)
     {
         exceptionHandler ??= c => Task.CompletedTask;
         var options = new ExceptionHandlerOptions()
@@ -498,6 +627,10 @@ private IOptions<ExceptionHandlerOptions> CreateOptionsAccessor(
             ExceptionHandler = exceptionHandler,
             ExceptionHandlingPath = exceptionHandlingPath,
         };
+        if (suppressDiagnosticsCallback != null)
+        {
+            options.SuppressDiagnosticsCallback = suppressDiagnosticsCallback;
+        }
         var optionsAccessor = Mock.Of<IOptions<ExceptionHandlerOptions>>(o => o.Value == options);
         return optionsAccessor;
     }
@@ -506,14 +639,15 @@ private ExceptionHandlerMiddlewareImpl CreateMiddleware(
         RequestDelegate next,
         IOptions<ExceptionHandlerOptions> options,
         IEnumerable<IExceptionHandler> exceptionHandlers = null,
-        IMeterFactory meterFactory = null)
+        IMeterFactory meterFactory = null,
+        ILoggerFactory loggerFactory = null)
     {
         next ??= c => Task.CompletedTask;
         var listener = new DiagnosticListener("Microsoft.AspNetCore");
 
         var middleware = new ExceptionHandlerMiddlewareImpl(
             next,
-            NullLoggerFactory.Instance,
+            loggerFactory ?? NullLoggerFactory.Instance,
             options,
             listener,
             exceptionHandlers ?? Enumerable.Empty<IExceptionHandler>(),
@@ -529,4 +663,12 @@ public object GetService(Type serviceType)
             throw new NotImplementedException();
         }
     }
+
+    private sealed class TestHttpMetricsTagsFeature : IHttpMetricsTagsFeature
+    {
+        public List<KeyValuePair<string, object>> TagsList { get; } = new List<KeyValuePair<string, object>>();
+
+        public ICollection<KeyValuePair<string, object>> Tags => TagsList;
+        public bool MetricsDisabled { get; set; }
+    }
 }
diff --git a/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs b/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs
index e42c2a1f276f..20706ec71fbe 100644
--- a/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs
+++ b/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs
@@ -44,7 +44,7 @@ public async Task HeaderInRequest_AddCorrectValue()
 
         // Assert
         Assert.Contains("in", CapturedHeaders.Keys);
-        Assert.Equal(new[] { "test" }, CapturedHeaders["in"]);
+        Assert.Equal(new[] { "test" }, CapturedHeaders["in"].ToArray());
     }
 
     [Fact]
@@ -87,9 +87,9 @@ public async Task MultipleHeadersInRequest_AddAllHeaders()
 
         // Assert
         Assert.Contains("in", CapturedHeaders.Keys);
-        Assert.Equal(new[] { "test" }, CapturedHeaders["in"]);
+        Assert.Equal(new[] { "test" }, CapturedHeaders["in"].ToArray());
         Assert.Contains("another", CapturedHeaders.Keys);
-        Assert.Equal(new[] { "test2" }, CapturedHeaders["another"]);
+        Assert.Equal(new[] { "test2" }, CapturedHeaders["another"].ToArray());
     }
 
     [Theory]
@@ -132,7 +132,7 @@ public async Task UsesValueFilter(string[] filterValues, string[] expectedValues
 
         // Assert
         Assert.Contains("in", CapturedHeaders.Keys);
-        Assert.Equal(expectedValues, CapturedHeaders["in"]);
+        Assert.Equal(expectedValues, CapturedHeaders["in"].ToArray());
         Assert.Equal("in", receivedName);
         Assert.Equal(new StringValues("value"), receivedValue);
         Assert.Same(Context, receivedContext);
diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/src/PACKAGE.md b/src/Middleware/HealthChecks.EntityFrameworkCore/src/PACKAGE.md
new file mode 100644
index 000000000000..dc9f51745723
--- /dev/null
+++ b/src/Middleware/HealthChecks.EntityFrameworkCore/src/PACKAGE.md
@@ -0,0 +1,33 @@
+## About
+
+`Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore` provides components for performing health checks using Entity Framework Core (EF Core).
+
+## How to Use
+
+To use `Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore
+```
+
+### Configuration
+
+To add a health check for an EF Core `DbContext`, use the `AddDbContextCheck` extension method to configure it with your app's service provider. Here's an example:
+
+```csharp
+builder.Services.AddDbContext<SampleDbContext>(options =>
+    options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection")));
+
+builder.Services.AddHealthChecks()
+    .AddDbContextCheck<SampleDbContext>();
+```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/host-and-deploy/health-checks#entity-framework-core-dbcontext-probe) on using the Entity Framework Core `DbContext` probe.
+
+## Feedback &amp; Contributing
+
+`Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Middleware/HttpLogging/src/PublicAPI.Shipped.txt b/src/Middleware/HttpLogging/src/PublicAPI.Shipped.txt
index b02a11efea6f..d6236083ea58 100644
--- a/src/Middleware/HttpLogging/src/PublicAPI.Shipped.txt
+++ b/src/Middleware/HttpLogging/src/PublicAPI.Shipped.txt
@@ -111,6 +111,7 @@ Microsoft.Extensions.DependencyInjection.HttpLoggingServicesExtensions
 static Microsoft.AspNetCore.Builder.HttpLoggingBuilderExtensions.UseHttpLogging(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 static Microsoft.AspNetCore.Builder.HttpLoggingBuilderExtensions.UseW3CLogging(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 static Microsoft.AspNetCore.Builder.HttpLoggingEndpointConventionBuilderExtensions.WithHttpLogging<TBuilder>(this TBuilder builder, Microsoft.AspNetCore.HttpLogging.HttpLoggingFields loggingFields, int? requestBodyLogLimit = null, int? responseBodyLogLimit = null) -> TBuilder
+static Microsoft.Extensions.DependencyInjection.HttpLoggingServicesExtensions.AddHttpLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.Extensions.DependencyInjection.HttpLoggingServicesExtensions.AddHttpLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.HttpLogging.HttpLoggingOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.Extensions.DependencyInjection.HttpLoggingServicesExtensions.AddHttpLoggingInterceptor<T>(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.Extensions.DependencyInjection.HttpLoggingServicesExtensions.AddW3CLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.HttpLogging.W3CLoggerOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Middleware/HttpLogging/src/PublicAPI.Unshipped.txt b/src/Middleware/HttpLogging/src/PublicAPI.Unshipped.txt
index b27b861c528c..7dc5c58110bf 100644
--- a/src/Middleware/HttpLogging/src/PublicAPI.Unshipped.txt
+++ b/src/Middleware/HttpLogging/src/PublicAPI.Unshipped.txt
@@ -1,2 +1 @@
 #nullable enable
-static Microsoft.Extensions.DependencyInjection.HttpLoggingServicesExtensions.AddHttpLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Middleware/HttpLogging/src/RequestBufferingStream.cs b/src/Middleware/HttpLogging/src/RequestBufferingStream.cs
index d981cba8d5ce..b65269add321 100644
--- a/src/Middleware/HttpLogging/src/RequestBufferingStream.cs
+++ b/src/Middleware/HttpLogging/src/RequestBufferingStream.cs
@@ -13,6 +13,7 @@ internal sealed class RequestBufferingStream : BufferingStream
     private readonly bool _logOnFinish;
     private readonly int _limit;
     private BodyStatus _status = BodyStatus.None;
+    private string? _bodyBeforeClose;
 
     public bool HasLogged { get; private set; }
 
@@ -116,7 +117,7 @@ public void LogRequestBody()
         if (!HasLogged && _logOnFinish)
         {
             HasLogged = true;
-            _logger.RequestBody(GetString(_encoding), GetStatus(showCompleted: false));
+            _logger.RequestBody(GetStringInternal(), GetStatus(showCompleted: false));
         }
     }
 
@@ -124,7 +125,7 @@ public void LogRequestBody(HttpLoggingInterceptorContext logContext)
     {
         if (logContext.IsAnyEnabled(HttpLoggingFields.RequestBody))
         {
-            logContext.AddParameter("RequestBody", GetString(_encoding));
+            logContext.AddParameter("RequestBody", GetStringInternal());
             logContext.AddParameter("RequestBodyStatus", GetStatus(showCompleted: true));
         }
     }
@@ -138,6 +139,25 @@ public void LogRequestBody(HttpLoggingInterceptorContext logContext)
         _ => throw new NotImplementedException(_status.ToString()),
     };
 
+    private string GetStringInternal()
+    {
+        var result = _bodyBeforeClose ?? GetString(_encoding);
+        // Reset the value after its consumption to preserve GetString(encoding) behavior
+        _bodyBeforeClose = null;
+        return result;
+    }
+
+    public override void Close()
+    {
+        if (!HasLogged)
+        {
+            // Subsequent middleware can close the request stream after reading enough bytes (guided by ContentLength).
+            // Preserving the body for the final GetStringInternal() call.
+            _bodyBeforeClose = GetString(_encoding);
+        }
+        base.Close();
+    }
+
     public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback? callback, object? state)
     {
         return TaskToApm.Begin(ReadAsync(buffer, offset, count), callback, state);
diff --git a/src/Middleware/HttpLogging/src/ResponseBufferingStream.cs b/src/Middleware/HttpLogging/src/ResponseBufferingStream.cs
index 3a9baa9272c6..b408f633aa28 100644
--- a/src/Middleware/HttpLogging/src/ResponseBufferingStream.cs
+++ b/src/Middleware/HttpLogging/src/ResponseBufferingStream.cs
@@ -19,7 +19,9 @@ internal sealed class ResponseBufferingStream : BufferingStream, IHttpResponseBo
     private readonly HttpLoggingOptions _options;
     private readonly IHttpLoggingInterceptor[] _interceptors;
     private bool _logBody;
+    private bool _hasLogged;
     private Encoding? _encoding;
+    private string? _bodyBeforeClose;
 
     private static readonly StreamPipeWriterOptions _pipeWriterOptions = new StreamPipeWriterOptions(leaveOpen: true);
 
@@ -179,8 +181,9 @@ public void LogResponseBody()
     {
         if (_logBody)
         {
-            var responseBody = GetString(_encoding!);
+            var responseBody = GetStringInternal();
             _logger.ResponseBody(responseBody);
+            _hasLogged = true;
         }
     }
 
@@ -188,7 +191,28 @@ public void LogResponseBody(HttpLoggingInterceptorContext logContext)
     {
         if (_logBody)
         {
-            logContext.AddParameter("ResponseBody", GetString(_encoding!));
+            logContext.AddParameter("ResponseBody", GetStringInternal());
+            _hasLogged = true;
         }
     }
+
+    private string GetStringInternal()
+    {
+        var result = _bodyBeforeClose ?? GetString(_encoding!);
+        // Reset the value after its consumption to preserve GetString(encoding) behavior
+        _bodyBeforeClose = null;
+        return result;
+    }
+
+    public override void Close()
+    {
+        if (_logBody && !_hasLogged)
+        {
+            // Subsequent middleware can close the response stream after writing its body
+            // Preserving the body for the final GetStringInternal() call.
+            _bodyBeforeClose = GetString(_encoding!);
+        }
+
+        base.Close();
+    }
 }
diff --git a/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs b/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
index f948368b5c8b..4871dc0e9035 100644
--- a/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
+++ b/src/Middleware/HttpLogging/test/FileLoggerProcessorTests.cs
@@ -233,7 +233,7 @@ public async Task StopsLoggingAfter10000Files()
                 await WaitForFile(lastFilePath, _messageOne.Length).DefaultTimeout();
 
                 // directory is full, no warnings yet
-                Assert.Equal(0, testSink.Writes.Count);
+                Assert.Empty(testSink.Writes);
 
                 logger.EnqueueMessage(_messageOne);
                 await WaitForCondition(() => testSink.Writes.FirstOrDefault()?.EventId.Name == "MaxFilesReached").DefaultTimeout();
@@ -248,7 +248,7 @@ public async Task StopsLoggingAfter10000Files()
             var testLogger2 = new TestLoggerFactory(testSink2, enabled:true);
             await using (var logger = new FileLoggerProcessor(new OptionsWrapperMonitor<W3CLoggerOptions>(options), new HostingEnvironment(), testLogger2))
             {
-                Assert.Equal(0, testSink2.Writes.Count);
+                Assert.Empty(testSink2.Writes);
 
                 logger.SystemDateTime = mockSystemDateTime;
                 logger.EnqueueMessage(_messageOne);
diff --git a/src/Middleware/HttpLogging/test/HttpLoggingMiddlewareTests.cs b/src/Middleware/HttpLogging/test/HttpLoggingMiddlewareTests.cs
index 6c6fda628d1d..7a67683907a7 100644
--- a/src/Middleware/HttpLogging/test/HttpLoggingMiddlewareTests.cs
+++ b/src/Middleware/HttpLogging/test/HttpLoggingMiddlewareTests.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.HttpLogging;
 
 public class HttpLoggingMiddlewareTests : LoggedTest
 {
-    public static TheoryData BodyData
+    public static TheoryData<string> BodyData
     {
         get
         {
@@ -390,6 +390,46 @@ public async Task RequestBodyCopyToAsyncWorks(string expected)
         Assert.Contains(TestSink.Writes, w => w.Message.Contains(expected));
     }
 
+    [Theory]
+    [MemberData(nameof(BodyData))]
+    public async Task RequestBodyWithStreamCloseWorks(string expected)
+    {
+        var options = CreateOptionsAccessor();
+        options.CurrentValue.LoggingFields = HttpLoggingFields.RequestBody;
+
+        var middleware = CreateMiddleware(
+            async c =>
+            {
+                var arr = new byte[4096];
+                var contentLengthBytesLeft = c.Request.Body.Length;
+
+                // (1) The subsequent middleware reads right up to the buffer size (guided by the ContentLength header)
+                while (contentLengthBytesLeft > 0)
+                {
+                    var res = await c.Request.Body.ReadAsync(arr, 0, arr.Length);
+                    contentLengthBytesLeft -= res;
+                    if (res == 0)
+                    {
+                        break;
+                    }
+                }
+
+                // (2) The subsequent middleware closes the request stream after its consumption
+                c.Request.Body.Close();
+            },
+            options);
+
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.ContentType = "text/plain";
+        var buffer = Encoding.UTF8.GetBytes(expected);
+        httpContext.Request.Body = new MemoryStream(buffer);
+        httpContext.Request.ContentLength = buffer.Length;
+
+        await middleware.Invoke(httpContext);
+
+        Assert.Contains(TestSink.Writes, w => w.Message.Contains(expected));
+    }
+
     [Fact]
     public async Task RequestBodyReadingLimitLongCharactersWorks()
     {
@@ -1155,6 +1195,32 @@ public async Task StartAsyncResponseHeadersLogged()
         await middlewareTask;
     }
 
+    [Theory]
+    [MemberData(nameof(BodyData))]
+    public async Task ResponseBodyWithStreamCloseWorks(string expected)
+    {
+        var options = CreateOptionsAccessor();
+        options.CurrentValue.LoggingFields = HttpLoggingFields.ResponseBody;
+        var middleware = CreateMiddleware(
+            async c =>
+            {
+                c.Response.ContentType = "text/plain";
+
+                // (1) The subsequent middleware writes its response
+                await c.Response.WriteAsync(expected);
+
+                // (2) The subsequent middleware closes the response stream after it has completed writing to it
+                c.Response.Body.Close();
+            },
+            options);
+
+        var httpContext = new DefaultHttpContext();
+
+        await middleware.Invoke(httpContext);
+
+        Assert.Contains(TestSink.Writes, w => w.Message.Contains(expected));
+    }
+
     [Fact]
     public async Task UnrecognizedMediaType()
     {
@@ -1606,6 +1672,72 @@ public async Task CombineLogs_Exception_RequestLogged()
         Assert.Equal(lines.Length, i);
     }
 
+    [Theory]
+    [InlineData(HttpLoggingFields.RequestBody | HttpLoggingFields.ResponseBody)]
+    [InlineData(HttpLoggingFields.RequestBody)]
+    [InlineData(HttpLoggingFields.ResponseBody)]
+    public async Task CombineLogsWithStreamCloseWorks(HttpLoggingFields fields)
+    {
+        var options = CreateOptionsAccessor();
+        options.CurrentValue.LoggingFields = fields;
+        options.CurrentValue.CombineLogs = true;
+
+        var middleware = CreateMiddleware(
+            async c =>
+            {
+                var arr = new byte[4096];
+                var contentLengthBytesLeft = c.Request.Body.Length;
+
+                // (1) The subsequent middleware reads right up to the buffer size (guided by the ContentLength header)
+                while (contentLengthBytesLeft > 0)
+                {
+                    var res = await c.Request.Body.ReadAsync(arr, 0, arr.Length);
+                    contentLengthBytesLeft -= res;
+                    if (res == 0)
+                    {
+                        break;
+                    }
+                }
+
+                // (2) The subsequent middleware closes the request stream after its consumption
+                c.Request.Body.Close();
+
+                c.Response.ContentType = "text/plain";
+
+                // (3) The subsequent middleware writes its response
+                await c.Response.WriteAsync("test response");
+
+                // (4) The subsequent middleware closes the response stream after it has completed writing to it
+                c.Response.Body.Close();
+            },
+            options);
+
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.ContentType = "text/plain";
+        var requestBodyBuffer = Encoding.UTF8.GetBytes("test request");
+        httpContext.Request.Body = new MemoryStream(requestBodyBuffer);
+        httpContext.Request.ContentLength = requestBodyBuffer.Length;
+
+        await middleware.Invoke(httpContext);
+
+        var lines = Assert.Single(TestSink.Writes.Where(w => w.LogLevel >= LogLevel.Information)).Message.Split(Environment.NewLine);
+        var i = 0;
+        Assert.Equal("Request and Response:", lines[i++]);
+        if (fields.HasFlag(HttpLoggingFields.RequestBody))
+        {
+            Assert.Equal("RequestBody: test request", lines[i++]);
+            // Here we expect "Only partially consumed by app" status as the middleware reads request body right to its end,
+            // but never further as it follows the ContentLength header. From logging middleware perspective it looks like
+            // a partial consumption as it can't know for sure if it has been drained to the end or not.
+            Assert.Equal("RequestBodyStatus: [Only partially consumed by app]", lines[i++]);
+        }
+        if (fields.HasFlag(HttpLoggingFields.ResponseBody))
+        {
+            Assert.Equal("ResponseBody: test response", lines[i++]);
+        }
+        Assert.Equal(lines.Length, i);
+    }
+
     [Fact]
     public async Task ResponseInterceptorCanDisableResponseLogs()
     {
diff --git a/src/Middleware/HttpLogging/test/W3CLoggerTests.cs b/src/Middleware/HttpLogging/test/W3CLoggerTests.cs
index f807ddb49492..290bcf07584d 100644
--- a/src/Middleware/HttpLogging/test/W3CLoggerTests.cs
+++ b/src/Middleware/HttpLogging/test/W3CLoggerTests.cs
@@ -11,6 +11,7 @@ public class W3CLoggerTests
     readonly DateTime _timestampOne = new DateTime(2021, 01, 02, 03, 04, 05);
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61614")]
     public async Task WritesDateTime()
     {
         var path = Path.GetTempFileName() + "_";
@@ -54,6 +55,7 @@ public async Task WritesDateTime()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61052")]
     public async Task HandlesNullValuesAsync()
     {
         var path = Path.GetTempFileName() + "_";
diff --git a/src/Middleware/HttpOverrides/src/DualIPNetworkList.cs b/src/Middleware/HttpOverrides/src/DualIPNetworkList.cs
new file mode 100644
index 000000000000..7a3b92b1038f
--- /dev/null
+++ b/src/Middleware/HttpOverrides/src/DualIPNetworkList.cs
@@ -0,0 +1,140 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#pragma warning disable ASPDEPR005 // Type or member is obsolete
+
+using AspNetIPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
+using IPAddress = System.Net.IPAddress;
+using IPNetwork = System.Net.IPNetwork;
+
+namespace Microsoft.AspNetCore.Builder;
+
+/// <summary>
+/// Internal list implementation that keeps <see cref="System.Net.IPNetwork"/> and the obsolete
+/// <see cref="Microsoft.AspNetCore.HttpOverrides.IPNetwork"/> collections in sync. Modifications
+/// through either interface are reflected in the other.
+/// </summary>
+internal sealed class DualIPNetworkList : IList<IPNetwork>, IList<AspNetIPNetwork>
+{
+    // Two independent underlying lists so each side behaves exactly like a List<T> with respect to
+    // enumeration versioning, capacity growth, etc. They are kept strictly in sync by all mutating operations.
+    private readonly List<IPNetwork> _system = new();
+    private readonly List<AspNetIPNetwork> _aspnet = new();
+
+    public DualIPNetworkList()
+    {
+        // Default entry (loopback) added to both representations.
+        var loopback = new IPNetwork(IPAddress.Loopback, 8);
+        _system.Add(loopback);
+        _aspnet.Add(new AspNetIPNetwork(loopback.BaseAddress, loopback.PrefixLength));
+    }
+
+    int ICollection<IPNetwork>.Count => _system.Count;
+    int ICollection<AspNetIPNetwork>.Count => _aspnet.Count;
+
+    bool ICollection<IPNetwork>.IsReadOnly => false;
+    bool ICollection<AspNetIPNetwork>.IsReadOnly => false;
+
+    IPNetwork IList<IPNetwork>.this[int index]
+    {
+        get => _system[index];
+        set
+        {
+            _system[index] = value;
+            _aspnet[index] = new AspNetIPNetwork(value.BaseAddress, value.PrefixLength);
+        }
+    }
+
+    AspNetIPNetwork IList<AspNetIPNetwork>.this[int index]
+    {
+        get => _aspnet[index];
+        set
+        {
+            _aspnet[index] = value;
+            _system[index] = new IPNetwork(value.Prefix, value.PrefixLength);
+        }
+    }
+
+    void ICollection<IPNetwork>.Add(IPNetwork item)
+    {
+        _system.Add(item);
+        _aspnet.Add(new AspNetIPNetwork(item.BaseAddress, item.PrefixLength));
+    }
+
+    void ICollection<AspNetIPNetwork>.Add(AspNetIPNetwork item)
+    {
+        _aspnet.Add(item);
+        _system.Add(new IPNetwork(item.Prefix, item.PrefixLength));
+    }
+
+    public void Clear()
+    {
+        _system.Clear();
+        _aspnet.Clear();
+    }
+
+    void ICollection<IPNetwork>.Clear() => Clear();
+    void ICollection<AspNetIPNetwork>.Clear() => Clear();
+
+    bool ICollection<IPNetwork>.Contains(IPNetwork item) => _system.Contains(item);
+    bool ICollection<AspNetIPNetwork>.Contains(AspNetIPNetwork item) => _aspnet.Contains(item);
+
+    public void CopyTo(IPNetwork[] array, int arrayIndex) => _system.CopyTo(array, arrayIndex);
+    public void CopyTo(AspNetIPNetwork[] array, int arrayIndex) => _aspnet.CopyTo(array, arrayIndex);
+
+    void ICollection<IPNetwork>.CopyTo(IPNetwork[] array, int arrayIndex) => CopyTo(array, arrayIndex);
+    void ICollection<AspNetIPNetwork>.CopyTo(AspNetIPNetwork[] array, int arrayIndex) => CopyTo(array, arrayIndex);
+
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => _system.GetEnumerator();
+
+    IEnumerator<IPNetwork> IEnumerable<IPNetwork>.GetEnumerator() => _system.GetEnumerator();
+    IEnumerator<AspNetIPNetwork> IEnumerable<AspNetIPNetwork>.GetEnumerator() => _aspnet.GetEnumerator();
+
+    int IList<IPNetwork>.IndexOf(IPNetwork item) => _system.IndexOf(item);
+    int IList<AspNetIPNetwork>.IndexOf(AspNetIPNetwork item) => _aspnet.IndexOf(item);
+
+    void IList<IPNetwork>.Insert(int index, IPNetwork item)
+    {
+        _system.Insert(index, item);
+        _aspnet.Insert(index, new AspNetIPNetwork(item.BaseAddress, item.PrefixLength));
+    }
+
+    void IList<AspNetIPNetwork>.Insert(int index, AspNetIPNetwork item)
+    {
+        _aspnet.Insert(index, item);
+        _system.Insert(index, new IPNetwork(item.Prefix, item.PrefixLength));
+    }
+
+    bool ICollection<IPNetwork>.Remove(IPNetwork item)
+    {
+        var idx = _system.IndexOf(item);
+        if (idx >= 0)
+        {
+            RemoveAt(idx);
+            return true;
+        }
+        return false;
+    }
+
+    bool ICollection<AspNetIPNetwork>.Remove(AspNetIPNetwork item)
+    {
+        var idx = _aspnet.IndexOf(item);
+        if (idx >= 0)
+        {
+            RemoveAt(idx);
+            return true;
+        }
+        return false;
+    }
+
+    public void RemoveAt(int index)
+    {
+        _system.RemoveAt(index);
+        _aspnet.RemoveAt(index);
+    }
+
+    void IList<IPNetwork>.RemoveAt(int index) => RemoveAt(index);
+    void IList<AspNetIPNetwork>.RemoveAt(int index) => RemoveAt(index);
+}
+
+#pragma warning restore ASPDEPR005 // Type or member is obsolete
diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
index 6b2a118cb132..d60191021f08 100644
--- a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
+++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
@@ -213,26 +213,26 @@ public void ApplyForwarders(HttpContext context)
             // Host and Scheme initial values are never inspected, no need to set them here.
         };
 
-        var checkKnownIps = _options.KnownNetworks.Count > 0 || _options.KnownProxies.Count > 0;
+        var checkKnownIps = _options.KnownIPNetworks.Count > 0 || _options.KnownProxies.Count > 0;
         bool applyChanges = false;
         int entriesConsumed = 0;
 
         for (; entriesConsumed < sets.Length; entriesConsumed++)
         {
             var set = sets[entriesConsumed];
-            if (checkFor)
+            // For the first instance, allow remoteIp to be null for servers that don't support it natively.
+            if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address))
             {
-                // For the first instance, allow remoteIp to be null for servers that don't support it natively.
-                if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address))
+                // Stop at the first unknown remote IP, but still apply changes processed so far.
+                if (_logger.IsEnabled(LogLevel.Debug))
                 {
-                    // Stop at the first unknown remote IP, but still apply changes processed so far.
-                    if (_logger.IsEnabled(LogLevel.Debug))
-                    {
-                        _logger.LogDebug(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort);
-                    }
-                    break;
+                    _logger.LogDebug(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort);
                 }
+                break;
+            }
 
+            if (checkFor)
+            {
                 if (IPEndPoint.TryParse(set.IpAndPortText, out var parsedEndPoint))
                 {
                     applyChanges = true;
@@ -399,7 +399,7 @@ private bool CheckKnownAddress(IPAddress address)
         {
             return true;
         }
-        foreach (var network in _options.KnownNetworks)
+        foreach (var network in _options.KnownIPNetworks)
         {
             if (network.Contains(address))
             {
diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs
index ceb8ab32b997..043994b0a772 100644
--- a/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs
+++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Shared;
+using AspNetIPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
 using IPAddress = System.Net.IPAddress;
+using IPNetwork = System.Net.IPNetwork;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -11,6 +14,10 @@ namespace Microsoft.AspNetCore.Builder;
 /// </summary>
 public class ForwardedHeadersOptions
 {
+    // Backing dual list that keeps the obsolete and new types in sync.
+    // Once the obsolete IList<IPNetwork> property is removed this can be changed to a simple List<IPNetwork>.
+    private readonly DualIPNetworkList _knownNetworks = new();
+
     /// <summary>
     /// Gets or sets the header used to retrieve the originating client IP. Defaults to the value specified by
     /// <see cref="ForwardedHeadersDefaults.XForwardedForHeaderName"/>.
@@ -80,10 +87,17 @@ public class ForwardedHeadersOptions
     /// </summary>
     public IList<IPAddress> KnownProxies { get; } = new List<IPAddress>() { IPAddress.IPv6Loopback };
 
+    /// <summary>
+    /// Address ranges of known proxies to accept forwarded headers from.
+    /// Obsolete, please use <see cref="KnownIPNetworks"/> instead
+    /// </summary>
+    [Obsolete("Please use KnownIPNetworks instead. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005", UrlFormat = Obsoletions.AspNetCoreDeprecate005Url)]
+    public IList<AspNetIPNetwork> KnownNetworks => _knownNetworks;
+
     /// <summary>
     /// Address ranges of known proxies to accept forwarded headers from.
     /// </summary>
-    public IList<IPNetwork> KnownNetworks { get; } = new List<IPNetwork>() { new IPNetwork(IPAddress.Loopback, 8) };
+    public IList<IPNetwork> KnownIPNetworks => _knownNetworks;
 
     /// <summary>
     /// The allowed values from x-forwarded-host. If the list is empty then all hosts are allowed.
diff --git a/src/Middleware/HttpOverrides/src/IPNetwork.cs b/src/Middleware/HttpOverrides/src/IPNetwork.cs
index 9888de2d1535..11bfeb0160bc 100644
--- a/src/Middleware/HttpOverrides/src/IPNetwork.cs
+++ b/src/Middleware/HttpOverrides/src/IPNetwork.cs
@@ -4,12 +4,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Net.Sockets;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.HttpOverrides;
 
 /// <summary>
 /// A representation of an IP network based on CIDR notation.
+/// Please use <see cref="System.Net.IPNetwork"/> instead
 /// </summary>
+[Obsolete("Please use System.Net.IPNetwork instead. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005", UrlFormat = Obsoletions.AspNetCoreDeprecate005Url)]
 public class IPNetwork
 {
     /// <summary>
diff --git a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj
index 2a5fbb97210a..15e0c1a903cb 100644
--- a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj
+++ b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj
@@ -18,4 +18,8 @@
     <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Middleware/HttpOverrides/src/PublicAPI.Unshipped.txt b/src/Middleware/HttpOverrides/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..c08a53cc6255 100644
--- a/src/Middleware/HttpOverrides/src/PublicAPI.Unshipped.txt
+++ b/src/Middleware/HttpOverrides/src/PublicAPI.Unshipped.txt
@@ -1 +1,2 @@
 #nullable enable
+Microsoft.AspNetCore.Builder.ForwardedHeadersOptions.KnownIPNetworks.get -> System.Collections.Generic.IList<System.Net.IPNetwork>!
diff --git a/src/Middleware/HttpOverrides/test/DualIPNetworkListTests.cs b/src/Middleware/HttpOverrides/test/DualIPNetworkListTests.cs
new file mode 100644
index 000000000000..581d197acb85
--- /dev/null
+++ b/src/Middleware/HttpOverrides/test/DualIPNetworkListTests.cs
@@ -0,0 +1,248 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using Microsoft.AspNetCore.Builder;
+using Xunit;
+using AspNetIPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
+
+namespace Microsoft.AspNetCore.HttpOverrides;
+
+public class DualIPNetworkListTests
+{
+    [Fact]
+    public void DefaultContainsLoopback()
+    {
+        var options = new ForwardedHeadersOptions();
+        Assert.Single(options.KnownIPNetworks);
+        Assert.Equal("127.0.0.0", options.KnownIPNetworks[0].BaseAddress.ToString());
+        Assert.Equal(8, options.KnownIPNetworks[0].PrefixLength);
+#pragma warning disable ASPDEPR005
+        Assert.Single(options.KnownNetworks);
+        Assert.Equal("127.0.0.0", options.KnownNetworks[0].Prefix.ToString());
+        Assert.Equal(8, options.KnownNetworks[0].PrefixLength);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void AddThroughSystemCollectionVisibleViaObsolete()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+#pragma warning disable ASPDEPR005
+        var obsoleteList = options.KnownNetworks;
+        Assert.Equal(2, obsoleteList.Count);
+        Assert.Equal(IPAddress.Parse("10.0.0.0"), obsoleteList[1].Prefix);
+        Assert.Equal(8, obsoleteList[1].PrefixLength);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void AddThroughObsoleteCollectionVisibleViaSystem()
+    {
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        options.KnownNetworks.Add(new AspNetIPNetwork(IPAddress.Parse("192.168.0.0"), 16));
+        Assert.Equal(2, options.KnownIPNetworks.Count);
+        Assert.Equal("192.168.0.0/16", options.KnownIPNetworks[1].ToString());
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void ReplaceViaSystemIndexerUpdatesObsolete()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks[0] = System.Net.IPNetwork.Parse("172.16.0.0/12");
+#pragma warning disable ASPDEPR005
+        Assert.Equal(IPAddress.Parse("172.16.0.0"), options.KnownNetworks[0].Prefix);
+        Assert.Equal(12, options.KnownNetworks[0].PrefixLength);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void ReplaceViaObsoleteIndexerUpdatesSystem()
+    {
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        options.KnownNetworks[0] = new AspNetIPNetwork(IPAddress.Parse("172.16.0.0"), 12);
+        Assert.Equal("172.16.0.0/12", options.KnownIPNetworks[0].ToString());
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void ClearClearsBoth()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Clear();
+#pragma warning disable ASPDEPR005
+        Assert.Empty(options.KnownNetworks);
+#pragma warning restore ASPDEPR005
+        Assert.Empty(options.KnownIPNetworks);
+    }
+
+    [Fact]
+    public void RemoveThroughEitherCollectionRemovesFromBoth()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+        var first = options.KnownIPNetworks[0];
+        var removed = options.KnownIPNetworks.Remove(first);
+        Assert.True(removed);
+#pragma warning disable ASPDEPR005
+        var obsoleteList = options.KnownNetworks;
+        Assert.DoesNotContain(obsoleteList, n => n.Prefix.Equals(IPAddress.Loopback));
+#pragma warning restore ASPDEPR005
+        Assert.Single(options.KnownIPNetworks); // only the 10.0.0.0/8 entry should remain
+    }
+
+    // New tests to cover each IList<T> member for both interfaces
+
+    [Fact]
+    public void ContainsWorksForBothLists()
+    {
+        var options = new ForwardedHeadersOptions();
+        var loopback = options.KnownIPNetworks[0];
+        Assert.Contains(loopback, options.KnownIPNetworks);
+#pragma warning disable ASPDEPR005
+        Assert.Contains(options.KnownNetworks, n => n.Prefix.Equals(loopback.BaseAddress) && n.PrefixLength == loopback.PrefixLength);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void CopyToSystem()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+        var arr = new System.Net.IPNetwork[5];
+        options.KnownIPNetworks.CopyTo(arr, 1);
+        Assert.Equal("127.0.0.0/8", arr[1].ToString());
+        Assert.Equal("10.0.0.0/8", arr[2].ToString());
+    }
+
+    [Fact]
+    public void CopyToObsolete()
+    {
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        options.KnownNetworks.Add(new AspNetIPNetwork(IPAddress.Parse("10.0.0.0"), 8));
+        var arr = new AspNetIPNetwork[5];
+        options.KnownNetworks.CopyTo(arr, 2);
+        Assert.Null(arr[0]);
+        Assert.Equal(IPAddress.Parse("127.0.0.0"), arr[2].Prefix);
+        Assert.Equal(8, arr[2].PrefixLength);
+        Assert.Equal(IPAddress.Parse("10.0.0.0"), arr[3].Prefix);
+        Assert.Equal(8, arr[3].PrefixLength);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void IndexOfSystem()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+        Assert.Equal(1, options.KnownIPNetworks.IndexOf(System.Net.IPNetwork.Parse("10.0.0.0/8")));
+    }
+
+    [Fact]
+    public void IndexOfObsolete()
+    {
+        // AspNetIPNetwork doesn't implement Equals, so IndexOf uses reference equality.
+        // This keeps the obsolete behavior intact.
+
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        var item = new AspNetIPNetwork(IPAddress.Parse("10.0.0.0"), 8);
+        options.KnownNetworks.Add(item);
+        Assert.Equal(-1, options.KnownNetworks.IndexOf(new AspNetIPNetwork(IPAddress.Parse("10.0.0.0"), 8)));
+        Assert.Equal(1, options.KnownNetworks.IndexOf(item));
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void InsertSystem()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Insert(0, System.Net.IPNetwork.Parse("10.0.0.0/8"));
+        Assert.Equal("10.0.0.0/8", options.KnownIPNetworks[0].ToString());
+#pragma warning disable ASPDEPR005
+        Assert.Equal(IPAddress.Parse("10.0.0.0"), options.KnownNetworks[0].Prefix);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void InsertObsolete()
+    {
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        options.KnownNetworks.Insert(0, new AspNetIPNetwork(IPAddress.Parse("10.0.0.0"), 8));
+        Assert.Equal("10.0.0.0/8", options.KnownIPNetworks[0].ToString());
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void RemoveAtSystem()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+        options.KnownIPNetworks.RemoveAt(0); // remove loopback
+#pragma warning disable ASPDEPR005
+        Assert.DoesNotContain(options.KnownNetworks, n => n.Prefix.Equals(IPAddress.Loopback));
+#pragma warning restore ASPDEPR005
+        Assert.Single(options.KnownIPNetworks); // only 10.0.0.0/8
+    }
+
+    [Fact]
+    public void RemoveAtObsolete()
+    {
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        options.KnownNetworks.Add(new AspNetIPNetwork(IPAddress.Parse("10.0.0.0"), 8));
+        options.KnownNetworks.RemoveAt(0); // remove loopback
+        Assert.DoesNotContain(options.KnownIPNetworks, n => n.BaseAddress.Equals(IPAddress.Loopback));
+        Assert.Single(options.KnownIPNetworks); // only 10.0.0.0/8
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void EnumerateSystem()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+        var list = options.KnownIPNetworks.ToList();
+        Assert.Equal(2, list.Count);
+        Assert.Contains(list, n => n.BaseAddress.Equals(IPAddress.Parse("10.0.0.0")));
+    }
+
+    [Fact]
+    public void EnumerateObsolete()
+    {
+#pragma warning disable ASPDEPR005
+        var options = new ForwardedHeadersOptions();
+        options.KnownNetworks.Add(new AspNetIPNetwork(IPAddress.Parse("10.0.0.0"), 8));
+        var list = options.KnownNetworks.ToList();
+        Assert.Equal(2, list.Count);
+        Assert.Contains(list, n => n.Prefix.Equals(IPAddress.Parse("10.0.0.0")));
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void IsReadOnlyFalse()
+    {
+        var options = new ForwardedHeadersOptions();
+        Assert.False(options.KnownIPNetworks.IsReadOnly);
+#pragma warning disable ASPDEPR005
+        Assert.False(options.KnownNetworks.IsReadOnly);
+#pragma warning restore ASPDEPR005
+    }
+
+    [Fact]
+    public void CountSyncAfterMixedOperations()
+    {
+        var options = new ForwardedHeadersOptions();
+        options.KnownIPNetworks.Add(System.Net.IPNetwork.Parse("10.0.0.0/8"));
+#pragma warning disable ASPDEPR005
+        options.KnownNetworks.Add(new AspNetIPNetwork(IPAddress.Parse("192.168.0.0"), 16));
+        Assert.Equal(options.KnownIPNetworks.Count, options.KnownNetworks.Count);
+#pragma warning restore ASPDEPR005
+    }
+}
diff --git a/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs
index aa33a191e7b7..606fe2ebc91c 100644
--- a/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs
+++ b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs
@@ -104,7 +104,7 @@ public async Task XForwardedForFirstValueIsInvalid(int limit, string header, str
     [InlineData(2, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "13.113.113.13:34567", true)]
     [InlineData(3, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "13.113.113.13", 34567, "", false)]
     [InlineData(3, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "13.113.113.13", 34567, "", true)]
-    public async Task XForwardedForForwardLimit(int limit, string header, string expectedIp, int expectedPort, string remainingHeader, bool requireSymmetry)
+    public async Task XForwardedForForwardLimit_Obsolete(int limit, string header, string expectedIp, int expectedPort, string remainingHeader, bool requireSymmetry)
     {
         using var host = new HostBuilder()
             .ConfigureWebHost(webHostBuilder =>
@@ -120,7 +120,65 @@ public async Task XForwardedForForwardLimit(int limit, string header, string exp
                         ForwardLimit = limit,
                     };
                     options.KnownProxies.Clear();
+#pragma warning disable ASPDEPR005 // KnownNetworks is obsolete
                     options.KnownNetworks.Clear();
+#pragma warning restore ASPDEPR005 // KnownNetworks is obsolete
+                    app.UseForwardedHeaders(options);
+                });
+            }).Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
+
+        var context = await server.SendAsync(c =>
+        {
+            c.Request.Headers["X-Forwarded-For"] = header;
+            c.Connection.RemoteIpAddress = IPAddress.Parse("10.0.0.1");
+            c.Connection.RemotePort = 99;
+        });
+
+        Assert.Equal(expectedIp, context.Connection.RemoteIpAddress.ToString());
+        Assert.Equal(expectedPort, context.Connection.RemotePort);
+        Assert.Equal(remainingHeader, context.Request.Headers["X-Forwarded-For"].ToString());
+    }
+
+    [Theory]
+    [InlineData(1, "11.111.111.11:12345", "11.111.111.11", 12345, "", false)]
+    [InlineData(1, "11.111.111.11:12345", "11.111.111.11", 12345, "", true)]
+    [InlineData(10, "11.111.111.11:12345", "11.111.111.11", 12345, "", false)]
+    [InlineData(10, "11.111.111.11:12345", "11.111.111.11", 12345, "", true)]
+    [InlineData(1, "12.112.112.12:23456, 11.111.111.11:12345", "11.111.111.11", 12345, "12.112.112.12:23456", false)]
+    [InlineData(1, "12.112.112.12:23456, 11.111.111.11:12345", "11.111.111.11", 12345, "12.112.112.12:23456", true)]
+    [InlineData(2, "12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "", false)]
+    [InlineData(2, "12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "", true)]
+    [InlineData(10, "12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "", false)]
+    [InlineData(10, "12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "", true)]
+    [InlineData(10, "12.112.112.12.23456, 11.111.111.11:12345", "11.111.111.11", 12345, "12.112.112.12.23456", false)] // Invalid 2nd value
+    [InlineData(10, "12.112.112.12.23456, 11.111.111.11:12345", "11.111.111.11", 12345, "12.112.112.12.23456", true)] // Invalid 2nd value
+    [InlineData(10, "13.113.113.13:34567, 12.112.112.12.23456, 11.111.111.11:12345", "11.111.111.11", 12345, "13.113.113.13:34567,12.112.112.12.23456", false)] // Invalid 2nd value
+    [InlineData(10, "13.113.113.13:34567, 12.112.112.12.23456, 11.111.111.11:12345", "11.111.111.11", 12345, "13.113.113.13:34567,12.112.112.12.23456", true)] // Invalid 2nd value
+    [InlineData(2, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "13.113.113.13:34567", false)]
+    [InlineData(2, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "12.112.112.12", 23456, "13.113.113.13:34567", true)]
+    [InlineData(3, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "13.113.113.13", 34567, "", false)]
+    [InlineData(3, "13.113.113.13:34567, 12.112.112.12:23456, 11.111.111.11:12345", "13.113.113.13", 34567, "", true)]
+    public async Task XForwardedForForwardLimit(int limit, string header, string expectedIp, int expectedPort, string remainingHeader, bool requireSymmetry)
+    {
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                .UseTestServer()
+                .Configure(app =>
+                {
+                    var options = new ForwardedHeadersOptions
+                    {
+                        ForwardedHeaders = ForwardedHeaders.XForwardedFor,
+                        RequireHeaderSymmetry = requireSymmetry,
+                        ForwardLimit = limit,
+                    };
+                    options.KnownProxies.Clear();
+                    options.KnownIPNetworks.Clear();
                     app.UseForwardedHeaders(options);
                 });
             }).Build();
@@ -844,7 +902,7 @@ public async Task XForwardedProtoOverrideCanBeIndependentOfXForwardedForCount(in
     [InlineData("h2, h1", "", "::1", true, "http")]
     [InlineData("h2, h1", "F::, D::", "::1", true, "h1")]
     [InlineData("h2, h1", "E::, D::", "F::", true, "http")]
-    public async Task XForwardedProtoOverrideLimitedByLoopback(string protoHeader, string forHeader, string remoteIp, bool loopback, string expected)
+    public async Task XForwardedProtoOverrideLimitedByLoopback_Obsolete(string protoHeader, string forHeader, string remoteIp, bool loopback, string expected)
     {
         using var host = new HostBuilder()
             .ConfigureWebHost(webHostBuilder =>
@@ -861,7 +919,60 @@ public async Task XForwardedProtoOverrideLimitedByLoopback(string protoHeader, s
                     };
                     if (!loopback)
                     {
+#pragma warning disable ASPDEPR005 // KnownNetworks is obsolete
                         options.KnownNetworks.Clear();
+#pragma warning restore ASPDEPR005 // KnownNetworks is obsolete
+                        options.KnownProxies.Clear();
+                    }
+                    app.UseForwardedHeaders(options);
+                });
+            }).Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
+
+        var context = await server.SendAsync(c =>
+        {
+            c.Request.Headers["X-Forwarded-Proto"] = protoHeader;
+            c.Request.Headers["X-Forwarded-For"] = forHeader;
+            c.Connection.RemoteIpAddress = IPAddress.Parse(remoteIp);
+        });
+
+        Assert.Equal(expected, context.Request.Scheme);
+    }
+
+    [Theory]
+    [InlineData("", "", "::1", false, "http")]
+    [InlineData("h1", "", "::1", false, "http")]
+    [InlineData("h1", "F::", "::1", false, "h1")]
+    [InlineData("h1", "F::", "E::", false, "h1")]
+    [InlineData("", "", "::1", true, "http")]
+    [InlineData("h1", "", "::1", true, "http")]
+    [InlineData("h1", "F::", "::1", true, "h1")]
+    [InlineData("h1", "", "F::", true, "http")]
+    [InlineData("h1", "E::", "F::", true, "http")]
+    [InlineData("h2, h1", "", "::1", true, "http")]
+    [InlineData("h2, h1", "F::, D::", "::1", true, "h1")]
+    [InlineData("h2, h1", "E::, D::", "F::", true, "http")]
+    public async Task XForwardedProtoOverrideLimitedByLoopback(string protoHeader, string forHeader, string remoteIp, bool loopback, string expected)
+    {
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                .UseTestServer()
+                .Configure(app =>
+                {
+                    var options = new ForwardedHeadersOptions
+                    {
+                        ForwardedHeaders = ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedFor,
+                        RequireHeaderSymmetry = true,
+                        ForwardLimit = 5,
+                    };
+                    if (!loopback)
+                    {
+                        options.KnownIPNetworks.Clear();
                         options.KnownProxies.Clear();
                     }
                     app.UseForwardedHeaders(options);
@@ -888,7 +999,7 @@ public void AllForwardsDisabledByDefault()
         var options = new ForwardedHeadersOptions();
         Assert.True(options.ForwardedHeaders == ForwardedHeaders.None);
         Assert.Equal(1, options.ForwardLimit);
-        Assert.Single(options.KnownNetworks);
+        Assert.Single(options.KnownIPNetworks);
         Assert.Single(options.KnownProxies);
     }
 
@@ -962,6 +1073,79 @@ public async Task AllOptionsDisabledRequestDoesntChange()
         Assert.Equal(PathString.Empty, context.Request.PathBase);
     }
 
+    [Theory]
+    [InlineData(ForwardedHeaders.XForwardedFor, false)]
+    [InlineData(ForwardedHeaders.XForwardedFor, true)]
+    [InlineData(ForwardedHeaders.XForwardedHost, false)]
+    [InlineData(ForwardedHeaders.XForwardedHost, true)]
+    [InlineData(ForwardedHeaders.XForwardedProto, false)]
+    [InlineData(ForwardedHeaders.XForwardedProto, true)]
+    [InlineData(ForwardedHeaders.XForwardedPrefix, false)]
+    [InlineData(ForwardedHeaders.XForwardedPrefix, true)]
+    public async Task IgnoreXForwardedHeadersFromUnknownProxy(ForwardedHeaders forwardedHeaders, bool unknownProxy)
+    {
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                .UseTestServer()
+                .Configure(app =>
+                {
+                    var options = new ForwardedHeadersOptions
+                    {
+                        ForwardedHeaders = forwardedHeaders
+                    };
+                    if (!unknownProxy)
+                    {
+                        var proxy = IPAddress.Parse("10.0.0.1");
+                        options.KnownProxies.Add(proxy);
+                    }
+                    app.UseForwardedHeaders(options);
+                });
+            }).Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
+
+        var context = await server.SendAsync(c =>
+        {
+            c.Request.Headers["X-Forwarded-For"] = "11.111.111.11";
+            c.Request.Headers["X-Forwarded-Host"] = "testhost";
+            c.Request.Headers["X-Forwarded-Proto"] = "Protocol";
+            c.Request.Headers["X-Forwarded-Prefix"] = "/pathbase";
+            c.Connection.RemoteIpAddress = IPAddress.Parse("10.0.0.1");
+            c.Connection.RemotePort = 99;
+        });
+
+        if (unknownProxy)
+        {
+            Assert.Equal("10.0.0.1", context.Connection.RemoteIpAddress.ToString());
+            Assert.Equal("localhost", context.Request.Host.ToString());
+            Assert.Equal("http", context.Request.Scheme);
+            Assert.Equal(PathString.Empty, context.Request.PathBase);
+        }
+        else
+        {
+            if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor))
+            {
+                Assert.Equal("11.111.111.11", context.Connection.RemoteIpAddress.ToString());
+            }
+            if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost))
+            {
+                Assert.Equal("testhost", context.Request.Host.ToString());
+            }
+            if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto))
+            {
+                Assert.Equal("Protocol", context.Request.Scheme);
+            }
+            if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedPrefix))
+            {
+                Assert.Equal("/pathbase", context.Request.PathBase);
+            }
+        }
+    }
+
     [Fact]
     public async Task PartiallyEnabledForwardsPartiallyChangesRequest()
     {
@@ -1019,7 +1203,7 @@ public async Task XForwardForIPv4ToIPv6Mapping(string forHeader, string knownPro
             var knownNetworkParts = knownNetwork.Split('/');
             var networkIp = IPAddress.Parse(knownNetworkParts[0]);
             var prefixLength = int.Parse(knownNetworkParts[1], CultureInfo.InvariantCulture);
-            options.KnownNetworks.Add(new IPNetwork(networkIp, prefixLength));
+            options.KnownIPNetworks.Add(new System.Net.IPNetwork(networkIp, prefixLength));
         }
 
         using var host = new HostBuilder()
@@ -1048,7 +1232,7 @@ public async Task XForwardForIPv4ToIPv6Mapping(string forHeader, string knownPro
     [Theory]
     [InlineData(1, "httpa, httpb, httpc", "httpc", "httpa,httpb")]
     [InlineData(2, "httpa, httpb, httpc", "httpb", "httpa")]
-    public async Task ForwardersWithDIOptionsRunsOnce(int limit, string header, string expectedScheme, string remainingHeader)
+    public async Task ForwardersWithDIOptionsRunsOnce_Obsolete(int limit, string header, string expectedScheme, string remainingHeader)
     {
         using var host = new HostBuilder()
             .ConfigureWebHost(webHostBuilder =>
@@ -1061,7 +1245,49 @@ public async Task ForwardersWithDIOptionsRunsOnce(int limit, string header, stri
                     {
                         options.ForwardedHeaders = ForwardedHeaders.XForwardedProto;
                         options.KnownProxies.Clear();
+#pragma warning disable ASPDEPR005 // KnownNetworks is obsolete
                         options.KnownNetworks.Clear();
+#pragma warning restore ASPDEPR005 // KnownNetworks is obsolete
+                        options.ForwardLimit = limit;
+                    });
+                })
+                .Configure(app =>
+                {
+                    app.UseForwardedHeaders();
+                    app.UseForwardedHeaders();
+                });
+            }).Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
+
+        var context = await server.SendAsync(c =>
+        {
+            c.Request.Headers["X-Forwarded-Proto"] = header;
+        });
+
+        Assert.Equal(expectedScheme, context.Request.Scheme);
+        Assert.Equal(remainingHeader, context.Request.Headers["X-Forwarded-Proto"].ToString());
+    }
+
+    [Theory]
+    [InlineData(1, "httpa, httpb, httpc", "httpc", "httpa,httpb")]
+    [InlineData(2, "httpa, httpb, httpc", "httpb", "httpa")]
+    public async Task ForwardersWithDIOptionsRunsOnce(int limit, string header, string expectedScheme, string remainingHeader)
+    {
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                .UseTestServer()
+                .ConfigureServices(services =>
+                {
+                    services.Configure<ForwardedHeadersOptions>(options =>
+                    {
+                        options.ForwardedHeaders = ForwardedHeaders.XForwardedProto;
+                        options.KnownProxies.Clear();
+                        options.KnownIPNetworks.Clear();
                         options.ForwardLimit = limit;
                     });
                 })
@@ -1088,7 +1314,7 @@ public async Task ForwardersWithDIOptionsRunsOnce(int limit, string header, stri
     [Theory]
     [InlineData(1, "httpa, httpb, httpc", "httpb", "httpa")]
     [InlineData(2, "httpa, httpb, httpc", "httpa", "")]
-    public async Task ForwardersWithDirectOptionsRunsTwice(int limit, string header, string expectedScheme, string remainingHeader)
+    public async Task ForwardersWithDirectOptionsRunsTwice_Obsolete(int limit, string header, string expectedScheme, string remainingHeader)
     {
         using var host = new HostBuilder()
             .ConfigureWebHost(webHostBuilder =>
@@ -1103,7 +1329,46 @@ public async Task ForwardersWithDirectOptionsRunsTwice(int limit, string header,
                         ForwardLimit = limit,
                     };
                     options.KnownProxies.Clear();
+#pragma warning disable ASPDEPR005 // KnownNetworks is obsolete
                     options.KnownNetworks.Clear();
+#pragma warning restore ASPDEPR005 // KnownNetworks is obsolete
+                    app.UseForwardedHeaders(options);
+                    app.UseForwardedHeaders(options);
+                });
+            }).Build();
+
+        await host.StartAsync();
+
+        var server = host.GetTestServer();
+
+        var context = await server.SendAsync(c =>
+        {
+            c.Request.Headers["X-Forwarded-Proto"] = header;
+        });
+
+        Assert.Equal(expectedScheme, context.Request.Scheme);
+        Assert.Equal(remainingHeader, context.Request.Headers["X-Forwarded-Proto"].ToString());
+    }
+
+    [Theory]
+    [InlineData(1, "httpa, httpb, httpc", "httpb", "httpa")]
+    [InlineData(2, "httpa, httpb, httpc", "httpa", "")]
+    public async Task ForwardersWithDirectOptionsRunsTwice(int limit, string header, string expectedScheme, string remainingHeader)
+    {
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                .UseTestServer()
+                .Configure(app =>
+                {
+                    var options = new ForwardedHeadersOptions
+                    {
+                        ForwardedHeaders = ForwardedHeaders.XForwardedProto,
+                        ForwardLimit = limit,
+                    };
+                    options.KnownProxies.Clear();
+                    options.KnownIPNetworks.Clear();
                     app.UseForwardedHeaders(options);
                     app.UseForwardedHeaders(options);
                 });
diff --git a/src/Middleware/HttpOverrides/test/IPNetworkTest.cs b/src/Middleware/HttpOverrides/test/IPNetworkTest.cs
index c8f33f7a333b..5ad9acfd925e 100644
--- a/src/Middleware/HttpOverrides/test/IPNetworkTest.cs
+++ b/src/Middleware/HttpOverrides/test/IPNetworkTest.cs
@@ -4,6 +4,7 @@
 
 namespace Microsoft.AspNetCore.HttpOverrides;
 
+[Obsolete("Microsoft.AspNetCore.HttpOverrides.IPNetwork is obsolete. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005")]
 public class IPNetworkTest
 {
     [Theory]
diff --git a/src/Middleware/Localization/Localization.slnf b/src/Middleware/Localization/Localization.slnf
index f5013069eb4f..32a18e226c53 100644
--- a/src/Middleware/Localization/Localization.slnf
+++ b/src/Middleware/Localization/Localization.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Middleware\\Localization.Routing\\src\\Microsoft.AspNetCore.Localization.Routing.csproj",
       "src\\Middleware\\Localization.Routing\\test\\Microsoft.AspNetCore.Localization.Routing.Tests.csproj",
diff --git a/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs b/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs
index a013faecae83..1c54a7beaa7b 100644
--- a/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs
+++ b/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs
@@ -28,8 +28,8 @@ public class RequestLocalizationMiddleware
     /// </summary>
     /// <param name="next">The <see cref="RequestDelegate"/> representing the next middleware in the pipeline.</param>
     /// <param name="options">The <see cref="RequestLocalizationOptions"/> representing the options for the
-    /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> used for logging.</param>
     /// <see cref="RequestLocalizationMiddleware"/>.</param>
+    /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> used for logging.</param>
     public RequestLocalizationMiddleware(RequestDelegate next, IOptions<RequestLocalizationOptions> options, ILoggerFactory loggerFactory)
     {
         ArgumentNullException.ThrowIfNull(options);
diff --git a/src/Middleware/Middleware.slnf b/src/Middleware/Middleware.slnf
index 6e82505ebfc3..1224b4f0c41b 100644
--- a/src/Middleware/Middleware.slnf
+++ b/src/Middleware/Middleware.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
diff --git a/src/Middleware/MiddlewareAnalysis/test/MiddlewareAnalysisTests.cs b/src/Middleware/MiddlewareAnalysis/test/MiddlewareAnalysisTests.cs
index 6b3562b06dfe..652a786268d6 100644
--- a/src/Middleware/MiddlewareAnalysis/test/MiddlewareAnalysisTests.cs
+++ b/src/Middleware/MiddlewareAnalysis/test/MiddlewareAnalysisTests.cs
@@ -49,10 +49,10 @@ public async Task ExceptionWrittenToDiagnostics()
         Assert.Equal(2, listener.MiddlewareStarting.Count);
         Assert.Equal("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareAnalysisTests+<>c", listener.MiddlewareStarting[1]);
         // reversed "RunInlineMiddleware"
-        Assert.Equal(1, listener.MiddlewareException.Count);
+        Assert.Single(listener.MiddlewareException);
         Assert.Equal("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareAnalysisTests+<>c", listener.MiddlewareException[0]);
         // reversed "Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware"
-        Assert.Equal(1, listener.MiddlewareFinished.Count);
+        Assert.Single(listener.MiddlewareFinished);
         Assert.Equal("Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware", listener.MiddlewareFinished[0]);
     }
 }
diff --git a/src/Middleware/OutputCaching/OutputCaching.slnf b/src/Middleware/OutputCaching/OutputCaching.slnf
index 6dc74ac1a264..5b80482441e5 100644
--- a/src/Middleware/OutputCaching/OutputCaching.slnf
+++ b/src/Middleware/OutputCaching/OutputCaching.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Middleware\\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\\src\\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.csproj",
       "src\\Middleware\\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\\test\\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.Tests.csproj",
diff --git a/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json b/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json
index 4ccd32c4500c..9b86ded6edb0 100644
--- a/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json
+++ b/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/bin/Debug/net9.0/OutputCachingSample.dll",
+            "program": "${workspaceFolder}/bin/Debug/net10.0/OutputCachingSample.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             "stopAtEntry": false,
diff --git a/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs b/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs
index a75546b6793f..38a38069b32c 100644
--- a/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs
+++ b/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using System.Linq;
 using Microsoft.Extensions.Caching.Memory;
 
 namespace Microsoft.AspNetCore.OutputCaching.Memory;
@@ -9,7 +10,7 @@ namespace Microsoft.AspNetCore.OutputCaching.Memory;
 internal sealed class MemoryOutputCacheStore : IOutputCacheStore
 {
     private readonly MemoryCache _cache;
-    private readonly Dictionary<string, HashSet<string>> _taggedEntries = new();
+    private readonly Dictionary<string, HashSet<TaggedEntry>> _taggedEntries = [];
     private readonly object _tagsLock = new();
 
     internal MemoryOutputCacheStore(MemoryCache cache)
@@ -20,7 +21,7 @@ internal MemoryOutputCacheStore(MemoryCache cache)
     }
 
     // For testing
-    internal Dictionary<string, HashSet<string>> TaggedEntries => _taggedEntries;
+    internal Dictionary<string, HashSet<string>> TaggedEntries => _taggedEntries.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Select(t => t.Key).ToHashSet());
 
     public ValueTask EvictByTagAsync(string tag, CancellationToken cancellationToken)
     {
@@ -30,7 +31,7 @@ public ValueTask EvictByTagAsync(string tag, CancellationToken cancellationToken
         {
             if (_taggedEntries.TryGetValue(tag, out var keys))
             {
-                if (keys != null && keys.Count > 0)
+                if (keys is { Count: > 0 })
                 {
                     // If MemoryCache changed to run eviction callbacks inline in Remove, iterating over keys could throw
                     // To prevent allocating a copy of the keys we check if the eviction callback ran,
@@ -40,7 +41,7 @@ public ValueTask EvictByTagAsync(string tag, CancellationToken cancellationToken
                     while (i > 0)
                     {
                         var oldCount = keys.Count;
-                        foreach (var key in keys)
+                        foreach (var (key, _) in keys)
                         {
                             _cache.Remove(key);
                             i--;
@@ -74,6 +75,8 @@ public ValueTask SetAsync(string key, byte[] value, string[]? tags, TimeSpan val
         ArgumentNullException.ThrowIfNull(key);
         ArgumentNullException.ThrowIfNull(value);
 
+        var entryId = Guid.NewGuid();
+
         if (tags != null)
         {
             // Lock with SetEntry() to prevent EvictByTagAsync() from trying to remove a tag whose entry hasn't been added yet.
@@ -90,27 +93,27 @@ public ValueTask SetAsync(string key, byte[] value, string[]? tags, TimeSpan val
 
                     if (!_taggedEntries.TryGetValue(tag, out var keys))
                     {
-                        keys = new HashSet<string>();
+                        keys = new HashSet<TaggedEntry>();
                         _taggedEntries[tag] = keys;
                     }
 
                     Debug.Assert(keys != null);
 
-                    keys.Add(key);
+                    keys.Add(new TaggedEntry(key, entryId));
                 }
 
-                SetEntry(key, value, tags, validFor);
+                SetEntry(key, value, tags, validFor, entryId);
             }
         }
         else
         {
-            SetEntry(key, value, tags, validFor);
+            SetEntry(key, value, tags, validFor, entryId);
         }
 
         return ValueTask.CompletedTask;
     }
 
-    void SetEntry(string key, byte[] value, string[]? tags, TimeSpan validFor)
+    private void SetEntry(string key, byte[] value, string[]? tags, TimeSpan validFor, Guid entryId)
     {
         Debug.Assert(key != null);
 
@@ -120,22 +123,25 @@ void SetEntry(string key, byte[] value, string[]? tags, TimeSpan validFor)
             Size = value.Length
         };
 
-        if (tags != null && tags.Length > 0)
+        if (tags is { Length: > 0 })
         {
             // Remove cache keys from tag lists when the entry is evicted
-            options.RegisterPostEvictionCallback(RemoveFromTags, tags);
+            options.RegisterPostEvictionCallback(RemoveFromTags, (tags, entryId));
         }
 
         _cache.Set(key, value, options);
     }
 
-    void RemoveFromTags(object key, object? value, EvictionReason reason, object? state)
+    private void RemoveFromTags(object key, object? value, EvictionReason reason, object? state)
     {
-        var tags = state as string[];
+        Debug.Assert(state != null);
+
+        var (tags, entryId) = ((string[] Tags, Guid EntryId))state;
 
         Debug.Assert(tags != null);
         Debug.Assert(tags.Length > 0);
         Debug.Assert(key is string);
+        Debug.Assert(entryId != Guid.Empty);
 
         lock (_tagsLock)
         {
@@ -143,7 +149,7 @@ void RemoveFromTags(object key, object? value, EvictionReason reason, object? st
             {
                 if (_taggedEntries.TryGetValue(tag, out var tagged))
                 {
-                    tagged.Remove((string)key);
+                    tagged.Remove(new TaggedEntry((string)key, entryId));
 
                     // Remove the collection if there is no more keys in it
                     if (tagged.Count == 0)
@@ -154,4 +160,6 @@ void RemoveFromTags(object key, object? value, EvictionReason reason, object? st
             }
         }
     }
+
+    private record TaggedEntry(string Key, Guid EntryId);
 }
diff --git a/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs b/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs
index b0184e1339a2..86267be94f29 100644
--- a/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs
+++ b/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs
@@ -50,8 +50,8 @@ public static IServiceCollection AddOutputCache(this IServiceCollection services
         ArgumentNullException.ThrowIfNull(services);
         ArgumentNullException.ThrowIfNull(configureOptions);
 
-        services.Configure(configureOptions);
         services.AddOutputCache();
+        services.Configure(configureOptions);
 
         return services;
     }
diff --git a/src/Middleware/OutputCaching/test/CachedResponseBodyTests.cs b/src/Middleware/OutputCaching/test/CachedResponseBodyTests.cs
index 89c371ea5f26..8d8c251f5708 100644
--- a/src/Middleware/OutputCaching/test/CachedResponseBodyTests.cs
+++ b/src/Middleware/OutputCaching/test/CachedResponseBodyTests.cs
@@ -4,6 +4,7 @@
 using System.Buffers;
 using System.Diagnostics;
 using System.IO.Pipelines;
+using Microsoft.AspNetCore.InternalTesting;
 
 namespace Microsoft.AspNetCore.OutputCaching.Tests;
 
@@ -41,6 +42,7 @@ public async Task Copy_DoNothingWhenNoSegments()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61053")]
     public async Task Copy_SingleSegment()
     {
         var segments = new List<byte[]>
@@ -64,6 +66,7 @@ public async Task Copy_SingleSegment()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60904")]
     public async Task Copy_MultipleSegments()
     {
         var segments = new List<byte[]>
diff --git a/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs b/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs
index e8c809911add..c1ad1d708f4b 100644
--- a/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs
+++ b/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs
@@ -197,6 +197,43 @@ public async Task ExpiredEntries_AreRemovedFromTags()
         Assert.Single(tag2s);
     }
 
+    [Fact]
+    public async Task ReplacedEntries_AreNotRemovedFromTags()
+    {
+        var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow };
+        var cache = new MemoryCache(new MemoryCacheOptions { SizeLimit = 1000, Clock = testClock, ExpirationScanFrequency = TimeSpan.FromMilliseconds(1) });
+        var store = new MemoryOutputCacheStore(cache);
+        var value = "abc"u8.ToArray();
+
+        await store.SetAsync("a", value, new[] { "tag1", "tag2" }, TimeSpan.FromMilliseconds(5), default);
+        await store.SetAsync("a", value, new[] { "tag1" }, TimeSpan.FromMilliseconds(20), default);
+
+        testClock.Advance(TimeSpan.FromMilliseconds(10));
+
+        // Trigger background expiration by accessing the cache.
+        _ = cache.Get("a");
+
+        var resulta = await store.GetAsync("a", default);
+
+        Assert.NotNull(resulta);
+
+        HashSet<string> tag1s, tag2s;
+
+        // Wait for the tag2 HashSet to be removed by the background expiration thread.
+
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30));
+
+        while (store.TaggedEntries.TryGetValue("tag2", out tag2s) && !cts.IsCancellationRequested)
+        {
+            await Task.Yield();
+        }
+
+        store.TaggedEntries.TryGetValue("tag1", out tag1s);
+
+        Assert.Null(tag2s);
+        Assert.Single(tag1s);
+    }
+
     [Theory]
     [InlineData(null)]
     public async Task Store_Throws_OnInvalidTag(string tag)
diff --git a/src/Middleware/OutputCaching/test/OutputCachePoliciesTests.cs b/src/Middleware/OutputCaching/test/OutputCachePoliciesTests.cs
index ec6991f2a6ce..7279c07500ed 100644
--- a/src/Middleware/OutputCaching/test/OutputCachePoliciesTests.cs
+++ b/src/Middleware/OutputCaching/test/OutputCachePoliciesTests.cs
@@ -188,7 +188,7 @@ public async Task VaryByHeadersPolicy_IsEmpty()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Empty(context.CacheVaryByRules.HeaderNames);
+        Assert.Equal(0, context.CacheVaryByRules.HeaderNames.Count);
     }
 
     [Fact]
@@ -214,7 +214,7 @@ public async Task VaryByHeadersPolicy_AddsMultipleHeaders()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Equal(headers, context.CacheVaryByRules.HeaderNames);
+        Assert.Equal(headers, context.CacheVaryByRules.HeaderNames.ToArray());
     }
 
     [Fact]
@@ -226,7 +226,7 @@ public async Task VaryByQueryPolicy_IsEmpty()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Empty(context.CacheVaryByRules.QueryKeys);
+        Assert.Equal(0, context.CacheVaryByRules.QueryKeys.Count);
     }
 
     [Fact]
@@ -252,7 +252,7 @@ public async Task VaryByQueryPolicy_AddsMultipleHeaders()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys);
+        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys.ToArray());
     }
 
     [Fact]
@@ -265,7 +265,7 @@ public async Task VaryByQueryPolicy_AddsMultipleHeadersArray()
 
         await policy.CacheRequestAsync(context, default);
 
-        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys);
+        Assert.Equal(queries, context.CacheVaryByRules.QueryKeys.ToArray());
     }
 
     [Fact]
diff --git a/src/Middleware/OutputCaching/test/TestUtils.cs b/src/Middleware/OutputCaching/test/TestUtils.cs
index e85214ec7445..ddaca73bd01b 100644
--- a/src/Middleware/OutputCaching/test/TestUtils.cs
+++ b/src/Middleware/OutputCaching/test/TestUtils.cs
@@ -159,6 +159,7 @@ private static IEnumerable<IHostBuilder> CreateBuildersWithOutputCaching(
                     {
                         services.AddOutputCache(outputCachingOptions =>
                         {
+                            Assert.NotNull(outputCachingOptions.ApplicationServices);
                             if (options != null)
                             {
                                 outputCachingOptions.MaximumBodySize = options.MaximumBodySize;
diff --git a/src/Middleware/RateLimiting/src/PublicAPI.Shipped.txt b/src/Middleware/RateLimiting/src/PublicAPI.Shipped.txt
index f7d3b893664d..636ddf670a01 100644
--- a/src/Middleware/RateLimiting/src/PublicAPI.Shipped.txt
+++ b/src/Middleware/RateLimiting/src/PublicAPI.Shipped.txt
@@ -33,6 +33,7 @@ static Microsoft.AspNetCore.Builder.RateLimiterApplicationBuilderExtensions.UseR
 static Microsoft.AspNetCore.Builder.RateLimiterEndpointConventionBuilderExtensions.DisableRateLimiting<TBuilder>(this TBuilder builder) -> TBuilder
 static Microsoft.AspNetCore.Builder.RateLimiterEndpointConventionBuilderExtensions.RequireRateLimiting<TBuilder, TPartitionKey>(this TBuilder builder, Microsoft.AspNetCore.RateLimiting.IRateLimiterPolicy<TPartitionKey>! policy) -> TBuilder
 static Microsoft.AspNetCore.Builder.RateLimiterEndpointConventionBuilderExtensions.RequireRateLimiting<TBuilder>(this TBuilder builder, string! policyName) -> TBuilder
+static Microsoft.AspNetCore.Builder.RateLimiterServiceCollectionExtensions.AddRateLimiter(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.AspNetCore.Builder.RateLimiterServiceCollectionExtensions.AddRateLimiter(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.RateLimiting.RateLimiterOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.AspNetCore.RateLimiting.RateLimiterOptionsExtensions.AddConcurrencyLimiter(this Microsoft.AspNetCore.RateLimiting.RateLimiterOptions! options, string! policyName, System.Action<System.Threading.RateLimiting.ConcurrencyLimiterOptions!>! configureOptions) -> Microsoft.AspNetCore.RateLimiting.RateLimiterOptions!
 static Microsoft.AspNetCore.RateLimiting.RateLimiterOptionsExtensions.AddFixedWindowLimiter(this Microsoft.AspNetCore.RateLimiting.RateLimiterOptions! options, string! policyName, System.Action<System.Threading.RateLimiting.FixedWindowRateLimiterOptions!>! configureOptions) -> Microsoft.AspNetCore.RateLimiting.RateLimiterOptions!
diff --git a/src/Middleware/RateLimiting/src/PublicAPI.Unshipped.txt b/src/Middleware/RateLimiting/src/PublicAPI.Unshipped.txt
index dc6c7f9e9fe5..7dc5c58110bf 100644
--- a/src/Middleware/RateLimiting/src/PublicAPI.Unshipped.txt
+++ b/src/Middleware/RateLimiting/src/PublicAPI.Unshipped.txt
@@ -1,2 +1 @@
 #nullable enable
-static Microsoft.AspNetCore.Builder.RateLimiterServiceCollectionExtensions.AddRateLimiter(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs b/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs
index 71cd050492ce..3f7c99368e83 100644
--- a/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs
+++ b/src/Middleware/RequestDecompression/src/RequestDecompressionMiddleware.cs
@@ -62,7 +62,9 @@ private async Task InvokeCore(HttpContext context, Stream decompressionStream)
                 context.GetEndpoint()?.Metadata?.GetMetadata<IRequestSizeLimitMetadata>()?.MaxRequestBodySize
                     ?? context.Features.Get<IHttpMaxRequestBodySizeFeature>()?.MaxRequestBodySize;
 
-            context.Request.Body = new SizeLimitedStream(decompressionStream, sizeLimit);
+            context.Request.Body = new SizeLimitedStream(decompressionStream, sizeLimit, static (long sizeLimit) => throw new BadHttpRequestException(
+                    $"The decompressed request body is larger than the request body size limit {sizeLimit}.",
+                    StatusCodes.Status413PayloadTooLarge));
             await _next(context);
         }
         finally
diff --git a/src/Middleware/RequestDecompression/test/DefaultRequestDecompressionProviderTests.cs b/src/Middleware/RequestDecompression/test/DefaultRequestDecompressionProviderTests.cs
index a9d34921ac3f..74ba4e65169c 100644
--- a/src/Middleware/RequestDecompression/test/DefaultRequestDecompressionProviderTests.cs
+++ b/src/Middleware/RequestDecompression/test/DefaultRequestDecompressionProviderTests.cs
@@ -45,7 +45,7 @@ public void GetDecompressionProvider_SupportedContentEncoding_ReturnsProvider(
             $"The request will be decompressed with '{contentEncoding.ToLowerInvariant()}'.");
 
         var contentEncodingHeader = httpContext.Request.Headers.ContentEncoding;
-        Assert.Empty(contentEncodingHeader);
+        Assert.Equal(0, contentEncodingHeader.Count);
     }
 
     [Fact]
@@ -70,7 +70,7 @@ public void GetDecompressionProvider_NoContentEncoding_ReturnsNull()
             "The Content-Encoding header is empty or not specified. Skipping request decompression.");
 
         var contentEncodingHeader = httpContext.Request.Headers.ContentEncoding;
-        Assert.Empty(contentEncodingHeader);
+        Assert.Equal(0, contentEncodingHeader.Count);
     }
 
     [Fact]
diff --git a/src/Middleware/RequestDecompression/test/RequestDecompressionMiddlewareTests.cs b/src/Middleware/RequestDecompression/test/RequestDecompressionMiddlewareTests.cs
index f82391784713..54e0c685adc7 100644
--- a/src/Middleware/RequestDecompression/test/RequestDecompressionMiddlewareTests.cs
+++ b/src/Middleware/RequestDecompression/test/RequestDecompressionMiddlewareTests.cs
@@ -319,7 +319,7 @@ public async Task Request_Decompressed_ContentEncodingHeaderRemoved(bool isDecom
 
         if (isDecompressed)
         {
-            Assert.Empty(contentEncodingHeader);
+            Assert.Equal(0, contentEncodingHeader.Count);
 
             AssertDecompressedWithLog(logMessages, contentEncoding);
             Assert.Equal(uncompressedBytes, outputBytes);
@@ -499,8 +499,8 @@ public async Task Endpoint_HasRequestSizeLimit_UsedForRequest(bool exceedsLimit)
         if (exceedsLimit)
         {
             Assert.NotNull(exception);
-            Assert.IsAssignableFrom<InvalidOperationException>(exception);
-            Assert.Equal("The maximum number of bytes have been read.", exception.Message);
+            Assert.IsAssignableFrom<BadHttpRequestException>(exception);
+            Assert.Equal(StatusCodes.Status413PayloadTooLarge, ((BadHttpRequestException)exception).StatusCode);
         }
         else
         {
@@ -583,8 +583,8 @@ public async Task Feature_HasRequestSizeLimit_UsedForRequest(bool exceedsLimit)
         if (exceedsLimit)
         {
             Assert.NotNull(exception);
-            Assert.IsAssignableFrom<InvalidOperationException>(exception);
-            Assert.Equal("The maximum number of bytes have been read.", exception.Message);
+            Assert.IsAssignableFrom<BadHttpRequestException>(exception);
+            Assert.Equal(StatusCodes.Status413PayloadTooLarge, ((BadHttpRequestException)exception).StatusCode);
         }
         else
         {
diff --git a/src/Middleware/ResponseCaching/test/CachedResponseBodyTests.cs b/src/Middleware/ResponseCaching/test/CachedResponseBodyTests.cs
index ce5e1baf6580..c74777cf0bdb 100644
--- a/src/Middleware/ResponseCaching/test/CachedResponseBodyTests.cs
+++ b/src/Middleware/ResponseCaching/test/CachedResponseBodyTests.cs
@@ -4,6 +4,7 @@
 using System.Buffers;
 using System.Diagnostics;
 using System.IO.Pipelines;
+using Microsoft.AspNetCore.InternalTesting;
 
 namespace Microsoft.AspNetCore.ResponseCaching.Tests;
 
@@ -70,6 +71,7 @@ public async Task Copy_SingleSegment()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61293")]
     public async Task Copy_MultipleSegments()
     {
         var segments = new List<byte[]>
diff --git a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs
index f79098e83c3d..42ac59cea565 100644
--- a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs
+++ b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs
@@ -476,7 +476,7 @@ public async Task Request_Https_CompressedIfEnabled(bool enableHttps, int expect
 
         var response = await client.SendAsync(request);
 
-        Assert.Equal(expectedLength, response.Content.ReadAsByteArrayAsync().Result.Length);
+        Assert.Equal(expectedLength, (await response.Content.ReadAsByteArrayAsync()).Length);
 
         var logMessages = sink.Writes.ToList();
         if (enableHttps)
@@ -539,7 +539,7 @@ public async Task Request_Https_CompressedIfOptIn(HttpsCompressionMode mode, int
 
         var response = await client.SendAsync(request);
 
-        Assert.Equal(expectedLength, response.Content.ReadAsByteArrayAsync().Result.Length);
+        Assert.Equal(expectedLength, (await response.Content.ReadAsByteArrayAsync()).Length);
 
         var logMessages = sink.Writes.ToList();
         if (mode == HttpsCompressionMode.Compress)
@@ -602,7 +602,7 @@ public async Task Request_Https_NotCompressedIfOptOut(HttpsCompressionMode mode,
 
         var response = await client.SendAsync(request);
 
-        Assert.Equal(expectedLength, response.Content.ReadAsByteArrayAsync().Result.Length);
+        Assert.Equal(expectedLength, (await response.Content.ReadAsByteArrayAsync()).Length);
 
         var logMessages = sink.Writes.ToList();
         if (mode == HttpsCompressionMode.DoNotCompress)
diff --git a/src/Middleware/Rewrite/src/RewriteMiddleware.cs b/src/Middleware/Rewrite/src/RewriteMiddleware.cs
index d76ea33d21f5..7dcd2ca11b05 100644
--- a/src/Middleware/Rewrite/src/RewriteMiddleware.cs
+++ b/src/Middleware/Rewrite/src/RewriteMiddleware.cs
@@ -77,11 +77,7 @@ public Task Invoke(HttpContext context)
                 // An endpoint may have already been set. Since we're going to re-invoke the middleware pipeline we need to reset
                 // the endpoint and route values to ensure things are re-calculated.
                 context.SetEndpoint(endpoint: null);
-                var routeValuesFeature = context.Features.Get<IRouteValuesFeature>();
-                if (routeValuesFeature is not null)
-                {
-                    routeValuesFeature.RouteValues = null!;
-                }
+                context.Features.Get<IRouteValuesFeature>()?.RouteValues = null!;
                 return _options.BranchedNext(context);
             }
         }
diff --git a/src/Middleware/Rewrite/src/RewriteOptionsExtensions.cs b/src/Middleware/Rewrite/src/RewriteOptionsExtensions.cs
index 7a0841b1dd32..e018c287f872 100644
--- a/src/Middleware/Rewrite/src/RewriteOptionsExtensions.cs
+++ b/src/Middleware/Rewrite/src/RewriteOptionsExtensions.cs
@@ -50,7 +50,8 @@ public static RewriteOptions AddRewrite(this RewriteOptions options, [StringSynt
     }
 
     /// <summary>
-    /// Redirect the request if the regex matches the HttpContext's PathString
+    /// Redirect the request if the regex matches the HttpContext's PathString, with returning a 302
+    /// status code for found.
     /// </summary>
     /// <param name="options">The <see cref="RewriteOptions"/>.</param>
     /// <param name="regex">The regex string to compare with.</param>
diff --git a/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs b/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs
index 4c29d034aee4..3954db7a7053 100644
--- a/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs
+++ b/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs
@@ -31,11 +31,8 @@ public override void ApplyAction(RewriteContext context, BackReferenceCollection
 
         if (!string.IsNullOrEmpty(StatusDescription))
         {
-            var feature = context.HttpContext.Features.Get<IHttpBodyControlFeature>();
-            if (feature != null)
-            {
-                feature.AllowSynchronousIO = true;
-            }
+            context.HttpContext.Features.Get<IHttpBodyControlFeature>()?.AllowSynchronousIO = true;
+
             var content = Encoding.UTF8.GetBytes(StatusDescription);
             response.ContentLength = content.Length;
             response.ContentType = "text/plain; charset=utf-8";
diff --git a/src/Middleware/Rewrite/test/IISUrlRewrite/InputParserTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/InputParserTests.cs
index e73666dc1c32..387373926bb5 100644
--- a/src/Middleware/Rewrite/test/IISUrlRewrite/InputParserTests.cs
+++ b/src/Middleware/Rewrite/test/IISUrlRewrite/InputParserTests.cs
@@ -18,7 +18,7 @@ public void InputParser_ParseLiteralString()
     {
         var testString = "hello/hey/what";
         var result = new InputParser().ParseInputString(testString, UriMatchPart.Path);
-        Assert.Equal(1, result.PatternSegments.Count);
+        Assert.Single(result.PatternSegments);
     }
 
     [Theory]
@@ -146,7 +146,7 @@ public void Should_parse_RewriteMapSegment_and_successfully_evaluate_result()
 
         var inputString = $"{{{expectedMapName}:{{R:1}}}}";
         var pattern = new InputParser(maps, false).ParseInputString(inputString, UriMatchPart.Path);
-        Assert.Equal(1, pattern.PatternSegments.Count);
+        Assert.Single(pattern.PatternSegments);
 
         var segment = pattern.PatternSegments.Single();
         var rewriteMapSegment = segment as RewriteMapSegment;
diff --git a/src/Middleware/Rewrite/test/IISUrlRewrite/UrlRewriteApplicationTests.cs b/src/Middleware/Rewrite/test/IISUrlRewrite/UrlRewriteApplicationTests.cs
index 2ec3fe694334..3113203867b3 100644
--- a/src/Middleware/Rewrite/test/IISUrlRewrite/UrlRewriteApplicationTests.cs
+++ b/src/Middleware/Rewrite/test/IISUrlRewrite/UrlRewriteApplicationTests.cs
@@ -22,7 +22,7 @@ public void ApplyRule_AssertStopProcessingFlagWillTerminateOnNoAction()
                 </rewrite>");
         var rules = new UrlRewriteFileParser().Parse(xml, false);
 
-        Assert.Equal(1, rules.Count);
+        Assert.Single(rules);
         var context = new RewriteContext { HttpContext = new DefaultHttpContext() };
         rules.FirstOrDefault().ApplyRule(context);
         Assert.Equal(RuleResult.SkipRemainingRules, context.Result);
@@ -41,7 +41,7 @@ public void ApplyRule_AssertNoTerminateFlagWillNotTerminateOnNoAction()
                 </rewrite>");
         var rules = new UrlRewriteFileParser().Parse(xml, false);
 
-        Assert.Equal(1, rules.Count);
+        Assert.Single(rules);
         var context = new RewriteContext { HttpContext = new DefaultHttpContext() };
         rules.FirstOrDefault().ApplyRule(context);
         Assert.Equal(RuleResult.ContinueRules, context.Result);
@@ -63,7 +63,7 @@ public void ApplyRule_TrackAllCaptures()
                 </rewrite>");
         var rules = new UrlRewriteFileParser().Parse(xml, false);
 
-        Assert.Equal(1, rules.Count);
+        Assert.Single(rules);
         Assert.True(rules[0].Conditions.TrackAllCaptures);
         var context = new RewriteContext { HttpContext = new DefaultHttpContext() };
         rules.FirstOrDefault().ApplyRule(context);
diff --git a/src/Middleware/Session/Session.slnf b/src/Middleware/Session/Session.slnf
index d18b6b3216cf..f08ee4babece 100644
--- a/src/Middleware/Session/Session.slnf
+++ b/src/Middleware/Session/Session.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
diff --git a/src/Middleware/Session/test/SessionTests.cs b/src/Middleware/Session/test/SessionTests.cs
index ce40d19d8084..34ac0ddda40e 100644
--- a/src/Middleware/Session/test/SessionTests.cs
+++ b/src/Middleware/Session/test/SessionTests.cs
@@ -1014,7 +1014,7 @@ public async Task SessionLogsCacheCommitCanceledException()
         Assert.Contains("Session stored", sessionLogMessages[1].State.ToString());
         Assert.Equal(LogLevel.Debug, sessionLogMessages[1].LogLevel);
 
-        Assert.Empty(sink.Writes.Where(message => message.LoggerName.Equals(typeof(SessionMiddleware).FullName, StringComparison.Ordinal)));
+        Assert.DoesNotContain(sink.Writes, message => message.LoggerName.Equals(typeof(SessionMiddleware).FullName, StringComparison.Ordinal));
     }
 
     [Fact]
@@ -1078,7 +1078,7 @@ public async Task RequestAbortedIgnored()
         Assert.Contains("Session stored", sessionLogMessages[1].State.ToString());
         Assert.Equal(LogLevel.Debug, sessionLogMessages[1].LogLevel);
 
-        Assert.Empty(sink.Writes.Where(message => message.LoggerName.Equals(typeof(SessionMiddleware).FullName, StringComparison.Ordinal)));
+        Assert.DoesNotContain(sink.Writes, message => message.LoggerName.Equals(typeof(SessionMiddleware).FullName, StringComparison.Ordinal));
     }
 
     [Fact]
diff --git a/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj b/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj
index 17e20fdc10cc..56847fc93bde 100644
--- a/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj
+++ b/src/Middleware/Spa/SpaServices.Extensions/test/Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj
@@ -13,7 +13,6 @@
     <Reference Include="Microsoft.Extensions.DiagnosticAdapter" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
-    <Reference Include="System.Net.Http" />
     <Content Include="js\**\*" />
   </ItemGroup>
 
diff --git a/src/Middleware/StaticFiles/StaticFiles.slnf b/src/Middleware/StaticFiles/StaticFiles.slnf
index 97265e2e908d..540ce174977d 100644
--- a/src/Middleware/StaticFiles/StaticFiles.slnf
+++ b/src/Middleware/StaticFiles/StaticFiles.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
diff --git a/src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs b/src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs
index 541b43e3d1ae..b5d9a247c7bf 100644
--- a/src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs
+++ b/src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs
@@ -52,6 +52,7 @@ public FileExtensionContentTypeProvider()
                 { ".atom", "application/atom+xml" },
                 { ".au", "audio/basic" },
                 { ".avi", "video/x-msvideo" },
+                { ".avif", "image/avif" },
                 { ".axs", "application/olescript" },
                 { ".bas", "text/plain" },
                 { ".bcpio", "application/x-bcpio" },
diff --git a/src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs b/src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs
index 2cd66530ec05..83a7c74b89b3 100644
--- a/src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs
+++ b/src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs
@@ -79,7 +79,7 @@ header h1 {
         vertical-align: bottom;
         padding: 10px 5px 5px 5px;
         font-weight: 400;
-        color: #a0a0a0;
+        color: #737373;
         text-align: center; }
     #index td { padding: 3px 10px; }
     #index th, #index td {
@@ -91,7 +91,7 @@ header h1 {
     #index th:last-child, #index td:last-child {
         border-right: 1px transparent solid; }
     #index td.length, td.modified { text-align:right; }
-    a { color:#1ba1e2;text-decoration:none; }
+    a { color:#127aac;text-decoration:none; }
     a:hover { color:#13709e;text-decoration:underline; }
   </style>
 </head>
diff --git a/src/Middleware/StaticFiles/src/StaticFileContext.cs b/src/Middleware/StaticFiles/src/StaticFileContext.cs
index 69e8d8c59576..48bd8692496f 100644
--- a/src/Middleware/StaticFiles/src/StaticFileContext.cs
+++ b/src/Middleware/StaticFiles/src/StaticFileContext.cs
@@ -407,11 +407,7 @@ private ContentRangeHeaderValue ComputeContentRange(RangeItemHeaderValue range,
     // Only called when we expect to serve the body.
     private void SetCompressionMode()
     {
-        var responseCompressionFeature = _context.Features.Get<IHttpsCompressionFeature>();
-        if (responseCompressionFeature != null)
-        {
-            responseCompressionFeature.Mode = _options.HttpsCompression;
-        }
+        _context.Features.Get<IHttpsCompressionFeature>()?.Mode = _options.HttpsCompression;
     }
 
     internal enum PreconditionState : byte
diff --git a/src/Middleware/WebSockets/WebSockets.slnf b/src/Middleware/WebSockets/WebSockets.slnf
index ae0f653df720..84162e1c47c4 100644
--- a/src/Middleware/WebSockets/WebSockets.slnf
+++ b/src/Middleware/WebSockets/WebSockets.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
diff --git a/src/Middleware/WebSockets/src/PublicAPI.Shipped.txt b/src/Middleware/WebSockets/src/PublicAPI.Shipped.txt
index 6d316d9ba21d..c3858c183339 100644
--- a/src/Middleware/WebSockets/src/PublicAPI.Shipped.txt
+++ b/src/Middleware/WebSockets/src/PublicAPI.Shipped.txt
@@ -9,6 +9,8 @@ Microsoft.AspNetCore.Builder.WebSocketOptions
 Microsoft.AspNetCore.Builder.WebSocketOptions.AllowedOrigins.get -> System.Collections.Generic.IList<string!>!
 Microsoft.AspNetCore.Builder.WebSocketOptions.KeepAliveInterval.get -> System.TimeSpan
 Microsoft.AspNetCore.Builder.WebSocketOptions.KeepAliveInterval.set -> void
+Microsoft.AspNetCore.Builder.WebSocketOptions.KeepAliveTimeout.get -> System.TimeSpan
+Microsoft.AspNetCore.Builder.WebSocketOptions.KeepAliveTimeout.set -> void
 Microsoft.AspNetCore.Builder.WebSocketOptions.ReceiveBufferSize.get -> int
 Microsoft.AspNetCore.Builder.WebSocketOptions.ReceiveBufferSize.set -> void
 Microsoft.AspNetCore.Builder.WebSocketOptions.WebSocketOptions() -> void
diff --git a/src/Middleware/WebSockets/src/PublicAPI.Unshipped.txt b/src/Middleware/WebSockets/src/PublicAPI.Unshipped.txt
index 913e2d3dc9f3..7dc5c58110bf 100644
--- a/src/Middleware/WebSockets/src/PublicAPI.Unshipped.txt
+++ b/src/Middleware/WebSockets/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Builder.WebSocketOptions.KeepAliveTimeout.get -> System.TimeSpan
-Microsoft.AspNetCore.Builder.WebSocketOptions.KeepAliveTimeout.set -> void
diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs
index 57468bf4ee71..c1db5bc928c1 100644
--- a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs
+++ b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs
@@ -135,7 +135,7 @@ public async Task DeployTestAndAddToSpec(ServerType server, bool ssl, string env
         {
             Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp),
             ApplicationType = ApplicationType.Portable,
-            TargetFramework = "Net9.0",
+            TargetFramework = "Net10.0",
             EnvironmentName = environment,
             SiteName = "HttpTestSite", // This is configured in the Http.config
             ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null,
diff --git a/src/Middleware/WebSockets/test/UnitTests/SendReceiveTests.cs b/src/Middleware/WebSockets/test/UnitTests/SendReceiveTests.cs
index 93f753699e6e..deececfd31e2 100644
--- a/src/Middleware/WebSockets/test/UnitTests/SendReceiveTests.cs
+++ b/src/Middleware/WebSockets/test/UnitTests/SendReceiveTests.cs
@@ -94,7 +94,7 @@ public async Task ThrowsWhenUnderlyingStreamClosed()
             await pair.ClientSocket.ReceiveAsync(new ArraySegment<byte>(receiveBuffer), CancellationToken.None);
 
             // The exception should prevent this line from running
-            Assert.False(true, "Expected an exception to be thrown!");
+            Assert.Fail("Expected an exception to be thrown!");
         }
         catch (WebSocketException ex)
         {
diff --git a/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
index 71fc8ecf46d9..2bfe14ff7b45 100644
--- a/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
+++ b/src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
@@ -33,6 +33,11 @@ public class ApiResponseType
     /// </remarks>
     public Type? Type { get; set; }
 
+    /// <summary>
+    /// Gets or sets the description of the response.
+    /// </summary>
+    public string? Description { get; set; }
+
     /// <summary>
     /// Gets or sets the HTTP response status code.
     /// </summary>
diff --git a/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs
index 0a8fdabbf812..a938939796c6 100644
--- a/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs
+++ b/src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters;
 /// <para>
 /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
 /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
-/// <see cref="IResultFilter"/>. <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+/// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
 /// are also not executed in cases where an exception filter handles an exception by producing an action result.
 /// </para>
 /// <para>
diff --git a/src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs b/src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs
index 69c87abd8132..b47ca1fa1470 100644
--- a/src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs
+++ b/src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters;
 /// <para>
 /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
 /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
-/// <see cref="IResultFilter"/>. <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+/// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
 /// are also not executed in cases where an exception filter handles an exception by producing an action result.
 /// </para>
 /// <para>
diff --git a/src/Mvc/Mvc.Abstractions/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Abstractions/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..ada28c50d99a 100644
--- a/src/Mvc/Mvc.Abstractions/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.Abstractions/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType.Description.get -> string?
+Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType.Description.set -> void
diff --git a/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs
index 9a5954668b5e..544db549bfc3 100644
--- a/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs
+++ b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ValueProviderResultTest.cs
@@ -15,7 +15,7 @@ public void Construct_With_NullString()
 
         // Assert
         Assert.Equal(0, result.Length);
-        Assert.Empty(result.Values);
+        Assert.Equal(0, result.Values.Count);
         Assert.Null(result.FirstValue);
         Assert.Equal(ValueProviderResult.None, result);
         Assert.Empty((string)result);
@@ -30,7 +30,7 @@ public void Construct_With_NullArray()
 
         // Assert
         Assert.Equal(0, result.Length);
-        Assert.Empty(result.Values);
+        Assert.Equal(0, result.Values.Count);
         Assert.Null(result.FirstValue);
         Assert.Equal(ValueProviderResult.None, result);
         Assert.Empty((string)result);
@@ -45,7 +45,7 @@ public void Construct_With_None()
 
         // Assert
         Assert.Equal(0, result.Length);
-        Assert.Empty(result.Values);
+        Assert.Equal(0, result.Values.Count);
         Assert.Null(result.FirstValue);
         Assert.Equal(ValueProviderResult.None, result);
         Assert.Equal(ValueProviderResult.None, new ValueProviderResult(new StringValues()));
@@ -76,7 +76,7 @@ public void Construct_With_Array()
 
         // Assert
         Assert.Equal(2, result.Length);
-        Assert.Equal(new string[] { "Hi", "There" }, result.Values);
+        Assert.Equal(new string[] { "Hi", "There" }, result.Values.ToArray());
         Assert.Equal("Hi", result.FirstValue);
         Assert.NotEqual(ValueProviderResult.None, result);
         Assert.Equal("Hi,There", (string)result);
diff --git a/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs b/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs
index 3f9d4c28bf2b..b8ec5ab83354 100644
--- a/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs
+++ b/src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.CodeAnalysis;
@@ -8,12 +8,15 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers;
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
 public static class DiagnosticDescriptors
 {
+    private const string Naming = "Naming";
+    private const string Usage = "Usage";
+
     public static readonly DiagnosticDescriptor MVC1000_HtmlHelperPartialShouldBeAvoided =
         new DiagnosticDescriptor(
             "MVC1000",
             "Use of IHtmlHelper.{0} should be avoided",
             "Use of IHtmlHelper.{0} may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.{0}Async.",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true);
 
@@ -22,7 +25,7 @@ public static class DiagnosticDescriptors
             "MVC1001",
             "Filters cannot be applied to page handler methods",
             "'{0}' cannot be applied to Razor Page handler methods. It may be applied either to the Razor Page model or applied globally.",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true);
 
@@ -31,7 +34,7 @@ public static class DiagnosticDescriptors
             "MVC1002",
             "Route attributes cannot be applied to page handler methods",
             "'{0}' cannot be applied to Razor Page handler methods. Routes for Razor Pages must be declared using the @page directive or using conventions.",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true);
 
@@ -40,7 +43,7 @@ public static class DiagnosticDescriptors
             "MVC1003",
             "Route attributes cannot be applied to page models",
             "'{0}' cannot be applied to a Razor Page model. Routes for Razor Pages must be declared using the @page directive or using conventions.",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true);
 
@@ -50,7 +53,7 @@ public static class DiagnosticDescriptors
             "Rename model bound parameter",
             "Property on type '{0}' has the same name as parameter '{1}'. This may result in incorrect model binding. " +
             "Consider renaming the parameter or the property to avoid conflicts. If the type '{0}' has a custom type converter or custom model binder, you can suppress this message.",
-            "Naming",
+            Naming,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true,
             helpLinkUri: "https://aka.ms/AA20pbc");
@@ -62,7 +65,7 @@ public static class DiagnosticDescriptors
             "MVC1006",
             "Methods containing TagHelpers must be async and return Task",
             "The method contains a TagHelper and therefore must be async and return a Task. For instance, usage of ~/ typically results in a TagHelper and requires an async Task returning parent method.",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Error,
             isEnabledByDefault: true);
 }
diff --git a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
index fe7ff9461633..a1d483ef99f4 100644
--- a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
+++ b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
@@ -7,7 +7,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Microsoft.AspNetCore.Mvc.Analyzers;
 
@@ -373,7 +372,7 @@ public void OnGet()
 
     private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
     {
-        var test = new AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest(TestReferences.MetadataReferences)
+        var test = new AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest(TestReferences.MetadataReferences)
         {
             TestCode = source,
             ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies,
@@ -383,9 +382,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
         return test.RunAsync();
     }
 
-    private sealed class AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, XUnitVerifier>
+    private sealed class AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, DefaultVerifier>
     {
-        public AttributesShouldNotBeAppliedToPageModelCSharpAnalzyerTest(ImmutableArray<MetadataReference> metadataReferences)
+        public AttributesShouldNotBeAppliedToPageModelCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
         {
             TestState.AdditionalReferences.AddRange(metadataReferences);
         }
diff --git a/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
index 142a2a01801c..af74e87a0f58 100644
--- a/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
+++ b/src/Mvc/Mvc.Analyzers/test/AvoidHtmlPartialAnalyzerTest.cs
@@ -7,7 +7,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Microsoft.AspNetCore.Mvc.Analyzers;
 
@@ -412,7 +411,7 @@ public class DiagnosticsAreReturned_ForUseOfHtmlRenderPartial_InSections : globa
 
     private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
     {
-        var test = new AvoidHtmlPartialCSharpAnalzyerTest(TestReferences.MetadataReferences)
+        var test = new AvoidHtmlPartialCSharpAnalyzerTest(TestReferences.MetadataReferences)
         {
             TestCode = source,
             ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies,
@@ -422,9 +421,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
         return test.RunAsync();
     }
 
-    internal sealed class AvoidHtmlPartialCSharpAnalzyerTest : CSharpAnalyzerTest<AvoidHtmlPartialAnalyzer, XUnitVerifier>
+    internal sealed class AvoidHtmlPartialCSharpAnalyzerTest : CSharpAnalyzerTest<AvoidHtmlPartialAnalyzer, DefaultVerifier>
     {
-        public AvoidHtmlPartialCSharpAnalzyerTest(ImmutableArray<MetadataReference> metadataReferences)
+        public AvoidHtmlPartialCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
         {
             TestState.AdditionalReferences.AddRange(metadataReferences);
         }
diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
index 58253fa10667..eb6895f3e4db 100644
--- a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
+++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
@@ -16,7 +16,7 @@
     <Reference Include="Microsoft.Extensions.DependencyModel" />
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs
index c47fadb7b721..fa291014b620 100644
--- a/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs
+++ b/src/Mvc/Mvc.Analyzers/test/TagHelpersInCodeBlocksAnalyzerTest.cs
@@ -7,7 +7,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Microsoft.AspNetCore.Mvc.Analyzers;
 
@@ -58,7 +57,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInActions : global::Micros
         {
             WriteLiteral(""\r\n"");
             WriteLiteral(""\r\n"");
-  
+
     Action sometMethod = {|#0:() =>
     {
 
@@ -151,7 +150,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInNonAsyncFunc : global::M
         {
             WriteLiteral(""\r\n"");
             WriteLiteral(""\r\n"");
-  
+
     Func<Task> sometMethod = {|#0:() =>
     {
 
@@ -243,13 +242,13 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidClassMethods : globa
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral(""\r\n"");
-  
+
     SometMethod();
 
             WriteLiteral(""\r\n"");
         }
         #pragma warning restore 1998
-            
+
     {|#0:void SometMethod()
     {
 
@@ -336,7 +335,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global::
         {
             WriteLiteral(""\r\n"");
             WriteLiteral(""\r\n"");
-  
+
     TestDelegate sometMethod = {|#0:delegate ()
     {
 
@@ -368,7 +367,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidDelegates : global::
             WriteLiteral(""\r\n"");
         }
         #pragma warning restore 1998
-            
+
     delegate void TestDelegate();
 
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
@@ -430,7 +429,7 @@ public class DiagnosticsAreReturned_ForUseOfTagHelpersInVoidLocalFunctions : glo
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral(""\r\n"");
-  
+
     {|#0:void SometMethod()
     {
 
@@ -520,13 +519,13 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncClassMethods_ : g
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral(""\r\n"");
-  
+
     await SometMethod();
 
             WriteLiteral(""\r\n"");
         }
         #pragma warning restore 1998
-            
+
     async Task SometMethod()
     {
 
@@ -611,7 +610,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : glob
         {
             WriteLiteral(""\r\n"");
             WriteLiteral(""\r\n"");
-  
+
     TestDelegate sometMethod = async delegate ()
     {
 
@@ -643,7 +642,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncDelegates_ : glob
             WriteLiteral(""\r\n"");
         }
         #pragma warning restore 1998
-            
+
     delegate Task TestDelegate();
 
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
@@ -707,7 +706,7 @@ public class NoDiagnosticsAreReturned_ForUseOfTagHelpersInAsyncLocalFunctions_ :
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral(""\r\n"");
-  
+
     async Task SometMethod()
     {
 
@@ -794,13 +793,13 @@ public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : glob
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral(""\r\n"");
-  
+
     SometMethod();
 
             WriteLiteral(""\r\n"");
         }
         #pragma warning restore 1998
-            
+
     {|#0:void SometMethod()
     {
 
@@ -898,7 +897,7 @@ public class SingleDiagnosticIsReturned_ForMultipleTagHelpersInVoidMethod : glob
 
     private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
     {
-        var test = new TagHelpersInCodeBlocksCSharpAnalzyerTest(TestReferences.MetadataReferences)
+        var test = new TagHelpersInCodeBlocksCSharpAnalyzerTest(TestReferences.MetadataReferences)
         {
             TestCode = source,
             ReferenceAssemblies = TestReferences.EmptyReferenceAssemblies,
@@ -908,9 +907,9 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
         return test.RunAsync();
     }
 
-    private sealed class TagHelpersInCodeBlocksCSharpAnalzyerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, XUnitVerifier>
+    private sealed class TagHelpersInCodeBlocksCSharpAnalyzerTest : CSharpAnalyzerTest<AttributesShouldNotBeAppliedToPageModelAnalyzer, DefaultVerifier>
     {
-        public TagHelpersInCodeBlocksCSharpAnalzyerTest(ImmutableArray<MetadataReference> metadataReferences)
+        public TagHelpersInCodeBlocksCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
         {
             TestState.AdditionalReferences.AddRange(metadataReferences);
         }
diff --git a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs
index 50fb4048110b..5a176ccaf3f4 100644
--- a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs
+++ b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs
@@ -7,7 +7,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Microsoft.AspNetCore.Mvc.Analyzers;
 
@@ -596,7 +595,7 @@ private static Task VerifyAnalyzerAsync(string source, params DiagnosticResult[]
         return test.RunAsync();
     }
 
-    internal sealed class TopLevelParameterNameCSharpAnalyzerTest : CSharpAnalyzerTest<TopLevelParameterNameAnalyzer, XUnitVerifier>
+    internal sealed class TopLevelParameterNameCSharpAnalyzerTest : CSharpAnalyzerTest<TopLevelParameterNameAnalyzer, DefaultVerifier>
     {
         public TopLevelParameterNameCSharpAnalyzerTest(ImmutableArray<MetadataReference> metadataReferences)
         {
diff --git a/src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs b/src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs
index 4419136fbce9..3f1595859562 100644
--- a/src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs
+++ b/src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs
@@ -8,12 +8,14 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers;
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
 internal static class ApiDiagnosticDescriptors
 {
+    private const string Usage = "Usage";
+
     public static readonly DiagnosticDescriptor API1000_ActionReturnsUndocumentedStatusCode =
         new DiagnosticDescriptor(
             "API1000",
             "Action returns undeclared status code",
             "Action method returns undeclared status code '{0}'",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true);
 
@@ -22,7 +24,7 @@ internal static class ApiDiagnosticDescriptors
             "API1001",
             "Action returns undeclared success result",
             "Action method returns a success result without a corresponding ProducesResponseType",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true);
 
@@ -31,7 +33,7 @@ internal static class ApiDiagnosticDescriptors
             "API1002",
             "Action documents status code that is not returned",
             "Action method documents status code '{0}' without a corresponding return type",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Info,
             isEnabledByDefault: false);
 
@@ -40,7 +42,7 @@ internal static class ApiDiagnosticDescriptors
             "API1003",
             "Action methods on ApiController instances do not require explicit model validation check",
             "Action methods on ApiController instances do not require explicit model validation check",
-            "Usage",
+            Usage,
             DiagnosticSeverity.Info,
             isEnabledByDefault: true,
             customTags: new[] { WellKnownDiagnosticTags.Unnecessary });
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
index 6bf00e9c555d..d355f834ceeb 100644
--- a/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
+++ b/src/Mvc/Mvc.Api.Analyzers/test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -60,6 +60,8 @@ public class CustomResponseTypeAttribute : Attribute, IApiResponseMetadataProvid
 
         public int StatusCode { get; set; }
 
+        public string Description { get; set; }
+
         public void SetContentTypes(MediaTypeCollection contentTypes)
         {
         }
diff --git a/src/Mvc/Mvc.ApiExplorer/src/ApiResponseTypeProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/ApiResponseTypeProvider.cs
index 4877cedefe18..7bdaaad11dca 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/ApiResponseTypeProvider.cs
+++ b/src/Mvc/Mvc.ApiExplorer/src/ApiResponseTypeProvider.cs
@@ -166,11 +166,14 @@ internal static Dictionary<int, ApiResponseType> ReadResponseMetadata(
 
                 var statusCode = metadataAttribute.StatusCode;
 
+                var description = metadataAttribute.Description;
+
                 var apiResponseType = new ApiResponseType
                 {
                     Type = metadataAttribute.Type,
                     StatusCode = statusCode,
                     IsDefaultResponse = metadataAttribute is IApiDefaultResponseMetadataProvider,
+                    Description = description
                 };
 
                 if (apiResponseType.Type == typeof(void))
@@ -228,9 +231,10 @@ internal static Dictionary<int, ApiResponseType> ReadResponseMetadata(
 
         foreach (var metadata in responseMetadata)
         {
-            // `IResult` metadata inserted for awaitable types should
-            // not be considered for response metadata.
-            if (typeof(IResult).IsAssignableFrom(metadata.Type))
+            // Skip IResult types that implement IEndpointMetadataProvider (built-in framework types like TypedResults)
+            // since they handle their own metadata population. Custom IResult implementations that don't implement
+            // IEndpointMetadataProvider should be included in response metadata for API documentation.
+            if (typeof(IResult).IsAssignableFrom(metadata.Type) && typeof(IEndpointMetadataProvider).IsAssignableFrom(metadata.Type))
             {
                 continue;
             }
diff --git a/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
index 0e499dacddd1..75f0f194193b 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
+++ b/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
@@ -315,9 +315,21 @@ internal static void ProcessIsRequired(ApiParameterContext context, MvcOptions m
                 parameter.IsRequired = true;
             }
 
-            if (parameter.Source == BindingSource.Path && parameter.RouteInfo != null && !parameter.RouteInfo.IsOptional)
+            if (parameter.Source == BindingSource.Path && parameter.RouteInfo != null)
             {
-                parameter.IsRequired = true;
+                // Locate the corresponding route parameter metadata.
+                var routeParam = context.RouteParameters
+                    .FirstOrDefault(rp => string.Equals(rp.Name, parameter.Name, StringComparison.OrdinalIgnoreCase));
+
+                // If the parameter is defined as a catch-all, mark it as optional.
+                if (routeParam != null && routeParam.IsCatchAll)
+                {
+                    parameter.IsRequired = false;
+                }
+                else if (!parameter.RouteInfo.IsOptional)
+                {
+                    parameter.IsRequired = true;
+                }
             }
         }
     }
diff --git a/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs
index a2395c594bd8..cdd33a92fe22 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs
+++ b/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs
@@ -33,7 +33,7 @@ public EndpointMetadataApiDescriptionProvider(
         EndpointDataSource endpointDataSource,
         IHostEnvironment environment,
         ParameterPolicyFactory parameterPolicyFactory,
-        IServiceProviderIsService? serviceProviderIsService)
+        IServiceProviderIsService? serviceProviderIsService = null)
     {
         _endpointDataSource = endpointDataSource;
         _environment = environment;
@@ -188,7 +188,7 @@ private ApiDescription CreateApiDescription(RouteEndpoint routeEndpoint, string
         return new ApiParameterDescription
         {
             Name = name,
-            ModelMetadata = CreateModelMetadata(paramType),
+            ModelMetadata = CreateModelMetadata(parameter, paramType),
             Source = source,
             DefaultValue = parameter.ParameterInfo.DefaultValue,
             Type = parameter.ParameterInfo.ParameterType,
@@ -274,7 +274,7 @@ private static ParameterDescriptor CreateParameterDescriptor(ParameterInfo param
         {
             return (BindingSource.FormFile, fromFormAttribute.Name ?? parameter.Name ?? string.Empty, false, parameterType);
         }
-        else if (parameter.ParameterInfo.CustomAttributes.Any(a => typeof(IFromServiceMetadata).IsAssignableFrom(a.AttributeType) || typeof(FromKeyedServicesAttribute) == a.AttributeType) ||
+        else if (parameter.ParameterInfo.CustomAttributes.Any(a => typeof(IFromServiceMetadata).IsAssignableFrom(a.AttributeType) || typeof(FromKeyedServicesAttribute).IsAssignableFrom(a.AttributeType)) ||
                  parameterType == typeof(HttpContext) ||
                  parameterType == typeof(HttpRequest) ||
                  parameterType == typeof(HttpResponse) ||
@@ -332,10 +332,9 @@ private static void AddSupportedResponseTypes(
         var defaultErrorType = errorMetadata?.Type ?? typeof(void);
         var contentTypes = new MediaTypeCollection();
 
-        // If the return type is an IResult or an awaitable IResult, then we should treat it as a void return type
-        // since we can't infer anything without additional metadata.
-        if (typeof(IResult).IsAssignableFrom(responseType) ||
-            producesResponseMetadata.Any(metadata => typeof(IResult).IsAssignableFrom(metadata.Type)))
+        // If the return type is an IResult or wrapped in a Task or ValueTask, then we should treat it as a void return type
+        // since we can't infer anything without additional metadata or requiring unreferenced code.
+        if (IsTaskOrValueTask(responseType) || typeof(IResult).IsAssignableFrom(responseType))
         {
             responseType = typeof(void);
         }
@@ -375,6 +374,8 @@ private static void AddSupportedResponseTypes(
                     apiResponseType.ApiResponseFormats.Add(defaultResponseFormat);
                 }
 
+                apiResponseType.Description ??= GetMatchingResponseTypeDescription(responseProviderMetadataTypes.Values, apiResponseType);
+
                 if (!supportedResponseTypes.Any(existingResponseType => existingResponseType.StatusCode == apiResponseType.StatusCode))
                 {
                     supportedResponseTypes.Add(apiResponseType);
@@ -395,6 +396,53 @@ private static void AddSupportedResponseTypes(
 
             supportedResponseTypes.Add(defaultApiResponseType);
         }
+
+        static string? GetMatchingResponseTypeDescription(IEnumerable<ApiResponseType> responseMetadataTypes, ApiResponseType apiResponseType)
+        {
+            // We set the Description to the LAST non-null value we find that matches the status code.
+            string? matchingDescription = null;
+            foreach (var metadata in responseMetadataTypes)
+            {
+                if (metadata.StatusCode == apiResponseType.StatusCode &&
+                    TypesAreCompatible(apiResponseType.Type, metadata.Type) &&
+                    metadata.Description is not null)
+                {
+                    matchingDescription = metadata.Description;
+                }
+            }
+            return matchingDescription;
+        }
+
+        static bool TypesAreCompatible(Type? apiResponseType, Type? metadataType)
+        {
+            // We need to a special check for cases where the inferred type is different than the one specified in attributes.
+            // For example, an endpoint that defines [ProducesResponseType<IEnumerable<WeatherForecast>>],
+            // but the endpoint returns weatherForecasts.ToList(). Because List<> is a different type than IEnumerable<>, it would incorrectly set OpenAPI metadata incorrectly.
+            // We use a conservative unidirectional check where the attribute type must be assignable from the inferred type.
+            // This handles inheritance (BaseClass ← DerivedClass) and interface implementation (IEnumerable<T> ← List<T>).
+            // This should be sufficient, as it's more common to specify an interface or base class type in the attribute and a concrete type in the endpoint implementation,
+            // compared to doing the opposite.
+            // For more information, check the related bug: https://github.com/dotnet/aspnetcore/issues/60518
+            return apiResponseType == metadataType ||
+                metadataType?.IsAssignableFrom(apiResponseType) == true;
+        }
+
+        static bool IsTaskOrValueTask(Type returnType)
+        {
+            // If this method did not need to be trim-safe, we would use CoercedAwaitableInfo.IsTypeAwaitable, but we cannot.
+            if (returnType.IsAssignableFrom(typeof(Task)) || returnType.IsAssignableFrom(typeof(ValueTask)))
+            {
+                return true;
+            }
+
+            if (returnType.FullName is null)
+            {
+                return false;
+            }
+
+            return returnType.FullName.StartsWith("System.Threading.Tasks.Task`1[", StringComparison.Ordinal) ||
+                returnType.FullName.StartsWith("System.Threading.Tasks.ValueTask`1[", StringComparison.Ordinal);
+        }
     }
 
     private static ApiResponseType CreateDefaultApiResponseType(Type responseType)
@@ -436,6 +484,19 @@ private static ApiResponseType CreateDefaultApiResponseType(Type responseType)
     private static EndpointModelMetadata CreateModelMetadata(Type type) =>
         new(ModelMetadataIdentity.ForType(type));
 
+    private static EndpointModelMetadata CreateModelMetadata(IParameterBindingMetadata parameter, Type type)
+    {
+        if (parameter.ParameterInfo is { } parameterInfo)
+        {
+            if (parameterInfo.Member is PropertyInfo propertyInfo && propertyInfo.DeclaringType is not null)
+            {
+                return new(ModelMetadataIdentity.ForProperty(propertyInfo, type, propertyInfo.DeclaringType));
+            }
+            return new(ModelMetadataIdentity.ForParameter(parameterInfo, type));
+        }
+        return CreateModelMetadata(type);
+    }
+
     private static void AddResponseContentTypes(IList<ApiResponseFormat> apiResponseFormats, IReadOnlyList<string> contentTypes)
     {
         foreach (var contentType in contentTypes)
diff --git a/src/Mvc/Mvc.ApiExplorer/src/EndpointModelMetadata.cs b/src/Mvc/Mvc.ApiExplorer/src/EndpointModelMetadata.cs
index 3fd46f1798e2..d893d3a04b01 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/EndpointModelMetadata.cs
+++ b/src/Mvc/Mvc.ApiExplorer/src/EndpointModelMetadata.cs
@@ -65,6 +65,7 @@ public static Type GetDisplayType(Type type)
             || underlyingType == typeof(TimeSpan)
             || underlyingType == typeof(decimal)
             || underlyingType == typeof(Guid)
-            || underlyingType == typeof(Uri) ? type : typeof(string);
+            || underlyingType == typeof(Uri)
+            || underlyingType.IsEnum ? type : typeof(string);
     }
 }
diff --git a/src/Mvc/Mvc.ApiExplorer/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.ApiExplorer/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..3c89ceb1b24c 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.ApiExplorer/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType.Description.get -> string? (forwarded, contained in Microsoft.AspNetCore.Mvc.Abstractions)
+Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType.Description.set -> void (forwarded, contained in Microsoft.AspNetCore.Mvc.Abstractions)
diff --git a/src/Mvc/Mvc.ApiExplorer/test/ApiResponseTypeProviderTest.cs b/src/Mvc/Mvc.ApiExplorer/test/ApiResponseTypeProviderTest.cs
index b65ef5cc4846..44fece97ea3e 100644
--- a/src/Mvc/Mvc.ApiExplorer/test/ApiResponseTypeProviderTest.cs
+++ b/src/Mvc/Mvc.ApiExplorer/test/ApiResponseTypeProviderTest.cs
@@ -186,6 +186,66 @@ public void GetApiResponseTypes_ReturnsResponseTypesFromApiConventionItem()
            });
     }
 
+    [Fact]
+    public void GetApiResponseTypes_ReturnsDescriptionFromProducesResponseType()
+    {
+        // Arrange
+
+        const string expectedOkDescription = "All is well";
+        const string expectedBadRequestDescription = "Invalid request";
+        const string expectedNotFoundDescription = "Something was not found";
+
+        var actionDescriptor = GetControllerActionDescriptor(
+            typeof(GetApiResponseTypes_ReturnsResponseTypesFromDefaultConventionsController),
+            nameof(GetApiResponseTypes_ReturnsResponseTypesFromDefaultConventionsController.DeleteBase));
+
+        actionDescriptor.Properties[typeof(ApiConventionResult)] = new ApiConventionResult(new[]
+        {
+                new ProducesResponseTypeAttribute(200) { Description = expectedOkDescription},
+                new ProducesResponseTypeAttribute(400) { Description = expectedBadRequestDescription },
+                new ProducesResponseTypeAttribute(404) { Description = expectedNotFoundDescription },
+            });
+
+        var provider = GetProvider();
+
+        // Act
+        var result = provider.GetApiResponseTypes(actionDescriptor);
+
+        // Assert
+        Assert.Collection(
+           result.OrderBy(r => r.StatusCode),
+           responseType =>
+           {
+               Assert.Equal(200, responseType.StatusCode);
+               Assert.Equal(typeof(BaseModel), responseType.Type);
+               Assert.False(responseType.IsDefaultResponse);
+               Assert.Equal(expectedOkDescription, responseType.Description);
+               Assert.Collection(
+                    responseType.ApiResponseFormats,
+                    format =>
+                    {
+                        Assert.Equal("application/json", format.MediaType);
+                        Assert.IsType<TestOutputFormatter>(format.Formatter);
+                    });
+           },
+           responseType =>
+           {
+               Assert.Equal(400, responseType.StatusCode);
+               Assert.Equal(typeof(void), responseType.Type);
+               Assert.False(responseType.IsDefaultResponse);
+               Assert.Empty(responseType.ApiResponseFormats);
+               Assert.Equal(expectedBadRequestDescription, responseType.Description);
+           },
+           responseType =>
+           {
+               Assert.Equal(404, responseType.StatusCode);
+               Assert.Equal(typeof(void), responseType.Type);
+               Assert.False(responseType.IsDefaultResponse);
+               Assert.Empty(responseType.ApiResponseFormats);
+               Assert.Equal(expectedNotFoundDescription, responseType.Description);
+           });
+    }
+
     [ApiConventionType(typeof(DefaultApiConventions))]
     public class GetApiResponseTypes_ReturnsResponseTypesFromDefaultConventionsController : ControllerBase
     {
@@ -751,7 +811,7 @@ public void GetApiResponseTypes_HandlesActionWithMultipleContentTypesAndProduces
     }
 
     [Fact]
-    public void GetApiResponseTypes_ReturnNoResponseTypes_IfActionWithIResultReturnType()
+    public void GetApiResponseTypes_ReturnNoResponseTypes_IfActionWithBuiltIResultReturnType()
     {
         // Arrange
         var actionDescriptor = GetControllerActionDescriptor(typeof(TestController), nameof(TestController.GetIResult));
@@ -764,6 +824,23 @@ public void GetApiResponseTypes_ReturnNoResponseTypes_IfActionWithIResultReturnT
         Assert.False(result.Any());
     }
 
+    [Fact]
+    public void GetApiResponseTypes_ReturnResponseType_IfActionHasCustomIResultReturnTypeInMetadata()
+    {
+        // Arrange
+        var actionDescriptor = GetControllerActionDescriptor(typeof(TestController), nameof(TestController.GetCustomIResult));
+        actionDescriptor.EndpointMetadata = [new ProducesResponseTypeMetadata(200, typeof(MyResponse))];
+        var provider = new ApiResponseTypeProvider(new EmptyModelMetadataProvider(), new ActionResultTypeMapper(), new MvcOptions());
+
+        // Act
+        var result = provider.GetApiResponseTypes(actionDescriptor);
+
+        // Assert
+        var response = Assert.Single(result);
+        Assert.Equal(typeof(MyResponse), response.Type);
+        Assert.Equal(200, response.StatusCode);
+    }
+
     private static ApiResponseTypeProvider GetProvider()
     {
         var mvcOptions = new MvcOptions
@@ -811,6 +888,18 @@ public class TestController
         public ActionResult<DerivedModel> PutModel(string userId, DerivedModel model) => null;
 
         public IResult GetIResult(int id) => null;
+
+        public MyResponse GetCustomIResult() => new MyResponse { Content = "Test Content" };
+    }
+
+    public class MyResponse : IResult
+    {
+        public required string Content { get; set; }
+
+        public Task ExecuteAsync(HttpContext httpContext)
+        {
+            return httpContext.Response.WriteAsJsonAsync(this);
+        }
     }
 
     private class TestOutputFormatter : OutputFormatter
diff --git a/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs b/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs
index ab0b5ebe592f..a949d6cecc0b 100644
--- a/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs
+++ b/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs
@@ -8,7 +8,6 @@
 using System.Globalization;
 using System.Reflection;
 using System.Text;
-using System.Xml.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
@@ -32,6 +31,36 @@ namespace Microsoft.AspNetCore.Mvc.Description;
 
 public class DefaultApiDescriptionProviderTest
 {
+    [Fact]
+    public void OnlyCatchAllParameter_IsReportedAsOptional()
+    {
+        // Arrange: Create an action descriptor with a multi-parameter route template.
+        var action = CreateActionDescriptor();
+        action.AttributeRouteInfo = new AttributeRouteInfo
+        {
+            Template = "/products/{category}/items/{group}/inventory/{**any}"
+        };
+
+        // Act: Get the API descriptions using the existing helper.
+        var descriptions = GetApiDescriptions(action);
+
+        // Assert: Only the 'any' parameter should be optional.
+        var description = Assert.Single(descriptions);
+        var categoryParameter = Assert.Single(description.ParameterDescriptions,
+            p => string.Equals(p.Name, "category", StringComparison.OrdinalIgnoreCase));
+        var groupParameter = Assert.Single(description.ParameterDescriptions,
+            p => string.Equals(p.Name, "group", StringComparison.OrdinalIgnoreCase));
+        var anyParameter = Assert.Single(description.ParameterDescriptions,
+            p => string.Equals(p.Name, "any", StringComparison.OrdinalIgnoreCase));
+
+        // The non-catch-all parameters should be required.
+        Assert.True(categoryParameter.IsRequired);
+        Assert.True(groupParameter.IsRequired);
+
+        // The catch-all parameter should be optional.
+        Assert.False(anyParameter.IsRequired);
+    }
+
     [Fact]
     public void GetApiDescription_IgnoresNonControllerActionDescriptor()
     {
@@ -633,7 +662,7 @@ public void GetApiDescription_DoesNotPopulatesResponseInformation_WhenUnknown(st
         Assert.Empty(description.SupportedResponseTypes);
     }
 
-    public static TheoryData ReturnsActionResultWithProducesAndProducesContentTypeData
+    public static TheoryData<Type, string, List<FilterDescriptor>> ReturnsActionResultWithProducesAndProducesContentTypeData
     {
         get
         {
@@ -1107,7 +1136,8 @@ public void GetApiDescription_PopulatesResponseInformation_WhenSetByFilter(strin
         var action = CreateActionDescriptor(methodName);
         var filter = new ContentTypeAttribute("text/*")
         {
-            Type = typeof(Order)
+            Type = typeof(Order),
+            Description = "Example"
         };
 
         action.FilterDescriptors = new List<FilterDescriptor>
@@ -1124,6 +1154,7 @@ public void GetApiDescription_PopulatesResponseInformation_WhenSetByFilter(strin
         Assert.NotNull(responseTypes.ModelMetadata);
         Assert.Equal(200, responseTypes.StatusCode);
         Assert.Equal(typeof(Order), responseTypes.Type);
+        Assert.Equal("Example", responseTypes.Description);
 
         foreach (var responseFormat in responseTypes.ApiResponseFormats)
         {
@@ -1489,6 +1520,20 @@ public void GetApiDescription_ParameterDescription_SourceFromServices()
         Assert.Empty(description.ParameterDescriptions);
     }
 
+    [Fact]
+    public void GetApiDescription_ParameterDescription_SourceFromDerivedServices()
+    {
+        // Arrange
+        var action = CreateActionDescriptor(nameof(AcceptsFormatters_DerivedServices));
+
+        // Act
+        var descriptions = GetApiDescriptions(action);
+
+        // Assert
+        var description = Assert.Single(descriptions);
+        Assert.Empty(description.ParameterDescriptions);
+    }
+
     [Fact]
     public void GetApiDescription_ParameterDescription_SourceFromCustomModelBinder()
     {
@@ -1577,7 +1622,7 @@ public void GetApiDescription_ParameterDescription_FromQueryEmployee()
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Name");
         Assert.Same(BindingSource.Query, id.Source);
@@ -1596,7 +1641,7 @@ public void GetApiDescription_ParameterDescription_ParsablePrimitiveType()
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "id");
         Assert.Same(BindingSource.Query, id.Source);
@@ -1615,7 +1660,7 @@ public void GetApiDescription_ParameterDescription_NullableParsablePrimitiveType
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "id");
         Assert.Same(BindingSource.Query, id.Source);
@@ -1634,7 +1679,7 @@ public void GetApiDescription_ParameterDescription_ParsableType()
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "employee");
         Assert.Same(BindingSource.Query, id.Source);
@@ -1653,7 +1698,7 @@ public void GetApiDescription_ParameterDescription_NullableParsableType()
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "employee");
         Assert.Same(BindingSource.Query, id.Source);
@@ -1672,7 +1717,7 @@ public void GetApiDescription_ParameterDescription_ConvertibleType()
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "employee");
         Assert.Same(BindingSource.Query, id.Source);
@@ -1691,7 +1736,7 @@ public void GetApiDescription_ParameterDescription_NullableConvertibleType()
 
         // Assert
         var description = Assert.Single(descriptions);
-        Assert.Equal(1, description.ParameterDescriptions.Count);
+        Assert.Single(description.ParameterDescriptions);
 
         var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "employee");
         Assert.Same(BindingSource.Query, id.Source);
@@ -2477,6 +2522,10 @@ private void AcceptsFormatters_Services([FromServices] ITestService tempDataProv
     {
     }
 
+    private void AcceptsFormatters_DerivedServices([CustomFromServices] ITestService tempDataProvider, [CustomFromKeyedServices("foo")] ITestService keyedTempDataProvider)
+    {
+    }
+
     private void AcceptsProductChangeDTO(ProductChangeDTO dto)
     {
     }
@@ -2874,6 +2923,8 @@ public ContentTypeAttribute(string mediaType)
 
         public Type Type { get; set; }
 
+        public string Description { get; set; }
+
         public void SetContentTypes(MediaTypeCollection contentTypes)
         {
             contentTypes.Clear();
@@ -2919,4 +2970,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
             return base.ConvertFrom(context, culture, value);
         }
     }
+
+    private class CustomFromKeyedServicesAttribute(object key) : FromKeyedServicesAttribute(key);
+
+    private class CustomFromServicesAttribute : FromServicesAttribute;
 }
diff --git a/src/Mvc/Mvc.ApiExplorer/test/EndpointMetadataApiDescriptionProviderTest.cs b/src/Mvc/Mvc.ApiExplorer/test/EndpointMetadataApiDescriptionProviderTest.cs
index dfead0cc88e4..b58fbefa53b6 100644
--- a/src/Mvc/Mvc.ApiExplorer/test/EndpointMetadataApiDescriptionProviderTest.cs
+++ b/src/Mvc/Mvc.ApiExplorer/test/EndpointMetadataApiDescriptionProviderTest.cs
@@ -300,12 +300,227 @@ public void AddsMultipleResponseFormatsForTypedResults()
         Assert.Empty(badRequestResponseType.ApiResponseFormats);
     }
 
+    [Fact]
+    public void AddsResponseDescription()
+    {
+        const string expectedCreatedDescription = "A new item was created";
+        const string expectedBadRequestDescription = "Validation failed for the request";
+
+        var apiDescription = GetApiDescription(
+    [ProducesResponseType(typeof(TimeSpan), StatusCodes.Status201Created, Description = expectedCreatedDescription)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest, Description = expectedBadRequestDescription)]
+        () => TypedResults.Created("https://example.com", new TimeSpan()));
+
+        Assert.Equal(2, apiDescription.SupportedResponseTypes.Count);
+
+        var createdResponseType = apiDescription.SupportedResponseTypes[0];
+
+        Assert.Equal(201, createdResponseType.StatusCode);
+        Assert.Equal(typeof(TimeSpan), createdResponseType.Type);
+        Assert.Equal(typeof(TimeSpan), createdResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedCreatedDescription, createdResponseType.Description);
+
+        var createdResponseFormat = Assert.Single(createdResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdResponseFormat.MediaType);
+
+        var badRequestResponseType = apiDescription.SupportedResponseTypes[1];
+
+        Assert.Equal(400, badRequestResponseType.StatusCode);
+        Assert.Equal(typeof(void), badRequestResponseType.Type);
+        Assert.Equal(typeof(void), badRequestResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedBadRequestDescription, badRequestResponseType.Description);
+    }
+
+    [Fact]
+    public void AddsResponseDescription_WorksWithGenerics()
+    {
+        const string expectedOkDescription = "The weather forecast for the next 5 days.";
+
+        var apiDescription = GetApiDescription([ProducesResponseType<GenericClass<TimeSpan>>(StatusCodes.Status200OK, Description = expectedOkDescription)]
+        () => new GenericClass<TimeSpan> { Value = new TimeSpan() });
+
+        var okResponseType = Assert.Single(apiDescription.SupportedResponseTypes);
+
+        Assert.Equal(200, okResponseType.StatusCode);
+        Assert.Equal(typeof(GenericClass<TimeSpan>), okResponseType.Type);
+        Assert.Equal(typeof(GenericClass<TimeSpan>), okResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedOkDescription, okResponseType.Description);
+
+        var createdOkFormat = Assert.Single(okResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdOkFormat.MediaType);
+    }
+
+    [Fact]
+    public void AddsResponseDescription_WorksWithGenericsAndTypedResults()
+    {
+        const string expectedOkDescription = "The weather forecast for the next 5 days.";
+
+        var apiDescription = GetApiDescription([ProducesResponseType<GenericClass<TimeSpan>>(StatusCodes.Status200OK, Description = expectedOkDescription)]
+        () => TypedResults.Ok(new GenericClass<TimeSpan> { Value = new TimeSpan() }));
+
+        var okResponseType = Assert.Single(apiDescription.SupportedResponseTypes);
+
+        Assert.Equal(200, okResponseType.StatusCode);
+        Assert.Equal(typeof(GenericClass<TimeSpan>), okResponseType.Type);
+        Assert.Equal(typeof(GenericClass<TimeSpan>), okResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedOkDescription, okResponseType.Description);
+
+        var createdOkFormat = Assert.Single(okResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdOkFormat.MediaType);
+    }
+
+    [Fact]
+    public void AddsResponseDescription_WorksWithCollections()
+    {
+        const string expectedOkDescription = "The weather forecast for the next 5 days.";
+
+        var apiDescription = GetApiDescription([ProducesResponseType<IEnumerable<TimeSpan>>(StatusCodes.Status200OK, Description = expectedOkDescription)]
+        () => new List<TimeSpan> { new() });
+
+        var okResponseType = Assert.Single(apiDescription.SupportedResponseTypes);
+
+        Assert.Equal(200, okResponseType.StatusCode);
+        Assert.Equal(typeof(List<TimeSpan>), okResponseType.Type); // We use List as the inferred type has higher priority than those set by metadata (attributes)
+        Assert.Equal(typeof(List<TimeSpan>), okResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedOkDescription, okResponseType.Description);
+
+        var createdOkFormat = Assert.Single(okResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdOkFormat.MediaType);
+    }
+
+    [Fact]
+    public void AddsResponseDescription_WorksWithCollectionsAndTypedResults()
+    {
+        const string expectedOkDescription = "The weather forecast for the next 5 days.";
+
+        var apiDescription = GetApiDescription([ProducesResponseType<IEnumerable<TimeSpan>>(StatusCodes.Status200OK, Description = expectedOkDescription)]
+        () => TypedResults.Ok(new List<TimeSpan> { new() }));
+
+        var okResponseType = Assert.Single(apiDescription.SupportedResponseTypes);
+
+        Assert.Equal(200, okResponseType.StatusCode);
+        Assert.Equal(typeof(List<TimeSpan>), okResponseType.Type); // We use List as the inferred type has higher priority than those set by metadata (attributes)
+        Assert.Equal(typeof(List<TimeSpan>), okResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedOkDescription, okResponseType.Description);
+
+        var createdOkFormat = Assert.Single(okResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdOkFormat.MediaType);
+    }
+
+    /// <summary>
+    /// EndpointMetadataApiDescriptionProvider performs a one way type check for discovering response types to match the description that's set in [ProducesResponseType]
+    /// The reason we do a one-way check instead of a bidirectional check is to prevent too many positive matches.
+    /// </summary>
+    /// <remarks>
+    /// Example: If we did a bidirectional check, we would match something scenarios like this, which can cause confusion:
+    /// [ProducesResponseType<string>(StatusCodes.Status200OK, Description = "Returned with a string")] -> TypedResults.Ok(new object())
+    /// This would match because object is assignable to string,
+    /// but it doesn't make sense to add the Description to the object type because the attribute says we should return a string.
+    ///
+    /// This test documents this desired behavior and will fail if the behavior changes, so the developer can double check if their change is intentional.
+    /// </summary>
+    [Fact]
+    public void AddsResponseDescription_ShouldFailWhenInferredTypeIsNotDirectlyAssignableToAttributeType()
+    {
+        var apiDescription = GetApiDescription([ProducesResponseType<string>(StatusCodes.Status200OK, Description = "Only returned with a string")]
+        () => TypedResults.Ok(new object()));
+
+        var okResponseType = Assert.Single(apiDescription.SupportedResponseTypes);
+
+        Assert.Equal(200, okResponseType.StatusCode);
+        Assert.Equal(typeof(object), okResponseType.Type);
+        Assert.Equal(typeof(object), okResponseType.ModelMetadata?.ModelType);
+        Assert.Null(okResponseType.Description);
+    }
+
+    [Fact]
+    public void WithEmptyMethodBody_AddsResponseDescription()
+    {
+        const string expectedCreatedDescription = "A new item was created";
+        const string expectedBadRequestDescription = "Validation failed for the request";
+
+        var apiDescription = GetApiDescription(
+    [ProducesResponseType(typeof(TimeSpan), StatusCodes.Status201Created, Description = expectedCreatedDescription)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest, Description = expectedBadRequestDescription)]
+        () => new InferredJsonClass());
+
+        Assert.Equal(3, apiDescription.SupportedResponseTypes.Count);
+
+        var rdfInferredResponseType = apiDescription.SupportedResponseTypes[0];
+
+        Assert.Equal(200, rdfInferredResponseType.StatusCode);
+        Assert.Equal(typeof(InferredJsonClass), rdfInferredResponseType.Type);
+        Assert.Equal(typeof(InferredJsonClass), rdfInferredResponseType.ModelMetadata?.ModelType);
+
+        var rdfInferredResponseFormat = Assert.Single(rdfInferredResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", rdfInferredResponseFormat.MediaType);
+        Assert.Null(rdfInferredResponseType.Description); // There is no description set for the default "200" code, so we expect it to be null.
+
+        var createdResponseType = apiDescription.SupportedResponseTypes[1];
+
+        Assert.Equal(201, createdResponseType.StatusCode);
+        Assert.Equal(typeof(TimeSpan), createdResponseType.Type);
+        Assert.Equal(typeof(TimeSpan), createdResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedCreatedDescription, createdResponseType.Description);
+
+        var createdResponseFormat = Assert.Single(createdResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdResponseFormat.MediaType);
+
+        var badRequestResponseType = apiDescription.SupportedResponseTypes[2];
+
+        Assert.Equal(400, badRequestResponseType.StatusCode);
+        Assert.Equal(typeof(InferredJsonClass), badRequestResponseType.Type);
+        Assert.Equal(typeof(InferredJsonClass), badRequestResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedBadRequestDescription, badRequestResponseType.Description);
+
+        var badRequestResponseFormat = Assert.Single(badRequestResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", badRequestResponseFormat.MediaType);
+    }
+
+    /// <summary>
+    /// Setting the description grabs the LAST description.
+    // To validate this, we add multiple ProducesResponseType to validate that it only grabs the LAST ONE.
+    /// </summary>
+    [Fact]
+    public void AddsResponseDescription_UsesLastOne()
+    {
+        const string expectedCreatedDescription = "A new item was created";
+        const string expectedBadRequestDescription = "Validation failed for the request";
+
+        var apiDescription = GetApiDescription(
+    [ProducesResponseType(typeof(int), StatusCodes.Status201Created, Description = "First description")] // The first item is an int, not a timespan, shouldn't match
+        [ProducesResponseType(typeof(int), StatusCodes.Status201Created, Description = "Second description")] // Not a timespan AND not the final item, shouldn't match
+        [ProducesResponseType(typeof(TimeSpan), StatusCodes.Status201Created, Description = expectedCreatedDescription)] // This is the last item, which should match
+        [ProducesResponseType(StatusCodes.Status400BadRequest, Description = "First description")]
+        [ProducesResponseType(StatusCodes.Status400BadRequest, Description = expectedBadRequestDescription)]
+        () => TypedResults.Created("https://example.com", new TimeSpan()));
+
+        Assert.Equal(2, apiDescription.SupportedResponseTypes.Count);
+
+        var createdResponseType = apiDescription.SupportedResponseTypes[0];
+
+        Assert.Equal(201, createdResponseType.StatusCode);
+        Assert.Equal(typeof(TimeSpan), createdResponseType.Type);
+        Assert.Equal(typeof(TimeSpan), createdResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedCreatedDescription, createdResponseType.Description);
+
+        var createdResponseFormat = Assert.Single(createdResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", createdResponseFormat.MediaType);
+
+        var badRequestResponseType = apiDescription.SupportedResponseTypes[1];
+
+        Assert.Equal(400, badRequestResponseType.StatusCode);
+        Assert.Equal(typeof(void), badRequestResponseType.Type);
+        Assert.Equal(typeof(void), badRequestResponseType.ModelMetadata?.ModelType);
+        Assert.Equal(expectedBadRequestDescription, badRequestResponseType.Description);
+    }
+
     [Fact]
     public void AddsResponseFormatsForTypedResultWithoutReturnType()
     {
         var apiDescription = GetApiDescription(() => TypedResults.Created("https://example.com", new InferredJsonClass()));
 
-        Assert.Equal(1, apiDescription.SupportedResponseTypes.Count);
+        Assert.Single(apiDescription.SupportedResponseTypes);
 
         var createdResponseType = apiDescription.SupportedResponseTypes[0];
 
@@ -323,7 +538,7 @@ public void HandlesTypedResultsWithoutIEndpointMetadataProviderImplementation()
         // TypedResults for ProblemDetails doesn't implement IEndpointMetadataProvider
         var apiDescription = GetApiDescription(() => TypedResults.Problem());
 
-        Assert.Equal(1, apiDescription.SupportedResponseTypes.Count);
+        Assert.Single(apiDescription.SupportedResponseTypes);
 
         var responseType = apiDescription.SupportedResponseTypes[0];
 
@@ -338,7 +553,7 @@ public void AddsResponseFormatsForAwaitableTypedResultWithoutReturnType()
         var apiDescription = GetApiDescription(() =>
             Task.FromResult(TypedResults.Created("https://example.com", new InferredJsonClass())));
 
-        Assert.Equal(1, apiDescription.SupportedResponseTypes.Count);
+        Assert.Single(apiDescription.SupportedResponseTypes);
 
         var createdResponseType = apiDescription.SupportedResponseTypes[0];
 
@@ -385,12 +600,13 @@ public void AddsMultipleResponseFormatsFromMetadataWithAwaitableResultType()
         var apiDescription = GetApiDescription(
             [ProducesResponseType(typeof(InferredJsonClass), StatusCodes.Status201Created)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        async Task<Results<Created<InferredJsonClass>, ProblemHttpResult>> () => {
-            await Task.CompletedTask;
-            return Random.Shared.Next() % 2 == 0
-                ? TypedResults.Created<InferredJsonClass>("/", new InferredJsonClass())
-                : TypedResults.Problem();
-        });
+        async Task<Results<Created<InferredJsonClass>, ProblemHttpResult>> () =>
+            {
+                await Task.CompletedTask;
+                return Random.Shared.Next() % 2 == 0
+                    ? TypedResults.Created<InferredJsonClass>("/", new InferredJsonClass())
+                    : TypedResults.Problem();
+            });
 
         Assert.Equal(2, apiDescription.SupportedResponseTypes.Count);
 
@@ -412,6 +628,32 @@ async Task<Results<Created<InferredJsonClass>, ProblemHttpResult>> () => {
         Assert.Empty(badRequestResponseType.ApiResponseFormats);
     }
 
+    [Fact]
+    public void ResponseProducesMetadataWithIResultImplementor()
+    {
+        var apiDescription = GetApiDescription(
+            [ProducesResponseType(typeof(CustomIResultImplementor), StatusCodes.Status200OK)] () => new CustomIResultImplementor { Content = "Hello, World!" });
+
+        var okResponseType = Assert.Single(apiDescription.SupportedResponseTypes);
+
+        Assert.Equal(200, okResponseType.StatusCode);
+        Assert.Equal(typeof(CustomIResultImplementor), okResponseType.Type);
+        Assert.Equal(typeof(CustomIResultImplementor), okResponseType.ModelMetadata?.ModelType);
+
+        var okResponseFormat = Assert.Single(okResponseType.ApiResponseFormats);
+        Assert.Equal("application/json", okResponseFormat.MediaType);
+    }
+
+    public class CustomIResultImplementor : IResult
+    {
+        public required string Content { get; set; }
+
+        public Task ExecuteAsync(HttpContext httpContext)
+        {
+            return httpContext.Response.WriteAsJsonAsync(this);
+        }
+    }
+
     [Fact]
     public void AddsFromRouteParameterAsPath()
     {
@@ -579,7 +821,9 @@ public void DoesNotAddFromServiceParameterAsService()
     {
         Assert.Empty(GetApiDescription((IInferredServiceInterface foo) => { }).ParameterDescriptions);
         Assert.Empty(GetApiDescription(([FromServices] InferredServiceClass foo) => { }).ParameterDescriptions);
+        Assert.Empty(GetApiDescription(([CustomFromServices] InferredServiceClass foo) => { }).ParameterDescriptions);
         Assert.Empty(GetApiDescription(([FromKeyedServices("foo")] InferredServiceClass foo) => { }).ParameterDescriptions);
+        Assert.Empty(GetApiDescription(([CustomFromKeyedServices("foo")] InferredServiceClass foo) => { }).ParameterDescriptions);
         Assert.Empty(GetApiDescription((HttpContext context) => { }).ParameterDescriptions);
         Assert.Empty(GetApiDescription((HttpRequest request) => { }).ParameterDescriptions);
         Assert.Empty(GetApiDescription((HttpResponse response) => { }).ParameterDescriptions);
@@ -706,6 +950,16 @@ public void SupportsRequiredMembersInAsParametersAttribute()
             param => Assert.False(param.IsRequired));
     }
 
+    [Fact]
+    public void SupportsContainerTypeInAsParametersAttribute()
+    {
+        var apiDescription = GetApiDescription(([AsParameters] AsParametersWithRequiredMembers foo) => { });
+        Assert.Equal(4, apiDescription.ParameterDescriptions.Count);
+
+        Assert.NotNull(apiDescription.ParameterDescriptions[0].ModelMetadata.ContainerType);
+        Assert.Equal(typeof(AsParametersWithRequiredMembers), apiDescription.ParameterDescriptions[0].ModelMetadata.ContainerType);
+    }
+
 #nullable disable
     public class AsParametersWithRequiredMembersObliviousContext
     {
@@ -793,7 +1047,7 @@ public void TestParameterIsRequiredForObliviousNullabilityContext()
     public void TestParameterAttributesCanBeInspected()
     {
         var apiDescription = GetApiDescription(([Description("The name.")] string name) => { });
-        Assert.Equal(1, apiDescription.ParameterDescriptions.Count);
+        Assert.Single(apiDescription.ParameterDescriptions);
 
         var nameParam = apiDescription.ParameterDescriptions[0];
         Assert.Equal(typeof(string), nameParam.Type);
@@ -1277,8 +1531,8 @@ public void TestIsRequiredFromFormFile()
     {
         var apiDescription0 = GetApiDescription((IFormFile fromFile) => { });
         var apiDescription1 = GetApiDescription((IFormFile? fromFile) => { });
-        Assert.Equal(1, apiDescription0.ParameterDescriptions.Count);
-        Assert.Equal(1, apiDescription1.ParameterDescriptions.Count);
+        Assert.Single(apiDescription0.ParameterDescriptions);
+        Assert.Single(apiDescription1.ParameterDescriptions);
 
         var fromFileParam0 = apiDescription0.ParameterDescriptions[0];
         Assert.Equal(typeof(IFormFile), fromFileParam0.Type);
@@ -1690,4 +1944,10 @@ private class TestServiceProvider : IServiceProvider
             return null;
         }
     }
+
+    private class GenericClass<TType> { public required TType Value { get; set; } }
+
+    private class CustomFromKeyedServicesAttribute(object key) : FromKeyedServicesAttribute(key);
+
+    private class CustomFromServicesAttribute : FromServicesAttribute;
 }
diff --git a/src/Mvc/Mvc.Core/src/ApiControllerAttribute.cs b/src/Mvc/Mvc.Core/src/ApiControllerAttribute.cs
index a1b95b3ee827..cde73404a399 100644
--- a/src/Mvc/Mvc.Core/src/ApiControllerAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/ApiControllerAttribute.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 
 namespace Microsoft.AspNetCore.Mvc;
@@ -17,6 +18,6 @@ namespace Microsoft.AspNetCore.Mvc;
 /// </para>
 /// </summary>
 [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-public class ApiControllerAttribute : ControllerAttribute, IApiBehaviorMetadata
+public class ApiControllerAttribute : ControllerAttribute, IApiBehaviorMetadata, IDisableCookieRedirectMetadata
 {
 }
diff --git a/src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestFormatMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestFormatMetadataProvider.cs
index cfb942053215..50e84006030d 100644
--- a/src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestFormatMetadataProvider.cs
+++ b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiRequestFormatMetadataProvider.cs
@@ -25,6 +25,6 @@ public interface IApiRequestFormatMetadataProvider
     /// </param>
     /// <returns>Content types which are supported by the <see cref="Formatters.IInputFormatter"/>.</returns>
     IReadOnlyList<string>? GetSupportedContentTypes(
-        string contentType,
+        string? contentType,
         Type objectType);
 }
diff --git a/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseMetadataProvider.cs
index 37e1d7daffab..2e0c7d5ab466 100644
--- a/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseMetadataProvider.cs
+++ b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseMetadataProvider.cs
@@ -17,6 +17,11 @@ public interface IApiResponseMetadataProvider : IFilterMetadata
     /// </summary>
     Type? Type { get; }
 
+    /// <summary>
+    /// Gets the description of the response.
+    /// </summary>
+    string? Description => null;
+
     /// <summary>
     /// Gets the HTTP status code of the response.
     /// </summary>
diff --git a/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseTypeMetadataProvider.cs b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseTypeMetadataProvider.cs
index c2c05b1746cb..679dbd71cdaa 100644
--- a/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseTypeMetadataProvider.cs
+++ b/src/Mvc/Mvc.Core/src/ApiExplorer/IApiResponseTypeMetadataProvider.cs
@@ -25,6 +25,6 @@ public interface IApiResponseTypeMetadataProvider
     /// </param>
     /// <returns>Content types which are supported by the <see cref="Formatters.IOutputFormatter"/>.</returns>
     IReadOnlyList<string>? GetSupportedContentTypes(
-        string contentType,
+        string? contentType,
         Type objectType);
 }
diff --git a/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs
index 829ceef8f59b..9e19c9c66289 100644
--- a/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs
+++ b/src/Mvc/Mvc.Core/src/ApplicationModels/DefaultApplicationModelProvider.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -349,9 +350,41 @@ internal PropertyModel CreatePropertyModel(PropertyInfo propertyInfo)
         applicableAttributes.AddRange(routeAttributes);
         AddRange(actionModel.Selectors, CreateSelectors(applicableAttributes));
 
+        AddReturnTypeMetadata(actionModel.Selectors, methodInfo);
+
         return actionModel;
     }
 
+    internal static void AddReturnTypeMetadata(IList<SelectorModel> selectors, MethodInfo methodInfo)
+    {
+        // Get metadata from return type
+        var returnType = methodInfo.ReturnType;
+        if (CoercedAwaitableInfo.IsTypeAwaitable(returnType, out var coercedAwaitableInfo))
+        {
+            returnType = coercedAwaitableInfo.AwaitableInfo.ResultType;
+        }
+
+        if (returnType is not null && typeof(IEndpointMetadataProvider).IsAssignableFrom(returnType))
+        {
+            // Return type implements IEndpointMetadataProvider
+            var builder = new InertEndpointBuilder();
+            var invokeArgs = new object[2];
+            invokeArgs[0] = methodInfo;
+            invokeArgs[1] = builder;
+            EndpointMetadataPopulator.PopulateMetadataForEndpointMethod.MakeGenericMethod(returnType).Invoke(null, invokeArgs);
+
+            // The metadata is added to the builder's metadata collection.
+            // We need to populate the selectors with that metadata.
+            foreach (var metadata in builder.Metadata)
+            {
+                foreach (var selector in selectors)
+                {
+                    selector.EndpointMetadata.Add(metadata);
+                }
+            }
+        }
+    }
+
     private string CanonicalizeActionName(string actionName)
     {
         const string Suffix = "Async";
diff --git a/src/Mvc/Mvc.Core/src/Formatters/InputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/InputFormatter.cs
index 2474e63ab177..47a6fa1b5b27 100644
--- a/src/Mvc/Mvc.Core/src/Formatters/InputFormatter.cs
+++ b/src/Mvc/Mvc.Core/src/Formatters/InputFormatter.cs
@@ -118,7 +118,7 @@ public virtual Task<InputFormatterResult> ReadAsync(InputFormatterContext contex
     public abstract Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context);
 
     /// <inheritdoc />
-    public virtual IReadOnlyList<string>? GetSupportedContentTypes(string contentType, Type objectType)
+    public virtual IReadOnlyList<string>? GetSupportedContentTypes(string? contentType, Type objectType)
     {
         if (SupportedMediaTypes.Count == 0)
         {
diff --git a/src/Mvc/Mvc.Core/src/Formatters/OutputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/OutputFormatter.cs
index 362171af2b8c..f14215f6ec28 100644
--- a/src/Mvc/Mvc.Core/src/Formatters/OutputFormatter.cs
+++ b/src/Mvc/Mvc.Core/src/Formatters/OutputFormatter.cs
@@ -30,7 +30,7 @@ protected virtual bool CanWriteType(Type? type)
 
     /// <inheritdoc />
     public virtual IReadOnlyList<string>? GetSupportedContentTypes(
-        string contentType,
+        string? contentType,
         Type objectType)
     {
         if (SupportedMediaTypes.Count == 0)
diff --git a/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs b/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs
index dd2285518075..81c6571140ba 100644
--- a/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs
+++ b/src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonInputFormatter.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using System.Text.Json;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Mvc.Formatters;
@@ -15,6 +14,7 @@ public partial class SystemTextJsonInputFormatter : TextInputFormatter, IInputFo
 {
     private readonly JsonOptions _jsonOptions;
     private readonly ILogger<SystemTextJsonInputFormatter> _logger;
+    private readonly bool _useStreamJsonOverload;
 
     /// <summary>
     /// Initializes a new instance of <see cref="SystemTextJsonInputFormatter"/>.
@@ -35,6 +35,11 @@ public SystemTextJsonInputFormatter(
         SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationJson);
         SupportedMediaTypes.Add(MediaTypeHeaderValues.TextJson);
         SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyJsonSyntax);
+
+        // Fallback to the stream-based overloads for JsonSerializer.DeserializeAsync
+        // This is to give users with custom JsonConverter implementations the chance to update their
+        // converters to support ReadOnlySequence<T> if needed while still keeping their apps working.
+        _useStreamJsonOverload = AppContext.TryGetSwitch("Microsoft.AspNetCore.UseStreamBasedJsonParsing", out var isEnabled) && isEnabled;
     }
 
     /// <summary>
@@ -58,12 +63,27 @@ public sealed override async Task<InputFormatterResult> ReadRequestBodyAsync(
         ArgumentNullException.ThrowIfNull(encoding);
 
         var httpContext = context.HttpContext;
-        var (inputStream, usesTranscodingStream) = GetInputStream(httpContext, encoding);
 
         object? model;
+        Stream? inputStream = null;
         try
         {
-            model = await JsonSerializer.DeserializeAsync(inputStream, context.ModelType, SerializerOptions);
+            if (encoding.CodePage == Encoding.UTF8.CodePage)
+            {
+                if (_useStreamJsonOverload)
+                {
+                    model = await JsonSerializer.DeserializeAsync(httpContext.Request.Body, context.ModelType, SerializerOptions);
+                }
+                else
+                {
+                    model = await JsonSerializer.DeserializeAsync(httpContext.Request.BodyReader, context.ModelType, SerializerOptions);
+                }
+            }
+            else
+            {
+                inputStream = Encoding.CreateTranscodingStream(httpContext.Request.Body, encoding, Encoding.UTF8, leaveOpen: true);
+                model = await JsonSerializer.DeserializeAsync(inputStream, context.ModelType, SerializerOptions);
+            }
         }
         catch (JsonException jsonException)
         {
@@ -89,7 +109,7 @@ public sealed override async Task<InputFormatterResult> ReadRequestBodyAsync(
         }
         finally
         {
-            if (usesTranscodingStream)
+            if (inputStream is not null)
             {
                 await inputStream.DisposeAsync();
             }
@@ -123,17 +143,6 @@ private Exception WrapExceptionForModelState(JsonException jsonException)
         return new InputFormatterException(jsonException.Message, jsonException);
     }
 
-    private static (Stream inputStream, bool usesTranscodingStream) GetInputStream(HttpContext httpContext, Encoding encoding)
-    {
-        if (encoding.CodePage == Encoding.UTF8.CodePage)
-        {
-            return (httpContext.Request.Body, false);
-        }
-
-        var inputStream = Encoding.CreateTranscodingStream(httpContext.Request.Body, encoding, Encoding.UTF8, leaveOpen: true);
-        return (inputStream, true);
-    }
-
     private static partial class Log
     {
         [LoggerMessage(1, LogLevel.Debug, "JSON input formatter threw an exception: {Message}", EventName = "SystemTextJsonInputException")]
diff --git a/src/Mvc/Mvc.Core/src/FromBodyAttribute.cs b/src/Mvc/Mvc.Core/src/FromBodyAttribute.cs
index ca4b362eea92..809cd3969542 100644
--- a/src/Mvc/Mvc.Core/src/FromBodyAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/FromBodyAttribute.cs
@@ -10,9 +10,33 @@ namespace Microsoft.AspNetCore.Mvc;
 /// Specifies that a parameter or property should be bound using the request body.
 /// </summary>
 /// <remarks>
+/// Binds a parameter or property to the request body.
+///
 /// By default, ASP.NET Core MVC delegates the responsibility of reading the body to an input formatter.<br/>
 /// In the case of ASP.NET Core Minimal APIs, the body is deserialized by <see cref="System.Text.Json.JsonSerializer"/>.
+///
+/// For more information about parameter binding see
+/// <see href="https://learn.microsoft.com/aspnet/core/fundamentals/minimal-apis/parameter-binding">Parameter binding</see>.
 /// </remarks>
+/// <example>
+/// In this example, the value of the 'name' field in the form-data request body is bound to the name parameter,
+/// and the value of the 'age' field is bound to the age parameter.
+/// <code>
+/// app.MapPost("/from-body", ([FromBody] Person person) => person);
+///
+/// public record Person(string Name, int Age);
+/// </code>
+///
+/// If the EmptyBodyBehavior is set to EmptyBodyBehavior.Allow in the FromBody attribute,
+/// requests without a request body are allowed.
+/// <code>
+/// app.MapPost("/allow-empty-body",
+/// (
+///     [Description("An optional request body")]
+///     [FromBody(EmptyBodyBehavior = EmptyBodyBehavior.Allow)] Body body
+/// ) =>
+/// </code>
+/// </example>
 [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
 public class FromBodyAttribute : Attribute, IBindingSourceMetadata, IConfigureEmptyBodyBehavior, IFromBodyMetadata
 {
diff --git a/src/Mvc/Mvc.Core/src/FromFormAttribute.cs b/src/Mvc/Mvc.Core/src/FromFormAttribute.cs
index 3e1b705e35af..4f57878ffe0d 100644
--- a/src/Mvc/Mvc.Core/src/FromFormAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/FromFormAttribute.cs
@@ -9,6 +9,22 @@ namespace Microsoft.AspNetCore.Mvc;
 /// <summary>
 /// Specifies that a parameter or property should be bound using form-data in the request body.
 /// </summary>
+/// <remarks>
+/// Binds a parameter or property to a field in a form-data request body with the same name,
+/// or the name specified in the <see cref="Name"/> property.
+/// Form parameter names are matched case-insensitively.
+///
+/// For more information about parameter binding see
+/// <see href="https://learn.microsoft.com/aspnet/core/fundamentals/minimal-apis/parameter-binding">Parameter binding</see>.
+/// </remarks>
+/// <example>
+/// In this example, the value of the 'name' field in the form-data request body is bound to the name parameter,
+/// and the value of the 'age' field is bound to the age parameter.
+/// <code>
+/// app.MapPost("/from-form", ([FromForm] string name, [FromForm] int age)
+///     => new { Name = name, Age = age });
+/// </code>
+/// </example>
 [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
 public class FromFormAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider, IFromFormMetadata
 {
diff --git a/src/Mvc/Mvc.Core/src/FromHeaderAttribute.cs b/src/Mvc/Mvc.Core/src/FromHeaderAttribute.cs
index d2209698cf83..f914ed495317 100644
--- a/src/Mvc/Mvc.Core/src/FromHeaderAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/FromHeaderAttribute.cs
@@ -9,6 +9,21 @@ namespace Microsoft.AspNetCore.Mvc;
 /// <summary>
 /// Specifies that a parameter or property should be bound using the request headers.
 /// </summary>
+/// <remarks>
+/// Binds a parameter or property to the value of the request header with the same name,
+/// or the name specified in the <see cref="Name"/> property.
+/// Note that HTTP header names are case-insensitive, so the header name is matched without regard to case.
+///
+/// For more information about parameter binding see
+/// <see href="https://learn.microsoft.com/aspnet/core/fundamentals/minimal-apis/parameter-binding">Parameter binding</see>.
+/// </remarks>
+/// <example>
+/// In this example, the value of the 'User-Agent' header is bound to the parameter.
+/// <code>
+/// app.MapGet("/user-agent", ([FromHeader(Name = "User-Agent")] string userAgent)
+///     => userAgent);
+/// </code>
+/// </example>
 [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
 public class FromHeaderAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider, IFromHeaderMetadata
 {
diff --git a/src/Mvc/Mvc.Core/src/FromQueryAttribute.cs b/src/Mvc/Mvc.Core/src/FromQueryAttribute.cs
index 3f9727f344b4..f83238aff252 100644
--- a/src/Mvc/Mvc.Core/src/FromQueryAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/FromQueryAttribute.cs
@@ -9,6 +9,21 @@ namespace Microsoft.AspNetCore.Mvc;
 /// <summary>
 /// Specifies that a parameter or property should be bound using the request query string.
 /// </summary>
+/// <remarks>
+/// Binds a parameter or property to the value of query string parameter with the same name,
+/// or the name specified in the <see cref="Name"/> property.
+/// The query parameter name is matched case-insensitively.
+///
+/// For more information about parameter binding see
+/// <see href="https://learn.microsoft.com/aspnet/core/fundamentals/minimal-apis/parameter-binding">Parameter binding</see>.
+/// </remarks>
+/// <example>
+/// In this example, the value of the 'User-Agent' header is bound to the parameter.
+/// <code>
+/// app.MapGet("/version", ([FromQuery(Name = "api-version")] string apiVersion)
+///     => apiVersion);
+/// </code>
+/// </example>
 [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
 public class FromQueryAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider, IFromQueryMetadata
 {
diff --git a/src/Mvc/Mvc.Core/src/FromRouteAttribute.cs b/src/Mvc/Mvc.Core/src/FromRouteAttribute.cs
index e3fee8160c31..6524c70af5ab 100644
--- a/src/Mvc/Mvc.Core/src/FromRouteAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/FromRouteAttribute.cs
@@ -10,6 +10,20 @@ namespace Microsoft.AspNetCore.Mvc;
 /// <summary>
 /// Specifies that a parameter or property should be bound using route-data from the current request.
 /// </summary>
+/// <remarks>
+/// Binds a parameter or property to the value of a route parameter with the same name,
+/// or the name specified in the <see cref="Name"/> property.
+/// The route parameter name is matched against parameter segments of the route pattern case-insensitively.
+///
+/// For more information about parameter binding see
+/// <see href="https://learn.microsoft.com/aspnet/core/fundamentals/minimal-apis/parameter-binding">Parameter binding</see>.
+/// </remarks>
+/// <example>
+/// In this example, the value of the 'id' route parameter is bound to the parameter.
+/// <code>
+/// app.MapGet("/from-route/{id}", ([FromRoute] string id) => id);
+/// </code>
+/// </example>
 [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
 public class FromRouteAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider, IFromRouteMetadata
 {
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs
index 5a8213ef9ce2..6d310128fcad 100644
--- a/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs
+++ b/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs
@@ -4,12 +4,14 @@
 #nullable enable
 
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.Mvc.Infrastructure;
 
 /// <summary>
 /// Type that provides access to an <see cref="ActionContext"/>.
 /// </summary>
+[Obsolete("ActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006", UrlFormat = Obsoletions.AspNetCoreDeprecate006Url)]
 public class ActionContextAccessor : IActionContextAccessor
 {
     internal static readonly IActionContextAccessor Null = new NullActionContextAccessor();
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs
index 8aef2b4dd2e6..436be14aeddc 100644
--- a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs
+++ b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvoker.cs
@@ -30,7 +30,9 @@ internal partial class ControllerActionInvoker : ResourceInvoker, IActionInvoker
     internal ControllerActionInvoker(
         ILogger logger,
         DiagnosticListener diagnosticListener,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor actionContextAccessor,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
         IActionResultTypeMapper mapper,
         ControllerContext controllerContext,
         ControllerActionInvokerCacheEntry cacheEntry,
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs
index 24b6395038bc..4d70251c4340 100644
--- a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs
+++ b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs
@@ -23,7 +23,9 @@ internal sealed class ControllerActionInvokerProvider : IActionInvokerProvider
     private readonly ILogger _logger;
     private readonly DiagnosticListener _diagnosticListener;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
 
     public ControllerActionInvokerProvider(
         ControllerActionInvokerCache controllerActionInvokerCache,
@@ -41,7 +43,9 @@ public ControllerActionInvokerProvider(
         ILoggerFactory loggerFactory,
         DiagnosticListener diagnosticListener,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor)
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     {
         _controllerActionInvokerCache = controllerActionInvokerCache;
         _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
@@ -51,7 +55,9 @@ public ControllerActionInvokerProvider(
         _logger = loggerFactory.CreateLogger(typeof(ControllerActionInvoker));
         _diagnosticListener = diagnosticListener;
         _mapper = mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public int Order => -1000;
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs
index e4ebd8f65a07..a33dd2ff72c5 100644
--- a/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs
+++ b/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs
@@ -4,12 +4,14 @@
 #nullable enable
 
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.Mvc.Infrastructure;
 
 /// <summary>
 /// Defines an interface for exposing an <see cref="ActionContext"/>.
 /// </summary>
+[Obsolete("IActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006", UrlFormat = Obsoletions.AspNetCoreDeprecate006Url)]
 public interface IActionContextAccessor
 {
     /// <summary>
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
index f09da93f3c3f..6d2422bea797 100644
--- a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
+++ b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
@@ -15,7 +15,9 @@ internal abstract partial class ResourceInvoker
 {
     protected readonly DiagnosticListener _diagnosticListener;
     protected readonly ILogger _logger;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
     protected readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     protected readonly IActionResultTypeMapper _mapper;
     protected readonly ActionContext _actionContext;
     protected readonly IFilterMetadata[] _filters;
@@ -37,7 +39,9 @@ internal abstract partial class ResourceInvoker
     public ResourceInvoker(
         DiagnosticListener diagnosticListener,
         ILogger logger,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor actionContextAccessor,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
         IActionResultTypeMapper mapper,
         ActionContext actionContext,
         IFilterMetadata[] filters,
diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.WarningSuppressions.xml b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.WarningSuppressions.xml
index 450566e81932..e179ca1a04b3 100644
--- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.WarningSuppressions.xml
+++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.WarningSuppressions.xml
@@ -37,6 +37,12 @@
       <property name="Scope">member</property>
       <property name="Target">M:Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult.#ctor(System.String,System.Object,System.Object)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2026</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:Microsoft.AspNetCore.Mvc.ApplicationModels.DefaultApplicationModelProvider.AddReturnTypeMetadata(System.Collections.Generic.IList{Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel},System.Reflection.MethodInfo)</property>
+    </attribute>
     <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
       <argument>ILLink</argument>
       <argument>IL2026</argument>
@@ -77,7 +83,7 @@
       <argument>ILLink</argument>
       <argument>IL2026</argument>
       <property name="Scope">member</property>
-      <property name="Target">M:Microsoft.AspNetCore.Mvc.Formatters.SystemTextJsonInputFormatter.&lt;ReadRequestBodyAsync&gt;d__8.MoveNext</property>
+      <property name="Target">M:Microsoft.AspNetCore.Mvc.Formatters.SystemTextJsonInputFormatter.&lt;ReadRequestBodyAsync&gt;d__9.MoveNext</property>
     </attribute>
     <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
       <argument>ILLink</argument>
@@ -517,6 +523,12 @@
       <property name="Scope">member</property>
       <property name="Target">M:Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute.GetFactoryType</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2060</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:Microsoft.AspNetCore.Mvc.ApplicationModels.DefaultApplicationModelProvider.AddReturnTypeMetadata(System.Collections.Generic.IList{Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel},System.Reflection.MethodInfo)</property>
+    </attribute>
     <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
       <argument>ILLink</argument>
       <argument>IL2060</argument>
@@ -637,6 +649,12 @@
       <property name="Scope">member</property>
       <property name="Target">M:Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultBindingMetadataProvider.GetBoundConstructor(System.Type)</property>
     </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2072</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:Microsoft.AspNetCore.Mvc.ApplicationModels.DefaultApplicationModelProvider.AddReturnTypeMetadata(System.Collections.Generic.IList{Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel},System.Reflection.MethodInfo)</property>
+    </attribute>
     <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
       <argument>ILLink</argument>
       <argument>IL2072</argument>
diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
index 2f0ca390d01f..fa00f51a8fe1 100644
--- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
+++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj
@@ -40,6 +40,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
     <Compile Include="$(SharedSourceRoot)HttpParseResult.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)HttpRuleParser.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Json\JsonSerializerExtensions.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs
index 68c71a5e4807..48e1580609c6 100644
--- a/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs
+++ b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs
@@ -248,12 +248,7 @@ protected virtual bool ValidateNode()
         {
             // If the field has an entry in ModelState, then record it as valid. Don't create
             // extra entries if they don't exist already.
-            var entry = ModelState[Key];
-            if (entry != null)
-            {
-                entry.ValidationState = ModelValidationState.Valid;
-            }
-
+            ModelState[Key]?.ValidationState = ModelValidationState.Valid;
             return true;
         }
     }
diff --git a/src/Mvc/Mvc.Core/src/ProducesAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesAttribute.cs
index f7bbbc380dfc..bcef087a2e6a 100644
--- a/src/Mvc/Mvc.Core/src/ProducesAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/ProducesAttribute.cs
@@ -52,6 +52,9 @@ public ProducesAttribute(string contentType, params string[] additionalContentTy
     /// <inheritdoc />
     public Type? Type { get; set; }
 
+    /// <inheritdoc />
+    public string? Description { get; set; }
+
     /// <summary>
     /// Gets or sets the supported response content types. Used to set <see cref="ObjectResult.ContentTypes"/>.
     /// </summary>
diff --git a/src/Mvc/Mvc.Core/src/ProducesDefaultResponseTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesDefaultResponseTypeAttribute.cs
index 95468183d7c1..1ba001648769 100644
--- a/src/Mvc/Mvc.Core/src/ProducesDefaultResponseTypeAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/ProducesDefaultResponseTypeAttribute.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
@@ -39,6 +39,11 @@ public ProducesDefaultResponseTypeAttribute(Type type)
     /// </summary>
     public int StatusCode { get; }
 
+    /// <summary>
+    /// Gets or sets the description of the response.
+    /// </summary>
+    public string? Description { get; set; }
+
     /// <inheritdoc />
     void IApiResponseMetadataProvider.SetContentTypes(MediaTypeCollection contentTypes)
     {
diff --git a/src/Mvc/Mvc.Core/src/ProducesResponseTypeAttribute.cs b/src/Mvc/Mvc.Core/src/ProducesResponseTypeAttribute.cs
index 6399a66d464d..f9c55192040e 100644
--- a/src/Mvc/Mvc.Core/src/ProducesResponseTypeAttribute.cs
+++ b/src/Mvc/Mvc.Core/src/ProducesResponseTypeAttribute.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
@@ -87,6 +87,11 @@ public ProducesResponseTypeAttribute(Type type, int statusCode, string contentTy
     // Internal for testing
     internal MediaTypeCollection? ContentTypes => _contentTypes;
 
+    /// <summary>
+    /// Gets or sets the description of the response.
+    /// </summary>
+    public string? Description { get; set; }
+
     /// <inheritdoc />
     void IApiResponseMetadataProvider.SetContentTypes(MediaTypeCollection contentTypes)
     {
diff --git a/src/Mvc/Mvc.Core/src/PublicAPI.Shipped.txt b/src/Mvc/Mvc.Core/src/PublicAPI.Shipped.txt
index 073e491b4a7e..ebb18238569f 100644
--- a/src/Mvc/Mvc.Core/src/PublicAPI.Shipped.txt
+++ b/src/Mvc/Mvc.Core/src/PublicAPI.Shipped.txt
@@ -953,6 +953,8 @@ Microsoft.AspNetCore.Mvc.Infrastructure.ContentResultExecutor
 Microsoft.AspNetCore.Mvc.Infrastructure.ContentResultExecutor.ContentResultExecutor(Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Mvc.Infrastructure.ContentResultExecutor!>! logger, Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory! httpResponseStreamWriterFactory) -> void
 Microsoft.AspNetCore.Mvc.Infrastructure.DefaultOutputFormatterSelector
 Microsoft.AspNetCore.Mvc.Infrastructure.DefaultOutputFormatterSelector.DefaultOutputFormatterSelector(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions!>! options, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
+Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory
+Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory.DefaultProblemDetailsFactory(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.ApiBehaviorOptions!>! options, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Http.ProblemDetailsOptions!>? problemDetailsOptions = null) -> void
 Microsoft.AspNetCore.Mvc.Infrastructure.DefaultStatusCodeAttribute
 Microsoft.AspNetCore.Mvc.Infrastructure.DefaultStatusCodeAttribute.DefaultStatusCodeAttribute(int statusCode) -> void
 Microsoft.AspNetCore.Mvc.Infrastructure.DefaultStatusCodeAttribute.StatusCode.get -> int
@@ -1999,6 +2001,8 @@ override Microsoft.AspNetCore.Mvc.Formatters.StringOutputFormatter.WriteResponse
 override Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter.ReadRequestBodyAsync(Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext! context) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult!>!
 override Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter.WriteAsync(Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext! context) -> System.Threading.Tasks.Task!
 override Microsoft.AspNetCore.Mvc.Infrastructure.DefaultOutputFormatterSelector.SelectFormatter(Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext! context, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter!>! formatters, Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection! contentTypes) -> Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter?
+override Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory.CreateProblemDetails(Microsoft.AspNetCore.Http.HttpContext! httpContext, int? statusCode = null, string? title = null, string? type = null, string? detail = null, string? instance = null) -> Microsoft.AspNetCore.Mvc.ProblemDetails!
+override Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory.CreateValidationProblemDetails(Microsoft.AspNetCore.Http.HttpContext! httpContext, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary! modelStateDictionary, int? statusCode = null, string? title = null, string? type = null, string? detail = null, string? instance = null) -> Microsoft.AspNetCore.Mvc.ValidationProblemDetails!
 override Microsoft.AspNetCore.Mvc.JsonResult.ExecuteResultAsync(Microsoft.AspNetCore.Mvc.ActionContext! context) -> System.Threading.Tasks.Task!
 override Microsoft.AspNetCore.Mvc.LocalRedirectResult.ExecuteResultAsync(Microsoft.AspNetCore.Mvc.ActionContext! context) -> System.Threading.Tasks.Task!
 override Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ArrayModelBinder<TElement>.CanCreateInstance(System.Type! targetType) -> bool
@@ -2357,7 +2361,8 @@ virtual Microsoft.AspNetCore.Mvc.ControllerBase.PhysicalFile(string! physicalPat
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.PhysicalFile(string! physicalPath, string! contentType, string? fileDownloadName, System.DateTimeOffset? lastModified, Microsoft.Net.Http.Headers.EntityTagHeaderValue! entityTag, bool enableRangeProcessing) -> Microsoft.AspNetCore.Mvc.PhysicalFileResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.PhysicalFile(string! physicalPath, string! contentType, System.DateTimeOffset? lastModified, Microsoft.Net.Http.Headers.EntityTagHeaderValue! entityTag) -> Microsoft.AspNetCore.Mvc.PhysicalFileResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.PhysicalFile(string! physicalPath, string! contentType, System.DateTimeOffset? lastModified, Microsoft.Net.Http.Headers.EntityTagHeaderValue! entityTag, bool enableRangeProcessing) -> Microsoft.AspNetCore.Mvc.PhysicalFileResult!
-virtual Microsoft.AspNetCore.Mvc.ControllerBase.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null) -> Microsoft.AspNetCore.Mvc.ObjectResult!
+virtual Microsoft.AspNetCore.Mvc.ControllerBase.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Mvc.ObjectResult!
+virtual Microsoft.AspNetCore.Mvc.ControllerBase.Problem(string? detail, string? instance, int? statusCode, string? title, string? type) -> Microsoft.AspNetCore.Mvc.ObjectResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.Redirect(string! url) -> Microsoft.AspNetCore.Mvc.RedirectResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.RedirectPermanent(string! url) -> Microsoft.AspNetCore.Mvc.RedirectResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.RedirectPermanentPreserveMethod(string! url) -> Microsoft.AspNetCore.Mvc.RedirectResult!
@@ -2426,7 +2431,8 @@ virtual Microsoft.AspNetCore.Mvc.ControllerBase.UnprocessableEntity(object? erro
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem() -> Microsoft.AspNetCore.Mvc.ActionResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary! modelStateDictionary) -> Microsoft.AspNetCore.Mvc.ActionResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(Microsoft.AspNetCore.Mvc.ValidationProblemDetails! descriptor) -> Microsoft.AspNetCore.Mvc.ActionResult!
-virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary? modelStateDictionary = null) -> Microsoft.AspNetCore.Mvc.ActionResult!
+virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary? modelStateDictionary = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Mvc.ActionResult!
+virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(string? detail, string? instance, int? statusCode, string? title, string? type, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary? modelStateDictionary) -> Microsoft.AspNetCore.Mvc.ActionResult!
 virtual Microsoft.AspNetCore.Mvc.ControllerContext.ValueProviderFactories.get -> System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory!>!
 virtual Microsoft.AspNetCore.Mvc.ControllerContext.ValueProviderFactories.set -> void
 virtual Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor.ActionName.get -> string!
diff --git a/src/Mvc/Mvc.Core/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Core/src/PublicAPI.Unshipped.txt
index b4560b45280f..1cd6a2b5200c 100644
--- a/src/Mvc/Mvc.Core/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.Core/src/PublicAPI.Unshipped.txt
@@ -1,11 +1,16 @@
 #nullable enable
-*REMOVED*virtual Microsoft.AspNetCore.Mvc.ControllerBase.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null) -> Microsoft.AspNetCore.Mvc.ObjectResult!
-*REMOVED*virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary? modelStateDictionary = null) -> Microsoft.AspNetCore.Mvc.ActionResult!
-virtual Microsoft.AspNetCore.Mvc.ControllerBase.Problem(string? detail, string? instance, int? statusCode, string? title, string? type) -> Microsoft.AspNetCore.Mvc.ObjectResult!
-virtual Microsoft.AspNetCore.Mvc.ControllerBase.Problem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Mvc.ObjectResult!
-virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(string? detail, string? instance, int? statusCode, string? title, string? type, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary? modelStateDictionary) -> Microsoft.AspNetCore.Mvc.ActionResult!
-virtual Microsoft.AspNetCore.Mvc.ControllerBase.ValidationProblem(string? detail = null, string? instance = null, int? statusCode = null, string? title = null, string? type = null, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary? modelStateDictionary = null, System.Collections.Generic.IDictionary<string!, object?>? extensions = null) -> Microsoft.AspNetCore.Mvc.ActionResult!
-Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory
-Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory.DefaultProblemDetailsFactory(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.ApiBehaviorOptions!>! options, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Http.ProblemDetailsOptions!>? problemDetailsOptions = null) -> void
-override Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory.CreateProblemDetails(Microsoft.AspNetCore.Http.HttpContext! httpContext, int? statusCode = null, string? title = null, string? type = null, string? detail = null, string? instance = null) -> Microsoft.AspNetCore.Mvc.ProblemDetails!
-override Microsoft.AspNetCore.Mvc.Infrastructure.DefaultProblemDetailsFactory.CreateValidationProblemDetails(Microsoft.AspNetCore.Http.HttpContext! httpContext, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary! modelStateDictionary, int? statusCode = null, string? title = null, string? type = null, string? detail = null, string? instance = null) -> Microsoft.AspNetCore.Mvc.ValidationProblemDetails!
+*REMOVED*Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestFormatMetadataProvider.GetSupportedContentTypes(string! contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestFormatMetadataProvider.GetSupportedContentTypes(string? contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider.Description.get -> string?
+*REMOVED*Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseTypeMetadataProvider.GetSupportedContentTypes(string! contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseTypeMetadataProvider.GetSupportedContentTypes(string? contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+Microsoft.AspNetCore.Mvc.ProducesAttribute.Description.get -> string?
+Microsoft.AspNetCore.Mvc.ProducesAttribute.Description.set -> void
+Microsoft.AspNetCore.Mvc.ProducesDefaultResponseTypeAttribute.Description.get -> string?
+Microsoft.AspNetCore.Mvc.ProducesDefaultResponseTypeAttribute.Description.set -> void
+Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute.Description.get -> string?
+Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute.Description.set -> void
+*REMOVED*virtual Microsoft.AspNetCore.Mvc.Formatters.InputFormatter.GetSupportedContentTypes(string! contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+virtual Microsoft.AspNetCore.Mvc.Formatters.InputFormatter.GetSupportedContentTypes(string? contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+*REMOVED*virtual Microsoft.AspNetCore.Mvc.Formatters.OutputFormatter.GetSupportedContentTypes(string! contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
+virtual Microsoft.AspNetCore.Mvc.Formatters.OutputFormatter.GetSupportedContentTypes(string? contentType, System.Type! objectType) -> System.Collections.Generic.IReadOnlyList<string!>?
diff --git a/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
index 6b46d0a62bca..3b803e72e340 100644
--- a/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
+++ b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
@@ -543,12 +543,4 @@ private static RequestDelegate CreateRequestDelegate()
             return invoker!.InvokeAsync();
         };
     }
-
-    private sealed class InertEndpointBuilder : EndpointBuilder
-    {
-        public override Endpoint Build()
-        {
-            return new Endpoint(RequestDelegate, new EndpointMetadataCollection(Metadata), DisplayName);
-        }
-    }
 }
diff --git a/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs b/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs
index f31448e78732..4b4bbd1313c9 100644
--- a/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs
+++ b/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs
@@ -24,7 +24,9 @@ internal sealed class ControllerRequestDelegateFactory : IRequestDelegateFactory
     private readonly ILogger _logger;
     private readonly DiagnosticListener _diagnosticListener;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     private readonly bool _enableActionInvokers;
 
     public ControllerRequestDelegateFactory(
@@ -43,7 +45,9 @@ public ControllerRequestDelegateFactory(
         ILoggerFactory loggerFactory,
         DiagnosticListener diagnosticListener,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor)
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     {
         _controllerActionInvokerCache = controllerActionInvokerCache;
         _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
@@ -54,7 +58,9 @@ public ControllerRequestDelegateFactory(
         _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
         _diagnosticListener = diagnosticListener;
         _mapper = mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public RequestDelegate? CreateRequestDelegate(ActionDescriptor actionDescriptor, RouteValueDictionary? dataTokens)
diff --git a/src/Mvc/Mvc.Core/src/Routing/InertEndpointBuilder.cs b/src/Mvc/Mvc.Core/src/Routing/InertEndpointBuilder.cs
new file mode 100644
index 000000000000..b37312e5be92
--- /dev/null
+++ b/src/Mvc/Mvc.Core/src/Routing/InertEndpointBuilder.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.Routing;
+
+internal sealed class InertEndpointBuilder : EndpointBuilder
+{
+    public override Endpoint Build()
+    {
+        return new Endpoint(RequestDelegate, new EndpointMetadataCollection(Metadata), DisplayName);
+    }
+}
diff --git a/src/Mvc/Mvc.Core/test/ActionConstraints/HttpMethodActionConstraintTest.cs b/src/Mvc/Mvc.Core/test/ActionConstraints/HttpMethodActionConstraintTest.cs
index 027d2d275ad2..a1696a10b5e2 100644
--- a/src/Mvc/Mvc.Core/test/ActionConstraints/HttpMethodActionConstraintTest.cs
+++ b/src/Mvc/Mvc.Core/test/ActionConstraints/HttpMethodActionConstraintTest.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.ActionConstraints;
 
 public class HttpMethodActionConstraintTest
 {
-    public static TheoryData AcceptCaseInsensitiveData =
+    public static TheoryData<IEnumerable<string>, string> AcceptCaseInsensitiveData =
         new TheoryData<IEnumerable<string>, string>
         {
                 { new string[] { "get", "Get", "GET", "GEt"}, "gEt" },
diff --git a/src/Mvc/Mvc.Core/test/ApplicationModels/DefaultApplicationModelProviderTest.cs b/src/Mvc/Mvc.Core/test/ApplicationModels/DefaultApplicationModelProviderTest.cs
index eee240402991..082b7e498b42 100644
--- a/src/Mvc/Mvc.Core/test/ApplicationModels/DefaultApplicationModelProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ApplicationModels/DefaultApplicationModelProviderTest.cs
@@ -3,6 +3,7 @@
 
 using System.Reflection;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -1243,6 +1244,46 @@ public void CreateActionModel_InheritedAttributeRoutesOverridden()
         Assert.Contains(selectorModel.AttributeRouteModel.Attribute, action.Attributes);
     }
 
+    [Fact]
+    public void CreateActionModel_PopulatesReturnTypeEndpointMetadata() {
+        // Arrange
+        var builder = new TestApplicationModelProvider();
+        var typeInfo = typeof(TypedResultsReturningActionsController).GetTypeInfo();
+        var actionName = nameof(TypedResultsReturningActionsController.Get);
+
+        // Act
+        var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+        // Assert
+        Assert.NotNull(action.Selectors);
+        Assert.All(action.Selectors, selector =>
+        {
+            Assert.NotNull(selector.EndpointMetadata);
+            Assert.Contains(selector.EndpointMetadata, m => m is ProducesResponseTypeMetadata);
+        });
+        var metadata = action.Selectors[0].EndpointMetadata.OfType<ProducesResponseTypeMetadata>().Single();
+        Assert.Equal(200, metadata.StatusCode);
+    }
+
+    [Fact]
+    public void AddReturnTypeMetadata_ExtractsMetadataFromReturnType()
+    {
+        // Arrange
+        var selector = new SelectorModel();
+        var selectors = new List<SelectorModel> { selector };
+        var actionMethod = typeof(TypedResultsReturningActionsController).GetMethod(nameof(TypedResultsReturningActionsController.Get));
+
+        // Act
+        DefaultApplicationModelProvider.AddReturnTypeMetadata(selectors, actionMethod);
+
+        // Assert
+        Assert.NotNull(selector.EndpointMetadata);
+        Assert.Equal(2, selector.EndpointMetadata.Count);
+        Assert.Single(selector.EndpointMetadata.OfType<ProducesResponseTypeMetadata>());
+        Assert.Single(selector.EndpointMetadata.OfType<IDisableCookieRedirectMetadata>());
+        Assert.Equal(200, ((ProducesResponseTypeMetadata)selector.EndpointMetadata[0]).StatusCode);
+    }
+
     [Fact]
     public void ControllerDispose_ExplicitlyImplemented_IDisposableMethods_AreTreatedAs_NonActions()
     {
@@ -1711,6 +1752,16 @@ public void Details() { }
         public void List() { }
     }
 
+    private class TypedResultsReturningActionsController : Controller
+    {
+        [HttpGet]
+        public Http.HttpResults.Ok<Foo> Get() => TypedResults.Ok<Foo>(new Foo { Info = "Hello" });
+    }
+
+    public class Foo {
+        public required string Info { get; set; }
+    }
+
     private class CustomHttpMethodsAttribute : Attribute, IActionHttpMethodProvider
     {
         private readonly string[] _methods;
diff --git a/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs b/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs
index 9f8fa3037d62..2d3d30340bd5 100644
--- a/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs
+++ b/src/Mvc/Mvc.Core/test/Authorization/AuthorizeFilterTest.cs
@@ -448,7 +448,7 @@ public void CreateInstance_ReturnsSelfIfPolicyProviderIsSet()
         Assert.Same(authorizeFilter, result);
     }
 
-    public static TheoryData AuthorizeFiltersCreatedWithoutPolicyOrPolicyProvider
+    public static TheoryData<AuthorizeFilter> AuthorizeFiltersCreatedWithoutPolicyOrPolicyProvider
     {
         get
         {
diff --git a/src/Mvc/Mvc.Core/test/CreatedResultTests.cs b/src/Mvc/Mvc.Core/test/CreatedResultTests.cs
index 543d828cce74..77c430591a03 100644
--- a/src/Mvc/Mvc.Core/test/CreatedResultTests.cs
+++ b/src/Mvc/Mvc.Core/test/CreatedResultTests.cs
@@ -88,7 +88,7 @@ public async Task CreatedResult_ReturnsStatusCode_NotSetLocationHeader()
 
         // Assert
         Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
-        Assert.Empty(httpContext.Response.Headers["Location"]);
+        Assert.Equal(0, httpContext.Response.Headers["Location"].Count);
     }
 
     [Fact]
diff --git a/src/Mvc/Mvc.Core/test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
index e7e8f597b532..a256f7eaf849 100644
--- a/src/Mvc/Mvc.Core/test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
+++ b/src/Mvc/Mvc.Core/test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
@@ -16,7 +16,7 @@ public class ApiBehaviorOptionsSetupTest
     public void Configure_AddsClientErrorMappings()
     {
         // Arrange
-        var expected = new[] { 400, 401, 403, 404, 405, 406, 408, 409, 412, 415, 422, 426, 500, 502, 503, 504 };
+        var expected = new[] { 400, 401, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 421, 422, 426, 500, 501, 502, 503, 504, 505 };
         var optionsSetup = new ApiBehaviorOptionsSetup();
         var options = new ApiBehaviorOptions();
 
diff --git a/src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
index d105879e827c..319d018b70d0 100644
--- a/src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
+++ b/src/Mvc/Mvc.Core/test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
@@ -362,15 +362,11 @@ private void AssertContainsSingle(
 
         if (matches.Length == 0)
         {
-            Assert.True(
-                false,
-                $"Could not find an instance of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Could not find an instance of {implementationType} registered as {serviceType}");
         }
         else if (matches.Length > 1)
         {
-            Assert.True(
-                false,
-                $"Found multiple instances of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Found multiple instances of {implementationType} registered as {serviceType}");
         }
     }
 }
diff --git a/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs b/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs
index ee74ec0b72cb..14a605a53667 100644
--- a/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs
+++ b/src/Mvc/Mvc.Core/test/Filters/MiddlewareFilterTest.cs
@@ -379,7 +379,7 @@ public void Verify()
         {
             if (CreateCalled && !ReleaseCalled)
             {
-                Assert.False(true, "ReleaseController should have been called.");
+                Assert.Fail("ReleaseController should have been called.");
             }
         }
     }
@@ -398,7 +398,9 @@ public TestControllerActionInvoker(
             : base(
                   logger,
                   diagnosticListener,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
                   ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
                   mapper,
                   CreateControllerContext(actionContext, valueProviderFactories, maxAllowedErrorsInModelState),
                   CreateCacheEntry((ControllerActionDescriptor)actionContext.ActionDescriptor, controllerFactory),
diff --git a/src/Mvc/Mvc.Core/test/ForbidResultTest.cs b/src/Mvc/Mvc.Core/test/ForbidResultTest.cs
index d78d399f5ca0..b20c98fa8eaa 100644
--- a/src/Mvc/Mvc.Core/test/ForbidResultTest.cs
+++ b/src/Mvc/Mvc.Core/test/ForbidResultTest.cs
@@ -71,7 +71,7 @@ public async Task ExecuteResultAsync_InvokesForbidAsyncOnAllConfiguredSchemes()
         auth.Verify();
     }
 
-    public static TheoryData ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData =>
+    public static TheoryData<AuthenticationProperties> ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData =>
         new TheoryData<AuthenticationProperties>
         {
                 null,
diff --git a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs
index efbe148abb5c..502c789aba6b 100644
--- a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs
+++ b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonOutputFormatterTest.cs
@@ -88,7 +88,7 @@ public async Task WriteResponseBodyAsync_ForLargeAsyncEnumerable()
     {
         // Arrange
         var expected = new MemoryStream();
-        await JsonSerializer.SerializeAsync(expected, LargeAsync(), new JsonSerializerOptions(JsonSerializerDefaults.Web));
+        await JsonSerializer.SerializeAsync(expected, LargeAsync(), JsonSerializerOptions.Web);
         var formatter = GetOutputFormatter();
         var mediaType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
         var encoding = CreateOrGetSupportedEncoding(formatter, "utf-8", isDefaultEncoding: true);
diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/ActionMethodExecutorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ActionMethodExecutorTest.cs
index 5b3019425a77..73cfbe3ebe3d 100644
--- a/src/Mvc/Mvc.Core/test/Infrastructure/ActionMethodExecutorTest.cs
+++ b/src/Mvc/Mvc.Core/test/Infrastructure/ActionMethodExecutorTest.cs
@@ -12,7 +12,7 @@ public class ActionMethodExecutorTest
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesVoidActions(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesVoidActionsAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -32,13 +32,13 @@ public void ActionMethodExecutor_ExecutesVoidActions(bool withFilter)
         // Assert
         Assert.Equal("VoidResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.True(controller.Executed);
-        Assert.IsType<EmptyResult>(valueTask.Result);
+        Assert.IsType<EmptyResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturningIActionResult(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturningIActionResultAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -58,13 +58,13 @@ public void ActionMethodExecutor_ExecutesActionsReturningIActionResult(bool with
         // Assert
         Assert.Equal("SyncActionResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.True(valueTask.IsCompleted);
-        Assert.IsType<ContentResult>(valueTask.Result);
+        Assert.IsType<ContentResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturningSubTypeOfActionResult(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturningSubTypeOfActionResultAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -83,13 +83,13 @@ public void ActionMethodExecutor_ExecutesActionsReturningSubTypeOfActionResult(b
 
         // Assert
         Assert.Equal("SyncActionResultExecutor", actionMethodExecutor.GetType().Name);
-        Assert.IsType<ContentResult>(valueTask.Result);
+        Assert.IsType<ContentResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturningActionResultOfT(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturningActionResultOfTAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -107,7 +107,7 @@ public void ActionMethodExecutor_ExecutesActionsReturningActionResultOfT(bool wi
         var valueTask = Execute(actionMethodExecutor, filterContext, withFilter);
 
         // Assert
-        var result = Assert.IsType<ObjectResult>(valueTask.Result);
+        var result = Assert.IsType<ObjectResult>(await valueTask);
 
         Assert.Equal("SyncObjectResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.NotNull(result.Value);
@@ -118,7 +118,7 @@ public void ActionMethodExecutor_ExecutesActionsReturningActionResultOfT(bool wi
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturningModelAsModel(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturningModelAsModelAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -136,7 +136,7 @@ public void ActionMethodExecutor_ExecutesActionsReturningModelAsModel(bool withF
         var valueTask = Execute(actionMethodExecutor, filterContext, withFilter);
 
         // Assert
-        var result = Assert.IsType<ObjectResult>(valueTask.Result);
+        var result = Assert.IsType<ObjectResult>(await valueTask);
 
         Assert.Equal("SyncObjectResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.NotNull(result.Value);
@@ -147,7 +147,7 @@ public void ActionMethodExecutor_ExecutesActionsReturningModelAsModel(bool withF
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturningModelAsObject(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturningModelAsObjectAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -165,7 +165,7 @@ public void ActionMethodExecutor_ExecutesActionsReturningModelAsObject(bool with
         var valueTask = Execute(actionMethodExecutor, filterContext, withFilter);
 
         // Assert
-        var result = Assert.IsType<ObjectResult>(valueTask.Result);
+        var result = Assert.IsType<ObjectResult>(await valueTask);
 
         Assert.Equal("SyncObjectResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.NotNull(result.Value);
@@ -176,7 +176,7 @@ public void ActionMethodExecutor_ExecutesActionsReturningModelAsObject(bool with
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturningActionResultAsObject(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturningActionResultAsObjectAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -195,13 +195,13 @@ public void ActionMethodExecutor_ExecutesActionsReturningActionResultAsObject(bo
 
         // Assert
         Assert.Equal("SyncActionResultExecutor", actionMethodExecutor.GetType().Name);
-        Assert.IsType<ContentResult>(valueTask.Result);
+        Assert.IsType<ContentResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturnTask(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturnTaskAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -221,13 +221,13 @@ public void ActionMethodExecutor_ExecutesActionsReturnTask(bool withFilter)
         // Assert
         Assert.Equal("TaskResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.True(controller.Executed);
-        Assert.IsType<EmptyResult>(valueTask.Result);
+        Assert.IsType<EmptyResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsReturnAwaitable(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsReturnAwaitableAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -247,13 +247,13 @@ public void ActionMethodExecutor_ExecutesActionsReturnAwaitable(bool withFilter)
         // Assert
         Assert.Equal("AwaitableResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.True(controller.Executed);
-        Assert.IsType<EmptyResult>(valueTask.Result);
+        Assert.IsType<EmptyResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutorExecutesActionsAsynchronouslyReturningIActionResult(bool withFilter)
+    public async Task ActionMethodExecutorExecutesActionsAsynchronouslyReturningIActionResultAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -272,7 +272,7 @@ public void ActionMethodExecutorExecutesActionsAsynchronouslyReturningIActionRes
 
         // Assert
         Assert.Equal("TaskOfIActionResultExecutor", actionMethodExecutor.GetType().Name);
-        Assert.IsType<StatusCodeResult>(valueTask.Result);
+        Assert.IsType<StatusCodeResult>(await valueTask);
     }
 
     [Theory]
@@ -298,13 +298,13 @@ public async Task ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningAct
         // Assert
         await valueTask;
         Assert.Equal("TaskOfActionResultExecutor", actionMethodExecutor.GetType().Name);
-        Assert.IsType<ViewResult>(valueTask.Result);
+        Assert.IsType<ViewResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModel(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModelAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -322,7 +322,7 @@ public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModel(boo
         var valueTask = Execute(actionMethodExecutor, filterContext, withFilter);
 
         // Assert
-        var result = Assert.IsType<ObjectResult>(valueTask.Result);
+        var result = Assert.IsType<ObjectResult>(await valueTask);
 
         Assert.Equal("AwaitableObjectResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.NotNull(result.Value);
@@ -333,7 +333,7 @@ public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModel(boo
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModelAsObject(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModelAsObjectAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -351,7 +351,7 @@ public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModelAsOb
         var valueTask = Execute(actionMethodExecutor, filterContext, withFilter);
 
         // Assert
-        var result = Assert.IsType<ObjectResult>(valueTask.Result);
+        var result = Assert.IsType<ObjectResult>(await valueTask);
 
         Assert.Equal("AwaitableObjectResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.NotNull(result.Value);
@@ -362,7 +362,7 @@ public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModelAsOb
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningIActionResultAsObject(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningIActionResultAsObjectAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -381,13 +381,13 @@ public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningIActionRe
 
         // Assert
         Assert.Equal("AwaitableObjectResultExecutor", actionMethodExecutor.GetType().Name);
-        Assert.IsType<OkResult>(valueTask.Result);
+        Assert.IsType<OkResult>(await valueTask);
     }
 
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningActionResultOfT(bool withFilter)
+    public async Task ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningActionResultOfTAsync(bool withFilter)
     {
         // Arrange
         var mapper = new ActionResultTypeMapper();
@@ -405,7 +405,7 @@ public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningActionRes
         var valueTask = Execute(actionMethodExecutor, filterContext, withFilter);
 
         // Assert
-        var result = Assert.IsType<ObjectResult>(valueTask.Result);
+        var result = Assert.IsType<ObjectResult>(await valueTask);
 
         Assert.Equal("AwaitableObjectResultExecutor", actionMethodExecutor.GetType().Name);
         Assert.NotNull(result.Value);
diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs
index cc2fc74e9376..69bdac9ed518 100644
--- a/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs
+++ b/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerTest.cs
@@ -63,7 +63,7 @@ public async Task Invoke_WritesDiagnostic_ActionSelected()
         var routeValues = listener.BeforeAction?.RouteData?.Values;
         Assert.NotNull(routeValues);
 
-        Assert.Equal(1, routeValues.Count);
+        Assert.Single(routeValues);
         Assert.Contains(routeValues, kvp => kvp.Key == "tag" && string.Equals(kvp.Value, "value"));
     }
 
@@ -112,7 +112,7 @@ public async Task InvokeAction_ResourceFilter_WritesDiagnostic_Not_ShortCircuite
         actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ActionMethod));
         actionDescriptor.ControllerTypeInfo = typeof(TestController).GetTypeInfo();
 
-        var listener = new TestDiagnosticListener();        
+        var listener = new TestDiagnosticListener();
         var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
         resourceFilter
             .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
@@ -161,7 +161,7 @@ public async Task InvokeAction_ResourceFilter_WritesDiagnostic_ShortCircuited()
         actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ActionMethod));
         actionDescriptor.ControllerTypeInfo = typeof(TestController).GetTypeInfo();
 
-        var listener = new TestDiagnosticListener();        
+        var listener = new TestDiagnosticListener();
         var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
         resourceFilter
             .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
@@ -252,7 +252,7 @@ public async Task DeletingValueProviderFactory_AtResourceFilter_IsNotAvailableIn
         // Assert
         var controllerContext = Assert.IsType<ControllerActionInvoker>(invoker).ControllerContext;
         Assert.NotNull(controllerContext);
-        Assert.Equal(1, controllerContext.ValueProviderFactories.Count);
+        Assert.Single(controllerContext.ValueProviderFactories);
         Assert.Same(valueProviderFactory2, controllerContext.ValueProviderFactories[0]);
     }
 
@@ -1432,7 +1432,9 @@ public async Task Invoke_UsesDefaultValuesIfNotBound()
         var invoker = new ControllerActionInvoker(
             new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
             new DiagnosticListener("Microsoft.AspNetCore"),
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
             ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
             new ActionResultTypeMapper(),
             controllerContext,
             cacheEntry,
@@ -1769,7 +1771,9 @@ private ControllerActionInvoker CreateInvoker(
         var invoker = new ControllerActionInvoker(
             logger,
             diagnosticSource,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
             ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
             new ActionResultTypeMapper(),
             controllerContext,
             cacheEntry,
diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/DefaultApiProblemDetailsWriterTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/DefaultApiProblemDetailsWriterTest.cs
index ae8fc3a945f1..5a0ff23e205b 100644
--- a/src/Mvc/Mvc.Core/test/Infrastructure/DefaultApiProblemDetailsWriterTest.cs
+++ b/src/Mvc/Mvc.Core/test/Infrastructure/DefaultApiProblemDetailsWriterTest.cs
@@ -42,7 +42,7 @@ public async Task WriteAsync_Works()
 
         //Assert
         stream.Position = 0;
-        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
+        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.NotNull(problemDetails);
         Assert.Equal(expectedProblem.Status, problemDetails.Status);
         Assert.Equal(expectedProblem.Type, problemDetails.Type);
@@ -81,7 +81,7 @@ public async Task WriteAsync_Works_WhenReplacingProblemDetailsUsingSetter()
 
         //Assert
         stream.Position = 0;
-        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(stream, new JsonSerializerOptions(JsonSerializerDefaults.Web));
+        var problemDetails = await JsonSerializer.DeserializeAsync<ProblemDetails>(stream, JsonSerializerOptions.Web);
         Assert.NotNull(problemDetails);
         Assert.Equal(expectedProblem.Status, problemDetails.Status);
         Assert.Equal(expectedProblem.Type, problemDetails.Type);
diff --git a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
index e7ccf9267d05..2d050ebe7717 100644
--- a/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
+++ b/src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
@@ -12,6 +12,7 @@
   <ItemGroup>
     <Reference Include="FSharp.Core" />
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
+    <Reference Include="Microsoft.AspNetCore.Http.Results" />
     <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
     <ProjectReference Include="..\..\shared\Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
 
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexObjectModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexObjectModelBinderProviderTest.cs
index e0abf00e800b..30e3f8362c8d 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexObjectModelBinderProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexObjectModelBinderProviderTest.cs
@@ -40,7 +40,7 @@ public void Create_ForSupportedTypes_ReturnsBinder()
             }
             else
             {
-                Assert.False(true, "Not the right model type");
+                Assert.Fail("Not the right model type");
                 return null;
             }
         });
@@ -67,7 +67,7 @@ public void Create_ForSupportedType_ReturnsBinder()
             }
             else
             {
-                Assert.False(true, "Not the right model type");
+                Assert.Fail("Not the right model type");
                 return null;
             }
         });
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
index 152dfcf24d03..cbcb8d34592c 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
@@ -40,7 +40,7 @@ public void Create_ForSupportedTypes_ReturnsBinder()
             }
             else
             {
-                Assert.False(true, "Not the right model type");
+                Assert.Fail("Not the right model type");
                 return null;
             }
         });
@@ -67,7 +67,7 @@ public void Create_ForSupportedType_ReturnsBinder()
             }
             else
             {
-                Assert.False(true, "Not the right model type");
+                Assert.Fail("Not the right model type");
                 return null;
             }
         });
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
index 16f650647e43..801d3c91c3ed 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
@@ -45,7 +45,7 @@ public void Create_ForDictionaryType_ReturnsBinder(Type modelType)
             }
             else
             {
-                Assert.False(true, "Not the right model type");
+                Assert.Fail("Not the right model type");
                 return null;
             }
         });
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
index 0b0b9d8465b1..82fe62e975c8 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
@@ -41,7 +41,7 @@ public void Create_ForKeyValuePair_ReturnsBinder()
             }
             else
             {
-                Assert.False(true, "Not the right model type");
+                Assert.Fail("Not the right model type");
                 return null;
             }
         });
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs
index c1c9aec765dd..b1c2613f4f7e 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/EnumerableValueProviderTest.cs
@@ -179,7 +179,7 @@ public void GetValue_MultiValue()
         var result = valueProvider.GetValue("some");
 
         // Assert
-        Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values);
+        Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values.ToArray());
         Assert.Equal("someValue1,someValue2", (string)result);
         Assert.Equal(culture, result.Culture);
     }
@@ -215,7 +215,7 @@ public void GetValue_NullMultipleValue()
         var result = valueProvider.GetValue("key");
 
         // Assert
-        Assert.Equal(new[] { null, null, "value" }, result.Values);
+        Assert.Equal(new[] { null, null, "value" }, result.Values.ToArray());
     }
 
     [Fact]
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
index c4d8bafec62f..9b6662d2f15b 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
@@ -211,8 +211,14 @@ public void GetMetadataForParameter_SuppliesEmptyAttributes_WhenParameterHasNoAt
         // Assert
         var defaultMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
 
-        // Not exactly "no attributes" due to SerializableAttribute on object.
-        Assert.IsType<SerializableAttribute>(Assert.Single(defaultMetadata.Attributes.Attributes));
+        // The parameter itself has no attributes
+        Assert.Empty(defaultMetadata.Attributes.ParameterAttributes);
+
+        // Type attributes exist (but we don't care what they are - that's runtime implementation detail)
+        Assert.NotEmpty(defaultMetadata.Attributes.TypeAttributes);
+
+        // Combined attributes = ParameterAttributes + TypeAttributes (when parameter has no attributes)
+        Assert.Equal(defaultMetadata.Attributes.TypeAttributes, defaultMetadata.Attributes.Attributes);
     }
 
     [Fact]
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs
index 73dbd7f6c180..f4f56c5ff8fe 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs
@@ -185,11 +185,15 @@ public void GetAttributesForParameter_NoAttributes()
                 .GetParameters()[0]);
 
         // Assert
-        // Not exactly "no attributes" due to SerializableAttribute on object.
-        Assert.IsType<SerializableAttribute>(Assert.Single(attributes.Attributes));
+        // The parameter itself has no attributes
         Assert.Empty(attributes.ParameterAttributes);
         Assert.Null(attributes.PropertyAttributes);
-        Assert.Equal(attributes.Attributes, attributes.TypeAttributes);
+
+        // Type attributes exist (but we don't care what they are - that's runtime implementation detail)
+        Assert.NotEmpty(attributes.TypeAttributes);
+
+        // Combined attributes = ParameterAttributes + TypeAttributes (when parameter has no attributes)
+        Assert.Equal(attributes.TypeAttributes, attributes.Attributes);
     }
 
     [Fact]
@@ -212,10 +216,8 @@ public void GetAttributesForParameter_SomeAttributes()
             attribute => Assert.IsType<RequiredAttribute>(attribute),
             attribute => Assert.IsType<RangeAttribute>(attribute));
         Assert.Null(attributes.PropertyAttributes);
-        Assert.Collection(
-            // Take(1) because the attribute or attributes after SerializableAttribute are framework-specific.
-            attributes.TypeAttributes.Take(1),
-            attribute => Assert.IsType<SerializableAttribute>(attribute));
+        // Check that SerializableAttribute exists in TypeAttributes (order-agnostic)
+        Assert.Contains(attributes.TypeAttributes, attr => attr is SerializableAttribute);
     }
 
     [Fact]
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderFactoryTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderFactoryTest.cs
index 3ec37c1f23c1..b368a22bc79e 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderFactoryTest.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/ModelBinderFactoryTest.cs
@@ -277,7 +277,7 @@ public void CreateBinder_Caches_WhenTokenIsNotNull()
         Assert.Same(result1, result2);
     }
 
-    public static TheoryData BindingInfoData
+    public static TheoryData<BindingInfo, BindingMetadata, BindingInfo> BindingInfoData
     {
         get
         {
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
index 408329761018..f9cc5ea0e7ab 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
@@ -1480,7 +1480,7 @@ private DefaultObjectValidator CreateValidator(params IMetadataDetailsProvider[]
 
     private static void AssertKeysEqual(ModelStateDictionary modelState, params string[] keys)
     {
-        Assert.Equal<string>(keys.OrderBy(k => k).ToArray(), modelState.Keys.OrderBy(k => k).ToArray());
+        Assert.Equal<string>(keys.OrderBy(k => k).ToList(), modelState.Keys.OrderBy(k => k).ToList());
     }
 
     private class ThrowingProperty
diff --git a/src/Mvc/Mvc.Core/test/ProducesAttributeTests.cs b/src/Mvc/Mvc.Core/test/ProducesAttributeTests.cs
index d29fa66a9f37..15cbd07e0bc1 100644
--- a/src/Mvc/Mvc.Core/test/ProducesAttributeTests.cs
+++ b/src/Mvc/Mvc.Core/test/ProducesAttributeTests.cs
@@ -151,6 +151,29 @@ public void ProducesAttribute_WithTypeOnly_DoesNotSetContentTypes()
         Assert.Empty(producesAttribute.ContentTypes);
     }
 
+    [Fact]
+    public void ProducesAttribute_SetsDescription()
+    {
+        // Arrange
+        var producesAttribute = new ProducesAttribute(typeof(Person))
+        {
+            Description = "Example"
+        };
+
+        // Act and Assert
+        Assert.Equal("Example", producesAttribute.Description);
+    }
+
+    [Fact]
+    public void ProducesAttribute_WithTypeOnly_DoesNotSetDescription()
+    {
+        // Arrange
+        var producesAttribute = new ProducesAttribute(typeof(Person));
+
+        // Act and Assert
+        Assert.Null(producesAttribute.Description);
+    }
+
     private static ResultExecutedContext CreateResultExecutedContext(ResultExecutingContext context)
     {
         return new ResultExecutedContext(context, context.Filters, context.Result, context.Controller);
diff --git a/src/Mvc/Mvc.Core/test/ProducesResponseTypeAttributeTests.cs b/src/Mvc/Mvc.Core/test/ProducesResponseTypeAttributeTests.cs
index 204925a95df2..3cb9e69dd87c 100644
--- a/src/Mvc/Mvc.Core/test/ProducesResponseTypeAttributeTests.cs
+++ b/src/Mvc/Mvc.Core/test/ProducesResponseTypeAttributeTests.cs
@@ -67,6 +67,29 @@ public void ProducesResponseTypeAttribute_WithTypeOnly_DoesNotSetContentTypes()
         Assert.Null(producesResponseTypeAttribute.ContentTypes);
     }
 
+    [Fact]
+    public void ProducesResponseTypeAttribute_SetsDescription()
+    {
+        // Arrange
+        var producesResponseTypeAttribute = new ProducesResponseTypeAttribute(typeof(Person), StatusCodes.Status200OK)
+        {
+            Description = "Example"
+        };
+
+        // Act and Assert
+        Assert.Equal("Example", producesResponseTypeAttribute.Description);
+    }
+
+    [Fact]
+    public void ProducesResponseTypeAttribute_WithTypeOnly_DoesNotSetDescription()
+    {
+        // Arrange
+        var producesResponseTypeAttribute = new ProducesResponseTypeAttribute(typeof(Person), StatusCodes.Status200OK);
+
+        // Act and Assert
+        Assert.Null(producesResponseTypeAttribute.Description);
+    }
+
     private class Person
     {
         public int Id { get; set; }
diff --git a/src/Mvc/Mvc.Core/test/Routing/UrlHelperBaseTest.cs b/src/Mvc/Mvc.Core/test/Routing/UrlHelperBaseTest.cs
index 56bd029a5c21..6fef0d904caa 100644
--- a/src/Mvc/Mvc.Core/test/Routing/UrlHelperBaseTest.cs
+++ b/src/Mvc/Mvc.Core/test/Routing/UrlHelperBaseTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing;
 
 public class UrlHelperBaseTest
 {
-    public static TheoryData GeneratePathFromRoute_HandlesLeadingAndTrailingSlashesData =>
+    public static TheoryData<string, string, string> GeneratePathFromRoute_HandlesLeadingAndTrailingSlashesData =>
         new TheoryData<string, string, string>
         {
                 {  null, "", "/" },
diff --git a/src/Mvc/Mvc.Core/test/Routing/UrlHelperExtensionsTest.cs b/src/Mvc/Mvc.Core/test/Routing/UrlHelperExtensionsTest.cs
index 80c59eb677e2..22e9ed77bdbc 100644
--- a/src/Mvc/Mvc.Core/test/Routing/UrlHelperExtensionsTest.cs
+++ b/src/Mvc/Mvc.Core/test/Routing/UrlHelperExtensionsTest.cs
@@ -49,7 +49,7 @@ public void Page_WithName_Works()
         Assert.Null(actual.Fragment);
     }
 
-    public static TheoryData Page_WithNameAndRouteValues_WorksData
+    public static TheoryData<object> Page_WithNameAndRouteValues_WorksData
     {
         get => new TheoryData<object>
             {
diff --git a/src/Mvc/Mvc.Cors/test/CorsHttpMethodActionConstraintTest.cs b/src/Mvc/Mvc.Cors/test/CorsHttpMethodActionConstraintTest.cs
index 6e46df9bf3b6..c3a7cb3ef984 100644
--- a/src/Mvc/Mvc.Cors/test/CorsHttpMethodActionConstraintTest.cs
+++ b/src/Mvc/Mvc.Cors/test/CorsHttpMethodActionConstraintTest.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Cors;
 
 public class CorsHttpMethodActionConstraintTest
 {
-    public static TheoryData AcceptCaseInsensitiveData =
+    public static TheoryData<IEnumerable<string>, string> AcceptCaseInsensitiveData =
         new TheoryData<IEnumerable<string>, string>
         {
                 { new string[] { "get", "Get", "GET", "GEt"}, "gEt" },
diff --git a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorTest.cs
index 0a7575dfe97e..ace7022dacbb 100644
--- a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorTest.cs
+++ b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsModelValidatorTest.cs
@@ -438,7 +438,7 @@ public void Validate_CanUseRequestServices_WithinValidationAttribute()
 
     private const string LocalizationKey = "LocalizeIt";
 
-    public static TheoryData Validate_AttributesIncludeValues
+    public static TheoryData<ValidationAttribute, string, object[]> Validate_AttributesIncludeValues
     {
         get
         {
diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlAssert.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssert.cs
index cca59cfc7a77..748ffc9be707 100644
--- a/src/Mvc/Mvc.Formatters.Xml/test/XmlAssert.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssert.cs
@@ -29,7 +29,7 @@ public static void Equal(string expectedXml, string actualXml)
 
         if (!areEqual)
         {
-            throw new EqualException(
+            throw EqualException.ForMismatchedValues(
                 sortedExpectedXDocument.ToString(SaveOptions.DisableFormatting),
                 sortedActualXDocument.ToString(SaveOptions.DisableFormatting));
         }
diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
index 830c77cf43b2..0ff823610f19 100644
--- a/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
@@ -18,8 +18,8 @@ public class XmlAssertTest
     public void Throws_WithMismatchedTextNodes(string input1, string input2)
     {
         var equalException = Assert.Throws<EqualException>(() => XmlAssert.Equal(input1, input2));
-        Assert.Equal(input1, equalException.Expected);
-        Assert.Equal(input2, equalException.Actual);
+        Assert.Contains(input1, equalException.Message);
+        Assert.Contains(input2, equalException.Message);
     }
 
     [Theory]
@@ -111,7 +111,7 @@ public void Throws_WithMismatchedAttributeValues_ReorderingAttributes()
 
         // Act and Assert
         var equalException = Assert.Throws<EqualException>(() => XmlAssert.Equal(expected, actual));
-        Assert.Equal(exceptionMessageForExpected, equalException.Expected);
-        Assert.Equal(exceptionMessageForActual, equalException.Actual);
+        Assert.Contains(exceptionMessageForExpected, equalException.Message);
+        Assert.Contains(exceptionMessageForActual, equalException.Message);
     }
 }
diff --git a/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs
index 5e0e911ba2cc..f4378891322d 100644
--- a/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs
+++ b/src/Mvc/Mvc.Localization/test/MvcLocalizationServiceCollectionExtensionsTest.cs
@@ -61,15 +61,11 @@ private void AssertContainsSingle(
 
         if (matches.Length == 0)
         {
-            Assert.True(
-                false,
-                $"Could not find an instance of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Could not find an instance of {implementationType} registered as {serviceType}");
         }
         else if (matches.Length > 1)
         {
-            Assert.True(
-                false,
-                $"Found multiple instances of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Found multiple instances of {implementationType} registered as {serviceType}");
         }
     }
 
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs
index 94a7eb41c49a..9be63233422a 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Linq;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.DependencyModel;
 
 namespace Microsoft.AspNetCore.Mvc.ApplicationParts;
@@ -9,6 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts;
 /// <summary>
 /// Static class that adds methods to <see cref="AssemblyPart"/>.
 /// </summary>
+[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)]
 public static class AssemblyPartExtensions
 {
     /// <inheritdoc />
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
index 33eae53219ab..78b648781bd9 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
@@ -6,7 +6,9 @@
 
 namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
 internal sealed class MvcRazorRuntimeCompilationOptionsSetup : IConfigureOptions<MvcRazorRuntimeCompilationOptions>
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
 {
     private readonly IWebHostEnvironment _hostingEnvironment;
 
@@ -15,7 +17,9 @@ public MvcRazorRuntimeCompilationOptionsSetup(IWebHostEnvironment hostingEnviron
         _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
     }
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
     public void Configure(MvcRazorRuntimeCompilationOptions options)
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     {
         ArgumentNullException.ThrowIfNull(options);
 
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
index c6518101b0ee..76d1dc802d4c 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
+using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>
 /// Static class that adds razor compilation extension methods.
 /// </summary>
+[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)]
 public static class RazorRuntimeCompilationMvcBuilderExtensions
 {
     /// <summary>
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
index c74402f64e69..86c1a02df57d 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -20,6 +21,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// Static class that adds razor runtime compilation extension methods.
 /// </summary>
+[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)]
 public static class RazorRuntimeCompilationMvcCoreBuilderExtensions
 {
     /// <summary>
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs
index d6045545f4da..631395910171 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs
@@ -34,7 +34,9 @@ public override RazorProjectItem GetItem(string path, string? fileKind)
         path = NormalizeAndEnsureValidPath(path);
         var fileInfo = FileProvider.GetFileInfo(path);
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         return new FileProviderRazorProjectItem(fileInfo, basePath: string.Empty, filePath: path, root: _hostingEnvironment.ContentRootPath, fileKind);
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     }
 
     public override IEnumerable<RazorProjectItem> EnumerateItems(string path)
@@ -63,7 +65,9 @@ private IEnumerable<RazorProjectItem> EnumerateFiles(IDirectoryContents director
                 {
                     var filePath = prefix + "/" + fileInfo.Name;
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
                     yield return new FileProviderRazorProjectItem(fileInfo, basePath, filePath: filePath, root: _hostingEnvironment.ContentRootPath);
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
                 }
             }
         }
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs
index 2a05375f5c00..9bc702527788 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
@@ -9,6 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 /// <summary>
 /// A file provider <see cref="RazorProjectItem"/>.
 /// </summary>
+[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)]
 public class FileProviderRazorProjectItem : RazorProjectItem
 {
     private readonly string _root;
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
index a8425cf70113..661eeae9fb01 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
@@ -22,6 +22,10 @@
     <Compile Include="..\..\Mvc.RazorPages\src\ApplicationModels\PageRouteModelFactory.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="targets\$(PackageId).targets" Pack="true" PackagePath="build\$(DefaultNetCoreTargetFramework)\$(PackageId).targets" />
     <None Include="targets\$(PackageId).targets" Pack="true" PackagePath="buildTransitive\$(DefaultNetCoreTargetFramework)\$(PackageId).targets" />
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs
index dc4d8017b924..6ec9876dcd88 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
@@ -10,6 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 /// <summary>
 /// Used to configure razor compilation.
 /// </summary>
+[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)]
 public class MvcRazorRuntimeCompilationOptions
 {
     /// <summary>
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/PACKAGE.md b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/PACKAGE.md
new file mode 100644
index 000000000000..0443d0f6fbc6
--- /dev/null
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/PACKAGE.md
@@ -0,0 +1,83 @@
+## About
+
+Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation is a NuGet package designed to provide runtime compilation support for Razor views in ASP.NET Core MVC applications. This package enables developers to modify and update Razor views without needing to restart the application, facilitating a more dynamic development experience.
+
+## Key Features
+
+* Runtime compilation of Razor views in ASP.NET Core MVC applications.
+* Allows developers to modify Razor views without restarting the application.
+* Supports faster iteration and development cycles.
+* Compatible with ASP.NET Core 3.0 and newer.
+
+## Limitations
+
+* Isn't supported for Razor components of Blazor apps.
+* Doesn't support [global using directives](/dotnet/csharp/whats-new/csharp-10#global-using-directives).
+* Doesn't support [implicit using directives](/dotnet/core/tutorials/top-level-templates#implicit-using-directives).
+* Disables [.NET Hot Reload](xref:test/hot-reload).
+* Is recommended for development, not for production.
+
+## How to Use
+
+To start using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation in your ASP.NET Core MVC application, follow these steps:
+
+### Installation
+
+Install the package via NuGet Package Manager or .NET CLI:
+
+```sh
+dotnet add package Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+```
+
+### Configuration
+
+In your Startup.cs file, configure runtime compilation for Razor views:
+
+```C#
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+
+public void ConfigureServices(IServiceCollection services)
+{
+    services.AddControllersWithViews()
+        .AddRazorRuntimeCompilation();
+}
+```
+
+### Usage
+Now, you can modify Razor views in your application, and the changes will be picked up dynamically without requiring a restart:
+
+```html
+<!-- Example Razor view: Views/Home/Index.cshtml -->
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<h2>@ViewData["Title"]</h2>
+
+<p>Welcome to the ASP.NET Core MVC application!</p>
+```
+
+For more information on using runtime compilation for Razor views in ASP.NET Core MVC, refer to the [official documentation](https://learn.microsoft.com/en-us/aspnet/core/mvc/overview?view=aspnetcore-8.0).
+
+## Main Types
+
+<!-- The main types provided in this library -->
+
+The main types provided by this library are:
+
+* `RazorRuntimeCompilationMvcBuilderExtensions`: Extension methods for configuring runtime compilation for Razor views.
+* `RazorRuntimeCompilationMvcOptions`: Options for configuring runtime compilation settings.
+
+## Additional Documentation
+
+<!-- Links to further documentation. Remove conceptual documentation if not available for the library. -->
+
+* [Overview of ASP.NET Core MVC](https://learn.microsoft.com/en-us/aspnet/core/mvc/overview?view=aspnetcore-8.0)
+* [Razor syntax reference for ASP.NET Core](https://learn.microsoft.com/en-us/aspnet/core/mvc/views/razor?view=aspnetcore-8.0)
+
+## Feedback & Contributing
+
+<!-- How to provide feedback on this package and contribute to it -->
+
+Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
\ No newline at end of file
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorReferenceManager.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorReferenceManager.cs
index 6e077cbe7132..20ed11166df5 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorReferenceManager.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorReferenceManager.cs
@@ -14,14 +14,18 @@ internal class RazorReferenceManager
 #pragma warning restore CA1852 // Seal internal types
 {
     private readonly ApplicationPartManager _partManager;
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
     private readonly MvcRazorRuntimeCompilationOptions _options;
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     private object _compilationReferencesLock = new object();
     private bool _compilationReferencesInitialized;
     private IReadOnlyList<MetadataReference>? _compilationReferences;
 
     public RazorReferenceManager(
         ApplicationPartManager partManager,
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         IOptions<MvcRazorRuntimeCompilationOptions> options)
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     {
         _partManager = partManager;
         _options = options.Value;
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs
index 51f5959709cc..055104676e00 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs
@@ -11,6 +11,8 @@ internal sealed class RazorRuntimeCompilationHostingStartup : IHostingStartup
     public void Configure(IWebHostBuilder builder)
     {
         // Add Razor services
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         builder.ConfigureServices(RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices);
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     }
 }
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeCompilationFileProvider.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeCompilationFileProvider.cs
index 1a912345216b..228f3b33c303 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeCompilationFileProvider.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RuntimeCompilationFileProvider.cs
@@ -8,10 +8,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 
 internal sealed class RuntimeCompilationFileProvider
 {
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
     private readonly MvcRazorRuntimeCompilationOptions _options;
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     private IFileProvider? _compositeFileProvider;
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
     public RuntimeCompilationFileProvider(IOptions<MvcRazorRuntimeCompilationOptions> options)
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     {
         ArgumentNullException.ThrowIfNull(options);
 
@@ -31,15 +35,19 @@ public IFileProvider FileProvider
         }
     }
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
     private static IFileProvider GetCompositeFileProvider(MvcRazorRuntimeCompilationOptions options)
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     {
         var fileProviders = options.FileProviders;
         if (fileProviders.Count == 0)
         {
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
             var message = Resources.FormatFileProvidersAreRequired(
                 typeof(MvcRazorRuntimeCompilationOptions).FullName,
                 nameof(MvcRazorRuntimeCompilationOptions.FileProviders),
                 typeof(IFileProvider).FullName);
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
             throw new InvalidOperationException(message);
         }
         else if (fileProviders.Count == 1)
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
index e0fb21625643..ebcc077929c6 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
@@ -19,7 +19,9 @@ public void AddServices_ReplacesRazorViewCompiler()
             .AddSingleton<IViewCompilerProvider, DefaultViewCompilerProvider>();
 
         // Act
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices(services);
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
 
         // Assert
         var serviceDescriptor = Assert.Single(services, service => service.ServiceType == typeof(IViewCompilerProvider));
@@ -34,7 +36,9 @@ public void AddServices_ReplacesActionDescriptorProvider()
             .AddSingleton<IActionDescriptorProvider, CompiledPageActionDescriptorProvider>();
 
         // Act
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices(services);
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
 
         // Assert
         var serviceDescriptor = Assert.Single(services, service => service.ServiceType == typeof(IActionDescriptorProvider));
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/FileProviderRazorProjectFileSystemTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/FileProviderRazorProjectFileSystemTest.cs
index 2a38a5c4bc6f..65a95ce68aae 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/FileProviderRazorProjectFileSystemTest.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/FileProviderRazorProjectFileSystemTest.cs
@@ -243,10 +243,12 @@ private static FileProviderRazorProjectFileSystem GetRazorProjectFileSystem(
         TestFileProvider fileProvider,
         string contentRootPath = "BasePath")
     {
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         var options = Options.Create(new MvcRazorRuntimeCompilationOptions
         {
             FileProviders = { fileProvider }
         });
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
         var compilationFileProvider = new RuntimeCompilationFileProvider(options);
         var fileSystem = new FileProviderRazorProjectFileSystem(
             compilationFileProvider,
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RazorReferenceManagerTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RazorReferenceManagerTest.cs
index cc82836ea16b..9eedd521d487 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RazorReferenceManagerTest.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RazorReferenceManagerTest.cs
@@ -15,7 +15,9 @@ public class RazorReferenceManagerTest
     public void GetCompilationReferences_CombinesApplicationPartAndOptionMetadataReferences()
     {
         // Arrange
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         var options = new MvcRazorRuntimeCompilationOptions();
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
         var additionalReferencePath = "additional-path";
         options.AdditionalReferencePaths.Add(additionalReferencePath);
 
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeCompilationFileProviderTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeCompilationFileProviderTest.cs
index 9e16d6a51a1d..ce2ead2dfd24 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeCompilationFileProviderTest.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeCompilationFileProviderTest.cs
@@ -12,11 +12,13 @@ public class RuntimeCompilationFileProviderTest
     public void GetFileProvider_ThrowsIfNoConfiguredFileProviders()
     {
         // Arrange
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         var expected =
             $"'{typeof(MvcRazorRuntimeCompilationOptions).FullName}.{nameof(MvcRazorRuntimeCompilationOptions.FileProviders)}' must " +
             $"not be empty. At least one '{typeof(IFileProvider).FullName}' is required to locate a view for " +
             "rendering.";
         var options = Options.Create(new MvcRazorRuntimeCompilationOptions());
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
 
         var fileProvider = new RuntimeCompilationFileProvider(options);
 
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs
index bbabadaedaae..ca19f82a3115 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs
@@ -638,8 +638,10 @@ public async Task GetOrAdd_AllowsConcurrentCompilationOfMultipleRazorPages()
         // Assert
         Assert.True(compilingOne);
         Assert.True(compilingTwo);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.Same(result1, task1.Result);
         Assert.Same(result2, task2.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
@@ -678,9 +680,11 @@ public async Task CompileAsync_DoesNotCreateMultipleCompilationResults_ForConcur
         await Task.WhenAll(task1, task2);
 
         // Assert
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         var result1 = task1.Result;
         var result2 = task2.Result;
         Assert.Same(result1, result2);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
     }
 
     [Fact]
@@ -820,10 +824,12 @@ private static TestRazorViewCompiler GetViewCompiler(
         CSharpCompiler csharpCompiler = null)
     {
         fileProvider = fileProvider ?? new TestFileProvider();
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         var options = Options.Create(new MvcRazorRuntimeCompilationOptions
         {
             FileProviders = { fileProvider }
         });
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
         var compilationFileProvider = new RuntimeCompilationFileProvider(options);
 
         referenceManager = referenceManager ?? CreateReferenceManager();
@@ -851,7 +857,9 @@ private static RazorReferenceManager CreateReferenceManager()
         var assembly = typeof(RuntimeViewCompilerTest).Assembly;
         applicationPartManager.ApplicationParts.Add(new AssemblyPart(assembly));
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         return new RazorReferenceManager(applicationPartManager, Options.Create(new MvcRazorRuntimeCompilationOptions()));
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     }
 
     private class TestRazorViewCompiler : RuntimeViewCompiler
diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorReferenceManager.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorReferenceManager.cs
index bf0e446704f5..285ce2842ffb 100644
--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorReferenceManager.cs
+++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/TestRazorReferenceManager.cs
@@ -12,7 +12,9 @@ internal class TestRazorReferenceManager : RazorReferenceManager
     public TestRazorReferenceManager()
         : base(
             new ApplicationPartManager(),
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
             Options.Create(new MvcRazorRuntimeCompilationOptions()))
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     {
         CompilationReferences = Array.Empty<MetadataReference>();
     }
diff --git a/src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs b/src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs
index e363c864bfda..75e87b33b4ad 100644
--- a/src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs
+++ b/src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs
@@ -18,8 +18,7 @@ public interface IRazorViewEngine : IViewEngine
     /// <param name="pageName">The name or path of the page.</param>
     /// <returns>The <see cref="RazorPageResult"/> of locating the page.</returns>
     /// <remarks>
-    /// <remarks>Use <see cref="GetPage(string, string)"/> when the absolute or relative
-    /// path of the page is known.</remarks>
+    /// Use <see cref="GetPage(string, string)"/> when the absolute or relative path of the page is known.
     /// <seealso cref="IViewEngine.FindView"/>.
     /// </remarks>
     RazorPageResult FindPage(ActionContext context, string pageName);
diff --git a/src/Mvc/Mvc.Razor/test/RazorPageTest.cs b/src/Mvc/Mvc.Razor/test/RazorPageTest.cs
index e74e63425297..cb0e02c301ca 100644
--- a/src/Mvc/Mvc.Razor/test/RazorPageTest.cs
+++ b/src/Mvc/Mvc.Razor/test/RazorPageTest.cs
@@ -274,19 +274,19 @@ public async Task TagHelperScopes_ViewBuffersCanCombine()
 
         var page = CreatePage(async v =>
         {
-            Assert.Equal(0, bufferScope.CreatedBuffers.Count);
+            Assert.Empty(bufferScope.CreatedBuffers);
             v.Write("Level:0"); // Creates a 'top-level' buffer.
-            Assert.Equal(1, bufferScope.CreatedBuffers.Count);
+            Assert.Single(bufferScope.CreatedBuffers);
 
             // Run a TagHelper
             {
                 v.StartTagHelperWritingScope(encoder: null);
 
-                Assert.Equal(1, bufferScope.CreatedBuffers.Count);
-                Assert.Equal(0, bufferScope.ReturnedBuffers.Count);
+                Assert.Single(bufferScope.CreatedBuffers);
+                Assert.Empty(bufferScope.ReturnedBuffers);
                 v.Write("Level:1-A"); // Creates a new buffer for the TagHelper.
                 Assert.Equal(2, bufferScope.CreatedBuffers.Count);
-                Assert.Equal(0, bufferScope.ReturnedBuffers.Count);
+                Assert.Empty(bufferScope.ReturnedBuffers);
 
                 TagHelperContent innerContentLevel1 = null;
                 var outputLevel1 = new TagHelperOutput("t1", new TagHelperAttributeList(), (_, encoder) =>
@@ -298,27 +298,27 @@ public async Task TagHelperScopes_ViewBuffersCanCombine()
                 outputLevel1.Content = await outputLevel1.GetChildContentAsync();
 
                 Assert.Equal(2, bufferScope.CreatedBuffers.Count);
-                Assert.Equal(0, bufferScope.ReturnedBuffers.Count);
+                Assert.Empty(bufferScope.ReturnedBuffers);
                 v.Write(outputLevel1); // Writing the TagHelper to output returns a buffer.
                 Assert.Equal(2, bufferScope.CreatedBuffers.Count);
-                Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                Assert.Single(bufferScope.ReturnedBuffers);
             }
 
             Assert.Equal(2, bufferScope.CreatedBuffers.Count);
-            Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+            Assert.Single(bufferScope.ReturnedBuffers);
             v.Write("Level:0"); // Already have a buffer for this scope.
             Assert.Equal(2, bufferScope.CreatedBuffers.Count);
-            Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+            Assert.Single(bufferScope.ReturnedBuffers);
 
             // Run another TagHelper
             {
                 v.StartTagHelperWritingScope(encoder: null);
 
                 Assert.Equal(2, bufferScope.CreatedBuffers.Count);
-                Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                Assert.Single(bufferScope.ReturnedBuffers);
                 v.Write("Level:1-B"); // Creates a new buffer for the TagHelper.
                 Assert.Equal(3, bufferScope.CreatedBuffers.Count);
-                Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                Assert.Single(bufferScope.ReturnedBuffers);
 
                 TagHelperContent innerContentLevel1 = null;
                 var outputLevel1 = new TagHelperOutput("t2", new TagHelperAttributeList(), (_, encoder) =>
@@ -331,10 +331,10 @@ public async Task TagHelperScopes_ViewBuffersCanCombine()
                     v.StartTagHelperWritingScope(encoder: null);
 
                     Assert.Equal(3, bufferScope.CreatedBuffers.Count);
-                    Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                    Assert.Single(bufferScope.ReturnedBuffers);
                     v.Write("Level:2"); // Creates a new buffer for the TagHelper.
                     Assert.Equal(4, bufferScope.CreatedBuffers.Count);
-                    Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                    Assert.Single(bufferScope.ReturnedBuffers);
 
                     TagHelperContent innerContentLevel2 = null;
                     var outputLevel2 = new TagHelperOutput("t3", new TagHelperAttributeList(), (_, encoder) =>
@@ -346,7 +346,7 @@ public async Task TagHelperScopes_ViewBuffersCanCombine()
                     outputLevel2.Content = await outputLevel2.GetChildContentAsync();
 
                     Assert.Equal(4, bufferScope.CreatedBuffers.Count);
-                    Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                    Assert.Single(bufferScope.ReturnedBuffers);
                     v.Write(outputLevel2); // Writing the TagHelper to output returns a buffer.
                     Assert.Equal(4, bufferScope.CreatedBuffers.Count);
                     Assert.Equal(2, bufferScope.ReturnedBuffers.Count);
@@ -940,7 +940,7 @@ public async Task FlushAsync_ReturnsEmptyHtmlString()
         Assert.Same(HtmlString.Empty, actual);
     }
 
-    public static TheoryData AddHtmlAttributeValues_ValueData
+    public static TheoryData<string, int, object, int, bool, string> AddHtmlAttributeValues_ValueData
     {
         get
         {
@@ -1165,7 +1165,7 @@ public void AddHtmlAttributeValues_AddsAttributeNameAsValueWhenValueIsUnprefixed
         Assert.Equal(HtmlAttributeValueStyle.NoQuotes, allAttribute.ValueStyle);
     }
 
-    public static TheoryData WriteAttributeData
+    public static TheoryData<string, int, object, int, bool, string> WriteAttributeData
     {
         get
         {
diff --git a/src/Mvc/Mvc.Razor/test/TagHelpers/UrlResolutionTagHelperTest.cs b/src/Mvc/Mvc.Razor/test/TagHelpers/UrlResolutionTagHelperTest.cs
index 94c2fe3bfdc0..701dd29ca21a 100644
--- a/src/Mvc/Mvc.Razor/test/TagHelpers/UrlResolutionTagHelperTest.cs
+++ b/src/Mvc/Mvc.Razor/test/TagHelpers/UrlResolutionTagHelperTest.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
 
 public class UrlResolutionTagHelperTest
 {
-    public static TheoryData ResolvableUrlData
+    public static TheoryData<string, string> ResolvableUrlData
     {
         get
         {
@@ -38,7 +38,7 @@ public static TheoryData ResolvableUrlData
         }
     }
 
-    public static TheoryData ResolvableUrlVersionData
+    public static TheoryData<string, string> ResolvableUrlVersionData
     {
         get
         {
@@ -133,7 +133,7 @@ public void Process_ResolvesTildeSlashValues(string url, string expectedHref)
         Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
     }
 
-    public static TheoryData ResolvableUrlHtmlStringData
+    public static TheoryData<string, string> ResolvableUrlHtmlStringData
     {
         get
         {
@@ -193,7 +193,7 @@ public void Process_ResolvesTildeSlashValues_InHtmlString(string url, string exp
         Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
     }
 
-    public static TheoryData UnresolvableUrlData
+    public static TheoryData<string> UnresolvableUrlData
     {
         get
         {
@@ -251,7 +251,7 @@ public void Process_DoesNotResolveNonTildeSlashValues(string url)
         Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
     }
 
-    public static TheoryData UnresolvableUrlHtmlStringData
+    public static TheoryData<string> UnresolvableUrlHtmlStringData
     {
         get
         {
diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs
index 6ad0d6faa2b4..161bf9800b58 100644
--- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs
+++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvoker.cs
@@ -35,7 +35,9 @@ public PageActionInvoker(
         IPageHandlerMethodSelector handlerMethodSelector,
         DiagnosticListener diagnosticListener,
         ILogger logger,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor actionContextAccessor,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
         IActionResultTypeMapper mapper,
         PageContext pageContext,
         IFilterMetadata[] filterMetadata,
diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs
index 19f9ff1c7da8..3b9781cd6751 100644
--- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs
+++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs
@@ -25,7 +25,9 @@ internal sealed class PageActionInvokerProvider : IActionInvokerProvider
     private readonly DiagnosticListener _diagnosticListener;
     private readonly ILogger<PageActionInvoker> _logger;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
 
     public PageActionInvokerProvider(
         PageLoader pageLoader,
@@ -38,7 +40,9 @@ public PageActionInvokerProvider(
         DiagnosticListener diagnosticListener,
         ILoggerFactory loggerFactory,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor = null)
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     {
         _pageLoader = pageLoader;
         _pageActionInvokerCache = pageActionInvokerCache;
@@ -50,7 +54,9 @@ public PageActionInvokerProvider(
         _diagnosticListener = diagnosticListener;
         _logger = loggerFactory.CreateLogger<PageActionInvoker>();
         _mapper = mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     // For testing
diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageRequestDelegateFactory.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageRequestDelegateFactory.cs
index e6c19ea66350..404e5dd37739 100644
--- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageRequestDelegateFactory.cs
+++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageRequestDelegateFactory.cs
@@ -26,7 +26,9 @@ internal sealed class PageRequestDelegateFactory : IRequestDelegateFactory
     private readonly DiagnosticListener _diagnosticListener;
     private readonly ILogger<PageActionInvoker> _logger;
     private readonly IActionResultTypeMapper _mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
     private readonly IActionContextAccessor _actionContextAccessor;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     private readonly bool _enableActionInvokers;
 
     public PageRequestDelegateFactory(
@@ -53,7 +55,9 @@ public PageRequestDelegateFactory(
         DiagnosticListener diagnosticListener,
         ILoggerFactory loggerFactory,
         IActionResultTypeMapper mapper,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         IActionContextAccessor? actionContextAccessor)
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     {
         _cache = cache;
         _valueProviderFactories = mvcOptions.Value.ValueProviderFactories.ToArray();
@@ -65,7 +69,9 @@ public PageRequestDelegateFactory(
         _diagnosticListener = diagnosticListener;
         _logger = loggerFactory.CreateLogger<PageActionInvoker>();
         _mapper = mapper;
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         _actionContextAccessor = actionContextAccessor ?? ActionContextAccessor.Null;
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public RequestDelegate? CreateRequestDelegate(ActionDescriptor actionDescriptor, RouteValueDictionary? dataTokens)
diff --git a/src/Mvc/Mvc.RazorPages/src/PublicAPI.Shipped.txt b/src/Mvc/Mvc.RazorPages/src/PublicAPI.Shipped.txt
index 977d073ed0da..da1d8690246b 100644
--- a/src/Mvc/Mvc.RazorPages/src/PublicAPI.Shipped.txt
+++ b/src/Mvc/Mvc.RazorPages/src/PublicAPI.Shipped.txt
@@ -15,6 +15,7 @@ const Microsoft.AspNetCore.Mvc.Diagnostics.BeforePageFilterOnPageHandlerSelectio
 Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder
 Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder.Add(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! convention) -> void
 Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder.Finally(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! finalConvention) -> void
+Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilderResourceCollectionExtensions
 Microsoft.AspNetCore.Builder.RazorPagesEndpointRouteBuilderExtensions
 Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention
 Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention.Apply(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel! model) -> void
@@ -393,6 +394,7 @@ override Microsoft.AspNetCore.Mvc.RazorPages.PageBase.EnsureRenderedBodyOrSectio
 override Microsoft.AspNetCore.Mvc.RazorPages.PageBase.ViewContext.get -> Microsoft.AspNetCore.Mvc.Rendering.ViewContext!
 override Microsoft.AspNetCore.Mvc.RazorPages.PageBase.ViewContext.set -> void
 override Microsoft.AspNetCore.Mvc.RazorPages.PageResult.ExecuteResultAsync(Microsoft.AspNetCore.Mvc.ActionContext! context) -> System.Threading.Tasks.Task!
+static Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilderResourceCollectionExtensions.WithStaticAssets(this Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder! builder, string? manifestPath = null) -> Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.RazorPagesEndpointRouteBuilderExtensions.MapDynamicPageRoute<TTransformer>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern) -> void
 static Microsoft.AspNetCore.Builder.RazorPagesEndpointRouteBuilderExtensions.MapDynamicPageRoute<TTransformer>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern, object! state, int order) -> void
 static Microsoft.AspNetCore.Builder.RazorPagesEndpointRouteBuilderExtensions.MapDynamicPageRoute<TTransformer>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern, object? state) -> void
diff --git a/src/Mvc/Mvc.RazorPages/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.RazorPages/src/PublicAPI.Unshipped.txt
index 3dc85b737c41..7dc5c58110bf 100644
--- a/src/Mvc/Mvc.RazorPages/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.RazorPages/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilderResourceCollectionExtensions
-static Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilderResourceCollectionExtensions.WithStaticAssets(this Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder! builder, string? manifestPath = null) -> Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder!
diff --git a/src/Mvc/Mvc.RazorPages/test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
index 41c8e15ca11b..7d304f7c0a05 100644
--- a/src/Mvc/Mvc.RazorPages/test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
+++ b/src/Mvc/Mvc.RazorPages/test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
@@ -452,7 +452,7 @@ public void OnProvidersExecuting_EmptyPage()
 
         // Assert
         var pageModel = context.PageApplicationModel;
-        Assert.Empty(pageModel.HandlerProperties.Where(p => p.BindingInfo != null));
+        Assert.DoesNotContain(pageModel.HandlerProperties, p => p.BindingInfo != null);
         Assert.Empty(pageModel.HandlerMethods);
         Assert.Same(typeof(EmptyPage).GetTypeInfo(), pageModel.HandlerType);
         Assert.Same(typeof(EmptyPage).GetTypeInfo(), pageModel.ModelType);
@@ -473,7 +473,7 @@ public void OnProvidersExecuting_EmptyPageModel()
 
         // Assert
         var pageModel = context.PageApplicationModel;
-        Assert.Empty(pageModel.HandlerProperties.Where(p => p.BindingInfo != null));
+        Assert.DoesNotContain(pageModel.HandlerProperties, p => p.BindingInfo != null);
         Assert.Empty(pageModel.HandlerMethods);
         Assert.Same(typeof(EmptyPageModel).GetTypeInfo(), pageModel.DeclaredModelType);
         Assert.Same(typeof(EmptyPageModel).GetTypeInfo(), pageModel.ModelType);
diff --git a/src/Mvc/Mvc.RazorPages/test/Builder/PageActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs b/src/Mvc/Mvc.RazorPages/test/Builder/PageActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs
index c2837e8d6d29..101219a57ef3 100644
--- a/src/Mvc/Mvc.RazorPages/test/Builder/PageActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs
+++ b/src/Mvc/Mvc.RazorPages/test/Builder/PageActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs
@@ -33,7 +33,7 @@ public void WithStaticAssets_AddsEmptyResourceCollection_ToEndpoints_NoStaticAss
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(0, list.Count);
+            Assert.Empty(list);
         });
     }
 
@@ -54,7 +54,7 @@ public void WithStaticAssets_AddsEmptyResourceCollection_ToEndpoints_NoMatchingS
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(0, list.Count);
+            Assert.Empty(list);
         });
     }
 
@@ -75,7 +75,7 @@ public void WithStaticAssets_AddsResourceCollection_ToEndpoints_NamedManifest()
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("named.css", list[0].Url);
         });
     }
@@ -97,7 +97,7 @@ public void WithStaticAssets_AddsResourceCollection_ToEndpoints_DefaultManifest(
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("default.css", list[0].Url);
         });
     }
@@ -120,7 +120,7 @@ public void WithStaticAssets_AddsDefaultResourceCollectionToEndpoints_WhenNoMani
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("default.css", list[0].Url);
         });
     }
@@ -143,7 +143,7 @@ public void WithStaticAssets_AddsMatchingResourceCollectionToEndpoints_WhenExpli
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("named.css", list[0].Url);
         });
     }
@@ -169,7 +169,7 @@ public void WithStaticAssets_AddsCollectionFromGroup_WhenMappedInsideAnEndpointG
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(1, list.Count);
+            Assert.Single(list);
             Assert.Equal("named.css", list[0].Url);
         });
     }
@@ -195,7 +195,7 @@ public void WithStaticAssets_AddsEmptyCollectionFromGroup_WhenMappingNotFound_In
             var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
             Assert.NotNull(metadata);
             var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-            Assert.Equal(0, list.Count);
+            Assert.Empty(list);
         });
     }
 
diff --git a/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs
index 40f10563626b..2294563bc156 100644
--- a/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs
+++ b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerTest.cs
@@ -51,7 +51,7 @@ public async Task Invoke_WritesDiagnostic_ActionSelected()
         var routeValues = listener.BeforeAction?.RouteData?.Values;
         Assert.NotNull(routeValues);
 
-        Assert.Equal(1, routeValues.Count);
+        Assert.Single(routeValues);
         Assert.Contains(routeValues, kvp => kvp.Key == "tag" && string.Equals(kvp.Value, "value"));
     }
 
@@ -142,7 +142,7 @@ public async Task DeletingValueProviderFactory_AtResourceFilter_IsNotAvailableIn
         // Assert
         var pageContext = Assert.IsType<PageActionInvoker>(invoker).PageContext;
         Assert.NotNull(pageContext);
-        Assert.Equal(1, pageContext.ValueProviderFactories.Count);
+        Assert.Single(pageContext.ValueProviderFactories);
         Assert.Same(valueProviderFactory2, pageContext.ValueProviderFactories[0]);
     }
 
@@ -1565,7 +1565,9 @@ object pageFactory(PageContext context, ViewContext viewContext)
             selector.Object,
             diagnosticListener ?? new DiagnosticListener("Microsoft.AspNetCore"),
             logger ?? NullLogger.Instance,
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
             ActionContextAccessor.Null,
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
             new ActionResultTypeMapper(),
             pageContext,
             filters ?? Array.Empty<IFilterMetadata>(),
diff --git a/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Shipped.txt b/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Shipped.txt
index 447cc36a67c6..6a1a48cc3160 100644
--- a/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Shipped.txt
+++ b/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Shipped.txt
@@ -211,6 +211,8 @@
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.GlobbingUrlBuilder.get -> Microsoft.AspNetCore.Mvc.TagHelpers.GlobbingUrlBuilder
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.GlobbingUrlBuilder.set -> void
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.HostingEnvironment.get -> Microsoft.AspNetCore.Hosting.IWebHostEnvironment
+~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.ImportMap.get -> Microsoft.AspNetCore.Components.ImportMapDefinition
+~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.ImportMap.set -> void
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.JavaScriptEncoder.get -> System.Text.Encodings.Web.JavaScriptEncoder
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.ScriptTagHelper(Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnvironment, Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider cacheProvider, Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider fileVersionProvider, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.Text.Encodings.Web.JavaScriptEncoder javaScriptEncoder, Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory urlHelperFactory) -> void
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Src.get -> string
@@ -219,6 +221,8 @@
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.SrcExclude.set -> void
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.SrcInclude.get -> string
 ~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.SrcInclude.set -> void
+~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Type.get -> string
+~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Type.set -> void
 ~Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper.For.get -> Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression
 ~Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper.For.set -> void
 ~Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper.Generator.get -> Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator
diff --git a/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Unshipped.txt
index 1c4ffad9ba5e..46ac17a8733c 100644
--- a/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.TagHelpers/src/PublicAPI.Unshipped.txt
@@ -1,5 +1,3 @@
 #nullable enable
-~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.ImportMap.get -> Microsoft.AspNetCore.Components.ImportMapDefinition
-~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.ImportMap.set -> void
-~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Type.get -> string
-~Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Type.set -> void
+*REMOVED*~override Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.Process(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output) -> void
+~override Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper.ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output) -> System.Threading.Tasks.Task
diff --git a/src/Mvc/Mvc.TagHelpers/src/ScriptTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/ScriptTagHelper.cs
index 64cc1be2f694..85952ce0865a 100644
--- a/src/Mvc/Mvc.TagHelpers/src/ScriptTagHelper.cs
+++ b/src/Mvc/Mvc.TagHelpers/src/ScriptTagHelper.cs
@@ -235,15 +235,29 @@ private StringWriter StringWriter
     }
 
     /// <inheritdoc />
-    public override void Process(TagHelperContext context, TagHelperOutput output)
+    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
         ArgumentNullException.ThrowIfNull(context);
         ArgumentNullException.ThrowIfNull(output);
 
         if (string.Equals(Type, "importmap", StringComparison.OrdinalIgnoreCase))
         {
-            // This is an importmap script, we'll write out the import map and
-            // stop processing.
+            // Do not update the content if another tag helper targeting this element has already done so.
+            if (output.IsContentModified)
+            {
+                return;
+            }
+
+            // This is an importmap script, check if there's existing content first.
+            var childContent = await output.GetChildContentAsync();
+            if (!childContent.IsEmptyOrWhiteSpace)
+            {
+                // User provided existing content; preserve it.
+                output.Content.SetHtmlContent(childContent);
+                return;
+            }
+
+            // No existing content, so we can apply import map logic.
             var importMap = ImportMap ?? ViewContext.HttpContext.GetEndpoint()?.Metadata.GetMetadata<ImportMapDefinition>();
             if (importMap == null)
             {
@@ -252,10 +266,10 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
                 return;
             }
 
+            output.Content.SetHtmlContent(importMap.ToString());
             output.TagName = "script";
             output.TagMode = TagMode.StartTagAndEndTag;
             output.Attributes.SetAttribute("type", "importmap");
-            output.Content.SetHtmlContent(importMap.ToString());
             return;
         }
 
diff --git a/src/Mvc/Mvc.TagHelpers/src/_package.json b/src/Mvc/Mvc.TagHelpers/src/_package.json
index ea557bf64ef8..46d78f15d9c1 100644
--- a/src/Mvc/Mvc.TagHelpers/src/_package.json
+++ b/src/Mvc/Mvc.TagHelpers/src/_package.json
@@ -1,6 +1,6 @@
 {
     "version": "1.0.0",
-    "name": "Microsoft.AspNetCore.Mvc.TagHelpers",
+    "name": "@microsoft/Microsoft.AspNetCore.Mvc.TagHelpers",
     "private": true,
     "devDependencies": {
         "grunt": "~0.4.5",
diff --git a/src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs
index e0779ea5e890..0ef5faff903f 100644
--- a/src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs
@@ -881,6 +881,7 @@ public async Task ProcessAsync_ThrowsExceptionForAwaiters_IfExecutorEncountersAn
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57567")]
     public async Task ProcessAsync_AwaitersUseTheResultOfExecutor()
     {
         // Arrange
diff --git a/src/Mvc/Mvc.TagHelpers/test/ComponentTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/ComponentTagHelperTest.cs
index 18e7efa00274..cefb5d70a82e 100644
--- a/src/Mvc/Mvc.TagHelpers/test/ComponentTagHelperTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/ComponentTagHelperTest.cs
@@ -77,9 +77,6 @@ private static TagHelperOutput GetTagHelperOutput()
 
     private ViewContext GetViewContext()
     {
-        var navManager = new Mock<NavigationManager>();
-        navManager.As<IHostEnvironmentNavigationManager>();
-
         var httpContext = new DefaultHttpContext
         {
             RequestServices = new ServiceCollection()
@@ -89,7 +86,7 @@ private ViewContext GetViewContext()
                     x => x.CreateProtector(It.IsAny<string>()) == Mock.Of<IDataProtector>()))
                 .AddLogging()
                 .AddScoped<ComponentStatePersistenceManager>()
-                .AddScoped(_ => navManager.Object)
+                .AddScoped<NavigationManager, MockNavigationManager>()
                 .AddScoped<HttpContextFormDataProvider>()
                 .BuildServiceProvider(),
         };
@@ -104,4 +101,16 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddContent(0, "Hello from the component");
         }
     }
+
+    class MockNavigationManager : NavigationManager, IHostEnvironmentNavigationManager
+    {
+        public MockNavigationManager()
+        {
+           Initialize("https://localhost:85/subdir/", "https://localhost:85/subdir/path?query=value#hash");
+        }
+
+        void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri)
+        {
+        }
+    }
 }
diff --git a/src/Mvc/Mvc.TagHelpers/test/GlobbingUrlBuilderTest.cs b/src/Mvc/Mvc.TagHelpers/test/GlobbingUrlBuilderTest.cs
index 2931040874c7..c22dd15b13a8 100644
--- a/src/Mvc/Mvc.TagHelpers/test/GlobbingUrlBuilderTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/GlobbingUrlBuilderTest.cs
@@ -47,7 +47,7 @@ public void DedupesStaticUrlAndPatternMatches()
             url => Assert.Equal("/blank.css", url));
     }
 
-    public static TheoryData OrdersGlobbedMatchResultsCorrectly_Data
+    public static TheoryData<string, FileNode, string[]> OrdersGlobbedMatchResultsCorrectly_Data
     {
         get
         {
@@ -295,7 +295,7 @@ public void CachesMatchResults()
         Mock.Get(cache).VerifyAll();
     }
 
-    public static TheoryData CommaSeparatedPatternData
+    public static TheoryData<string, string[]> CommaSeparatedPatternData
     {
         get
         {
diff --git a/src/Mvc/Mvc.TagHelpers/test/LinkTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/LinkTagHelperTest.cs
index 0ce563ec4fe4..b86b66630208 100644
--- a/src/Mvc/Mvc.TagHelpers/test/LinkTagHelperTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/LinkTagHelperTest.cs
@@ -76,7 +76,7 @@ public void Process_HrefDefaultsToTagHelperOutputHrefAttributeAddedByOtherTagHel
             StringComparer.Ordinal);
     }
 
-    public static TheoryData MultiAttributeSameNameData
+    public static TheoryData<TagHelperAttributeList> MultiAttributeSameNameData
     {
         get
         {
@@ -168,7 +168,7 @@ public void HandlesMultipleAttributesSameNameCorrectly(TagHelperAttributeList ou
         Assert.Equal(expectedAttributes, output.Attributes);
     }
 
-    public static TheoryData RunsWhenRequiredAttributesArePresent_Data
+    public static TheoryData<TagHelperAttributeList, Action<LinkTagHelper>> RunsWhenRequiredAttributesArePresent_Data
     {
         get
         {
@@ -319,7 +319,7 @@ public void RunsWhenRequiredAttributesArePresent(
         Assert.True(output.PostElement.IsModified);
     }
 
-    public static TheoryData RunsWhenRequiredAttributesArePresent_NoHref_Data
+    public static TheoryData<TagHelperAttributeList, Action<LinkTagHelper>> RunsWhenRequiredAttributesArePresent_NoHref_Data
     {
         get
         {
@@ -445,7 +445,7 @@ public void PreservesOrderOfNonHrefAttributes()
         Assert.Equal("data-extra", output.Attributes[2].Name);
     }
 
-    public static TheoryData DoesNotRunWhenARequiredAttributeIsMissing_Data
+    public static TheoryData<TagHelperAttributeList, Action<LinkTagHelper>> DoesNotRunWhenARequiredAttributeIsMissing_Data
     {
         get
         {
diff --git a/src/Mvc/Mvc.TagHelpers/test/RenderAtEndOfFormTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/RenderAtEndOfFormTagHelperTest.cs
index 9d4ac6ea6839..d07040830794 100644
--- a/src/Mvc/Mvc.TagHelpers/test/RenderAtEndOfFormTagHelperTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/RenderAtEndOfFormTagHelperTest.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers;
 
 public class RenderAtEndOfFormTagHelperTest
 {
-    public static TheoryData RenderAtEndOfFormTagHelperData
+    public static TheoryData<List<TagBuilder>, string> RenderAtEndOfFormTagHelperData
     {
         get
         {
diff --git a/src/Mvc/Mvc.TagHelpers/test/ScriptTagHelperTest.cs b/src/Mvc/Mvc.TagHelpers/test/ScriptTagHelperTest.cs
index e982e324a200..11fec3545440 100644
--- a/src/Mvc/Mvc.TagHelpers/test/ScriptTagHelperTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/ScriptTagHelperTest.cs
@@ -30,7 +30,7 @@ public class ScriptTagHelperTest
     [InlineData("abcd.js", "test.js", "test.js")]
     [InlineData(null, "~/test.js", "virtualRoot/test.js")]
     [InlineData("abcd.js", "~/test.js", "virtualRoot/test.js")]
-    public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
+    public async Task ProcessAsync_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
         string src,
         string srcOutput,
         string expectedSrcPrefix)
@@ -66,7 +66,7 @@ public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelpe
         helper.Src = src;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal(
@@ -77,7 +77,7 @@ public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelpe
 
     [Theory]
     [MemberData(nameof(LinkTagHelperTest.MultiAttributeSameNameData), MemberType = typeof(LinkTagHelperTest))]
-    public void HandlesMultipleAttributesSameNameCorrectly(TagHelperAttributeList outputAttributes)
+    public async Task HandlesMultipleAttributesSameNameCorrectly(TagHelperAttributeList outputAttributes)
     {
         // Arrange
         var allAttributes = new TagHelperAttributeList(
@@ -107,13 +107,13 @@ public void HandlesMultipleAttributesSameNameCorrectly(TagHelperAttributeList ou
         expectedAttributes.Add(new TagHelperAttribute("src", "/blank.js"));
 
         // Act
-        helper.Process(tagHelperContext, output);
+        await helper.ProcessAsync(tagHelperContext, output);
 
         // Assert
         Assert.Equal(expectedAttributes, output.Attributes);
     }
 
-    public static TheoryData RunsWhenRequiredAttributesArePresent_Data
+    public static TheoryData<TagHelperAttributeList, Action<ScriptTagHelper>> RunsWhenRequiredAttributesArePresent_Data
     {
         get
         {
@@ -268,7 +268,7 @@ public static TheoryData RunsWhenRequiredAttributesArePresent_Data
 
     [Theory]
     [MemberData(nameof(RunsWhenRequiredAttributesArePresent_Data))]
-    public void RunsWhenRequiredAttributesArePresent(
+    public async Task RunsWhenRequiredAttributesArePresent(
         TagHelperAttributeList attributes,
         Action<ScriptTagHelper> setProperties)
     {
@@ -287,7 +287,7 @@ public void RunsWhenRequiredAttributesArePresent(
         setProperties(helper);
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.NotNull(output.TagName);
@@ -295,7 +295,7 @@ public void RunsWhenRequiredAttributesArePresent(
         Assert.True(output.PostElement.IsModified);
     }
 
-    public static TheoryData RunsWhenRequiredAttributesArePresent_NoSrc_Data
+    public static TheoryData<TagHelperAttributeList, Action<ScriptTagHelper>> RunsWhenRequiredAttributesArePresent_NoSrc_Data
     {
         get
         {
@@ -355,7 +355,7 @@ public static TheoryData RunsWhenRequiredAttributesArePresent_NoSrc_Data
 
     [Theory]
     [MemberData(nameof(RunsWhenRequiredAttributesArePresent_NoSrc_Data))]
-    public void RunsWhenRequiredAttributesArePresent_NoSrc(
+    public async Task RunsWhenRequiredAttributesArePresent_NoSrc(
         TagHelperAttributeList attributes,
         Action<ScriptTagHelper> setProperties)
     {
@@ -374,7 +374,7 @@ public void RunsWhenRequiredAttributesArePresent_NoSrc(
         setProperties(helper);
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Null(output.TagName);
@@ -383,7 +383,7 @@ public void RunsWhenRequiredAttributesArePresent_NoSrc(
         Assert.True(output.PostElement.IsModified);
     }
 
-    public static TheoryData DoesNotRunWhenARequiredAttributeIsMissing_Data
+    public static TheoryData<TagHelperAttributeList, Action<ScriptTagHelper>> DoesNotRunWhenARequiredAttributeIsMissing_Data
     {
         get
         {
@@ -449,7 +449,7 @@ public static TheoryData DoesNotRunWhenARequiredAttributeIsMissing_Data
 
     [Theory]
     [MemberData(nameof(DoesNotRunWhenARequiredAttributeIsMissing_Data))]
-    public void DoesNotRunWhenARequiredAttributeIsMissing(
+    public async Task DoesNotRunWhenARequiredAttributeIsMissing(
         TagHelperAttributeList attributes,
         Action<ScriptTagHelper> setProperties)
     {
@@ -462,7 +462,7 @@ public void DoesNotRunWhenARequiredAttributeIsMissing(
         setProperties(helper);
 
         // Act
-        helper.Process(tagHelperContext, output);
+        await helper.ProcessAsync(tagHelperContext, output);
 
         // Assert
         Assert.NotNull(output.TagName);
@@ -472,7 +472,7 @@ public void DoesNotRunWhenARequiredAttributeIsMissing(
     }
 
     [Fact]
-    public void DoesNotRunWhenAllRequiredAttributesAreMissing()
+    public async Task DoesNotRunWhenAllRequiredAttributesAreMissing()
     {
         // Arrange
         var tagHelperContext = MakeTagHelperContext();
@@ -482,7 +482,7 @@ public void DoesNotRunWhenAllRequiredAttributesAreMissing()
         var helper = GetHelper();
 
         // Act
-        helper.Process(tagHelperContext, output);
+        await helper.ProcessAsync(tagHelperContext, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -492,7 +492,7 @@ public void DoesNotRunWhenAllRequiredAttributesAreMissing()
     }
 
     [Fact]
-    public void PreservesOrderOfNonSrcAttributes()
+    public async Task PreservesOrderOfNonSrcAttributes()
     {
         // Arrange
         var tagHelperContext = MakeTagHelperContext(
@@ -518,7 +518,7 @@ public void PreservesOrderOfNonSrcAttributes()
         helper.Src = "/blank.js";
 
         // Act
-        helper.Process(tagHelperContext, output);
+        await helper.ProcessAsync(tagHelperContext, output);
 
         // Assert
         Assert.Equal("data-extra", output.Attributes[0].Name);
@@ -527,7 +527,7 @@ public void PreservesOrderOfNonSrcAttributes()
     }
 
     [Fact]
-    public void RendersScriptTagsForGlobbedSrcResults()
+    public async Task RendersScriptTagsForGlobbedSrcResults()
     {
         // Arrange
         var expectedContent = "<script src=\"HtmlEncode[[/js/site.js]]\"></script>" +
@@ -552,7 +552,7 @@ public void RendersScriptTagsForGlobbedSrcResults()
         helper.SrcInclude = "**/*.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -562,7 +562,7 @@ public void RendersScriptTagsForGlobbedSrcResults()
     }
 
     [Fact]
-    public void RendersScriptTagsForGlobbedSrcResults_EncodesAsExpected()
+    public async Task RendersScriptTagsForGlobbedSrcResults_EncodesAsExpected()
     {
         // Arrange
         var expectedContent =
@@ -605,7 +605,7 @@ public void RendersScriptTagsForGlobbedSrcResults_EncodesAsExpected()
         helper.SrcInclude = "**/*.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -615,7 +615,7 @@ public void RendersScriptTagsForGlobbedSrcResults_EncodesAsExpected()
     }
 
     [Fact]
-    public void RenderScriptTags_WithFileVersion()
+    public async Task RenderScriptTags_WithFileVersion()
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -631,7 +631,7 @@ public void RenderScriptTags_WithFileVersion()
         helper.AppendVersion = true;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -642,7 +642,7 @@ public void RenderScriptTags_WithFileVersion()
     [InlineData("~/js/site.js", "/js/site.fingerprint.js")]
     [InlineData("/js/site.js", "/js/site.fingerprint.js")]
     [InlineData("js/site.js", "js/site.fingerprint.js")]
-    public void RenderScriptTags_WithFileVersion_UsingResourceCollection(string src, string expected)
+    public async Task RenderScriptTags_WithFileVersion_UsingResourceCollection(string src, string expected)
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -661,7 +661,7 @@ public void RenderScriptTags_WithFileVersion_UsingResourceCollection(string src,
         helper.AppendVersion = true;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -671,7 +671,7 @@ public void RenderScriptTags_WithFileVersion_UsingResourceCollection(string src,
     [Theory]
     [InlineData("~/js/site.js")]
     [InlineData("/approot/js/site.js")]
-    public void RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection(string path)
+    public async Task RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection(string path)
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -699,7 +699,7 @@ public void RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection(st
         helper.AppendVersion = true;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -707,7 +707,7 @@ public void RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection(st
     }
 
     [Fact]
-    public void ScriptTagHelper_RendersProvided_ImportMap()
+    public async Task ScriptTagHelper_RendersProvided_ImportMap()
     {
         // Arrange
         var importMap = new ImportMapDefinition(
@@ -744,7 +744,7 @@ public void ScriptTagHelper_RendersProvided_ImportMap()
         helper.ImportMap = importMap;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -752,7 +752,7 @@ public void ScriptTagHelper_RendersProvided_ImportMap()
     }
 
     [Fact]
-    public void ScriptTagHelper_RendersImportMap_FromEndpoint()
+    public async Task ScriptTagHelper_RendersImportMap_FromEndpoint()
     {
         // Arrange
         var importMap = new ImportMapDefinition(
@@ -787,13 +787,66 @@ public void ScriptTagHelper_RendersImportMap_FromEndpoint()
         helper.Type = "importmap";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
         Assert.Equal(importMap.ToJson(), output.Content.GetContent());
     }
 
+    [Fact]
+    public async Task ScriptTagHelper_PreservesExplicitImportMapContent_WhenUserProvidesContent()
+    {
+        // Arrange - this simulates the user's scenario where they provide explicit importmap content
+        var context = MakeTagHelperContext(attributes: [new TagHelperAttribute("type", "importmap")]);
+
+        // Simulate user providing explicit content
+        var childContent = new DefaultTagHelperContent();
+        childContent.SetHtmlContent(@"{""imports"":{""jquery"":""https://code.jquery.com/jquery.js""}}");
+
+        var output = MakeTagHelperOutput("script", attributes: [new TagHelperAttribute("type", "importmap")], childContent: childContent);
+
+        var helper = GetHelper();
+        helper.Type = "importmap";
+
+        // No endpoint with ImportMapDefinition - this should NOT suppress the output
+        // since user provided explicit content
+
+        // Act
+        await helper.ProcessAsync(context, output);
+
+        // Assert
+        Assert.Equal("script", output.TagName); // Tag should not be suppressed
+        Assert.Equal("importmap", output.Attributes["type"].Value);
+        // The user's explicit content should be preserved
+        Assert.Equal(@"{""imports"":{""jquery"":""https://code.jquery.com/jquery.js""}}", output.Content.GetContent());
+    }
+
+    [Fact]
+    public async Task ScriptTagHelper_SuppressesOutput_WhenNoContentAndNoImportMapDefinition()
+    {
+        // Arrange - this simulates an empty importmap script with no definition
+        var context = MakeTagHelperContext(
+            attributes: new TagHelperAttributeList
+            {
+                new TagHelperAttribute("type", "importmap"),
+            });
+        
+        var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
+        // No content provided
+
+        var helper = GetHelper();
+        helper.Type = "importmap";
+        // No endpoint with ImportMapDefinition and no explicit content
+        // This should suppress the output since there's nothing to render
+
+        // Act
+        await helper.ProcessAsync(context, output);
+
+        // Assert - output should be suppressed when no content and no definition
+        Assert.Null(output.TagName); // Tag should be suppressed
+    }
+
     private Endpoint CreateEndpoint(ImportMapDefinition importMap = null)
     {
         return new Endpoint(
@@ -809,7 +862,7 @@ [new ResourceAssetCollection([
     }
 
     [Fact]
-    public void RenderScriptTags_WithFileVersion_AndRequestPathBase()
+    public async Task RenderScriptTags_WithFileVersion_AndRequestPathBase()
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -826,7 +879,7 @@ public void RenderScriptTags_WithFileVersion_AndRequestPathBase()
         helper.AppendVersion = true;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -834,7 +887,7 @@ public void RenderScriptTags_WithFileVersion_AndRequestPathBase()
     }
 
     [Fact]
-    public void RenderScriptTags_FallbackSrc_WithFileVersion()
+    public async Task RenderScriptTags_FallbackSrc_WithFileVersion()
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -854,7 +907,7 @@ public void RenderScriptTags_FallbackSrc_WithFileVersion()
         helper.Src = "/js/site.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -865,7 +918,7 @@ public void RenderScriptTags_FallbackSrc_WithFileVersion()
     }
 
     [Fact]
-    public void RenderScriptTags_FallbackSrc_AppendVersion_WithStaticAssets()
+    public async Task RenderScriptTags_FallbackSrc_AppendVersion_WithStaticAssets()
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -886,7 +939,7 @@ public void RenderScriptTags_FallbackSrc_AppendVersion_WithStaticAssets()
         helper.Src = "/js/site.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -897,7 +950,7 @@ public void RenderScriptTags_FallbackSrc_AppendVersion_WithStaticAssets()
     }
 
     [Fact]
-    public void RenderScriptTags_FallbackSrc_WithFileVersion_EncodesAsExpected()
+    public async Task RenderScriptTags_FallbackSrc_WithFileVersion_EncodesAsExpected()
     {
         // Arrange
         var expectedContent =
@@ -939,7 +992,7 @@ public void RenderScriptTags_FallbackSrc_WithFileVersion_EncodesAsExpected()
         helper.Src = "/js/site.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -949,7 +1002,7 @@ public void RenderScriptTags_FallbackSrc_WithFileVersion_EncodesAsExpected()
     }
 
     [Fact]
-    public void RenderScriptTags_GlobbedSrc_WithFileVersion()
+    public async Task RenderScriptTags_GlobbedSrc_WithFileVersion()
     {
         // Arrange
         var expectedContent = "<script " +
@@ -977,7 +1030,7 @@ public void RenderScriptTags_GlobbedSrc_WithFileVersion()
         helper.Src = "/js/site.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -987,7 +1040,7 @@ public void RenderScriptTags_GlobbedSrc_WithFileVersion()
     }
 
     [Fact]
-    public void RenderScriptTags_GlobbedSrc_WithFileVersion_WithStaticAssets()
+    public async Task RenderScriptTags_GlobbedSrc_WithFileVersion_WithStaticAssets()
     {
         // Arrange
         var expectedContent = "<script " +
@@ -1016,7 +1069,7 @@ public void RenderScriptTags_GlobbedSrc_WithFileVersion_WithStaticAssets()
         helper.Src = "/js/site.js";
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -1028,7 +1081,7 @@ public void RenderScriptTags_GlobbedSrc_WithFileVersion_WithStaticAssets()
     [Theory]
     [InlineData("~/js/site.js")]
     [InlineData("/approot/js/site.js")]
-    public void RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection_PreservesModule(string path)
+    public async Task RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection_PreservesModule(string path)
     {
         // Arrange
         var context = MakeTagHelperContext(
@@ -1055,7 +1108,7 @@ public void RenderScriptTags_PathBase_WithFileVersion_UsingResourceCollection_Pr
         helper.AppendVersion = true;
 
         // Act
-        helper.Process(context, output);
+        await helper.ProcessAsync(context, output);
 
         // Assert
         Assert.Equal("script", output.TagName);
@@ -1121,15 +1174,15 @@ private static ViewContext MakeViewContext(string requestPathBase = null)
         return viewContext;
     }
 
-    private TagHelperOutput MakeTagHelperOutput(string tagName, TagHelperAttributeList attributes = null)
+    private TagHelperOutput MakeTagHelperOutput(string tagName, TagHelperAttributeList attributes = null, TagHelperContent childContent = null)
     {
-        attributes = attributes ?? new TagHelperAttributeList();
+        attributes ??= [];
+        childContent ??= new DefaultTagHelperContent();
 
         return new TagHelperOutput(
             tagName,
             attributes,
-            getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
-                new DefaultTagHelperContent()));
+            getChildContentAsync: (useCachedResult, encoder) => Task.FromResult(childContent));
     }
 
     private static IWebHostEnvironment MakeHostingEnvironment()
diff --git a/src/Mvc/Mvc.TagHelpers/test/TagHelperOutputExtensionsTest.cs b/src/Mvc/Mvc.TagHelpers/test/TagHelperOutputExtensionsTest.cs
index d59704c461b0..be4689f62e40 100644
--- a/src/Mvc/Mvc.TagHelpers/test/TagHelperOutputExtensionsTest.cs
+++ b/src/Mvc/Mvc.TagHelpers/test/TagHelperOutputExtensionsTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers;
 
 public class TagHelperOutputExtensionsTest
 {
-    public static TheoryData CopyHtmlAttributeData_MaintainsOrder
+    public static TheoryData<string, TagHelperAttributeList, TagHelperAttributeList, IEnumerable<TagHelperAttribute>> CopyHtmlAttributeData_MaintainsOrder
     {
         get
         {
@@ -349,7 +349,7 @@ public void CopyHtmlAttribute_MaintainsOrder(
         Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData CopyHtmlAttributeData_MultipleAttributesSameName
+    public static TheoryData<string, TagHelperAttributeList, IEnumerable<TagHelperAttribute>> CopyHtmlAttributeData_MultipleAttributesSameName
     {
         get
         {
@@ -630,7 +630,7 @@ public void FindPrefixedAttributes_ReturnsEmpty_AttributeListIfNoAttributesPrefi
         Assert.Equal(expectedAttribute, attribute);
     }
 
-    public static TheoryData MultipleAttributeSameNameData
+    public static TheoryData<Dictionary<string, string>, TagHelperAttributeList, TagHelperAttributeList> MultipleAttributeSameNameData
     {
         get
         {
diff --git a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
index 0adf29bfa100..933378e47a35 100644
--- a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
+++ b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
@@ -61,7 +61,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
     }
 
     private static bool HasBody(HttpRequestMessage request) =>
-        request.Method == HttpMethod.Post || request.Method == HttpMethod.Put;
+        request.Method == HttpMethod.Post || request.Method == HttpMethod.Put || request.Method == HttpMethod.Patch;
 
     private static async Task<HttpContent?> DuplicateRequestContent(HttpRequestMessage request)
     {
diff --git a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
index 3201fd08940b..76118e0bb154 100644
--- a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
+++ b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.TestHost" />
     <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.DependencyModel" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
diff --git a/src/Mvc/Mvc.Testing/src/PACKAGE.md b/src/Mvc/Mvc.Testing/src/PACKAGE.md
new file mode 100644
index 000000000000..6ba3b49a2f09
--- /dev/null
+++ b/src/Mvc/Mvc.Testing/src/PACKAGE.md
@@ -0,0 +1,72 @@
+## About
+
+`Microsoft.AspNetCore.Mvc.Testing` provides support for writing integration tests for ASP.NET Core apps that utilize MVC or Minimal APIs.
+
+## Key Features
+
+* Copies the dependencies file (`.deps.json`) from the System Under Test (SUT) into the test project's `bin` directory
+* Sets the [content root](https://learn.microsoft.com/aspnet/core/fundamentals/#content-root) to the SUT's project root so that static files are found during test execution
+* Provides the [`WebApplicationFactory`](https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.mvc.testing.webapplicationfactory-1) class to streamline bootstrapping the SUT with [`TestServer`](https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.testhost.testserver)
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Mvc.Testing`, follow these steps:
+
+### Installation
+
+To install the package, run the following command from the directory containing the test project file:
+
+```shell
+dotnet add package Microsoft.AspNetCore.Mvc.Testing
+```
+
+### Configuration
+
+To configure the test app, follow these steps:
+
+1. Specify the Web SDK in the test project file (`<Project Sdk="Microsoft.NET.Sdk.Web">`).
+2. Add references to the following packages:
+    * `xunit`
+    * `xunit.runner.visualstudio`
+    * `Microsoft.NET.Test.Sdk`
+3. Add a test class to the test project:
+    ```csharp
+    public class BasicTests
+        : IClassFixture<WebApplicationFactory<Program>>
+    {
+        private readonly WebApplicationFactory<Program> _factory;
+
+        public BasicTests(WebApplicationFactory<Program> factory)
+        {
+            _factory = factory;
+        }
+
+        [Theory]
+        [InlineData("/")]
+        [InlineData("/Index")]
+        [InlineData("/About")]
+        [InlineData("/Privacy")]
+        [InlineData("/Contact")]
+        public async Task Get_EndpointsReturnSuccessAndCorrectContentType(string url)
+        {
+            // Arrange
+            var client = _factory.CreateClient();
+
+            // Act
+            var response = await client.GetAsync(url);
+
+            // Assert
+            response.EnsureSuccessStatusCode(); // Status Code 200-299
+            Assert.Equal("text/html; charset=utf-8",
+                response.Content.Headers.ContentType.ToString());
+        }
+    }
+    ```
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/test/integration-tests) on integration testing in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Mvc.Testing` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..f1ba5d5f2e0e 100644
--- a/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt
@@ -1 +1,6 @@
 #nullable enable
+Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.StartServer() -> void
+Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel() -> void
+Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel(int port) -> void
+Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel(System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions!>! configureKestrelOptions) -> void
+virtual Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.CreateServer(System.IServiceProvider! serviceProvider) -> Microsoft.AspNetCore.TestHost.TestServer!
diff --git a/src/Mvc/Mvc.Testing/src/Resources.resx b/src/Mvc/Mvc.Testing/src/Resources.resx
index 84ce491ca5ed..8148b93f3280 100644
--- a/src/Mvc/Mvc.Testing/src/Resources.resx
+++ b/src/Mvc/Mvc.Testing/src/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -126,4 +126,13 @@
   <data name="MissingDepsFile" xml:space="preserve">
     <value>Can't find '{0}'. This file is required for functional tests to run properly. There should be a copy of the file on your source project bin folder. If that is not the case, make sure that the property PreserveCompilationContext is set to true on your project file. E.g '&lt;PreserveCompilationContext&gt;true&lt;/PreserveCompilationContext&gt;'. For functional tests to work they need to either run from the build output folder or the {1} file from your application's output directory must be copied to the folder where the tests are running on. A common cause for this error is having shadow copying enabled when the tests run.</value>
   </data>
+  <data name="ServerNotInitialized" xml:space="preserve">
+    <value>Server hasn't been initialized yet. Please initialize the server first before trying to create a client.</value>
+  </data>
+  <data name="TestServerNotSupportedWhenUsingKestrel" xml:space="preserve">
+    <value>Accessing the `Server` property isn't supported when using Kestrel server.</value>
+  </data>
+  <data name="UseKestrelCanBeCalledBeforeInitialization" xml:space="preserve">
+    <value>UseKestrel should be called before server initialization. Calling UseKestrel after the server was initialized will have no effect.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
index dd43bdac2e7c..3976128cd958 100644
--- a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
+++ b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.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.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
@@ -9,6 +8,9 @@
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -26,9 +28,18 @@ public partial class WebApplicationFactory<TEntryPoint> : IDisposable, IAsyncDis
 {
     private bool _disposed;
     private bool _disposedAsync;
+
+    private bool _useKestrel;
+    private int? _kestrelPort;
+    private Action<KestrelServerOptions>? _configureKestrelOptions;
+
     private TestServer? _server;
     private IHost? _host;
     private Action<IWebHostBuilder> _configuration;
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+    private IWebHost? _webHost;
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+    private Uri? _webHostAddress;
     private readonly List<HttpClient> _clients = new();
     private readonly List<WebApplicationFactory<TEntryPoint>> _derivedFactories = new();
 
@@ -75,8 +86,13 @@ public TestServer Server
     {
         get
         {
-            EnsureServer();
-            return _server;
+            if (_useKestrel)
+            {
+                throw new NotSupportedException(Resources.TestServerNotSupportedWhenUsingKestrel);
+            }
+
+            StartServer();
+            return _server!;
         }
     }
 
@@ -87,11 +103,23 @@ public virtual IServiceProvider Services
     {
         get
         {
-            EnsureServer();
-            return _host?.Services ?? _server.Host.Services;
+            StartServer();
+            if (_useKestrel)
+            {
+                return _webHost?.Services ?? _host!.Services;
+            }
+
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+            return _host?.Services ?? _server!.Host.Services;
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
         }
     }
 
+    /// <summary>
+    /// Helps determine if the `StartServer` method has been called already.
+    /// </summary>
+    private bool ServerStarted => _webHost != null || _host != null || _server != null;
+
     /// <summary>
     /// Gets the <see cref="IReadOnlyList{WebApplicationFactory}"/> of factories created from this factory
     /// by further customizing the <see cref="IWebHostBuilder"/> when calling
@@ -119,6 +147,9 @@ internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Actio
     {
         var factory = new DelegatedWebApplicationFactory(
             ClientOptions,
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+            CreateServer,
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
             CreateServer,
             CreateHost,
             CreateWebHostBuilder,
@@ -136,10 +167,94 @@ internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Actio
         return factory;
     }
 
-    [MemberNotNull(nameof(_server))]
-    private void EnsureServer()
+    /// <summary>
+    /// Configures the factory to use Kestrel as the server.
+    /// </summary>
+    public void UseKestrel()
     {
-        if (_server != null)
+        if (ServerStarted)
+        {
+            throw new InvalidOperationException(Resources.UseKestrelCanBeCalledBeforeInitialization);
+        }
+
+        _useKestrel = true;
+    }
+
+    /// <summary>
+    /// Configures the factory to use Kestrel as the server.
+    /// </summary>
+    /// <param name="port">The port to listen to when the server starts. Use `0` to allow dynamic port selection.</param>
+    /// <exception cref="InvalidOperationException">Thrown, if this method is called after the WebHostFactory has been initialized.</exception>
+    /// <remarks>This method should be called before the factory is initialized either via one of the <see cref="CreateClient()"/> methods
+    /// or via the <see cref="StartServer"/> method.</remarks>
+    public void UseKestrel(int port)
+    {
+        UseKestrel();
+
+        this._kestrelPort = port;
+    }
+
+    /// <summary>
+    /// Configures the factory to use Kestrel as the server.
+    /// </summary>
+    /// <param name="configureKestrelOptions">A callback handler that will be used for configuring the server when it starts.</param>
+    /// <exception cref="InvalidOperationException">Thrown, if this method is called after the WebHostFactory has been initialized.</exception>
+    /// <remarks>This method should be called before the factory is initialized either via one of the <see cref="CreateClient()"/> methods
+    /// or via the <see cref="StartServer"/> method.</remarks>
+    public void UseKestrel(Action<KestrelServerOptions> configureKestrelOptions)
+    {
+        UseKestrel();
+
+        this._configureKestrelOptions = configureKestrelOptions;
+    }
+
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+    private IWebHost CreateKestrelServer(IWebHostBuilder builder)
+    {
+        ConfigureBuilderToUseKestrel(builder);
+
+        var host = builder.Build();
+
+        TryConfigureServerPort(() => GetServerAddressFeature(host));
+
+        host.Start();
+        return host;
+    }
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+
+    private void TryConfigureServerPort(Func<IServerAddressesFeature?> serverAddressFeatureAccessor)
+    {
+        if (_kestrelPort.HasValue)
+        {
+            var saf = serverAddressFeatureAccessor();
+            if (saf is not null)
+            {
+                saf.Addresses.Clear();
+                saf.Addresses.Add($"http://127.0.0.1:{_kestrelPort}");
+                saf.PreferHostingUrls = true;
+            }
+        }
+    }
+
+    private void ConfigureBuilderToUseKestrel(IWebHostBuilder builder)
+    {
+        if (_configureKestrelOptions is not null)
+        {
+            builder.UseKestrel(_configureKestrelOptions);
+        }
+        else
+        {
+            builder.UseKestrel();
+        }
+    }
+
+    /// <summary>
+    /// Initializes the instance by configurating the host builder.
+    /// </summary>
+    /// <exception cref="InvalidOperationException">Thrown if the provided <typeparamref name="TEntryPoint"/> type has no factory method.</exception>
+    public void StartServer()
+    {
+        if (ServerStarted)
         {
             return;
         }
@@ -158,8 +273,8 @@ private void EnsureServer()
         {
             var deferredHostBuilder = new DeferredHostBuilder();
             deferredHostBuilder.UseEnvironment(Environments.Development);
-            // There's no helper for UseApplicationName, but we need to 
-            // set the application name to the target entry point 
+            // There's no helper for UseApplicationName, but we need to
+            // set the application name to the target entry point
             // assembly name.
             deferredHostBuilder.ConfigureHostConfiguration(config =>
             {
@@ -197,21 +312,58 @@ private void EnsureServer()
         {
             SetContentRoot(builder);
             _configuration(builder);
-            _server = CreateServer(builder);
+            if (_useKestrel)
+            {
+                _webHost = CreateKestrelServer(builder);
+
+                TryExtractHostAddress(GetServerAddressFeature(_webHost));
+            }
+            else
+            {
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+                _server = CreateServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+            }
+        }
+    }
+
+    private void TryExtractHostAddress(IServerAddressesFeature? serverAddressFeature)
+    {
+        if (serverAddressFeature?.Addresses.Count > 0)
+        {
+            // Store the web host address as it's going to be used every time a client is created to communicate to the server
+            _webHostAddress = new Uri(serverAddressFeature.Addresses.Last());
+            ClientOptions.BaseAddress = _webHostAddress;
         }
     }
 
-    [MemberNotNull(nameof(_server))]
     private void ConfigureHostBuilder(IHostBuilder hostBuilder)
     {
         hostBuilder.ConfigureWebHost(webHostBuilder =>
         {
             SetContentRoot(webHostBuilder);
             _configuration(webHostBuilder);
-            webHostBuilder.UseTestServer();
+            if (_useKestrel)
+            {
+                ConfigureBuilderToUseKestrel(webHostBuilder);
+            }
+            else
+            {
+                webHostBuilder.ConfigureServices(services =>
+                {
+                    services.AddSingleton<IServer>(CreateServer);
+                });
+            }
         });
         _host = CreateHost(hostBuilder);
-        _server = (TestServer)_host.Services.GetRequiredService<IServer>();
+        if (_useKestrel)
+        {
+            TryExtractHostAddress(GetServerAddressFeature(_host));
+        }
+        else
+        {
+            _server = (TestServer)_host.Services.GetRequiredService<IServer>();
+        }
     }
 
     private void SetContentRoot(IWebHostBuilder builder)
@@ -426,22 +578,39 @@ private static void EnsureDepsFile()
     /// <param name="builder">The <see cref="IWebHostBuilder"/> used to
     /// create the server.</param>
     /// <returns>The <see cref="TestServer"/> with the bootstrapped application.</returns>
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the overloads that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
     protected virtual TestServer CreateServer(IWebHostBuilder builder) => new(builder);
 
+    /// <summary>
+    /// Creates the <see cref="TestServer"/> with the <see cref="IServiceProvider"/> from the bootstrapped application.
+    /// This is only called for applications using <see cref="IHostBuilder"/>. Applications based on
+    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateHost"/> instead.
+    /// </summary>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/> from the bootstrapped application.</param>
+    /// <returns></returns>
+    protected virtual TestServer CreateServer(IServiceProvider serviceProvider) => new(serviceProvider);
+
     /// <summary>
     /// Creates the <see cref="IHost"/> with the bootstrapped application in <paramref name="builder"/>.
     /// This is only called for applications using <see cref="IHostBuilder"/>. Applications based on
-    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateServer"/> instead.
+    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateServer(IWebHostBuilder)"/> instead.
     /// </summary>
     /// <param name="builder">The <see cref="IHostBuilder"/> used to create the host.</param>
     /// <returns>The <see cref="IHost"/> with the bootstrapped application.</returns>
     protected virtual IHost CreateHost(IHostBuilder builder)
     {
         var host = builder.Build();
+        TryConfigureServerPort(() => GetServerAddressFeature(host));
         host.Start();
         return host;
     }
 
+    private static IServerAddressesFeature? GetServerAddressFeature(IHost host) => host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>();
+
+#pragma warning disable ASPDEPR008 // IWebHost is obsolete
+    private static IServerAddressesFeature? GetServerAddressFeature(IWebHost webHost) => webHost.ServerFeatures.Get<IServerAddressesFeature>();
+#pragma warning restore ASPDEPR008 // IWebHost is obsolete
+
     /// <summary>
     /// Gives a fixture an opportunity to configure the application before it gets built.
     /// </summary>
@@ -455,8 +624,21 @@ protected virtual void ConfigureWebHost(IWebHostBuilder builder)
     /// redirects and handles cookies.
     /// </summary>
     /// <returns>The <see cref="HttpClient"/>.</returns>
-    public HttpClient CreateClient() =>
-        CreateClient(ClientOptions);
+    public HttpClient CreateClient()
+    {
+        var client = CreateClient(ClientOptions);
+
+        if (_useKestrel && object.ReferenceEquals(client.BaseAddress, WebApplicationFactoryClientOptions.DefaultBaseAddres))
+        {
+            // When using Kestrel, the server may start to listen on a pre-configured port,
+            // which can differ from the one configured via ClientOptions.
+            // Hence, if the ClientOptions haven't been set explicitly to a custom value, we will assume that
+            // the user wants the client to communicate on a port that the server listens too, and because that port may be different, we overwrite it here.
+            client.BaseAddress = ClientOptions.BaseAddress;
+        }
+
+        return client;
+    }
 
     /// <summary>
     /// Creates an instance of <see cref="HttpClient"/> that automatically follows
@@ -476,12 +658,24 @@ public HttpClient CreateClient(WebApplicationFactoryClientOptions options) =>
     /// <returns>The <see cref="HttpClient"/>.</returns>
     public HttpClient CreateDefaultClient(params DelegatingHandler[] handlers)
     {
-        EnsureServer();
+        StartServer();
 
         HttpClient client;
         if (handlers == null || handlers.Length == 0)
         {
-            client = _server.CreateClient();
+            if (_useKestrel)
+            {
+                client = new HttpClient();
+            }
+            else
+            {
+                if (_server is null)
+                {
+                    throw new InvalidOperationException(Resources.ServerNotInitialized);
+                }
+
+                client = _server.CreateClient();
+            }
         }
         else
         {
@@ -490,7 +684,7 @@ public HttpClient CreateDefaultClient(params DelegatingHandler[] handlers)
                 handlers[i - 1].InnerHandler = handlers[i];
             }
 
-            var serverHandler = _server.CreateHandler();
+            var serverHandler = CreateHandler();
             handlers[^1].InnerHandler = serverHandler;
 
             client = new HttpClient(handlers[0]);
@@ -503,6 +697,21 @@ public HttpClient CreateDefaultClient(params DelegatingHandler[] handlers)
         return client;
     }
 
+    private HttpMessageHandler CreateHandler()
+    {
+        if (_useKestrel)
+        {
+            return new HttpClientHandler();
+        }
+
+        if (_server is null)
+        {
+            throw new InvalidOperationException(Resources.ServerNotInitialized);
+        }
+
+        return _server.CreateHandler();
+    }
+
     /// <summary>
     /// Configures <see cref="HttpClient"/> instances created by this <see cref="WebApplicationFactory{TEntryPoint}"/>.
     /// </summary>
@@ -511,7 +720,19 @@ protected virtual void ConfigureClient(HttpClient client)
     {
         ArgumentNullException.ThrowIfNull(client);
 
-        client.BaseAddress = new Uri("http://localhost");
+        if (_useKestrel)
+        {
+            if (_webHost is null && _host is null)
+            {
+                throw new InvalidOperationException(Resources.ServerNotInitialized);
+            }
+
+            client.BaseAddress = _webHostAddress;
+        }
+        else
+        {
+            client.BaseAddress = new Uri("http://localhost");
+        }
     }
 
     /// <summary>
@@ -607,6 +828,7 @@ public virtual async ValueTask DisposeAsync()
     private sealed class DelegatedWebApplicationFactory : WebApplicationFactory<TEntryPoint>
     {
         private readonly Func<IWebHostBuilder, TestServer> _createServer;
+        private readonly Func<IServiceProvider, TestServer> _createServerFromServiceProvider;
         private readonly Func<IHostBuilder, IHost> _createHost;
         private readonly Func<IWebHostBuilder?> _createWebHostBuilder;
         private readonly Func<IHostBuilder?> _createHostBuilder;
@@ -616,6 +838,7 @@ private sealed class DelegatedWebApplicationFactory : WebApplicationFactory<TEnt
         public DelegatedWebApplicationFactory(
             WebApplicationFactoryClientOptions options,
             Func<IWebHostBuilder, TestServer> createServer,
+            Func<IServiceProvider, TestServer> createServerFromServiceProvider,
             Func<IHostBuilder, IHost> createHost,
             Func<IWebHostBuilder?> createWebHostBuilder,
             Func<IHostBuilder?> createHostBuilder,
@@ -625,6 +848,7 @@ public DelegatedWebApplicationFactory(
         {
             ClientOptions = new WebApplicationFactoryClientOptions(options);
             _createServer = createServer;
+            _createServerFromServiceProvider = createServerFromServiceProvider;
             _createHost = createHost;
             _createWebHostBuilder = createWebHostBuilder;
             _createHostBuilder = createHostBuilder;
@@ -633,8 +857,11 @@ public DelegatedWebApplicationFactory(
             _configuration = configureWebHost;
         }
 
+        [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)]
         protected override TestServer CreateServer(IWebHostBuilder builder) => _createServer(builder);
 
+        protected override TestServer CreateServer(IServiceProvider serviceProvider) => _createServerFromServiceProvider(serviceProvider);
+
         protected override IHost CreateHost(IHostBuilder builder) => _createHost(builder);
 
         protected override IWebHostBuilder? CreateWebHostBuilder() => _createWebHostBuilder();
@@ -652,6 +879,7 @@ internal override WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Acti
             return new DelegatedWebApplicationFactory(
                 ClientOptions,
                 _createServer,
+                _createServerFromServiceProvider,
                 _createHost,
                 _createWebHostBuilder,
                 _createHostBuilder,
diff --git a/src/Mvc/Mvc.Testing/src/WebApplicationFactoryClientOptions.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactoryClientOptions.cs
index 177bb8ef5b89..4d394cbba8d9 100644
--- a/src/Mvc/Mvc.Testing/src/WebApplicationFactoryClientOptions.cs
+++ b/src/Mvc/Mvc.Testing/src/WebApplicationFactoryClientOptions.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Linq;
@@ -14,6 +14,8 @@ namespace Microsoft.AspNetCore.Mvc.Testing;
 /// </summary>
 public class WebApplicationFactoryClientOptions
 {
+    internal static readonly Uri DefaultBaseAddres = new Uri("http://localhost");
+
     /// <summary>
     /// Initializes a new instance of <see cref="WebApplicationFactoryClientOptions"/>.
     /// </summary>
@@ -35,7 +37,7 @@ internal WebApplicationFactoryClientOptions(WebApplicationFactoryClientOptions c
     /// <see cref="WebApplicationFactory{TEntryPoint}.CreateClient(WebApplicationFactoryClientOptions)"/>.
     /// The default is <c>http://localhost</c>.
     /// </summary>
-    public Uri BaseAddress { get; set; } = new Uri("http://localhost");
+    public Uri BaseAddress { get; set; } = DefaultBaseAddres;
 
     /// <summary>
     /// Gets or sets whether or not <see cref="HttpClient"/> instances created by calling
diff --git a/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets
index 77f1bd087290..7a67a26f5c9c 100644
--- a/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets
+++ b/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="..\..\build\net9.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
+  <Import Project="..\..\build\net10.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
 </Project>
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs
index 2da398ae0e8f..20e78949b675 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs
@@ -83,11 +83,7 @@ public void OnResourceExecuted(ResourceExecutedContext context)
         // not be available.
         if (!context.HttpContext.Response.HasStarted && context.Exception != null)
         {
-            var saveTempDataContext = GetTempDataContext(context.HttpContext);
-            if (saveTempDataContext != null)
-            {
-                saveTempDataContext.RequestHasUnhandledException = true;
-            }
+            GetTempDataContext(context.HttpContext)?.RequestHasUnhandledException = true;
         }
     }
 
@@ -105,12 +101,7 @@ public void OnResultExecuted(ResultExecutedContext context)
         if (!context.HttpContext.Response.HasStarted)
         {
             SaveTempData(context.Result, _factory, context.Filters, context.HttpContext);
-
-            var saveTempDataContext = GetTempDataContext(context.HttpContext);
-            if (saveTempDataContext != null)
-            {
-                saveTempDataContext.TempDataSaved = true;
-            }
+            GetTempDataContext(context.HttpContext)?.TempDataSaved = true;
         }
     }
 
diff --git a/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs
index c1ac26b46742..f04f8895bd9a 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs
@@ -25,8 +25,7 @@ public HtmlAttributePropertyHelper(PropertyHelper propertyHelper)
     /// <summary>
     /// Part of <see cref="MetadataUpdateHandlerAttribute"/> contract.
     /// </summary>
-    /// <param name="_"></param>
-    public static void UpdateCache(Type _)
+    public static void ClearCache(Type[] _)
     {
         ReflectionCache.Clear();
     }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Shipped.txt b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Shipped.txt
index bc4f78524a2e..b8dedc85b2e6 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Shipped.txt
+++ b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Shipped.txt
@@ -352,6 +352,7 @@
 ~Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataInfo.ViewDataInfo(object container, System.Reflection.PropertyInfo propertyInfo, System.Func<object> valueAccessor) -> void
 ~override Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultValidationHtmlAttributeProvider.AddValidationAttributes(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer modelExplorer, System.Collections.Generic.IDictionary<string, string> attributes) -> void
 ~override Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper<TModel>.Contextualize(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) -> void
+~static Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilderResourceCollectionExtensions.WithStaticAssets(this Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder builder, string manifestPath = null) -> Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder
 ~static Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionaryExtensions.AddModelError<TModel>(this Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, System.Linq.Expressions.Expression<System.Func<TModel, object>> expression, string errorMessage) -> void
 ~static Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionaryExtensions.AddModelError<TModel>(this Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, System.Linq.Expressions.Expression<System.Func<TModel, object>> expression, System.Exception exception, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata) -> void
 ~static Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionaryExtensions.Remove<TModel>(this Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, System.Linq.Expressions.Expression<System.Func<TModel, object>> expression) -> bool
@@ -595,6 +596,7 @@
 ~virtual Microsoft.AspNetCore.Mvc.ViewFeatures.SessionStateTempDataProvider.SaveTempData(Microsoft.AspNetCore.Http.HttpContext context, System.Collections.Generic.IDictionary<string, object> values) -> void
 ~virtual Microsoft.AspNetCore.Mvc.ViewFeatures.ValidationHtmlAttributeProvider.AddAndTrackValidationAttributes(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer modelExplorer, string expression, System.Collections.Generic.IDictionary<string, string> attributes) -> void
 abstract Microsoft.AspNetCore.Mvc.RemoteAttributeBase.GetUrl(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext! context) -> string!
+Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilderResourceCollectionExtensions
 Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute
 Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute.AutoValidateAntiforgeryTokenAttribute() -> void
 Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute.CreateInstance(System.IServiceProvider! serviceProvider) -> Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata!
diff --git a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
index db29399a5c9e..7dc5c58110bf 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilderResourceCollectionExtensions
-~static Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilderResourceCollectionExtensions.WithStaticAssets(this Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder builder, string manifestPath = null) -> Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder
diff --git a/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs
index c0abec8fa222..ebf3a237b96f 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs
@@ -23,11 +23,7 @@ public void OnResourceExecuting(ResourceExecutingContext context)
     {
         ArgumentNullException.ThrowIfNull(context);
 
-        var statusCodeFeature = context.HttpContext.Features.Get<IStatusCodePagesFeature>();
-        if (statusCodeFeature != null)
-        {
-            // Turn off the StatusCodePages feature.
-            statusCodeFeature.Enabled = false;
-        }
+        // Turn off the StatusCodePages feature.
+        context.HttpContext.Features.Get<IStatusCodePagesFeature>()?.Enabled = false;
     }
 }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentFactory.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentFactory.cs
index 204fbcdd693c..aaa09325f86d 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentFactory.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/ViewComponents/IViewComponentFactory.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents;
 public interface IViewComponentFactory
 {
     /// <summary>
-    /// Creates a new controller for the specified <paramref name="context"/>.
+    /// Creates a new view component for the specified <paramref name="context"/>.
     /// </summary>
     /// <param name="context"><see cref="ViewComponentContext"/> for the view component.</param>
     /// <returns>The view component.</returns>
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Builder/ControllerActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Builder/ControllerActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs
index 84806020d64f..e582790f470d 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Builder/ControllerActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Builder/ControllerActionEndpointConventionBuilderResourceCollectionExtensionsTest.cs
@@ -41,7 +41,7 @@ public void WithStaticAssets_AddsEmptyResourceCollection_ToEndpoints_NoStaticAss
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(0, list.Count);
+                Assert.Empty(list);
             }
         });
     }
@@ -71,7 +71,7 @@ public void WithStaticAssets_AddsEmptyResourceCollection_ToEndpoints_NoMatchingS
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(0, list.Count);
+                Assert.Empty(list);
             }
         });
     }
@@ -102,7 +102,7 @@ public void WithStaticAssets_AddsResourceCollection_ToEndpoints_NamedManifest()
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(1, list.Count);
+                Assert.Single(list);
                 Assert.Equal("named.css", list[0].Url);
             }
         });
@@ -133,7 +133,7 @@ public void WithStaticAssets_AddsResourceCollection_ToEndpoints_DefaultManifest(
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(1, list.Count);
+                Assert.Single(list);
                 Assert.Equal("default.css", list[0].Url);
             }
         });
@@ -165,7 +165,7 @@ public void WithStaticAssets_AddsDefaultResourceCollectionToEndpoints_WhenNoMani
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(1, list.Count);
+                Assert.Single(list);
                 Assert.Equal("default.css", list[0].Url);
             }
         });
@@ -197,7 +197,7 @@ public void WithStaticAssets_AddsMatchingResourceCollectionToEndpoints_WhenExpli
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(1, list.Count);
+                Assert.Single(list);
                 Assert.Equal("named.css", list[0].Url);
             }
         });
@@ -232,7 +232,7 @@ public void WithStaticAssets_AddsCollectionFromGroup_WhenMappedInsideAnEndpointG
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(1, list.Count);
+                Assert.Single(list);
                 Assert.Equal("named.css", list[0].Url);
             }
         });
@@ -267,7 +267,7 @@ public void WithStaticAssets_AddsEmptyCollectionFromGroup_WhenMappingNotFound_In
                 var metadata = e.Metadata.GetMetadata<ResourceAssetCollection>();
                 Assert.NotNull(metadata);
                 var list = Assert.IsAssignableFrom<IReadOnlyList<ResourceAsset>>(metadata);
-                Assert.Equal(0, list.Count);
+                Assert.Empty(list);
             }
         });
     }
diff --git a/src/Mvc/Mvc.ViewFeatures/test/CookieTempDataProviderTest.cs b/src/Mvc/Mvc.ViewFeatures/test/CookieTempDataProviderTest.cs
index b7b3e8d95612..37c8475f28ea 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/CookieTempDataProviderTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/CookieTempDataProviderTest.cs
@@ -284,8 +284,8 @@ public void SaveTempData_RemovesCookie_WhenNoDataToSave()
         Assert.Single(responseCookies);
         var cookie = responseCookies.Single();
         Assert.NotNull(cookie);
-        Assert.Equal(CookieTempDataProvider.CookieName, cookie.Name);
-        Assert.Equal(string.Empty, cookie.Value);
+        Assert.Equal(CookieTempDataProvider.CookieName, cookie.Name.AsSpan());
+        Assert.Equal(string.Empty, cookie.Value.AsSpan());
         Assert.NotNull(cookie.Expires);
         Assert.True(cookie.Expires.Value < DateTimeOffset.Now); // expired cookie
     }
diff --git a/src/Mvc/Mvc.ViewFeatures/test/ExpressionHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ExpressionHelperTest.cs
index 23df14fa57ca..f15c63d0737b 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/ExpressionHelperTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/ExpressionHelperTest.cs
@@ -10,7 +10,7 @@ public class ExpressionHelperTest
 {
     private readonly ConcurrentDictionary<LambdaExpression, string> _expressionTextCache = new ConcurrentDictionary<LambdaExpression, string>(LambdaExpressionComparer.Instance);
 
-    public static TheoryData<Expression, string> ExpressionAndTexts
+    public static TheoryData<LambdaExpression, string> ExpressionAndTexts
     {
         get
         {
@@ -22,7 +22,7 @@ public static TheoryData<Expression, string> ExpressionAndTexts
             var modelTest = new TestModel();
             var modelType = typeof(TestModel);
 
-            var data = new TheoryData<Expression, string>
+            var data = new TheoryData<LambdaExpression, string>
                 {
                     {
                         (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
@@ -178,14 +178,14 @@ public static TheoryData<Expression, string> ExpressionAndTexts
         }
     }
 
-    public static TheoryData<Expression> CachedExpressions
+    public static TheoryData<LambdaExpression> CachedExpressions
     {
         get
         {
             var key = "TestModel";
             var myModel = new TestModel();
 
-            return new TheoryData<Expression>
+            return new TheoryData<LambdaExpression>
                 {
                     (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
                     (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName),
@@ -198,7 +198,7 @@ public static TheoryData<Expression> CachedExpressions
         }
     }
 
-    public static TheoryData<Expression> IndexerExpressions
+    public static TheoryData<LambdaExpression> IndexerExpressions
     {
         get
         {
@@ -206,7 +206,7 @@ public static TheoryData<Expression> IndexerExpressions
             var key = "TestModel";
             var myModels = new List<TestModel>();
 
-            return new TheoryData<Expression>
+            return new TheoryData<LambdaExpression>
                 {
                     (Expression<Func<IList<TestModel>, Category>>)(model => model[2].SelectedCategory),
                     (Expression<Func<IList<TestModel>, Category>>)(model => myModels[i].SelectedCategory),
@@ -217,14 +217,14 @@ public static TheoryData<Expression> IndexerExpressions
         }
     }
 
-    public static TheoryData<Expression> UnsupportedExpressions
+    public static TheoryData<LambdaExpression> UnsupportedExpressions
     {
         get
         {
             var i = 2;
             var j = 3;
 
-            return new TheoryData<Expression>
+            return new TheoryData<LambdaExpression>
                 {
                     // Indexers that have multiple arguments.
                     (Expression<Func<TestModel[][], string>>)(model => model[23][3].Name),
@@ -239,14 +239,14 @@ public static TheoryData<Expression> UnsupportedExpressions
         }
     }
 
-    public static TheoryData<Expression, Expression> EquivalentExpressions
+    public static TheoryData<LambdaExpression, LambdaExpression> EquivalentExpressions
     {
         get
         {
             var value = "Test";
             var Model = "Test";
 
-            return new TheoryData<Expression, Expression>
+            return new TheoryData<LambdaExpression, LambdaExpression>
                 {
                     {
                         (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
@@ -283,7 +283,7 @@ public static TheoryData<Expression, Expression> EquivalentExpressions
         }
     }
 
-    public static TheoryData<Expression, Expression> NonEquivalentExpressions
+    public static TheoryData<LambdaExpression, LambdaExpression> NonEquivalentExpressions
     {
         get
         {
@@ -292,7 +292,7 @@ public static TheoryData<Expression, Expression> NonEquivalentExpressions
             var Model = "Test";
             var myModel = new TestModel();
 
-            return new TheoryData<Expression, Expression>
+            return new TheoryData<LambdaExpression, LambdaExpression>
                 {
                     {
                         (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperHiddenTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperHiddenTest.cs
index 1d533a3e0d1b..2346814db4ef 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperHiddenTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperHiddenTest.cs
@@ -758,7 +758,7 @@ public void HiddenFor_GeneratesUnobtrusiveValidationAttributes()
         Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
     }
 
-    public static TheoryData HiddenFor_UsesPropertyValueIfModelStateDoesNotContainValueData
+    public static TheoryData<Expression<Func<HiddenModel, string>>, string> HiddenFor_UsesPropertyValueIfModelStateDoesNotContainValueData
     {
         get
         {
@@ -819,7 +819,7 @@ public void HiddenFor_UsesPropertyValueIfModelStateDoesNotContainValue(
         Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
     }
 
-    public static TheoryData HiddenFor_UsesModelStateValueForComplexExpressionsData
+    public static TheoryData<Expression<Func<HiddenModel, string>>, string> HiddenFor_UsesModelStateValueForComplexExpressionsData
     {
         get
         {
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperNameExtensionsTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperNameExtensionsTest.cs
index c42c961ff620..067593551b44 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperNameExtensionsTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperNameExtensionsTest.cs
@@ -245,7 +245,7 @@ public void IdForAndNameFor_ReturnEmpty_IfExpressionUnsupported()
     }
 
     // expression, expected name, expected id
-    public static TheoryData StaticExpressionNamesData
+    public static TheoryData<Expression<Func<List<OuterClass>, string>>, string, string> StaticExpressionNamesData
     {
         get
         {
@@ -256,7 +256,7 @@ public static TheoryData StaticExpressionNamesData
     }
 
     // expression, expected name, expected id
-    private TheoryData ExpressionNamesData
+    private TheoryData<Expression<Func<List<OuterClass>, string>>, string, string> ExpressionNamesData
     {
         get
         {
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs
index d88a30889a9a..caa11d372f06 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperPasswordTest.cs
@@ -44,8 +44,8 @@ public static TheoryData<ViewDataDictionary<PasswordModel>, object> PasswordWith
             var data = new TheoryData<ViewDataDictionary<PasswordModel>, object>();
             foreach (var items in HtmlAttributeData)
             {
-                data.Add(viewData, items[0]);
-                data.Add(nullModelViewData, items[0]);
+                data.Add(viewData, items);
+                data.Add(nullModelViewData, items);
             }
 
             return data;
@@ -320,7 +320,7 @@ public void PasswordFor_GeneratesUnobtrusiveValidationAttributes()
         Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
     }
 
-    public static TheoryData PasswordFor_WithComplexExpressionsData
+    public static TheoryData<Expression<Func<PasswordModel, string>>, string> PasswordFor_WithComplexExpressionsData
     {
         get
         {
@@ -468,7 +468,7 @@ private static ViewDataDictionary<PasswordModel> GetViewDataWithErrors()
         return viewData;
     }
 
-    public static TheoryData PasswordFor_IgnoresExpressionValueForComplexExpressionsData
+    public static TheoryData<Expression<Func<PasswordModel, string>>, string> PasswordFor_IgnoresExpressionValueForComplexExpressionsData
     {
         get
         {
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaTest.cs
index e181e2828298..91165d3a2a21 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextAreaTest.cs
@@ -38,7 +38,7 @@ public void TextAreaFor_DoesNotGeneratePlaceholderAttribute_WhenNoPlaceholderPre
         Assert.DoesNotContain(@"placeholder=""HtmlEncode[[placeholder]]""", result, StringComparison.Ordinal);
     }
 
-    public static TheoryData TextAreaFor_UsesModelValueForComplexExpressionsData
+    public static TheoryData<Expression<Func<ComplexModel, string>>, string> TextAreaFor_UsesModelValueForComplexExpressionsData
     {
         get
         {
@@ -85,7 +85,7 @@ public void TextAreaFor_ComplexExpressions_UsesModelValueForComplexExpressions(
         Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
     }
 
-    public static TheoryData TextAreaFor_UsesModelStateValueForComplexExpressionsData
+    public static TheoryData<Expression<Func<ComplexModel, string>>, string> TextAreaFor_UsesModelStateValueForComplexExpressionsData
     {
         get
         {
diff --git a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxTest.cs b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxTest.cs
index 75c1e3ebfb4a..9fb2273cc291 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/Rendering/HtmlHelperTextBoxTest.cs
@@ -56,7 +56,7 @@ public void TextBoxFor_DoesNotGeneratePlaceholderAttribute_WhenDisplayAttributeP
         Assert.DoesNotContain(@"placeholder=""HtmlEncode[[placeholder]]""", result, StringComparison.Ordinal);
     }
 
-    public static TheoryData TextBoxFor_UsesModelValueForComplexExpressionsData
+    public static TheoryData<Expression<Func<ComplexModel, string>>, string> TextBoxFor_UsesModelValueForComplexExpressionsData
     {
         get
         {
@@ -103,7 +103,7 @@ public void TextBoxFor_ComplexExpressions_UsesModelValueForComplexExpressions(
         Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
     }
 
-    public static TheoryData TextBoxFor_UsesModelStateValueForComplexExpressionsData
+    public static TheoryData<Expression<Func<ComplexModel, string>>, string> TextBoxFor_UsesModelStateValueForComplexExpressionsData
     {
         get
         {
diff --git a/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentHelperTest.cs b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentHelperTest.cs
index ffbe5c5f45b2..09dccb1b22c4 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentHelperTest.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/ViewComponents/DefaultViewComponentHelperTest.cs
@@ -22,7 +22,7 @@ public void GetArgumentDictionary_SupportsNullArguments()
         var argumentDictionary = DefaultViewComponentHelper.GetArgumentDictionary(descriptor, null);
 
         // Assert
-        Assert.Equal(0, argumentDictionary.Count);
+        Assert.Empty(argumentDictionary);
         Assert.IsType<Dictionary<string, object>>(argumentDictionary);
     }
 
diff --git a/src/Mvc/Mvc.slnf b/src/Mvc/Mvc.slnf
index 61da89ec072d..9c0b6b890334 100644
--- a/src/Mvc/Mvc.slnf
+++ b/src/Mvc/Mvc.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
@@ -28,7 +28,7 @@
       "src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
       "src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
       "src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
-      "src\\Http\\Http.Extensions\\gen\\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj",
+      "src\\Http\\Http.Extensions\\gen\\Microsoft.AspNetCore.Http.RequestDelegateGenerator\\Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj",
       "src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
       "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
       "src\\Http\\Http.Results\\src\\Microsoft.AspNetCore.Http.Results.csproj",
@@ -152,4 +152,4 @@
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Mvc/Mvc/test/MvcServiceCollectionExtensionsTest.cs b/src/Mvc/Mvc/test/MvcServiceCollectionExtensionsTest.cs
index 757c411c6f3e..174ca9619aa0 100644
--- a/src/Mvc/Mvc/test/MvcServiceCollectionExtensionsTest.cs
+++ b/src/Mvc/Mvc/test/MvcServiceCollectionExtensionsTest.cs
@@ -254,7 +254,7 @@ public void AddControllersWithViews_AddsDocumentedServices()
         Assert.Contains(services, s => s.ServiceType == typeof(CacheTagHelperMemoryCacheFactory));
 
         // No Razor Pages
-        Assert.Empty(services.Where(s => s.ServiceType == typeof(IActionInvokerProvider) && s.ImplementationType == typeof(PageActionInvokerProvider)));
+        Assert.DoesNotContain(services, s => s.ServiceType == typeof(IActionInvokerProvider) && s.ImplementationType == typeof(PageActionInvokerProvider));
     }
 
     private void VerifyAllServices(IServiceCollection services)
@@ -639,9 +639,7 @@ private void AssertContainsSingle(
 
         if (matches.Length == 0)
         {
-            Assert.True(
-                false,
-                $"Could not find an instance of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Could not find an instance of {implementationType} registered as {serviceType}");
         }
         else if (matches.Length > 1)
         {
@@ -664,9 +662,7 @@ private void AssertContainsSingle(
                 }
             }
 
-            Assert.True(
-                false,
-                $"Found multiple instances of {implementationType} registered as {serviceType}");
+            Assert.Fail($"Found multiple instances of {implementationType} registered as {serviceType}");
         }
     }
 
diff --git a/src/Mvc/MvcNoDeps.slnf b/src/Mvc/MvcNoDeps.slnf
index 5bcf63dd8a47..f648ea97ecb5 100644
--- a/src/Mvc/MvcNoDeps.slnf
+++ b/src/Mvc/MvcNoDeps.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Mvc\\Mvc.Abstractions\\src\\Microsoft.AspNetCore.Mvc.Abstractions.csproj",
       "src\\Mvc\\Mvc.Abstractions\\test\\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj",
diff --git a/src/Mvc/build/package-lock.json b/src/Mvc/build/package-lock.json
index e876d6510dc8..b6a3602d452c 100644
--- a/src/Mvc/build/package-lock.json
+++ b/src/Mvc/build/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "jquery-validation-dependency",
+  "name": "@microsoft/jquery-validation-dependency",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "jquery-validation-dependency",
+      "name": "@microsoft/jquery-validation-dependency",
       "version": "1.0.0",
       "devDependencies": {
         "jquery-validation": "1.20.0"
diff --git a/src/Mvc/build/package.json b/src/Mvc/build/package.json
index 9676c2415364..3367086617fd 100644
--- a/src/Mvc/build/package.json
+++ b/src/Mvc/build/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "jquery-validation-dependency",
+  "name": "@microsoft/jquery-validation-dependency",
   "version": "1.0.0",
   "private": true,
   "scripts": {
diff --git a/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs
index b1db2fa974fd..610267f8b813 100644
--- a/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs
+++ b/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -229,25 +230,29 @@ private void DropDatabaseTables(IServiceProvider services)
 
         public static void Main(string[] args)
         {
-            var host = CreateWebHostBuilder(args)
+            using var host = CreateHost(args)
                 .Build();
 
             host.Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+        public static IHostBuilder CreateHost(string[] args)
         {
             var configuration = new ConfigurationBuilder()
                 .AddEnvironmentVariables()
                 .AddCommandLine(args)
                 .Build();
 
-            return new WebHostBuilder()
-                .UseKestrel()
-                .UseUrls("http://+:5000")
-                .UseConfiguration(configuration)
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseStartup<Startup>();
+            return new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseUrls("http://+:5000")
+                        .UseConfiguration(configuration)
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseStartup<Startup>();
+                });
         }
     }
 }
diff --git a/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs
index cf4914be126c..131072630160 100644
--- a/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs
+++ b/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs
@@ -8,6 +8,7 @@
 #endif
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -191,26 +192,30 @@ private void DropDatabaseTables(IServiceProvider services)
 
         public static void Main(string[] args)
         {
-            var host = CreateWebHostBuilder(args)
+            using var host = CreateHost(args)
                 .Build();
 
             host.Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+        public static IHostBuilder CreateHost(string[] args)
         {
             var configuration = new ConfigurationBuilder()
                 .AddEnvironmentVariables()
                 .AddCommandLine(args)
                 .Build();
 
-            return new WebHostBuilder()
-                .UseKestrel()
-                .UseUrls("http://+:5000")
-                .UseConfiguration(configuration)
-                .UseIISIntegration()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseStartup<Startup>();
+            return new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseUrls("http://+:5000")
+                        .UseConfiguration(configuration)
+                        .UseIISIntegration()
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseStartup<Startup>();
+                });
         }
     }
 }
diff --git a/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs
index c332e9f2a8be..cc36aeaf08bb 100644
--- a/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs
+++ b/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs
@@ -4,6 +4,7 @@
 using Data;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Html;
@@ -60,24 +61,28 @@ private static List<DataB> GenerateDataB()
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHost(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+    public static IHostBuilder CreateHost(string[] args)
     {
         var configuration = new ConfigurationBuilder()
             .AddEnvironmentVariables()
             .AddCommandLine(args)
             .Build();
 
-        return new WebHostBuilder()
-            .UseKestrel()
-            .UseUrls("http://+:5000")
-            .UseConfiguration(configuration)
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>();
+        return new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseUrls("http://+:5000")
+                    .UseConfiguration(configuration)
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>();
+            });
     }
 }
diff --git a/src/Mvc/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs
index 2708a0c0b47c..95b307f30108 100644
--- a/src/Mvc/samples/MvcSandbox/Startup.cs
+++ b/src/Mvc/samples/MvcSandbox/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace MvcSandbox;
 
 public class Startup
@@ -42,22 +44,26 @@ static void ConfigureEndpoints(IEndpointRouteBuilder endpoints)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .ConfigureLogging(factory =>
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                factory
-                    .AddConsole()
-                    .AddDebug();
-            })
-            .UseKestrel()
-            .UseStartup<Startup>();
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .ConfigureLogging(factory =>
+                    {
+                        factory
+                            .AddConsole()
+                            .AddDebug();
+                    })
+                    .UseKestrel()
+                    .UseStartup<Startup>();
+            });
 }
 
diff --git a/src/Mvc/shared/Mvc.Core.TestCommon/MediaTypeAssert.cs b/src/Mvc/shared/Mvc.Core.TestCommon/MediaTypeAssert.cs
index c65dd96fb605..d69dc5df5c99 100644
--- a/src/Mvc/shared/Mvc.Core.TestCommon/MediaTypeAssert.cs
+++ b/src/Mvc/shared/Mvc.Core.TestCommon/MediaTypeAssert.cs
@@ -32,14 +32,14 @@ public static void Equal(StringSegment left, StringSegment right)
         }
         else if (!left.HasValue || !right.HasValue)
         {
-            throw new EqualException(left.ToString(), right.ToString());
+            throw EqualException.ForMismatchedValues(left.ToString(), right.ToString());
         }
 
         if (!MediaTypeHeaderValue.TryParse(left.Value, out var leftMediaType) ||
             !MediaTypeHeaderValue.TryParse(right.Value, out var rightMediaType) ||
             !leftMediaType.Equals(rightMediaType))
         {
-            throw new EqualException(left.ToString(), right.ToString());
+            throw EqualException.ForMismatchedValues(left.ToString(), right.ToString());
         }
     }
 }
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
index 71d1ab1cc1ee..3386a5aabb6d 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
@@ -11,6 +11,11 @@
 using Microsoft.Extensions.Logging;
 using System.Reflection;
 using Xunit.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
 
@@ -1561,10 +1566,30 @@ public async Task ApiExplorer_LogsInvokedDescriptionProvidersOnStartup()
         // Assert
         Assert.Contains(TestSink.Writes, w => w.EventId.Name?.Equals("ApiDescriptionProviderExecuting", StringComparison.Ordinal) == true);
         Assert.Contains(TestSink.Writes, w => w.LoggerName.Equals("Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider", StringComparison.Ordinal));
-        Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'DefaultApiDescriptionProvider' from assembly Microsoft.AspNetCore.Mvc.ApiExplorer v9.0.0.0.", StringComparison.Ordinal));
+        Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'DefaultApiDescriptionProvider' from assembly Microsoft.AspNetCore.Mvc.ApiExplorer v10.0.0.0.", StringComparison.Ordinal));
         Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'JsonPatchOperationsArrayProvider' from assembly Microsoft.AspNetCore.Mvc.NewtonsoftJson v42.42.42.42.", StringComparison.Ordinal));
     }
 
+    [Fact]
+    public void ApiExplorer_BuildsMetadataForActionWithTypedResult()
+    {
+        var apiDescCollectionProvider = Factory.Server.Services.GetService<IApiDescriptionGroupCollectionProvider>();
+        var testGroupName = nameof(ApiExplorerWithTypedResultController).Replace("Controller", string.Empty);
+        var group = apiDescCollectionProvider.ApiDescriptionGroups.Items.Where(i => i.GroupName == testGroupName).SingleOrDefault();
+        Assert.NotNull(group);
+        var apiDescription = Assert.Single<ApiDescription>(group.Items);
+
+        var responseType = Assert.Single(apiDescription.SupportedResponseTypes);
+        Assert.Equal(StatusCodes.Status200OK, responseType.StatusCode);
+        Assert.Equal(typeof(Product), responseType.Type);
+
+        Assert.NotNull(apiDescription.ActionDescriptor.EndpointMetadata);
+        var producesResponseTypeMetadata = apiDescription.ActionDescriptor.EndpointMetadata.OfType<ProducesResponseTypeMetadata>().SingleOrDefault();
+        Assert.NotNull(producesResponseTypeMetadata);
+        Assert.Equal(StatusCodes.Status200OK, producesResponseTypeMetadata.StatusCode);
+        Assert.Equal(typeof(Product), producesResponseTypeMetadata.Type);
+    }
+
     private IEnumerable<string> GetSortedMediaTypes(ApiExplorerResponseType apiResponseType)
     {
         return apiResponseType.ResponseFormats
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ControllerEndpointFiltersTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ControllerEndpointFiltersTest.cs
index 7821ed967ef4..551319c41acb 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ControllerEndpointFiltersTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ControllerEndpointFiltersTest.cs
@@ -47,6 +47,7 @@ public async Task CanApplyEndpointFilterToController()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60109")]
     public async Task CanCaptureMethodInfoFromControllerAction()
     {
         using var client = Factory.CreateClient();
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs
index fd6c9f793e0a..87747166f36d 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs
@@ -50,7 +50,9 @@ public async Task CompilationFailuresAreListedByErrorPageMiddleware()
     {
         // Arrange
         var factory = Factory.WithWebHostBuilder(b => b.UseStartup<ErrorPageMiddlewareWebSite.Startup>());
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         factory = factory.WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure<MvcRazorRuntimeCompilationOptions>(ConfigureRuntimeCompilationOptions)));
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
 
         var client = factory.CreateDefaultClient();
         client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/html"));
@@ -70,6 +72,7 @@ public async Task CompilationFailuresAreListedByErrorPageMiddleware()
         Assert.Contains(expected, content);
         Assert.DoesNotContain(PreserveCompilationContextMessage, content);
 
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options)
         {
             options.AdditionalReferencePaths.Add(typeof(string).Assembly.Location);
@@ -81,6 +84,7 @@ static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions
                 options.AdditionalReferencePaths.Add(path);
             }
         }
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
     }
 
     [Fact]
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
index fbf1e5a65aad..d58d130758f0 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
@@ -49,28 +49,6 @@ public static async Task<HttpResponseMessage> AssertStatusCodeAsync(this HttpRes
             // No-op
         }
 
-        throw new StatusCodeMismatchException
-        {
-            ExpectedStatusCode = expectedStatusCode,
-            ActualStatusCode = response.StatusCode,
-            ResponseContent = responseContent,
-        };
-    }
-
-    private class StatusCodeMismatchException : XunitException
-    {
-        public HttpStatusCode ExpectedStatusCode { get; set; }
-
-        public HttpStatusCode ActualStatusCode { get; set; }
-
-        public string ResponseContent { get; set; }
-
-        public override string Message
-        {
-            get
-            {
-                return $"Expected status code {ExpectedStatusCode}. Actual {ActualStatusCode}. Response Content:" + Environment.NewLine + ResponseContent;
-            }
-        }
+        throw EqualException.ForMismatchedValues(expectedStatusCode, response.StatusCode, $"Expected status code {expectedStatusCode}. Actual {response.StatusCode}. Response Content:" + Environment.NewLine + responseContent);
     }
 }
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
index 5f9a0054bf4e..2c575743e210 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
@@ -3,10 +3,9 @@
 
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.WebEncoders.Testing;
-using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
 
@@ -20,9 +19,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         base.ConfigureWebHost(builder);
         builder.ConfigureServices(services =>
         {
-            services.TryAddTransient<HtmlEncoder, HtmlTestEncoder>();
-            services.TryAddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
-            services.TryAddTransient<UrlEncoder, UrlTestEncoder>();
+            services.AddTransient<HtmlEncoder, HtmlTestEncoder>();
+            services.AddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
+            services.AddTransient<UrlEncoder, UrlTestEncoder>();
         });
     }
 }
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
index 45c33dad7268..825adc8e1d20 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
@@ -42,7 +42,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 });
     }
 
+#pragma warning disable CS0672 // Member overrides obsolete member
     protected override TestServer CreateServer(IWebHostBuilder builder)
+#pragma warning restore CS0672 // Member overrides obsolete member
     {
         var originalCulture = CultureInfo.CurrentCulture;
         var originalUICulture = CultureInfo.CurrentUICulture;
@@ -50,7 +52,9 @@ protected override TestServer CreateServer(IWebHostBuilder builder)
         {
             CultureInfo.CurrentCulture = new CultureInfo("en-GB");
             CultureInfo.CurrentUICulture = new CultureInfo("en-US");
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
             return base.CreateServer(builder);
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
         }
         finally
         {
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
index 0bf985fbdd76..a2df4f319f62 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
@@ -75,13 +75,13 @@ public static Stream GetResourceStream(Assembly assembly, string resourceName, b
                 if (sourceFile)
                 {
                     // Even when generating baselines, a missing source file is a serious problem.
-                    Assert.True(false, $"Manifest resource: { fullName } not found.");
+                    Assert.Fail($"Manifest resource: { fullName } not found.");
                 }
             }
             else
             {
                 // When not generating baselines, a missing source or output file is always an error.
-                Assert.True(false, $"Manifest resource '{ fullName }' not found.");
+                Assert.Fail($"Manifest resource '{ fullName }' not found.");
             }
 
             return null;
diff --git a/src/Mvc/test/Mvc.FunctionalTests/KestrelBasedWebApplicationFactory.cs b/src/Mvc/test/Mvc.FunctionalTests/KestrelBasedWebApplicationFactory.cs
new file mode 100644
index 000000000000..7a69dce5fa52
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/KestrelBasedWebApplicationFactory.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Mvc.Testing;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class KestrelBasedWebApplicationFactory : WebApplicationFactory<SimpleWebSite.Startup>
+{
+    public KestrelBasedWebApplicationFactory() : base()
+    {
+        // Use dynamically assigned port to avoid test conflicts in CI.
+        this.UseKestrel(0);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/KestrelBasedWebApplicationFactoryForMinimal.cs b/src/Mvc/test/Mvc.FunctionalTests/KestrelBasedWebApplicationFactoryForMinimal.cs
new file mode 100644
index 000000000000..c72f6ac6410f
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/KestrelBasedWebApplicationFactoryForMinimal.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Mvc.Testing;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class KestrelBasedWebApplicationFactoryForMinimal : WebApplicationFactory<SimpleWebSiteWithWebApplicationBuilder.Program>
+{
+    public KestrelBasedWebApplicationFactoryForMinimal() : base()
+    {
+        // Use dynamically assigned port to avoid test conflicts in CI.
+        this.UseKestrel(0);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
index 436507d6a9d5..c33d71b8927c 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -24,7 +24,6 @@
           ..\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj" />
 
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.AspNet.WebApi.Client" />
     <Reference Include="Microsoft.AspNetCore.Components.Server" />
     <Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
index e3a7bfdb7fe5..b59e6b6311e3 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
@@ -24,8 +24,8 @@ public class RazorBuildTest : LoggedTest
     protected override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
     {
         base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         Factory = new MvcTestFixture<RazorBuildWebSite.Startup>(LoggerFactory)
-            .WithWebHostBuilder(b => b.UseStartup<RazorBuildWebSite.Startup>())
             .WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure<MvcRazorRuntimeCompilationOptions>(ConfigureRuntimeCompilationOptions)));
 
         static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options)
@@ -37,6 +37,7 @@ static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions
                 options.AdditionalReferencePaths.Add(path);
             }
         }
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
         Client = Factory.CreateDefaultClient();
     }
 
@@ -100,8 +101,8 @@ public async Task RzcViewsArePreferredToRuntimeViews()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/56553")]
     [LogLevel(LogLevel.Trace)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/56553")]
     public async Task RazorViews_AreUpdatedOnChange()
     {
         // Arrange
@@ -139,8 +140,8 @@ public async Task RazorViews_AreUpdatedOnChange()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/56553")]
     [LogLevel(LogLevel.Trace)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/56553")]
     public async Task RazorPages_AreUpdatedOnChange()
     {
         // Arrange
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RazorRuntimeCompilationHostingStartupTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorRuntimeCompilationHostingStartupTest.cs
index 1f718596d577..da884b521080 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/RazorRuntimeCompilationHostingStartupTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/RazorRuntimeCompilationHostingStartupTest.cs
@@ -21,6 +21,7 @@ public class RazorRuntimeCompilationHostingStartupTest : LoggedTest
     protected override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper)
     {
         base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
+#pragma warning disable ASPDEPR003 // Type or member is obsolete
         Factory = new MvcTestFixture<RazorBuildWebSite.StartupWithHostingStartup>(LoggerFactory)
             .WithWebHostBuilder(b => b.UseStartup<RazorBuildWebSite.StartupWithHostingStartup>())
             .WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure<MvcRazorRuntimeCompilationOptions>(ConfigureRuntimeCompilationOptions)));
@@ -34,6 +35,7 @@ static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions
                 options.AdditionalReferencePaths.Add(path);
             }
         }
+#pragma warning restore ASPDEPR003 // Type or member is obsolete
         Client = Factory.CreateDefaultClient();
     }
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RealServerBackedIntegrationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RealServerBackedIntegrationTests.cs
new file mode 100644
index 000000000000..28b92a3484b5
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/RealServerBackedIntegrationTests.cs
@@ -0,0 +1,65 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class RealServerBackedIntegrationTests : IClassFixture<KestrelBasedWebApplicationFactory>
+{
+    public KestrelBasedWebApplicationFactory Factory { get; }
+
+    public RealServerBackedIntegrationTests(KestrelBasedWebApplicationFactory factory)
+    {
+        Factory = factory;
+    }
+
+    [Fact]
+    public async Task RetrievesDataFromRealServer()
+    {
+        // Arrange
+        var expectedMediaType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+
+        // Act
+        var client = Factory.CreateClient();
+        var response = await client.GetAsync("/");
+        var responseContent = await response.Content.ReadAsStringAsync();
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+        Assert.Contains("first", responseContent);
+        Assert.Contains("second", responseContent);
+        Assert.Contains("wall", responseContent);
+        Assert.Contains("floor", responseContent);
+    }
+
+    [Fact]
+    public async Task ServerReachableViaGenericHttpClient()
+    {
+        // Act
+        using var factoryClient = Factory.CreateClient();
+        using var client = new HttpClient() { BaseAddress = factoryClient.BaseAddress };
+
+        using var response = await client.GetAsync("/");
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+    }
+
+    [Fact]
+    public void CanResolveServices()
+    {
+        // Act
+        var server = Factory.Services.GetRequiredService<IServer>();
+
+        // Assert
+        Assert.NotNull(server);
+        Assert.Contains("Kestrel", server.GetType().FullName);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RealServerUsingMinimalBackedIntegrationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RealServerUsingMinimalBackedIntegrationTests.cs
new file mode 100644
index 000000000000..4fba8f30a8c9
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/RealServerUsingMinimalBackedIntegrationTests.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class RealServerUsingMinimalBackedIntegrationTests : IClassFixture<KestrelBasedWebApplicationFactoryForMinimal>
+{
+    public KestrelBasedWebApplicationFactoryForMinimal Factory { get; }
+
+    public RealServerUsingMinimalBackedIntegrationTests(KestrelBasedWebApplicationFactoryForMinimal factory)
+    {
+        Factory = factory;
+    }
+
+    [Fact]
+    public async Task RetrievesDataFromRealServer()
+    {
+        // Arrange
+        var expectedMediaType = MediaTypeHeaderValue.Parse("text/plain; charset=utf-8");
+
+        // Act
+        var client = Factory.CreateClient();
+        var response = await client.GetAsync("/");
+        var responseContent = await response.Content.ReadAsStringAsync();
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+        Assert.Contains("Hello World", responseContent);
+    }
+
+    [Fact]
+    public async Task ServerReachableViaGenericHttpClient()
+    {
+        // Act
+        using var factoryClient = Factory.CreateClient();
+        using var client = new HttpClient() { BaseAddress = factoryClient.BaseAddress };
+
+        using var response = await client.GetAsync("/");
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+    }
+
+    [Fact]
+    public void CanResolveServices()
+    {
+        // Act
+        var server = Factory.Services.GetRequiredService<IServer>();
+
+        // Assert
+        Assert.NotNull(server);
+        Assert.Contains("Kestrel", server.GetType().FullName);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RealServerWithCustomConfigurationIntegrationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RealServerWithCustomConfigurationIntegrationTests.cs
new file mode 100644
index 000000000000..c5f3a2659915
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/RealServerWithCustomConfigurationIntegrationTests.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class RealServerWithCustomConfigurationIntegrationTests : IClassFixture<KestrelBasedWebApplicationFactory>
+{
+    private int _optionsConfiguredCounter = 0;
+
+    public KestrelBasedWebApplicationFactory Factory { get; }
+
+    public RealServerWithCustomConfigurationIntegrationTests(KestrelBasedWebApplicationFactory factory)
+    {
+        Factory = factory;
+        Factory.UseKestrel(options => { _optionsConfiguredCounter++; });
+    }
+
+    [Fact]
+    public async Task ServerReachableViaGenericHttpClient()
+    {
+        // Arrange
+
+        // Act
+        Assert.Equal(0, _optionsConfiguredCounter);
+        Factory.StartServer();
+
+        using var client = Factory.CreateClient();
+
+        using var response = await client.GetAsync("/");
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(1, _optionsConfiguredCounter);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RealServerWithDynamicPortIntegrationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RealServerWithDynamicPortIntegrationTests.cs
new file mode 100644
index 000000000000..b10f81963c82
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/RealServerWithDynamicPortIntegrationTests.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using System.Net.Http;
+using Microsoft.AspNetCore.Mvc.Testing;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class RealServerWithDynamicPortIntegrationTests : IClassFixture<KestrelBasedWebApplicationFactory>
+{
+    public KestrelBasedWebApplicationFactory Factory { get; }
+
+    public RealServerWithDynamicPortIntegrationTests(KestrelBasedWebApplicationFactory factory)
+    {
+        Factory = factory;
+
+        // Use dynamic port
+        Factory.UseKestrel(0);
+    }
+
+    [Fact]
+    public async Task ServerReachableViaGenericHttpClient()
+    {
+        // Arrange
+        using var client = new HttpClient();
+        using var factoryClient = Factory.CreateClient();
+        client.BaseAddress = factoryClient.BaseAddress;
+
+        // Act
+        using var response = await client.GetAsync("/");
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RealServerWithSpecifiedPortBackedIntegrationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/RealServerWithSpecifiedPortBackedIntegrationTests.cs
new file mode 100644
index 000000000000..19e55e1a1a61
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/RealServerWithSpecifiedPortBackedIntegrationTests.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class RealServerWithSpecifiedPortBackedIntegrationTests : IClassFixture<KestrelBasedWebApplicationFactory>
+{
+    private const int ServerPort = 7777;
+
+    public KestrelBasedWebApplicationFactory Factory { get; }
+
+    public RealServerWithSpecifiedPortBackedIntegrationTests(KestrelBasedWebApplicationFactory factory)
+    {
+        Factory = factory;
+        Factory.UseKestrel(ServerPort);
+    }
+
+    [Fact]
+    public async Task ServerReachableViaGenericHttpClient_OnSpecificPort()
+    {
+        // Arrange
+        var baseAddress = new Uri($"http://localhost:{ServerPort}");
+
+        // Act
+        Factory.StartServer();
+
+        using var client = new HttpClient() { BaseAddress = baseAddress };
+
+        using var response = await client.GetAsync("/");
+
+        // Assert
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+    }
+}
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RoutingGroupsWithMetadataTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RoutingGroupsWithMetadataTest.cs
index 0e0525722bb0..db4a449f5ac1 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/RoutingGroupsWithMetadataTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/RoutingGroupsWithMetadataTest.cs
@@ -32,6 +32,7 @@ public override void Dispose()
     public WebApplicationFactory<StartupForRouteGroupsWithMetadata> Factory { get; private set; }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/55927")]
     public async Task OrderedGroupMetadataForControllers()
     {
         using var client = Factory.CreateClient();
diff --git a/src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs
index c914b3500c95..5c892021b76b 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs
@@ -126,7 +126,7 @@ public async Task ReRegisteringAntiforgeryTokenInsideFormTagHelper_DoesNotAddDup
         ResourceFile.UpdateOrVerify(_resourcesAssembly, outputFile, expectedContent, responseContent, forgeryToken);
     }
 
-    public static TheoryData TagHelpersAreInheritedFromViewImportsPagesData
+    public static TheoryData<string, string> TagHelpersAreInheritedFromViewImportsPagesData
     {
         get
         {
diff --git a/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesTest.cs
index f25096cc9acc..1738431352bf 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesTest.cs
@@ -80,7 +80,7 @@ public async Task RoundTripLargeData_WorksWithChunkingCookies(int size)
         foreach (var cookieTempDataProviderCookie in cookieTempDataProviderCookies)
         {
             Assert.NotNull(cookieTempDataProviderCookie.Value.Value);
-            Assert.Equal("/", cookieTempDataProviderCookie.Path);
+            Assert.Equal("/", cookieTempDataProviderCookie.Path.AsSpan());
             Assert.Null(cookieTempDataProviderCookie.Domain.Value);
             Assert.False(cookieTempDataProviderCookie.Secure);
         }
@@ -97,8 +97,8 @@ public async Task RoundTripLargeData_WorksWithChunkingCookies(int size)
             .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
             .FirstOrDefault(setCookieHeader => setCookieHeader.Name == CookieTempDataProvider.CookieName);
         Assert.NotNull(setCookieHeaderValue);
-        Assert.Equal(string.Empty, setCookieHeaderValue.Value);
-        Assert.Equal("/", setCookieHeaderValue.Path);
+        Assert.Equal(string.Empty, setCookieHeaderValue.Value.AsSpan());
+        Assert.Equal("/", setCookieHeaderValue.Path.AsSpan());
         Assert.Null(setCookieHeaderValue.Domain.Value);
         Assert.NotNull(setCookieHeaderValue.Expires);
         Assert.True(setCookieHeaderValue.Expires < DateTimeOffset.Now); // expired cookie
@@ -130,7 +130,7 @@ public async Task Redirect_RetainsTempData_EvenIfAccessed_AndSetsAppropriateCook
             .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
             .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
         Assert.NotNull(setCookieHeader);
-        Assert.Equal("/", setCookieHeader.Path);
+        Assert.Equal("/", setCookieHeader.Path.AsSpan());
         Assert.Null(setCookieHeader.Domain.Value);
         Assert.False(setCookieHeader.Secure);
         Assert.Null(setCookieHeader.Expires);
@@ -153,8 +153,8 @@ public async Task Redirect_RetainsTempData_EvenIfAccessed_AndSetsAppropriateCook
             .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
             .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
         Assert.NotNull(setCookieHeader);
-        Assert.Equal(string.Empty, setCookieHeader.Value);
-        Assert.Equal("/", setCookieHeader.Path);
+        Assert.Equal(string.Empty, setCookieHeader.Value.AsSpan());
+        Assert.Equal("/", setCookieHeader.Path.AsSpan());
         Assert.Null(setCookieHeader.Domain.Value);
         Assert.NotNull(setCookieHeader.Expires);
         Assert.True(setCookieHeader.Expires < DateTimeOffset.Now); // expired cookie
@@ -183,7 +183,7 @@ public async Task CookieTempDataProviderCookie_DoesNotSetsSecureAttributeOnCooki
             .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
             .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
         Assert.NotNull(setCookieHeader);
-        Assert.Equal("/", setCookieHeader.Path);
+        Assert.Equal("/", setCookieHeader.Path.AsSpan());
         Assert.Null(setCookieHeader.Domain.Value);
         Assert.False(setCookieHeader.Secure);
         Assert.Null(setCookieHeader.Expires);
diff --git a/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs b/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
index 9f4162734292..97a46c5e6463 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
@@ -25,7 +25,8 @@ public void TestingInfrastructure_WebHost_WithWebHostBuilderRespectsCustomizatio
 
         // Assert
         Assert.Equal(new[] { "ConfigureWebHost", "Customization", "FurtherCustomization" }, factory.ConfigureWebHostCalled.ToArray());
-        Assert.True(factory.CreateServerCalled);
+        Assert.True(factory.CreateServerIWebHostBuilderCalled);
+        Assert.False(factory.CreateServerWithServiceProviderCalled);
         Assert.True(factory.CreateWebHostBuilderCalled);
         // GetTestAssemblies is not called when reading content roots from MvcAppManifest
         Assert.False(factory.GetTestAssembliesCalled);
@@ -48,7 +49,8 @@ public void TestingInfrastructure_GenericHost_WithWithHostBuilderRespectsCustomi
         Assert.False(factory.GetTestAssembliesCalled);
         Assert.True(factory.CreateHostBuilderCalled);
         Assert.True(factory.CreateHostCalled);
-        Assert.False(factory.CreateServerCalled);
+        Assert.False(factory.CreateServerIWebHostBuilderCalled);
+        Assert.True(factory.CreateServerWithServiceProviderCalled);
         Assert.False(factory.CreateWebHostBuilderCalled);
     }
 
@@ -108,6 +110,23 @@ public void TestingInfrastructure_GenericHost_HostDispose()
         Assert.True(sink._asyncDisposed);
     }
 
+    [Fact]
+    public void TestingInfrastructure_WebApplicationBuilder_RespectsCustomizations()
+    {
+        // Arrange
+        using var factory = new CustomizedFactory<SimpleWebSiteWithWebApplicationBuilder.Program>();
+        factory.StartServer();
+
+        // Assert
+        Assert.Equal(["ConfigureWebHost"], factory.ConfigureWebHostCalled.ToArray());
+        Assert.False(factory.GetTestAssembliesCalled);
+        Assert.True(factory.CreateHostBuilderCalled);
+        Assert.True(factory.CreateHostCalled);
+        Assert.False(factory.CreateServerIWebHostBuilderCalled);
+        Assert.True(factory.CreateServerWithServiceProviderCalled);
+        Assert.True(factory.CreateWebHostBuilderCalled);
+    }
+
     private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
         builder.UseStartup<GenericHostWebSite.Startup>()
         .ConfigureServices(s => s.AddScoped<DisposableService>());
@@ -131,7 +150,8 @@ private class CustomizedFactory<TEntryPoint> : WebApplicationFactory<TEntryPoint
         public bool GetTestAssembliesCalled { get; private set; }
         public bool CreateWebHostBuilderCalled { get; private set; }
         public bool CreateHostBuilderCalled { get; private set; }
-        public bool CreateServerCalled { get; private set; }
+        public bool CreateServerIWebHostBuilderCalled { get; private set; }
+        public bool CreateServerWithServiceProviderCalled { get; private set; }
         public bool CreateHostCalled { get; private set; }
         public IList<string> ConfigureWebHostCalled { get; private set; } = new List<string>();
 
@@ -141,11 +161,21 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             base.ConfigureWebHost(builder);
         }
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+#pragma warning disable CS0672 // Member overrides obsolete member
         protected override TestServer CreateServer(IWebHostBuilder builder)
+#pragma warning restore CS0672 // Member overrides obsolete member
         {
-            CreateServerCalled = true;
+            CreateServerIWebHostBuilderCalled = true;
             return base.CreateServer(builder);
         }
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+
+        protected override TestServer CreateServer(IServiceProvider serviceProvider)
+        {
+            CreateServerWithServiceProviderCalled = true;
+            return base.CreateServer(serviceProvider);
+        }
 
         protected override IHost CreateHost(IHostBuilder builder)
         {
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ViewEngineTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ViewEngineTests.cs
index 6a4deae7ab38..ac62daae8563 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ViewEngineTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ViewEngineTests.cs
@@ -172,7 +172,7 @@ public async Task RazorViewEngine_UsesViewExpandersForViewsAndPartials(string va
         Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
     }
 
-    public static TheoryData ViewLocationExpanders_GetIsMainPageFromContextData
+    public static TheoryData<string, string> ViewLocationExpanders_GetIsMainPageFromContextData
     {
         get
         {
diff --git a/src/Mvc/test/Mvc.FunctionalTests/WebApplicationFactorySlnxTests.cs b/src/Mvc/test/Mvc.FunctionalTests/WebApplicationFactorySlnxTests.cs
new file mode 100644
index 000000000000..60de72aa2e55
--- /dev/null
+++ b/src/Mvc/test/Mvc.FunctionalTests/WebApplicationFactorySlnxTests.cs
@@ -0,0 +1,74 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using BasicWebSite;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class WebApplicationFactorySlnxTests : IClassFixture<WebApplicationFactory<BasicWebSite.Startup>>, IDisposable
+{
+    private readonly string _tempDirectory;
+    private readonly string _contentDirectory;
+
+    public WebApplicationFactorySlnxTests(WebApplicationFactory<BasicWebSite.Startup> factory)
+    {
+        Factory = factory;
+        _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N")[..8]);
+        _contentDirectory = Path.Combine(_tempDirectory, "BasicWebSite");
+
+        Directory.CreateDirectory(_tempDirectory);
+        Directory.CreateDirectory(_contentDirectory);
+
+        // Create a minimal wwwroot directory to satisfy content root expectations
+        var wwwrootDir = Path.Combine(_contentDirectory, "wwwroot");
+        Directory.CreateDirectory(wwwrootDir);
+    }
+
+    public WebApplicationFactory<BasicWebSite.Startup> Factory { get; }
+
+    [Fact]
+    public async Task WebApplicationFactory_UsesSlnxForSolutionRelativeContentRoot()
+    {
+        // Create .slnx file in temp directory
+        var slnxFile = Path.Combine(_tempDirectory, "TestSolution.slnx");
+        File.WriteAllText(slnxFile, """
+            <Solution>
+              <Configurations>
+                <Configuration Name="Debug|Any CPU" />
+                <Configuration Name="Release|Any CPU" />
+              </Configurations>
+              <Folder Name="/BasicWebSite/">
+                <Project Path="BasicWebSite/BasicWebSite.csproj" />
+              </Folder>
+            </Solution>
+            """);
+
+        var factory = Factory.WithWebHostBuilder(builder =>
+        {
+            builder.UseSolutionRelativeContentRoot("BasicWebSite", _tempDirectory, "TestSolution.slnx");
+        });
+
+        using var client = factory.CreateClient();
+
+        // Verify that the content root was set correctly by accessing the environment
+        var environment = factory.Services.GetRequiredService<IWebHostEnvironment>();
+        Assert.Equal(_contentDirectory, environment.ContentRootPath);
+        Assert.True(Directory.Exists(environment.ContentRootPath));
+
+        // Verify the factory is functional with the .slnx-resolved content root
+        var response = await client.GetAsync("/");
+        Assert.True(response.IsSuccessStatusCode);
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_tempDirectory))
+        {
+            Directory.Delete(_tempDirectory, recursive: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
index b94910bf2a16..8bb72ff67055 100644
--- a/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
+++ b/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
@@ -721,11 +721,11 @@ public async Task CollectionModelBinder_BindsCollectionOfComplexType_ImpliedPref
     }
 
     // parameter type, form content, expected type
-    public static TheoryData<Type, IDictionary<string, StringValues>, Type> CollectionTypeData
+    public static TheoryData<Type, Dictionary<string, StringValues>, Type> CollectionTypeData
     {
         get
         {
-            return new TheoryData<Type, IDictionary<string, StringValues>, Type>
+            return new TheoryData<Type, Dictionary<string, StringValues>, Type>
                 {
                     {
                         typeof(IEnumerable<string>),
diff --git a/src/Mvc/test/Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
index 49e73228a862..374c9f458d9d 100644
--- a/src/Mvc/test/Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
+++ b/src/Mvc/test/Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
@@ -634,11 +634,11 @@ public async Task BindParameter_NoData_Fails()
         Assert.Empty(modelState.Keys);
     }
 
-    public static TheoryData<IDictionary<string, StringValues>> PersonStoreData
+    public static TheoryData<Dictionary<string, StringValues>> PersonStoreData
     {
         get
         {
-            return new TheoryData<IDictionary<string, StringValues>>
+            return new TheoryData<Dictionary<string, StringValues>>
                 {
                     new Dictionary<string, StringValues>
                     {
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
index b1fcdbf3ffe6..539f0477a1fd 100644
--- a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
@@ -7,6 +7,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" />
+    <Reference Include="Microsoft.AspNetCore.Http.Results" />
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
 
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerWithTypedResultController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerWithTypedResultController.cs
new file mode 100644
index 000000000000..2bd1c52c3386
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerWithTypedResultController.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite;
+
+[Route("ApiExplorerWithTypedResult/[Action]")]
+public class ApiExplorerWithTypedResultController : Controller
+{
+    [HttpGet]
+    public Ok<Product> GetProduct() => TypedResults.Ok(new Product { Name = "Test product" });
+}
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
index c2bfec25d45e..22ab7f53d20a 100644
--- a/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
@@ -4,6 +4,7 @@
 using ApiExplorerWebSite.Controllers;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Hosting;
 
 namespace ApiExplorerWebSite;
 
@@ -45,17 +46,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseKestrel()
-            .UseIISIntegration()
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseKestrel()
+                    .UseIISIntegration()
+                    .UseStartup<Startup>();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
index ab31d94048cd..20962f53c44b 100644
--- a/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace ApplicationModelWebSite;
 
 public class Startup
@@ -34,17 +36,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Program.cs b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
index 2940ac16caec..1237033adda3 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
@@ -1,16 +1,25 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace BasicWebSite;
 
 public class Program
 {
-    public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
+    public static void Main(string[] args)
+    {
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+        using var host = CreateWebHostBuilder(args).Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+        host.Run();
+    }
 
-    // Do not change. This is the pattern our test infrastructure uses to initialize a IWebHostBuilder from
-    // a users app.
+    // Using WebHostBuilder to keep some test coverage in WebApplicationFactory tests
     public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
         new WebHostBuilder()
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
             .UseContentRoot(Directory.GetCurrentDirectory())
             .UseStartup<StartupWithoutEndpointRouting>()
             .UseKestrel()
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
index 1a9fb3200c0e..af44ae54e992 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
@@ -20,7 +20,9 @@ public void ConfigureServices(IServiceCollection services)
         services.AddHttpContextAccessor();
         services.AddScoped<RequestIdService>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/BasicWebSite/StartupWithoutEndpointRouting.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithoutEndpointRouting.cs
index 94a467baa003..a43f14b6dfc2 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/StartupWithoutEndpointRouting.cs
+++ b/src/Mvc/test/WebSites/BasicWebSite/StartupWithoutEndpointRouting.cs
@@ -49,7 +49,9 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<RequestIdService>();
         services.AddTransient<ServiceActionFilter>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
         services.TryAddSingleton(CreateWeatherForecastService);
     }
 
diff --git a/src/Mvc/test/WebSites/BasicWebSite/_package.json b/src/Mvc/test/WebSites/BasicWebSite/_package.json
index a0d2a37b7acb..f06282ec0ede 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/_package.json
+++ b/src/Mvc/test/WebSites/BasicWebSite/_package.json
@@ -1,6 +1,6 @@
 {
     "version": "0.0.0",
-    "name": "BasicWebSite",
+    "name": "@microsoft/BasicWebSite",
     "description": "Web site demonstrating various validations.",
     "private":  true,
     "devDependencies": {
diff --git a/src/Mvc/test/WebSites/Common/TestResponseGenerator.cs b/src/Mvc/test/WebSites/Common/TestResponseGenerator.cs
index b447d97f287f..ab7a804920eb 100644
--- a/src/Mvc/test/WebSites/Common/TestResponseGenerator.cs
+++ b/src/Mvc/test/WebSites/Common/TestResponseGenerator.cs
@@ -12,7 +12,9 @@ public class TestResponseGenerator
 {
     private readonly ActionContext _actionContext;
 
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
     public TestResponseGenerator(IActionContextAccessor contextAccessor)
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     {
         _actionContext = contextAccessor.ActionContext;
         if (_actionContext == null)
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
index 2e236143f638..ca1fe86ab6da 100644
--- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
@@ -6,6 +6,7 @@
 using ControllersFromServicesWebSite.Components;
 using ControllersFromServicesWebSite.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.Hosting;
 
 namespace ControllersFromServicesWebSite;
 
@@ -61,17 +62,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Program.cs b/src/Mvc/test/WebSites/CorsWebSite/Program.cs
index d6bef8cec94e..fffa0760a8dc 100644
--- a/src/Mvc/test/WebSites/CorsWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/CorsWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace CorsWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
index d459fadc0c7a..a3aae2df48ce 100644
--- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace ErrorPageMiddlewareWebSite;
 
 public class Startup
@@ -24,17 +26,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Startup.cs b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
index b2028da6904b..bdee1296991f 100644
--- a/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace FilesWebSite;
 
 public class Startup
@@ -23,16 +25,20 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Program.cs b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
index 6235f2d3214f..55d6b0c04c25 100644
--- a/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace FormatterWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/GenericHostWebSite/Startup.cs b/src/Mvc/test/WebSites/GenericHostWebSite/Startup.cs
index 60fe3c2ce951..07e999ccde7a 100644
--- a/src/Mvc/test/WebSites/GenericHostWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/GenericHostWebSite/Startup.cs
@@ -23,7 +23,9 @@ public void ConfigureServices(IServiceCollection services)
         services.AddLogging();
         services.AddHttpContextAccessor();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/GenericHostWebSite/_package.json b/src/Mvc/test/WebSites/GenericHostWebSite/_package.json
index 45df438fd2a0..e927a42c5226 100644
--- a/src/Mvc/test/WebSites/GenericHostWebSite/_package.json
+++ b/src/Mvc/test/WebSites/GenericHostWebSite/_package.json
@@ -1,6 +1,6 @@
 {
     "version": "0.0.0",
-    "name": "GenericHostWebSite",
+    "name": "@microsoft/GenericHostWebSite",
     "description": "Web site demonstrating various validations.",
     "private":  true,
     "devDependencies": {
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
index 4ac4a3edbdf6..baab04ea7b8b 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Hosting;
 
 namespace HtmlGenerationWebSite;
 
@@ -48,18 +49,22 @@ public virtual void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 
     protected virtual void ConfigureMvcOptions(MvcOptions options)
     {
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
index da8475622054..1f8da4281eb3 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using Microsoft.Extensions.Hosting;
 
 namespace HtmlGenerationWebSite;
 
@@ -31,10 +32,14 @@ public void Configure(IApplicationBuilder app)
         Startup.Configure(app);
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<StartupWithCultureReplace>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<StartupWithCultureReplace>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
index 95325f20d4f2..82da4815dba1 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RazorBuildWebSite;
 
 public class Startup
@@ -25,10 +27,14 @@ public void Configure(IApplicationBuilder app)
         });
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-        .UseContentRoot(Directory.GetCurrentDirectory())
-        .UseStartup<Startup>()
-        .UseKestrel()
-        .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs
index 78c56e00ed5a..8fde980c5abf 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.Hosting;
 
 namespace RazorBuildWebSite;
 
@@ -34,17 +35,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-        .UseContentRoot(Directory.GetCurrentDirectory())
-        .UseStartup<Startup>()
-        .UseKestrel();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel();
+            });
 
     private class MockMvcBuilder : IMvcBuilder
     {
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
index 8440222b2671..39720535fdbb 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RazorPagesWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseIISIntegration()
-            .UseStartup<StartupWithBasePath>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseIISIntegration()
+                    .UseStartup<StartupWithBasePath>();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Program.cs b/src/Mvc/test/WebSites/RazorWebSite/Program.cs
index 63f000d9e68c..df37aa1be8d9 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/RazorWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RazorWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Program.cs b/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
index e87a93791ee6..d872250cf5bd 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
@@ -1,22 +1,28 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RoutingWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<StartupForFallback>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<StartupForFallback>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs b/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
index 9438fe0195cb..c3ef0149527d 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
@@ -29,7 +29,9 @@ public void ConfigureServices(IServiceCollection services)
         ConfigureRoutingServices(services);
 
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamic.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamic.cs
index 4dc4d13e07c2..9726929e10e2 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamic.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamic.cs
@@ -18,7 +18,9 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddTransient<Transformer>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
 
         // Used by some controllers defined in this project.
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamicOrder.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamicOrder.cs
index 840c50ce64b7..08b61b0c0ea6 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamicOrder.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamicOrder.cs
@@ -33,7 +33,9 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddTransient<Transformer>();
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
 
         // Used by some controllers defined in this project.
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupForEndpointFilters.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForEndpointFilters.cs
index 268c19d75f7c..f8424d5c41f3 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupForEndpointFilters.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupForEndpointFilters.cs
@@ -17,7 +17,9 @@ public void ConfigureServices(IServiceCollection services)
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
         services.AddScoped<TestResponseGenerator>();
         // This is used by test response generator
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupForFallback.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForFallback.cs
index 9fd809a7ea6c..732ec4b82a61 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupForFallback.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupForFallback.cs
@@ -16,7 +16,9 @@ public void ConfigureServices(IServiceCollection services)
             .AddNewtonsoftJson();
 
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
 
         // Used by some controllers defined in this project.
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupForGroups.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForGroups.cs
index 889c18b40f7a..c055dc3ff23a 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupForGroups.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupForGroups.cs
@@ -17,7 +17,9 @@ public void ConfigureServices(IServiceCollection services)
         services.Configure<RouteOptions>(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
         services.AddScoped<TestResponseGenerator>();
         // This is used by test response generator
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs
index d9e38eac752b..2792eb795dfe 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs
@@ -31,7 +31,9 @@ public void ConfigureServices(IServiceCollection services)
             });
 
         services.AddScoped<TestResponseGenerator>();
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/StartupRoutingDifferentBranches.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupRoutingDifferentBranches.cs
index afcc67cecfc3..371540eee06d 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/StartupRoutingDifferentBranches.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/StartupRoutingDifferentBranches.cs
@@ -31,7 +31,9 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddScoped<TestResponseGenerator>();
         // This is used by test response generator
+        #pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<BranchesTransformer>();
     }
 
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Program.cs b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
index 9aaddc6b3c38..440a2774ebaa 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
@@ -1,21 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace SecurityWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>();
+            });
 }
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
index 5a87688449dd..e5faf5d06d32 100644
--- a/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
@@ -29,17 +30,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
index 67990ce51d8b..71a933ba44ab 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace TagHelpersWebSite;
 
 public class Startup
@@ -23,18 +25,22 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStaticWebAssets()
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStaticWebAssets()
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Program.cs b/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
index bdb3e48f5746..8f535ad23228 100644
--- a/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace VersioningWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs b/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
index f4a02003c92f..71e417b8bb98 100644
--- a/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
@@ -14,7 +14,9 @@ public void ConfigureServices(IServiceCollection services)
             .AddNewtonsoftJson();
 
         services.AddScoped<TestResponseGenerator>();
+#pragma warning disable ASPDEPR006 // Type or member is obsolete
         services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+#pragma warning restore ASPDEPR006 // Type or member is obsolete
     }
 
     public virtual void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
index 956fd0f33233..b747c6b08438 100644
--- a/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Net.Http.Headers;
 
 namespace XmlFormattersWebSite;
@@ -109,17 +110,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/OpenApi/OpenApi.slnf b/src/OpenApi/OpenApi.slnf
index 3d616bfa4daf..48954eeb5878 100644
--- a/src/OpenApi/OpenApi.slnf
+++ b/src/OpenApi/OpenApi.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
@@ -10,12 +10,13 @@
       "src\\Http\\Http\\src\\Microsoft.AspNetCore.Http.csproj",
       "src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
       "src\\Http\\Routing\\src\\Microsoft.AspNetCore.Routing.csproj",
+      "src\\OpenApi\\gen\\Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj",
       "src\\OpenApi\\perf\\Microbenchmarks\\Microsoft.AspNetCore.OpenApi.Microbenchmarks.csproj",
       "src\\OpenApi\\sample\\Sample.csproj",
       "src\\OpenApi\\src\\Microsoft.AspNetCore.OpenApi.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
+      "src\\OpenApi\\test\\Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests\\Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests.csproj",
       "src\\OpenApi\\test\\Microsoft.AspNetCore.OpenApi.Tests\\Microsoft.AspNetCore.OpenApi.Tests.csproj",
-      "src\\OpenApi\\sample\\Sample.csproj",
       "src\\OpenApi\\perf\\Microbenchmarks\\Microsoft.AspNetCore.OpenApi.Microbenchmarks.csproj"
     ]
   }
diff --git a/src/OpenApi/build/Microsoft.AspNetCore.OpenApi.targets b/src/OpenApi/build/Microsoft.AspNetCore.OpenApi.targets
new file mode 100644
index 000000000000..7b1add5c1666
--- /dev/null
+++ b/src/OpenApi/build/Microsoft.AspNetCore.OpenApi.targets
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project>
+  <PropertyGroup>
+    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.OpenApi.Generated</InterceptorsNamespaces>
+  </PropertyGroup>
+  <Target Name="GenerateAdditionalXmlFilesForOpenApi"
+    AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <AdditionalFiles
+        Include="@(ReferencePath->'%(RootDir)%(Directory)%(Filename).xml')"
+        Condition="'%(ReferencePath.Extension)' == '.dll' AND
+        Exists('%(ReferencePath.RootDir)%(ReferencePath.Directory)%(ReferencePath.Filename).xml') AND
+        ('%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference')"
+         KeepMetadata="Identity" />
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/OpenApi/gen/Helpers/AddOpenApiInvocation.cs b/src/OpenApi/gen/Helpers/AddOpenApiInvocation.cs
new file mode 100644
index 000000000000..464d4bd17a96
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/AddOpenApiInvocation.cs
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+/// <summary>
+/// Represents an invocation of the AddOpenApi method.
+/// </summary>
+/// <param name="Variant">The variant of the AddOpenApi method.</param>
+/// <param name="InvocationExpression">The invocation expression.</param>
+/// <param name="Location">The location of the invocation that can be intercepted.</param>
+internal sealed record AddOpenApiInvocation(
+    AddOpenApiOverloadVariant Variant,
+    InvocationExpressionSyntax InvocationExpression,
+    InterceptableLocation? Location);
diff --git a/src/OpenApi/gen/Helpers/AddOpenApiInvocationComparer.cs b/src/OpenApi/gen/Helpers/AddOpenApiInvocationComparer.cs
new file mode 100644
index 000000000000..98589347a5be
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/AddOpenApiInvocationComparer.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+internal class AddOpenApiInvocationComparer : IEqualityComparer<AddOpenApiInvocation>
+{
+    public static AddOpenApiInvocationComparer Instance { get; } = new();
+    public bool Equals(AddOpenApiInvocation? x, AddOpenApiInvocation? y)
+    {
+        if (ReferenceEquals(x, y))
+        {
+            return true;
+        }
+        if (x is null || y is null)
+        {
+            return false;
+        }
+
+        return x.Variant.Equals(y.Variant);
+    }
+
+    public int GetHashCode(AddOpenApiInvocation obj) =>
+        HashCode.Combine(obj.Variant);
+}
diff --git a/src/OpenApi/gen/Helpers/AddOpenApiOverloadVariant.cs b/src/OpenApi/gen/Helpers/AddOpenApiOverloadVariant.cs
new file mode 100644
index 000000000000..8ed1b42fc721
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/AddOpenApiOverloadVariant.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+internal enum AddOpenApiOverloadVariant
+{
+    AddOpenApi,
+    AddOpenApiDocumentName,
+    AddOpenApiDocumentNameConfigureOptions,
+    AddOpenApiConfigureOptions,
+    Unknown
+}
diff --git a/src/OpenApi/gen/Helpers/AssemblyTypeSymbolsVisitor.cs b/src/OpenApi/gen/Helpers/AssemblyTypeSymbolsVisitor.cs
new file mode 100644
index 000000000000..548ef98c2b84
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/AssemblyTypeSymbolsVisitor.cs
@@ -0,0 +1,85 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+/// <summary>
+/// Visits the assembly symbols to collect public types, properties, and methods that might
+/// contain XML documentation comments.
+/// </summary>
+internal sealed class AssemblyTypeSymbolsVisitor(IAssemblySymbol assemblySymbol, CancellationToken cancellation) : SymbolVisitor
+{
+    private readonly CancellationToken _cancellationToken = cancellation;
+    private readonly HashSet<INamedTypeSymbol> _exportedTypes = new(SymbolEqualityComparer.Default);
+    private readonly HashSet<IPropertySymbol> _exportedProperties = new(SymbolEqualityComparer.Default);
+    private readonly HashSet<IMethodSymbol> _exportedMethods = new(SymbolEqualityComparer.Default);
+
+    public ImmutableArray<INamedTypeSymbol> GetPublicTypes() => [.. _exportedTypes];
+    public ImmutableArray<IPropertySymbol> GetPublicProperties() => [.. _exportedProperties];
+    public ImmutableArray<IMethodSymbol> GetPublicMethods() => [.. _exportedMethods];
+
+    public void VisitAssembly() => VisitAssembly(assemblySymbol);
+
+    public override void VisitAssembly(IAssemblySymbol symbol)
+    {
+        _cancellationToken.ThrowIfCancellationRequested();
+        symbol.GlobalNamespace.Accept(this);
+    }
+
+    public override void VisitNamespace(INamespaceSymbol symbol)
+    {
+        foreach (var namespaceOrType in symbol.GetMembers())
+        {
+            _cancellationToken.ThrowIfCancellationRequested();
+            namespaceOrType.Accept(this);
+        }
+    }
+
+    public override void VisitNamedType(INamedTypeSymbol type)
+    {
+        _cancellationToken.ThrowIfCancellationRequested();
+
+        if (!IsAccessibleType(type) || !_exportedTypes.Add(type))
+        {
+            return;
+        }
+
+        var nestedTypes = type.GetTypeMembers();
+
+        foreach (var nestedType in nestedTypes)
+        {
+            _cancellationToken.ThrowIfCancellationRequested();
+            nestedType.Accept(this);
+        }
+
+        var properties = type.GetMembers().OfType<IPropertySymbol>();
+        foreach (var property in properties)
+        {
+            _cancellationToken.ThrowIfCancellationRequested();
+            if (IsAccessibleType(property) && _exportedProperties.Add(property))
+            {
+                property.Type.Accept(this);
+            }
+        }
+        var methods = type.GetMembers().OfType<IMethodSymbol>();
+        foreach (var method in methods)
+        {
+            _cancellationToken.ThrowIfCancellationRequested();
+            if (IsAccessibleType(method) && _exportedMethods.Add(method))
+            {
+                method.Accept(this);
+            }
+        }
+    }
+
+    private bool IsAccessibleType(ISymbol symbol) =>
+        SymbolEqualityComparer.Default.Equals(symbol.ContainingAssembly, assemblySymbol)
+            && (symbol.DeclaredAccessibility == Accessibility.Public ||
+                symbol.DeclaredAccessibility == Accessibility.Internal ||
+                symbol.DeclaredAccessibility == Accessibility.ProtectedOrInternal);
+}
diff --git a/src/OpenApi/gen/Helpers/DocumentationCommentXmlNames.cs b/src/OpenApi/gen/Helpers/DocumentationCommentXmlNames.cs
new file mode 100644
index 000000000000..d9c2fb98d2e3
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/DocumentationCommentXmlNames.cs
@@ -0,0 +1,61 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+internal static class DocumentationCommentXmlNames
+{
+    public const string CElementName = "c";
+    public const string CodeElementName = "code";
+    public const string CompletionListElementName = "completionlist";
+    public const string DescriptionElementName = "description";
+    public const string ExampleElementName = "example";
+    public const string ExceptionElementName = "exception";
+    public const string IncludeElementName = "include";
+    public const string InheritdocElementName = "inheritdoc";
+    public const string ItemElementName = "item";
+    public const string ListElementName = "list";
+    public const string ListHeaderElementName = "listheader";
+    public const string ParaElementName = "para";
+    public const string ParameterElementName = "param";
+    public const string ParameterReferenceElementName = "paramref";
+    public const string PermissionElementName = "permission";
+    public const string PlaceholderElementName = "placeholder";
+    public const string PreliminaryElementName = "preliminary";
+    public const string RemarksElementName = "remarks";
+    public const string ReturnsElementName = "returns";
+    public const string SeeElementName = "see";
+    public const string SeeAlsoElementName = "seealso";
+    public const string SummaryElementName = "summary";
+    public const string TermElementName = "term";
+    public const string ThreadSafetyElementName = "threadsafety";
+    public const string TypeParameterElementName = "typeparam";
+    public const string TypeParameterReferenceElementName = "typeparamref";
+    public const string ValueElementName = "value";
+    public const string CrefAttributeName = "cref";
+    public const string HrefAttributeName = "href";
+    public const string FileAttributeName = "file";
+    public const string InstanceAttributeName = "instance";
+    public const string LangwordAttributeName = "langword";
+    public const string NameAttributeName = "name";
+    public const string PathAttributeName = "path";
+    public const string StaticAttributeName = "static";
+    public const string TypeAttributeName = "type";
+
+    public static bool ElementEquals(string name1, string name2, bool fromVb = false)
+    {
+        return string.Equals(name1, name2, fromVb ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
+    }
+
+    public static bool AttributeEquals(string name1, string name2)
+    {
+        return string.Equals(name1, name2, StringComparison.Ordinal);
+    }
+
+    public static new bool Equals(object left, object right)
+    {
+        return object.Equals(left, right);
+    }
+}
diff --git a/src/OpenApi/gen/Helpers/ISymbolExtensions.cs b/src/OpenApi/gen/Helpers/ISymbolExtensions.cs
new file mode 100644
index 000000000000..84cb3812119d
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/ISymbolExtensions.cs
@@ -0,0 +1,214 @@
+// 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.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+internal static class ISymbolExtensions
+{
+    public static ImmutableArray<ISymbol> ExplicitOrImplicitInterfaceImplementations(this ISymbol symbol)
+    {
+        if (symbol.Kind is not SymbolKind.Method and not SymbolKind.Property and not SymbolKind.Event)
+        {
+            return [];
+        }
+
+        var result = ImmutableArray.CreateBuilder<ISymbol>();
+
+        foreach (var iface in symbol.ContainingType.AllInterfaces)
+        {
+            foreach (var interfaceMember in iface.GetMembers())
+            {
+                var impl = symbol.ContainingType.FindImplementationForInterfaceMember(interfaceMember);
+                if (SymbolEqualityComparer.Default.Equals(symbol, impl))
+                {
+                    result.Add(interfaceMember);
+                }
+            }
+        }
+
+        // There are explicit methods that FindImplementationForInterfaceMember.  For example `abstract explicit impls`
+        // like `abstract void I<T>.M()`.  So add these back in directly using symbol.ExplicitInterfaceImplementations.
+        result.AddRange(symbol.ExplicitInterfaceImplementations());
+
+        return result.ToImmutable();
+    }
+
+    public static ImmutableArray<ISymbol> ExplicitInterfaceImplementations(this ISymbol symbol)
+        => symbol switch
+        {
+            IEventSymbol @event => ImmutableArray<ISymbol>.CastUp(@event.ExplicitInterfaceImplementations),
+            IMethodSymbol method => ImmutableArray<ISymbol>.CastUp(method.ExplicitInterfaceImplementations),
+            IPropertySymbol property => ImmutableArray<ISymbol>.CastUp(property.ExplicitInterfaceImplementations),
+            _ => [],
+        };
+
+    public static ImmutableArray<ITypeParameterSymbol> GetAllTypeParameters(this ISymbol? symbol)
+    {
+        var results = ImmutableArray.CreateBuilder<ITypeParameterSymbol>();
+
+        while (symbol != null)
+        {
+            results.AddRange(symbol.GetTypeParameters());
+            symbol = symbol.ContainingType;
+        }
+
+        return results.ToImmutable();
+    }
+
+    public static ImmutableArray<ITypeParameterSymbol> GetTypeParameters(this ISymbol? symbol)
+        => symbol switch
+        {
+            IMethodSymbol m => m.TypeParameters,
+            INamedTypeSymbol nt => nt.TypeParameters,
+            _ => [],
+        };
+
+    public static ImmutableArray<ITypeSymbol> GetAllTypeArguments(this ISymbol symbol)
+    {
+        var results = ImmutableArray.CreateBuilder<ITypeSymbol>();
+        results.AddRange(symbol.GetTypeArguments());
+
+        var containingType = symbol.ContainingType;
+        while (containingType != null)
+        {
+            results.AddRange(containingType.GetTypeArguments());
+            containingType = containingType.ContainingType;
+        }
+
+        return results.ToImmutable();
+    }
+
+    public static ImmutableArray<ITypeSymbol> GetTypeArguments(this ISymbol? symbol)
+        => symbol switch
+        {
+            IMethodSymbol m => m.TypeArguments,
+            INamedTypeSymbol nt => nt.TypeArguments,
+            _ => [],
+        };
+
+    public static ISymbol? GetOverriddenMember(this ISymbol? symbol, bool allowLooseMatch = false)
+    {
+        if (symbol is null)
+        {
+            return null;
+        }
+
+        ISymbol? exactMatch = symbol switch
+        {
+            IMethodSymbol method => method.OverriddenMethod,
+            IPropertySymbol property => property.OverriddenProperty,
+            IEventSymbol @event => @event.OverriddenEvent,
+            _ => null,
+        };
+
+        if (exactMatch != null)
+        {
+            return exactMatch;
+        }
+
+        if (allowLooseMatch &&
+            (symbol.IsVirtual || symbol.IsAbstract || symbol.IsOverride))
+        {
+            foreach (var baseType in symbol.ContainingType.GetBaseTypes())
+            {
+                if (TryFindLooseMatch(symbol, baseType, out var looseMatch))
+                {
+                    return looseMatch;
+                }
+            }
+        }
+
+        return null;
+
+        static bool TryFindLooseMatch(ISymbol symbol, INamedTypeSymbol baseType, [NotNullWhen(true)] out ISymbol? looseMatch)
+        {
+            IMethodSymbol? bestMethod = null;
+            var parameterCount = symbol.GetParameters().Length;
+
+            foreach (var member in baseType.GetMembers(symbol.Name))
+            {
+                if (member.Kind != symbol.Kind)
+                {
+                    continue;
+                }
+
+                if (!member.IsOverridable())
+                {
+                    continue;
+                }
+
+                if (symbol.Kind is SymbolKind.Event or SymbolKind.Property)
+                {
+                    // We've found a matching event/property in the base type (perhaps differing by return type). This
+                    // is a good enough match to return as a loose match for the starting symbol.
+                    looseMatch = member;
+                    return true;
+                }
+                else if (member is IMethodSymbol method)
+                {
+                    // Prefer methods that are closed in parameter count to the original method we started with.
+                    if (bestMethod is null || Math.Abs(method.Parameters.Length - parameterCount) < Math.Abs(bestMethod.Parameters.Length - parameterCount))
+                    {
+                        bestMethod = method;
+                    }
+                }
+            }
+
+            looseMatch = bestMethod;
+            return looseMatch != null;
+        }
+    }
+
+    public static bool IsOverridable([NotNullWhen(true)] this ISymbol? symbol)
+    {
+        // Members can only have overrides if they are virtual, abstract or override and is not sealed.
+        return symbol is { ContainingType.TypeKind: TypeKind.Class, IsSealed: false } &&
+               (symbol.IsVirtual || symbol.IsAbstract || symbol.IsOverride);
+    }
+
+    public static ImmutableArray<IParameterSymbol> GetParameters(this ISymbol? symbol)
+        => symbol switch
+        {
+            IMethodSymbol m => m.Parameters,
+            IPropertySymbol nt => nt.Parameters,
+            _ => [],
+        };
+
+    public static IEnumerable<INamedTypeSymbol> GetBaseTypes(this ITypeSymbol? type)
+    {
+        var current = type?.BaseType;
+        while (current != null)
+        {
+            yield return current;
+            current = current.BaseType;
+        }
+    }
+
+    public static bool IsAccessibleType(this ISymbol symbol)
+    {
+        // Check if the symbol itself is public
+        if (symbol.DeclaredAccessibility != Accessibility.Public)
+        {
+            return false;
+        }
+
+        // Check if all containing types are public as well
+        var containingType = symbol.ContainingType;
+        while (containingType != null)
+        {
+            if (containingType.DeclaredAccessibility != Accessibility.Public)
+            {
+                return false;
+            }
+            containingType = containingType.ContainingType;
+        }
+
+        return true;
+    }
+}
diff --git a/src/OpenApi/gen/Helpers/StringExtensions.cs b/src/OpenApi/gen/Helpers/StringExtensions.cs
new file mode 100644
index 000000000000..ee4a81284295
--- /dev/null
+++ b/src/OpenApi/gen/Helpers/StringExtensions.cs
@@ -0,0 +1,90 @@
+// 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.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+/// <summary>
+/// Extension methods for string manipulation.
+/// </summary>
+public static class StringExtensions
+{
+    /// <summary>
+    /// Trims whitespace from each line of text while preserving relative indentation.
+    /// </summary>
+    /// <param name="text">The text to trim.</param>
+    /// <param name="indent">Optional indentation to apply.</param>
+    /// <returns>The trimmed text with preserved indentation structure.</returns>
+    public static string TrimEachLine(this string text, string indent = "")
+    {
+        var minLeadingWhitespace = int.MaxValue;
+        var lines = text.ReadLines().ToList();
+        foreach (var line in lines)
+        {
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                continue;
+            }
+
+            var leadingWhitespace = 0;
+            while (leadingWhitespace < line.Length && char.IsWhiteSpace(line[leadingWhitespace]))
+            {
+                leadingWhitespace++;
+            }
+
+            minLeadingWhitespace = Math.Min(minLeadingWhitespace, leadingWhitespace);
+        }
+
+        var builder = new StringBuilder();
+
+        // Trim leading empty lines
+        var trimStart = true;
+
+        // Apply indentation to all lines except the first,
+        // since the first new line in <pre></code> is significant
+        var firstLine = true;
+
+        foreach (var line in lines)
+        {
+            if (trimStart && string.IsNullOrWhiteSpace(line))
+            {
+                continue;
+            }
+
+            if (firstLine)
+            {
+                firstLine = false;
+            }
+            else
+            {
+                builder.Append(indent);
+            }
+
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                builder.AppendLine();
+                continue;
+            }
+
+            trimStart = false;
+            builder.AppendLine(line.Substring(minLeadingWhitespace));
+        }
+
+        return builder.ToString().TrimEnd();
+    }
+
+    public static IEnumerable<string> ReadLines(this string text)
+    {
+        string line;
+        using var sr = new StringReader(text);
+        while ((line = sr.ReadLine()) != null)
+        {
+            yield return line;
+        }
+    }
+}
diff --git a/src/OpenApi/gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj b/src/OpenApi/gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj
new file mode 100644
index 000000000000..8ca8ad11dd21
--- /dev/null
+++ b/src/OpenApi/gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DebugSymbols>true</DebugSymbols>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IsAnalyzersProject>true</IsAnalyzersProject>
+    <AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
+    <Nullable>enable</Nullable>
+    <WarnOnNullable>true</WarnOnNullable>
+    <IsPackable>false</IsPackable>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="All" IsImplicitlyDefined="true" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="All" IsImplicitlyDefined="true" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)IsExternalInit.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)HashCode.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\IncrementalValuesProviderExtensions.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\CodeWriter.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Diagnostics\AnalyzerDebug.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/OpenApi/gen/XmlCommentGenerator.Emitter.cs b/src/OpenApi/gen/XmlCommentGenerator.Emitter.cs
new file mode 100644
index 000000000000..b7bff6ff1282
--- /dev/null
+++ b/src/OpenApi/gen/XmlCommentGenerator.Emitter.cs
@@ -0,0 +1,803 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+public sealed partial class XmlCommentGenerator : IIncrementalGenerator
+{
+    public static string GeneratedCodeConstructor => $@"System.CodeDom.Compiler.GeneratedCodeAttribute(""{typeof(XmlCommentGenerator).Assembly.FullName}"", ""{typeof(XmlCommentGenerator).Assembly.GetName().Version}"")";
+    public static string GeneratedCodeAttribute => $"[{GeneratedCodeConstructor}]";
+
+    internal static string GenerateXmlCommentSupportSource(string commentsFromXmlFile, string? commentsFromCompilation, ImmutableArray<(AddOpenApiInvocation Source, int Index, ImmutableArray<InterceptableLocation?> Elements)> groupedAddOpenApiInvocations) => $$"""
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    {{GeneratedCodeAttribute}}
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    {{GeneratedCodeAttribute}}
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    {{GeneratedCodeAttribute}}
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    {{GeneratedCodeAttribute}}
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    {{GeneratedCodeAttribute}}
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+{{commentsFromXmlFile}}
+{{commentsFromCompilation}}
+            return cache;
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file static class GeneratedServiceCollectionExtensions
+    {
+{{GenerateAddOpenApiInterceptions(groupedAddOpenApiInvocations)}}
+    }
+}
+
+""";
+
+    internal static string GetAddOpenApiInterceptor(AddOpenApiOverloadVariant overloadVariant) => overloadVariant switch
+    {
+        AddOpenApiOverloadVariant.AddOpenApi => """
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+                {
+                    return services.AddOpenApi("v1", options =>
+                    {
+                        options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                        options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                    });
+                }
+        """,
+        AddOpenApiOverloadVariant.AddOpenApiDocumentName => """
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, string documentName)
+                {
+                    return services.AddOpenApi(documentName, options =>
+                    {
+                        options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                        options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                    });
+                }
+        """,
+        AddOpenApiOverloadVariant.AddOpenApiConfigureOptions => """
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, Action<OpenApiOptions> configureOptions)
+                {
+                    return services.AddOpenApi("v1", options =>
+                    {
+                        options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                        options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                        configureOptions(options);
+                    });
+                }
+        """,
+        AddOpenApiOverloadVariant.AddOpenApiDocumentNameConfigureOptions => """
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, string documentName, Action<OpenApiOptions> configureOptions)
+                {
+                    // This overload is not intercepted.
+                    return OpenApiServiceCollectionExtensions.AddOpenApi(services, documentName, options =>
+                    {
+                        options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                        options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                        configureOptions(options);
+                    });
+                }
+        """,
+        _ => string.Empty // Effectively no-op for AddOpenApi invocations that do not conform to a variant
+    };
+
+    internal static string GenerateAddOpenApiInterceptions(ImmutableArray<(AddOpenApiInvocation Source, int Index, ImmutableArray<InterceptableLocation?> Elements)> groupedAddOpenApiInvocations)
+    {
+        var writer = new StringWriter();
+        var codeWriter = new CodeWriter(writer, baseIndent: 2);
+        foreach (var (source, _, locations) in groupedAddOpenApiInvocations)
+        {
+            foreach (var location in locations)
+            {
+                if (location is not null)
+                {
+                    codeWriter.WriteLine(location.GetInterceptsLocationAttributeSyntax());
+                }
+            }
+            codeWriter.WriteLine(GetAddOpenApiInterceptor(source.Variant));
+        }
+        return writer.ToString();
+    }
+
+    internal static string EmitCommentsCache(IEnumerable<(string MemberKey, XmlComment? Comment)> comments, CancellationToken cancellationToken)
+    {
+        var writer = new StringWriter();
+        var codeWriter = new CodeWriter(writer, baseIndent: 3);
+        foreach (var (memberKey, comment) in comments)
+        {
+            if (comment is not null)
+            {
+                codeWriter.WriteLine($"cache.Add({FormatStringForCode(memberKey)}, {EmitSourceGeneratedXmlComment(comment)});");
+            }
+        }
+        return writer.ToString();
+    }
+
+    private static string FormatStringForCode(string? input)
+    {
+        if (input == null)
+        {
+            return "null";
+        }
+
+        var formatted = input
+            .Replace("\"", "\"\""); // Escape double quotes
+
+        return $"@\"{formatted}\"";
+    }
+
+    internal static string EmitSourceGeneratedXmlComment(XmlComment comment)
+    {
+        var writer = new StringWriter();
+        var codeWriter = new CodeWriter(writer, baseIndent: 0);
+        codeWriter.Write($"new XmlComment(");
+        codeWriter.Write(FormatStringForCode(comment.Summary) + ", ");
+        codeWriter.Write(FormatStringForCode(comment.Description) + ", ");
+        codeWriter.Write(FormatStringForCode(comment.Remarks) + ", ");
+        codeWriter.Write(FormatStringForCode(comment.Returns) + ", ");
+        codeWriter.Write(FormatStringForCode(comment.Value) + ", ");
+        codeWriter.Write(comment.Deprecated == true ? "true" : "false" + ", ");
+        if (comment.Examples is null || comment.Examples.Count == 0)
+        {
+            codeWriter.Write("null, ");
+        }
+        else
+        {
+            codeWriter.Write("[");
+            for (var i = 0; i < comment.Examples.Count; i++)
+            {
+                var example = comment.Examples[i];
+                codeWriter.Write(FormatStringForCode(example));
+                if (i < comment.Examples.Count - 1)
+                {
+                    codeWriter.Write(", ");
+                }
+            }
+            codeWriter.Write("], ");
+        }
+
+        if (comment.Parameters is null || comment.Parameters.Count == 0)
+        {
+            codeWriter.Write("null, ");
+        }
+        else
+        {
+            codeWriter.Write("[");
+            for (var i = 0; i < comment.Parameters.Count; i++)
+            {
+                var parameter = comment.Parameters[i];
+                var exampleLiteral = string.IsNullOrEmpty(parameter.Example)
+                    ? "null"
+                    : FormatStringForCode(parameter.Example!);
+                codeWriter.Write("new XmlParameterComment(");
+                codeWriter.Write(FormatStringForCode(parameter.Name) + ", ");
+                codeWriter.Write(FormatStringForCode(parameter.Description) + ", ");
+                codeWriter.Write(exampleLiteral + ", ");
+                codeWriter.Write(parameter.Deprecated == true ? "true" : "false");
+                codeWriter.Write(")");
+                if (i < comment.Parameters.Count - 1)
+                {
+                    codeWriter.Write(", ");
+                }
+            }
+            codeWriter.Write("], ");
+        }
+
+        if (comment.Responses is null || comment.Responses.Count == 0)
+        {
+            codeWriter.Write("null");
+        }
+        else
+        {
+            codeWriter.Write("[");
+            for (var i = 0; i < comment.Responses.Count; i++)
+            {
+                var response = comment.Responses[i];
+                codeWriter.Write("new XmlResponseComment(");
+                codeWriter.Write(FormatStringForCode(response.Code) + ", ");
+                codeWriter.Write(FormatStringForCode(response.Description) + ", ");
+                codeWriter.Write(response.Example is null ? "null)" : FormatStringForCode(response.Example) + ")");
+                if (i < comment.Responses.Count - 1)
+                {
+                    codeWriter.Write(", ");
+                }
+            }
+            codeWriter.Write("]");
+        }
+        codeWriter.Write(")");
+        return writer.ToString();
+    }
+
+    internal static void Emit(SourceProductionContext context,
+        string commentsFromXmlFile,
+        string commentsFromCompilation,
+        ImmutableArray<(AddOpenApiInvocation Source, int Index, ImmutableArray<InterceptableLocation?> Elements)> groupedAddOpenApiInvocations)
+    {
+        context.AddSource("OpenApiXmlCommentSupport.generated.cs", GenerateXmlCommentSupportSource(commentsFromXmlFile, commentsFromCompilation, groupedAddOpenApiInvocations));
+    }
+}
diff --git a/src/OpenApi/gen/XmlCommentGenerator.Parser.cs b/src/OpenApi/gen/XmlCommentGenerator.Parser.cs
new file mode 100644
index 000000000000..ba8248194d20
--- /dev/null
+++ b/src/OpenApi/gen/XmlCommentGenerator.Parser.cs
@@ -0,0 +1,186 @@
+// 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.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using System.Xml.Linq;
+using Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+public sealed partial class XmlCommentGenerator
+{
+    /// <summary>
+    /// Normalizes a documentation comment ID to match the compiler-style format.
+    /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+    /// </summary>
+    /// <param name="docId">The documentation comment ID to normalize.</param>
+    /// <returns>The normalized documentation comment ID.</returns>
+    internal static string NormalizeDocId(string docId)
+    {
+        // Find the tilde character that indicates the return type suffix
+        var tildeIndex = docId.IndexOf('~');
+        if (tildeIndex == -1)
+        {
+            // No return type suffix, return as-is
+            return docId;
+        }
+
+        // Check if this is a conversion operator (op_Implicit or op_Explicit)
+        // For these operators, we need to keep the return type suffix
+        if (docId.Contains("op_Implicit", StringComparison.Ordinal) || docId.Contains("op_Explicit", StringComparison.Ordinal))
+        {
+            return docId;
+        }
+
+        // For ordinary methods, strip the return type suffix
+        return docId.Substring(0, tildeIndex);
+    }
+    internal static List<(string, string)> ParseXmlFile(AdditionalText additionalText, CancellationToken cancellationToken)
+    {
+        var text = additionalText.GetText(cancellationToken);
+        if (text is null)
+        {
+            return [];
+        }
+        XElement xml;
+        try
+        {
+            xml = XElement.Parse(text.ToString());
+        }
+        catch
+        {
+            return [];
+        }
+        var members = xml.Descendants("member");
+        var comments = new List<(string, string)>();
+        foreach (var member in members)
+        {
+            var name = member.Attribute(DocumentationCommentXmlNames.NameAttributeName)?.Value;
+            if (name is not null)
+            {
+                comments.Add((NormalizeDocId(name), member.ToString()));
+            }
+        }
+        return comments;
+    }
+
+    internal static List<(string, string)> ParseCompilation(Compilation compilation, CancellationToken cancellationToken)
+    {
+        var visitor = new AssemblyTypeSymbolsVisitor(compilation.Assembly, cancellationToken);
+        visitor.VisitAssembly();
+        var types = visitor.GetPublicTypes();
+        var comments = new List<(string, string)>();
+        foreach (var type in types)
+        {
+            if (DocumentationCommentId.CreateDeclarationId(type) is string name &&
+                type.GetDocumentationCommentXml(CultureInfo.InvariantCulture, expandIncludes: true, cancellationToken: cancellationToken) is string xml)
+            {
+                comments.Add((NormalizeDocId(name), xml));
+            }
+        }
+        var properties = visitor.GetPublicProperties();
+        foreach (var property in properties)
+        {
+            if (DocumentationCommentId.CreateDeclarationId(property) is string name &&
+                property.GetDocumentationCommentXml(CultureInfo.InvariantCulture, expandIncludes: true, cancellationToken: cancellationToken) is string xml)
+            {
+                comments.Add((NormalizeDocId(name), xml));
+            }
+        }
+        var methods = visitor.GetPublicMethods();
+        foreach (var method in methods)
+        {
+            // If the method is a constructor for a record, skip it because we will have already processed the type.
+            if (method.MethodKind == MethodKind.Constructor)
+            {
+                continue;
+            }
+            if (DocumentationCommentId.CreateDeclarationId(method) is string name &&
+                method.GetDocumentationCommentXml(CultureInfo.InvariantCulture, expandIncludes: true, cancellationToken: cancellationToken) is string xml)
+            {
+                comments.Add((NormalizeDocId(name), xml));
+            }
+        }
+        return comments;
+    }
+
+    internal static IEnumerable<(string, XmlComment?)> ParseComments(
+        (List<(string, string)> RawComments, Compilation Compilation) input,
+        CancellationToken cancellationToken)
+    {
+        var compilation = input.Compilation;
+        var comments = new List<(string, XmlComment?)>();
+        foreach (var (name, value) in input.RawComments)
+        {
+            if (DocumentationCommentId.GetFirstSymbolForDeclarationId(name, compilation) is ISymbol symbol &&
+                // Only include symbols that are declared in the application assembly or are
+                // accessible from the application assembly.
+                (SymbolEqualityComparer.Default.Equals(symbol.ContainingAssembly, compilation.Assembly) || symbol.IsAccessibleType()) &&
+                // Skip static classes that are just containers for members with annotations
+                // since they cannot be instantiated.
+                symbol is not INamedTypeSymbol { TypeKind: TypeKind.Class, IsStatic: true })
+            {
+                var parsedComment = XmlComment.Parse(symbol, compilation, value, cancellationToken);
+                if (parsedComment is not null)
+                {
+                    comments.Add((name, parsedComment));
+                }
+            }
+        }
+        return comments;
+    }
+
+    internal static bool FilterInvocations(SyntaxNode node, CancellationToken _)
+        => node is InvocationExpressionSyntax { Expression: MemberAccessExpressionSyntax { Name.Identifier.ValueText: "AddOpenApi" } };
+
+    internal static AddOpenApiInvocation GetAddOpenApiOverloadVariant(GeneratorSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var invocationExpression = (InvocationExpressionSyntax)context.Node;
+
+        // Soft check to validate that the method is from the OpenApiServiceCollectionExtensions class
+        // in the Microsoft.AspNetCore.OpenApi assembly.
+        var symbol = context.SemanticModel.GetSymbolInfo(invocationExpression, cancellationToken).Symbol;
+        if (symbol is not IMethodSymbol methodSymbol
+            || methodSymbol.ContainingType.Name != "OpenApiServiceCollectionExtensions"
+            || methodSymbol.ContainingAssembly.Name != "Microsoft.AspNetCore.OpenApi")
+        {
+            return new(AddOpenApiOverloadVariant.Unknown, invocationExpression, null);
+        }
+
+        var interceptableLocation = context.SemanticModel.GetInterceptableLocation(invocationExpression, cancellationToken);
+        var argumentsCount = invocationExpression.ArgumentList.Arguments.Count;
+        if (argumentsCount == 0)
+        {
+            return new(AddOpenApiOverloadVariant.AddOpenApi, invocationExpression, interceptableLocation);
+        }
+        else if (argumentsCount == 2)
+        {
+            return new(AddOpenApiOverloadVariant.AddOpenApiDocumentNameConfigureOptions, invocationExpression, interceptableLocation);
+        }
+        else
+        {
+            // We need to disambiguate between the two overloads that take a string and a delegate
+            // AddOpenApi("v1") vs. AddOpenApi(options => { }). The implementation here is pretty naive and
+            // won't handle cases where the document name is provided by a variable or a method call.
+            var argument = invocationExpression.ArgumentList.Arguments[0];
+            if (argument.Expression is LiteralExpressionSyntax)
+            {
+                return new(AddOpenApiOverloadVariant.AddOpenApiDocumentName, invocationExpression, interceptableLocation);
+            }
+            else if (argument.Expression is LambdaExpressionSyntax)
+            {
+                return new(AddOpenApiOverloadVariant.AddOpenApiConfigureOptions, invocationExpression, interceptableLocation);
+            }
+            else
+            {
+                return new(AddOpenApiOverloadVariant.Unknown, invocationExpression, null);
+            }
+        }
+    }
+}
diff --git a/src/OpenApi/gen/XmlCommentGenerator.cs b/src/OpenApi/gen/XmlCommentGenerator.cs
new file mode 100644
index 000000000000..84c736a92700
--- /dev/null
+++ b/src/OpenApi/gen/XmlCommentGenerator.cs
@@ -0,0 +1,57 @@
+// 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.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators;
+
+[Generator(LanguageNames.CSharp)]
+public sealed partial class XmlCommentGenerator : IIncrementalGenerator
+{
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        // Pull out XML comments from referenced assemblies passed in as AdditionalFiles.
+        var commentsFromXmlFile = context.AdditionalTextsProvider
+            .Where(file => file.Path.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
+            .Select(ParseXmlFile);
+        // Pull out XML comments from the target assembly using the information produced
+        // by Roslyn into the compilation.
+        var commentsFromTargetAssembly = context.CompilationProvider
+            .Select(ParseCompilation);
+        // Map string XML comments to structured data from both the AdditionalFiles
+        // and the target assembly.
+        var parsedCommentsFromXmlFile = commentsFromXmlFile
+            .Combine(context.CompilationProvider)
+            .Select(ParseComments);
+        var parsedCommentsFromCompilation = commentsFromTargetAssembly
+            .Combine(context.CompilationProvider)
+            .Select(ParseComments);
+        // Discover AddOpenApi invocations so that we can intercept them with an implicit
+        // registration of the transformers for mapping XML doc comments to the OpenAPI file.
+        var groupedAddOpenApiInvocations = context.SyntaxProvider
+            .CreateSyntaxProvider(FilterInvocations, GetAddOpenApiOverloadVariant)
+            .GroupWith((variantDetails) => variantDetails.Location, AddOpenApiInvocationComparer.Instance)
+            .Collect();
+
+        var generatedCommentsFromXmlFile = parsedCommentsFromXmlFile
+            .Select(EmitCommentsCache);
+        var generatedCommentsFromCompilation = parsedCommentsFromCompilation
+            .Select(EmitCommentsCache);
+
+        var result = generatedCommentsFromXmlFile.Collect()
+            .Combine(generatedCommentsFromCompilation)
+            .Combine(groupedAddOpenApiInvocations);
+
+        context.RegisterSourceOutput(result, (context, output) =>
+        {
+            var groupedAddOpenApiInvocations = output.Right;
+            var (generatedCommentsFromXmlFile, generatedCommentsFromCompilation) = output.Left;
+            var compiledXmlFileComments = !generatedCommentsFromXmlFile.IsDefaultOrEmpty
+                ? string.Join("\n", generatedCommentsFromXmlFile)
+                : string.Empty;
+            Emit(context, compiledXmlFileComments, generatedCommentsFromCompilation, groupedAddOpenApiInvocations);
+        });
+    }
+}
diff --git a/src/OpenApi/gen/XmlComments/XmlComment.InheritDoc.cs b/src/OpenApi/gen/XmlComments/XmlComment.InheritDoc.cs
new file mode 100644
index 000000000000..12ce950f24b0
--- /dev/null
+++ b/src/OpenApi/gen/XmlComments/XmlComment.InheritDoc.cs
@@ -0,0 +1,443 @@
+// 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.Collections;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using Microsoft.AspNetCore.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+/// <remarks>
+/// Source code in this class is derived from Roslyn's XML documentation comment processing
+/// to support the full resolution of <inheritdoc /> tags.
+/// For the original code, see https://github.com/dotnet/roslyn/blob/ef1d7fe925c94e96a93e4c9af50983e0f675a9fd/src/Workspaces/Core/Portable/Shared/Extensions/ISymbolExtensions.cs.
+/// </remarks>
+internal sealed partial class XmlComment
+{
+    private static string? GetDocumentationComment(ISymbol symbol, string xmlText, HashSet<ISymbol>? visitedSymbols, Compilation compilation, CancellationToken cancellationToken)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(xmlText))
+            {
+                if (IsEligibleForAutomaticInheritdoc(symbol))
+                {
+                    xmlText = $@"<doc><inheritdoc/></doc>";
+                }
+                else
+                {
+                    return string.Empty;
+                }
+            }
+
+            try
+            {
+                var element = XElement.Parse(xmlText, LoadOptions.PreserveWhitespace);
+                element.ReplaceNodes(RewriteMany(symbol, visitedSymbols, compilation, [.. element.Nodes()], cancellationToken));
+                xmlText = element.ToString(SaveOptions.DisableFormatting);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+            return xmlText;
+        }
+        catch (XmlException)
+        {
+            return null;
+        }
+    }
+
+    private static bool IsEligibleForAutomaticInheritdoc(ISymbol symbol)
+    {
+        // Only the following symbols are eligible to inherit documentation without an <inheritdoc/> element:
+        //
+        // * Members that override an inherited member
+        // * Members that implement an interface member
+        if (symbol.IsOverride)
+        {
+            return true;
+        }
+
+        if (symbol.ContainingType is null)
+        {
+            // Observed with certain implicit operators, such as operator==(void*, void*).
+            return false;
+        }
+
+        switch (symbol.Kind)
+        {
+            case SymbolKind.Method:
+            case SymbolKind.Property:
+            case SymbolKind.Event:
+                if (symbol.ExplicitOrImplicitInterfaceImplementations().Any())
+                {
+                    return true;
+                }
+
+                break;
+
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    private static XNode[] RewriteMany(ISymbol symbol, HashSet<ISymbol>? visitedSymbols, Compilation compilation, XNode[] nodes, CancellationToken cancellationToken)
+    {
+        var result = new List<XNode>();
+        foreach (var child in nodes)
+        {
+            result.AddRange(RewriteInheritdocElements(symbol, visitedSymbols, compilation, child, cancellationToken));
+        }
+
+        return [.. result];
+    }
+
+    private static XNode[] RewriteInheritdocElements(ISymbol symbol, HashSet<ISymbol>? visitedSymbols, Compilation compilation, XNode node, CancellationToken cancellationToken)
+    {
+        if (node.NodeType == XmlNodeType.Element)
+        {
+            var element = (XElement)node;
+            if (ElementNameIs(element, DocumentationCommentXmlNames.InheritdocElementName))
+            {
+                var rewritten = RewriteInheritdocElement(symbol, visitedSymbols, compilation, element, cancellationToken);
+                if (rewritten is not null)
+                {
+                    return rewritten;
+                }
+            }
+        }
+
+        if (node is not XContainer container)
+        {
+            return [Copy(node, copyAttributeAnnotations: false)];
+        }
+
+        var oldNodes = container.Nodes();
+
+        // Do this after grabbing the nodes, so we don't see copies of them.
+        container = Copy(container, copyAttributeAnnotations: false);
+
+        // WARN: don't use node after this point - use container since it's already been copied.
+
+        if (oldNodes != null)
+        {
+            var rewritten = RewriteMany(symbol, visitedSymbols, compilation, [.. oldNodes], cancellationToken);
+            container.ReplaceNodes(rewritten);
+        }
+
+        return [container];
+    }
+
+    private static XNode[]? RewriteInheritdocElement(ISymbol memberSymbol, HashSet<ISymbol>? visitedSymbols, Compilation compilation, XElement element, CancellationToken cancellationToken)
+    {
+        var crefAttribute = element.Attribute(XName.Get(DocumentationCommentXmlNames.CrefAttributeName));
+        var pathAttribute = element.Attribute(XName.Get(DocumentationCommentXmlNames.PathAttributeName));
+
+        var candidate = GetCandidateSymbol(memberSymbol);
+        var hasCandidateCref = candidate is object;
+
+        var hasCrefAttribute = crefAttribute is not null;
+        var hasPathAttribute = pathAttribute is not null;
+        if (!hasCrefAttribute && !hasCandidateCref)
+        {
+            // No cref available
+            return null;
+        }
+
+        ISymbol? symbol;
+        if (crefAttribute is null)
+        {
+            if (candidate is null)
+            {
+                return null;
+            }
+            symbol = candidate;
+        }
+        else
+        {
+            var crefValue = crefAttribute.Value;
+            symbol = DocumentationCommentId.GetFirstSymbolForDeclarationId(crefValue, compilation);
+            if (symbol is null)
+            {
+                return null;
+            }
+        }
+
+        visitedSymbols ??= [];
+        if (!visitedSymbols.Add(symbol!))
+        {
+            // Prevent recursion
+            return null;
+        }
+
+        try
+        {
+            var xmlDocumentation = symbol.GetDocumentationCommentXml(cancellationToken: cancellationToken);
+            if (xmlDocumentation is null)
+            {
+                return [];
+            }
+            var inheritedDocumentation = GetDocumentationComment(symbol, xmlDocumentation, visitedSymbols, compilation, cancellationToken);
+            if (inheritedDocumentation == string.Empty)
+            {
+                return [];
+            }
+
+            var document = XDocument.Parse(inheritedDocumentation, LoadOptions.PreserveWhitespace);
+            string xpathValue;
+            if (string.IsNullOrEmpty(pathAttribute?.Value))
+            {
+                xpathValue = BuildXPathForElement(element.Parent!);
+            }
+            else
+            {
+                xpathValue = pathAttribute!.Value;
+                if (xpathValue.StartsWith("/", StringComparison.InvariantCulture))
+                {
+                    // Account for the root <doc> or <member> element
+                    xpathValue = "/*" + xpathValue;
+                }
+            }
+
+            // Consider the following code, we want Test<int>.Clone to say "Clones a Test<int>" instead of "Clones a int", thus
+            // we rewrite `typeparamref`s as cref pointing to the correct type:
+            /*
+                public class Test<T> : ICloneable<Test<T>>
+                {
+                    /// <inheritdoc/>
+                    public Test<T> Clone() => new();
+                }
+
+                /// <summary>A type that has clonable instances.</summary>
+                /// <typeparam name="T">The type of instances that can be cloned.</typeparam>
+                public interface ICloneable<T>
+                {
+                    /// <summary>Clones a <typeparamref name="T"/>.</summary>
+                    public T Clone();
+                }
+            */
+            // Note: there is no way to cref an instantiated generic type. See https://github.com/dotnet/csharplang/issues/401
+            var typeParameterRefs = document.Descendants(DocumentationCommentXmlNames.TypeParameterReferenceElementName).ToImmutableArray();
+            foreach (var typeParameterRef in typeParameterRefs)
+            {
+                if (typeParameterRef.Attribute(DocumentationCommentXmlNames.NameAttributeName) is XAttribute typeParamName)
+                {
+                    var targetTypeParameter = symbol.GetAllTypeParameters().FirstOrDefault(p => p.Name == typeParamName.Value);
+                    if (targetTypeParameter is not null
+                        && symbol.OriginalDefinition.GetAllTypeParameters().IndexOf(targetTypeParameter) is int index
+                        && index >= 0)
+                    {
+                        var typeArgs = symbol.GetAllTypeArguments();
+                        if (index < typeArgs.Length)
+                        {
+                            var docId = typeArgs[index].GetDocumentationCommentId();
+                            if (docId != null && !docId.StartsWith("!", StringComparison.OrdinalIgnoreCase))
+                            {
+                                var replacement = new XElement(DocumentationCommentXmlNames.SeeElementName);
+                                replacement.SetAttributeValue(DocumentationCommentXmlNames.CrefAttributeName, docId);
+                                typeParameterRef.ReplaceWith(replacement);
+                            }
+                        }
+                    }
+                }
+            }
+
+            var loadedElements = TrySelectNodes(document, xpathValue);
+            return loadedElements ?? [];
+        }
+        catch (XmlException)
+        {
+            return [];
+        }
+        finally
+        {
+            visitedSymbols.Remove(symbol);
+        }
+
+        // Local functions
+        static ISymbol? GetCandidateSymbol(ISymbol memberSymbol)
+        {
+            if (memberSymbol.ExplicitInterfaceImplementations().Any())
+            {
+                return memberSymbol.ExplicitInterfaceImplementations().First();
+            }
+            else if (memberSymbol.IsOverride)
+            {
+                return memberSymbol.GetOverriddenMember();
+            }
+
+            if (memberSymbol is IMethodSymbol methodSymbol)
+            {
+                if (methodSymbol.MethodKind is MethodKind.Constructor or MethodKind.StaticConstructor)
+                {
+                    var baseType = memberSymbol.ContainingType.BaseType;
+#nullable disable // Can 'baseType' be null here? https://github.com/dotnet/roslyn/issues/39166
+                    return baseType.Constructors.Where(c => IsSameSignature(methodSymbol, c)).FirstOrDefault();
+#nullable enable
+                }
+                else
+                {
+                    // check for implicit interface
+                    return methodSymbol.ExplicitOrImplicitInterfaceImplementations().FirstOrDefault();
+                }
+            }
+            else if (memberSymbol is INamedTypeSymbol typeSymbol)
+            {
+                if (typeSymbol.TypeKind == TypeKind.Class)
+                {
+                    // Classes use the base type as the default inheritance candidate. A different target (e.g. an
+                    // interface) can be provided via the 'path' attribute.
+                    return typeSymbol.BaseType;
+                }
+                else if (typeSymbol.TypeKind == TypeKind.Interface)
+                {
+                    return typeSymbol.Interfaces.FirstOrDefault();
+                }
+                else
+                {
+                    // This includes structs, enums, and delegates as mentioned in the inheritdoc spec
+                    return null;
+                }
+            }
+
+            return memberSymbol.ExplicitOrImplicitInterfaceImplementations().FirstOrDefault();
+        }
+
+        static bool IsSameSignature(IMethodSymbol left, IMethodSymbol right)
+        {
+            if (left.Parameters.Length != right.Parameters.Length)
+            {
+                return false;
+            }
+
+            if (left.IsStatic != right.IsStatic)
+            {
+                return false;
+            }
+
+            if (!SymbolEqualityComparer.Default.Equals(left.ReturnType, right.ReturnType))
+            {
+                return false;
+            }
+
+            for (var i = 0; i < left.Parameters.Length; i++)
+            {
+                if (!SymbolEqualityComparer.Default.Equals(left.Parameters[i].Type, right.Parameters[i].Type))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        static string BuildXPathForElement(XElement element)
+        {
+            if (ElementNameIs(element, "member") || ElementNameIs(element, "doc"))
+            {
+                // Avoid string concatenation allocations for inheritdoc as a top-level element
+                return "/*/node()[not(self::overloads)]";
+            }
+
+            var path = "/node()[not(self::overloads)]";
+            for (var current = element; current != null; current = current.Parent)
+            {
+                var currentName = current.Name.ToString();
+                if (ElementNameIs(current, "member") || ElementNameIs(current, "doc"))
+                {
+                    // Allow <member> and <doc> to be used interchangeably
+                    currentName = "*";
+                }
+
+                path = "/" + currentName + path;
+            }
+
+            return path;
+        }
+    }
+
+    private static bool ElementNameIs(XElement element, string name)
+        => string.IsNullOrEmpty(element.Name.NamespaceName) && DocumentationCommentXmlNames.ElementEquals(element.Name.LocalName, name);
+
+    private static TNode Copy<TNode>(TNode node, bool copyAttributeAnnotations)
+        where TNode : XNode
+    {
+        XNode copy;
+
+        // Documents can't be added to containers, so our usual copy trick won't work.
+        if (node.NodeType == XmlNodeType.Document)
+        {
+            copy = new XDocument((XDocument)(object)node);
+        }
+        else
+        {
+            XContainer temp = new XElement("temp");
+            temp.Add(node);
+            copy = temp.LastNode!;
+            temp.RemoveNodes();
+        }
+
+        AnalyzerDebug.Assert(copy != node);
+        AnalyzerDebug.Assert(copy.Parent == null); // Otherwise, when we give it one, it will be copied.
+
+        // Copy annotations, the above doesn't preserve them.
+        // We need to preserve Location annotations as well as line position annotations.
+        CopyAnnotations(node, copy);
+
+        // We also need to preserve line position annotations for all attributes
+        // since we report errors with attribute locations.
+        if (copyAttributeAnnotations && node.NodeType == XmlNodeType.Element)
+        {
+            var sourceElement = (XElement)(object)node;
+            var targetElement = (XElement)copy;
+
+            var sourceAttributes = sourceElement.Attributes().GetEnumerator();
+            var targetAttributes = targetElement.Attributes().GetEnumerator();
+            while (sourceAttributes.MoveNext() && targetAttributes.MoveNext())
+            {
+                AnalyzerDebug.Assert(sourceAttributes.Current.Name == targetAttributes.Current.Name);
+                CopyAnnotations(sourceAttributes.Current, targetAttributes.Current);
+            }
+        }
+
+        return (TNode)copy;
+    }
+
+    private static void CopyAnnotations(XObject source, XObject target)
+    {
+        foreach (var annotation in source.Annotations<object>())
+        {
+            target.AddAnnotation(annotation);
+        }
+    }
+
+    private static XNode[]? TrySelectNodes(XNode node, string xpath)
+    {
+        try
+        {
+            var xpathResult = (IEnumerable)System.Xml.XPath.Extensions.XPathEvaluate(node, xpath);
+
+            // Throws InvalidOperationException if the result of the XPath is an XDocument:
+            return xpathResult?.Cast<XNode>().ToArray();
+        }
+        catch (InvalidOperationException)
+        {
+            return null;
+        }
+        catch (XPathException)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/OpenApi/gen/XmlComments/XmlComment.cs b/src/OpenApi/gen/XmlComments/XmlComment.cs
new file mode 100644
index 000000000000..0ec1f073f9b2
--- /dev/null
+++ b/src/OpenApi/gen/XmlComments/XmlComment.cs
@@ -0,0 +1,250 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+internal sealed partial class XmlComment
+{
+    public string? Summary { get; internal set; }
+    public string? Description { get; internal set; }
+    public string? Value { get; internal set; }
+    public string? Remarks { get; internal set; }
+    public string? Returns { get; internal set; }
+    public bool? Deprecated { get; internal set; }
+    public List<string?>? Examples { get; internal set; }
+    public List<XmlParameterComment> Parameters { get; internal set; } = [];
+    public List<XmlResponseComment> Responses { get; internal set; } = [];
+
+    private XmlComment(Compilation compilation, string xml)
+    {
+        // Treat <doc> as <member>
+        if (xml.StartsWith("<doc>", StringComparison.InvariantCulture) && xml.EndsWith("</doc>", StringComparison.InvariantCulture))
+        {
+            xml = xml.Substring(5, xml.Length - 11);
+            xml = xml.Trim();
+        }
+
+        // Transform triple slash comment
+        var doc = XDocument.Parse(xml, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+        ResolveCrefLink(compilation, doc, DocumentationCommentXmlNames.SeeAlsoElementName);
+        ResolveCrefLink(compilation, doc, DocumentationCommentXmlNames.SeeElementName);
+
+        ResolveLangKeyword(doc, DocumentationCommentXmlNames.SeeElementName);
+
+        // Resolve <list> and <item> tags into bullets
+        ResolveListTags(doc);
+        // Resolve <code> tags into code blocks
+        ResolveCodeTags(doc, DocumentationCommentXmlNames.CodeElementName, "```");
+        // Resolve <paramref> and typeparamref tags into parameter names
+        ResolveParamRefTags(doc);
+        // Resolve <para> tags into underlying content
+        ResolveParaTags(doc);
+        // Resolve <c> tags into inline code blocks
+        ResolveCodeTags(doc, DocumentationCommentXmlNames.CElementName, "`");
+
+        var nav = doc.CreateNavigator();
+        Summary = GetSingleNodeValue(nav, "/member/summary");
+        Description = GetSingleNodeValue(nav, "/member/description");
+        Remarks = GetSingleNodeValue(nav, "/member/remarks");
+        Returns = GetSingleNodeValue(nav, "/member/returns");
+        Value = GetSingleNodeValue(nav, "/member/value");
+        Deprecated = GetSingleNodeValue(nav, "/member/deprecated") == "true";
+
+        Examples = [.. GetMultipleExampleNodes(nav, "/member/example")];
+        Parameters = XmlParameterComment.GetXmlParameterListComment(nav, "/member/param");
+        Responses = XmlResponseComment.GetXmlResponseCommentList(nav, "/member/response");
+    }
+
+    private static void ResolveListTags(XDocument document)
+    {
+        var listElements = document.Descendants(DocumentationCommentXmlNames.ListElementName).ToArray();
+        foreach (var element in listElements)
+        {
+            if (element is null)
+            {
+                continue;
+            }
+            var rawListType = element.Attribute(DocumentationCommentXmlNames.TypeAttributeName)?.Value;
+            var listPrefix = rawListType switch
+            {
+                "table" => "* ",
+                "number" => "1. ",
+                "bullet" => "* ",
+                _ => "* ",
+            };
+            var items = element.Elements(DocumentationCommentXmlNames.ItemElementName);
+            if (items == null)
+            {
+                continue;
+            }
+            var bulletPoints = items
+                .Select(item => listPrefix + item?.Value?.TrimEachLine() ?? string.Empty)
+                .ToList();
+
+            var bulletText = string.Join("\n", bulletPoints);
+            element.ReplaceWith(new XText(bulletText));
+        }
+    }
+
+    private static void ResolveCodeTags(XDocument document, string tagName, string codeBlockDelimiter)
+    {
+        var codeElements = document.Descendants(tagName).ToArray();
+        foreach (var element in codeElements)
+        {
+            if (element is null)
+            {
+                continue;
+            }
+            var codeText = element.Value.TrimEachLine();
+            element.ReplaceWith(new XText(codeBlockDelimiter + codeText + codeBlockDelimiter));
+        }
+    }
+
+    private static void ResolveParamRefTags(XDocument document)
+    {
+        var paramRefElements = document.Descendants(DocumentationCommentXmlNames.ParameterReferenceElementName).ToArray();
+        foreach (var element in paramRefElements)
+        {
+            if (element is null)
+            {
+                continue;
+            }
+            var paramName = element.Attribute(DocumentationCommentXmlNames.NameAttributeName)?.Value;
+            if (paramName is null)
+            {
+                continue;
+            }
+            element.ReplaceWith(new XText(paramName));
+        }
+
+        var typeParamRefElements = document.Descendants(DocumentationCommentXmlNames.TypeParameterReferenceElementName).ToArray();
+        foreach (var element in typeParamRefElements)
+        {
+            if (element is null)
+            {
+                continue;
+            }
+            var paramName = element.Attribute(DocumentationCommentXmlNames.NameAttributeName)?.Value;
+            if (paramName is null)
+            {
+                continue;
+            }
+            element.ReplaceWith(new XText(paramName));
+        }
+    }
+
+    private static void ResolveParaTags(XDocument document)
+    {
+        var paraElements = document.Descendants(DocumentationCommentXmlNames.ParaElementName).ToArray();
+        foreach (var element in paraElements)
+        {
+            if (element is null)
+            {
+                continue;
+            }
+            var paraText = element.Value.TrimEachLine();
+            element.ReplaceWith(new XText(paraText));
+        }
+    }
+
+    public static XmlComment? Parse(ISymbol symbol, Compilation compilation, string xmlText, CancellationToken cancellationToken)
+    {
+        // Avoid processing empty or malformed XML comments.
+        if (string.IsNullOrEmpty(xmlText) ||
+            xmlText.StartsWith("<!-- Badly formed XML comment ignored for member ", StringComparison.Ordinal))
+        {
+            return null;
+        }
+
+        var resolvedComment = GetDocumentationComment(symbol, xmlText, [], compilation, cancellationToken);
+        return !string.IsNullOrEmpty(resolvedComment) ? new XmlComment(compilation, resolvedComment!) : null;
+    }
+
+    /// <summary>
+    /// Resolves the cref links in the XML documentation into type names.
+    /// </summary>
+    /// <param name="compilation">The compilation to resolve type symbol declarations from.</param>
+    /// <param name="node">The target node to process crefs in.</param>
+    /// <param name="elementName">The node type to process crefs for, can be `see` or `seealso`.</param>
+    private static void ResolveCrefLink(Compilation compilation, XNode node, string elementName)
+    {
+        if (node == null || string.IsNullOrEmpty(elementName))
+        {
+            return;
+        }
+
+        var attributeName = DocumentationCommentXmlNames.CrefAttributeName;
+
+        var nodes = node.XPathSelectElements($"//{elementName}[@{attributeName}]").ToArray();
+        foreach (var item in nodes)
+        {
+            var cref = item.Attribute(attributeName).Value;
+            if (string.IsNullOrEmpty(cref))
+            {
+                continue;
+            }
+
+            var symbol = DocumentationCommentId.GetFirstSymbolForDeclarationId(cref, compilation);
+            if (symbol is not null)
+            {
+                var type = symbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
+                item.ReplaceWith(new XText(type));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Resolves the links in the XML documentation into language keywords.
+    /// </summary>
+    /// <param name="node">The target node to process crefs in.</param>
+    /// <param name="elementName">The node type to process langwords for, can be `see` or `seealso`.</param>
+    private static void ResolveLangKeyword(XNode node, string elementName)
+    {
+        if (node == null || string.IsNullOrEmpty(elementName))
+        {
+            return;
+        }
+
+        var attributeName = DocumentationCommentXmlNames.LangwordAttributeName;
+
+        var nodes = node.XPathSelectElements($"//{elementName}[@{attributeName}]").ToArray();
+        foreach (var item in nodes)
+        {
+            var langword = item.Attribute(attributeName).Value;
+            if (string.IsNullOrEmpty(langword))
+            {
+                continue;
+            }
+
+            item.ReplaceWith(new XText($"`{langword}`"));
+        }
+    }
+
+    private static IEnumerable<string?> GetMultipleExampleNodes(XPathNavigator navigator, string selector)
+    {
+        var iterator = navigator.Select(selector);
+        if (iterator == null)
+        {
+            yield break;
+        }
+        foreach (XPathNavigator nav in iterator)
+        {
+            yield return nav.InnerXml.TrimEachLine();
+        }
+    }
+
+    private static string? GetSingleNodeValue(XPathNavigator nav, string selector)
+    {
+        var node = nav.Clone().SelectSingleNode(selector);
+        return node?.InnerXml.TrimEachLine();
+    }
+}
diff --git a/src/OpenApi/gen/XmlComments/XmlParameterComment.cs b/src/OpenApi/gen/XmlComments/XmlParameterComment.cs
new file mode 100644
index 000000000000..72823787f345
--- /dev/null
+++ b/src/OpenApi/gen/XmlComments/XmlParameterComment.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Xml.XPath;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+internal sealed class XmlParameterComment
+{
+    public string Name { get; set; } = string.Empty;
+    public string? Description { get; set; }
+    public string? Example { get; set; }
+    public bool? Deprecated { get; set; }
+
+    public static List<XmlParameterComment> GetXmlParameterListComment(XPathNavigator navigator, string xpath)
+    {
+        var iterator = navigator.Select(xpath);
+        var result = new List<XmlParameterComment>();
+        if (iterator == null)
+        {
+            return result;
+        }
+        foreach (XPathNavigator nav in iterator)
+        {
+            var name = nav.GetAttribute("name", string.Empty);
+
+            if (!string.IsNullOrEmpty(name))
+            {
+                var description = nav.InnerXml.TrimEachLine();
+                var example = nav.GetAttribute("example", string.Empty);
+                var deprecated = nav.GetAttribute("deprecated", string.Empty);
+                result.Add(new XmlParameterComment { Name = name, Description = description, Example = example, Deprecated = deprecated == "true" });
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/src/OpenApi/gen/XmlComments/XmlResponseComment.cs b/src/OpenApi/gen/XmlComments/XmlResponseComment.cs
new file mode 100644
index 000000000000..8cfc7f940520
--- /dev/null
+++ b/src/OpenApi/gen/XmlComments/XmlResponseComment.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Xml.XPath;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Xml;
+
+internal sealed class XmlResponseComment
+{
+    public string Code { get; set; } = string.Empty;
+    public string? Description { get; set; }
+
+    public string? Example { get; set; }
+
+    public static List<XmlResponseComment> GetXmlResponseCommentList(XPathNavigator navigator, string xpath)
+    {
+        var iterator = navigator.Select(xpath);
+        var result = new List<XmlResponseComment>();
+        if (iterator == null)
+        {
+            return result;
+        }
+
+        foreach (XPathNavigator nav in iterator)
+        {
+            var code = nav.GetAttribute("code", string.Empty);
+
+            if (!string.IsNullOrEmpty(code))
+            {
+                var description = nav.InnerXml.TrimEachLine();
+                var example = nav.GetAttribute("example", string.Empty);
+                result.Add(new XmlResponseComment { Code = code, Description = description, Example = example });
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/src/OpenApi/perf/Microbenchmarks/OpenApiSchemaComparerBenchmark.cs b/src/OpenApi/perf/Microbenchmarks/OpenApiSchemaComparerBenchmark.cs
deleted file mode 100644
index 64bf0ce2736a..000000000000
--- a/src/OpenApi/perf/Microbenchmarks/OpenApiSchemaComparerBenchmark.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Globalization;
-using BenchmarkDotNet.Attributes;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi.Microbenchmarks;
-
-public class OpenApiSchemaComparerBenchmark
-{
-    [Params(1, 10, 100)]
-    public int ElementCount { get; set; }
-
-    private OpenApiSchema _schema;
-
-    [GlobalSetup]
-    public void OpenApiSchema_Setup()
-    {
-        _schema = new OpenApiSchema
-        {
-            AdditionalProperties = GenerateInnerSchema(),
-            AdditionalPropertiesAllowed = true,
-            AllOf = Enumerable.Range(0, ElementCount).Select(_ => GenerateInnerSchema()).ToList(),
-            AnyOf = Enumerable.Range(0, ElementCount).Select(_ => GenerateInnerSchema()).ToList(),
-            Deprecated = true,
-            Default = new OpenApiString("default"),
-            Description = "description",
-            Discriminator = new OpenApiDiscriminator(),
-            Example = new OpenApiString("example"),
-            ExclusiveMaximum = true,
-            ExclusiveMinimum = true,
-            Extensions = new Dictionary<string, IOpenApiExtension>
-            {
-                ["key"] = new OpenApiString("value")
-            },
-            ExternalDocs = new OpenApiExternalDocs(),
-            Enum = Enumerable.Range(0, ElementCount).Select(_ => (IOpenApiAny)new OpenApiString("enum")).ToList(),
-            OneOf = Enumerable.Range(0, ElementCount).Select(_ => GenerateInnerSchema()).ToList(),
-        };
-
-        static OpenApiSchema GenerateInnerSchema() => new OpenApiSchema
-        {
-            Properties = Enumerable.Range(0, 10).ToDictionary(i => i.ToString(CultureInfo.InvariantCulture), _ => new OpenApiSchema()),
-            Deprecated = true,
-            Default = new OpenApiString("default"),
-            Description = "description",
-            Example = new OpenApiString("example"),
-            Extensions = new Dictionary<string, IOpenApiExtension>
-            {
-                ["key"] = new OpenApiString("value")
-            },
-        };
-    }
-
-    [Benchmark]
-    public int OpenApiSchema_GetHashCode() => OpenApiSchemaComparer.Instance.GetHashCode(_schema);
-
-    [Benchmark]
-    public OpenApiSchema OpenApiSchema_Clone() => OpenApiSchemaExtensions.Clone(_schema);
-}
diff --git a/src/OpenApi/perf/Microbenchmarks/TransformersBenchmark.cs b/src/OpenApi/perf/Microbenchmarks/TransformersBenchmark.cs
index a5a117b54bd9..87434483fc0a 100644
--- a/src/OpenApi/perf/Microbenchmarks/TransformersBenchmark.cs
+++ b/src/OpenApi/perf/Microbenchmarks/TransformersBenchmark.cs
@@ -5,8 +5,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace Microsoft.AspNetCore.OpenApi.Microbenchmarks;
 
@@ -102,13 +101,14 @@ public void SchemaTransformer_Setup()
         {
             _options.AddSchemaTransformer((schema, context, token) =>
             {
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
                 if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription != null)
                 {
-                    schema.Extensions["x-my-extension"] = new OpenApiString(context.ParameterDescription.Name);
+                    schema.Extensions["x-my-extension"] = new JsonNodeExtension(context.ParameterDescription.Name);
                 }
                 else
                 {
-                    schema.Extensions["x-my-extension"] = new OpenApiString("response");
+                    schema.Extensions["x-my-extension"] = new JsonNodeExtension("response");
                 }
                 return Task.CompletedTask;
             });
@@ -175,13 +175,14 @@ private class SchemaTransformer : IOpenApiSchemaTransformer
     {
         public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
         {
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
             if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription != null)
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString(context.ParameterDescription.Name);
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension(context.ParameterDescription.Name);
             }
             else
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("response");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("response");
             }
             return Task.CompletedTask;
         }
diff --git a/src/OpenApi/sample/Controllers/TestController.cs b/src/OpenApi/sample/Controllers/TestController.cs
index cf1fed79abb2..43a1e22250f9 100644
--- a/src/OpenApi/sample/Controllers/TestController.cs
+++ b/src/OpenApi/sample/Controllers/TestController.cs
@@ -3,7 +3,9 @@
 
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
 
 [ApiController]
 [Route("[controller]")]
@@ -17,6 +19,13 @@ public string GetByIdAndName(RouteParamsContainer paramsContainer)
         return paramsContainer.Id + "_" + paramsContainer.Name;
     }
 
+    [HttpGet]
+    [Route("/gettypedresult")]
+    public Ok<MvcTodo> GetTypedResult()
+    {
+        return TypedResults.Ok(new MvcTodo("Title", "Description", true));
+    }
+
     [HttpPost]
     [Route("/forms")]
     public IActionResult PostForm([FromForm] MvcTodo todo)
@@ -24,16 +33,43 @@ public IActionResult PostForm([FromForm] MvcTodo todo)
         return Ok(todo);
     }
 
+    [HttpGet]
+    [Route("/getcultureinvariant")]
+    public Ok<CurrentWeather> GetCurrentWeather()
+    {
+        return TypedResults.Ok(new CurrentWeather(1.0f));
+    }
+
+    [Route("/nohttpmethod")]
+    public ActionResult<CurrentWeather> NoHttpMethod()
+        => Ok(new CurrentWeather(-100));
+
+    [HttpQuery]
+    [Route("/query")]
+    public ActionResult<CurrentWeather> HttpQueryMethod()
+        => Ok(new CurrentWeather(0));
+
+    [HttpFoo] // See https://github.com/dotnet/aspnetcore/issues/60914
+    [Route("/unsupported")]
+    public ActionResult<CurrentWeather> UnsupportedHttpMethod()
+        => Ok(new CurrentWeather(100));
+
+    public class HttpQuery() : HttpMethodAttribute(["QUERY"]);
+
+    public class HttpFoo() : HttpMethodAttribute(["FOO"]);
+
     public class RouteParamsContainer
     {
-        [FromRoute]
+        [FromRoute(Name = "id")]
         public int Id { get; set; }
 
-        [FromRoute]
+        [FromRoute(Name = "name")]
         [MinLength(5)]
         [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "MinLengthAttribute works without reflection on string properties.")]
         public string? Name { get; set; }
     }
 
     public record MvcTodo(string Title, string Description, bool IsCompleted);
+
+    public record CurrentWeather([property: Range(-100.5f, 100.5f)] float Temperature = 0.1f);
 }
diff --git a/src/OpenApi/sample/Controllers/XmlController.cs b/src/OpenApi/sample/Controllers/XmlController.cs
new file mode 100644
index 000000000000..d2849c6b304c
--- /dev/null
+++ b/src/OpenApi/sample/Controllers/XmlController.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+[Route("[controller]")]
+[ApiExplorerSettings(GroupName = "xml")]
+public class XmlController : ControllerBase
+{
+    /// <summary>
+    /// A summary of the action.
+    /// </summary>
+    /// <description>
+    /// A description of the action.
+    /// </description>
+    [HttpGet]
+    public string Get()
+    {
+        return "Hello, World!";
+    }
+
+    /// <param name="name">The name of the person.</param>
+    /// <response code="200">Returns the greeting.</response>
+    [HttpGet]
+    public string Get1(string name)
+    {
+        return $"Hello, {name}!";
+    }
+
+    /// <param name="todo">The todo to insert into the database.</param>
+    [HttpPost]
+    public string Post(Todo todo)
+    {
+        return $"Hello, {todo.Title}!";
+    }
+
+    public record Todo(int Id, string Title, bool Completed);
+}
diff --git a/src/OpenApi/sample/Endpoints/MapFormEndpoints.cs b/src/OpenApi/sample/Endpoints/MapFormEndpoints.cs
new file mode 100644
index 000000000000..2fc4fc60699a
--- /dev/null
+++ b/src/OpenApi/sample/Endpoints/MapFormEndpoints.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Mvc;
+
+public static class FormEndpoints
+{
+    public static IEndpointRouteBuilder MapFormEndpoints(this WebApplication app)
+    {
+        var forms = app.MapGroup("/forms")
+            .WithGroupName("forms");
+
+        if (app.Environment.IsDevelopment())
+        {
+            forms.DisableAntiforgery();
+        }
+
+        forms.MapPost("/form-file", (IFormFile resume) => Results.Ok(resume.FileName));
+        forms.MapPost("/form-files", (IFormFileCollection files) => Results.Ok(files.Count));
+        forms.MapPost("/form-file-multiple", (IFormFile resume, IFormFileCollection files) => Results.Ok(files.Count + resume.FileName));
+        // Disable warnings because RDG does not support complex form binding yet.
+#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
+#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
+#pragma warning disable RDG003 // Unable to resolve parameter
+        forms.MapPost("/form-todo", ([FromForm] Todo todo) => Results.Ok(todo));
+        forms.MapPost("/forms-pocos-and-files", ([FromForm] Todo todo, IFormFile file) => Results.Ok(new { Todo = todo, File = file.FileName }));
+#pragma warning restore RDG003 // Unable to resolve parameter
+#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
+#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
+
+        return app;
+    }
+}
diff --git a/src/OpenApi/sample/Endpoints/MapResponsesEndpoints.cs b/src/OpenApi/sample/Endpoints/MapResponsesEndpoints.cs
new file mode 100644
index 000000000000..b2f9cac4f6a6
--- /dev/null
+++ b/src/OpenApi/sample/Endpoints/MapResponsesEndpoints.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+public static class ResponseEndpoints
+{
+    public static IEndpointRouteBuilder MapResponseEndpoints(this IEndpointRouteBuilder endpointRouteBuilder)
+    {
+        var responses = endpointRouteBuilder.MapGroup("/responses")
+            .WithGroupName("responses");
+
+        responses.MapGet("/200-add-xml", () => new TodoWithDueDate(1, "Test todo", false, DateTime.Now.AddDays(1), DateTime.Now))
+            .Produces<Todo>(additionalContentTypes: "text/xml");
+
+        responses.MapGet("/200-only-xml", () => new TodoWithDueDate(1, "Test todo", false, DateTime.Now.AddDays(1), DateTime.Now))
+            .Produces<Todo>(contentType: "text/xml");
+
+        responses.MapGet("/triangle", () => new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 });
+        responses.MapGet("/shape", Shape () => new Triangle { Color = "blue", Sides = 4 });
+
+        return endpointRouteBuilder;
+    }
+}
diff --git a/src/OpenApi/sample/Endpoints/MapSchemasEndpoints.cs b/src/OpenApi/sample/Endpoints/MapSchemasEndpoints.cs
new file mode 100644
index 000000000000..958a2fd9c47c
--- /dev/null
+++ b/src/OpenApi/sample/Endpoints/MapSchemasEndpoints.cs
@@ -0,0 +1,271 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.ComponentModel;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
+
+public static class SchemasEndpointsExtensions
+{
+    public static IEndpointRouteBuilder MapSchemasEndpoints(this IEndpointRouteBuilder endpointRouteBuilder)
+    {
+        var schemas = endpointRouteBuilder.MapGroup("schemas-by-ref")
+            .WithGroupName("schemas-by-ref");
+
+        schemas.MapGet("/typed-results", () => TypedResults.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 }));
+        schemas.MapGet("/multiple-results", Results<Ok<Triangle>, NotFound<string>> () => Random.Shared.Next(0, 2) == 0
+            ? TypedResults.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 })
+            : TypedResults.NotFound<string>("Item not found."));
+        schemas.MapGet("/iresult-no-produces", () => Results.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 }));
+        schemas.MapGet("/iresult-with-produces", () => Results.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 }))
+            .Produces<Triangle>(200, "text/xml");
+        schemas.MapGet("/primitives", ([Description("The ID associated with the Todo item.")] int id, [Description("The number of Todos to fetch")] int size) => { });
+        schemas.MapGet("/product", (Product product) => TypedResults.Ok(product));
+        schemas.MapGet("/account", (Account account) => TypedResults.Ok(account));
+        schemas.MapPost("/array-of-ints", (int[] values) => values.Sum());
+        schemas.MapPost("/list-of-ints", (List<int> values) => values.Count);
+        schemas.MapPost("/ienumerable-of-ints", (IEnumerable<int> values) => values.Count());
+        schemas.MapGet("/dictionary-of-ints", () => new Dictionary<string, int> { { "one", 1 }, { "two", 2 } });
+        schemas.MapGet("/frozen-dictionary-of-ints", () => ImmutableDictionary.CreateRange(new Dictionary<string, int> { { "one", 1 }, { "two", 2 } }));
+        schemas.MapPost("/shape", (Shape shape) => { });
+        schemas.MapPost("/weatherforecastbase", (WeatherForecastBase forecast) => { });
+        schemas.MapPost("/person", (Person person) => { });
+        schemas.MapPost("/category", (Category category) => { });
+        schemas.MapPost("/container", (ContainerType container) => { });
+        schemas.MapPost("/root", (Root root) => { });
+        schemas.MapPost("/location", (LocationContainer location) => { });
+        schemas.MapPost("/parent", (ParentObject parent) => Results.Ok(parent));
+        schemas.MapPost("/child", (ChildObject child) => Results.Ok(child));
+        schemas.MapPatch("/json-patch", (JsonPatchDocument patchDoc) => Results.NoContent());
+        schemas.MapPatch("/json-patch-generic", (JsonPatchDocument<ParentObject> patchDoc) => Results.NoContent());
+        schemas.MapGet("/custom-iresult", () => new CustomIResultImplementor { Content = "Hello world!" })
+            .Produces<CustomIResultImplementor>(200);
+
+        // Tests for validating scenarios related to https://github.com/dotnet/aspnetcore/issues/61194
+        schemas.MapPost("/config-with-generic-lists", (Config config) => Results.Ok(config));
+        schemas.MapPost("/project-response", (ProjectResponse project) => Results.Ok(project));
+        schemas.MapPost("/subscription", (Subscription subscription) => Results.Ok(subscription));
+
+        // Tests for oneOf nullable behavior on responses and request bodies
+        schemas.MapGet("/nullable-response", () => TypedResults.Ok(new NullableResponseModel
+        {
+            RequiredProperty = "required",
+            NullableProperty = null,
+            NullableComplexProperty = null
+        }));
+        schemas.MapGet("/nullable-return-type", NullableResponseModel? () => new NullableResponseModel
+        {
+            RequiredProperty = "required",
+            NullableProperty = null,
+            NullableComplexProperty = null
+        });
+        schemas.MapPost("/nullable-request", (NullableRequestModel? request) => Results.Ok(request));
+        schemas.MapPost("/complex-nullable-hierarchy", (ComplexHierarchyModel model) => Results.Ok(model));
+
+        // Additional edge cases for nullable testing
+        schemas.MapPost("/nullable-array-elements", (NullableArrayModel model) => Results.Ok(model));
+        schemas.MapGet("/optional-with-default", () => TypedResults.Ok(new ModelWithDefaults()));
+        schemas.MapGet("/nullable-enum-response", () => TypedResults.Ok(new EnumNullableModel
+        {
+            RequiredEnum = TestEnum.Value1,
+            NullableEnum = null
+        }));
+
+        return endpointRouteBuilder;
+    }
+
+    public class CustomIResultImplementor : IResult
+    {
+        public required string Content { get; set; }
+        public Task ExecuteAsync(HttpContext httpContext)
+        {
+            return Task.CompletedTask;
+        }
+    }
+
+    public sealed class Category
+    {
+        public required string Name { get; set; }
+
+        public required Category Parent { get; set; }
+
+        public IEnumerable<Tag> Tags { get; set; } = [];
+    }
+
+    public sealed class Tag
+    {
+        public required string Name { get; set; }
+    }
+
+    public sealed class ContainerType
+    {
+        public List<List<string>> Seq1 { get; set; } = [];
+        public List<List<string>> Seq2 { get; set; } = [];
+    }
+
+    public sealed class Root
+    {
+        public Item Item1 { get; set; } = null!;
+        public Item Item2 { get; set; } = null!;
+    }
+
+    public sealed class Item
+    {
+        public string[] Name { get; set; } = null!;
+        public int value { get; set; }
+    }
+
+    public sealed class LocationContainer
+    {
+        public required LocationDto Location { get; set; }
+    }
+
+    public sealed class LocationDto
+    {
+        public required AddressDto Address { get; set; }
+    }
+
+    public sealed class AddressDto
+    {
+        public required LocationDto RelatedLocation { get; set; }
+    }
+
+    public sealed class ParentObject
+    {
+        public int Id { get; set; }
+        public List<ChildObject> Children { get; set; } = [];
+    }
+
+    public sealed class ChildObject
+    {
+        public int Id { get; set; }
+        public required ParentObject Parent { get; set; }
+    }
+
+    // Example types for GitHub issue 61194: Generic types referenced multiple times
+    public sealed class Config
+    {
+        public List<ConfigItem> Items1 { get; set; } = [];
+        public List<ConfigItem> Items2 { get; set; } = [];
+    }
+
+    public sealed class ConfigItem
+    {
+        public int? Id { get; set; }
+        public string? Lang { get; set; }
+        public Dictionary<string, object?>? Words { get; set; }
+        public List<string>? Break { get; set; }
+        public string? WillBeGood { get; set; }
+    }
+
+    // Example types for GitHub issue 63054: Reused types across different hierarchies
+    public sealed class ProjectResponse
+    {
+        public required ProjectAddressResponse Address { get; init; }
+        public required ProjectBuilderResponse Builder { get; init; }
+    }
+
+    public sealed class ProjectAddressResponse
+    {
+        public required CityResponse City { get; init; }
+    }
+
+    public sealed class ProjectBuilderResponse
+    {
+        public required CityResponse City { get; init; }
+    }
+
+    public sealed class CityResponse
+    {
+        public string Name { get; set; } = "";
+    }
+
+    // Example types for GitHub issue 63211: Nullable reference types
+    public sealed class Subscription
+    {
+        public required string Id { get; set; }
+        public required RefProfile PrimaryUser { get; set; }
+        public RefProfile? SecondaryUser { get; set; }
+    }
+
+    public sealed class RefProfile
+    {
+        public required RefUser User { get; init; }
+    }
+
+    public sealed class RefUser
+    {
+        public string Name { get; set; } = "";
+        public string Email { get; set; } = "";
+    }
+
+    // Models for testing oneOf nullable behavior
+    public sealed class NullableResponseModel
+    {
+        public required string RequiredProperty { get; set; }
+        public string? NullableProperty { get; set; }
+        public ComplexType? NullableComplexProperty { get; set; }
+    }
+
+    public sealed class NullableRequestModel
+    {
+        public required string RequiredField { get; set; }
+        public string? OptionalField { get; set; }
+        public List<string>? NullableList { get; set; }
+        public Dictionary<string, string?>? NullableDictionary { get; set; }
+    }
+
+    // Complex hierarchy model for testing nested nullable properties
+    public sealed class ComplexHierarchyModel
+    {
+        public required string Id { get; set; }
+        public NestedModel? OptionalNested { get; set; }
+        public required NestedModel RequiredNested { get; set; }
+        public List<NestedModel?>? NullableListWithNullableItems { get; set; }
+    }
+
+    public sealed class NestedModel
+    {
+        public required string Name { get; set; }
+        public int? OptionalValue { get; set; }
+        public ComplexType? DeepNested { get; set; }
+    }
+
+    public sealed class ComplexType
+    {
+        public string? Description { get; set; }
+        public DateTime? Timestamp { get; set; }
+    }
+
+    // Additional models for edge case testing
+    public sealed class NullableArrayModel
+    {
+        public string[]? NullableArray { get; set; }
+        public List<string?> ListWithNullableElements { get; set; } = [];
+        public Dictionary<string, string?>? NullableDictionaryWithNullableValues { get; set; }
+    }
+
+    public sealed class ModelWithDefaults
+    {
+        public string PropertyWithDefault { get; set; } = "default";
+        public string? NullableWithNull { get; set; }
+        public int NumberWithDefault { get; set; } = 42;
+        public bool BoolWithDefault { get; set; } = true;
+    }
+
+    // Enum testing with nullable
+    public enum TestEnum
+    {
+        Value1,
+        Value2,
+        Value3
+    }
+
+    public sealed class EnumNullableModel
+    {
+        public required TestEnum RequiredEnum { get; set; }
+        public TestEnum? NullableEnum { get; set; }
+        public List<TestEnum?> ListOfNullableEnums { get; set; } = [];
+    }
+}
diff --git a/src/OpenApi/sample/Endpoints/MapVersionedEndpoints.cs b/src/OpenApi/sample/Endpoints/MapVersionedEndpoints.cs
new file mode 100644
index 000000000000..a30ee2d3df9e
--- /dev/null
+++ b/src/OpenApi/sample/Endpoints/MapVersionedEndpoints.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+public static class VersionedEndpointsExtensions
+{
+    public static IEndpointRouteBuilder MapV1Endpoints(this IEndpointRouteBuilder endpointRouteBuilder)
+    {
+        var v1 = endpointRouteBuilder.MapGroup("/v1")
+            .WithGroupName("v1");
+
+        v1.MapGet("/array-of-guids", (Guid[] guids) => guids);
+
+        v1.MapPost("/todos", (Todo todo) => Results.Created($"/todos/{todo.Id}", todo))
+            .WithSummary("Creates a new todo item.");
+        v1.MapGet("/todos/{id}", (int id) => new TodoWithDueDate(1, "Test todo", false, DateTime.Now.AddDays(1), DateTime.Now))
+            .WithDescription("Returns a specific todo item.");
+
+        return endpointRouteBuilder;
+    }
+
+    public static IEndpointRouteBuilder MapV2Endpoints(this IEndpointRouteBuilder endpointRouteBuilder)
+    {
+        var v2 = endpointRouteBuilder.MapGroup("/v2")
+            .WithGroupName("v2");
+
+        v2.MapGet("/users", () => new[] { "alice", "bob" })
+            .WithTags("users");
+
+        v2.MapPost("/users", () => Results.Created("/users/1", new { Id = 1, Name = "Test user" }))
+            .WithName("CreateUser");
+
+        return endpointRouteBuilder;
+    }
+}
diff --git a/src/OpenApi/sample/Endpoints/MapXmlEndpoints.cs b/src/OpenApi/sample/Endpoints/MapXmlEndpoints.cs
new file mode 100644
index 000000000000..fa34c306ef67
--- /dev/null
+++ b/src/OpenApi/sample/Endpoints/MapXmlEndpoints.cs
@@ -0,0 +1,114 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+public static class XmlEndpointExtensions
+{
+    public static IEndpointRouteBuilder MapXmlEndpoints(this IEndpointRouteBuilder endpointRouteBuilder)
+    {
+        var group = endpointRouteBuilder.MapGroup("/xml")
+            .WithGroupName("xml");
+
+        group.MapGet("/type-with-examples", (TypeWithExamples typeWithExamples) =>
+            TypedResults.Ok(typeWithExamples));
+
+        group.MapPost("/todo", (TodoFomInterface todo) => { });
+        group.MapPost("/project", (Project project) => { });
+        group.MapPost("/board", (ProjectBoard.BoardItem boardItem) => { });
+
+        group.MapPost("/project-record", (ProjectRecord projectRecord) => { });
+
+        group.MapPost("/todo-with-description", (TodoWithDescription todo) => { });
+
+        return endpointRouteBuilder;
+    }
+
+    public class TypeWithExamples
+    {
+        /// <example>true</example>
+        public bool BooleanType { get; set; }
+        /// <example>42</example>
+        public int IntegerType { get; set; }
+        /// <example>1234567890123456789</example>
+        public long LongType { get; set; }
+        /// <example>3.14</example>
+        public double DoubleType { get; set; }
+        /// <example>3.14</example>
+        public float FloatType { get; set; }
+        /// <example>2022-01-01T00:00:00Z</example>
+        public DateTime DateTimeType { get; set; }
+        /// <example>2022-01-01</example>
+        public DateOnly DateOnlyType { get; set; }
+    }
+
+    public interface ITodo
+    {
+        /// <summary>
+        /// The identifier of the todo.
+        /// </summary>
+        int Id { get; set; }
+
+        /// <value>
+        /// The name of the todo.
+        /// </value>
+        string Name { get; set; }
+    }
+
+    /// <summary>
+    /// This is a todo item.
+    /// </summary>
+    public class TodoFomInterface : ITodo
+    {
+        /// <inheritdoc />
+        public int Id { get; set; }
+
+        /// <inheritdoc />
+        public required string Name { get; set; }
+
+        /// <summary>
+        /// A description of the todo.
+        /// </summary>
+        public required string Description { get; set; }
+    }
+
+    /// <summary>
+    /// The project that contains <see cref="Todo"/> items.
+    /// </summary>
+    public record Project(string Name, string Description);
+
+    public class ProjectBoard
+    {
+        /// <summary>
+        /// An item on the board.
+        /// </summary>
+        public class BoardItem
+        {
+            public required string Name { get; set; }
+        }
+    }
+
+    /// <summary>
+    /// The project that contains <see cref="Todo"/> items.
+    /// </summary>
+    /// <param name="Name">The name of the project.</param>
+    /// <param name="Description">The description of the project.</param>
+    public record ProjectRecord(string Name, string Description);
+
+    public class TodoWithDescription : ITodo
+    {
+        /// <summary>
+        /// The identifier of the todo, overridden.
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <value>
+        /// The name of the todo, overridden.
+        /// </value>
+        public required string Name { get; set; }
+
+        /// <summary>
+        /// A description of the the todo.
+        /// </summary>
+        /// <value>Another description of the todo.</value>
+        public required string Description { get; set; }
+    }
+}
diff --git a/src/OpenApi/sample/Program.cs b/src/OpenApi/sample/Program.cs
index a622780ff482..11fd830b1234 100644
--- a/src/OpenApi/sample/Program.cs
+++ b/src/OpenApi/sample/Program.cs
@@ -1,11 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Immutable;
-using System.ComponentModel;
-using Microsoft.AspNetCore.Http.HttpResults;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Models;
+using System.Globalization;
+using System.Text.Json.Serialization;
 using Sample.Transformers;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -15,16 +12,25 @@
 #pragma warning restore IL2026
 builder.Services.AddAuthentication().AddJwtBearer();
 
+// Supports representing integer formats as strictly numerically values
+// inside the schema.
+builder.Services.ConfigureHttpJsonOptions(options =>
+{
+    options.SerializerOptions.NumberHandling = JsonNumberHandling.Strict;
+});
+
 builder.Services.AddOpenApi("v1", options =>
 {
     options.AddHeader("X-Version", "1.0");
     options.AddDocumentTransformer<BearerSecuritySchemeTransformer>();
 });
-builder.Services.AddOpenApi("v2", options => {
+builder.Services.AddOpenApi("v2", options =>
+{
     options.AddSchemaTransformer<AddExternalDocsTransformer>();
     options.AddOperationTransformer<AddExternalDocsTransformer>();
     options.AddDocumentTransformer(new AddContactTransformer());
-    options.AddDocumentTransformer((document, context, token) => {
+    options.AddDocumentTransformer((document, context, token) =>
+    {
         document.Info.License = new OpenApiLicense { Name = "MIT" };
         return Task.CompletedTask;
     });
@@ -33,86 +39,32 @@
 builder.Services.AddOpenApi("responses");
 builder.Services.AddOpenApi("forms");
 builder.Services.AddOpenApi("schemas-by-ref");
+builder.Services.AddOpenApi("xml");
+builder.Services.AddOpenApi("localized", options =>
+{
+    options.ShouldInclude = _ => true;
+    options.AddDocumentTransformer((document, context, token) =>
+    {
+        document.Info.Description = $"This is a localized OpenAPI document for {CultureInfo.CurrentUICulture.NativeName}.";
+        return Task.CompletedTask;
+    });
+});
 
 var app = builder.Build();
 
 app.MapOpenApi();
+app.MapOpenApi("/openapi/{documentName}.yaml");
 if (app.Environment.IsDevelopment())
 {
     app.MapSwaggerUi();
 }
 
-var forms = app.MapGroup("forms")
-    .WithGroupName("forms");
-
-var schemas = app.MapGroup("schemas-by-ref")
-    .WithGroupName("schemas-by-ref");
-
-if (app.Environment.IsDevelopment())
-{
-    forms.DisableAntiforgery();
-}
-
-forms.MapPost("/form-file", (IFormFile resume) => Results.Ok(resume.FileName));
-forms.MapPost("/form-files", (IFormFileCollection files) => Results.Ok(files.Count));
-forms.MapPost("/form-file-multiple", (IFormFile resume, IFormFileCollection files) => Results.Ok(files.Count + resume.FileName));
-// Disable warnings because RDG does not support complex form binding yet.
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-#pragma warning disable RDG003 // Unable to resolve parameter
-forms.MapPost("/form-todo", ([FromForm] Todo todo) => Results.Ok(todo));
-forms.MapPost("/forms-pocos-and-files", ([FromForm] Todo todo, IFormFile file) => Results.Ok(new { Todo = todo, File = file.FileName }));
-#pragma warning restore RDG003 // Unable to resolve parameter
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-
-var v1 = app.MapGroup("v1")
-    .WithGroupName("v1");
-var v2 = app.MapGroup("v2")
-    .WithGroupName("v2");
-var responses = app.MapGroup("responses")
-    .WithGroupName("responses");
-
-v1.MapGet("/array-of-guids", (Guid[] guids) => guids);
-
-v1.MapPost("/todos", (Todo todo) => Results.Created($"/todos/{todo.Id}", todo))
-    .WithSummary("Creates a new todo item.");
-v1.MapGet("/todos/{id}", (int id) => new TodoWithDueDate(1, "Test todo", false, DateTime.Now.AddDays(1), DateTime.Now))
-    .WithDescription("Returns a specific todo item.");
-
-v2.MapGet("/users", () => new [] { "alice", "bob" })
-    .WithTags("users");
-
-v2.MapPost("/users", () => Results.Created("/users/1", new { Id = 1, Name = "Test user" }))
-  .WithName("CreateUser");
-
-responses.MapGet("/200-add-xml", () => new TodoWithDueDate(1, "Test todo", false, DateTime.Now.AddDays(1), DateTime.Now))
-    .Produces<Todo>(additionalContentTypes: "text/xml");
-
-responses.MapGet("/200-only-xml", () => new TodoWithDueDate(1, "Test todo", false, DateTime.Now.AddDays(1), DateTime.Now))
-    .Produces<Todo>(contentType: "text/xml");
-
-responses.MapGet("/triangle", () => new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 });
-responses.MapGet("/shape", Shape () => new Triangle { Color = "blue", Sides = 4 });
-
-schemas.MapGet("/typed-results", () => TypedResults.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 }));
-schemas.MapGet("/multiple-results", Results<Ok<Triangle>, NotFound<string>> () => Random.Shared.Next(0, 2) == 0
-    ? TypedResults.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 })
-    : TypedResults.NotFound<string>("Item not found."));
-schemas.MapGet("/iresult-no-produces", () => Results.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 }));
-schemas.MapGet("/iresult-with-produces", () => Results.Ok(new Triangle { Color = "red", Sides = 3, Hypotenuse = 5.0 }))
-    .Produces<Triangle>(200, "text/xml");
-schemas.MapGet("/primitives", ([Description("The ID associated with the Todo item.")] int id, [Description("The number of Todos to fetch")] int size) => { });
-schemas.MapGet("/product", (Product product) => TypedResults.Ok(product));
-schemas.MapGet("/account", (Account account) => TypedResults.Ok(account));
-schemas.MapPost("/array-of-ints", (int[] values) => values.Sum());
-schemas.MapPost("/list-of-ints", (List<int> values) => values.Count);
-schemas.MapPost("/ienumerable-of-ints", (IEnumerable<int> values) => values.Count());
-schemas.MapGet("/dictionary-of-ints", () => new Dictionary<string, int> { { "one", 1 }, { "two", 2 } });
-schemas.MapGet("/frozen-dictionary-of-ints", () => ImmutableDictionary.CreateRange(new Dictionary<string, int> { { "one", 1 }, { "two", 2 } }));
-schemas.MapPost("/shape", (Shape shape) => { });
-schemas.MapPost("/weatherforecastbase", (WeatherForecastBase forecast) => { });
-schemas.MapPost("/person", (Person person) => { });
+app.MapFormEndpoints();
+app.MapV1Endpoints();
+app.MapV2Endpoints();
+app.MapXmlEndpoints();
+app.MapSchemasEndpoints();
+app.MapResponseEndpoints();
 
 app.MapControllers();
 
diff --git a/src/OpenApi/sample/Properties/launchSettings.json b/src/OpenApi/sample/Properties/launchSettings.json
index e7c91524954d..1b535d687afb 100644
--- a/src/OpenApi/sample/Properties/launchSettings.json
+++ b/src/OpenApi/sample/Properties/launchSettings.json
@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -13,7 +13,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5051",
+      "applicationUrl": "http://sample.dev.localhost:5051",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -22,7 +22,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:7174;http://localhost:5051",
+      "applicationUrl": "https://sample.dev.localhost:7174;http://sample.dev.localhost:5051",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/src/OpenApi/sample/Sample.csproj b/src/OpenApi/sample/Sample.csproj
index 31a0291457cc..cb2dc20c05a5 100644
--- a/src/OpenApi/sample/Sample.csproj
+++ b/src/OpenApi/sample/Sample.csproj
@@ -7,18 +7,22 @@
     <!-- Required to generated trimmable Map-invocations. -->
     <EnableRequestDelegateGenerator>true</EnableRequestDelegateGenerator>
     <IsAotCompatible>true</IsAotCompatible>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.OpenApi.Generated</InterceptorsNamespaces>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
-    <Reference Include="Microsoft.AspNetCore.OpenApi" />
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.AspNetCore.Http.Results" />
+    <Reference Include="Microsoft.AspNetCore.JsonPatch.SystemTextJson" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.OpenApi" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
-    <Reference Include="Microsoft.AspNetCore.Mvc" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,7 +32,16 @@
 
   <!-- Required to generated trimmable Map-invocations. -->
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <!-- Required to process XML documentation. -->
+  <ItemGroup>
+    <ProjectReference Include="../gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.OpenApi" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenApi/sample/Transformers/AddBearerSecuritySchemeTransformer.cs b/src/OpenApi/sample/Transformers/AddBearerSecuritySchemeTransformer.cs
index 02bd033b7628..ad841d605991 100644
--- a/src/OpenApi/sample/Transformers/AddBearerSecuritySchemeTransformer.cs
+++ b/src/OpenApi/sample/Transformers/AddBearerSecuritySchemeTransformer.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
 
 namespace Sample.Transformers;
 
@@ -14,7 +13,7 @@ public async Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransf
         var authenticationSchemes = await authenticationSchemeProvider.GetAllSchemesAsync();
         if (authenticationSchemes.Any(authScheme => authScheme.Name == "Bearer"))
         {
-            var requirements = new Dictionary<string, OpenApiSecurityScheme>
+            var requirements = new Dictionary<string, IOpenApiSecurityScheme>
             {
                 ["Bearer"] = new OpenApiSecurityScheme
                 {
diff --git a/src/OpenApi/sample/Transformers/AddContactTransformer.cs b/src/OpenApi/sample/Transformers/AddContactTransformer.cs
index 5d9d35f1c7ad..513073a67caf 100644
--- a/src/OpenApi/sample/Transformers/AddContactTransformer.cs
+++ b/src/OpenApi/sample/Transformers/AddContactTransformer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
 
 namespace Sample.Transformers;
 
diff --git a/src/OpenApi/sample/Transformers/AddExternalDocsTransformer.cs b/src/OpenApi/sample/Transformers/AddExternalDocsTransformer.cs
index 6af558870e0d..8143890faec3 100644
--- a/src/OpenApi/sample/Transformers/AddExternalDocsTransformer.cs
+++ b/src/OpenApi/sample/Transformers/AddExternalDocsTransformer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
 
 namespace Sample.Transformers;
 
@@ -29,7 +28,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
     {
         if (Uri.TryCreate(configuration["DocumentationBaseUrl"], UriKind.Absolute, out var baseUri))
         {
-            var url = new Uri(baseUri, $"/api/docs/schemas/{Uri.EscapeDataString(schema.Type)}");
+            var url = new Uri(baseUri, $"/api/docs/schemas/{Uri.EscapeDataString(schema.Type.ToString()!.ToLowerInvariant())}");
 
             schema.ExternalDocs = new OpenApiExternalDocs
             {
diff --git a/src/OpenApi/sample/Transformers/OperationTransformers.cs b/src/OpenApi/sample/Transformers/OperationTransformers.cs
index b1427762e09b..df286b126b56 100644
--- a/src/OpenApi/sample/Transformers/OperationTransformers.cs
+++ b/src/OpenApi/sample/Transformers/OperationTransformers.cs
@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
 
 namespace Sample.Transformers;
 
@@ -15,7 +12,7 @@ public static OpenApiOptions AddHeader(this OpenApiOptions options, string heade
         return options.AddOperationTransformer((operation, context, cancellationToken) =>
         {
             var schema = OpenApiTypeMapper.MapTypeToOpenApiPrimitiveType(typeof(string));
-            schema.Default = new OpenApiString(defaultValue);
+            schema.Default = defaultValue;
             operation.Parameters ??= [];
             operation.Parameters.Add(new OpenApiParameter
             {
diff --git a/src/OpenApi/src/Comparers/ComparerHelpers.cs b/src/OpenApi/src/Comparers/ComparerHelpers.cs
deleted file mode 100644
index 3baa530db866..000000000000
--- a/src/OpenApi/src/Comparers/ComparerHelpers.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal static class ComparerHelpers
-{
-    internal static bool DictionaryEquals<TKey, TValue>(IDictionary<TKey, TValue> x, IDictionary<TKey, TValue> y, IEqualityComparer<TValue> comparer)
-        where TKey : notnull
-        where TValue : notnull
-    {
-        if (x is Dictionary<TKey, TValue> xDictionary && y is Dictionary<TKey, TValue> yDictionary)
-        {
-            return DictionaryEquals(xDictionary, yDictionary, comparer);
-        }
-
-        if (x.Keys.Count != y.Keys.Count)
-        {
-            return false;
-        }
-
-        foreach (var key in x.Keys)
-        {
-            if (!y.TryGetValue(key, out var value) || !comparer.Equals(x[key], value))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    // Private method to avoid interface dispatch.
-    private static bool DictionaryEquals<TKey, TValue>(Dictionary<TKey, TValue> x, Dictionary<TKey, TValue> y, IEqualityComparer<TValue> comparer)
-        where TKey : notnull
-        where TValue : notnull
-    {
-        if (x.Keys.Count != y.Keys.Count)
-        {
-            return false;
-        }
-
-        foreach (var key in x.Keys)
-        {
-            if (!y.TryGetValue(key, out var value) || !comparer.Equals(x[key], value))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    internal static bool ListEquals<T>(IList<T> x, IList<T> y, IEqualityComparer<T> comparer)
-    {
-        if (x is List<T> xList && y is List<T> yList)
-        {
-            return ListEquals(xList, yList, comparer);
-        }
-
-        if (x.Count != y.Count)
-        {
-            return false;
-        }
-
-        for (var i = 0; i < x.Count; i++)
-        {
-            if (!comparer.Equals(x[i], y[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    // Private method to avoid interface dispatch.
-    private static bool ListEquals<T>(List<T> x, List<T> y, IEqualityComparer<T> comparer)
-    {
-        if (x.Count != y.Count)
-        {
-            return false;
-        }
-
-        for (var i = 0; i < x.Count; i++)
-        {
-            if (!comparer.Equals(x[i], y[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiAnyComparer.cs b/src/OpenApi/src/Comparers/OpenApiAnyComparer.cs
deleted file mode 100644
index 5ba27568899d..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiAnyComparer.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal sealed class OpenApiAnyComparer : IEqualityComparer<IOpenApiAny>, IEqualityComparer<IOpenApiExtension>
-{
-    public static OpenApiAnyComparer Instance { get; } = new OpenApiAnyComparer();
-
-    public bool Equals(IOpenApiAny? x, IOpenApiAny? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        return x.AnyType == y.AnyType &&
-            (x switch
-            {
-                OpenApiNull _ => y is OpenApiNull,
-                OpenApiArray arrayX => y is OpenApiArray arrayY && ComparerHelpers.ListEquals(arrayX, arrayY, Instance),
-                OpenApiObject objectX => y is OpenApiObject objectY && ComparerHelpers.DictionaryEquals(objectX, objectY, Instance),
-                OpenApiBinary binaryX => y is OpenApiBinary binaryY && binaryX.Value.SequenceEqual(binaryY.Value),
-                OpenApiInteger integerX => y is OpenApiInteger integerY && integerX.Value == integerY.Value,
-                OpenApiLong longX => y is OpenApiLong longY && longX.Value == longY.Value,
-                OpenApiDouble doubleX => y is OpenApiDouble doubleY && doubleX.Value == doubleY.Value,
-                OpenApiFloat floatX => y is OpenApiFloat floatY && floatX.Value == floatY.Value,
-                OpenApiBoolean booleanX => y is OpenApiBoolean booleanY && booleanX.Value == booleanY.Value,
-                OpenApiString stringX => y is OpenApiString stringY && stringX.Value == stringY.Value,
-                OpenApiPassword passwordX => y is OpenApiPassword passwordY && passwordX.Value == passwordY.Value,
-                OpenApiByte byteX => y is OpenApiByte byteY && byteX.Value.SequenceEqual(byteY.Value),
-                OpenApiDate dateX => y is OpenApiDate dateY && dateX.Value == dateY.Value,
-                OpenApiDateTime dateTimeX => y is OpenApiDateTime dateTimeY && dateTimeX.Value == dateTimeY.Value,
-                _ => x.Equals(y)
-            });
-    }
-
-    public int GetHashCode(IOpenApiAny obj)
-    {
-        var hashCode = new HashCode();
-        hashCode.Add(obj.AnyType);
-        if (obj is IOpenApiPrimitive primitive)
-        {
-            hashCode.Add(primitive.PrimitiveType);
-        }
-        if (obj is OpenApiBinary binary)
-        {
-            hashCode.AddBytes(binary.Value);
-        }
-        if (obj is OpenApiByte bytes)
-        {
-            hashCode.AddBytes(bytes.Value);
-        }
-        hashCode.Add<object?>(obj switch
-        {
-            OpenApiInteger integer => integer.Value,
-            OpenApiLong @long => @long.Value,
-            OpenApiDouble @double => @double.Value,
-            OpenApiFloat @float => @float.Value,
-            OpenApiBoolean boolean => boolean.Value,
-            OpenApiString @string => @string.Value,
-            OpenApiPassword password => password.Value,
-            OpenApiDate date => date.Value,
-            OpenApiDateTime dateTime => dateTime.Value,
-            _ => null
-        });
-
-        return hashCode.ToHashCode();
-    }
-
-    public bool Equals(IOpenApiExtension? x, IOpenApiExtension? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-
-        if (x is null || y is null)
-        {
-            return false;
-        }
-
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        if (x is IOpenApiAny openApiAnyX && y is IOpenApiAny openApiAnyY)
-        {
-            return Equals(openApiAnyX, openApiAnyY);
-        }
-
-        return x.Equals(y);
-    }
-
-    public int GetHashCode(IOpenApiExtension obj)
-    {
-        if (obj is IOpenApiAny any)
-        {
-            return GetHashCode(any);
-        }
-
-        return obj.GetHashCode();
-    }
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiDiscriminatorComparer.cs b/src/OpenApi/src/Comparers/OpenApiDiscriminatorComparer.cs
deleted file mode 100644
index c4547b07d591..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiDiscriminatorComparer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal sealed class OpenApiDiscriminatorComparer : IEqualityComparer<OpenApiDiscriminator>
-{
-    public static OpenApiDiscriminatorComparer Instance { get; } = new OpenApiDiscriminatorComparer();
-
-    public bool Equals(OpenApiDiscriminator? x, OpenApiDiscriminator? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        return x.PropertyName == y.PropertyName &&
-            x.Mapping.Count == y.Mapping.Count &&
-            ComparerHelpers.DictionaryEquals(x.Mapping, y.Mapping, StringComparer.Ordinal);
-    }
-
-    public int GetHashCode(OpenApiDiscriminator obj)
-    {
-        var hashCode = new HashCode();
-        hashCode.Add(obj.PropertyName);
-        hashCode.Add(obj.Mapping.Count);
-        return hashCode.ToHashCode();
-    }
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiExternalDocsComparer.cs b/src/OpenApi/src/Comparers/OpenApiExternalDocsComparer.cs
deleted file mode 100644
index 499b245911f8..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiExternalDocsComparer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal sealed class OpenApiExternalDocsComparer : IEqualityComparer<OpenApiExternalDocs>
-{
-    public static OpenApiExternalDocsComparer Instance { get; } = new OpenApiExternalDocsComparer();
-
-    public bool Equals(OpenApiExternalDocs? x, OpenApiExternalDocs? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        return x.Description == y.Description &&
-            x.Url == y.Url &&
-            ComparerHelpers.DictionaryEquals(x.Extensions, y.Extensions, OpenApiAnyComparer.Instance);
-    }
-
-    public int GetHashCode(OpenApiExternalDocs obj)
-    {
-        var hashCode = new HashCode();
-        hashCode.Add(obj.Description);
-        hashCode.Add(obj.Url);
-        hashCode.Add(obj.Extensions.Count);
-        return hashCode.ToHashCode();
-    }
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiReferenceComparer.cs b/src/OpenApi/src/Comparers/OpenApiReferenceComparer.cs
deleted file mode 100644
index d01175bf6740..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiReferenceComparer.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal sealed class OpenApiReferenceComparer : IEqualityComparer<OpenApiReference>
-{
-    public static OpenApiReferenceComparer Instance { get; } = new OpenApiReferenceComparer();
-
-    public bool Equals(OpenApiReference? x, OpenApiReference? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        // We avoid comparing the HostDocument that a reference is associated with
-        // so that the same schema in the OpenApiSchemaStore cache and embedded in
-        // an OpenAPI document is considered equal.
-        return x.ExternalResource == y.ExternalResource &&
-            x.Id == y.Id &&
-            x.Type == y.Type;
-    }
-
-    public int GetHashCode(OpenApiReference obj)
-    {
-        var hashCode = new HashCode();
-        hashCode.Add(obj.ExternalResource);
-        hashCode.Add(obj.Id);
-        if (obj.Type is not null)
-        {
-            hashCode.Add(obj.Type);
-        }
-        return hashCode.ToHashCode();
-    }
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs b/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs
deleted file mode 100644
index 0591035d2f47..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal sealed class OpenApiSchemaComparer : IEqualityComparer<OpenApiSchema>
-{
-    public static OpenApiSchemaComparer Instance { get; } = new OpenApiSchemaComparer();
-
-    public bool Equals(OpenApiSchema? x, OpenApiSchema? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        // Compare property equality in an order that should help us find inequality faster
-        return
-            x.Type == y.Type &&
-            x.Format == y.Format &&
-            SchemaIdEquals(x, y) &&
-            ComparerHelpers.DictionaryEquals(x.Properties, y.Properties, Instance) &&
-            OpenApiDiscriminatorComparer.Instance.Equals(x.Discriminator, y.Discriminator) &&
-            Instance.Equals(x.AdditionalProperties, y.AdditionalProperties) &&
-            x.AdditionalPropertiesAllowed == y.AdditionalPropertiesAllowed &&
-            ComparerHelpers.ListEquals(x.AllOf, y.AllOf, Instance) &&
-            ComparerHelpers.ListEquals(x.AnyOf, y.AnyOf, Instance) &&
-            x.Deprecated == y.Deprecated &&
-            OpenApiAnyComparer.Instance.Equals(x.Default, y.Default) &&
-            x.Description == y.Description &&
-            OpenApiAnyComparer.Instance.Equals(x.Example, y.Example) &&
-            x.ExclusiveMaximum == y.ExclusiveMaximum &&
-            x.ExclusiveMinimum == y.ExclusiveMinimum &&
-            x.Extensions.Count == y.Extensions.Count &&
-            ComparerHelpers.DictionaryEquals(x.Extensions, y.Extensions, OpenApiAnyComparer.Instance) &&
-            OpenApiExternalDocsComparer.Instance.Equals(x.ExternalDocs, y.ExternalDocs) &&
-            ComparerHelpers.ListEquals(x.Enum, y.Enum, OpenApiAnyComparer.Instance) &&
-            Instance.Equals(x.Items, y.Items) &&
-            x.Title == y.Title &&
-            x.Maximum == y.Maximum &&
-            x.MaxItems == y.MaxItems &&
-            x.MaxLength == y.MaxLength &&
-            x.MaxProperties == y.MaxProperties &&
-            x.Minimum == y.Minimum &&
-            x.MinItems == y.MinItems &&
-            x.MinLength == y.MinLength &&
-            x.MinProperties == y.MinProperties &&
-            x.MultipleOf == y.MultipleOf &&
-            ComparerHelpers.ListEquals(x.OneOf, y.OneOf, Instance) &&
-            Instance.Equals(x.Not, y.Not) &&
-            x.Nullable == y.Nullable &&
-            x.Pattern == y.Pattern &&
-            x.ReadOnly == y.ReadOnly &&
-            x.Required.Count == y.Required.Count && x.Required.SetEquals(y.Required) &&
-            OpenApiReferenceComparer.Instance.Equals(x.Reference, y.Reference) &&
-            x.UniqueItems == y.UniqueItems &&
-            x.UnresolvedReference == y.UnresolvedReference &&
-            x.WriteOnly == y.WriteOnly &&
-            OpenApiXmlComparer.Instance.Equals(x.Xml, y.Xml);
-    }
-
-    private static bool SchemaIdEquals(OpenApiSchema x, OpenApiSchema y)
-    {
-        if (x.Annotations == null && y.Annotations == null)
-        {
-            return true;
-        }
-        if (x.Annotations == null || y.Annotations == null)
-        {
-            return false;
-        }
-        if (x.Annotations.TryGetValue(OpenApiConstants.SchemaId, out var xSchemaId)
-            && y.Annotations.TryGetValue(OpenApiConstants.SchemaId, out var ySchemaId))
-        {
-            if (xSchemaId == null && ySchemaId == null)
-            {
-                return true;
-            }
-            if (xSchemaId == null || ySchemaId == null)
-            {
-                return false;
-            }
-            return xSchemaId.Equals(ySchemaId);
-        }
-        return true;
-    }
-
-    public int GetHashCode(OpenApiSchema obj)
-    {
-        var hashCode = new HashCode();
-        hashCode.Add(obj.AdditionalProperties, Instance);
-        hashCode.Add(obj.AdditionalPropertiesAllowed);
-        hashCode.Add(obj.AllOf.Count);
-        hashCode.Add(obj.AnyOf.Count);
-        hashCode.Add(obj.Deprecated);
-        hashCode.Add(obj.Default, OpenApiAnyComparer.Instance);
-        hashCode.Add(obj.Description);
-        hashCode.Add(obj.Discriminator, OpenApiDiscriminatorComparer.Instance);
-        hashCode.Add(obj.Example, OpenApiAnyComparer.Instance);
-        hashCode.Add(obj.ExclusiveMaximum);
-        hashCode.Add(obj.ExclusiveMinimum);
-        hashCode.Add(obj.Extensions.Count);
-        hashCode.Add(obj.ExternalDocs, OpenApiExternalDocsComparer.Instance);
-        hashCode.Add(obj.Enum.Count);
-        hashCode.Add(obj.Format);
-        hashCode.Add(obj.Items, Instance);
-        hashCode.Add(obj.Title);
-        hashCode.Add(obj.Type);
-        hashCode.Add(obj.Maximum);
-        hashCode.Add(obj.MaxItems);
-        hashCode.Add(obj.MaxLength);
-        hashCode.Add(obj.MaxProperties);
-        hashCode.Add(obj.Minimum);
-        hashCode.Add(obj.MinItems);
-        hashCode.Add(obj.MinLength);
-        hashCode.Add(obj.MinProperties);
-        hashCode.Add(obj.MultipleOf);
-        hashCode.Add(obj.OneOf.Count);
-        hashCode.Add(obj.Not, Instance);
-        hashCode.Add(obj.Nullable);
-        hashCode.Add(obj.Pattern);
-        hashCode.Add(obj.Properties.Count);
-        hashCode.Add(obj.ReadOnly);
-        hashCode.Add(obj.Required.Count);
-        hashCode.Add(obj.Reference, OpenApiReferenceComparer.Instance);
-        hashCode.Add(obj.UniqueItems);
-        hashCode.Add(obj.UnresolvedReference);
-        hashCode.Add(obj.WriteOnly);
-        hashCode.Add(obj.Xml, OpenApiXmlComparer.Instance);
-        return hashCode.ToHashCode();
-    }
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiTagComparer.cs b/src/OpenApi/src/Comparers/OpenApiTagComparer.cs
deleted file mode 100644
index 7154553e932c..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiTagComparer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-/// <summary>
-/// This comparer is used to maintain a globally unique list of tags encountered
-/// in a particular OpenAPI document.
-/// </summary>
-internal sealed class OpenApiTagComparer : IEqualityComparer<OpenApiTag>
-{
-    public static OpenApiTagComparer Instance { get; } = new OpenApiTagComparer();
-
-    public bool Equals(OpenApiTag? x, OpenApiTag? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        // Tag comparisons are case-sensitive by default. Although the OpenAPI specification
-        // only outlines case sensitivity for property names, we extend this principle to
-        // property values for tag names as well.
-        // See https://spec.openapis.org/oas/v3.1.0#format.
-        return string.Equals(x.Name, y.Name, StringComparison.Ordinal);
-    }
-
-    public int GetHashCode(OpenApiTag obj) => obj.Name.GetHashCode();
-}
diff --git a/src/OpenApi/src/Comparers/OpenApiXmlComparer.cs b/src/OpenApi/src/Comparers/OpenApiXmlComparer.cs
deleted file mode 100644
index bfe71ef51f6c..000000000000
--- a/src/OpenApi/src/Comparers/OpenApiXmlComparer.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-internal sealed class OpenApiXmlComparer : IEqualityComparer<OpenApiXml>
-{
-    public static OpenApiXmlComparer Instance { get; } = new OpenApiXmlComparer();
-
-    public bool Equals(OpenApiXml? x, OpenApiXml? y)
-    {
-        if (x is null && y is null)
-        {
-            return true;
-        }
-        if (x is null || y is null)
-        {
-            return false;
-        }
-        if (object.ReferenceEquals(x, y))
-        {
-            return true;
-        }
-
-        return x.Name == y.Name &&
-            x.Namespace == y.Namespace &&
-            x.Prefix == y.Prefix &&
-            x.Attribute == y.Attribute &&
-            x.Wrapped == y.Wrapped &&
-            ComparerHelpers.DictionaryEquals(x.Extensions, y.Extensions, OpenApiAnyComparer.Instance);
-    }
-
-    public int GetHashCode(OpenApiXml obj)
-    {
-        var hashCode = new HashCode();
-        hashCode.Add(obj.Name);
-        hashCode.Add(obj.Namespace);
-        hashCode.Add(obj.Prefix);
-        hashCode.Add(obj.Attribute);
-        hashCode.Add(obj.Wrapped);
-        hashCode.Add(obj.Extensions.Count);
-        return hashCode.ToHashCode();
-    }
-}
diff --git a/src/OpenApi/src/Extensions/ApiDescriptionExtensions.cs b/src/OpenApi/src/Extensions/ApiDescriptionExtensions.cs
index 9e134604641a..a6e5b86944a1 100644
--- a/src/OpenApi/src/Extensions/ApiDescriptionExtensions.cs
+++ b/src/OpenApi/src/Extensions/ApiDescriptionExtensions.cs
@@ -4,31 +4,32 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Routing.Patterns;
-using Microsoft.OpenApi.Models;
 
 internal static class ApiDescriptionExtensions
 {
     /// <summary>
-    /// Maps the HTTP method of the ApiDescription to the OpenAPI <see cref="OperationType"/> .
+    /// Maps the HTTP method of the ApiDescription to the HttpMethod.
     /// </summary>
-    /// <param name="apiDescription">The ApiDescription to resolve an operation type from.</param>
-    /// <returns>The <see cref="OperationType"/> associated with the given <paramref name="apiDescription"/>.</returns>
-    public static OperationType GetOperationType(this ApiDescription apiDescription) =>
+    /// <param name="apiDescription">The ApiDescription to resolve an HttpMethod from.</param>
+    /// <returns>The <see cref="HttpMethod"/> associated with the given <paramref name="apiDescription"/>, if known.</returns>
+    public static HttpMethod? GetHttpMethod(this ApiDescription apiDescription) =>
         apiDescription.HttpMethod?.ToUpperInvariant() switch
         {
-            "GET" => OperationType.Get,
-            "POST" => OperationType.Post,
-            "PUT" => OperationType.Put,
-            "DELETE" => OperationType.Delete,
-            "PATCH" => OperationType.Patch,
-            "HEAD" => OperationType.Head,
-            "OPTIONS" => OperationType.Options,
-            "TRACE" => OperationType.Trace,
-            _ => throw new InvalidOperationException($"Unsupported HTTP method: {apiDescription.HttpMethod}"),
+            // Only add methods documented in the OpenAPI spec: https://spec.openapis.org/oas/v3.1.1.html#path-item-object
+            "GET" => HttpMethod.Get,
+            "POST" => HttpMethod.Post,
+            "PUT" => HttpMethod.Put,
+            "DELETE" => HttpMethod.Delete,
+            "PATCH" => HttpMethod.Patch,
+            "HEAD" => HttpMethod.Head,
+            "OPTIONS" => HttpMethod.Options,
+            "TRACE" => HttpMethod.Trace,
+            _ => null,
         };
 
     /// <summary>
diff --git a/src/OpenApi/src/Extensions/JsonNodeSchemaExtensions.cs b/src/OpenApi/src/Extensions/JsonNodeSchemaExtensions.cs
index 9cc97724b1b3..945326b1d5b1 100644
--- a/src/OpenApi/src/Extensions/JsonNodeSchemaExtensions.cs
+++ b/src/OpenApi/src/Extensions/JsonNodeSchemaExtensions.cs
@@ -15,7 +15,6 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Constraints;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -27,26 +26,26 @@ internal static class JsonNodeSchemaExtensions
 {
     private static readonly Dictionary<Type, OpenApiSchema> _simpleTypeToOpenApiSchema = new()
     {
-        [typeof(bool)] = new() { Type = "boolean" },
-        [typeof(byte)] = new() { Type = "integer", Format = "uint8" },
-        [typeof(byte[])] = new() { Type = "string", Format = "byte" },
-        [typeof(int)] = new() { Type = "integer", Format = "int32" },
-        [typeof(uint)] = new() { Type = "integer", Format = "uint32" },
-        [typeof(long)] = new() { Type = "integer", Format = "int64" },
-        [typeof(ulong)] = new() { Type = "integer", Format = "uint64" },
-        [typeof(short)] = new() { Type = "integer", Format = "int16" },
-        [typeof(ushort)] = new() { Type = "integer", Format = "uint16" },
-        [typeof(float)] = new() { Type = "number", Format = "float" },
-        [typeof(double)] = new() { Type = "number", Format = "double" },
-        [typeof(decimal)] = new() { Type = "number", Format = "double" },
-        [typeof(DateTime)] = new() { Type = "string", Format = "date-time" },
-        [typeof(DateTimeOffset)] = new() { Type = "string", Format = "date-time" },
-        [typeof(Guid)] = new() { Type = "string", Format = "uuid" },
-        [typeof(char)] = new() { Type = "string", Format = "char" },
-        [typeof(Uri)] = new() { Type = "string", Format = "uri" },
-        [typeof(string)] = new() { Type = "string" },
-        [typeof(TimeOnly)] = new() { Type = "string", Format = "time" },
-        [typeof(DateOnly)] = new() { Type = "string", Format = "date" },
+        [typeof(bool)] = new() { Type = JsonSchemaType.Boolean },
+        [typeof(byte)] = new() { Type = JsonSchemaType.Integer, Format = "uint8" },
+        [typeof(byte[])] = new() { Type = JsonSchemaType.String, Format = "byte" },
+        [typeof(int)] = new() { Type = JsonSchemaType.Integer, Format = "int32" },
+        [typeof(uint)] = new() { Type = JsonSchemaType.Integer, Format = "uint32" },
+        [typeof(long)] = new() { Type = JsonSchemaType.Integer, Format = "int64" },
+        [typeof(ulong)] = new() { Type = JsonSchemaType.Integer, Format = "uint64" },
+        [typeof(short)] = new() { Type = JsonSchemaType.Integer, Format = "int16" },
+        [typeof(ushort)] = new() { Type = JsonSchemaType.Integer, Format = "uint16" },
+        [typeof(float)] = new() { Type = JsonSchemaType.Number, Format = "float" },
+        [typeof(double)] = new() { Type = JsonSchemaType.Number, Format = "double" },
+        [typeof(decimal)] = new() { Type = JsonSchemaType.Number, Format = "double" },
+        [typeof(DateTime)] = new() { Type = JsonSchemaType.String, Format = "date-time" },
+        [typeof(DateTimeOffset)] = new() { Type = JsonSchemaType.String, Format = "date-time" },
+        [typeof(Guid)] = new() { Type = JsonSchemaType.String, Format = "uuid" },
+        [typeof(char)] = new() { Type = JsonSchemaType.String, Format = "char" },
+        [typeof(Uri)] = new() { Type = JsonSchemaType.String, Format = "uri" },
+        [typeof(string)] = new() { Type = JsonSchemaType.String },
+        [typeof(TimeOnly)] = new() { Type = JsonSchemaType.String, Format = "time" },
+        [typeof(DateOnly)] = new() { Type = JsonSchemaType.String, Format = "date" },
     };
 
     /// <summary>
@@ -86,13 +85,47 @@ internal static void ApplyValidationAttributes(this JsonNode schema, IEnumerable
         {
             if (attribute is Base64StringAttribute)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "string";
                 schema[OpenApiSchemaKeywords.FormatKeyword] = "byte";
             }
             else if (attribute is RangeAttribute rangeAttribute)
             {
-                schema[OpenApiSchemaKeywords.MinimumKeyword] = decimal.Parse(rangeAttribute.Minimum.ToString()!, CultureInfo.InvariantCulture);
-                schema[OpenApiSchemaKeywords.MaximumKeyword] = decimal.Parse(rangeAttribute.Maximum.ToString()!, CultureInfo.InvariantCulture);
+                decimal? minDecimal = null;
+                decimal? maxDecimal = null;
+
+                if (rangeAttribute.Minimum is int minimumInteger)
+                {
+                    // The range was set with the RangeAttribute(int, int) constructor.
+                    minDecimal = minimumInteger;
+                    maxDecimal = (int)rangeAttribute.Maximum;
+                }
+                else
+                {
+                    // Use InvariantCulture if explicitly requested or if the range has been set via the RangeAttribute(double, double) constructor.
+                    var targetCulture = rangeAttribute.ParseLimitsInInvariantCulture || rangeAttribute.Minimum is double
+                        ? CultureInfo.InvariantCulture
+                        : CultureInfo.CurrentCulture;
+
+                    var minString = Convert.ToString(rangeAttribute.Minimum, targetCulture);
+                    var maxString = Convert.ToString(rangeAttribute.Maximum, targetCulture);
+
+                    if (decimal.TryParse(minString, NumberStyles.Any, targetCulture, out var value))
+                    {
+                        minDecimal = value;
+                    }
+                    if (decimal.TryParse(maxString, NumberStyles.Any, targetCulture, out value))
+                    {
+                        maxDecimal = value;
+                    }
+                }
+
+                if (minDecimal is { } minValue)
+                {
+                    schema[rangeAttribute.MinimumIsExclusive ? OpenApiSchemaKeywords.ExclusiveMinimum : OpenApiSchemaKeywords.MinimumKeyword] = minValue;
+                }
+                if (maxDecimal is { } maxValue)
+                {
+                    schema[rangeAttribute.MaximumIsExclusive ? OpenApiSchemaKeywords.ExclusiveMaximum : OpenApiSchemaKeywords.MaximumKeyword] = maxValue;
+                }
             }
             else if (attribute is RegularExpressionAttribute regularExpressionAttribute)
             {
@@ -100,23 +133,25 @@ internal static void ApplyValidationAttributes(this JsonNode schema, IEnumerable
             }
             else if (attribute is MaxLengthAttribute maxLengthAttribute)
             {
-                var targetKey = schema[OpenApiSchemaKeywords.TypeKeyword]?.GetValue<string>() == "array" ? OpenApiSchemaKeywords.MaxItemsKeyword : OpenApiSchemaKeywords.MaxLengthKeyword;
-                schema[targetKey] = maxLengthAttribute.Length;
+                var isArray = MapJsonNodeToSchemaType(schema[OpenApiSchemaKeywords.TypeKeyword]) is { } schemaTypes && schemaTypes.HasFlag(JsonSchemaType.Array);
+                var key = isArray ? OpenApiSchemaKeywords.MaxItemsKeyword : OpenApiSchemaKeywords.MaxLengthKeyword;
+                schema[key] = maxLengthAttribute.Length;
             }
             else if (attribute is MinLengthAttribute minLengthAttribute)
             {
-                var targetKey = schema[OpenApiSchemaKeywords.TypeKeyword]?.GetValue<string>() == "array" ? OpenApiSchemaKeywords.MinItemsKeyword : OpenApiSchemaKeywords.MinLengthKeyword;
-                schema[targetKey] = minLengthAttribute.Length;
+                var isArray = MapJsonNodeToSchemaType(schema[OpenApiSchemaKeywords.TypeKeyword]) is { } schemaTypes && schemaTypes.HasFlag(JsonSchemaType.Array);
+                var key = isArray ? OpenApiSchemaKeywords.MinItemsKeyword : OpenApiSchemaKeywords.MinLengthKeyword;
+                schema[key] = minLengthAttribute.Length;
             }
             else if (attribute is LengthAttribute lengthAttribute)
             {
-                var targetKeySuffix = schema[OpenApiSchemaKeywords.TypeKeyword]?.GetValue<string>() == "array" ? "Items" : "Length";
+                var isArray = MapJsonNodeToSchemaType(schema[OpenApiSchemaKeywords.TypeKeyword]) is { } schemaTypes && schemaTypes.HasFlag(JsonSchemaType.Array);
+                var targetKeySuffix = isArray ? "Items" : "Length";
                 schema[$"min{targetKeySuffix}"] = lengthAttribute.MinimumLength;
                 schema[$"max{targetKeySuffix}"] = lengthAttribute.MaximumLength;
             }
             else if (attribute is UrlAttribute)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "string";
                 schema[OpenApiSchemaKeywords.FormatKeyword] = "uri";
             }
             else if (attribute is StringLengthAttribute stringLengthAttribute)
@@ -158,11 +193,6 @@ internal static void ApplyDefaultValue(this JsonNode schema, object? defaultValu
     /// underlying schema generator does not support this, we need to manually apply the
     /// supported formats to the schemas associated with the generated type.
     ///
-    /// Whereas JsonSchema represents nullable types via `type: ["string", "null"]`, OpenAPI
-    /// v3 exposes a nullable property on the schema. This method will set the nullable property
-    /// based on whether the underlying schema generator returned an array type containing "null" to
-    /// represent a nullable type or if the type was denoted as nullable from our lookup cache.
-    ///
     /// Note that this method targets <see cref="JsonNode"/> and not <see cref="OpenApiSchema"/> because
     /// it is is designed to be invoked via the `OnGenerated` callback in the underlying schema generator as
     /// opposed to after the generated schemas have been mapped to OpenAPI schemas.
@@ -176,14 +206,13 @@ internal static void ApplyPrimitiveTypesAndFormats(this JsonNode schema, JsonSch
         var underlyingType = Nullable.GetUnderlyingType(type);
         if (_simpleTypeToOpenApiSchema.TryGetValue(underlyingType ?? type, out var openApiSchema))
         {
-            schema[OpenApiSchemaKeywords.NullableKeyword] = openApiSchema.Nullable || (schema[OpenApiSchemaKeywords.TypeKeyword] is JsonArray schemaType && schemaType.GetValues<string>().Contains("null"));
-            schema[OpenApiSchemaKeywords.TypeKeyword] = openApiSchema.Type;
+            if (underlyingType != null && MapJsonNodeToSchemaType(schema[OpenApiSchemaKeywords.TypeKeyword]) is { } schemaTypes &&
+                !schemaTypes.HasFlag(JsonSchemaType.Null))
+            {
+                schema[OpenApiSchemaKeywords.TypeKeyword] = (schemaTypes | JsonSchemaType.Null).ToString();
+            }
             schema[OpenApiSchemaKeywords.FormatKeyword] = openApiSchema.Format;
             schema[OpenApiConstants.SchemaId] = createSchemaReferenceId(context.TypeInfo);
-            schema[OpenApiSchemaKeywords.NullableKeyword] = underlyingType != null;
-            // Clear out patterns that the underlying JSON schema generator uses to represent
-            // validations for DateTime, DateTimeOffset, and integers.
-            schema[OpenApiSchemaKeywords.PatternKeyword] = null;
         }
     }
 
@@ -196,7 +225,7 @@ internal static void ApplyRouteConstraints(this JsonNode schema, IEnumerable<IRo
     {
         // Apply constraints in reverse order because when it comes to the routing
         // layer the first constraint that is violated causes routing to short circuit.
-        foreach (var constraint in constraints.Reverse())
+        foreach (var constraint in Enumerable.Reverse(constraints))
         {
             if (constraint is MinRouteConstraint minRouteConstraint)
             {
@@ -221,7 +250,7 @@ internal static void ApplyRouteConstraints(this JsonNode schema, IEnumerable<IRo
             }
             else if (constraint is RegexRouteConstraint regexRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "string";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.String.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = null;
                 schema[OpenApiSchemaKeywords.PatternKeyword] = regexRouteConstraint.Constraint.ToString();
             }
@@ -232,32 +261,32 @@ internal static void ApplyRouteConstraints(this JsonNode schema, IEnumerable<IRo
             }
             else if (constraint is FloatRouteConstraint or DecimalRouteConstraint or DoubleRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "number";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.Number.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = constraint is FloatRouteConstraint ? "float" : "double";
             }
             else if (constraint is LongRouteConstraint or IntRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "integer";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.Integer.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = constraint is LongRouteConstraint ? "int64" : "int32";
             }
             else if (constraint is GuidRouteConstraint or StringRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "string";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.String.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = constraint is GuidRouteConstraint ? "uuid" : null;
             }
             else if (constraint is BoolRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "boolean";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.Boolean.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = null;
             }
             else if (constraint is AlphaRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "string";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.String.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = null;
             }
             else if (constraint is DateTimeRouteConstraint)
             {
-                schema[OpenApiSchemaKeywords.TypeKeyword] = "string";
+                schema[OpenApiSchemaKeywords.TypeKeyword] = JsonSchemaType.String.ToString();
                 schema[OpenApiSchemaKeywords.FormatKeyword] = "date-time";
             }
         }
@@ -293,6 +322,11 @@ internal static void ApplyParameterInfo(this JsonNode schema, ApiParameterDescri
             var attributes = validations.OfType<ValidationAttribute>();
             schema.ApplyValidationAttributes(attributes);
         }
+        if (parameterDescription.ModelMetadata is Mvc.ModelBinding.Metadata.DefaultModelMetadata { Attributes.PropertyAttributes.Count: > 0 } metadata &&
+            metadata.Attributes.PropertyAttributes.OfType<DefaultValueAttribute>().LastOrDefault() is { } metadataDefaultValueAttribute)
+        {
+            schema.ApplyDefaultValue(metadataDefaultValueAttribute.Value, jsonTypeInfo);
+        }
         if (parameterDescription.ParameterDescriptor is IParameterInfoParameterDescriptor { ParameterInfo: { } parameterInfo })
         {
             if (parameterInfo.HasDefaultValue)
@@ -304,12 +338,10 @@ internal static void ApplyParameterInfo(this JsonNode schema, ApiParameterDescri
                 schema.ApplyDefaultValue(defaultValueAttribute.Value, jsonTypeInfo);
             }
 
-            if (parameterInfo.GetCustomAttributes().OfType<ValidationAttribute>() is { } validationAttributes)
+            if (parameterInfo.GetCustomAttributes<ValidationAttribute>() is { } validationAttributes)
             {
                 schema.ApplyValidationAttributes(validationAttributes);
             }
-
-            schema.ApplyNullabilityContextInfo(parameterInfo);
         }
         // Route constraints are only defined on parameters that are sourced from the path. Since
         // they are encoded in the route template, and not in the type information based to the underlying
@@ -319,14 +351,17 @@ internal static void ApplyParameterInfo(this JsonNode schema, ApiParameterDescri
             schema.ApplyRouteConstraints(constraints);
         }
 
-        if (parameterDescription.Source is { } bindingSource && SupportsNullableProperty(bindingSource))
+        if (parameterDescription.Source is { } bindingSource
+            && SupportsNullableProperty(bindingSource)
+            && MapJsonNodeToSchemaType(schema[OpenApiSchemaKeywords.TypeKeyword]) is { } schemaTypes &&
+            schemaTypes.HasFlag(JsonSchemaType.Null))
         {
-            schema[OpenApiSchemaKeywords.NullableKeyword] = false;
+            schema[OpenApiSchemaKeywords.TypeKeyword] = (schemaTypes & ~JsonSchemaType.Null).ToString();
         }
 
         // Parameters sourced from the header, query, route, and/or form cannot be nullable based on our binding
         // rules but can be optional.
-        static bool SupportsNullableProperty(BindingSource bindingSource) =>bindingSource == BindingSource.Header
+        static bool SupportsNullableProperty(BindingSource bindingSource) => bindingSource == BindingSource.Header
             || bindingSource == BindingSource.Query
             || bindingSource == BindingSource.Path
             || bindingSource == BindingSource.Form
@@ -366,7 +401,7 @@ internal static void MapPolymorphismOptionsToDiscriminator(this JsonNode schema,
                     // that we hardcode here. We could use `OpenApiReference` to construct the reference and
                     // serialize it but we use a hardcoded string here to avoid allocating a new object and
                     // working around Microsoft.OpenApi's serialization libraries.
-                    mappings[$"{discriminator}"] = $"#/components/schemas/{createSchemaReferenceId(context.TypeInfo)}{createSchemaReferenceId(jsonDerivedType)}";
+                    mappings[$"{discriminator}"] = $"{createSchemaReferenceId(context.TypeInfo)}{createSchemaReferenceId(jsonDerivedType)}";
                 }
             }
             schema[OpenApiSchemaKeywords.DiscriminatorKeyword] = polymorphismOptions.TypeDiscriminatorPropertyName;
@@ -407,37 +442,93 @@ private static bool IsNonAbstractTypeWithoutDerivedTypeReference(JsonSchemaExpor
     }
 
     /// <summary>
-    /// Support applying nullability status for reference types provided as a parameter.
+    /// Support applying nullability status for reference types provided as a property or field.
     /// </summary>
     /// <param name="schema">The <see cref="JsonNode"/> produced by the underlying schema generator.</param>
-    /// <param name="parameterInfo">The <see cref="ParameterInfo" /> associated with the schema.</param>
-    internal static void ApplyNullabilityContextInfo(this JsonNode schema, ParameterInfo parameterInfo)
+    /// <param name="propertyInfo">The <see cref="JsonPropertyInfo" /> associated with the schema.</param>
+    internal static void ApplyNullabilityContextInfo(this JsonNode schema, JsonPropertyInfo propertyInfo)
     {
-        if (parameterInfo.ParameterType.IsValueType)
+        // Avoid setting explicit nullability annotations for `object` types so they continue to match on the catch
+        // all schema (no type, no format, no constraints).
+        if (propertyInfo.PropertyType != typeof(object) && (propertyInfo.IsGetNullable || propertyInfo.IsSetNullable))
         {
-            return;
+            if (MapJsonNodeToSchemaType(schema[OpenApiSchemaKeywords.TypeKeyword]) is { } schemaTypes &&
+                !schemaTypes.HasFlag(JsonSchemaType.Null))
+            {
+                schema[OpenApiSchemaKeywords.TypeKeyword] = (schemaTypes | JsonSchemaType.Null).ToString();
+            }
         }
-
-        var nullabilityInfoContext = new NullabilityInfoContext();
-        var nullabilityInfo = nullabilityInfoContext.Create(parameterInfo);
-        if (nullabilityInfo.WriteState == NullabilityState.Nullable)
+        if (schema[OpenApiConstants.SchemaId] is not null &&
+            propertyInfo.PropertyType != typeof(object) && propertyInfo.ShouldApplyNullablePropertySchema())
         {
-            schema[OpenApiSchemaKeywords.NullableKeyword] = true;
+            schema[OpenApiConstants.NullableProperty] = true;
         }
     }
 
     /// <summary>
-    /// Support applying nullability status for reference types provided as a property or field.
+    /// Prunes the "null" type from the schema for types that are componentized. These
+    /// types should represent their nullability using oneOf with null instead.
     /// </summary>
     /// <param name="schema">The <see cref="JsonNode"/> produced by the underlying schema generator.</param>
-    /// <param name="propertyInfo">The <see cref="JsonPropertyInfo" /> associated with the schema.</param>
-    internal static void ApplyNullabilityContextInfo(this JsonNode schema, JsonPropertyInfo propertyInfo)
+    internal static void PruneNullTypeForComponentizedTypes(this JsonNode schema)
     {
-        // Avoid setting explicit nullability annotations for `object` types so they continue to match on the catch
-        // all schema (no type, no format, no constraints).
-        if (propertyInfo.PropertyType != typeof(object) && (propertyInfo.IsGetNullable || propertyInfo.IsSetNullable))
+        if (schema[OpenApiConstants.SchemaId] is not null &&
+                schema[OpenApiSchemaKeywords.TypeKeyword] is JsonArray typeArray)
+        {
+            for (var i = typeArray.Count - 1; i >= 0; i--)
+            {
+                if (typeArray[i]?.GetValue<string>() == "null")
+                {
+                    typeArray.RemoveAt(i);
+                }
+            }
+            if (typeArray.Count == 1)
+            {
+                schema[OpenApiSchemaKeywords.TypeKeyword] = typeArray[0]?.GetValue<string>();
+            }
+        }
+    }
+
+    private static JsonSchemaType? MapJsonNodeToSchemaType(JsonNode? jsonNode)
+    {
+        if (jsonNode is not JsonArray jsonArray)
         {
-            schema[OpenApiSchemaKeywords.NullableKeyword] = true;
+            if (Enum.TryParse<JsonSchemaType>(jsonNode?.GetValue<string>(), true, out var openApiSchemaType))
+            {
+                return openApiSchemaType;
+            }
+
+            return jsonNode is JsonValue jsonValue && jsonValue.TryGetValue<string>(out var identifier)
+                ? ToSchemaType(identifier)
+                : null;
+        }
+
+        JsonSchemaType? schemaType = null;
+
+        foreach (var node in jsonArray)
+        {
+            if (node is JsonValue jsonValue && jsonValue.TryGetValue<string>(out var identifier))
+            {
+                var type = ToSchemaType(identifier);
+                schemaType = schemaType.HasValue ? (schemaType | type) : type;
+            }
+        }
+
+        return schemaType;
+
+        static JsonSchemaType ToSchemaType(string identifier)
+        {
+            return identifier.ToLowerInvariant() switch
+            {
+                "null" => JsonSchemaType.Null,
+                "boolean" => JsonSchemaType.Boolean,
+                "integer" => JsonSchemaType.Integer,
+                "number" => JsonSchemaType.Number,
+                "string" => JsonSchemaType.String,
+                "array" => JsonSchemaType.Array,
+                "object" => JsonSchemaType.Object,
+                _ => throw new InvalidOperationException($"Unknown schema type: {identifier}"),
+            };
         }
     }
 }
diff --git a/src/OpenApi/src/Extensions/JsonTypeInfoExtensions.cs b/src/OpenApi/src/Extensions/JsonTypeInfoExtensions.cs
index 18e08f585d72..a97a2226d5cf 100644
--- a/src/OpenApi/src/Extensions/JsonTypeInfoExtensions.cs
+++ b/src/OpenApi/src/Extensions/JsonTypeInfoExtensions.cs
@@ -66,8 +66,16 @@ internal static class JsonTypeInfoExtensions
             return simpleName;
         }
 
+        // Use the same JSON Patch schema for all JSON Patch document types (JsonPatchDocument,
+        // JsonPatchDocument<T>, derived types, etc.) as otherwise we'll generate a schema
+        // per unique type which are otherwise identical to each other.
+        if (type.IsJsonPatchDocument())
+        {
+            return "JsonPatchDocument";
+        }
+
         // Although arrays are enumerable types they are not encoded correctly
-        // with JsonTypeInfoKind.Enumerable so we handle the Enumerble type
+        // with JsonTypeInfoKind.Enumerable so we handle the Enumerable type
         // case here.
         if (jsonTypeInfo is JsonTypeInfo { Kind: JsonTypeInfoKind.Enumerable } || type.IsArray)
         {
@@ -100,11 +108,23 @@ internal static string GetSchemaReferenceId(this Type type, JsonSerializerOption
             return $"{typeName}Of{propertyNames}";
         }
 
+        // Special handling for nullable value types
+        if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+        {
+            return type.GetGenericArguments()[0].GetSchemaReferenceId(options);
+        }
+
         // Special handling for generic types that are collections
         // Generic types become a concatenation of the generic type name and the type arguments
         if (type.IsGenericType)
         {
-            var genericTypeName = type.Name[..type.Name.LastIndexOf('`')];
+            // We need to handle the case where the generic type is a nested type,
+            // so we check if the name contains a backtick already.
+            // For more information: https://github.com/dotnet/aspnetcore/issues/59092
+            var backtickIndex = type.Name.LastIndexOf('`');
+            var isNestedGenericType = backtickIndex == -1;
+
+            var genericTypeName = isNestedGenericType ? type.Name : type.Name[..backtickIndex];
             var genericArguments = type.GetGenericArguments();
             var argumentNames = string.Join("And", genericArguments.Select(arg => arg.GetSchemaReferenceId(options)));
             return $"{genericTypeName}Of{argumentNames}";
diff --git a/src/OpenApi/src/Extensions/OpenApiDocumentExtensions.cs b/src/OpenApi/src/Extensions/OpenApiDocumentExtensions.cs
new file mode 100644
index 000000000000..c09bd50dc67b
--- /dev/null
+++ b/src/OpenApi/src/Extensions/OpenApiDocumentExtensions.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.OpenApi;
+
+internal static class OpenApiDocumentExtensions
+{
+    /// <summary>
+    /// Registers a <see cref="IOpenApiSchema" /> into the top-level components store on the
+    /// <see cref="OpenApiDocument" /> and returns a resolvable reference to it.
+    /// </summary>
+    /// <param name="document">The <see cref="OpenApiDocument"/> to register the schema onto.</param>
+    /// <param name="schemaId">The ID that serves as the key for the schema in the schema store.</param>
+    /// <param name="schema">The <see cref="IOpenApiSchema" /> to register into the document.</param>
+    /// <returns>An <see cref="IOpenApiSchema"/> with a reference to the stored schema.</returns>
+    public static IOpenApiSchema AddOpenApiSchemaByReference(this OpenApiDocument document, string schemaId, IOpenApiSchema schema)
+    {
+        document.Components ??= new();
+        document.Components.Schemas ??= new Dictionary<string, IOpenApiSchema>();
+        document.Components.Schemas[schemaId] = schema;
+        document.Workspace ??= new();
+        var location = document.BaseUri + "/components/schemas/" + schemaId;
+        document.Workspace.RegisterComponentForDocument(document, schema, location);
+
+        object? description = null;
+        object? example = null;
+        if (schema is OpenApiSchema actualSchema)
+        {
+            actualSchema.Metadata?.TryGetValue(OpenApiConstants.RefDescriptionAnnotation, out description);
+            actualSchema.Metadata?.TryGetValue(OpenApiConstants.RefExampleAnnotation, out example);
+        }
+
+        return new OpenApiSchemaReference(schemaId, document)
+        {
+            Description = description as string,
+            Examples = example is JsonNode exampleJson ? [exampleJson] : null,
+        };
+    }
+}
diff --git a/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs b/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs
index 3e325362f6bf..e29a2dd86167 100644
--- a/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs
+++ b/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs
@@ -7,9 +7,9 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -30,6 +30,7 @@ public static class OpenApiEndpointConventionBuilderExtensions
     /// </remarks>
     /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
     /// <returns>A <see cref="IEndpointConventionBuilder"/> that can be used to further customize the endpoint.</returns>
+    [Obsolete("WithOpenApi is deprecated and will be removed in a future release. For more information, visit https://aka.ms/aspnet/deprecate/002.", DiagnosticId = "ASPDEPR002", UrlFormat = Obsoletions.AspNetCoreDeprecate002Url)]
     [RequiresDynamicCode(TrimWarningMessage)]
     [RequiresUnreferencedCode(TrimWarningMessage)]
     public static TBuilder WithOpenApi<TBuilder>(this TBuilder builder) where TBuilder : IEndpointConventionBuilder
@@ -49,6 +50,7 @@ public static TBuilder WithOpenApi<TBuilder>(this TBuilder builder) where TBuild
     /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
     /// <param name="configureOperation">An <see cref="Func{T, TResult}"/> that returns a new OpenAPI annotation given a generated operation.</param>
     /// <returns>A <see cref="IEndpointConventionBuilder"/> that can be used to further customize the endpoint.</returns>
+    [Obsolete("WithOpenApi is deprecated and will be removed in a future release. For more information, visit https://aka.ms/aspnet/deprecate/002.", DiagnosticId = "ASPDEPR002", UrlFormat = Obsoletions.AspNetCoreDeprecate002Url)]
     [RequiresDynamicCode(TrimWarningMessage)]
     [RequiresUnreferencedCode(TrimWarningMessage)]
     public static TBuilder WithOpenApi<TBuilder>(this TBuilder builder, Func<OpenApiOperation, OpenApiOperation> configureOperation)
@@ -121,4 +123,17 @@ private static void AddAndConfigureOperationForEndpoint(EndpointBuilder endpoint
             }
         }
     }
+
+    /// <summary>
+    /// Adds an OpenAPI operation transformer to the <see cref="EndpointBuilder.Metadata" /> associated
+    /// with the current endpoint.
+    /// </summary>
+    /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
+    /// <param name="transformer">The <see cref="Func{OpenApiOperation, OpenApiOperationTransformerContext, CancellationToken, Task}"/> that modifies the operation in the <see cref="OpenApiDocument"/>.</param>
+    /// <returns>A <see cref="IEndpointConventionBuilder"/> that can be used to further customize the endpoint.</returns>
+    public static TBuilder AddOpenApiOperationTransformer<TBuilder>(this TBuilder builder, Func<OpenApiOperation, OpenApiOperationTransformerContext, CancellationToken, Task> transformer) where TBuilder : IEndpointConventionBuilder
+    {
+        builder.WithMetadata(new DelegateOpenApiOperationTransformer(transformer));
+        return builder;
+    }
 }
diff --git a/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs b/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs
index c5bed38669e4..7028ae71600b 100644
--- a/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs
+++ b/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs
@@ -8,8 +8,6 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Writers;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -25,42 +23,62 @@ public static class OpenApiEndpointRouteBuilderExtensions
     /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
     /// <param name="pattern">The route to register the endpoint on. Must include the 'documentName' route parameter.</param>
     /// <returns>An <see cref="IEndpointRouteBuilder"/> that can be used to further customize the endpoint.</returns>
-    public static IEndpointConventionBuilder MapOpenApi(this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern = OpenApiConstants.DefaultOpenApiRoute)
+    public static IEndpointConventionBuilder MapOpenApi(this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern = OpenApi.OpenApiConstants.DefaultOpenApiRoute)
     {
         var options = endpoints.ServiceProvider.GetRequiredService<IOptionsMonitor<OpenApiOptions>>();
-        return endpoints.MapGet(pattern, async (HttpContext context, string documentName = OpenApiConstants.DefaultDocumentName) =>
+        return endpoints.MapGet(pattern, async (HttpContext context, string documentName = OpenApi.OpenApiConstants.DefaultDocumentName) =>
             {
+                // We need to retrieve the document name in a case-insensitive manner to support case-insensitive document name resolution.
+                // The document service is registered with a key equal to the document name, but in lowercase.
+                // The GetRequiredKeyedService() method is case-sensitive, which doesn't work well for OpenAPI document names here,
+                // as the document name is also used as the route to retrieve the document, so we need to ensure this is lowercased to achieve consistency with ASP.NET Core routing.
+                // The same goes for the document options below, which is also case-sensitive, and thus we need to pass in a case-insensitive document name.
+                // See OpenApiServiceCollectionExtensions.cs for more info.
+                var lowercasedDocumentName = documentName.ToLowerInvariant();
+
                 // It would be ideal to use the `HttpResponseStreamWriter` to
                 // asynchronously write to the response stream here but Microsoft.OpenApi
                 // does not yet support async APIs on their writers.
                 // See https://github.com/microsoft/OpenAPI.NET/issues/421 for more info.
-                var documentService = context.RequestServices.GetKeyedService<OpenApiDocumentService>(documentName);
+                var documentService = context.RequestServices.GetKeyedService<OpenApiDocumentService>(lowercasedDocumentName);
                 if (documentService is null)
                 {
                     context.Response.StatusCode = StatusCodes.Status404NotFound;
                     context.Response.ContentType = "text/plain;charset=utf-8";
-                    await context.Response.WriteAsync($"No OpenAPI document with the name '{documentName}' was found.");
+                    await context.Response.WriteAsync($"No OpenAPI document with the name '{lowercasedDocumentName}' was found.");
                 }
                 else
                 {
-                    var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.RequestAborted);
-                    var documentOptions = options.Get(documentName);
-                    using var output = MemoryBufferWriter.Get();
-                    using var writer = Utf8BufferTextWriter.Get(output);
-                    try
+                    var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.Request, context.RequestAborted);
+                    var documentOptions = options.Get(lowercasedDocumentName);
+
+                    using var textWriter = new Utf8BufferTextWriter(System.Globalization.CultureInfo.InvariantCulture);
+                    textWriter.SetWriter(context.Response.BodyWriter);
+
+                    string contentType;
+                    OpenApiWriterBase openApiWriter;
+
+                    if (UseYaml(pattern))
                     {
-                        document.Serialize(new OpenApiJsonWriter(writer), documentOptions.OpenApiVersion);
-                        context.Response.ContentType = "application/json;charset=utf-8";
-                        await context.Response.BodyWriter.WriteAsync(output.ToArray(), context.RequestAborted);
-                        await context.Response.BodyWriter.FlushAsync(context.RequestAborted);
+                        contentType = "text/plain+yaml;charset=utf-8";
+                        openApiWriter = new OpenApiYamlWriter(textWriter);
                     }
-                    finally
+                    else
                     {
-                        MemoryBufferWriter.Return(output);
-                        Utf8BufferTextWriter.Return(writer);
+                        contentType = "application/json;charset=utf-8";
+                        openApiWriter = new OpenApiJsonWriter(textWriter);
                     }
 
+                    context.Response.ContentType = contentType;
+
+                    await context.Response.StartAsync();
+                    await document.SerializeAsync(openApiWriter, documentOptions.OpenApiVersion, context.RequestAborted);
+                    await context.Response.BodyWriter.FlushAsync(context.RequestAborted);
                 }
             }).ExcludeFromDescription();
     }
+
+    private static bool UseYaml(string pattern) =>
+        pattern.EndsWith(".yaml", StringComparison.OrdinalIgnoreCase) ||
+        pattern.EndsWith(".yml", StringComparison.OrdinalIgnoreCase);
 }
diff --git a/src/OpenApi/src/Extensions/OpenApiSchemaExtensions.cs b/src/OpenApi/src/Extensions/OpenApiSchemaExtensions.cs
index a3f182147931..f394445850fe 100644
--- a/src/OpenApi/src/Extensions/OpenApiSchemaExtensions.cs
+++ b/src/OpenApi/src/Extensions/OpenApiSchemaExtensions.cs
@@ -1,69 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-
 namespace Microsoft.AspNetCore.OpenApi;
 
 internal static class OpenApiSchemaExtensions
 {
-    /// <summary>
-    /// Generates a deep copy of a given <see cref="OpenApiSchema"/> instance.
-    /// </summary>
-    /// <remarks>
-    /// The copy constructors of the <see cref="OpenApiSchema"/> class do not perform a deep
-    /// copy of the instance which presents a problem whe making modifications in deeply nested
-    /// subschemas. This extension implements a deep copy on <see cref="OpenApiSchema" /> to guarantee
-    /// that modifications on cloned subschemas do not affect the original subschema.
-    /// /// </remarks>
-    /// <param name="schema">The <see cref="OpenApiSchema"/> to generate a deep copy of.</param>
-    public static OpenApiSchema Clone(this OpenApiSchema schema)
+    private static readonly OpenApiSchema _nullSchema = new() { Type = JsonSchemaType.Null };
+
+    public static IOpenApiSchema CreateOneOfNullableWrapper(this IOpenApiSchema originalSchema)
     {
         return new OpenApiSchema
         {
-            Title = schema.Title,
-            Type = schema.Type,
-            Format = schema.Format,
-            Description = schema.Description,
-            Maximum = schema.Maximum,
-            ExclusiveMaximum = schema.ExclusiveMaximum,
-            Minimum = schema.Minimum,
-            ExclusiveMinimum = schema.ExclusiveMinimum,
-            MaxLength = schema.MaxLength,
-            MinLength = schema.MinLength,
-            Pattern = schema.Pattern,
-            MultipleOf = schema.MultipleOf,
-            Default = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(schema.Default),
-            ReadOnly = schema.ReadOnly,
-            WriteOnly = schema.WriteOnly,
-            AllOf = schema.AllOf != null ? new List<OpenApiSchema>(schema.AllOf.Select(s => s.Clone())) : null,
-            OneOf = schema.OneOf != null ? new List<OpenApiSchema>(schema.OneOf.Select(s => s.Clone())) : null,
-            AnyOf = schema.AnyOf != null ? new List<OpenApiSchema>(schema.AnyOf.Select(s => s.Clone())) : null,
-            Not = schema.Not?.Clone(),
-            Required = schema.Required != null ? new HashSet<string>(schema.Required) : null,
-            Items = schema.Items?.Clone(),
-            MaxItems = schema.MaxItems,
-            MinItems = schema.MinItems,
-            UniqueItems = schema.UniqueItems,
-            Properties = schema.Properties?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Clone()),
-            MaxProperties = schema.MaxProperties,
-            MinProperties = schema.MinProperties,
-            AdditionalPropertiesAllowed = schema.AdditionalPropertiesAllowed,
-            AdditionalProperties = schema.AdditionalProperties?.Clone(),
-            Discriminator = schema.Discriminator != null ? new(schema.Discriminator) : null,
-            Example = OpenApiAnyCloneHelper.CloneFromCopyConstructor<IOpenApiAny>(schema.Example),
-            Enum = schema.Enum != null ? new List<IOpenApiAny>(schema.Enum) : null,
-            Nullable = schema.Nullable,
-            ExternalDocs = schema.ExternalDocs != null ? new(schema.ExternalDocs) : null,
-            Deprecated = schema.Deprecated,
-            Xml = schema.Xml != null ? new(schema.Xml) : null,
-            Extensions = schema.Extensions != null ? new Dictionary<string, IOpenApiExtension>(schema.Extensions) : null,
-            UnresolvedReference = schema.UnresolvedReference,
-            Reference = schema.Reference != null ? new(schema.Reference) : null,
-            Annotations = schema.Annotations != null ? new Dictionary<string, object>(schema.Annotations) : null,
+            OneOf =
+            [
+                _nullSchema,
+                originalSchema
+            ]
         };
     }
 }
diff --git a/src/OpenApi/src/Extensions/OpenApiServiceCollectionExtensions.cs b/src/OpenApi/src/Extensions/OpenApiServiceCollectionExtensions.cs
index aef8d1794616..1e96388af3b0 100644
--- a/src/OpenApi/src/Extensions/OpenApiServiceCollectionExtensions.cs
+++ b/src/OpenApi/src/Extensions/OpenApiServiceCollectionExtensions.cs
@@ -1,11 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Json;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.ApiDescriptions;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
+using OpenApiConstants = Microsoft.AspNetCore.OpenApi.OpenApiConstants;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -19,6 +21,14 @@ public static class OpenApiServiceCollectionExtensions
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/> to register services onto.</param>
     /// <param name="documentName">The name of the OpenAPI document associated with registered services.</param>
+    /// <example>
+    /// This method is commonly used to add OpenAPI services to the <see cref="WebApplicationBuilder.Services"/>
+    /// of a <see cref="WebApplicationBuilder"/>, as shown in the following example:
+    /// <code>
+    /// var builder = WebApplication.CreateBuilder(args);
+    /// builder.Services.AddOpenApi("MyWebApi");
+    /// </code>
+    /// </example>
     public static IServiceCollection AddOpenApi(this IServiceCollection services, string documentName)
     {
         ArgumentNullException.ThrowIfNull(services);
@@ -32,15 +42,31 @@ public static IServiceCollection AddOpenApi(this IServiceCollection services, st
     /// <param name="services">The <see cref="IServiceCollection"/> to register services onto.</param>
     /// <param name="documentName">The name of the OpenAPI document associated with registered services.</param>
     /// <param name="configureOptions">A delegate used to configure the target <see cref="OpenApiOptions"/>.</param>
+    /// <example>
+    /// This method is commonly used to add OpenAPI services to the <see cref="WebApplicationBuilder.Services"/>
+    /// of a <see cref="WebApplicationBuilder"/>, as shown in the following example:
+    /// <code>
+    /// var builder = WebApplication.CreateBuilder(args);
+    /// builder.Services.AddOpenApi("MyWebApi", options => {
+    ///     // Add a custom schema transformer for decimal types
+    ///     options.AddSchemaTransformer(DecimalTransformer.TransformAsync);
+    /// });
+    /// </code>
+    /// </example>
     public static IServiceCollection AddOpenApi(this IServiceCollection services, string documentName, Action<OpenApiOptions> configureOptions)
     {
         ArgumentNullException.ThrowIfNull(services);
         ArgumentNullException.ThrowIfNull(configureOptions);
 
-        services.AddOpenApiCore(documentName);
-        services.Configure<OpenApiOptions>(documentName, options =>
+        // We need to register the document name in a case-insensitive manner to support case-insensitive document name resolution.
+        // The document name is used to store and retrieve keyed services and configuration options, which are all case-sensitive.
+        // To achieve parity with ASP.NET Core routing, which is case-insensitive, we need to ensure the document name is lowercased.
+        var lowercasedDocumentName = documentName.ToLowerInvariant();
+
+        services.AddOpenApiCore(lowercasedDocumentName);
+        services.Configure<OpenApiOptions>(lowercasedDocumentName, options =>
         {
-            options.DocumentName = documentName;
+            options.DocumentName = lowercasedDocumentName;
             configureOptions(options);
         });
         return services;
@@ -51,6 +77,17 @@ public static IServiceCollection AddOpenApi(this IServiceCollection services, st
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/> to register services onto.</param>
     /// <param name="configureOptions">A delegate used to configure the target <see cref="OpenApiOptions"/>.</param>
+    /// <example>
+    /// This method is commonly used to add OpenAPI services to the <see cref="WebApplicationBuilder.Services"/>
+    /// of a <see cref="WebApplicationBuilder"/>, as shown in the following example:
+    /// <code>
+    /// var builder = WebApplication.CreateBuilder(args);
+    /// builder.Services.AddOpenApi(options => {
+    ///     // Add a custom schema transformer for decimal types
+    ///     options.AddSchemaTransformer(DecimalTransformer.TransformAsync);
+    /// });
+    /// </code>
+    /// </example>
     public static IServiceCollection AddOpenApi(this IServiceCollection services, Action<OpenApiOptions> configureOptions)
             => services.AddOpenApi(OpenApiConstants.DefaultDocumentName, configureOptions);
 
@@ -58,6 +95,14 @@ public static IServiceCollection AddOpenApi(this IServiceCollection services, Ac
     /// Adds OpenAPI services related to the default document to the specified <see cref="IServiceCollection"/>.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/> to register services onto.</param>
+    /// <example>
+    /// This method is commonly used to add OpenAPI services to the <see cref="WebApplicationBuilder.Services"/>
+    /// of a <see cref="WebApplicationBuilder"/>, as shown in the following example:
+    /// <code>
+    /// var builder = WebApplication.CreateBuilder(args);
+    /// builder.Services.AddOpenApi();
+    /// </code>
+    /// </example>
     public static IServiceCollection AddOpenApi(this IServiceCollection services)
         => services.AddOpenApi(OpenApiConstants.DefaultDocumentName);
 
@@ -65,8 +110,9 @@ private static IServiceCollection AddOpenApiCore(this IServiceCollection service
     {
         services.AddEndpointsApiExplorer();
         services.AddKeyedSingleton<OpenApiSchemaService>(documentName);
-        services.AddKeyedSingleton<OpenApiSchemaStore>(documentName);
         services.AddKeyedSingleton<OpenApiDocumentService>(documentName);
+        services.AddKeyedSingleton<IOpenApiDocumentProvider, OpenApiDocumentService>(documentName);
+
         // Required for build-time generation
         services.AddSingleton<IDocumentProvider, OpenApiDocumentProvider>();
         // Required to resolve document names for build-time generation
diff --git a/src/OpenApi/src/Extensions/TypeExtensions.cs b/src/OpenApi/src/Extensions/TypeExtensions.cs
new file mode 100644
index 000000000000..0636347bf5bc
--- /dev/null
+++ b/src/OpenApi/src/Extensions/TypeExtensions.cs
@@ -0,0 +1,109 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Linq;
+using System.Reflection;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.OpenApi;
+
+internal static class TypeExtensions
+{
+    private const string JsonPatchDocumentNamespace = "Microsoft.AspNetCore.JsonPatch.SystemTextJson";
+    private const string JsonPatchDocumentName = "JsonPatchDocument";
+    private const string JsonPatchDocumentNameOfT = "JsonPatchDocument`1";
+
+    public static bool IsJsonPatchDocument(this Type type)
+    {
+        // We cannot depend on the actual runtime type as
+        // Microsoft.AspNetCore.JsonPatch.SystemTextJson is not
+        // AoT compatible so cannot be referenced by Microsoft.AspNetCore.OpenApi.
+        var modelType = type;
+
+        while (modelType != null && modelType != typeof(object))
+        {
+            if (modelType.Namespace == JsonPatchDocumentNamespace &&
+                (modelType.Name == JsonPatchDocumentName ||
+                 (modelType.IsGenericType && modelType.GenericTypeArguments.Length == 1 && modelType.Name == JsonPatchDocumentNameOfT)))
+            {
+                return true;
+            }
+
+            modelType = modelType.BaseType;
+        }
+
+        return false;
+    }
+
+    public static bool ShouldApplyNullableResponseSchema(this ApiResponseType apiResponseType, ApiDescription apiDescription)
+    {
+        // Get the MethodInfo from the ActionDescriptor
+        var responseType = apiResponseType.Type;
+        var methodInfo = apiDescription.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+            ? controllerActionDescriptor.MethodInfo
+            : apiDescription.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+        if (methodInfo is null)
+        {
+            return false;
+        }
+
+        var returnType = methodInfo.ReturnType;
+        if (returnType.IsGenericType &&
+            (returnType.GetGenericTypeDefinition() == typeof(Task<>) || returnType.GetGenericTypeDefinition() == typeof(ValueTask<>)))
+        {
+            returnType = returnType.GetGenericArguments()[0];
+        }
+        if (returnType != responseType)
+        {
+            return false;
+        }
+
+        if (returnType.IsValueType)
+        {
+            return apiResponseType.ModelMetadata?.IsNullableValueType ?? false;
+        }
+
+        var nullabilityInfoContext = new NullabilityInfoContext();
+        var nullabilityInfo = nullabilityInfoContext.Create(methodInfo.ReturnParameter);
+        return nullabilityInfo.WriteState == NullabilityState.Nullable;
+    }
+
+    public static bool ShouldApplyNullableRequestSchema(this ApiParameterDescription apiParameterDescription)
+    {
+        var parameterType = apiParameterDescription.Type;
+        if (parameterType is null)
+        {
+            return false;
+        }
+
+        if (apiParameterDescription.ParameterDescriptor is not IParameterInfoParameterDescriptor { ParameterInfo: { } parameterInfo })
+        {
+            return false;
+        }
+
+        if (parameterType.IsValueType)
+        {
+            return apiParameterDescription.ModelMetadata?.IsNullableValueType ?? false;
+        }
+
+        var nullabilityInfoContext = new NullabilityInfoContext();
+        var nullabilityInfo = nullabilityInfoContext.Create(parameterInfo);
+        return nullabilityInfo.WriteState == NullabilityState.Nullable;
+    }
+
+    public static bool ShouldApplyNullablePropertySchema(this JsonPropertyInfo jsonPropertyInfo)
+    {
+        if (jsonPropertyInfo.AttributeProvider is not PropertyInfo propertyInfo)
+        {
+            return false;
+        }
+
+        var nullabilityInfoContext = new NullabilityInfoContext();
+        var nullabilityInfo = nullabilityInfoContext.Create(propertyInfo);
+        return nullabilityInfo.WriteState == NullabilityState.Nullable;
+    }
+}
diff --git a/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj b/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj
index 65688d2eb269..686bdcaf6329 100644
--- a/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj
+++ b/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj
@@ -14,12 +14,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.OpenApi" />
+    <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http.Results" />
-    <Reference Include="Microsoft.AspNetCore.Routing" />
-    <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
     <Reference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" />
+    <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
+    <Reference Include="Microsoft.AspNetCore.Routing" />
+    <Reference Include="Microsoft.OpenApi" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,6 +29,7 @@
     <Compile Include="$(SharedSourceRoot)PropertyAsParameterInfo.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ParameterBindingMethodCache.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)TypeNameHelper\TypeNameHelper.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
@@ -42,7 +44,18 @@
 
   <!-- Required to generated native AoT friendly `MapOpenApi` endpoint. -->
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(RepoRoot)/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <!-- Required to bundle source generator related assets into build. -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/OpenApi/gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj" ReferenceOutputAssembly="false" />
+    <None Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.OpenApi.SourceGenerators\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="..\build\Microsoft.AspNetCore.OpenApi.targets" Pack="true" PackagePath="build" Visible="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.OpenApi" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenApi/src/PublicAPI.Shipped.txt b/src/OpenApi/src/PublicAPI.Shipped.txt
index ca80deee675b..e5f97354be7f 100644
--- a/src/OpenApi/src/PublicAPI.Shipped.txt
+++ b/src/OpenApi/src/PublicAPI.Shipped.txt
@@ -1,4 +1,64 @@
 #nullable enable
 Microsoft.AspNetCore.Builder.OpenApiEndpointConventionBuilderExtensions
+Microsoft.AspNetCore.Builder.OpenApiEndpointRouteBuilderExtensions
+Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer
+Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiDocument! document, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer
+Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiOperation! operation, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer
+Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiSchema! schema, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.ApplicationServices.get -> System.IServiceProvider!
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.ApplicationServices.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DescriptionGroups.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup!>!
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DescriptionGroups.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DocumentName.get -> string!
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DocumentName.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.OpenApiDocumentTransformerContext() -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.ApplicationServices.get -> System.IServiceProvider!
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.ApplicationServices.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.Description.get -> Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription!
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.Description.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.DocumentName.get -> string!
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.DocumentName.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.OpenApiOperationTransformerContext() -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOptions
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer(Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiDocument!, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer<TTransformerType>() -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer(Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiOperation!, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer<TTransformerType>() -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer(Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiSchema!, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer<TTransformerType>() -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.CreateSchemaReferenceId.get -> System.Func<System.Text.Json.Serialization.Metadata.JsonTypeInfo!, string?>!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.CreateSchemaReferenceId.set -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.DocumentName.get -> string!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.OpenApiOptions() -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.OpenApiVersion.get -> Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.OpenApiVersion.set -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.ShouldInclude.get -> System.Func<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription!, bool>!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.ShouldInclude.set -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ApplicationServices.get -> System.IServiceProvider!
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ApplicationServices.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.DocumentName.get -> string!
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.DocumentName.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonPropertyInfo.get -> System.Text.Json.Serialization.Metadata.JsonPropertyInfo?
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonPropertyInfo.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonTypeInfo.get -> System.Text.Json.Serialization.Metadata.JsonTypeInfo!
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonTypeInfo.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.OpenApiSchemaTransformerContext() -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ParameterDescription.get -> Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription?
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ParameterDescription.init -> void
+Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions
 static Microsoft.AspNetCore.Builder.OpenApiEndpointConventionBuilderExtensions.WithOpenApi<TBuilder>(this TBuilder builder) -> TBuilder
 static Microsoft.AspNetCore.Builder.OpenApiEndpointConventionBuilderExtensions.WithOpenApi<TBuilder>(this TBuilder builder, System.Func<Microsoft.OpenApi.Models.OpenApiOperation!, Microsoft.OpenApi.Models.OpenApiOperation!>! configureOperation) -> TBuilder
+static Microsoft.AspNetCore.Builder.OpenApiEndpointRouteBuilderExtensions.MapOpenApi(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern = "/openapi/{documentName}.json") -> Microsoft.AspNetCore.Builder.IEndpointConventionBuilder!
+static Microsoft.AspNetCore.OpenApi.OpenApiOptions.CreateDefaultSchemaReferenceId(System.Text.Json.Serialization.Metadata.JsonTypeInfo! jsonTypeInfo) -> string?
+static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! documentName) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! documentName, System.Action<Microsoft.AspNetCore.OpenApi.OpenApiOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.OpenApi.OpenApiOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
diff --git a/src/OpenApi/src/PublicAPI.Unshipped.txt b/src/OpenApi/src/PublicAPI.Unshipped.txt
index 5b3cb33941d0..b94c71e90cb6 100644
--- a/src/OpenApi/src/PublicAPI.Unshipped.txt
+++ b/src/OpenApi/src/PublicAPI.Unshipped.txt
@@ -1,61 +1,25 @@
 #nullable enable
-Microsoft.AspNetCore.Builder.OpenApiEndpointRouteBuilderExtensions
-Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiDocument! document, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer
-Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiOperation! operation, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer
-Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiSchema! schema, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.Description.get -> Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription!
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.Description.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOptions
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer(Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer<TTransformerType>() -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer(Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer<TTransformerType>() -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.CreateSchemaReferenceId.get -> System.Func<System.Text.Json.Serialization.Metadata.JsonTypeInfo!, string?>!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.CreateSchemaReferenceId.set -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.DocumentName.get -> string!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.OpenApiOptions() -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.OpenApiVersion.get -> Microsoft.OpenApi.OpenApiSpecVersion
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.OpenApiVersion.set -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.ShouldInclude.get -> System.Func<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription!, bool>!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.ShouldInclude.set -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiOperation!, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiSchema!, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer(Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiDocument!, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer<TTransformerType>() -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ApplicationServices.get -> System.IServiceProvider!
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ApplicationServices.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.DocumentName.get -> string!
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.DocumentName.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonPropertyInfo.get -> System.Text.Json.Serialization.Metadata.JsonPropertyInfo?
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonPropertyInfo.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonTypeInfo.get -> System.Text.Json.Serialization.Metadata.JsonTypeInfo!
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.JsonTypeInfo.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.OpenApiSchemaTransformerContext() -> void
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ParameterDescription.get -> Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription?
-Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.ParameterDescription.init -> void
-Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions
-static Microsoft.AspNetCore.Builder.OpenApiEndpointRouteBuilderExtensions.MapOpenApi(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string! pattern = "/openapi/{documentName}.json") -> Microsoft.AspNetCore.Builder.IEndpointConventionBuilder!
-static Microsoft.AspNetCore.OpenApi.OpenApiOptions.CreateDefaultSchemaReferenceId(System.Text.Json.Serialization.Metadata.JsonTypeInfo! jsonTypeInfo) -> string?
-static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! documentName) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, string! documentName, System.Action<Microsoft.AspNetCore.OpenApi.OpenApiOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-static Microsoft.Extensions.DependencyInjection.OpenApiServiceCollectionExtensions.AddOpenApi(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.OpenApi.OpenApiOptions!>! configureOptions) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
-Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.ApplicationServices.get -> System.IServiceProvider!
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.ApplicationServices.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DescriptionGroups.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup!>!
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DescriptionGroups.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DocumentName.get -> string!
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.DocumentName.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.OpenApiDocumentTransformerContext() -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.ApplicationServices.get -> System.IServiceProvider!
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.ApplicationServices.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.DocumentName.get -> string!
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.DocumentName.init -> void
-Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.OpenApiOperationTransformerContext() -> void
+*REMOVED*Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiDocument! document, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+*REMOVED*Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiOperation! operation, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+*REMOVED*Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer.TransformAsync(Microsoft.OpenApi.Models.OpenApiSchema! schema, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+*REMOVED*Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiDocument!, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+*REMOVED*Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiOperation!, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+*REMOVED*Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer(System.Func<Microsoft.OpenApi.Models.OpenApiSchema!, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+*REMOVED*static Microsoft.AspNetCore.Builder.OpenApiEndpointConventionBuilderExtensions.WithOpenApi<TBuilder>(this TBuilder builder, System.Func<Microsoft.OpenApi.Models.OpenApiOperation!, Microsoft.OpenApi.Models.OpenApiOperation!>! configureOperation) -> TBuilder
+Microsoft.AspNetCore.OpenApi.IOpenApiDocumentProvider
+Microsoft.AspNetCore.OpenApi.IOpenApiDocumentProvider.GetOpenApiDocumentAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.OpenApiDocument!>!
+Microsoft.AspNetCore.OpenApi.IOpenApiDocumentTransformer.TransformAsync(Microsoft.OpenApi.OpenApiDocument! document, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.OpenApi.IOpenApiOperationTransformer.TransformAsync(Microsoft.OpenApi.OpenApiOperation! operation, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.OpenApi.IOpenApiSchemaTransformer.TransformAsync(Microsoft.OpenApi.OpenApiSchema! schema, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddDocumentTransformer(System.Func<Microsoft.OpenApi.OpenApiDocument!, Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddOperationTransformer(System.Func<Microsoft.OpenApi.OpenApiOperation!, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+Microsoft.AspNetCore.OpenApi.OpenApiOptions.AddSchemaTransformer(System.Func<Microsoft.OpenApi.OpenApiSchema!, Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> Microsoft.AspNetCore.OpenApi.OpenApiOptions!
+static Microsoft.AspNetCore.Builder.OpenApiEndpointConventionBuilderExtensions.AddOpenApiOperationTransformer<TBuilder>(this TBuilder builder, System.Func<Microsoft.OpenApi.OpenApiOperation!, Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext!, System.Threading.CancellationToken, System.Threading.Tasks.Task!>! transformer) -> TBuilder
+Microsoft.AspNetCore.OpenApi.OpenApiDocumentTransformerContext.GetOrCreateSchemaAsync(System.Type! type, Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription? parameterDescription = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.OpenApiSchema!>!
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.Document.get -> Microsoft.OpenApi.OpenApiDocument?
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.Document.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiOperationTransformerContext.GetOrCreateSchemaAsync(System.Type! type, Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription? parameterDescription = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.OpenApiSchema!>!
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.Document.get -> Microsoft.OpenApi.OpenApiDocument?
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.Document.init -> void
+Microsoft.AspNetCore.OpenApi.OpenApiSchemaTransformerContext.GetOrCreateSchemaAsync(System.Type! type, Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription? parameterDescription = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.OpenApiSchema!>!
+static Microsoft.AspNetCore.Builder.OpenApiEndpointConventionBuilderExtensions.WithOpenApi<TBuilder>(this TBuilder builder, System.Func<Microsoft.OpenApi.OpenApiOperation!, Microsoft.OpenApi.OpenApiOperation!>! configureOperation) -> TBuilder
diff --git a/src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs b/src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs
index c9d90f5d9e5a..877ac70010db 100644
--- a/src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs
+++ b/src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs
@@ -1,12 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+
 using OpenApiConstants = Microsoft.AspNetCore.OpenApi.OpenApiConstants;
 
 internal sealed partial class OpenApiJsonSchema
@@ -82,63 +84,65 @@ internal sealed partial class OpenApiJsonSchema
         return values;
     }
 
-    internal static IOpenApiAny? ReadOpenApiAny(ref Utf8JsonReader reader)
-        => ReadOpenApiAny(ref reader, out _);
+    internal static JsonNode? ReadJsonNode(ref Utf8JsonReader reader)
+        => ReadJsonNode(ref reader, out _);
 
-    internal static IOpenApiAny? ReadOpenApiAny(ref Utf8JsonReader reader, out string? type)
+    internal static JsonNode? ReadJsonNode(ref Utf8JsonReader reader, out JsonSchemaType? type)
     {
         type = null;
         if (reader.TokenType == JsonTokenType.Null)
         {
-            return new OpenApiNull();
+            return null;
         }
 
         if (reader.TokenType == JsonTokenType.True || reader.TokenType == JsonTokenType.False)
         {
-            type = "boolean";
-            return new OpenApiBoolean(reader.GetBoolean());
+            type = JsonSchemaType.Boolean;
+            return reader.GetBoolean();
         }
 
         if (reader.TokenType == JsonTokenType.Number)
         {
             if (reader.TryGetInt32(out var intValue))
             {
-                type = "integer";
-                return new OpenApiInteger(intValue);
+                type = JsonSchemaType.Integer;
+                return intValue;
             }
 
             if (reader.TryGetInt64(out var longValue))
             {
-                type = "integer";
-                return new OpenApiLong(longValue);
+                type = JsonSchemaType.Integer;
+                return longValue;
             }
 
             if (reader.TryGetSingle(out var floatValue) && !float.IsInfinity(floatValue))
             {
-                type = "number";
-                return new OpenApiFloat(floatValue);
+                type = JsonSchemaType.Number;
+                return floatValue;
             }
 
             if (reader.TryGetDouble(out var doubleValue))
             {
-                type = "number";
-                return new OpenApiDouble(doubleValue);
+                type = JsonSchemaType.Number;
+                return doubleValue;
             }
         }
 
         if (reader.TokenType == JsonTokenType.String)
         {
-            type = "string";
-            return new OpenApiString(reader.GetString());
+            type = JsonSchemaType.String;
+            return reader.GetString();
         }
 
         if (reader.TokenType == JsonTokenType.StartArray)
         {
-            type = "array";
-            var array = new OpenApiArray();
+            type = JsonSchemaType.Array;
+            var array = new JsonArray();
+            // Read to process JsonTokenType.StartArray before advancing
+            reader.Read();
             while (reader.TokenType != JsonTokenType.EndArray)
             {
-                array.Add(ReadOpenApiAny(ref reader));
+                array.Add(ReadJsonNode(ref reader));
                 reader.Read();
             }
             return array;
@@ -146,8 +150,8 @@ internal sealed partial class OpenApiJsonSchema
 
         if (reader.TokenType == JsonTokenType.StartObject)
         {
-            type = "object";
-            var obj = new OpenApiObject();
+            type = JsonSchemaType.Object;
+            var obj = new JsonObject();
             reader.Read();
             while (reader.TokenType != JsonTokenType.EndObject)
             {
@@ -158,7 +162,7 @@ internal sealed partial class OpenApiJsonSchema
 
                 var key = reader.GetString()!;
                 reader.Read();
-                obj[key] = ReadOpenApiAny(ref reader);
+                obj[key] = ReadJsonNode(ref reader);
                 reader.Read();
             }
             return obj;
@@ -185,47 +189,40 @@ public static void ReadProperty(ref Utf8JsonReader reader, string propertyName,
                     var types = ReadList<string>(ref reader);
                     foreach (var type in types ?? [])
                     {
-                        // JSON Schema represents nullable types using an array consisting of
-                        // the target type and "null". Since OpenAPI Schema does not support
-                        // representing types within an array we must check for the "null" type
-                        // and map it to OpenAPI's `nullable` property for OpenAPI v3.
-                        if (type == "null")
+                        if (schema.Type is not null)
                         {
-                            schema.Nullable = true;
+                            schema.Type |= Enum.Parse<JsonSchemaType>(type, ignoreCase: true);
                         }
                         else
                         {
-                            schema.Type = type;
+                            schema.Type = Enum.Parse<JsonSchemaType>(type, ignoreCase: true);
                         }
                     }
                 }
                 else
                 {
                     var type = reader.GetString();
-                    schema.Type = type;
+                    Debug.Assert(type is not null);
+                    schema.Type = Enum.Parse<JsonSchemaType>(type, ignoreCase: true);
                 }
                 break;
             case OpenApiSchemaKeywords.EnumKeyword:
                 reader.Read();
-                var enumValues = ReadList<string>(ref reader);
+                var enumValues = ReadList<JsonNode>(ref reader);
                 if (enumValues is not null)
                 {
-                    schema.Enum = enumValues.Select(v => new OpenApiString(v)).ToList<IOpenApiAny>();
+                    schema.Enum = enumValues;
                 }
                 break;
             case OpenApiSchemaKeywords.DefaultKeyword:
                 reader.Read();
-                schema.Default = ReadOpenApiAny(ref reader);
+                schema.Default = ReadJsonNode(ref reader);
                 break;
             case OpenApiSchemaKeywords.ItemsKeyword:
                 reader.Read();
                 var valueConverter = (JsonConverter<OpenApiJsonSchema>)options.GetTypeInfo(typeof(OpenApiJsonSchema)).Converter;
                 schema.Items = valueConverter.Read(ref reader, typeof(OpenApiJsonSchema), options)?.Schema;
                 break;
-            case OpenApiSchemaKeywords.NullableKeyword:
-                reader.Read();
-                schema.Nullable = reader.GetBoolean();
-                break;
             case OpenApiSchemaKeywords.DescriptionKeyword:
                 reader.Read();
                 schema.Description = reader.GetString();
@@ -261,12 +258,22 @@ public static void ReadProperty(ref Utf8JsonReader reader, string propertyName,
             case OpenApiSchemaKeywords.MinimumKeyword:
                 reader.Read();
                 var minimum = reader.GetDecimal();
-                schema.Minimum = minimum;
+                schema.Minimum = minimum.ToString(CultureInfo.InvariantCulture);
+                break;
+            case OpenApiSchemaKeywords.ExclusiveMinimum:
+                reader.Read();
+                var exclusiveMinimum = reader.GetDecimal();
+                schema.ExclusiveMinimum = exclusiveMinimum.ToString(CultureInfo.InvariantCulture);
                 break;
             case OpenApiSchemaKeywords.MaximumKeyword:
                 reader.Read();
                 var maximum = reader.GetDecimal();
-                schema.Maximum = maximum;
+                schema.Maximum = maximum.ToString(CultureInfo.InvariantCulture);
+                break;
+            case OpenApiSchemaKeywords.ExclusiveMaximum:
+                reader.Read();
+                var exclusiveMaximum = reader.GetDecimal();
+                schema.ExclusiveMaximum = exclusiveMaximum.ToString(CultureInfo.InvariantCulture);
                 break;
             case OpenApiSchemaKeywords.PatternKeyword:
                 reader.Read();
@@ -276,18 +283,29 @@ public static void ReadProperty(ref Utf8JsonReader reader, string propertyName,
             case OpenApiSchemaKeywords.PropertiesKeyword:
                 reader.Read();
                 var props = ReadDictionary<OpenApiJsonSchema>(ref reader);
-                schema.Properties = props?.ToDictionary(p => p.Key, p => p.Value.Schema);
+                schema.Properties = props?.ToDictionary(p => p.Key, p => p.Value.Schema as IOpenApiSchema);
                 break;
             case OpenApiSchemaKeywords.AdditionalPropertiesKeyword:
                 reader.Read();
+                if (reader.TokenType == JsonTokenType.False)
+                {
+                    schema.AdditionalPropertiesAllowed = false;
+                    break;
+                }
                 var additionalPropsConverter = (JsonConverter<OpenApiJsonSchema>)options.GetTypeInfo(typeof(OpenApiJsonSchema)).Converter;
                 schema.AdditionalProperties = additionalPropsConverter.Read(ref reader, typeof(OpenApiJsonSchema), options)?.Schema;
                 break;
             case OpenApiSchemaKeywords.AnyOfKeyword:
                 reader.Read();
-                schema.Type = "object";
-                var schemas = ReadList<OpenApiJsonSchema>(ref reader);
-                schema.AnyOf = schemas?.Select(s => s.Schema).ToList();
+                schema.Type = JsonSchemaType.Object;
+                var anyOfSchemas = ReadList<OpenApiJsonSchema>(ref reader);
+                schema.AnyOf = anyOfSchemas?.Select(s => s.Schema as IOpenApiSchema).ToList();
+                break;
+            case OpenApiSchemaKeywords.OneOfKeyword:
+                reader.Read();
+                schema.Type = JsonSchemaType.Object;
+                var oneOfSchemas = ReadList<OpenApiJsonSchema>(ref reader);
+                schema.OneOf = oneOfSchemas?.Select(s => s.Schema as IOpenApiSchema).ToList();
                 break;
             case OpenApiSchemaKeywords.DiscriminatorKeyword:
                 reader.Read();
@@ -302,25 +320,42 @@ public static void ReadProperty(ref Utf8JsonReader reader, string propertyName,
                 var mappings = ReadDictionary<string>(ref reader);
                 if (mappings is not null)
                 {
-                    schema.Discriminator.Mapping = mappings;
+                    schema.Discriminator ??= new OpenApiDiscriminator();
+                    foreach (var kvp in mappings)
+                    {
+                        schema.Discriminator.Mapping ??= new Dictionary<string, OpenApiSchemaReference>();
+                        schema.Discriminator.Mapping[kvp.Key] = new OpenApiSchemaReference(kvp.Value);
+                    }
                 }
                 break;
             case OpenApiConstants.SchemaId:
                 reader.Read();
-                schema.Annotations ??= new Dictionary<string, object>();
-                schema.Annotations.Add(OpenApiConstants.SchemaId, reader.GetString());
+                schema.Metadata ??= new Dictionary<string, object>();
+                schema.Metadata.Add(OpenApiConstants.SchemaId, reader.GetString() ?? string.Empty);
+                break;
+            case OpenApiConstants.NullableProperty:
+                reader.Read();
+                schema.Metadata ??= new Dictionary<string, object>();
+                schema.Metadata.Add(OpenApiConstants.NullableProperty, reader.GetBoolean());
                 break;
             // OpenAPI does not support the `const` keyword in its schema implementation, so
             // we map it to its closest approximation, an enum with a single value, here.
             case OpenApiSchemaKeywords.ConstKeyword:
                 reader.Read();
-                schema.Enum = [ReadOpenApiAny(ref reader, out var constType)];
+                schema.Enum = ReadJsonNode(ref reader, out var constType) is { } jsonNode ? [jsonNode] : [];
                 schema.Type = constType;
                 break;
             case OpenApiSchemaKeywords.RefKeyword:
                 reader.Read();
-                schema.Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = reader.GetString() };
+                schema.Metadata ??= new Dictionary<string, object>();
+                schema.Metadata[OpenApiConstants.RefId] = reader.GetString() ?? string.Empty;
+                break;
+            case OpenApiConstants.RefDescriptionAnnotation:
+                reader.Read();
+                schema.Metadata ??= new Dictionary<string, object>();
+                schema.Metadata[OpenApiConstants.RefDescriptionAnnotation] = reader.GetString() ?? string.Empty;
                 break;
+
             default:
                 reader.Skip();
                 break;
diff --git a/src/OpenApi/src/Schemas/OpenApiJsonSchema.cs b/src/OpenApi/src/Schemas/OpenApiJsonSchema.cs
index 08ece97c62a5..3a73ace8778e 100644
--- a/src/OpenApi/src/Schemas/OpenApiJsonSchema.cs
+++ b/src/OpenApi/src/Schemas/OpenApiJsonSchema.cs
@@ -3,7 +3,6 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.OpenApi.Models;
 
 [JsonConverter(typeof(JsonConverter))]
 internal sealed partial class OpenApiJsonSchema(OpenApiSchema schema)
diff --git a/src/OpenApi/src/Schemas/OpenApiJsonSchemaContext.cs b/src/OpenApi/src/Schemas/OpenApiJsonSchemaContext.cs
index b2be4b47b8df..dffca479b20c 100644
--- a/src/OpenApi/src/Schemas/OpenApiJsonSchemaContext.cs
+++ b/src/OpenApi/src/Schemas/OpenApiJsonSchemaContext.cs
@@ -1,10 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
 [JsonSerializable(typeof(OpenApiJsonSchema))]
 [JsonSerializable(typeof(string))]
+[JsonSerializable(typeof(JsonNode))]
 internal sealed partial class OpenApiJsonSchemaContext : JsonSerializerContext { }
diff --git a/src/OpenApi/src/Schemas/OpenApiSchemaKeywords.cs b/src/OpenApi/src/Schemas/OpenApiSchemaKeywords.cs
index 37e4121462b9..104b80798c96 100644
--- a/src/OpenApi/src/Schemas/OpenApiSchemaKeywords.cs
+++ b/src/OpenApi/src/Schemas/OpenApiSchemaKeywords.cs
@@ -10,9 +10,9 @@ internal class OpenApiSchemaKeywords
     public const string AdditionalPropertiesKeyword = "additionalProperties";
     public const string RequiredKeyword = "required";
     public const string AnyOfKeyword = "anyOf";
+    public const string OneOfKeyword = "oneOf";
     public const string EnumKeyword = "enum";
     public const string DefaultKeyword = "default";
-    public const string NullableKeyword = "nullable";
     public const string DescriptionKeyword = "description";
     public const string DiscriminatorKeyword = "discriminatorName";
     public const string DiscriminatorMappingKeyword = "discriminatorMapping";
@@ -20,7 +20,9 @@ internal class OpenApiSchemaKeywords
     public const string MaxLengthKeyword = "maxLength";
     public const string PatternKeyword = "pattern";
     public const string MinimumKeyword = "minimum";
+    public const string ExclusiveMinimum = "exclusiveMinimum";
     public const string MaximumKeyword = "maximum";
+    public const string ExclusiveMaximum = "exclusiveMaximum";
     public const string MinItemsKeyword = "minItems";
     public const string MaxItemsKeyword = "maxItems";
     public const string RefKeyword = "$ref";
diff --git a/src/OpenApi/src/Services/IDocumentProvider.cs b/src/OpenApi/src/Services/IDocumentProvider.cs
index 31344117305e..2ea36eddf88a 100644
--- a/src/OpenApi/src/Services/IDocumentProvider.cs
+++ b/src/OpenApi/src/Services/IDocumentProvider.cs
@@ -1,8 +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 Microsoft.OpenApi;
-
 namespace Microsoft.Extensions.ApiDescriptions;
 
 /// <summary>
diff --git a/src/OpenApi/src/Services/IOpenApiDocumentProvider.cs b/src/OpenApi/src/Services/IOpenApiDocumentProvider.cs
new file mode 100644
index 000000000000..205679310a15
--- /dev/null
+++ b/src/OpenApi/src/Services/IOpenApiDocumentProvider.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.OpenApi;
+
+/// <summary>
+/// Represents a provider for OpenAPI documents that can be used by consumers to
+/// retrieve generated OpenAPI documents at runtime.
+/// </summary>
+public interface IOpenApiDocumentProvider
+{
+    /// <summary>
+    /// Gets the OpenAPI document.
+    /// </summary>
+    /// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the OpenAPI document.</returns>
+    /// <remarks>
+    /// This method is typically used by consumers to retrieve the OpenAPI document. The generated document
+    /// may not contain the appropriate servers information since it can be instantiated outside the context
+    /// of an HTTP request. In these scenarios, the <see cref="OpenApiDocument"/> can be modified to
+    /// include the appropriate servers information.
+    /// </remarks>
+    /// <remarks>
+    /// Any OpenAPI transformers registered in the <see cref="OpenApiOptions"/> instance associated with
+    /// this document will be applied to the document before it is returned.
+    /// </remarks>
+    Task<OpenApiDocument> GetOpenApiDocumentAsync(CancellationToken cancellationToken = default);
+}
diff --git a/src/OpenApi/src/Services/OpenApiConstants.cs b/src/OpenApi/src/Services/OpenApiConstants.cs
index e6d99096dc45..df4228633556 100644
--- a/src/OpenApi/src/Services/OpenApiConstants.cs
+++ b/src/OpenApi/src/Services/OpenApiConstants.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.OpenApi.Models;
+using System.Net.Http;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -12,20 +12,26 @@ internal static class OpenApiConstants
     internal const string DefaultOpenApiRoute = "/openapi/{documentName}.json";
     internal const string DescriptionId = "x-aspnetcore-id";
     internal const string SchemaId = "x-schema-id";
+    internal const string RefId = "x-ref-id";
+    internal const string RefDescriptionAnnotation = "x-ref-description";
+    internal const string RefExampleAnnotation = "x-ref-example";
+    internal const string RefKeyword = "$ref";
+    internal const string RefPrefix = "#";
+    internal const string NullableProperty = "x-is-nullable-property";
     internal const string DefaultOpenApiResponseKey = "default";
-    // Since there's a finite set of operation types that can be included in a given
-    // OpenApiPaths, we can pre-allocate an array of these types and use a direct
+    // Since there's a finite set of HTTP methods that can be included in a given
+    // OpenApiPaths, we can pre-allocate an array of these methods and use a direct
     // lookup on the OpenApiPaths dictionary to avoid allocating an enumerator
     // over the KeyValuePairs in OpenApiPaths.
-    internal static readonly OperationType[] OperationTypes = [
-        OperationType.Get,
-        OperationType.Post,
-        OperationType.Put,
-        OperationType.Delete,
-        OperationType.Options,
-        OperationType.Head,
-        OperationType.Patch,
-        OperationType.Trace
+    internal static readonly HttpMethod[] HttpMethods = [
+        HttpMethod.Get,
+        HttpMethod.Post,
+        HttpMethod.Put,
+        HttpMethod.Delete,
+        HttpMethod.Options,
+        HttpMethod.Head,
+        HttpMethod.Patch,
+        HttpMethod.Trace
     ];
     // Represents primitive types that should never be represented as
     // a schema reference and always inlined.
diff --git a/src/OpenApi/src/Services/OpenApiDocumentProvider.cs b/src/OpenApi/src/Services/OpenApiDocumentProvider.cs
index 2e8e2c14d721..7ba8c044a265 100644
--- a/src/OpenApi/src/Services/OpenApiDocumentProvider.cs
+++ b/src/OpenApi/src/Services/OpenApiDocumentProvider.cs
@@ -4,9 +4,6 @@
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Writers;
 using System.Linq;
 
 namespace Microsoft.Extensions.ApiDescriptions;
@@ -25,10 +22,13 @@ internal sealed class OpenApiDocumentProvider(IServiceProvider serviceProvider)
     /// <param name="writer">A text writer associated with the document to write to.</param>
     public async Task GenerateAsync(string documentName, TextWriter writer)
     {
-        var optionsSnapshot = serviceProvider.GetRequiredService<IOptionsSnapshot<OpenApiOptions>>();
-        var namedOption = optionsSnapshot.Get(documentName);
+        // See OpenApiServiceCollectionExtensions.cs to learn why we lowercase the document name
+        var lowercasedDocumentName = documentName.ToLowerInvariant();
+
+        var options = serviceProvider.GetRequiredService<IOptionsMonitor<OpenApiOptions>>();
+        var namedOption = options.Get(lowercasedDocumentName);
         var resolvedOpenApiVersion = namedOption.OpenApiVersion;
-        await GenerateAsync(documentName, writer, resolvedOpenApiVersion);
+        await GenerateAsync(lowercasedDocumentName, writer, resolvedOpenApiVersion);
     }
 
     /// <summary>
@@ -40,14 +40,21 @@ public async Task GenerateAsync(string documentName, TextWriter writer)
     /// <param name="openApiSpecVersion">The OpenAPI specification version to use when serializing the document.</param>
     public async Task GenerateAsync(string documentName, TextWriter writer, OpenApiSpecVersion openApiSpecVersion)
     {
+        // We need to retrieve the document name in a case-insensitive manner to support case-insensitive document name resolution.
+        // The document service is registered with a key equal to the document name, but in lowercase.
+        // The GetRequiredKeyedService() method is case-sensitive, which doesn't work well for OpenAPI document names here,
+        // as the document name is also used as the route to retrieve the document, so we need to ensure this is lowercased to achieve consistency with ASP.NET Core routing.
+        // See OpenApiServiceCollectionExtensions.cs for more info.
+        var lowercasedDocumentName = documentName.ToLowerInvariant();
+
         // Microsoft.OpenAPI does not provide async APIs for writing the JSON
         // document to a file. See https://github.com/microsoft/OpenAPI.NET/issues/421 for
         // more info.
-        var targetDocumentService = serviceProvider.GetRequiredKeyedService<OpenApiDocumentService>(documentName);
+        var targetDocumentService = serviceProvider.GetRequiredKeyedService<OpenApiDocumentService>(lowercasedDocumentName);
         using var scopedService = serviceProvider.CreateScope();
         var document = await targetDocumentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider);
         var jsonWriter = new OpenApiJsonWriter(writer);
-        document.Serialize(jsonWriter, openApiSpecVersion);
+        await document.SerializeAsync(jsonWriter, openApiSpecVersion);
     }
 
     /// <summary>
diff --git a/src/OpenApi/src/Services/OpenApiDocumentService.cs b/src/OpenApi/src/Services/OpenApiDocumentService.cs
index 2745d64770a7..f342f5b7943b 100644
--- a/src/OpenApi/src/Services/OpenApiDocumentService.cs
+++ b/src/OpenApi/src/Services/OpenApiDocumentService.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Concurrent;
 using System.Collections.Frozen;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -9,10 +10,12 @@
 using System.Globalization;
 using System.IO.Pipelines;
 using System.Linq;
+using System.Net.Http;
 using System.Reflection;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
@@ -24,7 +27,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -34,11 +36,10 @@ internal sealed class OpenApiDocumentService(
     IHostEnvironment hostEnvironment,
     IOptionsMonitor<OpenApiOptions> optionsMonitor,
     IServiceProvider serviceProvider,
-    IServer? server = null)
+    IServer? server = null) : IOpenApiDocumentProvider
 {
     private readonly OpenApiOptions _options = optionsMonitor.Get(documentName);
     private readonly OpenApiSchemaService _componentService = serviceProvider.GetRequiredKeyedService<OpenApiSchemaService>(documentName);
-    private readonly OpenApiSchemaReferenceTransformer _schemaReferenceTransformer = new();
 
     /// <summary>
     /// Cache of <see cref="OpenApiOperationTransformerContext"/> instances keyed by the
@@ -46,7 +47,7 @@ internal sealed class OpenApiDocumentService(
     /// are unique within the lifetime of an application and serve as helpful associators between
     /// operations, API descriptions, and their respective transformer contexts.
     /// </summary>
-    private readonly Dictionary<string, OpenApiOperationTransformerContext> _operationTransformerContextCache = new();
+    private readonly ConcurrentDictionary<string, OpenApiOperationTransformerContext> _operationTransformerContextCache = new();
     private static readonly ApiResponseType _defaultApiResponseType = new() { StatusCode = StatusCodes.Status200OK };
 
     private static readonly FrozenSet<string> _disallowedHeaderParameters = new[] { HeaderNames.Accept, HeaderNames.Authorization, HeaderNames.ContentType }.ToFrozenSet(StringComparer.OrdinalIgnoreCase);
@@ -54,46 +55,57 @@ internal sealed class OpenApiDocumentService(
     internal bool TryGetCachedOperationTransformerContext(string descriptionId, [NotNullWhen(true)] out OpenApiOperationTransformerContext? context)
         => _operationTransformerContextCache.TryGetValue(descriptionId, out context);
 
-    public async Task<OpenApiDocument> GetOpenApiDocumentAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken = default)
+    public async Task<OpenApiDocument> GetOpenApiDocumentAsync(IServiceProvider scopedServiceProvider, HttpRequest? httpRequest = null, CancellationToken cancellationToken = default)
     {
-        // For good hygiene, operation-level tags must also appear in the document-level
-        // tags collection. This set captures all tags that have been seen so far.
-        HashSet<OpenApiTag> capturedTags = new(OpenApiTagComparer.Instance);
         // Schema and operation transformers are scoped per-request and can be
         // pre-allocated to hold the same number of transformers as the associated
         // options object.
-        IOpenApiSchemaTransformer[] schemaTransformers = _options.SchemaTransformers.Count > 0
+        var schemaTransformers = _options.SchemaTransformers.Count > 0
             ? new IOpenApiSchemaTransformer[_options.SchemaTransformers.Count]
-            : Array.Empty<IOpenApiSchemaTransformer>();
-        IOpenApiOperationTransformer[] operationTransformers = _options.OperationTransformers.Count > 0 ?
+            : [];
+        var operationTransformers = _options.OperationTransformers.Count > 0 ?
             new IOpenApiOperationTransformer[_options.OperationTransformers.Count]
-            : Array.Empty<IOpenApiOperationTransformer>();
+            : [];
         InitializeTransformers(scopedServiceProvider, schemaTransformers, operationTransformers);
         var document = new OpenApiDocument
         {
             Info = GetOpenApiInfo(),
-            Paths = await GetOpenApiPathsAsync(capturedTags, scopedServiceProvider, operationTransformers, schemaTransformers, cancellationToken),
-            Servers = GetOpenApiServers(),
-            Tags = [.. capturedTags]
+            Servers = GetOpenApiServers(httpRequest)
         };
+        document.Paths = await GetOpenApiPathsAsync(document, scopedServiceProvider, operationTransformers, schemaTransformers, cancellationToken);
         try
         {
-            await ApplyTransformersAsync(document, scopedServiceProvider, cancellationToken);
+            await ApplyTransformersAsync(document, scopedServiceProvider, schemaTransformers, cancellationToken);
         }
+
         finally
         {
             await FinalizeTransformers(schemaTransformers, operationTransformers);
         }
+        // Call register components to support
+        // resolution of references in the document.
+        document.Workspace ??= new();
+        document.Workspace.RegisterComponents(document);
+        if (document.Components?.Schemas is not null)
+        {
+            // Sort schemas by key name for better readability and consistency
+            // This works around an API change in OpenAPI.NET
+            document.Components.Schemas = new Dictionary<string, IOpenApiSchema>(
+                document.Components.Schemas.OrderBy(kvp => kvp.Key),
+                StringComparer.Ordinal);
+        }
         return document;
     }
 
-    private async Task ApplyTransformersAsync(OpenApiDocument document, IServiceProvider scopedServiceProvider, CancellationToken cancellationToken)
+    private async Task ApplyTransformersAsync(OpenApiDocument document, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, CancellationToken cancellationToken)
     {
         var documentTransformerContext = new OpenApiDocumentTransformerContext
         {
             DocumentName = documentName,
             ApplicationServices = scopedServiceProvider,
             DescriptionGroups = apiDescriptionGroupCollectionProvider.ApiDescriptionGroups.Items,
+            Document = document,
+            SchemaTransformers = schemaTransformers
         };
         // Use index-based for loop to avoid allocating an enumerator with a foreach.
         for (var i = 0; i < _options.DocumentTransformers.Count; i++)
@@ -101,8 +113,6 @@ private async Task ApplyTransformersAsync(OpenApiDocument document, IServiceProv
             var transformer = _options.DocumentTransformers[i];
             await transformer.TransformAsync(document, documentTransformerContext, cancellationToken);
         }
-        // Move duplicated JSON schemas to the global components.schemas object and map references after all transformers have run.
-        await _schemaReferenceTransformer.TransformAsync(document, documentTransformerContext, cancellationToken);
     }
 
     internal void InitializeTransformers(IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, IOpenApiOperationTransformer[] operationTransformers)
@@ -153,15 +163,16 @@ internal async Task ForEachOperationAsync(
     {
         foreach (var pathItem in document.Paths.Values)
         {
-            for (var i = 0; i < OpenApiConstants.OperationTypes.Length; i++)
+            for (var i = 0; i < OpenApiConstants.HttpMethods.Length; i++)
             {
-                var operationType = OpenApiConstants.OperationTypes[i];
-                if (!pathItem.Operations.TryGetValue(operationType, out var operation))
+                var httpMethod = OpenApiConstants.HttpMethods[i];
+                if (pathItem.Operations is null || !pathItem.Operations.TryGetValue(httpMethod, out var operation))
                 {
                     continue;
                 }
 
-                if (operation.Annotations.TryGetValue(OpenApiConstants.DescriptionId, out var descriptionId) &&
+                if (operation.Metadata is { } annotations &&
+                    annotations.TryGetValue(OpenApiConstants.DescriptionId, out var descriptionId) &&
                     descriptionId is string descriptionIdString &&
                     TryGetCachedOperationTransformerContext(descriptionIdString, out var operationContext))
                 {
@@ -174,7 +185,7 @@ descriptionId is string descriptionIdString &&
                     // user in another operation transformer or if the lookup for operation transformer
                     // context resulted in a cache miss. As an alternative here, we could just to implement
                     // the "slow-path" and look up the ApiDescription associated with the OpenApiOperation
-                    // using the OperationType and given path, but we'll avoid this for now.
+                    // using the HttpMethod and given path, but we'll avoid this for now.
                     throw new InvalidOperationException("Cached operation transformer context not found. Please ensure that the operation contains the `x-aspnetcore-id` extension attribute.");
                 }
             }
@@ -191,12 +202,26 @@ internal OpenApiInfo GetOpenApiInfo()
         };
     }
 
-    internal List<OpenApiServer> GetOpenApiServers()
+    // Resolve server URL from the request to handle reverse proxies.
+    // If there is active request object, assume a development environment and use the server addresses.
+    internal List<OpenApiServer> GetOpenApiServers(HttpRequest? httpRequest = null)
+    {
+        if (httpRequest is not null)
+        {
+            var serverUrl = UriHelper.BuildAbsolute(httpRequest.Scheme, httpRequest.Host, httpRequest.PathBase);
+            return [new OpenApiServer { Url = serverUrl }];
+        }
+        else
+        {
+            return GetDevelopmentOpenApiServers();
+        }
+    }
+    private List<OpenApiServer> GetDevelopmentOpenApiServers()
     {
         if (hostEnvironment.IsDevelopment() &&
             server?.Features.Get<IServerAddressesFeature>()?.Addresses is { Count: > 0 } addresses)
         {
-            return addresses.Select(address => new OpenApiServer { Url = address }).ToList();
+            return [.. addresses.Select(address => new OpenApiServer { Url = address })];
         }
         return [];
     }
@@ -211,7 +236,7 @@ internal List<OpenApiServer> GetOpenApiServers()
     /// description instance into its appropriate document.
     /// </remarks>
     private async Task<OpenApiPaths> GetOpenApiPathsAsync(
-        HashSet<OpenApiTag> capturedTags,
+        OpenApiDocument document,
         IServiceProvider scopedServiceProvider,
         IOpenApiOperationTransformer[] operationTransformers,
         IOpenApiSchemaTransformer[] schemaTransformers,
@@ -225,35 +250,49 @@ private async Task<OpenApiPaths> GetOpenApiPathsAsync(
         foreach (var descriptions in descriptionsByPath)
         {
             Debug.Assert(descriptions.Key != null, "Relative path mapped to OpenApiPath key cannot be null.");
-            paths.Add(descriptions.Key, new OpenApiPathItem { Operations = await GetOperationsAsync(descriptions, capturedTags, scopedServiceProvider, operationTransformers, schemaTransformers, cancellationToken) });
+            var operations = await GetOperationsAsync(descriptions, document, scopedServiceProvider, operationTransformers, schemaTransformers, cancellationToken);
+            if (operations.Count > 0)
+            {
+                paths.Add(descriptions.Key, new OpenApiPathItem { Operations = operations });
+            }
         }
+
         return paths;
     }
 
-    private async Task<Dictionary<OperationType, OpenApiOperation>> GetOperationsAsync(
+    private async Task<Dictionary<HttpMethod, OpenApiOperation>> GetOperationsAsync(
         IGrouping<string?, ApiDescription> descriptions,
-        HashSet<OpenApiTag> capturedTags,
+        OpenApiDocument document,
         IServiceProvider scopedServiceProvider,
         IOpenApiOperationTransformer[] operationTransformers,
         IOpenApiSchemaTransformer[] schemaTransformers,
         CancellationToken cancellationToken)
     {
-        var operations = new Dictionary<OperationType, OpenApiOperation>();
+        var operations = new Dictionary<HttpMethod, OpenApiOperation>();
         foreach (var description in descriptions)
         {
-            var operation = await GetOperationAsync(description, capturedTags, scopedServiceProvider, schemaTransformers, cancellationToken);
-            operation.Annotations ??= new Dictionary<string, object>();
-            operation.Annotations.Add(OpenApiConstants.DescriptionId, description.ActionDescriptor.Id);
+            var operation = await GetOperationAsync(description, document, scopedServiceProvider, schemaTransformers, cancellationToken);
+            operation.Metadata ??= new Dictionary<string, object>();
+            operation.Metadata.Add(OpenApiConstants.DescriptionId, description.ActionDescriptor.Id);
 
             var operationContext = new OpenApiOperationTransformerContext
             {
                 DocumentName = documentName,
                 Description = description,
                 ApplicationServices = scopedServiceProvider,
+                Document = document,
+                SchemaTransformers = schemaTransformers
             };
 
             _operationTransformerContextCache.TryAdd(description.ActionDescriptor.Id, operationContext);
-            operations[description.GetOperationType()] = operation;
+
+            if (description.GetHttpMethod() is not { } method)
+            {
+                // Skip unsupported HTTP methods
+                continue;
+            }
+
+            operations[method] = operation;
 
             // Use index-based for loop to avoid allocating an enumerator with a foreach.
             for (var i = 0; i < operationTransformers.Length; i++)
@@ -261,33 +300,35 @@ private async Task<Dictionary<OperationType, OpenApiOperation>> GetOperationsAsy
                 var transformer = operationTransformers[i];
                 await transformer.TransformAsync(operation, operationContext, cancellationToken);
             }
+
+            // Apply any endpoint-specific operation transformers registered via
+            // the AddOpenApiOperationTransformer extension method.
+            var endpointOperationTransformers = description.ActionDescriptor.EndpointMetadata
+                .OfType<DelegateOpenApiOperationTransformer>();
+            foreach (var endpointOperationTransformer in endpointOperationTransformers)
+            {
+                await endpointOperationTransformer.TransformAsync(operation, operationContext, cancellationToken);
+            }
         }
         return operations;
     }
 
     private async Task<OpenApiOperation> GetOperationAsync(
         ApiDescription description,
-        HashSet<OpenApiTag> capturedTags,
+        OpenApiDocument document,
         IServiceProvider scopedServiceProvider,
         IOpenApiSchemaTransformer[] schemaTransformers,
         CancellationToken cancellationToken)
     {
-        var tags = GetTags(description);
-        if (tags != null)
-        {
-            foreach (var tag in tags)
-            {
-                capturedTags.Add(tag);
-            }
-        }
+        var tags = GetTags(description, document);
         var operation = new OpenApiOperation
         {
             OperationId = GetOperationId(description),
             Summary = GetSummary(description),
             Description = GetDescription(description),
-            Responses = await GetResponsesAsync(description, scopedServiceProvider, schemaTransformers, cancellationToken),
-            Parameters = await GetParametersAsync(description, scopedServiceProvider, schemaTransformers, cancellationToken),
-            RequestBody = await GetRequestBodyAsync(description, scopedServiceProvider, schemaTransformers, cancellationToken),
+            Responses = await GetResponsesAsync(document, description, scopedServiceProvider, schemaTransformers, cancellationToken),
+            Parameters = await GetParametersAsync(document, description, scopedServiceProvider, schemaTransformers, cancellationToken),
+            RequestBody = await GetRequestBodyAsync(document, description, scopedServiceProvider, schemaTransformers, cancellationToken),
             Tags = tags,
         };
         return operation;
@@ -303,19 +344,31 @@ private async Task<OpenApiOperation> GetOperationAsync(
         => description.ActionDescriptor.AttributeRouteInfo?.Name ??
             description.ActionDescriptor.EndpointMetadata.OfType<IEndpointNameMetadata>().LastOrDefault()?.EndpointName;
 
-    private static List<OpenApiTag>? GetTags(ApiDescription description)
+    private static HashSet<OpenApiTagReference> GetTags(ApiDescription description, OpenApiDocument document)
     {
         var actionDescriptor = description.ActionDescriptor;
         if (actionDescriptor.EndpointMetadata?.OfType<ITagsMetadata>().LastOrDefault() is { } tagsMetadata)
         {
-            return tagsMetadata.Tags.Select(tag => new OpenApiTag { Name = tag }).ToList();
+            HashSet<OpenApiTagReference> tags = [];
+            foreach (var tag in tagsMetadata.Tags)
+            {
+                document.Tags ??= new HashSet<OpenApiTag>();
+                document.Tags.Add(new OpenApiTag { Name = tag });
+                tags.Add(new OpenApiTagReference(tag, document));
+
+            }
+            return tags;
         }
         // If no tags are specified, use the controller name as the tag. This effectively
         // allows us to group endpoints by the "resource" concept (e.g. users, todos, etc.)
-        return [new OpenApiTag { Name = description.ActionDescriptor.RouteValues["controller"] }];
+        var controllerName = description.ActionDescriptor.RouteValues["controller"];
+        document.Tags ??= new HashSet<OpenApiTag>();
+        document.Tags.Add(new OpenApiTag { Name = controllerName });
+        return controllerName is not null ? [new(controllerName, document)] : [];
     }
 
     private async Task<OpenApiResponses> GetResponsesAsync(
+        OpenApiDocument document,
         ApiDescription description,
         IServiceProvider scopedServiceProvider,
         IOpenApiSchemaTransformer[] schemaTransformers,
@@ -328,7 +381,7 @@ private async Task<OpenApiResponses> GetResponsesAsync(
         {
             return new OpenApiResponses
             {
-                ["200"] = await GetResponseAsync(description, StatusCodes.Status200OK, _defaultApiResponseType, scopedServiceProvider, schemaTransformers, cancellationToken)
+                ["200"] = await GetResponseAsync(document, description, StatusCodes.Status200OK, _defaultApiResponseType, scopedServiceProvider, schemaTransformers, cancellationToken)
             };
         }
 
@@ -342,12 +395,13 @@ private async Task<OpenApiResponses> GetResponsesAsync(
             var responseKey = responseType.IsDefaultResponse
                 ? OpenApiConstants.DefaultOpenApiResponseKey
                 : responseType.StatusCode.ToString(CultureInfo.InvariantCulture);
-            responses.Add(responseKey, await GetResponseAsync(description, responseType.StatusCode, responseType, scopedServiceProvider, schemaTransformers, cancellationToken));
+            responses.Add(responseKey, await GetResponseAsync(document, description, responseType.StatusCode, responseType, scopedServiceProvider, schemaTransformers, cancellationToken));
         }
         return responses;
     }
 
     private async Task<OpenApiResponse> GetResponseAsync(
+        OpenApiDocument document,
         ApiDescription apiDescription,
         int statusCode,
         ApiResponseType apiResponseType,
@@ -355,10 +409,9 @@ private async Task<OpenApiResponse> GetResponseAsync(
         IOpenApiSchemaTransformer[] schemaTransformers,
         CancellationToken cancellationToken)
     {
-        var description = ReasonPhrases.GetReasonPhrase(statusCode);
         var response = new OpenApiResponse
         {
-            Description = description,
+            Description = apiResponseType.Description ?? ReasonPhrases.GetReasonPhrase(statusCode),
             Content = new Dictionary<string, OpenApiMediaType>()
         };
 
@@ -370,8 +423,15 @@ private async Task<OpenApiResponse> GetResponseAsync(
             .Select(responseFormat => responseFormat.MediaType);
         foreach (var contentType in apiResponseFormatContentTypes)
         {
-            var schema = apiResponseType.Type is { } type ? await _componentService.GetOrCreateSchemaAsync(type, scopedServiceProvider, schemaTransformers, null, captureSchemaByRef: true, cancellationToken) : new OpenApiSchema();
-            response.Content[contentType] = new OpenApiMediaType { Schema = schema };
+            IOpenApiSchema? schema = null;
+            if (apiResponseType.Type is { } responseType)
+            {
+                schema = await _componentService.GetOrCreateSchemaAsync(document, responseType, scopedServiceProvider, schemaTransformers, null, cancellationToken);
+                schema = apiResponseType.ShouldApplyNullableResponseSchema(apiDescription)
+                    ? schema.CreateOneOfNullableWrapper()
+                    : schema;
+            }
+            response.Content[contentType] = new OpenApiMediaType { Schema = schema ?? new OpenApiSchema() };
         }
 
         // MVC's `ProducesAttribute` doesn't implement the produces metadata that the ApiExplorer
@@ -388,13 +448,14 @@ private async Task<OpenApiResponse> GetResponseAsync(
         return response;
     }
 
-    private async Task<List<OpenApiParameter>?> GetParametersAsync(
+    private async Task<List<IOpenApiParameter>?> GetParametersAsync(
+        OpenApiDocument document,
         ApiDescription description,
         IServiceProvider scopedServiceProvider,
         IOpenApiSchemaTransformer[] schemaTransformers,
         CancellationToken cancellationToken)
     {
-        List<OpenApiParameter>? parameters = null;
+        List<IOpenApiParameter>? parameters = null;
         foreach (var parameter in description.ParameterDescriptions)
         {
             if (ShouldIgnoreParameter(parameter))
@@ -410,16 +471,17 @@ private async Task<OpenApiResponse> GetResponseAsync(
                     "Query" => ParameterLocation.Query,
                     "Header" => ParameterLocation.Header,
                     "Path" => ParameterLocation.Path,
-                    _ => throw new InvalidOperationException($"Unsupported parameter source: {parameter.Source.Id}")
+                    _ => ParameterLocation.Query
                 },
                 Required = IsRequired(parameter),
-                Schema = await _componentService.GetOrCreateSchemaAsync(parameter.Type, scopedServiceProvider, schemaTransformers, parameter, cancellationToken: cancellationToken),
+                Schema = await _componentService.GetOrCreateSchemaAsync(document, GetTargetType(description, parameter), scopedServiceProvider, schemaTransformers, parameter, cancellationToken: cancellationToken),
                 Description = GetParameterDescriptionFromAttribute(parameter)
             };
 
             parameters ??= [];
             parameters.Add(openApiParameter);
         }
+
         return parameters;
 
         static bool ShouldIgnoreParameter(ApiParameterDescription parameter)
@@ -451,18 +513,29 @@ private static bool IsRequired(ApiParameterDescription parameter)
     }
 
     // Apply [Description] attributes on the parameter to the top-level OpenApiParameter object and not the schema.
-    private static string? GetParameterDescriptionFromAttribute(ApiParameterDescription parameter) =>
-        parameter.ParameterDescriptor is IParameterInfoParameterDescriptor { ParameterInfo: { } parameterInfo } &&
-        parameterInfo.GetCustomAttributes().OfType<DescriptionAttribute>().LastOrDefault() is { } descriptionAttribute ?
-            descriptionAttribute.Description :
-            null;
+    private static string? GetParameterDescriptionFromAttribute(ApiParameterDescription parameter)
+    {
+        if (parameter.ParameterDescriptor is IParameterInfoParameterDescriptor { ParameterInfo: { } parameterInfo } &&
+            parameterInfo.GetCustomAttributes<DescriptionAttribute>().LastOrDefault() is { } parameterDescription)
+        {
+            return parameterDescription.Description;
+        }
 
-    private async Task<OpenApiRequestBody?> GetRequestBodyAsync(ApiDescription description, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, CancellationToken cancellationToken)
+        if (parameter.ModelMetadata is Mvc.ModelBinding.Metadata.DefaultModelMetadata { Attributes.PropertyAttributes.Count: > 0 } metadata &&
+            metadata.Attributes.PropertyAttributes.OfType<DescriptionAttribute>().LastOrDefault() is { } propertyDescription)
+        {
+            return propertyDescription.Description;
+        }
+
+        return null;
+    }
+
+    private async Task<OpenApiRequestBody?> GetRequestBodyAsync(OpenApiDocument document, ApiDescription description, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, CancellationToken cancellationToken)
     {
         // Only one parameter can be bound from the body in each request.
         if (description.TryGetBodyParameter(out var bodyParameter))
         {
-            return await GetJsonRequestBody(description.SupportedRequestFormats, bodyParameter, scopedServiceProvider, schemaTransformers, cancellationToken);
+            return await GetJsonRequestBody(document, description.SupportedRequestFormats, bodyParameter, scopedServiceProvider, schemaTransformers, cancellationToken);
         }
         // If there are no body parameters, check for form parameters.
         // Note: Form parameters and body parameters cannot exist simultaneously
@@ -470,12 +543,13 @@ private static bool IsRequired(ApiParameterDescription parameter)
         if (description.TryGetFormParameters(out var formParameters))
         {
             var endpointMetadata = description.ActionDescriptor.EndpointMetadata;
-            return await GetFormRequestBody(description.SupportedRequestFormats, formParameters, endpointMetadata, scopedServiceProvider, schemaTransformers, cancellationToken);
+            return await GetFormRequestBody(document, description.SupportedRequestFormats, formParameters, endpointMetadata, scopedServiceProvider, schemaTransformers, cancellationToken);
         }
         return null;
     }
 
     private async Task<OpenApiRequestBody> GetFormRequestBody(
+        OpenApiDocument document,
         IList<ApiRequestFormat> supportedRequestFormats,
         IEnumerable<ApiParameterDescription> formParameters,
         IList<object> endpointMetadata,
@@ -499,7 +573,8 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
             Content = new Dictionary<string, OpenApiMediaType>()
         };
 
-        var schema = new OpenApiSchema { Type = "object", Properties = new Dictionary<string, OpenApiSchema>() };
+        var schema = new OpenApiSchema { Type = JsonSchemaType.Object, Properties = new Dictionary<string, IOpenApiSchema>() };
+        IOpenApiSchema? complexTypeSchema = null;
         // Group form parameters by their name because MVC explodes form parameters that are bound from the
         // same model instance into separate ApiParameterDescriptions in ApiExplorer, while minimal APIs does not.
         //
@@ -519,21 +594,23 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
             if (parameter.All(parameter => parameter.ModelMetadata.ContainerType is null))
             {
                 var description = parameter.Single();
-                var parameterSchema = await _componentService.GetOrCreateSchemaAsync(description.Type, scopedServiceProvider, schemaTransformers, description, cancellationToken: cancellationToken);
+                var parameterSchema = await _componentService.GetOrCreateSchemaAsync(document, description.Type, scopedServiceProvider, schemaTransformers, description, cancellationToken: cancellationToken);
                 // Form files are keyed by their parameter name so we must capture the parameter name
                 // as a property in the schema.
                 if (description.Type == typeof(IFormFile) || description.Type == typeof(IFormFileCollection))
                 {
                     if (IsRequired(description))
                     {
+                        schema.Required ??= new HashSet<string>();
                         schema.Required.Add(description.Name);
                     }
                     if (hasMultipleFormParameters)
                     {
+                        schema.AllOf ??= [];
                         schema.AllOf.Add(new OpenApiSchema
                         {
-                            Type = "object",
-                            Properties = new Dictionary<string, OpenApiSchema>
+                            Type = JsonSchemaType.Object,
+                            Properties = new Dictionary<string, IOpenApiSchema>
                             {
                                 [description.Name] = parameterSchema
                             }
@@ -541,6 +618,7 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
                     }
                     else
                     {
+                        schema.Properties ??= new Dictionary<string, IOpenApiSchema>();
                         schema.Properties[description.Name] = parameterSchema;
                     }
                 }
@@ -558,18 +636,21 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
                         // The form-binding implementation will capture them implicitly.
                         if (isComplexType)
                         {
+                            schema.AllOf ??= [];
                             schema.AllOf.Add(parameterSchema);
                         }
                         else
                         {
                             if (IsRequired(description))
                             {
+                                schema.Required ??= new HashSet<string>();
                                 schema.Required.Add(description.Name);
                             }
+                            schema.AllOf ??= [];
                             schema.AllOf.Add(new OpenApiSchema
                             {
-                                Type = "object",
-                                Properties = new Dictionary<string, OpenApiSchema>
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>
                                 {
                                     [description.Name] = parameterSchema
                                 }
@@ -580,14 +661,16 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
                     {
                         if (isComplexType)
                         {
-                            schema = parameterSchema;
+                            complexTypeSchema = parameterSchema;
                         }
                         else
                         {
                             if (IsRequired(description))
                             {
+                                schema.Required ??= new HashSet<string>();
                                 schema.Required.Add(description.Name);
                             }
+                            schema.Properties ??= new Dictionary<string, IOpenApiSchema>();
                             schema.Properties[description.Name] = parameterSchema;
                         }
                     }
@@ -597,18 +680,20 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
             {
                 if (hasMultipleFormParameters)
                 {
-                    var propertySchema = new OpenApiSchema { Type = "object", Properties = new Dictionary<string, OpenApiSchema>() };
+                    var propertySchema = new OpenApiSchema { Type = JsonSchemaType.Object, Properties = new Dictionary<string, IOpenApiSchema>() };
                     foreach (var description in parameter)
                     {
-                        propertySchema.Properties[description.Name] = await _componentService.GetOrCreateSchemaAsync(description.Type, scopedServiceProvider, schemaTransformers, description, cancellationToken: cancellationToken);
+                        propertySchema.Properties[description.Name] = await _componentService.GetOrCreateSchemaAsync(document, description.Type, scopedServiceProvider, schemaTransformers, description, cancellationToken: cancellationToken);
                     }
+                    schema.AllOf ??= [];
                     schema.AllOf.Add(propertySchema);
                 }
                 else
                 {
                     foreach (var description in parameter)
                     {
-                        schema.Properties[description.Name] = await _componentService.GetOrCreateSchemaAsync(description.Type, scopedServiceProvider, schemaTransformers, description, cancellationToken: cancellationToken);
+                        schema.Properties ??= new Dictionary<string, IOpenApiSchema>();
+                        schema.Properties[description.Name] = await _componentService.GetOrCreateSchemaAsync(document, description.Type, scopedServiceProvider, schemaTransformers, description, cancellationToken: cancellationToken);
                     }
                 }
             }
@@ -619,7 +704,7 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
             var contentType = requestFormat.MediaType;
             requestBody.Content[contentType] = new OpenApiMediaType
             {
-                Schema = schema
+                Schema = complexTypeSchema ?? schema
             };
         }
 
@@ -627,6 +712,7 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
     }
 
     private async Task<OpenApiRequestBody> GetJsonRequestBody(
+        OpenApiDocument document,
         IList<ApiRequestFormat> supportedRequestFormats,
         ApiParameterDescription bodyParameter,
         IServiceProvider scopedServiceProvider,
@@ -641,6 +727,12 @@ private async Task<OpenApiRequestBody> GetJsonRequestBody(
                 // for stream-based parameter types.
                 supportedRequestFormats = [new ApiRequestFormat { MediaType = "application/octet-stream" }];
             }
+            else if (bodyParameter.Type.IsJsonPatchDocument())
+            {
+                // Assume "application/json-patch+json" as the default media type
+                // for JSON Patch documents.
+                supportedRequestFormats = [new ApiRequestFormat { MediaType = "application/json-patch+json" }];
+            }
             else
             {
                 // Assume "application/json" as the default media type
@@ -656,12 +748,60 @@ private async Task<OpenApiRequestBody> GetJsonRequestBody(
             Description = GetParameterDescriptionFromAttribute(bodyParameter)
         };
 
-        foreach (var requestForm in supportedRequestFormats)
+        foreach (var requestFormat in supportedRequestFormats)
         {
-            var contentType = requestForm.MediaType;
-            requestBody.Content[contentType] = new OpenApiMediaType { Schema = await _componentService.GetOrCreateSchemaAsync(bodyParameter.Type, scopedServiceProvider, schemaTransformers, bodyParameter, captureSchemaByRef: true, cancellationToken: cancellationToken) };
+            var contentType = requestFormat.MediaType;
+            var schema = await _componentService.GetOrCreateSchemaAsync(document, bodyParameter.Type, scopedServiceProvider, schemaTransformers, bodyParameter, cancellationToken: cancellationToken);
+            schema = bodyParameter.ShouldApplyNullableRequestSchema()
+                ? schema.CreateOneOfNullableWrapper()
+                : schema;
+            requestBody.Content[contentType] = new OpenApiMediaType { Schema = schema };
         }
 
         return requestBody;
     }
+
+    /// <remarks>
+    /// This method is used to determine the target type for a given parameter. The target type
+    /// is the actual type that should be used to generate the schema for the parameter. This is
+    /// necessary because MVC's ModelMetadata layer will set ApiParameterDescription.Type to string
+    /// when the parameter is a parsable or convertible type. In this case, we want to use the actual
+    /// model type to generate the schema instead of the string type.
+    /// </remarks>
+    /// <remarks>
+    /// This method will also check if no target type was resolved from the <see cref="ApiParameterDescription"/>
+    /// and default to a string schema. This will happen if we are dealing with an inert route parameter
+    /// that does not define a specific parameter type in the route handler or in the response.
+    /// </remarks>
+    private static Type GetTargetType(ApiDescription description, ApiParameterDescription parameter)
+    {
+        var bindingMetadata = description.ActionDescriptor.EndpointMetadata
+            .OfType<IParameterBindingMetadata>()
+            .SingleOrDefault(metadata => metadata.Name == parameter.Name);
+        var parameterType = parameter.Type is not null
+            ? Nullable.GetUnderlyingType(parameter.Type) ?? parameter.Type
+            : parameter.Type;
+
+        // parameter.Type = typeof(string)
+        // parameter.ModelMetadata.Type = typeof(TEnum)
+        var requiresModelMetadataFallbackForEnum = parameterType == typeof(string)
+            && parameter.ModelMetadata.ModelType != parameter.Type
+            && parameter.ModelMetadata.ModelType.IsEnum;
+        // Enums are exempt because we want to set the IOpenApiSchema.Enum field when feasible.
+        // parameter.Type = typeof(TEnum), typeof(TypeWithTryParse)
+        // parameter.ModelMetadata.Type = typeof(string)
+        var hasTryParse = bindingMetadata?.HasTryParse == true && parameterType is not null && !parameterType.IsEnum;
+        var targetType = requiresModelMetadataFallbackForEnum || hasTryParse
+            ? parameter.ModelMetadata.ModelType
+            : parameter.Type;
+        targetType ??= typeof(string);
+        return targetType;
+    }
+
+    /// <inheritdoc />
+    public Task<OpenApiDocument> GetOpenApiDocumentAsync(CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return GetOpenApiDocumentAsync(serviceProvider, httpRequest: null, cancellationToken);
+    }
 }
diff --git a/src/OpenApi/src/Services/OpenApiGenerator.cs b/src/OpenApi/src/Services/OpenApiGenerator.cs
index be70be1edb25..6257f7fa2fea 100644
--- a/src/OpenApi/src/Services/OpenApiGenerator.cs
+++ b/src/OpenApi/src/Services/OpenApiGenerator.cs
@@ -19,7 +19,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Primitives;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -322,19 +321,22 @@ private static void GenerateDefaultResponses(Dictionary<int, (Type?, MediaTypeCo
         return null;
     }
 
-    private List<OpenApiTag> GetOperationTags(MethodInfo methodInfo, EndpointMetadataCollection metadata)
+    private HashSet<OpenApiTagReference> GetOperationTags(MethodInfo methodInfo, EndpointMetadataCollection metadata)
     {
         var metadataList = metadata.GetOrderedMetadata<ITagsMetadata>();
+        var document = new OpenApiDocument();
 
         if (metadataList.Count > 0)
         {
-            var tags = new List<OpenApiTag>();
+            var tags = new HashSet<OpenApiTagReference>();
 
             foreach (var metadataItem in metadataList)
             {
                 foreach (var tag in metadataItem.Tags)
                 {
-                    tags.Add(new OpenApiTag() { Name = tag });
+                    document.Tags ??= new HashSet<OpenApiTag>();
+                    document.Tags.Add(new OpenApiTag { Name = tag });
+                    tags.Add(new OpenApiTagReference(tag, document));
                 }
             }
 
@@ -354,13 +356,15 @@ private List<OpenApiTag> GetOperationTags(MethodInfo methodInfo, EndpointMetadat
             controllerName = _environment?.ApplicationName ?? string.Empty;
         }
 
-        return new List<OpenApiTag>() { new OpenApiTag() { Name = controllerName } };
+        document.Tags ??= new HashSet<OpenApiTag>();
+        document.Tags.Add(new OpenApiTag { Name = controllerName });
+        return [new(controllerName, document)];
     }
 
-    private List<OpenApiParameter> GetOpenApiParameters(MethodInfo methodInfo, RoutePattern pattern, bool disableInferredBody)
+    private List<IOpenApiParameter> GetOpenApiParameters(MethodInfo methodInfo, RoutePattern pattern, bool disableInferredBody)
     {
         var parameters = PropertyAsParameterInfo.Flatten(methodInfo.GetParameters(), ParameterBindingMethodCache.Instance);
-        var openApiParameters = new List<OpenApiParameter>();
+        var openApiParameters = new List<IOpenApiParameter>();
 
         foreach (var parameter in parameters)
         {
@@ -420,7 +424,7 @@ private List<OpenApiParameter> GetOpenApiParameters(MethodInfo methodInfo, Route
         {
             return (true, null, null);
         }
-        else if (parameter.CustomAttributes.Any(a => typeof(IFromServiceMetadata).IsAssignableFrom(a.AttributeType) || typeof(FromKeyedServicesAttribute) == a.AttributeType) ||
+        else if (parameter.CustomAttributes.Any(a => typeof(IFromServiceMetadata).IsAssignableFrom(a.AttributeType) || typeof(FromKeyedServicesAttribute).IsAssignableFrom(a.AttributeType)) ||
                 parameter.ParameterType == typeof(HttpContext) ||
                 parameter.ParameterType == typeof(HttpRequest) ||
                 parameter.ParameterType == typeof(HttpResponse) ||
@@ -443,7 +447,9 @@ private List<OpenApiParameter> GetOpenApiParameters(MethodInfo methodInfo, Route
                 return (false, ParameterLocation.Query, null);
             }
         }
-        else if (parameter.ParameterType == typeof(IFormFile) || parameter.ParameterType == typeof(IFormFileCollection))
+        else if (parameter.ParameterType == typeof(IFormFile) ||
+                 parameter.ParameterType == typeof(IFormFileCollection) ||
+                 parameter.ParameterType.IsJsonPatchDocument())
         {
             return (true, null, null);
         }
diff --git a/src/OpenApi/src/Services/OpenApiOptions.cs b/src/OpenApi/src/Services/OpenApiOptions.cs
index 7b900b53c9c7..6c0936515307 100644
--- a/src/OpenApi/src/Services/OpenApiOptions.cs
+++ b/src/OpenApi/src/Services/OpenApiOptions.cs
@@ -4,8 +4,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.OpenApi;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -37,7 +35,7 @@ public OpenApiOptions()
     /// <summary>
     /// The version of the OpenAPI specification to use. Defaults to <see cref="OpenApiSpecVersion.OpenApi3_0"/>.
     /// </summary>
-    public OpenApiSpecVersion OpenApiVersion { get; set; } = OpenApiSpecVersion.OpenApi3_0;
+    public OpenApiSpecVersion OpenApiVersion { get; set; } = OpenApiSpecVersion.OpenApi3_1;
 
     /// <summary>
     /// The name of the OpenAPI document this <see cref="OpenApiOptions"/> instance is associated with.
diff --git a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs
index d7ea158b919a..931c1a80c546 100644
--- a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs
+++ b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
@@ -16,7 +17,6 @@
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -28,11 +28,10 @@ namespace Microsoft.AspNetCore.OpenApi;
 internal sealed class OpenApiSchemaService(
     [ServiceKey] string documentName,
     IOptions<JsonOptions> jsonOptions,
-    IServiceProvider serviceProvider,
     IOptionsMonitor<OpenApiOptions> optionsMonitor)
 {
-    private readonly OpenApiSchemaStore _schemaStore = serviceProvider.GetRequiredKeyedService<OpenApiSchemaStore>(documentName);
-    private readonly OpenApiJsonSchemaContext _jsonSchemaContext = new OpenApiJsonSchemaContext(new(jsonOptions.Value.SerializerOptions));
+    private readonly ConcurrentDictionary<Type, string?> _schemaIdCache = new();
+    private readonly OpenApiJsonSchemaContext _jsonSchemaContext = new(new(jsonOptions.Value.SerializerOptions));
     private readonly JsonSerializerOptions _jsonSerializerOptions = new(jsonOptions.Value.SerializerOptions)
     {
         // In order to properly handle the `RequiredAttribute` on type properties, add a modifier to support
@@ -83,6 +82,10 @@ internal sealed class OpenApiSchemaService(
                     }
                 };
             }
+            else if (type.IsJsonPatchDocument())
+            {
+                schema = CreateSchemaForJsonPatch();
+            }
             // STJ uses `true` in place of an empty object to represent a schema that matches
             // anything (like the `object` type) or types with user-defined converters. We override
             // this default behavior here to match the format expected in OpenAPI v3.
@@ -96,42 +99,140 @@ internal sealed class OpenApiSchemaService(
             schema.MapPolymorphismOptionsToDiscriminator(context, createSchemaReferenceId);
             if (context.PropertyInfo is { } jsonPropertyInfo)
             {
-                // Short-circuit STJ's handling of nested properties, which uses a reference to the
-                // properties type schema with a schema that uses a document level reference.
-                // For example, if the property is a `public NestedTyped Nested { get; set; }` property,
-                // "nested": "#/properties/nested" becomes "nested": "#/components/schemas/NestedType"
-                if (jsonPropertyInfo.PropertyType == jsonPropertyInfo.DeclaringType)
-                {
-                    return new JsonObject { [OpenApiSchemaKeywords.RefKeyword] = context.TypeInfo.GetSchemaReferenceId() };
-                }
                 schema.ApplyNullabilityContextInfo(jsonPropertyInfo);
             }
+            if (context.TypeInfo.Type.GetCustomAttributes(inherit: false).OfType<DescriptionAttribute>().LastOrDefault() is { } typeDescriptionAttribute)
+            {
+                schema[OpenApiSchemaKeywords.DescriptionKeyword] = typeDescriptionAttribute.Description;
+            }
             if (context.PropertyInfo is { AttributeProvider: { } attributeProvider })
             {
-                if (attributeProvider.GetCustomAttributes(inherit: false).OfType<ValidationAttribute>() is { } validationAttributes)
+                var propertyAttributes = attributeProvider.GetCustomAttributes(inherit: false);
+                if (propertyAttributes.OfType<ValidationAttribute>() is { } validationAttributes)
                 {
                     schema.ApplyValidationAttributes(validationAttributes);
                 }
-                if (attributeProvider.GetCustomAttributes(inherit: false).OfType<DefaultValueAttribute>().LastOrDefault() is DefaultValueAttribute defaultValueAttribute)
+                if (propertyAttributes.OfType<DefaultValueAttribute>().LastOrDefault() is { } defaultValueAttribute)
                 {
                     schema.ApplyDefaultValue(defaultValueAttribute.Value, context.TypeInfo);
                 }
-                if (attributeProvider.GetCustomAttributes(inherit: false).OfType<DescriptionAttribute>().LastOrDefault() is DescriptionAttribute descriptionAttribute)
+                var isInlinedSchema = schema[OpenApiConstants.SchemaId] is null;
+                if (isInlinedSchema)
                 {
-                    schema[OpenApiSchemaKeywords.DescriptionKeyword] = descriptionAttribute.Description;
+                    if (propertyAttributes.OfType<DescriptionAttribute>().LastOrDefault() is { } descriptionAttribute)
+                    {
+                        schema[OpenApiSchemaKeywords.DescriptionKeyword] = descriptionAttribute.Description;
+                    }
+                }
+                else
+                {
+                    if (propertyAttributes.OfType<DescriptionAttribute>().LastOrDefault() is { } descriptionAttribute)
+                    {
+                        schema[OpenApiConstants.RefDescriptionAnnotation] = descriptionAttribute.Description;
+                    }
                 }
             }
-
+            schema.PruneNullTypeForComponentizedTypes();
             return schema;
         }
     };
 
-    internal async Task<OpenApiSchema> GetOrCreateSchemaAsync(Type type, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, ApiParameterDescription? parameterDescription = null, bool captureSchemaByRef = false, CancellationToken cancellationToken = default)
+    private static JsonObject CreateSchemaForJsonPatch()
+    {
+        var addReplaceTest = new JsonObject()
+        {
+            [OpenApiSchemaKeywords.TypeKeyword] = "object",
+            [OpenApiSchemaKeywords.AdditionalPropertiesKeyword] = false,
+            [OpenApiSchemaKeywords.RequiredKeyword] = JsonArray(["op", "path", "value"]),
+            [OpenApiSchemaKeywords.PropertiesKeyword] = new JsonObject
+            {
+                ["op"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string",
+                    [OpenApiSchemaKeywords.EnumKeyword] = JsonArray(["add", "replace", "test"]),
+                },
+                ["path"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string"
+                },
+                ["value"] = new JsonObject()
+            }
+        };
+
+        var moveCopy = new JsonObject()
+        {
+            [OpenApiSchemaKeywords.TypeKeyword] = "object",
+            [OpenApiSchemaKeywords.AdditionalPropertiesKeyword] = false,
+            [OpenApiSchemaKeywords.RequiredKeyword] = JsonArray(["op", "path", "from"]),
+            [OpenApiSchemaKeywords.PropertiesKeyword] = new JsonObject
+            {
+                ["op"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string",
+                    [OpenApiSchemaKeywords.EnumKeyword] = JsonArray(["move", "copy"]),
+                },
+                ["path"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string"
+                },
+                ["from"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string"
+                },
+            }
+        };
+
+        var remove = new JsonObject()
+        {
+            [OpenApiSchemaKeywords.TypeKeyword] = "object",
+            [OpenApiSchemaKeywords.AdditionalPropertiesKeyword] = false,
+            [OpenApiSchemaKeywords.RequiredKeyword] = JsonArray(["op", "path"]),
+            [OpenApiSchemaKeywords.PropertiesKeyword] = new JsonObject
+            {
+                ["op"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string",
+                    [OpenApiSchemaKeywords.EnumKeyword] = JsonArray(["remove"])
+                },
+                ["path"] = new JsonObject()
+                {
+                    [OpenApiSchemaKeywords.TypeKeyword] = "string"
+                },
+            }
+        };
+
+        return new JsonObject
+        {
+            [OpenApiConstants.SchemaId] = "JsonPatchDocument",
+            [OpenApiSchemaKeywords.TypeKeyword] = "array",
+            [OpenApiSchemaKeywords.ItemsKeyword] = new JsonObject
+            {
+                [OpenApiSchemaKeywords.OneOfKeyword] = JsonArray([addReplaceTest, moveCopy, remove])
+            },
+        };
+
+        // Using JsonArray inline causes the compile to pick the generic Add<T>() overload
+        // which then generates native AoT warnings without adding a cost. To Avoid that use
+        // this helper method that uses JsonNode to pick the native AoT compatible overload instead.
+        static JsonArray JsonArray(ReadOnlySpan<JsonNode> values)
+        {
+            var array = new JsonArray();
+
+            foreach (var value in values)
+            {
+                array.Add(value);
+            }
+
+            return array;
+        }
+    }
+
+    internal async Task<OpenApiSchema> GetOrCreateUnresolvedSchemaAsync(OpenApiDocument? document, Type type, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
     {
         var key = parameterDescription?.ParameterDescriptor is IParameterInfoParameterDescriptor parameterInfoDescription
             && parameterDescription.ModelMetadata.PropertyName is null
             ? new OpenApiSchemaKey(type, parameterInfoDescription.ParameterInfo) : new OpenApiSchemaKey(type, null);
-        var schemaAsJsonObject = _schemaStore.GetOrAdd(key, CreateSchema);
+        var schemaAsJsonObject = CreateSchema(key);
         if (parameterDescription is not null)
         {
             schemaAsJsonObject.ApplyParameterInfo(parameterDescription, _jsonSerializerOptions.GetTypeInfo(type));
@@ -141,12 +242,152 @@ internal async Task<OpenApiSchema> GetOrCreateSchemaAsync(Type type, IServicePro
         var deserializedSchema = JsonSerializer.Deserialize(schemaAsJsonObject, _jsonSchemaContext.OpenApiJsonSchema);
         Debug.Assert(deserializedSchema != null, "The schema should have been deserialized successfully and materialize a non-null value.");
         var schema = deserializedSchema.Schema;
-        await ApplySchemaTransformersAsync(schema, type, scopedServiceProvider, schemaTransformers, parameterDescription, cancellationToken);
-        _schemaStore.PopulateSchemaIntoReferenceCache(schema, captureSchemaByRef);
+        await ApplySchemaTransformersAsync(document, schema, type, scopedServiceProvider, schemaTransformers, parameterDescription, cancellationToken);
+        return schema;
+    }
+
+    internal async Task<IOpenApiSchema> GetOrCreateSchemaAsync(OpenApiDocument document, Type type, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
+    {
+        var schema = await GetOrCreateUnresolvedSchemaAsync(document, type, scopedServiceProvider, schemaTransformers, parameterDescription, cancellationToken);
+
+        // Cache the root schema IDs since we expect to be called
+        // on the same type multiple times within an API
+        var baseSchemaId = _schemaIdCache.GetOrAdd(type, t =>
+        {
+            var jsonTypeInfo = _jsonSerializerOptions.GetTypeInfo(t);
+            return optionsMonitor.Get(documentName).CreateSchemaReferenceId(jsonTypeInfo);
+        });
+
+        return ResolveReferenceForSchema(document, schema, baseSchemaId);
+    }
+
+    internal static IOpenApiSchema ResolveReferenceForSchema(OpenApiDocument document, IOpenApiSchema inputSchema, string? rootSchemaId, string? baseSchemaId = null)
+    {
+        var schema = UnwrapOpenApiSchema(inputSchema);
+
+        if (schema.Metadata is not null &&
+            schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var resolvedBaseSchemaId))
+        {
+            if (schema.AnyOf is { Count: > 0 })
+            {
+                for (var i = 0; i < schema.AnyOf.Count; i++)
+                {
+                    schema.AnyOf[i] = ResolveReferenceForSchema(document, schema.AnyOf[i], rootSchemaId, resolvedBaseSchemaId?.ToString());
+                }
+            }
+        }
+
+        if (schema.Properties is not null)
+        {
+            foreach (var property in schema.Properties)
+            {
+                var resolvedProperty = ResolveReferenceForSchema(document, property.Value, rootSchemaId);
+                if (property.Value is OpenApiSchema targetSchema &&
+                    targetSchema.Metadata?.TryGetValue(OpenApiConstants.NullableProperty, out var isNullableProperty) == true &&
+                    isNullableProperty is true)
+                {
+                    schema.Properties[property.Key] = resolvedProperty.CreateOneOfNullableWrapper();
+                }
+                else
+                {
+                    schema.Properties[property.Key] = resolvedProperty;
+                }
+            }
+        }
+
+        if (schema.AllOf is { Count: > 0 })
+        {
+            for (var i = 0; i < schema.AllOf.Count; i++)
+            {
+                schema.AllOf[i] = ResolveReferenceForSchema(document, schema.AllOf[i], rootSchemaId);
+            }
+        }
+
+        if (schema.OneOf is { Count: > 0 })
+        {
+            for (var i = 0; i < schema.OneOf.Count; i++)
+            {
+                schema.OneOf[i] = ResolveReferenceForSchema(document, schema.OneOf[i], rootSchemaId);
+            }
+        }
+
+        if (schema.AdditionalProperties is not null)
+        {
+            schema.AdditionalProperties = ResolveReferenceForSchema(document, schema.AdditionalProperties, rootSchemaId);
+        }
+
+        if (schema.Items is not null)
+        {
+            schema.Items = ResolveReferenceForSchema(document, schema.Items, rootSchemaId);
+        }
+
+        if (schema.Not is not null)
+        {
+            schema.Not = ResolveReferenceForSchema(document, schema.Not, rootSchemaId);
+        }
+
+        // Handle schemas where the references have been inlined by the JsonSchemaExporter. In this case,
+        // the `#` ID is generated by the exporter since it has no base document to baseline against. In this
+        // case we we want to replace the reference ID with the schema ID that was generated by the
+        // `CreateSchemaReferenceId` method in the OpenApiSchemaService.
+        if (schema.Metadata is not null &&
+            schema.Metadata.TryGetValue(OpenApiConstants.RefId, out var refId) &&
+            refId is string refIdString)
+        {
+            if (schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var schemaId) &&
+                schemaId is string schemaIdString)
+            {
+                return new OpenApiSchemaReference(schemaIdString, document);
+            }
+            var relativeSchemaId = $"#/components/schemas/{rootSchemaId}{refIdString.Replace("#", string.Empty)}";
+            return new OpenApiSchemaReference(relativeSchemaId, document);
+        }
+
+        // If we're resolving schemas for a top-level schema being referenced in the `components.schema` property
+        // we don't want to replace the top-level inline schema with a reference to itself. We want to replace
+        // inline schemas to reference schemas for all schemas referenced in the top-level schema though (such as
+        // `allOf`, `oneOf`, `anyOf`, `items`, `properties`, etc.) which is why `isTopLevel` is only set once.
+        if (schema is OpenApiSchema && schema.Metadata is not null &&
+            !schema.Metadata.ContainsKey(OpenApiConstants.RefId) &&
+            schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var referenceId) &&
+            referenceId is string referenceIdString)
+        {
+            var targetReferenceId = baseSchemaId is not null
+                ? $"{baseSchemaId}{referenceIdString}"
+                : referenceIdString;
+            if (!string.IsNullOrEmpty(targetReferenceId))
+            {
+                return document.AddOpenApiSchemaByReference(targetReferenceId, schema);
+            }
+        }
+
         return schema;
     }
 
-    internal async Task ApplySchemaTransformersAsync(OpenApiSchema schema, Type type, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
+    private static OpenApiSchema UnwrapOpenApiSchema(IOpenApiSchema sourceSchema)
+    {
+        if (sourceSchema is OpenApiSchemaReference schemaReference)
+        {
+            if (schemaReference.Target is OpenApiSchema target)
+            {
+                return target;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiSchema)} or {nameof(OpenApiSchemaReference)}.");
+            }
+        }
+        else if (sourceSchema is OpenApiSchema directSchema)
+        {
+            return directSchema;
+        }
+        else
+        {
+            throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiSchema)} or {nameof(OpenApiSchemaReference)}.");
+        }
+    }
+
+    internal async Task ApplySchemaTransformersAsync(OpenApiDocument? document, IOpenApiSchema schema, Type type, IServiceProvider scopedServiceProvider, IOpenApiSchemaTransformer[] schemaTransformers, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
     {
         if (schemaTransformers.Length == 0)
         {
@@ -159,7 +400,9 @@ internal async Task ApplySchemaTransformersAsync(OpenApiSchema schema, Type type
             JsonTypeInfo = jsonTypeInfo,
             JsonPropertyInfo = null,
             ParameterDescription = parameterDescription,
-            ApplicationServices = scopedServiceProvider
+            ApplicationServices = scopedServiceProvider,
+            Document = document,
+            SchemaTransformers = schemaTransformers
         };
         for (var i = 0; i < schemaTransformers.Length; i++)
         {
@@ -169,7 +412,7 @@ internal async Task ApplySchemaTransformersAsync(OpenApiSchema schema, Type type
         }
     }
 
-    private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema,
+    private async Task InnerApplySchemaTransformersAsync(IOpenApiSchema inputSchema,
         JsonTypeInfo jsonTypeInfo,
         JsonPropertyInfo? jsonPropertyInfo,
         OpenApiSchemaTransformerContext context,
@@ -177,6 +420,7 @@ private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema,
         CancellationToken cancellationToken = default)
     {
         context.UpdateJsonTypeInfo(jsonTypeInfo, jsonPropertyInfo);
+        var schema = UnwrapOpenApiSchema(inputSchema);
         await transformer.TransformAsync(schema, context, cancellationToken);
 
         // Only apply transformers on polymorphic schemas where we can resolve the derived
@@ -196,9 +440,10 @@ private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema,
             }
         }
 
-        if (schema.Items is not null)
+        // If the schema is an array but uses AnyOf or OneOf then ElementType is null
+        if (schema.Items is not null && jsonTypeInfo.ElementType is not null)
         {
-            var elementTypeInfo = _jsonSerializerOptions.GetTypeInfo(jsonTypeInfo.ElementType!);
+            var elementTypeInfo = _jsonSerializerOptions.GetTypeInfo(jsonTypeInfo.ElementType);
             await InnerApplySchemaTransformersAsync(schema.Items, elementTypeInfo, null, context, transformer, cancellationToken);
         }
 
@@ -212,8 +457,136 @@ private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema,
                 }
             }
         }
+
+        if (schema is { AdditionalPropertiesAllowed: true, AdditionalProperties: not null } &&
+            jsonTypeInfo.ElementType is not null)
+        {
+            var elementTypeInfo = _jsonSerializerOptions.GetTypeInfo(jsonTypeInfo.ElementType);
+            await InnerApplySchemaTransformersAsync(schema.AdditionalProperties, elementTypeInfo, null, context, transformer, cancellationToken);
+        }
     }
 
     private JsonNode CreateSchema(OpenApiSchemaKey key)
-        => JsonSchemaExporter.GetJsonSchemaAsNode(_jsonSerializerOptions, key.Type, _configuration);
+    {
+        var schema = JsonSchemaExporter.GetJsonSchemaAsNode(_jsonSerializerOptions, key.Type, _configuration);
+        return ResolveReferences(schema, schema);
+    }
+
+    private static JsonNode ResolveReferences(JsonNode node, JsonNode rootSchema)
+    {
+        return ResolveReferencesRecursive(node, rootSchema);
+    }
+
+    private static JsonNode ResolveReferencesRecursive(JsonNode node, JsonNode rootSchema)
+    {
+        if (node is JsonObject jsonObject)
+        {
+            if (jsonObject.TryGetPropertyValue(OpenApiConstants.RefKeyword, out var refNode) &&
+                refNode is JsonValue refValue &&
+                refValue.TryGetValue<string>(out var refString) &&
+                refString.StartsWith(OpenApiConstants.RefPrefix, StringComparison.Ordinal))
+            {
+                try
+                {
+                    // Resolve the reference path to the actual schema content
+                    // to avoid relative references
+                    var resolvedNode = ResolveReference(refString, rootSchema);
+                    if (resolvedNode != null)
+                    {
+                        return resolvedNode.DeepClone();
+                    }
+                }
+                catch (InvalidOperationException)
+                {
+                    // If resolution fails due to invalid path, return the original reference
+                    // This maintains backward compatibility while preventing crashes
+                }
+
+                // If resolution fails, return the original reference
+                return node;
+            }
+
+            // Process all properties recursively
+            var newObject = new JsonObject();
+            foreach (var property in jsonObject)
+            {
+                if (property.Value != null)
+                {
+                    var processedValue = ResolveReferencesRecursive(property.Value, rootSchema);
+                    newObject[property.Key] = processedValue?.DeepClone();
+                }
+                else
+                {
+                    newObject[property.Key] = null;
+                }
+            }
+            return newObject;
+        }
+        else if (node is JsonArray jsonArray)
+        {
+            var newArray = new JsonArray();
+            for (var i = 0; i < jsonArray.Count; i++)
+            {
+                if (jsonArray[i] != null)
+                {
+                    var processedValue = ResolveReferencesRecursive(jsonArray[i]!, rootSchema);
+                    newArray.Add(processedValue?.DeepClone());
+                }
+                else
+                {
+                    newArray.Add(null);
+                }
+            }
+            return newArray;
+        }
+
+        // Return non-$ref nodes as-is
+        return node;
+    }
+
+    private static JsonNode? ResolveReference(string refPath, JsonNode rootSchema)
+    {
+        if (string.IsNullOrWhiteSpace(refPath))
+        {
+            throw new InvalidOperationException("Reference path cannot be null or empty.");
+        }
+
+        if (!refPath.StartsWith(OpenApiConstants.RefPrefix, StringComparison.Ordinal))
+        {
+            throw new InvalidOperationException($"Only fragment references (starting with '{OpenApiConstants.RefPrefix}') are supported. Found: {refPath}");
+        }
+
+        var path = refPath.TrimStart('#', '/');
+        if (string.IsNullOrEmpty(path))
+        {
+            return rootSchema;
+        }
+
+        var segments = path.Split('/');
+        var current = rootSchema;
+
+        for (var i = 0; i < segments.Length; i++)
+        {
+            var segment = segments[i];
+            if (current is JsonObject currentObject)
+            {
+                if (currentObject.TryGetPropertyValue(segment, out var nextNode) && nextNode != null)
+                {
+                    current = nextNode;
+                }
+                else
+                {
+                    var partialPath = string.Join('/', segments.Take(i + 1));
+                    throw new InvalidOperationException($"Failed to resolve reference '{refPath}': path segment '{segment}' not found at '#{partialPath}'");
+                }
+            }
+            else
+            {
+                var partialPath = string.Join('/', segments.Take(i));
+                throw new InvalidOperationException($"Failed to resolve reference '{refPath}': cannot navigate beyond '#{partialPath}' - expected object but found {current?.GetType().Name ?? "null"}");
+            }
+        }
+
+        return current;
+    }
 }
diff --git a/src/OpenApi/src/Services/Schemas/OpenApiSchemaStore.cs b/src/OpenApi/src/Services/Schemas/OpenApiSchemaStore.cs
deleted file mode 100644
index 88f1dd4633af..000000000000
--- a/src/OpenApi/src/Services/Schemas/OpenApiSchemaStore.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.IO.Pipelines;
-using System.Text.Json.Nodes;
-using Microsoft.AspNetCore.Http;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-/// <summary>
-/// Stores schemas generated by the JsonSchemaMapper for a
-/// given OpenAPI document for later resolution.
-/// </summary>
-internal sealed class OpenApiSchemaStore
-{
-    private readonly Dictionary<OpenApiSchemaKey, JsonNode> _schemas = new()
-    {
-        // Pre-populate OpenAPI schemas for well-defined types in ASP.NET Core.
-        [new OpenApiSchemaKey(typeof(IFormFile), null)] = new JsonObject
-        {
-            ["type"] = "string",
-            ["format"] = "binary",
-            [OpenApiConstants.SchemaId] = "IFormFile"
-        },
-        [new OpenApiSchemaKey(typeof(IFormFileCollection), null)] = new JsonObject
-        {
-            ["type"] = "array",
-            ["items"] = new JsonObject
-            {
-                ["type"] = "string",
-                ["format"] = "binary",
-                [OpenApiConstants.SchemaId] = "IFormFile"
-            },
-            [OpenApiConstants.SchemaId] = "IFormFileCollection"
-        },
-        [new OpenApiSchemaKey(typeof(Stream), null)] = new JsonObject
-        {
-            ["type"] = "string",
-            ["format"] = "binary",
-            [OpenApiConstants.SchemaId] = "Stream"
-        },
-        [new OpenApiSchemaKey(typeof(PipeReader), null)] = new JsonObject
-        {
-            ["type"] = "string",
-            ["format"] = "binary",
-            [OpenApiConstants.SchemaId] = "PipeReader"
-        },
-    };
-
-    public readonly Dictionary<OpenApiSchema, string?> SchemasByReference = new(OpenApiSchemaComparer.Instance);
-    private readonly Dictionary<string, int> _referenceIdCounter = new();
-
-    /// <summary>
-    /// Resolves the JSON schema for the given type and parameter description.
-    /// </summary>
-    /// <param name="key">The key associated with the generated schema.</param>
-    /// <param name="valueFactory">A function used to generated the JSON object representing the schema.</param>
-    /// <returns>A <see cref="JsonObject" /> representing the JSON schema associated with the key.</returns>
-    public JsonNode GetOrAdd(OpenApiSchemaKey key, Func<OpenApiSchemaKey, JsonNode> valueFactory)
-    {
-        if (_schemas.TryGetValue(key, out var schema))
-        {
-            return schema;
-        }
-        var targetSchema = valueFactory(key);
-        _schemas.Add(key, targetSchema);
-        return targetSchema;
-    }
-
-    /// <summary>
-    /// Add the provided schema to the schema-with-references cache that is eventually
-    /// used to populate the top-level components.schemas object. This method will
-    /// unwrap the provided schema and add any child schemas to the global cache. Child
-    /// schemas include those referenced in the schema.Items, schema.AdditionalProperties, or
-    /// schema.Properties collections. Schema reference IDs are only set for schemas that have
-    /// been encountered more than once in the document to avoid unnecessarily capturing unique
-    /// schemas into the top-level document.
-    /// </summary>
-    /// <remarks>
-    /// We don't do a depth check in the recursion call here since we assume that
-    /// System.Text.Json has already validate the depth of the schema based on
-    /// the configured JsonSerializerOptions.MaxDepth value.
-    /// </remarks>
-    /// <param name="schema">The <see cref="OpenApiSchema"/> to add to the schemas-with-references cache.</param>
-    /// <param name="captureSchemaByRef"><see langword="true"/> if schema should always be referenced instead of inlined.</param>
-    public void PopulateSchemaIntoReferenceCache(OpenApiSchema schema, bool captureSchemaByRef)
-    {
-        AddOrUpdateSchemaByReference(schema, captureSchemaByRef: captureSchemaByRef);
-        AddOrUpdateAnyOfSubSchemaByReference(schema);
-
-        if (schema.AdditionalProperties is not null)
-        {
-            PopulateSchemaIntoReferenceCache(schema.AdditionalProperties, captureSchemaByRef);
-        }
-        if (schema.Items is not null)
-        {
-            PopulateSchemaIntoReferenceCache(schema.Items, captureSchemaByRef);
-        }
-        if (schema.AllOf is not null)
-        {
-            foreach (var allOfSchema in schema.AllOf)
-            {
-                PopulateSchemaIntoReferenceCache(allOfSchema, captureSchemaByRef);
-            }
-        }
-        if (schema.Properties is not null)
-        {
-            foreach (var property in schema.Properties.Values)
-            {
-                PopulateSchemaIntoReferenceCache(property, captureSchemaByRef);
-            }
-        }
-    }
-
-    private void AddOrUpdateAnyOfSubSchemaByReference(OpenApiSchema schema)
-    {
-        if (schema.AnyOf is not null)
-        {
-            // AnyOf schemas in a polymorphic type should contain a reference to the parent schema
-            // ID to support disambiguating between a derived type on its own and a derived type
-            // as part of a polymorphic schema.
-            var baseTypeSchemaId = schema.Annotations is not null && schema.Annotations.TryGetValue(OpenApiConstants.SchemaId, out var schemaId)
-                ? schemaId?.ToString()
-                : null;
-            foreach (var anyOfSchema in schema.AnyOf)
-            {
-                AddOrUpdateSchemaByReference(anyOfSchema, baseTypeSchemaId);
-            }
-        }
-
-        if (schema.Items is not null)
-        {
-            AddOrUpdateAnyOfSubSchemaByReference(schema.Items);
-        }
-
-        if (schema.Properties is { Count: > 0 })
-        {
-            foreach (var property in schema.Properties.Values)
-            {
-                AddOrUpdateAnyOfSubSchemaByReference(property);
-            }
-        }
-
-        if (schema.AllOf is not null)
-        {
-            foreach (var allOfSchema in schema.AllOf)
-            {
-                AddOrUpdateAnyOfSubSchemaByReference(allOfSchema);
-            }
-        }
-
-        if (schema.AdditionalProperties is not null)
-        {
-            AddOrUpdateAnyOfSubSchemaByReference(schema.AdditionalProperties);
-        }
-    }
-
-    private void AddOrUpdateSchemaByReference(OpenApiSchema schema, string? baseTypeSchemaId = null, bool captureSchemaByRef = false)
-    {
-        var targetReferenceId = baseTypeSchemaId is not null ? $"{baseTypeSchemaId}{GetSchemaReferenceId(schema)}" : GetSchemaReferenceId(schema);
-        if (SchemasByReference.TryGetValue(schema, out var referenceId) || captureSchemaByRef)
-        {
-            // If we've already used this reference ID else where in the document, increment a counter value to the reference
-            // ID to avoid name collisions. These collisions are most likely to occur when the same .NET type produces a different
-            // schema in the OpenAPI document because of special annotations provided on it. For example, in the two type definitions
-            // below:
-            // public class Todo
-            // {
-            //     public int Id { get; set; }
-            //     public string Name { get; set; }
-            // }
-            // public class Project
-            // {
-            //     public int Id { get; set; }
-            //     [MinLength(5)]
-            //     public string Title { get; set; }
-            // }
-            // The `Title` and `Name` properties are both strings but the `Title` property has a `minLength` annotation
-            // on it that will materialize into a different schema.
-            // {
-            //
-            //      "type": "string",
-            //      "minLength": 5
-            // }
-            // {
-            //      "type": "string"
-            // }
-            // In this case, although the reference ID  based on the .NET type we would use is `string`, the
-            // two schemas are distinct.
-            if (referenceId == null && targetReferenceId is not null)
-            {
-                if (_referenceIdCounter.TryGetValue(targetReferenceId, out var counter))
-                {
-                    counter++;
-                    _referenceIdCounter[targetReferenceId] = counter;
-                    SchemasByReference[schema] = $"{targetReferenceId}{counter}";
-                }
-                else
-                {
-                    _referenceIdCounter[targetReferenceId] = 1;
-                    SchemasByReference[schema] = targetReferenceId;
-                }
-            }
-        }
-        else
-        {
-            SchemasByReference[schema] = baseTypeSchemaId is not null ? targetReferenceId : null;
-        }
-    }
-
-    private static string? GetSchemaReferenceId(OpenApiSchema schema)
-    {
-        if (schema.Annotations?.TryGetValue(OpenApiConstants.SchemaId, out var referenceIdObject) == true
-            && referenceIdObject is string referenceId)
-        {
-            return referenceId;
-        }
-
-        return null;
-    }
-}
diff --git a/src/OpenApi/src/Transformers/DelegateOpenApiDocumentTransformer.cs b/src/OpenApi/src/Transformers/DelegateOpenApiDocumentTransformer.cs
index 3a31bbe7a2bc..38c52189df91 100644
--- a/src/OpenApi/src/Transformers/DelegateOpenApiDocumentTransformer.cs
+++ b/src/OpenApi/src/Transformers/DelegateOpenApiDocumentTransformer.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
diff --git a/src/OpenApi/src/Transformers/DelegateOpenApiOperationTransformer.cs b/src/OpenApi/src/Transformers/DelegateOpenApiOperationTransformer.cs
index cf7c7ac4ae7f..5b8f9d3267bb 100644
--- a/src/OpenApi/src/Transformers/DelegateOpenApiOperationTransformer.cs
+++ b/src/OpenApi/src/Transformers/DelegateOpenApiOperationTransformer.cs
@@ -1,8 +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 Microsoft.OpenApi.Models;
-
 namespace Microsoft.AspNetCore.OpenApi;
 
 internal sealed class DelegateOpenApiOperationTransformer : IOpenApiOperationTransformer
diff --git a/src/OpenApi/src/Transformers/DelegateOpenApiSchemaTransformer.cs b/src/OpenApi/src/Transformers/DelegateOpenApiSchemaTransformer.cs
index bfe25b2297f2..3e7e7be27455 100644
--- a/src/OpenApi/src/Transformers/DelegateOpenApiSchemaTransformer.cs
+++ b/src/OpenApi/src/Transformers/DelegateOpenApiSchemaTransformer.cs
@@ -1,8 +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 Microsoft.OpenApi.Models;
-
 namespace Microsoft.AspNetCore.OpenApi;
 
 internal sealed class DelegateOpenApiSchemaTransformer : IOpenApiSchemaTransformer
diff --git a/src/OpenApi/src/Transformers/IOpenApiDocumentTransformer.cs b/src/OpenApi/src/Transformers/IOpenApiDocumentTransformer.cs
index 5c92a2700e43..b0fe004c2585 100644
--- a/src/OpenApi/src/Transformers/IOpenApiDocumentTransformer.cs
+++ b/src/OpenApi/src/Transformers/IOpenApiDocumentTransformer.cs
@@ -1,8 +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 Microsoft.OpenApi.Models;
-
 namespace Microsoft.AspNetCore.OpenApi;
 
 /// <summary>
diff --git a/src/OpenApi/src/Transformers/IOpenApiOperationTransformer.cs b/src/OpenApi/src/Transformers/IOpenApiOperationTransformer.cs
index 3d5227342b34..756dd3b62fd7 100644
--- a/src/OpenApi/src/Transformers/IOpenApiOperationTransformer.cs
+++ b/src/OpenApi/src/Transformers/IOpenApiOperationTransformer.cs
@@ -1,8 +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 Microsoft.OpenApi.Models;
-
 namespace Microsoft.AspNetCore.OpenApi;
 
 /// <summary>
diff --git a/src/OpenApi/src/Transformers/IOpenApiSchemaTransformer.cs b/src/OpenApi/src/Transformers/IOpenApiSchemaTransformer.cs
index e971ded4e373..291369a379a3 100644
--- a/src/OpenApi/src/Transformers/IOpenApiSchemaTransformer.cs
+++ b/src/OpenApi/src/Transformers/IOpenApiSchemaTransformer.cs
@@ -1,8 +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 Microsoft.OpenApi.Models;
-
 namespace Microsoft.AspNetCore.OpenApi;
 
 /// <summary>
diff --git a/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs b/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs
deleted file mode 100644
index 07c76fe22974..000000000000
--- a/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.AspNetCore.OpenApi;
-
-/// <summary>
-/// Document transformer to support mapping duplicate JSON schema instances
-/// into JSON schema references across the document.
-/// </summary>
-internal sealed class OpenApiSchemaReferenceTransformer : IOpenApiDocumentTransformer
-{
-    public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerContext context, CancellationToken cancellationToken)
-    {
-        var schemaStore = context.ApplicationServices.GetRequiredKeyedService<OpenApiSchemaStore>(context.DocumentName);
-        var schemasByReference = schemaStore.SchemasByReference;
-
-        document.Components ??= new OpenApiComponents();
-        document.Components.Schemas ??= new Dictionary<string, OpenApiSchema>();
-
-        foreach (var (schema, referenceId) in schemasByReference.Where(kvp => kvp.Value is not null).OrderBy(kvp => kvp.Value))
-        {
-            // Reference IDs are only set for schemas that appear  more than once in the OpenAPI
-            // document and should be represented as references instead of inlined in the document.
-            if (referenceId is not null)
-            {
-                // Note: we create a copy of the schema here to avoid modifying the original schema
-                // so that comparisons between the original schema and the resolved schema during
-                // the transformation process are consistent.
-                document.Components.Schemas.Add(
-                    referenceId,
-                    ResolveReferenceForSchema(schema.Clone(), schemasByReference, isTopLevel: true));
-            }
-        }
-
-        foreach (var pathItem in document.Paths.Values)
-        {
-            for (var i = 0; i < OpenApiConstants.OperationTypes.Length; i++)
-            {
-                var operationType = OpenApiConstants.OperationTypes[i];
-                if (pathItem.Operations.TryGetValue(operationType, out var operation))
-                {
-                    if (operation.Parameters is not null)
-                    {
-                        foreach (var parameter in operation.Parameters)
-                        {
-                            parameter.Schema = ResolveReferenceForSchema(parameter.Schema, schemasByReference);
-                        }
-                    }
-
-                    if (operation.RequestBody is not null)
-                    {
-                        foreach (var content in operation.RequestBody.Content)
-                        {
-                            content.Value.Schema = ResolveReferenceForSchema(content.Value.Schema, schemasByReference);
-                        }
-                    }
-
-                    if (operation.Responses is not null)
-                    {
-                        foreach (var response in operation.Responses.Values)
-                        {
-                            if (response.Content is not null)
-                            {
-                                foreach (var content in response.Content)
-                                {
-                                    content.Value.Schema = ResolveReferenceForSchema(content.Value.Schema, schemasByReference);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return Task.CompletedTask;
-    }
-
-    /// <summary>
-    /// Resolves the provided schema into a reference if it is found in the schemas-by-reference cache.
-    /// </summary>
-    /// <param name="schema">The inline schema to replace with a reference.</param>
-    /// <param name="schemasByReference">A cache of schemas and their associated reference IDs.</param>
-    /// <param name="isTopLevel">When <see langword="true" />, will skip resolving references for the top-most schema provided.</param>
-    internal static OpenApiSchema? ResolveReferenceForSchema(OpenApiSchema? schema, Dictionary<OpenApiSchema, string?> schemasByReference, bool isTopLevel = false)
-    {
-        if (schema is null)
-        {
-            return schema;
-        }
-
-        // If we're resolving schemas for a top-level schema being referenced in the `components.schema` property
-        // we don't want to replace the top-level inline schema with a reference to itself. We want to replace
-        // inline schemas to reference schemas for all schemas referenced in the top-level schema though (such as
-        // `allOf`, `oneOf`, `anyOf`, `items`, `properties`, etc.) which is why `isTopLevel` is only set once.
-        if (!isTopLevel && schemasByReference.TryGetValue(schema, out var referenceId) && referenceId is not null)
-        {
-            return new OpenApiSchema { Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = referenceId } };
-        }
-
-        if (schema.AllOf is not null)
-        {
-            for (var i = 0; i < schema.AllOf.Count; i++)
-            {
-                schema.AllOf[i] = ResolveReferenceForSchema(schema.AllOf[i], schemasByReference);
-            }
-        }
-
-        if (schema.OneOf is not null)
-        {
-            for (var i = 0; i < schema.OneOf.Count; i++)
-            {
-                schema.OneOf[i] = ResolveReferenceForSchema(schema.OneOf[i], schemasByReference);
-            }
-        }
-
-        if (schema.AnyOf is not null)
-        {
-            for (var i = 0; i < schema.AnyOf.Count; i++)
-            {
-                schema.AnyOf[i] = ResolveReferenceForSchema(schema.AnyOf[i], schemasByReference);
-            }
-        }
-
-        if (schema.AdditionalProperties is not null)
-        {
-            schema.AdditionalProperties = ResolveReferenceForSchema(schema.AdditionalProperties, schemasByReference);
-        }
-
-        if (schema.Items is not null)
-        {
-            schema.Items = ResolveReferenceForSchema(schema.Items, schemasByReference);
-        }
-
-        if (schema.Properties is not null)
-        {
-            foreach (var property in schema.Properties)
-            {
-                schema.Properties[property.Key] = ResolveReferenceForSchema(property.Value, schemasByReference);
-            }
-        }
-
-        if (schema.Not is not null)
-        {
-            schema.Not = ResolveReferenceForSchema(schema.Not, schemasByReference);
-        }
-        return schema;
-    }
-}
diff --git a/src/OpenApi/src/Transformers/OpenApiDocumentTransformerContext.cs b/src/OpenApi/src/Transformers/OpenApiDocumentTransformerContext.cs
index c47638bedf93..ee2cf766db4b 100644
--- a/src/OpenApi/src/Transformers/OpenApiDocumentTransformerContext.cs
+++ b/src/OpenApi/src/Transformers/OpenApiDocumentTransformerContext.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -24,4 +26,33 @@ public sealed class OpenApiDocumentTransformerContext
     /// Gets the application services associated with current document.
     /// </summary>
     public required IServiceProvider ApplicationServices { get; init; }
+
+    internal IOpenApiSchemaTransformer[] SchemaTransformers { get; init; } = [];
+
+    // Internal because we expect users to interact with the `Document` provided in
+    // the `IOpenApiDocumentTransformer` itself instead of the context object.
+    internal OpenApiDocument? Document { get; init; }
+
+    /// <summary>
+    /// Gets or creates an <see cref="OpenApiSchema"/> for the specified type. Augments
+    /// the schema with any <see cref="IOpenApiSchemaTransformer"/>s that are registered
+    /// on the document. If <paramref name="parameterDescription"/> is not null, the schema will be
+    /// augmented with the <see cref="ApiParameterDescription"/> information.
+    /// </summary>
+    /// <param name="type">The type for which the schema is being created.</param>
+    /// <param name="parameterDescription">An optional parameter description to augment the schema.</param>
+    /// <param name="cancellationToken">A cancellation token to cancel the operation.</param>
+    /// <returns>A task that represents the asynchronous operation, with a value of type <see cref="OpenApiSchema"/>.</returns>
+    public Task<OpenApiSchema> GetOrCreateSchemaAsync(Type type, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
+    {
+        Debug.Assert(Document is not null, "Document should have been initialized by framework.");
+        var schemaService = ApplicationServices.GetRequiredKeyedService<OpenApiSchemaService>(DocumentName);
+        return schemaService.GetOrCreateUnresolvedSchemaAsync(
+            document: Document,
+            type: type,
+            parameterDescription: parameterDescription,
+            scopedServiceProvider: ApplicationServices,
+            schemaTransformers: SchemaTransformers,
+            cancellationToken: cancellationToken);
+    }
 }
diff --git a/src/OpenApi/src/Transformers/OpenApiOperationTransformerContext.cs b/src/OpenApi/src/Transformers/OpenApiOperationTransformerContext.cs
index 49d76a0191e6..82a5be551a5d 100644
--- a/src/OpenApi/src/Transformers/OpenApiOperationTransformerContext.cs
+++ b/src/OpenApi/src/Transformers/OpenApiOperationTransformerContext.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -24,4 +25,33 @@ public sealed class OpenApiOperationTransformerContext
     /// Gets the application services associated with the current document the target operation is in.
     /// </summary>
     public required IServiceProvider ApplicationServices { get; init; }
+
+    /// <summary>
+    /// Gets the OpenAPI document the current endpoint belongs to.
+    /// </summary>
+    public OpenApiDocument? Document { get; init; }
+
+    internal IOpenApiSchemaTransformer[] SchemaTransformers { get; init; } = [];
+
+    /// <summary>
+    /// Gets or creates an <see cref="OpenApiSchema"/> for the specified type. Augments
+    /// the schema with any <see cref="IOpenApiSchemaTransformer"/>s that are registered
+    /// on the document. If <paramref name="parameterDescription"/> is not null, the schema will be
+    /// augmented with the <see cref="ApiParameterDescription"/> information.
+    /// </summary>
+    /// <param name="type">The type for which the schema is being created.</param>
+    /// <param name="parameterDescription">An optional parameter description to augment the schema.</param>
+    /// <param name="cancellationToken">A cancellation token to cancel the operation.</param>
+    /// <returns>A task that represents the asynchronous operation, with a value of type <see cref="OpenApiSchema"/>.</returns>
+    public Task<OpenApiSchema> GetOrCreateSchemaAsync(Type type, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
+    {
+        var schemaService = ApplicationServices.GetRequiredKeyedService<OpenApiSchemaService>(DocumentName);
+        return schemaService.GetOrCreateUnresolvedSchemaAsync(
+            document: Document,
+            type: type,
+            parameterDescription: parameterDescription,
+            scopedServiceProvider: ApplicationServices,
+            schemaTransformers: SchemaTransformers,
+            cancellationToken: cancellationToken);
+    }
 }
diff --git a/src/OpenApi/src/Transformers/OpenApiSchemaTransformerContext.cs b/src/OpenApi/src/Transformers/OpenApiSchemaTransformerContext.cs
index 94a03e679639..a0553342cf2c 100644
--- a/src/OpenApi/src/Transformers/OpenApiSchemaTransformerContext.cs
+++ b/src/OpenApi/src/Transformers/OpenApiSchemaTransformerContext.cs
@@ -3,6 +3,7 @@
 
 using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
@@ -41,6 +42,11 @@ public sealed class OpenApiSchemaTransformerContext
     /// </summary>
     public required IServiceProvider ApplicationServices { get; init; }
 
+    /// <summary>
+    /// Gets the OpenAPI document the current schema belongs to.
+    /// </summary>
+    public OpenApiDocument? Document { get; init; }
+
     // Expose internal setters for the properties that only allow initializations to avoid allocating
     // new instances of the context for each sub-schema transformation.
     internal void UpdateJsonTypeInfo(JsonTypeInfo jsonTypeInfo, JsonPropertyInfo? jsonPropertyInfo)
@@ -48,4 +54,28 @@ internal void UpdateJsonTypeInfo(JsonTypeInfo jsonTypeInfo, JsonPropertyInfo? js
         _jsonTypeInfo = jsonTypeInfo;
         _jsonPropertyInfo = jsonPropertyInfo;
     }
+
+    internal IOpenApiSchemaTransformer[] SchemaTransformers { get; init; } = [];
+
+    /// <summary>
+    /// Gets or creates an <see cref="OpenApiSchema"/> for the specified type. Augments
+    /// the schema with any <see cref="IOpenApiSchemaTransformer"/>s that are registered
+    /// on the document. If <paramref name="parameterDescription"/> is not null, the schema will be
+    /// augmented with the <see cref="ApiParameterDescription"/> information.
+    /// </summary>
+    /// <param name="type">The type for which the schema is being created.</param>
+    /// <param name="parameterDescription">An optional parameter description to augment the schema.</param>
+    /// <param name="cancellationToken">A cancellation token to cancel the operation.</param>
+    /// <returns>A task that represents the asynchronous operation, with a value of type <see cref="OpenApiSchema"/>.</returns>
+    public Task<OpenApiSchema> GetOrCreateSchemaAsync(Type type, ApiParameterDescription? parameterDescription = null, CancellationToken cancellationToken = default)
+    {
+        var schemaService = ApplicationServices.GetRequiredKeyedService<OpenApiSchemaService>(DocumentName);
+        return schemaService.GetOrCreateUnresolvedSchemaAsync(
+            document: Document,
+            type: type,
+            parameterDescription: parameterDescription,
+            scopedServiceProvider: ApplicationServices,
+            schemaTransformers: SchemaTransformers,
+            cancellationToken: cancellationToken);
+    }
 }
diff --git a/src/OpenApi/src/Transformers/TypeBasedOpenApiDocumentTransformer.cs b/src/OpenApi/src/Transformers/TypeBasedOpenApiDocumentTransformer.cs
index d950ae5c4ce0..990f500d6429 100644
--- a/src/OpenApi/src/Transformers/TypeBasedOpenApiDocumentTransformer.cs
+++ b/src/OpenApi/src/Transformers/TypeBasedOpenApiDocumentTransformer.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
diff --git a/src/OpenApi/src/Transformers/TypeBasedOpenApiOperationTransformer.cs b/src/OpenApi/src/Transformers/TypeBasedOpenApiOperationTransformer.cs
index a8c8a11e526b..d0b32c8ac455 100644
--- a/src/OpenApi/src/Transformers/TypeBasedOpenApiOperationTransformer.cs
+++ b/src/OpenApi/src/Transformers/TypeBasedOpenApiOperationTransformer.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
diff --git a/src/OpenApi/src/Transformers/TypeBasedOpenApiSchemaTransformer.cs b/src/OpenApi/src/Transformers/TypeBasedOpenApiSchemaTransformer.cs
index 29c0c3be6e46..564aad2d758b 100644
--- a/src/OpenApi/src/Transformers/TypeBasedOpenApiSchemaTransformer.cs
+++ b/src/OpenApi/src/Transformers/TypeBasedOpenApiSchemaTransformer.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi;
 
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/GenerateAdditionalXmlFilesForOpenApiTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/GenerateAdditionalXmlFilesForOpenApiTests.cs
new file mode 100644
index 000000000000..f230d7186e5d
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/GenerateAdditionalXmlFilesForOpenApiTests.cs
@@ -0,0 +1,118 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Text.Json;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.AspNetCore.OpenApi.Build.Tests;
+
+public class GenerateAdditionalXmlFilesForOpenApiTests
+{
+    private static readonly TimeSpan _defaultProcessTimeout = TimeSpan.FromMinutes(2);
+
+    [Fact]
+    public void VerifiesTargetGeneratesXmlFiles()
+    {
+        var projectFile = CreateTestProject();
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = DotNetMuxer.MuxerPathOrDefault(),
+            Arguments = $"build -t:Build -getItem:AdditionalFiles",
+            WorkingDirectory = Path.GetDirectoryName(projectFile),
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            UseShellExecute = false
+        };
+
+        using var process = Process.Start(startInfo);
+        process.WaitForExit(_defaultProcessTimeout);
+        Assert.Equal(0, process.ExitCode);
+
+        var output = process.StandardOutput.ReadToEnd();
+        var result = JsonSerializer.Deserialize<ItemsResult>(output);
+        var additionalFiles = result.Items.AdditionalFiles;
+        Assert.NotEmpty(additionalFiles);
+
+        // Captures ProjectReferences and PackageReferences in project.
+        var identities = additionalFiles.Select(x => x["Identity"]).ToArray();
+        Assert.Collection(identities,
+            x => Assert.EndsWith("ClassLibrary.xml", x)
+        );
+    }
+
+    private static string CreateTestProject()
+    {
+        var classLibTempPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        Directory.CreateDirectory(classLibTempPath);
+
+        // Create a class library project
+        var classLibProjectPath = Path.Combine(classLibTempPath, "ClassLibrary.csproj");
+        var classLibProjectContent = """
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+</Project>
+""";
+        File.WriteAllText(classLibProjectPath, classLibProjectContent);
+
+        // Create a class library source file
+        var classLibSourcePath = Path.Combine(classLibTempPath, "Class1.cs");
+        var classLibSourceContent = """
+/// <summary>
+/// This is a class
+/// </summary>
+public class Class1
+{
+}
+""";
+        File.WriteAllText(classLibSourcePath, classLibSourceContent);
+
+        var tempPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        Directory.CreateDirectory(tempPath);
+
+        // Copy the targets file to the temp directory
+        var sourceTargetsPath = Path.Combine(AppContext.BaseDirectory, "Microsoft.AspNetCore.OpenApi.targets");
+        var targetTargetsPath = Path.Combine(tempPath, "Microsoft.AspNetCore.OpenApi.targets");
+        File.Copy(sourceTargetsPath, targetTargetsPath);
+
+        var projectPath = Path.Combine(tempPath, "TestProject.csproj");
+        var projectContent = $$"""
+<Project Sdk="Microsoft.NET.Sdk.Web">
+    <Import Project="{{targetTargetsPath}}" />
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+    <ProjectReference Include="{{classLibProjectPath}}" />
+  </ItemGroup>
+</Project>
+""";
+        File.WriteAllText(projectPath, projectContent);
+
+        // Create a test source file
+        var sourcePath = Path.Combine(tempPath, "Program.cs");
+        var sourceContent = """
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create(args);
+
+app.MapGet("/", () => "Hello World!");
+
+app.Run();
+""";
+        File.WriteAllText(sourcePath, sourceContent);
+
+        return projectPath;
+    }
+
+    private record ItemsResult(AdditionalFilesResult Items);
+    private record AdditionalFilesResult(Dictionary<string, string>[] AdditionalFiles);
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/Microsoft.AspNetCore.OpenApi.Build.Tests.csproj b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/Microsoft.AspNetCore.OpenApi.Build.Tests.csproj
new file mode 100644
index 000000000000..4aa6ddf207cf
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Build.Tests/Microsoft.AspNetCore.OpenApi.Build.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)\CommandLineUtils\Utilities\DotNetMuxer.cs" Link="Shared\DotNetMuxer.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="../../build/Microsoft.AspNetCore.OpenApi.targets" CopyToOutputDirectory="Always" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/AddOpenApiTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/AddOpenApiTests.cs
new file mode 100644
index 000000000000..3aebcdf825b3
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/AddOpenApiTests.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+[UsesVerify]
+public class AddOpenApiTests
+{
+    [Fact]
+    public async Task CanInterceptAddOpenApi()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+// No parameters
+builder.Services.AddOpenApi();
+// Name parameter
+builder.Services.AddOpenApi("v2");
+var documentName = "v4";
+builder.Services.AddOpenApi(documentName); // Should not be intercepted
+// Configure options parameter
+builder.Services.AddOpenApi(options =>
+{
+    options.OpenApiVersion = Microsoft.OpenApi.OpenApiSpecVersion.OpenApi2_0;
+});
+// Name and configure options parameters
+builder.Services.AddOpenApi("v2", options =>
+{
+    options.OpenApiVersion = Microsoft.OpenApi.OpenApiSpecVersion.OpenApi2_0;
+});
+// Another name and configure options invocation that should be covered
+// by the same interceptor method as the previous one
+builder.Services.AddOpenApi("v3", options =>
+{
+    options.OpenApiVersion = Microsoft.OpenApi.OpenApiSpecVersion.OpenApi3_0;
+});
+
+var app = builder.Build();
+
+app.MapPost("", () => "Hello world!");
+
+app.Run();
+""";
+
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, out var compilation);
+        Assert.Empty(compilation.GetDiagnostics().Where(d => d.Severity > DiagnosticSeverity.Warning));
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/AdditionalTextsTests.Schemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/AdditionalTextsTests.Schemas.cs
new file mode 100644
index 000000000000..d349f172b24e
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/AdditionalTextsTests.Schemas.cs
@@ -0,0 +1,266 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+[UsesVerify]
+public partial class AdditionalTextsTests
+{
+    [Fact]
+    public async Task CanHandleXmlForSchemasInAdditionalTexts()
+    {
+        var source = """
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using ClassLibrary;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapPost("/todo", (Todo todo) => { });
+app.MapPost("/project", (Project project) => { });
+app.MapPost("/board", (ProjectBoard.BoardItem boardItem) => { });
+app.MapPost("/project-record", (ProjectRecord project) => { });
+app.MapPost("/todo-with-description", (TodoWithDescription todo) => { });
+app.MapPost("/type-with-examples", (TypeWithExamples typeWithExamples) => { });
+app.MapPost("/external-method", ClassLibrary.Endpoints.ExternalMethod);
+
+app.Run();
+""";
+
+        var librarySource = """
+using System;
+
+namespace ClassLibrary;
+
+/// <summary>
+/// This is a todo item.
+/// </summary>
+public class Todo
+{
+    public int Id { get; set; }
+    public string Name { get; set; }
+    public string Description { get; set; }
+}
+
+/// <summary>
+/// The project that contains <see cref="Todo"/> items.
+/// </summary>
+public record Project(string Name, string Description);
+
+public class ProjectBoard
+{
+    /// <summary>
+    /// An item on the board.
+    /// </summary>
+    public class BoardItem
+    {
+        /// <summary>
+        /// The identifier of the board item. Defaults to "name".
+        /// </summary>
+        public string Name { get; set; }
+    }
+
+    private class Element
+    {
+        /// <summary>
+        /// The unique identifier for the element.
+        /// </summary>
+        /// <remarks>
+        /// This won't be emitted since it is a public
+        /// property on a private class.
+        /// </remarks>
+        public string Name { get; set; }
+    }
+
+    protected internal class ProtectedInternalElement
+    {
+        /// <summary>
+        /// The unique identifier for the element.
+        /// </summary>
+        public string Name { get; set; }
+    }
+
+    protected class ProtectedElement
+    {
+        /// <summary>
+        /// The unique identifier for the element.
+        /// </summary>
+        public string Name { get; set; }
+    }
+}
+
+/// <summary>
+/// The project that contains <see cref="Todo"/> items.
+/// </summary>
+/// <param name="Name">The name of the project.</param>
+/// <param name="Description">The description of the project.</param>
+public record ProjectRecord(string Name, string Description);
+
+public class TodoWithDescription
+{
+    /// <summary>
+    /// The identifier of the todo.
+    /// </summary>
+    public int Id { get; set; }
+    /// <value>
+    /// The name of the todo.
+    /// </value>
+    public string Name { get; set; }
+    /// <summary>
+    /// A description of the todo.
+    /// </summary>
+    /// <value>Another description of the todo.</value>
+    public string Description { get; set; }
+}
+
+public class TypeWithExamples
+{
+    /// <example>true</example>
+    public bool BooleanType { get; set; }
+    /// <example>42</example>
+    public int IntegerType { get; set; }
+    /// <example>1234567890123456789</example>
+    public long LongType { get; set; }
+    /// <example>3.14</example>
+    public double DoubleType { get; set; }
+    /// <example>3.14</example>
+    public float FloatType { get; set; }
+    /// <example>2022-01-01T00:00:00Z</example>
+    public DateTime DateTimeType { get; set; }
+    /// <example>2022-01-01</example>
+    public DateOnly DateOnlyType { get; set; }
+    /// <example>Hello, World!</example>
+    public string StringType { get; set; }
+    /// <example>2d8f1eac-b5c6-4e29-8c62-4d9d75ef3d3d</example>
+    public Guid GuidType { get; set; }
+    /// <example>12:30:45</example>
+    public TimeOnly TimeOnlyType { get; set; }
+    /// <example>P3DT4H5M</example>
+    public TimeSpan TimeSpanType { get; set; }
+    /// <example>255</example>
+    public byte ByteType { get; set; }
+    /// <example>3.14159265359</example>
+    public decimal DecimalType { get; set; }
+    /// <example>https://example.com</example>
+    public Uri UriType { get; set; }
+}
+
+public class Holder<T>
+{
+    /// <summary>
+    /// The value to hold.
+    /// </summary>
+    public T Value { get; set; }
+
+    public Holder(T value)
+    {
+        Value = value;
+    }
+}
+
+public static class Endpoints
+{
+    /// <summary>
+    /// An external method.
+    /// </summary>
+    /// <param name="name">The name of the tester. Defaults to "Tester".</param>
+    public static void ExternalMethod(string name = "Tester") { }
+
+    /// <summary>
+    /// Creates a holder for the specified value.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <param name="value">The value to hold.</param>
+    /// <returns>A holder for the specified value.</returns>
+    /// <example>{ value: 42 }</example>
+    public static Holder<T> CreateHolder<T>(T value) => new(value);
+}
+""";
+        var references = new Dictionary<string, List<string>>
+        {
+            { "ClassLibrary", [librarySource] }
+        };
+
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, references, out var compilation, out var additionalAssemblies);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, additionalAssemblies, document =>
+        {
+            var path = document.Paths["/todo"].Operations[HttpMethod.Post];
+            var todo = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This is a todo item.", todo.Description);
+
+            path = document.Paths["/project"].Operations[HttpMethod.Post];
+            var project = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("The project that contains Todo items.", project.Description);
+
+            path = document.Paths["/board"].Operations[HttpMethod.Post];
+            var board = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("An item on the board.", board.Description);
+
+            path = document.Paths["/project-record"].Operations[HttpMethod.Post];
+            project = path.RequestBody.Content["application/json"].Schema;
+
+            Assert.Equal("The name of the project.", project.Properties["name"].Description);
+            Assert.Equal("The description of the project.", project.Properties["description"].Description);
+
+            path = document.Paths["/todo-with-description"].Operations[HttpMethod.Post];
+            todo = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("The identifier of the todo.", todo.Properties["id"].Description);
+            Assert.Equal("The name of the todo.", todo.Properties["name"].Description);
+            Assert.Equal($"A description of the todo.\nAnother description of the todo.", todo.Properties["description"].Description);
+
+            path = document.Paths["/type-with-examples"].Operations[HttpMethod.Post];
+            var typeWithExamples = path.RequestBody.Content["application/json"].Schema;
+
+            var booleanTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["booleanType"].Example);
+            Assert.True(booleanTypeExample.GetValue<bool>());
+
+            var integerTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["integerType"].Example);
+            Assert.Equal(42, integerTypeExample.GetValue<int>());
+
+            var longTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["longType"].Example);
+            Assert.Equal(1234567890123456789, longTypeExample.GetValue<long>());
+
+            var doubleTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["doubleType"].Example);
+            Assert.Equal(3.14, doubleTypeExample.GetValue<double>());
+
+            var floatTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["floatType"].Example);
+            Assert.Equal(3.14f, floatTypeExample.GetValue<float>());
+
+            var dateTimeTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["dateTimeType"].Example);
+            Assert.Equal(new DateTime(2022, 01, 01), dateTimeTypeExample.GetValue<DateTime>());
+
+            var dateOnlyTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["dateOnlyType"].Example);
+            Assert.Equal("2022-01-01", dateOnlyTypeExample.GetValue<string>());
+
+            var stringTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["stringType"].Example);
+            Assert.Equal("Hello, World!", stringTypeExample.GetValue<string>());
+
+            var guidTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["guidType"].Example);
+            Assert.Equal("2d8f1eac-b5c6-4e29-8c62-4d9d75ef3d3d", guidTypeExample.GetValue<string>());
+
+            var byteTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["byteType"].Example);
+            Assert.Equal(255, byteTypeExample.GetValue<int>());
+
+            var timeOnlyTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["timeOnlyType"].Example);
+            Assert.Equal("12:30:45", timeOnlyTypeExample.GetValue<string>());
+
+            var timeSpanTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["timeSpanType"].Example);
+            Assert.Equal("P3DT4H5M", timeSpanTypeExample.GetValue<string>());
+
+            var decimalTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["decimalType"].Example);
+            Assert.Equal(3.14159265359m, decimalTypeExample.GetValue<decimal>());
+
+            var uriTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["uriType"].Example);
+            Assert.Equal("https://example.com", uriTypeExample.GetValue<string>());
+        });
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/CompletenessTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/CompletenessTests.cs
new file mode 100644
index 000000000000..24656b12c63f
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/CompletenessTests.cs
@@ -0,0 +1,581 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+// Test scenarios derived from https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/xmldoc/examples
+
+[UsesVerify]
+public class CompletenessTests
+{
+    [Fact]
+    public async Task SupportsAllXmlTagsOnSchemas()
+    {
+        var source = """
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapPost("/example-class", (ExampleClass example) => { });
+app.MapPost("/person", (Person person) => { });
+app.MapPost("/derived-class", (DerivedClass child) => { });
+app.MapPost("/main-class", (MainClass main) => { });
+app.MapPost("/test-interface", (ITestInterface test) => { });
+app.MapPost("/implementing-class", (ImplementingClass impl) => { });
+app.MapPost("/inherit-only-returns", (InheritOnlyReturns returns) => { });
+app.MapPost("/inherit-all-but-remarks", (InheritAllButRemarks remarks) => { });
+app.MapPost("/generic-class", (GenericClass<string> generic) => { });
+app.MapPost("/generic-parent", (GenericParent parent) => { });
+app.MapPost("/params-and-param-refs", (ParamsAndParamRefs refs) => { });
+app.MapPost("/xml-property-test", (XmlPropertyTestClass test) => { });
+
+
+app.Run();
+
+/// <summary>
+/// Every class and member should have a one sentence
+/// summary describing its purpose.
+/// </summary>
+/// <remarks>
+/// You can expand on that one sentence summary to
+/// provide more information for readers. In this case,
+/// the <c>ExampleClass</c> provides different C#
+/// elements to show how you would add documentation
+///comments for most elements in a typical class.
+/// <para>
+/// The remarks can add multiple paragraphs, so you can
+/// write detailed information for developers that use
+/// your work. You should add everything needed for
+/// readers to be successful. This class contains
+/// examples for the following:
+/// </para>
+/// <list type="table">
+/// <item>
+/// <term>Summary</term>
+/// <description>
+/// This should provide a one sentence summary of the class or member.
+/// </description>
+/// </item>
+/// <item>
+/// <term>Remarks</term>
+/// <description>
+/// This is typically a more detailed description of the class or member
+/// </description>
+/// </item>
+/// <item>
+/// <term>para</term>
+/// <description>
+/// The para tag separates a section into multiple paragraphs
+/// </description>
+/// </item>
+/// <item>
+/// <term>list</term>
+/// <description>
+/// Provides a list of terms or elements
+/// </description>
+/// </item>
+/// <item>
+/// <term>returns, param</term>
+/// <description>
+/// Used to describe parameters and return values
+/// </description>
+/// </item>
+/// <item>
+/// <term>value</term>
+/// <description>Used to describe properties</description>
+/// </item>
+/// <item>
+/// <term>exception</term>
+/// <description>
+/// Used to describe exceptions that may be thrown
+/// </description>
+/// </item>
+/// <item>
+/// <term>c, cref, see, seealso</term>
+/// <description>
+/// These provide code style and links to other
+/// documentation elements
+/// </description>
+/// </item>
+/// <item>
+/// <term>example, code</term>
+/// <description>
+/// These are used for code examples
+/// </description>
+/// </item>
+/// </list>
+/// <para>
+/// The list above uses the "table" style. You could
+/// also use the "bullet" or "number" style. Neither
+/// would typically use the "term" element.
+/// <br/>
+/// Note: paragraphs are double spaced. Use the *br*
+/// tag for single spaced lines.
+/// </para>
+/// </remarks>
+public class ExampleClass
+{
+    /// <value>
+    /// The <c>Label</c> property represents a label
+    /// for this instance.
+    /// </value>
+    /// <remarks>
+    /// The <see cref="Label"/> is a <see langword="string"/>
+    /// that you use for a label.
+    /// <para>
+    /// Note that there isn't a way to provide a "cref" to
+    /// each accessor, only to the property itself.
+    /// </para>
+    /// </remarks>
+    public string? Label
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Adds two integers and returns the result.
+    /// </summary>
+    /// <returns>
+    /// The sum of two integers.
+    /// </returns>
+    /// <param name="left">
+    /// The left operand of the addition.
+    /// </param>
+    /// <param name="right">
+    /// The right operand of the addition.
+    /// </param>
+    /// <example>
+    /// <code>
+    /// int c = Math.Add(4, 5);
+    /// if (c > 10)
+    /// {
+    ///     Console.WriteLine(c);
+    /// }
+    /// </code>
+    /// </example>
+    /// <exception cref="System.OverflowException">
+    /// Thrown when one parameter is
+    /// <see cref="Int32.MaxValue">MaxValue</see> and the other is
+    /// greater than 0.
+    /// Note that here you can also use
+    /// <see href="https://learn.microsoft.com/dotnet/api/system.int32.maxvalue"/>
+    ///  to point a web page instead.
+    /// </exception>
+    /// <see cref="ExampleClass"/> for a list of all
+    /// the tags in these examples.
+    /// <seealso cref="ExampleClass.Label"/>
+    public static int Add(int left, int right)
+    {
+        if ((left == int.MaxValue && right > 0) || (right == int.MaxValue && left > 0))
+            throw new System.OverflowException();
+
+        return left + right;
+    }
+
+    /// <summary>
+    /// This method is an example of a method that
+    /// returns an awaitable item.
+    /// </summary>
+    public static Task<int> AddAsync(int left, int right)
+    {
+        return Task.FromResult(Add(left, right));
+    }
+
+    /// <summary>
+    /// This method is an example of a method that
+    /// returns a Task which should map to a void return type.
+    /// </summary>
+    public static Task DoNothingAsync()
+    {
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// This method is an example of a method that consumes
+    /// an params array.
+    /// </summary>
+    public static int AddNumbers(params int[] numbers)
+    {
+        var sum = 0;
+        foreach (var number in numbers)
+        {
+            sum += number;
+        }
+        return sum;
+    }
+}
+
+/// <summary>
+/// This is an example of a positional record.
+/// </summary>
+/// <remarks>
+/// There isn't a way to add XML comments for properties
+/// created for positional records, yet. The language
+/// design team is still considering what tags should
+/// be supported, and where. Currently, you can use
+/// the "param" tag to describe the parameters to the
+/// primary constructor.
+/// </remarks>
+/// <param name="FirstName">
+/// This tag will apply to the primary constructor parameter.
+/// </param>
+/// <param name="LastName">
+/// This tag will apply to the primary constructor parameter.
+/// </param>
+public record Person(string FirstName, string LastName);
+
+/// <summary>
+/// A summary about this class.
+/// </summary>
+/// <remarks>
+/// These remarks would explain more about this class.
+/// In this example, these comments also explain the
+/// general information about the derived class.
+/// </remarks>
+public class MainClass
+{
+}
+
+///<inheritdoc/>
+public class DerivedClass : MainClass
+{
+}
+
+/// <summary>
+/// This interface would describe all the methods in
+/// its contract.
+/// </summary>
+/// <remarks>
+/// While elided for brevity, each method or property
+/// in this interface would contain docs that you want
+/// to duplicate in each implementing class.
+/// </remarks>
+public interface ITestInterface
+{
+    /// <summary>
+    /// This method is part of the test interface.
+    /// </summary>
+    /// <remarks>
+    /// This content would be inherited by classes
+    /// that implement this interface when the
+    /// implementing class uses "inheritdoc"
+    /// </remarks>
+    /// <returns>The value of <paramref name="arg" /> </returns>
+    /// <param name="arg">The argument to the method</param>
+    int Method(int arg);
+}
+
+///<inheritdoc cref="ITestInterface"/>
+public class ImplementingClass : ITestInterface
+{
+    // doc comments are inherited here.
+    public int Method(int arg) => arg;
+}
+
+/// <summary>
+/// This class shows hows you can "inherit" the doc
+/// comments from one method in another method.
+/// </summary>
+/// <remarks>
+/// You can inherit all comments, or only a specific tag,
+/// represented by an xpath expression.
+/// </remarks>
+public class InheritOnlyReturns
+{
+    /// <summary>
+    /// In this example, this summary is only visible for this method.
+    /// </summary>
+    /// <returns>A boolean</returns>
+    public static bool MyParentMethod(bool x) { return x; }
+
+    /// <inheritdoc cref="MyParentMethod" path="/returns"/>
+    public static bool MyChildMethod() { return false; }
+}
+
+/// <summary>
+/// This class shows an example of sharing comments across methods.
+/// </summary>
+public class InheritAllButRemarks
+{
+    /// <summary>
+    /// In this example, this summary is visible on all the methods.
+    /// </summary>
+    /// <remarks>
+    /// The remarks can be inherited by other methods
+    /// using the xpath expression.
+    /// </remarks>
+    /// <returns>A boolean</returns>
+    public static bool MyParentMethod(bool x) { return x; }
+
+    /// <inheritdoc cref="MyParentMethod" path="//*[not(self::remarks)]"/>
+    public static bool MyChildMethod() { return false; }
+}
+
+/// <summary>
+/// This is a generic class.
+/// </summary>
+/// <remarks>
+/// This example shows how to specify the <see cref="GenericClass{T}"/>
+/// type as a cref attribute.
+/// In generic classes and methods, you'll often want to reference the
+/// generic type, or the type parameter.
+/// </remarks>
+public class GenericClass<T>
+{
+    // Fields and members.
+}
+
+/// <summary>
+/// This class validates the behavior for mapping
+/// generic types to open generics for use in
+/// typeof expressions.
+/// </summary>
+public class GenericParent
+{
+    /// <summary>
+    /// This property is a nullable value type.
+    /// </summary>
+    public int? Id { get; set; }
+
+    /// <summary>
+    /// This property is a nullable reference type.
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// This property is a generic type containing a tuple.
+    /// </summary>
+    public Task<(int, string)> TaskOfTupleProp { get; set; }
+
+    /// <summary>
+    /// This property is a tuple with a generic type inside.
+    /// </summary>
+    public (int, Dictionary<int, string>) TupleWithGenericProp { get; set; }
+
+    /// <summary>
+    /// This property is a tuple with a nested generic type inside.
+    /// </summary>
+    public (int, Dictionary<int, Dictionary<string, int>>) TupleWithNestedGenericProp { get; set; }
+
+    /// <summary>
+    /// This method returns a generic type containing a tuple.
+    /// </summary>
+    public static Task<(int, string)> GetTaskOfTuple()
+    {
+        return Task.FromResult((1, "test"));
+    }
+
+    /// <summary>
+    /// This method returns a tuple with a generic type inside.
+    /// </summary>
+    public static (int, Dictionary<int, string>) GetTupleOfTask()
+    {
+        return (1, new Dictionary<int, string>());
+    }
+
+    /// <summary>
+    /// This method return a tuple with a generic type containing a
+    /// type parameter inside.
+    /// </summary>
+    public static (int, Dictionary<int, T>) GetTupleOfTask1<T>()
+    {
+        return (1, new Dictionary<int, T>());
+    }
+
+    /// <summary>
+    /// This method return a tuple with a generic type containing a
+    /// type parameter inside.
+    /// </summary>
+    public static (T, Dictionary<int, string>) GetTupleOfTask2<T>()
+    {
+        return (default, new Dictionary<int, string>());
+    }
+
+    /// <summary>
+    /// This method returns a nested generic with all types resolved.
+    /// </summary>
+    public static Dictionary<int, Dictionary<int, string>> GetNestedGeneric()
+    {
+        return new Dictionary<int, Dictionary<int, string>>();
+    }
+
+    /// <summary>
+    /// This method returns a nested generic with a type parameter.
+    /// </summary>
+    public static Dictionary<int, Dictionary<int, T>> GetNestedGeneric1<T>()
+    {
+        return new Dictionary<int, Dictionary<int, T>>();
+    }
+}
+
+/// <summary>
+/// This shows examples of typeparamref and typeparam tags
+/// </summary>
+public class ParamsAndParamRefs
+{
+    /// <summary>
+    /// The GetGenericValue method.
+    /// </summary>
+    /// <remarks>
+    /// This sample shows how to specify the <see cref="GetGenericValue"/>
+    /// method as a cref attribute.
+    /// The parameter and return value are both of an arbitrary type,
+    /// <typeparamref name="T"/>
+    /// </remarks>
+    public static T GetGenericValue<T>(T para)
+    {
+        return para;
+    }
+}
+
+/// <summary>
+/// A class that implements the <see cref="IDisposable"/> interface.
+/// </summary>
+public class DisposableType : IDisposable
+{
+    /// <summary>
+    /// Finalizes an instance of the <see cref="DisposableType"/> class.
+    /// </summary>
+    ~DisposableType()
+    {
+        Dispose(false);
+    }
+
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+    /// </summary>
+    /// <param name="disposing">
+    /// <see langword="true" /> to release both managed and unmanaged resources;
+    /// <see langword="false" /> to release only unmanaged resources.
+    /// <see langword="null" /> to indicate a no-op.
+    /// </param>
+    protected virtual void Dispose(bool disposing)
+    {
+        // No-op
+    }
+}
+
+/// <summary>
+/// This class tests different XML comment scenarios for properties.
+/// </summary>
+public class XmlPropertyTestClass
+{
+    /// <summary>
+    /// A property with only summary tag.
+    /// </summary>
+    public string SummaryOnly { get; set; }
+
+    /// <value>
+    /// A property with only value tag.
+    /// </value>
+    public string ValueOnly { get; set; }
+
+    /// <summary>
+    /// A property with both summary and value.
+    /// </summary>
+    /// <value>Additional value information.</value>
+    public string BothSummaryAndValue { get; set; }
+
+    /// <returns>This should be ignored for properties.</returns>
+    public string ReturnsOnly { get; set; }
+
+    /// <summary>
+    /// A property with summary and returns.
+    /// </summary>
+    /// <returns>This should be ignored for properties.</returns>
+    public string SummaryAndReturns { get; set; }
+}
+""";
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, out var compilation);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, document =>
+        {
+            var path = document.Paths["/example-class"].Operations[HttpMethod.Post];
+            var exampleClass = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("Every class and member should have a one sentence\nsummary describing its purpose.", exampleClass.Description, ignoreLineEndingDifferences: true);
+            // Label property has only <value> tag -> uses value directly
+            Assert.Equal("The `Label` property represents a label\nfor this instance.", exampleClass.Properties["label"].Description, ignoreLineEndingDifferences: true);
+
+            path = document.Paths["/person"].Operations[HttpMethod.Post];
+            var person = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This is an example of a positional record.", person.Description);
+            Assert.Equal("This tag will apply to the primary constructor parameter.", person.Properties["firstName"].Description);
+            Assert.Equal("This tag will apply to the primary constructor parameter.", person.Properties["lastName"].Description);
+
+            path = document.Paths["/derived-class"].Operations[HttpMethod.Post];
+            var derivedClass = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("A summary about this class.", derivedClass.Description);
+
+            path = document.Paths["/main-class"].Operations[HttpMethod.Post];
+            var mainClass = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("A summary about this class.", mainClass.Description);
+
+            path = document.Paths["/implementing-class"].Operations[HttpMethod.Post];
+            var implementingClass = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This interface would describe all the methods in\nits contract.", implementingClass.Description, ignoreLineEndingDifferences: true);
+
+            path = document.Paths["/inherit-only-returns"].Operations[HttpMethod.Post];
+            var inheritOnlyReturns = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This class shows hows you can \"inherit\" the doc\ncomments from one method in another method.", inheritOnlyReturns.Description, ignoreLineEndingDifferences: true);
+
+            path = document.Paths["/inherit-all-but-remarks"].Operations[HttpMethod.Post];
+            var inheritAllButRemarks = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This class shows an example of sharing comments across methods.", inheritAllButRemarks.Description);
+
+            path = document.Paths["/generic-class"].Operations[HttpMethod.Post];
+            var genericClass = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This is a generic class.", genericClass.Description);
+
+            path = document.Paths["/generic-parent"].Operations[HttpMethod.Post];
+            var genericParent = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This class validates the behavior for mapping\ngeneric types to open generics for use in\ntypeof expressions.", genericParent.Description, ignoreLineEndingDifferences: true);
+            Assert.Equal("This property is a nullable value type.", genericParent.Properties["id"].Description);
+            Assert.Equal("This property is a nullable reference type.", genericParent.Properties["name"].Description);
+            Assert.Equal("This property is a generic type containing a tuple.", genericParent.Properties["taskOfTupleProp"].Description);
+            Assert.Equal("This property is a tuple with a generic type inside.", genericParent.Properties["tupleWithGenericProp"].Description);
+            Assert.Equal("This property is a tuple with a nested generic type inside.", genericParent.Properties["tupleWithNestedGenericProp"].Description);
+
+            path = document.Paths["/params-and-param-refs"].Operations[HttpMethod.Post];
+            var paramsAndParamRefs = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This shows examples of typeparamref and typeparam tags", paramsAndParamRefs.Description);
+
+            // Test new XML property documentation behavior
+            path = document.Paths["/xml-property-test"].Operations[HttpMethod.Post];
+            var xmlPropertyTest = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This class tests different XML comment scenarios for properties.", xmlPropertyTest.Description);
+
+            // Property with only <summary> -> uses summary directly
+            Assert.Equal("A property with only summary tag.", xmlPropertyTest.Properties["summaryOnly"].Description);
+
+            // Property with only <value> -> uses value directly
+            Assert.Equal("A property with only value tag.", xmlPropertyTest.Properties["valueOnly"].Description);
+
+            // Property with both <summary> and <value> -> combines with newline separator
+            Assert.Equal($"A property with both summary and value.\nAdditional value information.", xmlPropertyTest.Properties["bothSummaryAndValue"].Description);
+
+            // Property with only <returns> -> should be null (ignored)
+            Assert.Null(xmlPropertyTest.Properties["returnsOnly"].Description);
+
+            // Property with <summary> and <returns> -> uses summary only, ignores returns
+            Assert.Equal("A property with summary and returns.", xmlPropertyTest.Properties["summaryAndReturns"].Description);
+        });
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests.csproj b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests.csproj
new file mode 100644
index 000000000000..61a22595ac54
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+    <IsShipping>false</IsShipping>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.OpenApi" />
+    <Reference Include="Verify.SourceGenerators" />
+    <Reference Include="Verify.Xunit" />
+    <Reference Include="Microsoft.AspNetCore.Mvc" />
+    <Reference Include="Microsoft.AspNetCore.OpenApi" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" IsImplicitlyDefined="true" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" IsImplicitlyDefined="true" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\gen\Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <HelixContent Include="$(MSBuildProjectDirectory)\snapshots\**"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.OpenApi" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/ModuleInitializer.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/ModuleInitializer.cs
new file mode 100644
index 000000000000..bf5defe4b9fc
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/ModuleInitializer.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+public static class ModuleInitializer
+{
+    [ModuleInitializer]
+    public static void Init() =>
+        VerifySourceGenerators.Initialize();
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/OperationTests.Controllers.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/OperationTests.Controllers.cs
new file mode 100644
index 000000000000..5e13b2a06f6b
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/OperationTests.Controllers.cs
@@ -0,0 +1,99 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+public partial class OperationTests
+{
+    [Fact]
+    public async Task SupportsXmlCommentsOnOperationsFromControllers()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services
+    .AddControllers()
+    .AddApplicationPart(typeof(TestController).Assembly)
+    .AddApplicationPart(typeof(Test2Controller).Assembly);
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapControllers();
+
+app.Run();
+
+[ApiController]
+[Route("[controller]")]
+public class TestController : ControllerBase
+{
+    /// <summary>
+    /// A summary of the action.
+    /// </summary>
+    /// <description>
+    /// A description of the action.
+    /// </description>
+    [HttpGet]
+    public string Get()
+    {
+        return "Hello, World!";
+    }
+}
+
+[ApiController]
+[Route("[controller]")]
+public class Test2Controller : ControllerBase
+{
+    /// <param name="name">The name of the person.</param>
+    /// <response code="200">Returns the greeting.</response>
+    [HttpGet]
+    public string Get(string name)
+    {
+        return $"Hello, {name}!";
+    }
+
+    /// <param name="id">The id associated with the request.</param>
+    [HttpGet("HelloByInt")]
+    public string Get(int id)
+    {
+        return $"Hello, {id}!";
+    }
+
+    /// <param name="todo">The todo to insert into the database.</param>
+    [HttpPost]
+    public string Post(Todo todo)
+    {
+        return $"Hello, {todo.Title}!";
+    }
+}
+
+public partial class Program {}
+
+public record Todo(int Id, string Title, bool Completed);
+""";
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, out var compilation);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, document =>
+        {
+            var path = document.Paths["/Test"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of the action.", path.Summary);
+            Assert.Equal("A description of the action.", path.Description);
+
+            var path2 = document.Paths["/Test2"].Operations[HttpMethod.Get];
+            Assert.Equal("The name of the person.", path2.Parameters[0].Description);
+            Assert.Equal("Returns the greeting.", path2.Responses["200"].Description);
+
+            var path2again = document.Paths["/Test2/HelloByInt"].Operations[HttpMethod.Get];
+            Assert.Equal("The id associated with the request.", path2again.Parameters[0].Description);
+
+            var path3 = document.Paths["/Test2"].Operations[HttpMethod.Post];
+            Assert.Equal("The todo to insert into the database.", path3.RequestBody.Description);
+        });
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/OperationTests.MinimalApis.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/OperationTests.MinimalApis.cs
new file mode 100644
index 000000000000..dad4380e2f9a
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/OperationTests.MinimalApis.cs
@@ -0,0 +1,533 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+[UsesVerify]
+public partial class OperationTests
+{
+    [Fact]
+    public async Task SupportsXmlCommentsOnOperationsFromMinimalApis()
+    {
+        var source = """
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapGet("/1", RouteHandlerExtensionMethods.Get);
+app.MapGet("/2", RouteHandlerExtensionMethods.Get2);
+app.MapGet("/3", RouteHandlerExtensionMethods.Get3);
+app.MapGet("/4", RouteHandlerExtensionMethods.Get4);
+app.MapGet("/5", RouteHandlerExtensionMethods.Get5);
+app.MapPost("/6", RouteHandlerExtensionMethods.Post6);
+app.MapPut("/7", RouteHandlerExtensionMethods.Put7);
+app.MapGet("/8", RouteHandlerExtensionMethods.Get8);
+app.MapGet("/9", RouteHandlerExtensionMethods.Get9);
+app.MapGet("/10", RouteHandlerExtensionMethods.Get10);
+app.MapGet("/11", RouteHandlerExtensionMethods.Get11);
+app.MapGet("/12", RouteHandlerExtensionMethods.Get12);
+app.MapGet("/13", RouteHandlerExtensionMethods.Get13);
+app.MapGet("/14", RouteHandlerExtensionMethods.Get14);
+app.MapGet("/15", RouteHandlerExtensionMethods.Get15);
+app.MapPost("/16", RouteHandlerExtensionMethods.Post16);
+app.MapGet("/17", RouteHandlerExtensionMethods.Get17);
+app.MapPost("/18", RouteHandlerExtensionMethods.Post18);
+app.MapPost("/19", RouteHandlerExtensionMethods.Post19);
+app.MapGet("/20", RouteHandlerExtensionMethods.Get20);
+app.MapGet("/21", RouteHandlerExtensionMethods.Get21);
+app.MapGet("/22", RouteHandlerExtensionMethods.Get22);
+
+app.Run();
+
+public static class RouteHandlerExtensionMethods
+{
+    /// <summary>
+    /// A summary of the action.
+    /// </summary>
+    /// <description>
+    /// A description of the action.
+    /// </description>
+    /// <returns>Returns the greeting.</returns>
+    public static string Get()
+    {
+        return "Hello, World!";
+    }
+
+    /// <param name="name">The name of the person.</param>
+    /// <response code="200">Returns the greeting.</response>
+    public static string Get2(string name)
+    {
+        return $"Hello, {name}!";
+    }
+
+    /// <param name="name" example="Testy McTester">The name of the person.</param>
+    /// <returns>Returns the greeting.</returns>
+    /// <returns>Returns a different greeting.</returns>
+    public static string Get3(string name)
+    {
+        return $"Hello, {name}!";
+    }
+
+    /// <returns>Indicates that the value was not found.</returns>
+    public static NotFound<string> Get4()
+    {
+        return TypedResults.NotFound("Not found!");
+    }
+
+    /// <returns>This gets ignored.</returns>
+    /// <response code="200">Indicates that the value is even.</response>
+    /// <response code="201">Indicates that the value is less than 50.</response>
+    /// <response code="404">Indicates that the value was not found.</response>
+    public static Results<NotFound<string>, Ok<string?>, Created> Get5()
+    {
+        var randomNumber = Random.Shared.Next();
+        if (randomNumber % 2 == 0)
+        {
+            return TypedResults.Ok("is even");
+        }
+        else if (randomNumber < 50)
+        {
+            return TypedResults.Created("is less than 50");
+        }
+        return TypedResults.NotFound("Not found!");
+    }
+
+    /// <summary>
+    /// Creates a new user.
+    /// </summary>
+    /// <remarks>
+    /// Sample request:
+    ///     POST /6
+    ///     {
+    ///         "username": "johndoe",
+    ///         "email": "john@example.com"
+    ///     }
+    /// </remarks>
+    /// <param name="user" example='{"username": "johndoe", "email": "john@example.com"}'>The user information.</param>
+    /// <response code="201">Successfully created the user.</response>
+    /// <response code="400">If the user data is invalid.</response>
+    public static IResult Post6(User user)
+    {
+        return TypedResults.Created($"/users/{user.Username}", user);
+    }
+
+    /// <summary>
+    /// Updates an existing record.
+    /// </summary>
+    /// <param name="id" deprecated="true">Legacy ID parameter - use uuid instead.</param>
+    /// <param name="uuid">Unique identifier for the record.</param>
+    /// <response code="204">Update successful.</response>
+    /// <response code="404" deprecated="true">Legacy response - will be removed.</response>
+    public static IResult Put7(int? id, string uuid)
+    {
+        return TypedResults.NoContent();
+    }
+
+    /// <summary>
+    /// A summary of Get8.
+    /// </summary>
+    public static async Task Get8()
+    {
+        await Task.Delay(1000);
+        return;
+    }
+    /// <summary>
+    /// A summary of Get9.
+    /// </summary>
+    public static async ValueTask Get9()
+    {
+        await Task.Delay(1000);
+        return;
+    }
+    /// <summary>
+    /// A summary of Get10.
+    /// </summary>
+    public static Task Get10()
+    {
+        return Task.CompletedTask;
+    }
+    /// <summary>
+    /// A summary of Get11.
+    /// </summary>
+    public static ValueTask Get11()
+    {
+        return ValueTask.CompletedTask;
+    }
+    /// <summary>
+    /// A summary of Get12.
+    /// </summary>
+    public static Task<string> Get12()
+    {
+        return Task.FromResult("Hello, World!");
+    }
+    /// <summary>
+    /// A summary of Get13.
+    /// </summary>
+    public static ValueTask<string> Get13()
+    {
+        return new ValueTask<string>("Hello, World!");
+    }
+    /// <summary>
+    /// A summary of Get14.
+    /// </summary>
+    /// <returns>Returns the greeting.</returns>
+    public static async Task<Holder<string>> Get14()
+    {
+        await Task.Delay(1000);
+        return new Holder<string> { Value = "Hello, World!" };
+    }
+    /// <summary>
+    /// A summary of Get15.
+    /// </summary>
+    /// <response code="200">Returns the greeting.</response>
+    public static Task<Holder<string>> Get15()
+    {
+        return Task.FromResult(new Holder<string> { Value = "Hello, World!" });
+    }
+
+    /// <summary>
+    /// A summary of Post16.
+    /// </summary>
+    public static void Post16(Example example)
+    {
+        return;
+    }
+
+    /// <summary>
+    /// A summary of Get17.
+    /// </summary>
+    public static int[][] Get17(int[] args)
+    {
+        return [[1, 2, 3], [4, 5, 6], [7, 8, 9], args];
+    }
+
+    /// <summary>
+    /// A summary of Post18.
+    /// </summary>
+    public static int Post18([AsParameters] FirstParameters queryParameters, [AsParameters] SecondParameters bodyParameters)
+    {
+        return 0;
+    }
+
+    /// <summary>
+    /// Tests mixed regular and AsParameters with examples.
+    /// </summary>
+    /// <param name="regularParam">A regular parameter with documentation.</param>
+    /// <param name="mixedParams">Mixed parameter class with various types.</param>
+    public static IResult Post19(string regularParam, [AsParameters] MixedParametersClass mixedParams)
+    {
+        return TypedResults.Ok($"Regular: {regularParam}, Email: {mixedParams.Email}");
+    }
+
+    /// <summary>
+    /// Tests AsParameters with different binding sources.
+    /// </summary>
+    /// <param name="bindingParams">Parameters from different sources.</param>
+    public static IResult Get20([AsParameters] BindingSourceParametersClass bindingParams)
+    {
+        return TypedResults.Ok($"Query: {bindingParams.QueryParam}, Header: {bindingParams.HeaderParam}");
+    }
+
+    /// <summary>
+    /// Tests XML documentation priority order (value > returns > summary).
+    /// </summary>
+    /// <param name="priorityParams">Parameters demonstrating XML doc priority.</param>
+    public static IResult Get21([AsParameters] XmlDocPriorityParametersClass priorityParams)
+    {
+        return TypedResults.Ok($"Processed parameters");
+    }
+
+    /// <summary>
+    /// Tests summary and value documentation priority on AsParameters properties.
+    /// </summary>
+    /// <param name="summaryValueParams">Parameters testing summary vs value priority.</param>
+    public static IResult Get22([AsParameters] SummaryValueParametersClass summaryValueParams)
+    {
+        return TypedResults.Ok($"Summary: {summaryValueParams.SummaryProperty}, Value: {summaryValueParams.ValueProperty}");
+    }
+}
+
+public class FirstParameters
+{
+    /// <summary>
+    /// The name of the person.
+    /// </summary>
+    public string? Name { get; set; }
+    /// <summary>
+    /// The age of the person.
+    /// </summary>
+    /// <example>30</example>
+    public int? Age { get; set; }
+    /// <summary>
+    /// The user information.
+    /// </summary>
+    /// <example>
+    /// {
+    ///   "username": "johndoe",
+    ///   "email": "johndoe@example.com"
+    /// }
+    /// </example>
+    public User? User { get; set; }
+}
+
+public class SecondParameters
+{
+    /// <summary>
+    /// The description of the project.
+    /// </summary>
+    public string? Description { get; set; }
+    /// <summary>
+    /// The service used for testing.
+    /// </summary>
+    [FromServices]
+    public Example Service { get; set; }
+}
+
+public class User
+{
+    public string Username { get; set; } = string.Empty;
+    public string Email { get; set; } = string.Empty;
+}
+
+public class Holder<T>
+{
+    public T Value { get; set; } = default!;
+}
+
+public class Example : Task<int>
+{
+    public Example(Func<int> function) : base(function)
+    {
+    }
+
+    public Example(Func<object?, int> function, object? state) : base(function, state)
+    {
+    }
+}
+
+public class MixedParametersClass
+{
+    /// <summary>
+    /// The user's email address.
+    /// </summary>
+    /// <example>"user@example.com"</example>
+    public string? Email { get; set; }
+
+    /// <summary>
+    /// The user's age in years.
+    /// </summary>
+    /// <example>25</example>
+    public int Age { get; set; }
+
+    /// <summary>
+    /// Whether the user is active.
+    /// </summary>
+    /// <example>true</example>
+    public bool IsActive { get; set; }
+}
+
+public class BindingSourceParametersClass
+{
+    /// <summary>
+    /// Query parameter from URL.
+    /// </summary>
+    [FromQuery]
+    public string? QueryParam { get; set; }
+
+    /// <summary>
+    /// Header value from request.
+    /// </summary>
+    [FromHeader]
+    public string? HeaderParam { get; set; }
+}
+
+public class XmlDocPriorityParametersClass
+{
+    /// <summary>
+    /// Property with only summary documentation.
+    /// </summary>
+    public string? SummaryOnlyProperty { get; set; }
+
+    /// <summary>
+    /// Property with summary documentation that should be overridden.
+    /// </summary>
+    /// <returns>Returns-based description that should take precedence over summary.</returns>
+    public string? SummaryAndReturnsProperty { get; set; }
+
+    /// <summary>
+    /// Property with all three types of documentation.
+    /// </summary>
+    /// <returns>Returns-based description that should be overridden by value.</returns>
+    /// <value>Value-based description that should take highest precedence.</value>
+    public string? AllThreeProperty { get; set; }
+
+    /// <returns>Returns-only description.</returns>
+    public string? ReturnsOnlyProperty { get; set; }
+
+    /// <value>Value-only description.</value>
+    public string? ValueOnlyProperty { get; set; }
+}
+
+public class SummaryValueParametersClass
+{
+    /// <summary>
+    /// Property with only summary documentation.
+    /// </summary>
+    public string? SummaryProperty { get; set; }
+
+    /// <summary>
+    /// Property with summary that should be overridden by value.
+    /// </summary>
+    /// <value>Value description that should take precedence over summary.</value>
+    public string? ValueProperty { get; set; }
+
+    /// <value>Property with only value documentation.</value>
+    public string? ValueOnlyProperty { get; set; }
+}
+""";
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, out var compilation);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, document =>
+        {
+            var path = document.Paths["/1"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of the action.", path.Summary);
+            Assert.Equal("A description of the action.", path.Description);
+            Assert.Equal("Returns the greeting.", path.Responses["200"].Description);
+
+            var path2 = document.Paths["/2"].Operations[HttpMethod.Get];
+            Assert.Equal("The name of the person.", path2.Parameters[0].Description);
+            Assert.Equal("Returns the greeting.", path2.Responses["200"].Description);
+
+            var path3 = document.Paths["/3"].Operations[HttpMethod.Get];
+            Assert.Equal("The name of the person.", path3.Parameters[0].Description);
+            var example = Assert.IsAssignableFrom<JsonNode>(path3.Parameters[0].Example);
+            Assert.Equal("\"Testy McTester\"", example.ToJsonString());
+            Assert.Equal("Returns the greeting.", path3.Responses["200"].Description);
+
+            var path4 = document.Paths["/4"].Operations[HttpMethod.Get];
+            var response = path4.Responses["404"];
+            Assert.Equal("Indicates that the value was not found.", response.Description);
+
+            var path5 = document.Paths["/5"].Operations[HttpMethod.Get];
+            Assert.Equal("Indicates that the value was not found.", path5.Responses["404"].Description);
+            Assert.Equal("Indicates that the value is even.", path5.Responses["200"].Description);
+            Assert.Equal("Indicates that the value is less than 50.", path5.Responses["201"].Description);
+
+            var path6 = document.Paths["/6"].Operations[HttpMethod.Post];
+            Assert.Equal("Creates a new user.", path6.Summary);
+            Assert.Contains("Sample request:", path6.Description);
+            var userParam = path6.RequestBody.Content["application/json"];
+            var userExample = Assert.IsAssignableFrom<JsonNode>(userParam.Example);
+            Assert.Equal("johndoe", userExample["username"].GetValue<string>());
+
+            var path7 = document.Paths["/7"].Operations[HttpMethod.Put];
+            var idParam = path7.Parameters.First(p => p.Name == "id");
+            Assert.True(idParam.Deprecated);
+            Assert.Equal("Legacy ID parameter - use uuid instead.", idParam.Description);
+
+            var path8 = document.Paths["/8"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get8.", path8.Summary);
+
+            var path9 = document.Paths["/9"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get9.", path9.Summary);
+
+            var path10 = document.Paths["/10"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get10.", path10.Summary);
+
+            var path11 = document.Paths["/11"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get11.", path11.Summary);
+
+            var path12 = document.Paths["/12"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get12.", path12.Summary);
+
+            var path13 = document.Paths["/13"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get13.", path13.Summary);
+
+            var path14 = document.Paths["/14"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get14.", path14.Summary);
+            Assert.Equal("Returns the greeting.", path14.Responses["200"].Description);
+
+            var path15 = document.Paths["/15"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get15.", path15.Summary);
+            Assert.Equal("Returns the greeting.", path15.Responses["200"].Description);
+
+            var path16 = document.Paths["/16"].Operations[HttpMethod.Post];
+            Assert.Equal("A summary of Post16.", path16.Summary);
+
+            var path17 = document.Paths["/17"].Operations[HttpMethod.Get];
+            Assert.Equal("A summary of Get17.", path17.Summary);
+
+            var path18 = document.Paths["/18"].Operations[HttpMethod.Post];
+            Assert.Equal("A summary of Post18.", path18.Summary);
+            Assert.Equal("The name of the person.", path18.Parameters[0].Description);
+            Assert.Equal("The age of the person.", path18.Parameters[1].Description);
+            Assert.Equal(30, path18.Parameters[1].Example.GetValue<int>());
+            Assert.Equal("The description of the project.", path18.Parameters[2].Description);
+            Assert.Equal("The user information.", path18.RequestBody.Description);
+            var path18RequestBody = path18.RequestBody.Content["application/json"];
+            var path18Example = Assert.IsAssignableFrom<JsonNode>(path18RequestBody.Example);
+            Assert.Equal("johndoe", path18Example["username"].GetValue<string>());
+            Assert.Equal("johndoe@example.com", path18Example["email"].GetValue<string>());
+
+            var path19 = document.Paths["/19"].Operations[HttpMethod.Post];
+            Assert.Equal("Tests mixed regular and AsParameters with examples.", path19.Summary);
+            Assert.Equal("A regular parameter with documentation.", path19.Parameters[0].Description);
+            Assert.Equal("The user's email address.", path19.Parameters[1].Description);
+            Assert.Equal("user@example.com", path19.Parameters[1].Example.GetValue<string>());
+            Assert.Equal("The user's age in years.", path19.Parameters[2].Description);
+            Assert.Equal(25, path19.Parameters[2].Example.GetValue<int>());
+            Assert.Equal("Whether the user is active.", path19.Parameters[3].Description);
+            Assert.True(path19.Parameters[3].Example.GetValue<bool>());
+
+            var path20 = document.Paths["/20"].Operations[HttpMethod.Get];
+            Assert.Equal("Tests AsParameters with different binding sources.", path20.Summary);
+            Assert.Equal("Query parameter from URL.", path20.Parameters[0].Description);
+            Assert.Equal("Header value from request.", path20.Parameters[1].Description);
+
+            // Test XML documentation priority order: value > returns > summary
+            var path22 = document.Paths["/21"].Operations[HttpMethod.Get];
+            // Find parameters by name for clearer assertions
+            var summaryOnlyParam = path22.Parameters.First(p => p.Name == "SummaryOnlyProperty");
+            Assert.Equal("Property with only summary documentation.", summaryOnlyParam.Description);
+
+            var summaryAndReturnsParam = path22.Parameters.First(p => p.Name == "SummaryAndReturnsProperty");
+            Assert.Equal("Property with summary documentation that should be overridden.", summaryAndReturnsParam.Description);
+
+            var allThreeParam = path22.Parameters.First(p => p.Name == "AllThreeProperty");
+            Assert.Equal($"Property with all three types of documentation.\nValue-based description that should take highest precedence.", allThreeParam.Description);
+
+            var returnsOnlyParam = path22.Parameters.First(p => p.Name == "ReturnsOnlyProperty");
+            Assert.Null(returnsOnlyParam.Description);
+
+            var valueOnlyParam = path22.Parameters.First(p => p.Name == "ValueOnlyProperty");
+            Assert.Equal("Value-only description.", valueOnlyParam.Description);
+
+            // Test summary and value documentation priority for AsParameters
+            var path23 = document.Paths["/22"].Operations[HttpMethod.Get];
+            Assert.Equal("Tests summary and value documentation priority on AsParameters properties.", path23.Summary);
+
+            var summaryParam = path23.Parameters.First(p => p.Name == "SummaryProperty");
+            Assert.Equal("Property with only summary documentation.", summaryParam.Description);
+
+            var valueParam = path23.Parameters.First(p => p.Name == "ValueProperty");
+            Assert.Equal($"Property with summary that should be overridden by value.\nValue description that should take precedence over summary.", valueParam.Description);
+
+            var valueOnlyParam2 = path23.Parameters.First(p => p.Name == "ValueOnlyProperty");
+            Assert.Equal("Property with only value documentation.", valueOnlyParam2.Description);
+        });
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/SchemaTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/SchemaTests.cs
new file mode 100644
index 000000000000..9fcd24ca2dec
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/SchemaTests.cs
@@ -0,0 +1,425 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+[UsesVerify]
+public class SchemaTests
+{
+    [Fact]
+    public async Task SupportsXmlCommentsOnSchemas()
+    {
+        var source = """
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapPost("/todo", (Todo todo) => { });
+app.MapPost("/project", (Project project) => { });
+app.MapPost("/board", (ProjectBoard.BoardItem boardItem) => { });
+app.MapPost("/protected-internal-element", (ProjectBoard.ProtectedInternalElement element) => { });
+app.MapPost("/project-record", (ProjectRecord project) => { });
+app.MapPost("/todo-with-description", (TodoWithDescription todo) => { });
+app.MapPost("/type-with-examples", (TypeWithExamples typeWithExamples) => { });
+app.MapPost("/user", (User user) => { });
+
+app.Run();
+
+/// <summary>
+/// This is a todo item.
+/// </summary>
+public class Todo
+{
+    public int Id { get; set; }
+    public string Name { get; set; }
+    public string Description { get; set; }
+}
+
+/// <summary>
+/// The project that contains <see cref="Todo"/> items.
+/// </summary>
+public record Project(string Name, string Description);
+
+public class ProjectBoard
+{
+    /// <summary>
+    /// An item on the board.
+    /// </summary>
+    public class BoardItem
+    {
+        public string Name { get; set; }
+    }
+
+    /// <summary>
+    /// No XML comment processed here.
+    /// </summary>
+    private class Element
+    {
+        /// <summary>
+        /// The unique identifier for the element.
+        /// </summary>
+        /// <remarks>
+        /// This won't be emitted since it is a public
+        /// property on a private class.
+        /// </remarks>
+        public string Name { get; set; }
+    }
+
+    /// <summary>
+    /// Can find this XML comment.
+    /// </summary>
+    protected internal class ProtectedInternalElement
+    {
+        /// <summary>
+        /// The unique identifier for the element.
+        /// </summary>
+        public string Name { get; set; }
+    }
+
+    /// <summary>
+    /// No XML comment processed here.
+    /// </summary>
+    protected class ProtectedElement
+    {
+        /// <summary>
+        /// The unique identifier for the element.
+        /// </summary>
+        public string Name { get; set; }
+    }
+}
+
+/// <summary>
+/// The project that contains <see cref="Todo"/> items.
+/// </summary>
+/// <param name="Name">The name of the project.</param>
+/// <param name="Description">The description of the project.</param>
+public record ProjectRecord(string Name, string Description);
+
+public class TodoWithDescription
+{
+    /// <summary>
+    /// The identifier of the todo.
+    /// </summary>
+    public int Id { get; set; }
+    /// <value>
+    /// The name of the todo.
+    /// </value>
+    public string Name { get; set; }
+    /// <summary>
+    /// A description of the the todo.
+    /// </summary>
+    /// <value>Another description of the todo.</value>
+    public string Description { get; set; }
+}
+
+public class TypeWithExamples
+{
+    /// <example>true</example>
+    public bool BooleanType { get; set; }
+    /// <example>42</example>
+    public int IntegerType { get; set; }
+    /// <example>1234567890123456789</example>
+    public long LongType { get; set; }
+    /// <example>3.14</example>
+    public double DoubleType { get; set; }
+    /// <example>3.14</example>
+    public float FloatType { get; set; }
+    /// <example>2022-01-01T00:00:00Z</example>
+    public DateTime DateTimeType { get; set; }
+    /// <example>2022-01-01</example>
+    public DateOnly DateOnlyType { get; set; }
+    /// <example>Hello, World!</example>
+    public string StringType { get; set; }
+    /// <example>2d8f1eac-b5c6-4e29-8c62-4d9d75ef3d3d</example>
+    public Guid GuidType { get; set; }
+    /// <example>12:30:45</example>
+    public TimeOnly TimeOnlyType { get; set; }
+    /// <example>P3DT4H5M</example>
+    public TimeSpan TimeSpanType { get; set; }
+    /// <example>255</example>
+    public byte ByteType { get; set; }
+    /// <example>3.14159265359</example>
+    public decimal DecimalType { get; set; }
+    /// <example>https://example.com</example>
+    public Uri UriType { get; set; }
+}
+
+public interface IUser
+{
+    /// <summary>
+    /// The unique identifier for the user.
+    /// </summary>
+    int Id { get; set; }
+
+    /// <summary>
+    /// The user's display name.
+    /// </summary>
+    string Name { get; set; }
+}
+
+/// <inheritdoc/>
+internal class User : IUser
+{
+    /// <inheritdoc/>
+    public int Id { get; set; }
+
+    /// <inheritdoc/>
+    public string Name { get; set; }
+}
+
+""";
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, out var compilation);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, document =>
+        {
+            var path = document.Paths["/todo"].Operations[HttpMethod.Post];
+            var todo = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("This is a todo item.", todo.Description);
+
+            path = document.Paths["/project"].Operations[HttpMethod.Post];
+            var project = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("The project that contains Todo items.", project.Description);
+
+            path = document.Paths["/board"].Operations[HttpMethod.Post];
+            var board = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("An item on the board.", board.Description);
+
+            path = document.Paths["/protected-internal-element"].Operations[HttpMethod.Post];
+            var element = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("The unique identifier for the element.", element.Properties["name"].Description);
+            Assert.Equal("Can find this XML comment.", element.Description);
+
+            path = document.Paths["/project-record"].Operations[HttpMethod.Post];
+            project = path.RequestBody.Content["application/json"].Schema;
+
+            Assert.Equal("The name of the project.", project.Properties["name"].Description);
+            Assert.Equal("The description of the project.", project.Properties["description"].Description);
+
+            path = document.Paths["/todo-with-description"].Operations[HttpMethod.Post];
+            todo = path.RequestBody.Content["application/json"].Schema;
+            // Test different XML comment scenarios for properties:
+            // Id: only <summary> tag -> uses summary directly
+            Assert.Equal("The identifier of the todo.", todo.Properties["id"].Description);
+            // Name: only <value> tag -> uses value directly
+            Assert.Equal("The name of the todo.", todo.Properties["name"].Description);
+            // Description: both <summary> and <value> tags -> combines with newline separator
+            Assert.Equal($"A description of the the todo.\nAnother description of the todo.", todo.Properties["description"].Description);
+
+            path = document.Paths["/type-with-examples"].Operations[HttpMethod.Post];
+            var typeWithExamples = path.RequestBody.Content["application/json"].Schema;
+
+            var booleanTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["booleanType"].Example);
+            Assert.True(booleanTypeExample.GetValue<bool>());
+
+            var integerTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["integerType"].Example);
+            Assert.Equal(42, integerTypeExample.GetValue<int>());
+
+            var longTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["longType"].Example);
+            Assert.Equal(1234567890123456789, longTypeExample.GetValue<long>());
+
+            var doubleTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["doubleType"].Example);
+            Assert.Equal(3.14, doubleTypeExample.GetValue<double>());
+
+            var floatTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["floatType"].Example);
+            Assert.Equal(3.14f, floatTypeExample.GetValue<float>());
+
+            var dateTimeTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["dateTimeType"].Example);
+            Assert.Equal(new DateTime(2022, 01, 01), dateTimeTypeExample.GetValue<DateTime>());
+
+            var dateOnlyTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["dateOnlyType"].Example);
+            Assert.Equal("2022-01-01", dateOnlyTypeExample.GetValue<string>());
+
+            var stringTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["stringType"].Example);
+            Assert.Equal("Hello, World!", stringTypeExample.GetValue<string>());
+
+            var guidTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["guidType"].Example);
+            Assert.Equal("2d8f1eac-b5c6-4e29-8c62-4d9d75ef3d3d", guidTypeExample.GetValue<string>());
+
+            var byteTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["byteType"].Example);
+            Assert.Equal(255, byteTypeExample.GetValue<int>());
+
+            var timeOnlyTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["timeOnlyType"].Example);
+            Assert.Equal("12:30:45", timeOnlyTypeExample.GetValue<string>());
+
+            var timeSpanTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["timeSpanType"].Example);
+            Assert.Equal("P3DT4H5M", timeSpanTypeExample.GetValue<string>());
+
+            var decimalTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["decimalType"].Example);
+            Assert.Equal(3.14159265359m, decimalTypeExample.GetValue<decimal>());
+
+            var uriTypeExample = Assert.IsAssignableFrom<JsonNode>(typeWithExamples.Properties["uriType"].Example);
+            Assert.Equal("https://example.com", uriTypeExample.GetValue<string>());
+
+            path = document.Paths["/user"].Operations[HttpMethod.Post];
+            var user = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("The unique identifier for the user.", user.Properties["id"].Description);
+            Assert.Equal("The user's display name.", user.Properties["name"].Description);
+        });
+    }
+
+    [Fact]
+    public async Task XmlCommentsOnPropertiesShouldApplyToSchemaReferences()
+    {
+        var source = """
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddOpenApi(options => {
+    var prevCreateSchemaReferenceId = options.CreateSchemaReferenceId;
+    options.CreateSchemaReferenceId = (x) => x.Type == typeof(ModelInline) ? null : prevCreateSchemaReferenceId(x);
+});
+
+var app = builder.Build();
+
+app.MapPost("/example", (RootModel model) => { });
+
+app.Run();
+
+/// <summary>
+/// Comment on class ModelWithSummary.
+/// </summary>
+/// <example>
+/// { "street": "ModelWithSummaryClass" }
+/// </example>
+public class ModelWithSummary
+{
+    public string Street { get; set; }
+}
+
+public class ModelWithoutSummary
+{
+    public string Street { get; set; }
+}
+
+/// <summary>
+/// Comment on class ModelInline.
+/// </summary>
+/// <example>
+/// { "street": "ModelInlineClass" }
+/// </example>
+public class ModelInline
+{
+    public string Street { get; set; }
+}
+
+/// <summary>
+/// Comment on class RootModel.
+/// </summary>
+/// <example>
+/// { }
+/// </example>
+public class RootModel
+{
+    public ModelWithSummary NoPropertyComment { get; set; }
+
+    /// <summary>
+    /// Comment on property ModelWithSummary1.
+    /// </summary>
+    /// <example>
+    /// { "street": "ModelWithSummary1Prop" }
+    /// </example>
+    public ModelWithSummary ModelWithSummary1 { get; set; }
+
+    /// <summary>
+    /// Comment on property ModelWithSummary2.
+    /// </summary>
+    /// <example>
+    /// { "street": "ModelWithSummary2Prop" }
+    /// </example>
+    public ModelWithSummary ModelWithSummary2 { get; set; }
+
+    /// <summary>
+    /// Comment on property ModelWithoutSummary1.
+    /// </summary>
+    /// <example>
+    /// { "street": "ModelWithoutSummary1Prop" }
+    /// </example>
+    public ModelWithoutSummary ModelWithoutSummary1 { get; set; }
+
+    /// <summary>
+    /// Comment on property ModelWithoutSummary2.
+    /// </summary>
+    /// <example>
+    /// { "street": "ModelWithoutSummary2Prop" }
+    /// </example>
+    public ModelWithoutSummary ModelWithoutSummary2 { get; set; }
+
+    /// <summary>
+    /// Comment on property ModelInline1.
+    /// </summary>
+    /// <example>
+    /// { "street": "ModelInline1Prop" }
+    /// </example>
+    public ModelInline ModelInline1 { get; set; }
+
+    /// <summary>
+    /// Comment on property ModelInline2.
+    /// </summary>
+    /// <example>
+    /// { "street": "ModelInline2Prop" }
+    /// </example>
+    public ModelInline ModelInline2 { get; set; }
+}
+""";
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, out var compilation);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, document =>
+        {
+            var path = document.Paths["/example"].Operations[HttpMethod.Post];
+            var exampleOperationBodySchema = path.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("Comment on class RootModel.", exampleOperationBodySchema.Description);
+
+            var rootModelSchema = document.Components.Schemas["RootModel"];
+            Assert.Equal("Comment on class RootModel.", rootModelSchema.Description);
+
+            var modelWithSummary = document.Components.Schemas["ModelWithSummary"];
+            Assert.Equal("Comment on class ModelWithSummary.", modelWithSummary.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelWithSummaryClass" }"""), modelWithSummary.Example));
+
+            var modelWithoutSummary = document.Components.Schemas["ModelWithoutSummary"];
+            Assert.Null(modelWithoutSummary.Description);
+
+            Assert.DoesNotContain("ModelInline", document.Components.Schemas.Keys);
+
+            // Check RootModel properties
+            var noPropertyCommentProp = Assert.IsType<OpenApiSchemaReference>(rootModelSchema.Properties["noPropertyComment"]);
+            Assert.Null(noPropertyCommentProp.Reference.Description);
+
+            var modelWithSummary1Prop = Assert.IsType<OpenApiSchemaReference>(rootModelSchema.Properties["modelWithSummary1"]);
+            Assert.Equal("Comment on property ModelWithSummary1.", modelWithSummary1Prop.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelWithSummary1Prop" }"""), modelWithSummary1Prop.Examples[0]));
+
+            var modelWithSummary2Prop = Assert.IsType<OpenApiSchemaReference>(rootModelSchema.Properties["modelWithSummary2"]);
+            Assert.Equal("Comment on property ModelWithSummary2.", modelWithSummary2Prop.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelWithSummary2Prop" }"""), modelWithSummary2Prop.Examples[0]));
+
+            var modelWithoutSummary1Prop = Assert.IsType<OpenApiSchemaReference>(rootModelSchema.Properties["modelWithoutSummary1"]);
+            Assert.Equal("Comment on property ModelWithoutSummary1.", modelWithoutSummary1Prop.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelWithoutSummary1Prop" }"""), modelWithoutSummary1Prop.Examples[0]));
+
+            var modelWithoutSummary2Prop = Assert.IsType<OpenApiSchemaReference>(rootModelSchema.Properties["modelWithoutSummary2"]);
+            Assert.Equal("Comment on property ModelWithoutSummary2.", modelWithoutSummary2Prop.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelWithoutSummary2Prop" }"""), modelWithoutSummary2Prop.Examples[0]));
+
+            var modelInline1Prop = Assert.IsType<OpenApiSchema>(rootModelSchema.Properties["modelInline1"]);
+            Assert.Equal("Comment on property ModelInline1.", modelInline1Prop.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelInline1Prop" }"""), modelInline1Prop.Example));
+
+            var modelInline2Prop = Assert.IsType<OpenApiSchema>(rootModelSchema.Properties["modelInline2"]);
+            Assert.Equal("Comment on property ModelInline2.", modelInline2Prop.Description);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("""{ "street": "ModelInline2Prop" }"""), modelInline2Prop.Example));
+        });
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/SnapshotTestHelper.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/SnapshotTestHelper.cs
new file mode 100644
index 000000000000..4693176aedc3
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/SnapshotTestHelper.cs
@@ -0,0 +1,569 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.Loader;
+using System.Text;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+[UsesVerify]
+public static partial class SnapshotTestHelper
+{
+    [GeneratedRegex(@"\[global::System\.Runtime\.CompilerServices\.InterceptsLocationAttribute\([^)]*\)\]")]
+    private static partial Regex InterceptsLocationRegex();
+
+    private static readonly CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview)
+        .WithFeatures([new KeyValuePair<string, string>("InterceptorsNamespaces", "Microsoft.AspNetCore.OpenApi.Generated")]);
+
+    public static Task Verify(string source, IIncrementalGenerator generator, out Compilation compilation)
+        => Verify(source, generator, [], out compilation, out _);
+
+    public static Task Verify(string source, IIncrementalGenerator generator, Dictionary<string, List<string>> classLibrarySources, out Compilation compilation, out List<byte[]> generatedAssemblies)
+    {
+        var references = AppDomain.CurrentDomain.GetAssemblies()
+                .Where(assembly => !assembly.IsDynamic && !string.IsNullOrWhiteSpace(assembly.Location))
+                .Select(assembly => MetadataReference.CreateFromFile(assembly.Location))
+                .Concat(
+                [
+                    MetadataReference.CreateFromFile(typeof(Builder.WebApplicationBuilder).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(OpenApiOptions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Builder.EndpointRouteBuilderExtensions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Builder.IApplicationBuilder).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Mvc.ApiExplorer.IApiDescriptionProvider).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Mvc.ControllerBase).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(MvcServiceCollectionExtensions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(MvcCoreMvcBuilderExtensions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Http.TypedResults).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(System.Text.Json.Nodes.JsonArray).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Console).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Uri).Assembly.Location),
+                ])
+                .ToList();
+
+        var additionalTexts = new List<AdditionalText>();
+        generatedAssemblies = [];
+
+        foreach (var classLibrary in classLibrarySources)
+        {
+            var classLibraryCompilation = CSharpCompilation.Create(classLibrary.Key,
+                classLibrary.Value.Select((source, index) => CSharpSyntaxTree.ParseText(source, options: ParseOptions, path: $"{classLibrary.Key}-{index}.cs")),
+                references,
+                new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+
+            var ms = new MemoryStream();
+            using var xmlStream = new MemoryStream();
+            var emitResult = classLibraryCompilation.Emit(ms, xmlDocumentationStream: xmlStream);
+
+            if (!emitResult.Success)
+            {
+                throw new InvalidOperationException($"Failed to compile class library {classLibrary.Key}: {string.Join(Environment.NewLine, emitResult.Diagnostics)}");
+            }
+
+            ms.Seek(0, SeekOrigin.Begin);
+            xmlStream.Seek(0, SeekOrigin.Begin);
+
+            var assembly = ms.ToArray();
+            generatedAssemblies.Add(assembly);
+            references.Add(MetadataReference.CreateFromImage(assembly));
+
+            var xmlText = Encoding.UTF8.GetString(xmlStream.ToArray());
+            additionalTexts.Add(new TestAdditionalText($"{classLibrary.Key}.xml", xmlText));
+        }
+
+        var inputCompilation = CSharpCompilation.Create("OpenApiXmlCommentGeneratorSample",
+            [CSharpSyntaxTree.ParseText(source, options: ParseOptions, path: "Program.cs")],
+            references,
+            new CSharpCompilationOptions(OutputKind.ConsoleApplication));
+
+        var driver = CSharpGeneratorDriver.Create(
+            generators: [generator.AsSourceGenerator()],
+            additionalTexts: additionalTexts,
+            parseOptions: ParseOptions);
+
+        return Verifier
+            .Verify(driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out compilation, out var diagnostics))
+            .ScrubLinesWithReplace(line => InterceptsLocationRegex().Replace(line, "[InterceptsLocation]"))
+            .UseDirectory(SkipOnHelixAttribute.OnHelix()
+                ? Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "snapshots")
+                : "snapshots");
+    }
+
+    public static async Task VerifyOpenApi(Compilation compilation, Action<OpenApiDocument> verifyFunc)
+        => await VerifyOpenApi(compilation, [], verifyFunc);
+
+    public static async Task VerifyOpenApi(Compilation compilation, List<byte[]> generatedAssemblies, Action<OpenApiDocument> verifyFunc)
+    {
+        var assemblyName = compilation.AssemblyName;
+        var symbolsName = Path.ChangeExtension(assemblyName, "pdb");
+
+        var output = new MemoryStream();
+        var pdb = new MemoryStream();
+
+        var emitOptions = new EmitOptions(
+            debugInformationFormat: DebugInformationFormat.PortablePdb,
+            pdbFilePath: symbolsName,
+            outputNameOverride: $"TestProject-{Guid.NewGuid()}");
+
+        var embeddedTexts = new List<EmbeddedText>();
+
+        foreach (var syntaxTree in compilation.SyntaxTrees)
+        {
+            var text = syntaxTree.GetText();
+            var encoding = text.Encoding ?? Encoding.UTF8;
+            var buffer = encoding.GetBytes(text.ToString());
+            var sourceText = SourceText.From(buffer, buffer.Length, encoding, canBeEmbedded: true);
+
+            var syntaxRootNode = (CSharpSyntaxNode)syntaxTree.GetRoot();
+            var newSyntaxTree = CSharpSyntaxTree.Create(syntaxRootNode, options: ParseOptions, encoding: encoding, path: syntaxTree.FilePath);
+
+            compilation = compilation.ReplaceSyntaxTree(syntaxTree, newSyntaxTree);
+
+            embeddedTexts.Add(EmbeddedText.FromSource(syntaxTree.FilePath, sourceText));
+        }
+
+        var result = compilation.Emit(output, pdb, options: emitOptions, embeddedTexts: embeddedTexts);
+
+        Assert.Empty(result.Diagnostics.Where(d => d.Severity > DiagnosticSeverity.Warning));
+        Assert.True(result.Success);
+
+        output.Position = 0;
+        pdb.Position = 0;
+
+        var assembly = AssemblyLoadContext.Default.LoadFromStream(output, pdb);
+        foreach (var generatedAssembly in generatedAssemblies)
+        {
+            AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(generatedAssembly));
+        }
+
+        void ConfigureHostBuilder(object hostBuilder)
+        {
+            ((IHostBuilder)hostBuilder).ConfigureServices((context, services) =>
+            {
+                services.AddSingleton<IServer, NoopServer>();
+                services.AddSingleton<IHostLifetime, NoopHostLifetime>();
+            });
+        }
+
+        var waitForStartTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+        void OnEntryPointExit(Exception exception)
+        {
+            // If the entry point exited, we'll try to complete the wait
+            if (exception != null)
+            {
+                waitForStartTcs.TrySetException(exception);
+            }
+            else
+            {
+                waitForStartTcs.TrySetResult(0);
+            }
+        }
+
+        var factory = HostFactoryResolver.ResolveHostFactory(assembly,
+            stopApplication: false,
+            configureHostBuilder: ConfigureHostBuilder,
+            entrypointCompleted: OnEntryPointExit);
+
+        if (factory == null)
+        {
+            return;
+        }
+
+        var services = ((IHost)factory([$"--{HostDefaults.ApplicationKey}={assemblyName}"])).Services;
+
+        var applicationLifetime = services.GetRequiredService<IHostApplicationLifetime>();
+        using (var registration = applicationLifetime.ApplicationStarted.Register(() => waitForStartTcs.TrySetResult(0)))
+        {
+            waitForStartTcs.Task.Wait();
+            var targetAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => assembly.GetName().Name == "Microsoft.AspNetCore.OpenApi");
+            var serviceType = targetAssembly.GetType("Microsoft.Extensions.ApiDescriptions.IDocumentProvider", throwOnError: false);
+
+            if (serviceType == null)
+            {
+                return;
+            }
+
+            var service = services.GetService(serviceType) ?? throw new InvalidOperationException("Could not resolve IDocumentProvider service.");
+            using var stream = new MemoryStream();
+            using var writer = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture) { AutoFlush = true };
+            var targetMethod = serviceType.GetMethod("GenerateAsync", [typeof(string), typeof(TextWriter)]) ?? throw new InvalidOperationException("Could not resolve GenerateAsync method.");
+            targetMethod.Invoke(service, ["v1", writer]);
+            stream.Position = 0;
+            var (document, _) = await OpenApiDocument.LoadAsync(stream, "json");
+            verifyFunc(document);
+        }
+    }
+
+    private sealed class NoopHostLifetime : IHostLifetime
+    {
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+        public Task WaitForStartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+    private sealed class NoopServer : IServer
+    {
+        public IFeatureCollection Features { get; } = new FeatureCollection();
+        public void Dispose() { }
+        public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken) where TContext : notnull => Task.CompletedTask;
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+    private sealed class HostFactoryResolver
+    {
+        private const BindingFlags DeclaredOnlyLookup = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+        public const string BuildWebHost = nameof(BuildWebHost);
+        public const string CreateWebHostBuilder = nameof(CreateWebHostBuilder);
+        public const string CreateHostBuilder = nameof(CreateHostBuilder);
+        private const string TimeoutEnvironmentKey = "DOTNET_HOST_FACTORY_RESOLVER_DEFAULT_TIMEOUT_IN_SECONDS";
+
+        // The amount of time we wait for the diagnostic source events to fire
+        private static readonly TimeSpan s_defaultWaitTimeout = SetupDefaultTimeout();
+
+        private static TimeSpan SetupDefaultTimeout()
+        {
+            if (Debugger.IsAttached)
+            {
+                return Timeout.InfiniteTimeSpan;
+            }
+
+            if (uint.TryParse(Environment.GetEnvironmentVariable(TimeoutEnvironmentKey), out uint timeoutInSeconds))
+            {
+                return TimeSpan.FromSeconds((int)timeoutInSeconds);
+            }
+
+            return TimeSpan.FromMinutes(5);
+        }
+
+        public static Func<string[], TWebHost> ResolveWebHostFactory<TWebHost>(Assembly assembly)
+        {
+            return ResolveFactory<TWebHost>(assembly, BuildWebHost);
+        }
+
+        public static Func<string[], TWebHostBuilder> ResolveWebHostBuilderFactory<TWebHostBuilder>(Assembly assembly)
+        {
+            return ResolveFactory<TWebHostBuilder>(assembly, CreateWebHostBuilder);
+        }
+
+        public static Func<string[], THostBuilder> ResolveHostBuilderFactory<THostBuilder>(Assembly assembly)
+        {
+            return ResolveFactory<THostBuilder>(assembly, CreateHostBuilder);
+        }
+
+        // This helpers encapsulates all of the complex logic required to:
+        // 1. Execute the entry point of the specified assembly in a different thread.
+        // 2. Wait for the diagnostic source events to fire
+        // 3. Give the caller a chance to execute logic to mutate the IHostBuilder
+        // 4. Resolve the instance of the applications's IHost
+        // 5. Allow the caller to determine if the entry point has completed
+        public static Func<string[], object> ResolveHostFactory(Assembly assembly,
+                                                                 TimeSpan waitTimeout = default,
+                                                                 bool stopApplication = true,
+                                                                 Action<object> configureHostBuilder = null,
+                                                                 Action<Exception> entrypointCompleted = null)
+        {
+            if (assembly.EntryPoint is null)
+            {
+                return null;
+            }
+
+            return args => new HostingListener(args, assembly.EntryPoint, waitTimeout == default ? s_defaultWaitTimeout : waitTimeout, stopApplication, configureHostBuilder, entrypointCompleted).CreateHost();
+        }
+
+        private static Func<string[], T> ResolveFactory<T>(Assembly assembly, string name)
+        {
+            var programType = assembly.EntryPoint.DeclaringType;
+            if (programType == null)
+            {
+                return null;
+            }
+
+            var factory = programType.GetMethod(name, DeclaredOnlyLookup);
+            if (!IsFactory<T>(factory))
+            {
+                return null;
+            }
+
+            return args => (T)factory!.Invoke(null, [args])!;
+        }
+
+        // TReturn Factory(string[] args);
+        private static bool IsFactory<TReturn>(MethodInfo factory)
+        {
+            return factory != null
+                && typeof(TReturn).IsAssignableFrom(factory.ReturnType)
+                && factory.GetParameters().Length == 1
+                && typeof(string[]).Equals(factory.GetParameters()[0].ParameterType);
+        }
+
+        // Used by EF tooling without any Hosting references. Looses some return type safety checks.
+        public static Func<string[], IServiceProvider> ResolveServiceProviderFactory(Assembly assembly, TimeSpan waitTimeout = default)
+        {
+            // Prefer the older patterns by default for back compat.
+            var webHostFactory = ResolveWebHostFactory<object>(assembly);
+            if (webHostFactory != null)
+            {
+                return args =>
+                {
+                    var webHost = webHostFactory(args);
+                    return GetServiceProvider(webHost);
+                };
+            }
+
+            var webHostBuilderFactory = ResolveWebHostBuilderFactory<object>(assembly);
+            if (webHostBuilderFactory != null)
+            {
+                return args =>
+                {
+                    var webHostBuilder = webHostBuilderFactory(args);
+                    var webHost = Build(webHostBuilder);
+                    return GetServiceProvider(webHost);
+                };
+            }
+
+            var hostBuilderFactory = ResolveHostBuilderFactory<object>(assembly);
+            if (hostBuilderFactory != null)
+            {
+                return args =>
+                {
+                    var hostBuilder = hostBuilderFactory(args);
+                    var host = Build(hostBuilder);
+                    return GetServiceProvider(host);
+                };
+            }
+
+            var hostFactory = ResolveHostFactory(assembly, waitTimeout: waitTimeout);
+            if (hostFactory != null)
+            {
+                return args =>
+                {
+                    static bool IsApplicationNameArg(string arg)
+                        => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) ||
+                            arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase);
+
+                    if (!args.Any(arg => IsApplicationNameArg(arg)) && assembly.GetName().Name is string assemblyName)
+                    {
+                        args = [.. args, .. new[] { "--applicationName", assemblyName }];
+                    }
+
+                    var host = hostFactory(args);
+                    return GetServiceProvider(host);
+                };
+            }
+
+            return null;
+        }
+
+        private static object Build(object builder)
+        {
+            var buildMethod = builder.GetType().GetMethod("Build");
+            return buildMethod.Invoke(builder, []);
+        }
+
+        private static IServiceProvider GetServiceProvider(object host)
+        {
+            if (host == null)
+            {
+                return null;
+            }
+            var hostType = host.GetType();
+            var servicesProperty = hostType.GetProperty("Services", DeclaredOnlyLookup);
+            return (IServiceProvider)servicesProperty.GetValue(host);
+        }
+
+        private sealed class HostingListener : IObserver<DiagnosticListener>, IObserver<KeyValuePair<string, object>>
+        {
+            private readonly string[] _args;
+            private readonly MethodInfo _entryPoint;
+            private readonly TimeSpan _waitTimeout;
+            private readonly bool _stopApplication;
+
+            private readonly TaskCompletionSource<object> _hostTcs = new();
+            private IDisposable _disposable;
+            private readonly Action<object> _configure;
+            private readonly Action<Exception> _entrypointCompleted;
+            private static readonly AsyncLocal<HostingListener> _currentListener = new();
+
+            public HostingListener(string[] args, MethodInfo entryPoint, TimeSpan waitTimeout, bool stopApplication, Action<object> configure, Action<Exception> entrypointCompleted)
+            {
+                _args = args;
+                _entryPoint = entryPoint;
+                _waitTimeout = waitTimeout;
+                _stopApplication = stopApplication;
+                _configure = configure;
+                _entrypointCompleted = entrypointCompleted;
+            }
+
+            public object CreateHost()
+            {
+                using var subscription = DiagnosticListener.AllListeners.Subscribe(this);
+
+                // Kick off the entry point on a new thread so we don't block the current one
+                // in case we need to timeout the execution
+                var thread = new Thread(() =>
+                {
+                    Exception exception = null;
+
+                    try
+                    {
+                        // Set the async local to the instance of the HostingListener so we can filter events that
+                        // aren't scoped to this execution of the entry point.
+                        _currentListener.Value = this;
+
+                        var parameters = _entryPoint.GetParameters();
+                        if (parameters.Length == 0)
+                        {
+                            _entryPoint.Invoke(null, []);
+                        }
+                        else
+                        {
+                            _entryPoint.Invoke(null, new object[] { _args });
+                        }
+
+                        // Try to set an exception if the entry point returns gracefully, this will force
+                        // build to throw
+                        _hostTcs.TrySetException(new InvalidOperationException("The entry point exited without ever building an IHost."));
+                    }
+                    catch (TargetInvocationException tie) when (tie.InnerException.GetType().Name == "HostAbortedException")
+                    {
+                        // The host was stopped by our own logic
+                    }
+                    catch (TargetInvocationException tie)
+                    {
+                        exception = tie.InnerException ?? tie;
+
+                        // Another exception happened, propagate that to the caller
+                        _hostTcs.TrySetException(exception);
+                    }
+                    catch (Exception ex)
+                    {
+                        exception = ex;
+
+                        // Another exception happened, propagate that to the caller
+                        _hostTcs.TrySetException(ex);
+                    }
+                    finally
+                    {
+                        // Signal that the entry point is completed
+                        _entrypointCompleted.Invoke(exception);
+                    }
+                })
+                {
+                    // Make sure this doesn't hang the process
+                    IsBackground = true
+                };
+
+                // Start the thread
+                thread.Start();
+
+                try
+                {
+                    // Wait before throwing an exception
+                    if (!_hostTcs.Task.Wait(_waitTimeout))
+                    {
+                        throw new InvalidOperationException($"Timed out waiting for the entry point to build the IHost after {s_defaultWaitTimeout}. This timeout can be modified using the '{TimeoutEnvironmentKey}' environment variable.");
+                    }
+                }
+                catch (AggregateException) when (_hostTcs.Task.IsCompleted)
+                {
+                    // Lets this propagate out of the call to GetAwaiter().GetResult()
+                }
+
+                Debug.Assert(_hostTcs.Task.IsCompleted);
+
+                return _hostTcs.Task.GetAwaiter().GetResult();
+            }
+
+            public void OnCompleted()
+            {
+                _disposable.Dispose();
+            }
+
+            public void OnError(Exception error)
+            {
+
+            }
+
+            public void OnNext(DiagnosticListener value)
+            {
+                if (_currentListener.Value != this)
+                {
+                    // Ignore events that aren't for this listener
+                    return;
+                }
+
+                if (value.Name == "Microsoft.Extensions.Hosting")
+                {
+                    _disposable = value.Subscribe(this);
+                }
+            }
+
+            public void OnNext(KeyValuePair<string, object> value)
+            {
+                if (_currentListener.Value != this)
+                {
+                    // Ignore events that aren't for this listener
+                    return;
+                }
+
+                if (value.Key == "HostBuilding")
+                {
+                    _configure.Invoke(value.Value!);
+                }
+
+                if (value.Key == "HostBuilt")
+                {
+                    _hostTcs.TrySetResult(value.Value!);
+
+                    if (_stopApplication)
+                    {
+                        // Stop the host from running further
+                        ThrowHostAborted();
+                    }
+                }
+            }
+
+            // HostFactoryResolver is used by tools that explicitly don't want to reference Microsoft.Extensions.Hosting assemblies.
+            // So don't depend on the public HostAbortedException directly. Instead, load the exception type dynamically if it can
+            // be found. If it can't (possibly because the app is using an older version), throw a private exception with the same name.
+            private static void ThrowHostAborted()
+            {
+                var publicHostAbortedExceptionType = Type.GetType("Microsoft.Extensions.Hosting.HostAbortedException, Microsoft.Extensions.Hosting.Abstractions", throwOnError: false);
+                if (publicHostAbortedExceptionType != null)
+                {
+                    throw (Exception)Activator.CreateInstance(publicHostAbortedExceptionType)!;
+                }
+                else
+                {
+                    throw new HostAbortedException();
+                }
+            }
+
+            private sealed class HostAbortedException : Exception
+            {
+            }
+        }
+    }
+
+    private class TestAdditionalText(string path, string text) : AdditionalText
+    {
+        public override string Path => path;
+
+        public override SourceText GetText(CancellationToken cancellationToken = default)
+        {
+            return SourceText.From(text, Encoding.UTF8);
+        }
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/XmlCommentDocumentationIdTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/XmlCommentDocumentationIdTests.cs
new file mode 100644
index 000000000000..fbf42c1e5092
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/XmlCommentDocumentationIdTests.cs
@@ -0,0 +1,90 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests;
+
+[UsesVerify]
+public class XmlCommentDocumentationIdTests
+{
+    [Fact]
+    public async Task CanMergeXmlCommentsWithDifferentDocumentationIdFormats()
+    {
+        // This test verifies that XML comments from referenced assemblies (without return type suffix)
+        // are properly merged with in-memory symbols (with return type suffix)
+        var source = """
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using ReferencedLibrary;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapPost("/test-method", ReferencedLibrary.TestApi.TestMethod);
+
+app.Run();
+""";
+
+        var referencedLibrarySource = """
+using System;
+using System.Threading.Tasks;
+
+namespace ReferencedLibrary;
+
+public static class TestApi
+{
+    /// <summary>
+    /// This method should have its XML comment merged properly.
+    /// </summary>
+    /// <param name="id">The identifier for the test.</param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    public static Task TestMethod(int id)
+    {
+        return Task.CompletedTask;
+    }
+}
+""";
+
+        var references = new Dictionary<string, List<string>>
+        {
+            { "ReferencedLibrary", [referencedLibrarySource] }
+        };
+
+        var generator = new XmlCommentGenerator();
+        await SnapshotTestHelper.Verify(source, generator, references, out var compilation, out var additionalAssemblies);
+        await SnapshotTestHelper.VerifyOpenApi(compilation, additionalAssemblies, document =>
+        {
+            var path = document.Paths["/test-method"].Operations[HttpMethod.Post];
+            
+            // Verify that the XML comment from the referenced library was properly merged
+            // This would fail before the fix because the documentation IDs didn't match
+            Assert.NotNull(path.Summary);
+            Assert.Equal("This method should have its XML comment merged properly.", path.Summary);
+            
+            // Verify the parameter comment is also available
+            Assert.NotNull(path.Parameters);
+            Assert.Single(path.Parameters);
+            Assert.Equal("The identifier for the test.", path.Parameters[0].Description);
+        });
+    }
+
+    [Theory]
+    [InlineData("M:Sample.MyMethod(System.Int32)~System.Threading.Tasks.Task", "M:Sample.MyMethod(System.Int32)")]
+    [InlineData("M:Sample.MyMethod(System.Int32)", "M:Sample.MyMethod(System.Int32)")]
+    [InlineData("M:Sample.op_Implicit(System.Int32)~Sample.MyClass", "M:Sample.op_Implicit(System.Int32)~Sample.MyClass")]
+    [InlineData("M:Sample.op_Explicit(System.Int32)~Sample.MyClass", "M:Sample.op_Explicit(System.Int32)~Sample.MyClass")]
+    [InlineData("T:Sample.MyClass", "T:Sample.MyClass")]
+    [InlineData("P:Sample.MyClass.MyProperty", "P:Sample.MyClass.MyProperty")]
+    public void NormalizeDocId_ReturnsExpectedResult(string input, string expected)
+    {
+        var result = XmlCommentGenerator.NormalizeDocId(input);
+        Assert.Equal(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..ce2763fd112a
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,640 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, string documentName)
+        {
+            return services.AddOpenApi(documentName, options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+        
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, Action<OpenApiOptions> configureOptions)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                configureOptions(options);
+            });
+        }
+        [InterceptsLocation]
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, string documentName, Action<OpenApiOptions> configureOptions)
+        {
+            // This overload is not intercepted.
+            return OpenApiServiceCollectionExtensions.AddOpenApi(services, documentName, options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                configureOptions(options);
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..42aff6ae7205
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,637 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+            cache.Add(@"T:ClassLibrary.Todo", new XmlComment(@"This is a todo item.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ClassLibrary.Project", new XmlComment(@"The project that contains Todo items.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:ClassLibrary.Project.#ctor(System.String,System.String)", new XmlComment(@"The project that contains Todo items.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ClassLibrary.ProjectBoard.BoardItem", new XmlComment(@"An item on the board.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ClassLibrary.ProjectBoard.BoardItem.Name", new XmlComment(@"The identifier of the board item. Defaults to ""name"".", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ClassLibrary.ProjectRecord", new XmlComment(@"The project that contains Todo items.", null, null, null, null, false, null, [new XmlParameterComment(@"Name", @"The name of the project.", null, false), new XmlParameterComment(@"Description", @"The description of the project.", null, false)], null));
+            cache.Add(@"M:ClassLibrary.ProjectRecord.#ctor(System.String,System.String)", new XmlComment(@"The project that contains Todo items.", null, null, null, null, false, null, [new XmlParameterComment(@"Name", @"The name of the project.", null, false), new XmlParameterComment(@"Description", @"The description of the project.", null, false)], null));
+            cache.Add(@"P:ClassLibrary.ProjectRecord.Name", new XmlComment(@"The name of the project.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ClassLibrary.ProjectRecord.Description", new XmlComment(@"The description of the project.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ClassLibrary.TodoWithDescription.Id", new XmlComment(@"The identifier of the todo.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ClassLibrary.TodoWithDescription.Name", new XmlComment(null, null, null, null, @"The name of the todo.", false, null, null, null));
+            cache.Add(@"P:ClassLibrary.TodoWithDescription.Description", new XmlComment(@"A description of the todo.", null, null, null, @"Another description of the todo.", false, null, null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.BooleanType", new XmlComment(null, null, null, null, null, false, [@"true"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.IntegerType", new XmlComment(null, null, null, null, null, false, [@"42"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.LongType", new XmlComment(null, null, null, null, null, false, [@"1234567890123456789"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.DoubleType", new XmlComment(null, null, null, null, null, false, [@"3.14"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.FloatType", new XmlComment(null, null, null, null, null, false, [@"3.14"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.DateTimeType", new XmlComment(null, null, null, null, null, false, [@"2022-01-01T00:00:00Z"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.DateOnlyType", new XmlComment(null, null, null, null, null, false, [@"2022-01-01"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.StringType", new XmlComment(null, null, null, null, null, false, [@"Hello, World!"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.GuidType", new XmlComment(null, null, null, null, null, false, [@"2d8f1eac-b5c6-4e29-8c62-4d9d75ef3d3d"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.TimeOnlyType", new XmlComment(null, null, null, null, null, false, [@"12:30:45"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.TimeSpanType", new XmlComment(null, null, null, null, null, false, [@"P3DT4H5M"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.ByteType", new XmlComment(null, null, null, null, null, false, [@"255"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.DecimalType", new XmlComment(null, null, null, null, null, false, [@"3.14159265359"], null, null));
+            cache.Add(@"P:ClassLibrary.TypeWithExamples.UriType", new XmlComment(null, null, null, null, null, false, [@"https://example.com"], null, null));
+            cache.Add(@"P:ClassLibrary.Holder`1.Value", new XmlComment(@"The value to hold.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:ClassLibrary.Endpoints.ExternalMethod(System.String)", new XmlComment(@"An external method.", null, null, null, null, false, null, [new XmlParameterComment(@"name", @"The name of the tester. Defaults to ""Tester"".", null, false)], null));
+            cache.Add(@"M:ClassLibrary.Endpoints.CreateHolder``1(``0)", new XmlComment(@"Creates a holder for the specified value.", null, null, @"A holder for the specified value.", null, false, [@"{ value: 42 }"], [new XmlParameterComment(@"value", @"The value to hold.", null, false)], null));
+
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..03379781d78f
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,735 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+
+            cache.Add(@"T:ExampleClass", new XmlComment(@"Every class and member should have a one sentence
+summary describing its purpose.", null, @"     You can expand on that one sentence summary to
+     provide more information for readers. In this case,
+     the `ExampleClass` provides different C#
+     elements to show how you would add documentation
+    comments for most elements in a typical class.
+     The remarks can add multiple paragraphs, so you can
+write detailed information for developers that use
+your work. You should add everything needed for
+readers to be successful. This class contains
+examples for the following:
+     * Summary
+
+This should provide a one sentence summary of the class or member.
+* Remarks
+
+This is typically a more detailed description of the class or member
+* para
+
+The para tag separates a section into multiple paragraphs
+* list
+
+Provides a list of terms or elements
+* returns, param
+
+Used to describe parameters and return values
+* value
+Used to describe properties
+* exception
+
+Used to describe exceptions that may be thrown
+* c, cref, see, seealso
+
+These provide code style and links to other
+documentation elements
+* example, code
+
+These are used for code examples
+     The list above uses the ""table"" style. You could
+also use the ""bullet"" or ""number"" style. Neither
+would typically use the ""term"" element.
+
+Note: paragraphs are double spaced. Use the *br*
+tag for single spaced lines.", null, null, false, null, null, null));
+            cache.Add(@"T:Person", new XmlComment(@"This is an example of a positional record.", null, @"There isn't a way to add XML comments for properties
+created for positional records, yet. The language
+design team is still considering what tags should
+be supported, and where. Currently, you can use
+the ""param"" tag to describe the parameters to the
+primary constructor.", null, null, false, null, [new XmlParameterComment(@"FirstName", @"This tag will apply to the primary constructor parameter.", null, false), new XmlParameterComment(@"LastName", @"This tag will apply to the primary constructor parameter.", null, false)], null));
+            cache.Add(@"T:MainClass", new XmlComment(@"A summary about this class.", null, @"These remarks would explain more about this class.
+In this example, these comments also explain the
+general information about the derived class.", null, null, false, null, null, null));
+            cache.Add(@"T:DerivedClass", new XmlComment(@"A summary about this class.", null, @"These remarks would explain more about this class.
+In this example, these comments also explain the
+general information about the derived class.", null, null, false, null, null, null));
+            cache.Add(@"T:ITestInterface", new XmlComment(@"This interface would describe all the methods in
+its contract.", null, @"While elided for brevity, each method or property
+in this interface would contain docs that you want
+to duplicate in each implementing class.", null, null, false, null, null, null));
+            cache.Add(@"T:ImplementingClass", new XmlComment(@"This interface would describe all the methods in
+its contract.", null, @"While elided for brevity, each method or property
+in this interface would contain docs that you want
+to duplicate in each implementing class.", null, null, false, null, null, null));
+            cache.Add(@"T:InheritOnlyReturns", new XmlComment(@"This class shows hows you can ""inherit"" the doc
+comments from one method in another method.", null, @"You can inherit all comments, or only a specific tag,
+represented by an xpath expression.", null, null, false, null, null, null));
+            cache.Add(@"T:InheritAllButRemarks", new XmlComment(@"This class shows an example of sharing comments across methods.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:GenericClass`1", new XmlComment(@"This is a generic class.", null, @"This example shows how to specify the GenericClass&lt;T&gt;
+type as a cref attribute.
+In generic classes and methods, you'll often want to reference the
+generic type, or the type parameter.", null, null, false, null, null, null));
+            cache.Add(@"T:GenericParent", new XmlComment(@"This class validates the behavior for mapping
+generic types to open generics for use in
+typeof expressions.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ParamsAndParamRefs", new XmlComment(@"This shows examples of typeparamref and typeparam tags", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:DisposableType", new XmlComment(@"A class that implements the IDisposable interface.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:XmlPropertyTestClass", new XmlComment(@"This class tests different XML comment scenarios for properties.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ExampleClass.Label", new XmlComment(null, null, @"    The string? ExampleClass.Label is a `string`
+    that you use for a label.
+    Note that there isn't a way to provide a ""cref"" to
+each accessor, only to the property itself.", null, @"The `Label` property represents a label
+for this instance.", false, null, null, null));
+            cache.Add(@"P:Person.FirstName", new XmlComment(@"This tag will apply to the primary constructor parameter.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:Person.LastName", new XmlComment(@"This tag will apply to the primary constructor parameter.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:GenericParent.Id", new XmlComment(@"This property is a nullable value type.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:GenericParent.Name", new XmlComment(@"This property is a nullable reference type.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:GenericParent.TaskOfTupleProp", new XmlComment(@"This property is a generic type containing a tuple.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:GenericParent.TupleWithGenericProp", new XmlComment(@"This property is a tuple with a generic type inside.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:GenericParent.TupleWithNestedGenericProp", new XmlComment(@"This property is a tuple with a nested generic type inside.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:XmlPropertyTestClass.SummaryOnly", new XmlComment(@"A property with only summary tag.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:XmlPropertyTestClass.ValueOnly", new XmlComment(null, null, null, null, @"A property with only value tag.", false, null, null, null));
+            cache.Add(@"P:XmlPropertyTestClass.BothSummaryAndValue", new XmlComment(@"A property with both summary and value.", null, null, null, @"Additional value information.", false, null, null, null));
+            cache.Add(@"P:XmlPropertyTestClass.ReturnsOnly", new XmlComment(null, null, null, @"This should be ignored for properties.", null, false, null, null, null));
+            cache.Add(@"P:XmlPropertyTestClass.SummaryAndReturns", new XmlComment(@"A property with summary and returns.", null, null, @"This should be ignored for properties.", null, false, null, null, null));
+            cache.Add(@"M:ExampleClass.Add(System.Int32,System.Int32)", new XmlComment(@"Adds two integers and returns the result.", null, null, @"The sum of two integers.", null, false, [@"    ```int c = Math.Add(4, 5);
+if (c &gt; 10)
+{
+    Console.WriteLine(c);
+}```"], [new XmlParameterComment(@"left", @"The left operand of the addition.", null, false), new XmlParameterComment(@"right", @"The right operand of the addition.", null, false)], null));
+            cache.Add(@"M:ExampleClass.AddAsync(System.Int32,System.Int32)", new XmlComment(@"This method is an example of a method that
+returns an awaitable item.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:ExampleClass.DoNothingAsync", new XmlComment(@"This method is an example of a method that
+returns a Task which should map to a void return type.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:ExampleClass.AddNumbers(System.Int32[])", new XmlComment(@"This method is an example of a method that consumes
+an params array.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:ITestInterface.Method(System.Int32)", new XmlComment(@"This method is part of the test interface.", null, @"This content would be inherited by classes
+that implement this interface when the
+implementing class uses ""inheritdoc""", @"The value of arg", null, false, null, [new XmlParameterComment(@"arg", @"The argument to the method", null, false)], null));
+            cache.Add(@"M:InheritOnlyReturns.MyParentMethod(System.Boolean)", new XmlComment(@"In this example, this summary is only visible for this method.", null, null, @"A boolean", null, false, null, null, null));
+            cache.Add(@"M:InheritOnlyReturns.MyChildMethod", new XmlComment(null, null, null, @"A boolean", null, false, null, null, null));
+            cache.Add(@"M:InheritAllButRemarks.MyParentMethod(System.Boolean)", new XmlComment(@"In this example, this summary is visible on all the methods.", null, @"The remarks can be inherited by other methods
+using the xpath expression.", @"A boolean", null, false, null, null, null));
+            cache.Add(@"M:InheritAllButRemarks.MyChildMethod", new XmlComment(@"In this example, this summary is visible on all the methods.", null, null, @"A boolean", null, false, null, null, null));
+            cache.Add(@"M:GenericParent.GetTaskOfTuple", new XmlComment(@"This method returns a generic type containing a tuple.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:GenericParent.GetTupleOfTask", new XmlComment(@"This method returns a tuple with a generic type inside.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:GenericParent.GetTupleOfTask1``1", new XmlComment(@"This method return a tuple with a generic type containing a
+type parameter inside.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:GenericParent.GetTupleOfTask2``1", new XmlComment(@"This method return a tuple with a generic type containing a
+type parameter inside.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:GenericParent.GetNestedGeneric", new XmlComment(@"This method returns a nested generic with all types resolved.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:GenericParent.GetNestedGeneric1``1", new XmlComment(@"This method returns a nested generic with a type parameter.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:ParamsAndParamRefs.GetGenericValue``1(``0)", new XmlComment(@"The GetGenericValue method.", null, @"This sample shows how to specify the T ParamsAndParamRefs.GetGenericValue&lt;T&gt;(T para)
+method as a cref attribute.
+The parameter and return value are both of an arbitrary type,
+T", null, null, false, null, null, null));
+            cache.Add(@"M:DisposableType.Dispose", new XmlComment(null, null, null, null, null, false, null, null, null));
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..0c2836cc9f2f
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,612 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+
+            cache.Add(@"M:TestController.Get", new XmlComment(@"A summary of the action.", @"A description of the action.", null, null, null, false, null, null, null));
+            cache.Add(@"M:Test2Controller.Get(System.String)", new XmlComment(null, null, null, null, null, false, null, [new XmlParameterComment(@"name", @"The name of the person.", null, false)], [new XmlResponseComment(@"200", @"Returns the greeting.", @"")]));
+            cache.Add(@"M:Test2Controller.Get(System.Int32)", new XmlComment(null, null, null, null, null, false, null, [new XmlParameterComment(@"id", @"The id associated with the request.", null, false)], null));
+            cache.Add(@"M:Test2Controller.Post(Todo)", new XmlComment(null, null, null, null, null, false, null, [new XmlParameterComment(@"todo", @"The todo to insert into the database.", null, false)], null));
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..c8da228d94d8
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,656 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+
+            cache.Add(@"P:FirstParameters.Name", new XmlComment(@"The name of the person.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:FirstParameters.Age", new XmlComment(@"The age of the person.", null, null, null, null, false, [@"30"], null, null));
+            cache.Add(@"P:FirstParameters.User", new XmlComment(@"The user information.", null, null, null, null, false, [@"{
+  ""username"": ""johndoe"",
+  ""email"": ""johndoe@example.com""
+}"], null, null));
+            cache.Add(@"P:SecondParameters.Description", new XmlComment(@"The description of the project.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:SecondParameters.Service", new XmlComment(@"The service used for testing.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:MixedParametersClass.Email", new XmlComment(@"The user's email address.", null, null, null, null, false, [@"""user@example.com"""], null, null));
+            cache.Add(@"P:MixedParametersClass.Age", new XmlComment(@"The user's age in years.", null, null, null, null, false, [@"25"], null, null));
+            cache.Add(@"P:MixedParametersClass.IsActive", new XmlComment(@"Whether the user is active.", null, null, null, null, false, [@"true"], null, null));
+            cache.Add(@"P:BindingSourceParametersClass.QueryParam", new XmlComment(@"Query parameter from URL.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:BindingSourceParametersClass.HeaderParam", new XmlComment(@"Header value from request.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:XmlDocPriorityParametersClass.SummaryOnlyProperty", new XmlComment(@"Property with only summary documentation.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:XmlDocPriorityParametersClass.SummaryAndReturnsProperty", new XmlComment(@"Property with summary documentation that should be overridden.", null, null, @"Returns-based description that should take precedence over summary.", null, false, null, null, null));
+            cache.Add(@"P:XmlDocPriorityParametersClass.AllThreeProperty", new XmlComment(@"Property with all three types of documentation.", null, null, @"Returns-based description that should be overridden by value.", @"Value-based description that should take highest precedence.", false, null, null, null));
+            cache.Add(@"P:XmlDocPriorityParametersClass.ReturnsOnlyProperty", new XmlComment(null, null, null, @"Returns-only description.", null, false, null, null, null));
+            cache.Add(@"P:XmlDocPriorityParametersClass.ValueOnlyProperty", new XmlComment(null, null, null, null, @"Value-only description.", false, null, null, null));
+            cache.Add(@"P:SummaryValueParametersClass.SummaryProperty", new XmlComment(@"Property with only summary documentation.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:SummaryValueParametersClass.ValueProperty", new XmlComment(@"Property with summary that should be overridden by value.", null, null, null, @"Value description that should take precedence over summary.", false, null, null, null));
+            cache.Add(@"P:SummaryValueParametersClass.ValueOnlyProperty", new XmlComment(null, null, null, null, @"Property with only value documentation.", false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get", new XmlComment(@"A summary of the action.", @"A description of the action.", null, @"Returns the greeting.", null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get2(System.String)", new XmlComment(null, null, null, null, null, false, null, [new XmlParameterComment(@"name", @"The name of the person.", null, false)], [new XmlResponseComment(@"200", @"Returns the greeting.", @"")]));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get3(System.String)", new XmlComment(null, null, null, @"Returns the greeting.", null, false, null, [new XmlParameterComment(@"name", @"The name of the person.", @"Testy McTester", false)], null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get4", new XmlComment(null, null, null, @"Indicates that the value was not found.", null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get5", new XmlComment(null, null, null, @"This gets ignored.", null, false, null, null, [new XmlResponseComment(@"200", @"Indicates that the value is even.", @""), new XmlResponseComment(@"201", @"Indicates that the value is less than 50.", @""), new XmlResponseComment(@"404", @"Indicates that the value was not found.", @"")]));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Post6(User)", new XmlComment(@"Creates a new user.", null, @"Sample request:
+    POST /6
+    {
+        ""username"": ""johndoe"",
+        ""email"": ""john@example.com""
+    }", null, null, false, null, [new XmlParameterComment(@"user", @"The user information.", @"{""username"": ""johndoe"", ""email"": ""john@example.com""}", false)], [new XmlResponseComment(@"201", @"Successfully created the user.", @""), new XmlResponseComment(@"400", @"If the user data is invalid.", @"")]));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Put7(System.Nullable{System.Int32},System.String)", new XmlComment(@"Updates an existing record.", null, null, null, null, false, null, [new XmlParameterComment(@"id", @"Legacy ID parameter - use uuid instead.", null, true), new XmlParameterComment(@"uuid", @"Unique identifier for the record.", null, false)], [new XmlResponseComment(@"204", @"Update successful.", @""), new XmlResponseComment(@"404", @"Legacy response - will be removed.", @"")]));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get8", new XmlComment(@"A summary of Get8.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get9", new XmlComment(@"A summary of Get9.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get10", new XmlComment(@"A summary of Get10.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get11", new XmlComment(@"A summary of Get11.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get12", new XmlComment(@"A summary of Get12.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get13", new XmlComment(@"A summary of Get13.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get14", new XmlComment(@"A summary of Get14.", null, null, @"Returns the greeting.", null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get15", new XmlComment(@"A summary of Get15.", null, null, null, null, false, null, null, [new XmlResponseComment(@"200", @"Returns the greeting.", @"")]));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Post16(Example)", new XmlComment(@"A summary of Post16.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get17(System.Int32[])", new XmlComment(@"A summary of Get17.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Post18(FirstParameters,SecondParameters)", new XmlComment(@"A summary of Post18.", null, null, null, null, false, null, null, null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Post19(System.String,MixedParametersClass)", new XmlComment(@"Tests mixed regular and AsParameters with examples.", null, null, null, null, false, null, [new XmlParameterComment(@"regularParam", @"A regular parameter with documentation.", null, false), new XmlParameterComment(@"mixedParams", @"Mixed parameter class with various types.", null, false)], null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get20(BindingSourceParametersClass)", new XmlComment(@"Tests AsParameters with different binding sources.", null, null, null, null, false, null, [new XmlParameterComment(@"bindingParams", @"Parameters from different sources.", null, false)], null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get21(XmlDocPriorityParametersClass)", new XmlComment(@"Tests XML documentation priority order (value &gt; returns &gt; summary).", null, null, null, null, false, null, [new XmlParameterComment(@"priorityParams", @"Parameters demonstrating XML doc priority.", null, false)], null));
+            cache.Add(@"M:RouteHandlerExtensionMethods.Get22(SummaryValueParametersClass)", new XmlComment(@"Tests summary and value documentation priority on AsParameters properties.", null, null, null, null, false, null, [new XmlParameterComment(@"summaryValueParams", @"Parameters testing summary vs value priority.", null, false)], null));
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..e192067879b7
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,638 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+
+            cache.Add(@"T:Todo", new XmlComment(@"This is a todo item.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:Project", new XmlComment(@"The project that contains Todo items.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ProjectBoard.BoardItem", new XmlComment(@"An item on the board.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ProjectBoard.ProtectedInternalElement", new XmlComment(@"Can find this XML comment.", null, null, null, null, false, null, null, null));
+            cache.Add(@"T:ProjectRecord", new XmlComment(@"The project that contains Todo items.", null, null, null, null, false, null, [new XmlParameterComment(@"Name", @"The name of the project.", null, false), new XmlParameterComment(@"Description", @"The description of the project.", null, false)], null));
+            cache.Add(@"T:User", new XmlComment(null, null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ProjectBoard.ProtectedInternalElement.Name", new XmlComment(@"The unique identifier for the element.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ProjectRecord.Name", new XmlComment(@"The name of the project.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:ProjectRecord.Description", new XmlComment(@"The description of the project.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:TodoWithDescription.Id", new XmlComment(@"The identifier of the todo.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:TodoWithDescription.Name", new XmlComment(null, null, null, null, @"The name of the todo.", false, null, null, null));
+            cache.Add(@"P:TodoWithDescription.Description", new XmlComment(@"A description of the the todo.", null, null, null, @"Another description of the todo.", false, null, null, null));
+            cache.Add(@"P:TypeWithExamples.BooleanType", new XmlComment(null, null, null, null, null, false, [@"true"], null, null));
+            cache.Add(@"P:TypeWithExamples.IntegerType", new XmlComment(null, null, null, null, null, false, [@"42"], null, null));
+            cache.Add(@"P:TypeWithExamples.LongType", new XmlComment(null, null, null, null, null, false, [@"1234567890123456789"], null, null));
+            cache.Add(@"P:TypeWithExamples.DoubleType", new XmlComment(null, null, null, null, null, false, [@"3.14"], null, null));
+            cache.Add(@"P:TypeWithExamples.FloatType", new XmlComment(null, null, null, null, null, false, [@"3.14"], null, null));
+            cache.Add(@"P:TypeWithExamples.DateTimeType", new XmlComment(null, null, null, null, null, false, [@"2022-01-01T00:00:00Z"], null, null));
+            cache.Add(@"P:TypeWithExamples.DateOnlyType", new XmlComment(null, null, null, null, null, false, [@"2022-01-01"], null, null));
+            cache.Add(@"P:TypeWithExamples.StringType", new XmlComment(null, null, null, null, null, false, [@"Hello, World!"], null, null));
+            cache.Add(@"P:TypeWithExamples.GuidType", new XmlComment(null, null, null, null, null, false, [@"2d8f1eac-b5c6-4e29-8c62-4d9d75ef3d3d"], null, null));
+            cache.Add(@"P:TypeWithExamples.TimeOnlyType", new XmlComment(null, null, null, null, null, false, [@"12:30:45"], null, null));
+            cache.Add(@"P:TypeWithExamples.TimeSpanType", new XmlComment(null, null, null, null, null, false, [@"P3DT4H5M"], null, null));
+            cache.Add(@"P:TypeWithExamples.ByteType", new XmlComment(null, null, null, null, null, false, [@"255"], null, null));
+            cache.Add(@"P:TypeWithExamples.DecimalType", new XmlComment(null, null, null, null, null, false, [@"3.14159265359"], null, null));
+            cache.Add(@"P:TypeWithExamples.UriType", new XmlComment(null, null, null, null, null, false, [@"https://example.com"], null, null));
+            cache.Add(@"P:IUser.Id", new XmlComment(@"The unique identifier for the user.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:IUser.Name", new XmlComment(@"The user's display name.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:User.Id", new XmlComment(@"The unique identifier for the user.", null, null, null, null, false, null, null, null));
+            cache.Add(@"P:User.Name", new XmlComment(@"The user's display name.", null, null, null, null, false, null, null, null));
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.XmlCommentsOnPropertiesShouldApplyToSchemaReferences#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.XmlCommentsOnPropertiesShouldApplyToSchemaReferences#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..62eca1ce5fa6
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.XmlCommentsOnPropertiesShouldApplyToSchemaReferences#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,618 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+
+            cache.Add(@"T:ModelWithSummary", new XmlComment(@"Comment on class ModelWithSummary.", null, null, null, null, false, [@"{ ""street"": ""ModelWithSummaryClass"" }"], null, null));
+            cache.Add(@"T:ModelInline", new XmlComment(@"Comment on class ModelInline.", null, null, null, null, false, [@"{ ""street"": ""ModelInlineClass"" }"], null, null));
+            cache.Add(@"T:RootModel", new XmlComment(@"Comment on class RootModel.", null, null, null, null, false, [@"{ }"], null, null));
+            cache.Add(@"P:RootModel.ModelWithSummary1", new XmlComment(@"Comment on property ModelWithSummary1.", null, null, null, null, false, [@"{ ""street"": ""ModelWithSummary1Prop"" }"], null, null));
+            cache.Add(@"P:RootModel.ModelWithSummary2", new XmlComment(@"Comment on property ModelWithSummary2.", null, null, null, null, false, [@"{ ""street"": ""ModelWithSummary2Prop"" }"], null, null));
+            cache.Add(@"P:RootModel.ModelWithoutSummary1", new XmlComment(@"Comment on property ModelWithoutSummary1.", null, null, null, null, false, [@"{ ""street"": ""ModelWithoutSummary1Prop"" }"], null, null));
+            cache.Add(@"P:RootModel.ModelWithoutSummary2", new XmlComment(@"Comment on property ModelWithoutSummary2.", null, null, null, null, false, [@"{ ""street"": ""ModelWithoutSummary2Prop"" }"], null, null));
+            cache.Add(@"P:RootModel.ModelInline1", new XmlComment(@"Comment on property ModelInline1.", null, null, null, null, false, [@"{ ""street"": ""ModelInline1Prop"" }"], null, null));
+            cache.Add(@"P:RootModel.ModelInline2", new XmlComment(@"Comment on property ModelInline2.", null, null, null, null, false, [@"{ ""street"": ""ModelInline2Prop"" }"], null, null));
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services, Action<OpenApiOptions> configureOptions)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+                configureOptions(options);
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/XmlCommentDocumentationIdTests.CanMergeXmlCommentsWithDifferentDocumentationIdFormats#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/XmlCommentDocumentationIdTests.CanMergeXmlCommentsWithDifferentDocumentationIdFormats#OpenApiXmlCommentSupport.generated.verified.cs
new file mode 100644
index 000000000000..2bea3547fc7b
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/XmlCommentDocumentationIdTests.CanMergeXmlCommentsWithDifferentDocumentationIdFormats#OpenApiXmlCommentSupport.generated.verified.cs
@@ -0,0 +1,609 @@
+//HintName: OpenApiXmlCommentSupport.generated.cs
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+// Suppress warnings about obsolete types and members
+// in generated code
+#pragma warning disable CS0612, CS0618
+
+namespace System.Runtime.CompilerServices
+{
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.AspNetCore.OpenApi.Generated
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Linq;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.Json;
+    using System.Text.Json.Nodes;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.OpenApi;
+    using Microsoft.AspNetCore.Mvc.Controllers;
+    using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.OpenApi;
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlComment(
+        string? Summary,
+        string? Description,
+        string? Remarks,
+        string? Returns,
+        string? Value,
+        bool Deprecated,
+        List<string>? Examples,
+        List<XmlParameterComment>? Parameters,
+        List<XmlResponseComment>? Responses);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlParameterComment(string? Name, string? Description, string? Example, bool Deprecated);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file record XmlResponseComment(string Code, string? Description, string? Example);
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class XmlCommentCache
+    {
+        private static Dictionary<string, XmlComment>? _cache;
+        public static Dictionary<string, XmlComment> Cache => _cache ??= GenerateCacheEntries();
+
+        private static Dictionary<string, XmlComment> GenerateCacheEntries()
+        {
+            var cache = new Dictionary<string, XmlComment>();
+            cache.Add(@"M:ReferencedLibrary.TestApi.TestMethod(System.Int32)", new XmlComment(@"This method should have its XML comment merged properly.", null, null, @"A task representing the asynchronous operation.", null, false, null, [new XmlParameterComment(@"id", @"The identifier for the test.", null, false)], null));
+
+
+            return cache;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class DocumentationCommentIdHelper
+    {
+        /// <summary>
+        /// Generates a documentation comment ID for a type.
+        /// Example: T:Namespace.Outer+Inner`1 becomes T:Namespace.Outer.Inner`1
+        /// </summary>
+        public static string CreateDocumentationId(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return "T:" + GetTypeDocId(type, includeGenericArguments: false, omitGenericArity: false);
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property.
+        /// Example: P:Namespace.ContainingType.PropertyName or for an indexer P:Namespace.ContainingType.Item(System.Int32)
+        /// </summary>
+        public static string CreateDocumentationId(this PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+
+            if (property.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(property.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+            sb.Append(property.Name);
+
+            // For indexers, include the parameter list.
+            var indexParams = property.GetIndexParameters();
+            if (indexParams.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < indexParams.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    sb.Append(GetTypeDocId(indexParams[i].ParameterType, includeGenericArguments: true, omitGenericArity: false));
+                }
+                sb.Append(')');
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a property given its container type and property name.
+        /// Example: P:Namespace.ContainingType.PropertyName
+        /// </summary>
+        public static string CreateDocumentationId(Type containerType, string propertyName)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                throw new ArgumentException("Property name cannot be null or empty.", nameof(propertyName));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("P:");
+            sb.Append(GetTypeDocId(containerType, includeGenericArguments: false, omitGenericArity: false));
+            sb.Append('.');
+            sb.Append(propertyName);
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation comment ID for a method (or constructor).
+        /// For example:
+        ///   M:Namespace.ContainingType.MethodName(ParamType1,ParamType2)~ReturnType
+        ///   M:Namespace.ContainingType.#ctor(ParamType)
+        /// </summary>
+        public static string CreateDocumentationId(this MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            var sb = new StringBuilder();
+            sb.Append("M:");
+
+            // Append the fully qualified name of the declaring type.
+            if (method.DeclaringType != null)
+            {
+                sb.Append(GetTypeDocId(method.DeclaringType, includeGenericArguments: false, omitGenericArity: false));
+            }
+
+            sb.Append('.');
+
+            // Append the method name, handling constructors specially.
+            if (method.IsConstructor)
+            {
+                sb.Append(method.IsStatic ? "#cctor" : "#ctor");
+            }
+            else
+            {
+                sb.Append(method.Name);
+                if (method.IsGenericMethod)
+                {
+                    sb.Append("``");
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", method.GetGenericArguments().Length);
+                }
+            }
+
+            // Append the parameter list, if any.
+            var parameters = method.GetParameters();
+            if (parameters.Length > 0)
+            {
+                sb.Append('(');
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        sb.Append(',');
+                    }
+
+                    // Omit the generic arity for the parameter type.
+                    sb.Append(GetTypeDocId(parameters[i].ParameterType, includeGenericArguments: true, omitGenericArity: true));
+                }
+                sb.Append(')');
+            }
+
+            // Append the return type after a '~' (if the method returns a value).
+            if (method.ReturnType != typeof(void))
+            {
+                sb.Append('~');
+                // Omit the generic arity for the return type.
+                sb.Append(GetTypeDocId(method.ReturnType, includeGenericArguments: true, omitGenericArity: true));
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a documentation ID string for a type.
+        /// This method handles nested types (replacing '+' with '.'),
+        /// generic types, arrays, pointers, by-ref types, and generic parameters.
+        /// The <paramref name="includeGenericArguments"/> flag controls whether
+        /// constructed generic type arguments are emitted, while <paramref name="omitGenericArity"/>
+        /// controls whether the generic arity marker (e.g. "`1") is appended.
+        /// </summary>
+        private static string GetTypeDocId(Type type, bool includeGenericArguments, bool omitGenericArity)
+        {
+            if (type.IsGenericParameter)
+            {
+                // Use `` for method-level generic parameters and ` for type-level.
+                if (type.DeclaringMethod != null)
+                {
+                    return "``" + type.GenericParameterPosition;
+                }
+                else if (type.DeclaringType != null)
+                {
+                    return "`" + type.GenericParameterPosition;
+                }
+                else
+                {
+                    return type.Name;
+                }
+            }
+
+            if (type.IsGenericType)
+            {
+                Type genericDef = type.GetGenericTypeDefinition();
+                string fullName = genericDef.FullName ?? genericDef.Name;
+
+                var sb = new StringBuilder(fullName.Length);
+
+                // Replace '+' with '.' for nested types
+                for (var i = 0; i < fullName.Length; i++)
+                {
+                    char c = fullName[i];
+                    if (c == '+')
+                    {
+                        sb.Append('.');
+                    }
+                    else if (c == '`')
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+
+                if (!omitGenericArity)
+                {
+                    int arity = genericDef.GetGenericArguments().Length;
+                    sb.Append('`');
+                    sb.AppendFormat(CultureInfo.InvariantCulture, "{0}", arity);
+                }
+
+                if (includeGenericArguments && !type.IsGenericTypeDefinition)
+                {
+                    var typeArgs = type.GetGenericArguments();
+                    sb.Append('{');
+
+                    for (int i = 0; i < typeArgs.Length; i++)
+                    {
+                        if (i > 0)
+                        {
+                            sb.Append(',');
+                        }
+
+                        sb.Append(GetTypeDocId(typeArgs[i], includeGenericArguments, omitGenericArity));
+                    }
+
+                    sb.Append('}');
+                }
+
+                return sb.ToString();
+            }
+
+            // For non-generic types, use FullName (if available) and replace nested type separators.
+            return (type.FullName ?? type.Name).Replace('+', '.');
+        }
+
+        /// <summary>
+        /// Normalizes a documentation comment ID to match the compiler-style format.
+        /// Strips the return type suffix for ordinary methods but retains it for conversion operators.
+        /// </summary>
+        /// <param name="docId">The documentation comment ID to normalize.</param>
+        /// <returns>The normalized documentation comment ID.</returns>
+        public static string NormalizeDocId(string docId)
+        {
+            // Find the tilde character that indicates the return type suffix
+            var tildeIndex = docId.IndexOf('~');
+            if (tildeIndex == -1)
+            {
+                // No return type suffix, return as-is
+                return docId;
+            }
+
+            // Check if this is a conversion operator (op_Implicit or op_Explicit)
+            // For these operators, we need to keep the return type suffix
+            if (docId.Contains("op_Implicit") || docId.Contains("op_Explicit"))
+            {
+                return docId;
+            }
+
+            // For ordinary methods, strip the return type suffix
+            return docId.Substring(0, tildeIndex);
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentOperationTransformer : IOpenApiOperationTransformer
+    {
+        public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
+        {
+            var methodInfo = context.Description.ActionDescriptor is ControllerActionDescriptor controllerActionDescriptor
+                ? controllerActionDescriptor.MethodInfo
+                : context.Description.ActionDescriptor.EndpointMetadata.OfType<MethodInfo>().SingleOrDefault();
+
+            if (methodInfo is null)
+            {
+                return Task.CompletedTask;
+            }
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(methodInfo.CreateDocumentationId()), out var methodComment))
+            {
+                if (methodComment.Summary is { } summary)
+                {
+                    operation.Summary = summary;
+                }
+                if (methodComment.Description is { } description)
+                {
+                    operation.Description = description;
+                }
+                if (methodComment.Remarks is { } remarks)
+                {
+                    operation.Description = remarks;
+                }
+                if (methodComment.Parameters is { Count: > 0})
+                {
+                    foreach (var parameterComment in methodComment.Parameters)
+                    {
+                        var parameterInfo = methodInfo.GetParameters().SingleOrDefault(info => info.Name == parameterComment.Name);
+                        var operationParameter = operation.Parameters?.SingleOrDefault(parameter => parameter.Name == parameterComment.Name);
+                        if (operationParameter is not null)
+                        {
+                            var targetOperationParameter = UnwrapOpenApiParameter(operationParameter);
+                            targetOperationParameter.Description = parameterComment.Description;
+                            if (parameterComment.Example is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                            targetOperationParameter.Deprecated = parameterComment.Deprecated;
+                        }
+                        else
+                        {
+                            var requestBody = operation.RequestBody;
+                            if (requestBody is not null)
+                            {
+                                requestBody.Description = parameterComment.Description;
+                                if (parameterComment.Example is { } jsonString)
+                                {
+                                    var content = requestBody?.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = jsonString.Parse();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Applies `<returns>` on XML comments for operation with single response value.
+                if (methodComment.Returns is { } returns && operation.Responses is { Count: 1 })
+                {
+                    var response = operation.Responses.First();
+                    response.Value.Description = returns;
+                }
+                // Applies `<response>` on XML comments for operation with multiple response values.
+                if (methodComment.Responses is { Count: > 0} && operation.Responses is { Count: > 0 })
+                {
+                    foreach (var response in operation.Responses)
+                    {
+                        var responseComment = methodComment.Responses.SingleOrDefault(xmlResponse => xmlResponse.Code == response.Key);
+                        if (responseComment is not null)
+                        {
+                            response.Value.Description = responseComment.Description;
+                        }
+                    }
+                }
+            }
+            foreach (var parameterDescription in context.Description.ParameterDescriptions)
+            {
+                var metadata = parameterDescription.ModelMetadata;
+                if (metadata.MetadataKind == ModelMetadataKind.Property
+                    && metadata.ContainerType is { } containerType
+                    && metadata.PropertyName is { } propertyName)
+                {
+                    var propertyDocId = DocumentationCommentIdHelper.CreateDocumentationId(containerType, propertyName);
+                    if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyDocId), out var propertyComment))
+                    {
+                        var parameter = operation.Parameters?.SingleOrDefault(p => p.Name == metadata.Name);
+                        var description = propertyComment.Summary;
+                        if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                        {
+                            description = $"{description}\n{propertyComment.Value}";
+                        }
+                        else if (string.IsNullOrEmpty(description))
+                        {
+                            description = propertyComment.Value;
+                        }
+                        if (parameter is null)
+                        {
+                            if (operation.RequestBody is not null)
+                            {
+                                operation.RequestBody.Description = description;
+                                if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                                {
+                                    var content = operation.RequestBody.Content?.Values;
+                                    if (content is null)
+                                    {
+                                        continue;
+                                    }
+                                    var parsedExample = jsonString.Parse();
+                                    foreach (var mediaType in content)
+                                    {
+                                        mediaType.Example = parsedExample;
+                                    }
+                                }
+                            }
+                            continue;
+                        }
+                        var targetOperationParameter = UnwrapOpenApiParameter(parameter);
+                        if (targetOperationParameter is not null)
+                        {
+                            targetOperationParameter.Description = description;
+                            if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                            {
+                                targetOperationParameter.Example = jsonString.Parse();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceParameter)
+        {
+            if (sourceParameter is OpenApiParameterReference parameterReference)
+            {
+                if (parameterReference.Target is OpenApiParameter target)
+                {
+                    return target;
+                }
+                else
+                {
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+                }
+            }
+            else if (sourceParameter is OpenApiParameter directParameter)
+            {
+                return directParameter;
+            }
+            else
+            {
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class XmlCommentSchemaTransformer : IOpenApiSchemaTransformer
+    {
+        public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
+        {
+            // Apply comments from the type
+            if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(context.JsonTypeInfo.Type.CreateDocumentationId()), out var typeComment))
+            {
+                schema.Description = typeComment.Summary;
+                if (typeComment.Examples?.FirstOrDefault() is { } jsonString)
+                {
+                    schema.Example = jsonString.Parse();
+                }
+            }
+
+            if (context.JsonPropertyInfo is { AttributeProvider: PropertyInfo propertyInfo })
+            {
+                // Apply comments from the property
+                if (XmlCommentCache.Cache.TryGetValue(DocumentationCommentIdHelper.NormalizeDocId(propertyInfo.CreateDocumentationId()), out var propertyComment))
+                {
+                    var description = propertyComment.Summary;
+                    if (!string.IsNullOrEmpty(description) && !string.IsNullOrEmpty(propertyComment.Value))
+                    {
+                        description = $"{description}\n{propertyComment.Value}";
+                    }
+                    else if (string.IsNullOrEmpty(description))
+                    {
+                        description = propertyComment.Value;
+                    }
+                    if (schema.Metadata is null
+                        || !schema.Metadata.TryGetValue("x-schema-id", out var schemaId)
+                        || string.IsNullOrEmpty(schemaId as string))
+                    {
+                        // Inlined schema
+                        schema.Description = description;
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Example = jsonString.Parse();
+                        }
+                    }
+                    else
+                    {
+                        // Schema Reference
+                        if (!string.IsNullOrEmpty(description))
+                        {
+                            schema.Metadata["x-ref-description"] = description;
+                        }
+                        if (propertyComment.Examples?.FirstOrDefault() is { } jsonString)
+                        {
+                            schema.Metadata["x-ref-example"] = jsonString.Parse()!;
+                        }
+                    }
+                }
+            }
+            return Task.CompletedTask;
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class JsonNodeExtensions
+    {
+        public static JsonNode? Parse(this string? json)
+        {
+            if (json is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return JsonNode.Parse(json);
+            }
+            catch (JsonException)
+            {
+                try
+                {
+                    // If parsing fails, try wrapping in quotes to make it a valid JSON string
+                    return JsonNode.Parse($"\"{json.Replace("\"", "\\\"")}\"");
+                }
+                catch (JsonException)
+                {
+                    return null;
+                }
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.OpenApi.SourceGenerators, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static IServiceCollection AddOpenApi(this IServiceCollection services)
+        {
+            return services.AddOpenApi("v1", options =>
+            {
+                options.AddSchemaTransformer(new XmlCommentSchemaTransformer());
+                options.AddOperationTransformer(new XmlCommentOperationTransformer());
+            });
+        }
+
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiAnyComparerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiAnyComparerTests.cs
deleted file mode 100644
index 18ab3e1b27b3..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiAnyComparerTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Text;
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-
-public class OpenApiAnyComparerTests
-{
-    public static object[][] Data => [
-        [new OpenApiNull(), new OpenApiNull(), true],
-        [new OpenApiNull(), new OpenApiBoolean(true), false],
-        [new OpenApiByte(1), new OpenApiByte(1), true],
-        [new OpenApiByte(1), new OpenApiByte(2), false],
-        [new OpenApiBinary(Encoding.UTF8.GetBytes("test")), new OpenApiBinary(Encoding.UTF8.GetBytes("test")), true],
-        [new OpenApiBinary(Encoding.UTF8.GetBytes("test2")), new OpenApiBinary(Encoding.UTF8.GetBytes("test")), false],
-        [new OpenApiBoolean(true), new OpenApiBoolean(true), true],
-        [new OpenApiBoolean(true), new OpenApiBoolean(false), false],
-        [new OpenApiInteger(1), new OpenApiInteger(1), true],
-        [new OpenApiInteger(1), new OpenApiInteger(2), false],
-        [new OpenApiInteger(1), new OpenApiLong(1), false],
-        [new OpenApiLong(1), new OpenApiLong(1), true],
-        [new OpenApiLong(1), new OpenApiLong(2), false],
-        [new OpenApiFloat(1.1f), new OpenApiFloat(1.1f), true],
-        [new OpenApiFloat(1.1f), new OpenApiFloat(1.2f), false],
-        [new OpenApiDouble(1.1), new OpenApiDouble(1.1), true],
-        [new OpenApiDouble(1.1), new OpenApiDouble(1.2), false],
-        [new OpenApiString("value"), new OpenApiString("value"), true],
-        [new OpenApiString("value"), new OpenApiString("value2"), false],
-        [new OpenApiObject(), new OpenApiObject(), true],
-        [new OpenApiObject(), new OpenApiObject { ["key"] = new OpenApiString("value") }, false],
-        [new OpenApiObject { ["key"] = new OpenApiString("value") }, new OpenApiObject { ["key"] = new OpenApiString("value") }, true],
-        [new OpenApiObject { ["key"] = new OpenApiString("value") }, new OpenApiObject { ["key"] = new OpenApiString("value2") }, false],
-        [new OpenApiObject { ["key2"] = new OpenApiString("value") }, new OpenApiObject { ["key"] = new OpenApiString("value") }, false],
-        [new OpenApiDate(DateTime.Today), new OpenApiDate(DateTime.Today), true],
-        [new OpenApiDate(DateTime.Today), new OpenApiDate(DateTime.Today.AddDays(1)), false],
-        [new OpenApiPassword("password"), new OpenApiPassword("password"), true],
-        [new OpenApiPassword("password"), new OpenApiPassword("password2"), false],
-        [new OpenApiArray { new OpenApiString("value") }, new OpenApiArray { new OpenApiString("value") }, true],
-        [new OpenApiArray { new OpenApiString("value") }, new OpenApiArray { new OpenApiString("value2") }, false],
-        [new OpenApiArray { new OpenApiString("value2"), new OpenApiString("value") }, new OpenApiArray { new OpenApiString("value"), new OpenApiString("value2") }, false],
-        [new OpenApiArray { new OpenApiString("value"), new OpenApiString("value") }, new OpenApiArray { new OpenApiString("value"), new OpenApiString("value") }, true],
-    ];
-
-    [Theory]
-    [MemberData(nameof(Data))]
-    public void ProducesCorrectEqualityForOpenApiAny(IOpenApiAny any, IOpenApiAny anotherAny, bool isEqual)
-        => Assert.Equal(isEqual, OpenApiAnyComparer.Instance.Equals(any, anotherAny));
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiDiscriminatorComparerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiDiscriminatorComparerTests.cs
deleted file mode 100644
index bb411ab5198b..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiDiscriminatorComparerTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
-
-public class OpenApiDiscriminatorComparerTests
-{
-    public static object[][] Data => [
-        [new OpenApiDiscriminator(), new OpenApiDiscriminator(), true],
-        [new OpenApiDiscriminator { PropertyName = "prop" }, new OpenApiDiscriminator(), false],
-        [new OpenApiDiscriminator { PropertyName = "prop" }, new OpenApiDiscriminator { PropertyName = "prop" }, true],
-        [new OpenApiDiscriminator { PropertyName = "prop2" }, new OpenApiDiscriminator { PropertyName = "prop" }, false],
-        [new OpenApiDiscriminator { PropertyName = "prop", Mapping = { ["key"] = "discriminatorValue" } }, new OpenApiDiscriminator { PropertyName = "prop", Mapping = { ["key"] = "discriminatorValue" } }, true],
-        [new OpenApiDiscriminator { PropertyName = "prop", Mapping = { ["key"] = "discriminatorValue" } }, new OpenApiDiscriminator { PropertyName = "prop2", Mapping = { ["key"] = "discriminatorValue" } }, false],
-        [new OpenApiDiscriminator { PropertyName = "prop", Mapping = { ["key"] = "discriminatorValue" } }, new OpenApiDiscriminator { PropertyName = "prop", Mapping = { ["key"] = "discriminatorValue2" } }, false]
-    ];
-
-    [Theory]
-    [MemberData(nameof(Data))]
-    public void ProducesCorrectEqualityForOpenApiDiscriminator(OpenApiDiscriminator discriminator, OpenApiDiscriminator anotherDiscriminator, bool isEqual)
-        => Assert.Equal(isEqual, OpenApiDiscriminatorComparer.Instance.Equals(discriminator, anotherDiscriminator));
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiExternalDocsComparerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiExternalDocsComparerTests.cs
deleted file mode 100644
index d2487a54ba4f..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiExternalDocsComparerTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-
-public class OpenApiExternalDocsComparerTests
-{
-    public static object[][] Data => [
-        [new OpenApiExternalDocs(), new OpenApiExternalDocs(), true],
-        [new OpenApiExternalDocs(), new OpenApiExternalDocs { Description = "description" }, false],
-        [new OpenApiExternalDocs { Description = "description" }, new OpenApiExternalDocs { Description = "description" }, true],
-        [new OpenApiExternalDocs { Description = "description" }, new OpenApiExternalDocs { Description = "description", Url = new Uri("http://localhost") }, false],
-        [new OpenApiExternalDocs { Description = "description", Url = new Uri("http://localhost") }, new OpenApiExternalDocs { Description = "description", Url = new Uri("http://localhost") }, true],
-        [new OpenApiExternalDocs { Description = "description", Url = new Uri("http://localhost") }, new OpenApiExternalDocs { Description = "description", Url = new Uri("http://localhost") }, true],
-    ];
-
-    [Theory]
-    [MemberData(nameof(Data))]
-    public void ProducesCorrectEqualityForOpenApiExternalDocs(OpenApiExternalDocs externalDocs, OpenApiExternalDocs anotherExternalDocs, bool isEqual)
-        => Assert.Equal(isEqual, OpenApiExternalDocsComparer.Instance.Equals(externalDocs, anotherExternalDocs));
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiReferenceComparerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiReferenceComparerTests.cs
deleted file mode 100644
index baa1526f50c9..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiReferenceComparerTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
-
-public class OpenApiReferenceComparerTests
-{
-    public static object[][] Data => [
-        [new OpenApiReference(), new OpenApiReference(), true],
-        [new OpenApiReference(), new OpenApiReference { Id = "id" }, false],
-        [new OpenApiReference { Id = "id" }, new OpenApiReference { Id = "id" }, true],
-        [new OpenApiReference { Id = "id" }, new OpenApiReference { Id = "id", Type = ReferenceType.Schema }, false],
-        [new OpenApiReference { Id = "id", Type = ReferenceType.Schema }, new OpenApiReference { Id = "id", Type = ReferenceType.Schema }, true],
-        [new OpenApiReference { Id = "id", Type = ReferenceType.Schema }, new OpenApiReference { Id = "id", Type = ReferenceType.Response }, false],
-        [new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet.json" }, new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet.json" }, true],
-        [new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet.json" }, new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet2.json" }, false],
-        [new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet.json", HostDocument = new OpenApiDocument() }, new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet.json", HostDocument = new OpenApiDocument() }, true],
-        [new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet.json", HostDocument = new OpenApiDocument { Info = new() { Title = "Test" }} }, new OpenApiReference { Id = "id", Type = ReferenceType.Response, ExternalResource = "http://localhost/pet2.json", HostDocument = new OpenApiDocument() }, false]
-    ];
-
-    [Theory]
-    [MemberData(nameof(Data))]
-    public void ProducesCorrectEqualityForOpenApiReference(OpenApiReference reference, OpenApiReference anotherReference, bool isEqual)
-        => Assert.Equal(isEqual, OpenApiReferenceComparer.Instance.Equals(reference, anotherReference));
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiSchemaComparerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiSchemaComparerTests.cs
deleted file mode 100644
index d1243f078703..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiSchemaComparerTests.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-
-public class OpenApiSchemaComparerTests
-{
-    public static object[][] SinglePropertyData => [
-        [new OpenApiSchema { Title = "Title" }, new OpenApiSchema { Title = "Title" }, true],
-        [new OpenApiSchema { Title = "Title" }, new OpenApiSchema { Title = "Another Title" }, false],
-        [new OpenApiSchema { Type = "string" }, new OpenApiSchema { Type = "string" }, true],
-        [new OpenApiSchema { Type = "string" }, new OpenApiSchema { Type = "integer" }, false],
-        [new OpenApiSchema { Format = "int32" }, new OpenApiSchema { Format = "int32" }, true],
-        [new OpenApiSchema { Format = "int32" }, new OpenApiSchema { Format = "int64" }, false],
-        [new OpenApiSchema { Maximum = 10 }, new OpenApiSchema { Maximum = 10 }, true],
-        [new OpenApiSchema { Maximum = 10 }, new OpenApiSchema { Maximum = 20 }, false],
-        [new OpenApiSchema { Minimum = 10 }, new OpenApiSchema { Minimum = 10 }, true],
-        [new OpenApiSchema { Minimum = 10 }, new OpenApiSchema { Minimum = 20 }, false],
-        [new OpenApiSchema { ExclusiveMaximum = true }, new OpenApiSchema { ExclusiveMaximum = true }, true],
-        [new OpenApiSchema { ExclusiveMaximum = true }, new OpenApiSchema { ExclusiveMaximum = false }, false],
-        [new OpenApiSchema { ExclusiveMinimum = true }, new OpenApiSchema { ExclusiveMinimum = true }, true],
-        [new OpenApiSchema { ExclusiveMinimum = true }, new OpenApiSchema { ExclusiveMinimum = false }, false],
-        [new OpenApiSchema { MaxLength = 10 }, new OpenApiSchema { MaxLength = 10 }, true],
-        [new OpenApiSchema { MaxLength = 10 }, new OpenApiSchema { MaxLength = 20 }, false],
-        [new OpenApiSchema { MinLength = 10 }, new OpenApiSchema { MinLength = 10 }, true],
-        [new OpenApiSchema { MinLength = 10 }, new OpenApiSchema { MinLength = 20 }, false],
-        [new OpenApiSchema { Pattern = "pattern" }, new OpenApiSchema { Pattern = "pattern" }, true],
-        [new OpenApiSchema { Pattern = "pattern" }, new OpenApiSchema { Pattern = "another pattern" }, false],
-        [new OpenApiSchema { MaxItems = 10 }, new OpenApiSchema { MaxItems = 10 }, true],
-        [new OpenApiSchema { MaxItems = 10 }, new OpenApiSchema { MaxItems = 20 }, false],
-        [new OpenApiSchema { MinItems = 10 }, new OpenApiSchema { MinItems = 10 }, true],
-        [new OpenApiSchema { MinItems = 10 }, new OpenApiSchema { MinItems = 20 }, false],
-        [new OpenApiSchema { UniqueItems = true }, new OpenApiSchema { UniqueItems = true }, true],
-        [new OpenApiSchema { UniqueItems = true }, new OpenApiSchema { UniqueItems = false }, false],
-        [new OpenApiSchema { MaxProperties = 10 }, new OpenApiSchema { MaxProperties = 10 }, true],
-        [new OpenApiSchema { MaxProperties = 10 }, new OpenApiSchema { MaxProperties = 20 }, false],
-        [new OpenApiSchema { MinProperties = 10 }, new OpenApiSchema { MinProperties = 10 }, true],
-        [new OpenApiSchema { MinProperties = 10 }, new OpenApiSchema { MinProperties = 20 }, false],
-        [new OpenApiSchema { Required = new HashSet<string>() { "required" } }, new OpenApiSchema { Required = new HashSet<string> { "required" } }, true],
-        [new OpenApiSchema { Required = new HashSet<string>() { "name", "age" } }, new OpenApiSchema { Required = new HashSet<string> { "age", "name" } }, true],
-        [new OpenApiSchema { Required = new HashSet<string>() { "required" } }, new OpenApiSchema { Required = new HashSet<string> { "another required" } }, false],
-        [new OpenApiSchema { Enum = [new OpenApiString("value")] }, new OpenApiSchema { Enum = [new OpenApiString("value")] }, true],
-        [new OpenApiSchema { Enum = [new OpenApiString("value")] }, new OpenApiSchema { Enum = [new OpenApiString("value2" )] }, false],
-        [new OpenApiSchema { Enum = [new OpenApiString("value"), new OpenApiString("value2")] }, new OpenApiSchema { Enum = [new OpenApiString("value2" ), new OpenApiString("value" )] }, false],
-        [new OpenApiSchema { Items = new OpenApiSchema { Type = "string" } }, new OpenApiSchema { Items = new OpenApiSchema { Type = "string" } }, true],
-        [new OpenApiSchema { Items = new OpenApiSchema { Type = "string" } }, new OpenApiSchema { Items = new OpenApiSchema { Type = "integer" } }, false],
-        [new OpenApiSchema { Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema { Type = "string" } } }, new OpenApiSchema { Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema { Type = "string" } } }, true],
-        [new OpenApiSchema { Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema { Type = "string" } } }, new OpenApiSchema { Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema { Type = "integer" } } }, false],
-        [new OpenApiSchema { AdditionalProperties = new OpenApiSchema { Type = "string" } }, new OpenApiSchema { AdditionalProperties = new OpenApiSchema { Type = "string" } }, true],
-        [new OpenApiSchema { AdditionalProperties = new OpenApiSchema { Type = "string" } }, new OpenApiSchema { AdditionalProperties = new OpenApiSchema { Type = "integer" } }, false],
-        [new OpenApiSchema { Description = "Description" }, new OpenApiSchema { Description = "Description" }, true],
-        [new OpenApiSchema { Description = "Description" }, new OpenApiSchema { Description = "Another Description" }, false],
-        [new OpenApiSchema { Deprecated = true }, new OpenApiSchema { Deprecated = true }, true],
-        [new OpenApiSchema { Deprecated = true }, new OpenApiSchema { Deprecated = false }, false],
-        [new OpenApiSchema { ExternalDocs = new OpenApiExternalDocs { Description = "Description" } }, new OpenApiSchema { ExternalDocs = new OpenApiExternalDocs { Description = "Description" } }, true],
-        [new OpenApiSchema { ExternalDocs = new OpenApiExternalDocs { Description = "Description" } }, new OpenApiSchema { ExternalDocs = new OpenApiExternalDocs { Description = "Another Description" } }, false],
-        [new OpenApiSchema { UnresolvedReference = true }, new OpenApiSchema { UnresolvedReference = true }, true],
-        [new OpenApiSchema { UnresolvedReference = true }, new OpenApiSchema { UnresolvedReference = false }, false],
-        [new OpenApiSchema { Reference = new OpenApiReference { Id = "Id", Type = ReferenceType.Schema } }, new OpenApiSchema { Reference = new OpenApiReference { Id = "Id", Type = ReferenceType.Schema } }, true],
-        [new OpenApiSchema { Reference = new OpenApiReference { Id = "Id", Type = ReferenceType.Schema } }, new OpenApiSchema { Reference = new OpenApiReference { Id = "Another Id", Type = ReferenceType.Schema } }, false],
-        [new OpenApiSchema { Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("value") } }, new OpenApiSchema { Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("value") } }, true],
-        [new OpenApiSchema { Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("value") } }, new OpenApiSchema { Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("another value") } }, false],
-        [new OpenApiSchema { Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("value") } }, new OpenApiSchema { Extensions = new Dictionary<string, IOpenApiExtension> { ["key2"] = new OpenApiString("value") } }, false],
-        [new OpenApiSchema { Xml = new OpenApiXml { Name = "Name" } }, new OpenApiSchema { Xml = new OpenApiXml { Name = "Name" } }, true],
-        [new OpenApiSchema { Xml = new OpenApiXml { Name = "Name" } }, new OpenApiSchema { Xml = new OpenApiXml { Name = "Another Name" } }, false],
-        [new OpenApiSchema { Nullable = true }, new OpenApiSchema { Nullable = true }, true],
-        [new OpenApiSchema { Nullable = true }, new OpenApiSchema { Nullable = false }, false],
-        [new OpenApiSchema { ReadOnly = true }, new OpenApiSchema { ReadOnly = true }, true],
-        [new OpenApiSchema { ReadOnly = true }, new OpenApiSchema { ReadOnly = false }, false],
-        [new OpenApiSchema { WriteOnly = true }, new OpenApiSchema { WriteOnly = true }, true],
-        [new OpenApiSchema { WriteOnly = true }, new OpenApiSchema { WriteOnly = false }, false],
-        [new OpenApiSchema { Discriminator = new OpenApiDiscriminator { PropertyName = "PropertyName" } }, new OpenApiSchema { Discriminator = new OpenApiDiscriminator { PropertyName = "PropertyName" } }, true],
-        [new OpenApiSchema { Discriminator = new OpenApiDiscriminator { PropertyName = "PropertyName" } }, new OpenApiSchema { Discriminator = new OpenApiDiscriminator { PropertyName = "AnotherPropertyName" } }, false],
-        [new OpenApiSchema { Example = new OpenApiString("example") }, new OpenApiSchema { Example = new OpenApiString("example") }, true],
-        [new OpenApiSchema { Example = new OpenApiString("example") }, new OpenApiSchema { Example = new OpenApiString("another example") }, false],
-        [new OpenApiSchema { Example = new OpenApiInteger(2) }, new OpenApiSchema { Example = new OpenApiString("another example") }, false],
-        [new OpenApiSchema { AdditionalPropertiesAllowed = true }, new OpenApiSchema { AdditionalPropertiesAllowed = true }, true],
-        [new OpenApiSchema { AdditionalPropertiesAllowed = true }, new OpenApiSchema { AdditionalPropertiesAllowed = false }, false],
-        [new OpenApiSchema { Not = new OpenApiSchema { Type = "string" } }, new OpenApiSchema { Not = new OpenApiSchema { Type = "string" } }, true],
-        [new OpenApiSchema { Not = new OpenApiSchema { Type = "string" } }, new OpenApiSchema { Not = new OpenApiSchema { Type = "integer" } }, false],
-        [new OpenApiSchema { AnyOf = [new OpenApiSchema { Type = "string" }] }, new OpenApiSchema { AnyOf = [new OpenApiSchema { Type = "string" }] }, true],
-        [new OpenApiSchema { AnyOf = [new OpenApiSchema { Type = "string" }] }, new OpenApiSchema { AnyOf = [new OpenApiSchema { Type = "integer" }] }, false],
-        [new OpenApiSchema { AllOf = [new OpenApiSchema { Type = "string" }] }, new OpenApiSchema { AllOf = [new OpenApiSchema { Type = "string" }] }, true],
-        [new OpenApiSchema { AllOf = [new OpenApiSchema { Type = "string" }] }, new OpenApiSchema { AllOf = [new OpenApiSchema { Type = "integer" }] }, false],
-        [new OpenApiSchema { OneOf = [new OpenApiSchema { Type = "string" }] }, new OpenApiSchema { OneOf = [new OpenApiSchema { Type = "string" }] }, true],
-        [new OpenApiSchema { OneOf = [new OpenApiSchema { Type = "string" }] }, new OpenApiSchema { OneOf = [new OpenApiSchema { Type = "integer" }] }, false],
-        [new OpenApiSchema { MultipleOf = 10 }, new OpenApiSchema { MultipleOf = 10 }, true],
-        [new OpenApiSchema { MultipleOf = 10 }, new OpenApiSchema { MultipleOf = 20 }, false],
-        [new OpenApiSchema { Default = new OpenApiString("default") }, new OpenApiSchema { Default = new OpenApiString("default") }, true],
-        [new OpenApiSchema { Default = new OpenApiString("default") }, new OpenApiSchema { Default = new OpenApiString("another default") }, false],
-    ];
-
-    [Theory]
-    [MemberData(nameof(SinglePropertyData))]
-    public void ProducesCorrectEqualityForOpenApiSchema(OpenApiSchema schema, OpenApiSchema anotherSchema, bool isEqual)
-        => Assert.Equal(isEqual, OpenApiSchemaComparer.Instance.Equals(schema, anotherSchema));
-
-    [Fact]
-    public void ValidatePropertiesOnOpenApiSchema()
-    {
-        var propertyNames = typeof(OpenApiSchema).GetProperties().Select(property => property.Name).ToList();
-        var originalSchema = new OpenApiSchema
-        {
-            AdditionalProperties = new OpenApiSchema(),
-            AdditionalPropertiesAllowed = true,
-            AllOf = [new OpenApiSchema()],
-            AnyOf = [new OpenApiSchema()],
-            Deprecated = true,
-            Default = new OpenApiString("default"),
-            Description = "description",
-            Discriminator = new OpenApiDiscriminator(),
-            Example = new OpenApiString("example"),
-            ExclusiveMaximum = true,
-            ExclusiveMinimum = true,
-            Extensions = new Dictionary<string, IOpenApiExtension>
-            {
-                ["key"] = new OpenApiString("value")
-            },
-            ExternalDocs = new OpenApiExternalDocs(),
-            Enum = [new OpenApiString("test")],
-            Format = "object",
-            Items = new OpenApiSchema(),
-            Maximum = 10,
-            MaxItems = 10,
-            MaxLength = 10,
-            MaxProperties = 10,
-            Minimum = 10,
-            MinItems = 10,
-            MinLength = 10,
-            MinProperties = 10,
-            MultipleOf = 10,
-            OneOf = [new OpenApiSchema()],
-            Not = new OpenApiSchema(),
-            Nullable = false,
-            Pattern = "pattern",
-            Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema() },
-            ReadOnly = true,
-            Required = new HashSet<string> { "required" },
-            Reference = new OpenApiReference { Id = "Id", Type = ReferenceType.Schema },
-            UniqueItems = false,
-            UnresolvedReference = true,
-            WriteOnly = true,
-            Xml = new OpenApiXml { Name = "Name" },
-            Annotations = new Dictionary<string, object> { ["key"] = "value" }
-        };
-
-        OpenApiSchema modifiedSchema = new(originalSchema) { AdditionalProperties = new OpenApiSchema { Type = "string" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AdditionalProperties)));
-
-        modifiedSchema = new(originalSchema) { AdditionalPropertiesAllowed = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AdditionalPropertiesAllowed)));
-
-        modifiedSchema = new(originalSchema) { AllOf = [new OpenApiSchema { Type = "string" }] };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AllOf)));
-
-        modifiedSchema = new(originalSchema) { AnyOf = [new OpenApiSchema { Type = "string" }] };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AnyOf)));
-
-        modifiedSchema = new(originalSchema) { Deprecated = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Deprecated)));
-
-        modifiedSchema = new(originalSchema) { Default = new OpenApiString("another default") };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Default)));
-
-        modifiedSchema = new(originalSchema) { Description = "another description" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Description)));
-
-        modifiedSchema = new(originalSchema) { Discriminator = new OpenApiDiscriminator { PropertyName = "PropertyName" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Discriminator)));
-
-        modifiedSchema = new(originalSchema) { Example = new OpenApiString("another example") };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Example)));
-
-        modifiedSchema = new(originalSchema) { ExclusiveMaximum = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ExclusiveMaximum)));
-
-        modifiedSchema = new(originalSchema) { ExclusiveMinimum = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ExclusiveMinimum)));
-
-        modifiedSchema = new(originalSchema) { Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("another value") } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Extensions)));
-
-        modifiedSchema = new(originalSchema) { ExternalDocs = new OpenApiExternalDocs { Description = "another description" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ExternalDocs)));
-
-        modifiedSchema = new(originalSchema) { Enum = [new OpenApiString("another test")] };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Enum)));
-
-        modifiedSchema = new(originalSchema) { Format = "string" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Format)));
-
-        modifiedSchema = new(originalSchema) { Items = new OpenApiSchema { Type = "string" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Items)));
-
-        modifiedSchema = new(originalSchema) { Maximum = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Maximum)));
-
-        modifiedSchema = new(originalSchema) { MaxItems = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MaxItems)));
-
-        modifiedSchema = new(originalSchema) { MaxLength = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MaxLength)));
-
-        modifiedSchema = new(originalSchema) { MaxProperties = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MaxProperties)));
-
-        modifiedSchema = new(originalSchema) { Minimum = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Minimum)));
-
-        modifiedSchema = new(originalSchema) { MinItems = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MinItems)));
-
-        modifiedSchema = new(originalSchema) { MinLength = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MinLength)));
-
-        modifiedSchema = new(originalSchema) { MinProperties = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MinProperties)));
-
-        modifiedSchema = new(originalSchema) { MultipleOf = 20 };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MultipleOf)));
-
-        modifiedSchema = new(originalSchema) { OneOf = [new OpenApiSchema { Type = "string" }] };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.OneOf)));
-
-        modifiedSchema = new(originalSchema) { Not = new OpenApiSchema { Type = "string" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Not)));
-
-        modifiedSchema = new(originalSchema) { Nullable = true };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Nullable)));
-
-        modifiedSchema = new(originalSchema) { Pattern = "another pattern" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Pattern)));
-
-        modifiedSchema = new(originalSchema) { Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema { Type = "integer" } } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Properties)));
-
-        modifiedSchema = new(originalSchema) { ReadOnly = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ReadOnly)));
-
-        modifiedSchema = new(originalSchema) { Required = new HashSet<string> { "another required" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Required)));
-
-        modifiedSchema = new(originalSchema) { Reference = new OpenApiReference { Id = "Another Id", Type = ReferenceType.Schema } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Reference)));
-
-        modifiedSchema = new(originalSchema) { Title = "Another Title" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Title)));
-
-        modifiedSchema = new(originalSchema) { Type = "integer" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Type)));
-
-        modifiedSchema = new(originalSchema) { UniqueItems = true };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.UniqueItems)));
-
-        modifiedSchema = new(originalSchema) { UnresolvedReference = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.UnresolvedReference)));
-
-        modifiedSchema = new(originalSchema) { WriteOnly = false };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.WriteOnly)));
-
-        modifiedSchema = new(originalSchema) { Xml = new OpenApiXml { Name = "Another Name" } };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Xml)));
-
-        // Disregard annotations in comparison checks since they are in-memory constructs
-        modifiedSchema = new(originalSchema);
-        modifiedSchema.Annotations["key"] = "another value";
-        Assert.True(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Annotations)));
-
-        Assert.Empty(propertyNames);
-    }
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiXmlComparerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiXmlComparerTests.cs
deleted file mode 100644
index 49b116efb0f0..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Comparers/OpenApiXmlComparerTests.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
-
-public class OpenApiXmlComparerTests
-{
-    public static object[][] Data => [
-        [new OpenApiXml(), new OpenApiXml(), true],
-        [new OpenApiXml(), new OpenApiXml { Name = "name" }, false],
-        [new OpenApiXml { Name = "name" }, new OpenApiXml { Name = "name" }, true],
-        [new OpenApiXml { Name = "name" }, new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace") }, false],
-        [new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace") }, new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace") }, true],
-        [new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace") }, new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace2") }, false],
-        [new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace"), Prefix = "prefix" }, new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace"), Prefix = "prefix" }, true],
-        [new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace"), Prefix = "prefix" }, new OpenApiXml { Name = "name", Namespace = new Uri("http://localhost.com/namespace"), Prefix = "prefix2" }, false]
-    ];
-
-    [Theory]
-    [MemberData(nameof(Data))]
-    public void ProducesCorrectEqualityForOpenApiXml(OpenApiXml xml, OpenApiXml anotherXml, bool isEqual)
-        => Assert.Equal(isEqual, OpenApiXmlComparer.Instance.Equals(xml, anotherXml));
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/ApiDescriptionExtensionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/ApiDescriptionExtensionsTests.cs
index cc0d4e872c9a..0fbbce9ac27a 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/ApiDescriptionExtensionsTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/ApiDescriptionExtensionsTests.cs
@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.OpenApi.Models;
 
 public class ApiDescriptionExtensionsTests
 {
@@ -31,44 +31,36 @@ public void MapRelativePathToItemPath_ReturnsItemPathForApiDescription(string re
         Assert.Equal(expectedItemPath, itemPath);
     }
 
-    [Theory]
-    [InlineData("GET", OperationType.Get)]
-    [InlineData("POST", OperationType.Post)]
-    [InlineData("PUT", OperationType.Put)]
-    [InlineData("DELETE", OperationType.Delete)]
-    [InlineData("PATCH", OperationType.Patch)]
-    [InlineData("HEAD", OperationType.Head)]
-    [InlineData("OPTIONS", OperationType.Options)]
-    [InlineData("TRACE", OperationType.Trace)]
-    [InlineData("gEt", OperationType.Get)]
-    public void ToOperationType_ReturnsOperationTypeForApiDescription(string httpMethod, OperationType expectedOperationType)
+    public static class HttpMethodTestData
     {
-        // Arrange
-        var apiDescription = new ApiDescription
+        public static IEnumerable<object[]> TestCases => new List<object[]>
         {
-            HttpMethod = httpMethod
+            new object[] { "GET", HttpMethod.Get },
+            new object[] { "POST", HttpMethod.Post },
+            new object[] { "PUT", HttpMethod.Put },
+            new object[] { "DELETE", HttpMethod.Delete },
+            new object[] { "PATCH", HttpMethod.Patch },
+            new object[] { "HEAD", HttpMethod.Head },
+            new object[] { "OPTIONS", HttpMethod.Options },
+            new object[] { "TRACE", HttpMethod.Trace },
+            new object[] { "gEt", HttpMethod.Get }, // Test case-insensitivity
         };
-
-        // Act
-        var operationType = apiDescription.GetOperationType();
-
-        // Assert
-        Assert.Equal(expectedOperationType, operationType);
     }
 
     [Theory]
-    [InlineData("UNKNOWN")]
-    [InlineData("unknown")]
-    public void ToOperationType_ThrowsForUnknownHttpMethod(string methodName)
+    [MemberData(nameof(HttpMethodTestData.TestCases), MemberType = typeof(HttpMethodTestData))]
+    public void GetHttpMethod_ReturnsHttpMethodForApiDescription(string httpMethod, HttpMethod expectedHttpMethod)
     {
         // Arrange
         var apiDescription = new ApiDescription
         {
-            HttpMethod = methodName
+            HttpMethod = httpMethod
         };
 
-        // Act & Assert
-        var exception = Assert.Throws<InvalidOperationException>(() => apiDescription.GetOperationType());
-        Assert.Equal($"Unsupported HTTP method: {methodName}", exception.Message);
+        // Act
+        var result = apiDescription.GetHttpMethod();
+
+        // Assert
+        Assert.Equal(expectedHttpMethod, result);
     }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonNodeSchemaExtensionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonNodeSchemaExtensionsTests.cs
new file mode 100644
index 000000000000..bf4126735a9d
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonNodeSchemaExtensionsTests.cs
@@ -0,0 +1,150 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.AspNetCore.OpenApi.Tests;
+
+public static class JsonNodeSchemaExtensionsTests
+{
+    public static TheoryData<string, bool, RangeAttribute, string, string> TestCases()
+    {
+        bool[] isExclusive = [false, true];
+
+        string[] invariantOrEnglishCultures =
+        [
+            string.Empty,
+            "en",
+            "en-AU",
+            "en-GB",
+            "en-US",
+        ];
+
+        string[] commaForDecimalCultures =
+        [
+            "de-DE",
+            "fr-FR",
+            "sv-SE",
+        ];
+
+        Type[] fractionNumberTypes =
+        [
+            typeof(float),
+            typeof(double),
+            typeof(decimal),
+        ];
+
+        var testCases = new TheoryData<string, bool, RangeAttribute, string, string>();
+
+        foreach (var culture in invariantOrEnglishCultures)
+        {
+            foreach (var exclusive in isExclusive)
+            {
+                testCases.Add(culture, exclusive, new(1, 1234) { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1", "1234");
+                testCases.Add(culture, exclusive, new(1d, 1234d) { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1", "1234");
+                testCases.Add(culture, exclusive, new(1.23, 4.56) { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1.23", "4.56");
+
+                foreach (var type in fractionNumberTypes)
+                {
+                    testCases.Add(culture, exclusive, new(type, "1.23", "4.56") { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1.23", "4.56");
+                    testCases.Add(culture, exclusive, new(type, "1.23", "4.56") { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive, ParseLimitsInInvariantCulture = true }, "1.23", "4.56");
+                }
+            }
+        }
+
+        foreach (var culture in commaForDecimalCultures)
+        {
+            foreach (var exclusive in isExclusive)
+            {
+                testCases.Add(culture, exclusive, new(1, 1234) { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1", "1234");
+                testCases.Add(culture, exclusive, new(1d, 1234d) { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1", "1234");
+                testCases.Add(culture, exclusive, new(1.23, 4.56) { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1.23", "4.56");
+
+                foreach (var type in fractionNumberTypes)
+                {
+                    testCases.Add(culture, exclusive, new(type, "1,23", "4,56") { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "1.23", "4.56");
+                    testCases.Add(culture, exclusive, new(type, "1.23", "4.56") { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive, ParseLimitsInInvariantCulture = true }, "1.23", "4.56");
+                }
+            }
+        }
+
+        // Numbers using numeric format, such as with thousands separators
+        testCases.Add("en-GB", false, new(typeof(float), "-12,445.7", "12,445.7"), "-12445.7", "12445.7");
+        testCases.Add("fr-FR", false, new(typeof(float), "-12 445,7", "12 445,7"), "-12445.7", "12445.7");
+        testCases.Add("sv-SE", false, new(typeof(float), "-12 445,7", "12 445,7"), "-12445.7", "12445.7");
+
+        // Decimal value that would lose precision if parsed as a float or double
+        foreach (var exclusive in isExclusive)
+        {
+            testCases.Add("en-US", exclusive, new(typeof(decimal), "12345678901234567890.123456789", "12345678901234567890.123456789") { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive }, "12345678901234567890.123456789", "12345678901234567890.123456789");
+            testCases.Add("en-US", exclusive, new(typeof(decimal), "12345678901234567890.123456789", "12345678901234567890.123456789") { MaximumIsExclusive = exclusive, MinimumIsExclusive = exclusive, ParseLimitsInInvariantCulture = true }, "12345678901234567890.123456789", "12345678901234567890.123456789");
+        }
+
+        return testCases;
+    }
+
+    [Theory]
+    [MemberData(nameof(TestCases))]
+    public static void ApplyValidationAttributes_Handles_RangeAttribute_Correctly(
+        string cultureName,
+        bool isExclusive,
+        RangeAttribute rangeAttribute,
+        string expectedMinimum,
+        string expectedMaximum)
+    {
+        // Arrange
+        var minimum = decimal.Parse(expectedMinimum, CultureInfo.InvariantCulture);
+        var maximum = decimal.Parse(expectedMaximum, CultureInfo.InvariantCulture);
+
+        var schema = new JsonObject();
+
+        // Act
+        var previous = CultureInfo.CurrentCulture;
+
+        try
+        {
+            CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo(cultureName);
+
+            schema.ApplyValidationAttributes([rangeAttribute]);
+        }
+        finally
+        {
+            CultureInfo.CurrentCulture = previous;
+        }
+
+        // Assert
+        if (isExclusive)
+        {
+            Assert.Equal(minimum, schema["exclusiveMinimum"].GetValue<decimal>());
+            Assert.Equal(maximum, schema["exclusiveMaximum"].GetValue<decimal>());
+            Assert.False(schema.TryGetPropertyValue("minimum", out _));
+            Assert.False(schema.TryGetPropertyValue("maximum", out _));
+        }
+        else
+        {
+            Assert.Equal(minimum, schema["minimum"].GetValue<decimal>());
+            Assert.Equal(maximum, schema["maximum"].GetValue<decimal>());
+            Assert.False(schema.TryGetPropertyValue("exclusiveMinimum", out _));
+            Assert.False(schema.TryGetPropertyValue("exclusiveMaximum", out _));
+        }
+    }
+
+    [Fact]
+    public static void ApplyValidationAttributes_Handles_Invalid_RangeAttribute_Values()
+    {
+        // Arrange
+        var rangeAttribute = new RangeAttribute(typeof(int), "foo", "bar");
+        var schema = new JsonObject();
+
+        // Act
+        schema.ApplyValidationAttributes([rangeAttribute]);
+
+        // Assert
+        Assert.False(schema.TryGetPropertyValue("minimum", out _));
+        Assert.False(schema.TryGetPropertyValue("maximum", out _));
+        Assert.False(schema.TryGetPropertyValue("exclusiveMinimum", out _));
+        Assert.False(schema.TryGetPropertyValue("exclusiveMaximum", out _));
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonTypeInfoExtensionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonTypeInfoExtensionsTests.cs
index 641dbf65d75b..a402ef393a59 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonTypeInfoExtensionsTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/JsonTypeInfoExtensionsTests.cs
@@ -5,6 +5,7 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OpenApi;
 
@@ -17,6 +18,21 @@ private class Container
         internal delegate void ContainedTestDelegate(int x, int y);
     }
 
+    /// <remarks>
+    /// https://github.com/dotnet/aspnetcore/issues/59092
+    /// </remarks>
+    public static class Foo<T>
+    {
+        public static class Bar<TT>
+        {
+            public class Baz
+            {
+                public required T One { get; set; }
+                public required TT Two { get; set; }
+            }
+        }
+    }
+
     /// <summary>
     /// This data is used to test the <see cref="TypeExtensions.GetSchemaReferenceId"/> method
     /// which is used to generate reference IDs for OpenAPI schemas in the OpenAPI document.
@@ -43,6 +59,8 @@ private class Container
         [(new { Id = 1, Name = "Todo" }).GetType(), "AnonymousTypeOfintAndstring"],
         [typeof(IFormFile), "IFormFile"],
         [typeof(IFormFileCollection), "IFormFileCollection"],
+        [typeof(JsonPatchDocument), "JsonPatchDocument"],
+        [typeof(JsonPatchDocument<Todo>), "JsonPatchDocument"],
         [typeof(Stream), "Stream"],
         [typeof(PipeReader), "PipeReader"],
         [typeof(Results<Ok<TodoWithDueDate>, Ok<Todo>>), "ResultsOfOkOfTodoWithDueDateAndOkOfTodo"],
@@ -58,6 +76,7 @@ private class Container
         [typeof(Dictionary<string, string[]>), null],
         [typeof(Dictionary<string, List<string[]>>), null],
         [typeof(Dictionary<string, IEnumerable<string[]>>), null],
+        [typeof(Foo<int>.Bar<string>.Baz), "BazOfintAndstring"],
     ];
 
     [Theory]
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiEndpointRouteBuilderExtensionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiEndpointRouteBuilderExtensionsTests.cs
index be44b44344ce..1df8c8647ba5 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiEndpointRouteBuilderExtensionsTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiEndpointRouteBuilderExtensionsTests.cs
@@ -9,8 +9,8 @@
 using static Microsoft.AspNetCore.OpenApi.Tests.OpenApiOperationGeneratorTests;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
+using Microsoft.OpenApi;
+using Microsoft.OpenApi.Reader;
 using System.Text;
 
 public class OpenApiEndpointRouteBuilderExtensionsTests : OpenApiDocumentServiceTestBase
@@ -29,11 +29,13 @@ public void MapOpenApi_ReturnsEndpointConventionBuilder()
         Assert.IsAssignableFrom<IEndpointConventionBuilder>(returnedBuilder);
     }
 
-    [Fact]
-    public void MapOpenApi_SupportsCustomizingPath()
+    [Theory]
+    [InlineData("/custom/{documentName}/openapi.json")]
+    [InlineData("/custom/{documentName}/openapi.yaml")]
+    [InlineData("/custom/{documentName}/openapi.yml")]
+    public void MapOpenApi_SupportsCustomizingPath(string expectedPath)
     {
         // Arrange
-        var expectedPath = "/custom/{documentName}/openapi.json";
         var serviceProvider = CreateServiceProvider();
         var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
 
@@ -57,7 +59,7 @@ public async Task MapOpenApi_ReturnsRenderedDocument()
         context.Response.Body = responseBodyStream;
         context.RequestServices = serviceProvider;
         context.Request.RouteValues.Add("documentName", "v1");
-        var endpoint = builder.DataSources.First().Endpoints.First();
+        var endpoint = builder.DataSources.First().Endpoints[0];
 
         // Act
         var requestDelegate = endpoint.RequestDelegate;
@@ -65,25 +67,29 @@ public async Task MapOpenApi_ReturnsRenderedDocument()
 
         // Assert
         Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
-        ValidateOpenApiDocument(responseBodyStream, document =>
+        await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
             Assert.Equal("OpenApiEndpointRouteBuilderExtensionsTests | v1", document.Info.Title);
             Assert.Equal("1.0.0", document.Info.Version);
         });
     }
 
-    [Fact]
-    public async Task MapOpenApi_ReturnsDefaultDocumentIfNoNameProvided()
+    [Theory]
+    [InlineData("/openapi.json", "application/json;charset=utf-8", false)]
+    [InlineData("/openapi.toml", "application/json;charset=utf-8", false)]
+    [InlineData("/openapi.yaml", "text/plain+yaml;charset=utf-8", true)]
+    [InlineData("/openapi.yml", "text/plain+yaml;charset=utf-8", true)]
+    public async Task MapOpenApi_ReturnsDefaultDocumentIfNoNameProvided(string expectedPath, string expectedContentType, bool isYaml)
     {
         // Arrange
         var serviceProvider = CreateServiceProvider();
         var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
-        builder.MapOpenApi("/openapi.json");
+        builder.MapOpenApi(expectedPath);
         var context = new DefaultHttpContext();
         var responseBodyStream = new MemoryStream();
         context.Response.Body = responseBodyStream;
         context.RequestServices = serviceProvider;
-        var endpoint = builder.DataSources.First().Endpoints.First();
+        var endpoint = builder.DataSources.First().Endpoints[0];
 
         // Act
         var requestDelegate = endpoint.RequestDelegate;
@@ -91,11 +97,16 @@ public async Task MapOpenApi_ReturnsDefaultDocumentIfNoNameProvided()
 
         // Assert
         Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
-        ValidateOpenApiDocument(responseBodyStream, document =>
+        Assert.Equal(expectedContentType, context.Response.ContentType);
+        var responseString = Encoding.UTF8.GetString(responseBodyStream.ToArray());
+        // String check to validate that generated document starts with YAML syntax
+        Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.1'", StringComparison.OrdinalIgnoreCase));
+        responseBodyStream.Position = 0;
+        await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
             Assert.Equal("OpenApiEndpointRouteBuilderExtensionsTests | v1", document.Info.Title);
             Assert.Equal("1.0.0", document.Info.Version);
-        });
+        }, isYaml ? "yaml" : "json");
     }
 
     [Fact]
@@ -110,7 +121,7 @@ public async Task MapOpenApi_Returns404ForUnresolvedDocument()
         context.Response.Body = responseBodyStream;
         context.RequestServices = serviceProvider;
         context.Request.RouteValues.Add("documentName", "v2");
-        var endpoint = builder.DataSources.First().Endpoints.First();
+        var endpoint = builder.DataSources.First().Endpoints[0];
 
         // Act
         var requestDelegate = endpoint.RequestDelegate;
@@ -121,8 +132,71 @@ public async Task MapOpenApi_Returns404ForUnresolvedDocument()
         Assert.Equal("No OpenAPI document with the name 'v2' was found.", Encoding.UTF8.GetString(responseBodyStream.ToArray()));
     }
 
+    [Theory]
+    [InlineData("CaseSensitive", "casesensitive")]
+    [InlineData("casesensitive", "CaseSensitive")]
+    public async Task MapOpenApi_ReturnsDocumentWhenPathIsCaseSensitive(string registeredDocumentName, string requestedDocumentName)
+    {
+        // Arrange
+        var serviceProvider = CreateServiceProvider(registeredDocumentName);
+        var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
+        builder.MapOpenApi("/openapi/{documentName}.json");
+        var context = new DefaultHttpContext();
+        var responseBodyStream = new MemoryStream();
+        context.Response.Body = responseBodyStream;
+        context.RequestServices = serviceProvider;
+        context.Request.RouteValues.Add("documentName", requestedDocumentName);
+        var endpoint = builder.DataSources.First().Endpoints[0];
+
+        // Act
+        var requestDelegate = endpoint.RequestDelegate;
+        await requestDelegate(context);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+    }
+
     [Fact]
-    public async Task MapOpenApi_ReturnsDocumentIfNameProvidedInQuery()
+    public async Task MapOpenApi_ShouldRetrieveOptionsInACaseInsensitiveManner()
+    {
+        // Arrange
+        var hostEnvironment = new HostEnvironment() { ApplicationName = nameof(OpenApiEndpointRouteBuilderExtensionsTests) };
+        var serviceProviderIsService = new ServiceProviderIsService();
+        var serviceProvider = CreateServiceProvider("casesensitive", OpenApiSpecVersion.OpenApi2_0);
+        var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
+        builder.MapOpenApi("/openapi/{documentName}.json");
+        var context = new DefaultHttpContext();
+        var responseBodyStream = new MemoryStream();
+        context.Response.Body = responseBodyStream;
+        context.RequestServices = serviceProvider;
+        context.Request.RouteValues.Add("documentName", "CaseSensitive");
+        var endpoint = builder.DataSources.First().Endpoints[0];
+
+        // Act
+        var requestDelegate = endpoint.RequestDelegate;
+        await requestDelegate(context);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+        var responseString = Encoding.UTF8.GetString(responseBodyStream.ToArray());
+
+        // When we receive an OpenAPI document, we use an OptionsMonitor to retrieve OpenAPI options which are stored with a key equal the requested document name.
+        // This key is case-sensitive. If the document doesn't exist, the options monitor return a default instance, in which the OpenAPI version is set to v3.
+        // This could cause bugs! You'd get your document, but depending on the casing you used in the document name you passed to the function, you'll receive different OpenAPI document versions.
+        // We want to prevent this from happening. Therefore:
+        // By setting up a v2 document on the "casesensitive" route and requesting it on "CaseSensitive",
+        // we can test that the we've configured the options monitor to retrieve the options in a case-insensitive manner.
+        // If it is case-sensitive, it would return a default instance with OpenAPI version v3, which would cause this test to fail!
+        // However, if it would return the v2 instance, which was configured on the lowercase - case-insensitive - documentname, the test would pass!
+        // For more info, see OpenApiEndpointRouteBuilderExtensions.cs
+        Assert.StartsWith("{\n  \"swagger\": \"2.0\"", responseString);
+    }
+
+    [Theory]
+    [InlineData("/openapi.json", "application/json;charset=utf-8", false)]
+    [InlineData("/openapi.yaml", "text/plain+yaml;charset=utf-8", true)]
+    [InlineData("/openapi.yml", "text/plain+yaml;charset=utf-8", true)]
+    public async Task MapOpenApi_ReturnsDocumentIfNameProvidedInQuery(string expectedPath, string expectedContentType, bool isYaml)
     {
         // Arrange
         var documentName = "v2";
@@ -130,13 +204,13 @@ public async Task MapOpenApi_ReturnsDocumentIfNameProvidedInQuery()
         var serviceProviderIsService = new ServiceProviderIsService();
         var serviceProvider = CreateServiceProvider(documentName);
         var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
-        builder.MapOpenApi("/openapi.json");
+        builder.MapOpenApi(expectedPath);
         var context = new DefaultHttpContext();
         var responseBodyStream = new MemoryStream();
         context.Response.Body = responseBodyStream;
         context.RequestServices = serviceProvider;
         context.Request.QueryString = new QueryString($"?documentName={documentName}");
-        var endpoint = builder.DataSources.First().Endpoints.First();
+        var endpoint = builder.DataSources.First().Endpoints[0];
 
         // Act
         var requestDelegate = endpoint.RequestDelegate;
@@ -144,21 +218,29 @@ public async Task MapOpenApi_ReturnsDocumentIfNameProvidedInQuery()
 
         // Assert
         Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
-        ValidateOpenApiDocument(responseBodyStream, document =>
+        Assert.Equal(expectedContentType, context.Response.ContentType);
+        var responseString = Encoding.UTF8.GetString(responseBodyStream.ToArray());
+        // String check to validate that generated document starts with YAML syntax
+        Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.1'", StringComparison.OrdinalIgnoreCase));
+        responseBodyStream.Position = 0;
+        await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
             Assert.Equal($"OpenApiEndpointRouteBuilderExtensionsTests | {documentName}", document.Info.Title);
             Assert.Equal("1.0.0", document.Info.Version);
-        });
+        }, isYaml ? "yaml" : "json");
     }
 
-    private static void ValidateOpenApiDocument(MemoryStream documentStream, Action<OpenApiDocument> action)
+    private static async Task ValidateOpenApiDocumentAsync(MemoryStream documentStream, Action<OpenApiDocument> action, string format = "json")
     {
-        var document = new OpenApiStringReader().Read(Encoding.UTF8.GetString(documentStream.ToArray()), out var diagnostic);
-        Assert.Empty(diagnostic.Errors);
-        action(document);
+        documentStream.Position = 0;
+        var readerSettings = new OpenApiReaderSettings();
+        readerSettings.AddYamlReader();
+        var result = await OpenApiDocument.LoadAsync(documentStream, format, readerSettings);
+        Assert.Empty(result.Diagnostic.Errors);
+        action(result.Document);
     }
 
-    private static IServiceProvider CreateServiceProvider(string documentName = Microsoft.AspNetCore.OpenApi.OpenApiConstants.DefaultDocumentName)
+    private static IServiceProvider CreateServiceProvider(string documentName = Microsoft.AspNetCore.OpenApi.OpenApiConstants.DefaultDocumentName, OpenApiSpecVersion openApiSpecVersion = OpenApiSpecVersion.OpenApi3_1)
     {
         var hostEnvironment = new HostEnvironment() { ApplicationName = nameof(OpenApiEndpointRouteBuilderExtensionsTests) };
         var serviceProviderIsService = new ServiceProviderIsService();
@@ -167,7 +249,7 @@ private static IServiceProvider CreateServiceProvider(string documentName = Micr
             .AddSingleton<IHostEnvironment>(hostEnvironment)
             .AddSingleton(CreateApiDescriptionGroupCollectionProvider())
             .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
-            .AddOpenApi(documentName)
+            .AddOpenApi(documentName, x => x.OpenApiVersion = openApiSpecVersion)
             .BuildServiceProvider();
         return serviceProvider;
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiRouteHandlerBuilderExtensionTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiRouteHandlerBuilderExtensionTests.cs
index 793b6f9bfe44..8c14337a69ed 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiRouteHandlerBuilderExtensionTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiRouteHandlerBuilderExtensionTests.cs
@@ -1,12 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR002 // WithOpenApi is deprecated
+
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
 using static Microsoft.AspNetCore.OpenApi.Tests.OpenApiOperationGeneratorTests;
 
 namespace Microsoft.AspNetCore.OpenApi.Tests;
@@ -74,7 +75,7 @@ public void WithOpenApi_CanSetSchemaInOperationWithOverride()
         _ = builder.MapDelete("/{id}", GetString)
             .WithOpenApi(operation => new(operation)
             {
-                Parameters = new List<OpenApiParameter>() { new() { Schema = new() { Type = "number" } } }
+                Parameters = [new OpenApiParameter() { Schema = new OpenApiSchema() { Type = JsonSchemaType.Number } }]
             });
 
         var dataSource = GetBuilderEndpointDataSource(builder);
@@ -84,7 +85,7 @@ public void WithOpenApi_CanSetSchemaInOperationWithOverride()
         var operation = endpoint.Metadata.GetMetadata<OpenApiOperation>();
         Assert.NotNull(operation);
         var parameter = Assert.Single(operation.Parameters);
-        Assert.Equal("number", parameter.Schema.Type);
+        Assert.Equal(JsonSchemaType.Number, parameter.Schema.Type);
     }
 
     [Fact]
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiSchemaExtensionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiSchemaExtensionsTests.cs
deleted file mode 100644
index e4a5903d033e..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiSchemaExtensionsTests.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-
-public class OpenApiSchemaExtensionsTests
-{
-    [Fact]
-    public void ValidateCopyOnAllProperties()
-    {
-        var propertyNames = typeof(OpenApiSchema).GetProperties().Select(property => property.Name).ToList();
-        var originalSchema = new OpenApiSchema
-        {
-            AdditionalProperties = new OpenApiSchema(),
-            AdditionalPropertiesAllowed = true,
-            AllOf = [new OpenApiSchema()],
-            AnyOf = [new OpenApiSchema()],
-            Deprecated = true,
-            Default = new OpenApiString("default"),
-            Description = "description",
-            Discriminator = new OpenApiDiscriminator(),
-            Example = new OpenApiString("example"),
-            ExclusiveMaximum = true,
-            ExclusiveMinimum = true,
-            Extensions = new Dictionary<string, IOpenApiExtension>
-            {
-                ["key"] = new OpenApiString("value")
-            },
-            ExternalDocs = new OpenApiExternalDocs(),
-            Enum = [new OpenApiString("test")],
-            Format = "object",
-            Items = new OpenApiSchema(),
-            Maximum = 10,
-            MaxItems = 10,
-            MaxLength = 10,
-            MaxProperties = 10,
-            Minimum = 10,
-            MinItems = 10,
-            MinLength = 10,
-            MinProperties = 10,
-            MultipleOf = 10,
-            OneOf = [new OpenApiSchema()],
-            Not = new OpenApiSchema(),
-            Nullable = false,
-            Pattern = "pattern",
-            Properties = new Dictionary<string, OpenApiSchema> { ["name"] = new OpenApiSchema { Items = new OpenApiSchema() }, },
-            ReadOnly = true,
-            Required = new HashSet<string> { "required" },
-            Reference = new OpenApiReference { Id = "Id", Type = ReferenceType.Schema },
-            UniqueItems = false,
-            UnresolvedReference = true,
-            WriteOnly = true,
-            Xml = new OpenApiXml { Name = "Name" },
-            Annotations = new Dictionary<string, object> { ["x-schema-id"] = "value" }
-        };
-
-        var modifiedSchema = originalSchema.Clone();
-        modifiedSchema.AdditionalProperties = new OpenApiSchema { Type = "string" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AdditionalProperties)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.AdditionalPropertiesAllowed = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AdditionalPropertiesAllowed)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.AllOf = [new OpenApiSchema { Type = "string" }];
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AllOf)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.AnyOf = [new OpenApiSchema { Type = "string" }];
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.AnyOf)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Deprecated = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Deprecated)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Default = new OpenApiString("another default");
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Default)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Description = "another description";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Description)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Discriminator = new OpenApiDiscriminator { PropertyName = "PropertyName" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Discriminator)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Example = new OpenApiString("another example");
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Example)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.ExclusiveMaximum = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ExclusiveMaximum)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.ExclusiveMinimum = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ExclusiveMinimum)));
-
-        modifiedSchema = originalSchema.Clone();
-        originalSchema.Extensions = new Dictionary<string, IOpenApiExtension> { ["key"] = new OpenApiString("another value") };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Extensions)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.ExternalDocs.Description = "another description";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ExternalDocs)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Enum = [new OpenApiString("another test")];
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Enum)));
-
-        modifiedSchema = originalSchema.Clone();
-        originalSchema.Format = "string";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Format)));
-
-        modifiedSchema = originalSchema.Clone();
-        originalSchema.Type = "string";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Items)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Maximum = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Maximum)));
-
-        modifiedSchema = originalSchema.Clone();
-        originalSchema.MaxItems = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MaxItems)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.MaxLength = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MaxLength)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.MaxProperties = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MaxProperties)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Minimum = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Minimum)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.MinItems = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MinItems)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.MinLength = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MinLength)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.MinProperties = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MinProperties)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.MultipleOf = 20;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.MultipleOf)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.OneOf = [new OpenApiSchema { Type = "string" }];
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.OneOf)));
-
-        modifiedSchema = originalSchema.Clone();
-        originalSchema.Not = new OpenApiSchema { Type = "string" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Not)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Nullable = true;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Nullable)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Pattern = "another pattern";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Pattern)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Properties["name"].Items = new OpenApiSchema { Type = "string" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Properties)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.ReadOnly = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.ReadOnly)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Required = new HashSet<string> { "another required" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Required)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Reference = new OpenApiReference { Id = "Another Id", Type = ReferenceType.Schema };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Reference)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Title = "Another Title";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Title)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Type = "integer";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Type)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.UniqueItems = true;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.UniqueItems)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.UnresolvedReference = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.UnresolvedReference)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.WriteOnly = false;
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.WriteOnly)));
-
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Xml = new OpenApiXml { Name = "Another Name" };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Xml)));
-
-        // Although annotations are not part of the OpenAPI schema, we care specifically about
-        // x-schema-id annotation which is used to identify schemas in the document.
-        modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Annotations["x-schema-id"] = "another value";
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-        Assert.True(propertyNames.Remove(nameof(OpenApiSchema.Annotations)));
-
-        Assert.Empty(propertyNames);
-    }
-
-    [Fact]
-    public void ValidateDeepCopyOnNestedSchemas()
-    {
-        var originalSchema = new OpenApiSchema
-        {
-            Properties = new Dictionary<string, OpenApiSchema>
-            {
-                ["name"] = new OpenApiSchema
-                {
-                    Items = new OpenApiSchema
-                    {
-                        Properties = new Dictionary<string, OpenApiSchema>
-                        {
-                            ["nested"] = new OpenApiSchema
-                            {
-                                AnyOf = [new OpenApiSchema { Type = "string" }]
-                            }
-                        }
-                    }
-                }
-            }
-        };
-
-        var modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Properties["name"].Items.Properties["nested"].AnyOf = [new OpenApiSchema { Type = "integer" }];
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-    }
-
-    [Fact]
-    public void ValidateDeepCopyOnSchemasWithReference()
-    {
-        var originalSchema = new OpenApiSchema
-        {
-            Properties = new Dictionary<string, OpenApiSchema>
-            {
-                ["name"] = new OpenApiSchema
-                {
-                    Reference = new OpenApiReference { Id = "Id", Type = ReferenceType.Schema }
-                }
-            }
-        };
-
-        var modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Properties["name"].Reference = new OpenApiReference { Id = "Another Id", Type = ReferenceType.Schema };
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-    }
-
-    [Fact]
-    public void ValidateDeepCopyOnSchemasWithOpenApiAny()
-    {
-        var originalSchema = new OpenApiSchema
-        {
-            Properties = new Dictionary<string, OpenApiSchema>
-            {
-                ["name"] = new OpenApiSchema
-                {
-                    Default = new OpenApiString("default"),
-                    Example = new OpenApiString("example"),
-                    Enum = [new OpenApiString("enum")],
-                    ExternalDocs = new OpenApiExternalDocs(),
-                    Xml = new OpenApiXml { Name = "Name" }
-                }
-            }
-        };
-
-        var modifiedSchema = originalSchema.Clone();
-        modifiedSchema.Properties["name"].Default = new OpenApiString("another default");
-        Assert.False(OpenApiSchemaComparer.Instance.Equals(originalSchema, modifiedSchema));
-    }
-}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiServiceCollectionExtensionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiServiceCollectionExtensionsTests.cs
index 57e177605258..5c697ef3c616 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiServiceCollectionExtensionsTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiServiceCollectionExtensionsTests.cs
@@ -4,6 +4,8 @@
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.ApiDescriptions;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi;
 
@@ -189,4 +191,112 @@ public void AddOpenApi_WithDuplicateDocumentNames_UsesLastRegistration_ValidateO
         Assert.Equal(documentName, namedOption.DocumentName);
         Assert.Equal(OpenApiSpecVersion.OpenApi2_0, namedOption.OpenApiVersion);
     }
+
+    [Fact]
+    public void AddOpenApi_WithDefaultDocumentName_RegistersIOpenApiDocumentProviderInterface()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        // Include dependencies for OpenApiDocumentService
+        services.AddSingleton<IHostEnvironment>(new HostingEnvironment
+        {
+            EnvironmentName = Environments.Development,
+            ApplicationName = "Test Application"
+        });
+        services.AddLogging();
+        services.AddRouting();
+
+        // Act
+        services.AddOpenApi();
+        var serviceProvider = services.BuildServiceProvider();
+
+        // Assert
+        var documentProvider = serviceProvider.GetRequiredKeyedService<IOpenApiDocumentProvider>(Microsoft.AspNetCore.OpenApi.OpenApiConstants.DefaultDocumentName);
+        Assert.NotNull(documentProvider);
+        Assert.IsType<OpenApiDocumentService>(documentProvider);
+    }
+
+    [Fact]
+    public void AddOpenApi_WithCustomDocumentName_RegistersIOpenApiDocumentProviderInterface()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        // Include dependencies for OpenApiDocumentService
+        services.AddSingleton<IHostEnvironment>(new HostingEnvironment
+        {
+            EnvironmentName = Environments.Development,
+            ApplicationName = "Test Application"
+        });
+        services.AddLogging();
+        services.AddRouting();
+        var documentName = "v1";
+
+        // Act
+        services.AddOpenApi(documentName);
+        var serviceProvider = services.BuildServiceProvider();
+
+        // Assert
+        var documentProvider = serviceProvider.GetRequiredKeyedService<IOpenApiDocumentProvider>(documentName.ToLowerInvariant());
+        Assert.NotNull(documentProvider);
+        Assert.IsType<OpenApiDocumentService>(documentProvider);
+    }
+
+    [Fact]
+    public async Task GetOpenApiDocumentAsync_ReturnsDocument()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        // Include dependencies for OpenApiDocumentService
+        services.AddSingleton<IHostEnvironment>(new HostingEnvironment
+        {
+            EnvironmentName = Environments.Development,
+            ApplicationName = "Test Application"
+        });
+        services.AddLogging();
+        services.AddRouting();
+
+        var documentName = "v1";
+        services.AddOpenApi(documentName);
+        var serviceProvider = services.BuildServiceProvider();
+        var documentProvider = serviceProvider.GetRequiredKeyedService<IOpenApiDocumentProvider>(documentName.ToLowerInvariant());
+
+        // Act
+        var document = await documentProvider.GetOpenApiDocumentAsync();
+
+        // Assert
+        Assert.NotNull(document);
+        Assert.IsType<OpenApiDocument>(document);
+
+        // Verify basic document structure
+        Assert.NotNull(document.Info);
+        Assert.Equal($"Test Application | {documentName.ToLowerInvariant()}", document.Info.Title);
+        Assert.Equal("1.0.0", document.Info.Version);
+    }
+
+    [Fact]
+    public async Task GetOpenApiDocumentAsync_HandlesCancellation()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        services.AddSingleton<IHostEnvironment>(new HostingEnvironment
+        {
+            EnvironmentName = Environments.Development,
+            ApplicationName = "Test Application"
+        });
+        services.AddLogging();
+        services.AddRouting();
+        var documentName = "v1";
+        services.AddOpenApi(documentName);
+        var serviceProvider = services.BuildServiceProvider();
+        var documentProvider = serviceProvider.GetRequiredKeyedService<IOpenApiDocumentProvider>(documentName.ToLowerInvariant());
+
+        using var cts = new CancellationTokenSource();
+        cts.Cancel();
+
+        // Act & Assert
+        await Assert.ThrowsAsync<OperationCanceledException>(async () =>
+        {
+            await documentProvider.GetOpenApiDocumentAsync(cts.Token);
+        });
+    }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/LocalizedSampleAppFixture.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/LocalizedSampleAppFixture.cs
new file mode 100644
index 000000000000..1aee02e9f053
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/LocalizedSampleAppFixture.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+// Runs requests with a culture that uses commas to format decimals to
+// verify the invariant culture is used to generate the OpenAPI document.
+
+public sealed class LocalizedSampleAppFixture : SampleAppFixture
+{
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
+    {
+        base.ConfigureWebHost(builder);
+
+        builder.ConfigureServices(services =>
+        {
+            services.AddTransient<IStartupFilter, AddLocalizationMiddlewareFilter>();
+            services.AddRequestLocalization((options) =>
+            {
+                options.DefaultRequestCulture = new("fr-FR");
+                options.SupportedCultures = [new("fr-FR")];
+                options.SupportedUICultures = [new("fr-FR")];
+            });
+        });
+    }
+
+    private sealed class AddLocalizationMiddlewareFilter : IStartupFilter
+    {
+        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+        {
+            return (app) =>
+            {
+                app.UseRequestLocalization();
+                next(app);
+            };
+        }
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentConcurrentRequestTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentConcurrentRequestTests.cs
new file mode 100644
index 000000000000..07ac45f0a520
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentConcurrentRequestTests.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using Microsoft.AspNetCore.InternalTesting;
+
+namespace Microsoft.AspNetCore.OpenApi.Tests.Integration;
+
+public class OpenApiDocumentConcurrentRequestTests(SampleAppFixture fixture) : IClassFixture<SampleAppFixture>
+{
+    [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/58128")]
+    public async Task MapOpenApi_HandlesConcurrentRequests()
+    {
+        // Arrange
+        var client = fixture.CreateClient();
+
+        // Act
+        await Parallel.ForAsync(0, 150, async (_, ctx) =>
+        {
+            var response = await client.GetAsync("/openapi/v1.json", ctx);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        });
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs
index 37ebf3c26f06..47540c6a10b2 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs
@@ -1,40 +1,188 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Globalization;
+using System.Text.Json.Nodes;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using Microsoft.OpenApi.Reader;
 
 [UsesVerify]
 public sealed class OpenApiDocumentIntegrationTests(SampleAppFixture fixture) : IClassFixture<SampleAppFixture>
 {
+    public static TheoryData<string, OpenApiSpecVersion> OpenApiDocuments()
+    {
+        OpenApiSpecVersion[] versions =
+        [
+            OpenApiSpecVersion.OpenApi3_0,
+            OpenApiSpecVersion.OpenApi3_1,
+        ];
+
+        var testCases = new TheoryData<string, OpenApiSpecVersion>();
+
+        foreach (var version in versions)
+        {
+            testCases.Add("v1", version);
+            testCases.Add("v2", version);
+            testCases.Add("controllers", version);
+            testCases.Add("responses", version);
+            testCases.Add("forms", version);
+            testCases.Add("schemas-by-ref", version);
+            testCases.Add("xml", version);
+        }
+
+        return testCases;
+    }
+
+    [Theory]
+    [MemberData(nameof(OpenApiDocuments))]
+    public async Task VerifyOpenApiDocument(string documentName, OpenApiSpecVersion version)
+    {
+        var json = await GetOpenApiDocument(documentName, version);
+        var baseSnapshotsDirectory = SkipOnHelixAttribute.OnHelix()
+            ? Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Integration", "snapshots")
+            : "snapshots";
+        var outputDirectory = Path.Combine(baseSnapshotsDirectory, version.ToString());
+        await Verify(json)
+            .UseDirectory(outputDirectory)
+            .UseParameters(documentName);
+    }
+
     [Theory]
-    [InlineData("v1")]
-    [InlineData("v2")]
-    [InlineData("controllers")]
-    [InlineData("responses")]
-    [InlineData("forms")]
-    [InlineData("schemas-by-ref")]
-    public async Task VerifyOpenApiDocument(string documentName)
+    [MemberData(nameof(OpenApiDocuments))]
+    public async Task OpenApiDocumentIsValid(string documentName, OpenApiSpecVersion version)
+    {
+        var json = await GetOpenApiDocument(documentName, version);
+
+        var actual = OpenApiDocument.Parse(json, format: "json");
+
+        Assert.NotNull(actual);
+        Assert.NotNull(actual.Document);
+        Assert.NotNull(actual.Diagnostic);
+        Assert.NotNull(actual.Diagnostic.Errors);
+        Assert.Empty(actual.Diagnostic.Errors);
+
+        var ruleSet = ValidationRuleSet.GetDefaultRuleSet();
+
+        var errors = actual.Document.Validate(ruleSet);
+        Assert.Empty(errors);
+    }
+
+    [Theory] // See https://github.com/dotnet/aspnetcore/issues/63090
+    [MemberData(nameof(OpenApiDocuments))]
+    public async Task OpenApiDocumentReferencesAreValid(string documentName, OpenApiSpecVersion version)
+    {
+        var json = await GetOpenApiDocument(documentName, version);
+
+        var result = OpenApiDocument.Parse(json, format: "json");
+
+        var document = result.Document;
+        var documentNode = JsonNode.Parse(json);
+
+        var ruleName = "OpenApiDocumentReferencesAreValid";
+        var rule = new ValidationRule<OpenApiDocument>(ruleName, (context, item) =>
+        {
+            var visitor = new OpenApiSchemaReferenceVisitor(ruleName, context, documentNode);
+
+            var walker = new OpenApiWalker(visitor);
+            walker.Walk(item);
+        });
+
+        var ruleSet = new ValidationRuleSet();
+        ruleSet.Add(typeof(OpenApiDocument), rule);
+
+        var errors = document.Validate(ruleSet);
+
+        Assert.Empty(errors);
+    }
+
+    private async Task<string> GetOpenApiDocument(string documentName, OpenApiSpecVersion version)
     {
         var documentService = fixture.Services.GetRequiredKeyedService<OpenApiDocumentService>(documentName);
         var scopedServiceProvider = fixture.Services.CreateScope();
         var document = await documentService.GetOpenApiDocumentAsync(scopedServiceProvider.ServiceProvider);
-        await Verifier.Verify(GetOpenApiJson(document))
-            .UseDirectory(SkipOnHelixAttribute.OnHelix()
-                ? Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Integration", "snapshots")
-                : "snapshots")
-            .UseParameters(documentName);
+
+        return await document.SerializeAsJsonAsync(version);
     }
 
-    private static string GetOpenApiJson(OpenApiDocument document)
+    private sealed class OpenApiSchemaReferenceVisitor(
+        string ruleName,
+        IValidationContext context,
+        JsonNode document) : OpenApiVisitorBase
     {
-        using var textWriter = new StringWriter(CultureInfo.InvariantCulture);
-        var jsonWriter = new OpenApiJsonWriter(textWriter);
-        document.SerializeAsV3(jsonWriter);
-        return textWriter.ToString();
+        public override void Visit(IOpenApiReferenceHolder referenceHolder)
+        {
+            if (referenceHolder is OpenApiSchemaReference { Reference.IsLocal: true } reference)
+            {
+                ValidateSchemaReference(reference);
+            }
+        }
+
+        public override void Visit(IOpenApiSchema schema)
+        {
+            if (schema is OpenApiSchemaReference { Reference.IsLocal: true } reference)
+            {
+                ValidateSchemaReference(reference);
+            }
+        }
+
+        private void ValidateSchemaReference(OpenApiSchemaReference reference)
+        {
+            try
+            {
+                if (reference.RecursiveTarget is not null)
+                {
+                    return;
+                }
+            }
+            catch (InvalidOperationException ex)
+            {
+                // Thrown if a circular reference is detected
+                context.Enter($"{PathString[2..]}/{OpenApiSchemaKeywords.RefKeyword}");
+                context.CreateError(ruleName, ex.Message);
+                context.Exit();
+
+                return;
+            }
+
+            var id = reference.Reference.ReferenceV3;
+
+            if (id is { Length: > 0 } && !IsValidSchemaReference(id, document))
+            {
+                var isValid = false;
+
+                // Sometimes ReferenceV3 is not a valid JSON pointer, but the $ref
+                // associated with it still points to a valid location in the document.
+                // In these cases, we need to find it manually to verify that fact before
+                // generating a warning that the schema reference is indeed invalid.
+                var parent = Find(PathString, document);
+                var @ref = parent[OpenApiSchemaKeywords.RefKeyword];
+                var path = PathString[2..]; // Trim off the leading "#/" as the context is already at the root
+
+                if (@ref is not null && @ref.GetValueKind() is System.Text.Json.JsonValueKind.String &&
+                    @ref.GetValue<string>() is { Length: > 0 } refId)
+                {
+                    id = refId;
+                    path += $"/{OpenApiSchemaKeywords.RefKeyword}";
+                    isValid = IsValidSchemaReference(id, document);
+                }
+
+                if (!isValid)
+                {
+                    context.Enter(path);
+                    context.CreateWarning(ruleName, $"The schema reference '{id}' does not point to an existing schema.");
+                    context.Exit();
+                }
+            }
+
+            static bool IsValidSchemaReference(string id, JsonNode baseNode)
+                => Find(id, baseNode) is not null;
+
+            static JsonNode Find(string id, JsonNode baseNode)
+            {
+                var pointer = new JsonPointer(id.Replace("#/", "/"));
+                return pointer.Find(baseNode);
+            }
+        }
     }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentLocalizationTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentLocalizationTests.cs
new file mode 100644
index 000000000000..e2480db6e048
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentLocalizationTests.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.InternalTesting;
+
+[UsesVerify]
+public sealed class OpenApiDocumentLocalizationTests(LocalizedSampleAppFixture fixture) : IClassFixture<LocalizedSampleAppFixture>
+{
+    [Fact]
+    public async Task VerifyOpenApiDocumentIsInvariant()
+    {
+        using var client = fixture.CreateClient();
+        var json = await client.GetStringAsync("/openapi/localized.json");
+        var outputDirectory = SkipOnHelixAttribute.OnHelix()
+            ? Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Integration", "snapshots")
+            : "snapshots";
+        await Verify(json)
+            .UseDirectory(outputDirectory);
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
similarity index 54%
rename from src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
rename to src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
index 5f8abe054fd2..07aaa0b07c41 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "Sample | controllers",
     "version": "1.0.0"
@@ -12,7 +12,7 @@
         ],
         "parameters": [
           {
-            "name": "Id",
+            "name": "id",
             "in": "path",
             "required": true,
             "schema": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "name": "Name",
+            "name": "name",
             "in": "path",
             "required": true,
             "schema": {
@@ -54,6 +54,25 @@
         }
       }
     },
+    "/gettypedresult": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MvcTodo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/forms": {
       "post": {
         "tags": [
@@ -66,11 +85,9 @@
                 "type": "object",
                 "properties": {
                   "Title": {
-                    "minLength": 5,
                     "type": "string"
                   },
                   "Description": {
-                    "minLength": 5,
                     "type": "string"
                   },
                   "IsCompleted": {
@@ -88,9 +105,62 @@
           }
         }
       }
+    },
+    "/getcultureinvariant": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CurrentWeather"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "CurrentWeather": {
+        "type": "object",
+        "properties": {
+          "temperature": {
+            "maximum": 100.5,
+            "minimum": -100.5,
+            "type": "number",
+            "format": "float",
+            "default": 0.1
+          }
+        }
+      },
+      "MvcTodo": {
+        "required": [
+          "title",
+          "description",
+          "isCompleted"
+        ],
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "isCompleted": {
+            "type": "boolean"
+          }
+        }
+      }
     }
   },
-  "components": { },
   "tags": [
     {
       "name": "Test"
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
similarity index 91%
rename from src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
rename to src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
index 3e341cabab82..e4bbaf44a54a 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "Sample | forms",
     "version": "1.0.0"
@@ -198,19 +198,24 @@
         "properties": {
           "id": {
             "type": "integer",
+            "description": "The unique identifier of the to-do item.",
             "format": "int32"
           },
           "title": {
-            "type": "string"
+            "type": "string",
+            "description": "The title of the to-do item."
           },
           "completed": {
-            "type": "boolean"
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
           },
           "createdAt": {
             "type": "string",
+            "description": "The date and time when the to-do item was created.",
             "format": "date-time"
           }
-        }
+        },
+        "description": "Represents a to-do item."
       }
     }
   },
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
similarity index 90%
rename from src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
rename to src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
index 12fb88cb35e6..96a3be6747cf 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "Sample | responses",
     "version": "1.0.0"
@@ -163,19 +163,24 @@
         "properties": {
           "id": {
             "type": "integer",
+            "description": "The unique identifier of the to-do item.",
             "format": "int32"
           },
           "title": {
-            "type": "string"
+            "type": "string",
+            "description": "The title of the to-do item."
           },
           "completed": {
-            "type": "boolean"
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
           },
           "createdAt": {
             "type": "string",
+            "description": "The date and time when the to-do item was created.",
             "format": "date-time"
           }
-        }
+        },
+        "description": "Represents a to-do item."
       },
       "Triangle": {
         "type": "object",
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
new file mode 100644
index 000000000000..648510972ee6
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
@@ -0,0 +1,1607 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Sample | schemas-by-ref",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/schemas-by-ref/typed-results": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/multiple-results": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/iresult-no-produces": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/iresult-with-produces": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/primitives": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "query",
+            "description": "The ID associated with the Todo item.",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "size",
+            "in": "query",
+            "description": "The number of Todos to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/product": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Product"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Product"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/account": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Account"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Account"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/array-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/list-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/ienumerable-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/dictionary-of-ints": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/frozen-dictionary-of-ints": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/shape": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Shape"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/weatherforecastbase": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WeatherForecastBase"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/person": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Person"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/category": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Category"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/container": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ContainerType"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/root": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Root"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/location": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LocationContainer"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/parent": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ParentObject"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/child": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChildObject"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/json-patch": {
+      "patch": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/JsonPatchDocument"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/json-patch-generic": {
+      "patch": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/JsonPatchDocument"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/custom-iresult": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CustomIResultImplementor"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/config-with-generic-lists": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Config"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/project-response": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectResponse"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/subscription": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Subscription"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-response": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NullableResponseModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-return-type": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "nullable": true
+                    },
+                    {
+                      "$ref": "#/components/schemas/NullableResponseModel"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-request": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "nullable": true
+                  },
+                  {
+                    "$ref": "#/components/schemas/NullableRequestModel"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/complex-nullable-hierarchy": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ComplexHierarchyModel"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-array-elements": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NullableArrayModel"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/optional-with-default": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModelWithDefaults"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-enum-response": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnumNullableModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Account": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "AddressDto": {
+        "required": [
+          "relatedLocation"
+        ],
+        "type": "object",
+        "properties": {
+          "relatedLocation": {
+            "$ref": "#/components/schemas/LocationDto"
+          }
+        }
+      },
+      "Category": {
+        "required": [
+          "name",
+          "parent"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/Category"
+          },
+          "tags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Tag"
+            }
+          }
+        }
+      },
+      "ChildObject": {
+        "required": [
+          "parent"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/ParentObject"
+          }
+        }
+      },
+      "CityResponse": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ComplexHierarchyModel": {
+        "required": [
+          "id",
+          "requiredNested"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "optionalNested": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/NestedModel"
+              }
+            ]
+          },
+          "requiredNested": {
+            "$ref": "#/components/schemas/NestedModel"
+          },
+          "nullableListWithNullableItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/NestedModel"
+            },
+            "nullable": true
+          }
+        }
+      },
+      "ComplexType": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "timestamp": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          }
+        }
+      },
+      "Config": {
+        "type": "object",
+        "properties": {
+          "items1": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigItem"
+            }
+          },
+          "items2": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigItem"
+            }
+          }
+        }
+      },
+      "ConfigItem": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "lang": {
+            "type": "string",
+            "nullable": true
+          },
+          "words": {
+            "type": "object",
+            "nullable": true
+          },
+          "break": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "willBeGood": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "ContainerType": {
+        "type": "object",
+        "properties": {
+          "seq1": {
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "seq2": {
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      },
+      "CustomIResultImplementor": {
+        "required": [
+          "content"
+        ],
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string"
+          }
+        }
+      },
+      "EnumNullableModel": {
+        "required": [
+          "requiredEnum"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredEnum": {
+            "$ref": "#/components/schemas/TestEnum"
+          },
+          "nullableEnum": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/TestEnum"
+              }
+            ]
+          },
+          "listOfNullableEnums": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TestEnum"
+            }
+          }
+        }
+      },
+      "Item": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "value": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "JsonPatchDocument": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "oneOf": [
+            {
+              "required": [
+                "op",
+                "path",
+                "value"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "add",
+                    "replace",
+                    "test"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "value": { }
+              },
+              "additionalProperties": false
+            },
+            {
+              "required": [
+                "op",
+                "path",
+                "from"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "move",
+                    "copy"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "from": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "required": [
+                "op",
+                "path"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "remove"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        }
+      },
+      "LocationContainer": {
+        "required": [
+          "location"
+        ],
+        "type": "object",
+        "properties": {
+          "location": {
+            "$ref": "#/components/schemas/LocationDto"
+          }
+        }
+      },
+      "LocationDto": {
+        "required": [
+          "address"
+        ],
+        "type": "object",
+        "properties": {
+          "address": {
+            "$ref": "#/components/schemas/AddressDto"
+          }
+        }
+      },
+      "ModelWithDefaults": {
+        "type": "object",
+        "properties": {
+          "propertyWithDefault": {
+            "type": "string"
+          },
+          "nullableWithNull": {
+            "type": "string",
+            "nullable": true
+          },
+          "numberWithDefault": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "boolWithDefault": {
+            "type": "boolean"
+          }
+        }
+      },
+      "NestedModel": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "optionalValue": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "deepNested": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/ComplexType"
+              }
+            ]
+          }
+        }
+      },
+      "NullableArrayModel": {
+        "type": "object",
+        "properties": {
+          "nullableArray": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "listWithNullableElements": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "nullableDictionaryWithNullableValues": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        }
+      },
+      "NullableRequestModel": {
+        "required": [
+          "requiredField"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredField": {
+            "type": "string"
+          },
+          "optionalField": {
+            "type": "string",
+            "nullable": true
+          },
+          "nullableList": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "nullableDictionary": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        }
+      },
+      "NullableResponseModel": {
+        "required": [
+          "requiredProperty"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredProperty": {
+            "type": "string"
+          },
+          "nullableProperty": {
+            "type": "string",
+            "nullable": true
+          },
+          "nullableComplexProperty": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/ComplexType"
+              }
+            ]
+          }
+        }
+      },
+      "ParentObject": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChildObject"
+            }
+          }
+        }
+      },
+      "Person": {
+        "required": [
+          "discriminator"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/PersonStudent"
+          },
+          {
+            "$ref": "#/components/schemas/PersonTeacher"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "discriminator",
+          "mapping": {
+            "student": "#/components/schemas/PersonStudent",
+            "teacher": "#/components/schemas/PersonTeacher"
+          }
+        }
+      },
+      "PersonStudent": {
+        "properties": {
+          "discriminator": {
+            "enum": [
+              "student"
+            ],
+            "type": "string"
+          },
+          "gpa": {
+            "type": "number",
+            "format": "double"
+          }
+        }
+      },
+      "PersonTeacher": {
+        "required": [
+          "subject"
+        ],
+        "properties": {
+          "discriminator": {
+            "enum": [
+              "teacher"
+            ],
+            "type": "string"
+          },
+          "subject": {
+            "type": "string"
+          }
+        }
+      },
+      "Product": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ProjectAddressResponse": {
+        "required": [
+          "city"
+        ],
+        "type": "object",
+        "properties": {
+          "city": {
+            "$ref": "#/components/schemas/CityResponse"
+          }
+        }
+      },
+      "ProjectBuilderResponse": {
+        "required": [
+          "city"
+        ],
+        "type": "object",
+        "properties": {
+          "city": {
+            "$ref": "#/components/schemas/CityResponse"
+          }
+        }
+      },
+      "ProjectResponse": {
+        "required": [
+          "address",
+          "builder"
+        ],
+        "type": "object",
+        "properties": {
+          "address": {
+            "$ref": "#/components/schemas/ProjectAddressResponse"
+          },
+          "builder": {
+            "$ref": "#/components/schemas/ProjectBuilderResponse"
+          }
+        }
+      },
+      "RefProfile": {
+        "required": [
+          "user"
+        ],
+        "type": "object",
+        "properties": {
+          "user": {
+            "$ref": "#/components/schemas/RefUser"
+          }
+        }
+      },
+      "RefUser": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      },
+      "Root": {
+        "type": "object",
+        "properties": {
+          "item1": {
+            "$ref": "#/components/schemas/Item"
+          },
+          "item2": {
+            "$ref": "#/components/schemas/Item"
+          }
+        }
+      },
+      "Shape": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ShapeTriangle"
+          },
+          {
+            "$ref": "#/components/schemas/ShapeSquare"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "triangle": "#/components/schemas/ShapeTriangle",
+            "square": "#/components/schemas/ShapeSquare"
+          }
+        }
+      },
+      "ShapeSquare": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "square"
+            ],
+            "type": "string"
+          },
+          "area": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "ShapeTriangle": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "triangle"
+            ],
+            "type": "string"
+          },
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "Subscription": {
+        "required": [
+          "id",
+          "primaryUser"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "primaryUser": {
+            "$ref": "#/components/schemas/RefProfile"
+          },
+          "secondaryUser": {
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/RefProfile"
+              }
+            ]
+          }
+        }
+      },
+      "Tag": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "TestEnum": {
+        "type": "integer"
+      },
+      "Triangle": {
+        "type": "object",
+        "properties": {
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "WeatherForecastBase": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity"
+          },
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries"
+          },
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "0": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity",
+            "1": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries",
+            "2": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithCity": {
+        "required": [
+          "city"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              0
+            ],
+            "type": "integer"
+          },
+          "city": {
+            "type": "string"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithLocalNews": {
+        "required": [
+          "news"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              2
+            ],
+            "type": "integer"
+          },
+          "news": {
+            "type": "string"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithTimeSeries": {
+        "required": [
+          "summary"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              1
+            ],
+            "type": "integer"
+          },
+          "date": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "temperatureC": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "summary": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
similarity index 81%
rename from src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
rename to src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
index 96ce428e5d17..98c81bc48fce 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "Sample | v1",
     "version": "1.0.0"
@@ -136,19 +136,24 @@
         "properties": {
           "id": {
             "type": "integer",
+            "description": "The unique identifier of the to-do item.",
             "format": "int32"
           },
           "title": {
-            "type": "string"
+            "type": "string",
+            "description": "The title of the to-do item."
           },
           "completed": {
-            "type": "boolean"
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
           },
           "createdAt": {
             "type": "string",
+            "description": "The date and time when the to-do item was created.",
             "format": "date-time"
           }
-        }
+        },
+        "description": "Represents a to-do item."
       },
       "TodoWithDueDate": {
         "required": [
@@ -162,23 +167,29 @@
         "properties": {
           "dueDate": {
             "type": "string",
+            "description": "The due date of the to-do item.",
             "format": "date-time"
           },
           "id": {
             "type": "integer",
+            "description": "The unique identifier of the to-do item.",
             "format": "int32"
           },
           "title": {
-            "type": "string"
+            "type": "string",
+            "description": "The title of the to-do item."
           },
           "completed": {
-            "type": "boolean"
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
           },
           "createdAt": {
             "type": "string",
+            "description": "The date and time when the to-do item was created.",
             "format": "date-time"
           }
-        }
+        },
+        "description": "Represents a to-do item with a due date."
       }
     },
     "securitySchemes": {
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
similarity index 97%
rename from src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
rename to src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
index b3d4fa31bff9..10aa7f3ec95f 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "Sample | v2",
     "contact": {
@@ -58,7 +58,6 @@
       }
     }
   },
-  "components": { },
   "tags": [
     {
       "name": "users"
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt
new file mode 100644
index 000000000000..d2b295c23ab6
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt
@@ -0,0 +1,397 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Sample | xml",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/xml/type-with-examples": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TypeWithExamples"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TypeWithExamples"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/xml/todo": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TodoFomInterface"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/project": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Project"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/board": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BoardItem"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/project-record": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectRecord"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/todo-with-description": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TodoWithDescription"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/Xml": {
+      "get": {
+        "tags": [
+          "Xml"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "description": "The name of the person.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the greeting.",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Xml"
+        ],
+        "requestBody": {
+          "description": "The todo to insert into the database.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "BoardItem": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        },
+        "description": "An item on the board."
+      },
+      "Project": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          }
+        },
+        "description": "The project that contains Todo items."
+      },
+      "ProjectRecord": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the project."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the project."
+          }
+        },
+        "description": "The project that contains Todo items."
+      },
+      "Todo": {
+        "required": [
+          "id",
+          "title",
+          "completed"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string"
+          },
+          "completed": {
+            "type": "boolean"
+          }
+        }
+      },
+      "TodoFomInterface": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The identifier of the todo.",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the todo."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the todo."
+          }
+        },
+        "description": "This is a todo item."
+      },
+      "TodoWithDescription": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The identifier of the todo, overridden.",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the todo, overridden."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the the todo.\nAnother description of the todo."
+          }
+        }
+      },
+      "TypeWithExamples": {
+        "type": "object",
+        "properties": {
+          "booleanType": {
+            "type": "boolean",
+            "example": true
+          },
+          "integerType": {
+            "type": "integer",
+            "format": "int32",
+            "example": 42
+          },
+          "longType": {
+            "type": "integer",
+            "format": "int64",
+            "example": 1234567890123456789
+          },
+          "doubleType": {
+            "type": "number",
+            "format": "double",
+            "example": 3.14
+          },
+          "floatType": {
+            "type": "number",
+            "format": "float",
+            "example": 3.14
+          },
+          "dateTimeType": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2022-01-01T00:00:00Z"
+          },
+          "dateOnlyType": {
+            "type": "string",
+            "format": "date",
+            "example": "2022-01-01"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    },
+    {
+      "name": "Xml"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
new file mode 100644
index 000000000000..54815495aa78
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt
@@ -0,0 +1,169 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | controllers",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/getbyidandname/{id}/{name}": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "minLength": 5,
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/gettypedresult": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MvcTodo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/forms": {
+      "post": {
+        "tags": [
+          "Test"
+        ],
+        "requestBody": {
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "Title": {
+                    "type": "string"
+                  },
+                  "Description": {
+                    "type": "string"
+                  },
+                  "IsCompleted": {
+                    "type": "boolean"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/getcultureinvariant": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CurrentWeather"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "CurrentWeather": {
+        "type": "object",
+        "properties": {
+          "temperature": {
+            "maximum": 100.5,
+            "minimum": -100.5,
+            "type": "number",
+            "format": "float",
+            "default": 0.1
+          }
+        }
+      },
+      "MvcTodo": {
+        "required": [
+          "title",
+          "description",
+          "isCompleted"
+        ],
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "isCompleted": {
+            "type": "boolean"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Test"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
new file mode 100644
index 000000000000..c68e4d17c64d
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt
@@ -0,0 +1,227 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | forms",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/forms/form-file": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "resume"
+                ],
+                "type": "object",
+                "properties": {
+                  "resume": {
+                    "$ref": "#/components/schemas/IFormFile"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/form-files": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "files"
+                ],
+                "type": "object",
+                "properties": {
+                  "files": {
+                    "$ref": "#/components/schemas/IFormFileCollection"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/form-file-multiple": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "resume",
+                  "files"
+                ],
+                "type": "object",
+                "allOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "resume": {
+                        "$ref": "#/components/schemas/IFormFile"
+                      }
+                    }
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "files": {
+                        "$ref": "#/components/schemas/IFormFileCollection"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/form-todo": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/forms-pocos-and-files": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "file"
+                ],
+                "type": "object",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/Todo"
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "file": {
+                        "$ref": "#/components/schemas/IFormFile"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "IFormFile": {
+        "type": "string",
+        "format": "binary"
+      },
+      "IFormFileCollection": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/IFormFile"
+        }
+      },
+      "Todo": {
+        "required": [
+          "id",
+          "title",
+          "completed",
+          "createdAt"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The unique identifier of the to-do item.",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the to-do item."
+          },
+          "completed": {
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "The date and time when the to-do item was created.",
+            "format": "date-time"
+          }
+        },
+        "description": "Represents a to-do item."
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
new file mode 100644
index 000000000000..45a4660aa78c
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt
@@ -0,0 +1,208 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | responses",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/responses/200-add-xml": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              },
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/200-only-xml": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/triangle": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/shape": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Shape"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Shape": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ShapeTriangle"
+          },
+          {
+            "$ref": "#/components/schemas/ShapeSquare"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "triangle": "#/components/schemas/ShapeTriangle",
+            "square": "#/components/schemas/ShapeSquare"
+          }
+        }
+      },
+      "ShapeSquare": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "square"
+            ],
+            "type": "string"
+          },
+          "area": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "ShapeTriangle": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "triangle"
+            ],
+            "type": "string"
+          },
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "Todo": {
+        "required": [
+          "id",
+          "title",
+          "completed",
+          "createdAt"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The unique identifier of the to-do item.",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the to-do item."
+          },
+          "completed": {
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "The date and time when the to-do item was created.",
+            "format": "date-time"
+          }
+        },
+        "description": "Represents a to-do item."
+      },
+      "Triangle": {
+        "type": "object",
+        "properties": {
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
new file mode 100644
index 000000000000..61d0527bc80f
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
@@ -0,0 +1,1639 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | schemas-by-ref",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/schemas-by-ref/typed-results": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/multiple-results": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/iresult-no-produces": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/iresult-with-produces": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/primitives": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "query",
+            "description": "The ID associated with the Todo item.",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "size",
+            "in": "query",
+            "description": "The number of Todos to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/product": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Product"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Product"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/account": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Account"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Account"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/array-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/list-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/ienumerable-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/dictionary-of-ints": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/frozen-dictionary-of-ints": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/shape": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Shape"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/weatherforecastbase": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WeatherForecastBase"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/person": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Person"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/category": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Category"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/container": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ContainerType"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/root": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Root"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/location": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LocationContainer"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/parent": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ParentObject"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/child": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChildObject"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/json-patch": {
+      "patch": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/JsonPatchDocument"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/json-patch-generic": {
+      "patch": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/JsonPatchDocument"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/custom-iresult": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CustomIResultImplementor"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/config-with-generic-lists": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Config"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/project-response": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectResponse"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/subscription": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Subscription"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-response": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NullableResponseModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-return-type": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "$ref": "#/components/schemas/NullableResponseModel"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-request": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "type": "null"
+                  },
+                  {
+                    "$ref": "#/components/schemas/NullableRequestModel"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/complex-nullable-hierarchy": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ComplexHierarchyModel"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-array-elements": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NullableArrayModel"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/optional-with-default": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModelWithDefaults"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-enum-response": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnumNullableModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Account": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "AddressDto": {
+        "required": [
+          "relatedLocation"
+        ],
+        "type": "object",
+        "properties": {
+          "relatedLocation": {
+            "$ref": "#/components/schemas/LocationDto"
+          }
+        }
+      },
+      "Category": {
+        "required": [
+          "name",
+          "parent"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/Category"
+          },
+          "tags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Tag"
+            }
+          }
+        }
+      },
+      "ChildObject": {
+        "required": [
+          "parent"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/ParentObject"
+          }
+        }
+      },
+      "CityResponse": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ComplexHierarchyModel": {
+        "required": [
+          "id",
+          "requiredNested"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "optionalNested": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/NestedModel"
+              }
+            ]
+          },
+          "requiredNested": {
+            "$ref": "#/components/schemas/NestedModel"
+          },
+          "nullableListWithNullableItems": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/NestedModel"
+            }
+          }
+        }
+      },
+      "ComplexType": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "timestamp": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          }
+        }
+      },
+      "Config": {
+        "type": "object",
+        "properties": {
+          "items1": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigItem"
+            }
+          },
+          "items2": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigItem"
+            }
+          }
+        }
+      },
+      "ConfigItem": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": [
+              "null",
+              "integer"
+            ],
+            "format": "int32"
+          },
+          "lang": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "words": {
+            "type": [
+              "null",
+              "object"
+            ]
+          },
+          "break": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "type": "string"
+            }
+          },
+          "willBeGood": {
+            "type": [
+              "null",
+              "string"
+            ]
+          }
+        }
+      },
+      "ContainerType": {
+        "type": "object",
+        "properties": {
+          "seq1": {
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "seq2": {
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      },
+      "CustomIResultImplementor": {
+        "required": [
+          "content"
+        ],
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string"
+          }
+        }
+      },
+      "EnumNullableModel": {
+        "required": [
+          "requiredEnum"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredEnum": {
+            "$ref": "#/components/schemas/TestEnum"
+          },
+          "nullableEnum": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/TestEnum"
+              }
+            ]
+          },
+          "listOfNullableEnums": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TestEnum"
+            }
+          }
+        }
+      },
+      "Item": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "value": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "JsonPatchDocument": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "oneOf": [
+            {
+              "required": [
+                "op",
+                "path",
+                "value"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "add",
+                    "replace",
+                    "test"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "value": { }
+              },
+              "additionalProperties": false
+            },
+            {
+              "required": [
+                "op",
+                "path",
+                "from"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "move",
+                    "copy"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "from": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "required": [
+                "op",
+                "path"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "remove"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        }
+      },
+      "LocationContainer": {
+        "required": [
+          "location"
+        ],
+        "type": "object",
+        "properties": {
+          "location": {
+            "$ref": "#/components/schemas/LocationDto"
+          }
+        }
+      },
+      "LocationDto": {
+        "required": [
+          "address"
+        ],
+        "type": "object",
+        "properties": {
+          "address": {
+            "$ref": "#/components/schemas/AddressDto"
+          }
+        }
+      },
+      "ModelWithDefaults": {
+        "type": "object",
+        "properties": {
+          "propertyWithDefault": {
+            "type": "string"
+          },
+          "nullableWithNull": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "numberWithDefault": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "boolWithDefault": {
+            "type": "boolean"
+          }
+        }
+      },
+      "NestedModel": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "optionalValue": {
+            "type": [
+              "null",
+              "integer"
+            ],
+            "format": "int32"
+          },
+          "deepNested": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ComplexType"
+              }
+            ]
+          }
+        }
+      },
+      "NullableArrayModel": {
+        "type": "object",
+        "properties": {
+          "nullableArray": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "type": "string"
+            }
+          },
+          "listWithNullableElements": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "nullableDictionaryWithNullableValues": {
+            "type": [
+              "null",
+              "object"
+            ],
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "NullableRequestModel": {
+        "required": [
+          "requiredField"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredField": {
+            "type": "string"
+          },
+          "optionalField": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "nullableList": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "type": "string"
+            }
+          },
+          "nullableDictionary": {
+            "type": [
+              "null",
+              "object"
+            ],
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "NullableResponseModel": {
+        "required": [
+          "requiredProperty"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredProperty": {
+            "type": "string"
+          },
+          "nullableProperty": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "nullableComplexProperty": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ComplexType"
+              }
+            ]
+          }
+        }
+      },
+      "ParentObject": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChildObject"
+            }
+          }
+        }
+      },
+      "Person": {
+        "required": [
+          "discriminator"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/PersonStudent"
+          },
+          {
+            "$ref": "#/components/schemas/PersonTeacher"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "discriminator",
+          "mapping": {
+            "student": "#/components/schemas/PersonStudent",
+            "teacher": "#/components/schemas/PersonTeacher"
+          }
+        }
+      },
+      "PersonStudent": {
+        "properties": {
+          "discriminator": {
+            "enum": [
+              "student"
+            ],
+            "type": "string"
+          },
+          "gpa": {
+            "type": "number",
+            "format": "double"
+          }
+        }
+      },
+      "PersonTeacher": {
+        "required": [
+          "subject"
+        ],
+        "properties": {
+          "discriminator": {
+            "enum": [
+              "teacher"
+            ],
+            "type": "string"
+          },
+          "subject": {
+            "type": "string"
+          }
+        }
+      },
+      "Product": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ProjectAddressResponse": {
+        "required": [
+          "city"
+        ],
+        "type": "object",
+        "properties": {
+          "city": {
+            "$ref": "#/components/schemas/CityResponse"
+          }
+        }
+      },
+      "ProjectBuilderResponse": {
+        "required": [
+          "city"
+        ],
+        "type": "object",
+        "properties": {
+          "city": {
+            "$ref": "#/components/schemas/CityResponse"
+          }
+        }
+      },
+      "ProjectResponse": {
+        "required": [
+          "address",
+          "builder"
+        ],
+        "type": "object",
+        "properties": {
+          "address": {
+            "$ref": "#/components/schemas/ProjectAddressResponse"
+          },
+          "builder": {
+            "$ref": "#/components/schemas/ProjectBuilderResponse"
+          }
+        }
+      },
+      "RefProfile": {
+        "required": [
+          "user"
+        ],
+        "type": "object",
+        "properties": {
+          "user": {
+            "$ref": "#/components/schemas/RefUser"
+          }
+        }
+      },
+      "RefUser": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      },
+      "Root": {
+        "type": "object",
+        "properties": {
+          "item1": {
+            "$ref": "#/components/schemas/Item"
+          },
+          "item2": {
+            "$ref": "#/components/schemas/Item"
+          }
+        }
+      },
+      "Shape": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ShapeTriangle"
+          },
+          {
+            "$ref": "#/components/schemas/ShapeSquare"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "triangle": "#/components/schemas/ShapeTriangle",
+            "square": "#/components/schemas/ShapeSquare"
+          }
+        }
+      },
+      "ShapeSquare": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "square"
+            ],
+            "type": "string"
+          },
+          "area": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "ShapeTriangle": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "triangle"
+            ],
+            "type": "string"
+          },
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "Subscription": {
+        "required": [
+          "id",
+          "primaryUser"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "primaryUser": {
+            "$ref": "#/components/schemas/RefProfile"
+          },
+          "secondaryUser": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/RefProfile"
+              }
+            ]
+          }
+        }
+      },
+      "Tag": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "TestEnum": {
+        "type": "integer"
+      },
+      "Triangle": {
+        "type": "object",
+        "properties": {
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "WeatherForecastBase": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity"
+          },
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries"
+          },
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "0": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity",
+            "1": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries",
+            "2": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithCity": {
+        "required": [
+          "city"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              0
+            ],
+            "type": "integer"
+          },
+          "city": {
+            "type": "string"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithLocalNews": {
+        "required": [
+          "news"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              2
+            ],
+            "type": "integer"
+          },
+          "news": {
+            "type": "string"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithTimeSeries": {
+        "required": [
+          "summary"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              1
+            ],
+            "type": "integer"
+          },
+          "date": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "temperatureC": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "summary": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
new file mode 100644
index 000000000000..abbe8732d74f
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt
@@ -0,0 +1,208 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | v1",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/v1/array-of-guids": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "parameters": [
+          {
+            "name": "guids",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "uuid"
+              }
+            }
+          },
+          {
+            "name": "X-Version",
+            "in": "header",
+            "schema": {
+              "type": "string",
+              "default": "1.0"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string",
+                    "format": "uuid"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/todos": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "summary": "Creates a new todo item.",
+        "parameters": [
+          {
+            "name": "X-Version",
+            "in": "header",
+            "schema": {
+              "type": "string",
+              "default": "1.0"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/v1/todos/{id}": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "description": "Returns a specific todo item.",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "X-Version",
+            "in": "header",
+            "schema": {
+              "type": "string",
+              "default": "1.0"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TodoWithDueDate"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Todo": {
+        "required": [
+          "id",
+          "title",
+          "completed",
+          "createdAt"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The unique identifier of the to-do item.",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the to-do item."
+          },
+          "completed": {
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "The date and time when the to-do item was created.",
+            "format": "date-time"
+          }
+        },
+        "description": "Represents a to-do item."
+      },
+      "TodoWithDueDate": {
+        "required": [
+          "dueDate",
+          "id",
+          "title",
+          "completed",
+          "createdAt"
+        ],
+        "type": "object",
+        "properties": {
+          "dueDate": {
+            "type": "string",
+            "description": "The due date of the to-do item.",
+            "format": "date-time"
+          },
+          "id": {
+            "type": "integer",
+            "description": "The unique identifier of the to-do item.",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the to-do item."
+          },
+          "completed": {
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "The date and time when the to-do item was created.",
+            "format": "date-time"
+          }
+        },
+        "description": "Represents a to-do item with a due date."
+      }
+    },
+    "securitySchemes": {
+      "Bearer": {
+        "type": "http",
+        "scheme": "bearer",
+        "bearerFormat": "Json Web Token"
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
new file mode 100644
index 000000000000..fed56ba97790
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt
@@ -0,0 +1,69 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | v2",
+    "contact": {
+      "name": "OpenAPI Enthusiast",
+      "email": "iloveopenapi@example.com"
+    },
+    "license": {
+      "name": "MIT"
+    },
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/v2/users": {
+      "get": {
+        "tags": [
+          "users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string",
+                    "externalDocs": {
+                      "description": "Documentation for this OpenAPI schema",
+                      "url": "https://example.com/api/docs/schemas/string"
+                    }
+                  },
+                  "externalDocs": {
+                    "description": "Documentation for this OpenAPI schema",
+                    "url": "https://example.com/api/docs/schemas/array"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "externalDocs": {
+          "description": "Documentation for this OpenAPI endpoint",
+          "url": "https://example.com/api/docs/operations/CreateUser"
+        },
+        "operationId": "CreateUser",
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "users"
+    },
+    {
+      "name": "Sample"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt
new file mode 100644
index 000000000000..7a4b01a03316
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt
@@ -0,0 +1,397 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | xml",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/xml/type-with-examples": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TypeWithExamples"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TypeWithExamples"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/xml/todo": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TodoFomInterface"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/project": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Project"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/board": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BoardItem"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/project-record": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectRecord"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/todo-with-description": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TodoWithDescription"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/Xml": {
+      "get": {
+        "tags": [
+          "Xml"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "description": "The name of the person.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the greeting.",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Xml"
+        ],
+        "requestBody": {
+          "description": "The todo to insert into the database.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "BoardItem": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        },
+        "description": "An item on the board."
+      },
+      "Project": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          }
+        },
+        "description": "The project that contains Todo items."
+      },
+      "ProjectRecord": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the project."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the project."
+          }
+        },
+        "description": "The project that contains Todo items."
+      },
+      "Todo": {
+        "required": [
+          "id",
+          "title",
+          "completed"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string"
+          },
+          "completed": {
+            "type": "boolean"
+          }
+        }
+      },
+      "TodoFomInterface": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The identifier of the todo.",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the todo."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the todo."
+          }
+        },
+        "description": "This is a todo item."
+      },
+      "TodoWithDescription": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The identifier of the todo, overridden.",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the todo, overridden."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the the todo.\nAnother description of the todo."
+          }
+        }
+      },
+      "TypeWithExamples": {
+        "type": "object",
+        "properties": {
+          "booleanType": {
+            "type": "boolean",
+            "example": true
+          },
+          "integerType": {
+            "type": "integer",
+            "format": "int32",
+            "example": 42
+          },
+          "longType": {
+            "type": "integer",
+            "format": "int64",
+            "example": 1234567890123456789
+          },
+          "doubleType": {
+            "type": "number",
+            "format": "double",
+            "example": 3.14
+          },
+          "floatType": {
+            "type": "number",
+            "format": "float",
+            "example": 3.14
+          },
+          "dateTimeType": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2022-01-01T00:00:00Z"
+          },
+          "dateOnlyType": {
+            "type": "string",
+            "format": "date",
+            "example": "2022-01-01"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    },
+    {
+      "name": "Xml"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
deleted file mode 100644
index cd00d261b632..000000000000
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
+++ /dev/null
@@ -1,624 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "info": {
-    "title": "Sample | schemas-by-ref",
-    "version": "1.0.0"
-  },
-  "paths": {
-    "/schemas-by-ref/typed-results": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Triangle"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/multiple-results": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Triangle"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not Found",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/iresult-no-produces": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/iresult-with-produces": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "text/xml": {
-                "schema": {
-                  "$ref": "#/components/schemas/Triangle"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/primitives": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "parameters": [
-          {
-            "name": "id",
-            "in": "query",
-            "description": "The ID associated with the Todo item.",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          },
-          {
-            "name": "size",
-            "in": "query",
-            "description": "The number of Todos to fetch",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/product": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Product"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Product"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/account": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Account"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Account"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/array-of-ints": {
-      "post": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "array",
-                "items": {
-                  "type": "integer",
-                  "format": "int32"
-                }
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "integer",
-                  "format": "int32"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/list-of-ints": {
-      "post": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "array",
-                "items": {
-                  "type": "integer",
-                  "format": "int32"
-                }
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "integer",
-                  "format": "int32"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/ienumerable-of-ints": {
-      "post": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "integer",
-                  "format": "int32"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/dictionary-of-ints": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "integer",
-                    "format": "int32"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/frozen-dictionary-of-ints": {
-      "get": {
-        "tags": [
-          "Sample"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "integer",
-                    "format": "int32"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/shape": {
-      "post": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Shape"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/weatherforecastbase": {
-      "post": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/WeatherForecastBase"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
-    "/schemas-by-ref/person": {
-      "post": {
-        "tags": [
-          "Sample"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Person"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "Account": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "name": {
-            "type": "string"
-          }
-        }
-      },
-      "Person": {
-        "required": [
-          "discriminator"
-        ],
-        "type": "object",
-        "anyOf": [
-          {
-            "$ref": "#/components/schemas/PersonStudent"
-          },
-          {
-            "$ref": "#/components/schemas/PersonTeacher"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "discriminator",
-          "mapping": {
-            "student": "#/components/schemas/PersonStudent",
-            "teacher": "#/components/schemas/PersonTeacher"
-          }
-        }
-      },
-      "PersonStudent": {
-        "properties": {
-          "discriminator": {
-            "enum": [
-              "student"
-            ],
-            "type": "string"
-          },
-          "gpa": {
-            "type": "number",
-            "format": "double"
-          }
-        }
-      },
-      "PersonTeacher": {
-        "required": [
-          "subject"
-        ],
-        "properties": {
-          "discriminator": {
-            "enum": [
-              "teacher"
-            ],
-            "type": "string"
-          },
-          "subject": {
-            "type": "string"
-          }
-        }
-      },
-      "Product": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "name": {
-            "type": "string"
-          }
-        }
-      },
-      "Shape": {
-        "required": [
-          "$type"
-        ],
-        "type": "object",
-        "anyOf": [
-          {
-            "$ref": "#/components/schemas/ShapeTriangle"
-          },
-          {
-            "$ref": "#/components/schemas/ShapeSquare"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "$type",
-          "mapping": {
-            "triangle": "#/components/schemas/ShapeTriangle",
-            "square": "#/components/schemas/ShapeSquare"
-          }
-        }
-      },
-      "ShapeSquare": {
-        "properties": {
-          "$type": {
-            "enum": [
-              "square"
-            ],
-            "type": "string"
-          },
-          "area": {
-            "type": "number",
-            "format": "double"
-          },
-          "color": {
-            "type": "string"
-          },
-          "sides": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "ShapeTriangle": {
-        "properties": {
-          "$type": {
-            "enum": [
-              "triangle"
-            ],
-            "type": "string"
-          },
-          "hypotenuse": {
-            "type": "number",
-            "format": "double"
-          },
-          "color": {
-            "type": "string"
-          },
-          "sides": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "Triangle": {
-        "type": "object",
-        "properties": {
-          "hypotenuse": {
-            "type": "number",
-            "format": "double"
-          },
-          "color": {
-            "type": "string"
-          },
-          "sides": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "WeatherForecastBase": {
-        "required": [
-          "$type"
-        ],
-        "type": "object",
-        "anyOf": [
-          {
-            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity"
-          },
-          {
-            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries"
-          },
-          {
-            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
-          }
-        ],
-        "discriminator": {
-          "propertyName": "$type",
-          "mapping": {
-            "0": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity",
-            "1": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries",
-            "2": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
-          }
-        }
-      },
-      "WeatherForecastBaseWeatherForecastWithCity": {
-        "required": [
-          "city"
-        ],
-        "properties": {
-          "$type": {
-            "enum": [
-              0
-            ],
-            "type": "integer"
-          },
-          "city": {
-            "type": "string"
-          }
-        }
-      },
-      "WeatherForecastBaseWeatherForecastWithLocalNews": {
-        "required": [
-          "news"
-        ],
-        "properties": {
-          "$type": {
-            "enum": [
-              2
-            ],
-            "type": "integer"
-          },
-          "news": {
-            "type": "string"
-          }
-        }
-      },
-      "WeatherForecastBaseWeatherForecastWithTimeSeries": {
-        "required": [
-          "summary"
-        ],
-        "properties": {
-          "$type": {
-            "enum": [
-              1
-            ],
-            "type": "integer"
-          },
-          "date": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "temperatureC": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "summary": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  },
-  "tags": [
-    {
-      "name": "Sample"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentLocalizationTests.VerifyOpenApiDocumentIsInvariant.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentLocalizationTests.VerifyOpenApiDocumentIsInvariant.verified.txt
new file mode 100644
index 000000000000..eec2cfe16702
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentLocalizationTests.VerifyOpenApiDocumentIsInvariant.verified.txt
@@ -0,0 +1,2611 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "Sample | localized",
+    "description": "This is a localized OpenAPI document for français (France).",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost/"
+    }
+  ],
+  "paths": {
+    "/forms/form-file": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "resume"
+                ],
+                "type": "object",
+                "properties": {
+                  "resume": {
+                    "$ref": "#/components/schemas/IFormFile"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/form-files": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "files"
+                ],
+                "type": "object",
+                "properties": {
+                  "files": {
+                    "$ref": "#/components/schemas/IFormFileCollection"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/form-file-multiple": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "resume",
+                  "files"
+                ],
+                "type": "object",
+                "allOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "resume": {
+                        "$ref": "#/components/schemas/IFormFile"
+                      }
+                    }
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "files": {
+                        "$ref": "#/components/schemas/IFormFileCollection"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/form-todo": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/forms/forms-pocos-and-files": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "file"
+                ],
+                "type": "object",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/Todo"
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "file": {
+                        "$ref": "#/components/schemas/IFormFile"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/v1/array-of-guids": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "parameters": [
+          {
+            "name": "guids",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "uuid"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string",
+                    "format": "uuid"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v1/todos": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "summary": "Creates a new todo item.",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/v1/todos/{id}": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "description": "Returns a specific todo item.",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TodoWithDueDate"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/v2/users": {
+      "get": {
+        "tags": [
+          "users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "operationId": "CreateUser",
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/type-with-examples": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TypeWithExamples"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TypeWithExamples"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/xml/todo": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TodoFomInterface"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/project": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Project"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/board": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BoardItem"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/project-record": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectRecord"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/xml/todo-with-description": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TodoWithDescription"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/Xml": {
+      "get": {
+        "tags": [
+          "Xml"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "description": "The name of the person.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the greeting.",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Xml"
+        ],
+        "requestBody": {
+          "description": "The todo to insert into the database.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/Todo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/typed-results": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/multiple-results": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/iresult-no-produces": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/iresult-with-produces": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/primitives": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "query",
+            "description": "The ID associated with the Todo item.",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "size",
+            "in": "query",
+            "description": "The number of Todos to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/product": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Product"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Product"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/account": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Account"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Account"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/array-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/list-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/ienumerable-of-ints": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/dictionary-of-ints": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/frozen-dictionary-of-ints": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/shape": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Shape"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/weatherforecastbase": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WeatherForecastBase"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/person": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Person"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/category": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Category"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/container": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ContainerType"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/root": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Root"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/location": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LocationContainer"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/parent": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ParentObject"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/child": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChildObject"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/json-patch": {
+      "patch": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/JsonPatchDocument"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/json-patch-generic": {
+      "patch": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json-patch+json": {
+              "schema": {
+                "$ref": "#/components/schemas/JsonPatchDocument"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/custom-iresult": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CustomIResultImplementor"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/config-with-generic-lists": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Config"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/project-response": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectResponse"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/subscription": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Subscription"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-response": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NullableResponseModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-return-type": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "$ref": "#/components/schemas/NullableResponseModel"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-request": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "type": "null"
+                  },
+                  {
+                    "$ref": "#/components/schemas/NullableRequestModel"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/complex-nullable-hierarchy": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ComplexHierarchyModel"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-array-elements": {
+      "post": {
+        "tags": [
+          "Sample"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NullableArrayModel"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/optional-with-default": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModelWithDefaults"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/schemas-by-ref/nullable-enum-response": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnumNullableModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/200-add-xml": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              },
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/200-only-xml": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/Todo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/triangle": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Triangle"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/responses/shape": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Shape"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/getbyidandname/{id}/{name}": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "minLength": 5,
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/gettypedresult": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MvcTodo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/forms": {
+      "post": {
+        "tags": [
+          "Test"
+        ],
+        "requestBody": {
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "Title": {
+                    "type": "string"
+                  },
+                  "Description": {
+                    "type": "string"
+                  },
+                  "IsCompleted": {
+                    "type": "boolean"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/getcultureinvariant": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CurrentWeather"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Account": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "AddressDto": {
+        "required": [
+          "relatedLocation"
+        ],
+        "type": "object",
+        "properties": {
+          "relatedLocation": {
+            "$ref": "#/components/schemas/LocationDto"
+          }
+        }
+      },
+      "BoardItem": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        },
+        "description": "An item on the board."
+      },
+      "Category": {
+        "required": [
+          "name",
+          "parent"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/Category"
+          },
+          "tags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Tag"
+            }
+          }
+        }
+      },
+      "ChildObject": {
+        "required": [
+          "parent"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/ParentObject"
+          }
+        }
+      },
+      "CityResponse": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ComplexHierarchyModel": {
+        "required": [
+          "id",
+          "requiredNested"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "optionalNested": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/NestedModel"
+              }
+            ]
+          },
+          "requiredNested": {
+            "$ref": "#/components/schemas/NestedModel"
+          },
+          "nullableListWithNullableItems": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/NestedModel"
+            }
+          }
+        }
+      },
+      "ComplexType": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "timestamp": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          }
+        }
+      },
+      "Config": {
+        "type": "object",
+        "properties": {
+          "items1": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigItem"
+            }
+          },
+          "items2": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigItem"
+            }
+          }
+        }
+      },
+      "ConfigItem": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": [
+              "null",
+              "integer"
+            ],
+            "format": "int32"
+          },
+          "lang": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "words": {
+            "type": [
+              "null",
+              "object"
+            ]
+          },
+          "break": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "type": "string"
+            }
+          },
+          "willBeGood": {
+            "type": [
+              "null",
+              "string"
+            ]
+          }
+        }
+      },
+      "ContainerType": {
+        "type": "object",
+        "properties": {
+          "seq1": {
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "seq2": {
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      },
+      "CurrentWeather": {
+        "type": "object",
+        "properties": {
+          "temperature": {
+            "maximum": 100.5,
+            "minimum": -100.5,
+            "type": "number",
+            "format": "float",
+            "default": 0.1
+          }
+        }
+      },
+      "CustomIResultImplementor": {
+        "required": [
+          "content"
+        ],
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "string"
+          }
+        }
+      },
+      "EnumNullableModel": {
+        "required": [
+          "requiredEnum"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredEnum": {
+            "$ref": "#/components/schemas/TestEnum"
+          },
+          "nullableEnum": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/TestEnum"
+              }
+            ]
+          },
+          "listOfNullableEnums": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TestEnum"
+            }
+          }
+        }
+      },
+      "IFormFile": {
+        "type": "string",
+        "format": "binary"
+      },
+      "IFormFileCollection": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/IFormFile"
+        }
+      },
+      "Item": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "value": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "JsonPatchDocument": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "oneOf": [
+            {
+              "required": [
+                "op",
+                "path",
+                "value"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "add",
+                    "replace",
+                    "test"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "value": { }
+              },
+              "additionalProperties": false
+            },
+            {
+              "required": [
+                "op",
+                "path",
+                "from"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "move",
+                    "copy"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "from": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "required": [
+                "op",
+                "path"
+              ],
+              "type": "object",
+              "properties": {
+                "op": {
+                  "enum": [
+                    "remove"
+                  ],
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        }
+      },
+      "LocationContainer": {
+        "required": [
+          "location"
+        ],
+        "type": "object",
+        "properties": {
+          "location": {
+            "$ref": "#/components/schemas/LocationDto"
+          }
+        }
+      },
+      "LocationDto": {
+        "required": [
+          "address"
+        ],
+        "type": "object",
+        "properties": {
+          "address": {
+            "$ref": "#/components/schemas/AddressDto"
+          }
+        }
+      },
+      "ModelWithDefaults": {
+        "type": "object",
+        "properties": {
+          "propertyWithDefault": {
+            "type": "string"
+          },
+          "nullableWithNull": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "numberWithDefault": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "boolWithDefault": {
+            "type": "boolean"
+          }
+        }
+      },
+      "MvcTodo": {
+        "required": [
+          "title",
+          "description",
+          "isCompleted"
+        ],
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "isCompleted": {
+            "type": "boolean"
+          }
+        }
+      },
+      "NestedModel": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "optionalValue": {
+            "type": [
+              "null",
+              "integer"
+            ],
+            "format": "int32"
+          },
+          "deepNested": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ComplexType"
+              }
+            ]
+          }
+        }
+      },
+      "NullableArrayModel": {
+        "type": "object",
+        "properties": {
+          "nullableArray": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "type": "string"
+            }
+          },
+          "listWithNullableElements": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "nullableDictionaryWithNullableValues": {
+            "type": [
+              "null",
+              "object"
+            ],
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "NullableRequestModel": {
+        "required": [
+          "requiredField"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredField": {
+            "type": "string"
+          },
+          "optionalField": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "nullableList": {
+            "type": [
+              "null",
+              "array"
+            ],
+            "items": {
+              "type": "string"
+            }
+          },
+          "nullableDictionary": {
+            "type": [
+              "null",
+              "object"
+            ],
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "NullableResponseModel": {
+        "required": [
+          "requiredProperty"
+        ],
+        "type": "object",
+        "properties": {
+          "requiredProperty": {
+            "type": "string"
+          },
+          "nullableProperty": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "nullableComplexProperty": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ComplexType"
+              }
+            ]
+          }
+        }
+      },
+      "ParentObject": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChildObject"
+            }
+          }
+        }
+      },
+      "Person": {
+        "required": [
+          "discriminator"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/PersonStudent"
+          },
+          {
+            "$ref": "#/components/schemas/PersonTeacher"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "discriminator",
+          "mapping": {
+            "student": "#/components/schemas/PersonStudent",
+            "teacher": "#/components/schemas/PersonTeacher"
+          }
+        }
+      },
+      "PersonStudent": {
+        "properties": {
+          "discriminator": {
+            "enum": [
+              "student"
+            ],
+            "type": "string"
+          },
+          "gpa": {
+            "type": "number",
+            "format": "double"
+          }
+        }
+      },
+      "PersonTeacher": {
+        "required": [
+          "subject"
+        ],
+        "properties": {
+          "discriminator": {
+            "enum": [
+              "teacher"
+            ],
+            "type": "string"
+          },
+          "subject": {
+            "type": "string"
+          }
+        }
+      },
+      "Product": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "Project": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          }
+        },
+        "description": "The project that contains Todo items."
+      },
+      "ProjectAddressResponse": {
+        "required": [
+          "city"
+        ],
+        "type": "object",
+        "properties": {
+          "city": {
+            "$ref": "#/components/schemas/CityResponse"
+          }
+        }
+      },
+      "ProjectBuilderResponse": {
+        "required": [
+          "city"
+        ],
+        "type": "object",
+        "properties": {
+          "city": {
+            "$ref": "#/components/schemas/CityResponse"
+          }
+        }
+      },
+      "ProjectRecord": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the project."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the project."
+          }
+        },
+        "description": "The project that contains Todo items."
+      },
+      "ProjectResponse": {
+        "required": [
+          "address",
+          "builder"
+        ],
+        "type": "object",
+        "properties": {
+          "address": {
+            "$ref": "#/components/schemas/ProjectAddressResponse"
+          },
+          "builder": {
+            "$ref": "#/components/schemas/ProjectBuilderResponse"
+          }
+        }
+      },
+      "RefProfile": {
+        "required": [
+          "user"
+        ],
+        "type": "object",
+        "properties": {
+          "user": {
+            "$ref": "#/components/schemas/RefUser"
+          }
+        }
+      },
+      "RefUser": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      },
+      "Root": {
+        "type": "object",
+        "properties": {
+          "item1": {
+            "$ref": "#/components/schemas/Item"
+          },
+          "item2": {
+            "$ref": "#/components/schemas/Item"
+          }
+        }
+      },
+      "Shape": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ShapeTriangle"
+          },
+          {
+            "$ref": "#/components/schemas/ShapeSquare"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "triangle": "#/components/schemas/ShapeTriangle",
+            "square": "#/components/schemas/ShapeSquare"
+          }
+        }
+      },
+      "ShapeSquare": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "square"
+            ],
+            "type": "string"
+          },
+          "area": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "ShapeTriangle": {
+        "properties": {
+          "$type": {
+            "enum": [
+              "triangle"
+            ],
+            "type": "string"
+          },
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "Subscription": {
+        "required": [
+          "id",
+          "primaryUser"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "primaryUser": {
+            "$ref": "#/components/schemas/RefProfile"
+          },
+          "secondaryUser": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/RefProfile"
+              }
+            ]
+          }
+        }
+      },
+      "Tag": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "TestEnum": {
+        "type": "integer"
+      },
+      "Todo": {
+        "required": [
+          "id",
+          "title",
+          "completed",
+          "createdAt"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The unique identifier of the to-do item.",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the to-do item."
+          },
+          "completed": {
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "The date and time when the to-do item was created.",
+            "format": "date-time"
+          }
+        },
+        "description": "Represents a to-do item."
+      },
+      "TodoFomInterface": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The identifier of the todo.",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the todo."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the todo."
+          }
+        },
+        "description": "This is a todo item."
+      },
+      "TodoWithDescription": {
+        "required": [
+          "name",
+          "description"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "The identifier of the todo, overridden.",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the todo, overridden."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the the todo.\nAnother description of the todo."
+          }
+        }
+      },
+      "TodoWithDueDate": {
+        "required": [
+          "dueDate",
+          "id",
+          "title",
+          "completed",
+          "createdAt"
+        ],
+        "type": "object",
+        "properties": {
+          "dueDate": {
+            "type": "string",
+            "description": "The due date of the to-do item.",
+            "format": "date-time"
+          },
+          "id": {
+            "type": "integer",
+            "description": "The unique identifier of the to-do item.",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the to-do item."
+          },
+          "completed": {
+            "type": "boolean",
+            "description": "Indicates whether the to-do item is completed."
+          },
+          "createdAt": {
+            "type": "string",
+            "description": "The date and time when the to-do item was created.",
+            "format": "date-time"
+          }
+        },
+        "description": "Represents a to-do item with a due date."
+      },
+      "Triangle": {
+        "type": "object",
+        "properties": {
+          "hypotenuse": {
+            "type": "number",
+            "format": "double"
+          },
+          "color": {
+            "type": "string"
+          },
+          "sides": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "TypeWithExamples": {
+        "type": "object",
+        "properties": {
+          "booleanType": {
+            "type": "boolean",
+            "example": true
+          },
+          "integerType": {
+            "type": "integer",
+            "format": "int32",
+            "example": 42
+          },
+          "longType": {
+            "type": "integer",
+            "format": "int64",
+            "example": 1234567890123456789
+          },
+          "doubleType": {
+            "type": "number",
+            "format": "double",
+            "example": 3.14
+          },
+          "floatType": {
+            "type": "number",
+            "format": "float",
+            "example": 3.14
+          },
+          "dateTimeType": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2022-01-01T00:00:00Z"
+          },
+          "dateOnlyType": {
+            "type": "string",
+            "format": "date",
+            "example": "2022-01-01"
+          }
+        }
+      },
+      "WeatherForecastBase": {
+        "required": [
+          "$type"
+        ],
+        "type": "object",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity"
+          },
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries"
+          },
+          {
+            "$ref": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "$type",
+          "mapping": {
+            "0": "#/components/schemas/WeatherForecastBaseWeatherForecastWithCity",
+            "1": "#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries",
+            "2": "#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithCity": {
+        "required": [
+          "city"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              0
+            ],
+            "type": "integer"
+          },
+          "city": {
+            "type": "string"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithLocalNews": {
+        "required": [
+          "news"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              2
+            ],
+            "type": "integer"
+          },
+          "news": {
+            "type": "string"
+          }
+        }
+      },
+      "WeatherForecastBaseWeatherForecastWithTimeSeries": {
+        "required": [
+          "summary"
+        ],
+        "properties": {
+          "$type": {
+            "enum": [
+              1
+            ],
+            "type": "integer"
+          },
+          "date": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "temperatureC": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "summary": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample"
+    },
+    {
+      "name": "users"
+    },
+    {
+      "name": "Xml"
+    },
+    {
+      "name": "Test"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Microsoft.AspNetCore.OpenApi.Tests.csproj b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Microsoft.AspNetCore.OpenApi.Tests.csproj
index 3dd050f9bded..96a5342b6407 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Microsoft.AspNetCore.OpenApi.Tests.csproj
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Microsoft.AspNetCore.OpenApi.Tests.csproj
@@ -13,7 +13,7 @@
     <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.OpenApi" />
-    <Reference Include="Microsoft.OpenApi.Readers" />
+    <Reference Include="Microsoft.OpenApi.YamlReader" />
     <Reference Include="Microsoft.AspNetCore.Routing" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
@@ -36,6 +36,12 @@
   <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 
   <ItemGroup>
-    <HelixContent Include="$(MSBuildProjectDirectory)\Integration\snapshots\**" LinkBase="$(MSBuildThisFileDirectory)\Integration\snapshots"/>
+    <HelixContent
+      Include="$(MSBuildProjectDirectory)\Integration\snapshots\**"
+      LinkBase="$(MSBuildThisFileDirectory)\Integration\snapshots"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.OpenApi" />
   </ItemGroup>
 </Project>
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/CreateSchemaReferenceIdTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/CreateSchemaReferenceIdTests.cs
index f488a6ffc737..62a184e7a951 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/CreateSchemaReferenceIdTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/CreateSchemaReferenceIdTests.cs
@@ -1,11 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public class CreateSchemaReferenceIdTests : OpenApiDocumentServiceTestBase
 {
@@ -32,11 +32,11 @@ string createReferenceId(JsonTypeInfo jsonTypeInfo)
         // Assert
         await VerifyOpenApiDocument(builder, options, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings have been configured correctly
             Assert.Equal("$type", schema.Discriminator.PropertyName);
             Assert.Contains(schema.Discriminator.PropertyName, schema.Required);
@@ -45,15 +45,15 @@ await VerifyOpenApiDocument(builder, options, document =>
                 item => Assert.Equal("square", item.Key)
             );
             Assert.Collection(schema.Discriminator.Mapping,
-                item => Assert.Equal("#/components/schemas/MyShapeMyTriangle", item.Value),
-                item => Assert.Equal("#/components/schemas/MyShapeMySquare", item.Value)
+                item => Assert.Equal("#/components/schemas/MyShapeMyTriangle", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/MyShapeMySquare", item.Value.Reference.ReferenceV3)
             );
             // Assert the schemas with the discriminator have been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("MyShapeMyTriangle", out var triangleSchema));
             Assert.Contains(schema.Discriminator.PropertyName, triangleSchema.Properties.Keys);
-            Assert.Equal("triangle", ((OpenApiString)triangleSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("triangle", triangleSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             Assert.True(document.Components.Schemas.TryGetValue("MyShapeMySquare", out var squareSchema));
-            Assert.Equal("square", ((OpenApiString)squareSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("square", squareSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
         });
     }
 
@@ -70,36 +70,36 @@ public async Task GeneratesSchemaForPoco_WithSchemaReferenceIdCustomization()
         // Assert
         await VerifyOpenApiDocument(builder, options, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
 
             Assert.NotNull(requestBody);
             var content = Assert.Single(requestBody.Content);
             Assert.Equal("application/json", content.Key);
             Assert.NotNull(content.Value.Schema);
-            Assert.Equal("TodoSchema", content.Value.Schema.Reference.Id);
-            var schema = content.Value.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            Assert.Equal("TodoSchema", ((OpenApiSchemaReference)content.Value.Schema).Reference.Id);
+            var schema = content.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
 
@@ -119,7 +119,7 @@ public async Task GeneratesInlineSchemaForPoco_WithCustomNullId()
         // Assert
         await VerifyOpenApiDocument(builder, options, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
 
             Assert.NotNull(requestBody);
@@ -128,28 +128,28 @@ await VerifyOpenApiDocument(builder, options, document =>
             Assert.NotNull(content.Value.Schema);
             // Assert that no reference was created and the schema is inlined
             var schema = content.Value.Schema;
-            Assert.Null(schema.Reference);
-            Assert.Equal("object", schema.Type);
+            Assert.IsType<OpenApiSchema>(schema);
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
 
@@ -176,7 +176,7 @@ public async Task CanCallDefaultImplementationFromCustomOne()
 
         await VerifyOpenApiDocument(builder, options, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var response = operation.Responses["200"];
 
@@ -186,7 +186,7 @@ await VerifyOpenApiDocument(builder, options, document =>
             Assert.Equal("application/json", content.Key);
             Assert.NotNull(content.Value.Schema);
             var schema = content.Value.Schema;
-            Assert.Null(schema.Reference);
+            Assert.IsNotType<OpenApiSchemaReference>(schema);
 
             // Assert that a reference was created for the TodoWithDueDate type
             Assert.NotNull(response);
@@ -194,12 +194,12 @@ await VerifyOpenApiDocument(builder, options, document =>
             Assert.Equal("application/json", responseContent.Key);
             Assert.NotNull(responseContent.Value.Schema);
             var responseSchema = responseContent.Value.Schema;
-            Assert.NotNull(responseSchema.Reference);
-            Assert.Equal("TodoWithDueDate", responseSchema.Reference.Id);
+            Assert.IsType<OpenApiSchemaReference>(responseSchema);
+            Assert.Equal("TodoWithDueDate", ((OpenApiSchemaReference)responseSchema).Reference.Id);
         });
     }
 
-    [Fact]
+    [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/58619")]
     public async Task HandlesDuplicateSchemaReferenceIdsGeneratedByOverload()
     {
         var builder = CreateBuilder();
@@ -219,7 +219,7 @@ public async Task HandlesDuplicateSchemaReferenceIdsGeneratedByOverload()
 
         await VerifyOpenApiDocument(builder, options, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var response = operation.Responses["200"];
 
@@ -229,7 +229,7 @@ await VerifyOpenApiDocument(builder, options, document =>
             Assert.Equal("application/json", content.Key);
             Assert.NotNull(content.Value.Schema);
             var schema = content.Value.Schema;
-            Assert.NotNull(schema.Reference);
+            Assert.IsType<OpenApiSchemaReference>(schema);
 
             // Assert that a reference was created for the TodoWithDueDate type
             Assert.NotNull(response);
@@ -237,65 +237,65 @@ await VerifyOpenApiDocument(builder, options, document =>
             Assert.Equal("application/json", responseContent.Key);
             Assert.NotNull(responseContent.Value.Schema);
             var responseSchema = responseContent.Value.Schema;
-            Assert.NotNull(responseSchema.Reference);
+            Assert.IsType<OpenApiSchemaReference>(responseSchema);
 
             // Assert that the reference IDs are not the same (have been deduped)
-            Assert.NotEqual(schema.Reference.Id, responseSchema.Reference.Id);
+            Assert.NotEqual(((OpenApiSchemaReference)schema).Reference.Id, ((OpenApiSchemaReference)responseSchema).Reference.Id);
 
             // Assert that the referenced schemas are correct
-            var effectiveResponseSchema = responseSchema.GetEffective(document);
-            Assert.Equal("object", effectiveResponseSchema.Type);
+            var effectiveResponseSchema = responseSchema;
+            Assert.Equal(JsonSchemaType.Object, effectiveResponseSchema.Type);
             Assert.Collection(effectiveResponseSchema.Properties,
                 property =>
                 {
                     Assert.Equal("dueDate", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
 
-            var effectiveRequestSchema = schema.GetEffective(document);
-            Assert.Equal("object", effectiveRequestSchema.Type);
+            var effectiveRequestSchema = schema;
+            Assert.Equal(JsonSchemaType.Object, effectiveRequestSchema.Type);
             Assert.Collection(effectiveRequestSchema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
         });
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentProviderTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentProviderTests.cs
index 04e31fdec7ba..51fef947ee71 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentProviderTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentProviderTests.cs
@@ -4,8 +4,7 @@
 using Microsoft.Extensions.ApiDescriptions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
+using Microsoft.OpenApi;
 using static Microsoft.AspNetCore.OpenApi.Tests.OpenApiOperationGeneratorTests;
 
 public class OpenApiDocumentProviderTests : OpenApiDocumentServiceTestBase
@@ -30,6 +29,58 @@ public async Task GenerateAsync_ReturnsDocument()
         });
     }
 
+    [Fact]
+    public async Task GenerateAsync_ShouldRetrieveOptionsInACaseInsensitiveManner()
+    {
+        // Arrange
+        var documentName = "CaseSensitive";
+        var serviceProvider = CreateServiceProvider(["casesensitive"], OpenApiSpecVersion.OpenApi2_0);
+        var documentProvider = new OpenApiDocumentProvider(serviceProvider);
+        var stringWriter = new StringWriter();
+
+        // Act
+        await documentProvider.GenerateAsync(documentName, stringWriter);
+
+        // Assert
+        var document = stringWriter.ToString();
+
+        // When we generate an OpenAPI document, we use an OptionsMonitor to retrieve OpenAPI options which are stored with a key equal the requested document name.
+        // This key is case-sensitive. If the document doesn't exist, the options monitor return a default instance, in which the OpenAPI version is set to v3.
+        // This could cause bugs! You'd get your document, but depending on the casing you used in the document name you passed to the function, you'll receive different OpenAPI document versions.
+        // We want to prevent this from happening. Therefore:
+        // By setting up a v2 document on the "casesensitive" route and requesting it on "CaseSensitive",
+        // we can test that the we've configured the options monitor to retrieve the options in a case-insensitive manner.
+        // If it is case-sensitive, it would return a default instance with OpenAPI version v3, which would cause this test to fail!
+        // However, if it would return the v2 instance, which was configured on the lowercase - case-insensitive - documentname, the test would pass!
+        Assert.StartsWith("{\n  \"swagger\": \"2.0\"", document);
+    }
+
+    [Fact]
+    public async Task GenerateAsync_ShouldRetrieveOpenApiDocumentServiceWithACaseInsensitiveKey()
+    {
+        // Arrange
+        var documentName = "CaseSensitive";
+        var serviceProvider = CreateServiceProvider(["casesensitive"]);
+        var documentProvider = new OpenApiDocumentProvider(serviceProvider);
+        var stringWriter = new StringWriter();
+
+        // Act
+        await documentProvider.GenerateAsync(documentName, stringWriter, OpenApiSpecVersion.OpenApi3_0);
+
+        // Assert
+        var document = stringWriter.ToString();
+
+        // If the Document Service is retrieved with a non-existent (case-sensitive) key, it would throw:
+        // https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.dependencyinjection.serviceproviderkeyedserviceextensions.getrequiredkeyedservice?view=net-9.0-pp
+
+        // In this test's case, we're testing that the document service is retrieved with a case-insensitive key.
+        // It's registered as "casesensitive" but we're passing in "CaseSensitive", which doesn't exist.
+        // Therefore, if the test doesn't throw, we know it has passed correctly.
+        // We still do a small check to validate the document, just in case. But the main test is that it doesn't throw.
+        ValidateOpenApiDocument(stringWriter, _ => { });
+        Assert.StartsWith("{\n  \"openapi\": \"3.0.4\"", document);
+    }
+
     [Fact]
     public void GetDocumentNames_ReturnsAllRegisteredDocumentName()
     {
@@ -51,12 +102,12 @@ public void GetDocumentNames_ReturnsAllRegisteredDocumentName()
 
     private static void ValidateOpenApiDocument(StringWriter stringWriter, Action<OpenApiDocument> action)
     {
-        var document = new OpenApiStringReader().Read(stringWriter.ToString(), out var diagnostic);
-        Assert.Empty(diagnostic.Errors);
-        action(document);
+        var result = OpenApiDocument.Parse(stringWriter.ToString());
+        Assert.Empty(result.Diagnostic.Errors);
+        action(result.Document);
     }
 
-    private static IServiceProvider CreateServiceProvider(string[] documentNames)
+    private static IServiceProvider CreateServiceProvider(string[] documentNames, OpenApiSpecVersion openApiSpecVersion = OpenApiSpecVersion.OpenApi3_1)
     {
         var hostEnvironment = new HostEnvironment() { ApplicationName = nameof(OpenApiDocumentProviderTests) };
         var serviceProviderIsService = new ServiceProviderIsService();
@@ -66,9 +117,9 @@ private static IServiceProvider CreateServiceProvider(string[] documentNames)
             .AddSingleton(CreateApiDescriptionGroupCollectionProvider());
         foreach (var documentName in documentNames)
         {
-            serviceCollection.AddOpenApi(documentName);
+            serviceCollection.AddOpenApi(documentName, x => x.OpenApiVersion = openApiSpecVersion);
         }
-        var serviceProvider = serviceCollection.BuildServiceProvider();
+        var serviceProvider = serviceCollection.BuildServiceProvider(validateScopes: true);
         return serviceProvider;
     }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Operations.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Operations.cs
index 8cfe2573f0f5..428c94d03fbc 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Operations.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Operations.cs
@@ -1,11 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiDocumentServiceTests
 {
@@ -22,7 +22,7 @@ public async Task GetOpenApiOperation_CapturesSummary()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal(summary, operation.Summary);
         });
     }
@@ -40,7 +40,7 @@ public async Task GetOpenApiOperation_CapturesLastSummary()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal(summary + "1", operation.Summary);
         });
     }
@@ -58,7 +58,7 @@ public async Task GetOpenApiOperation_CapturesDescription()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal(description, operation.Description);
         });
     }
@@ -76,7 +76,7 @@ public async Task GetOpenApiOperation_CapturesDescriptionLastDescription()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal(description + "1", operation.Description);
         });
     }
@@ -93,7 +93,7 @@ public async Task GetOpenApiOperation_CapturesTags()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Collection(operation.Tags, tag =>
             {
                 Assert.Equal("todos", tag.Name);
@@ -117,7 +117,7 @@ public async Task GetOpenApiOperation_CapturesTagsLastTags()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Collection(operation.Tags, tag =>
             {
                 Assert.Equal("todos", tag.Name);
@@ -141,7 +141,7 @@ public async Task GetOpenApiOperation_SetsDefaultValueForTags()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Collection(document.Tags, tag =>
             {
                 Assert.Equal(nameof(OpenApiDocumentServiceTests), tag.Name);
@@ -193,7 +193,7 @@ public async Task GetOpenApiOperation_CapturesEndpointNameAsOperationId()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal("GetTodos", operation.OperationId);
 
         });
@@ -211,7 +211,7 @@ public async Task GetOpenApiOperation_CapturesEndpointNameAttributeAsOperationId
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal("GetTodos", operation.OperationId);
 
         });
@@ -226,7 +226,7 @@ public async Task GetOpenApiOperation_CapturesRouteAttributeAsOperationId()
         // Assert
         await VerifyOpenApiDocument(action, document =>
         {
-            var operation = document.Paths["/api/todos"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/todos"].Operations[HttpMethod.Get];
             Assert.Equal("GetTodos", operation.OperationId);
 
         });
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs
index 10c65ae2787f..faa002fb973f 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs
@@ -1,10 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Models;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 public partial class OpenApiDocumentServiceTests : OpenApiDocumentServiceTestBase
 {
@@ -22,15 +23,15 @@ public async Task GetOpenApiParameters_GeneratesParameterLocationCorrectly()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var pathParameter = Assert.Single(document.Paths["/api/todos/{id}"].Operations[OperationType.Get].Parameters);
+            var pathParameter = Assert.Single(document.Paths["/api/todos/{id}"].Operations[HttpMethod.Get].Parameters);
             Assert.Equal("id", pathParameter.Name);
             Assert.Equal(ParameterLocation.Path, pathParameter.In);
 
-            var queryParameter = Assert.Single(document.Paths["/api/todos"].Operations[OperationType.Get].Parameters);
+            var queryParameter = Assert.Single(document.Paths["/api/todos"].Operations[HttpMethod.Get].Parameters);
             Assert.Equal("id", queryParameter.Name);
             Assert.Equal(ParameterLocation.Query, queryParameter.In);
 
-            var headerParameter = Assert.Single(document.Paths["/api"].Operations[OperationType.Get].Parameters);
+            var headerParameter = Assert.Single(document.Paths["/api"].Operations[HttpMethod.Get].Parameters);
             Assert.Equal("X-Header", headerParameter.Name);
             Assert.Equal(ParameterLocation.Header, headerParameter.In);
         });
@@ -51,13 +52,13 @@ public async Task GetOpenApiParameters_RouteParametersAreAlwaysRequired()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var pathParameter = Assert.Single(document.Paths["/api/todos/{id}"].Operations[OperationType.Get].Parameters);
+            var pathParameter = Assert.Single(document.Paths["/api/todos/{id}"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("id", pathParameter.Name);
             Assert.True(pathParameter.Required);
-            var guidParameter = Assert.Single(document.Paths["/api/todos/{guid}"].Operations[OperationType.Get].Parameters);
+            var guidParameter = Assert.Single(document.Paths["/api/todos/{guid}"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("guid", guidParameter.Name);
             Assert.True(guidParameter.Required);
-            var isCompletedParameter = Assert.Single(document.Paths["/api/todos/{isCompleted}"].Operations[OperationType.Get].Parameters);
+            var isCompletedParameter = Assert.Single(document.Paths["/api/todos/{isCompleted}"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("isCompleted", isCompletedParameter.Name);
             Assert.True(isCompletedParameter.Required);
         });
@@ -77,13 +78,13 @@ public async Task GetOpenApiParameters_SetsRequirednessForQueryParameters()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var queryParameter = Assert.Single(document.Paths["/api/todos"].Operations[OperationType.Get].Parameters);
+            var queryParameter = Assert.Single(document.Paths["/api/todos"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("id", queryParameter.Name);
             Assert.True(queryParameter.Required);
-            var nullableQueryParameter = Assert.Single(document.Paths["/api/users"].Operations[OperationType.Get].Parameters);
+            var nullableQueryParameter = Assert.Single(document.Paths["/api/users"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("id", nullableQueryParameter.Name);
             Assert.False(nullableQueryParameter.Required);
-            var defaultQueryParameter = Assert.Single(document.Paths["/api/projects"].Operations[OperationType.Get].Parameters);
+            var defaultQueryParameter = Assert.Single(document.Paths["/api/projects"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("id", defaultQueryParameter.Name);
             Assert.False(defaultQueryParameter.Required);
         });
@@ -103,13 +104,13 @@ public async Task GetOpenApiParameters_SetsRequirednessForHeaderParameters()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var headerParameter = Assert.Single(document.Paths["/api/todos"].Operations[OperationType.Get].Parameters);
+            var headerParameter = Assert.Single(document.Paths["/api/todos"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("X-Header", headerParameter.Name);
             Assert.True(headerParameter.Required);
-            var nullableHeaderParameter = Assert.Single(document.Paths["/api/users"].Operations[OperationType.Get].Parameters);
+            var nullableHeaderParameter = Assert.Single(document.Paths["/api/users"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("X-Header", nullableHeaderParameter.Name);
             Assert.False(nullableHeaderParameter.Required);
-            var defaultHeaderParameter = Assert.Single(document.Paths["/api/projects"].Operations[OperationType.Get].Parameters);
+            var defaultHeaderParameter = Assert.Single(document.Paths["/api/projects"].Operations![HttpMethod.Get].Parameters!);
             Assert.Equal("X-Header", defaultHeaderParameter.Name);
             Assert.False(defaultHeaderParameter.Required);
         });
@@ -132,13 +133,13 @@ public async Task GetOpenApiParameters_RouteParametersAreAlwaysRequired_Nullabil
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var pathParameter = Assert.Single(document.Paths["/api/todos/{id}"].Operations[OperationType.Get].Parameters);
+            var pathParameter = Assert.Single(document.Paths["/api/todos/{id}"].Operations[HttpMethod.Get].Parameters);
             Assert.Equal("id", pathParameter.Name);
             Assert.True(pathParameter.Required);
-            var guidParameter = Assert.Single(document.Paths["/api/todos/{guid}"].Operations[OperationType.Get].Parameters);
+            var guidParameter = Assert.Single(document.Paths["/api/todos/{guid}"].Operations[HttpMethod.Get].Parameters);
             Assert.Equal("guid", guidParameter.Name);
             Assert.True(guidParameter.Required);
-            var isCompletedParameter = Assert.Single(document.Paths["/api/todos/{isCompleted}"].Operations[OperationType.Get].Parameters);
+            var isCompletedParameter = Assert.Single(document.Paths["/api/todos/{isCompleted}"].Operations[HttpMethod.Get].Parameters);
             Assert.Equal("isCompleted", isCompletedParameter.Name);
             Assert.True(isCompletedParameter.Required);
         });
@@ -158,9 +159,9 @@ public async Task GetOpenApiRequestBody_SkipsRequestBodyParameters()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var usersOperation = document.Paths["/api/users"].Operations[OperationType.Post];
+            var usersOperation = document.Paths["/api/users"].Operations[HttpMethod.Post];
             Assert.Null(usersOperation.Parameters);
-            var todosOperation = document.Paths["/api/todos"].Operations[OperationType.Post];
+            var todosOperation = document.Paths["/api/todos"].Operations[HttpMethod.Post];
             Assert.Null(todosOperation.Parameters);
         });
     }
@@ -182,12 +183,37 @@ public async Task GetOpenApiParameters_SkipsDisallowedHeaders()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            Assert.Null(document.Paths["/api/accept"].Operations[OperationType.Get].Parameters);
-            Assert.Null(document.Paths["/api/accept-lower"].Operations[OperationType.Get].Parameters);
-            Assert.Null(document.Paths["/api/authorization"].Operations[OperationType.Get].Parameters);
-            Assert.Null(document.Paths["/api/authorization-lower"].Operations[OperationType.Get].Parameters);
-            Assert.Null(document.Paths["/api/content-type"].Operations[OperationType.Get].Parameters);
-            Assert.Null(document.Paths["/api/content-type-lower"].Operations[OperationType.Get].Parameters);
+            Assert.Null(document.Paths["/api/accept"].Operations[HttpMethod.Get].Parameters);
+            Assert.Null(document.Paths["/api/accept-lower"].Operations[HttpMethod.Get].Parameters);
+            Assert.Null(document.Paths["/api/authorization"].Operations[HttpMethod.Get].Parameters);
+            Assert.Null(document.Paths["/api/authorization-lower"].Operations[HttpMethod.Get].Parameters);
+            Assert.Null(document.Paths["/api/content-type"].Operations[HttpMethod.Get].Parameters);
+            Assert.Null(document.Paths["/api/content-type-lower"].Operations[HttpMethod.Get].Parameters);
         });
     }
+
+    [Fact]
+    public async Task GetOpenApiParameters_ToleratesCustomBindingSource()
+    {
+        var action = CreateActionDescriptor(nameof(ActionWithCustomBinder));
+
+        await VerifyOpenApiDocument(action, document =>
+        {
+            var operation = document.Paths["/custom-binding"].Operations[HttpMethod.Get];
+            var parameter = Assert.Single(operation.Parameters);
+            Assert.Equal("model", parameter.Name);
+            Assert.Equal(ParameterLocation.Query, parameter.In);
+        });
+    }
+
+    [Route("/custom-binding")]
+    private void ActionWithCustomBinder([ModelBinder(BinderType = typeof(CustomBinder))] Todo model) { }
+
+    public class CustomBinder : IModelBinder
+    {
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            return Task.CompletedTask;
+        }
+    }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Paths.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Paths.cs
index a74353f762f0..8cf7525f7d51 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Paths.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Paths.cs
@@ -1,9 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiDocumentServiceTests : OpenApiDocumentServiceTestBase
 {
@@ -27,7 +27,7 @@ await VerifyOpenApiDocument(builder, document =>
                     Assert.Collection(path.Value.Operations.OrderBy(o => o.Key),
                         operation =>
                         {
-                            Assert.Equal(OperationType.Get, operation.Key);
+                            Assert.Equal(HttpMethod.Get, operation.Key);
                         });
                 },
                 path =>
@@ -36,7 +36,7 @@ await VerifyOpenApiDocument(builder, document =>
                     Assert.Collection(path.Value.Operations.OrderBy(o => o.Key),
                         operation =>
                         {
-                            Assert.Equal(OperationType.Get, operation.Key);
+                            Assert.Equal(HttpMethod.Get, operation.Key);
                         });
                 });
         });
@@ -84,15 +84,9 @@ await VerifyOpenApiDocument(builder, document =>
                 path =>
                 {
                     Assert.Equal("/api/todos", path.Key);
-                    Assert.Collection(path.Value.Operations.OrderBy(o => o.Key),
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Get, operation.Key);
-                        },
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Post, operation.Key);
-                        });
+                    Assert.Equal(2, path.Value.Operations.Count);
+                    Assert.Contains(HttpMethod.Get, path.Value.Operations);
+                    Assert.Contains(HttpMethod.Post, path.Value.Operations);
                 }
             );
         });
@@ -116,23 +110,11 @@ await VerifyOpenApiDocument(builder, document =>
                 path =>
                 {
                     Assert.Equal("/api/todos/{id}", path.Key);
-                    Assert.Collection(path.Value.Operations.OrderBy(o => o.Key),
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Get, operation.Key);
-                        },
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Put, operation.Key);
-                        },
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Post, operation.Key);
-                        },
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Patch, operation.Key);
-                        });
+                    Assert.Equal(4, path.Value.Operations.Count);
+                    Assert.Contains(HttpMethod.Get, path.Value.Operations);
+                    Assert.Contains(HttpMethod.Put, path.Value.Operations);
+                    Assert.Contains(HttpMethod.Post, path.Value.Operations);
+                    Assert.Contains(HttpMethod.Patch, path.Value.Operations);
                 }
             );
         });
@@ -155,15 +137,9 @@ await VerifyOpenApiDocument(builder, document =>
                 path =>
                 {
                     Assert.Equal("/api/todos/{id}", path.Key);
-                    Assert.Collection(path.Value.Operations.OrderBy(o => o.Key),
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Get, operation.Key);
-                        },
-                        operation =>
-                        {
-                            Assert.Equal(OperationType.Post, operation.Key);
-                        });
+                    Assert.Equal(2, path.Value.Operations.Count);
+                    Assert.Contains(HttpMethod.Get, path.Value.Operations);
+                    Assert.Contains(HttpMethod.Post, path.Value.Operations);
                 }
             );
         });
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.RequestBody.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.RequestBody.cs
index 739d6f3dd012..8a38a89952f4 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.RequestBody.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.RequestBody.cs
@@ -2,11 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.IO.Pipelines;
+using System.Net.Http;
+using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.JsonPatch.SystemTextJson;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiDocumentServiceTests : OpenApiDocumentServiceTestBase
 {
@@ -32,17 +34,17 @@ public async Task GetRequestBody_HandlesIFormFile(bool withAttribute)
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.True(operation.RequestBody.Required);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
             Assert.Equal("multipart/form-data", content.Key);
-            Assert.Equal("object", content.Value.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, content.Value.Schema.Type);
             Assert.NotNull(content.Value.Schema.Properties);
             Assert.Contains("formFile", content.Value.Schema.Properties);
             var formFileProperty = content.Value.Schema.Properties["formFile"];
-            Assert.Equal("string", formFileProperty.Type);
+            Assert.Equal(JsonSchemaType.String, formFileProperty.Type);
             Assert.Equal("binary", formFileProperty.Format);
         });
     }
@@ -70,17 +72,18 @@ public async Task GetRequestBody_HandlesIFormFileOptionality(bool isOptional)
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations![HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.True(operation.RequestBody.Required);
-            var schema = operation.RequestBody.Content["multipart/form-data"].Schema;
+            var schema = operation.RequestBody.Content!["multipart/form-data"].Schema;
+            Assert.NotNull(schema);
             if (!isOptional)
             {
-                Assert.Contains("formFile", schema.Required);
+                Assert.Contains("formFile", schema.Required!);
             }
             else
             {
-                Assert.DoesNotContain("formFile", schema.Required);
+                Assert.Null(schema.Required);
             }
         });
     }
@@ -108,18 +111,18 @@ public async Task GetRequestBody_HandlesIFormFileCollection(bool withAttribute)
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.True(operation.RequestBody.Required);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
             Assert.Equal("multipart/form-data", content.Key);
-            Assert.Equal("object", content.Value.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, content.Value.Schema.Type);
             Assert.NotNull(content.Value.Schema.Properties);
             Assert.Contains("formFileCollection", content.Value.Schema.Properties);
             var formFileProperty = content.Value.Schema.Properties["formFileCollection"];
-            Assert.Equal("array", formFileProperty.Type);
-            Assert.Equal("string", formFileProperty.Items.Type);
+            Assert.Equal(JsonSchemaType.Array, formFileProperty.Type);
+            Assert.Equal(JsonSchemaType.String, formFileProperty.Items.Type);
             Assert.Equal("binary", formFileProperty.Items.Format);
         });
     }
@@ -147,17 +150,18 @@ public async Task GetRequestBody_HandlesIFormFileCollectionOptionality(bool isOp
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations![HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.True(operation.RequestBody.Required);
-            var schema = operation.RequestBody.Content["multipart/form-data"].Schema;
+            var schema = operation.RequestBody.Content!["multipart/form-data"].Schema;
+            Assert.NotNull(schema);
             if (!isOptional)
             {
-                Assert.Contains("formFile", schema.Required);
+                Assert.Contains("formFile", schema.Required!);
             }
             else
             {
-                Assert.DoesNotContain("formFile", schema.Required);
+                Assert.Null(schema.Required);
             }
         });
     }
@@ -176,28 +180,28 @@ public async Task GetRequestBody_MultipleFormFileParameters()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
             Assert.Equal("multipart/form-data", content.Key);
-            Assert.Equal("object", content.Value.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, content.Value.Schema.Type);
             Assert.NotNull(content.Value.Schema.AllOf);
             Assert.Collection(content.Value.Schema.AllOf,
                 allOfItem =>
                 {
                     Assert.NotNull(allOfItem.Properties);
                     Assert.Contains("formFile1", allOfItem.Properties);
-                    var formFile1Property = allOfItem.Properties["formFile1"].GetEffective(document);
-                    Assert.Equal("string", formFile1Property.Type);
+                    var formFile1Property = allOfItem.Properties["formFile1"];
+                    Assert.Equal(JsonSchemaType.String, formFile1Property.Type);
                     Assert.Equal("binary", formFile1Property.Format);
                 },
                 allOfItem =>
                 {
                     Assert.NotNull(allOfItem.Properties);
                     Assert.Contains("formFile2", allOfItem.Properties);
-                    var formFile2Property = allOfItem.Properties["formFile2"].GetEffective(document);
-                    Assert.Equal("string", formFile2Property.Type);
+                    var formFile2Property = allOfItem.Properties["formFile2"];
+                    Assert.Equal(JsonSchemaType.String, formFile2Property.Type);
                     Assert.Equal("binary", formFile2Property.Format);
                 });
         });
@@ -216,16 +220,16 @@ public async Task GetRequestBody_IFormFileHandlesAcceptsMetadata()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
             Assert.Equal("application/magic-foo-content-type", content.Key);
-            Assert.Equal("object", content.Value.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, content.Value.Schema.Type);
             Assert.NotNull(content.Value.Schema.Properties);
             Assert.Contains("formFile", content.Value.Schema.Properties);
             var formFileProperty = content.Value.Schema.Properties["formFile"];
-            Assert.Equal("string", formFileProperty.Type);
+            Assert.Equal(JsonSchemaType.String, formFileProperty.Type);
             Assert.Equal("binary", formFileProperty.Format);
         });
     }
@@ -243,16 +247,16 @@ public async Task GetRequestBody_IFormFileHandlesConsumesAttribute()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
             Assert.Equal("application/magic-foo-content-type", content.Key);
-            Assert.Equal("object", content.Value.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, content.Value.Schema.Type);
             Assert.NotNull(content.Value.Schema.Properties);
             Assert.Contains("formFile", content.Value.Schema.Properties);
             var formFileProperty = content.Value.Schema.Properties["formFile"];
-            Assert.Equal("string", formFileProperty.Type);
+            Assert.Equal(JsonSchemaType.String, formFileProperty.Type);
             Assert.Equal("binary", formFileProperty.Format);
         });
     }
@@ -270,7 +274,7 @@ public async Task GetRequestBody_HandlesJsonBody()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.False(operation.RequestBody.Required);
             Assert.NotNull(operation.RequestBody.Content);
@@ -302,7 +306,7 @@ public async Task GetRequestBody_HandlesJsonBodyOptionality(bool isOptional)
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations![HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.Equal(!isOptional, operation.RequestBody.Required);
         });
@@ -323,7 +327,7 @@ public async Task GetRequestBody_HandlesJsonBodyWithAttribute()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.False(operation.RequestBody.Required);
             Assert.NotNull(operation.RequestBody.Content);
@@ -345,7 +349,7 @@ public async Task GetRequestBody_HandlesJsonBodyWithAcceptsMetadata()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
@@ -366,7 +370,7 @@ public async Task GetRequestBody_HandlesJsonBodyWithConsumesAttribute()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
@@ -387,7 +391,7 @@ public async Task GetOpenApiRequestBody_SetsNullRequestBodyWithNoParameters()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.Null(operation.RequestBody);
         });
     }
@@ -406,7 +410,7 @@ public async Task GetOpenApiRequestBody_HandlesFromFormWithPoco()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -417,7 +421,7 @@ await VerifyOpenApiDocument(builder, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.Properties);
                 Assert.Contains("id", item.Schema.Required);
                 Assert.Contains("title", item.Schema.Required);
@@ -427,22 +431,22 @@ await VerifyOpenApiDocument(builder, document =>
                     property =>
                     {
                         Assert.Equal("id", property.Key);
-                        Assert.Equal("integer", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("title", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("completed", property.Key);
-                        Assert.Equal("boolean", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("createdAt", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String, property.Value.Type);
                         Assert.Equal("date-time", property.Value.Format);
                     });
             }
@@ -463,7 +467,7 @@ public async Task GetOpenApiRequestBody_HandlesFromFormWithRequiredPrimitive()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -473,7 +477,7 @@ await VerifyOpenApiDocument(builder, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.Properties);
                 // Assert that requiredness has been set for primitives
                 Assert.Contains("id", item.Schema.Required);
@@ -483,18 +487,18 @@ await VerifyOpenApiDocument(builder, document =>
                     subSchema =>
                     {
                         Assert.Contains("id", subSchema.Properties);
-                        Assert.Equal("integer", subSchema.Properties["id"].Type);
+                        Assert.Equal(JsonSchemaType.Integer, subSchema.Properties["id"].Type);
                     },
                     subSchema =>
                     {
                         Assert.Contains("date", subSchema.Properties);
-                        Assert.Equal("string", subSchema.Properties["date"].Type);
+                        Assert.Equal(JsonSchemaType.String, subSchema.Properties["date"].Type);
                         Assert.Equal("date-time", subSchema.Properties["date"].Format);
                     },
                     subSchema =>
                     {
                         Assert.Contains("value", subSchema.Properties);
-                        Assert.Equal("integer", subSchema.Properties["value"].Type);
+                        Assert.Equal(JsonSchemaType.Integer, subSchema.Properties["value"].Type);
                     });
             }
         });
@@ -510,7 +514,7 @@ public async Task GetOpenApiRequestBody_HandlesFromFormWithPoco_MvcAction()
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -520,28 +524,28 @@ await VerifyOpenApiDocument(action, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.Properties);
                 Assert.Collection(item.Schema.Properties,
                     property =>
                     {
                         Assert.Equal("Id", property.Key);
-                        Assert.Equal("integer", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("Title", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("Completed", property.Key);
-                        Assert.Equal("boolean", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("CreatedAt", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String, property.Value.Type);
                         Assert.Equal("date-time", property.Value.Format);
                     });
             }
@@ -565,7 +569,7 @@ public async Task GetOpenApiRequestBody_HandlesMultipleFormWithPoco()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Post];
+            var operation = paths.Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -576,7 +580,7 @@ await VerifyOpenApiDocument(builder, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.AllOf);
                 Assert.Collection(item.Schema.AllOf,
                     allOfItem =>
@@ -584,22 +588,22 @@ await VerifyOpenApiDocument(builder, document =>
                         Assert.Collection(allOfItem.Properties, property =>
                             {
                                 Assert.Equal("id", property.Key);
-                                Assert.Equal("integer", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("title", property.Key);
-                                Assert.Equal("string", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("completed", property.Key);
-                                Assert.Equal("boolean", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("createdAt", property.Key);
-                                Assert.Equal("string", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.String, property.Value.Type);
                                 Assert.Equal("date-time", property.Value.Format);
                             });
                     },
@@ -609,12 +613,12 @@ await VerifyOpenApiDocument(builder, document =>
                             property =>
                             {
                                 Assert.Equal("code", property.Key);
-                                Assert.Equal("integer", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("message", property.Key);
-                                Assert.Equal("string", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                             });
                     });
             }
@@ -631,7 +635,7 @@ public async Task GetOpenApiRequestBody_HandlesMultipleFormWithPoco_MvcAction()
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -641,7 +645,7 @@ await VerifyOpenApiDocument(action, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.AllOf);
                 Assert.Collection(item.Schema.AllOf,
                     allOfItem =>
@@ -649,22 +653,22 @@ await VerifyOpenApiDocument(action, document =>
                         Assert.Collection(allOfItem.Properties, property =>
                             {
                                 Assert.Equal("Id", property.Key);
-                                Assert.Equal("integer", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("Title", property.Key);
-                                Assert.Equal("string", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.String, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("Completed", property.Key);
-                                Assert.Equal("boolean", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("CreatedAt", property.Key);
-                                Assert.Equal("string", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.String, property.Value.Type);
                                 Assert.Equal("date-time", property.Value.Format);
                             });
                     },
@@ -674,12 +678,12 @@ await VerifyOpenApiDocument(action, document =>
                             property =>
                             {
                                 Assert.Equal("Code", property.Key);
-                                Assert.Equal("integer", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("Message", property.Key);
-                                Assert.Equal("string", property.Value.GetEffective(document).Type);
+                                Assert.Equal(JsonSchemaType.String, property.Value.Type);
                             });
                     });
             }
@@ -699,7 +703,7 @@ public async Task GetOpenApiRequestBody_HandlesFromFormWithPocoSingleProp_MvcAct
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -709,13 +713,13 @@ await VerifyOpenApiDocument(action, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.Properties);
                 Assert.Collection(item.Schema.Properties,
                     property =>
                     {
                         Assert.Equal("Name", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     });
             }
         });
@@ -739,7 +743,7 @@ public async Task GetOpenApiRequestBody_HandlesFromFormWithNullableProperties_Mv
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
@@ -749,12 +753,12 @@ await VerifyOpenApiDocument(action, document =>
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.NotNull(item.Schema.Properties);
                 Assert.All(item.Schema.Properties,
                     property =>
                     {
-                        Assert.False(property.Value.Nullable);
+                        Assert.False(property.Value.Type?.HasFlag(JsonSchemaType.Null));
                     });
             }
         });
@@ -781,28 +785,28 @@ public async Task GetOpenApiRequestBody_HandlesFormModelWithFile_MvcAction()
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
             var item = Assert.Single(content.Values);
             Assert.NotNull(item.Schema);
-            Assert.Equal("object", item.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
             Assert.Collection(item.Schema.Properties,
                 property =>
                 {
                     Assert.Equal("Name", property.Key);
-                    Assert.Equal("string", property.Value.GetEffective(document).Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("Description", property.Key);
-                    Assert.Equal("string", property.Value.GetEffective(document).Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("Resume", property.Key);
-                    Assert.Equal("string", property.Value.GetEffective(document).Type);
-                    Assert.Equal("binary", property.Value.GetEffective(document).Format);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
+                    Assert.Equal("binary", property.Value.Format);
                 });
         });
     }
@@ -823,28 +827,28 @@ public async Task GetOpenApiRequestBody_HandlesFormModelWithFile()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.Collection(item.Schema.Properties,
                     property =>
                     {
                         Assert.Equal("name", property.Key);
-                        Assert.Equal("string", property.Value.GetEffective(document).Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("description", property.Key);
-                        Assert.Equal("string", property.Value.GetEffective(document).Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("resume", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                         Assert.Equal("binary", property.Value.Format);
                     });
             }
@@ -852,10 +856,10 @@ await VerifyOpenApiDocument(builder, document =>
     }
 
     [Theory]
-    [InlineData(nameof(ActionWithDateTimeForm), "string", "date-time")]
-    [InlineData(nameof(ActionWithGuidForm), "string", "uuid")]
-    [InlineData(nameof(ActionWithIntForm), "integer", "int32")]
-    public async Task GetOpenApiRequestBody_HandlesFormWithPrimitives_MvcAction(string actionMethodName, string type, string format)
+    [InlineData(nameof(ActionWithDateTimeForm), JsonSchemaType.String, "date-time")]
+    [InlineData(nameof(ActionWithGuidForm), JsonSchemaType.String, "uuid")]
+    [InlineData(nameof(ActionWithIntForm), JsonSchemaType.Integer, "int32")]
+    public async Task GetOpenApiRequestBody_HandlesFormWithPrimitives_MvcAction(string actionMethodName, JsonSchemaType type, string format)
     {
         // Arrange
         var action = CreateActionDescriptor(actionMethodName);
@@ -864,12 +868,12 @@ public async Task GetOpenApiRequestBody_HandlesFormWithPrimitives_MvcAction(stri
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
             var item = Assert.Single(content.Values);
             Assert.NotNull(item.Schema);
-            Assert.Equal("object", item.Schema.Type);
+            Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
             Assert.Collection(item.Schema.Properties,
                 property =>
                 {
@@ -891,27 +895,27 @@ private void ActionWithDateTimeForm([FromForm] DateTime model) { }
 
     public static object[][] FromFormWithPrimitives =>
     [
-        [([FromForm] int id) => {}, "integer", "int32"],
-        [([FromForm] long id) => {}, "integer", "int64"],
-        [([FromForm] float id) => {}, "number", "float"],
-        [([FromForm] double id) => {}, "number", "double"],
-        [([FromForm] decimal id) => {}, "number", "double"],
-        [([FromForm] bool id) => {}, "boolean", null],
-        [([FromForm] string id) => {}, "string", null],
-        [([FromForm] char id) => {}, "string", "char"],
-        [([FromForm] byte id) => {}, "integer", "uint8"],
-        [([FromForm] short id) => {}, "integer", "int16"],
-        [([FromForm] ushort id) => {}, "integer", "uint16"],
-        [([FromForm] uint id) => {}, "integer", "uint32"],
-        [([FromForm] ulong id) => {}, "integer", "uint64"],
-        [([FromForm] Uri id) => {}, "string", "uri"],
-        [([FromForm] TimeOnly id) => {}, "string", "time"],
-        [([FromForm] DateOnly id) => {}, "string", "date"]
+        [([FromForm] int id) => {}, JsonSchemaType.Integer, "int32"],
+        [([FromForm] long id) => {}, JsonSchemaType.Integer, "int64"],
+        [([FromForm] float id) => {}, JsonSchemaType.Number, "float"],
+        [([FromForm] double id) => {}, JsonSchemaType.Number, "double"],
+        [([FromForm] decimal id) => {}, JsonSchemaType.Number, "double"],
+        [([FromForm] bool id) => {}, JsonSchemaType.Boolean, null],
+        [([FromForm] string id) => {}, JsonSchemaType.String, null],
+        [([FromForm] char id) => {}, JsonSchemaType.String, "char"],
+        [([FromForm] byte id) => {}, JsonSchemaType.Integer, "uint8"],
+        [([FromForm] short id) => {}, JsonSchemaType.Integer, "int16"],
+        [([FromForm] ushort id) => {}, JsonSchemaType.Integer, "uint16"],
+        [([FromForm] uint id) => {}, JsonSchemaType.Integer, "uint32"],
+        [([FromForm] ulong id) => {}, JsonSchemaType.Integer, "uint64"],
+        [([FromForm] Uri id) => {}, JsonSchemaType.String, "uri"],
+        [([FromForm] TimeOnly id) => {}, JsonSchemaType.String, "time"],
+        [([FromForm] DateOnly id) => {}, JsonSchemaType.String, "date"]
     ];
 
     [Theory]
     [MemberData(nameof(FromFormWithPrimitives))]
-    public async Task GetOpenApiRequestBody_HandlesFormWithPrimitives(Delegate requestHandler, string schemaType, string schemaFormat)
+    public async Task GetOpenApiRequestBody_HandlesFormWithPrimitives(Delegate requestHandler, JsonSchemaType schemaType, string schemaFormat)
     {
         // Arrange
         var builder = CreateBuilder();
@@ -923,13 +927,13 @@ public async Task GetOpenApiRequestBody_HandlesFormWithPrimitives(Delegate reque
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.Collection(item.Schema.Properties,
                     property =>
                     {
@@ -954,35 +958,35 @@ public async Task GetOpenApiRequestBody_HandlesFormWithMultipleMixedTypes()
         await VerifyOpenApiDocument(builder, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.Collection(item.Schema.AllOf,
                     allOfItem =>
                     {
                         Assert.Collection(allOfItem.Properties, property =>
                             {
                                 Assert.Equal("id", property.Key);
-                                Assert.Equal("integer", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("title", property.Key);
-                                Assert.Equal("string", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("completed", property.Key);
-                                Assert.Equal("boolean", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("createdAt", property.Key);
-                                Assert.Equal("string", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.String, property.Value.Type);
                                 Assert.Equal("date-time", property.Value.Format);
                             });
                     },
@@ -991,7 +995,7 @@ await VerifyOpenApiDocument(builder, document =>
                         Assert.Collection(allOfItem.Properties, property =>
                         {
                             Assert.Equal("formFile", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String, property.Value.Type);
                             Assert.Equal("binary", property.Value.Format);
                         });
                     },
@@ -1000,7 +1004,7 @@ await VerifyOpenApiDocument(builder, document =>
                         Assert.Collection(allOfItem.Properties, property =>
                         {
                             Assert.Equal("guid", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String, property.Value.Type);
                             Assert.Equal("uuid", property.Value.Format);
                         });
                     });
@@ -1018,35 +1022,35 @@ public async Task GetOpenApiRequestBody_HandlesFormWithMultipleMixedTypes_MvcAct
         await VerifyOpenApiDocument(action, document =>
         {
             var paths = Assert.Single(document.Paths.Values);
-            var operation = paths.Operations[OperationType.Get];
+            var operation = paths.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = operation.RequestBody.Content;
             foreach (var item in content.Values)
             {
                 Assert.NotNull(item.Schema);
-                Assert.Equal("object", item.Schema.Type);
+                Assert.Equal(JsonSchemaType.Object, item.Schema.Type);
                 Assert.Collection(item.Schema.AllOf,
                     allOfItem =>
                     {
                         Assert.Collection(allOfItem.Properties, property =>
                             {
                                 Assert.Equal("id", property.Key);
-                                Assert.Equal("integer", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("title", property.Key);
-                                Assert.Equal("string", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("completed", property.Key);
-                                Assert.Equal("boolean", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                             },
                             property =>
                             {
                                 Assert.Equal("createdAt", property.Key);
-                                Assert.Equal("string", property.Value.Type);
+                                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                                 Assert.Equal("date-time", property.Value.Format);
                             });
                     },
@@ -1055,7 +1059,7 @@ await VerifyOpenApiDocument(action, document =>
                         Assert.Collection(allOfItem.Properties, property =>
                         {
                             Assert.Equal("formFile", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                             Assert.Equal("binary", property.Value.Format);
                         });
                     },
@@ -1064,7 +1068,7 @@ await VerifyOpenApiDocument(action, document =>
                         Assert.Collection(allOfItem.Properties, property =>
                         {
                             Assert.Equal("guid", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                             Assert.Equal("uuid", property.Value.Format);
                         });
                     });
@@ -1090,13 +1094,13 @@ await VerifyOpenApiDocument(builder, document =>
         {
             foreach (var path in document.Paths)
             {
-                var operation = path.Value.Operations[OperationType.Get];
+                var operation = path.Value.Operations[HttpMethod.Get];
                 Assert.NotNull(operation.RequestBody.Content);
                 var content = Assert.Single(operation.RequestBody.Content);
                 Assert.Equal("application/octet-stream", content.Key);
                 Assert.NotNull(content.Value.Schema);
-                Assert.Equal("string", content.Value.Schema.GetEffective(document).Type);
-                Assert.Equal("binary", content.Value.Schema.GetEffective(document).Format);
+                Assert.Equal(JsonSchemaType.String, content.Value.Schema.Type);
+                Assert.Equal("binary", content.Value.Schema.Format);
             }
         });
     }
@@ -1115,12 +1119,12 @@ public async Task GetOpenApiRequestBody_HandlesStreamAndPipeReader_MvcAction()
         static void VerifyDocument(OpenApiDocument document)
         {
             var path = Assert.Single(document.Paths);
-            var operation = path.Value.Operations[OperationType.Get];
+            var operation = path.Value.Operations[HttpMethod.Get];
             Assert.NotNull(operation.RequestBody.Content);
             var content = Assert.Single(operation.RequestBody.Content);
             Assert.Equal("application/octet-stream", content.Key);
             Assert.NotNull(content.Value.Schema);
-            Assert.Equal("string", content.Value.Schema.Type);
+            Assert.Equal(JsonSchemaType.String, content.Value.Schema.Type);
             Assert.Equal("binary", content.Value.Schema.Format);
         }
     }
@@ -1129,4 +1133,318 @@ static void VerifyDocument(OpenApiDocument document)
     private void ActionWithStream(Stream stream) { }
     [Route("/pipereader")]
     private void ActionWithPipeReader(PipeReader pipeReader) { }
+
+    [Fact]
+    public async Task GetRequestBody_HandlesJsonPatchBody()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", (JsonPatchDocument patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.False(operation.RequestBody.Required);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/json-patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+#nullable enable
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task GetRequestBody_HandlesJsonPatchBodyOptionality(bool isOptional)
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        if (isOptional)
+        {
+            builder.MapPatch("/", (JsonPatchDocument? patch) => { });
+        }
+        else
+        {
+            builder.MapPatch("/", (JsonPatchDocument patch) => { });
+        }
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations![HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.Equal(!isOptional, operation.RequestBody.Required);
+        });
+
+    }
+#nullable restore
+
+    [Fact]
+    public async Task GetRequestBody_HandlesJsonPatchBodyWithAttribute()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", ([FromBody] JsonPatchDocument patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.False(operation.RequestBody.Required);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/json-patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    [Fact]
+    public async Task GetRequestBody_HandlesJsonPatchBodyWithAcceptsMetadata()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", (JsonPatchDocument name) => { }).Accepts(typeof(JsonPatchDocument), "application/vnd.github.patch+json");
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/vnd.github.patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    [Fact]
+    public async Task GetRequestBody_HandlesJsonPatchBodyWithConsumesAttribute()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", [Consumes(typeof(JsonPatchDocument), "application/vnd.github.patch+json")] (JsonPatchDocument patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/vnd.github.patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    [Fact]
+    public async Task GetRequestBody_HandlesGenericJsonPatchBody()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", (JsonPatchDocument<JsonPatchModel> patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.False(operation.RequestBody.Required);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/json-patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+#nullable enable
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task GetRequestBody_HandlesGenericJsonPatchBodyOptionality(bool isOptional)
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        if (isOptional)
+        {
+            builder.MapPatch("/", (JsonPatchDocument<JsonPatchModel>? patch) => { });
+        }
+        else
+        {
+            builder.MapPatch("/", (JsonPatchDocument<JsonPatchModel> patch) => { });
+        }
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations![HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.Equal(!isOptional, operation.RequestBody.Required);
+        });
+
+    }
+#nullable restore
+
+    [Fact]
+    public async Task GetRequestBody_HandlesGenericJsonPatchBodyWithAttribute()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", ([FromBody] JsonPatchDocument<JsonPatchModel> patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.False(operation.RequestBody.Required);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/json-patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    [Fact]
+    public async Task GetRequestBody_HandlesGenericJsonPatchBodyWithAcceptsMetadata()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", (JsonPatchDocument<JsonPatchModel> name) => { })
+               .Accepts(typeof(JsonPatchDocument<JsonPatchModel>), "application/vnd.github.patch+json");
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/vnd.github.patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    [Fact]
+    public async Task GetRequestBody_HandlesGenericJsonPatchBodyWithConsumesAttribute()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", [Consumes(typeof(JsonPatchDocument<JsonPatchModel>), "application/vnd.github.patch+json")] (JsonPatchDocument<JsonPatchModel> patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/vnd.github.patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+#nullable enable
+    private sealed class JsonPatchModel
+    {
+        [JsonPropertyName("first")]
+        public string? First { get; set; }
+
+        [JsonPropertyName("second")]
+        public string? Second { get; set; }
+    }
+#nullable restore
+
+    [Fact]
+    public async Task GetRequestBody_HandlesCustomJsonPatchBody()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", (CustomJsonPatchDocument patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.False(operation.RequestBody.Required);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/json-patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    private class CustomJsonPatchDocument : JsonPatchDocument;
+
+    [Fact]
+    public async Task GetRequestBody_HandlesGenericCustomJsonPatchBody()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPatch("/", (CustomJsonPatchDocument<JsonPatchModel> patch) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var paths = Assert.Single(document.Paths.Values);
+            var operation = paths.Operations[HttpMethod.Patch];
+            Assert.NotNull(operation.RequestBody);
+            Assert.False(operation.RequestBody.Required);
+            Assert.NotNull(operation.RequestBody.Content);
+            var content = Assert.Single(operation.RequestBody.Content);
+            Assert.Equal("application/json-patch+json", content.Key);
+            var schema = Assert.IsType<OpenApiSchemaReference>(content.Value.Schema);
+            Assert.Equal("JsonPatchDocument", schema.Reference.Id);
+        });
+    }
+
+    private class CustomJsonPatchDocument<T> : JsonPatchDocument<T> where T : class;
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Responses.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Responses.cs
index 9c1d5b3c61ab..01f7ddff1df0 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Responses.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Responses.cs
@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiDocumentServiceTests : OpenApiDocumentServiceTestBase
 {
@@ -231,16 +230,16 @@ await VerifyOpenApiDocument(builder, document =>
             Assert.Empty(response.Value.Description);
             var mediaTypeEntry = Assert.Single(response.Value.Content);
             Assert.Equal("application/json", mediaTypeEntry.Key);
-            var schema = mediaTypeEntry.Value.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaTypeEntry.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties, property =>
             {
                 Assert.Equal("code", property.Key);
-                Assert.Equal("integer", property.Value.Type);
+                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
             }, property =>
             {
                 Assert.Equal("message", property.Key);
-                Assert.Equal("string", property.Value.Type);
+                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
             });
         });
     }
@@ -264,17 +263,17 @@ await VerifyOpenApiDocument(builder, document =>
             Assert.NotNull(defaultResponse);
             Assert.Empty(defaultResponse.Description);
             var defaultContent = Assert.Single(defaultResponse.Content.Values);
-            var defaultSchema = defaultContent.Schema.GetEffective(document);
+            var defaultSchema = defaultContent.Schema;
             Assert.Collection(defaultSchema.Properties,
             property =>
             {
                 Assert.Equal("code", property.Key);
-                Assert.Equal("integer", property.Value.GetEffective(document).Type);
+                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
             },
             property =>
             {
                 Assert.Equal("message", property.Key);
-                Assert.Equal("string", property.Value.GetEffective(document).Type);
+                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
             });
             // Generates the 200 status code response with the `Todo` response type.
             var okResponse = operation.Responses["200"];
@@ -282,26 +281,162 @@ await VerifyOpenApiDocument(builder, document =>
             Assert.Equal("OK", okResponse.Description);
             var okContent = Assert.Single(okResponse.Content);
             Assert.Equal("application/json", okContent.Key);
-            var schema = okContent.Value.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = okContent.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties, property =>
             {
                 Assert.Equal("id", property.Key);
-                Assert.Equal("integer", property.Value.GetEffective(document).Type);
+                Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
             }, property =>
             {
                 Assert.Equal("title", property.Key);
-                Assert.Equal("string", property.Value.GetEffective(document).Type);
+                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
             }, property =>
             {
                 Assert.Equal("completed", property.Key);
-                Assert.Equal("boolean", property.Value.Type);
+                Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
             }, property =>
             {
                 Assert.Equal("createdAt", property.Key);
-                Assert.Equal("string", property.Value.Type);
+                Assert.Equal(JsonSchemaType.String, property.Value.Type);
                 Assert.Equal("date-time", property.Value.Format);
             });
         });
     }
+
+    /// <remarks>
+    /// Regression test for https://github.com/dotnet/aspnetcore/issues/60518
+    /// </remarks>
+    [Fact]
+    public async Task GetOpenApiResponse_WithEmptyMethodBody_UsesDescriptionSetByUser()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        const string expectedCreatedDescription = "A new todo item was created";
+        const string expectedBadRequestDescription = "Validation failed for the request";
+
+        // Act
+        builder.MapPost("/api/todos",
+            [ProducesResponseType<Todo>(StatusCodes.Status200OK, Description = expectedCreatedDescription)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest, Description = expectedBadRequestDescription)]
+        () =>
+            { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = Assert.Single(document.Paths["/api/todos"].Operations.Values);
+            Assert.Collection(operation.Responses.OrderBy(r => r.Key),
+                response =>
+                {
+                    Assert.Equal("200", response.Key);
+                    Assert.Equal(expectedCreatedDescription, response.Value.Description);
+                },
+                response =>
+                {
+                    Assert.Equal("400", response.Key);
+                    Assert.Equal(expectedBadRequestDescription, response.Value.Description);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiResponse_UsesDescriptionSetByUser()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        const string expectedCreatedDescription = "A new todo item was created";
+        const string expectedBadRequestDescription = "Validation failed for the request";
+
+        // Act
+        builder.MapPost("/api/todos",
+            [ProducesResponseType<Todo>(StatusCodes.Status200OK, Description = expectedCreatedDescription)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest, Description = expectedBadRequestDescription)]
+        () =>
+            { return TypedResults.Ok(new Todo(1, "Lorem", true, DateTime.UtcNow)); }); // This code doesn't return Bad Request, but that doesn't matter for this test.
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = Assert.Single(document.Paths["/api/todos"].Operations.Values);
+            Assert.Collection(operation.Responses.OrderBy(r => r.Key),
+                response =>
+                {
+                    Assert.Equal("200", response.Key);
+                    Assert.Equal(expectedCreatedDescription, response.Value.Description);
+                },
+                response =>
+                {
+                    Assert.Equal("400", response.Key);
+                    Assert.Equal(expectedBadRequestDescription, response.Value.Description);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiResponse_UsesStatusCodeReasonPhraseWhenExplicitDescriptionIsMissing()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api/todos",
+            [ProducesResponseType<Todo>(StatusCodes.Status200OK, Description = null)] // Explicitly set to NULL
+        [ProducesResponseType(StatusCodes.Status400BadRequest)] // Omitted, meaning it should be NULL
+        () =>
+            { return TypedResults.Ok(new Todo(1, "Lorem", true, DateTime.UtcNow)); }); // This code doesn't return Bad Request, but that doesn't matter for this test.
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = Assert.Single(document.Paths["/api/todos"].Operations.Values);
+            Assert.Collection(operation.Responses.OrderBy(r => r.Key),
+                response =>
+                {
+                    Assert.Equal("200", response.Key);
+                    Assert.Equal("OK", response.Value.Description);
+                },
+                response =>
+                {
+                    Assert.Equal("400", response.Key);
+                    Assert.Equal("Bad Request", response.Value.Description);
+                });
+        });
+    }
+
+    /// <remarks>
+    /// Regression test for https://github.com/dotnet/aspnetcore/issues/60518
+    /// </remarks>
+    [Fact]
+    public async Task GetOpenApiResponse_WithEmptyMethodBody_UsesStatusCodeReasonPhraseWhenExplicitDescriptionIsMissing()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api/todos",
+            [ProducesResponseType<Todo>(StatusCodes.Status200OK, Description = null)] // Explicitly set to NULL
+        [ProducesResponseType(StatusCodes.Status400BadRequest)] // Omitted, meaning it should be NULL
+        () =>
+            { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = Assert.Single(document.Paths["/api/todos"].Operations.Values);
+            Assert.Collection(operation.Responses.OrderBy(r => r.Key),
+                response =>
+                {
+                    Assert.Equal("200", response.Key);
+                    Assert.Equal("OK", response.Value.Description);
+                },
+                response =>
+                {
+                    Assert.Equal("400", response.Key);
+                    Assert.Equal("Bad Request", response.Value.Description);
+                });
+        });
+    }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs
index c84c7e258510..967e84380d9d 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs
@@ -1,15 +1,54 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting.Internal;
-using Microsoft.Extensions.Options;
 using Moq;
 
 public partial class OpenApiDocumentServiceTests
 {
+    [Theory]
+    [InlineData("Development", "localhost:5001", "", "http", "http://localhost:5001/")]
+    [InlineData("Development", "example.com", "/api", "https", "https://example.com/api")]
+    [InlineData("Staging", "localhost:5002", "/v1", "http", "http://localhost:5002/v1")]
+    [InlineData("Staging", "api.example.com", "/base/path", "https", "https://api.example.com/base/path")]
+    [InlineData("Development", "localhost", "/", "http", "http://localhost/")]
+    public void GetOpenApiServers_FavorsHttpContextRequestOverServerAddress(string environment, string host, string pathBase, string scheme, string expectedUri)
+    {
+        // Arrange
+        var hostEnvironment = new HostingEnvironment
+        {
+            ApplicationName = "TestApplication",
+            EnvironmentName = environment
+        };
+        var docService = new OpenApiDocumentService(
+            "v1",
+            new Mock<IApiDescriptionGroupCollectionProvider>().Object,
+            hostEnvironment,
+            GetMockOptionsMonitor(),
+            new Mock<IKeyedServiceProvider>().Object,
+            new OpenApiTestServer(["http://localhost:5000"]));
+        var httpContext = new DefaultHttpContext()
+        {
+            Request =
+            {
+                Host = new HostString(host),
+                PathBase = pathBase,
+                Scheme = scheme
+
+            }
+        };
+
+        // Act
+        var servers = docService.GetOpenApiServers(httpContext.Request);
+
+        // Assert
+        Assert.Contains(expectedUri, servers.Select(s => s.Url));
+    }
+
     [Fact]
     public void GetOpenApiServers_HandlesServerAddressFeatureWithValues()
     {
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs
index e773ebf5ff89..9ab90d9f52a0 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs
@@ -15,36 +15,35 @@
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
-using Microsoft.OpenApi.Models;
 using Moq;
-using Xunit.Sdk;
 using static Microsoft.AspNetCore.OpenApi.Tests.OpenApiOperationGeneratorTests;
 
 public abstract class OpenApiDocumentServiceTestBase
 {
-    public static async Task VerifyOpenApiDocument(IEndpointRouteBuilder builder, Action<OpenApiDocument> verifyOpenApiDocument, CancellationToken cancellationToken = default)
-        => await VerifyOpenApiDocument(builder, new OpenApiOptions(), verifyOpenApiDocument, cancellationToken);
+    public static async Task VerifyOpenApiDocument(IEndpointRouteBuilder builder, Action<OpenApiDocument> verifyOpenApiDocument)
+        => await VerifyOpenApiDocument(builder, new OpenApiOptions(), verifyOpenApiDocument);
 
     public static async Task VerifyOpenApiDocument(IEndpointRouteBuilder builder, OpenApiOptions openApiOptions, Action<OpenApiDocument> verifyOpenApiDocument, CancellationToken cancellationToken = default)
     {
         var documentService = CreateDocumentService(builder, openApiOptions);
         var scopedService = ((TestServiceProvider)builder.ServiceProvider).CreateScope();
-        var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider, cancellationToken);
+        var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider, null, cancellationToken);
         verifyOpenApiDocument(document);
     }
 
-    public static async Task VerifyOpenApiDocument(ActionDescriptor action, Action<OpenApiDocument> verifyOpenApiDocument)
+    public static async Task VerifyOpenApiDocument(ActionDescriptor action, Action<OpenApiDocument> verifyOpenApiDocument, CancellationToken cancellationToken = default)
     {
         var builder = CreateBuilder();
         var documentService = CreateDocumentService(builder, action);
         var scopedService = ((TestServiceProvider)builder.ServiceProvider).CreateScope();
-        var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider);
+        var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider, null, cancellationToken);
         verifyOpenApiDocument(document);
     }
 
@@ -85,7 +84,11 @@ internal static OpenApiDocumentService CreateDocumentService(IEndpointRouteBuild
         var openApiOptions = new Mock<IOptionsMonitor<OpenApiOptions>>();
         openApiOptions.Setup(o => o.Get(It.IsAny<string>())).Returns(new OpenApiOptions());
 
-        var schemaService = new OpenApiSchemaService("Test", Options.Create(new Microsoft.AspNetCore.Http.Json.JsonOptions()), builder.ServiceProvider, openApiOptions.Object);
+        var jsonOptions = new Microsoft.AspNetCore.Http.Json.JsonOptions();
+        // Set strict number handling by default to make integer type checks more straightforward
+        jsonOptions.SerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.Strict;
+
+        var schemaService = new OpenApiSchemaService("Test", Options.Create(jsonOptions), openApiOptions.Object);
         ((TestServiceProvider)builder.ServiceProvider).TestSchemaService = schemaService;
         var documentService = new OpenApiDocumentService("Test", apiDescriptionGroupCollectionProvider, hostEnvironment, openApiOptions.Object, builder.ServiceProvider, new OpenApiTestServer());
         ((TestServiceProvider)builder.ServiceProvider).TestDocumentService = documentService;
@@ -126,9 +129,12 @@ internal static OpenApiDocumentService CreateDocumentService(IEndpointRouteBuild
         provider.OnProvidersExecuted(context);
 
         var apiDescriptionGroupCollectionProvider = CreateApiDescriptionGroupCollectionProvider(context.Results);
-        var jsonOptions = builder.ServiceProvider.GetService<IOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>>() ?? Options.Create(new Microsoft.AspNetCore.Http.Json.JsonOptions());
+        var defaultJsonOptions = new Microsoft.AspNetCore.Http.Json.JsonOptions();
+        // Set strict number handling by default to make integer type checks more straightforward
+        defaultJsonOptions.SerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.Strict;
+        var jsonOptions = builder.ServiceProvider.GetService<IOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>>() ?? Options.Create(defaultJsonOptions);
 
-        var schemaService = new OpenApiSchemaService("Test", jsonOptions, builder.ServiceProvider, options.Object);
+        var schemaService = new OpenApiSchemaService("Test", jsonOptions, options.Object);
         ((TestServiceProvider)builder.ServiceProvider).TestSchemaService = schemaService;
         var documentService = new OpenApiDocumentService("Test", apiDescriptionGroupCollectionProvider, hostEnvironment, options.Object, builder.ServiceProvider, new OpenApiTestServer());
         ((TestServiceProvider)builder.ServiceProvider).TestDocumentService = documentService;
@@ -159,8 +165,13 @@ private static EndpointMetadataApiDescriptionProvider CreateEndpointMetadataApiD
 
     internal static TestEndpointRouteBuilder CreateBuilder(IServiceCollection serviceCollection = null)
     {
+        serviceCollection ??= new ServiceCollection();
+        serviceCollection.ConfigureHttpJsonOptions(options =>
+        {
+            options.SerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.Strict;
+        });
         var serviceProvider = new TestServiceProvider();
-        serviceProvider.SetInternalServiceProvider(serviceCollection ?? new ServiceCollection());
+        serviceProvider.SetInternalServiceProvider(serviceCollection);
         return new TestEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
     }
 
@@ -218,14 +229,19 @@ public ControllerActionDescriptor CreateActionDescriptor(string methodName = nul
 
         action.AttributeRouteInfo = new()
         {
-            Template = action.MethodInfo.GetCustomAttribute<RouteAttribute>()?.Template,
+            Template = action.MethodInfo.GetCustomAttribute<RouteAttribute>()?.Template ?? string.Empty,
             Name = action.MethodInfo.GetCustomAttribute<RouteAttribute>()?.Name,
             Order = action.MethodInfo.GetCustomAttribute<RouteAttribute>()?.Order ?? 0,
         };
         action.RouteValues.Add("controller", "Test");
         action.RouteValues.Add("action", action.MethodInfo.Name);
-        action.ActionConstraints = [new HttpMethodActionConstraint(["GET"])];
         action.EndpointMetadata = [..action.MethodInfo.GetCustomAttributes()];
+        action.ActionConstraints = [new HttpMethodActionConstraint(action
+            .EndpointMetadata
+            .OfType<IActionHttpMethodProvider>()
+            .SelectMany(a => a.HttpMethods)
+            .DefaultIfEmpty("GET")
+        )];
         if (controllerType is not null)
         {
             foreach (var attribute in controllerType.GetCustomAttributes())
@@ -254,14 +270,12 @@ private class TestServiceProvider : IServiceProvider, IKeyedServiceProvider, ISe
         public static TestServiceProvider Instance { get; } = new TestServiceProvider();
         private IKeyedServiceProvider _serviceProvider;
         internal OpenApiDocumentService TestDocumentService { get; set; }
-        internal OpenApiSchemaStore TestSchemaStoreService { get; } = new OpenApiSchemaStore();
         internal OpenApiSchemaService TestSchemaService { get; set; }
 
         public IServiceProvider ServiceProvider => this;
 
         public void SetInternalServiceProvider(IServiceCollection serviceCollection)
         {
-            serviceCollection.AddKeyedSingleton<OpenApiSchemaStore>("Test");
             serviceCollection.Configure<OpenApiOptions>("Test", options =>
             {
                 options.DocumentName = "Test";
@@ -294,10 +308,6 @@ public object GetKeyedService(Type serviceType, object serviceKey)
             {
                 return TestSchemaService;
             }
-            if (serviceType == typeof(OpenApiSchemaStore))
-            {
-                return TestSchemaStoreService;
-            }
 
             return _serviceProvider.GetKeyedService(serviceType, serviceKey);
         }
@@ -312,10 +322,6 @@ public object GetRequiredKeyedService(Type serviceType, object serviceKey)
             {
                 return TestSchemaService;
             }
-            if (serviceType == typeof(OpenApiSchemaStore))
-            {
-                return TestSchemaStoreService;
-            }
 
             return _serviceProvider.GetRequiredKeyedService(serviceType, serviceKey);
         }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiGeneratorTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiGeneratorTests.cs
index f65f75196eaa..0dc6f3f6e53d 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiGeneratorTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiGeneratorTests.cs
@@ -15,7 +15,6 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Primitives;
-using Microsoft.OpenApi.Models;
 
 namespace Microsoft.AspNetCore.OpenApi.Tests;
 
@@ -83,8 +82,9 @@ public void AddsRequestFormatFromMetadata()
     {
         static void AssertCustomRequestFormat(OpenApiOperation operation)
         {
+            Assert.NotNull(operation.Parameters);
             Assert.Empty(operation.Parameters);
-            var content = operation.RequestBody.Content.Keys.FirstOrDefault();
+            var content = operation.RequestBody.Content!.Keys.FirstOrDefault();
             Assert.Equal("application/custom", content);
         }
 
@@ -101,11 +101,12 @@ public void AddsMultipleRequestFormatsFromMetadata()
         var operation = GetOpenApiOperation(
             [Consumes("application/custom0", "application/custom1")] (InferredJsonClass fromBody) => { });
 
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
 
-        var content = operation.RequestBody.Content;
+        var content = operation.RequestBody.Content!;
         Assert.Equal(2, content.Count);
-        Assert.Equal(new[] { "application/custom0", "application/custom1" }, content.Keys);
+        Assert.Equal(["application/custom0", "application/custom1"], content.Keys);
     }
 
     [Fact]
@@ -116,6 +117,7 @@ public void AddsMultipleRequestFormatsFromMetadataWithRequestTypeAndOptionalBody
         var request = operation.RequestBody;
         Assert.NotNull(request);
         Assert.Equal(2, request.Content.Count);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
 
         Assert.Equal("application/custom0", request.Content.First().Key);
@@ -134,9 +136,10 @@ public void AddsMultipleRequestFormatsFromMetadataWithRequiredBodyParameter()
         var request = operation.RequestBody;
         Assert.NotNull(request);
 
-        Assert.Equal("application/custom0", request.Content.First().Key);
-        Assert.Equal("application/custom1", request.Content.Last().Key);
+        Assert.Equal("application/custom0", request.Content!.First().Key);
+        Assert.Equal("application/custom1", request.Content!.Last().Key);
         Assert.True(request.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -145,7 +148,7 @@ public void AddsMultipleRequestFormatsFromMetadataWithRequiredBodyParameter()
     [Fact]
     public void AddsJsonResponseFormatWhenFromBodyInferred()
     {
-        static void AssertJsonResponse(OpenApiOperation operation, string expectedType)
+        static void AssertJsonResponse(OpenApiOperation operation, JsonSchemaType expectedType)
         {
             var response = Assert.Single(operation.Responses);
             Assert.Equal("200", response.Key);
@@ -154,14 +157,14 @@ static void AssertJsonResponse(OpenApiOperation operation, string expectedType)
             Assert.Equal("application/json", formats.Key);
         }
 
-        AssertJsonResponse(GetOpenApiOperation(() => new InferredJsonClass()), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => (IInferredJsonInterface)null), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => Task.FromResult(new InferredJsonClass())), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => Task.FromResult((IInferredJsonInterface)null)), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => ValueTask.FromResult(new InferredJsonClass())), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => ValueTask.FromResult((IInferredJsonInterface)null)), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => FSharp.Core.ExtraTopLevelOperators.DefaultAsyncBuilder.Return(new InferredJsonClass())), "object");
-        AssertJsonResponse(GetOpenApiOperation(() => FSharp.Core.ExtraTopLevelOperators.DefaultAsyncBuilder.Return((IInferredJsonInterface)null)), "object");
+        AssertJsonResponse(GetOpenApiOperation(() => new InferredJsonClass()), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => (IInferredJsonInterface)null), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => Task.FromResult(new InferredJsonClass())), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => Task.FromResult((IInferredJsonInterface)null)), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => ValueTask.FromResult(new InferredJsonClass())), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => ValueTask.FromResult((IInferredJsonInterface)null)), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => FSharp.Core.ExtraTopLevelOperators.DefaultAsyncBuilder.Return(new InferredJsonClass())), JsonSchemaType.Object);
+        AssertJsonResponse(GetOpenApiOperation(() => FSharp.Core.ExtraTopLevelOperators.DefaultAsyncBuilder.Return((IInferredJsonInterface)null)), JsonSchemaType.Object);
     }
 
     [Fact]
@@ -331,7 +334,7 @@ static void AssertPathParameter(OpenApiOperation operation)
         {
             var param = Assert.Single(operation.Parameters);
             Assert.Equal(ParameterLocation.Path, param.In);
-            Assert.Empty(param.Content);
+            Assert.Null(param.Content);
         }
 
         AssertPathParameter(GetOpenApiOperation((int foo) => { }, "/{foo}"));
@@ -345,7 +348,7 @@ static void AssertPathParameter(OpenApiOperation operation)
         {
             var param = Assert.Single(operation.Parameters);
             Assert.Equal(ParameterLocation.Path, param.In);
-            Assert.Empty(param.Content);
+            Assert.Null(param.Content);
         }
         AssertPathParameter(GetOpenApiOperation((TryParseStringRecord foo) => { }, pattern: "/{foo}"));
     }
@@ -357,7 +360,7 @@ static void AssertPathParameter(OpenApiOperation operation)
         {
             var param = Assert.Single(operation.Parameters);
             Assert.Equal(ParameterLocation.Path, param.In);
-            Assert.Empty(param.Content);
+            Assert.Null(param.Content);
         }
 
         AssertPathParameter(GetOpenApiOperation((int? foo) => { }, "/{foo}"));
@@ -371,7 +374,7 @@ static void AssertPathParameter(OpenApiOperation operation)
         {
             var param = Assert.Single(operation.Parameters);
             Assert.Equal(ParameterLocation.Path, param.In);
-            Assert.Empty(param.Content);
+            Assert.Null(param.Content);
         }
         AssertPathParameter(GetOpenApiOperation((TryParseStringRecordStruct foo) => { }, pattern: "/{foo}"));
     }
@@ -379,20 +382,20 @@ static void AssertPathParameter(OpenApiOperation operation)
     [Fact]
     public void AddsFromQueryParameterAsQuery()
     {
-        static void AssertQueryParameter(OpenApiOperation operation, string type)
+        static void AssertQueryParameter(OpenApiOperation operation, JsonSchemaType type)
         {
             var param = Assert.Single(operation.Parameters);
             Assert.Equal(ParameterLocation.Query, param.In);
-            Assert.Empty(param.Content);
+            Assert.Null(param.Content);
         }
 
-        AssertQueryParameter(GetOpenApiOperation((int foo) => { }, "/"), "integer");
-        AssertQueryParameter(GetOpenApiOperation(([FromQuery] int foo) => { }), "integer");
-        AssertQueryParameter(GetOpenApiOperation(([FromQuery] TryParseStringRecordStruct foo) => { }), "object");
-        AssertQueryParameter(GetOpenApiOperation((int[] foo) => { }, "/"), "array");
-        AssertQueryParameter(GetOpenApiOperation((string[] foo) => { }, "/"), "array");
-        AssertQueryParameter(GetOpenApiOperation((StringValues foo) => { }, "/"), "array");
-        AssertQueryParameter(GetOpenApiOperation((TryParseStringRecordStruct[] foo) => { }, "/"), "array");
+        AssertQueryParameter(GetOpenApiOperation((int foo) => { }, "/"), JsonSchemaType.Integer);
+        AssertQueryParameter(GetOpenApiOperation(([FromQuery] int foo) => { }), JsonSchemaType.Integer);
+        AssertQueryParameter(GetOpenApiOperation(([FromQuery] TryParseStringRecordStruct foo) => { }), JsonSchemaType.Object);
+        AssertQueryParameter(GetOpenApiOperation((int[] foo) => { }, "/"), JsonSchemaType.Array);
+        AssertQueryParameter(GetOpenApiOperation((string[] foo) => { }, "/"), JsonSchemaType.Array);
+        AssertQueryParameter(GetOpenApiOperation((StringValues foo) => { }, "/"), JsonSchemaType.Array);
+        AssertQueryParameter(GetOpenApiOperation((TryParseStringRecordStruct[] foo) => { }, "/"), JsonSchemaType.Array);
     }
 
     [Fact]
@@ -402,7 +405,7 @@ public void AddsFromHeaderParameterAsHeader()
         var param = Assert.Single(operation.Parameters);
 
         Assert.Equal(ParameterLocation.Header, param.In);
-        Assert.Empty(param.Content);
+        Assert.Null(param.Content);
     }
 
     [Fact]
@@ -410,7 +413,9 @@ public void DoesNotAddFromServiceParameterAsService()
     {
         Assert.Empty(GetOpenApiOperation((IInferredServiceInterface foo) => { }).Parameters);
         Assert.Empty(GetOpenApiOperation(([FromServices] int foo) => { }).Parameters);
+        Assert.Empty(GetOpenApiOperation(([CustomFromServices] int foo) => { }).Parameters);
         Assert.Empty(GetOpenApiOperation(([FromKeyedServices("foo")] int foo) => { }).Parameters);
+        Assert.Empty(GetOpenApiOperation(([CustomFromKeyedServices("foo")] int foo) => { }).Parameters);
         Assert.Empty(GetOpenApiOperation((HttpContext context) => { }).Parameters);
         Assert.Empty(GetOpenApiOperation((HttpRequest request) => { }).Parameters);
         Assert.Empty(GetOpenApiOperation((HttpResponse response) => { }).Parameters);
@@ -422,16 +427,18 @@ public void DoesNotAddFromServiceParameterAsService()
     [Fact]
     public void AddsBodyParameterInTheParameterDescription()
     {
-        static void AssertBodyParameter(OpenApiOperation operation, string expectedName, string expectedType)
+        static void AssertBodyParameter(OpenApiOperation operation, string expectedName, JsonSchemaType expectedType)
         {
             var requestBody = operation.RequestBody;
-            var content = Assert.Single(requestBody.Content);
+            Assert.NotNull(requestBody);
+            var content = Assert.Single(requestBody.Content!);
             Assert.Equal("application/json", content.Key);
+            Assert.NotNull(operation.Parameters);
             Assert.Empty(operation.Parameters);
         }
 
-        AssertBodyParameter(GetOpenApiOperation((InferredJsonClass foo) => { }), "foo", "object");
-        AssertBodyParameter(GetOpenApiOperation(([FromBody] int bar) => { }), "bar", "integer");
+        AssertBodyParameter(GetOpenApiOperation((InferredJsonClass foo) => { }), "foo", JsonSchemaType.Object);
+        AssertBodyParameter(GetOpenApiOperation(([FromBody] int bar) => { }), "bar", JsonSchemaType.Integer);
     }
 
 #nullable enable
@@ -440,22 +447,24 @@ static void AssertBodyParameter(OpenApiOperation operation, string expectedName,
     public void AddsMultipleParameters()
     {
         var operation = GetOpenApiOperation(([FromRoute] int foo, int bar, InferredJsonClass fromBody) => { });
+        Assert.NotNull(operation.Parameters);
         Assert.Equal(2, operation.Parameters.Count);
 
         var fooParam = operation.Parameters[0];
         Assert.Equal("foo", fooParam.Name);
         Assert.Equal(ParameterLocation.Path, fooParam.In);
         Assert.True(fooParam.Required);
-        Assert.Empty(fooParam.Content);
+        Assert.Null(fooParam.Content);
 
         var barParam = operation.Parameters[1];
         Assert.Equal("bar", barParam.Name);
         Assert.Equal(ParameterLocation.Query, barParam.In);
         Assert.True(barParam.Required);
-        Assert.Empty(barParam.Content);
+        Assert.Null(barParam.Content);
 
         var fromBodyParam = operation.RequestBody;
-        var fromBodyContent = Assert.Single(fromBodyParam.Content);
+        Assert.NotNull(fromBodyParam);
+        var fromBodyContent = Assert.Single(fromBodyParam.Content!);
         Assert.Equal("application/json", fromBodyContent.Key);
         Assert.True(fromBodyParam.Required);
     }
@@ -473,14 +482,14 @@ static void AssertParameters(OpenApiOperation operation, string capturedName = "
                     Assert.Equal(capturedName, param.Name);
                     Assert.Equal(ParameterLocation.Path, param.In);
                     Assert.True(param.Required);
-                    Assert.Empty(param.Content);
+                    Assert.Null(param.Content);
                 },
                 param =>
                 {
                     Assert.Equal("Bar", param.Name);
                     Assert.Equal(ParameterLocation.Query, param.In);
                     Assert.True(param.Required);
-                    Assert.Empty(param.Content);
+                    Assert.Null(param.Content);
                 }
             );
         }
@@ -505,13 +514,13 @@ public void TestParameterIsRequired()
         Assert.Equal("foo", fooParam.Name);
         Assert.Equal(ParameterLocation.Path, fooParam.In);
         Assert.True(fooParam.Required);
-        Assert.Empty(fooParam.Content);
+        Assert.Null(fooParam.Content);
 
         var barParam = operation.Parameters[1];
         Assert.Equal("bar", barParam.Name);
         Assert.Equal(ParameterLocation.Query, barParam.In);
         Assert.False(barParam.Required);
-        Assert.Empty(barParam.Content);
+        Assert.Null(barParam.Content);
     }
 
     [Fact]
@@ -661,11 +670,13 @@ public void HandleAcceptsMetadataWithNoParams()
             });
 
         var requestBody = operation.RequestBody;
+        Assert.NotNull(requestBody);
 
         // Assert
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
         Assert.Collection(
-            requestBody.Content,
+            requestBody.Content!,
             parameter =>
             {
                 Assert.Equal("application/json", parameter.Key);
@@ -688,8 +699,10 @@ public void HandleAcceptsMetadataWithTypeParameter()
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.False(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -703,9 +716,11 @@ public void HandleDefaultIAcceptsMetadataForRequiredBodyParameter()
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.Equal("application/json", content.Key);
         Assert.True(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -717,9 +732,11 @@ public void HandleDefaultIAcceptsMetadataForOptionalBodyParameter()
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.Equal("application/json", content.Key);
         Assert.False(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -731,9 +748,11 @@ public void HandleIAcceptsMetadataWithConsumesAttributeAndInferredOptionalFromBo
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.Equal("application/xml", content.Key);
         Assert.False(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -745,9 +764,11 @@ public void HandleDefaultIAcceptsMetadataForRequiredFormFileParameter()
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.Equal("multipart/form-data", content.Key);
         Assert.True(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -759,9 +780,11 @@ public void HandleDefaultIAcceptsMetadataForOptionalFormFileParameter()
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.Equal("multipart/form-data", content.Key);
         Assert.False(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -773,9 +796,11 @@ public void AddsMultipartFormDataRequestFormatWhenFormFileSpecified()
 
         // Assert
         var requestBody = operation.RequestBody;
-        var content = Assert.Single(requestBody.Content);
+        Assert.NotNull(requestBody);
+        var content = Assert.Single(requestBody.Content!);
         Assert.Equal("multipart/form-data", content.Key);
         Assert.True(requestBody.Required);
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -786,7 +811,8 @@ public void HasMultipleRequestFormatsWhenFormFileSpecifiedWithConsumesAttribute(
             [Consumes("application/custom0", "application/custom1")] (IFormFile file) => Results.NoContent());
 
         var requestBody = operation.RequestBody;
-        var content = requestBody.Content;
+        Assert.NotNull(requestBody);
+        var content = requestBody.Content!;
 
         Assert.Equal(2, content.Count);
 
@@ -796,6 +822,7 @@ public void HasMultipleRequestFormatsWhenFormFileSpecifiedWithConsumesAttribute(
         var requestFormat1 = content["application/custom1"];
         Assert.NotNull(requestFormat1);
 
+        Assert.NotNull(operation.Parameters);
         Assert.Empty(operation.Parameters);
     }
 
@@ -808,12 +835,12 @@ public void TestIsRequiredFromFormFile()
         Assert.NotNull(operation1.RequestBody);
 
         var fromFileParam0 = operation0.RequestBody;
-        var fromFileParam0ContentType = Assert.Single(fromFileParam0.Content.Values);
+        var fromFileParam0ContentType = Assert.Single(fromFileParam0.Content!.Values);
         Assert.Equal("multipart/form-data", fromFileParam0.Content.Keys.SingleOrDefault());
         Assert.True(fromFileParam0.Required);
 
         var fromFileParam1 = operation1.RequestBody;
-        var fromFileParam1ContentType = Assert.Single(fromFileParam1.Content.Values);
+        var fromFileParam1ContentType = Assert.Single(fromFileParam1.Content!.Values);
         Assert.Equal("multipart/form-data", fromFileParam1.Content.Keys.SingleOrDefault());
         Assert.False(fromFileParam1.Required);
     }
@@ -821,16 +848,18 @@ public void TestIsRequiredFromFormFile()
     [Fact]
     public void AddsFromFormParameterAsFormFile()
     {
-        static void AssertFormFileParameter(OpenApiOperation operation, string expectedType, string expectedName)
+        static void AssertFormFileParameter(OpenApiOperation operation, JsonSchemaType expectedType, string expectedName)
         {
             var requestBody = operation.RequestBody;
-            var content = Assert.Single(requestBody.Content);
+            Assert.NotNull(requestBody);
+            var content = Assert.Single(requestBody.Content!);
             Assert.Equal("multipart/form-data", content.Key);
+            Assert.NotNull(operation.Parameters);
             Assert.Empty(operation.Parameters);
         }
 
-        AssertFormFileParameter(GetOpenApiOperation((IFormFile file) => { }), "object", "file");
-        AssertFormFileParameter(GetOpenApiOperation(([FromForm(Name = "file_name")] IFormFile file) => { }), "object", "file_name");
+        AssertFormFileParameter(GetOpenApiOperation((IFormFile file) => { }), JsonSchemaType.Object, "file");
+        AssertFormFileParameter(GetOpenApiOperation(([FromForm(Name = "file_name")] IFormFile file) => { }), JsonSchemaType.Object, "file_name");
     }
 
     [Fact]
@@ -846,9 +875,11 @@ static void AssertFormFileCollection(Delegate handler, string expectedName)
 
             // Assert
             var requestBody = operation.RequestBody;
-            var content = Assert.Single(requestBody.Content);
+            Assert.NotNull(requestBody);
+            var content = Assert.Single(requestBody.Content!);
             Assert.Equal("multipart/form-data", content.Key);
             Assert.True(requestBody.Required);
+            Assert.NotNull(operation.Parameters);
             Assert.Empty(operation.Parameters);
         }
     }
@@ -952,9 +983,9 @@ public class AsParametersWithRequiredMembers
     public void SupportsRequiredMembersInAsParametersAttribute()
     {
         var operation = GetOpenApiOperation(([AsParameters] AsParametersWithRequiredMembers foo) => { });
-        Assert.Equal(4, operation.Parameters.Count);
+        Assert.Equal(4, operation.Parameters?.Count);
 
-        Assert.Collection(operation.Parameters,
+        Assert.Collection(operation.Parameters!,
             param => Assert.True(param.Required),
             param => Assert.False(param.Required),
             param => Assert.True(param.Required),
@@ -1115,4 +1146,8 @@ public override Endpoint Build()
             throw new NotImplementedException();
         }
     }
+
+    private class CustomFromKeyedServicesAttribute(object key) : FromKeyedServicesAttribute(key);
+
+    private class CustomFromServicesAttribute : FromServicesAttribute;
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.Annotations.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.Annotations.cs
new file mode 100644
index 000000000000..f4bb0a5aa4e7
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.Annotations.cs
@@ -0,0 +1,143 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.Net.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.OpenApi;
+using Microsoft.AspNetCore.Routing;
+
+public partial class OpenApiSchemaServiceTests : OpenApiDocumentServiceTestBase
+{
+    [Fact]
+    public async Task SchemaDescriptions_HandlesSchemaReferences()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/", (DescribedReferencesDto dto) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+
+            Assert.NotNull(requestBody);
+            var content = Assert.Single(requestBody.Content);
+            Assert.Equal("application/json", content.Key);
+            Assert.NotNull(content.Value.Schema);
+            var schema = content.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("child1", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Equal("Property: DescribedReferencesDto.Child1", reference.Reference.Description);
+                },
+                property =>
+                {
+                    Assert.Equal("child2", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Equal("Property: DescribedReferencesDto.Child2", reference.Reference.Description);
+                },
+                property =>
+                {
+                    Assert.Equal("childNoDescription", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Null(reference.Reference.Description);
+                });
+
+            var referencedSchema = document.Components.Schemas["DescribedChildDto"];
+            Assert.Equal("Class: DescribedChildDto", referencedSchema.Description);
+        });
+
+    }
+
+    [Description("Class: DescribedReferencesDto")]
+    public class DescribedReferencesDto
+    {
+        [Description("Property: DescribedReferencesDto.Child1")]
+        public DescribedChildDto Child1 { get; set; }
+
+        [Description("Property: DescribedReferencesDto.Child2")]
+        public DescribedChildDto Child2 { get; set; }
+
+        public DescribedChildDto ChildNoDescription { get; set; }
+    }
+
+    [Description("Class: DescribedChildDto")]
+    public class DescribedChildDto
+    {
+        [Description("Property: DescribedChildDto.ChildValue")]
+        public string ChildValue { get; set; }
+    }
+
+    [Fact]
+    public async Task SchemaDescriptions_HandlesInlinedSchemas()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        var options = new OpenApiOptions();
+        var originalCreateSchemaReferenceId = options.CreateSchemaReferenceId;
+        options.CreateSchemaReferenceId = (x) => x.Type == typeof(DescribedInlinedDto) ? null : originalCreateSchemaReferenceId(x);
+
+        // Act
+        builder.MapPost("/", (DescribedInlinedSchemasDto dto) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+
+            Assert.NotNull(requestBody);
+            var content = Assert.Single(requestBody.Content);
+            Assert.Equal("application/json", content.Key);
+            Assert.NotNull(content.Value.Schema);
+            var schema = content.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("inlined1", property.Key);
+                    var inlinedSchema = Assert.IsType<OpenApiSchema>(property.Value);
+                    Assert.Equal("Property: DescribedInlinedSchemasDto.Inlined1", inlinedSchema.Description);
+                },
+                property =>
+                {
+                    Assert.Equal("inlined2", property.Key);
+                    var inlinedSchema = Assert.IsType<OpenApiSchema>(property.Value);
+                    Assert.Equal("Property: DescribedInlinedSchemasDto.Inlined2", inlinedSchema.Description);
+                },
+                property =>
+                {
+                    Assert.Equal("inlinedNoDescription", property.Key);
+                    var inlinedSchema = Assert.IsType<OpenApiSchema>(property.Value);
+                    Assert.Equal("Class: DescribedInlinedDto", inlinedSchema.Description);
+                });
+        });
+    }
+
+    [Description("Class: DescribedInlinedSchemasDto")]
+    public class DescribedInlinedSchemasDto
+    {
+        [Description("Property: DescribedInlinedSchemasDto.Inlined1")]
+        public DescribedInlinedDto Inlined1 { get; set; }
+
+        [Description("Property: DescribedInlinedSchemasDto.Inlined2")]
+        public DescribedInlinedDto Inlined2 { get; set; }
+
+        public DescribedInlinedDto InlinedNoDescription { get; set; }
+    }
+
+    [Description("Class: DescribedInlinedDto")]
+    public class DescribedInlinedDto
+    {
+        [Description("Property: DescribedInlinedDto.ChildValue")]
+        public string ChildValue { get; set; }
+    }
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
index af9b7e5663d7..2903064bf31c 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
@@ -3,61 +3,63 @@
 
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Net.Http;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiSchemaServiceTests : OpenApiDocumentServiceTestBase
 {
 #nullable enable
     public static object?[][] RouteParametersWithPrimitiveTypes =>
     [
-        [(int id) => {}, "integer", "int32"],
-        [(long id) => {}, "integer", "int64"],
-        [(float id) => {}, "number", "float"],
-        [(double id) => {}, "number", "double"],
-        [(decimal id) => {}, "number", "double"],
-        [(bool id) => {}, "boolean", null],
-        [(string id) => {}, "string", null],
-        [(char id) => {}, "string", "char"],
-        [(byte id) => {}, "integer", "uint8"],
-        [(byte[] id) => {}, "string", "byte"],
-        [(short id) => {}, "integer", "int16"],
-        [(ushort id) => {}, "integer", "uint16"],
-        [(uint id) => {}, "integer", "uint32"],
-        [(ulong id) => {}, "integer", "uint64"],
-        [(Uri id) => {}, "string", "uri"],
-        [(TimeOnly id) => {}, "string", "time"],
-        [(DateOnly id) => {}, "string", "date"],
-        [(int? id) => {}, "integer", "int32"],
-        [(long? id) => {}, "integer", "int64"],
-        [(float? id) => {}, "number", "float"],
-        [(double? id) => {}, "number", "double"],
-        [(decimal? id) => {}, "number", "double"],
-        [(bool? id) => {}, "boolean", null],
-        [(string? id) => {}, "string", null],
-        [(char? id) => {}, "string", "char"],
-        [(byte? id) => {}, "integer", "uint8"],
-        [(byte[]? id) => {}, "string", "byte"],
-        [(short? id) => {}, "integer", "int16"],
-        [(ushort? id) => {}, "integer", "uint16"],
-        [(uint? id) => {}, "integer", "uint32"],
-        [(ulong? id) => {}, "integer", "uint64"],
-        [(Uri? id) => {}, "string", "uri"],
-        [(TimeOnly? id) => {}, "string", "time"],
-        [(DateOnly? id) => {}, "string", "date"]
+        [(int id) => {}, JsonSchemaType.Integer, "int32"],
+        [(long id) => {}, JsonSchemaType.Integer, "int64"],
+        [(float id) => {}, JsonSchemaType.Number, "float"],
+        [(double id) => {}, JsonSchemaType.Number, "double"],
+        [(decimal id) => {}, JsonSchemaType.Number, "double"],
+        [(bool id) => {}, JsonSchemaType.Boolean, null],
+        [(string id) => {}, JsonSchemaType.String, null],
+        [(char id) => {}, JsonSchemaType.String, "char"],
+        [(byte id) => {}, JsonSchemaType.Integer, "uint8"],
+        [(byte[] id) => {}, JsonSchemaType.String, "byte"],
+        [(short id) => {}, JsonSchemaType.Integer, "int16"],
+        [(ushort id) => {}, JsonSchemaType.Integer, "uint16"],
+        [(uint id) => {}, JsonSchemaType.Integer, "uint32"],
+        [(ulong id) => {}, JsonSchemaType.Integer, "uint64"],
+        [(Uri id) => {}, JsonSchemaType.String, "uri"],
+        [(TimeOnly id) => {}, JsonSchemaType.String, "time"],
+        [(DateOnly id) => {}, JsonSchemaType.String, "date"],
+        [(int? id) => {}, JsonSchemaType.Integer, "int32"],
+        [(long? id) => {}, JsonSchemaType.Integer, "int64"],
+        [(float? id) => {}, JsonSchemaType.Number, "float"],
+        [(double? id) => {}, JsonSchemaType.Number, "double"],
+        [(decimal? id) => {}, JsonSchemaType.Number, "double"],
+        [(bool? id) => {}, JsonSchemaType.Boolean, null],
+        [(string? id) => {}, JsonSchemaType.String, null],
+        [(char? id) => {}, JsonSchemaType.String, "char"],
+        [(byte? id) => {}, JsonSchemaType.Integer, "uint8"],
+        [(byte[]? id) => {}, JsonSchemaType.String, "byte"],
+        [(short? id) => {}, JsonSchemaType.Integer, "int16"],
+        [(ushort? id) => {}, JsonSchemaType.Integer, "uint16"],
+        [(uint? id) => {}, JsonSchemaType.Integer, "uint32"],
+        [(ulong? id) => {}, JsonSchemaType.Integer, "uint64"],
+        [(Uri? id) => {}, JsonSchemaType.String, "uri"],
+        [(TimeOnly? id) => {}, JsonSchemaType.String, "time"],
+        [(DateOnly? id) => {}, JsonSchemaType.String, "date"]
     ];
 #nullable restore
 
     [Theory]
     [MemberData(nameof(RouteParametersWithPrimitiveTypes))]
-    public async Task GetOpenApiParameters_HandlesRouteParameterWithPrimitiveType(Delegate requestHandler, string schemaType, string schemaFormat)
+    public async Task GetOpenApiParameters_HandlesRouteParameterWithPrimitiveType(Delegate requestHandler, JsonSchemaType schemaType, string schemaFormat)
     {
         // Arrange
         var builder = CreateBuilder();
@@ -68,25 +70,24 @@ public async Task GetOpenApiParameters_HandlesRouteParameterWithPrimitiveType(De
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/{id}"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/{id}"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
             Assert.Equal(schemaType, parameter.Schema.Type);
             Assert.Equal(schemaFormat, parameter.Schema.Format);
-            Assert.False(parameter.Schema.Nullable);
         });
     }
 
     public static object[][] RouteParametersWithParsableTypes =>
     [
-        [(Guid id) => {}, "string", "uuid"],
-        [(DateTime id) => {}, "string", "date-time"],
-        [(DateTimeOffset id) => {}, "string", "date-time"],
-        [(Uri id) => {}, "string", "uri"]
+        [(Guid id) => {}, JsonSchemaType.String, "uuid"],
+        [(DateTime id) => {}, JsonSchemaType.String, "date-time"],
+        [(DateTimeOffset id) => {}, JsonSchemaType.String, "date-time"],
+        [(Uri id) => {}, JsonSchemaType.String, "uri"]
     ];
 
     [Theory]
     [MemberData(nameof(RouteParametersWithParsableTypes))]
-    public async Task GetOpenApiParameters_HandlesRouteParameterWithParsableType(Delegate requestHandler, string schemaType, string schemaFormat)
+    public async Task GetOpenApiParameters_HandlesRouteParameterWithParsableType(Delegate requestHandler, JsonSchemaType schemaType, string schemaFormat)
     {
         // Arrange
         var builder = CreateBuilder();
@@ -97,7 +98,7 @@ public async Task GetOpenApiParameters_HandlesRouteParameterWithParsableType(Del
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/{id}"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/{id}"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
             Assert.Equal(schemaType, parameter.Schema.Type);
             Assert.Equal(schemaFormat, parameter.Schema.Format);
@@ -105,47 +106,47 @@ await VerifyOpenApiDocument(builder, document =>
     }
 
     [Theory]
-    [InlineData("/api/{id:int}", "integer", "int32", null, null, null, null, null)]
-    [InlineData("/api/{id:bool}", "boolean", null, null, null, null, null, null)]
-    [InlineData("/api/{id:datetime}", "string", "date-time", null, null, null, null, null)]
-    [InlineData("/api/{id:decimal}", "number", "double", null, null, null, null, null)]
-    [InlineData("/api/{id:double}", "number", "double", null, null, null, null, null)]
-    [InlineData("/api/{id:float}", "number", "float", null, null, null, null, null)]
-    [InlineData("/api/{id:guid}", "string", "uuid", null, null, null, null, null)]
-    [InlineData("/api/{id:long}", "integer", "int64", null, null, null, null, null)]
-    [InlineData("/api/{id:minLength(4)}", "integer", "int32", null, null, 4, null, null)]
-    [InlineData("/api/{id:maxLength(8)}", "integer", "int32", null, null, null, 8, null)]
-    [InlineData("/api/{id:length(4, 8)}", "integer", "int32", null, null, 4, 8, null)]
-    [InlineData("/api/{id:min(4)}", "integer", "int32", 4, null, null, null, null)]
-    [InlineData("/api/{id:max(8)}", "integer", "int32", null, 8, null, null, null)]
-    [InlineData("/api/{id:range(4, 8)}", "integer", "int32", 4, 8, null, null, null)]
-    [InlineData("/api/{id:alpha}", "string", null, null, null, null, null, "^[A-Za-z]*$")]
-    [InlineData("/api/{id:regex(^\\d{{3}}-\\d{{2}}-\\d{{4}}$)}", "string", null, null, null, null, null, "^\\d{3}-\\d{2}-\\d{4}$")]
+    [InlineData("/api/{id:int}", JsonSchemaType.Integer, "int32", null, null, null, null, null)]
+    [InlineData("/api/{id:bool}", JsonSchemaType.Boolean, null, null, null, null, null, null)]
+    [InlineData("/api/{id:datetime}", JsonSchemaType.String, "date-time", null, null, null, null, null)]
+    [InlineData("/api/{id:decimal}", JsonSchemaType.Number, "double", null, null, null, null, null)]
+    [InlineData("/api/{id:double}", JsonSchemaType.Number, "double", null, null, null, null, null)]
+    [InlineData("/api/{id:float}", JsonSchemaType.Number, "float", null, null, null, null, null)]
+    [InlineData("/api/{id:guid}", JsonSchemaType.String, "uuid", null, null, null, null, null)]
+    [InlineData("/api/{id:long}", JsonSchemaType.Integer, "int64", null, null, null, null, null)]
+    [InlineData("/api/{id:minLength(4)}", JsonSchemaType.Integer, "int32", null, null, 4, null, null)]
+    [InlineData("/api/{id:maxLength(8)}", JsonSchemaType.Integer, "int32", null, null, null, 8, null)]
+    [InlineData("/api/{id:length(4, 8)}", JsonSchemaType.Integer, "int32", null, null, 4, 8, null)]
+    [InlineData("/api/{id:min(4)}", JsonSchemaType.Integer, "int32", 4, null, null, null, null)]
+    [InlineData("/api/{id:max(8)}", JsonSchemaType.Integer, "int32", null, 8, null, null, null)]
+    [InlineData("/api/{id:range(4, 8)}", JsonSchemaType.Integer, "int32", 4, 8, null, null, null)]
+    [InlineData("/api/{id:alpha}", JsonSchemaType.String, null, null, null, null, null, "^[A-Za-z]*$")]
+    [InlineData("/api/{id:regex(^\\d{{3}}-\\d{{2}}-\\d{{4}}$)}", JsonSchemaType.String, null, null, null, null, null, "^\\d{3}-\\d{2}-\\d{4}$")]
     // First route constraint wins
-    [InlineData("/api/{id:min(2):range(4, 8)}", "integer", "int32", 2, 8, null, null, null)]
-    [InlineData("/api/{id::double:float}", "number", "double", null, null, null, null, null)]
-    [InlineData("/api/{id::long:int}", "integer", "int64", null, null, null, null, null)]
+    [InlineData("/api/{id:min(2):range(4, 8)}", JsonSchemaType.Integer, "int32", 2, 8, null, null, null)]
+    [InlineData("/api/{id::double:float}", JsonSchemaType.Number, "double", null, null, null, null, null)]
+    [InlineData("/api/{id::long:int}", JsonSchemaType.Integer, "int64", null, null, null, null, null)]
     // Compatible route constraints are combined
-    [InlineData("/api/{id:max(8):min(4)}", "integer", "int32", 4, 8, null, null, null)]
-    [InlineData("/api/{id:maxLength(8):minLength(4)}", "integer", "int32", null, null, 4, 8, null)]
-    public async Task GetOpenApiParameters_HandlesRouteParameterWithRouteConstraint(string routeTemplate, string type, string format, int? minimum, int? maximum, int? minLength, int? maxLength, string pattern)
+    [InlineData("/api/{id:max(8):min(4)}", JsonSchemaType.Integer, "int32", 4, 8, null, null, null)]
+    [InlineData("/api/{id:maxLength(8):minLength(4)}", JsonSchemaType.Integer, "int32", null, null, 4, 8, null)]
+    public async Task GetOpenApiParameters_HandlesRouteParameterWithRouteConstraint(string routeTemplate, JsonSchemaType type, string format, int? minimum, int? maximum, int? minLength, int? maxLength, string pattern)
     {
         // Arrange
         var builder = CreateBuilder();
 
         // Act
-        builder.MapGet(routeTemplate, (int id) => {});
+        builder.MapGet(routeTemplate, (int id) => { });
 
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
             var path = Assert.Single(document.Paths);
-            var operation = path.Value.Operations[OperationType.Get];
+            var operation = path.Value.Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
             Assert.Equal(type, parameter.Schema.Type);
             Assert.Equal(format, parameter.Schema.Format);
-            Assert.Equal(minimum, parameter.Schema.Minimum);
-            Assert.Equal(maximum, parameter.Schema.Maximum);
+            Assert.Equal(minimum?.ToString(CultureInfo.InvariantCulture), parameter.Schema.Minimum);
+            Assert.Equal(maximum?.ToString(CultureInfo.InvariantCulture), parameter.Schema.Maximum);
             Assert.Equal(minLength, parameter.Schema.MinLength);
             Assert.Equal(maxLength, parameter.Schema.MaxLength);
             Assert.Equal(pattern, parameter.Schema.Pattern);
@@ -155,30 +156,30 @@ await VerifyOpenApiDocument(builder, document =>
 #nullable enable
     public static object[][] RouteParametersWithDefaultValues =>
     [
-        [(int id = 2) => { }, (IOpenApiAny defaultValue) => Assert.Equal(2, ((OpenApiInteger)defaultValue).Value)],
-        [(float id = 3f) => { }, (IOpenApiAny defaultValue) => Assert.Equal(3, ((OpenApiInteger)defaultValue).Value)],
-        [(string id = "test") => { }, (IOpenApiAny defaultValue) => Assert.Equal("test", ((OpenApiString)defaultValue).Value)],
-        [(bool id = true) => { }, (IOpenApiAny defaultValue) => Assert.True(((OpenApiBoolean)defaultValue).Value)],
-        [(TaskStatus status = TaskStatus.Canceled) => { }, (IOpenApiAny defaultValue) => Assert.Equal(6, ((OpenApiInteger)defaultValue).Value)],
+        [(int id = 2) => { }, (JsonNode defaultValue) => Assert.Equal(2, defaultValue.GetValue<int>())],
+        [(float id = 3f) => { }, (JsonNode defaultValue) => Assert.Equal(3, defaultValue.GetValue<int>())],
+        [(string id = "test") => { }, (JsonNode defaultValue) => Assert.Equal("test", defaultValue.GetValue<string>())],
+        [(bool id = true) => { }, (JsonNode defaultValue) => Assert.True(defaultValue.GetValue<bool>())],
+        [(TaskStatus status = TaskStatus.Canceled) => { }, (JsonNode defaultValue) => Assert.Equal(6, defaultValue.GetValue<int>())],
         // Default value for enums is serialized as string when a converter is registered.
-        [(Status status = Status.Pending) => { }, (IOpenApiAny defaultValue) => Assert.Equal("Pending", ((OpenApiString)defaultValue).Value)],
-        [([DefaultValue(2)] int id) => { }, (IOpenApiAny defaultValue) => Assert.Equal(2, ((OpenApiInteger)defaultValue).Value)],
-        [([DefaultValue(3f)] float id) => { }, (IOpenApiAny defaultValue) => Assert.Equal(3, ((OpenApiInteger)defaultValue).Value)],
-        [([DefaultValue("test")] string id) => { }, (IOpenApiAny defaultValue) => Assert.Equal("test", ((OpenApiString)defaultValue).Value)],
-        [([DefaultValue(true)] bool id) => { }, (IOpenApiAny defaultValue) => Assert.True(((OpenApiBoolean)defaultValue).Value)],
-        [([DefaultValue(TaskStatus.Canceled)] TaskStatus status) => { }, (IOpenApiAny defaultValue) => Assert.Equal(6, ((OpenApiInteger)defaultValue).Value)],
-        [([DefaultValue(Status.Pending)] Status status) => { }, (IOpenApiAny defaultValue) => Assert.Equal("Pending", ((OpenApiString)defaultValue).Value)],
-        [([DefaultValue(null)] int? id) => { }, (IOpenApiAny defaultValue) => Assert.True(defaultValue is OpenApiNull)],
-        [([DefaultValue(2)] int? id) => { }, (IOpenApiAny defaultValue) => Assert.Equal(2, ((OpenApiInteger)defaultValue).Value)],
-        [([DefaultValue(null)] string? id) => { }, (IOpenApiAny defaultValue) => Assert.True(defaultValue is OpenApiNull)],
-        [([DefaultValue("foo")] string? id) => { }, (IOpenApiAny defaultValue) => Assert.Equal("foo", ((OpenApiString)defaultValue).Value)],
-        [([DefaultValue(null)] TaskStatus? status) => { }, (IOpenApiAny defaultValue) => Assert.True(defaultValue is OpenApiNull)],
-        [([DefaultValue(TaskStatus.Canceled)] TaskStatus? status) => { }, (IOpenApiAny defaultValue) => Assert.Equal(6, ((OpenApiInteger)defaultValue).Value)],
+        [(Status status = Status.Pending) => { }, (JsonNode defaultValue) => Assert.Equal("Pending", defaultValue.GetValue<string>())],
+        [([DefaultValue(2)] int id) => { }, (JsonNode defaultValue) => Assert.Equal(2, defaultValue.GetValue<int>())],
+        [([DefaultValue(3f)] float id) => { }, (JsonNode defaultValue) => Assert.Equal(3, defaultValue.GetValue<int>())],
+        [([DefaultValue("test")] string id) => { }, (JsonNode defaultValue) => Assert.Equal("test", defaultValue.GetValue<string>())],
+        [([DefaultValue(true)] bool id) => { }, (JsonNode defaultValue) => Assert.True(defaultValue.GetValue<bool>())],
+        [([DefaultValue(TaskStatus.Canceled)] TaskStatus status) => { }, (JsonNode defaultValue) => Assert.Equal(6, defaultValue.GetValue<int>())],
+        [([DefaultValue(Status.Pending)] Status status) => { }, (JsonNode defaultValue) => Assert.Equal("Pending", defaultValue.GetValue<string>())],
+        [([DefaultValue(null)] int? id) => { }, (JsonNode defaultValue) => Assert.True(defaultValue is null)],
+        [([DefaultValue(2)] int? id) => { }, (JsonNode defaultValue) => Assert.Equal(2, defaultValue.GetValue<int>())],
+        [([DefaultValue(null)] string? id) => { }, (JsonNode defaultValue) => Assert.True(defaultValue is null)],
+        [([DefaultValue("foo")] string? id) => { }, (JsonNode defaultValue) => Assert.Equal("foo", defaultValue.GetValue<string>())],
+        [([DefaultValue(null)] TaskStatus? status) => { }, (JsonNode defaultValue) => Assert.True(defaultValue is null)],
+        [([DefaultValue(TaskStatus.Canceled)] TaskStatus? status) => { }, (JsonNode defaultValue) => Assert.Equal(6, defaultValue.GetValue<int>())],
     ];
 
     [Theory]
     [MemberData(nameof(RouteParametersWithDefaultValues))]
-    public async Task GetOpenApiParameters_HandlesRouteParametersWithDefaultValue(Delegate requestHandler, Action<IOpenApiAny> assert)
+    public async Task GetOpenApiParameters_HandlesRouteParametersWithDefaultValue(Delegate requestHandler, Action<JsonNode> assert)
     {
         // Arrange
         var builder = CreateBuilder();
@@ -189,10 +190,10 @@ public async Task GetOpenApiParameters_HandlesRouteParametersWithDefaultValue(De
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/{id}"].Operations[OperationType.Post];
-            var parameter = Assert.Single(operation.Parameters);
-            var openApiDefault = parameter.Schema.Default;
-            assert(openApiDefault);
+            var operation = document.Paths!["/api/{id}"].Operations![HttpMethod.Post];
+            var parameter = Assert.Single(operation.Parameters ?? []);
+            var openApiDefault = parameter.Schema!.Default;
+            assert(openApiDefault!);
         });
     }
 #nullable restore
@@ -210,10 +211,10 @@ public async Task GetOpenApiParameters_HandlesEnumParameterWithoutConverter()
         // consumed as integer
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
-            Assert.Equal("integer", parameter.Schema.Type);
-            Assert.Empty(parameter.Schema.Enum);
+            Assert.Equal(JsonSchemaType.Integer, parameter.Schema.Type);
+            Assert.Null(parameter.Schema.Enum);
         });
     }
 
@@ -230,24 +231,21 @@ public async Task GetOpenApiParameters_HandlesEnumParameterWithConverter()
         // are serialized with the `enum` value in the schema.
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
             Assert.Null(parameter.Schema.Type);
             Assert.Collection(parameter.Schema.Enum,
             value =>
             {
-                var openApiString = Assert.IsType<OpenApiString>(value);
-                Assert.Equal("Pending", openApiString.Value);
+                Assert.Equal("Pending", value.GetValue<string>());
             },
             value =>
             {
-                var openApiString = Assert.IsType<OpenApiString>(value);
-                Assert.Equal("Approved", openApiString.Value);
+                Assert.Equal("Approved", value.GetValue<string>());
             },
             value =>
             {
-                var openApiString = Assert.IsType<OpenApiString>(value);
-                Assert.Equal("Rejected", openApiString.Value);
+                Assert.Equal("Rejected", value.GetValue<string>());
             });
         });
     }
@@ -259,22 +257,22 @@ public async Task GetOpenApiParameters_HandlesRouteParameterFromAsParameters()
         var builder = CreateBuilder();
 
         // Act
-        builder.MapGet("/api/{id}/{date}", ([AsParameters] RouteParamsContainer routeParams) => {});
+        builder.MapGet("/api/{id}/{date}", ([AsParameters] RouteParamsContainer routeParams) => { });
 
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/{id}/{date}"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/{id}/{date}"].Operations[HttpMethod.Get];
             Assert.Collection(operation.Parameters, parameter =>
             {
                 Assert.Equal("id", parameter.Name);
-                Assert.Equal("string", parameter.Schema.Type);
+                Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
                 Assert.Equal("uuid", parameter.Schema.Format);
             },
             parameter =>
             {
                 Assert.Equal("date", parameter.Name);
-                Assert.Equal("string", parameter.Schema.Type);
+                Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
                 Assert.Equal("date-time", parameter.Schema.Format);
             });
         });
@@ -289,17 +287,17 @@ public async Task GetOpenApiParameters_HandlesRouteParametersWithMvcModelBinding
         // Assert
         await VerifyOpenApiDocument(action, document =>
         {
-            var operation = document.Paths["/api/{id}/{date}"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/{id}/{date}"].Operations[HttpMethod.Get];
             Assert.Collection(operation.Parameters, parameter =>
             {
                 Assert.Equal("Id", parameter.Name);
-                Assert.Equal("string", parameter.Schema.Type);
+                Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
                 Assert.Equal("uuid", parameter.Schema.Format);
             },
             parameter =>
             {
                 Assert.Equal("Date", parameter.Name);
-                Assert.Equal("string", parameter.Schema.Type);
+                Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
                 Assert.Equal("date-time", parameter.Schema.Format);
             });
         });
@@ -314,17 +312,17 @@ public async Task GetOpenApiParameters_HandlesRouteParametersWithValidationsInMv
         // Assert
         await VerifyOpenApiDocument(action, document =>
         {
-            var operation = document.Paths["/api/{id}/{name}"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/{id}/{name}"].Operations[HttpMethod.Get];
             Assert.Collection(operation.Parameters, parameter =>
             {
                 Assert.Equal("Id", parameter.Name);
-                Assert.Equal("string", parameter.Schema.Type);
+                Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
                 Assert.Equal("uuid", parameter.Schema.Format);
             },
             parameter =>
             {
                 Assert.Equal("Name", parameter.Name);
-                Assert.Equal("string", parameter.Schema.Type);
+                Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
                 Assert.Equal(5, parameter.Schema.MaxLength);
             });
         });
@@ -337,13 +335,16 @@ await VerifyOpenApiDocument(action, document =>
         [([MaxLength(5)] int[] ids) => {}, (OpenApiSchema schema) => Assert.Equal(5, schema.MaxItems)],
         [([MinLength(2)] int[] id) => {}, (OpenApiSchema schema) => Assert.Equal(2, schema.MinItems)],
         [([Length(4, 8)] int[] id) => {}, (OpenApiSchema schema) => { Assert.Equal(4, schema.MinItems); Assert.Equal(8, schema.MaxItems); }],
-        [([Range(4, 8)]int id) => {}, (OpenApiSchema schema) => { Assert.Equal(4, schema.Minimum); Assert.Equal(8, schema.Maximum); }],
+        [([Range(4, 8)]int id) => {}, (OpenApiSchema schema) => { Assert.Equal("4", schema.Minimum); Assert.Equal("8", schema.Maximum); }],
+        [([Range(1234, 5678)]int id) => {}, (OpenApiSchema schema) => { Assert.Equal("1234", schema.Minimum); Assert.Equal("5678", schema.Maximum); }],
+        [([Range(1234.56, 7891.1)] decimal id) => {}, (OpenApiSchema schema) => { Assert.Equal("1234.56", schema.Minimum); Assert.Equal("7891.1", schema.Maximum); }],
+        [([Range(typeof(DateTime), "2024-02-01", "2024-02-031")] DateTime id) => {}, (OpenApiSchema schema) => { Assert.Null(schema.Minimum); Assert.Null(schema.Maximum); }],
         [([StringLength(10)] string name) => {}, (OpenApiSchema schema) => { Assert.Equal(10, schema.MaxLength); Assert.Equal(0, schema.MinLength); }],
         [([StringLength(10, MinimumLength = 5)] string name) => {}, (OpenApiSchema schema) => { Assert.Equal(10, schema.MaxLength); Assert.Equal(5, schema.MinLength); }],
-        [([Url] string url) => {}, (OpenApiSchema schema) => { Assert.Equal("string", schema.Type); Assert.Equal("uri", schema.Format); }],
+        [([Url] string url) => {}, (OpenApiSchema schema) => { Assert.Equal(JsonSchemaType.String, schema.Type); Assert.Equal("uri", schema.Format); }],
         // Check that multiple attributes get applied correctly
-        [([Url][StringLength(10)] string url) => {}, (OpenApiSchema schema) => { Assert.Equal("string", schema.Type); Assert.Equal("uri", schema.Format); Assert.Equal(10, schema.MaxLength); }],
-        [([Base64String] string base64string) => {}, (OpenApiSchema schema) => { Assert.Equal("string", schema.Type); Assert.Equal("byte", schema.Format); }],
+        [([Url][StringLength(10)] string url) => {}, (OpenApiSchema schema) => { Assert.Equal(JsonSchemaType.String, schema.Type); Assert.Equal("uri", schema.Format); Assert.Equal(10, schema.MaxLength); }],
+        [([Base64String] string base64string) => {}, (OpenApiSchema schema) => { Assert.Equal(JsonSchemaType.String, schema.Type); Assert.Equal("byte", schema.Format); }],
     ];
 
     [Theory]
@@ -359,9 +360,69 @@ public async Task GetOpenApiParameters_HandlesRouteParameterWithValidationAttrib
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api/{id}"].Operations[OperationType.Get];
+            var operation = document.Paths["/api/{id}"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
-            verifySchema(parameter.Schema);
+            var schema = Assert.IsType<OpenApiSchema>(parameter.Schema);
+            verifySchema(schema);
+        });
+    }
+
+    public static object[][] RouteParametersWithRangeAttributes =>
+    [
+        [([Range(4, 8)] int id) => {}, (OpenApiSchema schema) => { Assert.Equal("4", schema.Minimum); Assert.Equal("8", schema.Maximum); }],
+        [([Range(int.MinValue, int.MaxValue)] int id) => {}, (OpenApiSchema schema) => { Assert.Equal(int.MinValue.ToString(CultureInfo.InvariantCulture), schema.Minimum); Assert.Equal(int.MaxValue.ToString(CultureInfo.InvariantCulture), schema.Maximum); }],
+        [([Range(0, double.MaxValue)] double id) => {}, (OpenApiSchema schema) => { Assert.Equal("0", schema.Minimum); Assert.Null(schema.Maximum); }],
+        [([Range(typeof(double), "0", "1.79769313486232E+308")] double id) => {}, (OpenApiSchema schema) => { Assert.Equal("0", schema.Minimum); Assert.Null(schema.Maximum); }],
+        [([Range(typeof(long), "-9223372036854775808", "9223372036854775807")] long id) => {}, (OpenApiSchema schema) => { Assert.Equal(long.MinValue.ToString(CultureInfo.InvariantCulture), schema.Minimum); Assert.Equal(long.MaxValue.ToString(CultureInfo.InvariantCulture), schema.Maximum); }],
+        [([Range(typeof(DateTime), "2024-02-01", "2024-02-031")] DateTime id) => {}, (OpenApiSchema schema) => { Assert.Null(schema.Minimum); Assert.Null(schema.Maximum); }],
+    ];
+
+    [Theory]
+    [MemberData(nameof(RouteParametersWithRangeAttributes))]
+    public async Task GetOpenApiParameters_HandlesRouteParametersWithRangeAttributes(Delegate requestHandler, Action<OpenApiSchema> verifySchema)
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapGet("/api/{id}", requestHandler);
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api/{id}"].Operations[HttpMethod.Get];
+            var parameter = Assert.Single(operation.Parameters);
+            var schema = Assert.IsType<OpenApiSchema>(parameter.Schema);
+            verifySchema(schema);
+        });
+    }
+
+    public static object[][] RouteParametersWithRangeAttributes_CultureInfo =>
+    [
+        [([Range(typeof(DateTime), "2024-02-01", "2024-02-031")] DateTime id) => {}, (OpenApiSchema schema) => { Assert.Null(schema.Minimum); Assert.Null(schema.Maximum); }],
+        [([Range(typeof(decimal), "1,99", "3,99")] decimal id) => {}, (OpenApiSchema schema) => { Assert.Equal("1.99", schema.Minimum); Assert.Equal("3.99", schema.Maximum); }],
+        [([Range(typeof(decimal), "1,99", "3,99", ParseLimitsInInvariantCulture = true)] decimal id) => {}, (OpenApiSchema schema) => { Assert.Equal("199", schema.Minimum); Assert.Equal("399", schema.Maximum); }],
+        [([Range(1000, 2000)] int id) => {}, (OpenApiSchema schema) => { Assert.Equal("1000", schema.Minimum); Assert.Equal("2000", schema.Maximum); }]
+    ];
+
+    [Theory]
+    [MemberData(nameof(RouteParametersWithRangeAttributes_CultureInfo))]
+    [UseCulture("fr-FR")]
+    public async Task GetOpenApiParameters_HandlesRouteParametersWithRangeAttributes_CultureInfo(Delegate requestHandler, Action<OpenApiSchema> verifySchema)
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapGet("/api/{id}", requestHandler);
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api/{id}"].Operations[HttpMethod.Get];
+            var parameter = Assert.Single(operation.Parameters);
+            var schema = Assert.IsType<OpenApiSchema>(parameter.Schema);
+            verifySchema(schema);
         });
     }
 
@@ -383,29 +444,36 @@ await VerifyOpenApiDocument(builder, document =>
         {
             foreach (var path in document.Paths.Values)
             {
-                var operation = path.Operations[OperationType.Get];
+                var operation = path.Operations[HttpMethod.Get];
                 var parameter = Assert.Single(operation.Parameters);
                 Assert.True(parameter.Required);
             }
         });
     }
 
+#nullable enable
     public static object[][] ArrayBasedQueryParameters =>
     [
-        [(int[] id) => { }, "integer", false],
-        [(int?[] id) => { }, "integer", true],
-        [(Guid[] id) => { }, "string", false],
-        [(Guid?[] id) => { }, "string", true],
-        [(DateTime[] id) => { }, "string", false],
-        [(DateTime?[] id) => { }, "string", true],
-        [(DateTimeOffset[] id) => { }, "string", false],
-        [(DateTimeOffset?[] id) => { }, "string", true],
-        [(Uri[] id) => { }, "string", false],
+        [(int[] id) => { }, JsonSchemaType.Integer, false],
+        [(int?[] id) => { }, JsonSchemaType.Integer, true],
+        [(Guid[] id) => { }, JsonSchemaType.String, false],
+        [(Guid?[] id) => { }, JsonSchemaType.String, true],
+        [(string[] id) => { }, JsonSchemaType.String, false],
+        // Due to runtime restrictions, we can't resolve nullability
+        // info for reference types as element types so this will still
+        // encode as non-nullable.
+        [(string?[] id) => { }, JsonSchemaType.String, false],
+        [(DateTime[] id) => { }, JsonSchemaType.String, false],
+        [(DateTime?[] id) => { }, JsonSchemaType.String, true],
+        [(DateTimeOffset[] id) => { }, JsonSchemaType.String, false],
+        [(DateTimeOffset?[] id) => { }, JsonSchemaType.String, true],
+        [(Uri[] id) => { }, JsonSchemaType.String, false],
     ];
+#nullable restore
 
     [Theory]
     [MemberData(nameof(ArrayBasedQueryParameters))]
-    public async Task GetOpenApiParameters_HandlesArrayBasedTypes(Delegate requestHandler, string innerSchemaType, bool isNullable)
+    public async Task GetOpenApiParameters_HandlesArrayBasedTypes(Delegate requestHandler, JsonSchemaType innerSchemaType, bool isNullable)
     {
         // Arrange
         var builder = CreateBuilder();
@@ -416,16 +484,17 @@ public async Task GetOpenApiParameters_HandlesArrayBasedTypes(Delegate requestHa
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
-            Assert.Equal("array", parameter.Schema.Type);
-            Assert.Equal(innerSchemaType, parameter.Schema.Items.Type);
             // Array items can be serialized to nullable values when the element
             // type is nullable. For example, array-of-ints?ints=1&ints=2&ints=&ints=4
             // will produce [1, 2, null, 4] when the parameter is int?[] ints.
             // When the element type is not nullable (int[] ints), the binding
             // will produce [1, 2, 0, 4]
-            Assert.Equal(isNullable, parameter.Schema.Items.Nullable);
+            Assert.Equal(JsonSchemaType.Array, parameter.Schema.Type);
+
+            Assert.True(parameter.Schema.Items.Type?.HasFlag(innerSchemaType));
+            Assert.Equal(isNullable, parameter.Schema.Items.Type?.HasFlag(JsonSchemaType.Null));
         });
     }
 
@@ -441,12 +510,92 @@ public async Task GetOpenApiParameters_HandlesParametersWithDescriptionAttribute
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var parameter = Assert.Single(operation.Parameters);
             Assert.Equal("The ID of the entity", parameter.Description);
         });
     }
 
+    [Fact]
+    public async Task GetOpenApiParameters_HandlesAsParametersParametersWithDescriptionAttribute()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapGet("/api", ([AsParameters] FromQueryModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
+            Assert.Contains(operation.Parameters, actualMemory => actualMemory.Name == "id" && actualMemory.Description == "The ID of the entity");
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiParameters_HandlesFromQueryParametersWithDescriptionAttribute()
+    {
+        // Arrange
+        var actionDescriptor = CreateActionDescriptor(nameof(TestFromQueryController.GetWithFromQueryDto), typeof(TestFromQueryController));
+
+        // Assert
+        await VerifyOpenApiDocument(actionDescriptor, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
+            Assert.Contains(operation.Parameters, actualMemory => actualMemory.Name == "id" && actualMemory.Description == "The ID of the entity");
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiParameters_HandlesAsParametersParametersWithDefaultValueAttribute()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapGet("/api", ([AsParameters] FromQueryModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
+            Assert.Contains(
+                operation.Parameters,
+                actualMemory =>
+                {
+                    return actualMemory.Name == "limit" &&
+                           actualMemory.Schema != null &&
+                           actualMemory.Schema.Default != null &&
+                           actualMemory.Schema.Default.GetValueKind() == JsonValueKind.Number &&
+                           actualMemory.Schema.Default.GetValue<int>() == 20;
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiParameters_HandlesFromQueryParametersWithDefaultValueAttribute()
+    {
+        // Arrange
+        var actionDescriptor = CreateActionDescriptor(nameof(TestFromQueryController.GetWithFromQueryDto), typeof(TestFromQueryController));
+
+        // Assert
+        await VerifyOpenApiDocument(actionDescriptor, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
+            Assert.Contains(
+                operation.Parameters,
+                actualMemory =>
+                {
+                    return actualMemory.Name == "limit" &&
+                           actualMemory.Schema != null &&
+                           actualMemory.Schema.Default != null &&
+                           actualMemory.Schema.Default.GetValueKind() == JsonValueKind.Number &&
+                           actualMemory.Schema.Default.GetValue<int>() == 20;
+                });
+        });
+    }
+
     [Route("/api/{id}/{date}")]
     private void AcceptsParametersInModel(RouteParamsContainer model) { }
 
@@ -489,7 +638,7 @@ public async Task SupportsParametersWithTypeConverter()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             Assert.NotNull(operation.RequestBody.Content["application/json"]);
@@ -527,7 +676,7 @@ public async Task SupportsParameterWithDynamicType()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.NotNull(operation.RequestBody.Content);
             Assert.NotNull(operation.RequestBody.Content["application/json"]);
@@ -537,4 +686,329 @@ await VerifyOpenApiDocument(builder, document =>
             Assert.Null(operation.RequestBody.Content["application/json"].Schema.Type);
         });
     }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task SupportsParameterWithEnumType(bool useAction)
+    {
+        // Arrange
+        if (!useAction)
+        {
+            var builder = CreateBuilder();
+            builder.MapGet("/api/with-enum", (Status status) => status);
+            await VerifyOpenApiDocument(builder, AssertOpenApiDocument);
+        }
+        else
+        {
+            var action = CreateActionDescriptor(nameof(GetItemStatus));
+            await VerifyOpenApiDocument(action, AssertOpenApiDocument);
+        }
+
+        static void AssertOpenApiDocument(OpenApiDocument document)
+        {
+            var operation = document.Paths["/api/with-enum"].Operations[HttpMethod.Get];
+            var parameter = Assert.Single(operation.Parameters);
+            var response = Assert.Single(operation.Responses).Value.Content["application/json"].Schema;
+            Assert.Equal(((OpenApiSchemaReference)parameter.Schema).Reference.Id, ((OpenApiSchemaReference)response).Reference.Id);
+            var schema = parameter.Schema;
+            Assert.Collection(schema.Enum,
+            value =>
+            {
+                Assert.Equal("Pending", value.GetValue<string>());
+            },
+            value =>
+            {
+                Assert.Equal("Approved", value.GetValue<string>());
+            },
+            value =>
+            {
+                Assert.Equal("Rejected", value.GetValue<string>());
+            });
+        }
+    }
+
+    [Route("/api/with-enum")]
+    private Status GetItemStatus([FromQuery] Status status) => status;
+
+    [Fact]
+    public async Task SupportsMvcActionWithAmbientRouteParameter()
+    {
+        // Arrange
+        var action = CreateActionDescriptor(nameof(AmbientRouteParameter));
+
+        // Assert
+        await VerifyOpenApiDocument(action, document =>
+        {
+            var operation = document.Paths["/api/with-ambient-route-param/{versionId}"].Operations[HttpMethod.Get];
+            var parameter = Assert.Single(operation.Parameters);
+            Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
+        });
+    }
+
+    [Route("/api/with-ambient-route-param/{versionId}")]
+    private void AmbientRouteParameter() { }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task SupportsRouteParameterWithCustomTryParse(bool useAction)
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        if (!useAction)
+        {
+            builder.MapGet("/api/{student}", (Student student) => student);
+            await VerifyOpenApiDocument(builder, AssertOpenApiDocument);
+        }
+        else
+        {
+            var action = CreateActionDescriptor(nameof(GetStudent));
+            await VerifyOpenApiDocument(action, AssertOpenApiDocument);
+        }
+
+        // Assert
+        static void AssertOpenApiDocument(OpenApiDocument document)
+        {
+            // Parameter is a plain-old string when it comes from the route or query
+            var operation = document.Paths["/api/{student}"].Operations[HttpMethod.Get];
+            var parameter = Assert.Single(operation.Parameters);
+            Assert.Equal(JsonSchemaType.String, parameter.Schema.Type);
+
+            // Type is fully serialized in the response
+            var response = Assert.Single(operation.Responses).Value;
+            Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Collection(schema.Properties, property =>
+            {
+                Assert.Equal("name", property.Key);
+                Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+            });
+        }
+    }
+
+    [Route("/api/{student}")]
+    private Student GetStudent(Student student) => student;
+
+    public record Student(string Name)
+    {
+        public static bool TryParse(string value, out Student result)
+        {
+            if (value is null)
+            {
+                result = null;
+                return false;
+            }
+
+            result = new Student(value);
+            return true;
+        }
+    }
+
+    // Regression test for https://github.com/dotnet/aspnetcore/issues/62023
+    // Testing that the array parsing in our OpenApiJsonSchema works
+    [Fact]
+    public async Task CustomConverterThatOutputsArrayWithDefaultValue()
+    {
+        // Arrange
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.ConfigureHttpJsonOptions(options =>
+        {
+            options.SerializerOptions.Converters.Add(new EnumArrayTypeConverter());
+        });
+        var builder = CreateBuilder(serviceCollection);
+
+        // Act
+        builder.MapPost("/api", (EnumArrayType e = EnumArrayType.None) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var param = Assert.Single(operation.Parameters);
+            Assert.NotNull(param.Schema);
+            Assert.IsType<JsonArray>(param.Schema.Default);
+            // Type is null, it's up to the user to configure this via a custom schema
+            // transformer for types with a converter.
+            Assert.Null(param.Schema.Type);
+        });
+    }
+
+    [Fact]
+    public async Task CustomConverterThatOutputsObjectWithDefaultValue()
+    {
+        // Arrange
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.ConfigureHttpJsonOptions(options =>
+        {
+            options.SerializerOptions.Converters.Add(new EnumObjectTypeConverter());
+        });
+        var builder = CreateBuilder(serviceCollection);
+
+        // Act
+        builder.MapPost("/api", (EnumArrayType e = EnumArrayType.None) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var param = Assert.Single(operation.Parameters);
+            Assert.NotNull(param.Schema);
+            Assert.IsType<JsonObject>(param.Schema.Default);
+            // Type is null, it's up to the user to configure this via a custom schema
+            // transformer for types with a converter.
+            Assert.Null(param.Schema.Type);
+        });
+    }
+
+    public enum EnumArrayType
+    {
+        None = 1
+    }
+
+    public class EnumArrayTypeConverter : JsonConverter<EnumArrayType>
+    {
+        public override EnumArrayType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new EnumArrayType();
+        }
+
+        public override void Write(Utf8JsonWriter writer, EnumArrayType value, JsonSerializerOptions options)
+        {
+            writer.WriteStartArray();
+            writer.WriteEndArray();
+        }
+    }
+
+    public class EnumObjectTypeConverter : JsonConverter<EnumArrayType>
+    {
+        public override EnumArrayType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new EnumArrayType();
+        }
+
+        public override void Write(Utf8JsonWriter writer, EnumArrayType value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+            writer.WriteEndObject();
+        }
+    }
+
+    [Fact]
+    public async Task GetOpenApiParameters_HandlesNullableComplexTypesWithNullInType()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        builder.MapPost("/api/nullable-todo", (Todo? todo) => { });
+        builder.MapPost("/api/nullable-account", (Account? account) => { });
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable Todo parameter uses null in type directly
+            var todoOperation = document.Paths["/api/nullable-todo"].Operations[HttpMethod.Post];
+            var todoRequestBody = todoOperation.RequestBody;
+            var todoContent = Assert.Single(todoRequestBody.Content);
+            Assert.Equal("application/json", todoContent.Key);
+            var todoSchema = todoContent.Value.Schema;
+
+            // For complex types, check if it has both null and the reference type
+            if (todoSchema.OneOf != null)
+            {
+                // If it now uses oneOf, verify the structure
+                Assert.Equal(2, todoSchema.OneOf.Count);
+                Assert.Collection(todoSchema.OneOf,
+                    item =>
+                    {
+                        Assert.NotNull(item);
+                        Assert.Equal(JsonSchemaType.Null, item.Type);
+                    },
+                    item =>
+                    {
+                        Assert.NotNull(item);
+                        Assert.Equal("Todo", ((OpenApiSchemaReference)item).Reference.Id);
+                    });
+            }
+            else
+            {
+                // If it uses direct type, verify null is included
+                Assert.True(todoSchema.Type?.HasFlag(JsonSchemaType.Null));
+            }
+
+            // Verify nullable Account parameter
+            var accountOperation = document.Paths["/api/nullable-account"].Operations[HttpMethod.Post];
+            var accountRequestBody = accountOperation.RequestBody;
+            var accountContent = Assert.Single(accountRequestBody.Content);
+            Assert.Equal("application/json", accountContent.Key);
+            var accountSchema = accountContent.Value.Schema;
+
+            if (accountSchema.OneOf != null)
+            {
+                // If it now uses oneOf, verify the structure
+                Assert.Equal(2, accountSchema.OneOf.Count);
+                Assert.Collection(accountSchema.OneOf,
+                    item =>
+                    {
+                        Assert.NotNull(item);
+                        Assert.Equal(JsonSchemaType.Null, item.Type);
+                    },
+                    item =>
+                    {
+                        Assert.NotNull(item);
+                        Assert.Equal("Account", ((OpenApiSchemaReference)item).Reference.Id);
+                    });
+            }
+            else
+            {
+                // If it uses direct type, verify null is included
+                Assert.True(accountSchema.Type?.HasFlag(JsonSchemaType.Null));
+            }
+
+            // Verify component schemas are created for Todo and Account
+            Assert.Contains("Todo", document.Components.Schemas.Keys);
+            Assert.Contains("Account", document.Components.Schemas.Keys);
+        });
+    }
+
+    [ApiController]
+    [Route("[controller]/[action]")]
+    private class TestFromQueryController : ControllerBase
+    {
+        [HttpGet]
+        public Task<IActionResult> GetWithFromQueryDto([FromQuery] FromQueryModel query)
+        {
+            return Task.FromResult<IActionResult>(Ok());
+        }
+    }
+
+    [Description("A query model.")]
+    private record FromQueryModel
+    {
+        [Description("The ID of the entity")]
+        [FromQuery(Name = "id")]
+        public int Id { get; set; }
+
+        [Description("The maximum number of results")]
+        [FromQuery(Name = "limit")]
+        [DefaultValue(20)]
+        public int Limit { get; set; }
+    }
+
+#nullable enable
+    private record NullableParamsModel
+    {
+        [FromQuery(Name = "name")]
+        public string? Name { get; set; }
+
+        [FromQuery(Name = "id")]
+        public int? Id { get; set; }
+    }
+#nullable restore
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PolymorphicSchemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PolymorphicSchemas.cs
index ef41ea862c83..efe7da599f0f 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PolymorphicSchemas.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PolymorphicSchemas.cs
@@ -1,9 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiSchemaServiceTests : OpenApiDocumentServiceTestBase
 {
@@ -19,11 +18,11 @@ public async Task HandlesPolymorphicTypeWithMappingsAndStringDiscriminator()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings have been configured correctly
             Assert.Equal("$type", schema.Discriminator.PropertyName);
             Assert.Contains(schema.Discriminator.PropertyName, schema.Required);
@@ -32,15 +31,15 @@ await VerifyOpenApiDocument(builder, document =>
                 item => Assert.Equal("square", item.Key)
             );
             Assert.Collection(schema.Discriminator.Mapping,
-                item => Assert.Equal("#/components/schemas/ShapeTriangle", item.Value),
-                item => Assert.Equal("#/components/schemas/ShapeSquare", item.Value)
+                item => Assert.Equal("#/components/schemas/ShapeTriangle", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/ShapeSquare", item.Value.Reference.ReferenceV3)
             );
             // Assert the schemas with the discriminator have been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("ShapeTriangle", out var triangleSchema));
             Assert.Contains(schema.Discriminator.PropertyName, triangleSchema.Properties.Keys);
-            Assert.Equal("triangle", ((OpenApiString)triangleSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("triangle", triangleSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             Assert.True(document.Components.Schemas.TryGetValue("ShapeSquare", out var squareSchema));
-            Assert.Equal("square", ((OpenApiString)squareSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("square", squareSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
         });
     }
 
@@ -56,11 +55,11 @@ public async Task HandlesPolymorphicTypeWithMappingsAndIntegerDiscriminator()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings have been configured correctly
             Assert.Equal("$type", schema.Discriminator.PropertyName);
             Assert.Contains(schema.Discriminator.PropertyName, schema.Required);
@@ -70,22 +69,22 @@ await VerifyOpenApiDocument(builder, document =>
                 item => Assert.Equal("2", item.Key)
             );
             Assert.Collection(schema.Discriminator.Mapping,
-                item => Assert.Equal("#/components/schemas/WeatherForecastBaseWeatherForecastWithCity", item.Value),
-                item => Assert.Equal("#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries", item.Value),
-                item => Assert.Equal("#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews", item.Value)
+                item => Assert.Equal("#/components/schemas/WeatherForecastBaseWeatherForecastWithCity", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/WeatherForecastBaseWeatherForecastWithTimeSeries", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/WeatherForecastBaseWeatherForecastWithLocalNews", item.Value.Reference.ReferenceV3)
             );
             // Assert schema with discriminator = 0 has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("WeatherForecastBaseWeatherForecastWithCity", out var citySchema));
             Assert.Contains(schema.Discriminator.PropertyName, citySchema.Properties.Keys);
-            Assert.Equal(0, ((OpenApiInteger)citySchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal(0, citySchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<int>());
             // Assert schema with discriminator = 1 has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("WeatherForecastBaseWeatherForecastWithTimeSeries", out var timeSeriesSchema));
             Assert.Contains(schema.Discriminator.PropertyName, timeSeriesSchema.Properties.Keys);
-            Assert.Equal(1, ((OpenApiInteger)timeSeriesSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal(1, timeSeriesSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<int>());
             // Assert schema with discriminator = 2 has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("WeatherForecastBaseWeatherForecastWithLocalNews", out var newsSchema));
             Assert.Contains(schema.Discriminator.PropertyName, newsSchema.Properties.Keys);
-            Assert.Equal(2, ((OpenApiInteger)newsSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal(2, newsSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<int>());
         });
     }
 
@@ -101,11 +100,11 @@ public async Task HandlesPolymorphicTypesWithCustomPropertyName()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings have been configured correctly
             Assert.Equal("discriminator", schema.Discriminator.PropertyName);
             Assert.Contains(schema.Discriminator.PropertyName, schema.Required);
@@ -114,17 +113,17 @@ await VerifyOpenApiDocument(builder, document =>
                 item => Assert.Equal("teacher", item.Key)
             );
             Assert.Collection(schema.Discriminator.Mapping,
-                item => Assert.Equal("#/components/schemas/PersonStudent", item.Value),
-                item => Assert.Equal("#/components/schemas/PersonTeacher", item.Value)
+                item => Assert.Equal("#/components/schemas/PersonStudent", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/PersonTeacher", item.Value.Reference.ReferenceV3)
             );
             // Assert schema with discriminator = 0 has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("PersonStudent", out var citySchema));
             Assert.Contains(schema.Discriminator.PropertyName, citySchema.Properties.Keys);
-            Assert.Equal("student", ((OpenApiString)citySchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("student", citySchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             // Assert schema with discriminator = 1 has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("PersonTeacher", out var timeSeriesSchema));
             Assert.Contains(schema.Discriminator.PropertyName, timeSeriesSchema.Properties.Keys);
-            Assert.Equal("teacher", ((OpenApiString)timeSeriesSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("teacher", timeSeriesSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
         });
     }
 
@@ -140,27 +139,27 @@ public async Task HandlesPolymorphicTypesWithNonAbstractBaseClassWithNoDiscrimin
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings are not configured for this type since we
             // can't meet OpenAPI's restrictions that derived types _always_ have a discriminator
             // property associated with them.
             Assert.Null(schema.Discriminator);
             Assert.Collection(schema.AnyOf,
-                schema => Assert.Equal("ColorPaintColor", schema.Reference.Id),
-                schema => Assert.Equal("ColorFabricColor", schema.Reference.Id),
-                schema => Assert.Equal("ColorBase", schema.Reference.Id));
+                schema => Assert.Equal("ColorPaintColor", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("ColorFabricColor", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("ColorBase", ((OpenApiSchemaReference)schema).Reference.Id));
             // Assert schema with discriminator = "paint" has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("ColorPaintColor", out var paintSchema));
             Assert.Contains("$type", paintSchema.Properties.Keys);
-            Assert.Equal("paint", ((OpenApiString)paintSchema.Properties["$type"].Enum.First()).Value);
+            Assert.Equal("paint", paintSchema.Properties["$type"].Enum.First().GetValue<string>());
             // Assert schema with discriminator = "fabric" has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("ColorFabricColor", out var fabricSchema));
             Assert.Contains("$type", fabricSchema.Properties.Keys);
-            Assert.Equal("fabric", ((OpenApiString)fabricSchema.Properties["$type"].Enum.First()).Value);
+            Assert.Equal("fabric", fabricSchema.Properties["$type"].Enum.First().GetValue<string>());
             // Assert that schema for `Color` has been inserted into the components without a discriminator
             Assert.True(document.Components.Schemas.TryGetValue("ColorBase", out var colorSchema));
             Assert.DoesNotContain("$type", colorSchema.Properties.Keys);
@@ -179,11 +178,11 @@ public async Task HandlesPolymorphicTypesWithNonAbstractBaseClassAndDiscriminato
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings have been configured correctly
             Assert.Equal("$type", schema.Discriminator.PropertyName);
             Assert.Collection(schema.Discriminator.Mapping,
@@ -192,9 +191,9 @@ await VerifyOpenApiDocument(builder, document =>
                 item => Assert.Equal("pet", item.Key)
             );
             Assert.Collection(schema.Discriminator.Mapping,
-                item => Assert.Equal("#/components/schemas/PetCat", item.Value),
-                item => Assert.Equal("#/components/schemas/PetDog", item.Value),
-                item => Assert.Equal("#/components/schemas/PetPet", item.Value)
+                item => Assert.Equal("#/components/schemas/PetCat", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/PetDog", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/PetPet", item.Value.Reference.ReferenceV3)
             );
             // OpenAPI requires that derived types in a polymorphic schema _always_ have a discriminator
             // property associated with them. STJ permits the discriminator to be omitted from the
@@ -202,21 +201,21 @@ await VerifyOpenApiDocument(builder, document =>
             // type. In this scenario, we check that the base class is not included in the `anyOf`
             // schema.
             Assert.Collection(schema.AnyOf,
-                schema => Assert.Equal("PetCat", schema.Reference.Id),
-                schema => Assert.Equal("PetDog", schema.Reference.Id),
-                schema => Assert.Equal("PetPet", schema.Reference.Id));
+                schema => Assert.Equal("PetCat", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("PetDog", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("PetPet", ((OpenApiSchemaReference)schema).Reference.Id));
             // Assert schema with discriminator = "dog" has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("PetDog", out var dogSchema));
             Assert.Contains(schema.Discriminator.PropertyName, dogSchema.Properties.Keys);
-            Assert.Equal("dog", ((OpenApiString)dogSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("dog", dogSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             // Assert schema with discriminator = "cat" has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("PetCat", out var catSchema));
             Assert.Contains(schema.Discriminator.PropertyName, catSchema.Properties.Keys);
-            Assert.Equal("cat", ((OpenApiString)catSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("cat", catSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             // Assert schema with discriminator = "cat" has been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("PetPet", out var petSchema));
             Assert.Contains(schema.Discriminator.PropertyName, petSchema.Properties.Keys);
-            Assert.Equal("pet", ((OpenApiString)petSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("pet", petSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
         });
     }
 
@@ -232,19 +231,19 @@ public async Task HandlesPolymorphicTypesWithNoExplicitDiscriminators()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
+            var schema = mediaType.Schema;
             // Assert discriminator mappings are not configured for this type since we
             // can't meet OpenAPI's restrictions that derived types _always_ have a discriminator
             // property associated with them.
             Assert.Null(schema.Discriminator);
             Assert.Collection(schema.AnyOf,
-                schema => Assert.Equal("OrganismAnimal", schema.Reference.Id),
-                schema => Assert.Equal("OrganismPlant", schema.Reference.Id),
-                schema => Assert.Equal("OrganismBase", schema.Reference.Id));
+                schema => Assert.Equal("OrganismAnimal", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("OrganismPlant", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("OrganismBase", ((OpenApiSchemaReference)schema).Reference.Id));
             // Assert that schemas without discriminators have been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("OrganismAnimal", out var animalSchema));
             Assert.DoesNotContain("$type", animalSchema.Properties.Keys);
@@ -267,12 +266,12 @@ public async Task HandlesPolymorphicTypesWithSelfReference()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            Assert.Equal("Employee", mediaType.Schema.Reference.Id);
-            var schema = mediaType.Schema.GetEffective(document);
+            Assert.Equal("Employee", ((OpenApiSchemaReference)mediaType.Schema).Reference.Id);
+            var schema = mediaType.Schema;
             // Assert that discriminator mappings are configured correctly for type.
             Assert.Equal("$type", schema.Discriminator.PropertyName);
             Assert.Collection(schema.Discriminator.Mapping,
@@ -280,20 +279,20 @@ await VerifyOpenApiDocument(builder, document =>
                 item => Assert.Equal("employee", item.Key)
             );
             Assert.Collection(schema.Discriminator.Mapping,
-                item => Assert.Equal("#/components/schemas/EmployeeManager", item.Value),
-                item => Assert.Equal("#/components/schemas/EmployeeEmployee", item.Value)
+                item => Assert.Equal("#/components/schemas/EmployeeManager", item.Value.Reference.ReferenceV3),
+                item => Assert.Equal("#/components/schemas/EmployeeEmployee", item.Value.Reference.ReferenceV3)
             );
             // Assert that anyOf schemas use the correct reference IDs.
             Assert.Collection(schema.AnyOf,
-                schema => Assert.Equal("EmployeeManager", schema.Reference.Id),
-                schema => Assert.Equal("EmployeeEmployee", schema.Reference.Id));
+                schema => Assert.Equal("EmployeeManager", ((OpenApiSchemaReference)schema).Reference.Id),
+                schema => Assert.Equal("EmployeeEmployee", ((OpenApiSchemaReference)schema).Reference.Id));
             // Assert that schemas without discriminators have been inserted into the components
             Assert.True(document.Components.Schemas.TryGetValue("EmployeeManager", out var managerSchema));
-            Assert.Equal("manager", ((OpenApiString)managerSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("manager", managerSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             Assert.True(document.Components.Schemas.TryGetValue("EmployeeEmployee", out var employeeSchema));
-            Assert.Equal("employee", ((OpenApiString)employeeSchema.Properties[schema.Discriminator.PropertyName].Enum.First()).Value);
+            Assert.Equal("employee", employeeSchema.Properties[schema.Discriminator.PropertyName].Enum.First().GetValue<string>());
             // Assert that the schema has a correct self-reference to the base-type. This points to the schema that contains the discriminator.
-            Assert.Equal("Employee", employeeSchema.Properties["manager"].Reference.Id);
+            Assert.Equal("Employee", ((OpenApiSchemaReference)employeeSchema.Properties["manager"]).Reference.Id);
         });
     }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PropertySchemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PropertySchemas.cs
new file mode 100644
index 000000000000..e3b021b22294
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.PropertySchemas.cs
@@ -0,0 +1,753 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Net.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+public partial class OpenApiSchemaServiceTests : OpenApiDocumentServiceTestBase
+{
+    [Fact]
+    public async Task GetOpenApiSchema_HandlesNullablePropertiesWithNullInType()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (NullablePropertiesTestModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+
+            // Check nullable int property has null in type directly or uses oneOf
+            var nullableIntProperty = schema.Properties["nullableInt"];
+            if (nullableIntProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableIntProperty.OneOf.Count);
+                Assert.Collection(nullableIntProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.Integer, item.Type);
+                        Assert.Equal("int32", item.Format);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableIntProperty.Type?.HasFlag(JsonSchemaType.Integer));
+                Assert.True(nullableIntProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal("int32", nullableIntProperty.Format);
+            }
+
+            // Check nullable string property has null in type directly or uses oneOf
+            var nullableStringProperty = schema.Properties["nullableString"];
+            if (nullableStringProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableStringProperty.OneOf.Count);
+                Assert.Collection(nullableStringProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item => Assert.Equal(JsonSchemaType.String, item.Type));
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableStringProperty.Type?.HasFlag(JsonSchemaType.String));
+                Assert.True(nullableStringProperty.Type?.HasFlag(JsonSchemaType.Null));
+            }
+
+            // Check nullable bool property has null in type directly or uses oneOf
+            var nullableBoolProperty = schema.Properties["nullableBool"];
+            if (nullableBoolProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableBoolProperty.OneOf.Count);
+                Assert.Collection(nullableBoolProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item => Assert.Equal(JsonSchemaType.Boolean, item.Type));
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableBoolProperty.Type?.HasFlag(JsonSchemaType.Boolean));
+                Assert.True(nullableBoolProperty.Type?.HasFlag(JsonSchemaType.Null));
+            }
+
+            // Check nullable DateTime property has null in type directly or uses oneOf
+            var nullableDateTimeProperty = schema.Properties["nullableDateTime"];
+            if (nullableDateTimeProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableDateTimeProperty.OneOf.Count);
+                Assert.Collection(nullableDateTimeProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.String, item.Type);
+                        Assert.Equal("date-time", item.Format);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableDateTimeProperty.Type?.HasFlag(JsonSchemaType.String));
+                Assert.True(nullableDateTimeProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal("date-time", nullableDateTimeProperty.Format);
+            }
+
+            // Check nullable Guid property has null in type directly or uses oneOf
+            var nullableGuidProperty = schema.Properties["nullableGuid"];
+            if (nullableGuidProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableGuidProperty.OneOf.Count);
+                Assert.Collection(nullableGuidProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.String, item.Type);
+                        Assert.Equal("uuid", item.Format);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableGuidProperty.Type?.HasFlag(JsonSchemaType.String));
+                Assert.True(nullableGuidProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal("uuid", nullableGuidProperty.Format);
+            }
+
+            // Check nullable Uri property has null in type directly or uses oneOf
+            var nullableUriProperty = schema.Properties["nullableUri"];
+            if (nullableUriProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableUriProperty.OneOf.Count);
+                Assert.Collection(nullableUriProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.String, item.Type);
+                        Assert.Equal("uri", item.Format);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableUriProperty.Type?.HasFlag(JsonSchemaType.String));
+                Assert.True(nullableUriProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal("uri", nullableUriProperty.Format);
+            }
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_HandlesNullableComplexTypesInPropertiesWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (ComplexNullablePropertiesModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+
+            // Check nullable Todo property uses oneOf with reference
+            var nullableTodoProperty = schema.Properties["nullableTodo"];
+            Assert.NotNull(nullableTodoProperty.OneOf);
+            Assert.Equal(2, nullableTodoProperty.OneOf.Count);
+            Assert.Collection(nullableTodoProperty.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal("Todo", ((OpenApiSchemaReference)item).Reference.Id));
+
+            // Check nullable Account property uses oneOf with reference
+            var nullableAccountProperty = schema.Properties["nullableAccount"];
+            Assert.NotNull(nullableAccountProperty.OneOf);
+            Assert.Equal(2, nullableAccountProperty.OneOf.Count);
+            Assert.Collection(nullableAccountProperty.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal("Account", ((OpenApiSchemaReference)item).Reference.Id));
+
+            // Verify component schemas are created
+            Assert.Contains("Todo", document.Components.Schemas.Keys);
+            Assert.Contains("Account", document.Components.Schemas.Keys);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_HandlesNullableCollectionPropertiesWithNullInType()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (NullableCollectionPropertiesModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+
+            // Check nullable List<Todo> property has null in type or uses oneOf
+            var nullableTodoListProperty = schema.Properties["nullableTodoList"];
+            if (nullableTodoListProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableTodoListProperty.OneOf.Count);
+                Assert.Collection(nullableTodoListProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.Array, item.Type);
+                        Assert.NotNull(item.Items);
+                        Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableTodoListProperty.Type?.HasFlag(JsonSchemaType.Array));
+                Assert.True(nullableTodoListProperty.Type?.HasFlag(JsonSchemaType.Null));
+            }
+
+            // Check nullable Todo[] property has null in type or uses oneOf
+            var nullableTodoArrayProperty = schema.Properties["nullableTodoArray"];
+            if (nullableTodoArrayProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableTodoArrayProperty.OneOf.Count);
+                Assert.Collection(nullableTodoArrayProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.Array, item.Type);
+                        Assert.NotNull(item.Items);
+                        Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableTodoArrayProperty.Type?.HasFlag(JsonSchemaType.Array));
+                Assert.True(nullableTodoArrayProperty.Type?.HasFlag(JsonSchemaType.Null));
+            }
+
+            // Check nullable Dictionary<string, Todo> property has null in type or uses oneOf
+            var nullableDictionaryProperty = schema.Properties["nullableDictionary"];
+            if (nullableDictionaryProperty.OneOf != null)
+            {
+                // If still uses oneOf, verify structure
+                Assert.Equal(2, nullableDictionaryProperty.OneOf.Count);
+                Assert.Collection(nullableDictionaryProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.Object, item.Type);
+                        Assert.NotNull(item.AdditionalProperties);
+                        Assert.Equal("Todo", ((OpenApiSchemaReference)item.AdditionalProperties).Reference.Id);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included
+                Assert.True(nullableDictionaryProperty.Type?.HasFlag(JsonSchemaType.Object));
+                Assert.True(nullableDictionaryProperty.Type?.HasFlag(JsonSchemaType.Null));
+            }
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_HandlesNullableEnumPropertiesWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (NullableEnumPropertiesModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+
+            // Check nullable Status (with string converter) property uses oneOf with reference
+            var nullableStatusProperty = schema.Properties["nullableStatus"];
+            Assert.NotNull(nullableStatusProperty.OneOf);
+            Assert.Equal(2, nullableStatusProperty.OneOf.Count);
+            Assert.Collection(nullableStatusProperty.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal("Status", ((OpenApiSchemaReference)item).Reference.Id));
+
+            // Check nullable TaskStatus (without converter) property uses oneOf
+            var nullableTaskStatusProperty = schema.Properties["nullableTaskStatus"];
+            Assert.NotNull(nullableTaskStatusProperty.OneOf);
+            Assert.Equal(2, nullableTaskStatusProperty.OneOf.Count);
+            Assert.Collection(nullableTaskStatusProperty.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal(JsonSchemaType.Integer, item.Type));
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_HandlesNullablePropertiesWithValidationAttributesAndNullInType()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (NullablePropertiesWithValidationModel model) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+
+            // Check nullable string with validation attributes has null in type or uses oneOf
+            var nullableNameProperty = schema.Properties["nullableName"];
+            if (nullableNameProperty.OneOf != null)
+            {
+                // If still uses oneOf for properties with validation, verify structure
+                Assert.Equal(2, nullableNameProperty.OneOf.Count);
+                Assert.Collection(nullableNameProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.String, item.Type);
+                        Assert.Equal(3, item.MinLength);
+                        Assert.Equal(50, item.MaxLength);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included and validation attributes
+                Assert.True(nullableNameProperty.Type?.HasFlag(JsonSchemaType.String));
+                Assert.True(nullableNameProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal(3, nullableNameProperty.MinLength);
+                Assert.Equal(50, nullableNameProperty.MaxLength);
+            }
+
+            // Check nullable int with range validation has null in type or uses oneOf
+            var nullableAgeProperty = schema.Properties["nullableAge"];
+            if (nullableAgeProperty.OneOf != null)
+            {
+                // If still uses oneOf for properties with validation, verify structure
+                Assert.Equal(2, nullableAgeProperty.OneOf.Count);
+                Assert.Collection(nullableAgeProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.Integer, item.Type);
+                        Assert.Equal("int32", item.Format);
+                        Assert.Equal("18", item.Minimum);
+                        Assert.Equal("120", item.Maximum);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included and validation attributes
+                Assert.True(nullableAgeProperty.Type?.HasFlag(JsonSchemaType.Integer));
+                Assert.True(nullableAgeProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal("int32", nullableAgeProperty.Format);
+                Assert.Equal("18", nullableAgeProperty.Minimum);
+                Assert.Equal("120", nullableAgeProperty.Maximum);
+            }
+
+            // Check nullable string with description has null in type or uses oneOf
+            var nullableDescriptionProperty = schema.Properties["nullableDescription"];
+            if (nullableDescriptionProperty.OneOf != null)
+            {
+                // If still uses oneOf for properties with description, verify structure
+                Assert.Equal(2, nullableDescriptionProperty.OneOf.Count);
+                Assert.Collection(nullableDescriptionProperty.OneOf,
+                    item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                    item =>
+                    {
+                        Assert.Equal(JsonSchemaType.String, item.Type);
+                        Assert.Equal("A description field", item.Description);
+                    });
+            }
+            else
+            {
+                // If uses direct type, verify null is included and description
+                Assert.True(nullableDescriptionProperty.Type?.HasFlag(JsonSchemaType.String));
+                Assert.True(nullableDescriptionProperty.Type?.HasFlag(JsonSchemaType.Null));
+                Assert.Equal("A description field", nullableDescriptionProperty.Description);
+            }
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_Base64StringAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["base64StringValue"];
+            var nullable = schema.Properties["nullableBase64StringValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal("byte", nonNullable.Format);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal("byte", nullable.Format);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_RangeAttribute_IntProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["rangeIntValue"];
+            var nullable = schema.Properties["nullableRangeIntValue"];
+            Assert.Equal(JsonSchemaType.Integer, nonNullable.Type);
+            Assert.Equal("int32", nonNullable.Format);
+            Assert.Equal("1", nonNullable.Minimum);
+            Assert.Equal("100", nonNullable.Maximum);
+            Assert.Equal(JsonSchemaType.Integer | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal("int32", nullable.Format);
+            Assert.Equal("1", nullable.Minimum);
+            Assert.Equal("100", nullable.Maximum);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_RangeAttribute_DoubleProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["rangeDoubleValue"];
+            var nullable = schema.Properties["nullableRangeDoubleValue"];
+            Assert.Equal(JsonSchemaType.Number, nonNullable.Type);
+            Assert.Equal("double", nonNullable.Format);
+            Assert.Equal("0.1", nonNullable.Minimum as string);
+            Assert.Equal("99.9", nonNullable.Maximum as string);
+            Assert.Equal(JsonSchemaType.Number | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal("double", nullable.Format);
+            Assert.Equal("0.1", nullable.Minimum as string);
+            Assert.Equal("99.9", nullable.Maximum as string);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_RegularExpressionAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["regexStringValue"];
+            var nullable = schema.Properties["nullableRegexStringValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal("^[A-Z]{3}$", nonNullable.Pattern);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal("^[A-Z]{3}$", nullable.Pattern);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_MaxLengthAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["maxLengthStringValue"];
+            var nullable = schema.Properties["nullableMaxLengthStringValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal(10, nonNullable.MaxLength);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(10, nullable.MaxLength);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_MaxLengthAttribute_ArrayProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["maxLengthArrayValue"];
+            var nullable = schema.Properties["nullableMaxLengthArrayValue"];
+            Assert.Equal(JsonSchemaType.Array, nonNullable.Type);
+            Assert.Equal(5, nonNullable.MaxItems);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(5, nullable.MaxItems);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_MinLengthAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["minLengthStringValue"];
+            var nullable = schema.Properties["nullableMinLengthStringValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal(3, nonNullable.MinLength);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(3, nullable.MinLength);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_MinLengthAttribute_ArrayProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["minLengthArrayValue"];
+            var nullable = schema.Properties["nullableMinLengthArrayValue"];
+            Assert.Equal(JsonSchemaType.Array, nonNullable.Type);
+            Assert.Equal(2, nonNullable.MinItems);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(2, nullable.MinItems);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_LengthAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["lengthStringValue"];
+            var nullable = schema.Properties["nullableLengthStringValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal(2, nonNullable.MinLength);
+            Assert.Equal(8, nonNullable.MaxLength);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(2, nullable.MinLength);
+            Assert.Equal(8, nullable.MaxLength);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_LengthAttribute_ArrayProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["lengthArrayValue"];
+            var nullable = schema.Properties["nullableLengthArrayValue"];
+            Assert.Equal(JsonSchemaType.Array, nonNullable.Type);
+            Assert.Equal(1, nonNullable.MinItems);
+            Assert.Equal(4, nonNullable.MaxItems);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(1, nullable.MinItems);
+            Assert.Equal(4, nullable.MaxItems);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_UrlAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["urlStringValue"];
+            var nullable = schema.Properties["nullableUrlStringValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal("uri", nonNullable.Format);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal("uri", nullable.Format);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiSchema_StringLengthAttribute_StringProperties()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/api", (PropertiesWithDataAnnotations model) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var schema = document.Paths["/api"].Operations[HttpMethod.Post].RequestBody.Content.First().Value.Schema;
+            var nonNullable = schema.Properties["stringLengthValue"];
+            var nullable = schema.Properties["nullableStringLengthValue"];
+            Assert.Equal(JsonSchemaType.String, nonNullable.Type);
+            Assert.Equal(5, nonNullable.MinLength);
+            Assert.Equal(20, nonNullable.MaxLength);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, nullable.Type);
+            Assert.Equal(5, nullable.MinLength);
+            Assert.Equal(20, nullable.MaxLength);
+        });
+    }
+
+#nullable enable
+    private class NullablePropertiesTestModel
+    {
+        public int? NullableInt { get; set; }
+        public string? NullableString { get; set; }
+        public bool? NullableBool { get; set; }
+        public DateTime? NullableDateTime { get; set; }
+        public Guid? NullableGuid { get; set; }
+        public Uri? NullableUri { get; set; }
+    }
+
+    private class ComplexNullablePropertiesModel
+    {
+        public Todo? NullableTodo { get; set; }
+        public Account? NullableAccount { get; set; }
+    }
+
+    private class NullableCollectionPropertiesModel
+    {
+        public List<Todo>? NullableTodoList { get; set; }
+        public Todo[]? NullableTodoArray { get; set; }
+        public Dictionary<string, Todo>? NullableDictionary { get; set; }
+    }
+
+    private class NullableEnumPropertiesModel
+    {
+        public Status? NullableStatus { get; set; }
+        public TaskStatus? NullableTaskStatus { get; set; }
+    }
+
+    private class NullablePropertiesWithValidationModel
+    {
+        [StringLength(50, MinimumLength = 3)]
+        public string? NullableName { get; set; }
+
+        [Range(18, 120)]
+        public int? NullableAge { get; set; }
+
+        [Description("A description field")]
+        public string? NullableDescription { get; set; }
+    }
+
+    private class PropertiesWithDataAnnotations
+    {
+        // Base64StringAttribute
+        [Base64String]
+        public string Base64StringValue { get; set; } = string.Empty;
+        [Base64String]
+        public string? NullableBase64StringValue { get; set; }
+
+        // RangeAttribute
+        [Range(1, 100)]
+        public int RangeIntValue { get; set; } = 0;
+        [Range(1, 100)]
+        public int? NullableRangeIntValue { get; set; }
+        [Range(0.1, 99.9)]
+        public double RangeDoubleValue { get; set; } = 0.0;
+        [Range(0.1, 99.9)]
+        public double? NullableRangeDoubleValue { get; set; }
+
+        // RegularExpressionAttribute
+        [RegularExpression(@"^[A-Z]{3}$")]
+        public string RegexStringValue { get; set; } = string.Empty;
+        [RegularExpression(@"^[A-Z]{3}$")]
+        public string? NullableRegexStringValue { get; set; }
+
+        // MaxLengthAttribute
+        [MaxLength(10)]
+        public string MaxLengthStringValue { get; set; } = string.Empty;
+        [MaxLength(10)]
+        public string? NullableMaxLengthStringValue { get; set; }
+        [MaxLength(5)]
+        public int[] MaxLengthArrayValue { get; set; } = [];
+        [MaxLength(5)]
+        public int[]? NullableMaxLengthArrayValue { get; set; }
+
+        // MinLengthAttribute
+        [MinLength(3)]
+        public string MinLengthStringValue { get; set; } = string.Empty;
+        [MinLength(3)]
+        public string? NullableMinLengthStringValue { get; set; }
+        [MinLength(2)]
+        public int[] MinLengthArrayValue { get; set; } = [];
+        [MinLength(2)]
+        public int[]? NullableMinLengthArrayValue { get; set; }
+
+        // LengthAttribute (custom, if available)
+        [Length(2, 8)]
+        public string LengthStringValue { get; set; } = string.Empty;
+        [Length(2, 8)]
+        public string? NullableLengthStringValue { get; set; }
+        [Length(1, 4)]
+        public int[] LengthArrayValue { get; set; } = [];
+        [Length(1, 4)]
+        public int[]? NullableLengthArrayValue { get; set; }
+
+        // UrlAttribute
+        [Url]
+        public string UrlStringValue { get; set; } = string.Empty;
+        [Url]
+        public string? NullableUrlStringValue { get; set; }
+
+        // StringLengthAttribute
+        [StringLength(20, MinimumLength = 5)]
+        public string StringLengthValue { get; set; } = string.Empty;
+        [StringLength(20, MinimumLength = 5)]
+        public string? NullableStringLengthValue { get; set; }
+    }
+#nullable restore
+}
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.RequestBodySchemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.RequestBodySchemas.cs
index e7d0ea13af19..2c368e559c49 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.RequestBodySchemas.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.RequestBodySchemas.cs
@@ -4,12 +4,12 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.IO.Pipelines;
+using System.Net.Http;
+using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiSchemaServiceTests : OpenApiDocumentServiceTestBase
 {
@@ -25,35 +25,35 @@ public async Task GetOpenApiRequestBody_GeneratesSchemaForPoco()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
 
             Assert.NotNull(requestBody);
             var content = Assert.Single(requestBody.Content);
             Assert.Equal("application/json", content.Key);
             Assert.NotNull(content.Value.Schema);
-            var schema = content.Value.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = content.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
 
@@ -82,38 +82,57 @@ public async Task GetOpenApiRequestBody_GeneratesSchemaForPoco_WithValidationAtt
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
 
             Assert.NotNull(requestBody);
             var content = requestBody.Content[targetContentType];
             Assert.NotNull(content.Schema);
-            var effectiveSchema = content.Schema.GetEffective(document);
-            Assert.Equal("object", effectiveSchema.Type);
+            var effectiveSchema = content.Schema;
+            Assert.Equal(JsonSchemaType.Object, effectiveSchema.Type);
             Assert.Collection(effectiveSchema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
-                    Assert.Equal(1, property.Value.Minimum);
-                    Assert.Equal(100, property.Value.Maximum);
-                    Assert.True(property.Value.Default is OpenApiNull);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                    Assert.Equal("1", property.Value.Minimum);
+                    Assert.Equal("100", property.Value.Maximum);
+                    Assert.Null(property.Value.Default);
                 },
                 property =>
                 {
                     Assert.Equal("name", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal(5, property.Value.MinLength);
-                    Assert.True(property.Value.Default is OpenApiNull);
+                    Assert.Equal(10, property.Value.MaxLength);
+                    Assert.Null(property.Value.Default);
+                },
+                property =>
+                {
+                    Assert.Equal("description", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                    Assert.Equal(5, property.Value.MinLength);
+                    Assert.Equal(10, property.Value.MaxLength);
                 },
                 property =>
                 {
                     Assert.Equal("isPrivate", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
-                    var defaultValue = Assert.IsAssignableFrom<OpenApiBoolean>(property.Value.Default);
-                    Assert.True(defaultValue.Value);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
+                    Assert.True(property.Value.Default.GetValue<bool>());
+                },
+                property =>
+                {
+                    Assert.Equal("items", property.Key);
+                    Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, property.Value.Type);
+                    Assert.Equal(10, property.Value.MaxItems);
+                },
+                property =>
+                {
+                    Assert.Equal("tags", property.Key);
+                    Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, property.Value.Type);
+                    Assert.Equal(5, property.Value.MinItems);
+                    Assert.Equal(10, property.Value.MaxItems);
                 });
-
         });
     }
 
@@ -143,8 +162,8 @@ await VerifyOpenApiDocument(builder, document =>
 
         static OpenApiRequestBody GetRequestBodyForPath(OpenApiDocument document, string path)
         {
-            var operation = document.Paths[path].Operations[OperationType.Post];
-            return operation.RequestBody;
+            var operation = document.Paths[path].Operations[HttpMethod.Post];
+            return operation.RequestBody as OpenApiRequestBody;
         }
     }
 
@@ -160,10 +179,10 @@ public async Task GetOpenApiRequestBody_RespectsRequiredAttributeOnBodyPropertie
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/required-properties"].Operations[OperationType.Post];
+            var operation = document.Paths["/required-properties"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var content = Assert.Single(requestBody.Content);
-            var schema = content.Value.Schema.GetEffective(document);
+            var schema = content.Value.Schema;
             Assert.Collection(schema.Required,
                 property => Assert.Equal("title", property),
                 property => Assert.Equal("completed", property));
@@ -187,12 +206,12 @@ await VerifyOpenApiDocument(builder, document =>
         {
             foreach (var path in paths)
             {
-                var operation = document.Paths[$"/{path}"].Operations[OperationType.Post];
+                var operation = document.Paths[$"/{path}"].Operations[HttpMethod.Post];
                 var requestBody = operation.RequestBody;
 
-                var effectiveSchema = requestBody.Content["application/octet-stream"].Schema.GetEffective(document);
+                var effectiveSchema = requestBody.Content["application/octet-stream"].Schema;
 
-                Assert.Equal("string", effectiveSchema.Type);
+                Assert.Equal(JsonSchemaType.String, effectiveSchema.Type);
                 Assert.Equal("binary", effectiveSchema.Format);
             }
         });
@@ -210,20 +229,20 @@ public async Task GetOpenApiRequestBody_GeneratesSchemaForFilesInRecursiveType()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths[$"/proposal"].Operations[OperationType.Post];
+            var operation = document.Paths[$"/proposal"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var schema = requestBody.Content["application/json"].Schema;
-            Assert.Equal("Proposal", schema.Reference.Id);
-            var effectiveSchema = schema.GetEffective(document);
+            Assert.Equal("Proposal", ((OpenApiSchemaReference)schema).Reference.Id);
+            var effectiveSchema = schema;
             Assert.Collection(effectiveSchema.Properties,
                 property => {
                     Assert.Equal("proposalElement", property.Key);
-                    Assert.Equal("Proposal", property.Value.Reference.Id);
+                    Assert.Equal("Proposal", ((OpenApiSchemaReference)property.Value).Reference.Id);
                 },
                 property => {
                     Assert.Equal("stream", property.Key);
-                    var targetSchema = property.Value.GetEffective(document);
-                    Assert.Equal("string", targetSchema.Type);
+                    var targetSchema = property.Value;
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, targetSchema.Type);
                     Assert.Equal("binary", targetSchema.Format);
                 });
         });
@@ -243,9 +262,9 @@ public async Task GetOpenApiRequestBody_GeneratesSchemaForListOf()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var enumerableTodo = document.Paths["/enumerable-todo"].Operations[OperationType.Post];
-            var arrayTodo = document.Paths["/array-todo"].Operations[OperationType.Post];
-            var arrayParsable = document.Paths["/array-parsable"].Operations[OperationType.Get];
+            var enumerableTodo = document.Paths["/enumerable-todo"].Operations[HttpMethod.Post];
+            var arrayTodo = document.Paths["/array-todo"].Operations[HttpMethod.Post];
+            var arrayParsable = document.Paths["/array-parsable"].Operations[HttpMethod.Get];
 
             Assert.NotNull(enumerableTodo.RequestBody);
             Assert.NotNull(arrayTodo.RequestBody);
@@ -254,38 +273,38 @@ await VerifyOpenApiDocument(builder, document =>
             var enumerableTodoSchema = enumerableTodo.RequestBody.Content["application/json"].Schema;
             var arrayTodoSchema = arrayTodo.RequestBody.Content["application/json"].Schema;
             // Assert that both IEnumerable<Todo> and Todo[] have items that map to the same schema
-            Assert.Equal(enumerableTodoSchema.Items.Reference.Id, arrayTodoSchema.Items.Reference.Id);
+            Assert.Equal(((OpenApiSchemaReference)enumerableTodoSchema.Items).Reference.Id, ((OpenApiSchemaReference)arrayTodoSchema.Items).Reference.Id);
             // Assert all types materialize as arrays
-            Assert.Equal("array", enumerableTodoSchema.Type);
-            Assert.Equal("array", arrayTodoSchema.Type);
+            Assert.Equal(JsonSchemaType.Array, enumerableTodoSchema.Type);
+            Assert.Equal(JsonSchemaType.Array, arrayTodoSchema.Type);
 
-            Assert.Equal("array", parameter.Schema.Type);
-            Assert.Equal("string", parameter.Schema.Items.Type);
+            Assert.Equal(JsonSchemaType.Array, parameter.Schema.Type);
+            Assert.Equal(JsonSchemaType.String, parameter.Schema.Items.Type);
             Assert.Equal("uuid", parameter.Schema.Items.Format);
 
             // Assert the array items are the same as the Todo schema
             foreach (var element in new[] { enumerableTodoSchema, arrayTodoSchema })
             {
-                Assert.Collection(element.Items.GetEffective(document).Properties,
+                Assert.Collection(element.Items.Properties,
                     property =>
                     {
                         Assert.Equal("id", property.Key);
-                        Assert.Equal("integer", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("title", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("completed", property.Key);
-                        Assert.Equal("boolean", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                     },
                     property =>
                     {
                         Assert.Equal("createdAt", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String, property.Value.Type);
                         Assert.Equal("date-time", property.Value.Format);
                     });
             }
@@ -304,30 +323,30 @@ public async Task GetOpenApiRequestBody_HandlesPolymorphicRequestWithoutDiscrimi
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
-            Assert.Empty(schema.AnyOf);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Null(schema.AnyOf);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("length", property.Key);
-                    Assert.Equal("number", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Number, property.Value.Type);
                     Assert.Equal("double", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("wheels", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("make", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 });
         });
     }
@@ -344,36 +363,36 @@ public async Task GetOpenApiRequestBody_HandlesDescriptionAttributeOnProperties(
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             var requestBody = operation.RequestBody.Content;
             Assert.True(requestBody.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                     Assert.Equal("The unique identifier for a todo item.", property.Value.Description);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("The title of the todo item.", property.Value.Description);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                     Assert.Equal("The completion status of the todo item.", property.Value.Description);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                     Assert.Equal("The date and time the todo item was created.", property.Value.Description);
                 });
@@ -392,7 +411,7 @@ public async Task GetOpenApiRequestBody_HandlesDescriptionAttributeOnParameter()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.NotNull(operation.RequestBody);
             Assert.Equal("The todo item to create.", operation.RequestBody.Description);
         });
@@ -410,42 +429,219 @@ public async Task GetOpenApiRequestBody_HandlesNullableProperties()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var content = Assert.Single(requestBody.Content);
-            var schema = content.Value.Schema.GetEffective(document);
+            var schema = content.Value.Schema;
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("nullableInt", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
-                    Assert.True(property.Value.Nullable);
+                    Assert.Equal(JsonSchemaType.Integer | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("nullableString", property.Key);
-                    Assert.Equal("string", property.Value.Type);
-                    Assert.True(property.Value.Nullable);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("nullableBool", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
-                    Assert.True(property.Value.Nullable);
+                    Assert.Equal(JsonSchemaType.Boolean | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("nullableDateTime", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
-                    Assert.True(property.Value.Nullable);
                 },
                 property =>
                 {
                     Assert.Equal("nullableUri", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("uri", property.Value.Format);
-                    Assert.True(property.Value.Nullable);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiRequestBody_HandlesNullableParameterWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        builder.MapPost("/api/nullable-todo", (Todo? todo) => { });
+        builder.MapPost("/api/nullable-point", (Point? point) => { });
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable Todo parameter
+            var todoOperation = document.Paths["/api/nullable-todo"].Operations[HttpMethod.Post];
+            var todoRequestBody = todoOperation.RequestBody;
+            var todoContent = Assert.Single(todoRequestBody.Content);
+            Assert.Equal("application/json", todoContent.Key);
+            var todoSchema = todoContent.Value.Schema;
+            Assert.NotNull(todoSchema.OneOf);
+            Assert.Equal(2, todoSchema.OneOf.Count);
+            Assert.Collection(todoSchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Object, item.Type);
+                    Assert.Collection(item.Properties,
+                        property =>
+                        {
+                            Assert.Equal("id", property.Key);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("title", property.Key);
+                            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("completed", property.Key);
+                            Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("createdAt", property.Key);
+                            Assert.Equal(JsonSchemaType.String, property.Value.Type);
+                            Assert.Equal("date-time", property.Value.Format);
+                        });
+                });
+
+            // Verify nullable Point parameter
+            var pointOperation = document.Paths["/api/nullable-point"].Operations[HttpMethod.Post];
+            var pointRequestBody = pointOperation.RequestBody;
+            var pointContent = Assert.Single(pointRequestBody.Content);
+            Assert.Equal("application/json", pointContent.Key);
+            var pointSchema = pointContent.Value.Schema;
+            Assert.NotNull(pointSchema.OneOf);
+            Assert.Equal(2, pointSchema.OneOf.Count);
+            Assert.Collection(pointSchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Object, item.Type);
+                    Assert.Collection(item.Properties,
+                        property =>
+                        {
+                            Assert.Equal("x", property.Key);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("y", property.Key);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
+                        });
+                });
+
+            Assert.Equal(["Point", "Todo"], [.. document.Components.Schemas.Keys]);
+            Assert.Collection(document.Components.Schemas.Values,
+                item => Assert.Equal(JsonSchemaType.Object, item.Type),
+                item => Assert.Equal(JsonSchemaType.Object, item.Type));
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiRequestBody_HandlesNullableCollectionParametersWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        builder.MapPost("/api/nullable-array", (Todo[]? todos) => { });
+        builder.MapPost("/api/nullable-list", (List<Todo>? todoList) => { });
+        builder.MapPost("/api/nullable-enumerable", (IEnumerable<Todo>? todoEnumerable) => { });
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable array parameter - verify actual behavior with OneOf
+            var arrayOperation = document.Paths["/api/nullable-array"].Operations[HttpMethod.Post];
+            var arrayRequestBody = arrayOperation.RequestBody;
+            var arrayContent = Assert.Single(arrayRequestBody.Content);
+            Assert.Equal("application/json", arrayContent.Key);
+            var arraySchema = arrayContent.Value.Schema;
+            Assert.NotNull(arraySchema.OneOf); // OneOf IS used for nullable collections
+            Assert.Equal(2, arraySchema.OneOf.Count);
+            Assert.Collection(arraySchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                });
+
+            // Verify nullable List parameter - verify actual behavior with OneOf
+            var listOperation = document.Paths["/api/nullable-list"].Operations[HttpMethod.Post];
+            var listRequestBody = listOperation.RequestBody;
+            var listContent = Assert.Single(listRequestBody.Content);
+            Assert.Equal("application/json", listContent.Key);
+            var listSchema = listContent.Value.Schema;
+            Assert.NotNull(listSchema.OneOf); // OneOf IS used for nullable collections
+            Assert.Equal(2, listSchema.OneOf.Count);
+            Assert.Collection(listSchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                });
+
+            // Verify nullable IEnumerable parameter - verify actual behavior with OneOf
+            var enumerableOperation = document.Paths["/api/nullable-enumerable"].Operations[HttpMethod.Post];
+            var enumerableRequestBody = enumerableOperation.RequestBody;
+            var enumerableContent = Assert.Single(enumerableRequestBody.Content);
+            Assert.Equal("application/json", enumerableContent.Key);
+            var enumerableSchema = enumerableContent.Value.Schema;
+            Assert.NotNull(enumerableSchema.OneOf); // OneOf IS used for nullable collections
+            Assert.Equal(2, enumerableSchema.OneOf.Count);
+            Assert.Collection(enumerableSchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
                 });
         });
     }
@@ -462,21 +658,21 @@ public async Task SupportsNestedTypes()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var content = Assert.Single(requestBody.Content);
-            Assert.Equal("NestedType", content.Value.Schema.Reference.Id);
-            var schema = content.Value.Schema.GetEffective(document);
+            Assert.Equal("NestedType", ((OpenApiSchemaReference)content.Value.Schema).Reference.Id);
+            var schema = content.Value.Schema;
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("name", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("nested", property.Key);
-                    Assert.Equal("NestedType", property.Value.Reference.Id);
+                    Assert.Equal("NestedType", ((OpenApiSchemaReference)property.Value).Reference.Id);
                 });
         });
     }
@@ -507,21 +703,21 @@ public async Task SupportsNestedTypes_WithNoAttributeProvider()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody;
             var content = Assert.Single(requestBody.Content);
-            Assert.Equal("NestedType", content.Value.Schema.Reference.Id);
-            var schema = content.Value.Schema.GetEffective(document);
+            Assert.Equal("NestedType", ((OpenApiSchemaReference)content.Value.Schema).Reference.Id);
+            var schema = content.Value.Schema;
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("name", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("nested", property.Key);
-                    Assert.Equal("NestedType", property.Value.Reference.Id);
+                    Assert.Equal("NestedType", ((OpenApiSchemaReference)property.Value).Reference.Id);
                 });
         });
     }
@@ -572,26 +768,234 @@ public async Task ExcludesNullabilityInFormParameters()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             Assert.Collection(operation.RequestBody.Content["application/x-www-form-urlencoded"].Schema.AllOf,
                 schema =>
                 {
                     var property = schema.Properties["name"];
-                    Assert.Equal("string", property.Type);
-                    Assert.False(property.Nullable);
+                    Assert.Equal(JsonSchemaType.String, property.Type);
                 },
                 schema =>
                 {
                     var property = schema.Properties["number"];
-                    Assert.Equal("integer", property.Type);
-                    Assert.False(property.Nullable);
+                    Assert.Equal(JsonSchemaType.Integer, property.Type);
                 },
                 schema =>
                 {
                     var property = schema.Properties["ids"];
-                    Assert.Equal("array", property.Type);
-                    Assert.False(property.Nullable);
+                    Assert.Equal(JsonSchemaType.Array, property.Type);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task SupportsClassWithJsonUnmappedMemberHandlingDisallowed()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (ExampleWithDisallowedUnmappedMembers type) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("number", property.Key);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                });
+            Assert.False(schema.AdditionalPropertiesAllowed);
+        });
+    }
+
+    [Fact]
+    public async Task SupportsClassWithJsonUnmappedMemberHandlingSkipped()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (ExampleWithSkippedUnmappedMembers type) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("number", property.Key);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 });
+            Assert.True(schema.AdditionalPropertiesAllowed);
         });
     }
+
+    [JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)]
+    private class ExampleWithDisallowedUnmappedMembers
+    {
+        public int Number { get; init; }
+    }
+
+    [JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Skip)]
+    private class ExampleWithSkippedUnmappedMembers
+    {
+        public int Number { get; init; }
+    }
+
+    [Fact]
+    public async Task GetOpenApiRequestBody_HandlesNullableGenericTypesWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        builder.MapPost("/api/nullable-result", (Result<Todo>? result) => { });
+        builder.MapPost("/api/nullable-list", (List<Todo>? todos) => { });
+        builder.MapPost("/api/nullable-dictionary", (Dictionary<string, Todo>? todoDict) => { });
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable Result<Todo> uses allOf
+            var resultOperation = document.Paths["/api/nullable-result"].Operations[HttpMethod.Post];
+            var resultRequestBody = resultOperation.RequestBody;
+            var resultContent = Assert.Single(resultRequestBody.Content);
+            var resultSchema = resultContent.Value.Schema;
+            Assert.NotNull(resultSchema.OneOf);
+            Assert.Equal(2, resultSchema.OneOf.Count);
+            Assert.Collection(resultSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal(JsonSchemaType.Object, item.Type));
+
+            // Verify nullable List<Todo> uses allOf
+            var listOperation = document.Paths["/api/nullable-list"].Operations[HttpMethod.Post];
+            var listRequestBody = listOperation.RequestBody;
+            var listContent = Assert.Single(listRequestBody.Content);
+            var listSchema = listContent.Value.Schema;
+            Assert.NotNull(listSchema.OneOf);
+            Assert.Equal(2, listSchema.OneOf.Count);
+            Assert.Collection(listSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item =>
+                {
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                });
+
+            // Verify nullable Dictionary<string, Todo> uses allOf
+            var dictOperation = document.Paths["/api/nullable-dictionary"].Operations[HttpMethod.Post];
+            var dictRequestBody = dictOperation.RequestBody;
+            var dictContent = Assert.Single(dictRequestBody.Content);
+            var dictSchema = dictContent.Value.Schema;
+            Assert.NotNull(dictSchema.OneOf);
+            Assert.Equal(2, dictSchema.OneOf.Count);
+            Assert.Collection(dictSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item =>
+                {
+                    Assert.Equal(JsonSchemaType.Object, item.Type);
+                    Assert.NotNull(item.AdditionalProperties);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.AdditionalProperties).Reference.Id);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task SupportsTypesWithSelfReferencedProperties()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/api", (Parent parent) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var requestBody = operation.RequestBody;
+            var content = Assert.Single(requestBody.Content);
+            var schema = content.Value.Schema;
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("selfReferenceList", property.Key);
+                    Assert.Equal(JsonSchemaType.Null | JsonSchemaType.Array, property.Value.Type);
+                    Assert.Equal("Parent", ((OpenApiSchemaReference)property.Value.Items).Reference.Id);
+                },
+                property =>
+                {
+                    Assert.Equal("selfReferenceDictionary", property.Key);
+                    Assert.Equal(JsonSchemaType.Null | JsonSchemaType.Object, property.Value.Type);
+                    Assert.Equal("Parent", ((OpenApiSchemaReference)property.Value.AdditionalProperties).Reference.Id);
+                });
+        });
+    }
+
+    public class Parent
+    {
+        public IEnumerable<Parent> SelfReferenceList { get; set; } = [];
+        public IDictionary<string, Parent> SelfReferenceDictionary { get; set; } = new Dictionary<string, Parent>();
+    }
+
+    /// <remarks>
+    /// Regression test for https://github.com/dotnet/aspnetcore/issues/61327
+    /// </remarks>
+    [Fact]
+    public async Task RespectsEnumDefaultValueInControllerFormParameters()
+    {
+        // Arrange
+        var actionDescriptor = CreateActionDescriptor(nameof(TestBodyController.FormPostWithOptionalEnumParam), typeof(TestBodyController));
+
+        // Assert
+        await VerifyOpenApiDocument(actionDescriptor, VerifyOptionalEnum);
+    }
+
+    [Fact]
+    public async Task RespectsEnumDefaultValueInMinimalApiFormParameters()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+        builder.MapPost("/optionalEnum", ([FromForm(Name = "status")] Status status = Status.Approved) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, VerifyOptionalEnum);
+    }
+
+    private void VerifyOptionalEnum(OpenApiDocument document)
+    {
+        var operation = document.Paths["/optionalEnum"].Operations[HttpMethod.Post];
+        var properties = operation.RequestBody.Content["application/x-www-form-urlencoded"].Schema.Properties;
+        var property = properties["status"];
+
+        Assert.NotNull(property);
+        Assert.Equal(3, property.Enum.Count);
+        Assert.Equal("Approved", property.Default.GetValue<string>());
+    }
+
+    [ApiController]
+    [Produces("application/json")]
+    public class TestBodyController
+    {
+        [Route("/optionalEnum")]
+        [HttpPost]
+        internal Status FormPostWithOptionalEnumParam(
+            [FromForm(Name = "status")] Status status = Status.Approved
+        ) => status;
+    }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ResponseSchemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ResponseSchemas.cs
index 5ec980b6296c..c0a38a43997b 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ResponseSchemas.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ResponseSchemas.cs
@@ -2,36 +2,36 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.ComponentModel;
+using System.Net.Http;
+using System.Text.Json.Nodes;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public partial class OpenApiSchemaServiceTests : OpenApiDocumentServiceTestBase
 {
     public static object[][] ResponsesWithPrimitiveTypes =>
     [
-        [() => 12, "application/json", "integer", "int32"],
-        [() => Int64.MaxValue, "application/json", "integer", "int64"],
-        [() => 12.0f, "application/json", "number", "float"],
-        [() => 12.0, "application/json", "number", "double"],
-        [() => 12.0m, "application/json", "number", "double"],
-        [() => false, "application/json", "boolean", null],
-        [() => "test", "text/plain", "string", null],
-        [() => 't', "application/json", "string", "char"],
-        [() => byte.MaxValue, "application/json", "integer", "uint8"],
-        [() => new byte[] { }, "application/json", "string", "byte"],
-        [() => short.MaxValue, "application/json", "integer", "int16"],
-        [() => ushort.MaxValue, "application/json", "integer", "uint16"],
-        [() => uint.MaxValue, "application/json", "integer", "uint32"],
-        [() => ulong.MaxValue, "application/json", "integer", "uint64"],
-        [() => new Uri("http://example.com"), "application/json", "string", "uri"]
+        [() => 12, "application/json", JsonSchemaType.Integer, "int32"],
+        [() => Int64.MaxValue, "application/json", JsonSchemaType.Integer, "int64"],
+        [() => 12.0f, "application/json", JsonSchemaType.Number, "float"],
+        [() => 12.0, "application/json", JsonSchemaType.Number, "double"],
+        [() => 12.0m, "application/json", JsonSchemaType.Number, "double"],
+        [() => false, "application/json", JsonSchemaType.Boolean, null],
+        [() => "test", "text/plain", JsonSchemaType.String, null],
+        [() => 't', "application/json", JsonSchemaType.String, "char"],
+        [() => byte.MaxValue, "application/json", JsonSchemaType.Integer, "uint8"],
+        [() => new byte[] { }, "application/json", JsonSchemaType.String, "byte"],
+        [() => short.MaxValue, "application/json", JsonSchemaType.Integer, "int16"],
+        [() => ushort.MaxValue, "application/json", JsonSchemaType.Integer, "uint16"],
+        [() => uint.MaxValue, "application/json", JsonSchemaType.Integer, "uint32"],
+        [() => ulong.MaxValue, "application/json", JsonSchemaType.Integer, "uint64"],
+        [() => new Uri("http://example.com"), "application/json", JsonSchemaType.String, "uri"]
     ];
 
     [Theory]
     [MemberData(nameof(ResponsesWithPrimitiveTypes))]
-    public async Task GetOpenApiResponse_HandlesResponsesWithPrimitiveTypes(Delegate requestHandler, string contentType, string schemaType, string schemaFormat)
+    public async Task GetOpenApiResponse_HandlesResponsesWithPrimitiveTypes(Delegate requestHandler, string contentType, JsonSchemaType schemaType, string schemaFormat)
     {
         // Arrange
         var builder = CreateBuilder();
@@ -42,7 +42,7 @@ public async Task GetOpenApiResponse_HandlesResponsesWithPrimitiveTypes(Delegate
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue(contentType, out var mediaType));
@@ -63,33 +63,33 @@ public async Task GetOpenApiResponse_HandlesPocoResponse()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
         });
@@ -107,35 +107,56 @@ public async Task GetOpenApiResponse_GeneratesSchemaForPoco_WithValidationAttrib
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Get];
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
             var response = operation.Responses["200"];
 
             Assert.NotNull(response);
             var content = Assert.Single(response.Content);
             Assert.Equal("application/json", content.Key);
             Assert.NotNull(content.Value.Schema);
-            var schema = content.Value.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = content.Value.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
-                    Assert.Equal(1, property.Value.Minimum);
-                    Assert.Equal(100, property.Value.Maximum);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                    Assert.Equal("1", property.Value.Minimum);
+                    Assert.Equal("100", property.Value.Maximum);
                 },
                 property =>
                 {
                     Assert.Equal("name", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal(5, property.Value.MinLength);
+                    Assert.Equal(10, property.Value.MaxLength);
+                    Assert.Null(property.Value.Default);
+                },
+                property =>
+                {
+                    Assert.Equal("description", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                    Assert.Equal(5, property.Value.MinLength);
+                    Assert.Equal(10, property.Value.MaxLength);
                 },
                 property =>
                 {
                     Assert.Equal("isPrivate", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
-                    var defaultValue = Assert.IsAssignableFrom<OpenApiBoolean>(property.Value.Default);
-                    Assert.True(defaultValue.Value);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
+                    Assert.True(property.Value.Default.GetValue<bool>());
+                },
+                property =>
+                {
+                    Assert.Equal("items", property.Key);
+                    Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, property.Value.Type);
+                    Assert.Equal(10, property.Value.MaxItems);
+                },
+                property =>
+                {
+                    Assert.Equal("tags", property.Key);
+                    Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, property.Value.Type);
+                    Assert.Equal(5, property.Value.MinItems);
+                    Assert.Equal(10, property.Value.MaxItems);
                 });
 
         });
@@ -156,33 +177,141 @@ public async Task GetOpenApiResponse_HandlesNullablePocoResponse()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.NotNull(schema.OneOf);
+            Assert.Equal(2, schema.OneOf.Count);
+            // Check that the oneOf consists of a nullable schema and the GetTodo schema
+            Assert.Collection(schema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Object, item.Type);
+                    Assert.Collection(item.Properties,
+                        property =>
+                        {
+                            Assert.Equal("id", property.Key);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("title", property.Key);
+                            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("completed", property.Key);
+                            Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("createdAt", property.Key);
+                            Assert.Equal(JsonSchemaType.String, property.Value.Type);
+                            Assert.Equal("date-time", property.Value.Format);
+                        });
+                });
+
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiResponse_HandlesNullablePocoTaskResponse()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        static Task<Todo?> GetTodoAsync() => Task.FromResult(Random.Shared.Next() < 0.5 ? new Todo(1, "Test Title", true, DateTime.Now) : null);
+        builder.MapGet("/api", GetTodoAsync);
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
+            var responses = Assert.Single(operation.Responses);
+            var response = responses.Value;
+            Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("id", property.Key);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                    Assert.Equal("int32", property.Value.Format);
+                },
+                property =>
+                {
+                    Assert.Equal("title", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                },
+                property =>
+                {
+                    Assert.Equal("completed", property.Key);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
+                },
+                property =>
+                {
+                    Assert.Equal("createdAt", property.Key);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
+                    Assert.Equal("date-time", property.Value.Format);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiResponse_HandlesNullablePocoValueTaskResponse()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        static ValueTask<Todo?> GetTodoValueTaskAsync() => ValueTask.FromResult(Random.Shared.Next() < 0.5 ? new Todo(1, "Test Title", true, DateTime.Now) : null);
+        builder.MapGet("/api", GetTodoValueTaskAsync);
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
+            var responses = Assert.Single(operation.Responses);
+            var response = responses.Value;
+            Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
         });
@@ -200,16 +329,224 @@ public async Task GetOpenApiResponse_RespectsRequiredAttributeOnBodyProperties()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/required-properties"].Operations[OperationType.Post];
+            var operation = document.Paths["/required-properties"].Operations[HttpMethod.Post];
             var response = operation.Responses["200"];
             var content = Assert.Single(response.Content);
-            var schema = content.Value.Schema.GetEffective(document);
+            var schema = content.Value.Schema;
             Assert.Collection(schema.Required,
                 property => Assert.Equal("title", property),
                 property => Assert.Equal("completed", property));
         });
     }
 
+    [Fact]
+    public async Task GetOpenApiResponse_HandlesNullableValueTypeResponse()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        static Point? GetNullablePoint() => Random.Shared.Next() < 0.5 ? new Point { X = 10, Y = 20 } : null;
+        builder.MapGet("/api/nullable-point", GetNullablePoint);
+
+        static Coordinate? GetNullableCoordinate() => Random.Shared.Next() < 0.5 ? new Coordinate(1.5, 2.5) : null;
+        builder.MapGet("/api/nullable-coordinate", GetNullableCoordinate);
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable Point response
+            var pointOperation = document.Paths["/api/nullable-point"].Operations[HttpMethod.Get];
+            var pointResponses = Assert.Single(pointOperation.Responses);
+            var pointResponse = pointResponses.Value;
+            Assert.True(pointResponse.Content.TryGetValue("application/json", out var pointMediaType));
+            var pointSchema = pointMediaType.Schema;
+            Assert.NotNull(pointSchema.OneOf);
+            Assert.Equal(2, pointSchema.OneOf.Count);
+            Assert.Collection(pointSchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Object, item.Type);
+                    Assert.Collection(item.Properties,
+                        property =>
+                        {
+                            Assert.Equal("x", property.Key);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("y", property.Key);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
+                        });
+                });
+
+            // Verify nullable Coordinate response
+            var coordinateOperation = document.Paths["/api/nullable-coordinate"].Operations[HttpMethod.Get];
+            var coordinateResponses = Assert.Single(coordinateOperation.Responses);
+            var coordinateResponse = coordinateResponses.Value;
+            Assert.True(coordinateResponse.Content.TryGetValue("application/json", out var coordinateMediaType));
+            var coordinateSchema = coordinateMediaType.Schema;
+            Assert.NotNull(coordinateSchema.OneOf);
+            Assert.Equal(2, coordinateSchema.OneOf.Count);
+            Assert.Collection(coordinateSchema.OneOf,
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Null, item.Type);
+                },
+                item =>
+                {
+                    Assert.NotNull(item);
+                    Assert.Equal(JsonSchemaType.Object, item.Type);
+                    Assert.Collection(item.Properties,
+                        property =>
+                        {
+                            Assert.Equal("latitude", property.Key);
+                            Assert.Equal(JsonSchemaType.Number, property.Value.Type);
+                            Assert.Equal("double", property.Value.Format);
+                        },
+                        property =>
+                        {
+                            Assert.Equal("longitude", property.Key);
+                            Assert.Equal(JsonSchemaType.Number, property.Value.Type);
+                            Assert.Equal("double", property.Value.Format);
+                        });
+                });
+
+            // Assert that Point and Coordinates are the only schemas defined at the top-level
+            Assert.Equal(["Coordinate", "Point"], [.. document.Components.Schemas.Keys]);
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiResponse_HandlesNullableCollectionResponsesWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        static List<Todo>? GetNullableTodos() => Random.Shared.Next() < 0.5 ?
+            [new Todo(1, "Test", true, DateTime.Now)] : null;
+        static Todo[]? GetNullableTodoArray() => Random.Shared.Next() < 0.5 ?
+            [new Todo(1, "Test", true, DateTime.Now)] : null;
+        static IEnumerable<Todo>? GetNullableTodoEnumerable() => Random.Shared.Next() < 0.5 ?
+            [new Todo(1, "Test", true, DateTime.Now)] : null;
+
+        builder.MapGet("/api/nullable-list", GetNullableTodos);
+        builder.MapGet("/api/nullable-array", GetNullableTodoArray);
+        builder.MapGet("/api/nullable-enumerable", GetNullableTodoEnumerable);
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable List<Todo> response uses oneOf
+            var listOperation = document.Paths["/api/nullable-list"].Operations[HttpMethod.Get];
+            var listResponse = Assert.Single(listOperation.Responses).Value;
+            Assert.True(listResponse.Content.TryGetValue("application/json", out var listMediaType));
+            var listSchema = listMediaType.Schema;
+            Assert.NotNull(listSchema.OneOf);
+            Assert.Equal(2, listSchema.OneOf.Count);
+            Assert.Collection(listSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item =>
+                {
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                });
+
+            // Verify nullable Todo[] response uses oneOf
+            var arrayOperation = document.Paths["/api/nullable-array"].Operations[HttpMethod.Get];
+            var arrayResponse = Assert.Single(arrayOperation.Responses).Value;
+            Assert.True(arrayResponse.Content.TryGetValue("application/json", out var arrayMediaType));
+            var arraySchema = arrayMediaType.Schema;
+            Assert.NotNull(arraySchema.OneOf);
+            Assert.Equal(2, arraySchema.OneOf.Count);
+            Assert.Collection(arraySchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item =>
+                {
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                });
+
+            // Verify nullable IEnumerable<Todo> response uses oneOf
+            var enumerableOperation = document.Paths["/api/nullable-enumerable"].Operations[HttpMethod.Get];
+            var enumerableResponse = Assert.Single(enumerableOperation.Responses).Value;
+            Assert.True(enumerableResponse.Content.TryGetValue("application/json", out var enumerableMediaType));
+            var enumerableSchema = enumerableMediaType.Schema;
+            Assert.NotNull(enumerableSchema.OneOf);
+            Assert.Equal(2, enumerableSchema.OneOf.Count);
+            Assert.Collection(enumerableSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item =>
+                {
+                    Assert.Equal(JsonSchemaType.Array, item.Type);
+                    Assert.NotNull(item.Items);
+                    Assert.Equal("Todo", ((OpenApiSchemaReference)item.Items).Reference.Id);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOpenApiResponse_HandlesNullableEnumResponsesWithOneOf()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        // Act
+#nullable enable
+        static Status? GetNullableStatus() => Random.Shared.Next() < 0.5 ? Status.Approved : null;
+        static TaskStatus? GetNullableTaskStatus() => Random.Shared.Next() < 0.5 ? TaskStatus.Running : null;
+
+        builder.MapGet("/api/nullable-status", GetNullableStatus);
+        builder.MapGet("/api/nullable-task-status", GetNullableTaskStatus);
+#nullable restore
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            // Verify nullable Status (with string converter) response uses oneOf
+            var statusOperation = document.Paths["/api/nullable-status"].Operations[HttpMethod.Get];
+            var statusResponse = Assert.Single(statusOperation.Responses).Value;
+            Assert.True(statusResponse.Content.TryGetValue("application/json", out var statusMediaType));
+            var statusSchema = statusMediaType.Schema;
+            Assert.NotNull(statusSchema.OneOf);
+            Assert.Equal(2, statusSchema.OneOf.Count);
+            Assert.Collection(statusSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item =>
+                {
+                    // Status has string enum converter, so it should be a reference to the enum schema
+                    Assert.Equal("Status", ((OpenApiSchemaReference)item).Reference.Id);
+                });
+
+            // Verify nullable TaskStatus (without converter) response uses oneOf
+            var taskStatusOperation = document.Paths["/api/nullable-task-status"].Operations[HttpMethod.Get];
+            var taskStatusResponse = Assert.Single(taskStatusOperation.Responses).Value;
+            Assert.True(taskStatusResponse.Content.TryGetValue("application/json", out var taskStatusMediaType));
+            var taskStatusSchema = taskStatusMediaType.Schema;
+            Assert.NotNull(taskStatusSchema.OneOf);
+            Assert.Equal(2, taskStatusSchema.OneOf.Count);
+            Assert.Collection(taskStatusSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal(JsonSchemaType.Integer, item.Type));
+        });
+    }
+
     [Fact]
     public async Task GetOpenApiResponse_HandlesInheritedTypeResponse()
     {
@@ -222,45 +559,43 @@ public async Task GetOpenApiResponse_HandlesInheritedTypeResponse()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("dueDate", property.Key);
                     // DateTime schema appears twice in the document so we expect
                     // this to map to a reference ID.
-                    var dateTimeSchema = property.Value.GetEffective(document);
-                    Assert.Equal("string", dateTimeSchema.Type);
+                    var dateTimeSchema = property.Value;
+                    Assert.Equal(JsonSchemaType.String, dateTimeSchema.Type);
                     Assert.Equal("date-time", dateTimeSchema.Format);
                 },
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    // DateTime schema appears twice in the document so we expect
-                    // this to map to a reference ID.
-                    var dateTimeSchema = property.Value.GetEffective(document);
-                    Assert.Equal("string", dateTimeSchema.Type);
+                    var dateTimeSchema = property.Value;
+                    Assert.Equal(JsonSchemaType.String, dateTimeSchema.Type);
                     Assert.Equal("date-time", dateTimeSchema.Format);
                 });
         });
@@ -278,57 +613,57 @@ public async Task GetOpenApiResponse_HandlesGenericResponse()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("isSuccessful", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("value", property.Key);
-                    var propertyValue = property.Value.GetEffective(document);
-                    Assert.Equal("object", propertyValue.Type);
+                    var propertyValue = property.Value;
+                    Assert.Equal(JsonSchemaType.Object, propertyValue.Type);
                     Assert.Collection(propertyValue.Properties,
                     property =>
                     {
                         Assert.Equal("id", property.Key);
-                        Assert.Equal("integer", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                         Assert.Equal("int32", property.Value.Format);
                     }, property =>
                     {
                         Assert.Equal("title", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     }, property =>
                     {
                         Assert.Equal("completed", property.Key);
-                        Assert.Equal("boolean", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                     }, property =>
                     {
                         Assert.Equal("createdAt", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String, property.Value.Type);
                         Assert.Equal("date-time", property.Value.Format);
                     });
                 },
                 property =>
                 {
                     Assert.Equal("error", property.Key);
-                    var propertyValue = property.Value.GetEffective(document);
-                    Assert.Equal("object", propertyValue.Type);
+                    var propertyValue = property.Value;
+                    Assert.Equal(JsonSchemaType.Object, propertyValue.Type);
                     Assert.Collection(propertyValue.Properties, property =>
                     {
                         Assert.Equal("code", property.Key);
-                        Assert.Equal("integer", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     }, property =>
                     {
                         Assert.Equal("message", property.Key);
-                        Assert.Equal("string", property.Value.Type);
+                        Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                     });
                 });
         });
@@ -346,30 +681,30 @@ public async Task GetOpenApiResponse_HandlesPolymorphicResponseWithoutDiscrimina
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
-            Assert.Empty(schema.AnyOf);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Null(schema.AnyOf);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("length", property.Key);
-                    Assert.Equal("number", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Number, property.Value.Type);
                     Assert.Equal("double", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("wheels", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("make", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 });
         });
     }
@@ -386,51 +721,50 @@ public async Task GetOpenApiResponse_HandlesResultOfAnonymousType()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Get];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("name", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("todo", property.Key);
-                    Assert.NotNull(property.Value.Reference);
-                    var propertyValue = property.Value.GetEffective(document);
-                    Assert.Equal("object", propertyValue.Type);
+                    var propertyValue = property.Value;
+                    Assert.Equal(JsonSchemaType.Object, propertyValue.Type);
                     Assert.Collection(propertyValue.Properties,
                         property =>
                         {
                             Assert.Equal("id", property.Key);
-                            Assert.Equal("integer", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                             Assert.Equal("int32", property.Value.Format);
                         },
                         property =>
                         {
                             Assert.Equal("title", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                         },
                         property =>
                         {
                             Assert.Equal("completed", property.Key);
-                            Assert.Equal("boolean", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                         },
                         property =>
                         {
                             Assert.Equal("createdAt", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String, property.Value.Type);
                             Assert.Equal("date-time", property.Value.Format);
                         });
                 });
@@ -449,36 +783,36 @@ public async Task GetOpenApiResponse_HandlesListOf()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Get];
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("array", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Array, schema.Type);
             Assert.NotNull(schema.Items);
-            var effectiveItemsSchema = schema.Items.GetEffective(document);
-            Assert.Equal("object", effectiveItemsSchema.Type);
+            var effectiveItemsSchema = schema.Items;
+            Assert.Equal(JsonSchemaType.Object, effectiveItemsSchema.Type);
             Assert.Collection(effectiveItemsSchema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
         });
@@ -498,66 +832,65 @@ public async Task GetOpenApiResponse_HandlesGenericType()
         // OpenAPI 3.1.0.
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Get];
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("pageIndex", property.Key);
-                    Assert.Equal("integer", property.Value.GetEffective(document).Type);
-                    Assert.Equal("int32", property.Value.GetEffective(document).Format);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                    Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("pageSize", property.Key);
-                    Assert.Equal("integer", property.Value.GetEffective(document).Type);
-                    Assert.Equal("int32", property.Value.GetEffective(document).Format);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                    Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("totalItems", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                     Assert.Equal("int64", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("totalPages", property.Key);
-                    Assert.Equal("integer", property.Value.GetEffective(document).Type);
-                    Assert.Equal("int32", property.Value.GetEffective(document).Format);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                    Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("items", property.Key);
-                    Assert.Equal("array", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Null | JsonSchemaType.Array, property.Value.Type);
                     Assert.NotNull(property.Value.Items);
-                    Assert.NotNull(property.Value.Items.Reference);
-                    Assert.Equal("object", property.Value.Items.GetEffective(document).Type);
-                    var itemsValue = property.Value.Items.GetEffective(document);
+                    Assert.Equal(JsonSchemaType.Object, property.Value.Items.Type);
+                    var itemsValue = property.Value.Items;
                     Assert.Collection(itemsValue.Properties,
                         property =>
                         {
                             Assert.Equal("id", property.Key);
-                            Assert.Equal("integer", property.Value.GetEffective(document).Type);
-                            Assert.Equal("int32", property.Value.GetEffective(document).Format);
+                            Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
+                            Assert.Equal("int32", property.Value.Format);
                         },
                         property =>
                         {
                             Assert.Equal("title", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                         },
                         property =>
                         {
                             Assert.Equal("completed", property.Key);
-                            Assert.Equal("boolean", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                         },
                         property =>
                         {
                             Assert.Equal("createdAt", property.Key);
-                            Assert.Equal("string", property.Value.Type);
+                            Assert.Equal(JsonSchemaType.String, property.Value.Type);
                             Assert.Equal("date-time", property.Value.Format);
                         });
                 });
@@ -579,47 +912,47 @@ public async Task GetOpenApiResponse_HandlesValidationProblem()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Get];
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/problem+json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("type", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("status", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer | JsonSchemaType.Null, property.Value.Type);
                     Assert.Equal("int32", property.Value.Format);
                 },
                 property =>
                 {
                     Assert.Equal("detail", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("instance", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("errors", property.Key);
-                    Assert.Equal("object", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Object, property.Value.Type);
                     // The errors object is a dictionary of string[]. Use `additionalProperties`
                     // to indicate that the payload can be arbitrary keys with string[] values.
-                    Assert.Equal("array", property.Value.AdditionalProperties.Type);
-                    Assert.Equal("string", property.Value.AdditionalProperties.Items.GetEffective(document).Type);
+                    Assert.Equal(JsonSchemaType.Array, property.Value.AdditionalProperties.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.AdditionalProperties.Items.Type);
                 });
         });
     }
@@ -637,24 +970,24 @@ public async Task GetOpenApiResponse_SupportsObjectTypeProperty()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Get];
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("object", property.Key);
                     Assert.Null(property.Value.Type);
-                    Assert.False(property.Value.Nullable);
                 },
                 property =>
                 {
                     Assert.Equal("anotherObject", property.Key);
                     Assert.Null(property.Value.Type);
-                    Assert.Equal(32, ((OpenApiInteger)property.Value.Default).Value);
+                    var defaultValue = Assert.IsAssignableFrom<JsonNode>(property.Value.Default);
+                    Assert.Equal(32, defaultValue.GetValue<int>());
                     Assert.Equal("This is a description", property.Value.Description);
                 });
         });
@@ -667,32 +1000,32 @@ public async Task GetOpenApiResponse_SupportsProducesWithProducesResponseTypeOnC
 
         await VerifyOpenApiDocument(actionDescriptor, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Get];
+            var operation = document.Paths["/"].Operations[HttpMethod.Get];
             var responses = Assert.Single(operation.Responses);
             var response = responses.Value;
             Assert.True(response.Content.TryGetValue("application/json", out var mediaType));
-            var schema = mediaType.Schema.GetEffective(document);
-            Assert.Equal("object", schema.Type);
+            var schema = mediaType.Schema;
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
             Assert.Collection(schema.Properties,
                 property =>
                 {
                     Assert.Equal("id", property.Key);
-                    Assert.Equal("integer", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Integer, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("title", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("completed", property.Key);
-                    Assert.Equal("boolean", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.Boolean, property.Value.Type);
                 },
                 property =>
                 {
                     Assert.Equal("createdAt", property.Key);
-                    Assert.Equal("string", property.Value.Type);
+                    Assert.Equal(JsonSchemaType.String, property.Value.Type);
                     Assert.Equal("date-time", property.Value.Format);
                 });
         });
@@ -715,4 +1048,22 @@ private class ClassWithObjectProperty
         [DefaultValue(32)]
         public object AnotherObject { get; set; }
     }
+
+    private struct Point
+    {
+        public int X { get; set; }
+        public int Y { get; set; }
+    }
+
+    private readonly struct Coordinate
+    {
+        public double Latitude { get; }
+        public double Longitude { get; }
+
+        public Coordinate(double latitude, double longitude)
+        {
+            Latitude = latitude;
+            Longitude = longitude;
+        }
+    }
 }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Shared/SharedTypes.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Shared/SharedTypes.cs
index 0f9050ea995f..2719543862a6 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Shared/SharedTypes.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Shared/SharedTypes.cs
@@ -10,52 +10,159 @@
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Http;
 
+/// <summary>
+/// Represents a to-do item.
+/// </summary>
+/// <param name="Id">The unique identifier of the to-do item.</param>
+/// <param name="Title">The title of the to-do item.</param>
+/// <param name="Completed">Indicates whether the to-do item is completed.</param>
+/// <param name="CreatedAt">The date and time when the to-do item was created.</param>
 internal record Todo(int Id, string Title, bool Completed, DateTime CreatedAt);
 
+/// <summary>
+/// Represents a to-do item with a due date.
+/// </summary>
+/// <param name="Id">The unique identifier of the to-do item.</param>
+/// <param name="Title">The title of the to-do item.</param>
+/// <param name="Completed">Indicates whether the to-do item is completed.</param>
+/// <param name="CreatedAt">The date and time when the to-do item was created.</param>
+/// <param name="DueDate">The due date of the to-do item.</param>
 internal record TodoWithDueDate(int Id, string Title, bool Completed, DateTime CreatedAt, DateTime DueDate) : Todo(Id, Title, Completed, CreatedAt);
 
+/// <summary>
+/// Represents an error.
+/// </summary>
+/// <param name="Code">The error code.</param>
+/// <param name="Message">The error message.</param>
 internal record Error(int Code, string Message);
 
+/// <summary>
+/// Represents a resume upload.
+/// </summary>
+/// <param name="Name">The name of the resume.</param>
+/// <param name="Description">The description of the resume.</param>
+/// <param name="Resume">The resume file.</param>
 internal record ResumeUpload(string Name, string Description, IFormFile Resume);
 
+/// <summary>
+/// Represents a result of an operation.
+/// </summary>
+/// <typeparam name="T">The type of the value.</typeparam>
+/// <param name="IsSuccessful">Indicates whether the operation was successful.</param>
+/// <param name="Value">The value of the result.</param>
+/// <param name="Error">The error associated with the result, if any.</param>
 internal record Result<T>(bool IsSuccessful, T Value, Error Error);
 
+/// <summary>
+/// Represents a vehicle.
+/// </summary>
 internal class Vehicle
 {
+    /// <summary>
+    /// Gets or sets the number of wheels.
+    /// </summary>
     public int Wheels { get; set; }
+
+    /// <summary>
+    /// Gets or sets the make of the vehicle.
+    /// </summary>
     public string Make { get; set; } = string.Empty;
 }
 
+/// <summary>
+/// Represents a car.
+/// </summary>
 internal class Car : Vehicle
 {
+    /// <summary>
+    /// Gets or sets the number of doors.
+    /// </summary>
     public int Doors { get; set; }
 }
 
+/// <summary>
+/// Represents a boat.
+/// </summary>
 internal class Boat : Vehicle
 {
+    /// <summary>
+    /// Gets or sets the length of the boat.
+    /// </summary>
     public double Length { get; set; }
 }
 
+/// <summary>
+/// Represents the status of an operation.
+/// </summary>
 [JsonConverter(typeof(JsonStringEnumConverter<Status>))]
 internal enum Status
 {
+    /// <summary>
+    /// The operation is pending.
+    /// </summary>
     Pending,
+
+    /// <summary>
+    /// The operation is approved.
+    /// </summary>
     Approved,
+
+    /// <summary>
+    /// The operation is rejected.
+    /// </summary>
     Rejected
 }
 
+/// <summary>
+/// Represents a proposal.
+/// </summary>
 internal class Proposal
 {
+    /// <summary>
+    /// Gets or sets the proposal element.
+    /// </summary>
     public required Proposal ProposalElement { get; set; }
+
+    /// <summary>
+    /// Gets or sets the stream associated with the proposal.
+    /// </summary>
     public required Stream Stream { get; set; }
 }
 
+/// <summary>
+/// Represents a paginated collection of items.
+/// </summary>
+/// <typeparam name="T">The type of items contained in the collection. Must be a reference type.</typeparam>
+/// <param name="pageIndex">The current page index (zero-based).</param>
+/// <param name="pageSize">The number of items per page.</param>
+/// <param name="totalItems">The total number of items in the collection.</param>
+/// <param name="totalPages">The total number of pages available.</param>
+/// <param name="items">The collection of items for the current page.</param>
 internal class PaginatedItems<T>(int pageIndex, int pageSize, long totalItems, int totalPages, IEnumerable<T> items) where T : class
 {
+    /// <summary>
+    /// Gets or sets the current page index (zero-based).
+    /// </summary>
     public int PageIndex { get; set; } = pageIndex;
+
+    /// <summary>
+    /// Gets or sets the number of items per page.
+    /// </summary>
     public int PageSize { get; set; } = pageSize;
+
+    /// <summary>
+    /// Gets or sets the total number of items in the collection.
+    /// </summary>
     public long TotalItems { get; set; } = totalItems;
+
+    /// <summary>
+    /// Gets or sets the total number of pages available.
+    /// </summary>
     public int TotalPages { get; set; } = totalPages;
+
+    /// <summary>
+    /// Gets or sets the collection of items for the current page.
+    /// </summary>
     public IEnumerable<T> Items { get; set; } = items;
 }
 
@@ -76,13 +183,29 @@ internal class ProjectBoard
     public int Id { get; set; }
 
     [MinLength(5)]
+    [MaxLength(10)]
     [DefaultValue(null)]
     [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Used in tests.")]
     public string? Name { get; set; }
 
+    [Length(5, 10)]
+    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Used in tests.")]
+    public string? Description { get; set; }
+
     [DefaultValue(true)]
     public required bool IsPrivate { get; set; }
+
+    [MaxLength(10)]
+    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Used in tests.")]
+    public IList<ProjectBoardItem>? Items { get; set; }
+
+    [Length(5, 10)]
+    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "Used in tests.")]
+    public IEnumerable<string>? Tags { get; set; }
 }
+
+internal sealed record ProjectBoardItem(string Name);
+
 #nullable restore
 
 internal class Account
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/CustomSchemaTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/CustomSchemaTransformerTests.cs
new file mode 100644
index 000000000000..1de9451beec0
--- /dev/null
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/CustomSchemaTransformerTests.cs
@@ -0,0 +1,546 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OpenApi;
+using Microsoft.Extensions.DependencyInjection;
+
+public class CustomSchemaTransformerTests : OpenApiDocumentServiceTestBase
+{
+    [Fact]
+    public async Task CustomSchemaTransformer_CanInsertSchemaIntoDocumentFromOperationTransformer()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapGet("/error", () => { });
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            if (context.Description.RelativePath == "error")
+            {
+                var errorSchema = await context.GetOrCreateSchemaAsync(typeof(ProblemDetails), cancellationToken: cancellationToken);
+                context.Document.AddComponent("Error", errorSchema);
+                operation.Responses["500"] = new OpenApiResponse
+                {
+                    Description = "Error",
+                    Content = new Dictionary<string, OpenApiMediaType>()
+                    {
+                        ["application/problem+json"] = new OpenApiMediaType
+                        {
+                            Schema = new OpenApiSchemaReference("Error", context.Document),
+                        },
+                    },
+                };
+            }
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            var schema = Assert.Single(document.Components.Schemas);
+            Assert.Equal("Error", schema.Key);
+            var targetSchema = Assert.IsType<OpenApiSchema>(schema.Value);
+            Assert.Collection(targetSchema.Properties,
+                property =>
+                {
+                    Assert.Equal("type", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                },
+                property =>
+                {
+                    Assert.Equal("title", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                },
+                property =>
+                {
+                    Assert.Equal("status", property.Key);
+                    Assert.Equal(JsonSchemaType.Integer | JsonSchemaType.Null, property.Value.Type);
+                },
+                property =>
+                {
+                    Assert.Equal("detail", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                },
+                property =>
+                {
+                    Assert.Equal("instance", property.Key);
+                    Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, property.Value.Type);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchema_AddsSchemasForMultipleResponseTypes()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapGet("/api", () => TypedResults.Ok(new Todo(1, "Task", false, DateTime.Now)));
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            var todoSchema = await context.GetOrCreateSchemaAsync(typeof(Todo), cancellationToken: cancellationToken);
+            context.Document.AddComponent("Todo2", todoSchema);
+
+            var errorSchema = await context.GetOrCreateSchemaAsync(typeof(ProblemDetails), cancellationToken: cancellationToken);
+            context.Document.AddComponent("ProblemDetails", errorSchema);
+
+            // Add both success and error responses
+            operation.Responses["200"] = new OpenApiResponse
+            {
+                Description = "Success",
+                Content = new Dictionary<string, OpenApiMediaType>()
+                {
+                    ["application/json"] = new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchemaReference("Todo2", context.Document),
+                    },
+                },
+            };
+
+            operation.Responses["400"] = new OpenApiResponse
+            {
+                Description = "Bad Request",
+                Content = new Dictionary<string, OpenApiMediaType>()
+                {
+                    ["application/problem+json"] = new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchemaReference("ProblemDetails", context.Document),
+                    },
+                },
+            };
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            Assert.Collection(document.Components.Schemas.Keys,
+                key => Assert.Equal("ProblemDetails", key),
+                key => Assert.Equal("Todo", key),
+                key => Assert.Equal("Todo2", key));
+
+            var todoSchema = document.Components.Schemas["Todo2"];
+            Assert.Equal(4, todoSchema.Properties.Count);
+            Assert.True(todoSchema.Properties.ContainsKey("id"));
+            Assert.True(todoSchema.Properties.ContainsKey("title"));
+            Assert.True(todoSchema.Properties.ContainsKey("completed"));
+            Assert.True(todoSchema.Properties.ContainsKey("createdAt"));
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchema_CanBeUsedInSchemaTransformer()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapPost("/shape", (Shape shape) => new Triangle { Hypotenuse = 25 });
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddSchemaTransformer(async (schema, context, cancellationToken) =>
+        {
+            // Only transform the base Shape class schema
+            if (context.JsonTypeInfo.Type == typeof(Shape))
+            {
+                // Create an example schema to reference in our documentation
+                var exampleSchema = await context.GetOrCreateSchemaAsync(typeof(Triangle), cancellationToken: cancellationToken);
+                context.Document.AddComponent("TriangleExample", exampleSchema);
+
+                // Add a reference to the example in the shape schema
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                schema.Extensions["x-example-component"] = new JsonNodeExtension("#/components/schemas/TriangleExample");
+                schema.Description = "A shape with an example reference";
+            }
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            // Verify we have our TriangleExample component
+            Assert.True(document.Components.Schemas.ContainsKey("TriangleExample"));
+
+            // Verify the base Shape schema has our extension
+            var shapeSchema = document.Components.Schemas["Shape"];
+
+            Assert.NotNull(shapeSchema);
+            Assert.Equal("A shape with an example reference", shapeSchema.Description);
+            Assert.True(shapeSchema.Extensions.ContainsKey("x-example-component"));
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchema_CreatesDifferentSchemaForSameTypeWithDifferentParameterDescription()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapPost("/items", (int id, [FromQuery] int limit) => { });
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            // Get the parameter descriptions associated with the type
+            var idParam = context.Description.ParameterDescriptions.FirstOrDefault(p => p.Name == "id");
+            var limitParam = context.Description.ParameterDescriptions.FirstOrDefault(p => p.Name == "limit");
+
+            // Get schemas for same type but different parameter descriptions
+            var idSchema = await context.GetOrCreateSchemaAsync(typeof(int), idParam, cancellationToken);
+            var limitSchema = await context.GetOrCreateSchemaAsync(typeof(int), limitParam, cancellationToken);
+
+            // Add schemas to document
+            context.Document.AddComponent("IdParameter", idSchema);
+            context.Document.AddComponent("LimitParameter", limitSchema);
+
+            // Use schemas in custom parameter
+            operation.Parameters.Add(new OpenApiParameter
+            {
+                Name = "custom-id",
+                In = ParameterLocation.Path,
+                Schema = new OpenApiSchemaReference("IdParameter", context.Document)
+            });
+
+            operation.Parameters.Add(new OpenApiParameter
+            {
+                Name = "custom-limit",
+                In = ParameterLocation.Query,
+                Schema = new OpenApiSchemaReference("LimitParameter", context.Document)
+            });
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            Assert.Equal(2, document.Components.Schemas.Count);
+            Assert.Contains("IdParameter", document.Components.Schemas.Keys);
+            Assert.Contains("LimitParameter", document.Components.Schemas.Keys);
+
+            // Both schemas should have the same base type properties
+            var idSchema = document.Components.Schemas["IdParameter"];
+            var limitSchema = document.Components.Schemas["LimitParameter"];
+
+            Assert.Equal(JsonSchemaType.Integer, idSchema.Type);
+            Assert.Equal(JsonSchemaType.Integer, limitSchema.Type);
+
+            // Operation should now have 4 parameters (2 original + 2 custom)
+            var operation = document.Paths["/items"].Operations[HttpMethod.Post];
+            Assert.Equal(4, operation.Parameters.Count);
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchema_WorksWithNestedTypes()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapGet("/api", () => new { });
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddDocumentTransformer(async (document, context, cancellationToken) =>
+        {
+            // Generate schema for a complex nested type
+            var nestedTypeSchema = await context.GetOrCreateSchemaAsync(typeof(NestedContainer), cancellationToken: cancellationToken);
+            document.AddComponent("NestedContainer", nestedTypeSchema);
+
+            // Add a new path that uses this schema
+            var path = new OpenApiPathItem();
+            var operation = new OpenApiOperation
+            {
+                OperationId = "GetNestedContainer",
+                Responses = new OpenApiResponses
+                {
+                    ["200"] = new OpenApiResponse
+                    {
+                        Description = "Success",
+                        Content = new Dictionary<string, OpenApiMediaType>()
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchemaReference("NestedContainer", document)
+                            }
+                        }
+                    }
+                }
+            };
+
+            path.Operations ??= [];
+            path.Operations[HttpMethod.Get] = operation;
+            document.Paths["/nested"] = path;
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            // Verify the schema was added
+            Assert.True(document.Components.Schemas.ContainsKey("NestedContainer"));
+
+            // Verify the path was added
+            Assert.True(document.Paths.ContainsKey("/nested"));
+
+            // Verify the schema structure
+            var containerSchema = document.Components.Schemas["NestedContainer"];
+            Assert.True(containerSchema.Properties.ContainsKey("items"));
+
+            // Verify array type for items
+            var itemsSchema = containerSchema.Properties["items"];
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, itemsSchema.Type);
+
+            // Component schemas are not generated for nested types
+            Assert.False(document.Components.Schemas.ContainsKey("NestedItem"));
+            Assert.True(itemsSchema.Items is OpenApiSchema);
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchemaAsync_AppliesOtherSchemaTransformers()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapGet("/product", () => new { });
+
+        // Define a transformation flag that we'll check later
+        var transformerApplied = false;
+        var nestedTransformerApplied = false;
+
+        // Act
+        var options = new OpenApiOptions();
+
+        // Add a schema transformer that will mark all Product schemas as required
+        options.AddSchemaTransformer((schema, context, cancellationToken) =>
+        {
+            if (context.JsonTypeInfo.Type == typeof(Product))
+            {
+                schema.Required ??= new HashSet<string>();
+                schema.Required.Add("name");
+                schema.Required.Add("price");
+                transformerApplied = true;
+            }
+
+            if (context.JsonTypeInfo.Type == typeof(Category))
+            {
+                schema.Description = "Transformed category description";
+                nestedTransformerApplied = true;
+            }
+
+            return Task.CompletedTask;
+        });
+
+        // Add an operation transformer that uses GetOrCreateSchemaAsync
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            // Generate a schema for Product
+            var productSchema = await context.GetOrCreateSchemaAsync(typeof(Product), cancellationToken: cancellationToken);
+
+            // Add it to the document
+            context.Document.AddComponent("ProductSchema", productSchema);
+
+            // Use it in the response
+            operation.Responses["200"] = new OpenApiResponse
+            {
+                Description = "A product",
+                Content = new Dictionary<string, OpenApiMediaType>()
+                {
+                    ["application/json"] = new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchemaReference("ProductSchema", context.Document)
+                    }
+                }
+            };
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            // Verify schema was created
+            Assert.True(document.Components.Schemas.ContainsKey("ProductSchema"));
+
+            // Get the schema
+            var schema = document.Components.Schemas["ProductSchema"];
+
+            // Verify schema properties
+            Assert.True(schema.Properties.ContainsKey("name"));
+            Assert.True(schema.Properties.ContainsKey("price"));
+            Assert.True(schema.Properties.ContainsKey("category"));
+
+            // Verify transformer was applied - it should have added required properties
+            Assert.True(transformerApplied);
+            Assert.Contains("name", schema.Required);
+            Assert.Contains("price", schema.Required);
+
+            // Verify transformer was also applied to nested schema
+            var categoryProperty = schema.Properties["category"];
+            Assert.True(nestedTransformerApplied);
+
+            Assert.Equal("Transformed category description", categoryProperty.Description);
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchemaAsync_HandlesConcurrentRequests()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+        builder.MapGet("/concurrent", () => new { });
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            // Generate schema concurrently for the same type
+            var tasks = new Task<OpenApiSchema>[5];
+            for (var i = 0; i < tasks.Length; i++)
+            {
+                tasks[i] = context.GetOrCreateSchemaAsync(typeof(ComplexType), cancellationToken: cancellationToken);
+            }
+
+            // Wait for all tasks to complete
+            var schemas = await Task.WhenAll(tasks);
+
+            // All schemas should be the same instance when added to components
+            for (var i = 0; i < schemas.Length; i++)
+            {
+                context.Document.AddComponent($"Schema{i}", schemas[i]);
+            }
+
+            // Use one of them in the response
+            operation.Responses["200"] = new OpenApiResponse
+            {
+                Description = "Concurrent schema generation test",
+                Content = new Dictionary<string, OpenApiMediaType>()
+                {
+                    ["application/json"] = new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchemaReference("Schema0", context.Document)
+                    }
+                }
+            };
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            // All schemas should be generated
+            for (var i = 0; i < 5; i++)
+            {
+                Assert.True(document.Components.Schemas.ContainsKey($"Schema{i}"));
+                // They should all have the same structure
+                var schema = document.Components.Schemas[$"Schema{i}"];
+
+                Assert.True(schema.Properties.ContainsKey("id"));
+                Assert.True(schema.Properties.ContainsKey("name"));
+                Assert.True(schema.Properties.ContainsKey("createdAt"));
+                Assert.True(schema.Properties.ContainsKey("tags"));
+                Assert.True(schema.Properties.ContainsKey("metadata"));
+            }
+        });
+    }
+
+    [Fact]
+    public async Task GetOrCreateSchemaAsync_RespectsJsonSerializerOptions()
+    {
+        // Arrange
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.Configure<JsonOptions>(options =>
+        {
+            options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+            options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+        });
+        var builder = CreateBuilder();
+        builder.MapGet("/customjson", () => new { });
+
+        // Act
+        var options = new OpenApiOptions();
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            // Generate schema that should respect JSON naming policy
+            var userSchema = await context.GetOrCreateSchemaAsync(typeof(UserWithJsonOptions), cancellationToken: cancellationToken);
+            context.Document.AddComponent("User", userSchema);
+
+            operation.Responses["200"] = new OpenApiResponse
+            {
+                Description = "User with custom JSON options",
+                Content = new Dictionary<string, OpenApiMediaType>()
+                {
+                    ["application/json"] = new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchemaReference("User", context.Document)
+                    }
+                }
+            };
+        });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, options, (document) =>
+        {
+            // Verify schema was created
+            Assert.True(document.Components.Schemas.ContainsKey("User"));
+
+            // Get the schema
+            var schema = document.Components.Schemas["User"];
+
+            // Property names should be camelCase due to the naming policy
+            Assert.True(schema.Properties.ContainsKey("firstName"));
+            Assert.True(schema.Properties.ContainsKey("lastName"));
+            Assert.True(schema.Properties.ContainsKey("dateOfBirth"));
+
+            // The ignored property should not be in the schema
+            Assert.False(schema.Properties.ContainsKey("temporaryData"));
+        });
+    }
+
+    // For the nested types test
+    internal class NestedContainer
+    {
+        public List<NestedItem> Items { get; set; } = [];
+        public string Name { get; set; } = "Container";
+    }
+
+    internal class NestedItem
+    {
+        public int Id { get; set; }
+        public string Value { get; set; } = string.Empty;
+    }
+
+    // Supporting classes for the test
+    internal class Product
+    {
+        public string Name { get; set; } = string.Empty;
+        public decimal Price { get; set; }
+        public Category Category { get; set; } = new();
+    }
+
+    internal class Category
+    {
+        public int Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+    }
+
+    internal class ComplexType
+    {
+        public int Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public DateTime CreatedAt { get; set; }
+        public List<string> Tags { get; set; } = [];
+        public Dictionary<string, object> Metadata { get; set; } = [];
+    }
+
+    internal class UserWithJsonOptions
+    {
+        public string FirstName { get; set; } = string.Empty;
+        public string LastName { get; set; } = string.Empty;
+        public DateOnly DateOfBirth { get; set; }
+
+        [JsonIgnore]
+        public string TemporaryData { get; set; } = string.Empty;
+    }
+
+}
+
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/DocumentTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/DocumentTransformerTests.cs
index 30bc6f82f7ca..c5f599e040d4 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/DocumentTransformerTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/DocumentTransformerTests.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
 
 public class DocumentTransformerTests : OpenApiDocumentServiceTestBase
 {
@@ -240,6 +239,89 @@ public async Task DocumentTransformer_CanAccessTransientServiceFromContextApplic
         Assert.Equal(2, Dependency.InstantiationCount);
     }
 
+    [Fact]
+    public async Task DocumentTransformer_RespectsOperationCancellation()
+    {
+        var builder = CreateBuilder();
+        builder.MapGet("/todo", () => { });
+
+        var options = new OpenApiOptions();
+        var transformerCalled = false;
+        var exceptionThrown = false;
+        var tcs = new TaskCompletionSource();
+
+        options.AddDocumentTransformer(async (document, context, cancellationToken) =>
+        {
+            transformerCalled = true;
+            try
+            {
+                await tcs.Task.WaitAsync(cancellationToken);
+                document.Info.Description = "Should not be set";
+            }
+            catch (OperationCanceledException)
+            {
+                exceptionThrown = true;
+                throw;
+            }
+        });
+
+        using var cts = new CancellationTokenSource();
+        cts.CancelAfter(1);
+
+        await Assert.ThrowsAsync<TaskCanceledException>(async () =>
+        {
+            await VerifyOpenApiDocument(builder, options, _ => { }, cts.Token);
+        });
+
+        Assert.True(transformerCalled);
+        Assert.True(exceptionThrown);
+    }
+
+    [Fact]
+    public async Task DocumentTransformer_ExecutesAsynchronously()
+    {
+        var builder = CreateBuilder();
+        builder.MapGet("/todo", () => { });
+
+        var options = new OpenApiOptions();
+        var transformerOrder = new List<int>();
+        var tcs1 = new TaskCompletionSource();
+        var tcs2 = new TaskCompletionSource();
+
+        options.AddDocumentTransformer(async (document, context, cancellationToken) =>
+        {
+            await tcs1.Task;
+            transformerOrder.Add(1);
+            document.Info.Title = "First";
+        });
+
+        options.AddDocumentTransformer((document, context, cancellationToken) =>
+        {
+            transformerOrder.Add(2);
+            document.Info.Title += " Second";
+            tcs2.TrySetResult();
+            return Task.CompletedTask;
+        });
+
+        options.AddDocumentTransformer(async (document, context, cancellationToken) =>
+        {
+            await tcs2.Task;
+            transformerOrder.Add(3);
+            document.Info.Title += " Third";
+        });
+
+        var documentTask = VerifyOpenApiDocument(builder, options, document =>
+        {
+            Assert.Equal("First Second Third", document.Info.Title);
+        });
+
+        tcs1.TrySetResult();
+
+        await documentTask;
+
+        Assert.Equal([1, 2, 3], transformerOrder);
+    }
+
     private class ActivatedTransformer : IOpenApiDocumentTransformer
     {
         public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerContext context, CancellationToken cancellationToken)
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs
index eecb520c1bb0..2979e5198444 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs
@@ -1,13 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public class OpenApiSchemaReferenceTransformerTests : OpenApiDocumentServiceTestBase
 {
@@ -24,11 +24,11 @@ public async Task IdenticalParameterTypesAreStoredWithSchemaReference()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var parameter = operation.RequestBody.Content["multipart/form-data"];
             var schema = parameter.Schema;
 
-            var operation2 = document.Paths["/api-2"].Operations[OperationType.Post];
+            var operation2 = document.Paths["/api-2"].Operations[HttpMethod.Post];
             var parameter2 = operation2.RequestBody.Content["multipart/form-data"];
             var schema2 = parameter2.Schema;
 
@@ -52,14 +52,17 @@ await VerifyOpenApiDocument(builder, document =>
             //       }
             //     }
             //   }
-            Assert.Equal(schema.Reference, schema2.Reference);
-
-            var effectiveSchema = schema.GetEffective(document);
-            Assert.Equal("object", effectiveSchema.Type);
-            Assert.Equal(1, effectiveSchema.Properties.Count);
-            var effectivePropertySchema = effectiveSchema.Properties["value"].GetEffective(document);
-            Assert.Equal("string", effectivePropertySchema.Type);
-            Assert.Equal("binary", effectivePropertySchema.Format);
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            var value = Assert.Single(schema.Properties).Value;
+            Assert.Equal("IFormFile", ((OpenApiSchemaReference)value).Reference.Id);
+
+            Assert.Equal(JsonSchemaType.Object, schema2.Type);
+            var value2 = Assert.Single(schema2.Properties).Value;
+            Assert.Equal("IFormFile", ((OpenApiSchemaReference)value2).Reference.Id);
+
+            var effectiveSchema = ((OpenApiSchemaReference)value).Target;
+            Assert.Equal(JsonSchemaType.String, effectiveSchema.Type);
+            Assert.Equal("binary", effectiveSchema.Format);
         });
     }
 
@@ -75,7 +78,7 @@ public async Task TodoInRequestBodyAndResponseUsesSchemaReference()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody.Content["application/json"];
             var requestBodySchema = requestBody.Schema;
 
@@ -100,19 +103,20 @@ await VerifyOpenApiDocument(builder, document =>
             //       }
             //     }
             //   }
-            Assert.Equal(requestBodySchema.Reference.Id, responseSchema.Reference.Id);
+            // }
+            Assert.Equal(((OpenApiSchemaReference)requestBodySchema).Reference.Id, ((OpenApiSchemaReference)responseSchema).Reference.Id);
 
-            var effectiveSchema = requestBodySchema.GetEffective(document);
-            Assert.Equal("object", effectiveSchema.Type);
+            var effectiveSchema = requestBodySchema;
+            Assert.Equal(JsonSchemaType.Object, effectiveSchema.Type);
             Assert.Equal(4, effectiveSchema.Properties.Count);
-            var effectiveIdSchema = effectiveSchema.Properties["id"].GetEffective(document);
-            Assert.Equal("integer", effectiveIdSchema.Type);
-            var effectiveTitleSchema = effectiveSchema.Properties["title"].GetEffective(document);
-            Assert.Equal("string", effectiveTitleSchema.Type);
-            var effectiveCompletedSchema = effectiveSchema.Properties["completed"].GetEffective(document);
-            Assert.Equal("boolean", effectiveCompletedSchema.Type);
-            var effectiveCreatedAtSchema = effectiveSchema.Properties["createdAt"].GetEffective(document);
-            Assert.Equal("string", effectiveCreatedAtSchema.Type);
+            var effectiveIdSchema = effectiveSchema.Properties["id"];
+            Assert.Equal(JsonSchemaType.Integer, effectiveIdSchema.Type);
+            var effectiveTitleSchema = effectiveSchema.Properties["title"];
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, effectiveTitleSchema.Type);
+            var effectiveCompletedSchema = effectiveSchema.Properties["completed"];
+            Assert.Equal(JsonSchemaType.Boolean, effectiveCompletedSchema.Type);
+            var effectiveCreatedAtSchema = effectiveSchema.Properties["createdAt"];
+            Assert.Equal(JsonSchemaType.String, effectiveCreatedAtSchema.Type);
         });
     }
 
@@ -129,13 +133,13 @@ public async Task SameTypeInDictionaryAndListTypesUsesReferenceIds()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody.Content["application/json"];
-            var requestBodySchema = requestBody.Schema.GetEffective(document);
+            var requestBodySchema = requestBody.Schema;
 
-            var operation2 = document.Paths["/api-2"].Operations[OperationType.Post];
+            var operation2 = document.Paths["/api-2"].Operations[HttpMethod.Post];
             var requestBody2 = operation2.RequestBody.Content["application/json"];
-            var requestBodySchema2 = requestBody2.Schema.GetEffective(document);
+            var requestBodySchema2 = requestBody2.Schema;
 
             // {
             //   "type": "array",
@@ -166,10 +170,10 @@ await VerifyOpenApiDocument(builder, document =>
             // }
 
             // Parent types of schemas are different
-            Assert.Equal("array", requestBodySchema.Type);
-            Assert.Equal("object", requestBodySchema2.Type);
+            Assert.Equal(JsonSchemaType.Array, requestBodySchema.Type);
+            Assert.Equal(JsonSchemaType.Object, requestBodySchema2.Type);
             // Values of the list and dictionary point to the same reference ID
-            Assert.Equal(requestBodySchema.Items.Reference.Id, requestBodySchema2.AdditionalProperties.Reference.Id);
+            Assert.Equal(((OpenApiSchemaReference)requestBodySchema.Items).Reference.Id, ((OpenApiSchemaReference)requestBodySchema2.AdditionalProperties).Reference.Id);
         });
     }
 
@@ -186,26 +190,26 @@ public async Task SameTypeInAllOfReferenceGetsHandledCorrectly()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody.Content["multipart/form-data"];
             var requestBodySchema = requestBody.Schema;
 
-            var operation2 = document.Paths["/api-2"].Operations[OperationType.Post];
+            var operation2 = document.Paths["/api-2"].Operations[HttpMethod.Post];
             var requestBody2 = operation2.RequestBody.Content["multipart/form-data"];
             var requestBodySchema2 = requestBody2.Schema;
 
             // Todo parameter (second parameter) in allOf for each operation should point to the same reference ID.
-            Assert.Equal(requestBodySchema.AllOf[1].Reference.Id, requestBodySchema2.AllOf[1].Reference.Id);
+            Assert.Equal(((OpenApiSchemaReference)requestBodySchema.AllOf[1]).Reference.Id, ((OpenApiSchemaReference)requestBodySchema2.AllOf[1]).Reference.Id);
 
             // IFormFile parameter should use inline schema since it only appears once in the application.
-            Assert.Equal("object", requestBodySchema.AllOf[0].Type);
-            Assert.Equal("string", requestBodySchema.AllOf[0].Properties["resume"].Type);
+            Assert.Equal(JsonSchemaType.Object, requestBodySchema.AllOf[0].Type);
+            Assert.Equal(JsonSchemaType.String, requestBodySchema.AllOf[0].Properties["resume"].Type);
             Assert.Equal("binary", requestBodySchema.AllOf[0].Properties["resume"].Format);
 
             // string parameter is not resolved to a top-level reference.
-            Assert.Equal("object", requestBodySchema2.AllOf[0].Type);
-            Assert.Null(requestBodySchema.AllOf[1].GetEffective(document).Properties["title"].Reference);
-            Assert.Null(requestBodySchema2.AllOf[1].GetEffective(document).Properties["title"].Reference);
+            Assert.Equal(JsonSchemaType.Object, requestBodySchema2.AllOf[0].Type);
+            Assert.IsNotType<OpenApiSchemaReference>(requestBodySchema.AllOf[1].Properties["title"]);
+            Assert.IsNotType<OpenApiSchemaReference>(requestBodySchema2.AllOf[1].Properties["title"]);
         });
     }
 
@@ -222,11 +226,11 @@ public async Task DifferentTypesWithSameSchemaMapToSameReferenceId()
         // Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.RequestBody.Content["application/json"];
             var requestBodySchema = requestBody.Schema;
 
-            var operation2 = document.Paths["/api-2"].Operations[OperationType.Post];
+            var operation2 = document.Paths["/api-2"].Operations[HttpMethod.Post];
             var requestBody2 = operation2.RequestBody.Content["application/json"];
             var requestBodySchema2 = requestBody2.Schema;
 
@@ -254,18 +258,18 @@ await VerifyOpenApiDocument(builder, document =>
             // }
 
             // Both list types should be inlined
-            Assert.Null(requestBodySchema.Reference);
-            Assert.Equal(requestBodySchema.Reference, requestBodySchema2.Reference);
+            Assert.IsNotType<OpenApiSchemaReference>(requestBodySchema);
+            Assert.IsNotType<OpenApiSchemaReference>(requestBodySchema2);
             // And have an `array` type
-            Assert.Equal("array", requestBodySchema.Type);
+            Assert.Equal(JsonSchemaType.Array, requestBodySchema.Type);
             // With an `items` sub-schema should consist of a $ref to Todo
-            Assert.Equal("Todo", requestBodySchema.Items.Reference.Id);
-            Assert.Equal(requestBodySchema.Items.Reference.Id, requestBodySchema2.Items.Reference.Id);
-            Assert.Equal(4, requestBodySchema.Items.GetEffective(document).Properties.Count);
+            Assert.Equal("Todo", ((OpenApiSchemaReference)requestBodySchema.Items).Reference.Id);
+            Assert.Equal(((OpenApiSchemaReference)requestBodySchema.Items).Reference.Id, ((OpenApiSchemaReference)requestBodySchema2.Items).Reference.Id);
+            Assert.Equal(4, requestBodySchema.Items.Properties.Count);
         });
     }
 
-    [Fact]
+    [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/58619")]
     public async Task TypeModifiedWithSchemaTransformerMapsToDifferentReferenceId()
     {
         var builder = CreateBuilder();
@@ -278,7 +282,8 @@ public async Task TypeModifiedWithSchemaTransformerMapsToDifferentReferenceId()
         {
             if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription is not null)
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString(context.ParameterDescription.Name);
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension(context.ParameterDescription.Name);
             }
             return Task.CompletedTask;
         });
@@ -286,14 +291,14 @@ public async Task TypeModifiedWithSchemaTransformerMapsToDifferentReferenceId()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
+            var postOperation = path.Operations[HttpMethod.Post];
             var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
-            var getOperation = path.Operations[OperationType.Get];
+            var getOperation = path.Operations[HttpMethod.Get];
             var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             // Schemas are distinct because of applied transformer so no reference is used.
-            Assert.NotEqual(requestSchema.Reference.Id, responseSchema.Reference.Id);
-            Assert.Equal("todo", ((OpenApiString)requestSchema.GetEffective(document).Extensions["x-my-extension"]).Value);
-            Assert.False(responseSchema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var _));
+            Assert.NotEqual(((OpenApiSchemaReference)requestSchema).Reference.Id, ((OpenApiSchemaReference)responseSchema).Reference.Id);
+            Assert.Equal("todo", ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            Assert.False(responseSchema.Extensions.TryGetValue("x-my-extension", out var _));
         });
     }
 
@@ -314,11 +319,11 @@ public static async Task ProducesStableSchemaRefsForListOf()
 
         static void VerifyDocument(OpenApiDocument document)
         {
-            var operation = document.Paths["/api"].Operations[OperationType.Post];
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
             var requestBody = operation.Responses["200"].Content["application/json"];
             var requestBodySchema = requestBody.Schema;
 
-            var operation2 = document.Paths["/api-2"].Operations[OperationType.Post];
+            var operation2 = document.Paths["/api-2"].Operations[HttpMethod.Post];
             var requestBody2 = operation2.Responses["200"].Content["application/json"];
             var requestBodySchema2 = requestBody2.Schema;
 
@@ -344,15 +349,15 @@ static void VerifyDocument(OpenApiDocument document)
             // }
 
             // Both container types should point to the same reference ID
-            Assert.Equal("TodoListContainer", requestBodySchema.Reference.Id);
-            Assert.Equal(requestBodySchema.Reference.Id, requestBodySchema2.Reference.Id);
+            Assert.Equal("TodoListContainer", ((OpenApiSchemaReference)requestBodySchema).Reference.Id);
+            Assert.Equal(((OpenApiSchemaReference)requestBodySchema).Reference.Id, ((OpenApiSchemaReference)requestBodySchema2).Reference.Id);
             // The referenced schema should have an array type with items pointing to Todo
-            var effectiveSchema = requestBodySchema.GetEffective(document);
+            var effectiveSchema = requestBodySchema;
             var todosProperty = effectiveSchema.Properties["todos"];
-            Assert.Equal("array", todosProperty.Type);
+            Assert.Equal(JsonSchemaType.Null | JsonSchemaType.Array, todosProperty.Type);
             var itemsSchema = todosProperty.Items;
-            Assert.Equal("Todo", itemsSchema.Reference.Id);
-            Assert.Equal(4, itemsSchema.GetEffective(document).Properties.Count);
+            Assert.Equal("Todo", ((OpenApiSchemaReference)itemsSchema).Reference.Id);
+            Assert.Equal(4, itemsSchema.Properties.Count);
         }
     }
 
@@ -371,23 +376,23 @@ public async Task SupportsRefMappingInDeeplyNestedTypes()
 
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestSchema = operation.RequestBody.Content["application/json"].Schema;
 
             // Assert $ref used for top-level
-            Assert.Equal("Level1", requestSchema.Reference.Id);
+            Assert.Equal("Level1", ((OpenApiSchemaReference)requestSchema).Reference.Id);
 
             // Assert that $ref is used for Level1.Item2
-            var level1Schema = requestSchema.GetEffective(document);
-            Assert.Equal("Level2", level1Schema.Properties["item2"].Reference.Id);
+            var level1Schema = requestSchema;
+            Assert.Equal("Level2", ((OpenApiSchemaReference)level1Schema.Properties["item2"]).Reference.Id);
 
             // Assert that $ref is used for Level2.Item3
-            var level2Schema = level1Schema.Properties["item2"].GetEffective(document);
-            Assert.Equal("Level3", level2Schema.Properties["item3"].Reference.Id);
+            var level2Schema = level1Schema.Properties["item2"];
+            Assert.Equal("Level3", ((OpenApiSchemaReference)level2Schema.Properties["item3"]).Reference.Id);
 
             // Assert that no $ref is used for string property
-            var level3Schema = level2Schema.Properties["item3"].GetEffective(document);
-            Assert.Null(level3Schema.Properties["terminate"].Reference);
+            var level3Schema = level2Schema.Properties["item3"];
+            Assert.IsNotType<OpenApiSchemaReference>(level3Schema.Properties["terminate"]);
         });
     }
 
@@ -435,19 +440,768 @@ public async Task SupportsDeeplyNestedSchemaWithConfiguredMaxDepth()
         // Act & Assert
         await VerifyOpenApiDocument(builder, document =>
         {
-            var operation = document.Paths["/"].Operations[OperationType.Post];
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
             var requestSchema = operation.RequestBody.Content["application/json"].Schema;
 
             // Assert $ref used for top-level
-            Assert.Equal("DeeplyNestedLevel1", requestSchema.Reference.Id);
+            Assert.Equal("DeeplyNestedLevel1", ((OpenApiSchemaReference)requestSchema).Reference.Id);
 
             // Assert that $ref is used for all nested levels
-            var levelSchema = requestSchema.GetEffective(document);
+            var levelSchema = requestSchema;
             for (var level = 2; level < 36; level++)
             {
-                Assert.Equal($"DeeplyNestedLevel{level}", levelSchema.Properties[$"item{level}"].Reference.Id);
-                levelSchema = levelSchema.Properties[$"item{level}"].GetEffective(document);
+                Assert.Equal($"DeeplyNestedLevel{level}", ((OpenApiSchemaReference)levelSchema.Properties[$"item{level}"]).Reference.Id);
+                levelSchema = levelSchema.Properties[$"item{level}"];
+            }
+        });
+    }
+
+    [Fact]
+    public async Task SupportsNestedSchemasWithSelfReference()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (LocationContainer item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("LocationContainer", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Assert that only expected schema references are generated
+            Assert.Equal(3, document.Components.Schemas.Count);
+            Assert.Collection(document.Components.Schemas.Keys,
+                key => Assert.Equal("AddressDto", key),
+                key => Assert.Equal("LocationContainer", key),
+                key => Assert.Equal("LocationDto", key));
+
+            // Assert that LocationContainer schema is serialized with correct refs
+            var writer = new StringWriter();
+            var openApiWriter = new OpenApiJsonWriter(writer);
+            document.Components.Schemas["LocationContainer"].SerializeAsV31(openApiWriter);
+            var serializedSchema = writer.ToString();
+            Assert.Equal("""
+            {
+                "type": "object",
+                "properties": {
+                    "location": {
+                        "$ref": "#/components/schemas/LocationDto"
+                    }
+                }
+            }
+            """, serializedSchema, ignoreWhiteSpaceDifferences: true, ignoreLineEndingDifferences: true);
+
+            writer = new StringWriter();
+            openApiWriter = new OpenApiJsonWriter(writer);
+            document.Components.Schemas["LocationDto"].SerializeAsV31(openApiWriter);
+            serializedSchema = writer.ToString();
+            Assert.Equal("""
+            {
+                "type": "object",
+                "properties": {
+                    "address": {
+                        "$ref": "#/components/schemas/AddressDto"
+                    }
+                }
+            }
+            """, serializedSchema, ignoreAllWhiteSpace: true, ignoreLineEndingDifferences: true);
+
+            writer = new StringWriter();
+            openApiWriter = new OpenApiJsonWriter(writer);
+            document.Components.Schemas["AddressDto"].SerializeAsV31(openApiWriter);
+            serializedSchema = writer.ToString();
+            Assert.Equal("""
+            {
+                "type": "object",
+                "properties": {
+                    "relatedLocation": {
+                        "$ref": "#/components/schemas/LocationDto"
+                    }
+                }
+            }
+            """, serializedSchema, ignoreAllWhiteSpace: true, ignoreLineEndingDifferences: true);
+        });
+    }
+
+    [Fact]
+    public async Task SupportsListNestedSchemasWithSelfReference()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (ParentObject item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Assert that only two schemas are generated
+            Assert.Equal(2, document.Components.Schemas.Count);
+            Assert.Collection(document.Components.Schemas.Keys,
+                key => Assert.Equal("ChildObject", key),
+                key => Assert.Equal("ParentObject", key));
+
+            // Assert that ParentObject schema is serialized with correct refs
+            var writer = new StringWriter();
+            var openApiWriter = new OpenApiJsonWriter(writer);
+            document.Components.Schemas["ParentObject"].SerializeAsV31(openApiWriter);
+            var serializedSchema = writer.ToString();
+            Assert.Equal("""
+            {
+                "type": "object",
+                "properties": {
+                "id": {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                "children": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/components/schemas/ChildObject"
+                    }
+                }
+                }
+            }
+            """, serializedSchema, ignoreAllWhiteSpace: true, ignoreLineEndingDifferences: true);
+
+            writer = new StringWriter();
+            openApiWriter = new OpenApiJsonWriter(writer);
+            document.Components.Schemas["ChildObject"].SerializeAsV31(openApiWriter);
+            serializedSchema = writer.ToString();
+            Assert.Equal("""
+            {
+                "required": [
+                    "parent"
+                ],
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer",
+                        "format": "int32"
+                    },
+                    "parent": {
+                        "$ref": "#/components/schemas/ParentObject"
+                    }
+                }
             }
+            """, serializedSchema, ignoreAllWhiteSpace: true, ignoreLineEndingDifferences: true);
         });
     }
+
+    [Fact]
+    public async Task SupportsMultiplePropertiesWithSameType()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (Root item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("Root", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Assert that $ref is used for nested Item1
+            Assert.Equal("Item", ((OpenApiSchemaReference)requestSchema.Properties["item1"]).Reference.Id);
+
+            // Assert that $ref is used for nested Item2
+            Assert.Equal("Item", ((OpenApiSchemaReference)requestSchema.Properties["item2"]).Reference.Id);
+        });
+    }
+
+    [Fact]
+    public async Task SupportsListOfNestedSchemasWithSelfReference()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/list", (List<LocationContainer> items) => { });
+        builder.MapPost("/array", (LocationContainer[] items) => { });
+        builder.MapPost("/dictionary", (Dictionary<string, LocationContainer> items) => { });
+        builder.MapPost("/", (LocationContainer item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var listOperation = document.Paths["/list"].Operations[HttpMethod.Post];
+            var listRequestSchema = listOperation.RequestBody.Content["application/json"].Schema;
+
+            var arrayOperation = document.Paths["/array"].Operations[HttpMethod.Post];
+            var arrayRequestSchema = arrayOperation.RequestBody.Content["application/json"].Schema;
+
+            var dictionaryOperation = document.Paths["/dictionary"].Operations[HttpMethod.Post];
+            var dictionaryRequestSchema = dictionaryOperation.RequestBody.Content["application/json"].Schema;
+
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("LocationContainer", ((OpenApiSchemaReference)listRequestSchema.Items).Reference.Id);
+            Assert.Equal("LocationContainer", ((OpenApiSchemaReference)arrayRequestSchema.Items).Reference.Id);
+            Assert.Equal("LocationContainer", ((OpenApiSchemaReference)dictionaryRequestSchema.AdditionalProperties).Reference.Id);
+            Assert.Equal("LocationContainer", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Assert that $ref is used for nested LocationDto
+            var locationContainerSchema = requestSchema;
+            Assert.Equal("LocationDto", ((OpenApiSchemaReference)locationContainerSchema.Properties["location"]).Reference.Id);
+
+            // Assert that $ref is used for nested AddressDto
+            var locationSchema = locationContainerSchema.Properties["location"];
+            Assert.Equal("AddressDto", ((OpenApiSchemaReference)locationSchema.Properties["address"]).Reference.Id);
+
+            // Assert that $ref is used for related LocationDto
+            var addressSchema = locationSchema.Properties["address"];
+            Assert.Equal("LocationDto", ((OpenApiSchemaReference)addressSchema.Properties["relatedLocation"]).Reference.Id);
+
+            // Assert that only expected schemas are generated at the top-level
+            Assert.Equal(3, document.Components.Schemas.Count);
+            Assert.Collection(document.Components.Schemas.Keys,
+                key => Assert.Equal("AddressDto", key),
+                key => Assert.Equal("LocationContainer", key),
+                key => Assert.Equal("LocationDto", key));
+        });
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/60381
+    [Fact]
+    public async Task ResolvesListBasedReferencesCorrectly()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (ContainerType item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("ContainerType", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Get effective schema for ContainerType
+            Assert.Equal(2, requestSchema.Properties.Count);
+
+            // Check Seq1 and Seq2 properties
+            var seq1Schema = requestSchema.Properties["seq1"];
+            var seq2Schema = requestSchema.Properties["seq2"];
+
+            // Assert both are array types
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, seq1Schema.Type);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, seq2Schema.Type);
+
+            // Assert items are arrays of strings
+            Assert.Equal(JsonSchemaType.Array, seq1Schema.Items.Type);
+            Assert.Equal(JsonSchemaType.Array, seq2Schema.Items.Type);
+
+            // Since both Seq1 and Seq2 are the same type (List<List<string>>),
+            // they should reference the same schema structure
+            Assert.Equal(seq1Schema.Items.Type, seq2Schema.Items.Type);
+
+            // Verify the inner arrays contain strings
+            Assert.Equal(JsonSchemaType.String, seq1Schema.Items.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Schema.Items.Items.Type);
+
+            Assert.Equal(["ContainerType"], document.Components.Schemas.Keys);
+        });
+    }
+
+    // Tests for: https://github.com/dotnet/aspnetcore/issues/60012
+    [Fact]
+    public async Task SupportsListOfClassInSelfReferentialSchema()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (Category item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("Category", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Assert that $ref is used for nested Tags
+            Assert.Equal("Tag", ((OpenApiSchemaReference)requestSchema.Properties["tags"].Items).Reference.Id);
+
+            // Assert that $ref is used for nested Parent
+            Assert.Equal("Category", ((OpenApiSchemaReference)requestSchema.Properties["parent"]).Reference.Id);
+
+            // Assert that no duplicate schemas are emitted
+            Assert.Collection(document.Components.Schemas,
+                schema =>
+                {
+                    Assert.Equal("Category", schema.Key);
+                },
+                schema =>
+                {
+                    Assert.Equal("Tag", schema.Key);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task UsesSameReferenceForSameTypeInDifferentLocations()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/parent-object", (ParentObject item) => { });
+        builder.MapPost("/list", (List<ParentObject> item) => { });
+        builder.MapPost("/dictionary", (Dictionary<string, ParentObject> item) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/parent-object"].Operations[HttpMethod.Post];
+            var requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Assert that $ref is used for nested Children
+            Assert.Equal("ChildObject", ((OpenApiSchemaReference)requestSchema.Properties["children"].Items).Reference.Id);
+
+            // Assert that $ref is used for nested Parent
+            var childSchema = requestSchema.Properties["children"].Items;
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)childSchema.Properties["parent"]).Reference.Id);
+
+            operation = document.Paths["/list"].Operations[HttpMethod.Post];
+            requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for items in the list definition
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)requestSchema.Items).Reference.Id);
+            var parentSchema = requestSchema.Items;
+            Assert.Equal("ChildObject", ((OpenApiSchemaReference)parentSchema.Properties["children"].Items).Reference.Id);
+
+            childSchema = parentSchema.Properties["children"].Items;
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)childSchema.Properties["parent"]).Reference.Id);
+
+            operation = document.Paths["/dictionary"].Operations[HttpMethod.Post];
+            requestSchema = operation.RequestBody.Content["application/json"].Schema;
+
+            // Assert $ref used for items in the dictionary definition
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)requestSchema.AdditionalProperties).Reference.Id);
+            parentSchema = requestSchema.AdditionalProperties;
+            Assert.Equal("ChildObject", ((OpenApiSchemaReference)parentSchema.Properties["children"].Items).Reference.Id);
+
+            childSchema = parentSchema.Properties["children"].Items;
+            Assert.Equal("ParentObject", ((OpenApiSchemaReference)childSchema.Properties["parent"]).Reference.Id);
+
+            // Assert that only the expected schemas are registered
+            Assert.Equal(["ChildObject", "ParentObject"], document.Components.Schemas.Keys);
+        });
+    }
+
+    private class Category
+    {
+        public required string Name { get; set; }
+
+        public Category Parent { get; set; }
+
+        public IEnumerable<Tag> Tags { get; set; } = [];
+    }
+
+    public class Tag
+    {
+        public required string Name { get; set; }
+    }
+
+    private class ContainerType
+    {
+        public List<List<string>> Seq1 { get; set; } = [];
+        public List<List<string>> Seq2 { get; set; } = [];
+    }
+
+    private class Root
+    {
+        public Item Item1 { get; set; } = null!;
+        public Item Item2 { get; set; } = null!;
+    }
+
+    private class Item
+    {
+        public string[] Name { get; set; } = null!;
+        public int value { get; set; }
+    }
+
+    private class LocationContainer
+    {
+
+        public LocationDto Location { get; set; }
+    }
+
+    private class LocationDto
+    {
+        public AddressDto Address { get; set; }
+    }
+
+    private class AddressDto
+    {
+        public LocationDto RelatedLocation { get; set; }
+    }
+
+#nullable enable
+    private class ParentObject
+    {
+        public int Id { get; set; }
+        public List<ChildObject> Children { get; set; } = [];
+    }
+
+    private class ChildObject
+    {
+        public int Id { get; set; }
+        public required ParentObject Parent { get; set; }
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/61194
+    [Fact]
+    public async Task ResolveGenericTypesInListProperties()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (Config config) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/"]?.Operations?[HttpMethod.Post];
+            var requestSchema = operation?.RequestBody?.Content?["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.NotNull(requestSchema);
+            Assert.Equal("Config", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Get effective schema for Config
+            Assert.Equal(2, requestSchema.Properties!.Count);
+
+            // Check Items1 and Items2 properties
+            var items1Schema = requestSchema.Properties!["items1"];
+            var items2Schema = requestSchema.Properties!["items2"];
+
+            // Assert both are array types
+            Assert.Equal(JsonSchemaType.Array, items1Schema.Type);
+            Assert.Equal(JsonSchemaType.Array, items2Schema.Type);
+
+            // Assert items reference the same ConfigItem schema
+            Assert.Equal("ConfigItem", ((OpenApiSchemaReference)items1Schema.Items!).Reference.Id);
+            Assert.Equal("ConfigItem", ((OpenApiSchemaReference)items2Schema.Items!).Reference.Id);
+
+            // Verify the ConfigItem schema has proper content, not empty
+            var itemSchema = items1Schema.Items!;
+            Assert.True(itemSchema.Properties?.Count > 0, "ConfigItem schema should not be empty");
+            Assert.Contains("id", itemSchema.Properties?.Keys ?? []);
+            Assert.Contains("lang", itemSchema.Properties?.Keys ?? []);
+            Assert.Contains("words", itemSchema.Properties?.Keys ?? []);
+            Assert.Contains("break", itemSchema.Properties?.Keys ?? []);
+            Assert.Contains("willBeGood", itemSchema.Properties?.Keys ?? []);
+
+            Assert.Equal(["Config", "ConfigItem"], document.Components!.Schemas!.Keys.OrderBy(x => x));
+        });
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/63054
+    [Fact]
+    public async Task ResolveReusedTypesAcrossDifferentHierarchies()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (ProjectResponse project) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths?["/"].Operations?[HttpMethod.Post];
+            var requestSchema = operation?.RequestBody?.Content?["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.NotNull(requestSchema);
+            Assert.Equal("ProjectResponse", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Check Address property
+            var addressSchema = requestSchema.Properties!["address"];
+            Assert.Equal("AddressResponse", ((OpenApiSchemaReference)addressSchema).Reference.Id);
+
+            // Check Builder property
+            var builderSchema = requestSchema.Properties!["builder"];
+            Assert.Equal("BuilderResponse", ((OpenApiSchemaReference)builderSchema).Reference.Id);
+
+            // Verify CityResponse is properly referenced in Address
+            var cityInAddressSchema = addressSchema.Properties!["city"];
+            Assert.Equal("CityResponse", ((OpenApiSchemaReference)cityInAddressSchema).Reference.Id);
+
+            // Verify CityResponse is properly referenced in Builder
+            var cityInBuilderSchema = builderSchema.Properties!["city"];
+            Assert.Equal("CityResponse", ((OpenApiSchemaReference)cityInBuilderSchema).Reference.Id);
+
+            // Verify the CityResponse schema has proper content, not empty
+            var citySchema = cityInAddressSchema;
+            Assert.True(citySchema.Properties?.Count > 0, "CityResponse schema should not be empty");
+            Assert.Contains("name", citySchema.Properties?.Keys ?? []);
+
+            Assert.Equal(["AddressResponse", "BuilderResponse", "CityResponse", "ProjectResponse"],
+                        document.Components!.Schemas!.Keys.OrderBy(x => x));
+        });
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/63211
+    [Fact]
+    public async Task ResolveNullableReferenceTypes()
+    {
+        // Arrange
+        var builder = CreateBuilder();
+
+        builder.MapPost("/", (Subscription subscription) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths?["/"].Operations?[HttpMethod.Post];
+            var requestSchema = operation?.RequestBody?.Content?["application/json"].Schema;
+
+            // Assert $ref used for top-level
+            Assert.NotNull(requestSchema);
+            Assert.Equal("Subscription", ((OpenApiSchemaReference)requestSchema).Reference.Id);
+
+            // Check primaryUser property (required RefProfile)
+            var primaryUserSchema = requestSchema.Properties!["primaryUser"];
+            Assert.Equal("RefProfile", ((OpenApiSchemaReference)primaryUserSchema).Reference.Id);
+
+            // Check secondaryUser property (nullable RefProfile)
+            var secondaryUserSchema = requestSchema.Properties!["secondaryUser"];
+            Assert.NotNull(secondaryUserSchema.OneOf);
+            Assert.Collection(secondaryUserSchema.OneOf,
+                item => Assert.Equal(JsonSchemaType.Null, item.Type),
+                item => Assert.Equal("RefProfile", ((OpenApiSchemaReference)item).Reference.Id));
+
+            // Verify the RefProfile schema has a User property that references RefUser
+            var userPropertySchema = primaryUserSchema.Properties!["user"];
+            Assert.Equal("RefUser", ((OpenApiSchemaReference)userPropertySchema).Reference.Id);
+
+            // Verify the RefUser schema has proper content, not empty
+            var userSchemaContent = userPropertySchema;
+            Assert.True(userSchemaContent.Properties?.Count > 0, "RefUser schema should not be empty");
+            Assert.Contains("name", userSchemaContent.Properties?.Keys ?? []);
+            Assert.Contains("email", userSchemaContent.Properties?.Keys ?? []);
+
+            // Both properties should reference the same RefProfile schema
+            var secondaryUserSchemaRef = secondaryUserSchema.OneOf.Last();
+            Assert.Equal(((OpenApiSchemaReference)primaryUserSchema).Reference.Id,
+                        ((OpenApiSchemaReference)secondaryUserSchemaRef).Reference.Id);
+
+            Assert.Equal(["RefProfile", "RefUser", "Subscription"], document.Components!.Schemas!.Keys.OrderBy(x => x));
+            Assert.All(document.Components.Schemas.Values, item => Assert.False(item.Type?.HasFlag(JsonSchemaType.Null)));
+        });
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/63503
+    [Fact]
+    public async Task HandlesCircularReferencesRegardlessOfPropertyOrder_SelfFirst()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/", (DirectCircularModelSelfFirst dto) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            Assert.NotNull(document.Components?.Schemas);
+            var schema = document.Components.Schemas["DirectCircularModelSelfFirst"];
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.NotNull(schema.Properties);
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("self", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Equal("#/components/schemas/DirectCircularModelSelfFirst", reference.Reference.ReferenceV3);
+                },
+                property =>
+                {
+                    Assert.Equal("referenced", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                });
+
+            // Verify that it does not result in an empty schema for a referenced schema
+            var referencedSchema = document.Components.Schemas["ReferencedModel"];
+            Assert.NotNull(referencedSchema.Properties);
+            Assert.NotEmpty(referencedSchema.Properties);
+            var idProperty = Assert.Single(referencedSchema.Properties);
+            Assert.Equal("id", idProperty.Key);
+            var idPropertySchema = Assert.IsType<OpenApiSchema>(idProperty.Value);
+            Assert.Equal(JsonSchemaType.Integer, idPropertySchema.Type);
+        });
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/63503
+    [Fact]
+    public async Task HandlesCircularReferencesRegardlessOfPropertyOrder_SelfLast()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/", (DirectCircularModelSelfLast dto) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            Assert.NotNull(document.Components?.Schemas);
+            var schema = document.Components.Schemas["DirectCircularModelSelfLast"];
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.NotNull(schema.Properties);
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("referenced", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                },
+                property =>
+                {
+                    Assert.Equal("self", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Equal("#/components/schemas/DirectCircularModelSelfLast", reference.Reference.ReferenceV3);
+                });
+
+            // Verify that it does not result in an empty schema for a referenced schema
+            var referencedSchema = document.Components.Schemas["ReferencedModel"];
+            Assert.NotNull(referencedSchema.Properties);
+            Assert.NotEmpty(referencedSchema.Properties);
+            var idProperty = Assert.Single(referencedSchema.Properties);
+            Assert.Equal("id", idProperty.Key);
+            var idPropertySchema = Assert.IsType<OpenApiSchema>(idProperty.Value);
+            Assert.Equal(JsonSchemaType.Integer, idPropertySchema.Type);
+        });
+    }
+
+    // Test for: https://github.com/dotnet/aspnetcore/issues/63503
+    [Fact]
+    public async Task HandlesCircularReferencesRegardlessOfPropertyOrder_MultipleSelf()
+    {
+        var builder = CreateBuilder();
+        builder.MapPost("/", (DirectCircularModelMultiple dto) => { });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            Assert.NotNull(document.Components?.Schemas);
+            var schema = document.Components.Schemas["DirectCircularModelMultiple"];
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.NotNull(schema.Properties);
+            Assert.Collection(schema.Properties,
+                property =>
+                {
+                    Assert.Equal("selfFirst", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Equal("#/components/schemas/DirectCircularModelMultiple", reference.Reference.ReferenceV3);
+                },
+                property =>
+                {
+                    Assert.Equal("referenced", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                },
+                property =>
+                {
+                    Assert.Equal("selfLast", property.Key);
+                    var reference = Assert.IsType<OpenApiSchemaReference>(property.Value);
+                    Assert.Equal("#/components/schemas/DirectCircularModelMultiple", reference.Reference.ReferenceV3);
+                });
+
+            // Verify that it does not result in an empty schema for a referenced schema
+            var referencedSchema = document.Components.Schemas["ReferencedModel"];
+            Assert.NotNull(referencedSchema.Properties);
+            Assert.NotEmpty(referencedSchema.Properties);
+            var idProperty = Assert.Single(referencedSchema.Properties);
+            Assert.Equal("id", idProperty.Key);
+            var idPropertySchema = Assert.IsType<OpenApiSchema>(idProperty.Value);
+            Assert.Equal(JsonSchemaType.Integer, idPropertySchema.Type);
+        });
+    }
+
+    // Test models for issue 61194
+    private class Config
+    {
+        public List<ConfigItem> Items1 { get; set; } = [];
+        public List<ConfigItem> Items2 { get; set; } = [];
+    }
+
+    private class ConfigItem
+    {
+        public int? Id { get; set; }
+        public string? Lang { get; set; }
+        public Dictionary<string, object?>? Words { get; set; }
+        public List<string>? Break { get; set; }
+        public string? WillBeGood { get; set; }
+    }
+
+    // Test models for issue 63054
+    private class ProjectResponse
+    {
+        public AddressResponse Address { get; init; } = new();
+        public BuilderResponse Builder { get; init; } = new();
+    }
+
+    private class AddressResponse
+    {
+        public CityResponse City { get; init; } = new();
+    }
+
+    private class BuilderResponse
+    {
+        public CityResponse City { get; init; } = new();
+    }
+
+    private class CityResponse
+    {
+        public string Name { get; set; } = "";
+    }
+
+    // Test models for issue 63211
+    public sealed class Subscription
+    {
+        public required string Id { get; set; }
+        public required RefProfile PrimaryUser { get; set; }
+        public RefProfile? SecondaryUser { get; set; }
+    }
+
+    public sealed class RefProfile
+    {
+        public required RefUser User { get; init; }
+    }
+
+    public sealed class RefUser
+    {
+        public string Name { get; set; } = "";
+        public string Email { get; set; } = "";
+    }
+
+    // Test models for issue 63503
+    private class DirectCircularModelSelfFirst
+    {
+        public DirectCircularModelSelfFirst Self { get; set; } = null!;
+        public ReferencedModel Referenced { get; set; } = null!;
+    }
+
+    private class DirectCircularModelSelfLast
+    {
+        public ReferencedModel Referenced { get; set; } = null!;
+        public DirectCircularModelSelfLast Self { get; set; } = null!;
+    }
+
+    private class DirectCircularModelMultiple
+    {
+        public DirectCircularModelMultiple SelfFirst { get; set; } = null!;
+        public ReferencedModel Referenced { get; set; } = null!;
+        public DirectCircularModelMultiple SelfLast { get; set; } = null!;
+    }
+
+    private class ReferencedModel
+    {
+        public int Id { get; set; }
+    }
 }
+#nullable restore
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OpenApiOptionsTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OpenApiOptionsTests.cs
index 283d39c3c049..5a55dbfd35d5 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OpenApiOptionsTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OpenApiOptionsTests.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.OpenApi;
-using Microsoft.OpenApi.Models;
 
 public class OpenApiOptionsTests
 {
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OperationTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OperationTransformerTests.cs
index c85c2b2ec8e8..a67d4882dffc 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OperationTransformerTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/OperationTransformerTests.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
 
 public class OperationTransformerTests : OpenApiDocumentServiceTestBase
 {
@@ -478,6 +477,185 @@ public async Task OperationTransformer_CanAccessTransientServiceFromContextAppli
         Assert.Equal(4, Dependency.InstantiationCount);
     }
 
+    [Fact]
+    public async Task AddOpenApiOperationTransformer_CanApplyTransformer()
+    {
+        var builder = CreateBuilder();
+
+        builder.MapGet("/", () => { })
+            .AddOpenApiOperationTransformer((operation, context, cancellationToken) =>
+            {
+                operation.Description = "Operation Description";
+                return Task.CompletedTask;
+            });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            Assert.Collection(document.Paths.OrderBy(p => p.Key),
+                path =>
+                {
+                    Assert.Equal("/", path.Key);
+                    var operation = Assert.Single(path.Value.Operations.Values);
+                    Assert.Equal("Operation Description", operation.Description);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task AddOpenApiOperationTransformer_TransformerRunsAfterOtherTransformers()
+    {
+        var builder = CreateBuilder();
+
+        builder.MapGet("/", () => { })
+            .AddOpenApiOperationTransformer((operation, context, cancellationToken) =>
+            {
+                operation.Description = "Operation Description";
+                return Task.CompletedTask;
+            });
+
+        var options = new OpenApiOptions();
+        options.AddOperationTransformer((operation, context, cancellationToken) =>
+        {
+            operation.Description = "Operation Description 2";
+            return Task.CompletedTask;
+        });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            Assert.Collection(document.Paths.OrderBy(p => p.Key),
+                path =>
+                {
+                    Assert.Equal("/", path.Key);
+                    var operation = Assert.Single(path.Value.Operations.Values);
+                    Assert.Equal("Operation Description", operation.Description);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task AddOpenApiOperationTransformer_SupportsMultipleTransformers()
+    {
+        var builder = CreateBuilder();
+
+        builder.MapGet("/", () => { })
+            .AddOpenApiOperationTransformer((operation, context, cancellationToken) =>
+            {
+                operation.Description = "Operation Description";
+                return Task.CompletedTask;
+            })
+            .AddOpenApiOperationTransformer((operation, context, cancellationToken) =>
+            {
+                operation.Description += " 2";
+                operation.Deprecated = true;
+                return Task.CompletedTask;
+            })
+            .AddOpenApiOperationTransformer((operation, context, cancellationToken) =>
+            {
+                operation.Description += " 3";
+                operation.OperationId = "OperationId";
+                return Task.CompletedTask;
+            });
+
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            Assert.Collection(document.Paths.OrderBy(p => p.Key),
+                path =>
+                {
+                    Assert.Equal("/", path.Key);
+                    var operation = Assert.Single(path.Value.Operations.Values);
+                    Assert.Equal("Operation Description 2 3", operation.Description);
+                    Assert.True(operation.Deprecated);
+                    Assert.Equal("OperationId", operation.OperationId);
+                });
+        });
+    }
+
+    [Fact]
+    public async Task OperationTransformer_RespectsOperationCancellation()
+    {
+        var builder = CreateBuilder();
+        builder.MapGet("/todo", () => { });
+
+        var options = new OpenApiOptions();
+        var transformerCalled = false;
+        var exceptionThrown = false;
+        var tcs = new TaskCompletionSource();
+
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            transformerCalled = true;
+            try
+            {
+                await tcs.Task.WaitAsync(cancellationToken);
+                operation.Description = "Should not be set";
+            }
+            catch (OperationCanceledException)
+            {
+                exceptionThrown = true;
+                throw;
+            }
+        });
+
+        using var cts = new CancellationTokenSource();
+        cts.CancelAfter(1);
+
+        await Assert.ThrowsAsync<TaskCanceledException>(async () =>
+        {
+            await VerifyOpenApiDocument(builder, options, _ => { }, cts.Token);
+        });
+
+        Assert.True(transformerCalled);
+        Assert.True(exceptionThrown);
+    }
+
+    [Fact]
+    public async Task OperationTransformer_ExecutesAsynchronously()
+    {
+        var builder = CreateBuilder();
+        builder.MapGet("/todo", () => { });
+
+        var options = new OpenApiOptions();
+        var transformerOrder = new List<int>();
+        var tcs1 = new TaskCompletionSource();
+        var tcs2 = new TaskCompletionSource();
+
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            await tcs1.Task;
+            transformerOrder.Add(1);
+            operation.Description = "First";
+        });
+
+        options.AddOperationTransformer((operation, context, cancellationToken) =>
+        {
+            transformerOrder.Add(2);
+            operation.Description += " Second";
+            tcs2.TrySetResult();
+            return Task.CompletedTask;
+        });
+
+        options.AddOperationTransformer(async (operation, context, cancellationToken) =>
+        {
+            await tcs2.Task;
+            transformerOrder.Add(3);
+            operation.Description += " Third";
+        });
+
+        var documentTask = VerifyOpenApiDocument(builder, options, document =>
+        {
+            var operation = Assert.Single(document.Paths["/todo"].Operations.Values);
+            Assert.Equal("First Second Third", operation.Description);
+        });
+
+        tcs1.TrySetResult();
+
+        await documentTask;
+
+        // Verify transformers executed in the correct order, once for each transformer
+        // since there is a single operation in the document.
+        Assert.Equal([1, 2, 3], transformerOrder);
+    }
+
     private class ActivatedTransformer : IOpenApiOperationTransformer
     {
         public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransformerContext context, CancellationToken cancellationToken)
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs
index 5d20c810d6fa..4c69ebf1e007 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs
@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public class SchemaTransformerTests : OpenApiDocumentServiceTestBase
 {
@@ -152,21 +152,24 @@ public async Task SchemaTransformer_RunsInRegisteredOrder()
         var options = new OpenApiOptions();
         options.AddSchemaTransformer((schema, context, cancellationToken) =>
         {
-            schema.Extensions["x-my-extension"] = new OpenApiString("1");
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+            schema.Extensions["x-my-extension"] = new JsonNodeExtension("1");
+            schema.Format = "1";
             return Task.CompletedTask;
         });
         options.AddSchemaTransformer((schema, context, cancellationToken) =>
         {
-            Assert.Equal("1", ((OpenApiString)schema.Extensions["x-my-extension"]).Value);
-            schema.Extensions["x-my-extension"] = new OpenApiString("2");
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+            Assert.Equal("1", ((JsonNodeExtension)schema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            schema.Extensions["x-my-extension"] = new JsonNodeExtension("2");
             return Task.CompletedTask;
         });
 
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var operation = Assert.Single(document.Paths.Values).Operations.Values.Single();
-            var schema = operation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("2", ((OpenApiString)schema.Extensions["x-my-extension"]).Value);
+            var schema = operation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("2", ((JsonNodeExtension)schema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
     }
 
@@ -183,7 +186,8 @@ public async Task SchemaTransformer_OnTypeModifiesBothRequestAndResponse()
         {
             if (context.JsonTypeInfo.Type == typeof(Todo))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("1");
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("1");
             }
             return Task.CompletedTask;
         });
@@ -191,16 +195,16 @@ public async Task SchemaTransformer_OnTypeModifiesBothRequestAndResponse()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("1", ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("1", ((OpenApiString)responseSchema.Extensions["x-my-extension"]).Value);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("1", ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal("1", ((JsonNodeExtension)responseSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
     }
 
-    [Fact]
+    [ConditionalFact(Skip = "SchemaTransformer_WithDescriptionOnlyModifiesParameter")]
     public async Task SchemaTransformer_WithDescriptionOnlyModifiesParameter()
     {
         var builder = CreateBuilder();
@@ -213,7 +217,7 @@ public async Task SchemaTransformer_WithDescriptionOnlyModifiesParameter()
         {
             if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription is not null)
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString(context.ParameterDescription.Name);
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension(context.ParameterDescription.Name);
             }
             return Task.CompletedTask;
         });
@@ -221,11 +225,11 @@ public async Task SchemaTransformer_WithDescriptionOnlyModifiesParameter()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("todo", ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("todo", ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.False(responseSchema.Extensions.TryGetValue("x-my-extension", out var _));
         });
     }
@@ -244,12 +248,12 @@ public async Task SchemaTransformer_SupportsActivatedTransformers()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("1", ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("1", ((OpenApiString)responseSchema.Extensions["x-my-extension"]).Value);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("1", ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal("1", ((JsonNodeExtension)responseSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
     }
 
@@ -267,12 +271,12 @@ public async Task SchemaTransformer_SupportsInstanceTransformers()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("1", ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("1", ((OpenApiString)responseSchema.Extensions["x-my-extension"]).Value);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("1", ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal("1", ((JsonNodeExtension)responseSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
     }
 
@@ -294,23 +298,23 @@ public async Task SchemaTransformer_SupportsActivatedTransformerWithSingletonDep
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            value = ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value;
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            value = ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>();
             Assert.Equal(Dependency.InstantiationCount.ToString(CultureInfo.InvariantCulture), value);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal(value, ((OpenApiString)responseSchema.Extensions["x-my-extension"]).Value);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal(value, ((JsonNodeExtension)responseSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal(value, ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal(value, ((OpenApiString)responseSchema.Extensions["x-my-extension"]).Value);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal(value, ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal(value, ((JsonNodeExtension)responseSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
     }
 
@@ -330,21 +334,21 @@ public async Task SchemaTransformer_SupportsActivatedTransformerWithTransientDep
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
             Assert.True(requestSchema.Extensions.ContainsKey("x-my-extension"));
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.True(responseSchema.Extensions.ContainsKey("x-my-extension"));
         });
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
             Assert.True(requestSchema.Extensions.ContainsKey("x-my-extension"));
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.True(responseSchema.Extensions.ContainsKey("x-my-extension"));
         });
         // Assert that the transient dependency has a "scoped" lifetime within
@@ -367,11 +371,11 @@ public async Task SchemaTransformer_SupportsDisposableActivatedTransformer()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
             Assert.Equal("Schema Description", requestSchema.Description);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.Equal("Schema Description", responseSchema.Description);
         });
         // Assert that the transformer is disposed once for the entire document.
@@ -393,11 +397,11 @@ public async Task SchemaTransformer_SupportsAsyncDisposableActivatedTransformer(
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = Assert.Single(document.Paths.Values);
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
             Assert.Equal("Schema Description", requestSchema.Description);
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.Equal("Schema Description", responseSchema.Description);
         });
         // Assert that the transformer is disposed once for the entire document.
@@ -426,14 +430,14 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that parameter schema has been update
             var path = Assert.Single(document.Paths.Values);
-            var getOperation = path.Operations[OperationType.Get];
+            var getOperation = path.Operations[HttpMethod.Get];
             var responseSchema = getOperation.Parameters[0].Schema;
             Assert.Equal("modified-number-format", responseSchema.Format);
 
             // Assert that property in request body schema has been updated
-            var postOperation = path.Operations[OperationType.Post];
+            var postOperation = path.Operations[HttpMethod.Post];
             var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
-            Assert.Equal("modified-number-format", requestSchema.GetEffective(document).Properties["id"].Format);
+            Assert.Equal("modified-number-format", requestSchema.Properties["id"].Format);
         });
     }
 
@@ -444,6 +448,7 @@ public async Task SchemaTransformer_CanModifyItemTypesInADocument()
 
         builder.MapGet("/list", () => new List<int> { 1, 2, 3, 4 });
         builder.MapGet("/single", () => 1);
+        builder.MapGet("/dictionary", () => new Dictionary<string, int> { { "key", 1 } });
 
         var options = new OpenApiOptions();
         options.AddSchemaTransformer((schema, context, cancellationToken) =>
@@ -452,7 +457,7 @@ public async Task SchemaTransformer_CanModifyItemTypesInADocument()
             {
                 schema.Format = "modified-number-format";
             }
-            schema = new OpenApiSchema { Type = "array", Items = schema };
+            schema = new OpenApiSchema { Type = JsonSchemaType.Array, Items = schema };
             return Task.CompletedTask;
         });
 
@@ -460,15 +465,21 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that the schema represent list elements has been modified
             var path = document.Paths["/list"];
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.Equal("modified-number-format", responseSchema.Items.Format);
 
             // Assert that top-level schema associated with the standalone integer has been updated
             path = document.Paths["/single"];
-            getOperation = path.Operations[OperationType.Get];
-            responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
+            getOperation = path.Operations[HttpMethod.Get];
+            responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
             Assert.Equal("modified-number-format", responseSchema.Format);
+
+            // Assert that the schema represent dictionary values has been modified
+            path = document.Paths["/dictionary"];
+            getOperation = path.Operations[HttpMethod.Get];
+            responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal("modified-number-format", responseSchema.AdditionalProperties.Format);
         });
     }
 
@@ -485,7 +496,8 @@ public async Task SchemaTransformer_CanModifyPolymorphicChildSchemas()
         {
             if (context.JsonTypeInfo.Type == typeof(Triangle))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-triangle");
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-triangle");
             }
             return Task.CompletedTask;
         });
@@ -494,16 +506,16 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that the polymorphic sub-type `Triangle` has been updated
             var path = document.Paths["/shape"];
-            var postOperation = path.Operations[OperationType.Post];
-            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            var triangleSubschema = Assert.Single(requestSchema.AnyOf.Where(s => s.Reference.Id == "ShapeTriangle"));
-            Assert.True(triangleSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var _));
+            var postOperation = path.Operations[HttpMethod.Post];
+            var requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            var triangleSubschema = Assert.Single(requestSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeTriangle"));
+            Assert.True(triangleSubschema.Extensions.TryGetValue("x-my-extension", out var _));
 
             // Assert that the standalone `Triangle` type has been updated
             path = document.Paths["/triangle"];
-            postOperation = path.Operations[OperationType.Post];
-            requestSchema = postOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            Assert.Equal("this-is-a-triangle", ((OpenApiString)requestSchema.Extensions["x-my-extension"]).Value);
+            postOperation = path.Operations[HttpMethod.Post];
+            requestSchema = postOperation.RequestBody.Content["application/json"].Schema;
+            Assert.Equal("this-is-a-triangle", ((JsonNodeExtension)requestSchema.Extensions["x-my-extension"]).Node.GetValue<string>());
         });
     }
 
@@ -529,16 +541,16 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that the `id` property in the `Todo` within the array has been updated
             var path = document.Paths["/list-of-todo"];
-            var getOperation = path.Operations[OperationType.Get];
+            var getOperation = path.Operations[HttpMethod.Get];
             var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
-            var itemSchema = responseSchema.GetEffective(document).Items.GetEffective(document);
+            var itemSchema = responseSchema.Items;
             Assert.Equal("modified-number-format", itemSchema.Properties["id"].Format);
 
             // Assert that the integer type within the list has been updated
             var otherPath = document.Paths["/list-of-int"];
-            var otherGetOperation = otherPath.Operations[OperationType.Get];
+            var otherGetOperation = otherPath.Operations[HttpMethod.Get];
             var otherResponseSchema = otherGetOperation.Responses["200"].Content["application/json"].Schema;
-            var otherItemSchema = otherResponseSchema.GetEffective(document).Items.GetEffective(document);
+            var otherItemSchema = otherResponseSchema.Items;
             Assert.Equal("modified-number-format", otherItemSchema.Format);
         });
     }
@@ -553,13 +565,14 @@ public async Task SchemaTransformer_CanModifyListOfPolymorphicTypes()
         var options = new OpenApiOptions();
         options.AddSchemaTransformer((schema, context, cancellationToken) =>
         {
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
             if (context.JsonTypeInfo.Type == typeof(Triangle))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-triangle");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-triangle");
             }
             if (context.JsonTypeInfo.Type == typeof(Square))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-square");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-square");
             }
             return Task.CompletedTask;
         });
@@ -568,19 +581,19 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that the `Triangle` type within the list has been updated
             var path = document.Paths["/list"];
-            var getOperation = path.Operations[OperationType.Get];
+            var getOperation = path.Operations[HttpMethod.Get];
             var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
-            var itemSchema = responseSchema.GetEffective(document).Items.GetEffective(document);
-            var triangleSubschema = Assert.Single(itemSchema.AnyOf.Where(s => s.Reference.Id == "ShapeTriangle"));
+            var itemSchema = responseSchema.Items;
+            var triangleSubschema = Assert.Single(itemSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeTriangle"));
             // Assert that the x-my-extension type is set to this-is-a-triangle
-            Assert.True(triangleSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var triangleExtension));
-            Assert.Equal("this-is-a-triangle", ((OpenApiString)triangleExtension).Value);
+            Assert.True(triangleSubschema.Extensions.TryGetValue("x-my-extension", out var triangleExtension));
+            Assert.Equal("this-is-a-triangle", ((JsonNodeExtension)triangleExtension).Node.GetValue<string>());
 
             // Assert that the `Square` type within the polymorphic type list has been updated
-            var squareSubschema = Assert.Single(itemSchema.AnyOf.Where(s => s.Reference.Id == "ShapeSquare"));
+            var squareSubschema = Assert.Single(itemSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeSquare"));
             // Assert that the x-my-extension type is set to this-is-a-square
-            Assert.True(squareSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var squareExtension));
-            Assert.Equal("this-is-a-square", ((OpenApiString)squareExtension).Value);
+            Assert.True(squareSubschema.Extensions.TryGetValue("x-my-extension", out var squareExtension));
+            Assert.Equal("this-is-a-square", ((JsonNodeExtension)squareExtension).Node.GetValue<string>());
         });
     }
 
@@ -594,13 +607,14 @@ public async Task SchemaTransformer_CanModifyPolymorphicTypesInProperties()
         var options = new OpenApiOptions();
         options.AddSchemaTransformer((schema, context, cancellationToken) =>
         {
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
             if (context.JsonTypeInfo.Type == typeof(Triangle))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-triangle");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-triangle");
             }
             if (context.JsonTypeInfo.Type == typeof(Square))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-square");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-square");
             }
             return Task.CompletedTask;
         });
@@ -609,19 +623,19 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that the `Triangle` type within the list has been updated
             var path = document.Paths["/list"];
-            var getOperation = path.Operations[OperationType.Get];
+            var getOperation = path.Operations[HttpMethod.Get];
             var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
-            var someShapeSchema = responseSchema.GetEffective(document).Properties["someShape"].GetEffective(document);
-            var triangleSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => s.Reference.Id == "ShapeTriangle"));
+            var someShapeSchema = responseSchema.Properties["someShape"];
+            var triangleSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeTriangle"));
             // Assert that the x-my-extension type is set to this-is-a-triangle
-            Assert.True(triangleSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var triangleExtension));
-            Assert.Equal("this-is-a-triangle", ((OpenApiString)triangleExtension).Value);
+            Assert.True(triangleSubschema.Extensions.TryGetValue("x-my-extension", out var triangleExtension));
+            Assert.Equal("this-is-a-triangle", ((JsonNodeExtension)triangleExtension).Node.GetValue<string>());
 
             // Assert that the `Square` type within the polymorphic type list has been updated
-            var squareSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => s.Reference.Id == "ShapeSquare"));
+            var squareSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeSquare"));
             // Assert that the x-my-extension type is set to this-is-a-square
-            Assert.True(squareSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var squareExtension));
-            Assert.Equal("this-is-a-square", ((OpenApiString)squareExtension).Value);
+            Assert.True(squareSubschema.Extensions.TryGetValue("x-my-extension", out var squareExtension));
+            Assert.Equal("this-is-a-square", ((JsonNodeExtension)squareExtension).Node.GetValue<string>());
         });
     }
 
@@ -635,13 +649,14 @@ public async Task SchemaTransformer_CanModifyDeeplyNestedPolymorphicTypesInPrope
         var options = new OpenApiOptions();
         options.AddSchemaTransformer((schema, context, cancellationToken) =>
         {
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
             if (context.JsonTypeInfo.Type == typeof(Triangle))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-triangle");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-triangle");
             }
             if (context.JsonTypeInfo.Type == typeof(Square))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("this-is-a-square");
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("this-is-a-square");
             }
             return Task.CompletedTask;
         });
@@ -650,19 +665,19 @@ await VerifyOpenApiDocument(builder, options, document =>
         {
             // Assert that the `Triangle` type within the list has been updated
             var path = document.Paths["/list"];
-            var getOperation = path.Operations[OperationType.Get];
+            var getOperation = path.Operations[HttpMethod.Get];
             var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
-            var someShapeSchema = responseSchema.GetEffective(document).Items.GetEffective(document).Properties["someShape"].GetEffective(document);
-            var triangleSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => s.Reference.Id == "ShapeTriangle"));
+            var someShapeSchema = responseSchema.Items.Properties["someShape"];
+            var triangleSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeTriangle"));
             // Assert that the x-my-extension type is set to this-is-a-triangle
-            Assert.True(triangleSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var triangleExtension));
-            Assert.Equal("this-is-a-triangle", ((OpenApiString)triangleExtension).Value);
+            Assert.True(triangleSubschema.Extensions.TryGetValue("x-my-extension", out var triangleExtension));
+            Assert.Equal("this-is-a-triangle", ((JsonNodeExtension)triangleExtension).Node.GetValue<string>());
 
             // Assert that the `Square` type within the polymorphic type list has been updated
-            var squareSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => s.Reference.Id == "ShapeSquare"));
+            var squareSubschema = Assert.Single(someShapeSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeSquare"));
             // Assert that the x-my-extension type is set to this-is-a-square
-            Assert.True(squareSubschema.GetEffective(document).Extensions.TryGetValue("x-my-extension", out var squareExtension));
-            Assert.Equal("this-is-a-square", ((OpenApiString)squareExtension).Value);
+            Assert.True(squareSubschema.Extensions.TryGetValue("x-my-extension", out var squareExtension));
+            Assert.Equal("this-is-a-square", ((JsonNodeExtension)squareExtension).Node.GetValue<string>());
         });
     }
 
@@ -690,7 +705,7 @@ public async Task SchemaTransformers_CanModifyMultipleFormParameters()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = document.Paths["/todo"];
-            var postOperation = path.Operations[OperationType.Post];
+            var postOperation = path.Operations[HttpMethod.Post];
             var requestSchema = postOperation.RequestBody.Content["application/x-www-form-urlencoded"].Schema;
             Assert.Equal(2, requestSchema.AllOf.Count);
             var todoSchema = requestSchema.AllOf[0];
@@ -713,17 +728,18 @@ public async Task SchemaTransformers_CanImplementNotSchemaIndependently()
         {
             if (context.JsonTypeInfo.Type == typeof(Todo))
             {
-                schema.Not = new OpenApiSchema { Type = "string" };
+                schema.Not = new OpenApiSchema { Type = JsonSchemaType.String };
             }
             if (context.JsonTypeInfo.Type == typeof(Triangle))
             {
-                schema.Not = new OpenApiSchema { Type = "string" };
+                schema.Not = new OpenApiSchema { Type = JsonSchemaType.String };
             }
             return Task.CompletedTask;
         });
         UseNotSchemaTransformer(options, (schema, context, cancellationToken) =>
         {
-            schema.Extensions["modified-by-not-schema-transformer"] = new OpenApiBoolean(true);
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+            schema.Extensions["modified-by-not-schema-transformer"] = new JsonNodeExtension(true);
             return Task.CompletedTask;
         });
 
@@ -731,15 +747,15 @@ public async Task SchemaTransformers_CanImplementNotSchemaIndependently()
         await VerifyOpenApiDocument(builder, options, document =>
         {
             var path = document.Paths["/todo"];
-            var getOperation = path.Operations[OperationType.Get];
-            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document);
-            Assert.True(((OpenApiBoolean)responseSchema.Not.Extensions["modified-by-not-schema-transformer"]).Value);
+            var getOperation = path.Operations[HttpMethod.Get];
+            var responseSchema = getOperation.Responses["200"].Content["application/json"].Schema;
+            Assert.True(((JsonNodeExtension)responseSchema.Not.Extensions["modified-by-not-schema-transformer"]).Node.GetValue<bool>());
 
             var shapePath = document.Paths["/shape"];
-            var shapeOperation = shapePath.Operations[OperationType.Post];
-            var shapeRequestSchema = shapeOperation.RequestBody.Content["application/json"].Schema.GetEffective(document);
-            var triangleSchema = Assert.Single(shapeRequestSchema.AnyOf.Where(s => s.Reference.Id == "ShapeTriangle")).GetEffective(document);
-            Assert.True(((OpenApiBoolean)triangleSchema.Not.Extensions["modified-by-not-schema-transformer"]).Value);
+            var shapeOperation = shapePath.Operations[HttpMethod.Post];
+            var shapeRequestSchema = shapeOperation.RequestBody.Content["application/json"].Schema;
+            var triangleSchema = Assert.Single(shapeRequestSchema.AnyOf.Where(s => ((OpenApiSchemaReference)s).Reference.Id == "ShapeTriangle"));
+            Assert.True(((JsonNodeExtension)triangleSchema.Not.Extensions["modified-by-not-schema-transformer"]).Node.GetValue<bool>());
         });
 
         static void UseNotSchemaTransformer(OpenApiOptions options, Func<OpenApiSchema, OpenApiSchemaTransformerContext, CancellationToken, Task> func)
@@ -748,7 +764,8 @@ static void UseNotSchemaTransformer(OpenApiOptions options, Func<OpenApiSchema,
             {
                 if (schema.Not != null)
                 {
-                    await func(schema.Not, context, cancellationToken);
+                    OpenApiSchema targetSchema = schema.Not is OpenApiSchemaReference reference ? (OpenApiSchema)reference.Target : (OpenApiSchema)schema.Not;
+                    await func(targetSchema, context, cancellationToken);
                 }
                 return;
             });
@@ -837,6 +854,94 @@ public async Task SchemaTransformer_CanAccessTransientServiceFromContextApplicat
         Assert.Equal(10, Dependency.InstantiationCount);
     }
 
+    [Fact]
+    public async Task SchemaTransformer_RespectsOperationCancellation()
+    {
+        var builder = CreateBuilder();
+        builder.MapGet("/todo", () => new Todo(1, "Item1", false, DateTime.Now));
+
+        var options = new OpenApiOptions();
+        var transformerCalled = false;
+        var exceptionThrown = false;
+        var tcs = new TaskCompletionSource();
+
+        //Assert that transformers wait for completion signal from sibling tasks before running
+        options.AddSchemaTransformer(async (schema, context, cancellationToken) =>
+        {
+            transformerCalled = true;
+            try
+            {
+                await tcs.Task.WaitAsync(cancellationToken);
+                schema.Description = "Should not be set";
+            }
+            catch (OperationCanceledException)
+            {
+                exceptionThrown = true;
+                throw;
+            }
+        });
+
+        using var cts = new CancellationTokenSource();
+        cts.CancelAfter(1);
+
+        await Assert.ThrowsAsync<TaskCanceledException>(async () =>
+        {
+            await VerifyOpenApiDocument(builder, options, _ => { }, cts.Token);
+        });
+
+        Assert.True(transformerCalled);
+        Assert.True(exceptionThrown);
+    }
+
+    [Fact]
+    public async Task SchemaTransformer_ExecutesAsynchronously()
+    {
+        var builder = CreateBuilder();
+        builder.MapGet("/todo", () => new Todo(1, "Item1", false, DateTime.Now));
+
+        var options = new OpenApiOptions();
+        var transformerOrder = new List<int>();
+        var tcs1 = new TaskCompletionSource();
+        var tcs2 = new TaskCompletionSource();
+
+        options.AddSchemaTransformer(async (schema, context, cancellationToken) =>
+        {
+            await tcs1.Task;
+            transformerOrder.Add(1);
+            schema.Description = "First";
+        });
+
+        options.AddSchemaTransformer((schema, context, cancellationToken) =>
+        {
+            transformerOrder.Add(2);
+            schema.Description += " Second";
+            tcs2.TrySetResult();
+            return Task.CompletedTask;
+        });
+
+        options.AddSchemaTransformer(async (schema, context, cancellationToken) =>
+        {
+            await tcs2.Task;
+            transformerOrder.Add(3);
+            schema.Description += " Third";
+        });
+
+        var documentTask = VerifyOpenApiDocument(builder, options, document =>
+        {
+            var operation = Assert.Single(document.Paths["/todo"].Operations.Values);
+            var schema = operation.Responses["200"].Content["application/json"].Schema;
+            Assert.Equal("First Second Third", schema.Description);
+        });
+
+        tcs1.TrySetResult();
+
+        await documentTask;
+
+        // Each transformer is called a total of 5 times, once for the top-level schema
+        // and one for each of the four properties within the Todo type.
+        Assert.Equal([1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3], transformerOrder);
+    }
+
     private class PolymorphicContainer
     {
         public string Name { get; }
@@ -849,7 +954,8 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
         {
             if (context.JsonTypeInfo.Type == typeof(Todo))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("1");
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("1");
             }
             return Task.CompletedTask;
         }
@@ -897,7 +1003,8 @@ private class ActivatedTransformerWithDependency(Dependency dependency) : IOpenA
         public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
         {
             dependency.TestMethod();
-            schema.Extensions["x-my-extension"] = new OpenApiString(Dependency.InstantiationCount.ToString(CultureInfo.InvariantCulture));
+            schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+            schema.Extensions["x-my-extension"] = new JsonNodeExtension(Dependency.InstantiationCount.ToString(CultureInfo.InvariantCulture));
             return Task.CompletedTask;
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/TypeBasedTransformerLifetimeTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/TypeBasedTransformerLifetimeTests.cs
index 89047a1224de..3716ddb04dd9 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/TypeBasedTransformerLifetimeTests.cs
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/TypeBasedTransformerLifetimeTests.cs
@@ -4,8 +4,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
 
 public class TypeBasedTransformerLifetimeTests : OpenApiDocumentServiceTestBase
 {
@@ -348,7 +346,8 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
         {
             if (context.JsonTypeInfo.Type == typeof(Todo))
             {
-                schema.Extensions["x-my-extension"] = new OpenApiString("1");
+                schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                schema.Extensions["x-my-extension"] = new JsonNodeExtension("1");
             }
             return Task.CompletedTask;
         }
diff --git a/src/ProjectTemplates/ProjectTemplates.slnf b/src/ProjectTemplates/ProjectTemplates.slnf
index a3e1d4b51627..acddb24d68b1 100644
--- a/src/ProjectTemplates/ProjectTemplates.slnf
+++ b/src/ProjectTemplates/ProjectTemplates.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\Components\\Components\\src\\Microsoft.AspNetCore.Components.csproj",
@@ -12,7 +12,7 @@
       "src\\DataProtection\\Extensions\\src\\Microsoft.AspNetCore.DataProtection.Extensions.csproj",
       "src\\DefaultBuilder\\src\\Microsoft.AspNetCore.csproj",
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
-      "src\\Framework\\App.Runtime\\src\\Microsoft.AspNetCore.App.Runtime.csproj",
+      "src\\Framework\\App.Runtime\\src\\Microsoft.AspNetCore.App.Runtime.sfxproj",
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
       "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
@@ -95,4 +95,4 @@
       "src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/ProjectTemplates/ProjectTemplatesNoDeps.slnf b/src/ProjectTemplates/ProjectTemplatesNoDeps.slnf
index f7f5fa4ab1bf..fa7749e4c701 100644
--- a/src/ProjectTemplates/ProjectTemplatesNoDeps.slnf
+++ b/src/ProjectTemplates/ProjectTemplatesNoDeps.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\ProjectTemplates\\Web.Client.ItemTemplates\\Microsoft.DotNet.Web.Client.ItemTemplates.csproj",
       "src\\ProjectTemplates\\Web.ItemTemplates\\Microsoft.DotNet.Web.ItemTemplates.csproj",
diff --git a/src/ProjectTemplates/README.md b/src/ProjectTemplates/README.md
index 9fb481dee3eb..7d34c1a26a24 100644
--- a/src/ProjectTemplates/README.md
+++ b/src/ProjectTemplates/README.md
@@ -97,7 +97,7 @@ An entire test project can be configured to skip specific platforms using the `<
 
 ```xml
 <SkipHelixQueues>
-    $(HelixQueueArmDebian12);
+    $(HelixQueueArmDebian);
 </SkipHelixQueues>
 ```
 
@@ -109,7 +109,7 @@ When tests are run as part of the CI infrastructure, a number of different timeo
 
 ##### Helix job timeout
 
-When queuing test jobs to the Helix infrastructure, a timeout value is passed that the entire Helix job must complete within, i.e. that job running on a single queue. This default value is set in [eng\targets\Helix.props](/eng/targets/Helix.props): 
+When queuing test jobs to the Helix infrastructure, a timeout value is passed that the entire Helix job must complete within, i.e. that job running on a single queue. This default value is set in [eng\targets\Helix.props](/eng/targets/Helix.props):
 
 ```xml
 <HelixTimeout>00:45:00</HelixTimeout>
diff --git a/src/ProjectTemplates/Shared/AspNetProcess.cs b/src/ProjectTemplates/Shared/AspNetProcess.cs
index cf2205bbd5b5..0d9e02a7d316 100644
--- a/src/ProjectTemplates/Shared/AspNetProcess.cs
+++ b/src/ProjectTemplates/Shared/AspNetProcess.cs
@@ -171,12 +171,19 @@ public async Task ContainsLinks(Page page)
             else
             {
                 Assert.True(string.Equals(anchor.Href, expectedLink), $"Expected next link to be {expectedLink} but it was {anchor.Href}.");
-                var result = await RetryHelper.RetryRequest(async () =>
+
+                if (!string.Equals(anchor.Protocol, "https:") || string.Equals(anchor.HostName, "localhost", StringComparison.OrdinalIgnoreCase))
                 {
-                    return await _httpClient.GetAsync(anchor.Href);
-                }, logger: NullLogger.Instance);
+                    // This is a relative or same-site URI, so verify it goes to a real destination within the app.
+                    // We don't do this for external (absolute) URIs as it would introduce flakiness, and the code
+                    // above already checks that the URI is what we expect.
+                    var result = await RetryHelper.RetryRequest(async () =>
+                    {
+                        return await _httpClient.GetAsync(anchor.Href);
+                    }, logger: NullLogger.Instance);
 
-                Assert.True(IsSuccessStatusCode(result), $"{anchor.Href} is a broken link!");
+                    Assert.True(IsSuccessStatusCode(result), $"{anchor.Href} is a broken link!");
+                }
             }
         }
     }
diff --git a/src/ProjectTemplates/Shared/DevelopmentCertificate.cs b/src/ProjectTemplates/Shared/DevelopmentCertificate.cs
index 080f35c3b3f8..3ee2f8e6eab2 100644
--- a/src/ProjectTemplates/Shared/DevelopmentCertificate.cs
+++ b/src/ProjectTemplates/Shared/DevelopmentCertificate.cs
@@ -1,42 +1,61 @@
 // 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.IO;
-using Microsoft.AspNetCore.Certificates.Generation;
+using System.Reflection;
+using System.Text.Json;
 
 namespace Templates.Test.Helpers;
 
-public readonly struct DevelopmentCertificate
+public readonly struct DevelopmentCertificate(string certificatePath, string certificatePassword, string certificateThumbprint)
 {
-    public DevelopmentCertificate(string certificatePath, string certificatePassword, string certificateThumbprint)
+    public readonly string CertificatePath { get; } = certificatePath;
+    public readonly string CertificatePassword { get; } = certificatePassword;
+    public readonly string CertificateThumbprint { get; } = certificateThumbprint;
+
+    public static DevelopmentCertificate Get(Assembly assembly)
     {
-        CertificatePath = certificatePath;
-        CertificatePassword = certificatePassword;
-        CertificateThumbprint = certificateThumbprint;
-    }
+        string[] locations = [
+            Path.Combine(AppContext.BaseDirectory, "aspnetcore-https.json"),
+            Path.Combine(Environment.CurrentDirectory, "aspnetcore-https.json"),
+            Path.Combine(AppContext.BaseDirectory, "aspnetcore-https.json"),
+        ];
 
-    public readonly string CertificatePath { get; }
-    public readonly string CertificatePassword { get; }
-    public readonly string CertificateThumbprint { get; }
+        var json = TryGetExistingFile(locations)
+            ?? throw new InvalidOperationException($"The aspnetcore-https.json file does not exist. Searched locations: {Environment.NewLine}{string.Join(Environment.NewLine, locations)}");
 
-    public static DevelopmentCertificate Create(string workingDirectory)
-    {
-        var certificatePath = Path.Combine(workingDirectory, $"{Guid.NewGuid()}.pfx");
-        var certificatePassword = Guid.NewGuid().ToString();
-        var certificateThumbprint = EnsureDevelopmentCertificates(certificatePath, certificatePassword);
+        using var file = File.OpenRead(json);
+        var certificateAttributes = JsonSerializer.Deserialize<CertificateAttributes>(file) ??
+            throw new InvalidOperationException($"The aspnetcore-https.json file does not contain valid JSON.");
+
+        var path = Path.ChangeExtension(json, ".pfx");
 
-        return new DevelopmentCertificate(certificatePath, certificatePassword, certificateThumbprint);
+        if (!File.Exists(path))
+        {
+            throw new InvalidOperationException($"The certificate file does not exist. Expected at: '{path}'.");
+        }
+
+        var password = certificateAttributes.Password;
+        var thumbprint = certificateAttributes.Thumbprint;
+
+        return new DevelopmentCertificate(path, password, thumbprint);
     }
 
-    private static string EnsureDevelopmentCertificates(string certificatePath, string certificatePassword)
+    private static string TryGetExistingFile(string[] locations)
     {
-        var now = DateTimeOffset.Now;
-        var manager = CertificateManager.Instance;
-        var certificate = manager.CreateAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));
-        var certificateThumbprint = certificate.Thumbprint;
-        manager.ExportCertificate(certificate, path: certificatePath, includePrivateKey: true, certificatePassword, CertificateKeyExportFormat.Pfx);
+        foreach (var location in locations)
+        {
+            if (File.Exists(location))
+            {
+                return location;
+            }
+        }
+
+        return null;
+    }
 
-        return certificateThumbprint;
+    private sealed class CertificateAttributes
+    {
+        public string Password { get; set; }
+        public string Thumbprint { get; set; }
     }
 }
diff --git a/src/ProjectTemplates/Shared/Project.cs b/src/ProjectTemplates/Shared/Project.cs
index ed00a32f7f8e..308da1f9a8c8 100644
--- a/src/ProjectTemplates/Shared/Project.cs
+++ b/src/ProjectTemplates/Shared/Project.cs
@@ -51,7 +51,7 @@ public static string ArtifactsLogDir
     public string TemplateOutputDir { get; set; }
     public string TargetFramework { get; set; } = GetAssemblyMetadata("Test.DefaultTargetFramework");
     public string RuntimeIdentifier { get; set; } = string.Empty;
-    public static DevelopmentCertificate DevCert { get; } = DevelopmentCertificate.Create(AppContext.BaseDirectory);
+    public static DevelopmentCertificate DevCert { get; } = DevelopmentCertificate.Get(typeof(Project).Assembly);
 
     public string TemplateBuildDir => Path.Combine(TemplateOutputDir, "bin", "Debug", TargetFramework, RuntimeIdentifier);
     public string TemplatePublishDir => Path.Combine(TemplateOutputDir, "bin", "Release", TargetFramework, RuntimeIdentifier, "publish");
@@ -426,7 +426,13 @@ internal async Task RunDotNetNewRawAsync(string arguments)
 
     public void Dispose()
     {
-        DeleteOutputDirectory();
+        var doNotCleanUpTemplates = typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+            .Single(attribute => attribute.Key == "DoNotCleanUpTemplates")
+            .Value;
+        if (string.Equals(doNotCleanUpTemplates, "false", StringComparison.OrdinalIgnoreCase))
+        {
+            DeleteOutputDirectory();
+        }
     }
 
     public void DeleteOutputDirectory()
diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
index a0cb1f6e904c..08555fb5e696 100644
--- a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
+++ b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
@@ -36,6 +36,7 @@ internal static class TemplatePackageInstaller
             "Microsoft.DotNet.Web.ProjectTemplates.7.0",
             "Microsoft.DotNet.Web.ProjectTemplates.8.0",
             "Microsoft.DotNet.Web.ProjectTemplates.9.0",
+            "Microsoft.DotNet.Web.ProjectTemplates.10.0",
             "Microsoft.AspNetCore.Blazor.Templates",
         };
 
diff --git a/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets b/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
index 4e1a98035f07..1d4a655b7c61 100644
--- a/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
+++ b/src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
@@ -6,7 +6,7 @@
   <ItemGroup>
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>DotNetEfFullPath</_Parameter1>
-      <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfVersion)/tools/net8.0/any/dotnet-ef.dll</_Parameter2>
+      <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfVersion)/tools/net10.0/any/dotnet-ef.dll</_Parameter2>
     </AssemblyAttribute>
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>TestPackageRestorePath</_Parameter1>
@@ -20,8 +20,41 @@
       <_Parameter1>ContinuousIntegrationBuild</_Parameter1>
       <_Parameter2>true</_Parameter2>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(DoNotCleanUpTemplates)' == 'true'">
+      <_Parameter1>DoNotCleanUpTemplates</_Parameter1>
+      <_Parameter2>true</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(DoNotCleanUpTemplates)' != 'true'">
+      <_Parameter1>DoNotCleanUpTemplates</_Parameter1>
+      <_Parameter2>false</_Parameter2>
+    </AssemblyAttribute>
   </ItemGroup>
 
+  <Target Name="GenerateTestDevCert" BeforeTargets="AssignTargetPaths">
+
+    <PropertyGroup>
+      <_DevCertFileName>aspnetcore-https.pfx</_DevCertFileName>
+      <_DevCertJsonFileName>aspnetcore-https.json</_DevCertJsonFileName>
+      <_DevCertPath>$(ArtifactsTmpDir)$(_DevCertFileName)</_DevCertPath>
+      <_DevCertJsonPath>$(ArtifactsTmpDir)$(_DevCertJsonFileName)</_DevCertJsonPath>
+    </PropertyGroup>
+
+    <!-- This task only tries to generate a certificate if there is none existing at the location provided as path. -->
+    <GenerateTestDevCert
+        CertificatePath="$(_DevCertPath)"
+        Condition="'$(MSBuildRuntimeType)' == 'core'">
+    </GenerateTestDevCert>
+
+    <Error Condition="!Exists('$(_DevCertPath)') and '$(MSBuildRuntimeType)' == 'core'" Text="Failed to generate a test certificate at $(_DevCertPath)" />
+    <Error Condition="!Exists('$(_DevCertPath)') and '$(MSBuildRuntimeType)' != 'core'" Text="No dev cert exists at $(_DevCertPath). Ensure you follow the instructions from src/ProjectTemplates/README.md before running inside Visual Studio" />
+
+    <ItemGroup>
+      <Content Include="$(_DevCertPath)" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
+      <Content Include="$(_DevCertJsonPath)" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
+
+  </Target>
+
   <Target Name="PrepareForTest" BeforeTargets="GetAssemblyAttributes" Condition=" '$(DesignTimeBuild)' != 'true' ">
     <PropertyGroup>
       <TestTemplateCreationFolder>$([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)'))</TestTemplateCreationFolder>
@@ -107,7 +140,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="$(MSBuildThisFileDirectory)..\TestInfrastructure\Directory.Build.props.in"
-      Properties="RepoRoot=$(RepoRoot);ArtifactsBinDir=$(ArtifactsBinDir);TargetingPackLayoutRoot=$(TargetingPackLayoutRoot);SharedFrameworkLayoutRoot=$(SharedFrameworkLayoutRoot);TestDependsOnAspNetPackages=$(TestDependsOnAspNetPackages);"
+      Properties="RepoRoot=$(RepoRoot);ArtifactsBinDir=$(ArtifactsBinDir);TargetingPackLayoutRoot=$(TargetingPackLayoutRoot);SharedFrameworkLayoutRoot=$(SharedFrameworkLayoutRoot);TestDependsOnAspNetPackages=$(TestDependsOnAspNetPackages);MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion)"
       OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" />
 
     <!-- Workaround https://github.com/dotnet/core-setup/issues/6420 - there is no MSBuild setting for rollforward yet -->
diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json
index e3b7f9e5f22e..9f38172c4503 100644
--- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json
+++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "LESS is a language that compiles into CSS",
   "groupIdentity": "Microsoft.DotNet.Web.ClientItems.Less",
-  "precedence": "9900",
-  "identity": "Microsoft.DotNet.Web.ClientItems.Less.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.DotNet.Web.ClientItems.Less.10.0",
   "shortName": "less",
   "sourceName": "styleSheet1",
   "tags": {
diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json
index c10c19831857..8e3400fd9ffc 100644
--- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json
+++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "SCSS is a language that compiles into CSS",
   "groupIdentity": "Microsoft.DotNet.Web.ClientItems.Scss",
-  "precedence": "9900",
-  "identity": "Microsoft.DotNet.Web.ClientItems.Scss.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.DotNet.Web.ClientItems.Scss.10.0",
   "shortName": "scss",
   "sourceName": "styleSheet1",
   "tags": {
diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json
index 246dfa8684cd..7a340a53b7a3 100644
--- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json
+++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json
@@ -6,8 +6,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A blank TypeScript source file",
   "groupIdentity": "Microsoft.DotNet.Web.ClientItems.TypeScript",
-  "precedence": "9900",
-  "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.10.0",
   "shortName": "tsfile",
   "sourceName": "file1",
   "tags": {
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json
index ac14bc534137..a5b8aef8d3da 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json
@@ -10,8 +10,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.ApiController",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Mvc.ApiController.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Mvc.ApiController.10.0",
   "shortName": "apicontroller",
   "sourceName": "ValueController",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json
index 72f1e2e06407..4a03a91f4897 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json
@@ -10,8 +10,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.MvcController",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Mvc.MvcController.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Mvc.MvcController.10.0",
   "shortName": "mvccontroller",
   "sourceName": "HomeController",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json
index 03923ac46931..b4c2db526398 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json
@@ -13,8 +13,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.Web.Grpc.Protobuf",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.Grpc.Protobuf.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.Grpc.Protobuf.10.0",
   "shortname": "proto",
   "sourceName": "protobuf",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json
index b75b1a77c8dc..37e89b7c41f7 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json
@@ -13,8 +13,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Components.RazorComponent",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Components.RazorComponent.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Components.RazorComponent.10.0",
   "shortname": "razorcomponent",
   "sourceName": "Component1",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json
index 89b455ced96f..e3d340cee888 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json
@@ -10,8 +10,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorPage",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Mvc.RazorPage.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Mvc.RazorPage.10.0",
   "shortName": "page",
   "sourceName": "Index",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json
index 719c8bf6d311..8d05235d6994 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json
@@ -10,8 +10,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorView",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Mvc.RazorView.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Mvc.RazorView.10.0",
   "shortName": "view",
   "sourceName": "Index",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json
index f494407ea34c..454f475a3a0c 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json
@@ -10,8 +10,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewImports",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Mvc.ViewImports.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Mvc.ViewImports.10.0",
   "shortName": "viewimports",
   "sourceName": "ignoreme",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json
index 22db64ef38be..3c8a010849e3 100644
--- a/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json
@@ -10,8 +10,8 @@
     "type": "item"
   },
   "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewStart",
-  "precedence": "9900",
-  "identity": "Microsoft.AspNetCore.Mvc.ViewStart.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.AspNetCore.Mvc.ViewStart.10.0",
   "shortName": "viewstart",
   "sourceName": "ignoreme",
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.Client.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.Client.csproj.in
similarity index 86%
rename from src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.Client.csproj.in
rename to src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.Client.csproj.in
index 829c12db913c..8ca8b7ed5293 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.Client.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.Client.csproj.in
@@ -6,8 +6,9 @@
     <Nullable>enable</Nullable>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
-    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWeb-CSharp.Client</RootNamespace>
+    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWebCSharp._1.Client</RootNamespace>
     <AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">`$(AssemblyName.Replace(' ', '_'))</AssemblyName>
+    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.csproj.in
similarity index 85%
rename from src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.csproj.in
rename to src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.csproj.in
index 541be08bd263..239fc5d67314 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/BlazorWeb-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.csproj.in
@@ -4,10 +4,11 @@
     <TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId Condition="'$(IndividualLocalAuth)' == 'True'">aspnet-BlazorWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
+    <UserSecretsId Condition="'$(IndividualLocalAuth)' == 'True'">aspnet-BlazorWebCSharp__1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
-    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWeb-CSharp</RootNamespace>
+    <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWebCSharp._1</RootNamespace>
     <AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">`$(AssemblyName.Replace(' ', '_'))</AssemblyName>
+    <BlazorDisableThrowNavigationException>true</BlazorDisableThrowNavigationException>
   </PropertyGroup>
 
   <!--#if (IndividualLocalAuth && !UseLocalDB) -->
@@ -18,7 +19,7 @@
   <!--#endif -->
   <!--#if (UseWebAssembly || IndividualLocalAuth) -->
   <ItemGroup>
-    <ProjectReference Include="..\BlazorWeb-CSharp.Client\BlazorWeb-CSharp.Client.csproj" Condition="'$(UseWebAssembly)' == 'True'" />
+    <ProjectReference Include="..\BlazorWebCSharp.1.Client\BlazorWebCSharp.1.Client.csproj" Condition="'$(UseWebAssembly)' == 'True'" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="${MicrosoftAspNetCoreComponentsWebAssemblyServerVersion}" Condition="'$(UseWebAssembly)' == 'True'" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCoreVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="${MicrosoftAspNetCoreIdentityEntityFrameworkCoreVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.csproj.in
index a8ac031b8c7d..f8301d1e134d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.csproj.in
@@ -4,6 +4,7 @@
     <TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
     <!--#if PWA -->
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
     <!--#endif -->
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index 01fd5e06eafd..92879cd52586 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -23,7 +23,6 @@
       MicrosoftIdentityWebGraphServiceClientVersion=$(MicrosoftIdentityWebGraphServiceClientVersion);
       MicrosoftIdentityWebUIVersion=$(MicrosoftIdentityWebUIVersion);
       MicrosoftIdentityWebDownstreamApiVersion=$(MicrosoftIdentityWebDownstreamApiVersion);
-      MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
       SystemNetHttpJsonVersion=$(SystemNetHttpJsonVersion);
       MicrosoftGraphVersion=$(MicrosoftGraphVersion);
     </GeneratedContentProperties>
@@ -61,8 +60,8 @@
     <GeneratedContent Include="WebApi-FSharp.fsproj.in" OutputPath="content/WebApi-FSharp/Company.WebApplication1.fsproj" />
     <GeneratedContent Include="Worker-CSharp.csproj.in" OutputPath="content/Worker-CSharp/Company.Application1.csproj" />
     <GeneratedContent Include="Worker-FSharp.fsproj.in" OutputPath="content/Worker-FSharp/Company.Application1.fsproj" />
-    <GeneratedContent Include="BlazorWeb-CSharp.csproj.in" OutputPath="content/BlazorWeb-CSharp/BlazorWeb-CSharp/BlazorWeb-CSharp.csproj" />
-    <GeneratedContent Include="BlazorWeb-CSharp.Client.csproj.in" OutputPath="content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj" />
+    <GeneratedContent Include="BlazorWebCSharp.csproj.in" OutputPath="content/BlazorWeb-CSharp/BlazorWebCSharp.1/BlazorWebCSharp.1.csproj" />
+    <GeneratedContent Include="BlazorWebCSharp.Client.csproj.in" OutputPath="content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/BlazorWebCSharp.1.Client.csproj" />
     <GeneratedContent Include="ComponentsWebAssembly-CSharp.csproj.in" OutputPath="content/ComponentsWebAssembly-CSharp/ComponentsWebAssembly-CSharp.csproj" />
   </ItemGroup>
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApiAot-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApiAot-CSharp.csproj.in
index 135250791270..134c29609181 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/WebApiAot-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/WebApiAot-CSharp.csproj.in
@@ -10,4 +10,10 @@
     <PublishAot>true</PublishAot>
   </PropertyGroup>
 
+  <!--#if (EnableOpenAPI) -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="${MicrosoftAspNetCoreOpenApiVersion}" Condition="'$(EnableOpenAPI)' == 'True'" />
+  </ItemGroup>
+  
+  <!--#endif -->
 </Project>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/dotnetcli.host.json
index 9c853513c30e..a8976faa91b4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/dotnetcli.host.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/dotnetcli.host.json
@@ -53,6 +53,10 @@
     "UseProgramMain": {
       "longName": "use-program-main",
       "shortName": ""
+    },
+    "LocalhostTld": {
+      "longName": "localhost-tld",
+      "shortName": ""
     }
   },
   "usageExamples": [
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/ide.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/ide.host.json
index 1de5334e8f54..738b1f40e01e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/ide.host.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/ide.host.json
@@ -25,6 +25,12 @@
       "isVisible": true,
       "persistenceScope": "shared",
       "persistenceScopeName": "Microsoft"
+    },
+    {
+      "id": "LocalhostTld",
+      "isVisible": true,
+      "persistenceScope": "shared",
+      "persistenceScopeName": "Microsoft"
     }
   ]
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json
index a934cfaf8154..dba306dd4db5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json
@@ -3,7 +3,7 @@
   "name": "Webová aplikace Blazor",
   "description": "Šablona projektu pro vytvoření webové aplikace Blazor, která podporuje vykreslování na straně serveru i interaktivitu klienta. Tato šablona se dá použít pro webové aplikace s bohatými dynamickými uživatelskými rozhraními (UI).",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/UserSecretsId/description": "ID, které se má použít pro tajné kódy (používá se s individuálním ověřováním).",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije individuální ověřování).",
   "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
   "symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije individuální ověřování).",
-  "symbols/InteractivityPlatform/displayName": "Typ _Interactivity",
-  "symbols/InteractivityPlatform/description": "Určuje, která hostitelská platforma se má použít pro interaktivní komponenty.",
+  "symbols/InteractivityPlatform/displayName": "_Interaktivní režim vykreslování",
+  "symbols/InteractivityPlatform/description": "Umožňuje zvolit, který interaktivní režim vykreslování se má použít pro interaktivní komponenty.",
   "symbols/InteractivityPlatform/choices/None/displayName": "Žádné",
   "symbols/InteractivityPlatform/choices/None/description": "Žádná interaktivita (pouze vykreslování statického serveru)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Server",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "Spustí se v prohlížeči pomocí WebAssembly.",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Automaticky (Server a WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Při stahování prostředků WebAssembly používá Server a pak WebAssembly.",
-  "symbols/InteractivityLocation/displayName": "_Interactivity umístění",
+  "symbols/InteractivityLocation/displayName": "U_místění interaktivity",
   "symbols/InteractivityLocation/description": "Zvolí, které komponenty budou mít povolené interaktivní vykreslování.",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Na stránku nebo komponentu",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interaktivita se používá pro jednotlivé stránky nebo jednotlivé komponenty.",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Globální",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interaktivita se používá na kořenové úrovni.",
-  "symbols/IncludeSampleContent/displayName": "_Zahrnout ukázkové stránky",
+  "symbols/IncludeSampleContent/displayName": "Zahrnout _ukázkové stránky",
   "symbols/IncludeSampleContent/description": "Nastavuje, jestli se mají přidávat ukázkové stránky a styly pro demonstraci základních vzorů použití.",
   "symbols/Empty/description": "Nastavuje, jestli se mají vynechat ukázkové stránky a styly, které demonstrují základní vzory použití.",
   "symbols/auth/choices/None/description": "Bez ověřování",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Určuje, jestli se má vypnout protokol HTTPS. Tato možnost platí jenom v případě, že se pro --auth nepoužívá jednotlivec.",
   "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
   "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
+  "symbols/LocalhostTld/displayName": "Použití TLD .dev.localhost v adrese URL aplikace",
+  "symbols/LocalhostTld/description": "Určuje, jestli se má název projektu zkombinovat s TLD .dev.localhost v adrese URL aplikace pro místní vývoj, například https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json
index 4edfb2d91b11..b07cdc29ade5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json
@@ -3,7 +3,7 @@
   "name": "Blazor-Web-App",
   "description": "Eine Projektvorlage zum Erstellen einer Blazor-Web-App, die sowohl serverseitiges Rendering als auch Clientinteraktivität unterstützt. Diese Vorlage kann für Web-Apps mit umfangreichen dynamischen Benutzeroberflächen (UIs) verwendet werden.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/UserSecretsId/description": "Die für Geheimnisse zu verwendende ID (Verwendung mit individueller Authentifizierung).",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Portnummer, die für den HTTPS Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn die individuelle Authentifizierung verwendet wird).",
   "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express-HTTPS-Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn die individuelle Authentifizierung verwendet wird).",
-  "symbols/InteractivityPlatform/displayName": "_Interaktivitätstyp",
-  "symbols/InteractivityPlatform/description": "Wählt aus, welche Hostingplattform für interaktive Komponenten verwendet werden soll.",
+  "symbols/InteractivityPlatform/displayName": "_Interaktiver Rendermodus",
+  "symbols/InteractivityPlatform/description": "Wählt aus, welcher interaktive Rendermodus für interaktive Komponenten verwendet werden soll",
   "symbols/InteractivityPlatform/choices/None/displayName": "Keine",
   "symbols/InteractivityPlatform/choices/None/description": "Keine Interaktivität (nur statisches Serverrendering)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Server",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "Wird im Browser mithilfe von WebAssembly ausgeführt",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Automatisch (Server und WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Verwendet Server beim Herunterladen von WebAssembly-Ressourcen und dann WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_Interaktivitätsstandort",
+  "symbols/InteractivityLocation/displayName": "Interaktivitäts_location",
   "symbols/InteractivityLocation/description": "Wählt aus, für welche Komponenten das interaktive Rendering aktiviert werden soll",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Pro Seite/ Komponente",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interaktivität wird auf Seiten- oder Komponentenbasis angewendet",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interaktivität wird auf Stammebene angewendet",
-  "symbols/IncludeSampleContent/displayName": "_Include Beispielseiten",
+  "symbols/IncludeSampleContent/displayName": "_Beispielseiten einschließen",
   "symbols/IncludeSampleContent/description": "Konfiguriert, ob Beispielseiten und Stile hinzugefügt werden, um grundlegende Verwendungsmuster zu veranschaulichen.",
   "symbols/Empty/description": "Konfiguriert, ob Beispielseiten und Formatierungen weggelassen werden sollen, die grundlegende Verwendungsmuster veranschaulichen.",
   "symbols/auth/choices/None/description": "Keine Authentifizierung",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn \"Individual\" nicht für \"--auth\" verwendet wird.",
   "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
   "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
+  "symbols/LocalhostTld/displayName": "Verwenden der .dev.localhost-TLD in der Anwendungs-URL",
+  "symbols/LocalhostTld/description": "Gibt an, ob der Projektname mit der .dev.localhost-TLD in der Anwendungs-URL für die lokale Entwicklung kombiniert werden soll, z. B. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
   "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json
index 6d6fb4ad6791..cfe29a67cfd1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json
@@ -3,7 +3,7 @@
   "name": "Blazor Web App",
   "description": "A project template for creating a Blazor web app that supports both server-side rendering and client interactivity. This template can be used for web apps with rich dynamic user interfaces (UIs).",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/UserSecretsId/description": "The ID to use for secrets (use with Individual auth).",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "Runs in the browser using WebAssembly",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Auto (Server and WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Uses Server while downloading WebAssembly assets, then uses WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_Interactivity location",
+  "symbols/InteractivityLocation/displayName": "Interactivity _location",
   "symbols/InteractivityLocation/description": "Chooses which components will have interactive rendering enabled",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page/component",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interactivity is applied on a per-page or per-component basis",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interactivity is applied at the root level",
-  "symbols/IncludeSampleContent/displayName": "_Include sample pages",
+  "symbols/IncludeSampleContent/displayName": "Include _sample pages",
   "symbols/IncludeSampleContent/description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns.",
   "symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
   "symbols/auth/choices/None/description": "No authentication",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual isn't used for --auth.",
   "symbols/UseProgramMain/displayName": "Do not use _top-level statements",
   "symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
+  "symbols/LocalhostTld/displayName": "Use the .dev.localhost TLD in the application URL",
+  "symbols/LocalhostTld/description": "Whether to combine the project name with the .dev.localhost TLD in the application URL for local development, e.g. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
   "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
-}
\ No newline at end of file
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json
index 5ee91daa5bd8..ca2551ae5811 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json
@@ -3,7 +3,7 @@
   "name": "Aplicación web Blazor",
   "description": "Plantilla de proyecto para crear una aplicación web de Blazor que admita tanto la representación del lado del servidor como la interactividad del cliente. Esta plantilla se puede usar para las aplicaciones web con interfaces de usuario dinámicas enriquecidas.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/UserSecretsId/description": "Identificador que se va a usar para los secretos (se usa con la autenticación individual).",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa la autenticación individual).",
   "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa la autenticación individual).",
-  "symbols/InteractivityPlatform/displayName": "_Interactivity tipo",
-  "symbols/InteractivityPlatform/description": "Elige la plataforma de hospedaje que se va a usar para los componentes interactivos",
+  "symbols/InteractivityPlatform/displayName": "_Interactive modo de representación",
+  "symbols/InteractivityPlatform/description": "Elige qué modo de representación interactiva usar para los componentes interactivos",
   "symbols/InteractivityPlatform/choices/None/displayName": "Ninguno",
   "symbols/InteractivityPlatform/choices/None/description": "Sin interactividad (solo representación de servidor estático)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Servidor",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "Se ejecuta en el explorador mediante WebAssembly",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Automático (Servidor y WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Usa el servidor al descargar los activos de WebAssembly y, a continuación, usa WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_Interactivity ubicación",
+  "symbols/InteractivityLocation/displayName": "Interactividad _ubicación",
   "symbols/InteractivityLocation/description": "Elige qué componentes tendrán habilitada la representación interactiva",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Por página o componente",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "La interactividad se aplica por página o por componente",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "La interactividad se aplica en el nivel raíz",
-  "symbols/IncludeSampleContent/displayName": "_Incluir páginas de ejemplo",
+  "symbols/IncludeSampleContent/displayName": "Incluir páginas de _sample",
   "symbols/IncludeSampleContent/description": "Configura si se van a agregar páginas de ejemplo y estilos para mostrar patrones de uso básicos.",
   "symbols/Empty/description": "Configura si se omiten las páginas de ejemplo y los estilos que muestran patrones de uso básicos.",
   "symbols/auth/choices/None/description": "Sin autenticación",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si individual no se usa para --auth.",
   "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior",
   "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.",
+  "symbols/LocalhostTld/displayName": "Usar el TLD .dev.localhost en la dirección URL de la aplicación",
+  "symbols/LocalhostTld/description": "Indica si se debe combinar el nombre del proyecto con el TLD .dev.localhost en la dirección URL de la aplicación para el desarrollo local, por ejemplo, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json
index 0d25340346e5..f60391f68dd3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json
@@ -3,7 +3,7 @@
   "name": "Application web Blazor",
   "description": "Modèle de projet pour la création d’une application web Blazor qui prend en charge le rendu côté serveur et l’interactivité du client. Ce modèle peut être utilisé pour les applications web avec des interfaces utilisateur dynamiques enrichies.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/UserSecretsId/description": "ID à utiliser pour les secrets (à utiliser avec l’authentification individuelle).",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si l’authentification individuelle est utilisée).",
   "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si l’authentification individuelle est utilisée).",
-  "symbols/InteractivityPlatform/displayName": "type _Interactivity",
-  "symbols/InteractivityPlatform/description": "Choisit la plateforme d’hébergement à utiliser pour les composants interactifs",
+  "symbols/InteractivityPlatform/displayName": "_Mode de rendu interactif",
+  "symbols/InteractivityPlatform/description": "Choisit le mode de rendu interactif à utiliser pour les composants interactifs",
   "symbols/InteractivityPlatform/choices/None/displayName": "Aucun",
   "symbols/InteractivityPlatform/choices/None/description": "Aucune interactivité (rendu de serveur statique uniquement)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Serveur",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "S’exécute dans le navigateur à l’aide de WebAssembly",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Automatique (Serveur et WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Utilise le serveur lors du téléchargement des ressources WebAssembly, puis utilise WebAssembly",
-  "symbols/InteractivityLocation/displayName": "emplacement _Interactivity",
+  "symbols/InteractivityLocation/displayName": "Interactivité _location",
   "symbols/InteractivityLocation/description": "Choisit les composants pour lesquels le rendu interactif est activé",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Par page/composant",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "L’interactivité est appliquée sur une base par page ou par composant",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Mondial",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "L’interactivité est appliquée au niveau racine",
-  "symbols/IncludeSampleContent/displayName": "_Inclure des exemples de pages",
+  "symbols/IncludeSampleContent/displayName": "Inclure les pages _sample",
   "symbols/IncludeSampleContent/description": "Configure s'il faut ajouter des exemples de pages et de style pour illustrer les modèles d'utilisation de base.",
   "symbols/Empty/description": "Configure s'il faut omettre les exemples de pages et le style qui illustrent les modèles d'utilisation de base.",
   "symbols/auth/choices/None/description": "Aucune authentification",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual n’est pas utilisé pour --auth.",
   "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.",
   "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.",
+  "symbols/LocalhostTld/displayName": "Utilisez le TLD .dev.localhost dans l’URL de l’application",
+  "symbols/LocalhostTld/description": "Indique s’il faut combiner le nom du projet avec le TLD .dev.localhost dans l’URL de l’application pour le développement local, par exemple https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json
index bd5443326efe..3cc3a30b21c1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json
@@ -3,7 +3,7 @@
   "name": "App Web Blazor",
   "description": "Modello di progetto per la creazione di un'app Web Blazor che supporta sia il rendering lato server sia l'interattività client. Questo modello può essere usato per app Web con interfacce utente dinamiche avanzate.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/UserSecretsId/description": "ID da usare per i segreti (usare con l'autenticazione Individual).",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa l'autenticazione Individual).",
   "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa l'autenticazione Individual).",
-  "symbols/InteractivityPlatform/displayName": "tipo di _Interactivity",
-  "symbols/InteractivityPlatform/description": "Sceglie la piattaforma di hosting da usare per i componenti interattivi",
+  "symbols/InteractivityPlatform/displayName": "_Modalità di rendering interattivo",
+  "symbols/InteractivityPlatform/description": "Consente di scegliere la modalità di rendering interattivo da usare per i componenti interattivi",
   "symbols/InteractivityPlatform/choices/None/displayName": "Nessuno",
   "symbols/InteractivityPlatform/choices/None/description": "Nessuna interattività (solo rendering server statico)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Server",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "Viene eseguito nel browser tramite WebAssembly",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Automatico (Server e WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Usa Server durante il download degli asset WebAssembly, quindi usa WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_Interactivity posizione",
+  "symbols/InteractivityLocation/displayName": "Posizione _interattività",
   "symbols/InteractivityLocation/description": "Sceglie quali componenti avranno il rendering interattivo abilitato",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per pagina/componente",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "L'interattività viene applicata per pagina o per componente",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Globale",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "L'interattività viene applicata a livello radice",
-  "symbols/IncludeSampleContent/displayName": "_Include pagine di esempio",
+  "symbols/IncludeSampleContent/displayName": "Includi _pagine di esempio",
   "symbols/IncludeSampleContent/description": "Consente di configurare se aggiungere pagine di esempio e stile per mostrare modelli di utilizzo di base.",
   "symbols/Empty/description": "Consente di configurare se omettere pagine di esempio e stile che mostrano modelli di utilizzo di base.",
   "symbols/auth/choices/None/description": "Nessuna autenticazione",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual non viene usata per --auth.",
   "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello",
   "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.",
+  "symbols/LocalhostTld/displayName": "Usa il TLD .dev.localhost nell'URL dell'applicazione",
+  "symbols/LocalhostTld/description": "Indicare se combinare il nome del progetto con il TLD .dev.localhost nell'URL dell'applicazione per lo sviluppo in locale, ad esempio https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json
index 1c23498c0257..518fc5845fd6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json
@@ -3,7 +3,7 @@
   "name": "Blazor Web アプリ",
   "description": "サーバー側のレンダリングとクライアントの対話機能の両方をサポートする Blazor Web アプリを作成するためのプロジェクト テンプレートです。このテンプレートは、リッチな動的ユーザー インターフェイス (UI) を持つ Web アプリに使用できます。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/UserSecretsId/description": "シークレットで使用する ID (IndividualAuth で使用)。",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "launchSettings.json で HTTPS エンドポイントに使用するポート番号。このオプションは、no-https パラメーターが使用されていない場合にのみ適用されます (IndividualAuth が使用されている場合は、no-https は無視されます)。",
   "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。",
   "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、no-https パラメーターが使用されていない場合にのみ適用されます (IndividualAuth が使用されている場合は、no-https は無視されます)。",
-  "symbols/InteractivityPlatform/displayName": "インタラクティビティ型(_I)",
-  "symbols/InteractivityPlatform/description": "対話型コンポーネントに使用するホスティング プラットフォームを選択します",
+  "symbols/InteractivityPlatform/displayName": "_対話型レンダリング モード",
+  "symbols/InteractivityPlatform/description": "対話型コンポーネントに使用する対話型レンダリング モードを選択します",
   "symbols/InteractivityPlatform/choices/None/displayName": "なし",
   "symbols/InteractivityPlatform/choices/None/description": "インタラクティビティなし (静的サーバー レンダリングのみ)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "サーバー",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "WebAssembly を使用してブラウザーで実行します",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "自動 (サーバーと WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "WebAssembly 資産のダウンロード中にサーバーを使用してから、WebAssembly を使用します",
-  "symbols/InteractivityLocation/displayName": "インタラクティビティ場所(_I)",
+  "symbols/InteractivityLocation/displayName": "インタラクティビティの場所(_L)",
   "symbols/InteractivityLocation/description": "対話型レンダリングを有効にするコンポーネントを選択します",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "ページ/コンポーネントごと",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "インタラクティビティは、ページ単位またはコンポーネント単位で適用されます",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "グローバル",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "インタラクティビティはルート レベルで適用されます",
-  "symbols/IncludeSampleContent/displayName": "サンプル ページを含める(_I)",
+  "symbols/IncludeSampleContent/displayName": "サンプル ページを含める(_S)",
   "symbols/IncludeSampleContent/description": "基本的な使用パターンを示すサンプル ページとスタイルを追加するかどうかを構成します。",
   "symbols/Empty/description": "基本的な使用パターンを示すサンプル ページとスタイルを省略するかどうかを構成します。",
   "symbols/auth/choices/None/description": "認証なし",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual が --auth に使用されていない場合にのみ適用されます。",
   "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)",
   "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。",
+  "symbols/LocalhostTld/displayName": "アプリケーション URL で .dev.localhost TLD を使用する",
+  "symbols/LocalhostTld/description": "ローカル開発用のアプリケーション URL 内で、プロジェクト名を .dev.localhost TLD と組み合わせるかどうか (例: https://myapp.dev.localhost:12345)。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json
index e204607ccac2..0694ad4c16cc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json
@@ -3,7 +3,7 @@
   "name": "Blazor 웹앱",
   "description": "서버 측 렌더링 및 클라이언트 대화형 작업을 모두 지원하는 Blazor 웹앱을 만들기 위한 프로젝트 템플릿입니다. 이 템플릿은 풍부한 동적 UI(사용자 인터페이스)가 있는 웹앱에 사용할 수 있습니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/UserSecretsId/description": "비밀에 사용할 ID입니다(개별 인증과 함께 사용).",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "launchSettings.json의 HTTPS 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(개별 인증을 사용하는 경우 no-https가 무시됨).",
   "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express HTTPS 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(개별 인증을 사용하는 경우 no-https가 무시됨).",
-  "symbols/InteractivityPlatform/displayName": "_Interactivity 유형",
-  "symbols/InteractivityPlatform/description": "대화형 구성 요소에 사용할 호스팅 플랫폼을 선택합니다.",
+  "symbols/InteractivityPlatform/displayName": "_대화형 렌더링 모드",
+  "symbols/InteractivityPlatform/description": "대화형 구성 요소에 사용할 대화형 렌더링 모드를 선택합니다.",
   "symbols/InteractivityPlatform/choices/None/displayName": "없음",
   "symbols/InteractivityPlatform/choices/None/description": "대화형 작업 없음(정적 서버 렌더링만 해당)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "서버",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "WebAssembly를 사용하여 브라우저에서 실행",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "자동(Server 및 WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "WebAssembly 자산을 다운로드하는 동안 서버를 사용한 다음, WebAssembly를 사용합니다.",
-  "symbols/InteractivityLocation/displayName": "_Interactivity 위치",
+  "symbols/InteractivityLocation/displayName": "대화형 위치(_L)",
   "symbols/InteractivityLocation/description": "대화형 렌더링을 사용하도록 설정할 구성 요소를 선택합니다.",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "페이지/구성 요소당",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "상호 작용은 페이지별 또는 구성 요소별로 적용됩니다.",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "글로벌",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "대화형 작업은 루트 수준에서 적용됩니다.",
-  "symbols/IncludeSampleContent/displayName": "샘플 페이지 포함(_I)",
+  "symbols/IncludeSampleContent/displayName": "샘플 페이지 포함(_S)",
   "symbols/IncludeSampleContent/description": "기본 사용 패턴을 보여주기 위해 샘플 페이지 및 스타일을 추가할지 여부를 구성합니다.",
   "symbols/Empty/description": "기본 사용 패턴을 보여주는 샘플 페이지 및 스타일을 생략할지 여부를 구성합니다.",
   "symbols/auth/choices/None/description": "인증 없음",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별 항목이 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)",
   "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.",
+  "symbols/LocalhostTld/displayName": "애플리케이션 URL에서 .dev.localhost TLD를 사용하세요.",
+  "symbols/LocalhostTld/description": "로컬 개발을 위한 애플리케이션 URL에서 프로젝트 이름과 .dev.localhost TLD를 결합할지 여부, 예를 들어 https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json
index 680c85b1ccc1..2f066461d636 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json
@@ -3,7 +3,7 @@
   "name": "Aplikacja internetowa Blazor",
   "description": "Szablon projektu służący do tworzenia aplikacji internetowej platformy Blazor, która obsługuje renderowanie po stronie serwera i interakcyjność klienta. Ten szablon może być używany dla aplikacji internetowych z zaawansowanymi dynamicznymi interfejsami użytkownika.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/UserSecretsId/description": "Identyfikator do użycia dla wpisów tajnych (używany z indywidualnym uwierzytelnianym).",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy parametr no-https nie jest używany (no-https będzie ignorowany, jeśli używany jest Individual auth — indywidualny uwierzytelniony dostęp).",
   "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS programu IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy parametr no-https nie jest używany (no-https będzie ignorowany, jeśli używany jest Individual auth — indywidualny uwierzytelniony dostęp).",
-  "symbols/InteractivityPlatform/displayName": "_Typy interakcyjności",
-  "symbols/InteractivityPlatform/description": "Wybiera platformę hostingu, która ma być używana na potrzeby składników interakcyjnych",
+  "symbols/InteractivityPlatform/displayName": "_Interakcyjny tryb renderowania",
+  "symbols/InteractivityPlatform/description": "Wybiera tryb renderowania interakcyjnego do użycia dla składników interakcyjnych",
   "symbols/InteractivityPlatform/choices/None/displayName": "Brak",
   "symbols/InteractivityPlatform/choices/None/description": "Brak interakcyjności (tylko renderowanie serwera statycznego)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Serwer",
@@ -27,7 +27,7 @@
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interakcyjność jest stosowana dla poszczególnych stron lub składników",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Globalne",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interakcyjność jest stosowana na poziomie głównym",
-  "symbols/IncludeSampleContent/displayName": "_Dołącz przykładowe strony",
+  "symbols/IncludeSampleContent/displayName": "Dołącz _przykładowe strony",
   "symbols/IncludeSampleContent/description": "Konfiguruje, czy dodać przykładowe strony i style w celu zademonstrowania podstawowych wzorców użycia.",
   "symbols/Empty/description": "Konfiguruje, czy pomijać przykładowe strony i style demonstrujące podstawowe wzorce użycia.",
   "symbols/auth/choices/None/description": "Bez uwierzytelniania",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy opcja Individual nie została użyta dla opcji --auth.",
   "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu",
   "symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.",
+  "symbols/LocalhostTld/displayName": "Użyj pliku .dev.localhost TLD w adresie URL aplikacji",
+  "symbols/LocalhostTld/description": "Określa, czy połączyć nazwę projektu z domeną najwyższego poziomu .dev.localhost w adresie URL aplikacji na potrzeby programowania lokalnego, np. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 95709542acd4..6e4eedd859bc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -3,7 +3,7 @@
   "name": "Aplicativo Web Blazor",
   "description": "Um modelo de projeto para criar um aplicativo Web Blazor que dá suporte à renderização do lado do servidor e à interatividade do cliente. Este modelo pode ser usado para aplicativos da Web com interfaces de usuário (UIs) dinâmicas avançadas.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/UserSecretsId/description": "O ID a ser usado para segredos (usado com autenticação individual).",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS em launchSettings.json. Esta opção só é aplicável quando o parâmetro no-https não é utilizado (no-https será ignorado se for utilizada autenticação individual).",
   "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Esta opção só é aplicável quando o parâmetro no-https não é utilizado (no-https será ignorado se for utilizada autenticação individual).",
-  "symbols/InteractivityPlatform/displayName": "_Tipo de interatividade",
-  "symbols/InteractivityPlatform/description": "Escolhe qual plataforma de hospedagem usar com os componentes interativos",
+  "symbols/InteractivityPlatform/displayName": "_Modo de renderização Interativo",
+  "symbols/InteractivityPlatform/description": "Escolha qual modo de renderização interativo que será usado para componentes interativos",
   "symbols/InteractivityPlatform/choices/None/displayName": "Nenhum",
   "symbols/InteractivityPlatform/choices/None/description": "Sem interatividade (somente renderização do servidor estático)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Servidor",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "É executado no navegador usando o WebAssembly",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Automático (Servidor e WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Usa Servidor ao baixar os ativos WebAssembly e usa o WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_Interatividade local",
+  "symbols/InteractivityLocation/displayName": "Localização da _Interatividade",
   "symbols/InteractivityLocation/description": "Escolhe quais componentes terão a renderização interativa habilitada",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Por página/componente",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "A interatividade é aplicada por página ou por componente",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "A interatividade é aplicada no nível raiz",
-  "symbols/IncludeSampleContent/displayName": "_Incluir páginas de amostra",
+  "symbols/IncludeSampleContent/displayName": "Incluir páginas de _amostra",
   "symbols/IncludeSampleContent/description": "Configura se deseja adicionar páginas de amostra e estilo para demonstrar padrões de uso básicos.",
   "symbols/Empty/description": "Configura a omissão de páginas de amostra e estilo que demonstram padrões básicos de uso.",
   "symbols/auth/choices/None/description": "Sem autenticação",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Se deve desligar o HTTPS. Essa opção só se aplica se Individual não for usado para --auth.",
   "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior",
   "symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.",
+  "symbols/LocalhostTld/displayName": "Usar o TLD .dev.localhost na URL do aplicativo",
+  "symbols/LocalhostTld/description": "Se deseja combinar o nome do projeto com o TLD .dev.localhost na URL do aplicativo para desenvolvimento local, por exemplo, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
   "postActions/restore/manualInstructions/default/text": "Executa 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json
index 2a2f7b50097b..6d83de21bb73 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json
@@ -3,7 +3,7 @@
   "name": "Веб-приложение Blazor",
   "description": "Шаблон проекта для создания приложения Blazor, поддерживающего как отрисовку на стороне сервера, так и интерактивные возможности клиента. Этот шаблон можно использовать для веб-приложений с многофункциональными динамическими пользовательскими интерфейсами (UI).",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/UserSecretsId/description": "Идентификатор, используемый для секретов (применяется с индивидуальной проверкой подлинности).",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (no-https игнорируется при использовании индивидуальной проверки подлинности).",
   "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.",
   "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (no-https игнорируется при использовании индивидуальной проверки подлинности).",
-  "symbols/InteractivityPlatform/displayName": "Тип _интерактивности",
-  "symbols/InteractivityPlatform/description": "Выбор платформы размещения для интерактивных компонентов",
+  "symbols/InteractivityPlatform/displayName": "_Интерактивный режим отрисовки",
+  "symbols/InteractivityPlatform/description": "Выбор режима интерактивной отрисовки для интерактивных компонентов",
   "symbols/InteractivityPlatform/choices/None/displayName": "Нет",
   "symbols/InteractivityPlatform/choices/None/description": "Без взаимодействия (только отрисовка статического сервера)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Сервер",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "Запуск в браузере с помощью WebAssembly",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Авто (Сервер и WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "Использует сервер при загрузке ресурсов WebAssembly, затем использует WebAssembly.",
-  "symbols/InteractivityLocation/displayName": "расположение _интерактивности",
+  "symbols/InteractivityLocation/displayName": "_Расположение интерактивности",
   "symbols/InteractivityLocation/description": "Выбор компонентов, для которых будет включена интерактивная отрисовка",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "На страницу или компонент",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Интерактивность применяется для каждой страницы или для каждого компонента",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Глобальный",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Интерактивность применяется на корневом уровне",
-  "symbols/IncludeSampleContent/displayName": "_Включить примеры страниц",
+  "symbols/IncludeSampleContent/displayName": "Включить _примеры страниц",
   "symbols/IncludeSampleContent/description": "Настраивает, следует ли добавлять примеры страниц и стили для демонстрации базовых шаблонов использования.",
   "symbols/Empty/description": "Настраивает, следует ли пропускать примеры страниц и стили, демонстрирующие базовые шаблоны использования.",
   "symbols/auth/choices/None/description": "Без проверки подлинности",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется только в том случае, если для аргумента --auth не используется значение Individual.",
   "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня",
   "symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.",
+  "symbols/LocalhostTld/displayName": "Используйте домен верхнего уровня .dev.localhost в URL-адресе приложения",
+  "symbols/LocalhostTld/description": "Следует ли объединять имя проекта с TLD .dev.localhost в URL-адресе приложения для локальной разработки, например, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json
index aebc293d040f..2bca6772387c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json
@@ -3,7 +3,7 @@
   "name": "Blazor Web Uygulaması",
   "description": "Hem sunucu tarafı işlemeyi hem de istemci etkileşimini destekleyen bir Blazor web uygulaması oluşturmaya yönelik proje şablonu. Bu şablon, zengin dinamik kullanıcı arabirimlerine (UI) sahip web uygulamaları için kullanılabilir.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/UserSecretsId/description": "Gizli diziler için kullanılacak kimlik (Bireysel kimlik doğrulamayla kullanın).",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "launchSettings.json içinde HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmadığında geçerlidir (Bireysel kimlik doğrulama kullanılırsa no-https göz ardı edilecektir).",
   "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmadığında geçerlidir (Bireysel kimlik doğrulama kullanılırsa no-https göz ardı edilecektir).",
-  "symbols/InteractivityPlatform/displayName": "_Etkileşim türü",
-  "symbols/InteractivityPlatform/description": "Etkileşimli bileşenler için kullanılacak barındırma platformunu seçer",
+  "symbols/InteractivityPlatform/displayName": "_Etkileşimli işleme modu",
+  "symbols/InteractivityPlatform/description": "Etkileşimli bileşenler için hangi etkileşimli işleme modunun kullanılacağını seçer",
   "symbols/InteractivityPlatform/choices/None/displayName": "Yok",
   "symbols/InteractivityPlatform/choices/None/description": "Etkileşim yok (yalnızca statik sunucu işleme)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "Server",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "WebAssembly kullanarak tarayıcıda çalışır",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "Otomatik (Server ve WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "WebAssembly varlıkları indirilirken Server kullanır, ardından WebAssembly'i kullanır",
-  "symbols/InteractivityLocation/displayName": "_Etkileşimin konumu",
+  "symbols/InteractivityLocation/displayName": "Etkileşim _konumu",
   "symbols/InteractivityLocation/description": "Etkileşimli işlemenin etkinleştirileceği bileşenleri belirler",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Sayfa/bileşen başına",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "Etkileşim sayfa başına veya bileşen başına temelinde uygulanır",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Genel",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Etkileşim kök düzeyinde uygulanır",
-  "symbols/IncludeSampleContent/displayName": "Örnek _sayfalar ekle",
+  "symbols/IncludeSampleContent/displayName": "Örnek sayfalar _ekle",
   "symbols/IncludeSampleContent/description": "Temel kullanım düzenlerini göstermek için örnek sayfaların ve stil oluşturma özelliklerinin eklenip eklenmeyeceğini yapılandırır.",
   "symbols/Empty/description": "Temel kullanım düzenlerini gösteren örnek sayfaların ve stil oluşturma özelliklerinin atlanıp atlanmayacağını yapılandırır.",
   "symbols/auth/choices/None/description": "Kimlik doğrulaması yok",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel --auth için kullanılmadığında geçerlidir.",
   "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın",
   "symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.",
+  "symbols/LocalhostTld/displayName": "Uygulama URL'sinde .dev.localhost TLD'sini kullanın",
+  "symbols/LocalhostTld/description": "Yerel geliştirme için uygulama URL'sinde proje adını .dev.localhost TLD ile birleştirip birleştirmeyeceğinizi seçin, örneğin https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 01048e225981..eb986742989b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -3,7 +3,7 @@
   "name": "Blazor Web 应用",
   "description": "用于创建支持服务器端呈现和客户端交互的 Blazor Web 应用的项目模板。此模板可用于具有丰富动态用户界面 (UI) 的 Web 应用。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/UserSecretsId/description": "用于机密的 ID (与个人身份验证一起使用)。",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "要用于 launchSettings.json 中 HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 Induvidual 身份验证，则将忽略 no-https)。",
   "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。",
   "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 Induvidual 身份验证，则将忽略 no-https)。",
-  "symbols/InteractivityPlatform/displayName": "_交互性类型",
-  "symbols/InteractivityPlatform/description": "选择交互式组件要使用的托管平台",
+  "symbols/InteractivityPlatform/displayName": "交互式(_I)呈现模式",
+  "symbols/InteractivityPlatform/description": "选择要用于交互式组件的交互式呈现模式",
   "symbols/InteractivityPlatform/choices/None/displayName": "无",
   "symbols/InteractivityPlatform/choices/None/description": "没有交互性 (仅限静态服务器呈现)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "服务器",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "使用 WebAssembly 在浏览器中运行",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "自动 (服务器和 WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "下载 WebAssembly 资产时使用服务器，然后使用 WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_交互性位置",
+  "symbols/InteractivityLocation/displayName": "交互性位置(_L)",
   "symbols/InteractivityLocation/description": "选择将启用交互式呈现的组件",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "每页/组件",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "基于每页或每组件应用交互",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "全局",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "在根级别应用交互性",
-  "symbols/IncludeSampleContent/displayName": "包含示例页(_I)",
+  "symbols/IncludeSampleContent/displayName": "包含示例页(_S)",
   "symbols/IncludeSampleContent/description": "配置是否添加示例页和样式以演示基本使用模式。",
   "symbols/Empty/description": "配置是否忽略演示基本使用模式的示例页和样式。",
   "symbols/auth/choices/None/description": "无身份验证",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "是否关闭 HTTPS。仅当 Individual 不用于 --auth 时，此选项才适用。",
   "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)",
   "symbols/UseProgramMain/description": "是否生成显式程序类和主方法，而不是顶级语句。",
+  "symbols/LocalhostTld/displayName": "在应用程序 URL 中使用 .dev.localhost TLD",
+  "symbols/LocalhostTld/description": "是否在应用程序 URL 中将项目名称与 .dev.localhost TLD 合并以用于本地开发，例如 https://myapp.dev.localhost:12345。",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
   "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index b34e4fd9fb33..1cb6a16e26a1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -3,7 +3,7 @@
   "name": "Blazor Web 應用程式",
   "description": "用於建立同時支援伺服器端轉譯和用戶端互動的 Blazor Web 應用程式的專案範本。此範本可用於具有豐富動態使用者介面 (UI) 的 Web 應用程式。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/UserSecretsId/description": "用於祕密的識別碼 (搭配個別驗證使用)。",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。",
@@ -11,8 +11,8 @@
   "symbols/kestrelHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用用此選項 (如果使用個別驗證，則會忽略 no-https)。",
   "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。",
   "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用用此選項 (如果使用個別驗證，則會忽略 no-https)。",
-  "symbols/InteractivityPlatform/displayName": "_互動功能類型",
-  "symbols/InteractivityPlatform/description": "選擇要用於互動式元件的裝載平台",
+  "symbols/InteractivityPlatform/displayName": "互動式轉譯模式(_I)",
+  "symbols/InteractivityPlatform/description": "選擇要用於互動式元件的互動式轉譯模式",
   "symbols/InteractivityPlatform/choices/None/displayName": "無",
   "symbols/InteractivityPlatform/choices/None/description": "沒有互動功能 (只有靜態伺服器轉譯)",
   "symbols/InteractivityPlatform/choices/Server/displayName": "伺服器",
@@ -21,13 +21,13 @@
   "symbols/InteractivityPlatform/choices/WebAssembly/description": "使用 WebAssembly 在瀏覽器中執行",
   "symbols/InteractivityPlatform/choices/Auto/displayName": "自動 (伺服器和 WebAssembly)",
   "symbols/InteractivityPlatform/choices/Auto/description": "下載 WebAssembly 資產時使用伺服器，然後使用 WebAssembly",
-  "symbols/InteractivityLocation/displayName": "_互動功能位置",
+  "symbols/InteractivityLocation/displayName": "互動功能位置(_l)",
   "symbols/InteractivityLocation/description": "選擇要啟用互動式轉譯的元件",
   "symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "每頁/元件",
   "symbols/InteractivityLocation/choices/InteractivePerPage/description": "互動性會以每頁或每一元件為基礎套用",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "全球",
   "symbols/InteractivityLocation/choices/InteractiveGlobal/description": "互動功能已套用至根層級",
-  "symbols/IncludeSampleContent/displayName": "包含範例頁面(_I)",
+  "symbols/IncludeSampleContent/displayName": "包含範例頁面(_s)",
   "symbols/IncludeSampleContent/description": "設定是否要新增範例頁面和樣式，以示範基本使用模式。",
   "symbols/Empty/description": "設定是否要省略範例頁面和樣式，其示範基本使用模式。",
   "symbols/auth/choices/None/description": "沒有驗證",
@@ -39,6 +39,8 @@
   "symbols/NoHttps/description": "是否要關閉 HTTPS。此選項僅適用於個人未用於 --auth 時。",
   "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)",
   "symbols/UseProgramMain/description": "是否要產生明確的 Program 類別和 Main 方法，而非最上層語句。",
+  "symbols/LocalhostTld/displayName": "在應用程式 URL 中使用 .dev.localhost TLD",
+  "symbols/LocalhostTld/description": "是否要在本機開發的應用程式 URL 中將專案名稱與 .dev.localhost TLD 合併，例如 https://myapp.dev.localhost:12345。",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 04d9fe1b2e0c..df16332f7827 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -10,36 +10,36 @@
   "defaultName": "BlazorApp",
   "description": "A project template for creating a Blazor web app that supports both server-side rendering and client interactivity. This template can be used for web apps with rich dynamic user interfaces (UIs).",
   "groupIdentity": "Microsoft.Web.Blazor",
-  "precedence": "9900",
+  "precedence": "10000",
   "guids": [
     "4C26868E-5E7C-458D-82E3-040509D0C71F",
     "5990939C-7E7B-4CFA-86FF-44CA5756498A",
     "650B3CE7-2E93-4CC4-9F46-466686815EAA",
     "53bc9b9d-9d6a-45d4-8429-2a2761773502"
   ],
-  "identity": "Microsoft.Web.Blazor.CSharp.9.0",
-  "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices",
+  "identity": "Microsoft.Web.Blazor.CSharp.10.0",
+  "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices",
   "preferNameDirectory": true,
   "primaryOutputs": [
     {
       "condition": "(UseWebAssembly && (HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\"))",
-      "path": "BlazorWeb-CSharp.sln"
+      "path": "BlazorWebCSharp.1.sln"
     },
     {
       "condition": "(UseWebAssembly && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
-      "path": "BlazorWeb-CSharp/BlazorWeb-CSharp.csproj"
+      "path": "BlazorWebCSharp.1/BlazorWebCSharp.1.csproj"
     },
     {
       "condition": "(!UseWebAssembly)",
-      "path": "BlazorWeb-CSharp.csproj"
+      "path": "BlazorWebCSharp.1.csproj"
     },
     {
       "condition": "(UseWebAssembly && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
-      "path": "BlazorWeb-CSharp.Client/BlazorWeb-CSharp.Client.csproj"
+      "path": "BlazorWebCSharp.1.Client/BlazorWebCSharp.1.Client.csproj"
     }
   ],
   "shortName": "blazor",
-  "sourceName": "BlazorWeb-CSharp",
+  "sourceName": "BlazorWebCSharp.1",
   "sources": [
     {
       "source": "./",
@@ -54,34 +54,35 @@
         {
           "condition": "(!UseWebAssembly)",
           "exclude": [
-            "BlazorWeb-CSharp.Client/**",
+            "BlazorWebCSharp.1.Client/**",
             "*.sln"
           ],
           "rename": {
-            "BlazorWeb-CSharp/": "./"
+            "BlazorWebCSharp.1/": "./"
           }
         },
         {
           "condition": "(UseWebAssembly && InteractiveAtRoot)",
           "rename": {
-            "BlazorWeb-CSharp/Components/Layout/": "./BlazorWeb-CSharp.Client/Layout/",
-            "BlazorWeb-CSharp/Components/Pages/Home.razor": "./BlazorWeb-CSharp.Client/Pages/Home.razor",
-            "BlazorWeb-CSharp/Components/Pages/Weather.razor": "./BlazorWeb-CSharp.Client/Pages/Weather.razor",
-            "BlazorWeb-CSharp/Components/Routes.razor": "./BlazorWeb-CSharp.Client/Routes.razor"
+            "BlazorWebCSharp.1/Components/Layout/": "./BlazorWebCSharp.1.Client/Layout/",
+            "BlazorWebCSharp.1/Components/Pages/Home.razor": "./BlazorWebCSharp.1.Client/Pages/Home.razor",
+            "BlazorWebCSharp.1/Components/Pages/NotFound.razor": "./BlazorWebCSharp.1.Client/Pages/NotFound.razor",
+            "BlazorWebCSharp.1/Components/Pages/Weather.razor": "./BlazorWebCSharp.1.Client/Pages/Weather.razor",
+            "BlazorWebCSharp.1/Components/Routes.razor": "./BlazorWebCSharp.1.Client/Routes.razor"
           }
         },
         {
           "condition": "(!UseProgramMain)",
           "exclude": [
-            "BlazorWeb-CSharp/Program.Main.cs",
-            "BlazorWeb-CSharp.Client/Program.Main.cs"
+            "BlazorWebCSharp.1/Program.Main.cs",
+            "BlazorWebCSharp.1.Client/Program.Main.cs"
           ]
         },
         {
           "condition": "(UseProgramMain)",
           "exclude": [
-            "BlazorWeb-CSharp/Program.cs",
-            "BlazorWeb-CSharp.Client/Program.cs"
+            "BlazorWebCSharp.1/Program.cs",
+            "BlazorWebCSharp.1.Client/Program.cs"
           ],
           "rename": {
             "Program.Main.cs": "Program.cs"
@@ -90,26 +91,37 @@
         {
           "condition": "(!(UseServer && !UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Pages/Counter.razor"
+            "BlazorWebCSharp.1/Components/Pages/Counter.razor"
+          ]
+        },
+        {
+          "condition": "(!UseServer)",
+          "exclude": [
+            "BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor",
+            "BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.css",
+            "BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.js",
+            "BlazorWebCSharp.1.Client/Layout/ReconnectModal.razor",
+            "BlazorWebCSharp.1.Client/Layout/ReconnectModal.razor.css",
+            "BlazorWebCSharp.1.Client/Layout/ReconnectModal.razor.js"
           ]
         },
         {
           "condition": "(ExcludeLaunchSettings)",
           "exclude": [
-            "BlazorWeb-CSharp/Properties/launchSettings.json"
+            "BlazorWebCSharp.1/Properties/launchSettings.json"
           ]
         },
         {
           "condition": "(!SampleContent)",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Pages/Auth.*",
-            "BlazorWeb-CSharp/Components/Pages/Counter.*",
-            "BlazorWeb-CSharp/Components/Pages/Weather.*",
-            "BlazorWeb-CSharp/Components/Layout/NavMenu.*",
-            "BlazorWeb-CSharp/wwwroot/lib/**",
-            "BlazorWeb-CSharp/wwwroot/favicon.*",
-            "BlazorWeb-CSharp.Client/Pages/**",
-            "BlazorWeb-CSharp.Client/wwwroot/**"
+            "BlazorWebCSharp.1/Components/Pages/Auth.*",
+            "BlazorWebCSharp.1/Components/Pages/Counter.*",
+            "BlazorWebCSharp.1/Components/Pages/Weather.*",
+            "BlazorWebCSharp.1/Components/Layout/NavMenu.*",
+            "BlazorWebCSharp.1/wwwroot/lib/**",
+            "BlazorWebCSharp.1/wwwroot/favicon.*",
+            "BlazorWebCSharp.1.Client/Pages/**",
+            "BlazorWebCSharp.1.Client/wwwroot/**"
           ]
         },
         {
@@ -121,70 +133,70 @@
         {
           "condition": "(!IndividualLocalAuth)",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Account/**",
-            "BlazorWeb-CSharp/Data/**",
-            "BlazorWeb-CSharp.Client/UserInfo.cs",
-            "BlazorWeb-CSharp.Client/Pages/Auth.razor"
+            "BlazorWebCSharp.1/Components/Account/**",
+            "BlazorWebCSharp.1/Data/**",
+            "BlazorWebCSharp.1.Client/UserInfo.cs",
+            "BlazorWebCSharp.1.Client/Pages/Auth.razor"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && !UseLocalDB))",
           "exclude": [
-            "BlazorWeb-CSharp/Data/app.db"
+            "BlazorWebCSharp.1/Data/app.db"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && !UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Pages/Auth.razor"
+            "BlazorWebCSharp.1/Components/Pages/Auth.razor"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && UseServer))",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(IndividualLocalAuth && UseLocalDB && UseWebAssembly)",
           "rename": {
-            "BlazorWeb-CSharp/Data/SqlServer/": "BlazorWeb-CSharp/Data/Migrations/"
+            "BlazorWebCSharp.1/Data/SqlServer/": "BlazorWebCSharp.1/Data/Migrations/"
           },
           "exclude": [
-            "BlazorWeb-CSharp/Data/SqlLite/**"
+            "BlazorWebCSharp.1/Data/SqlLite/**"
           ]
         },
         {
           "condition": "(IndividualLocalAuth && UseLocalDB && !UseWebAssembly)",
           "rename": {
-            "BlazorWeb-CSharp/Data/SqlServer/": "Data/Migrations/"
+            "BlazorWebCSharp.1/Data/SqlServer/": "Data/Migrations/"
           },
           "exclude": [
-            "BlazorWeb-CSharp/Data/SqlLite/**"
+            "BlazorWebCSharp.1/Data/SqlLite/**"
           ]
         },
         {
           "condition": "(IndividualLocalAuth && !UseLocalDB && UseWebAssembly)",
           "rename": {
-            "BlazorWeb-CSharp/Data/SqlLite/": "BlazorWeb-CSharp/Data/Migrations/"
+            "BlazorWebCSharp.1/Data/SqlLite/": "BlazorWebCSharp.1/Data/Migrations/"
           },
           "exclude": [
-            "BlazorWeb-CSharp/Data/SqlServer/**"
+            "BlazorWebCSharp.1/Data/SqlServer/**"
           ]
         },
         {
           "condition": "(IndividualLocalAuth && !UseLocalDB && !UseWebAssembly)",
           "rename": {
-            "BlazorWeb-CSharp/Data/SqlLite/": "Data/Migrations/"
+            "BlazorWebCSharp.1/Data/SqlLite/": "Data/Migrations/"
           },
           "exclude": [
-            "BlazorWeb-CSharp/Data/SqlServer/**"
+            "BlazorWebCSharp.1/Data/SqlServer/**"
           ]
         },
         {
           "condition": "(IndividualLocalAuth && UseWebAssembly)",
           "rename": {
-            "BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor": "BlazorWeb-CSharp.Client/RedirectToLogin.razor"
+            "BlazorWebCSharp.1/Components/Account/Shared/RedirectToLogin.razor": "BlazorWebCSharp.1.Client/RedirectToLogin.razor"
           }
         }
       ]
@@ -197,12 +209,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "HostIdentifier": {
       "type": "bind",
@@ -211,8 +223,8 @@
     "UserSecretsId": {
       "type": "parameter",
       "datatype": "string",
-      "replaces": "aspnet-BlazorWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
-      "defaultValue": "aspnet-BlazorWeb-CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502",
+      "replaces": "aspnet-BlazorWebCSharp.1-53bc9b9d-9d6a-45d4-8429-2a2761773502",
+      "defaultValue": "aspnet-BlazorWebCSharp.1-53bc9b9d-9d6a-45d4-8429-2a2761773502",
       "description": "The ID to use for secrets (use with Individual auth)."
     },
     "skipRestore": {
@@ -311,6 +323,19 @@
       },
       "replaces": "44300"
     },
+    "StyleBundleName":{
+      "type": "generated",
+      "generator": "regex",
+      "replaces": "StyleBundleName",
+      "parameters": {
+      "source": "name",
+      "steps": [
+        {
+          "regex": " ",
+          "replacement": "_"
+        }]
+      }
+    },
     "InteractivityPlatform": {
       "type": "parameter",
       "datatype": "choice",
@@ -344,7 +369,7 @@
       "type": "parameter",
       "datatype": "choice",
       "defaultValue": "InteractivePerPage",
-      "displayName": "_Interactivity location",
+      "displayName": "Interactivity _location",
       "description": "Chooses which components will have interactive rendering enabled",
       "isEnabled": "(InteractivityPlatform != \"None\")",
       "choices": [
@@ -372,7 +397,7 @@
       "type": "parameter",
       "datatype": "bool",
       "defaultValue": "true",
-      "displayName": "_Include sample pages",
+      "displayName": "Include _sample pages",
       "description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns."
     },
     "Empty": {
@@ -455,6 +480,13 @@
       "defaultValue": "false",
       "displayName": "Do not use _top-level statements",
       "description": "Whether to generate an explicit Program class and Main method instead of top-level statements."
+    },
+    "LocalhostTld": {
+      "type": "parameter",
+      "datatype": "bool",
+      "defaultValue": "false",
+      "displayName": "Use the .dev.localhost TLD in the application URL",
+      "description": "Whether to combine the project name with the .dev.localhost TLD in the application URL for local development, e.g. https://myapp.dev.localhost:12345."
     }
   },
   "tags": {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityUserAccessor.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityUserAccessor.cs
deleted file mode 100644
index 86e027c0b6ee..000000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityUserAccessor.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using BlazorWeb_CSharp.Data;
-
-namespace BlazorWeb_CSharp.Components.Account;
-
-internal sealed class IdentityUserAccessor(UserManager<ApplicationUser> userManager, IdentityRedirectManager redirectManager)
-{
-    public async Task<ApplicationUser> GetRequiredUserAsync(HttpContext context)
-    {
-        var user = await userManager.GetUserAsync(context.User);
-
-        if (user is null)
-        {
-            redirectManager.RedirectToWithStatus("Account/InvalidUser", $"Error: Unable to load user with ID '{userManager.GetUserId(context.User)}'.", context);
-        }
-
-        return user;
-    }
-}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
deleted file mode 100644
index ecfdacfa93f4..000000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
+++ /dev/null
@@ -1,2 +0,0 @@
-@using BlazorWeb_CSharp.Components.Account.Shared
-@attribute [ExcludeFromInteractiveRouting]
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Pages/Auth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Pages/Auth.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Pages/Auth.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Pages/Auth.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Pages/Counter.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Pages/Counter.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Pages/Counter.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Pages/Counter.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Program.Main.cs
similarity index 92%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Program.Main.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Program.Main.cs
index 7ed596789d0d..f068f6db1b68 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Program.Main.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
-namespace BlazorWeb_CSharp.Client;
+namespace BlazorWebCSharp._1.Client;
 
 class Program
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Program.cs
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/Program.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Program.cs
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/_Imports.razor
similarity index 76%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/_Imports.razor
index b739f3ba372a..674eac341d64 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/_Imports.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/_Imports.razor
@@ -9,8 +9,7 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using BlazorWeb_CSharp
-@*#if (UseWebAssembly) -->
-@using BlazorWeb_CSharp.Client
-##endif*@
-@using BlazorWeb_CSharp.Components
+@using BlazorWebCSharp._1.Client
+@*#if (UseWebAssembly && InteractiveAtRoot) -->
+@using BlazorWebCSharp._1.Client.Layout
+##endif*@
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/wwwroot/appsettings.Development.json
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.Development.json
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/wwwroot/appsettings.Development.json
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/wwwroot/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/wwwroot/appsettings.json
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.Client/wwwroot/appsettings.json
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/wwwroot/appsettings.json
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.sln b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.sln
similarity index 88%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.sln
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.sln
index 4f37d8496763..76c33ea1b94d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.sln
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.sln
@@ -2,9 +2,9 @@
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.0.0
 MinimumVisualStudioVersion = 16.0.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWeb-CSharp", "BlazorWeb-CSharp\BlazorWeb-CSharp.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebCSharp.1", "BlazorWebCSharp.1\BlazorWebCSharp.1.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWeb-CSharp.Client", "BlazorWeb-CSharp.Client\BlazorWeb-CSharp.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebCSharp.1.Client", "BlazorWebCSharp.1.Client\BlazorWebCSharp.1.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
similarity index 71%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index fd9fe31ab31a..96565a6ec3a8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -1,14 +1,15 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
-using BlazorWeb_CSharp.Components.Account.Pages;
-using BlazorWeb_CSharp.Components.Account.Pages.Manage;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Components.Account.Pages;
+using BlazorWebCSharp._1.Components.Account.Pages.Manage;
+using BlazorWebCSharp._1.Data;
 
 namespace Microsoft.AspNetCore.Routing;
 
@@ -49,6 +50,45 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
             return TypedResults.LocalRedirect($"~/{returnUrl}");
         });
 
+        accountGroup.MapPost("/PasskeyCreationOptions", async (
+            HttpContext context,
+            [FromServices] UserManager<ApplicationUser> userManager,
+            [FromServices] SignInManager<ApplicationUser> signInManager,
+            [FromServices] IAntiforgery antiforgery) =>
+        {
+            await antiforgery.ValidateRequestAsync(context);
+
+            var user = await userManager.GetUserAsync(context.User);
+            if (user is null)
+            {
+                return Results.NotFound($"Unable to load user with ID '{userManager.GetUserId(context.User)}'.");
+            }
+
+            var userId = await userManager.GetUserIdAsync(user);
+            var userName = await userManager.GetUserNameAsync(user) ?? "User";
+            var optionsJson = await signInManager.MakePasskeyCreationOptionsAsync(new()
+            {
+                Id = userId,
+                Name = userName,
+                DisplayName = userName
+            });
+            return TypedResults.Content(optionsJson, contentType: "application/json");
+        });
+
+        accountGroup.MapPost("/PasskeyRequestOptions", async (
+            HttpContext context,
+            [FromServices] UserManager<ApplicationUser> userManager,
+            [FromServices] SignInManager<ApplicationUser> signInManager,
+            [FromServices] IAntiforgery antiforgery,
+            [FromQuery] string? username) =>
+        {
+            await antiforgery.ValidateRequestAsync(context);
+
+            var user = string.IsNullOrEmpty(username) ? null : await userManager.FindByNameAsync(username);
+            var optionsJson = await signInManager.MakePasskeyRequestOptionsAsync(user);
+            return TypedResults.Content(optionsJson, contentType: "application/json");
+        });
+
         var manageGroup = accountGroup.MapGroup("/Manage").RequireAuthorization();
 
         manageGroup.MapPost("/LinkExternalLogin", async (
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityNoOpEmailSender.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityNoOpEmailSender.cs
similarity index 93%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityNoOpEmailSender.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityNoOpEmailSender.cs
index 1256a02a78ba..e1fc2df442bd 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityNoOpEmailSender.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityNoOpEmailSender.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Data;
 
-namespace BlazorWeb_CSharp.Components.Account;
+namespace BlazorWebCSharp._1.Components.Account;
 
 // Remove the "else if (EmailSender is IdentityNoOpEmailSender)" block from RegisterConfirmation.razor after updating with a real implementation.
 internal sealed class IdentityNoOpEmailSender : IEmailSender<ApplicationUser>
@@ -11,10 +11,10 @@ internal sealed class IdentityNoOpEmailSender : IEmailSender<ApplicationUser>
 
     public Task SendConfirmationLinkAsync(ApplicationUser user, string email, string confirmationLink) =>
         emailSender.SendEmailAsync(email, "Confirm your email", $"Please confirm your account by <a href='{confirmationLink}'>clicking here</a>.");
- 
+
     public Task SendPasswordResetLinkAsync(ApplicationUser user, string email, string resetLink) =>
         emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password by <a href='{resetLink}'>clicking here</a>.");
- 
+
     public Task SendPasswordResetCodeAsync(ApplicationUser user, string email, string resetCode) =>
         emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password using the following code: {resetCode}");
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRedirectManager.cs
similarity index 73%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRedirectManager.cs
index da85e6efd46d..9d7e30adae19 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRedirectManager.cs
@@ -1,7 +1,8 @@
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Identity;
+using BlazorWebCSharp._1.Data;
 
-namespace BlazorWeb_CSharp.Components.Account;
+namespace BlazorWebCSharp._1.Components.Account;
 
 internal sealed class IdentityRedirectManager(NavigationManager navigationManager)
 {
@@ -15,7 +16,6 @@ internal sealed class IdentityRedirectManager(NavigationManager navigationManage
         MaxAge = TimeSpan.FromSeconds(5),
     };
 
-    [DoesNotReturn]
     public void RedirectTo(string? uri)
     {
         uri ??= "";
@@ -26,13 +26,9 @@ public void RedirectTo(string? uri)
             uri = navigationManager.ToBaseRelativePath(uri);
         }
 
-        // During static rendering, NavigateTo throws a NavigationException which is handled by the framework as a redirect.
-        // So as long as this is called from a statically rendered Identity component, the InvalidOperationException is never thrown.
         navigationManager.NavigateTo(uri);
-        throw new InvalidOperationException($"{nameof(IdentityRedirectManager)} can only be used during static rendering.");
     }
 
-    [DoesNotReturn]
     public void RedirectTo(string uri, Dictionary<string, object?> queryParameters)
     {
         var uriWithoutQuery = navigationManager.ToAbsoluteUri(uri).GetLeftPart(UriPartial.Path);
@@ -40,7 +36,6 @@ public void RedirectTo(string uri, Dictionary<string, object?> queryParameters)
         RedirectTo(newUri);
     }
 
-    [DoesNotReturn]
     public void RedirectToWithStatus(string uri, string message, HttpContext context)
     {
         context.Response.Cookies.Append(StatusCookieName, message, StatusCookieBuilder.Build(context));
@@ -49,10 +44,11 @@ public void RedirectToWithStatus(string uri, string message, HttpContext context
 
     private string CurrentPath => navigationManager.ToAbsoluteUri(navigationManager.Uri).GetLeftPart(UriPartial.Path);
 
-    [DoesNotReturn]
     public void RedirectToCurrentPage() => RedirectTo(CurrentPath);
 
-    [DoesNotReturn]
     public void RedirectToCurrentPageWithStatus(string message, HttpContext context)
         => RedirectToWithStatus(CurrentPath, message, context);
+
+    public void RedirectToInvalidUser(UserManager<ApplicationUser> userManager, HttpContext context)
+        => RedirectToWithStatus("Account/InvalidUser", $"Error: Unable to load user with ID '{userManager.GetUserId(context.User)}'.", context);
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
similarity index 95%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
index cf8bf6d8930b..489443fbeffb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
@@ -3,9 +3,9 @@
 using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Data;
 
-namespace BlazorWeb_CSharp.Components.Account;
+namespace BlazorWebCSharp._1.Components.Account;
 
 // This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user
 // every 30 minutes an interactive circuit is connected.
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/AccessDenied.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/AccessDenied.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/AccessDenied.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/AccessDenied.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ConfirmEmail.razor
similarity index 96%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ConfirmEmail.razor
index 830ee204c824..0841b05c8763 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ConfirmEmail.razor
@@ -3,7 +3,7 @@
 @using System.Text
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IdentityRedirectManager RedirectManager
@@ -30,6 +30,7 @@
         if (UserId is null || Code is null)
         {
             RedirectManager.RedirectTo("");
+            return;
         }
 
         var user = await UserManager.FindByIdAsync(UserId);
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ConfirmEmailChange.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ConfirmEmailChange.razor
index 478a810defc9..3a76b7261564 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ConfirmEmailChange.razor
@@ -3,7 +3,7 @@
 @using System.Text
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
@@ -36,6 +36,7 @@
         {
             RedirectManager.RedirectToWithStatus(
                 "Account/Login", "Error: Invalid email change confirmation link.", HttpContext);
+            return;
         }
 
         var user = await UserManager.FindByIdAsync(UserId);
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ExternalLogin.razor
similarity index 92%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ExternalLogin.razor
index 0e5200ecb4e5..0c30821599fa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ExternalLogin.razor
@@ -6,7 +6,7 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
@@ -54,7 +54,7 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     [SupplyParameterFromQuery]
     private string? RemoteError { get; set; }
@@ -69,15 +69,19 @@
 
     protected override async Task OnInitializedAsync()
     {
+        Input ??= new();
+
         if (RemoteError is not null)
         {
             RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
+            return;
         }
 
         var info = await SignInManager.GetExternalLoginInfoAsync();
         if (info is null)
         {
             RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
+            return;
         }
 
         externalLoginInfo = info;
@@ -101,6 +105,7 @@
         if (externalLoginInfo is null)
         {
             RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
+            return;
         }
 
         // Sign in the user with this external login provider if the user already has a login.
@@ -117,10 +122,12 @@
                 externalLoginInfo.Principal.Identity?.Name,
                 externalLoginInfo.LoginProvider);
             RedirectManager.RedirectTo(ReturnUrl);
+            return;
         }
         else if (result.IsLockedOut)
         {
             RedirectManager.RedirectTo("Account/Lockout");
+            return;
         }
 
         // If the user does not have an account, then ask the user to create an account.
@@ -135,6 +142,7 @@
         if (externalLoginInfo is null)
         {
             RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information during confirmation.", HttpContext);
+            return;
         }
 
         var emailStore = GetEmailStore();
@@ -165,13 +173,17 @@
                 {
                     RedirectManager.RedirectTo("Account/RegisterConfirmation", new() { ["email"] = Input.Email });
                 }
-
-                await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
-                RedirectManager.RedirectTo(ReturnUrl);
+                else
+                {
+                    await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
+                    RedirectManager.RedirectTo(ReturnUrl);
+                }
             }
         }
-
-        message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
+        else
+        {
+            message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
+        }
     }
 
     private ApplicationUser CreateUser()
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
similarity index 93%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
index efe20b0f5639..ae82692ab7e9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
@@ -5,7 +5,7 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender<ApplicationUser> EmailSender
@@ -35,7 +35,12 @@
 
 @code {
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
+
+    protected override void OnInitialized()
+    {
+        Input ??= new();
+    }
 
     private async Task OnValidSubmitAsync()
     {
@@ -44,6 +49,7 @@
         {
             // Don't reveal that the user does not exist or is not confirmed
             RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
+            return;
         }
 
         // For more information on how to enable account confirmation and password reset please
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPasswordConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPasswordConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPasswordConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPasswordConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidPasswordReset.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/InvalidPasswordReset.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidPasswordReset.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/InvalidPasswordReset.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidUser.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/InvalidUser.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidUser.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/InvalidUser.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Lockout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Lockout.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Lockout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Lockout.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
similarity index 70%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
index 292750b79a4c..65347e0afdb6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
@@ -3,8 +3,9 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Authentication
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
+@inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
 @inject ILogger<Login> Logger
 @inject NavigationManager NavigationManager
@@ -17,13 +18,13 @@
     <div class="col-lg-6">
         <section>
             <StatusMessage Message="@errorMessage" />
-            <EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login">
+            <EditForm EditContext="editContext" method="post" OnSubmit="LoginUser" FormName="login">
                 <DataAnnotationsValidator />
                 <h2>Use a local account to log in.</h2>
                 <hr />
                 <ValidationSummary class="text-danger" role="alert" />
                 <div class="form-floating mb-3">
-                    <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
+                    <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username webauthn" aria-required="true" placeholder="name@example.com" />
                     <label for="Input.Email" class="form-label">Email</label>
                     <ValidationMessage For="() => Input.Email" class="text-danger" />
                 </div>
@@ -41,6 +42,12 @@
                 <div>
                     <button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
                 </div>
+                <hr />
+                <div class="d-flex flex-column">
+                    <span class="text-secondary mx-auto mt-2">OR</span>
+                    <PasskeySubmit Operation="PasskeyOperation.Request" Name="Input.Passkey" EmailName="Input.Email" class="btn btn-link mx-auto">Log in with a passkey</PasskeySubmit>
+                </div>
+                <hr />
                 <div>
                     <p>
                         <a href="Account/ForgotPassword">Forgot your password?</a>
@@ -66,18 +73,23 @@
 
 @code {
     private string? errorMessage;
+    private EditContext editContext = default!;
 
     [CascadingParameter]
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
+        Input ??= new();
+
+        editContext = new EditContext(Input);
+
         if (HttpMethods.IsGet(HttpContext.Request.Method))
         {
             // Clear the existing external cookie to ensure a clean login process
@@ -87,9 +99,31 @@
 
     public async Task LoginUser()
     {
-        // This doesn't count login failures towards account lockout
-        // To enable password failures to trigger account lockout, set lockoutOnFailure: true
-        var result = await SignInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
+        if (!string.IsNullOrEmpty(Input.Passkey?.Error))
+        {
+            errorMessage = $"Error: {Input.Passkey.Error}";
+            return;
+        }
+
+        SignInResult result;
+        if (!string.IsNullOrEmpty(Input.Passkey?.CredentialJson))
+        {
+            // When performing passkey sign-in, don't perform form validation.
+            result = await SignInManager.PasskeySignInAsync(Input.Passkey.CredentialJson);
+        }
+        else
+        {
+            // If doing a password sign-in, validate the form.
+            if (!editContext.Validate())
+            {
+                return;
+            }
+
+            // This doesn't count login failures towards account lockout
+            // To enable password failures to trigger account lockout, set lockoutOnFailure: true
+            result = await SignInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
+        }
+
         if (result.Succeeded)
         {
             Logger.LogInformation("User logged in.");
@@ -124,5 +158,7 @@
 
         [Display(Name = "Remember me?")]
         public bool RememberMe { get; set; }
+
+        public PasskeyInputModel? Passkey { get; set; }
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/LoginWith2fa.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/LoginWith2fa.razor
index 20cebaaef191..3d7243c9b775 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/LoginWith2fa.razor
@@ -2,7 +2,7 @@
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
@@ -49,7 +49,7 @@
     private ApplicationUser user = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
@@ -59,6 +59,8 @@
 
     protected override async Task OnInitializedAsync()
     {
+        Input ??= new();
+
         // Ensure the user has gone through the username & password screen first
         user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
             throw new InvalidOperationException("Unable to load two-factor authentication user.");
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/LoginWithRecoveryCode.razor
similarity index 96%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/LoginWithRecoveryCode.razor
index b984545c18d2..f99d02900b12 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/LoginWithRecoveryCode.razor
@@ -2,7 +2,7 @@
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
@@ -38,13 +38,15 @@
     private ApplicationUser user = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
+        Input ??= new();
+
         // Ensure the user has gone through the username & password screen first
         user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
             throw new InvalidOperationException("Unable to load two-factor authentication user.");
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
similarity index 88%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
index dc21755a47b0..290ea53d8fe1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
@@ -2,11 +2,10 @@
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<ChangePassword> Logger
 
@@ -41,18 +40,26 @@
 
 @code {
     private string? message;
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private bool hasPassword;
 
     [CascadingParameter]
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        Input ??= new();
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         hasPassword = await UserManager.HasPasswordAsync(user);
         if (!hasPassword)
         {
@@ -62,6 +69,12 @@
 
     private async Task OnValidSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword);
         if (!changePasswordResult.Succeeded)
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/DeletePersonalData.razor
similarity index 84%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/DeletePersonalData.razor
index d7bfb84d491b..f9c247897223 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/DeletePersonalData.razor
@@ -2,11 +2,10 @@
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<DeletePersonalData> Logger
 
@@ -40,24 +39,36 @@
 
 @code {
     private string? message;
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private bool requirePassword;
 
     [CascadingParameter]
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
         Input ??= new();
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
         requirePassword = await UserManager.HasPasswordAsync(user);
     }
 
     private async Task OnValidSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         if (requirePassword && !await UserManager.CheckPasswordAsync(user, Input.Password))
         {
             message = "Error: Incorrect password.";
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Disable2fa.razor
similarity index 82%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Disable2fa.razor
index d3969f457c9c..8a6921b2ae5b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Disable2fa.razor
@@ -1,10 +1,9 @@
 @page "/Account/Manage/Disable2fa"
 
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<Disable2fa> Logger
 
@@ -31,14 +30,19 @@
 </div>
 
 @code {
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
 
     [CascadingParameter]
     private HttpContext HttpContext { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
 
         if (HttpMethods.IsGet(HttpContext.Request.Method) && !await UserManager.GetTwoFactorEnabledAsync(user))
         {
@@ -48,6 +52,12 @@
 
     private async Task OnSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var disable2faResult = await UserManager.SetTwoFactorEnabledAsync(user, false);
         if (!disable2faResult.Succeeded)
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
similarity index 87%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
index c8b1518061ae..94f6b6a473ca 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
@@ -5,12 +5,12 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender<ApplicationUser> EmailSender
-@inject IdentityUserAccessor UserAccessor
 @inject NavigationManager NavigationManager
+@inject IdentityRedirectManager RedirectManager
 
 <PageTitle>Manage email</PageTitle>
 
@@ -55,7 +55,7 @@
 
 @code {
     private string? message;
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private string? email;
     private bool isEmailConfirmed;
 
@@ -63,11 +63,19 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm(FormName = "change-email")]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        Input ??= new();
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         email = await UserManager.GetEmailAsync(user);
         isEmailConfirmed = await UserManager.IsEmailConfirmedAsync(user);
 
@@ -82,6 +90,12 @@
             return;
         }
 
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var userId = await UserManager.GetUserIdAsync(user);
         var code = await UserManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail);
         code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
@@ -101,6 +115,12 @@
             return;
         }
 
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var userId = await UserManager.GetUserIdAsync(user);
         var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
         code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/EnableAuthenticator.razor
similarity index 92%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/EnableAuthenticator.razor
index 1872e9e6c83b..588134b5fa5a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/EnableAuthenticator.razor
@@ -5,10 +5,9 @@
 @using System.Text
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
-@inject IdentityUserAccessor UserAccessor
 @inject UrlEncoder UrlEncoder
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<EnableAuthenticator> Logger
@@ -70,7 +69,7 @@ else
     private const string AuthenticatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
 
     private string? message;
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private string? sharedKey;
     private string? authenticatorUri;
     private IEnumerable<string>? recoveryCodes;
@@ -79,17 +78,30 @@ else
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        Input ??= new();
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
 
         await LoadSharedKeyAndQrCodeUriAsync(user);
     }
 
     private async Task OnValidSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         // Strip spaces and hyphens
         var verificationCode = Input.Code.Replace(" ", string.Empty).Replace("-", string.Empty);
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ExternalLogins.razor
similarity index 80%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ExternalLogins.razor
index 25a6b27926a0..4c2582dcae89 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -2,11 +2,10 @@
 
 @using Microsoft.AspNetCore.Authentication
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IUserStore<ApplicationUser> UserStore
 @inject IdentityRedirectManager RedirectManager
 
@@ -66,7 +65,7 @@
 @code {
     public const string LinkLoginCallbackAction = "LinkLoginCallback";
 
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private IList<UserLoginInfo>? currentLogins;
     private IList<AuthenticationScheme>? otherLogins;
     private bool showRemoveButton;
@@ -85,7 +84,13 @@
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         currentLogins = await UserManager.GetLoginsAsync(user);
         otherLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync())
             .Where(auth => currentLogins.All(ul => auth.Name != ul.LoginProvider))
@@ -107,34 +112,51 @@
 
     private async Task OnSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var result = await UserManager.RemoveLoginAsync(user, LoginProvider!, ProviderKey!);
         if (!result.Succeeded)
         {
             RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not removed.", HttpContext);
         }
-
-        await SignInManager.RefreshSignInAsync(user);
-        RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
+        else
+        {
+            await SignInManager.RefreshSignInAsync(user);
+            RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
+        }
     }
 
     private async Task OnGetLinkLoginCallbackAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var userId = await UserManager.GetUserIdAsync(user);
         var info = await SignInManager.GetExternalLoginInfoAsync(userId);
         if (info is null)
         {
             RedirectManager.RedirectToCurrentPageWithStatus("Error: Could not load external login info.", HttpContext);
+            return;
         }
 
         var result = await UserManager.AddLoginAsync(user, info);
-        if (!result.Succeeded)
+        if (result.Succeeded)
+        {
+            // Clear the existing external cookie to ensure a clean login process
+            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+
+            RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
+        }
+        else
         {
             RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not added. External logins can only be associated with one account.", HttpContext);
         }
-
-        // Clear the existing external cookie to ensure a clean login process
-        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-
-        RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
similarity index 84%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
index c63c765ab887..7ef969efb286 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
@@ -1,10 +1,9 @@
 @page "/Account/Manage/GenerateRecoveryCodes"
 
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<GenerateRecoveryCodes> Logger
 
@@ -40,7 +39,7 @@ else
 
 @code {
     private string? message;
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private IEnumerable<string>? recoveryCodes;
 
     [CascadingParameter]
@@ -48,7 +47,12 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
 
         var isTwoFactorEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
         if (!isTwoFactorEnabled)
@@ -59,6 +63,12 @@ else
 
     private async Task OnSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var userId = await UserManager.GetUserIdAsync(user);
         recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
         message = "You have generated new recovery codes.";
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Index.razor
similarity index 82%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Index.razor
index bff831a1d852..13faf41804f2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Index.razor
@@ -2,11 +2,10 @@
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 
 <PageTitle>Profile</PageTitle>
@@ -34,7 +33,7 @@
 </div>
 
 @code {
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
     private string? username;
     private string? phoneNumber;
 
@@ -42,11 +41,19 @@
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        Input ??= new();
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         username = await UserManager.GetUserNameAsync(user);
         phoneNumber = await UserManager.GetPhoneNumberAsync(user);
 
@@ -55,12 +62,19 @@
 
     private async Task OnValidSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         if (Input.PhoneNumber != phoneNumber)
         {
             var setPhoneResult = await UserManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
             if (!setPhoneResult.Succeeded)
             {
                 RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to set phone number.", HttpContext);
+                return;
             }
         }
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Passkeys.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Passkeys.razor
new file mode 100644
index 000000000000..b4bc96b4f376
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Passkeys.razor
@@ -0,0 +1,182 @@
+@page "/Account/Manage/Passkeys"
+
+@using BlazorWebCSharp._1.Data
+@using Microsoft.AspNetCore.Identity
+@using System.ComponentModel.DataAnnotations
+@using System.Buffers.Text
+
+@inject UserManager<ApplicationUser> UserManager
+@inject SignInManager<ApplicationUser> SignInManager
+@inject IdentityRedirectManager RedirectManager
+
+<PageTitle>Manage your passkeys</PageTitle>
+
+<h3>Manage your passkeys</h3>
+
+<StatusMessage />
+
+@if (currentPasskeys is { Count: > 0 })
+{
+    <table class="table">
+        <tbody>
+            @foreach (var passkey in currentPasskeys)
+            {
+                <tr>
+                    <td>@(passkey.Name ?? "Unnamed passkey")</td>
+                    <td>
+                        @{
+                            var credentialId = Base64Url.EncodeToString(passkey.CredentialId);
+                        }
+                        <form @formname="@($"update-passkey-{credentialId}")" @onsubmit="UpdatePasskey" method="post">
+                            <AntiforgeryToken />
+                            <div>
+                                <input type="hidden" name="CredentialId" value="@credentialId" />
+                                <button type="submit" name="Action" value="rename" class="btn btn-primary" title="Rename this passkey">Rename</button>
+                                <button type="submit" name="Action" value="delete" class="btn btn-danger" title="Remove this passkey from your account">Delete</button>
+                            </div>
+                        </form>
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
+else
+{
+    <p>No passkeys are registered.</p>
+}
+
+<form @formname="add-passkey" @onsubmit="AddPasskey" method="post">
+    <AntiforgeryToken />
+    @if (currentPasskeys is { Count: >= MaxPasskeyCount })
+    {
+        <p class="text-danger">You have reached the maximum number of allowed passkeys. Please delete one before adding a new one.</p>
+    }
+    else
+    {
+        <PasskeySubmit Operation="PasskeyOperation.Create" Name="Input" class="btn btn-primary">Add a new passkey</PasskeySubmit>
+    }
+
+</form>
+
+@code {
+    private const int MaxPasskeyCount = 100;
+
+    private ApplicationUser? user;
+    private IList<UserPasskeyInfo>? currentPasskeys;
+
+    [CascadingParameter]
+    private HttpContext HttpContext { get; set; } = default!;
+
+    [SupplyParameterFromForm]
+    private string? Action { get; set; }
+
+    [SupplyParameterFromForm]
+    private string? CredentialId { get; set; }
+
+    [SupplyParameterFromForm(FormName = "add-passkey")]
+    private PasskeyInputModel Input { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        Input ??= new();
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+        currentPasskeys = await UserManager.GetPasskeysAsync(user);
+    }
+
+    private async Task AddPasskey()
+    {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
+        if (!string.IsNullOrEmpty(Input.Error))
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus($"Error: {Input.Error}", HttpContext);
+            return;
+        }
+
+        if (string.IsNullOrEmpty(Input.CredentialJson))
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus("Error: The browser did not provide a passkey.", HttpContext);
+            return;
+        }
+
+        if (currentPasskeys!.Count >= MaxPasskeyCount)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus($"Error: You have reached the maximum number of allowed passkeys.", HttpContext);
+            return;
+        }
+
+        var attestationResult = await SignInManager.PerformPasskeyAttestationAsync(Input.CredentialJson);
+        if (!attestationResult.Succeeded)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus($"Error: Could not add the passkey: {attestationResult.Failure.Message}", HttpContext);
+            return;
+        }
+
+        var addPasskeyResult = await UserManager.AddOrUpdatePasskeyAsync(user, attestationResult.Passkey);
+        if (!addPasskeyResult.Succeeded)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus("Error: The passkey could not be added to your account.", HttpContext);
+            return;
+        }
+
+        // Immediately prompt the user to enter a name for the credential
+        var credentialIdBase64Url = Base64Url.EncodeToString(attestationResult.Passkey.CredentialId);
+        RedirectManager.RedirectTo($"Account/Manage/RenamePasskey/{credentialIdBase64Url}");
+    }
+
+    private async Task UpdatePasskey()
+    {
+        switch (Action)
+        {
+            case "rename":
+                RedirectManager.RedirectTo($"Account/Manage/RenamePasskey/{CredentialId}");
+                break;
+            case "delete":
+                await DeletePasskey();
+                break;
+            default:
+                RedirectManager.RedirectToCurrentPageWithStatus($"Error: Unknown action '{Action}'.", HttpContext);
+                break;
+        }
+    }
+
+    private async Task DeletePasskey()
+    {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
+        byte[] credentialId;
+        try
+        {
+            credentialId = Base64Url.DecodeFromChars(CredentialId);
+        }
+        catch (FormatException)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus("Error: The specified passkey ID had an invalid format.", HttpContext);
+            return;
+        }
+
+        var result = await UserManager.RemovePasskeyAsync(user, credentialId);
+        if (!result.Succeeded)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus("Error: The passkey could not be deleted.", HttpContext);
+            return;
+        }
+
+        RedirectManager.RedirectToCurrentPageWithStatus("Passkey deleted successfully.", HttpContext);
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/PersonalData.razor
similarity index 72%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/PersonalData.razor
index 851eb54c8820..214902bdbdec 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/PersonalData.razor
@@ -1,6 +1,10 @@
 @page "/Account/Manage/PersonalData"
 
-@inject IdentityUserAccessor UserAccessor
+@using Microsoft.AspNetCore.Identity
+@using BlazorWebCSharp._1.Data
+
+@inject UserManager<ApplicationUser> UserManager
+@inject IdentityRedirectManager RedirectManager
 
 <PageTitle>Personal Data</PageTitle>
 
@@ -29,6 +33,10 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _ = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        var user  = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+        }
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/RenamePasskey.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/RenamePasskey.razor
new file mode 100644
index 000000000000..a28d1bb85a50
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/RenamePasskey.razor
@@ -0,0 +1,95 @@
+@page "/Account/Manage/RenamePasskey/{Id}"
+
+@using BlazorWebCSharp._1.Data
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Identity
+@using System.Buffers.Text
+
+@inject UserManager<ApplicationUser> UserManager
+@inject IdentityRedirectManager RedirectManager
+
+<EditForm Model="Input" OnValidSubmit="Rename" FormName="rename-passkey" method="post">
+    <DataAnnotationsValidator />
+    @if (passkey?.Name is { } name)
+    {
+        <h4>Enter a new name for your "@name" passkey</h4>
+    }
+    else
+    {
+        <h4>Enter a name for your passkey</h4>
+    }
+    <hr />
+    <ValidationSummary class="text-danger" role="alert" />
+    <div class="form-floating mb-3">
+        <InputText @bind-Value="Input.Name" id="Input.Name" class="form-control" aria-required="true" placeholder="My passkey" />
+        <label for="Input.Name" class="form-label">Passkey name</label>
+        <ValidationMessage For="() => Input.Name" class="text-danger" />
+    </div>
+    <div>
+        <button type="submit" class="w-100 btn btn-lg btn-primary">Continue</button>
+    </div>
+</EditForm>
+
+@code {
+    private ApplicationUser? user;
+    private UserPasskeyInfo? passkey;
+
+    [CascadingParameter]
+    private HttpContext HttpContext { get; set; } = default!;
+
+    [Parameter]
+    public string? Id { get; set; }
+
+    [SupplyParameterFromForm]
+    private InputModel Input { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        Input ??= new();
+
+        user = (await UserManager.GetUserAsync(HttpContext.User))!;
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
+        byte[] credentialId;
+        try
+        {
+            credentialId = Base64Url.DecodeFromChars(Id);
+        }
+        catch (FormatException)
+        {
+            RedirectManager.RedirectToWithStatus("Account/Manage/Passkeys", "Error: The specified passkey ID had an invalid format.", HttpContext);
+            return;
+        }
+
+        passkey = await UserManager.GetPasskeyAsync(user, credentialId);
+        if (passkey is null)
+        {
+            RedirectManager.RedirectToWithStatus("Account/Manage/Passkeys", "Error: The specified passkey could not be found.", HttpContext);
+            return;
+        }
+    }
+
+    private async Task Rename()
+    {
+        passkey!.Name = Input.Name;
+        var result = await UserManager.AddOrUpdatePasskeyAsync(user!, passkey);
+        if (!result.Succeeded)
+        {
+            RedirectManager.RedirectToWithStatus("Account/Manage/Passkeys", "Error: The passkey could not be updated.", HttpContext);
+            return;
+        }
+
+        RedirectManager.RedirectToWithStatus("Account/Manage/Passkeys", "Passkey updated successfully.", HttpContext);
+    }
+
+    private sealed class InputModel
+    {
+        [Required]
+        [StringLength(200, ErrorMessage = "Passkey names must be no longer than {1} characters.")]
+        public string Name { get; set; } = "";
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ResetAuthenticator.razor
similarity index 88%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ResetAuthenticator.razor
index c12e38094f76..beb54b93a5f8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ResetAuthenticator.razor
@@ -1,11 +1,10 @@
 @page "/Account/Manage/ResetAuthenticator"
 
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 @inject ILogger<ResetAuthenticator> Logger
 
@@ -36,7 +35,13 @@
 
     private async Task OnSubmitAsync()
     {
-        var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        var user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         await UserManager.SetTwoFactorEnabledAsync(user, false);
         await UserManager.ResetAuthenticatorKeyAsync(user);
         var userId = await UserManager.GetUserIdAsync(user);
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/SetPassword.razor
similarity index 86%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/SetPassword.razor
index 79eabe780fff..180b4d77a4cc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/SetPassword.razor
@@ -2,11 +2,10 @@
 
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 
 <PageTitle>Set password</PageTitle>
@@ -39,17 +38,24 @@
 
 @code {
     private string? message;
-    private ApplicationUser user = default!;
+    private ApplicationUser? user;
 
     [CascadingParameter]
     private HttpContext HttpContext { get; set; } = default!;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        Input ??= new();
+
+        user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
 
         var hasPassword = await UserManager.HasPasswordAsync(user);
         if (hasPassword)
@@ -60,6 +66,12 @@
 
     private async Task OnValidSubmitAsync()
     {
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         var addPasswordResult = await UserManager.AddPasswordAsync(user, Input.NewPassword!);
         if (!addPasswordResult.Succeeded)
         {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
similarity index 93%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
index d15097a9ed16..6774ba789335 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
@@ -2,11 +2,10 @@
 
 @using Microsoft.AspNetCore.Http.Features
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
 
 <PageTitle>Two-factor authentication (2FA)</PageTitle>
@@ -82,7 +81,13 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
+        var user = await UserManager.GetUserAsync(HttpContext.User);
+        if (user is null)
+        {
+            RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
+            return;
+        }
+
         canTrack = HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
         hasAuthenticator = await UserManager.GetAuthenticatorKeyAsync(user) is not null;
         is2faEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/_Imports.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/_Imports.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
similarity index 92%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
index 6da721d050f2..bee8e0530a88 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
@@ -5,7 +5,7 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IUserStore<ApplicationUser> UserStore
@@ -22,7 +22,7 @@
 <div class="row">
     <div class="col-lg-6">
         <StatusMessage Message="@Message" />
-        <EditForm Model="Input" asp-route-returnUrl="@ReturnUrl" method="post" OnValidSubmit="RegisterUser" FormName="register">
+        <EditForm Model="Input" method="post" OnValidSubmit="RegisterUser" FormName="register">
             <DataAnnotationsValidator />
             <h2>Create a new account.</h2>
             <hr />
@@ -58,13 +58,18 @@
     private IEnumerable<IdentityError>? identityErrors;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     [SupplyParameterFromQuery]
     private string? ReturnUrl { get; set; }
 
     private string? Message => identityErrors is null ? null : $"Error: {string.Join(", ", identityErrors.Select(error => error.Description))}";
 
+    protected override void OnInitialized()
+    {
+        Input ??= new();
+    }
+
     public async Task RegisterUser(EditContext editContext)
     {
         var user = CreateUser();
@@ -97,9 +102,11 @@
                 "Account/RegisterConfirmation",
                 new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
         }
-
-        await SignInManager.SignInAsync(user, isPersistent: false);
-        RedirectManager.RedirectTo(ReturnUrl);
+        else
+        {
+            await SignInManager.SignInAsync(user, isPersistent: false);
+            RedirectManager.RedirectTo(ReturnUrl);
+        }
     }
 
     private ApplicationUser CreateUser()
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/RegisterConfirmation.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/RegisterConfirmation.razor
index ec74ea584ef8..de3ea0b2513b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/RegisterConfirmation.razor
@@ -3,7 +3,7 @@
 @using System.Text
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender<ApplicationUser> EmailSender
@@ -46,6 +46,7 @@ else
         if (Email is null)
         {
             RedirectManager.RedirectTo("");
+            return;
         }
 
         var user = await UserManager.FindByEmailAsync(Email);
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResendEmailConfirmation.razor
similarity index 93%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResendEmailConfirmation.razor
index 8024beaeeee2..b6fdb411ec8a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResendEmailConfirmation.razor
@@ -5,7 +5,7 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender<ApplicationUser> EmailSender
@@ -37,7 +37,12 @@
     private string? message;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
+
+    protected override void OnInitialized()
+    {
+        Input ??= new();
+    }
 
     private async Task OnValidSubmitAsync()
     {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
similarity index 95%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
index 61e07c0b8de0..74f258a1c518 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
@@ -4,7 +4,7 @@
 @using System.Text
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject IdentityRedirectManager RedirectManager
 @inject UserManager<ApplicationUser> UserManager
@@ -46,7 +46,7 @@
     private IEnumerable<IdentityError>? identityErrors;
 
     [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
+    private InputModel Input { get; set; } = default!;
 
     [SupplyParameterFromQuery]
     private string? Code { get; set; }
@@ -55,9 +55,12 @@
 
     protected override void OnInitialized()
     {
+        Input ??= new();
+
         if (Code is null)
         {
             RedirectManager.RedirectTo("Account/InvalidPasswordReset");
+            return;
         }
 
         Input.Code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
@@ -70,12 +73,14 @@
         {
             // Don't reveal that the user does not exist
             RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
+            return;
         }
 
         var result = await UserManager.ResetPasswordAsync(user, Input.Code, Input.Password);
         if (result.Succeeded)
         {
             RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
+            return;
         }
 
         identityErrors = result.Errors;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPasswordConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPasswordConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPasswordConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPasswordConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/_Imports.razor
new file mode 100644
index 000000000000..7dda41502616
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/_Imports.razor
@@ -0,0 +1,2 @@
+@using BlazorWebCSharp._1.Components.Account.Shared
+@attribute [ExcludeFromInteractiveRouting]
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyInputModel.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyInputModel.cs
new file mode 100644
index 000000000000..22319ef0d4d2
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyInputModel.cs
@@ -0,0 +1,7 @@
+namespace BlazorWebCSharp._1.Components.Account;
+
+public class PasskeyInputModel
+{
+    public string? CredentialJson { get; set; }
+    public string? Error { get; set; }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyOperation.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyOperation.cs
new file mode 100644
index 000000000000..ab2f0a29ef24
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyOperation.cs
@@ -0,0 +1,7 @@
+namespace BlazorWebCSharp._1.Components.Account;
+
+public enum PasskeyOperation
+{
+    Create = 0,
+    Request = 1,
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ExternalLoginPicker.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ExternalLoginPicker.razor
index 3127c8974a46..ae791f522546 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ExternalLoginPicker.razor
@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Authentication
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageLayout.razor
similarity index 77%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageLayout.razor
index 248a2ed161a1..e117e416e6d8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageLayout.razor
@@ -1,8 +1,8 @@
 @inherits LayoutComponentBase
 @*#if (UseWebAssembly && InteractiveAtRoot)
-@layout BlazorWeb_CSharp.Client.Layout.MainLayout
+@layout BlazorWebCSharp._1.Client.Layout.MainLayout
 ##else
-@layout BlazorWeb_CSharp.Components.Layout.MainLayout
+@layout BlazorWebCSharp._1.Components.Layout.MainLayout
 ##endif*@
 
 <h1>Manage your account</h1>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageNavMenu.razor
similarity index 88%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageNavMenu.razor
index 29d1ec6e7d8a..e29d36c96a4e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageNavMenu.razor
@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Data
+@using BlazorWebCSharp._1.Data
 
 @inject SignInManager<ApplicationUser> SignInManager
 
@@ -22,6 +22,9 @@
     <li class="nav-item">
         <NavLink class="nav-link" href="Account/Manage/TwoFactorAuthentication">Two-factor authentication</NavLink>
     </li>
+    <li class="nav-item">
+        <NavLink class="nav-link" href="Account/Manage/Passkeys">Passkeys</NavLink>
+    </li>
     <li class="nav-item">
         <NavLink class="nav-link" href="Account/Manage/PersonalData">Personal data</NavLink>
     </li>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/PasskeySubmit.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/PasskeySubmit.razor
new file mode 100644
index 000000000000..9db61ffa5f3d
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/PasskeySubmit.razor
@@ -0,0 +1,40 @@
+@using Microsoft.AspNetCore.Antiforgery
+@inject IServiceProvider Services
+
+<button type="submit" name="__passkeySubmit" @attributes="AdditionalAttributes">@ChildContent</button>
+<passkey-submit
+    operation="@Operation"
+    name="@Name"
+    email-name="@EmailName"
+    request-token-name="@tokens?.HeaderName"
+    request-token-value="@tokens?.RequestToken">
+</passkey-submit>
+
+@code {
+    private AntiforgeryTokenSet? tokens;
+
+    [CascadingParameter]
+    private HttpContext HttpContext { get; set; } = default!;
+
+    [Parameter]
+    [EditorRequired]
+    public PasskeyOperation Operation { get; set; }
+
+    [Parameter]
+    [EditorRequired]
+    public string Name { get; set; } = default!;
+
+    [Parameter]
+    public string? EmailName { get; set; }
+
+    [Parameter]
+    public RenderFragment? ChildContent { get; set; }
+
+    [Parameter(CaptureUnmatchedValues = true)]
+    public IDictionary<string, object>? AdditionalAttributes { get; set; }
+
+    protected override void OnInitialized()
+    {
+        tokens = Services.GetService<IAntiforgery>()?.GetTokens(HttpContext);
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/PasskeySubmit.razor.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/PasskeySubmit.razor.js
new file mode 100644
index 000000000000..55a83bcc7ba1
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/PasskeySubmit.razor.js
@@ -0,0 +1,123 @@
+const browserSupportsPasskeys =
+    typeof navigator.credentials !== 'undefined' &&
+    typeof window.PublicKeyCredential !== 'undefined' &&
+    typeof window.PublicKeyCredential.parseCreationOptionsFromJSON === 'function' &&
+    typeof window.PublicKeyCredential.parseRequestOptionsFromJSON === 'function';
+
+async function fetchWithErrorHandling(url, options = {}) {
+    const response = await fetch(url, {
+        credentials: 'include',
+        ...options
+    });
+    if (!response.ok) {
+        const text = await response.text();
+        console.error(text);
+        throw new Error(`The server responded with status ${response.status}.`);
+    }
+    return response;
+}
+
+async function createCredential(headers, signal) {
+    const optionsResponse = await fetchWithErrorHandling('/Account/PasskeyCreationOptions', {
+        method: 'POST',
+        headers,
+        signal,
+    });
+    const optionsJson = await optionsResponse.json();
+    const options = PublicKeyCredential.parseCreationOptionsFromJSON(optionsJson);
+    return await navigator.credentials.create({ publicKey: options, signal });
+}
+
+async function requestCredential(email, mediation, headers, signal) {
+    const optionsResponse = await fetchWithErrorHandling(`/Account/PasskeyRequestOptions?username=${email}`, {
+        method: 'POST',
+        headers,
+        signal,
+    });
+    const optionsJson = await optionsResponse.json();
+    const options = PublicKeyCredential.parseRequestOptionsFromJSON(optionsJson);
+    return await navigator.credentials.get({ publicKey: options, mediation, signal });
+}
+
+customElements.define('passkey-submit', class extends HTMLElement {
+    static formAssociated = true;
+
+    connectedCallback() {
+        this.internals = this.attachInternals();
+        this.attrs = {
+            operation: this.getAttribute('operation'),
+            name: this.getAttribute('name'),
+            emailName: this.getAttribute('email-name'),
+            requestTokenName: this.getAttribute('request-token-name'),
+            requestTokenValue: this.getAttribute('request-token-value'),
+        };
+
+        this.internals.form.addEventListener('submit', (event) => {
+            if (event.submitter?.name === '__passkeySubmit') {
+                event.preventDefault();
+                this.obtainAndSubmitCredential();
+            }
+        });
+
+        this.tryAutofillPasskey();
+    }
+
+    disconnectedCallback() {
+        this.abortController?.abort();
+    }
+
+    async obtainCredential(useConditionalMediation, signal) {
+        if (!browserSupportsPasskeys) {
+            throw new Error('Some passkey features are missing. Please update your browser.');
+        }
+
+        const headers = {
+            [this.attrs.requestTokenName]: this.attrs.requestTokenValue,
+        };
+
+        if (this.attrs.operation === 'Create') {
+            return await createCredential(headers, signal);
+        } else if (this.attrs.operation === 'Request') {
+            const email = new FormData(this.internals.form).get(this.attrs.emailName);
+            const mediation = useConditionalMediation ? 'conditional' : undefined;
+            return await requestCredential(email, mediation, headers, signal);
+        } else {
+            throw new Error(`Unknown passkey operation '${this.attrs.operation}'.`);
+        }
+    }
+
+    async obtainAndSubmitCredential(useConditionalMediation = false) {
+        this.abortController?.abort();
+        this.abortController = new AbortController();
+        const signal = this.abortController.signal;
+        const formData = new FormData();
+        try {
+            const credential = await this.obtainCredential(useConditionalMediation, signal);
+            const credentialJson = JSON.stringify(credential);
+            formData.append(`${this.attrs.name}.CredentialJson`, credentialJson);
+        } catch (error) {
+            if (error.name === 'AbortError') {
+                // The user explicitly canceled the operation - return without error.
+                return;
+            }
+            console.error(error);
+            if (useConditionalMediation) {
+                // An error occurred during conditional mediation, which is not user-initiated.
+                // We log the error in the console but do not relay it to the user.
+                return;
+            }
+            const errorMessage = error.name === 'NotAllowedError'
+                ? 'No passkey was provided by the authenticator.'
+                : error.message;
+            formData.append(`${this.attrs.name}.Error`, errorMessage);
+        }
+        this.internals.setFormValue(formData);
+        this.internals.form.submit();
+    }
+
+    async tryAutofillPasskey() {
+        if (browserSupportsPasskeys && this.attrs.operation === 'Request' && await PublicKeyCredential.isConditionalMediationAvailable?.()) {
+            await this.obtainAndSubmitCredential(/* useConditionalMediation */ true);
+        }
+    }
+});
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/RedirectToLogin.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/RedirectToLogin.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ShowRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ShowRecoveryCodes.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ShowRecoveryCodes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ShowRecoveryCodes.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/StatusMessage.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/StatusMessage.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/App.razor
similarity index 84%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/App.razor
index c43b540ddf7c..347861a467ff 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/App.razor
@@ -5,11 +5,12 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
+    <ResourcePreloader />
     @*#if (SampleContent)
     <link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
     ##endif*@
     <link rel="stylesheet" href="@Assets["app.css"]" />
-    <link rel="stylesheet" href="@Assets["BlazorWeb-CSharp.styles.css"]" />
+    <link rel="stylesheet" href="@Assets["StyleBundleName.styles.css"]" />
     <ImportMap />
     @*#if (SampleContent)
     <link rel="icon" type="image/png" href="favicon.png" />
@@ -39,7 +40,13 @@
     ##else
     <Routes @rendermode="InteractiveWebAssembly" />
     ##endif*@
-    <script src="_framework/blazor.web.js"></script>
+    @*#if (UseServer)  -->
+    <ReconnectModal />
+    ##endif*@
+    <script src="@Assets["_framework/blazor.web.js"]"></script>
+    @*#if (IndividualLocalAuth)
+    <script src="@Assets["Components/Account/Shared/PasskeySubmit.razor.js"]" type="module"></script>
+    ##endif*@
 </body>
 
 </html>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/MainLayout.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/MainLayout.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/MainLayout.razor.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/MainLayout.razor.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/MainLayout.razor.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/NavMenu.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/NavMenu.razor
index bd05d545fc59..00fbe2af24d7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/NavMenu.razor
@@ -6,14 +6,14 @@
 ##endif*@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="">BlazorWeb-CSharp</a>
+        <a class="navbar-brand" href="">BlazorWebCSharp.1</a>
     </div>
 </div>
 
 <input type="checkbox" title="Navigation menu" class="navbar-toggler" />
 
 <div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
-    <nav class="flex-column">
+    <nav class="nav flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
                 <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/NavMenu.razor.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/NavMenu.razor.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor
new file mode 100644
index 000000000000..a85217a1132b
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor
@@ -0,0 +1,35 @@
+@*#if (UseWebAssembly && InteractiveAtRoot) -->
+<script type="module" src="@Assets["Layout/ReconnectModal.razor.js"]"></script>
+##else
+<script type="module" src="@Assets["Components/Layout/ReconnectModal.razor.js"]"></script>
+##endif*@
+
+<dialog id="components-reconnect-modal" data-nosnippet>
+    <div class="components-reconnect-container">
+        <div class="components-rejoining-animation" aria-hidden="true">
+            <div></div>
+            <div></div>
+        </div>
+        <p class="components-reconnect-first-attempt-visible">
+            Rejoining the server...
+        </p>
+        <p class="components-reconnect-repeated-attempt-visible">
+            Rejoin failed... trying again in <span id="components-seconds-to-next-attempt"></span> seconds.
+        </p>
+        <p class="components-reconnect-failed-visible">
+            Failed to rejoin.<br />Please retry or reload the page.
+        </p>
+        <button id="components-reconnect-button" class="components-reconnect-failed-visible">
+            Retry
+        </button>
+        <p class="components-pause-visible">
+            The session has been paused by the server.
+        </p>
+        <button id="components-resume-button" class="components-pause-visible">
+            Resume
+        </button>
+        <p class="components-resume-failed-visible">
+            Failed to resume the session.<br />Please reload the page.
+        </p>
+    </div>
+</dialog>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.css
new file mode 100644
index 000000000000..3ad3773f39db
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.css
@@ -0,0 +1,157 @@
+.components-reconnect-first-attempt-visible,
+.components-reconnect-repeated-attempt-visible,
+.components-reconnect-failed-visible,
+.components-pause-visible,
+.components-resume-failed-visible,
+.components-rejoining-animation {
+    display: none;
+}
+
+#components-reconnect-modal.components-reconnect-show .components-reconnect-first-attempt-visible,
+#components-reconnect-modal.components-reconnect-show .components-rejoining-animation,
+#components-reconnect-modal.components-reconnect-paused .components-pause-visible,
+#components-reconnect-modal.components-reconnect-resume-failed .components-resume-failed-visible,
+#components-reconnect-modal.components-reconnect-retrying,
+#components-reconnect-modal.components-reconnect-retrying .components-reconnect-repeated-attempt-visible,
+#components-reconnect-modal.components-reconnect-retrying .components-rejoining-animation,
+#components-reconnect-modal.components-reconnect-failed,
+#components-reconnect-modal.components-reconnect-failed .components-reconnect-failed-visible {
+    display: block;
+}
+
+
+#components-reconnect-modal {
+    background-color: white;
+    width: 20rem;
+    margin: 20vh auto;
+    padding: 2rem;
+    border: 0;
+    border-radius: 0.5rem;
+    box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3);
+    opacity: 0;
+    transition: display 0.5s allow-discrete, overlay 0.5s allow-discrete;
+    animation: components-reconnect-modal-fadeOutOpacity 0.5s both;
+    &[open]
+
+{
+    animation: components-reconnect-modal-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s;
+    animation-fill-mode: both;
+}
+
+}
+
+#components-reconnect-modal::backdrop {
+    background-color: rgba(0, 0, 0, 0.4);
+    animation: components-reconnect-modal-fadeInOpacity 0.5s ease-in-out;
+    opacity: 1;
+}
+
+@keyframes components-reconnect-modal-slideUp {
+    0% {
+        transform: translateY(30px) scale(0.95);
+    }
+
+    100% {
+        transform: translateY(0);
+    }
+}
+
+@keyframes components-reconnect-modal-fadeInOpacity {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes components-reconnect-modal-fadeOutOpacity {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+.components-reconnect-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 1rem;
+}
+
+#components-reconnect-modal p {
+    margin: 0;
+    text-align: center;
+}
+
+#components-reconnect-modal button {
+    border: 0;
+    background-color: #6b9ed2;
+    color: white;
+    padding: 4px 24px;
+    border-radius: 4px;
+}
+
+    #components-reconnect-modal button:hover {
+        background-color: #3b6ea2;
+    }
+
+    #components-reconnect-modal button:active {
+        background-color: #6b9ed2;
+    }
+
+.components-rejoining-animation {
+    position: relative;
+    width: 80px;
+    height: 80px;
+}
+
+    .components-rejoining-animation div {
+        position: absolute;
+        border: 3px solid #0087ff;
+        opacity: 1;
+        border-radius: 50%;
+        animation: components-rejoining-animation 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite;
+    }
+
+        .components-rejoining-animation div:nth-child(2) {
+            animation-delay: -0.5s;
+        }
+
+@keyframes components-rejoining-animation {
+    0% {
+        top: 40px;
+        left: 40px;
+        width: 0;
+        height: 0;
+        opacity: 0;
+    }
+
+    4.9% {
+        top: 40px;
+        left: 40px;
+        width: 0;
+        height: 0;
+        opacity: 0;
+    }
+
+    5% {
+        top: 40px;
+        left: 40px;
+        width: 0;
+        height: 0;
+        opacity: 1;
+    }
+
+    100% {
+        top: 0px;
+        left: 0px;
+        width: 80px;
+        height: 80px;
+        opacity: 0;
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.js
new file mode 100644
index 000000000000..e52a190bacbb
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.js
@@ -0,0 +1,63 @@
+// Set up event handlers
+const reconnectModal = document.getElementById("components-reconnect-modal");
+reconnectModal.addEventListener("components-reconnect-state-changed", handleReconnectStateChanged);
+
+const retryButton = document.getElementById("components-reconnect-button");
+retryButton.addEventListener("click", retry);
+
+const resumeButton = document.getElementById("components-resume-button");
+resumeButton.addEventListener("click", resume);
+
+function handleReconnectStateChanged(event) {
+    if (event.detail.state === "show") {
+        reconnectModal.showModal();
+    } else if (event.detail.state === "hide") {
+        reconnectModal.close();
+    } else if (event.detail.state === "failed") {
+        document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
+    } else if (event.detail.state === "rejected") {
+        location.reload();
+    }
+}
+
+async function retry() {
+    document.removeEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
+
+    try {
+        // Reconnect will asynchronously return:
+        // - true to mean success
+        // - false to mean we reached the server, but it rejected the connection (e.g., unknown circuit ID)
+        // - exception to mean we didn't reach the server (this can be sync or async)
+        const successful = await Blazor.reconnect();
+        if (!successful) {
+            // We have been able to reach the server, but the circuit is no longer available.
+            // We'll reload the page so the user can continue using the app as quickly as possible.
+            const resumeSuccessful = await Blazor.resumeCircuit();
+            if (!resumeSuccessful) {
+                location.reload();
+            } else {
+                reconnectModal.close();
+            }
+        }
+    } catch (err) {
+        // We got an exception, server is currently unavailable
+        document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
+    }
+}
+
+async function resume() {
+    try {
+        const successful = await Blazor.resumeCircuit();
+        if (!successful) {
+            location.reload();
+        }
+    } catch {
+        location.reload();
+    }
+}
+
+async function retryWhenDocumentBecomesVisible() {
+    if (document.visibilityState === "visible") {
+        await retry();
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Auth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Auth.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Auth.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Auth.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Counter.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Counter.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Counter.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Counter.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Error.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Error.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Error.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Error.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Home.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Home.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Home.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Home.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/NotFound.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/NotFound.razor
new file mode 100644
index 000000000000..917ada1d2328
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/NotFound.razor
@@ -0,0 +1,5 @@
+@page "/not-found"
+@layout MainLayout
+
+<h3>Not Found</h3>
+<p>Sorry, the content you are looking for does not exist.</p>
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Weather.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Weather.razor
similarity index 96%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Weather.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Weather.razor
index 188fe89fe82d..0d19b3e4bf3c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Weather.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Pages/Weather.razor
@@ -20,7 +20,7 @@ else
             <tr>
                 <th>Date</th>
                 <th aria-label="Temperature in Celsius">Temp. (C)</th>
-                <th aria-label="Temperature in Farenheit">Temp. (F)</th>
+                <th aria-label="Temperature in Fahrenheit">Temp. (F)</th>
                 <th>Summary</th>
             </tr>
         </thead>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Routes.razor
similarity index 74%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Routes.razor
index fdf2fe8b427f..a5d07ecd61ac 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Routes.razor
@@ -1,10 +1,10 @@
 @*#if (IndividualLocalAuth && !UseWebAssembly)
-@using BlazorWeb_CSharp.Components.Account.Shared
+@using BlazorWebCSharp._1.Components.Account.Shared
 ##endif*@
 @*#if (UseWebAssembly && !InteractiveAtRoot)
-<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
+<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }" NotFoundPage="typeof(Pages.NotFound)">
 ##else
-<Router AppAssembly="typeof(Program).Assembly">
+<Router AppAssembly="typeof(Program).Assembly" NotFoundPage="typeof(Pages.NotFound)">
 ##endif*@
     <Found Context="routeData">
         @*#if (IndividualLocalAuth)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/_Imports.razor
new file mode 100644
index 000000000000..192e7b16edfe
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/_Imports.razor
@@ -0,0 +1,22 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@*#if (IndividualLocalAuth)
+@using Microsoft.AspNetCore.Components.Authorization
+##endif*@
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using BlazorWebCSharp._1
+@*#if (UseWebAssembly) -->
+@using BlazorWebCSharp._1.Client
+##endif*@
+@*#if (UseServer && UseWebAssembly && InteractiveAtRoot) -->
+@using BlazorWebCSharp._1.Client.Layout
+##endif*@
+@using BlazorWebCSharp._1.Components
+@*#if ((UseServer && !UseWebAssembly) || !InteractiveAtRoot) -->
+@using BlazorWebCSharp._1.Components.Layout
+##endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/ApplicationDbContext.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/ApplicationDbContext.cs
similarity index 86%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/ApplicationDbContext.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/ApplicationDbContext.cs
index 2ce33e233a9e..a0a829a08fc2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/ApplicationDbContext.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/ApplicationDbContext.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlazorWeb_CSharp.Data;
+namespace BlazorWebCSharp._1.Data;
 
 public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : IdentityDbContext<ApplicationUser>(options)
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/ApplicationUser.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/ApplicationUser.cs
similarity index 83%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/ApplicationUser.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/ApplicationUser.cs
index 831bb92a4a57..67930aa5db69 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/ApplicationUser.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/ApplicationUser.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace BlazorWeb_CSharp.Data;
+namespace BlazorWebCSharp._1.Data;
 
 // Add profile data for application users by adding properties to the ApplicationUser class
 public class ApplicationUser : IdentityUser
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs
similarity index 70%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs
index ba5b97c07dff..04c0bf2b94af 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/00000000000000_CreateIdentitySchema.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -8,7 +8,7 @@
 
 #nullable disable
 
-namespace BlazorWeb_CSharp.Migrations
+namespace BlazorWebCSharp._1.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("00000000000000_CreateIdentitySchema")]
@@ -18,9 +18,9 @@ partial class CreateIdentitySchema
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.0");
 
-            modelBuilder.Entity("BlazorWeb_CSharp.Data.ApplicationUser", b =>
+            modelBuilder.Entity("BlazorWebCSharp._1.Data.ApplicationUser", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("TEXT");
@@ -57,6 +57,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PhoneNumber")
+                        .HasMaxLength(256)
                         .HasColumnType("TEXT");
 
                     b.Property<bool>("PhoneNumberConfirmed")
@@ -159,9 +160,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
                     b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("ProviderKey")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("ProviderDisplayName")
@@ -178,6 +181,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserLogins", (string)null);
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.Property<byte[]>("CredentialId")
+                        .HasMaxLength(1024)
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("CredentialId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserPasskeys", (string)null);
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
                 {
                     b.Property<string>("UserId")
@@ -199,9 +219,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Value")
@@ -223,7 +245,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -232,11 +254,71 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.OwnsOne("Microsoft.AspNetCore.Identity.IdentityPasskeyData", "Data", b1 =>
+                        {
+                            b1.Property<byte[]>("IdentityUserPasskeyCredentialId")
+                                .HasColumnType("BLOB");
+
+                            b1.Property<byte[]>("AttestationObject")
+                                .IsRequired()
+                                .HasColumnType("BLOB");
+
+                            b1.Property<byte[]>("ClientDataJson")
+                                .IsRequired()
+                                .HasColumnType("BLOB");
+
+                            b1.Property<DateTimeOffset>("CreatedAt")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<bool>("IsBackedUp")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsBackupEligible")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsUserVerified")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Name")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<byte[]>("PublicKey")
+                                .IsRequired()
+                                .HasColumnType("BLOB");
+
+                            b1.Property<uint>("SignCount")
+                                .HasColumnType("INTEGER");
+
+                            b1.PrimitiveCollection<string>("Transports")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("IdentityUserPasskeyCredentialId");
+
+                            b1.ToTable("AspNetUserPasskeys");
+
+                            b1.ToJson("Data");
+
+                            b1.WithOwner()
+                                .HasForeignKey("IdentityUserPasskeyCredentialId");
+                        });
+
+                    b.Navigation("Data")
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
@@ -247,7 +329,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -256,7 +338,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/00000000000000_CreateIdentitySchema.cs
similarity index 86%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/00000000000000_CreateIdentitySchema.cs
index bf83fc9a9f27..1da8a08e1abb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/00000000000000_CreateIdentitySchema.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/00000000000000_CreateIdentitySchema.cs
@@ -3,7 +3,7 @@
 
 #nullable disable
 
-namespace BlazorWeb_CSharp.Migrations
+namespace BlazorWebCSharp._1.Migrations
 {
     /// <inheritdoc />
     public partial class CreateIdentitySchema : Migration
@@ -38,7 +38,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     PasswordHash = table.Column<string>(type: "TEXT", nullable: true),
                     SecurityStamp = table.Column<string>(type: "TEXT", nullable: true),
                     ConcurrencyStamp = table.Column<string>(type: "TEXT", nullable: true),
-                    PhoneNumber = table.Column<string>(type: "TEXT", nullable: true),
+                    PhoneNumber = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
                     PhoneNumberConfirmed = table.Column<bool>(type: "INTEGER", nullable: false),
                     TwoFactorEnabled = table.Column<bool>(type: "INTEGER", nullable: false),
                     LockoutEnd = table.Column<DateTimeOffset>(type: "TEXT", nullable: true),
@@ -96,8 +96,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "AspNetUserLogins",
                 columns: table => new
                 {
-                    LoginProvider = table.Column<string>(type: "TEXT", nullable: false),
-                    ProviderKey = table.Column<string>(type: "TEXT", nullable: false),
+                    LoginProvider = table.Column<string>(type: "TEXT", maxLength: 128, nullable: false),
+                    ProviderKey = table.Column<string>(type: "TEXT", maxLength: 128, nullable: false),
                     ProviderDisplayName = table.Column<string>(type: "TEXT", nullable: true),
                     UserId = table.Column<string>(type: "TEXT", nullable: false)
                 },
@@ -112,6 +112,25 @@ protected override void Up(MigrationBuilder migrationBuilder)
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "AspNetUserPasskeys",
+                columns: table => new
+                {
+                    CredentialId = table.Column<byte[]>(type: "BLOB", maxLength: 1024, nullable: false),
+                    UserId = table.Column<string>(type: "TEXT", nullable: false),
+                    Data = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserPasskeys", x => x.CredentialId);
+                    table.ForeignKey(
+                        name: "FK_AspNetUserPasskeys_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateTable(
                 name: "AspNetUserRoles",
                 columns: table => new
@@ -141,8 +160,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     UserId = table.Column<string>(type: "TEXT", nullable: false),
-                    LoginProvider = table.Column<string>(type: "TEXT", nullable: false),
-                    Name = table.Column<string>(type: "TEXT", nullable: false),
+                    LoginProvider = table.Column<string>(type: "TEXT", maxLength: 128, nullable: false),
+                    Name = table.Column<string>(type: "TEXT", maxLength: 128, nullable: false),
                     Value = table.Column<string>(type: "TEXT", nullable: true)
                 },
                 constraints: table =>
@@ -177,6 +196,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table: "AspNetUserLogins",
                 column: "UserId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserPasskeys_UserId",
+                table: "AspNetUserPasskeys",
+                column: "UserId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetUserRoles_RoleId",
                 table: "AspNetUserRoles",
@@ -206,6 +230,9 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropTable(
                 name: "AspNetUserLogins");
 
+            migrationBuilder.DropTable(
+                name: "AspNetUserPasskeys");
+
             migrationBuilder.DropTable(
                 name: "AspNetUserRoles");
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/ApplicationDbContextModelSnapshot.cs
similarity index 70%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/ApplicationDbContextModelSnapshot.cs
index 930cebc1857d..ce22a6e61101 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlLite/ApplicationDbContextModelSnapshot.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlLite/ApplicationDbContextModelSnapshot.cs
@@ -1,13 +1,13 @@
 // <auto-generated />
 using System;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace BlazorWeb_CSharp.Migrations
+namespace BlazorWebCSharp._1.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot
@@ -15,9 +15,9 @@ partial class ApplicationDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.0");
 
-            modelBuilder.Entity("BlazorWeb_CSharp.Data.ApplicationUser", b =>
+            modelBuilder.Entity("BlazorWebCSharp._1.Data.ApplicationUser", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("TEXT");
@@ -54,6 +54,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PhoneNumber")
+                        .HasMaxLength(256)
                         .HasColumnType("TEXT");
 
                     b.Property<bool>("PhoneNumberConfirmed")
@@ -156,9 +157,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
                     b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("ProviderKey")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("ProviderDisplayName")
@@ -175,6 +178,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserLogins", (string)null);
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.Property<byte[]>("CredentialId")
+                        .HasMaxLength(1024)
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("CredentialId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserPasskeys", (string)null);
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
                 {
                     b.Property<string>("UserId")
@@ -196,9 +216,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
+                        .HasMaxLength(128)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Value")
@@ -220,7 +242,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -229,11 +251,71 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.OwnsOne("Microsoft.AspNetCore.Identity.IdentityPasskeyData", "Data", b1 =>
+                        {
+                            b1.Property<byte[]>("IdentityUserPasskeyCredentialId")
+                                .HasColumnType("BLOB");
+
+                            b1.Property<byte[]>("AttestationObject")
+                                .IsRequired()
+                                .HasColumnType("BLOB");
+
+                            b1.Property<byte[]>("ClientDataJson")
+                                .IsRequired()
+                                .HasColumnType("BLOB");
+
+                            b1.Property<DateTimeOffset>("CreatedAt")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<bool>("IsBackedUp")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsBackupEligible")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<bool>("IsUserVerified")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Name")
+                                .HasColumnType("TEXT");
+
+                            b1.Property<byte[]>("PublicKey")
+                                .IsRequired()
+                                .HasColumnType("BLOB");
+
+                            b1.Property<uint>("SignCount")
+                                .HasColumnType("INTEGER");
+
+                            b1.PrimitiveCollection<string>("Transports")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("IdentityUserPasskeyCredentialId");
+
+                            b1.ToTable("AspNetUserPasskeys");
+
+                            b1.ToJson("Data");
+
+                            b1.WithOwner()
+                                .HasForeignKey("IdentityUserPasskeyCredentialId");
+                        });
+
+                    b.Navigation("Data")
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
@@ -244,7 +326,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -253,7 +335,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs
similarity index 70%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs
index 34d2b6df1a30..5754a04c09a2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/00000000000000_CreateIdentitySchema.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -9,7 +9,7 @@
 
 #nullable disable
 
-namespace BlazorWeb_CSharp.Migrations
+namespace BlazorWebCSharp._1.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("00000000000000_CreateIdentitySchema")]
@@ -20,12 +20,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("ProductVersion", "10.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("BlazorWeb_CSharp.Data.ApplicationUser", b =>
+            modelBuilder.Entity("BlazorWebCSharp._1.Data.ApplicationUser", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("nvarchar(450)");
@@ -62,7 +62,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("PhoneNumber")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
 
                     b.Property<bool>("PhoneNumberConfirmed")
                         .HasColumnType("bit");
@@ -170,10 +171,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
                     b.Property<string>("LoginProvider")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("ProviderKey")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("ProviderDisplayName")
                         .HasColumnType("nvarchar(max)");
@@ -189,6 +192,23 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserLogins", (string)null);
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.Property<byte[]>("CredentialId")
+                        .HasMaxLength(1024)
+                        .HasColumnType("varbinary(1024)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("CredentialId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserPasskeys", (string)null);
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
                 {
                     b.Property<string>("UserId")
@@ -210,10 +230,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasColumnType("nvarchar(450)");
 
                     b.Property<string>("LoginProvider")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("Value")
                         .HasColumnType("nvarchar(max)");
@@ -234,7 +256,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -243,11 +265,71 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.OwnsOne("Microsoft.AspNetCore.Identity.IdentityPasskeyData", "Data", b1 =>
+                        {
+                            b1.Property<byte[]>("IdentityUserPasskeyCredentialId")
+                                .HasColumnType("varbinary(1024)");
+
+                            b1.Property<byte[]>("AttestationObject")
+                                .IsRequired()
+                                .HasColumnType("varbinary(max)");
+
+                            b1.Property<byte[]>("ClientDataJson")
+                                .IsRequired()
+                                .HasColumnType("varbinary(max)");
+
+                            b1.Property<DateTimeOffset>("CreatedAt")
+                                .HasColumnType("datetimeoffset");
+
+                            b1.Property<bool>("IsBackedUp")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsBackupEligible")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsUserVerified")
+                                .HasColumnType("bit");
+
+                            b1.Property<string>("Name")
+                                .HasColumnType("nvarchar(max)");
+
+                            b1.Property<byte[]>("PublicKey")
+                                .IsRequired()
+                                .HasColumnType("varbinary(max)");
+
+                            b1.Property<long>("SignCount")
+                                .HasColumnType("bigint");
+
+                            b1.PrimitiveCollection<string>("Transports")
+                                .HasColumnType("nvarchar(max)");
+
+                            b1.HasKey("IdentityUserPasskeyCredentialId");
+
+                            b1.ToTable("AspNetUserPasskeys");
+
+                            b1.ToJson("Data");
+
+                            b1.WithOwner()
+                                .HasForeignKey("IdentityUserPasskeyCredentialId");
+                        });
+
+                    b.Navigation("Data")
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
@@ -258,7 +340,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -267,7 +349,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/00000000000000_CreateIdentitySchema.cs
similarity index 87%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/00000000000000_CreateIdentitySchema.cs
index ec47e9f16b95..db895d25cc23 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/00000000000000_CreateIdentitySchema.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/00000000000000_CreateIdentitySchema.cs
@@ -3,7 +3,7 @@
 
 #nullable disable
 
-namespace BlazorWeb_CSharp.Migrations
+namespace BlazorWebCSharp._1.Migrations
 {
     /// <inheritdoc />
     public partial class CreateIdentitySchema : Migration
@@ -38,7 +38,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     PasswordHash = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     SecurityStamp = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     ConcurrencyStamp = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    PhoneNumber = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    PhoneNumber = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
                     PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false),
                     TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false),
                     LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
@@ -96,8 +96,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "AspNetUserLogins",
                 columns: table => new
                 {
-                    LoginProvider = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ProviderKey = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    LoginProvider = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    ProviderKey = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
                     ProviderDisplayName = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     UserId = table.Column<string>(type: "nvarchar(450)", nullable: false)
                 },
@@ -112,6 +112,25 @@ protected override void Up(MigrationBuilder migrationBuilder)
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "AspNetUserPasskeys",
+                columns: table => new
+                {
+                    CredentialId = table.Column<byte[]>(type: "varbinary(1024)", maxLength: 1024, nullable: false),
+                    UserId = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    Data = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserPasskeys", x => x.CredentialId);
+                    table.ForeignKey(
+                        name: "FK_AspNetUserPasskeys_AspNetUsers_UserId",
+                        column: x => x.UserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateTable(
                 name: "AspNetUserRoles",
                 columns: table => new
@@ -141,8 +160,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 columns: table => new
                 {
                     UserId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    LoginProvider = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    LoginProvider = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
                     Value = table.Column<string>(type: "nvarchar(max)", nullable: true)
                 },
                 constraints: table =>
@@ -178,6 +197,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table: "AspNetUserLogins",
                 column: "UserId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_AspNetUserPasskeys_UserId",
+                table: "AspNetUserPasskeys",
+                column: "UserId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetUserRoles_RoleId",
                 table: "AspNetUserRoles",
@@ -208,6 +232,9 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropTable(
                 name: "AspNetUserLogins");
 
+            migrationBuilder.DropTable(
+                name: "AspNetUserPasskeys");
+
             migrationBuilder.DropTable(
                 name: "AspNetUserRoles");
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/ApplicationDbContextModelSnapshot.cs
similarity index 70%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/ApplicationDbContextModelSnapshot.cs
index a6b6896c65dd..5d61b634a0ab 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/SqlServer/ApplicationDbContextModelSnapshot.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/SqlServer/ApplicationDbContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -8,7 +8,7 @@
 
 #nullable disable
 
-namespace BlazorWeb_CSharp.Migrations
+namespace BlazorWebCSharp._1.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot
@@ -17,12 +17,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("ProductVersion", "10.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("BlazorWeb_CSharp.Data.ApplicationUser", b =>
+            modelBuilder.Entity("BlazorWebCSharp._1.Data.ApplicationUser", b =>
                 {
                     b.Property<string>("Id")
                         .HasColumnType("nvarchar(450)");
@@ -59,7 +59,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("PhoneNumber")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
 
                     b.Property<bool>("PhoneNumberConfirmed")
                         .HasColumnType("bit");
@@ -167,10 +168,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
                     b.Property<string>("LoginProvider")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("ProviderKey")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("ProviderDisplayName")
                         .HasColumnType("nvarchar(max)");
@@ -186,6 +189,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserLogins", (string)null);
                 });
 
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.Property<byte[]>("CredentialId")
+                        .HasMaxLength(1024)
+                        .HasColumnType("varbinary(1024)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("CredentialId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserPasskeys", (string)null);
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
                 {
                     b.Property<string>("UserId")
@@ -207,10 +227,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("nvarchar(450)");
 
                     b.Property<string>("LoginProvider")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("Name")
-                        .HasColumnType("nvarchar(450)");
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
 
                     b.Property<string>("Value")
                         .HasColumnType("nvarchar(max)");
@@ -231,7 +253,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -240,11 +262,71 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserPasskey<string>", b =>
+                {
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.OwnsOne("Microsoft.AspNetCore.Identity.IdentityPasskeyData", "Data", b1 =>
+                        {
+                            b1.Property<byte[]>("IdentityUserPasskeyCredentialId")
+                                .HasColumnType("varbinary(1024)");
+
+                            b1.Property<byte[]>("AttestationObject")
+                                .IsRequired()
+                                .HasColumnType("varbinary(max)");
+
+                            b1.Property<byte[]>("ClientDataJson")
+                                .IsRequired()
+                                .HasColumnType("varbinary(max)");
+
+                            b1.Property<DateTimeOffset>("CreatedAt")
+                                .HasColumnType("datetimeoffset");
+
+                            b1.Property<bool>("IsBackedUp")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsBackupEligible")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsUserVerified")
+                                .HasColumnType("bit");
+
+                            b1.Property<string>("Name")
+                                .HasColumnType("nvarchar(max)");
+
+                            b1.Property<byte[]>("PublicKey")
+                                .IsRequired()
+                                .HasColumnType("varbinary(max)");
+
+                            b1.Property<long>("SignCount")
+                                .HasColumnType("bigint");
+
+                            b1.PrimitiveCollection<string>("Transports")
+                                .HasColumnType("nvarchar(max)");
+
+                            b1.HasKey("IdentityUserPasskeyCredentialId");
+
+                            b1.ToTable("AspNetUserPasskeys");
+
+                            b1.ToJson("Data");
+
+                            b1.WithOwner()
+                                .HasForeignKey("IdentityUserPasskeyCredentialId");
+                        });
+
+                    b.Navigation("Data")
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
@@ -255,7 +337,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -264,7 +346,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("BlazorWeb_CSharp.Data.ApplicationUser", null)
+                    b.HasOne("BlazorWebCSharp._1.Data.ApplicationUser", null)
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/app.db
similarity index 81%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/app.db
index 769de58a9edc..a8da6a470d4d 100644
Binary files a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db and b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Data/app.db differ
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs
similarity index 90%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs
index 6a2069105227..1b8771773c04 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs
@@ -6,15 +6,15 @@
 using Microsoft.EntityFrameworkCore;
 #endif
 #if (UseWebAssembly && SampleContent)
-using BlazorWeb_CSharp.Client.Pages;
+using BlazorWebCSharp._1.Client.Pages;
 #endif
-using BlazorWeb_CSharp.Components;
+using BlazorWebCSharp._1.Components;
 #if (IndividualLocalAuth)
-using BlazorWeb_CSharp.Components.Account;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Components.Account;
+using BlazorWebCSharp._1.Data;
 #endif
 
-namespace BlazorWeb_CSharp;
+namespace BlazorWebCSharp._1;
 
 public class Program
 {
@@ -46,7 +46,6 @@ public static void Main(string[] args)
 
         #if (IndividualLocalAuth)
         builder.Services.AddCascadingAuthenticationState();
-        builder.Services.AddScoped<IdentityUserAccessor>();
         builder.Services.AddScoped<IdentityRedirectManager>();
         #if (UseServer)
         builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
@@ -71,7 +70,11 @@ public static void Main(string[] args)
         #endif
         builder.Services.AddDatabaseDeveloperPageExceptionFilter();
 
-        builder.Services.AddIdentityCore<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
+        builder.Services.AddIdentityCore<ApplicationUser>(options =>
+            {
+                options.SignIn.RequireConfirmedAccount = true;
+                options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
+            })
             .AddEntityFrameworkStores<ApplicationDbContext>()
             .AddSignInManager()
             .AddDefaultTokenProviders();
@@ -104,10 +107,11 @@ public static void Main(string[] args)
         #endif
         }
 
+        app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
         #if (HasHttpsProfile)
         app.UseHttpsRedirection();
 
-        #endif
+#endif
         app.UseAntiforgery();
 
         app.MapStaticAssets();
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs
similarity index 82%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs
index 6fb87353ad7b..ae3fb9dcfce7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs
@@ -6,12 +6,12 @@
 using Microsoft.EntityFrameworkCore;
 #endif
 #if (UseWebAssembly && SampleContent)
-using BlazorWeb_CSharp.Client.Pages;
+using BlazorWebCSharp._1.Client.Pages;
 #endif
-using BlazorWeb_CSharp.Components;
+using BlazorWebCSharp._1.Components;
 #if (IndividualLocalAuth)
-using BlazorWeb_CSharp.Components.Account;
-using BlazorWeb_CSharp.Data;
+using BlazorWebCSharp._1.Components.Account;
+using BlazorWebCSharp._1.Data;
 #endif
 
 var builder = WebApplication.CreateBuilder(args);
@@ -21,26 +21,25 @@
 builder.Services.AddRazorComponents();
 #else
 builder.Services.AddRazorComponents()
-    #if (UseServer && UseWebAssembly && IndividualLocalAuth)
+#if (UseServer && UseWebAssembly && IndividualLocalAuth)
     .AddInteractiveServerComponents()
     .AddInteractiveWebAssemblyComponents()
     .AddAuthenticationStateSerialization();
-    #elif (UseServer && UseWebAssembly)
+#elif (UseServer && UseWebAssembly)
     .AddInteractiveServerComponents()
     .AddInteractiveWebAssemblyComponents();
-    #elif (UseServer)
+#elif (UseServer)
     .AddInteractiveServerComponents();
-    #elif (UseWebAssembly && IndividualLocalAuth)
+#elif (UseWebAssembly && IndividualLocalAuth)
     .AddInteractiveWebAssemblyComponents()
     .AddAuthenticationStateSerialization();
-    #elif (UseWebAssembly)
+#elif (UseWebAssembly)
     .AddInteractiveWebAssemblyComponents();
-    #endif
+#endif
 #endif
 
 #if (IndividualLocalAuth)
 builder.Services.AddCascadingAuthenticationState();
-builder.Services.AddScoped<IdentityUserAccessor>();
 builder.Services.AddScoped<IdentityRedirectManager>();
 #if (UseServer)
 builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
@@ -65,7 +64,11 @@
 #endif
 builder.Services.AddDatabaseDeveloperPageExceptionFilter();
 
-builder.Services.AddIdentityCore<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
+builder.Services.AddIdentityCore<ApplicationUser>(options =>
+    {
+        options.SignIn.RequireConfirmedAccount = true;
+        options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
+    })
     .AddEntityFrameworkStores<ApplicationDbContext>()
     .AddSignInManager()
     .AddDefaultTokenProviders();
@@ -97,12 +100,11 @@
     app.UseHsts();
 #endif
 }
-
+app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
 #if (HasHttpsProfile)
 app.UseHttpsRedirection();
 
 #endif
-
 app.UseAntiforgery();
 
 app.MapStaticAssets();
@@ -120,7 +122,7 @@
 app.MapRazorComponents<App>();
 #endif
 #if (UseWebAssembly)
-    .AddAdditionalAssemblies(typeof(BlazorWeb_CSharp.Client._Imports).Assembly);
+    .AddAdditionalAssemblies(typeof(BlazorWebCSharp._1.Client._Imports).Assembly);
 #endif
 
 #if (IndividualLocalAuth)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Properties/launchSettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Properties/launchSettings.json
similarity index 72%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Properties/launchSettings.json
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Properties/launchSettings.json
index 0d554caaa100..e86aed770617 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Properties/launchSettings.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Properties/launchSettings.json
@@ -6,14 +6,18 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-      //#if (UseWebAssembly)
+        //#if (UseWebAssembly)
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      //#endif
+        //#endif
+        //#if (LocalhostTld)
+        "applicationUrl": "http://blazorwebcsharp__1.dev.localhost:5500",
+        //#else
         "applicationUrl": "http://localhost:5500",
+        //#endif
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
-      //#if (HasHttpsProfile)
+        //#if (HasHttpsProfile)
       },
       //#else
       }
@@ -27,7 +31,11 @@
         //#if (UseWebAssembly)
         "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
         //#endif
+        //#if (LocalhostTld)
+        "applicationUrl": "https://blazorwebcsharp__1.dev.localhost:5501;http://blazorwebcsharp__1.dev.localhost:5500",
+        //#else
         "applicationUrl": "https://localhost:5501;http://localhost:5500",
+        //#endif
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/appsettings.Development.json
new file mode 100644
index 000000000000..0c208ae9181e
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/appsettings.json
similarity index 62%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/appsettings.json
index 3a18c82e2dc6..3aa431a5deac 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/appsettings.json
@@ -2,9 +2,9 @@
 ////#if (IndividualLocalAuth)
 //  "ConnectionStrings": {
 //#if (UseLocalDB)
-//    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-BlazorWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
+//    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-BlazorWebCSharp__1-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
 //#else
-//    "DefaultConnection": "DataSource=Data\\app.db;Cache=Shared"
+//    "DefaultConnection": "DataSource=Data/app.db;Cache=Shared"
 //#endif
 //  },
 ////#endif
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/app.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/app.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/app.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/app.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/favicon.png b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/favicon.png
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/favicon.png
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/favicon.png
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json
index 4210811fe25e..8069bf7c4909 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json
@@ -3,7 +3,7 @@
   "name": "Samostatná aplikace Blazor WebAssembly",
   "description": "Šablona projektu pro vytvoření aplikace Blazor, která běží ve WebAssembly. Tato šablona se dá využít pro webové aplikace s propracovanými dynamickými uživatelskými rozhraními (UI).",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/auth/choices/None/description": "Bez ověřování",
   "symbols/auth/choices/Individual/description": "Ověřování Individual",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json
index ea4f4c5475dd..049f7cbbfbf1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json
@@ -3,7 +3,7 @@
   "name": "Eigenständige Blazor WebAssembly-App",
   "description": "Eine Projektvorlage für das Erstellen einer Blazor-App, die in WebAssembly ausgeführt wird. Diese Vorlage kann für Web-Apps mit umfangreichen dynamischen Benutzeroberflächen verwendet werden.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/auth/choices/None/description": "Keine Authentifizierung",
   "symbols/auth/choices/Individual/description": "Individuelle Authentifizierung",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json
index 8df8a92cbc50..36fa5e417dfe 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json
@@ -3,7 +3,7 @@
   "name": "Blazor WebAssembly Standalone App",
   "description": "A project template for creating a Blazor app that runs on WebAssembly. This template can be used for web apps with rich dynamic user interfaces (UIs).",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/auth/choices/None/description": "No authentication",
   "symbols/auth/choices/Individual/description": "Individual authentication",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json
index 3f9385eaae2d..dcac346fb472 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json
@@ -3,7 +3,7 @@
   "name": "Aplicación independiente WebAssembly de Blazor",
   "description": "Plantilla de proyecto para crear una aplicación Blazor que se ejecuta en WebAssembly. Esta plantilla se puede usar para las aplicaciones web con interfaces de usuario dinámicas enriquecidas.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/auth/choices/None/description": "Sin autenticación",
   "symbols/auth/choices/Individual/description": "Autenticación individual",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json
index 5f6d956057bc..f110d5911155 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json
@@ -3,7 +3,7 @@
   "name": "Application Blazor WebAssembly autonome",
   "description": "Modèle de projet permettant de créer une application Blazor qui s'exécute sur WebAssembly. Vous pouvez utiliser ce modèle pour les applications web ayant des IU (interfaces utilisateur) dynamiques riches.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/auth/choices/None/description": "Aucune authentification",
   "symbols/auth/choices/Individual/description": "Authentification individuelle",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json
index 46f45f71c317..fd2246865689 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json
@@ -3,7 +3,7 @@
   "name": "App autonoma Blazor WebAssembly",
   "description": "Modello di progetto per la creazione di un'app Blazor eseguita in WebAssembly. Questo modello può essere usato per app Web con interfacce utente dinamiche.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/auth/choices/None/description": "Nessuna autenticazione",
   "symbols/auth/choices/Individual/description": "Autenticazione singola",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json
index 851403e67623..53ddf99b8c0a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json
@@ -3,7 +3,7 @@
   "name": "Blazor WebAssembly スタンドアロン アプリ",
   "description": "WebAssembly で実行される Blazor アプリを作成するためのプロジェクト テンプレート。このテンプレートは、高度でダイナミックなユーザー インターフェイス (UI) を備えた Web アプリに使用できます。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/auth/choices/None/description": "認証なし",
   "symbols/auth/choices/Individual/description": "個別の認証",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json
index b9d37fa5d211..7316c83e0220 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json
@@ -3,7 +3,7 @@
   "name": "Blazor WebAssembly 독립 실행형 앱",
   "description": "WebAssembly에서 실행되는 Blazor 앱을 만드는 데 사용되는 프로젝트 템플릿입니다. 이 템플릿을 사용하여 다양한 동적 UI(사용자 인터페이스)가 포함된 웹앱을 만들 수 있습니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/auth/choices/None/description": "인증 없음",
   "symbols/auth/choices/Individual/description": "개별 인증",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json
index 663443e609fa..7ce5f42612a2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json
@@ -3,7 +3,7 @@
   "name": "Autonomiczna aplikacja zestawu WebAssembly platformy Blazor",
   "description": "Szablon projektu służący do tworzenia aplikacji Blazor działającej na zestawie WebAssembly. Ten szablon może być używany dla aplikacji internetowych z rozbudowanymi, dynamicznymi interfejsami użytkowników.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/auth/choices/None/description": "Bez uwierzytelniania",
   "symbols/auth/choices/Individual/description": "Uwierzytelnianie indywidualne",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json
index c3155a7f52ba..52da8e8f4863 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -3,7 +3,7 @@
   "name": "Aplicativo Autônomo Blazor WebAssembly",
   "description": "Um modelo de projeto para criar um aplicativo Blazor que é executado no WebAssembly. Esse modelo pode ser usado para aplicativos Web com UIs (interfaces do usuário) completas e dinâmicas.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/auth/choices/None/description": "Sem autenticação",
   "symbols/auth/choices/Individual/description": "Autenticação individual",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json
index 50dff05cdd60..a9e986474c83 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json
@@ -3,7 +3,7 @@
   "name": "Изолированное приложение Blazor WebAssembly",
   "description": "Шаблон проекта для создания приложения Blazor, которое запускается в WebAssembly. Этот шаблон можно использовать для веб-приложений с полнофункциональными динамическими пользовательскими интерфейсами.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/auth/choices/None/description": "Без проверки подлинности",
   "symbols/auth/choices/Individual/description": "Индивидуальная проверка подлинности",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json
index ffce943575d0..eebe2c3e065c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json
@@ -3,7 +3,7 @@
   "name": "Blazor WebAssembly Tek Başına Uygulaması",
   "description": "WebAssembly üzerinde çalışan bir Blazor uygulaması oluşturmaya yönelik proje şablonu. Bu şablon, zengin dinamik kullanıcı arabirimlerine (UI) sahip web uygulamaları için kullanılabilir.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/auth/choices/None/description": "Kimlik doğrulaması yok",
   "symbols/auth/choices/Individual/description": "Bireysel kimlik doğrulaması",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index d86e38d146d6..4bf7eaec1a58 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -3,7 +3,7 @@
   "name": "Blazor WebAssembly 独立应用",
   "description": "用于创建在 WebAssembly 上运行的 Blazor 应用的项目模板。此模板可用于具有丰富动态用户界面(UI)的 Web 应用。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/auth/choices/None/description": "无身份验证",
   "symbols/auth/choices/Individual/description": "个人身份验证",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 11b2c13e641d..8ec169da3253 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -3,7 +3,7 @@
   "name": "Blazor WebAssembly 獨立應用程式",
   "description": "用來建立在 WebAssembly 上執行之 Blazor 應用程式的專案範本。此範本可用於具有豐富動態使用者介面 (UI) 的 Web 應用程式。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/auth/choices/None/description": "沒有驗證",
   "symbols/auth/choices/Individual/description": "個別驗證",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json
index 81cac9ca4dfa..66cdb208eee5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json
@@ -11,7 +11,7 @@
   "defaultName": "BlazorApp",
   "description": "A project template for creating a Blazor app that runs on WebAssembly. This template can be used for web apps with rich dynamic user interfaces (UIs).",
   "groupIdentity": "Microsoft.Web.Blazor.Wasm",
-  "precedence": "9900",
+  "precedence": "10000",
   "guids": [
     "4C26868E-5E7C-458D-82E3-040509D0C71F",
     "5990939C-7E7B-4CFA-86FF-44CA5756498A",
@@ -19,8 +19,8 @@
     "0AFFA7FD-4E37-4636-AB91-3753E746DB98",
     "53bc9b9d-9d6a-45d4-8429-2a2761773502" // Client ID
   ],
-  "identity": "Microsoft.Web.Blazor.Wasm.CSharp.9.0",
-  "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices",
+  "identity": "Microsoft.Web.Blazor.Wasm.CSharp.10.0",
+  "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices",
   "preferNameDirectory": true,
   "primaryOutputs": [
     {
@@ -139,12 +139,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "HostIdentifier": {
       "type": "bind",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/App.razor
index 15669dfec87b..c177d88dce9e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/App.razor
@@ -1,19 +1,13 @@
 @*#if (NoAuth)
-<Router AppAssembly="@typeof(App).Assembly">
+<Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(Pages.NotFound)">
     <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
-    <NotFound>
-        <PageTitle>Not found</PageTitle>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p role="alert">Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
 </Router>
 #else
 <CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(App).Assembly">
+    <Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(Pages.NotFound)" >
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
@@ -29,12 +23,6 @@
             </AuthorizeRouteView>
             <FocusOnNavigate RouteData="@routeData" Selector="h1" />
         </Found>
-        <NotFound>
-            <PageTitle>Not found</PageTitle>
-            <LayoutView Layout="@typeof(MainLayout)">
-                <p role="alert">Sorry, there's nothing at this address.</p>
-            </LayoutView>
-        </NotFound>
     </Router>
 </CascadingAuthenticationState>
 #endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.CallsWebApi.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.CallsWebApi.razor
index be56181b23cb..9a6e849adc50 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.CallsWebApi.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.CallsWebApi.razor
@@ -8,7 +8,7 @@
 </div>
 
 <div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
-    <nav class="flex-column">
+    <nav class="nav flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
                 <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.NoApi.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.NoApi.razor
index b259d774fe0f..6e5bbc1b6dde 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.NoApi.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Layout/NavMenu.NoApi.razor
@@ -8,7 +8,7 @@
 </div>
 
 <div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
-    <nav class="flex-column">
+    <nav class="nav flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
                 <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/NotFound.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/NotFound.razor
new file mode 100644
index 000000000000..917ada1d2328
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/NotFound.razor
@@ -0,0 +1,5 @@
+@page "/not-found"
+@layout MainLayout
+
+<h3>Not Found</h3>
+<p>Sorry, the content you are looking for does not exist.</p>
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/Weather.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/Weather.razor
index f2defcf215b9..3ea2b1cc655a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/Weather.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Pages/Weather.razor
@@ -18,7 +18,7 @@ else
             <tr>
                 <th>Date</th>
                 <th aria-label="Temperature in Celsius">Temp. (C)</th>
-                <th aria-label="Temperature in Farenheit">Temp. (F)</th>
+                <th aria-label="Temperature in Fahrenheit">Temp. (F)</th>
                 <th>Summary</th>
             </tr>
         </thead>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css
index 44ccc7755ac7..efef290c1836 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css
@@ -70,11 +70,12 @@ a, .btn-link {
     }
 
 .loading-progress {
-    position: relative;
+    position: absolute;
     display: block;
     width: 8rem;
     height: 8rem;
-    margin: 20vh auto 1rem auto;
+    inset: 20vh 0 auto 0;
+    margin: 0 auto 0 auto;
 }
 
     .loading-progress circle {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/index.html b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/index.html
index cd7f328ab0a7..5df64efe4f27 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/index.html
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/index.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>ComponentsWebAssembly-CSharp</title>
     <base href="/" />
+    <link rel="preload" id="webassembly" />
     <!--#if SampleContent -->
     <link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.min.css" />
     <!--#endif -->
@@ -22,6 +23,7 @@
     <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
     <link rel="apple-touch-icon" sizes="192x192" href="icon-192.png" />
     <!--#endif -->
+    <script type="importmap"></script>
 </head>
 
 <body>
@@ -44,9 +46,9 @@
 <!--#if (IndividualB2CAuth || OrganizationalAuth)  -->
     <script src="_content/Microsoft.Authentication.WebAssembly.Msal/AuthenticationService.js"></script>
 <!--#endif  -->
-    <script src="_framework/blazor.webassembly.js"></script>
+    <script src="_framework/blazor.webassembly#[.{fingerprint}].js"></script>
     <!--#if PWA -->
-    <script>navigator.serviceWorker.register('service-worker.js');</script>
+    <script>navigator.serviceWorker.register('service-worker.js', { updateViaCache: 'none' });</script>
     <!--#endif -->
 </body>
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/service-worker.published.js b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/service-worker.published.js
index 1f7f543fa510..51a0e5c7a4a1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/service-worker.published.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/service-worker.published.js
@@ -8,7 +8,7 @@ self.addEventListener('fetch', event => event.respondWith(onFetch(event)));
 
 const cacheNamePrefix = 'offline-cache-';
 const cacheName = `${cacheNamePrefix}${self.assetsManifest.version}`;
-const offlineAssetsInclude = [ /\.dll$/, /\.pdb$/, /\.wasm/, /\.html/, /\.js$/, /\.json$/, /\.css$/, /\.woff$/, /\.png$/, /\.jpe?g$/, /\.gif$/, /\.ico$/, /\.blat$/, /\.dat$/ ];
+const offlineAssetsInclude = [ /\.dll$/, /\.pdb$/, /\.wasm/, /\.html/, /\.js$/, /\.json$/, /\.css$/, /\.woff$/, /\.png$/, /\.jpe?g$/, /\.gif$/, /\.ico$/, /\.blat$/, /\.dat$/, /\.webmanifest$/ ];
 const offlineAssetsExclude = [ /^service-worker\.js$/ ];
 
 // Replace with your base path if you are hosting on a subfolder. Ensure there is a trailing '/'.
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json
index 4794d578cdc9..69fac3456fa9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/dotnetcli.host.json
@@ -31,6 +31,10 @@
     "UseProgramMain": {
       "longName": "use-program-main",
       "shortName": ""
+    },
+    "LocalhostTld": {
+      "longName": "localhost-tld",
+      "shortName": ""
     }
   },
   "usageExamples": [
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/ide.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/ide.host.json
index 71eb29162d13..b95619008e97 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/ide.host.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/ide.host.json
@@ -9,6 +9,12 @@
       "isVisible": true,
       "persistenceScope": "shared",
       "persistenceScopeName": "Microsoft"
+    },
+    {
+      "id": "LocalhostTld",
+      "isVisible": true,
+      "persistenceScope": "shared",
+      "persistenceScopeName": "Microsoft"
     }
   ],
   "disableHttpsSymbol": "NoHttps"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json
index d9bc635d952e..c9a2091cfdff 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
   "symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije IndividualAuth nebo OrganizationalAuth).",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.",
   "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
   "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
+  "symbols/LocalhostTld/displayName": "Použití TLD .dev.localhost v adrese URL aplikace",
+  "symbols/LocalhostTld/description": "Určuje, jestli se má název projektu zkombinovat s TLD .dev.localhost v adrese URL aplikace pro místní vývoj, například https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json
index c222a5a8eaee..c7cb69b1f95d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express HTTPS Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn entweder IndividualAuth oder OrganizationalAuth verwendet wird).",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
   "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
   "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
+  "symbols/LocalhostTld/displayName": "Verwenden der .dev.localhost-TLD in der Anwendungs-URL",
+  "symbols/LocalhostTld/description": "Gibt an, ob der Projektname mit der .dev.localhost-TLD in der Anwendungs-URL für die lokale Entwicklung kombiniert werden soll, z. B. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
   "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json
index 820711e04f34..b9b546af4541 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json
@@ -8,12 +8,14 @@
   "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if either IndividualAuth or OrganizationalAuth is used).",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
   "symbols/UseProgramMain/displayName": "Do not use _top-level statements",
   "_symbols/UseProgramMain/displayName.comment": "Use '_' as accelerator key when translating.",
   "symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
+  "symbols/LocalhostTld/displayName": "Use the .dev.localhost TLD in the application URL",
+  "symbols/LocalhostTld/description": "Whether to combine the project name with the .dev.localhost TLD in the application URL for local development, e.g. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
   "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
-}
\ No newline at end of file
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json
index 856249111029..9272830b6460 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa IndividualAuth o OrganizationalAuth).",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.",
   "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior",
   "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.",
+  "symbols/LocalhostTld/displayName": "Usar el TLD .dev.localhost en la dirección URL de la aplicación",
+  "symbols/LocalhostTld/description": "Indica si se debe combinar el nombre del proyecto con el TLD .dev.localhost en la dirección URL de la aplicación para el desarrollo local, por ejemplo, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json
index 78a27a517d23..9b01443a26bc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si IndividualAuth ou OrganizationalAuth est utilisé).",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
   "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.",
   "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.",
+  "symbols/LocalhostTld/displayName": "Utilisez le TLD .dev.localhost dans l’URL de l’application",
+  "symbols/LocalhostTld/description": "Indique s’il faut combiner le nom du projet avec le TLD .dev.localhost dans l’URL de l’application pour le développement local, par exemple https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json
index 760b84e45760..4bf689991807 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa IndividualAuth o OrganizationalAuth).",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
   "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello",
   "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.",
+  "symbols/LocalhostTld/displayName": "Usa il TLD .dev.localhost nell'URL dell'applicazione",
+  "symbols/LocalhostTld/description": "Indicare se combinare il nome del progetto con il TLD .dev.localhost nell'URL dell'applicazione per lo sviluppo in locale, ad esempio https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json
index 4b2547d827e6..2b2541b938c3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。",
   "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、HTTPS 以外のパラメーターが使用されていない場合にのみ適用されます (IndividualAuth または OrganizationalAuth が使用されている場合は、HTTPS 以外は無視されます)。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
   "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)",
   "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。",
+  "symbols/LocalhostTld/displayName": "アプリケーション URL で .dev.localhost TLD を使用する",
+  "symbols/LocalhostTld/description": "ローカル開発用のアプリケーション URL 内で、プロジェクト名を .dev.localhost TLD と組み合わせるかどうか (例: https://myapp.dev.localhost:12345)。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json
index 5ec8d2f2d918..a0cb0ee4f612 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(IndividualAuth 또는 OrganizationalAuth가 사용되는 경우 no-https는 무시됨).",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)",
   "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.",
+  "symbols/LocalhostTld/displayName": "애플리케이션 URL에서 .dev.localhost TLD를 사용하세요.",
+  "symbols/LocalhostTld/description": "로컬 개발을 위한 애플리케이션 URL에서 프로젝트 이름과 .dev.localhost TLD를 결합할지 여부, 예를 들어 https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json
index 31770af7003e..90bb31580d13 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS usług IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy nie jest używany parametr no-https (jeśli zostanie użyte uwierzytelnianie IndividualAuth lub OrganizationalAuth, parametr no-https zostanie zignorowana).",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.",
   "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu",
   "symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.",
+  "symbols/LocalhostTld/displayName": "Użyj pliku .dev.localhost TLD w adresie URL aplikacji",
+  "symbols/LocalhostTld/description": "Określa, czy połączyć nazwę projektu z domeną najwyższego poziomu .dev.localhost w adresie URL aplikacji na potrzeby programowania lokalnego, np. https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
index a41675cb17b1..6507f653bc31 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Essa opção só é aplicável quando o parâmetro no-https não é usado (no-https será ignorado se IndividualAuth ou OrganizationalAuth for usado).",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
   "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior",
   "symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.",
+  "symbols/LocalhostTld/displayName": "Usar o TLD .dev.localhost na URL do aplicativo",
+  "symbols/LocalhostTld/description": "Se deseja combinar o nome do projeto com o TLD .dev.localhost na URL do aplicativo para desenvolvimento local, por exemplo, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
   "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json
index 2a6a53f67902..6122a9803f98 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.",
   "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (при использовании IndividualAuth или OrganizationalAuth no-https игнорируется).",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.",
   "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня",
   "symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.",
+  "symbols/LocalhostTld/displayName": "Используйте домен верхнего уровня .dev.localhost в URL-адресе приложения",
+  "symbols/LocalhostTld/description": "Следует ли объединять имя проекта с TLD .dev.localhost в URL-адресе приложения для локальной разработки, например, https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json
index f0927891bb28..299ef18175b0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmazsa uygulanabilir (IndividualAuth veya OrganizationalAuth kullanılırsa no-https yoksayılır).",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
   "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın",
   "symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.",
+  "symbols/LocalhostTld/displayName": "Uygulama URL'sinde .dev.localhost TLD'sini kullanın.",
+  "symbols/LocalhostTld/description": "Yerel geliştirme için uygulama URL'sinde proje adını .dev.localhost TLD ile birleştirip birleştirmeyeceğinizi seçin, örneğin https://myapp.dev.localhost:12345.",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 38ced259fff7..dd034ba1f4fe 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。",
   "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 IndividualAuth 或 OrganizationalAuth，则将忽略 no-https)。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 Individual、IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。",
   "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)",
   "symbols/UseProgramMain/description": "是否生成显式程序类和主方法，而不是顶级语句。",
+  "symbols/LocalhostTld/displayName": "在应用程序 URL 中使用 .dev.localhost TLD",
+  "symbols/LocalhostTld/description": "是否在应用程序 URL 中将项目名称与 .dev.localhost TLD 合并以用于本地开发，例如 https://myapp.dev.localhost:12345。",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
   "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 0ab6b4e20d12..9a08ab8e2bc2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -8,11 +8,13 @@
   "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。",
   "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用此選項 (如果使用 IndividualAuth 或 OrganizationalAuth，則會忽略 no-https)。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 Individual、IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。",
   "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)",
   "symbols/UseProgramMain/description": "是否要產生明確的 Program 類別和 Main 方法，而非最上層語句。",
+  "symbols/LocalhostTld/displayName": "在應用程式 URL 中使用 .dev.localhost TLD",
+  "symbols/LocalhostTld/description": "是否要在本機開發的應用程式 URL 中將專案名稱與 .dev.localhost TLD 合併，例如 https://myapp.dev.localhost:12345。",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
index 07143857e4ef..b2249e8d99bc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
@@ -9,8 +9,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
   "groupIdentity": "Microsoft.Web.Empty",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.Empty.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.Empty.CSharp.10.0",
   "shortName": "web",
   "tags": {
     "language": "C#",
@@ -145,12 +145,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
@@ -182,6 +182,13 @@
       "defaultValue": "false",
       "displayName": "Do not use _top-level statements",
       "description": "Whether to generate an explicit Program class and Main method instead of top-level statements."
+    },
+    "LocalhostTld": {
+      "type": "parameter",
+      "datatype": "bool",
+      "defaultValue": "false",
+      "displayName": "Use the .dev.localhost TLD in the application URL",
+      "description": "Whether to combine the project name with the .dev.localhost TLD in the application URL for local development, e.g. https://myapp.dev.localhost:12345."
     }
   },
   "primaryOutputs": [
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/Properties/launchSettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/Properties/launchSettings.json
index d6368816ad8a..ed5e05d0ab13 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/Properties/launchSettings.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/Properties/launchSettings.json
@@ -1,15 +1,19 @@
-{
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "profiles": {
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
+      //#if (LocalhostTld)
+      "applicationUrl": "http://company_webapplication1.dev.localhost:5000",
+      //#else
       "applicationUrl": "http://localhost:5000",
+      //#endif
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    //#if (HasHttpsProfile)
+      //#if (HasHttpsProfile)
     },
     //#else
     }
@@ -19,7 +23,11 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
+      //#if (LocalhostTld)
+      "applicationUrl": "https://company_webapplication1.dev.localhost:5001;http://company_webapplication1.dev.localhost:5000",
+      //#else
       "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      //#endif
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json
index 7e1b4852e43d..7f60730cd4a0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
   "symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije IndividualAuth nebo OrganizationalAuth).",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json
index cf85cbc7194c..37910d04d35f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express HTTPS Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn entweder IndividualAuth oder OrganizationalAuth verwendet wird).",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json
index b3c2492ff2cc..26ae4ccf3d39 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if either IndividualAuth or OrganizationalAuth is used).",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json
index 63cd8d7b7cb8..2a772e71edca 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa IndividualAuth o OrganizationalAuth).",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json
index 6ea28d5d0df3..1cb77685f2a5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si IndividualAuth ou OrganizationalAuth est utilisé).",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json
index 2d50da2f913e..15a1916b3797 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa IndividualAuth o OrganizationalAuth).",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json
index b0a308b783b2..31fb68594607 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。",
   "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、HTTPS 以外のパラメーターが使用されていない場合にのみ適用されます (IndividualAuth または OrganizationalAuth が使用されている場合は、HTTPS 以外は無視されます)。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json
index 2c78f08201a7..6d1d1c2a03bf 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(IndividualAuth 또는 OrganizationalAuth가 사용되는 경우 no-https는 무시됨).",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json
index e42c512ea66a..0514cec97d1a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS usług IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy nie jest używany parametr no-https (jeśli zostanie użyte uwierzytelnianie IndividualAuth lub OrganizationalAuth, parametr no-https zostanie zignorowana).",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json
index db260382f645..27ecf158ebbb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Essa opção só é aplicável quando o parâmetro no-https não é usado (no-https será ignorado se IndividualAuth ou OrganizationalAuth for usado).",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json
index d14134988328..ee0dacfaea0c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.",
   "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (при использовании IndividualAuth или OrganizationalAuth no-https игнорируется).",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json
index 38f891d5cbae..fe1f51b69ea7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmazsa uygulanabilir (IndividualAuth veya OrganizationalAuth kullanılırsa no-https yoksayılır).",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json
index fd89f25fc0b5..bdc007a2158e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。",
   "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 IndividualAuth 或 OrganizationalAuth，则将忽略 no-https)。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 Individual、IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json
index 1cef17a7451c..15eafa5a41aa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。",
   "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用此選項 (如果使用 IndividualAuth 或 OrganizationalAuth，則會忽略 no-https)。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 Individual、IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
index 306cd23c02ed..a8d459dbfa34 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
@@ -8,8 +8,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.",
   "groupIdentity": "Microsoft.Web.Empty",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.Empty.FSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.Empty.FSharp.10.0",
   "shortName": "web",
   "tags": {
     "language": "F#",
@@ -126,12 +126,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json
index 7fc5c6f1a4ac..3ab529e9bb01 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json
@@ -3,7 +3,7 @@
   "name": "Služba ASP.NET Core gRPC",
   "description": "Šablona projektu pro vytvoření služby gRPC pomocí ASP.NET Core s volitelnou podporou publikování jako native AOT.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/kestrelHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v souboru launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json
index 0b105942628c..8680369aaf0b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core-gRPC-Dienst",
   "description": "Eine Projektvorlage zum Erstellen eines gRPC-Diensts mit ASP.NET Core, mit optionaler Unterstützung für die Veröffentlichung als native AOT.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/kestrelHttpPort/description": "Portnummer, die für den HTTP Endpunkt in launchSettings.json verwendet werden soll.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json
index 46c6210ab756..8a7b46b2bfee 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core gRPC Service",
   "description": "A project template for creating a gRPC service using ASP.NET Core, with optional support for publishing as native AOT.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/kestrelHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json
index c4555f52c755..141eb9a08352 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json
@@ -3,7 +3,7 @@
   "name": "Servicio gRPC de ASP.NET Core",
   "description": "Una plantilla de proyecto para crear un servicio gRPC utilizando ASP.NET Core, con soporte opcional para publicar como native AOT.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/kestrelHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP en launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json
index 2ec999826851..c7fd46a38c3c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json
@@ -3,7 +3,7 @@
   "name": "Service gRPC ASP.NET Core",
   "description": "Modèle de projet pour la création d’un service gRPC à l’aide de ASP.NET Core, avec prise en charge facultative de la publication en tant qu’AOT natif.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/kestrelHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP dans launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json
index e75c53331b76..763240ce44de 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json
@@ -3,7 +3,7 @@
   "name": "Servizio gRPC ASP.NET Core",
   "description": "Modello di progetto per la creazione di un servizio gRPC tramite ASP.NET Core, con supporto facoltativo per la pubblicazione come native AOT.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/kestrelHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json
index e04e048c7454..b12392624482 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core gRPC サービス",
   "description": "ASP.NET Core を使用して gRPC サービスを作成するプロジェクト テンプレート。native AOT としての公開もオプションでサポートされます。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/kestrelHttpPort/description": "launchSettings.json の HTTP エンドポイントに使用するポート番号。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json
index 2adf8c95a69a..5f16276508ab 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core gRPC 서비스",
   "description": "ASP.NET Core를 사용하여 gRPC 서비스를 만들기 위한 프로젝트 템플릿으로, native AOT로 게시를 선택적으로 지원합니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/kestrelHttpPort/description": "launchSettings.json의 HTTP 엔드포인트에 사용할 포트 번호입니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json
index c05f6412e7f6..b2e225beeced 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json
@@ -3,7 +3,7 @@
   "name": "Usługa gRPC platformy ASP.NET Core",
   "description": "Szablon projektu służący do tworzenia usługi platformy gRPC przy użyciu platformy ASP.NET Core z opcjonalną obsługą publikowania jako native AOT.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/kestrelHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP w pliku launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json
index af70f53a143d..1bafea77a384 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -3,7 +3,7 @@
   "name": "Serviço gRPC do ASP.NET Core",
   "description": "Um modelo de projeto para criar um serviço gRPC usando ASP.NET Core, com suporte opcional para publicação como native AOT.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/kestrelHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP em launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json
index 76359e8da78b..f39713c82bd9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json
@@ -3,7 +3,7 @@
   "name": "Служба gRPC ASP.NET Core",
   "description": "Шаблон проекта для создания службы gRPC с помощью ASP.NET Core с необязательной поддержкой публикации в качестве «native AOT».",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/kestrelHttpPort/description": "Номер порта, используемый для конечной точки HTTP в launchSettings.json.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json
index 3f4abddb1caf..41febf600a6a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core gRPC Hizmeti",
   "description": "Yerel AOT olarak yayımlamak için isteğe bağlı destek ile ASP.NET Core kullanarak gRPC hizmeti oluşturmaya yönelik proje şablonu.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/kestrelHttpPort/description": "launchSettings.json içinde HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index c2bc4bff62d4..31aba09128f9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core gRPC 服务",
   "description": "用于使用 ASP.NET Core 创建 gRPC 服务的项目模板，可选择支持发布为 native AOT。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/kestrelHttpPort/description": "要用于 launchSettings.json 中 HTTP 终结点的端口号。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 387968b36ebd..3c01ccead2bf 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -3,7 +3,7 @@
   "name": "ASP.NET Core gRPC 服務",
   "description": "使用 ASP.NET Core 建立 gRPC 服務的專案範本，選擇性支援發佈為 Native AOT。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/kestrelHttpPort/description": "launchSettings.json 中 HTTP 端點要使用的連接埠號碼。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
index d79a6af2dabd..44d84749a755 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
@@ -11,8 +11,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project template for creating a gRPC service using ASP.NET Core, with optional support for publishing as native AOT.",
   "groupIdentity": "Microsoft.Web.Grpc",
-  "precedence": "9900",
-  "identity": "Microsoft.Grpc.Service.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Grpc.Service.CSharp.10.0",
   "shortName": "grpc",
   "tags": {
     "language": "C#",
@@ -58,11 +58,11 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "defaultValue": "net9.0"
+      "defaultValue": "net10.0"
     },
     "ExcludeLaunchSettings": {
       "type": "parameter",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Program.Main.cs
index 2dd344c10186..af75a62b3e0e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Program.Main.cs
@@ -19,4 +19,4 @@ public static void Main(string[] args)
 
         app.Run();
     }
-}
\ No newline at end of file
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs
index 37efaff8dc95..f98fd7c67150 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/Services/GreeterService.cs
@@ -1,18 +1,13 @@
 using Grpc.Core;
-using GrpcService_CSharp;
 
 namespace GrpcService_CSharp.Services;
 
-public class GreeterService : Greeter.GreeterBase
+public class GreeterService(ILogger<GreeterService> logger) : Greeter.GreeterBase
 {
-    private readonly ILogger<GreeterService> _logger;
-    public GreeterService(ILogger<GreeterService> logger)
-    {
-        _logger = logger;
-    }
-
     public override Task<HelloReply> SayHello(HelloRequest request, ServerCallContext context)
     {
+        logger.LogInformation("The message is received from {Name}", request.Name);
+
         return Task.FromResult(new HelloReply
         {
             Message = "Hello " + request.Name
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json
index b224d0bb72e0..77bd3f981dac 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json
@@ -3,7 +3,7 @@
   "name": "Knihovna tříd Razor",
   "description": "Projekt pro vytvoření knihovny tříd Razor, která cílí na .NET",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/SupportPagesAndViews/displayName": "Stránky podpory a zobrazení",
   "symbols/SupportPagesAndViews/description": "Určuje, jestli se má podporovat přidávání dalších stránek a zobrazení Razor do této knihovny.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json
index e20cac42a291..33ec20a8d3de 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json
@@ -3,7 +3,7 @@
   "name": "Razor Klassenbibliothek",
   "description": "Ein Projekt zum Erstellen einer Razor-Klassenbibliothek für .NET",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/SupportPagesAndViews/displayName": "Seiten und Ansichten unterstützen",
   "symbols/SupportPagesAndViews/description": "Gibt an, ob das Hinzufügen herkömmlicher Razor Pages und Ansichten zu dieser Bibliothek unterstützt werden soll.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json
index a9a3200d5478..cb0066c83dc6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json
@@ -3,7 +3,7 @@
   "name": "Razor Class Library",
   "description": "A project for creating a Razor class library that targets .NET",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/SupportPagesAndViews/displayName": "Support pages and views",
   "symbols/SupportPagesAndViews/description": "Whether to support adding traditional Razor pages and Views to this library.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json
index 9cd47795d6b0..286158091b85 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json
@@ -3,7 +3,7 @@
   "name": "Biblioteca de clases de Razor",
   "description": "Proyecto para crear una biblioteca de clases de Razor destinada a .NET",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/SupportPagesAndViews/displayName": "Páginas y vistas de soporte técnico",
   "symbols/SupportPagesAndViews/description": "Indica si se admite la adición de vistas y Razor Pages tradicionales a esta biblioteca.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json
index 110b498adad4..02a1445add2e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json
@@ -3,7 +3,7 @@
   "name": "Bibliothèque de classes Razor",
   "description": "Projet de création d’une bibliothèque de classes Razor qui cible .NET",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/SupportPagesAndViews/displayName": "Prendre en charge les pages et les vues",
   "symbols/SupportPagesAndViews/description": "Indique si l’ajout de pages et de vues Razor classiques à cette bibliothèque.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json
index 45c26a766cc3..886ae29f926b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json
@@ -3,7 +3,7 @@
   "name": "Libreria di classi Razor",
   "description": "Progetto per la creazione di una libreria di classi Razor destinata a .NET",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/SupportPagesAndViews/displayName": "Supporta pagine e visualizzazioni",
   "symbols/SupportPagesAndViews/description": "Indica se supportare l'aggiunta di pagine e visualizzazioni Razor tradizionali a questa libreria.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json
index aab9f370303d..f96725ee1fa1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json
@@ -3,7 +3,7 @@
   "name": "Razor クラス ライブラリ",
   "description": ".NET を対象とする Razor クラス ライブラリを作成するためのプロジェクト",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/SupportPagesAndViews/displayName": "サポート ページとビュー",
   "symbols/SupportPagesAndViews/description": "このライブラリに対して、従来の Razor ページとビューの追加をサポートするかどうか。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json
index 09e1d2a49894..b4bfa5341251 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json
@@ -3,7 +3,7 @@
   "name": "Razor 클래스 라이브러리",
   "description": ".NET을 대상으로 하는 Razor 클래스 라이브러리를 생성하기 위한 프로젝트",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/SupportPagesAndViews/displayName": "지원 페이지 및 보기",
   "symbols/SupportPagesAndViews/description": "이 라이브러리에 기존 Razor 페이지 및 보기 추가를 지원할지 여부입니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json
index 13eb05e58dc6..87bb5ba5a520 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json
@@ -3,7 +3,7 @@
   "name": "Biblioteka klas Razor",
   "description": "Projekt do tworzenia biblioteki klas Razor przeznaczonej dla platformy .NET Standard",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/SupportPagesAndViews/displayName": "Strony i widoki pomocy technicznej",
   "symbols/SupportPagesAndViews/description": "Określa, czy obsługiwać dodawanie tradycyjnych stron Razor i wyświetleń do tej biblioteki.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
index b872222095a0..9349bec9ba96 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -3,7 +3,7 @@
   "name": "Biblioteca de Classes Razor",
   "description": "Um projeto para criar uma biblioteca de classes Razor voltada para .NET",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/SupportPagesAndViews/displayName": "Páginas e visualizações de suporte",
   "symbols/SupportPagesAndViews/description": "Se é necessário dar suporte à adição de páginas e exibições tradicionais do Razor a esta biblioteca.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json
index f41d53b9e886..4c2f33a50192 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json
@@ -3,7 +3,7 @@
   "name": "Библиотека классов Razor",
   "description": "Проект для создания библиотеки классов Razor, предназначенной для .NET",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/SupportPagesAndViews/displayName": "Поддержка страниц и представлений",
   "symbols/SupportPagesAndViews/description": "Следует ли поддерживать добавление традиционных страниц и представлений Razor в эту библиотеку.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json
index 676acb065796..9e516a7a023c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json
@@ -3,7 +3,7 @@
   "name": "Razor Sınıf Kitaplığı",
   "description": ".NET’i hedefleyen bir Razor sınıf kitaplığı oluşturma projesi.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/SupportPagesAndViews/displayName": "Destek sayfaları ve görünümleri",
   "symbols/SupportPagesAndViews/description": "Bu kitaplığa geleneksel Razor sayfaları ve görünümleri eklemenin desteklenip desteklenmeyeceği.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index b30e4ffdd44c..bc1c4a2dcfb1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -3,7 +3,7 @@
   "name": "Razor 类库",
   "description": "用于创建目标为 .NET 的 Razor 类库的项目",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/SupportPagesAndViews/displayName": "支持页面和视图",
   "symbols/SupportPagesAndViews/description": "是否支持将传统的 Razor Pages 和视图添加到此库。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 6d97af8cf399..852d14c280bd 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -3,7 +3,7 @@
   "name": "Razor 類別庫",
   "description": "用於建立以 .NET 為目標之 Razor 類別庫的專案",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/SupportPagesAndViews/displayName": "支援頁面及檢視",
   "symbols/SupportPagesAndViews/description": "是否支援將傳統 Razor 頁面及檢視新增至此程式庫。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
index 0deb4c551fbd..f6494f592fc4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
@@ -10,8 +10,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project for creating a Razor class library that targets .NET",
   "groupIdentity": "Microsoft.Web.Razor",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.Razor.Library.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.Razor.Library.CSharp.10.0",
   "shortName": "razorclasslib",
   "tags": {
     "language": "C#",
@@ -48,11 +48,11 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "defaultValue": "net9.0"
+      "defaultValue": "net10.0"
     },
     "HostIdentifier": {
       "type": "bind",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs
index 208edd84ede3..f3057ed4f094 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs
@@ -9,15 +9,10 @@ namespace Company.RazorClassLibrary1;
 // This class can be registered as scoped DI service and then injected into Blazor
 // components for use.
 
-public class ExampleJsInterop : IAsyncDisposable
+public class ExampleJsInterop(IJSRuntime jsRuntime) : IAsyncDisposable
 {
-    private readonly Lazy<Task<IJSObjectReference>> moduleTask;
-
-    public ExampleJsInterop(IJSRuntime jsRuntime)
-    {
-        moduleTask = new (() => jsRuntime.InvokeAsync<IJSObjectReference>(
+    private readonly Lazy<Task<IJSObjectReference>> moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>(
             "import", "./_content/Company.RazorClassLibrary1/exampleJsInterop.js").AsTask());
-    }
 
     public async ValueTask<string> Prompt(string message)
     {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json
index 0148a219d873..d80d6f9d29da 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Webová aplikace ASP.NET Core",
+  "name": "Webová aplikace ASP.NET Core (Razor Pages)",
   "description": "Šablona projektu pro vytvoření aplikace ASP.NET Core s ukázkou obsahu ASP.NET Core Razor Pages",
   "symbols/auth/choices/None/description": "Bez ověřování",
   "symbols/auth/choices/Individual/description": "Ověřování Individual",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají IndividualB2C, SingleOrg ani MultiOrg.",
   "symbols/UseLocalDB/description": "Určuje, jestli se má použít LocalDB namísto SQLite. Tato možnost platí jenom v případě, že je zadáno --auth Individual nebo --auth IndividualB2C.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/CalledApiUrl/description": "Adresa URL rozhraní API, která se má volat z webové aplikace. Tato možnost platí jenom v případě, že je zadáno --auth SingleOrg, --auth MultiOrg nebo --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Určuje, jestli webová aplikace volá Microsoft Graph. Tato možnost platí pouze v případě, že je zadáno --auth SingleOrg nebo --auth MultiOrg.",
   "symbols/CalledApiScopes/description": "Obory, které se mají požádat o volání rozhraní API z webové aplikace Tato možnost platí jenom v případě, že je zadaná možnost --auth SingleOrg, --auth MultiOrg nebo --auth IndividualB2C.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json
index d9283a0d2d5b..9b778be6df2d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "ASP.NET Core Web App",
+  "name": "ASP.NET Core-Web-App (Razor Pages)",
   "description": "Eine Projektvorlage zum Erstellen einer ASP.NET Core-Anwendung mit Beispielinhalten für ASP.NET Core Razor Pages",
   "symbols/auth/choices/None/description": "Keine Authentifizierung",
   "symbols/auth/choices/Individual/description": "Individuelle Authentifizierung",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
   "symbols/UseLocalDB/description": "Ob LocalDB anstelle von SQLite verwendet werden soll. Diese Option gilt nur, wenn --auth Individual oder --auth IndividualB2C angegeben ist.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/CalledApiUrl/description": "URL der API, die von der Web-App aufgerufen werden soll. Diese Option gilt nur, wenn --auth SingleOrg, --auth MultiOrg oder --auth IndividualB2C angegeben ist.",
   "symbols/CallsMicrosoftGraph/description": "Gibt an, ob die Web-App Microsoft Graph aufruft. Diese Option gilt nur, wenn --auth SingleOrg oder --auth MultiOrg angegeben ist.",
   "symbols/CalledApiScopes/description": "Anzufordernde Bereiche zum Aufrufen der API von der Web-App. Diese Option gilt nur, wenn --auth SingleOrg, --auth MultiOrg oder --auth IndividualB2C angegeben ist.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json
index 35b7c85d36b3..c1ca1d2e0074 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
   "symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/CalledApiUrl/description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg, --auth MultiOrg or --auth IndividualB2C is specified.",
   "symbols/CallsMicrosoftGraph/description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg or --auth MultiOrg is specified.",
   "symbols/CalledApiScopes/description": "Scopes to request to call the API from the web app. This option only applies if --auth SingleOrg, --auth MultiOrg or --auth IndividualB2C is specified.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json
index e702b847c90e..2fdd4bbe5eb0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Aplicación web de ASP.NET Core",
+  "name": "ASP.NET Core Web App (Razor Pages)",
   "description": "Una plantilla de proyecto para crear una aplicación ASP.NET Core con contenido de Razor Pages de ASP.NET Core de ejemplo.",
   "symbols/auth/choices/None/description": "Sin autenticación",
   "symbols/auth/choices/Individual/description": "Autenticación individual",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Ya sea para desactivar HTTPS. Esta opción solo se aplica si no se utilizan IndividualB2C, SingleOrg o MultiOrg para --auth.",
   "symbols/UseLocalDB/description": "Indica si se va a usar LocalDB en lugar de SQLite. Esta opción solo se aplica si se especifica --auth Individual o --auth IndividualB2C.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/CalledApiUrl/description": "Dirección URL de la API a la que se va a llamar desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Especifica si la aplicación web llama a Microsoft Graph. Esta opción solo se aplica si se especifica --auth SingleOrg o --auth MultiOrg.",
   "symbols/CalledApiScopes/description": "Ámbitos para solicitar llamar a la API desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json
index 0921cfe778b7..d6fa3873b88b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Application web ASP.NET Core",
+  "name": "Application web ASP.NET Core (Razor Pages)",
   "description": "Modèle de projet pour la création d’une application ASP.NET Core avec un exemple de contenu ASP.NET Core Razor Pages",
   "symbols/auth/choices/None/description": "Aucune authentification",
   "symbols/auth/choices/Individual/description": "Authentification individuelle",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
   "symbols/UseLocalDB/description": "Indique s’il faut utiliser localDB au lieu de SQLite. Cette option s’applique uniquement si --auth Individual ou --auth IndividualB2C est spécifié.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/CalledApiUrl/description": "URL de l’API à appeler à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C est spécifié.",
   "symbols/CallsMicrosoftGraph/description": "Spécifie si l’application web appelle Microsoft Graph. Cette option s’applique uniquement si --auth SingleOrg ou --auth MultiOrg est spécifié.",
   "symbols/CalledApiScopes/description": "Étendues pour demander à appeler l’API à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C est spécifié.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json
index 8bdaa0307fff..a5df2a8f6e8c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "App Web ASP.NET Core",
+  "name": "ASP.NET Core Web App (Razor Pages)",
   "description": "Modello di progetto per la creazione di un'applicazione ASP.NET Core con contenuto Razor Pages ASP.NET Core di esempio.",
   "symbols/auth/choices/None/description": "Nessuna autenticazione",
   "symbols/auth/choices/Individual/description": "Autenticazione singola",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
   "symbols/UseLocalDB/description": "Indica se usare LocalDB invece di SQLite. Questa opzione si applica solo se è specificato --auth Individual o --auth IndividualB2C.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/CalledApiUrl/description": "URL dell'API da chiamare dall'app Web. Questa opzione si applica solo se si specifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Specifica se l'app Web chiama Microsoft Graph. Questa opzione si applica solo se è specificato --auth SingleOrg o --auth MultiOrg.",
   "symbols/CalledApiScopes/description": "Ambiti per richiedere di chiamare l'API dall'app Web. Questa opzione si applica solo se è specificato --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json
index 75fd505fc449..8f9caabd397d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "ASP.NET Core Web アプリ",
+  "name": "ASP.NET Core Web アプリ (Razor Pages)",
   "description": "ASP.NET Core アプリケーションを、サンプルの ASP.NET Core Razor Pages コンテンツで作成するためのプロジェクト テンプレートです",
   "symbols/auth/choices/None/description": "認証なし",
   "symbols/auth/choices/Individual/description": "個別の認証",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
   "symbols/UseLocalDB/description": "SQLite の代わりに LocalDB を使用するかどうか。このオプションは、--auth Individual または --auth IndividualB2C が指定されている場合にのみ適用されます。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/CalledApiUrl/description": "Web アプリから呼び出す API の URL。このオプションは、--auth SingleOrg、--auth MultiOrg、または --auth IndividualB2C が指定されている場合にのみ適用されます。",
   "symbols/CallsMicrosoftGraph/description": "Web アプリが Microsoft Graph を呼び出すかどうかを指定します。このオプションは、--auth SingleOrg または --auth MultiOrg が指定されている場合にのみ適用されます。",
   "symbols/CalledApiScopes/description": "Web アプリから API を呼び出す要求へのスコープ。このオプションは、--auth SingleOrg、--auth MultiOrg、または --auth IndividualB2C が指定されている場合にのみ適用されます。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json
index 21fbbe07394c..6cb9ed7a3b69 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "ASP.NET Core 웹앱",
+  "name": "ASP.NET Core 웹앱(Razor Pages)",
   "description": "예제 ASP.NET Core Razor Pages 콘텐츠를 사용하여 ASP.NET Core 애플리케이션을 만들기 위한 프로젝트 템플릿",
   "symbols/auth/choices/None/description": "인증 없음",
   "symbols/auth/choices/Individual/description": "개별 인증",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별B2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "symbols/UseLocalDB/description": "SQLite 대신 LocalDB를 사용할지 여부입니다. 이 옵션은 --auth Individual 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/CalledApiUrl/description": "웹앱에서 호출할 API의 URL입니다. 이 옵션은 --auth SingleOrg, --auth MultiOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
   "symbols/CallsMicrosoftGraph/description": "웹앱이 Microsoft Graph를 호출하는지 여부를 지정합니다. 이 옵션은 --auth SingleOrg 또는 --auth MultiOrg가 지정된 경우에만 적용됩니다.",
   "symbols/CalledApiScopes/description": "웹앱에서 API 호출을 요청할 범위입니다. 이 옵션은 --auth SingleOrg, --auth MultiOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json
index e9c7ba87877f..23ff653d7e76 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Aplikacja internetowa platformy ASP.NET Core",
+  "name": "ASP.NET Core Web App (Razor Pages)",
   "description": "Szablon projektu służący do tworzenia aplikacji platformy ASP.NET Core z przykładową zawartością platformy Razor Pages na platformie ASP.NET Core Razor.",
   "symbols/auth/choices/None/description": "Bez uwierzytelniania",
   "symbols/auth/choices/Individual/description": "Uwierzytelnianie indywidualne",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy elementy IndividualB2C, SingleOrg lub MultiOrg nie są używane dla uwierzytelniania --auth.",
   "symbols/UseLocalDB/description": "Określa, czy używać bazy danych LocalDB zamiast oprogramowania SQLite. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth Individual lub --auth IndividualB2C.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/CalledApiUrl/description": "Adres URL interfejsu API do wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg, --auth MultiOrg lub --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Określa, czy aplikacja internetowa wywołuje program Microsoft Graph. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg lub --auth MultiOrg.",
   "symbols/CalledApiScopes/description": "Zakresy do żądania wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg, --auth MultiOrg lub --auth IndividualB2C.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 377f50325f22..c39ad38a99df 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Aplicativo Web ASP.NET Core",
+  "name": "Aplicativo Web ASP.NET Core (Razor Pages)",
   "description": "Um modelo de projeto para criar um aplicativo ASP.NET Core com conteúdo de exemplo ASP.NET Core Razor Pages",
   "symbols/auth/choices/None/description": "Sem autenticação",
   "symbols/auth/choices/Individual/description": "Autenticação individual",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção só se aplica se IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
   "symbols/UseLocalDB/description": "Se deve usar LocalDB em vez de SQLite. Esta opção só se aplica se --auth Individual ou --auth IndividualB2C for especificado.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/CalledApiUrl/description": "URL da API para chamar do aplicativo Web. Esta opção só se aplica se --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C for especificado.",
   "symbols/CallsMicrosoftGraph/description": "Especifica se o aplicativo Web chama o Microsoft Graph. Esta opção só se aplica se --auth SingleOrg ou --auth MultiOrg for especificado.",
   "symbols/CalledApiScopes/description": "Escopos a serem solicitados para chamar a API do aplicativo Web. Esta opção só se aplica se --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C for especificado.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json
index 3c18a314f1d1..01bcec22a356 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json
@@ -1,6 +1,6 @@
 {
   "author": "Майкрософт",
-  "name": "Веб-приложение ASP.NET Core",
+  "name": "Веб-приложение ASP.NET Core (Razor Pages)",
   "description": "Шаблон проекта для создания приложения ASP.NET Core с образцом содержимого ASP.NET Core Razor Pages",
   "symbols/auth/choices/None/description": "Без проверки подлинности",
   "symbols/auth/choices/Individual/description": "Индивидуальная проверка подлинности",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются IndividualB2C, SingleOrg или MultiOrg.",
   "symbols/UseLocalDB/description": "Следует ли использовать LocalDB вместо SQLite. Этот параметр применяется, только если указывается --auth Individual или --auth IndividualB2C.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/CalledApiUrl/description": "URL-адрес API для вызова из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg, --auth MultiOrg или --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Указывает, вызывает ли веб-приложение Microsoft Graph. Этот параметр применяется, только если указывается --auth SingleOrg или --auth MultiOrg.",
   "symbols/CalledApiScopes/description": "Области для запроса вызова API из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg, --auth MultiOrg или --auth IndividualB2C.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json
index 4f6a65631745..1f580f995cb2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "ASP.NET Core Web Uygulaması",
+  "name": "ASP.NET Core Web Uygulaması (Razor Pages)",
   "description": "ASP.NET Core Razor Sayfalar içeriği örneğiyle ASP.NET Core uygulaması oluşturmak için proje şablonu",
   "symbols/auth/choices/None/description": "Kimlik doğrulaması yok",
   "symbols/auth/choices/Individual/description": "Bireysel kimlik doğrulaması",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
   "symbols/UseLocalDB/description": "SQLite yerine LocalDB'nin kullanılıp kullanılmayacağı. Bu seçenek yalnızca --auth Individual veya --auth IndividualB2C belirtilirse geçerlidir.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/CalledApiUrl/description": "Web uygulamasından çağrılan API URL'si. Bu seçenek yalnızca --auth SingleOrg, --auth MultiOrg veya --auth IndividualB2C belirtilirse geçerlidir.",
   "symbols/CallsMicrosoftGraph/description": "Web uygulamasının Microsoft Graph çağırıp çağırmadığını belirtir. Bu seçenek yalnızca --auth SingleOrg veya --auth MultiOrg belirtilirse geçerlidir.",
   "symbols/CalledApiScopes/description": "Web uygulamasından API çağırma istek kapsamları. Bu seçenek yalnızca --auth SingleOrg, --auth MultiOrg veya --auth IndividualB2C belirtilirse geçerlidir.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index b857d18e531d..186222ebd82e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "ASP.NET Core Web 应用",
+  "name": "ASP.NET Core Web 应用(Razor Pages)",
   "description": "用于创建包含示例 ASP.NET Core Razor Pages 内容的 ASP.NET Core 应用程序的项目模板",
   "symbols/auth/choices/None/description": "无身份验证",
   "symbols/auth/choices/Individual/description": "个人身份验证",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。",
   "symbols/UseLocalDB/description": "是否使用 LocalDB 而不是 SQLite。仅当指定了 --auth Individual 或 --auth IndividualB2C 时，此选项才适用。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/CalledApiUrl/description": "要从 Web 应用调用的 API 的 URL。仅当指定了 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 时，此选项才适用。",
   "symbols/CallsMicrosoftGraph/description": "指定 Web 应用是否调用 Microsoft Graph。仅当指定了 --auth SingleOrg 或 --auth MultiOrg 时，此选项才适用。",
   "symbols/CalledApiScopes/description": "请求从 Web 应用调用 API 的范围。仅当指定了 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 时，此选项才适用。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index a5fc8ee9e4ec..c60094dc9457 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "ASP.NET Core Web 應用程式",
+  "name": "ASP.NET Core Web 應用程式 (Razor Pages)",
   "description": "建立 ASP.NET 核心應用程式的專案範本，同時附上範例 ASP.NET Razor 頁面內容。",
   "symbols/auth/choices/None/description": "沒有驗證",
   "symbols/auth/choices/Individual/description": "個別驗證",
@@ -30,7 +30,7 @@
   "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。",
   "symbols/UseLocalDB/description": "是否使用 LocalDB 而非 SQLite。只有在已指定 --auth Individual 或 --auth IndividualB2C 時，才適用此選項。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/CalledApiUrl/description": "要從 Web 應用程式呼叫的 API URL。只有在已指定 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 時，才適用此選項。",
   "symbols/CallsMicrosoftGraph/description": "指定 Web 應用程式呼叫是否 Microsoft Graph。只有在已指定 --auth SingleOrg 或 --auth MultiOrg 時，才適用此選項。",
   "symbols/CalledApiScopes/description": "要求從 Web 應用程式呼叫 API 的範圍。只有在已指定 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 時，才適用此選項。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
index 1ab543330a58..6e9ffc26ce22 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
@@ -10,13 +10,13 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core Razor Pages content",
   "groupIdentity": "Microsoft.Web.RazorPages",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.RazorPages.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.RazorPages.CSharp.10.0",
   "shortName": [
     "webapp",
     "razor"
   ],
-  "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices",
+  "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices",
   "tags": {
     "language": "C#",
     "type": "project"
@@ -383,12 +383,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Data/ApplicationDbContext.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Data/ApplicationDbContext.cs
index 4e8fb8cbf43a..fde6e0a8e6a7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Data/ApplicationDbContext.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Data/ApplicationDbContext.cs
@@ -3,10 +3,6 @@
 
 namespace Company.WebApplication1.Data;
 
-public class ApplicationDbContext : IdentityDbContext
+public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : IdentityDbContext(options)
 {
-    public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
-        : base(options)
-    {
-    }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs
index f13301ac31d6..8884ae8c5cfd 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Error.cshtml.cs
@@ -12,13 +12,6 @@ public class ErrorModel : PageModel
 
     public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-    private readonly ILogger<ErrorModel> _logger;
-
-    public ErrorModel(ILogger<ErrorModel> logger)
-    {
-        _logger = logger;
-    }
-
     public void OnGet()
     {
         RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
index e937859ea730..228a9943b5ca 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
@@ -16,23 +16,18 @@ namespace Company.WebApplication1.Pages;
 #if (GenerateApiOrGraph)
 [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
 #endif
+#if (GenerateApi)
+public class IndexModel(IDownstreamApi downstreamApi) : PageModel
+#elseif (GenerateGraph)
+public class IndexModel(GraphServiceClient graphServiceClient) : PageModel
+#else
 public class IndexModel : PageModel
+#endif
 {
-    private readonly ILogger<IndexModel> _logger;
-
 #if (GenerateApi)
-    private readonly IDownstreamApi _downstreamApi;
-
-    public IndexModel(ILogger<IndexModel> logger,
-                        IDownstreamApi downstreamApi)
-    {
-            _logger = logger;
-        _downstreamApi = downstreamApi;
-    }
-
     public async Task OnGet()
     {
-        using var response = await _downstreamApi.CallApiForUserAsync("DownstreamApi").ConfigureAwait(false);
+        using var response = await downstreamApi.CallApiForUserAsync("DownstreamApi").ConfigureAwait(false);
         if (response.StatusCode == System.Net.HttpStatusCode.OK)
         {
             var apiResult = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
@@ -45,27 +40,13 @@ public async Task OnGet()
         }
     }
 #elseif (GenerateGraph)
-    private readonly GraphServiceClient _graphServiceClient;
-
-    public IndexModel(ILogger<IndexModel> logger,
-                        GraphServiceClient graphServiceClient)
-    {
-        _logger = logger;
-        _graphServiceClient = graphServiceClient;
-    }
-
     public async Task OnGet()
     {
-        var user = await _graphServiceClient.Me.GetAsync();
+        var user = await graphServiceClient.Me.GetAsync();
 
         ViewData["ApiResult"] = user?.DisplayName;
     }
 #else
-    public IndexModel(ILogger<IndexModel> logger)
-    {
-        _logger = logger;
-    }
-
     public void OnGet()
     {
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
index 83f879b16b81..15918977087e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Privacy.cshtml.cs
@@ -5,13 +5,6 @@ namespace Company.WebApplication1.Pages;
 
 public class PrivacyModel : PageModel
 {
-    private readonly ILogger<PrivacyModel> _logger;
-
-    public PrivacyModel(ILogger<PrivacyModel> logger)
-    {
-        _logger = logger;
-    }
-
     public void OnGet()
     {
     }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
index e54cd1dc48f7..a0c72625666d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
@@ -1,9 +1,9 @@
 /*!
- * jQuery Validation Plugin v1.21.0
+ * jQuery Validation Plugin v1.20.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2024 Jörn Zaefferer
+ * Copyright (c) 2023 Jörn Zaefferer
  * Released under the MIT license
  */
 (function( factory ) {
@@ -293,7 +293,6 @@ $.extend( $.validator, {
 		onsubmit: true,
 		ignore: ":hidden",
 		ignoreTitle: false,
-		customElements: [],
 		onfocusin: function( element ) {
 			this.lastActive = element;
 
@@ -441,17 +440,17 @@ $.extend( $.validator, {
 					settings[ eventType ].call( validator, this, event );
 				}
 			}
-			var focusListeners = [ ":text", "[type='password']", "[type='file']", "select", "textarea", "[type='number']", "[type='search']",
-								"[type='tel']", "[type='url']", "[type='email']", "[type='datetime']", "[type='date']", "[type='month']",
-								"[type='week']", "[type='time']", "[type='datetime-local']", "[type='range']", "[type='color']",
-								"[type='radio']", "[type='checkbox']", "[contenteditable]", "[type='button']" ];
-			var clickListeners = [ "select", "option", "[type='radio']", "[type='checkbox']" ];
+
 			$( this.currentForm )
-				.on( "focusin.validate focusout.validate keyup.validate", focusListeners.concat( this.settings.customElements ).join( ", " ), delegate )
+				.on( "focusin.validate focusout.validate keyup.validate",
+					":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
+					"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
+					"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
+					"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
 
 				// Support: Chrome, oldIE
 				// "select" is provided as event.target when clicking a option
-				.on( "click.validate", clickListeners.concat( this.settings.customElements ).join( ", " ), delegate );
+				.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
 
 			if ( this.settings.invalidHandler ) {
 				$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
@@ -648,12 +647,11 @@ $.extend( $.validator, {
 
 		elements: function() {
 			var validator = this,
-				rulesCache = {},
-				selectors = [ "input", "select", "textarea", "[contenteditable]" ];
+				rulesCache = {};
 
 			// Select all valid inputs inside the form (no submit or reset buttons)
 			return $( this.currentForm )
-			.find( selectors.concat( this.settings.customElements ).join( ", " ) )
+			.find( "input, select, textarea, [contenteditable]" )
 			.not( ":submit, :reset, :image, :disabled" )
 			.not( this.settings.ignore )
 			.filter( function() {
@@ -1503,7 +1501,7 @@ $.extend( $.validator, {
 
 		// https://jqueryvalidation.org/number-method/
 		number: function( value, element ) {
-			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test( value );
+			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
 		},
 
 		// https://jqueryvalidation.org/digits-method/
@@ -1614,12 +1612,11 @@ $.extend( $.validator, {
 
 			param = typeof param === "string" && { url: param } || param;
 			optionDataString = $.param( $.extend( { data: value }, param.data ) );
-			if ( previous.valid !== null && previous.old === optionDataString ) {
+			if ( previous.old === optionDataString ) {
 				return previous.valid;
 			}
 
 			previous.old = optionDataString;
-			previous.valid = null;
 			validator = this;
 			this.startRequest( element );
 			data = {};
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
index 14340cc9c9aa..44d3a43705a2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
@@ -1,4 +1,4 @@
-/*! jQuery Validation Plugin - v1.21.0 - 7/17/2024
+/*! jQuery Validation Plugin - v1.20.0 - 10/10/2023
  * https://jqueryvalidation.org/
- * Copyright (c) 2024 Jörn Zaefferer; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,customElements:[],onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)});var f=[":text","[type='password']","[type='file']","select","textarea","[type='number']","[type='search']","[type='tel']","[type='url']","[type='email']","[type='datetime']","[type='date']","[type='month']","[type='week']","[type='time']","[type='datetime-local']","[type='range']","[type='color']","[type='radio']","[type='checkbox']","[contenteditable]","[type='button']"],g=["select","option","[type='radio']","[type='checkbox']"];a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",f.concat(this.settings.customElements).join(", "),b).on("click.validate",g.concat(this.settings.customElements).join(", "),b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={},d=["input","select","textarea","[contenteditable]"];return a(this.currentForm).find(d.concat(this.settings.customElements).join(", ")).not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),null!==i.valid&&i.old===h?i.valid:(i.old=h,i.valid=null,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
+ * Copyright (c) 2023 Jörn Zaefferer; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], [type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox'], [contenteditable], [type='button']",b).on("click.validate","select, option, [type='radio'], [type='checkbox']",b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea, [contenteditable]").not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json
index d18251c02a02..9a9cb47b0cb3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají IndividualB2C, SingleOrg ani MultiOrg.",
   "symbols/UseLocalDB/description": "Určuje, jestli se má použít LocalDB namísto SQLite. Tato možnost platí jenom v případě, že je zadáno --auth Individual nebo --auth IndividualB2C.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/CalledApiUrl/description": "Adresa URL rozhraní API, která se má volat z webové aplikace. Tato možnost platí jenom v případě, že je zadáno --auth SingleOrg, --auth MultiOrg nebo --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Určuje, jestli webová aplikace volá Microsoft Graph. Tato možnost platí pouze v případě, že je zadáno --auth SingleOrg nebo --auth MultiOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json
index 616fdd240b86..69f4a48e29f2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
   "symbols/UseLocalDB/description": "Ob LocalDB anstelle von SQLite verwendet werden soll. Diese Option gilt nur, wenn --auth Individual oder --auth IndividualB2C angegeben ist.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/CalledApiUrl/description": "URL der API, die von der Web-App aufgerufen werden soll. Diese Option gilt nur, wenn --auth SingleOrg, --auth MultiOrg oder --auth IndividualB2C angegeben ist.",
   "symbols/CallsMicrosoftGraph/description": "Gibt an, ob die Web-App Microsoft Graph aufruft. Diese Option gilt nur, wenn --auth SingleOrg oder --auth MultiOrg angegeben ist.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json
index 9998411febcc..701903e81a0a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
   "symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/CalledApiUrl/description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg, --auth MultiOrg or --auth IndividualB2C is specified.",
   "symbols/CallsMicrosoftGraph/description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg or --auth MultiOrg is specified.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json
index 3b7263cba55c..38a515c32406 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Ya sea para desactivar HTTPS. Esta opción solo se aplica si no se utilizan IndividualB2C, SingleOrg o MultiOrg para la autenticación.",
   "symbols/UseLocalDB/description": "Indica si se va a usar LocalDB en lugar de SQLite. Esta opción solo se aplica si se especifica --auth Individual o --auth IndividualB2C.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/CalledApiUrl/description": "Dirección URL de la API a la que se va a llamar desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Especifica si la aplicación web llama a Microsoft Graph. Esta opción solo se aplica si se especifica --auth SingleOrg o --auth MultiOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json
index 5dd270711bc5..0cb3eb035bd3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
   "symbols/UseLocalDB/description": "Indique s’il faut utiliser localDB au lieu de SQLite. Cette option s’applique uniquement si --auth Individual ou --auth IndividualB2C est spécifié.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/CalledApiUrl/description": "URL de l’API à appeler à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C est spécifié.",
   "symbols/CallsMicrosoftGraph/description": "Spécifie si l’application web appelle Microsoft Graph. Cette option s’applique uniquement si --auth SingleOrg ou --auth MultiOrg est spécifié.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json
index 20771f90cfcb..0d2c6a0e94d7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
   "symbols/UseLocalDB/description": "Indica se usare LocalDB invece di SQLite. Questa opzione si applica solo se è specificato --auth Individual o --auth IndividualB2C.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/CalledApiUrl/description": "URL dell'API da chiamare dall'app Web. Questa opzione si applica solo se si specifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Specifica se l'app Web chiama Microsoft Graph. Questa opzione si applica solo se è specificato --auth SingleOrg o --auth MultiOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json
index 7cf1d33548fb..fc0f8821b7c5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
   "symbols/UseLocalDB/description": "SQLite の代わりに LocalDB を使用するかどうか。このオプションは、--auth Individual または --auth IndividualB2C が指定されている場合にのみ適用されます。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/CalledApiUrl/description": "Web アプリから呼び出す API の URL。このオプションは、--auth SingleOrg、--auth MultiOrg、または --auth IndividualB2C が指定されている場合にのみ適用されます。",
   "symbols/CallsMicrosoftGraph/description": "Web アプリが Microsoft Graph を呼び出すかどうかを指定します。このオプションは、--auth SingleOrg または --auth MultiOrg が指定されている場合にのみ適用されます。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json
index 13169220ec1b..ff7bde42ba0b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별B2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "symbols/UseLocalDB/description": "SQLite 대신 LocalDB를 사용할지 여부입니다. 이 옵션은 --auth Individual 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/CalledApiUrl/description": "웹앱에서 호출할 API의 URL입니다. 이 옵션은 --auth SingleOrg, --auth MultiOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
   "symbols/CallsMicrosoftGraph/description": "웹앱이 Microsoft Graph를 호출하는지 여부를 지정합니다. 이 옵션은 --auth SingleOrg 또는 --auth MultiOrg가 지정된 경우에만 적용됩니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json
index d2c4d33dcf00..579efe300221 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy elementy IndividualB2C, SingleOrg lub MultiOrg nie są używane dla uwierzytelniania --auth.",
   "symbols/UseLocalDB/description": "Określa, czy używać bazy danych LocalDB zamiast oprogramowania SQLite. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth Individual lub --auth IndividualB2C.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/CalledApiUrl/description": "Adres URL interfejsu API do wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg, --auth MultiOrg lub --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Określa, czy aplikacja internetowa wywołuje program Microsoft Graph. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg lub --auth MultiOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 59203f10bb59..402712727297 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção só se aplica se IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
   "symbols/UseLocalDB/description": "Se deve usar LocalDB em vez de SQLite. Esta opção só se aplica se --auth Individual ou --auth IndividualB2C for especificado.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/CalledApiUrl/description": "URL da API para chamar do aplicativo Web. Esta opção só se aplica se --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C for especificado.",
   "symbols/CallsMicrosoftGraph/description": "Especifica se o aplicativo Web chama o Microsoft Graph. Esta opção só se aplica se --auth SingleOrg ou --auth MultiOrg for especificado.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json
index d3371c5ce0a6..4950d4016b8c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются IndividualB2C, SingleOrg или MultiOrg.",
   "symbols/UseLocalDB/description": "Следует ли использовать LocalDB вместо SQLite. Этот параметр применяется, только если указывается --auth Individual или --auth IndividualB2C.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/CalledApiUrl/description": "URL-адрес API для вызова из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg, --auth MultiOrg или --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Указывает, вызывает ли веб-приложение Microsoft Graph. Этот параметр применяется, только если указывается --auth SingleOrg или --auth MultiOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json
index 0a7b2326c292..105e9c680f8a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
   "symbols/UseLocalDB/description": "SQLite yerine LocalDB'nin kullanılıp kullanılmayacağı. Bu seçenek yalnızca --auth Individual veya --auth IndividualB2C belirtilirse geçerlidir.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/CalledApiUrl/description": "Web uygulamasından çağrılan API URL'si. Bu seçenek yalnızca --auth SingleOrg, --auth MultiOrg veya --auth IndividualB2C belirtilirse geçerlidir.",
   "symbols/CallsMicrosoftGraph/description": "Web uygulamasının Microsoft Graph çağırıp çağırmadığını belirtir. Bu seçenek yalnızca --auth SingleOrg veya --auth MultiOrg belirtilirse geçerlidir.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 1c4c8a7d9807..53cd51919438 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。",
   "symbols/UseLocalDB/description": "是否使用 LocalDB 而不是 SQLite。仅当指定了 --auth Individual 或 --auth IndividualB2C 时，此选项才适用。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/CalledApiUrl/description": "要从 Web 应用调用的 API 的 URL。仅当指定了 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 时，此选项才适用。",
   "symbols/CallsMicrosoftGraph/description": "指定 Web 应用是否调用 Microsoft Graph。仅当指定了 --auth SingleOrg 或 --auth MultiOrg 时，此选项才适用。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 31c83a540677..4cd048f5973c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -29,7 +29,7 @@
   "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。",
   "symbols/UseLocalDB/description": "是否使用 LocalDB 而非 SQLite。只有在已指定 --auth Individual 或 --auth IndividualB2C 時，才適用此選項。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/CalledApiUrl/description": "要從 Web 應用程式呼叫的 API URL。只有在已指定 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 時，才適用此選項。",
   "symbols/CallsMicrosoftGraph/description": "指定 Web 應用程式呼叫是否 Microsoft Graph。只有在已指定 --auth SingleOrg 或 --auth MultiOrg 時，才適用此選項。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
index 84dc40535a92..79478ad13720 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
@@ -9,10 +9,10 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
   "groupIdentity": "Microsoft.Web.Mvc",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.Mvc.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.Mvc.CSharp.10.0",
   "shortName": "mvc",
-  "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices",
+  "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices",
   "tags": {
     "language": "C#",
     "type": "project"
@@ -373,12 +373,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs
index 3414e9cb3f8e..291efac97488 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs
@@ -20,24 +20,19 @@ namespace Company.WebApplication1.Controllers;
 #if (OrganizationalAuth)
 [Authorize]
 #endif
+#if (GenerateApi)
+public class HomeController(IDownstreamApi downstreamApi) : Controller
+#elseif (GenerateGraph)
+public class HomeController(GraphServiceClient graphServiceClient) : Controller
+#else
 public class HomeController : Controller
+#endif
 {
-    private readonly ILogger<HomeController> _logger;
-
 #if (GenerateApi)
-    private readonly IDownstreamApi _downstreamApi;
-
-    public HomeController(ILogger<HomeController> logger,
-                            IDownstreamApi downstreamApi)
-    {
-            _logger = logger;
-        _downstreamApi = downstreamApi;
-    }
-
     [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
     public async Task<IActionResult> Index()
     {
-        using var response = await _downstreamApi.CallApiForUserAsync("DownstreamApi").ConfigureAwait(false);
+        using var response = await downstreamApi.CallApiForUserAsync("DownstreamApi").ConfigureAwait(false);
         if (response.StatusCode == System.Net.HttpStatusCode.OK)
         {
             var apiResult = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
@@ -51,29 +46,15 @@ public async Task<IActionResult> Index()
         return View();
     }
 #elseif (GenerateGraph)
-    private readonly GraphServiceClient _graphServiceClient;
-
-    public HomeController(ILogger<HomeController> logger,
-                        GraphServiceClient graphServiceClient)
-    {
-            _logger = logger;
-        _graphServiceClient = graphServiceClient;
-    }
-
     [AuthorizeForScopes(ScopeKeySection = "DownstreamApi:Scopes")]
     public async Task<IActionResult> Index()
     {
-        var user = await _graphServiceClient.Me.GetAsync();
+        var user = await graphServiceClient.Me.GetAsync();
         ViewData["ApiResult"] = user?.DisplayName;
 
         return View();
     }
 #else
-    public HomeController(ILogger<HomeController> logger)
-    {
-        _logger = logger;
-    }
-
     public IActionResult Index()
     {
         return View();
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Data/ApplicationDbContext.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Data/ApplicationDbContext.cs
index 4e8fb8cbf43a..fde6e0a8e6a7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Data/ApplicationDbContext.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Data/ApplicationDbContext.cs
@@ -3,10 +3,6 @@
 
 namespace Company.WebApplication1.Data;
 
-public class ApplicationDbContext : IdentityDbContext
+public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : IdentityDbContext(options)
 {
-    public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
-        : base(options)
-    {
-    }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
index e54cd1dc48f7..a0c72625666d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
@@ -1,9 +1,9 @@
 /*!
- * jQuery Validation Plugin v1.21.0
+ * jQuery Validation Plugin v1.20.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2024 Jörn Zaefferer
+ * Copyright (c) 2023 Jörn Zaefferer
  * Released under the MIT license
  */
 (function( factory ) {
@@ -293,7 +293,6 @@ $.extend( $.validator, {
 		onsubmit: true,
 		ignore: ":hidden",
 		ignoreTitle: false,
-		customElements: [],
 		onfocusin: function( element ) {
 			this.lastActive = element;
 
@@ -441,17 +440,17 @@ $.extend( $.validator, {
 					settings[ eventType ].call( validator, this, event );
 				}
 			}
-			var focusListeners = [ ":text", "[type='password']", "[type='file']", "select", "textarea", "[type='number']", "[type='search']",
-								"[type='tel']", "[type='url']", "[type='email']", "[type='datetime']", "[type='date']", "[type='month']",
-								"[type='week']", "[type='time']", "[type='datetime-local']", "[type='range']", "[type='color']",
-								"[type='radio']", "[type='checkbox']", "[contenteditable]", "[type='button']" ];
-			var clickListeners = [ "select", "option", "[type='radio']", "[type='checkbox']" ];
+
 			$( this.currentForm )
-				.on( "focusin.validate focusout.validate keyup.validate", focusListeners.concat( this.settings.customElements ).join( ", " ), delegate )
+				.on( "focusin.validate focusout.validate keyup.validate",
+					":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
+					"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
+					"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
+					"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
 
 				// Support: Chrome, oldIE
 				// "select" is provided as event.target when clicking a option
-				.on( "click.validate", clickListeners.concat( this.settings.customElements ).join( ", " ), delegate );
+				.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
 
 			if ( this.settings.invalidHandler ) {
 				$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
@@ -648,12 +647,11 @@ $.extend( $.validator, {
 
 		elements: function() {
 			var validator = this,
-				rulesCache = {},
-				selectors = [ "input", "select", "textarea", "[contenteditable]" ];
+				rulesCache = {};
 
 			// Select all valid inputs inside the form (no submit or reset buttons)
 			return $( this.currentForm )
-			.find( selectors.concat( this.settings.customElements ).join( ", " ) )
+			.find( "input, select, textarea, [contenteditable]" )
 			.not( ":submit, :reset, :image, :disabled" )
 			.not( this.settings.ignore )
 			.filter( function() {
@@ -1503,7 +1501,7 @@ $.extend( $.validator, {
 
 		// https://jqueryvalidation.org/number-method/
 		number: function( value, element ) {
-			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test( value );
+			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
 		},
 
 		// https://jqueryvalidation.org/digits-method/
@@ -1614,12 +1612,11 @@ $.extend( $.validator, {
 
 			param = typeof param === "string" && { url: param } || param;
 			optionDataString = $.param( $.extend( { data: value }, param.data ) );
-			if ( previous.valid !== null && previous.old === optionDataString ) {
+			if ( previous.old === optionDataString ) {
 				return previous.valid;
 			}
 
 			previous.old = optionDataString;
-			previous.valid = null;
 			validator = this;
 			this.startRequest( element );
 			data = {};
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
index 14340cc9c9aa..44d3a43705a2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
@@ -1,4 +1,4 @@
-/*! jQuery Validation Plugin - v1.21.0 - 7/17/2024
+/*! jQuery Validation Plugin - v1.20.0 - 10/10/2023
  * https://jqueryvalidation.org/
- * Copyright (c) 2024 Jörn Zaefferer; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,customElements:[],onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)});var f=[":text","[type='password']","[type='file']","select","textarea","[type='number']","[type='search']","[type='tel']","[type='url']","[type='email']","[type='datetime']","[type='date']","[type='month']","[type='week']","[type='time']","[type='datetime-local']","[type='range']","[type='color']","[type='radio']","[type='checkbox']","[contenteditable]","[type='button']"],g=["select","option","[type='radio']","[type='checkbox']"];a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",f.concat(this.settings.customElements).join(", "),b).on("click.validate",g.concat(this.settings.customElements).join(", "),b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={},d=["input","select","textarea","[contenteditable]"];return a(this.currentForm).find(d.concat(this.settings.customElements).join(", ")).not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),null!==i.valid&&i.old===h?i.valid:(i.old=h,i.valid=null,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
+ * Copyright (c) 2023 Jörn Zaefferer; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], [type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox'], [contenteditable], [type='button']",b).on("click.validate","select, option, [type='radio'], [type='checkbox']",b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea, [contenteditable]").not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json
index 78a7a036a820..6b5643b74443 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
   "symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije IndividualAuth nebo OrganizationalAuth).",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json
index 1628809dfbb1..117234b0e551 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express HTTPS Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn entweder IndividualAuth oder OrganizationalAuth verwendet wird).",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json
index c870fe3a1c3e..ed6bdec5c069 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if either IndividualAuth or OrganizationalAuth is used).",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json
index d1f9e80aafcf..34a309e06b35 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa IndividualAuth o OrganizationalAuth).",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json
index 0674ee947ab0..6f0f6f1536cb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si IndividualAuth ou OrganizationalAuth est utilisé).",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json
index 78cc7ae8f58e..00e58138efd7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa IndividualAuth o OrganizationalAuth).",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json
index d86d696eeb7c..0ff620d60cec 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。",
   "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、HTTPS 以外のパラメーターが使用されていない場合にのみ適用されます (IndividualAuth または OrganizationalAuth が使用されている場合は、HTTPS 以外は無視されます)。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json
index 13adc18487e4..6a4876ff0188 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(IndividualAuth 또는 OrganizationalAuth가 사용되는 경우 no-https는 무시됨).",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json
index 72bef26c9a38..d6aa7b92fe80 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS usług IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy nie jest używany parametr no-https (jeśli zostanie użyte uwierzytelnianie IndividualAuth lub OrganizationalAuth, parametr no-https zostanie zignorowana).",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json
index 5ad40fd99fda..af5f20537852 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Essa opção só é aplicável quando o parâmetro no-https não é usado (no-https será ignorado se IndividualAuth ou OrganizationalAuth for usado).",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json
index badfe6cdde99..7d429e880beb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.",
   "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (при использовании IndividualAuth или OrganizationalAuth no-https игнорируется).",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json
index d39ae0fc92e2..7b17f4a74e97 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmazsa uygulanabilir (IndividualAuth veya OrganizationalAuth kullanılırsa no-https yoksayılır).",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json
index 2d0fe15b2efa..bd5fc41cefc9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。",
   "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 IndividualAuth 或 OrganizationalAuth，则将忽略 no-https)。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 Individual、IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json
index b91f007edb0a..e11914d2235a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。",
   "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用此選項 (如果使用 IndividualAuth 或 OrganizationalAuth，則會忽略 no-https)。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 Individual、IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
index b8ee9bfa2635..7507fabddd48 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
@@ -9,10 +9,10 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.",
   "groupIdentity": "Microsoft.Web.Mvc",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.Mvc.FSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.Mvc.FSharp.10.0",
   "shortName": "mvc",
-  "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices",
+  "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices",
   "tags": {
     "language": "F#",
     "type": "project"
@@ -131,12 +131,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
index e54cd1dc48f7..a0c72625666d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.js
@@ -1,9 +1,9 @@
 /*!
- * jQuery Validation Plugin v1.21.0
+ * jQuery Validation Plugin v1.20.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2024 Jörn Zaefferer
+ * Copyright (c) 2023 Jörn Zaefferer
  * Released under the MIT license
  */
 (function( factory ) {
@@ -293,7 +293,6 @@ $.extend( $.validator, {
 		onsubmit: true,
 		ignore: ":hidden",
 		ignoreTitle: false,
-		customElements: [],
 		onfocusin: function( element ) {
 			this.lastActive = element;
 
@@ -441,17 +440,17 @@ $.extend( $.validator, {
 					settings[ eventType ].call( validator, this, event );
 				}
 			}
-			var focusListeners = [ ":text", "[type='password']", "[type='file']", "select", "textarea", "[type='number']", "[type='search']",
-								"[type='tel']", "[type='url']", "[type='email']", "[type='datetime']", "[type='date']", "[type='month']",
-								"[type='week']", "[type='time']", "[type='datetime-local']", "[type='range']", "[type='color']",
-								"[type='radio']", "[type='checkbox']", "[contenteditable]", "[type='button']" ];
-			var clickListeners = [ "select", "option", "[type='radio']", "[type='checkbox']" ];
+
 			$( this.currentForm )
-				.on( "focusin.validate focusout.validate keyup.validate", focusListeners.concat( this.settings.customElements ).join( ", " ), delegate )
+				.on( "focusin.validate focusout.validate keyup.validate",
+					":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
+					"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
+					"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
+					"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
 
 				// Support: Chrome, oldIE
 				// "select" is provided as event.target when clicking a option
-				.on( "click.validate", clickListeners.concat( this.settings.customElements ).join( ", " ), delegate );
+				.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
 
 			if ( this.settings.invalidHandler ) {
 				$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
@@ -648,12 +647,11 @@ $.extend( $.validator, {
 
 		elements: function() {
 			var validator = this,
-				rulesCache = {},
-				selectors = [ "input", "select", "textarea", "[contenteditable]" ];
+				rulesCache = {};
 
 			// Select all valid inputs inside the form (no submit or reset buttons)
 			return $( this.currentForm )
-			.find( selectors.concat( this.settings.customElements ).join( ", " ) )
+			.find( "input, select, textarea, [contenteditable]" )
 			.not( ":submit, :reset, :image, :disabled" )
 			.not( this.settings.ignore )
 			.filter( function() {
@@ -1503,7 +1501,7 @@ $.extend( $.validator, {
 
 		// https://jqueryvalidation.org/number-method/
 		number: function( value, element ) {
-			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test( value );
+			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
 		},
 
 		// https://jqueryvalidation.org/digits-method/
@@ -1614,12 +1612,11 @@ $.extend( $.validator, {
 
 			param = typeof param === "string" && { url: param } || param;
 			optionDataString = $.param( $.extend( { data: value }, param.data ) );
-			if ( previous.valid !== null && previous.old === optionDataString ) {
+			if ( previous.old === optionDataString ) {
 				return previous.valid;
 			}
 
 			previous.old = optionDataString;
-			previous.valid = null;
 			validator = this;
 			this.startRequest( element );
 			data = {};
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
index 14340cc9c9aa..44d3a43705a2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
@@ -1,4 +1,4 @@
-/*! jQuery Validation Plugin - v1.21.0 - 7/17/2024
+/*! jQuery Validation Plugin - v1.20.0 - 10/10/2023
  * https://jqueryvalidation.org/
- * Copyright (c) 2024 Jörn Zaefferer; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,customElements:[],onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)});var f=[":text","[type='password']","[type='file']","select","textarea","[type='number']","[type='search']","[type='tel']","[type='url']","[type='email']","[type='datetime']","[type='date']","[type='month']","[type='week']","[type='time']","[type='datetime-local']","[type='range']","[type='color']","[type='radio']","[type='checkbox']","[contenteditable]","[type='button']"],g=["select","option","[type='radio']","[type='checkbox']"];a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",f.concat(this.settings.customElements).join(", "),b).on("click.validate",g.concat(this.settings.customElements).join(", "),b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={},d=["input","select","textarea","[contenteditable]"];return a(this.currentForm).find(d.concat(this.settings.customElements).join(", ")).not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),null!==i.valid&&i.old===h?i.valid:(i.old=h,i.valid=null,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
+ * Copyright (c) 2023 Jörn Zaefferer; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}});var b=function(a){return a.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};a.extend(a.expr.pseudos||a.expr[":"],{blank:function(c){return!b(""+a(c).val())},filled:function(c){var d=a(c).val();return null!==d&&!!b(""+d)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], [type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox'], [contenteditable], [type='button']",b).on("click.validate","select, option, [type='radio'], [type='checkbox']",b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea, [contenteditable]").not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);this.abortRequest(b),"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||"")):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass),this.settings&&this.settings.escapeHtml?h.text(c||""):h.html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return void 0===a?"":a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},elementAjaxPort:function(a){return"validate"+a.name},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()&&0===this.pendingRequest?(a(this.currentForm).trigger("submit"),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},abortRequest:function(b){var c;this.pending[b.name]&&(c=this.elementAjaxPort(b),a.ajaxAbort(c),this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass))},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a["date"===b?"dateISO":c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(a,d){b[a]="function"==typeof d&&"normalizer"!==a?d(c):d}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var a;b[this]&&(Array.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(a=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(a[0]),Number(a[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c},maxlength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d<=c},rangelength:function(a,b,c){var d=Array.isArray(a)?a.length:this.getLength(a,b);return this.optional(b)||d>=c[0]&&d<=c[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:this.elementAjaxPort(c),dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var c,d={};return a.ajaxPrefilter?a.ajaxPrefilter(function(b,c,e){var f=b.port;"abort"===b.mode&&(a.ajaxAbort(f),d[f]=e)}):(c=a.ajax,a.ajax=function(b){var e=("mode"in b?b:a.ajaxSettings).mode,f=("port"in b?b:a.ajaxSettings).port;return"abort"===e?(a.ajaxAbort(f),d[f]=c.apply(this,arguments),d[f]):c.apply(this,arguments)}),a.ajaxAbort=function(a){d[a]&&(d[a].abort(),delete d[a])},a});
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json
index 328b518b3c38..a602d8b66e03 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají IndividualB2C, SingleOrg ani MultiOrg.",
   "symbols/UseLocalDB/description": "Určuje, jestli se má použít LocalDB namísto SQLite. Tato možnost platí jenom v případě, že je zadáno --auth Individual nebo --auth IndividualB2C.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/CalledApiUrl/description": "Adresa URL rozhraní API, která se má volat z webové aplikace. Tato možnost platí jenom v případě, že je zadáno --auth SingleOrg nebo --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Určuje, jestli webová aplikace volá Microsoft Graph. Tato možnost platí pouze v případě, že je zadáno --auth SingleOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json
index 6dba235cace0..ac99ac4abb48 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
   "symbols/UseLocalDB/description": "Ob LocalDB anstelle von SQLite verwendet werden soll. Diese Option gilt nur, wenn --auth Individual oder --auth IndividualB2C angegeben ist.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/CalledApiUrl/description": "URL der API, die von der Web-App aufgerufen werden soll. Diese Option gilt nur, wenn --auth SingleOrg oder --auth IndividualB2C angegeben ist.",
   "symbols/CallsMicrosoftGraph/description": "Gibt an, ob die Web App Microsoft Graph aufruft. Diese Option gilt nur, wenn --auth SingleOrg angegeben ist.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json
index 04b743643b08..4383693bc546 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.",
   "symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/CalledApiUrl/description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg or --auth IndividualB2C is specified.",
   "symbols/CallsMicrosoftGraph/description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg is specified.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json
index 9347e1157c03..83eeb3ae1e41 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Ya sea para desactivar HTTPS. Esta opción solo se aplica si no se utilizan IndividualB2C, SingleOrg o MultiOrg para --auth.",
   "symbols/UseLocalDB/description": "Indica si se va a usar LocalDB en lugar de SQLite. Esta opción solo se aplica si se especifica --auth Individual o --auth IndividualB2C.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/CalledApiUrl/description": "Dirección URL de la API a la que se va a llamar desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg o --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Especifica si la aplicación web llama a Microsoft Graph. Esta opción solo se aplica si se especifica --auth SingleOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json
index a1ffcb05cabe..358989991b20 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.",
   "symbols/UseLocalDB/description": "Indique s’il faut utiliser localDB au lieu de SQLite. Cette option s’applique uniquement si --auth Individual ou --auth IndividualB2C est spécifié.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/CalledApiUrl/description": "URL de l’API à appeler à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg ou --auth IndividualB2C est spécifié.",
   "symbols/CallsMicrosoftGraph/description": "Spécifie si l’application web appelle Microsoft Graph. Cette option s’applique uniquement si --auth SingleOrg est spécifié.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json
index 2dddc1c30c29..aa7b56f131ae 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.",
   "symbols/UseLocalDB/description": "Indica se usare LocalDB invece di SQLite. Questa opzione si applica solo se è specificato --auth Individual o --auth IndividualB2C.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/CalledApiUrl/description": "URL dell'API da chiamare dall'app Web. Questa opzione si applica solo se è specificato --auth SingleOrg o --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Specifica se l'app Web chiama Microsoft Graph. Questa opzione si applica solo se è specificato --auth SingleOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json
index 15a8539a8218..8f9dfe9a61d7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。",
   "symbols/UseLocalDB/description": "SQLite の代わりに LocalDB を使用するかどうか。このオプションは、--auth Individual または --auth IndividualB2C が指定されている場合にのみ適用されます。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/CalledApiUrl/description": "Web アプリから呼び出す API の URL。このオプションは、--auth SingleOrg または --auth IndividualB2C が指定されている場合にのみ適用されます。",
   "symbols/CallsMicrosoftGraph/description": "Web アプリが Microsoft Graph を呼び出すかどうかを指定します。このオプションは、--auth SingleOrg が指定されている場合にのみ適用されます。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json
index 434847738040..13973ca6ed70 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별B2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.",
   "symbols/UseLocalDB/description": "SQLite 대신 LocalDB를 사용할지 여부입니다. 이 옵션은 --auth Individual 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/CalledApiUrl/description": "웹앱에서 호출할 API의 URL입니다. 이 옵션은 --auth SingleOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.",
   "symbols/CallsMicrosoftGraph/description": "웹앱이 Microsoft Graph를 호출하는지 여부를 지정합니다. 이 옵션은 --auth SingleOrg가 지정된 경우에만 적용됩니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json
index 0116babcf78e..0ec9870d7c54 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy elementy IndividualB2C, SingleOrg lub MultiOrg nie są używane dla uwierzytelniania --auth.",
   "symbols/UseLocalDB/description": "Określa, czy używać bazy danych LocalDB zamiast oprogramowania SQLite. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth Individual lub --auth IndividualB2C.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/CalledApiUrl/description": "Adres URL interfejsu API do wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg lub --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Określa, czy aplikacja internetowa wywołuje program Microsoft Graph. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json
index c2d2629e81d7..0aa84a9524ef 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção só se aplica se IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.",
   "symbols/UseLocalDB/description": "Se deve usar LocalDB em vez de SQLite. Esta opção só se aplica se --auth Individual ou --auth IndividualB2C for especificado.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/CalledApiUrl/description": "URL da API para chamar do aplicativo Web. Essa opção se aplica somente se --auth SingleOrg ou --auth IndividualB2C for especificado.",
   "symbols/CallsMicrosoftGraph/description": "Especifica se o aplicativo Web chama o Microsoft Graph. Esta opção só se aplica se --auth SingleOrg for especificado.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json
index 84b09f6ff279..f9393965129d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются IndividualB2C, SingleOrg или MultiOrg.",
   "symbols/UseLocalDB/description": "Следует ли использовать LocalDB вместо SQLite. Этот параметр применяется, только если указывается --auth Individual или --auth IndividualB2C.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/CalledApiUrl/description": "URL-адрес API для вызова из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg или --auth IndividualB2C.",
   "symbols/CallsMicrosoftGraph/description": "Указывает, вызывает ли веб-приложение Microsoft Graph. Этот параметр применяется, только если указывается --auth SingleOrg.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json
index f841252f1871..390781a3e05f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.",
   "symbols/UseLocalDB/description": "SQLite yerine LocalDB'nin kullanılıp kullanılmayacağı. Bu seçenek yalnızca --auth Individual veya --auth IndividualB2C belirtilirse geçerlidir.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/CalledApiUrl/description": "Web uygulamasından çağrılan API URL'si. Bu seçenek yalnızca --auth SingleOrg veya --auth IndividualB2C belirtilirse geçerlidir.",
   "symbols/CallsMicrosoftGraph/description": "Web uygulamasının Microsoft Graph çağırıp çağırmadığını belirtir. Bu seçenek yalnızca --auth SingleOrg belirtilirse geçerlidir.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 830ed78b25d1..730a4679cc30 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。",
   "symbols/UseLocalDB/description": "是否使用 LocalDB 而不是 SQLite。仅当指定了 --auth Individual 或 --auth IndividualB2C 时，此选项才适用。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/CalledApiUrl/description": "要从 Web 应用调用的 API 的 URL。仅当指定了 --auth SingleOrg 或 --auth IndividualB2C 时，此选项才适用。",
   "symbols/CallsMicrosoftGraph/description": "指定 Web 应用是否调用 Microsoft Graph。仅当指定了 --auth SingleOrg 时，此选项才适用。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index e08d9e050b26..d20d4937ff41 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -24,7 +24,7 @@
   "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。",
   "symbols/UseLocalDB/description": "是否使用 LocalDB 而非 SQLite。只有在已指定 --auth Individual 或 --auth IndividualB2C 時，才適用此選項。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/CalledApiUrl/description": "要從 Web 應用程式呼叫的 API URL。只有在已指定 --auth SingleOrg 或 --auth IndividualB2C 時，才適用此選項。",
   "symbols/CallsMicrosoftGraph/description": "指定 Web 應用程式呼叫是否 Microsoft Graph。只有在已指定 --auth SingleOrg 時，才適用此選項。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
index a69bf11bf222..c581b5457d40 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
@@ -11,8 +11,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project template for creating a RESTful Web API using ASP.NET Core controllers or minimal APIs, with optional support for OpenAPI and authentication.",
   "groupIdentity": "Microsoft.Web.WebApi",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.WebApi.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.WebApi.CSharp.10.0",
   "shortName": "webapi",
   "tags": {
     "language": "C#",
@@ -325,12 +325,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs
index 32bb96c761af..2aeb1a963c3d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs
@@ -26,25 +26,20 @@ namespace Company.WebApplication1.Controllers;
 #if (OrganizationalAuth || IndividualB2CAuth)
 [RequiredScope(RequiredScopesConfigurationKey = "AzureAd:Scopes")]
 #endif
+#if (GenerateApi)
+public class WeatherForecastController(IDownstreamApi downstreamApi) : ControllerBase
+#elseif (GenerateGraph)
+public class WeatherForecastController(GraphServiceClient graphServiceClient) : ControllerBase
+#else
 public class WeatherForecastController : ControllerBase
+#endif
 {
-    private static readonly string[] Summaries = new[]
-    {
+    private static readonly string[] Summaries =
+    [
         "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-    private readonly ILogger<WeatherForecastController> _logger;
+    ];
 
 #if (GenerateApi)
-    private readonly IDownstreamApi _downstreamApi;
-
-    public WeatherForecastController(ILogger<WeatherForecastController> logger,
-                            IDownstreamApi downstreamApi)
-    {
-        _logger = logger;
-        _downstreamApi = downstreamApi;
-    }
-
 #if (EnableOpenAPI)
     [HttpGet(Name = "GetWeatherForecast")]
 #else
@@ -52,7 +47,7 @@ public WeatherForecastController(ILogger<WeatherForecastController> logger,
 #endif
     public async Task<IEnumerable<WeatherForecast>> Get()
     {
-        using var response = await _downstreamApi.CallApiForUserAsync("DownstreamApi").ConfigureAwait(false);
+        using var response = await downstreamApi.CallApiForUserAsync("DownstreamApi").ConfigureAwait(false);
         if (response.StatusCode == System.Net.HttpStatusCode.OK)
         {
             var apiResult = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
@@ -74,15 +69,6 @@ public async Task<IEnumerable<WeatherForecast>> Get()
     }
 
 #elseif (GenerateGraph)
-    private readonly GraphServiceClient _graphServiceClient;
-
-    public WeatherForecastController(ILogger<WeatherForecastController> logger,
-                                        GraphServiceClient graphServiceClient)
-    {
-        _logger = logger;
-        _graphServiceClient = graphServiceClient;
-    }
-
 #if (EnableOpenAPI)
     [HttpGet(Name = "GetWeatherForecast")]
 #else
@@ -90,7 +76,7 @@ public WeatherForecastController(ILogger<WeatherForecastController> logger,
 #endif
     public async Task<IEnumerable<WeatherForecast>> Get()
     {
-        var user = await _graphServiceClient.Me.GetAsync();
+        var user = await graphServiceClient.Me.GetAsync();
 
         return Enumerable.Range(1, 5).Select(index => new WeatherForecast
         {
@@ -101,11 +87,6 @@ public async Task<IEnumerable<WeatherForecast>> Get()
         .ToArray();
     }
 #else
-    public WeatherForecastController(ILogger<WeatherForecastController> logger)
-    {
-        _logger = logger;
-    }
-
 #if (EnableOpenAPI)
     [HttpGet(Name = "GetWeatherForecast")]
 #else
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs
index 4e502393522f..415dc9b38f31 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Program.MinimalAPIs.OrgOrIndividualB2CAuth.cs
@@ -128,7 +128,6 @@
 #if (EnableOpenAPI)
 })
 .WithName("GetWeatherForecast")
-.WithOpenApi()
 .RequireAuthorization();
 #else
 })
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json
index 0a57fc2aa26a..cd686b984d27 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
   "symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/NoHttps/description": "Určuje, jestli se má vypnout protokol HTTPS.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json
index 02f2eb974fdc..6dfa6a773f9f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express-HTTPS-Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json
index 1d8122dcc2ee..04dbf0c01ec5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/NoHttps/description": "Whether to turn off HTTPS.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json
index 62dba41229ab..78e5d3ea74b0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/NoHttps/description": "Si se va a desactivar HTTPS.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json
index 031cc2c192c7..6389b3939d04 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json
index 92f8c7a0936e..970eb598a6c1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/NoHttps/description": "Indica se disattivare HTTPS.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json
index 93317d2a769a..5223c1c61090 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。",
   "symbols/iisHttpsPort/description": "launchSettings.json の IIS Express HTTPS エンドポイントに使用するポート番号。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/NoHttps/description": "HTTPS をオフにするかどうか。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json
index c52a04ce98bb..e8ea06770676 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express HTTPS 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json
index 01205d20761a..b1c4f26d7278 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.",
   "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS programu IIS Express w pliku launchSettings.json.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS.",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json
index 08ab2b515297..a3f8a81e05e1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.",
   "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/NoHttps/description": "Se o HTTPS deve ser desativado.",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json
index 0f8f73600c03..b3f8c0db60c7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.",
   "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/NoHttps/description": "Следует ли отключить HTTPS.",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json
index 49fcba439fdf..80430510e965 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı.",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json
index 6af11ca4efed..1082dbc7cc87 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。",
   "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/NoHttps/description": "是否禁用 HTTPS。",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json
index 56f400f67239..74b67b6e4a49 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -8,7 +8,7 @@
   "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。",
   "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/NoHttps/description": "是否要關閉 HTTPS。",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
index 87b2fbc2faf6..ae7a8a90a4e4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
@@ -8,8 +8,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.",
   "groupIdentity": "Microsoft.Web.WebApi",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.WebApi.FSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.WebApi.FSharp.10.0",
   "shortName": "webapi",
   "tags": {
     "language": "F#",
@@ -126,12 +126,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/dotnetcli.host.json
index 2569634c24f9..d24ccc689f1c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/dotnetcli.host.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/dotnetcli.host.json
@@ -21,9 +21,13 @@
     "UseProgramMain": {
       "longName": "use-program-main",
       "shortName": ""
+    },
+    "DisableOpenAPI": {
+      "longName": "no-openapi",
+      "shortName": ""
     }
   },
   "usageExamples": [
     ""
   ]
-}
+}
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/ide.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/ide.host.json
index 00b1829bfeb4..de0bfb10ae91 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/ide.host.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/ide.host.json
@@ -9,6 +9,21 @@
       "isVisible": true,
       "persistenceScope": "shared",
       "persistenceScopeName": "Microsoft"
+    },
+    {
+      "id": "DisableOpenAPI",
+      "name": {
+        "text": "Enable _OpenAPI support",
+        "overrideDefaultText": true
+      },
+      "description": {
+        "text": "Enables OpenAPI (Swagger) support",
+        "overrideDefaultText": true
+      },
+      "invertBoolean": true,
+      "isVisible": true,
+      "defaultValue": "true",
+      "persistenceScope": "templateGroup"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json
index 6d9ccb908419..0be5a546ea8c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core Web API (native AOT)",
-  "description": "Šablona projektu pro vytvoření webového rozhraní RESTful API s využitím minimálních rozhraní API ASP.NET Core publikovaných jako native AOT.",
+  "description": "Šablona projektu pro vytvoření webového rozhraní RESTful API s využitím minimálních rozhraní API ASP.NET Core publikovaných jako nativní AOT s volitelnou podporou OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.",
   "symbols/kestrelHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v souboru launchSettings.json.",
   "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
   "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
+  "symbols/DisableOpenAPI/description": "Zakázání podpory OpenAPI (Swagger)",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json
index 6e286ca19253..aff43303894a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core Web-API (native AOT)",
-  "description": "Eine Projektvorlage zum Erstellen einer RESTful-Web-API mit ASP.NET Core minimalen APIs, die als native AOT veröffentlicht wurden.",
+  "description": "Eine Projektvorlage zum Erstellen einer RESTful-Web-API mit ASP.NET Core minimalen APIs, die als native AOT veröffentlicht wurden, mit optionalem Support für OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.",
   "symbols/kestrelHttpPort/description": "Portnummer, die für den HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
   "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
+  "symbols/DisableOpenAPI/description": "Deaktivieren Sie die OpenAPI (Swagger) Unterstützung",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
   "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json
index 8cd862b9d7a6..1507b1e8498f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core Web API (native AOT)",
-  "description": "A project template for creating a RESTful Web API using ASP.NET Core minimal APIs published as native AOT.",
+  "description": "A project template for creating a RESTful Web API using ASP.NET Core minimal APIs published as native AOT, with optional support for OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
   "symbols/kestrelHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json.",
   "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/UseProgramMain/displayName": "Do not use _top-level statements",
   "symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
+  "symbols/DisableOpenAPI/description": "Disable OpenAPI (Swagger) support",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
   "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json
index 7311b2989198..9480443ae3f7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "API web ASP.NET Core (native AOT)",
-  "description": "Una plantilla de proyecto para crear una API web RESTful utilizando las API mínimas de ASP.NET Core publicadas como native AOT.",
+  "description": "Plantilla de proyecto para crear una API web de RESTful mediante las API mínimas básicas de ASP.NET Core publicadas como AOT nativo, con compatibilidad opcional con OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.",
   "symbols/kestrelHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP en launchSettings.json.",
   "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior",
   "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.",
+  "symbols/DisableOpenAPI/description": "Deshabilitar la compatibilidad con OpenAPI (Swagger)",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json
index 6398f3787e23..137a69bc50f2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "API web ASP.NET Core (AOT natif)",
-  "description": "Modèle de projet pour la création d’une API web RESTful à l’aide de ASP.NET Core api minimales publiées en tant qu’AOT natif.",
+  "description": "Un modèle de projet pour créer une API Web RESTful à l’aide des API minimales d’ASP.NET Core, publiée en AOT natif, avec une prise en charge optionnelle d’OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.",
   "symbols/kestrelHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP dans launchSettings.json.",
   "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.",
   "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.",
+  "symbols/DisableOpenAPI/description": "Désactiver la prise en charge d’OpenAPI (Swagger)",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json
index d506375db154..d07c5d0e60ac 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "API Web di ASP.NET Core (native AOT)",
-  "description": "Modello di progetto per la creazione di un'API Web RESTful tramite API minime di ASP.NET Core pubblicate come native AOT.",
+  "description": "Un modello di progetto per la creazione di un'API Web RESTful tramite API minime di ASP.NET Core pubblicate come native AOT, con supporto opzionale per OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.",
   "symbols/kestrelHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.",
   "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello",
   "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.",
+  "symbols/DisableOpenAPI/description": "Disabilita il supporto di OpenAPI (Swagger)",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json
index 06f2985050d7..db9ff4dde435 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core Web API (native AOT)",
-  "description": "最小限の API.NET Core API を使用して RESTful Web API を作成するプロジェクト テンプレート。native AOT として公開されます。",
+  "description": "ネイティブ AOT として公開された ASP.NET Core の最小限の API を使用して RESTful Web API を作成するためのプロジェクト テンプレート。OpenAPI のサポートはオプションです。",
   "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。",
   "symbols/kestrelHttpPort/description": "launchSettings.json の HTTP エンドポイントに使用するポート番号。",
   "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)",
   "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。",
+  "symbols/DisableOpenAPI/description": "OpenAPI (Swagger) サポートを無効にする",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json
index 430137e66cea..f96a30d836a5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core 웹 API(native AOT)",
-  "description": "native AOT로 게시된 ASP.NET Core 최소 API를 사용하여 RESTful 웹 API를 만들기 위한 프로젝트 템플릿입니다.",
+  "description": "OpenAPI에 대한 선택적 지원과 함께 네이티브 AOT로 게시된 ASP.NET Core 최소 API를 사용하여 RESTful Web API를 만들기 위한 프로젝트 템플릿입니다.",
   "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.",
   "symbols/kestrelHttpPort/description": "launchSettings.json의 HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)",
   "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.",
+  "symbols/DisableOpenAPI/description": "OpenAPI(Swagger) 지원 비활성화",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json
index c29a92f94359..8c5b71cc84b2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "Internetowy interfejs API platformy ASP.NET Core (native AOT)",
-  "description": "Szablon projektu służący do tworzenia internetowego interfejsu API RESTful przy użyciu minimalnych interfejsów API platformy ASP.NET Core publikowanego jako native AOT.",
+  "description": "Szablon projektu służący do tworzenia internetowego interfejsu API RESTful przy użyciu minimalnych interfejsów API ASP.NET Core opublikowanych jako natywne AOT z opcjonalną obsługą interfejsu OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.",
   "symbols/kestrelHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP w pliku launchSettings.json.",
   "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu",
   "symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.",
+  "symbols/DisableOpenAPI/description": "Włącz obsługę interfejsu OpenAPI (Swagger)",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 1824fd3c610c..6c7481a32e25 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core API Web (native AOT)",
-  "description": "Um modelo de projeto para criar uma API Web RESTful usando ASP.NET Core APIs mínimas publicadas como native AOT.",
+  "description": "Um modelo de projeto para criação de uma API Web RESTful usando APIs mínimas ASP.NET Core publicadas como AOT nativas, com suporte opcional para OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.",
   "symbols/kestrelHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP em launchSettings.json.",
   "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior",
   "symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.",
+  "symbols/DisableOpenAPI/description": "Desabilitar suporte a OpenAPI (Swagger)",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
   "postActions/restore/manualInstructions/default/text": "Executa 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json
index 36debc4470a0..dcefd3d9f8b1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "Веб-API ASP.NET Core (native AOT)",
-  "description": "Шаблон проекта для создания веб-API на основе REST с использованием минимальных API ASP.NET Core, опубликованных как «native AOT».",
+  "description": "Шаблон проекта для создания веб-API на основе REST с использованием минимальных API ASP.NET Core, опубликованных как \"native AOT\" с необязательной поддержкой OpenAPI.",
   "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.",
   "symbols/kestrelHttpPort/description": "Номер порта, используемый для конечной точки HTTP в launchSettings.json.",
   "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня",
   "symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.",
+  "symbols/DisableOpenAPI/description": "Отключение поддержки OpenAPI (Swagger)",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json
index e44572fe0c1c..3ada51e81afa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core Web API'si (yerel AOT)",
-  "description": "Yerel AOT olarak yayımlanan ASP.NET Core minimal API’ları kullanarak RESTful Web API oluşturmaya yönelik proje şablonu.",
+  "description": "OpenAPI için isteğe bağlı destekle yerel AOT olarak yayımlanan ASP.NET Core minimal API’ları kullanarak RESTful Web API oluşturmaya yönelik proje şablonu.",
   "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.",
   "symbols/kestrelHttpPort/description": "launchSettings.json içinde HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın",
   "symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.",
+  "symbols/DisableOpenAPI/description": "OpenAPI (Swagger) desteğini devre dışı bırak",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index e3e2e3397b1a..992e86ddee36 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET Core Web API (native AOT)",
-  "description": "用于使用发布为 native AOT 的 ASP.NET Core 最小 API 的 RESTful Web API 的项目模板。",
+  "description": "一个项目模板，用于使用发布为本机 AOT 的 ASP.NET Core 最小 API 创建 RESTful Web API，并提供对 OpenAPI 的可选支持。",
   "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。",
   "symbols/kestrelHttpPort/description": "要用于 launchSettings.json 中 HTTP 终结点的端口号。",
   "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)",
   "symbols/UseProgramMain/description": "是否生成显式程序类和主方法，而不是顶级语句。",
+  "symbols/DisableOpenAPI/description": "禁用 OpenAI (Swagger)支持",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
   "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\""
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 975e14f97abe..0643ce729967 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -1,15 +1,16 @@
 {
   "author": "Microsoft",
   "name": "ASP.NET 核心 Web API (Native AOT)",
-  "description": "此專案範本可用於使用發佈為 Native AOT 的 ASP.NET Core 最小 API 來建立 RESTful Web API。",
+  "description": "此專案範本可用於使用發佈為原生 AOT 的 ASP.NET Core 最小 API 來建立 RESTful Web API 的專案範本，並可選擇性地支援 OpenAPI。",
   "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。",
   "symbols/kestrelHttpPort/description": "launchSettings.json 中 HTTP 端點要使用的連接埠號碼。",
   "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)",
   "symbols/UseProgramMain/description": "是否要產生明確的 Program 類別和 Main 方法，而非最上層語句。",
+  "symbols/DisableOpenAPI/description": "停用 OpenAPI (Swagger) 支援",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'"
 }
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json
index ed7c61efb897..26f2ea88e496 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json
@@ -9,10 +9,10 @@
   ],
   "name": "ASP.NET Core Web API (native AOT)",
   "generatorVersions": "[1.0.0.0-*)",
-  "description": "A project template for creating a RESTful Web API using ASP.NET Core minimal APIs published as native AOT.",
+  "description": "A project template for creating a RESTful Web API using ASP.NET Core minimal APIs published as native AOT, with optional support for OpenAPI.",
   "groupIdentity": "Microsoft.Web.WebApiAot",
-  "precedence": "9900",
-  "identity": "Microsoft.Web.WebApiAot.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Web.WebApiAot.CSharp.10.0",
   "shortName": "webapiaot",
   "tags": {
     "language": "C#",
@@ -103,12 +103,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
@@ -130,6 +130,16 @@
       "defaultValue": "false",
       "displayName": "Do not use _top-level statements",
       "description": "Whether to generate an explicit Program class and Main method instead of top-level statements."
+    },
+    "DisableOpenAPI": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "false",
+      "description": "Disable OpenAPI (Swagger) support"
+    },
+    "EnableOpenAPI": {
+      "type": "computed",
+      "value": "(!DisableOpenAPI)"
     }
   },
   "primaryOutputs": [
@@ -152,4 +162,4 @@
       "continueOnError": true
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.Main.cs
index ea2807072a37..a971ac6b5d2d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.Main.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace Company.WebApplication1;
 
@@ -13,22 +14,47 @@ public static void Main(string[] args)
             options.SerializerOptions.TypeInfoResolverChain.Insert(0, AppJsonSerializerContext.Default);
         });
 
+#if (EnableOpenAPI)
+        // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
+        builder.Services.AddOpenApi();
+#endif
+
         var app = builder.Build();
 
-        var sampleTodos = new Todo[] {
+#if (EnableOpenAPI)
+        if (app.Environment.IsDevelopment())
+        {
+            app.MapOpenApi();
+        }
+#endif
+
+        Todo[] sampleTodos =
+        [
             new(1, "Walk the dog"),
             new(2, "Do the dishes", DateOnly.FromDateTime(DateTime.Now)),
             new(3, "Do the laundry", DateOnly.FromDateTime(DateTime.Now.AddDays(1))),
             new(4, "Clean the bathroom"),
             new(5, "Clean the car", DateOnly.FromDateTime(DateTime.Now.AddDays(2)))
-        };
+        ];
 
         var todosApi = app.MapGroup("/todos");
+#if (EnableOpenAPI)
+        todosApi.MapGet("/", () => sampleTodos)
+                .WithName("GetTodos");
+
+        todosApi.MapGet("/{id}", Results<Ok<Todo>, NotFound> (int id) =>
+            sampleTodos.FirstOrDefault(a => a.Id == id) is { } todo
+                ? TypedResults.Ok(todo)
+                : TypedResults.NotFound())
+            .WithName("GetTodoById");
+#else
         todosApi.MapGet("/", () => sampleTodos);
-        todosApi.MapGet("/{id}", (int id) =>
+
+        todosApi.MapGet("/{id}", Results<Ok<Todo>, NotFound> (int id) =>
             sampleTodos.FirstOrDefault(a => a.Id == id) is { } todo
-                ? Results.Ok(todo)
-                : Results.NotFound());
+                ? TypedResults.Ok(todo)
+                : TypedResults.NotFound());
+#endif
 
         app.Run();
     }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.cs
index d3b48c954001..7c47e5295e69 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/Program.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Http.HttpResults;
 
 var builder = WebApplication.CreateSlimBuilder(args);
 
@@ -7,22 +8,47 @@
     options.SerializerOptions.TypeInfoResolverChain.Insert(0, AppJsonSerializerContext.Default);
 });
 
+#if (EnableOpenAPI)
+// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
+builder.Services.AddOpenApi();
+#endif
+
 var app = builder.Build();
 
-var sampleTodos = new Todo[] {
+#if (EnableOpenAPI)
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+}
+#endif
+
+Todo[] sampleTodos =
+[
     new(1, "Walk the dog"),
     new(2, "Do the dishes", DateOnly.FromDateTime(DateTime.Now)),
     new(3, "Do the laundry", DateOnly.FromDateTime(DateTime.Now.AddDays(1))),
     new(4, "Clean the bathroom"),
     new(5, "Clean the car", DateOnly.FromDateTime(DateTime.Now.AddDays(2)))
-};
+];
 
 var todosApi = app.MapGroup("/todos");
+#if (EnableOpenAPI)
+todosApi.MapGet("/", () => sampleTodos)
+        .WithName("GetTodos");
+
+todosApi.MapGet("/{id}", Results<Ok<Todo>, NotFound> (int id) =>
+    sampleTodos.FirstOrDefault(a => a.Id == id) is { } todo
+        ? TypedResults.Ok(todo)
+        : TypedResults.NotFound())
+    .WithName("GetTodoById");
+#else
 todosApi.MapGet("/", () => sampleTodos);
-todosApi.MapGet("/{id}", (int id) =>
+
+todosApi.MapGet("/{id}", Results<Ok<Todo>, NotFound> (int id) =>
     sampleTodos.FirstOrDefault(a => a.Id == id) is { } todo
-        ? Results.Ok(todo)
-        : Results.NotFound());
+        ? TypedResults.Ok(todo)
+        : TypedResults.NotFound());
+#endif
 
 app.Run();
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json
index 0cd426cd94f6..6786161b31de 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json
@@ -4,7 +4,7 @@
   "description": "Šablona prázdného projektu pro vytvoření služby Worker Service",
   "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
   "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json
index 62d49dcf6a2d..0bcea350db4e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json
@@ -4,7 +4,7 @@
   "description": "Eine leere Projektvorlage zum Erstellen eines Workerdiensts.",
   "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
   "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json
index 4b764666b67e..7d51cff86822 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json
@@ -4,7 +4,7 @@
   "description": "An empty project template for creating a worker service.",
   "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "symbols/UseProgramMain/displayName": "Do not use _top-level statements",
   "_symbols/UseProgramMain/displayName.comment": "Use '_' as accelerator key when translating.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json
index 40944c609908..5e00f75594b5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json
@@ -4,7 +4,7 @@
   "description": "Una plantilla de proyecto vacía para crear un servicio Worker.",
   "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior",
   "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json
index bb5ae729a3f8..671674d9105c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json
@@ -4,7 +4,7 @@
   "description": "Modèle de projet vide pour la création d'un service Worker.",
   "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.",
   "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json
index 3fdf342ef919..eb7818957462 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json
@@ -4,7 +4,7 @@
   "description": "Modello di progetto vuoto per la creazione di un'istanza di Worker Service.",
   "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello",
   "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json
index 08552b60fd2f..d79de9268d6a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json
@@ -4,7 +4,7 @@
   "description": "Worker Service を作成するための空のプロジェクト テンプレート。",
   "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)",
   "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json
index e99b4756af63..8dd235564843 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json
@@ -4,7 +4,7 @@
   "description": "Worker Service를 만드는 데 사용하는 빈 프로젝트 템플릿입니다.",
   "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)",
   "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json
index 1dd5f142101f..0dcb54bd6c6e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json
@@ -4,7 +4,7 @@
   "description": "Szablon pustego projektu służący do tworzenia usługi procesu roboczego.",
   "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu",
   "symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 46991e230716..e3f8f12d2386 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -4,7 +4,7 @@
   "description": "Um modelo de projeto vazio para criar um worker service.",
   "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior",
   "symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json
index 09e94223de7e..a6cf5186bedd 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json
@@ -4,7 +4,7 @@
   "description": "Шаблон пустого проекта для создания службы Worker Service.",
   "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня",
   "symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json
index 1297a4a813c5..5bf2039d9c86 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json
@@ -4,7 +4,7 @@
   "description": "Çalışan hizmeti oluşturmaya yönelik boş proje şablonu.",
   "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın",
   "symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 2db1bd2f6d23..d40050aa7608 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -4,7 +4,7 @@
   "description": "用于创建 worker service 的空项目模板。",
   "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)",
   "symbols/UseProgramMain/description": "是否生成显式程序类和主方法，而不是顶级语句。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index dd0dde40b8c6..f10ad34d63fa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -4,7 +4,7 @@
   "description": "用於建立 Worker Service 的空白專案範本。",
   "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)",
   "symbols/UseProgramMain/description": "是否要產生明確的 Program 類別和 Main 方法，而非最上層語句。",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
index e28a913b8f1c..934552d8bfca 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
@@ -10,8 +10,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "An empty project template for creating a worker service.",
   "groupIdentity": "Microsoft.Worker.Empty",
-  "precedence": "9900",
-  "identity": "Microsoft.Worker.Empty.CSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Worker.Empty.CSharp.10.0",
   "shortName": "worker",
   "tags": {
     "language": "C#",
@@ -62,12 +62,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Program.Main.cs
index b3905aa4ebac..ffeb3e7eeec8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Program.Main.cs
@@ -10,4 +10,4 @@ public static void Main(string[] args)
         var host = builder.Build();
         host.Run();
     }
-}
\ No newline at end of file
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Worker.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Worker.cs
index 8e40f0c2e1c9..9d64f8c9d28f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Worker.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/Worker.cs
@@ -1,21 +1,14 @@
 namespace Company.Application1;
 
-public class Worker : BackgroundService
+public class Worker(ILogger<Worker> logger) : BackgroundService
 {
-    private readonly ILogger<Worker> _logger;
-
-    public Worker(ILogger<Worker> logger)
-    {
-        _logger = logger;
-    }
-
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         while (!stoppingToken.IsCancellationRequested)
         {
-            if (_logger.IsEnabled(LogLevel.Information))
+            if (logger.IsEnabled(LogLevel.Information))
             {
-                _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+                logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
             }
             await Task.Delay(1000, stoppingToken);
         }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json
index e1f5a8846d50..b9a21f7e6a6a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json
@@ -4,7 +4,7 @@
   "description": "Šablona prázdného projektu pro vytvoření služby Worker Service",
   "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.",
   "symbols/Framework/description": "Cílová architektura pro projekt",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Cíl net10.0",
   "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
   "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json
index b31745f8f0cc..8c92f2f900c5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json
@@ -4,7 +4,7 @@
   "description": "Eine leere Projektvorlage zum Erstellen eines Workerdiensts.",
   "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.",
   "symbols/Framework/description": "Das Zielframework für das Projekt.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Ziel.-NET10.0",
   "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
   "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
   "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json
index 0fd990d039ac..30684c10f80b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json
@@ -4,7 +4,7 @@
   "description": "An empty project template for creating a worker service.",
   "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
   "symbols/Framework/description": "The target framework for the project.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Target net10.0",
   "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
   "postActions/restore/description": "Restore NuGet packages required by this project.",
   "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json
index 1fff8efdb6c8..6ec74d549022 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json
@@ -4,7 +4,7 @@
   "description": "Una plantilla de proyecto vacía para crear un servicio Worker.",
   "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.",
   "symbols/Framework/description": "Marco de destino del proyecto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destino net10.0",
   "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
   "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json
index df347759a2e3..07a73c6c6c0f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json
@@ -4,7 +4,7 @@
   "description": "Modèle de projet vide pour la création d'un service Worker.",
   "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.",
   "symbols/Framework/description": "Framework cible du projet.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 cible",
   "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
   "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json
index 2e3bc12c41d8..1cfaa4749818 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json
@@ -4,7 +4,7 @@
   "description": "Modello di progetto vuoto per la creazione di un'istanza di Worker Service.",
   "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.",
   "symbols/Framework/description": "Il framework di destinazione per il progetto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
   "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.",
   "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json
index 14b9a604d0da..214aaba11851 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json
@@ -4,7 +4,7 @@
   "description": "Worker Service を作成するための空のプロジェクト テンプレート。",
   "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。",
   "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
   "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。",
   "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json
index abab2e07f927..f8a3f9d6ca71 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json
@@ -4,7 +4,7 @@
   "description": "Worker Service를 만드는 데 사용하는 빈 프로젝트 템플릿입니다.",
   "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "대상 net10.0",
   "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.",
   "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json
index bf6bb21aed97..1a5d0b62dee8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json
@@ -4,7 +4,7 @@
   "description": "Szablon pustego projektu służący do tworzenia usługi procesu roboczego.",
   "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
   "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\""
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json
index f50d362504cd..c0a30c1471f9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -4,7 +4,7 @@
   "description": "Um modelo de projeto vazio para criar um worker service.",
   "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.",
   "symbols/Framework/description": "A estrutura de destino do projeto.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
   "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.",
   "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.",
   "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json
index b8dd4e726213..a01443d4da8c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json
@@ -4,7 +4,7 @@
   "description": "Шаблон пустого проекта для создания службы Worker Service.",
   "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.",
   "symbols/Framework/description": "Целевая платформа для проекта.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Целевая платформа .NET 10.0",
   "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.",
   "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\""
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json
index d33af3b32a9a..e736867359cc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json
@@ -4,7 +4,7 @@
   "description": "Çalışan hizmeti oluşturmaya yönelik boş proje şablonu.",
   "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "Hedef net10.0",
   "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.",
   "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json
index b62be8d7d1b5..f9add8a000df 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -4,7 +4,7 @@
   "description": "用于创建 worker service 的空项目模板。",
   "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。",
   "symbols/Framework/description": "项目的目标框架。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目标 net10.0",
   "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。",
   "postActions/restore/description": "还原此项目所需的 NuGet 包。",
   "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\""
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json
index 539b7d527125..922b307491cc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -4,7 +4,7 @@
   "description": "用於建立 Worker Service 的空白專案範本。",
   "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。",
   "symbols/Framework/description": "專案的目標 Framework。",
-  "symbols/Framework/choices/net9.0/description": "Target net9.0",
+  "symbols/Framework/choices/net10.0/description": "目標 net10.0",
   "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。",
   "postActions/restore/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json
index 06603a7f8382..2215f34b7ca2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json
@@ -10,8 +10,8 @@
   "generatorVersions": "[1.0.0.0-*)",
   "description": "An empty project template for creating a worker service.",
   "groupIdentity": "Microsoft.Worker.Empty",
-  "precedence": "9900",
-  "identity": "Microsoft.Worker.Empty.FSharp.9.0",
+  "precedence": "10000",
+  "identity": "Microsoft.Worker.Empty.FSharp.10.0",
   "shortName": "worker",
   "tags": {
     "language": "F#",
@@ -47,12 +47,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net9.0",
-          "description": "Target net9.0"
+          "choice": "net10.0",
+          "description": "Target net10.0"
         }
       ],
-      "replaces": "net9.0",
-      "defaultValue": "net9.0"
+      "replaces": "net10.0",
+      "defaultValue": "net10.0"
     },
     "copyrightYear": {
       "type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json b/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json
index b9aa70741733..0b6889bfd3c5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "project-templates",
+  "name": "@microsoft/project-templates",
   "version": "0.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "project-templates",
+      "name": "@microsoft/project-templates",
       "version": "0.1.0",
       "dependencies": {
         "bootstrap": "^5.3.3",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/package.json b/src/ProjectTemplates/Web.ProjectTemplates/package.json
index 17fbcf2ee59e..c2e8fe32e490 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/package.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "project-templates",
+  "name": "@microsoft/project-templates",
   "private": true,
   "version": "0.1.0",
   "description": "Project templates dependencies",
diff --git a/src/ProjectTemplates/build.cmd b/src/ProjectTemplates/build.cmd
index 92a08bfbee72..568876895e94 100644
--- a/src/ProjectTemplates/build.cmd
+++ b/src/ProjectTemplates/build.cmd
@@ -1,6 +1,3 @@
 @ECHO OFF
 SET RepoRoot=%~dp0..\..
-CALL "%RepoRoot%\eng\build.cmd" -projects "%~dp0*\*.*proj" "/p:EnforceE2ETestPrerequisites=true" %*
-IF %ERRORLEVEL% NEQ 0 (
-   EXIT /b %ErrorLevel%
-)
+%RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*
diff --git a/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1
index 30f35b9fc877..0de74bedafbf 100644
--- a/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1
@@ -3,11 +3,82 @@
 
 # This script packages, installs and creates a template to help with rapid iteration in the templating area.
 [CmdletBinding(PositionalBinding = $false)]
-param()
+param(
+    [ValidateSet("net9.0", "net10.0")]
+    [string] $Framework = "net10.0",
+    [Parameter(Mandatory = $false)]
+    [switch] $NoRestore,
+    [Parameter(Mandatory = $false)]
+    [switch] $ExcludeLaunchSettings,
+    [Parameter(Mandatory = $false)]
+    [switch] $Empty,
+    [Parameter(Mandatory = $false)]
+    [ValidateSet("None", "Individual")]
+    [string] $Auth = "None",
+    [Parameter(Mandatory = $false)]
+    [switch] $NoHttps,
+    [Parameter(Mandatory = $false)]
+    [switch] $UseProgramMain,
+    [Parameter(Mandatory = $false)]
+    [string] $Authority,
+    [Parameter(Mandatory = $false)]
+    [string] $ClientId,
+    [switch] $Pwa,
+    [Parameter(Mandatory = $false)]
+    [ValidateSet("Debug", "Release")]
+    [string] $Configuration = "Release",
+    [Parameter(ValueFromRemainingArguments = $true)]
+    [string[]] $Args
+)
 
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Test-Template.ps1
+$templateArguments = @("blazorwasm");
 
-Test-Template "blazorwasm" "blazorwasm --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true
+if ($ExcludeLaunchSettings) {
+    $templateArguments += "--exclude-launch-settings"
+}
+
+if ($Empty) {
+    $templateArguments += "-e"
+}
+
+if ($Auth) {
+    $templateArguments += "--auth";
+    $templateArguments += $Auth;
+}
+
+$mainProjectRelativePath = $null;
+
+if ($NoHttps) {
+    $templateArguments += "--no-https"
+}
+
+if ($Authority) {
+    $templateArguments += "--authority"
+    $templateArguments += $Authority
+}
+
+if ($ClientId) {
+    $templateArguments += "--client-id"
+    $templateArguments += $ClientId
+}
+
+if ($Pwa) {
+    $templateArguments += "--pwa"
+}
+
+if ($UseProgramMain) {
+    $templateArguments += "--use-program-main"
+}
+
+Import-Module -Name "$PSScriptRoot/Test-Template.psm1";
+
+Test-Template `
+    -TemplateName "MyBlazorWasmApp" `
+    -TemplateArguments $templateArguments `
+    -MainProjectRelativePath $mainProjectRelativePath `
+    -TargetFramework $Framework `
+    -Configuration $Configuration `
+    -Verbose:$VerbosePreference;
diff --git a/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1
index 8a32a0a399c4..8802c4253ed8 100644
--- a/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1
@@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "blazorwasm" "blazorwasm --use-program-main --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true
+Test-Template "blazorwasm" "blazorwasm --use-program-main --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $true
diff --git a/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1
index 4ae051d00dbf..fe5b35826f06 100644
--- a/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1
@@ -2,12 +2,88 @@
 #requires -version 4
 
 # This script packages, installs and creates a template to help with rapid iteration in the templating area.
-[CmdletBinding(PositionalBinding = $false)]
-param()
+    [CmdletBinding(PositionalBinding = $false)]
+    param(
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateSet("net9.0", "net10.0")]
+        [string] $Framework = "net10.0",
+        [Parameter(Mandatory = $false)]
+        [switch] $NoRestore,
+        [Parameter(Mandatory = $false)]
+        [switch] $ExcludeLaunchSettings,
+        [Parameter(Mandatory = $false)]
+        [ValidateSet("None", "Server", "WebAssembly", "Auto")]
+        [string] $Interactivity = "Server",
+        [Parameter(Mandatory = $false)]
+        [switch] $Empty,
+        [Parameter(Mandatory = $false)]
+        [ValidateSet("None", "Individual")]
+        [string] $Auth = "None",
+        [Parameter(Mandatory = $false)]
+        [switch] $UseLocalDb,
+        [Parameter(Mandatory = $false)]
+        [switch] $AllInteractive,
+        [Parameter(Mandatory = $false)]
+        [switch] $NoHttps,
+        [Parameter(Mandatory = $false)]
+        [switch] $UseProgramMain,
+        [Parameter(Mandatory = $false)]
+        [ValidateSet("Debug", "Release")]
+        [string] $Configuration = "Release",
+        [Parameter(ValueFromRemainingArguments = $true)]
+        [string[]] $Args
+    )
 
-Set-StrictMode -Version 2
-$ErrorActionPreference = 'Stop'
+    Set-StrictMode -Version 2
+    $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Test-Template.ps1
+    $templateArguments = @("blazor");
 
-Test-Template "MyBlazorApp" "blazor" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true
+    if ($ExcludeLaunchSettings) {
+        $templateArguments += "--exclude-launch-settings"
+    }
+
+    if ($Interactivity) {
+        $templateArguments += "--interactivity"
+        $templateArguments += $Interactivity;
+    }
+
+    if ($Empty) {
+        $templateArguments += "-e"
+    }
+
+    if ($Auth) {
+        $templateArguments += "--auth";
+        $templateArguments += $Auth;
+    }
+
+    $mainProjectRelativePath = $null;
+    if($Interactivity -in @("Auto", "WebAssembly")){
+        $mainProjectRelativePath = "MyBlazorApp";
+    }
+
+    if ($UseLocalDb) {
+        $templateArguments += "-uld"
+    }
+
+    if ($AllInteractive) {
+        $templateArguments += "-ai"
+    }
+
+    if ($NoHttps) {
+        $templateArguments += "--no-https"
+    }
+
+    if ($UseProgramMain) {
+        $templateArguments += "--use-program-main"
+    }
+
+    Import-Module -Name "$PSScriptRoot/Test-Template.psm1";
+
+    Test-Template `
+        -TemplateName "MyBlazorApp" `
+        -TemplateArguments $templateArguments `
+        -MainProjectRelativePath $mainProjectRelativePath `
+        -TargetFramework $Framework `
+        -Configuration $Configuration `
+        -Verbose:$VerbosePreference;
diff --git a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1
index e938b8498d9b..f4ae7e245cd1 100644
--- a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1
index cf966878f2a2..22581d162ac8 100644
--- a/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "web" "web --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "web" "web --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1
index d43afebf1f96..aa09ad999f20 100644
--- a/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "grpc" "grpc -aot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "grpc" "grpc -aot" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1
index b75dcf2bbb27..c9647026e2ba 100644
--- a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1
@@ -1,9 +1,57 @@
-#!/usr/bin/env powershell
+#!/usr/bin/env pwsh
 #requires -version 4
 
+# This script packages, installs and creates a template to help with rapid iteration in the templating area.
 [CmdletBinding(PositionalBinding = $false)]
-param()
+param(
+    [Parameter(Mandatory = $false, Position = 0)]
+    [ValidateSet("net9.0", "net10.0")]
+    [string] $Framework = "net10.0",
+    [Parameter(Mandatory = $false)]
+    [switch] $ExcludeLaunchSettings,
+    [Parameter(Mandatory = $false)]
+    [ValidateSet("None", "Individual")]
+    [string] $Auth = "None",
+    [Parameter(Mandatory = $false)]
+    [switch] $UseLocalDb,
+    [Parameter(Mandatory = $false)]
+    [switch] $NoHttps,
+    [Parameter(Mandatory = $false)]
+    [switch] $UseProgramMain,
+    [Parameter(ValueFromRemainingArguments = $true)]
+    [string[]] $Args
+)
 
-. $PSScriptRoot\Test-Template.ps1
+Set-StrictMode -Version 2
+$ErrorActionPreference = 'Stop'
 
-Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+$templateArguments = @("webapp");
+
+if ($ExcludeLaunchSettings) {
+    $templateArguments += "--exclude-launch-settings"
+}
+
+if ($Auth) {
+    $templateArguments += "--auth";
+    $templateArguments += $Auth;
+}
+
+if ($UseLocalDb) {
+    $templateArguments += "-uld"
+}
+
+if ($NoHttps) {
+    $templateArguments += "--no-https"
+}
+
+if ($UseProgramMain) {
+    $templateArguments += "--use-program-main"
+}
+
+Import-Module -Name "$PSScriptRoot/Test-Template.psm1";
+
+Test-Template `
+    -TemplateName "MyWebApp" `
+    -TemplateArguments $templateArguments `
+    -TargetFramework $Framework `
+    -Verbose:$VerbosePreference;
diff --git a/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1
index 12d9f00fec4d..4d5126ac846b 100644
--- a/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1
@@ -6,4 +6,4 @@ param()
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapp" "webapp -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapp" "webapp -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1
index 0cb529d15758..d068aba66d7e 100644
--- a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1
@@ -1,12 +1,57 @@
 #!/usr/bin/env pwsh
 #requires -version 4
 
+# This script packages, installs and creates a template to help with rapid iteration in the templating area.
 [CmdletBinding(PositionalBinding = $false)]
-param()
+param(
+    [Parameter(Mandatory = $false, Position = 0)]
+    [ValidateSet("net9.0", "net10.0")]
+    [string] $Framework = "net10.0",
+    [Parameter(Mandatory = $false)]
+    [switch] $ExcludeLaunchSettings,
+    [Parameter(Mandatory = $false)]
+    [ValidateSet("None", "Individual")]
+    [string] $Auth = "None",
+    [Parameter(Mandatory = $false)]
+    [switch] $UseLocalDb,
+    [Parameter(Mandatory = $false)]
+    [switch] $NoHttps,
+    [Parameter(Mandatory = $false)]
+    [switch] $UseProgramMain,
+    [Parameter(ValueFromRemainingArguments = $true)]
+    [string[]] $Args
+)
 
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-. $PSScriptRoot\Test-Template.ps1
+$templateArguments = @("mvc");
 
-Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+if ($ExcludeLaunchSettings) {
+    $templateArguments += "--exclude-launch-settings"
+}
+
+if ($Auth) {
+    $templateArguments += "--auth";
+    $templateArguments += $Auth;
+}
+
+if ($UseLocalDb) {
+    $templateArguments += "-uld"
+}
+
+if ($NoHttps) {
+    $templateArguments += "--no-https"
+}
+
+if ($UseProgramMain) {
+    $templateArguments += "--use-program-main"
+}
+
+Import-Module -Name "$PSScriptRoot/Test-Template.psm1";
+
+Test-Template `
+    -TemplateName "MyMvcApp" `
+    -TemplateArguments $templateArguments `
+    -TargetFramework $Framework `
+    -Verbose:$VerbosePreference;
diff --git a/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1
index ab438f0aee18..21c562e39eeb 100644
--- a/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "mvc" "mvc -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "mvc" "mvc -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1
index 3dfb1fa512c5..08d3c77a95e7 100644
--- a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1
index ddff4253d418..87cf5e9bf244 100644
--- a/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapiaot" "webapiaot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapiaot" "webapiaot" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1
index 556b07f3c5ee..f091c99571fa 100644
--- a/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapiaot" "webapiaot --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapiaot" "webapiaot --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1
index 336a48339996..0fce1d0504e9 100644
--- a/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapimin" "webapi -minimal" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapimin" "webapi -minimal" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1
index da6595100039..94cf103fa768 100644
--- a/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapi" "webapi --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapi" "webapi --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1
index 72f9c1c1568a..05861f77b9b9 100644
--- a/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "webapi" "webapi --use-program-main --use-minimal-apis" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "webapi" "webapi --use-program-main --use-minimal-apis" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1
index 538c7d8e1d7c..f21cfd6df2f6 100644
--- a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1
index c86024ad16e9..20aa3389f909 100644
--- a/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "worker" "worker -aot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "worker" "worker -aot" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1
index c2d16ddaa02f..7e25ec93e49a 100644
--- a/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "worker" "worker --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "worker" "worker --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1
index 391eb8fc6638..ab9df1dd1ff5 100644
--- a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1
+++ b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1
@@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop'
 
 . $PSScriptRoot\Test-Template.ps1
 
-Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
+Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false
diff --git a/src/ProjectTemplates/scripts/Test-Template.ps1 b/src/ProjectTemplates/scripts/Test-Template.ps1
index 1ad286adbd88..1319769c747b 100644
--- a/src/ProjectTemplates/scripts/Test-Template.ps1
+++ b/src/ProjectTemplates/scripts/Test-Template.ps1
@@ -47,10 +47,10 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isBlazorWa
         foreach ($projPath in $proj) {
             $projContent = Get-Content -Path $projPath -Raw
             if ($isBlazorWasmHosted) {
-                $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net9.0/TestTemplates"
+                $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net10.0/TestTemplates"
             }
             else {
-                $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net9.0/TestTemplates"
+                $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net10.0/TestTemplates"
             }
             $projContent = $projContent -replace ('(?:<Project Sdk="Microsoft.NET.(?<SdkSuffix>Sdk\.\w+)">)', ('<Project Sdk="Microsoft.NET.${SdkSuffix}">
                 <Import Project="' + $importPath + '/Directory.Build.props" />
diff --git a/src/ProjectTemplates/scripts/Test-Template.psm1 b/src/ProjectTemplates/scripts/Test-Template.psm1
new file mode 100644
index 000000000000..9f63b5201cae
--- /dev/null
+++ b/src/ProjectTemplates/scripts/Test-Template.psm1
@@ -0,0 +1,130 @@
+#!/usr/bin/env pwsh
+#requires -version 4
+
+Set-StrictMode -Version 2
+$ErrorActionPreference = 'Stop'
+
+function Test-Template {
+    [CmdletBinding()]
+    param (
+        [string] $TemplateName,
+        [string[]] $TemplateArguments,
+        [string] $TemplatePackagePath = "Microsoft.DotNet.Web.ProjectTemplates.*-dev.nupkg",
+        [string] $PackagePattern = "(?<PackageId>([A-Za-z]+(\.[A-Za-z]+)*))\.(?<Version>\d+\.\d)\.(?<Suffix>.*)",
+        [string] $MainProjectRelativePath = $null,
+        [ValidateSet("Debug", "Release")]
+        [string] $Configuration = "Release",
+        [ValidatePattern("net\d+\.\d+")]
+        [string] $TargetFramework = "net10.0"
+    )
+
+    if(-not (Test-Path "$PSScriptRoot/.dotnet")){
+        $dotnetFolder = Get-Command dotnet | Select-Object -ExpandProperty Source | Split-Path -Parent;
+        Write-Verbose "Copying dotnet folder from $dotnetFolder to $PSScriptRoot/.dotnet";
+        Copy-Item -Path $dotnetFolder -Destination "$PSScriptRoot/.dotnet" -Recurse;
+    }
+
+    Write-Verbose "Patching Microsoft.AspNetCore.App";
+    $builtRuntime = Resolve-Path "$PSScriptRoot/../../../artifacts/packages/$Configuration/Shipping/aspnetcore-runtime-*-dev-win-x64.zip" | Where-Object { $_ -match "aspnetcore-runtime-[0-9.]+-dev-win-x64.zip" };
+    Write-Verbose "Patching Microsoft.AspNetCore.App from $builtRuntime";
+    Remove-Item "$PSScriptRoot/.runtime" -Recurse -ErrorAction Ignore;
+    Expand-Archive -Path $builtRuntime -DestinationPath "$PSScriptRoot/.runtime" -Force;
+    Remove-Item "$PSScriptRoot/.dotnet/shared/Microsoft.AspNetCore.App/*-dev" -Recurse -ErrorAction Ignore;
+    Write-Verbose "Copying $PSScriptRoot/.runtime/shared/Microsoft.AspNetCore.App to $PSScriptRoot/.dotnet/shared";
+    Copy-Item -Path "$PSScriptRoot/.runtime/shared/Microsoft.AspNetCore.App" -Destination "$PSScriptRoot/.dotnet/shared" -Recurse -Force;
+
+    $env:DOTNET_ROOT = "$PSScriptRoot/.dotnet";
+    $env:DOTNET_ROOT_X86 = "$PSScriptRoot/.dotnet";
+    $env:Path = "$PSScriptRoot/.dotnet;$env:Path";
+    $tmpDir = "$PSScriptRoot/$templateName";
+    Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore;
+    Push-Location ..;
+    try {
+        dotnet pack
+    }
+    finally {
+        Pop-Location;
+    }
+
+    $PackagePath = Resolve-Path "$PSScriptRoot/../../../artifacts/packages/$Configuration/Shipping/$TemplatePackagePath";
+
+    $PackageName = (Get-Item $PackagePath).Name;
+
+    if (-not (Test-Path "$($env:USERPROFILE)/.templateengine/packages/$PackageName")) {
+        Write-Verbose "Installing package from $PackagePath";
+        dotnet new install $PackagePath;
+    }
+    else {
+        Write-Verbose "Uninstalling package from $PackagePath";
+        if (-not ($PackageName -match $PackagePattern)) {
+            Write-Error "$PackageName did not match $PackagePattern";
+        }
+        $PackageId = $Matches["PackageId"];
+        $PackageVersion = $Matches["Version"];
+        Write-Verbose "Uninstalling existing package $PackageId.$PackageVersion";
+        dotnet new uninstall "$PackageId.$PackageVersion";
+
+        Write-Verbose "Installing package from $PackagePath";
+        dotnet new install $PackagePath;
+    }
+
+
+    Write-Verbose "Creating directory $tmpDir"
+    New-Item -ErrorAction Ignore -Path $tmpDir -ItemType Directory | Out-Null;
+    Push-Location $tmpDir -StackName TemplateFolder;
+    try {
+        $TemplateArguments = , "new" + $TemplateArguments + , "--no-restore";
+        Write-Verbose "Running dotnet command with arguments: $TemplateArguments";
+        dotnet @TemplateArguments;
+
+        $proj = Get-ChildItem $tmpDir -Recurse -File -Filter '*.csproj' -Depth 3;
+        if ($proj.Length -eq 0) {
+            $proj = Get-ChildItem $tmpDir -Recurse -File -Filter '*.fsproj' -Depth 3;
+        }
+
+        $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/$Configuration/$TargetFramework/TestTemplates";
+        # Define the XML string literals
+        [xml]$importPropsXml = "<Import Project='$importPath/Directory.Build.props' />";
+        [xml]$importTargetsXml = "<Import Project='$importPath/Directory.Build.targets' />";
+        [xml]$propertyGroupXml = @"
+<PropertyGroup>
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <TrimmerSingleWarn>false</TrimmerSingleWarn>
+</PropertyGroup>
+"@;
+
+        foreach ($projPath in $proj) {
+            Write-Verbose "Updating project file '$projPath'";
+            # Read the XML content from the file
+            [xml]$xmlContent = Get-Content -Path $projPath;
+
+            # Find the Project element and add the new elements
+            $projectElement = $xmlContent.Project;
+            $projectElement.PrependChild($xmlContent.ImportNode($propertyGroupXml.PropertyGroup, $true)) | Out-Null;
+            $projectElement.PrependChild($xmlContent.ImportNode($importTargetsXml.Import, $true)) | Out-Null;
+            $projectElement.PrependChild($xmlContent.ImportNode($importPropsXml.Import, $true)) | Out-Null;
+
+            # Save the modified XML content back to the file
+            $xmlContent.Save($projPath);
+        }
+
+        if ($null -ne $MainProjectRelativePath) {
+            Push-Location $MainProjectRelativePath;
+        }
+
+        if ('--auth' -in $TemplateArguments -and 'Individual' -in $TemplateArguments) {
+            Write-Verbose "Running dotnet ef migrations"
+            dotnet.exe ef migrations add Initial;
+        }
+
+        $publishOutputDir = "./.publish";
+        Write-Verbose "Running dotnet publish --configuration $Configuration --output $publishOutputDir";
+        dotnet.exe publish --configuration $Configuration --output $publishOutputDir;
+    }
+    finally {
+        Pop-Location -StackName TemplateFolder;
+    }
+}
+
+Export-ModuleMember Test-Template;
diff --git a/src/ProjectTemplates/scripts/startvs.cmd b/src/ProjectTemplates/scripts/startvs.cmd
new file mode 100644
index 000000000000..5229f91fdd6f
--- /dev/null
+++ b/src/ProjectTemplates/scripts/startvs.cmd
@@ -0,0 +1,34 @@
+@ECHO OFF
+SETLOCAL
+
+:: This command launches a Visual Studio solution with environment variables required to use a local version of the .NET Core SDK.
+
+:: This tells .NET Core to use the same dotnet.exe that build scripts use
+SET DOTNET_ROOT=%~dp0\.dotnet
+SET DOTNET_ROOT(x86)=%~dp0\.dotnet\x86
+
+:: This tells .NET Core not to go looking for .NET Core in other places
+SET DOTNET_MULTILEVEL_LOOKUP=0
+
+:: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
+SET PATH=%DOTNET_ROOT%;%PATH%
+
+SET sln=%~1
+
+IF "%sln%"=="" (
+    echo Error^: Expected argument ^<SLN_FILE^>
+    echo Usage^: startvs.cmd ^<SLN_FILE^>
+
+    exit /b 1
+)
+
+IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" (
+    echo .NET Core has not yet been installed. Run `%~dp0restore.cmd` to install tools
+    exit /b 1
+)
+
+IF "%VSINSTALLDIR%" == "" (
+    start "" "%sln%"
+) else (
+    "%VSINSTALLDIR%\Common7\IDE\devenv.com" "%sln%"
+)
diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorTemplateTest.cs b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorTemplateTest.cs
index 60d372d34dee..f6334c1cca6a 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorTemplateTest.cs
@@ -31,6 +31,7 @@ protected async Task<Project> CreateBuildPublishAsync(
     {
         // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
         Environment.SetEnvironmentVariable("EnableDefaultScopedCssItems", "true");
+        Environment.SetEnvironmentVariable("AllowMissingPrunePackageData", "true");
 
         var project = await ProjectFactory.CreateProject(Output);
         if (targetFramework != null)
@@ -86,7 +87,7 @@ protected async Task TestBasicInteractionInNewPageAsync(
         string listeningUri,
         string appName,
         BlazorTemplatePages pagesToExclude = BlazorTemplatePages.None,
-        bool usesAuth = false)
+        AuthenticationFeatures authenticationFeatures = AuthenticationFeatures.None)
     {
         if (!BrowserManager.IsAvailable(browserKind))
         {
@@ -100,16 +101,17 @@ protected async Task TestBasicInteractionInNewPageAsync(
         Output.WriteLine($"Opening browser at {listeningUri}...");
         await page.GotoAsync(listeningUri, new() { WaitUntil = WaitUntilState.NetworkIdle });
 
-        await TestBasicInteractionAsync(page, appName, pagesToExclude, usesAuth);
+        await TestBasicInteractionAsync(browser, page, appName, pagesToExclude, authenticationFeatures);
 
         await page.CloseAsync();
     }
 
     protected async Task TestBasicInteractionAsync(
+        IBrowserContext browser,
         IPage page,
         string appName,
         BlazorTemplatePages pagesToExclude = BlazorTemplatePages.None,
-        bool usesAuth = false)
+        AuthenticationFeatures authenticationFeatures = AuthenticationFeatures.None)
     {
         await page.WaitForSelectorAsync("nav");
 
@@ -134,17 +136,39 @@ await Task.WhenAll(
             await IncrementCounterAsync(page);
         }
 
-        if (usesAuth)
+        if (authenticationFeatures.HasFlag(AuthenticationFeatures.RegisterAndLogIn))
         {
+            // Start a new CDP session with WebAuthn enabled and add a virtual authenticator.
+            // We do this regardless of whether we're testing passkeys, because passkey
+            // gets attempted unconditionally on the login page, and this utilizes the WebAuthn API.
+            await using var cdpSession = await browser.NewCDPSessionAsync(page);
+            await cdpSession.SendAsync("WebAuthn.enable");
+            var result = await cdpSession.SendAsync("WebAuthn.addVirtualAuthenticator", new Dictionary<string, object>
+            {
+                ["options"] = new
+                {
+                    protocol = "ctap2",
+                    transport = "internal",
+                    hasResidentKey = false,
+                    hasUserVerification = true,
+                    isUserVerified = true,
+                    automaticPresenceSimulation = true,
+                }
+            });
+
+            Assert.True(result.HasValue);
+            var authenticatorId = result.Value.GetProperty("authenticatorId").GetString();
+
             await Task.WhenAll(
-                page.WaitForURLAsync("**/Identity/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
-                page.ClickAsync("text=Log in"));
+                page.WaitForURLAsync("**/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                page.ClickAsync("text=Login"));
 
             await Task.WhenAll(
-                page.WaitForSelectorAsync("[name=\"Input.Email\"]"),
-                page.WaitForURLAsync("**/Identity/Account/Register**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                page.WaitForURLAsync("**/Account/Register**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
                 page.ClickAsync("text=Register as a new user"));
 
+            await page.WaitForSelectorAsync("text=Create a new account.");
+
             var userName = $"{Guid.NewGuid()}@example.com";
             var password = "[PLACEHOLDER]-1a";
 
@@ -154,24 +178,115 @@ await Task.WhenAll(
 
             // We will be redirected to the RegisterConfirmation
             await Task.WhenAll(
-                page.WaitForURLAsync("**/Identity/Account/RegisterConfirmation**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
-                page.ClickAsync("#registerSubmit"));
+                page.WaitForURLAsync("**/Account/RegisterConfirmation**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                page.ClickAsync("button[type=\"submit\"]"));
 
             // We will be redirected to the ConfirmEmail
             await Task.WhenAll(
-                page.WaitForURLAsync("**/Identity/Account/ConfirmEmail**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                page.WaitForURLAsync("**/Account/ConfirmEmail**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
                 page.ClickAsync("text=Click here to confirm your account"));
 
+            // Now we attempt to navigate to the "Auth Required" page,
+            // which should redirect us to the login page since we are not logged in
+            await Task.WhenAll(
+                page.WaitForURLAsync("**/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                page.ClickAsync("text=Auth Required"));
+
             // Now we can login
-            await page.ClickAsync("text=Login");
             await page.WaitForSelectorAsync("[name=\"Input.Email\"]");
             await page.FillAsync("[name=\"Input.Email\"]", userName);
             await page.FillAsync("[name=\"Input.Password\"]", password);
-            await page.ClickAsync("#login-submit");
+            await page.ClickAsync("button[type=\"submit\"]");
 
-            // Need to navigate to fetch page
-            await page.GotoAsync(new Uri(page.Url).GetLeftPart(UriPartial.Authority));
-            Assert.Equal(appName.Trim(), (await page.TitleAsync()).Trim());
+            // Verify that we return to the "Auth Required" page
+            await page.WaitForSelectorAsync("text=You are authenticated");
+
+            if (authenticationFeatures.HasFlag(AuthenticationFeatures.Passkeys))
+            {
+                // Navigate to the passkey management page
+                await Task.WhenAll(
+                    page.WaitForURLAsync("**/Account/Manage**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                    page.ClickAsync("a[href=\"Account/Manage\"]"));
+
+                await page.WaitForSelectorAsync("text=Manage your account");
+
+                // Check that an error is displayed if passkey creation fails
+                await Task.WhenAll(
+                    page.WaitForURLAsync("**/Account/Manage/Passkeys**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                    page.ClickAsync("a[href=\"Account/Manage/Passkeys\"]"));
+
+                await page.EvaluateAsync("""
+                    () => {
+                        navigator.credentials.create = () => {
+                            const error = new Error("Simulated passkey creation failure");
+                            error.name = "NotAllowedError";
+                            return Promise.reject(error);
+                        };
+                    }
+                    """);
+
+                await page.ClickAsync("text=Add a new passkey");
+                await page.WaitForSelectorAsync("text=Error: No passkey was provided by the authenticator.");
+
+                // Now check that we can successfully register a passkey
+                await page.ReloadAsync(new() { WaitUntil = WaitUntilState.NetworkIdle });
+                await page.ClickAsync("text=Add a new passkey");
+
+                await page.WaitForSelectorAsync("text=Enter a name for your passkey");
+
+                // First check that we can't register a passkey with a long name.
+                var longName = new string('a', count: 201);
+                await page.FillAsync("[name=\"Input.Name\"]", longName);
+                await page.ClickAsync("text=Continue");
+                await page.WaitForSelectorAsync("text=Passkey names must be no longer than 200 characters.");
+
+                // Now register a passkey with a valid name
+                await page.FillAsync("[name=\"Input.Name\"]", "My passkey");
+                await page.ClickAsync("text=Continue");
+
+                await page.WaitForSelectorAsync("text=Passkey updated successfully");
+
+                // Logout so that we can test the passkey login flow
+                await Task.WhenAll(
+                    page.WaitForURLAsync("**/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                    page.ClickAsync("text=Logout"));
+
+                // Navigate home to reset the return URL
+                await page.ClickAsync("text=Home");
+                await page.WaitForSelectorAsync("text=Hello, world!");
+
+                // Now navigate to the login page
+                await Task.WhenAll(
+                    page.WaitForURLAsync("**/Account/Login**", new() { WaitUntil = WaitUntilState.NetworkIdle }),
+                    page.ClickAsync("text=Login"));
+
+                // Check that an error is displayed if passkey retrieval fails
+                await page.EvaluateAsync("""
+                    () => {
+                        navigator.credentials.get = () => {
+                            const error = new Error("Simulated passkey retrieval failure");
+                            error.name = "NotAllowedError";
+                            return Promise.reject(error);
+                        };
+                    }
+                    """);
+
+                await page.ClickAsync("text=Log in with a passkey");
+                await page.WaitForSelectorAsync("text=Error: No passkey was provided by the authenticator.");
+
+                // Now check that we can successfully login with the passkey
+                await page.ReloadAsync(new() { WaitUntil = WaitUntilState.NetworkIdle });
+                await page.WaitForSelectorAsync("[name=\"Input.Email\"]");
+                await page.FillAsync("[name=\"Input.Email\"]", userName);
+                await page.ClickAsync("text=Log in with a passkey");
+
+                // Verify that we return to the home page
+                await page.WaitForSelectorAsync("text=Hello, world!");
+
+                // Verify that we can visit the "Auth Required" page again
+                await page.ClickAsync("text=Auth Required");
+                await page.WaitForSelectorAsync("text=You are authenticated");
+            }
         }
 
         if (!pagesToExclude.HasFlag(BlazorTemplatePages.Weather))
@@ -232,4 +347,12 @@ protected enum BlazorTemplatePages
         Weather = 4,
         All = ~0,
     }
+
+    [Flags]
+    protected enum AuthenticationFeatures
+    {
+        None = 0,
+        RegisterAndLogIn = 1,
+        Passkeys = 2,
+    }
 }
diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs
index 1329beb45531..d74b67207a5c 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWasmTemplateTest.cs
@@ -12,6 +12,8 @@
 
 namespace BlazorTemplates.Tests;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory) : BlazorTemplateTest(projectFactory)
 {
     public override string ProjectType { get; } = "blazorwasm";
@@ -76,7 +78,7 @@ public async Task BlazorWasmStandalonePwaTemplate_Works(BrowserKind browserKind)
             await page.GotoAsync(listeningUri, new() { WaitUntil = WaitUntilState.NetworkIdle });
             using (serveProcess)
             {
-                await TestBasicInteractionAsync(page, project.ProjectName);
+                await TestBasicInteractionAsync(browser, page, project.ProjectName);
             }
 
             // The PWA template supports offline use. By now, the browser should have cached everything it needs,
@@ -84,7 +86,7 @@ public async Task BlazorWasmStandalonePwaTemplate_Works(BrowserKind browserKind)
             await page.GotoAsync("about:blank");
             await browser.SetOfflineAsync(true);
             await page.GotoAsync(listeningUri);
-            await TestBasicInteractionAsync(page, project.ProjectName, pagesToExclude: BlazorTemplatePages.Weather);
+            await TestBasicInteractionAsync(browser, page, project.ProjectName, pagesToExclude: BlazorTemplatePages.Weather);
             await page.CloseAsync();
         }
         else
diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWebTemplateTest.cs b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWebTemplateTest.cs
index dc2cf5b63982..cff83ab7b3fb 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWebTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/BlazorWebTemplateTest.cs
@@ -2,28 +2,25 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
 using Microsoft.AspNetCore.BrowserTesting;
-using Microsoft.AspNetCore.InternalTesting;
 using Templates.Test.Helpers;
 
 namespace BlazorTemplates.Tests;
 
-public class BlazorWebTemplateTest(ProjectFactoryFixture projectFactory) : BlazorTemplateTest(projectFactory)
+public class BlazorWebTemplateTest(ProjectFactoryFixture projectFactory) : BlazorTemplateTest(projectFactory), IClassFixture<ProjectFactoryFixture>
 {
     public override string ProjectType => "blazor";
 
-    [ConditionalTheory]
-    [SkipNonHelix]
+    [Theory]
     [InlineData(BrowserKind.Chromium, "None")]
     [InlineData(BrowserKind.Chromium, "Server")]
     [InlineData(BrowserKind.Chromium, "WebAssembly")]
     [InlineData(BrowserKind.Chromium, "Auto")]
-    public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string interactivityOption)
+    [InlineData(BrowserKind.Chromium, "None", "Individual")]
+    public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string interactivityOption, string authOption = "None")
     {
         var project = await CreateBuildPublishAsync(
-            args: ["-int", interactivityOption],
+            args: ["-int", interactivityOption, "-au", authOption],
             getTargetProject: GetTargetProject);
 
         // There won't be a counter page when the 'None' interactivity option is used
@@ -31,35 +28,11 @@ public async Task BlazorWebTemplate_Works(BrowserKind browserKind, string intera
             ? BlazorTemplatePages.Counter
             : BlazorTemplatePages.None;
 
-        var appName = project.ProjectName;
+        var authenticationFeatures = authOption is "None"
+            ? AuthenticationFeatures.None
+            : AuthenticationFeatures.RegisterAndLogIn;
 
-        // Test the built project
-        using (var aspNetProcess = project.StartBuiltProjectAsync())
-        {
-            Assert.False(
-                aspNetProcess.Process.HasExited,
-                ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process));
-
-            await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
-            await TestBasicInteractionInNewPageAsync(browserKind, aspNetProcess.ListeningUri.AbsoluteUri, appName, pagesToExclude);
-        }
-
-        // Test the published project
-        using (var aspNetProcess = project.StartPublishedProjectAsync())
-        {
-            Assert.False(
-                aspNetProcess.Process.HasExited,
-                ErrorMessages.GetFailedProcessMessageOrEmpty("Run published project", project, aspNetProcess.Process));
-
-            await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
-
-            if (HasClientProject())
-            {
-                await AssertWebAssemblyCompressionFormatAsync(aspNetProcess, "br");
-            }
-
-            await TestBasicInteractionInNewPageAsync(browserKind, aspNetProcess.ListeningUri.AbsoluteUri, appName, pagesToExclude);
-        }
+        await TestProjectCoreAsync(project, browserKind, pagesToExclude, authenticationFeatures);
 
         bool HasClientProject()
             => interactivityOption is "WebAssembly" or "Auto";
@@ -78,18 +51,41 @@ Project GetTargetProject(Project rootProject)
         }
     }
 
-    private static async Task AssertWebAssemblyCompressionFormatAsync(AspNetProcess aspNetProcess, string expectedEncoding)
+    [Theory]
+    [InlineData(BrowserKind.Chromium)]
+    public async Task BlazorWebTemplate_CanUsePasskeys(BrowserKind browserKind)
     {
-        var response = await aspNetProcess.SendRequest(() =>
+        var project = await CreateBuildPublishAsync(args: ["-int", "None", "-au", "Individual"]);
+        var pagesToExclude = BlazorTemplatePages.Counter;
+        var authenticationFeatures = AuthenticationFeatures.RegisterAndLogIn | AuthenticationFeatures.Passkeys;
+
+        await TestProjectCoreAsync(project, browserKind, pagesToExclude, authenticationFeatures);
+    }
+
+    private async Task TestProjectCoreAsync(Project project, BrowserKind browserKind, BlazorTemplatePages pagesToExclude, AuthenticationFeatures authenticationFeatures)
+    {
+        var appName = project.ProjectName;
+
+        // Test the built project
+        using (var aspNetProcess = project.StartBuiltProjectAsync())
+        {
+            Assert.False(
+                aspNetProcess.Process.HasExited,
+                ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process));
+
+            await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
+            await TestBasicInteractionInNewPageAsync(browserKind, aspNetProcess.ListeningUri.AbsoluteUri, appName, pagesToExclude, authenticationFeatures);
+        }
+
+        // Test the published project
+        using (var aspNetProcess = project.StartPublishedProjectAsync())
         {
-            var request = new HttpRequestMessage(HttpMethod.Get, new Uri(aspNetProcess.ListeningUri, "/_framework/blazor.boot.json"));
-            // These are the same as chrome
-            request.Headers.AcceptEncoding.Clear();
-            request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("gzip"));
-            request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("deflate"));
-            request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("br"));
-            return request;
-        });
-        Assert.Equal(expectedEncoding, response.Content.Headers.ContentEncoding.Single());
+            Assert.False(
+                aspNetProcess.Process.HasExited,
+                ErrorMessages.GetFailedProcessMessageOrEmpty("Run published project", project, aspNetProcess.Process));
+
+            await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
+            await TestBasicInteractionInNewPageAsync(browserKind, aspNetProcess.ListeningUri.AbsoluteUri, appName, pagesToExclude, authenticationFeatures);
+        }
     }
 }
diff --git a/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj
index 933f42dd9423..64c4a8639c41 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj
@@ -9,6 +9,7 @@
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <RunBlazorPlaywrightTemplateTests Condition="'$(RunBlazorPlaywrightTemplateTests)' == ''">$(RunTemplateTests)</RunBlazorPlaywrightTemplateTests>
     <SkipTests Condition="'$(RunBlazorPlaywrightTemplateTests)' != 'true'">true</SkipTests>
+    <SkipTests Condition="'$(RunBlazorPlaywrightTemplateTests)' == 'true'">false</SkipTests>
     <BuildHelixPayload Condition="'$(RunBlazorPlaywrightTemplateTests)' != 'true'">false</BuildHelixPayload>
 
     <BaseOutputPath />
@@ -50,11 +51,10 @@
     <Reference Include="Microsoft.Extensions.Configuration" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <Reference Include="Microsoft.Playwright" Condition="'$(IsPlaywrightAvailable)' == 'true'" />
     <Reference Include="Microsoft.Playwright" ExcludeAssets="build" Condition="'$(IsPlaywrightAvailable)' != 'true'" />
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs
index 540c22178863..ef46a52f7bac 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs
+++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs
@@ -6,6 +6,8 @@
 
 namespace Templates.Blazor.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class BlazorWasmTemplateAuthTest : BlazorTemplateTest
 {
     public BlazorWasmTemplateAuthTest(ProjectFactoryFixture projectFactory)
diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
index 3d0831a1001a..25491823a21d 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
@@ -7,8 +7,11 @@
     <TestGroupName>ProjectTemplates.Blazor.WebAssembly.Auth.Tests</TestGroupName>
     <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
 
+    <RequiresDelayedBuild>true</RequiresDelayedBuild>
+
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
+    <SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
     <BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>
 
     <BaseOutputPath />
@@ -43,8 +46,7 @@
 
   <ItemGroup>
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/BlazorWasmTemplateTest.cs
index 9ba6a77930b6..9fbc9ae02110 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/BlazorWasmTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/BlazorWasmTemplateTest.cs
@@ -17,6 +17,8 @@
 
 namespace Templates.Blazor.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class BlazorWasmTemplateTest : BlazorTemplateTest
 {
     public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory)
diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
index b42866c3a78f..15bb53c98209 100644
--- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
@@ -7,8 +7,11 @@
     <TestGroupName>ProjectTemplates.Blazor.WebAssembly.Tests</TestGroupName>
     <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
 
+    <RequiresDelayedBuild>true</RequiresDelayedBuild>
+
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
+    <SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
     <BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>
 
     <BaseOutputPath />
@@ -42,8 +45,7 @@
 
   <ItemGroup>
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/BlazorTemplateTest.cs b/src/ProjectTemplates/test/Templates.Mvc.Tests/BlazorTemplateTest.cs
index a6a87e256be6..6a5f18fb874f 100644
--- a/src/ProjectTemplates/test/Templates.Mvc.Tests/BlazorTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/BlazorTemplateTest.cs
@@ -16,7 +16,7 @@ public BlazorTemplateTest(ProjectFactoryFixture projectFactory)
 
     public ProjectFactoryFixture ProjectFactory { get; set; }
 
-    public static TheoryData<object[]> ArgsData() =>
+    public static TheoryData<string[]> ArgsData() =>
     [
         [],
         [ArgConstants.UseProgramMain],
@@ -187,7 +187,7 @@ private Task<string> ReadProjectFileAsync(Project project)
             return File.ReadAllTextAsync(multiProjectPath);
         }
 
-        throw new FailException($"Expected file to exist, but it doesn't: {singleProjectPath}");
+        throw FailException.ForFailure($"Expected file to exist, but it doesn't: {singleProjectPath}");
     }
 
     private async Task WorkAroundNonNullableRenderModeAsync(Project project)
diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/MvcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Mvc.Tests/MvcTemplateTest.cs
index 9b4f00d47855..e625d3e3fdf2 100644
--- a/src/ProjectTemplates/test/Templates.Mvc.Tests/MvcTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/MvcTemplateTest.cs
@@ -7,6 +7,8 @@
 
 namespace Templates.Mvc.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class MvcTemplateTest : LoggedTest
 {
     public MvcTemplateTest(ProjectFactoryFixture projectFactory)
diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
index 8d2e818fea7b..e4150c38bcd7 100644
--- a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
@@ -7,8 +7,11 @@
     <TestGroupName>ProjectTemplates.Mvc.Tests</TestGroupName>
     <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
 
+    <RequiresDelayedBuild>true</RequiresDelayedBuild>
+
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
+    <SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
     <BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>
 
     <BaseOutputPath />
@@ -24,9 +27,9 @@
     <!-- These tests fail in Helix in Debian and Mariner due to error -901 -->
     <!-- Disabling on those OSes until a better fix can be identified -->
     <SkipHelixQueues>
-      $(HelixQueueArmDebian12);
-      $(HelixQueueDebian12);
-      $(HelixQueueMariner);
+      $(HelixQueueArmDebian);
+      $(HelixQueueAzureLinux);
+      $(HelixQueueDebian);
       $(SkipHelixQueues)
     </SkipHelixQueues>
   </PropertyGroup>
@@ -52,8 +55,7 @@
 
   <ItemGroup>
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs b/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs
index c4473a9ac2e6..78236be67d6c 100644
--- a/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/WebApiTemplateTest.cs
@@ -12,6 +12,8 @@
 
 namespace Templates.Mvc.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class WebApiTemplateTest : LoggedTest
 {
     public WebApiTemplateTest(ProjectFactoryFixture factoryFixture)
@@ -96,7 +98,7 @@ public ITestOutputHelper Output
     [InlineData("SingleOrg", new [] { ArgConstants.UseProgramMain, ArgConstants.UseControllers, ArgConstants.CallsGraph })]
     public Task WebApiTemplateCSharp_IdentityWeb_SingleOrg_ProgramMain_BuildsAndPublishes(string auth, string[] args) => PublishAndBuildWebApiTemplate(languageOverride: null, auth: auth, args: args);
 
-    [ConditionalTheory]
+    [ConditionalTheory(Skip = "https://github.com/dotnet/aspnetcore/issues/58957")]
     [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/28090", Queues = HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
     [InlineData("SingleOrg", null)]
     [InlineData("SingleOrg", new [] { ArgConstants.UseProgramMain, ArgConstants.NoHttps })]
diff --git a/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs b/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs
index 4d7c978ddb66..55a1bc3e091b 100644
--- a/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs
@@ -15,6 +15,8 @@
 
 namespace Templates.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class BaselineTest : LoggedTest
 {
     private static readonly string BaselineDefinitionFileResourceName = "Templates.Tests.template-baselines.json";
diff --git a/src/ProjectTemplates/test/Templates.Tests/EmptyWebTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/EmptyWebTemplateTest.cs
index ccf216c2264e..afab0feb7d21 100644
--- a/src/ProjectTemplates/test/Templates.Tests/EmptyWebTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/EmptyWebTemplateTest.cs
@@ -9,6 +9,8 @@
 
 namespace Templates.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class EmptyWebTemplateTest : LoggedTest
 {
     public EmptyWebTemplateTest(ProjectFactoryFixture projectFactory)
diff --git a/src/ProjectTemplates/test/Templates.Tests/ItemTemplateTests/BlazorServerTests.cs b/src/ProjectTemplates/test/Templates.Tests/ItemTemplateTests/BlazorServerTests.cs
index 3035cd16d5d6..c50e7e7f9a5a 100644
--- a/src/ProjectTemplates/test/Templates.Tests/ItemTemplateTests/BlazorServerTests.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/ItemTemplateTests/BlazorServerTests.cs
@@ -9,6 +9,8 @@
 
 namespace Templates.Items.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class BlazorServerTest
 {
     public BlazorServerTest(ProjectFactoryFixture projectFactory, ITestOutputHelper output)
diff --git a/src/ProjectTemplates/test/Templates.Tests/RazorClassLibraryTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/RazorClassLibraryTemplateTest.cs
index 1763bef517ba..0fddec06ab52 100644
--- a/src/ProjectTemplates/test/Templates.Tests/RazorClassLibraryTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/RazorClassLibraryTemplateTest.cs
@@ -9,6 +9,8 @@
 
 namespace Templates.Test;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 public class RazorClassLibraryTemplateTest : LoggedTest
 {
     public RazorClassLibraryTemplateTest(ProjectFactoryFixture projectFactory)
diff --git a/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj b/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
index fb297bfae7c5..df91970f0576 100644
--- a/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
   <Import Condition="'$(SkipTestBuild)' != 'true'" Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
 
@@ -7,8 +7,11 @@
     <TestGroupName>ProjectTemplates.Tests</TestGroupName>
     <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
 
+    <RequiresDelayedBuild>true</RequiresDelayedBuild>
+
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
+    <SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
     <BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>
 
     <BaseOutputPath />
@@ -46,8 +49,7 @@
 
   <ItemGroup>
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
-    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
       SkipGetTargetFrameworkProperties="true" />
diff --git a/src/ProjectTemplates/test/Templates.Tests/WebApiNativeAotTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/WebApiNativeAotTemplateTest.cs
index 71c113aa7105..d1d6547c8484 100644
--- a/src/ProjectTemplates/test/Templates.Tests/WebApiNativeAotTemplateTest.cs
+++ b/src/ProjectTemplates/test/Templates.Tests/WebApiNativeAotTemplateTest.cs
@@ -34,17 +34,60 @@ public ITestOutputHelper Output
     [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
     public async Task WebApiNativeAotTemplateCSharp()
     {
-        await WebApiNativeAotTemplateCore(languageOverride: null);
+        await WebApiNativeAotTemplateCore(
+            languageOverride: null,
+            additionalEndpointsThatShould200OkForBuiltProjects: new[] { "/openapi/v1.json" });
     }
 
     [ConditionalFact]
     [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
     public async Task WebApiNativeAotTemplateProgramMainCSharp()
     {
-        await WebApiNativeAotTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain });
+        await WebApiNativeAotTemplateCore(
+            languageOverride: null,
+            args: new[] { ArgConstants.UseProgramMain },
+            additionalEndpointsThatShould200OkForBuiltProjects: new[] { "/openapi/v1.json" });
     }
 
-    private async Task WebApiNativeAotTemplateCore(string languageOverride, string[] args = null)
+    [ConditionalTheory]
+    [InlineData(false)]
+    [InlineData(true)]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
+    public async Task WebApiNativeAotTemplateCSharp_OpenApiDisabledInProductionEnvironment(bool useProgramMain)
+    {
+        var args = useProgramMain
+            ? new[] { ArgConstants.UseProgramMain }
+            : new string[] { };
+
+        await WebApiNativeAotTemplateCore(
+            languageOverride: null,
+            args: args,
+            additionalEndpointsThatShould404NotFoundForPublishedProjects: new[] { "/openapi/v1.json" });
+    }
+
+    [ConditionalTheory]
+    [InlineData(false)]
+    [InlineData(true)]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/47478", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
+    public async Task WebApiNativeAotTemplateCSharp_WithoutOpenAPI(bool useProgramMain)
+    {
+        var args = useProgramMain
+            ? new[] { ArgConstants.UseProgramMain, ArgConstants.NoOpenApi }
+            : new[] { ArgConstants.NoOpenApi };
+
+        await WebApiNativeAotTemplateCore(
+            languageOverride: null,
+            args: args,
+            additionalEndpointsThatShould404NotFoundForBuiltProjects: new[] { "/openapi/v1.json" });
+    }
+
+    private async Task WebApiNativeAotTemplateCore(
+        string languageOverride,
+        string[] args = null,
+        string[] additionalEndpointsThatShould200OkForBuiltProjects = null,
+        string[] additionalEndpointsThatShould200OkForPublishedProjects = null,
+        string[] additionalEndpointsThatShould404NotFoundForBuiltProjects = null,
+        string[] additionalEndpointsThatShould404NotFoundForPublishedProjects = null)
     {
         var project = await ProjectFactory.CreateProject(Output);
         project.SetCurrentRuntimeIdentifier();
@@ -77,7 +120,7 @@ private async Task WebApiNativeAotTemplateCore(string languageOverride, string[]
             Assert.False(
                aspNetProcess.Process.HasExited,
                ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process));
-            await AssertEndpoints(aspNetProcess);
+            await AssertEndpoints(aspNetProcess, additionalEndpointsThatShould200OkForBuiltProjects, additionalEndpointsThatShould404NotFoundForBuiltProjects);
         }
 
         using (var aspNetProcess = project.StartPublishedProjectAsync(noHttps: true, usePublishedAppHost: true))
@@ -86,15 +129,31 @@ private async Task WebApiNativeAotTemplateCore(string languageOverride, string[]
                 aspNetProcess.Process.HasExited,
                 ErrorMessages.GetFailedProcessMessageOrEmpty("Run published project", project, aspNetProcess.Process));
 
-            await AssertEndpoints(aspNetProcess);
+            await AssertEndpoints(aspNetProcess, additionalEndpointsThatShould200OkForPublishedProjects, additionalEndpointsThatShould404NotFoundForPublishedProjects);
         }
     }
 
-    private async Task AssertEndpoints(AspNetProcess aspNetProcess)
+    private async Task AssertEndpoints(AspNetProcess aspNetProcess, string[] additionalEndpointsThatShould200Ok = null, string[] additionalEndpointsThatShould404NotFound = null)
     {
         await aspNetProcess.AssertOk("/todos");
         await aspNetProcess.AssertOk("/todos/1");
         await aspNetProcess.AssertNotFound("/todos/100");
         await aspNetProcess.AssertNotFound("/");
+
+        if (additionalEndpointsThatShould200Ok is not null)
+        {
+            foreach (var endpoint in additionalEndpointsThatShould200Ok)
+            {
+                await aspNetProcess.AssertOk(endpoint);
+            }
+        }
+
+        if (additionalEndpointsThatShould404NotFound is not null)
+        {
+            foreach (var endpoint in additionalEndpointsThatShould404NotFound)
+            {
+                await aspNetProcess.AssertNotFound(endpoint);
+            }
+        }
     }
 }
diff --git a/src/ProjectTemplates/test/Templates.Tests/package.json b/src/ProjectTemplates/test/Templates.Tests/package.json
index 08ff35cbb443..465f1eec94e9 100644
--- a/src/ProjectTemplates/test/Templates.Tests/package.json
+++ b/src/ProjectTemplates/test/Templates.Tests/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "microsoft.aspnetcore.projecttemplates.tests",
+  "name": "@microsoft/microsoft.aspnetcore.projecttemplates.tests",
   "version": "0.0.1",
   "description": "Not a real package. This file exists only to declare dependencies.",
   "main": "index.js",
diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index c70e18b926d7..61b2ffddf049 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -535,6 +535,7 @@
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Components/Routes.razor",
         "Components/_Imports.razor",
@@ -599,7 +600,6 @@
         "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
-        "Components/Account/IdentityUserAccessor.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -620,7 +620,9 @@
         "Components/Account/Pages/Manage/ExternalLogins.razor",
         "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/Passkeys.razor",
         "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/RenamePasskey.razor",
         "Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "Components/Account/Pages/Manage/SetPassword.razor",
         "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -631,9 +633,13 @@
         "Components/Account/Pages/ResetPassword.razor",
         "Components/Account/Pages/ResetPasswordConfirmation.razor",
         "Components/Account/Pages/_Imports.razor",
+        "Components/Account/PasskeyInputModel.cs",
+        "Components/Account/PasskeyOperation.cs",
         "Components/Account/Shared/ExternalLoginPicker.razor",
         "Components/Account/Shared/ManageLayout.razor",
         "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/PasskeySubmit.razor",
+        "Components/Account/Shared/PasskeySubmit.razor.js",
         "Components/Account/Shared/RedirectToLogin.razor",
         "Components/Account/Shared/ShowRecoveryCodes.razor",
         "Components/Account/Shared/StatusMessage.razor",
@@ -645,6 +651,7 @@
         "Components/Pages/Auth.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Components/Routes.razor",
         "Components/_Imports.razor",
@@ -721,9 +728,13 @@
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
+        "Components/Layout/ReconnectModal.razor",
+        "Components/Layout/ReconnectModal.razor.css",
+        "Components/Layout/ReconnectModal.razor.js",
         "Components/Pages/Counter.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
@@ -785,7 +796,6 @@
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
         "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
-        "Components/Account/IdentityUserAccessor.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -806,7 +816,9 @@
         "Components/Account/Pages/Manage/ExternalLogins.razor",
         "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/Passkeys.razor",
         "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/RenamePasskey.razor",
         "Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "Components/Account/Pages/Manage/SetPassword.razor",
         "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -817,9 +829,13 @@
         "Components/Account/Pages/ResetPassword.razor",
         "Components/Account/Pages/ResetPasswordConfirmation.razor",
         "Components/Account/Pages/_Imports.razor",
+        "Components/Account/PasskeyInputModel.cs",
+        "Components/Account/PasskeyOperation.cs",
         "Components/Account/Shared/ExternalLoginPicker.razor",
         "Components/Account/Shared/ManageLayout.razor",
         "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/PasskeySubmit.razor",
+        "Components/Account/Shared/PasskeySubmit.razor.js",
         "Components/Account/Shared/RedirectToLogin.razor",
         "Components/Account/Shared/ShowRecoveryCodes.razor",
         "Components/Account/Shared/StatusMessage.razor",
@@ -828,10 +844,14 @@
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
+        "Components/Layout/ReconnectModal.razor",
+        "Components/Layout/ReconnectModal.razor.css",
+        "Components/Layout/ReconnectModal.razor.js",
         "Components/Pages/Auth.razor",
         "Components/Pages/Counter.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Components/Routes.razor",
         "Components/_Imports.razor",
@@ -903,7 +923,6 @@
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
         "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
-        "Components/Account/IdentityUserAccessor.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -924,7 +943,9 @@
         "Components/Account/Pages/Manage/ExternalLogins.razor",
         "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/Passkeys.razor",
         "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/RenamePasskey.razor",
         "Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "Components/Account/Pages/Manage/SetPassword.razor",
         "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -935,9 +956,13 @@
         "Components/Account/Pages/ResetPassword.razor",
         "Components/Account/Pages/ResetPasswordConfirmation.razor",
         "Components/Account/Pages/_Imports.razor",
+        "Components/Account/PasskeyInputModel.cs",
+        "Components/Account/PasskeyOperation.cs",
         "Components/Account/Shared/ExternalLoginPicker.razor",
         "Components/Account/Shared/ManageLayout.razor",
         "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/PasskeySubmit.razor",
+        "Components/Account/Shared/PasskeySubmit.razor.js",
         "Components/Account/Shared/RedirectToLogin.razor",
         "Components/Account/Shared/ShowRecoveryCodes.razor",
         "Components/Account/Shared/StatusMessage.razor",
@@ -946,10 +971,14 @@
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
+        "Components/Layout/ReconnectModal.razor",
+        "Components/Layout/ReconnectModal.razor.css",
+        "Components/Layout/ReconnectModal.razor.js",
         "Components/Pages/Auth.razor",
         "Components/Pages/Counter.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Components/Routes.razor",
         "Components/_Imports.razor",
@@ -1028,6 +1057,7 @@
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
@@ -1103,7 +1133,6 @@
         "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
-        "{ProjectName}/Components/Account/IdentityUserAccessor.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1124,7 +1153,9 @@
         "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
         "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Passkeys.razor",
         "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/RenamePasskey.razor",
         "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
         "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -1135,9 +1166,13 @@
         "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
         "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
         "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PasskeyInputModel.cs",
+        "{ProjectName}/Components/Account/PasskeyOperation.cs",
         "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
         "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
         "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor.js",
         "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
@@ -1147,6 +1182,7 @@
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
         "{ProjectName}/Components/Routes.razor",
         "{ProjectName}/Components/_Imports.razor",
@@ -1224,8 +1260,12 @@
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
         "{ProjectName}/Components/Layout/NavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.js",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
@@ -1302,7 +1342,6 @@
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
         "{ProjectName}/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
-        "{ProjectName}/Components/Account/IdentityUserAccessor.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1323,7 +1362,9 @@
         "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
         "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Passkeys.razor",
         "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/RenamePasskey.razor",
         "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
         "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -1334,9 +1375,13 @@
         "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
         "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
         "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PasskeyInputModel.cs",
+        "{ProjectName}/Components/Account/PasskeyOperation.cs",
         "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
         "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
         "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor.js",
         "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
@@ -1344,8 +1389,12 @@
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
         "{ProjectName}/Components/Layout/NavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.js",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
         "{ProjectName}/Components/Routes.razor",
         "{ProjectName}/Components/_Imports.razor",
@@ -1418,9 +1467,13 @@
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
+        "Components/Layout/ReconnectModal.razor",
+        "Components/Layout/ReconnectModal.razor.css",
+        "Components/Layout/ReconnectModal.razor.js",
         "Components/Pages/Counter.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Components/Routes.razor",
         "Components/_Imports.razor",
@@ -1486,6 +1539,7 @@
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/NotFound.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/Routes.razor",
@@ -1559,8 +1613,12 @@
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
+        "{ProjectName}.Client/Layout/ReconnectModal.razor",
+        "{ProjectName}.Client/Layout/ReconnectModal.razor.css",
+        "{ProjectName}.Client/Layout/ReconnectModal.razor.js",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/NotFound.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/Routes.razor",
@@ -1641,6 +1699,7 @@
         "Components/Layout/MainLayout.razor.css",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Properties/launchSettings.json",
         "wwwroot/app.css"
       ],
@@ -1659,8 +1718,12 @@
         "Components/_Imports.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
+        "Components/Layout/ReconnectModal.razor",
+        "Components/Layout/ReconnectModal.razor.css",
+        "Components/Layout/ReconnectModal.razor.js",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Properties/launchSettings.json",
         "wwwroot/app.css"
       ],
@@ -1677,6 +1740,7 @@
         "{ProjectName}/Program.cs",
         "{ProjectName}/Components/App.razor",
         "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Components/Routes.razor",
         "{ProjectName}/Components/_Imports.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
@@ -1704,8 +1768,12 @@
         "{ProjectName}/Components/_Imports.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.js",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
         "{ProjectName}.Client/{ProjectName}.Client.csproj",
@@ -1729,7 +1797,6 @@
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
         "{ProjectName}/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
-        "{ProjectName}/Components/Account/IdentityUserAccessor.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1750,7 +1817,9 @@
         "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
         "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Passkeys.razor",
         "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/RenamePasskey.razor",
         "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
         "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -1761,16 +1830,24 @@
         "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
         "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
         "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PasskeyInputModel.cs",
+        "{ProjectName}/Components/Account/PasskeyOperation.cs",
         "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
         "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
         "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor.js",
         "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.css",
+        "{ProjectName}/Components/Layout/ReconnectModal.razor.js",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
+        "{ProjectName}/Components/Pages/NotFound.razor",
         "{ProjectName}/Components/Routes.razor",
         "{ProjectName}/Components/_Imports.razor",
         "{ProjectName}/Data/app.db",
@@ -1796,7 +1873,6 @@
         "Components/Account/IdentityNoOpEmailSender.cs",
         "Components/Account/IdentityRedirectManager.cs",
         "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
-        "Components/Account/IdentityUserAccessor.cs",
         "Components/Account/Pages/AccessDenied.razor",
         "Components/Account/Pages/ConfirmEmail.razor",
         "Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1817,7 +1893,9 @@
         "Components/Account/Pages/Manage/ExternalLogins.razor",
         "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/Passkeys.razor",
         "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/RenamePasskey.razor",
         "Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "Components/Account/Pages/Manage/SetPassword.razor",
         "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -1828,9 +1906,13 @@
         "Components/Account/Pages/ResetPassword.razor",
         "Components/Account/Pages/ResetPasswordConfirmation.razor",
         "Components/Account/Pages/_Imports.razor",
+        "Components/Account/PasskeyInputModel.cs",
+        "Components/Account/PasskeyOperation.cs",
         "Components/Account/Shared/ExternalLoginPicker.razor",
         "Components/Account/Shared/ManageLayout.razor",
         "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/PasskeySubmit.razor",
+        "Components/Account/Shared/PasskeySubmit.razor.js",
         "Components/Account/Shared/RedirectToLogin.razor",
         "Components/Account/Shared/ShowRecoveryCodes.razor",
         "Components/Account/Shared/StatusMessage.razor",
@@ -1839,10 +1921,14 @@
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
+        "Components/Layout/ReconnectModal.razor",
+        "Components/Layout/ReconnectModal.razor.css",
+        "Components/Layout/ReconnectModal.razor.js",
         "Components/Pages/Auth.razor",
         "Components/Pages/Counter.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
+        "Components/Pages/NotFound.razor",
         "Components/Pages/Weather.razor",
         "Components/Routes.razor",
         "Components/_Imports.razor",
@@ -1916,6 +2002,7 @@
         "{ProjectName}.Client/Pages/Auth.razor",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/NotFound.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/RedirectToLogin.razor",
@@ -1929,7 +2016,6 @@
         "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
-        "{ProjectName}/Components/Account/IdentityUserAccessor.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -1950,7 +2036,9 @@
         "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
         "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Passkeys.razor",
         "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/RenamePasskey.razor",
         "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
         "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -1961,9 +2049,13 @@
         "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
         "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
         "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PasskeyInputModel.cs",
+        "{ProjectName}/Components/Account/PasskeyOperation.cs",
         "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
         "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
         "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor.js",
         "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
@@ -2036,10 +2128,14 @@
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
+        "{ProjectName}.Client/Layout/ReconnectModal.razor",
+        "{ProjectName}.Client/Layout/ReconnectModal.razor.css",
+        "{ProjectName}.Client/Layout/ReconnectModal.razor.js",
         "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/Pages/Auth.razor",
         "{ProjectName}.Client/Pages/Counter.razor",
         "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/NotFound.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/RedirectToLogin.razor",
@@ -2054,7 +2150,6 @@
         "{ProjectName}/Components/Account/IdentityNoOpEmailSender.cs",
         "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
         "{ProjectName}/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
-        "{ProjectName}/Components/Account/IdentityUserAccessor.cs",
         "{ProjectName}/Components/Account/Pages/AccessDenied.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
         "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
@@ -2075,7 +2170,9 @@
         "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
         "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Passkeys.razor",
         "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/RenamePasskey.razor",
         "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
         "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
         "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
@@ -2086,9 +2183,13 @@
         "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
         "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
         "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PasskeyInputModel.cs",
+        "{ProjectName}/Components/Account/PasskeyOperation.cs",
         "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
         "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
         "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor",
+        "{ProjectName}/Components/Account/Shared/PasskeySubmit.razor.js",
         "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
         "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
@@ -3098,6 +3199,7 @@
         "_Imports.razor",
         "Pages/Counter.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Pages/Weather.razor",
         "Layout/MainLayout.razor",
         "Layout/MainLayout.razor.css",
@@ -3163,6 +3265,7 @@
         "App.razor",
         "_Imports.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Properties/launchSettings.json",
         "wwwroot/icon-192.png",
@@ -3180,6 +3283,7 @@
         "Pages/Authentication.razor",
         "Pages/Counter.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Pages/Weather.razor",
         "Layout/MainLayout.razor",
         "Layout/MainLayout.razor.css",
@@ -3250,6 +3354,7 @@
         "_Imports.razor",
         "Pages/Authentication.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Layout/LoginDisplay.razor",
         "Layout/RedirectToLogin.razor",
@@ -3271,6 +3376,7 @@
         "Pages/Authentication.razor",
         "Pages/Counter.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Pages/Weather.razor",
         "Layout/MainLayout.razor",
         "Layout/MainLayout.razor.css",
@@ -3340,6 +3446,7 @@
         "_Imports.razor",
         "Pages/Authentication.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Layout/LoginDisplay.razor",
         "Layout/RedirectToLogin.razor",
@@ -3360,6 +3467,7 @@
         "Pages/Authentication.razor",
         "Pages/Counter.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Pages/Weather.razor",
         "Layout/MainLayout.razor",
         "Layout/MainLayout.razor.css",
@@ -3429,6 +3537,7 @@
         "_Imports.razor",
         "Pages/Authentication.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Layout/LoginDisplay.razor",
         "Layout/RedirectToLogin.razor",
@@ -3448,6 +3557,7 @@
         "_Imports.razor",
         "Pages/Counter.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Pages/Weather.razor",
         "Layout/MainLayout.razor",
         "Layout/MainLayout.razor.css",
@@ -3517,6 +3627,7 @@
         "App.razor",
         "_Imports.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Properties/launchSettings.json",
         "wwwroot/icon-192.png",
@@ -3537,6 +3648,7 @@
         "_Imports.razor",
         "Pages/Counter.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Pages/Weather.razor",
         "Layout/MainLayout.razor",
         "Layout/MainLayout.razor.css",
@@ -3601,6 +3713,7 @@
         "App.razor",
         "_Imports.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "wwwroot/icon-192.png",
         "wwwroot/index.html",
diff --git a/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
index 64b14d365deb..1bc5f9967561 100644
--- a/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
+++ b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
@@ -245,9 +245,8 @@ public static TheoryData<HtmlEncoder> HtmlEncoderDataLessNull
         get
         {
             var data = new TheoryData<HtmlEncoder>();
-            foreach (var row in HtmlEncoderData)
+            foreach (var encoder in HtmlEncoderData)
             {
-                var encoder = (HtmlEncoder)(row[0]);
                 if (encoder != null)
                 {
                     data.Add(encoder);
diff --git a/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs
index 120e0fe017b1..eb359ccc4104 100644
--- a/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs
+++ b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs
@@ -37,12 +37,12 @@ public async Task RunAsync_CallsInitPriorToProcessAsync()
         Assert.Equal(2, incrementer);
     }
 
-    public static TheoryData TagHelperOrderData
+    public static TheoryData<int[], int[]> TagHelperOrderData
     {
         get
         {
             // tagHelperOrders, expectedTagHelperOrders
-            return new TheoryData<int[], int[]>
+            return new()
                 {
                     {
                         new[] { 1000, int.MaxValue, 0 },
diff --git a/src/Razor/Razor.slnf b/src/Razor/Razor.slnf
index ac5fd0e69d74..1c80e7db80f4 100644
--- a/src/Razor/Razor.slnf
+++ b/src/Razor/Razor.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Razor\\Razor.Runtime\\src\\Microsoft.AspNetCore.Razor.Runtime.csproj",
       "src\\Razor\\Razor.Runtime\\test\\Microsoft.AspNetCore.Razor.Runtime.Test.csproj",
diff --git a/src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
index f32e6a466d47..771dc7faaa1a 100644
--- a/src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
+++ b/src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers;
 
 public class ReadOnlyTagHelperAttributeListTest
 {
-    public static TheoryData IndexOfNameData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, int> IndexOfNameData
     {
         get
         {
@@ -51,7 +51,7 @@ public void IndexOfName_ReturnsExpectedValue(
         Assert.Equal(expectedIndex, index);
     }
 
-    public static TheoryData IntIndexerData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, int, TagHelperAttribute> IntIndexerData
     {
         get
         {
@@ -91,7 +91,7 @@ public void IntIndexer_ReturnsExpectedAttribute(
         Assert.Equal(expectedAttribute, attribute, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData IntIndexerThrowData
+    public static TheoryData<int> IntIndexerThrowData
     {
         get
         {
@@ -115,7 +115,7 @@ public void IntIndexer_ThrowsIfInvalidIndex(int index)
         var exception = Assert.Throws<ArgumentOutOfRangeException>("index", () => attributes[index]);
     }
 
-    public static TheoryData StringIndexerData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, TagHelperAttribute> StringIndexerData
     {
         get
         {
@@ -202,7 +202,7 @@ public void Count_ReturnsNumberOfAttributes()
         Assert.Equal(3, count);
     }
 
-    public static TheoryData ContainsData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, TagHelperAttribute, bool> ContainsData
     {
         get
         {
@@ -310,7 +310,7 @@ public void Contains_ReturnsExpectedResult(
         Assert.Equal(expected, contains);
     }
 
-    public static TheoryData ContainsNameData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, bool> ContainsNameData
     {
         get
         {
@@ -386,7 +386,7 @@ public void ContainsName_ReturnsExpectedResult(
         Assert.Equal(expected, contains);
     }
 
-    public static TheoryData IndexOfData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, TagHelperAttribute, int> IndexOfData
     {
         get
         {
@@ -494,7 +494,7 @@ public void IndexOf_ReturnsExpectedResult(
         Assert.Equal(expected, index);
     }
 
-    public static TheoryData TryGetAttributeData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, TagHelperAttribute, bool> TryGetAttributeData
     {
         get
         {
@@ -566,7 +566,7 @@ public void TryGetAttribute_ReturnsExpectedValueAndAttribute(
         Assert.Equal(expectedAttribute, attribute, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData TryGetAttributesData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, IEnumerable<TagHelperAttribute>, bool> TryGetAttributesData
     {
         get
         {
diff --git a/src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs
index 5877d5f6394c..9d3af122c754 100644
--- a/src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs
+++ b/src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs
@@ -26,7 +26,7 @@ public void IntIndexer_GetsExpectedAttribute(
         Assert.Equal(expectedAttribute, attribute, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData IntIndexerSetData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, int, TagHelperAttribute, IEnumerable<TagHelperAttribute>> IntIndexerSetData
     {
         get
         {
@@ -125,7 +125,7 @@ public void StringIndexer_GetsExpectedAttribute(
         Assert.Equal(expectedAttribute, attribute, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData StringIndexerSetData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, object, IEnumerable<TagHelperAttribute>> StringIndexerSetData
     {
         get
         {
@@ -225,7 +225,7 @@ public void ICollection_IsReadOnly_ReturnsFalse()
         Assert.False(isReadOnly);
     }
 
-    public static TheoryData AddData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, TagHelperAttribute, IEnumerable<TagHelperAttribute>> AddData
     {
         get
         {
@@ -262,7 +262,7 @@ public void Add_AppendsAttributes(
         Assert.Equal(expectedAttributes, attributes, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData InsertData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, TagHelperAttribute, int, IEnumerable<TagHelperAttribute>> InsertData
     {
         get
         {
@@ -322,7 +322,7 @@ public void Insert_ThrowsWhenIndexIsOutOfRange()
             () => attributes.Insert(3, new TagHelperAttribute("c", "cb")));
     }
 
-    public static TheoryData CopyToData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, TagHelperAttribute[], int, IEnumerable<TagHelperAttribute>> CopyToData
     {
         get
         {
@@ -372,7 +372,7 @@ public void CopyTo_CopiesAttributes(
         Assert.Equal(expectedAttributes, attributeDestination, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData RemoveAllData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, string, IEnumerable<TagHelperAttribute>, bool> RemoveAllData
     {
         get
         {
@@ -444,7 +444,7 @@ public void RemoveAll_RemovesAllExpectedAttributes(
         Assert.Equal(expectedAttributes, attributes, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData RemoveData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, TagHelperAttribute, IEnumerable<TagHelperAttribute>, bool> RemoveData
     {
         get
         {
@@ -517,7 +517,7 @@ public void Remove_ReturnsExpectedValueAndRemovesFirstAttribute(
         Assert.Equal(expectedAttributes, attributes, CaseSensitiveTagHelperAttributeComparer.Default);
     }
 
-    public static TheoryData RemoveAtData
+    public static TheoryData<IEnumerable<TagHelperAttribute>, int, IEnumerable<TagHelperAttribute>> RemoveAtData
     {
         get
         {
diff --git a/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs
index 10a023825330..f80efdf608f3 100644
--- a/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs
+++ b/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs
@@ -164,9 +164,8 @@ public static TheoryData<bool, HtmlEncoder> UseCachedResultAndHtmlEncoderData
             var data = new TheoryData<bool, HtmlEncoder>();
             foreach (var useCachedResult in new[] { false, true })
             {
-                foreach (var encoderEntry in HtmlEncoderData)
+                foreach (var encoder in HtmlEncoderData)
                 {
-                    var encoder = (HtmlEncoder)(encoderEntry[0]);
                     data.Add(useCachedResult, encoder);
                 }
             }
diff --git a/src/Security/AuthSamples.slnf b/src/Security/AuthSamples.slnf
index b964add6fbc7..3b8175db74dd 100644
--- a/src/Security/AuthSamples.slnf
+++ b/src/Security/AuthSamples.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Security\\test\\AuthSamples.FunctionalTests\\AuthSamples.FunctionalTests.csproj",
       "src\\Security\\samples\\Cookies\\Cookies.csproj",
diff --git a/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs b/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs
index 8f8873057027..de74d6e5bf7c 100644
--- a/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs
+++ b/src/Security/Authentication/Certificate/src/CertificateAuthenticationHandler.cs
@@ -135,21 +135,35 @@ private async Task<AuthenticateResult> ValidateCertificateAsync(X509Certificate2
         }
 
         var chainPolicy = BuildChainPolicy(clientCertificate, isCertificateSelfSigned);
-        using var chain = new X509Chain
+        var chain = new X509Chain
         {
             ChainPolicy = chainPolicy
         };
 
-        var certificateIsValid = chain.Build(clientCertificate);
-        if (!certificateIsValid)
+        try
+        {
+            var certificateIsValid = chain.Build(clientCertificate);
+            if (!certificateIsValid)
+            {
+                var chainErrors = new List<string>(chain.ChainStatus.Length);
+                foreach (var validationFailure in chain.ChainStatus)
+                {
+                    chainErrors.Add($"{validationFailure.Status} {validationFailure.StatusInformation}");
+                }
+                Logger.CertificateFailedValidation(clientCertificate.Subject, chainErrors);
+                return AuthenticateResults.InvalidClientCertificate;
+            }
+        }
+        finally
         {
-            var chainErrors = new List<string>(chain.ChainStatus.Length);
-            foreach (var validationFailure in chain.ChainStatus)
+            // Disposing the chain does not dispose the elements we potentially built.
+            // Do the full walk manually to dispose.
+            for (var i = 0; i < chain.ChainElements.Count; i++)
             {
-                chainErrors.Add($"{validationFailure.Status} {validationFailure.StatusInformation}");
+                chain.ChainElements[i].Certificate.Dispose();
             }
-            Logger.CertificateFailedValidation(clientCertificate.Subject, chainErrors);
-            return AuthenticateResults.InvalidClientCertificate;
+
+            chain.Dispose();
         }
 
         var certificateValidatedContext = new CertificateValidatedContext(Context, Scheme, Options)
diff --git a/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs b/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs
index 693dd5da942a..cdb6598cf62a 100644
--- a/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs
+++ b/src/Security/Authentication/Certificate/src/CertificateAuthenticationOptions.cs
@@ -10,6 +10,14 @@ namespace Microsoft.AspNetCore.Authentication.Certificate;
 /// </summary>
 public class CertificateAuthenticationOptions : AuthenticationSchemeOptions
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="CertificateAuthenticationOptions"/>.
+    /// </summary>
+    public CertificateAuthenticationOptions()
+    {
+        Events = new CertificateAuthenticationEvents();
+    }
+
     /// <summary>
     /// Value indicating the types of certificates accepted by the authentication middleware.
     /// </summary>
diff --git a/src/Security/Authentication/Certificate/src/PACKAGE.md b/src/Security/Authentication/Certificate/src/PACKAGE.md
new file mode 100644
index 000000000000..40c7760a1811
--- /dev/null
+++ b/src/Security/Authentication/Certificate/src/PACKAGE.md
@@ -0,0 +1,42 @@
+## About
+
+`Microsoft.AspNetCore.Authentication.Certificate` provides ASP.NET Core middleware that enables an application to support certificate authentication.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Authentication.Certificate`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Authentication.Certificate
+```
+
+### Configuration
+
+1. Acquire an HTTPS certificate, install it, and [configure your server](https://learn.microsoft.com/aspnet/core/security/authentication/certauth#configure-your-server-to-require-certificates) to require certificates
+2. Configure the middleware in your APS.NET Core app's `Program.cs`:
+    ```csharp
+    var builder = WebApplication.CreateBuilder(args);
+
+    builder.Services.AddAuthentication(
+            CertificateAuthenticationDefaults.AuthenticationScheme)
+        .AddCertificate();
+
+    var app = builder.Build();
+
+    app.UseAuthentication();
+    ```
+
+## Main Types
+
+* `CertificateAuthenticationOptions`: Provides options to configure certificate authentication
+* `ICertificateValidationCache`: Provides a cache used to store `AuthenticateResult` results after the certificate has been validated
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/certauth) on certificate authentication in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Authentication.Certificate` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs b/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs
index be47982a28dd..35a73901c06b 100644
--- a/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs
+++ b/src/Security/Authentication/Cookies/src/CookieAuthenticationEvents.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Authentication.Cookies;
@@ -11,6 +12,8 @@ namespace Microsoft.AspNetCore.Authentication.Cookies;
 /// </summary>
 public class CookieAuthenticationEvents
 {
+    private static readonly bool _ignoreCookieRedirectMetadata = AppContext.TryGetSwitch("Microsoft.AspNetCore.Authentication.Cookies.IgnoreRedirectMetadata", out var isEnabled) && isEnabled;
+
     /// <summary>
     /// Invoked to validate the principal.
     /// </summary>
@@ -41,7 +44,7 @@ public class CookieAuthenticationEvents
     /// </summary>
     public Func<RedirectContext<CookieAuthenticationOptions>, Task> OnRedirectToLogin { get; set; } = context =>
     {
-        if (IsAjaxRequest(context.Request))
+        if (IsAjaxRequest(context.Request) || IsCookieRedirectDisabledByMetadata(context.HttpContext))
         {
             context.Response.Headers.Location = context.RedirectUri;
             context.Response.StatusCode = 401;
@@ -58,7 +61,7 @@ public class CookieAuthenticationEvents
     /// </summary>
     public Func<RedirectContext<CookieAuthenticationOptions>, Task> OnRedirectToAccessDenied { get; set; } = context =>
     {
-        if (IsAjaxRequest(context.Request))
+        if (IsAjaxRequest(context.Request) || IsCookieRedirectDisabledByMetadata(context.HttpContext))
         {
             context.Response.Headers.Location = context.RedirectUri;
             context.Response.StatusCode = 403;
@@ -108,6 +111,18 @@ private static bool IsAjaxRequest(HttpRequest request)
             string.Equals(request.Headers.XRequestedWith, "XMLHttpRequest", StringComparison.Ordinal);
     }
 
+    private static bool IsCookieRedirectDisabledByMetadata(HttpContext context)
+    {
+        if (_ignoreCookieRedirectMetadata)
+        {
+            return false;
+        }
+
+        var endpoint = context.GetEndpoint();
+        return endpoint?.Metadata.GetMetadata<IDisableCookieRedirectMetadata>() is not null &&
+            endpoint?.Metadata.GetMetadata<IAllowCookieRedirectMetadata>() is null;
+    }
+
     /// <summary>
     /// Invoked to validate the principal.
     /// </summary>
diff --git a/src/Security/Authentication/Core/src/AuthenticationHandler.cs b/src/Security/Authentication/Core/src/AuthenticationHandler.cs
index b3b31deed689..2695e668cd57 100644
--- a/src/Security/Authentication/Core/src/AuthenticationHandler.cs
+++ b/src/Security/Authentication/Core/src/AuthenticationHandler.cs
@@ -205,7 +205,7 @@ protected string BuildRedirectUri(string targetPath)
     {
         var target = scheme ?? Options.ForwardDefaultSelector?.Invoke(Context) ?? Options.ForwardDefault;
 
-        // Prevent self targetting
+        // Prevent self targeting
         return string.Equals(target, Scheme.Name, StringComparison.Ordinal)
             ? null
             : target;
@@ -290,9 +290,9 @@ protected virtual Task HandleForbiddenAsync(AuthenticationProperties properties)
     }
 
     /// <summary>
-    /// Override this method to deal with 401 challenge concerns, if an authentication scheme in question
-    /// deals an authentication interaction as part of it's request flow. (like adding a response header, or
-    /// changing the 401 result to 302 of a login page or external sign-in location.)
+    /// Override this method to deal with 401 challenge concerns if an authentication scheme in question
+    /// deals an authentication interaction as part of its request flow (like adding a response header, or
+    /// changing the 401 result to 302 of a login page or external sign-in location).
     /// </summary>
     /// <param name="properties"></param>
     /// <returns>A Task.</returns>
diff --git a/src/Security/Authentication/Core/src/PublicAPI.Shipped.txt b/src/Security/Authentication/Core/src/PublicAPI.Shipped.txt
index 60afaccaae7e..b5645be6d907 100644
--- a/src/Security/Authentication/Core/src/PublicAPI.Shipped.txt
+++ b/src/Security/Authentication/Core/src/PublicAPI.Shipped.txt
@@ -177,7 +177,7 @@ Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Principal.get -> Sys
 Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Principal.set -> void
 Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Properties.get -> Microsoft.AspNetCore.Authentication.AuthenticationProperties!
 Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Properties.set -> void
-Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Result.get -> Microsoft.AspNetCore.Authentication.AuthenticateResult!
+Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Result.get -> Microsoft.AspNetCore.Authentication.AuthenticateResult?
 Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.ResultContext(Microsoft.AspNetCore.Http.HttpContext! context, Microsoft.AspNetCore.Authentication.AuthenticationScheme! scheme, TOptions! options) -> void
 Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Success() -> void
 Microsoft.AspNetCore.Authentication.SecureDataFormat<TData>
diff --git a/src/Security/Authentication/Core/src/PublicAPI.Unshipped.txt b/src/Security/Authentication/Core/src/PublicAPI.Unshipped.txt
index 20cf9128f85d..7dc5c58110bf 100644
--- a/src/Security/Authentication/Core/src/PublicAPI.Unshipped.txt
+++ b/src/Security/Authentication/Core/src/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-*REMOVED*Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Result.get -> Microsoft.AspNetCore.Authentication.AuthenticateResult!
-Microsoft.AspNetCore.Authentication.ResultContext<TOptions>.Result.get -> Microsoft.AspNetCore.Authentication.AuthenticateResult?
diff --git a/src/Security/Authentication/Facebook/src/FacebookDefaults.cs b/src/Security/Authentication/Facebook/src/FacebookDefaults.cs
index f1ff992ce5a2..d62c2221dc12 100644
--- a/src/Security/Authentication/Facebook/src/FacebookDefaults.cs
+++ b/src/Security/Authentication/Facebook/src/FacebookDefaults.cs
@@ -24,15 +24,15 @@ public static class FacebookDefaults
     /// <remarks>
     /// For more details about this endpoint, see <see href="https://developers.facebook.com/docs/facebook-login/manually-build-a-login-flow#login"/>.
     /// </remarks>
-    public static readonly string AuthorizationEndpoint = "https://www.facebook.com/v14.0/dialog/oauth";
+    public static readonly string AuthorizationEndpoint = "https://www.facebook.com/v22.0/dialog/oauth";
 
     /// <summary>
     /// The OAuth endpoint used to retrieve access tokens.
     /// </summary>
-    public static readonly string TokenEndpoint = "https://graph.facebook.com/v14.0/oauth/access_token";
+    public static readonly string TokenEndpoint = "https://graph.facebook.com/v22.0/oauth/access_token";
 
     /// <summary>
     /// The Facebook Graph API endpoint that is used to gather additional user information.
     /// </summary>
-    public static readonly string UserInformationEndpoint = "https://graph.facebook.com/v14.0/me";
+    public static readonly string UserInformationEndpoint = "https://graph.facebook.com/v22.0/me";
 }
diff --git a/src/Security/Authentication/Facebook/src/PACKAGE.md b/src/Security/Authentication/Facebook/src/PACKAGE.md
new file mode 100644
index 000000000000..a0caa53a47ba
--- /dev/null
+++ b/src/Security/Authentication/Facebook/src/PACKAGE.md
@@ -0,0 +1,44 @@
+## About
+
+`Microsoft.AspNetCore.Authentication.Facebook` provides ASP.NET Core middleware that enables an application to support Facebook's OAuth 2.0 authentication workflow.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Authentication.Facebook`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Authentication.Facebook
+```
+
+### Configuration
+
+1. Refer to the guide in the official documentation [here](https://learn.microsoft.com/aspnet/core/security/authentication/social/facebook-logins#create-the-app-in-facebook) to create the app in Facebook.
+2. Follow the steps in the official documentation [here](https://learn.microsoft.com/aspnet/core/security/authentication/social/facebook-logins#store-the-facebook-app-id-and-secret) to store the Facebook app ID and secret.
+3. Configure the middleware your ASP.NET Core app's `Program.cs`:
+```csharp
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddAuthentication()
+    .AddFacebook(options =>
+    {
+        options.AppId = Configuration["Authentication:Facebook:AppId"];
+        options.AppSecret = Configuration["Authentication:Facebook:AppSecret"];
+    });
+```
+
+## Main Types
+
+The main types provided by this package are:
+
+* `FacebookOptions`: Represents the options for configuring Facebook authentication
+* `FacebookHandler`: The authentication handler responsible for processing Facebook authentication requests and generating the appropriate authentication ticket
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/social/facebook-logins) on Facebook login setup in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Authentication.Facebook` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
index 8180fa0c1172..37895a9e912d 100644
--- a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
+++ b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>ASP.NET Core contains middleware to support Google's OpenId and OAuth 2.0 authentication workflows.</Description>
+    <Description>ASP.NET Core contains middleware to support Google's OAuth 2.0 authentication workflow.</Description>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;authentication;security</PackageTags>
diff --git a/src/Security/Authentication/Google/src/PACKAGE.md b/src/Security/Authentication/Google/src/PACKAGE.md
new file mode 100644
index 000000000000..047d7021a48b
--- /dev/null
+++ b/src/Security/Authentication/Google/src/PACKAGE.md
@@ -0,0 +1,43 @@
+## About
+
+`Microsoft.AspNetCore.Authentication.Google` contains middleware to support Google's OAuth 2.0 authentication workflow.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Authentication.Google`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Authentication.Google
+```
+
+### Configuration
+
+1. Refer to the guide in the official documentation [here](https://learn.microsoft.com/aspnet/core/security/authentication/social/google-logins#create-the-google-oauth-20-client-id-and-secret) to configure the Google OAuth 2.0 client ID and secret
+2. Follow the steps in the official documentation [here](https://learn.microsoft.com/aspnet/core/security/authentication/social/google-logins#store-the-google-client-id-and-secret) to store the Google client ID and secret
+3. Add the Authentication service to your app's `Program.cs`:
+    ```csharp
+    var builder = WebApplication.CreateBuilder(args);
+
+    builder.Services.AddAuthentication().AddGoogle(googleOptions =>
+    {
+        googleOptions.ClientId = builder.Configuration["Authentication:Google:ClientId"];
+        googleOptions.ClientSecret = builder.Configuration["Authentication:Google:ClientSecret"];
+    });
+    ```
+
+## Main Types
+
+The main types provided by this package are:
+
+* `GoogleOptions`: Represents the options for configuring Google authentication
+* `GoogleHandler`: The authentication handler responsible for processing Google authentication requests and generating the appropriate authentication ticket
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/social/google-logins) on Google login setup in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Authentication.Google` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs
index 6ce4d6014bbb..1ec03cca626c 100644
--- a/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs
+++ b/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs
@@ -72,7 +72,7 @@ public void Configure(string? name, JwtBearerOptions options)
             ValidAudiences = audiences,
             ValidAudience = audience,
             ValidateIssuerSigningKey = true,
-            IssuerSigningKeys = GetIssuerSigningKeys(configSection, issuers),
+            IssuerSigningKeys = GetIssuerSigningKeys(configSection, [issuer, ..issuers]),
         };
     }
 
diff --git a/src/Security/Authentication/JwtBearer/src/JwtBearerOptions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerOptions.cs
index f5b56ed32531..c4142a40da73 100644
--- a/src/Security/Authentication/JwtBearer/src/JwtBearerOptions.cs
+++ b/src/Security/Authentication/JwtBearer/src/JwtBearerOptions.cs
@@ -32,6 +32,7 @@ public JwtBearerOptions()
         SecurityTokenValidators = new List<ISecurityTokenValidator> { _defaultHandler };
 #pragma warning restore CS0618 // Type or member is obsolete
         TokenHandlers = new List<TokenHandler> { _defaultTokenHandler };
+        Events = new JwtBearerEvents();
     }
 
     /// <summary>
diff --git a/src/Security/Authentication/MicrosoftAccount/src/PACKAGE.md b/src/Security/Authentication/MicrosoftAccount/src/PACKAGE.md
new file mode 100644
index 000000000000..2f91b46c1660
--- /dev/null
+++ b/src/Security/Authentication/MicrosoftAccount/src/PACKAGE.md
@@ -0,0 +1,42 @@
+## About
+
+`Microsoft.AspNetCore.Authentication.MicrosoftAccount` provides ASP.NET Core middleware that enables applications to support the Microsoft Account authentication workflow.
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Authentication.MicrosoftAccount`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Authentication.MicrosoftAccount
+```
+
+### Configuration
+
+1. Refer to the guide in the official documentation [here](https://learn.microsoft.com/aspnet/core/security/authentication/social/microsoft-logins#create-the-app-in-microsoft-developer-portal) to create the app in Microsoft Developer Portal
+2. Follow the steps in the official documentation [here](https://learn.microsoft.com/aspnet/core/security/authentication/social/microsoft-logins#store-the-microsoft-client-id-and-secret) to store the Microsoft client ID and secret
+3. Add the Authentication service to your app's `Program.cs`:
+    ```csharp
+    var builder = WebApplication.CreateBuilder(args);
+
+    builder.Services.AddAuthentication().AddMicrosoftAccount(microsoftOptions =>
+    {
+        microsoftOptions.ClientId = builder.Configuration["Authentication:Microsoft:ClientId"];
+        microsoftOptions.ClientSecret = builder.Configuration["Authentication:Microsoft:ClientSecret"];
+    });
+    ```
+
+## Main Types
+
+The main types provided by this package are:
+* `MicrosoftAccountOptions`: Represents the options for configuring Microsoft Account authentication
+* `MicrosoftAccountHandler`: The authentication handler responsible for processing Microsoft Account authentication requests and generating the appropriate authentication ticket
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/social/microsoft-logins) on Microsoft Account login setup in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Authentication.MicrosoftAccount` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs b/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs
index c0fdeba9c553..45d3973a140f 100644
--- a/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs
+++ b/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs
@@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate;
 internal static partial class LdapAdapter
 {
     [GeneratedRegex(@"(?<![^\\]\\),")]
-    internal static partial Regex DistinguishedNameSeparator();
-    
+    internal static partial Regex DistinguishedNameSeparatorRegex { get; }
+
     public static async Task RetrieveClaimsAsync(LdapSettings settings, ClaimsIdentity identity, ILogger logger)
     {
         var user = identity.Name!;
@@ -66,7 +66,7 @@ public static async Task RetrieveClaimsAsync(LdapSettings settings, ClaimsIdenti
             {
                 // Example distinguished name: CN=TestGroup,DC=KERB,DC=local
                 var groupDN = $"{Encoding.UTF8.GetString((byte[])group)}";
-                var groupCN = DistinguishedNameSeparator().Split(groupDN)[0].Substring("CN=".Length);
+                var groupCN = DistinguishedNameSeparatorRegex.Split(groupDN)[0].Substring("CN=".Length);
 
                 if (!settings.IgnoreNestedGroups)
                 {
@@ -124,7 +124,7 @@ private static void GetNestedGroups(LdapConnection connection, ClaimsIdentity pr
                 foreach (var member in memberof)
                 {
                     var nestedGroupDN = $"{Encoding.UTF8.GetString((byte[])member)}";
-                    var nestedGroupCN = DistinguishedNameSeparator().Split(nestedGroupDN)[0].Substring("CN=".Length);
+                    var nestedGroupCN = DistinguishedNameSeparatorRegex.Split(nestedGroupDN)[0].Substring("CN=".Length);
 
                     if (processedGroups.Contains(nestedGroupDN))
                     {
diff --git a/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs b/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs
index b1909d52ccfb..ace68994281e 100644
--- a/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs
+++ b/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs
@@ -126,10 +126,7 @@ public async Task<bool> HandleRequestAsync()
                 Logger.Reauthenticating();
                 _negotiateState.Dispose();
                 _negotiateState = null;
-                if (persistence != null)
-                {
-                    persistence.State = null;
-                }
+                persistence?.State = null;
             }
 
             _negotiateState ??= Options.StateFactory.CreateInstance();
diff --git a/src/Security/Authentication/Negotiate/src/NegotiateOptions.cs b/src/Security/Authentication/Negotiate/src/NegotiateOptions.cs
index b170eeb6b7e4..b4fe727ad813 100644
--- a/src/Security/Authentication/Negotiate/src/NegotiateOptions.cs
+++ b/src/Security/Authentication/Negotiate/src/NegotiateOptions.cs
@@ -8,6 +8,14 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate;
 /// </summary>
 public class NegotiateOptions : AuthenticationSchemeOptions
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="NegotiateOptions"/>.
+    /// </summary>
+    public NegotiateOptions()
+    {
+        Events = new NegotiateEvents();
+    }
+
     /// <summary>
     /// The object provided by the application to process events raised by the negotiate authentication handler.
     /// The application may use the existing NegotiateEvents instance and assign delegates only to the events it
diff --git a/src/Security/Authentication/Negotiate/src/PACKAGE.md b/src/Security/Authentication/Negotiate/src/PACKAGE.md
new file mode 100644
index 000000000000..ef5b90a67732
--- /dev/null
+++ b/src/Security/Authentication/Negotiate/src/PACKAGE.md
@@ -0,0 +1,42 @@
+## About
+
+`Microsoft.AspNetCore.Authentication.Negotiate` contains an authentication handler used to authenticate requests using Windows Authentication (also known as Negotiate, Kerberos, or NTLM).
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Authentication.Negotiate`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Authentication.Negotiate
+```
+
+### Configuration
+
+To use the middleware, configure it in your ASP.NET Core app's `Program.cs`:
+
+```csharp
+builder.Services.AddAuthentication(NegotiateDefaults.AuthenticationScheme)
+   .AddNegotiate();
+
+builder.Services.AddAuthorization();
+
+var app = builder.Build();
+
+Next, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/windowsauth) for configuration details specific to your app's web server.
+
+## Main Types
+
+The main types provided by this package are:
+
+* `NegotiateOptions`: Represents the options for configuring Negotiate Authentication handler behavior
+* `NegotiateHandler`: The authentication handler responsible for processing Negotiate authentication requests and generating the appropriate authentication ticket
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/security/authentication/windowsauth) on Windows Authentication in ASP.NET Core.
+
+## Feedback &amp; Contributing
+
+`Microsoft.AspNetCore.Authentication.Negotiate` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.Test/LdapAdapterTests.cs b/src/Security/Authentication/Negotiate/test/Negotiate.Test/LdapAdapterTests.cs
index 03908ad85ca0..415ad540ab1f 100644
--- a/src/Security/Authentication/Negotiate/test/Negotiate.Test/LdapAdapterTests.cs
+++ b/src/Security/Authentication/Negotiate/test/Negotiate.Test/LdapAdapterTests.cs
@@ -8,7 +8,7 @@ public class LdapAdapterTests
     [Fact]
     public void DistinguishedNameWithoutCommasSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split("Testing group - City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split("Testing group - City");
 
         Assert.Equal(new[] { "Testing group - City" }, parts);
     }
@@ -16,7 +16,7 @@ public void DistinguishedNameWithoutCommasSuccess()
     [Fact]
     public void DistinguishedNameWithEscapedCommaSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split(@"Testing group\,City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split(@"Testing group\,City");
 
         Assert.Equal(new[] { @"Testing group\,City" }, parts);
     }
@@ -24,7 +24,7 @@ public void DistinguishedNameWithEscapedCommaSuccess()
     [Fact]
     public void DistinguishedNameWithNotEscapedCommaSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split("Testing group,City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split("Testing group,City");
 
         Assert.Equal(new[] { "Testing group", "City" }, parts);
     }
@@ -32,7 +32,7 @@ public void DistinguishedNameWithNotEscapedCommaSuccess()
     [Fact]
     public void DistinguishedNameWithEscapedBackslashAndNotEscapedCommaSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split(@"Testing group\\,City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split(@"Testing group\\,City");
 
         Assert.Equal(new[] { @"Testing group\\", "City" }, parts);
     }
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.Test/NegotiateHandlerTests.cs b/src/Security/Authentication/Negotiate/test/Negotiate.Test/NegotiateHandlerTests.cs
index f84b5b5b5771..df34ce9a84ad 100644
--- a/src/Security/Authentication/Negotiate/test/Negotiate.Test/NegotiateHandlerTests.cs
+++ b/src/Security/Authentication/Negotiate/test/Negotiate.Test/NegotiateHandlerTests.cs
@@ -20,6 +20,13 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate;
 
 public class NegotiateHandlerTests
 {
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new NegotiateOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task Anonymous_MissingConnectionFeatures_ThrowsNotSupported()
     {
@@ -102,7 +109,7 @@ public async Task NtlmStage2Auth_WithoutStage1_Throws()
         var server = host.GetTestServer();
 
         var ex = await Assert.ThrowsAsync<TrueException>(() => SendAsync(server, "/404", new TestConnection(), "Negotiate ClientNtlmBlob2"));
-        Assert.Equal("Stage1Complete", ex.UserMessage);
+        Assert.Equal("Stage1Complete", ex.Message);
     }
 
     [Theory]
diff --git a/src/Security/Authentication/OAuth/src/PublicAPI.Shipped.txt b/src/Security/Authentication/OAuth/src/PublicAPI.Shipped.txt
index bacde21f2131..9d367bd9c89d 100644
--- a/src/Security/Authentication/OAuth/src/PublicAPI.Shipped.txt
+++ b/src/Security/Authentication/OAuth/src/PublicAPI.Shipped.txt
@@ -62,6 +62,7 @@ Microsoft.AspNetCore.Authentication.OAuth.OAuthHandler<TOptions>.Events.set -> v
 Microsoft.AspNetCore.Authentication.OAuth.OAuthHandler<TOptions>.OAuthHandler(Microsoft.Extensions.Options.IOptionsMonitor<TOptions!>! options, Microsoft.Extensions.Logging.ILoggerFactory! logger, System.Text.Encodings.Web.UrlEncoder! encoder) -> void
 Microsoft.AspNetCore.Authentication.OAuth.OAuthHandler<TOptions>.OAuthHandler(Microsoft.Extensions.Options.IOptionsMonitor<TOptions!>! options, Microsoft.Extensions.Logging.ILoggerFactory! logger, System.Text.Encodings.Web.UrlEncoder! encoder, Microsoft.AspNetCore.Authentication.ISystemClock! clock) -> void
 Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions
+Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions.AdditionalAuthorizationParameters.get -> System.Collections.Generic.IDictionary<string!, string!>!
 Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions.AuthorizationEndpoint.get -> string!
 Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions.AuthorizationEndpoint.set -> void
 Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions.ClaimActions.get -> Microsoft.AspNetCore.Authentication.OAuth.Claims.ClaimActionCollection!
diff --git a/src/Security/Authentication/OAuth/src/PublicAPI.Unshipped.txt b/src/Security/Authentication/OAuth/src/PublicAPI.Unshipped.txt
index bc2cd3195c2c..7dc5c58110bf 100644
--- a/src/Security/Authentication/OAuth/src/PublicAPI.Unshipped.txt
+++ b/src/Security/Authentication/OAuth/src/PublicAPI.Unshipped.txt
@@ -1,2 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions.AdditionalAuthorizationParameters.get -> System.Collections.Generic.IDictionary<string!, string!>!
diff --git a/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs
index fb20d8918cb4..716126163e04 100644
--- a/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs
+++ b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs
@@ -493,7 +493,7 @@ private async Task HandleChallengeAsyncInternal(AuthenticationProperties propert
                 // Push if endpoint is in disco
                 if (!string.IsNullOrEmpty(parEndpoint))
                 {
-                    await PushAuthorizationRequest(message, properties);
+                    await PushAuthorizationRequest(message, properties, parEndpoint);
                 }
 
                 break;
@@ -508,14 +508,13 @@ private async Task HandleChallengeAsyncInternal(AuthenticationProperties propert
                 break;
             case PushedAuthorizationBehavior.Require:
                 // Fail if required in options but unavailable in disco
-                var endpointIsConfigured = !string.IsNullOrEmpty(parEndpoint);
-                if (!endpointIsConfigured)
+                if (string.IsNullOrEmpty(parEndpoint))
                 {
                     throw new InvalidOperationException("Pushed authorization is required by the OpenIdConnectOptions.PushedAuthorizationBehavior, but no pushed authorization endpoint is available.");
                 }
 
                 // Otherwise push
-                await PushAuthorizationRequest(message, properties);
+                await PushAuthorizationRequest(message, properties, parEndpoint);
                 break;
         }
 
@@ -550,8 +549,10 @@ private async Task HandleChallengeAsyncInternal(AuthenticationProperties propert
         throw new NotImplementedException($"An unsupported authentication method has been configured: {Options.AuthenticationMethod}");
     }
 
-    private async Task PushAuthorizationRequest(OpenIdConnectMessage authorizeRequest, AuthenticationProperties properties)
+    private async Task PushAuthorizationRequest(OpenIdConnectMessage authorizeRequest, AuthenticationProperties properties, string parEndpoint)
     {
+        ArgumentException.ThrowIfNullOrEmpty(parEndpoint);
+
         // Build context and run event
         var parRequest = authorizeRequest.Clone();
         var context = new PushedAuthorizationContext(Context, Scheme, Options, parRequest, properties);
@@ -579,20 +580,15 @@ private async Task PushAuthorizationRequest(OpenIdConnectMessage authorizeReques
             Logger.PushAuthorizationSkippedPush();
             return;
         }
+
         // ... or handle pushing to the par endpoint itself, in which case it will supply the request uri
-        else if (context.HandledPush)
+        if (context.HandledPush)
         {
             Logger.PushAuthorizationHandledPush();
             requestUri = context.RequestUri;
         }
         else
         {
-            var parEndpoint = _configuration?.PushedAuthorizationRequestEndpoint;
-            if (string.IsNullOrEmpty(parEndpoint))
-            {
-                new InvalidOperationException("Attempt to push authorization with no pushed authorization endpoint configured.");
-            }
-
             var requestMessage = new HttpRequestMessage(HttpMethod.Post, parEndpoint);
             requestMessage.Content = new FormUrlEncodedContent(parRequest.Parameters);
             requestMessage.Version = Backchannel.DefaultRequestVersion;
diff --git a/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectOptions.cs b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectOptions.cs
index aa1b69caa61c..600d9a1deb52 100644
--- a/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectOptions.cs
+++ b/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectOptions.cs
@@ -410,7 +410,7 @@ public bool MapInboundClaims
     public bool UseSecurityTokenValidator { get; set; }
 
     /// <summary>
-    /// Controls wether the handler should push authorization parameters on the
+    /// Controls whether the handler should push authorization parameters on the
     /// backchannel before redirecting to the identity provider. See <see
     /// href="https://tools.ietf.org/html/9126"/>.
     /// </summary>
diff --git a/src/Security/Authentication/OpenIdConnect/src/PACKAGE.md b/src/Security/Authentication/OpenIdConnect/src/PACKAGE.md
new file mode 100644
index 000000000000..352189e1a36b
--- /dev/null
+++ b/src/Security/Authentication/OpenIdConnect/src/PACKAGE.md
@@ -0,0 +1,77 @@
+## About
+
+`Microsoft.AspNetCore.Authentication.OpenIdConnect` provides middleware that enables an application to support the OpenID Connect authentication workflow.
+
+## Key Features
+
+* Single sign-on and single sign-out support
+* Integration with external identity providers
+* Token validation and management
+* Configuration and mapping of user claims
+
+## How to Use
+
+To use `Microsoft.AspNetCore.Authentication.OpenIdConnect`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.Authentication.OpenIdConnect
+```
+
+### Configuration
+
+To configure `Microsoft.AspNetCore.Authentication.OpenIdConnect`, you need to add the necessary services and middleware to your application.
+
+1. In the `Program.cs` of your ASP.NET Core app, add the following code to register the OpenID Connect authentication services:
+    ```csharp
+    builder.Services
+        .AddAuthentication(options =>
+        {
+            options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+            options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
+        })
+        .AddCookie()
+        .AddOpenIdConnect(options =>
+        {
+            // Configure the authentication options
+            options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+            options.Authority = "your-identity-provider";
+            options.ClientId = "your-client-id";
+            options.ClientSecret = "your-client-secret-from-user-secrets-or-keyvault";
+            options.ResponseType = "code";
+            options.Scope.Add("profile");
+            options.SaveTokens = true;
+        });
+    ```
+
+    Make sure to replace `your-identity-provider`, `your-client-id`, and `your-client-secret-from-user-secrets-or-keyvault`, with the appropriate values for your application and identity provider.
+
+2. Add the following code to enable the OpenID Connect authentication middleware:
+    ```csharp
+    var app = builder.Build();
+
+    app.UseAuthentication();
+    ```
+    This ensures that the authentication middleware is added to the request pipeline.
+
+## Main Types
+
+The main types provided by `Microsoft.AspNetCore.Authentication.OpenIdConnect` are:
+
+* `OpenIdConnectOptions`: Represents the options for configuring the OpenID Connect authentication middleware
+* `OpenIdConnectEvents`: Provides event handlers for various stages of the OpenID Connect authentication workflow
+
+For more information on these types and their usage, refer to the [official documentation](https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.authentication.openidconnect).
+
+## Additional Documentation
+
+For additional documentation on using OpenID Connect authentication in ASP.NET Core, you can refer to the following resources:
+
+* [ASP.NET Core Authentication](https://learn.microsoft.com/aspnet/core/security/authentication)
+* [OpenID Connect](https://openid.net/developers/how-connect-works)
+* [Entra ID documentation](https://learn.microsoft.com/entra/identity)
+
+## Feedback & Contributing
+
+`Microsoft.AspNetCore.Authentication.OpenIdConnect` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Shipped.txt b/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Shipped.txt
index 343d64c3d2cc..d9ad22d7cf28 100644
--- a/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Shipped.txt
+++ b/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Shipped.txt
@@ -46,6 +46,8 @@ Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnAuthoriz
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnAuthorizationCodeReceived.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnMessageReceived.get -> System.Func<Microsoft.AspNetCore.Authentication.OpenIdConnect.MessageReceivedContext!, System.Threading.Tasks.Task!>!
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnMessageReceived.set -> void
+Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnPushAuthorization.get -> System.Func<Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext!, System.Threading.Tasks.Task!>!
+Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnPushAuthorization.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnRedirectToIdentityProvider.get -> System.Func<Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext!, System.Threading.Tasks.Task!>!
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnRedirectToIdentityProvider.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnRedirectToIdentityProviderForSignOut.get -> System.Func<Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext!, System.Threading.Tasks.Task!>!
@@ -69,6 +71,7 @@ Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectHandler.HtmlEncod
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectHandler.OpenIdConnectHandler(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions!>! options, Microsoft.Extensions.Logging.ILoggerFactory! logger, System.Text.Encodings.Web.HtmlEncoder! htmlEncoder, System.Text.Encodings.Web.UrlEncoder! encoder) -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectHandler.OpenIdConnectHandler(Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions!>! options, Microsoft.Extensions.Logging.ILoggerFactory! logger, System.Text.Encodings.Web.HtmlEncoder! htmlEncoder, System.Text.Encodings.Web.UrlEncoder! encoder, Microsoft.AspNetCore.Authentication.ISystemClock! clock) -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions
+Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.AdditionalAuthorizationParameters.get -> System.Collections.Generic.IDictionary<string!, string!>!
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.AuthenticationMethod.get -> Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.AuthenticationMethod.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.Authority.get -> string?
@@ -103,6 +106,8 @@ Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.Prompt.ge
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.Prompt.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.ProtocolValidator.get -> Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectProtocolValidator!
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.ProtocolValidator.set -> void
+Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.PushedAuthorizationBehavior.get -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
+Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.PushedAuthorizationBehavior.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.RefreshInterval.get -> System.TimeSpan
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.RefreshInterval.set -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.RefreshOnIssuerKeyNotFound.get -> bool
@@ -148,6 +153,20 @@ Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectPostConfigureOpti
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior.FormPost = 1 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior
 Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior.RedirectGet = 0 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior.Disable = 1 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior.Require = 2 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior.UseIfAvailable = 0 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandleClientAuthentication() -> void
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandledClientAuthentication.get -> bool
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandledPush.get -> bool
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandlePush(string! requestUri) -> void
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.ProtocolMessage.get -> Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage!
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.PushedAuthorizationContext(Microsoft.AspNetCore.Http.HttpContext! context, Microsoft.AspNetCore.Authentication.AuthenticationScheme! scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions! options, Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage! parRequest, Microsoft.AspNetCore.Authentication.AuthenticationProperties! properties) -> void
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.RequestUri.get -> string?
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.SkippedPush.get -> bool
+Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.SkipPush() -> void
 Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext
 Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext.Handled.get -> bool
 Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext.HandleResponse() -> void
@@ -203,6 +222,7 @@ static readonly Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectD
 virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.AuthenticationFailed(Microsoft.AspNetCore.Authentication.OpenIdConnect.AuthenticationFailedContext! context) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.AuthorizationCodeReceived(Microsoft.AspNetCore.Authentication.OpenIdConnect.AuthorizationCodeReceivedContext! context) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.MessageReceived(Microsoft.AspNetCore.Authentication.OpenIdConnect.MessageReceivedContext! context) -> System.Threading.Tasks.Task!
+virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.PushAuthorization(Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext! context) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.RedirectToIdentityProvider(Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext! context) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.RedirectToIdentityProviderForSignOut(Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext! context) -> System.Threading.Tasks.Task!
 virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.RemoteSignOut(Microsoft.AspNetCore.Authentication.OpenIdConnect.RemoteSignOutContext! context) -> System.Threading.Tasks.Task!
diff --git a/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Unshipped.txt b/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Unshipped.txt
index a9cf371f30ad..7dc5c58110bf 100644
--- a/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Unshipped.txt
+++ b/src/Security/Authentication/OpenIdConnect/src/PublicAPI.Unshipped.txt
@@ -1,21 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnPushAuthorization.get -> System.Func<Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext!, System.Threading.Tasks.Task!>!
-Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.OnPushAuthorization.set -> void
-Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.AdditionalAuthorizationParameters.get -> System.Collections.Generic.IDictionary<string!, string!>!
-Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.PushedAuthorizationBehavior.get -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
-Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions.PushedAuthorizationBehavior.set -> void
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior.Disable = 1 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior.Require = 2 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior.UseIfAvailable = 0 -> Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationBehavior
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandleClientAuthentication() -> void
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandledClientAuthentication.get -> bool
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandledPush.get -> bool
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.HandlePush(string! requestUri) -> void
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.ProtocolMessage.get -> Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage!
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.PushedAuthorizationContext(Microsoft.AspNetCore.Http.HttpContext! context, Microsoft.AspNetCore.Authentication.AuthenticationScheme! scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions! options, Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage! parRequest, Microsoft.AspNetCore.Authentication.AuthenticationProperties! properties) -> void
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.RequestUri.get -> string?
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.SkippedPush.get -> bool
-Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext.SkipPush() -> void
-virtual Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents.PushAuthorization(Microsoft.AspNetCore.Authentication.OpenIdConnect.PushedAuthorizationContext! context) -> System.Threading.Tasks.Task!
diff --git a/src/Security/Authentication/samples/SocialSample/Program.cs b/src/Security/Authentication/samples/SocialSample/Program.cs
index bd5ef8aaef63..6ea08e2eb673 100644
--- a/src/Security/Authentication/samples/SocialSample/Program.cs
+++ b/src/Security/Authentication/samples/SocialSample/Program.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.AspNetCore;
+using Microsoft.Extensions.Hosting;
 
 namespace SocialSample;
 
@@ -9,8 +9,11 @@ public static class Program
 {
     public static void Main(string[] args)
     {
-        var host = WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>()
+        var host = Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            })
             .Build();
 
         host.Run();
diff --git a/src/Security/Authentication/test/AuthenticationMetricsTest.cs b/src/Security/Authentication/test/AuthenticationMetricsTest.cs
new file mode 100644
index 000000000000..fec3667d4ee6
--- /dev/null
+++ b/src/Security/Authentication/test/AuthenticationMetricsTest.cs
@@ -0,0 +1,356 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Moq;
+
+namespace Microsoft.AspNetCore.Authentication;
+
+public class AuthenticationMetricsTest
+{
+    [Fact]
+    public async Task Authenticate_Success()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationHandler>();
+        authenticationHandler.Setup(h => h.AuthenticateAsync()).Returns(Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(), "custom"))));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
+
+        // Act
+        await authenticationService.AuthenticateAsync(httpContext, scheme: "custom");
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authenticationRequestsCollector.GetMeasurementSnapshot());
+        Assert.True(measurement.Value > 0);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("success", (string)measurement.Tags["aspnetcore.authentication.result"]);
+        Assert.False(measurement.Tags.ContainsKey("error.type"));
+    }
+
+    [Fact]
+    public async Task Authenticate_Failure()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationHandler>();
+        authenticationHandler.Setup(h => h.AuthenticateAsync()).Returns(Task.FromResult(AuthenticateResult.Fail("Authentication failed")));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
+
+        // Act
+        await authenticationService.AuthenticateAsync(httpContext, scheme: "custom");
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authenticationRequestsCollector.GetMeasurementSnapshot());
+        Assert.True(measurement.Value > 0);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("failure", (string)measurement.Tags["aspnetcore.authentication.result"]);
+        Assert.Equal("Microsoft.AspNetCore.Authentication.AuthenticationFailureException", (string)measurement.Tags["error.type"]);
+    }
+
+    [Fact]
+    public async Task Authenticate_NoResult()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationHandler>();
+        authenticationHandler.Setup(h => h.AuthenticateAsync()).Returns(Task.FromResult(AuthenticateResult.NoResult()));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
+
+        // Act
+        await authenticationService.AuthenticateAsync(httpContext, scheme: "custom");
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authenticationRequestsCollector.GetMeasurementSnapshot());
+        Assert.True(measurement.Value > 0);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("none", (string)measurement.Tags["aspnetcore.authentication.result"]);
+        Assert.False(measurement.Tags.ContainsKey("error.type"));
+    }
+
+    [Fact]
+    public async Task Authenticate_ExceptionThrownInHandler()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationHandler>();
+        authenticationHandler.Setup(h => h.AuthenticateAsync()).Throws(new InvalidOperationException("An error occurred during authentication"));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
+
+        // Act
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authenticationService.AuthenticateAsync(httpContext, scheme: "custom"));
+
+        // Assert
+        Assert.Equal("An error occurred during authentication", ex.Message);
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authenticationRequestsCollector.GetMeasurementSnapshot());
+        Assert.True(measurement.Value > 0);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+        Assert.False(measurement.Tags.ContainsKey("aspnetcore.authentication.result"));
+    }
+
+    [Fact]
+    public async Task Challenge()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(Mock.Of<IAuthenticationHandler>(), meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var challengesCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.challenges");
+
+        // Act
+        await authenticationService.ChallengeAsync(httpContext, scheme: "custom", properties: null);
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(challengesCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+    }
+
+    [Fact]
+    public async Task Challenge_ExceptionThrownInHandler()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationHandler>();
+        authenticationHandler.Setup(h => h.ChallengeAsync(It.IsAny<AuthenticationProperties>())).Throws(new InvalidOperationException("An error occurred during challenge"));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var challengesCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.challenges");
+
+        // Act
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authenticationService.ChallengeAsync(httpContext, scheme: "custom", properties: null));
+
+        // Assert
+        Assert.Equal("An error occurred during challenge", ex.Message);
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(challengesCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+    }
+
+    [Fact]
+    public async Task Forbid()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(Mock.Of<IAuthenticationHandler>(), meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var forbidsCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.forbids");
+
+        // Act
+        await authenticationService.ForbidAsync(httpContext, scheme: "custom", properties: null);
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(forbidsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+    }
+
+    [Fact]
+    public async Task Forbid_ExceptionThrownInHandler()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationHandler>();
+        authenticationHandler.Setup(h => h.ForbidAsync(It.IsAny<AuthenticationProperties>())).Throws(new InvalidOperationException("An error occurred during forbid"));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var forbidsCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.forbids");
+
+        // Act
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authenticationService.ForbidAsync(httpContext, scheme: "custom", properties: null));
+
+        // Assert
+        Assert.Equal("An error occurred during forbid", ex.Message);
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(forbidsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+    }
+
+    [Fact]
+    public async Task SignIn()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(Mock.Of<IAuthenticationSignInHandler>(), meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var signInsCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.sign_ins");
+
+        // Act
+        await authenticationService.SignInAsync(httpContext, scheme: "custom", new ClaimsPrincipal(), properties: null);
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(signInsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+    }
+
+    [Fact]
+    public async Task SignIn_ExceptionThrownInHandler()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationSignInHandler>();
+        authenticationHandler.Setup(h => h.SignInAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<AuthenticationProperties>())).Throws(new InvalidOperationException("An error occurred during sign in"));
+
+        var meterFactory = new TestMeterFactory();
+        var httpContext = new DefaultHttpContext();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var signInsCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.sign_ins");
+
+        // Act
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authenticationService.SignInAsync(httpContext, scheme: "custom", new ClaimsPrincipal(), properties: null));
+
+        // Assert
+        Assert.Equal("An error occurred during sign in", ex.Message);
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(signInsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+    }
+
+    [Fact]
+    public async Task SignOut()
+    {
+        // Arrange
+        var httpContext = new DefaultHttpContext();
+        var meterFactory = new TestMeterFactory();
+        var authenticationService = CreateAuthenticationService(Mock.Of<IAuthenticationSignOutHandler>(), meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var signOutsCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.sign_outs");
+
+        // Act
+        await authenticationService.SignOutAsync(httpContext, scheme: "custom", properties: null);
+
+        // Assert
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(signOutsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+    }
+
+    [Fact]
+    public async Task SignOut_ExceptionThrownInHandler()
+    {
+        // Arrange
+        var authenticationHandler = new Mock<IAuthenticationSignOutHandler>();
+        authenticationHandler.Setup(h => h.SignOutAsync(It.IsAny<AuthenticationProperties>())).Throws(new InvalidOperationException("An error occurred during sign out"));
+
+        var httpContext = new DefaultHttpContext();
+        var meterFactory = new TestMeterFactory();
+        var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
+        var meter = meterFactory.Meters.Single();
+
+        using var signOutsCollector = new MetricCollector<long>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.sign_outs");
+
+        // Act
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authenticationService.SignOutAsync(httpContext, scheme: "custom", properties: null));
+
+        // Assert
+        Assert.Equal("An error occurred during sign out", ex.Message);
+        Assert.Equal(AuthenticationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(signOutsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("custom", (string)measurement.Tags["aspnetcore.authentication.scheme"]);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+    }
+
+    private static AuthenticationServiceImpl CreateAuthenticationService(IAuthenticationHandler authenticationHandler, TestMeterFactory meterFactory)
+    {
+        var authenticationHandlerProvider = new Mock<IAuthenticationHandlerProvider>();
+        authenticationHandlerProvider.Setup(p => p.GetHandlerAsync(It.IsAny<HttpContext>(), "custom")).Returns(Task.FromResult(authenticationHandler));
+
+        var claimsTransform = new Mock<IClaimsTransformation>();
+        claimsTransform.Setup(t => t.TransformAsync(It.IsAny<ClaimsPrincipal>())).Returns((ClaimsPrincipal p) => Task.FromResult(p));
+
+        var options = Options.Create(new AuthenticationOptions
+        {
+            DefaultSignInScheme = "custom",
+            RequireAuthenticatedSignIn = false,
+        });
+
+        var metrics = new AuthenticationMetrics(meterFactory);
+        var authenticationService = new AuthenticationServiceImpl(
+            Mock.Of<IAuthenticationSchemeProvider>(),
+            authenticationHandlerProvider.Object,
+            claimsTransform.Object,
+            options,
+            metrics);
+
+        return authenticationService;
+    }
+}
diff --git a/src/Security/Authentication/test/BearerTokenTests.cs b/src/Security/Authentication/test/BearerTokenTests.cs
index 08ee3bb8511e..d5aa657de398 100644
--- a/src/Security/Authentication/test/BearerTokenTests.cs
+++ b/src/Security/Authentication/test/BearerTokenTests.cs
@@ -23,4 +23,11 @@ protected override void RegisterAuth(AuthenticationBuilder services, Action<Bear
     {
         services.AddBearerToken(configure);
     }
+
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new BearerTokenOptions();
+        Assert.NotNull(options.Events);
+    }
 }
diff --git a/src/Security/Authentication/test/CertificateTests.cs b/src/Security/Authentication/test/CertificateTests.cs
index 5e6d73eeca94..ba8e163539b3 100644
--- a/src/Security/Authentication/test/CertificateTests.cs
+++ b/src/Security/Authentication/test/CertificateTests.cs
@@ -22,6 +22,12 @@ namespace Microsoft.AspNetCore.Authentication.Certificate.Test;
 
 public class ClientCertificateAuthenticationTests
 {
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new CertificateAuthenticationOptions();
+        Assert.NotNull(options.Events);
+    }
 
     [Fact]
     public async Task VerifySchemeDefaults()
diff --git a/src/Security/Authentication/test/CookieTests.cs b/src/Security/Authentication/test/CookieTests.cs
index bc9ff451415d..9f209173fa35 100644
--- a/src/Security/Authentication/test/CookieTests.cs
+++ b/src/Security/Authentication/test/CookieTests.cs
@@ -11,12 +11,14 @@
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Time.Testing;
+using Microsoft.AspNetCore.Routing;
 
 namespace Microsoft.AspNetCore.Authentication.Cookies;
 
@@ -32,6 +34,13 @@ protected override void RegisterAuth(AuthenticationBuilder services, Action<Cook
         services.AddCookie(configure);
     }
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new CookieAuthenticationOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task NormalRequestPassesThrough()
     {
@@ -89,6 +98,54 @@ public async Task AjaxChallengeRedirectTurnsInto200WithLocationHeader()
         Assert.StartsWith("http://example.com/Account/Login", responded.Single());
     }
 
+    [Fact]
+    public async Task CanConfigure401ChallengeInsteadOfRedirectWithMetadata()
+    {
+        using var host = await CreateHost(s => { });
+        using var server = host.GetTestServer();
+        var transaction = await SendAsync(server, "http://example.com/api/challenge");
+        Assert.Equal(HttpStatusCode.Unauthorized, transaction.Response.StatusCode);
+        var responded = transaction.Response.Headers.GetValues("Location");
+        Assert.Single(responded);
+        Assert.StartsWith("http://example.com/Account/Login", responded.Single());
+    }
+
+    [Fact]
+    public async Task CanConfigure403ForbiddenInsteadOfRedirectWithMetadata()
+    {
+        using var host = await CreateHost(s => { });
+        using var server = host.GetTestServer();
+        var transaction = await SendAsync(server, "http://example.com/api/forbid");
+        Assert.Equal(HttpStatusCode.Forbidden, transaction.Response.StatusCode);
+        var responded = transaction.Response.Headers.GetValues("Location");
+        Assert.Single(responded);
+        Assert.StartsWith("http://example.com/Account/AccessDenied", responded.Single());
+    }
+
+    [Fact]
+    public async Task CanReenableLoginRedirectWithMetadata()
+    {
+        using var host = await CreateHost(s => { });
+        using var server = host.GetTestServer();
+        var transaction = await SendAsync(server, "http://example.com/api/jk/challenge");
+        Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
+        var responded = transaction.Response.Headers.GetValues("Location");
+        Assert.Single(responded);
+        Assert.StartsWith("http://example.com/Account/Login", responded.Single());
+    }
+
+    [Fact]
+    public async Task CanReenableAccessDeniedRedirectWithMetadata()
+    {
+        using var host = await CreateHost(s => { });
+        using var server = host.GetTestServer();
+        var transaction = await SendAsync(server, "http://example.com/api/jk/forbid");
+        Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
+        var responded = transaction.Response.Headers.GetValues("Location");
+        Assert.Single(responded);
+        Assert.StartsWith("http://example.com/Account/AccessDenied", responded.Single());
+    }
+
     [Fact]
     public async Task ProtectedCustomRequestShouldRedirectToCustomRedirectUri()
     {
@@ -1872,8 +1929,36 @@ private static async Task<IHost> CreateHostWithServices(Action<IServiceCollectio
                                 await next(context);
                             }
                         });
+
+                        app.UseRouting();
+                        app.UseEndpoints(endpoints =>
+                        {
+                            void AddChallengeAndForbidEndpoints(IEndpointRouteBuilder routeGroup)
+                            {
+                                routeGroup.MapGet("/challenge", async context =>
+                                {
+                                    await context.ChallengeAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                                });
+
+                                routeGroup.MapGet("/forbid", async context =>
+                                {
+                                    await context.ForbidAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                                });
+                            }
+
+                            var apiRouteGroup = endpoints.MapGroup("/api").DisableCookieRedirect();
+                            AddChallengeAndForbidEndpoints(apiRouteGroup);
+
+                            // IAllowCookieRedirect always wins if present. Adding IDisableCookieRedirect before and afterwards does not override it.
+                            var overriddenRouteGroup = apiRouteGroup.MapGroup("/jk").AllowCookieRedirect().DisableCookieRedirect();
+                            AddChallengeAndForbidEndpoints(overriddenRouteGroup);
+                        });
                     })
-                    .ConfigureServices(configureServices))
+                    .ConfigureServices(services =>
+                    {
+                        services.AddRoutingCore();
+                        configureServices(services);
+                    }))
             .Build();
 
         await host.StartAsync();
diff --git a/src/Security/Authentication/test/FacebookTests.cs b/src/Security/Authentication/test/FacebookTests.cs
index af088a9bc8c8..34e731324419 100644
--- a/src/Security/Authentication/test/FacebookTests.cs
+++ b/src/Security/Authentication/test/FacebookTests.cs
@@ -42,6 +42,13 @@ protected override void ConfigureDefaults(FacebookOptions o)
         o.SignInScheme = "auth1";
     }
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new FacebookOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task ThrowsIfAppIdMissing()
     {
@@ -230,7 +237,7 @@ public async Task NestedMapWillNotAffectRedirect()
         var transaction = await server.SendAsync("http://example.com/base/login");
         Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
         var location = transaction.Response.Headers.Location.AbsoluteUri;
-        Assert.Contains("https://www.facebook.com/v14.0/dialog/oauth", location);
+        Assert.Contains("https://www.facebook.com/v22.0/dialog/oauth", location);
         Assert.Contains("response_type=code", location);
         Assert.Contains("client_id=", location);
         Assert.Contains("redirect_uri=" + UrlEncoder.Default.Encode("http://example.com/base/signin-facebook"), location);
@@ -263,7 +270,7 @@ public async Task MapWillNotAffectRedirect()
         var transaction = await server.SendAsync("http://example.com/login");
         Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
         var location = transaction.Response.Headers.Location.AbsoluteUri;
-        Assert.Contains("https://www.facebook.com/v14.0/dialog/oauth", location);
+        Assert.Contains("https://www.facebook.com/v22.0/dialog/oauth", location);
         Assert.Contains("response_type=code", location);
         Assert.Contains("client_id=", location);
         Assert.Contains("redirect_uri=" + UrlEncoder.Default.Encode("http://example.com/signin-facebook"), location);
@@ -298,7 +305,7 @@ public async Task ChallengeWillTriggerRedirection()
         var transaction = await server.SendAsync("http://example.com/challenge");
         Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
         var location = transaction.Response.Headers.Location.AbsoluteUri;
-        Assert.Contains("https://www.facebook.com/v14.0/dialog/oauth", location);
+        Assert.Contains("https://www.facebook.com/v22.0/dialog/oauth", location);
         Assert.Contains("response_type=code", location);
         Assert.Contains("client_id=", location);
         Assert.Contains("redirect_uri=", location);
@@ -388,7 +395,7 @@ public async Task PkceSentToTokenEndpoint()
                         {
                             Sender = req =>
                             {
-                                if (req.RequestUri.AbsoluteUri == "https://graph.facebook.com/v14.0/oauth/access_token")
+                                if (req.RequestUri.AbsoluteUri == "https://graph.facebook.com/v22.0/oauth/access_token")
                                 {
                                     var body = req.Content.ReadAsStringAsync().Result;
                                     var form = new FormReader(body);
@@ -407,7 +414,7 @@ public async Task PkceSentToTokenEndpoint()
                                         token_type = "Bearer",
                                     });
                                 }
-                                else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://graph.facebook.com/v14.0/me")
+                                else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://graph.facebook.com/v22.0/me")
                                 {
                                     return ReturnJsonResponse(new
                                     {
@@ -433,7 +440,7 @@ public async Task PkceSentToTokenEndpoint()
         var transaction = await server.SendAsync("https://example.com/challenge");
         Assert.Equal(HttpStatusCode.Redirect, transaction.Response.StatusCode);
         var locationUri = transaction.Response.Headers.Location;
-        Assert.StartsWith("https://www.facebook.com/v14.0/dialog/oauth", locationUri.AbsoluteUri);
+        Assert.StartsWith("https://www.facebook.com/v22.0/dialog/oauth", locationUri.AbsoluteUri);
 
         var queryParams = QueryHelpers.ParseQuery(locationUri.Query);
         Assert.False(string.IsNullOrEmpty(queryParams["code_challenge"]));
diff --git a/src/Security/Authentication/test/GoogleTests.cs b/src/Security/Authentication/test/GoogleTests.cs
index 276284020cbe..5d8e550ed644 100644
--- a/src/Security/Authentication/test/GoogleTests.cs
+++ b/src/Security/Authentication/test/GoogleTests.cs
@@ -42,6 +42,13 @@ protected override void ConfigureDefaults(GoogleOptions o)
         o.SignInScheme = "auth1";
     }
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new GoogleOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task ChallengeWillTriggerRedirection()
     {
diff --git a/src/Security/Authentication/test/JwtBearerTests.cs b/src/Security/Authentication/test/JwtBearerTests.cs
index 639324deff29..96e3699a552e 100755
--- a/src/Security/Authentication/test/JwtBearerTests.cs
+++ b/src/Security/Authentication/test/JwtBearerTests.cs
@@ -33,15 +33,14 @@ public class JwtBearerTests : SharedAuthenticationTests<JwtBearerOptions>
 
     protected override void RegisterAuth(AuthenticationBuilder services, Action<JwtBearerOptions> configure)
     {
-        services.AddJwtBearer(o =>
-        {
-            ConfigureDefaults(o);
-            configure.Invoke(o);
-        });
+        services.AddJwtBearer(configure);
     }
 
-    private void ConfigureDefaults(JwtBearerOptions o)
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
     {
+        var options = new JwtBearerOptions();
+        Assert.NotNull(options.Events);
     }
 
     [Fact]
@@ -201,7 +200,7 @@ public async Task ThrowAtAuthenticationFailedEvent()
             try
             {
                 await next();
-                Assert.False(true, "Expected exception is not thrown");
+                Assert.Fail("Expected exception is not thrown");
             }
             catch (Exception)
             {
@@ -973,7 +972,7 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue()
             issuer: "issuer.contoso.com",
             audience: "audience.contoso.com",
             claims: claims,
-            expires: DateTime.MaxValue,
+            expires: new DateTime(DateTime.MaxValue.Ticks, DateTimeKind.Utc),
             signingCredentials: creds);
 
         var tokenText = new JwtSecurityTokenHandler().WriteToken(token);
@@ -1001,8 +1000,7 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue()
         var expiresElement = dom.RootElement.GetProperty("expires");
         Assert.Equal(JsonValueKind.String, expiresElement.ValueKind);
 
-        var elementValue = DateTime.Parse(expiresElement.GetString(), CultureInfo.InvariantCulture);
-        var elementValueUtc = elementValue.ToUniversalTime();
+        var elementValueUtc = DateTime.Parse(expiresElement.GetString(), CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);
         // roundtrip DateTime.MaxValue through parsing because it is lossy and we
         // need equivalent values to compare against.
         var max = DateTime.Parse(DateTime.MaxValue.ToString(CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);
diff --git a/src/Security/Authentication/test/JwtBearerTests_Handler.cs b/src/Security/Authentication/test/JwtBearerTests_Handler.cs
index 1c24afe93cc0..ff8311352ed9 100644
--- a/src/Security/Authentication/test/JwtBearerTests_Handler.cs
+++ b/src/Security/Authentication/test/JwtBearerTests_Handler.cs
@@ -188,7 +188,7 @@ public async Task ThrowAtAuthenticationFailedEvent()
             try
             {
                 await next();
-                Assert.False(true, "Expected exception is not thrown");
+                Assert.Fail("Expected exception is not thrown");
             }
             catch (Exception)
             {
@@ -917,7 +917,7 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue()
            issuer: "issuer.contoso.com",
            audience: "audience.contoso.com",
            claims: claims,
-           expires: DateTime.MaxValue,
+           expires: new DateTime(DateTime.MaxValue.Ticks, DateTimeKind.Utc),
            signingCredentials: creds);
 
         var tokenText = new JwtSecurityTokenHandler().WriteToken(token);
@@ -944,8 +944,7 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue()
         var expiresElement = dom.RootElement.GetProperty("expires");
         Assert.Equal(JsonValueKind.String, expiresElement.ValueKind);
 
-        var elementValue = DateTime.Parse(expiresElement.GetString(), CultureInfo.InvariantCulture);
-        var elementValueUtc = elementValue.ToUniversalTime();
+        var elementValueUtc = DateTime.Parse(expiresElement.GetString(), CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);
         // roundtrip DateTime.MaxValue through parsing because it is lossy and we
         // need equivalent values to compare against.
         var max = DateTime.Parse(DateTime.MaxValue.ToString(CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);
@@ -957,6 +956,7 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue()
     public void CanReadJwtBearerOptionsFromConfig()
     {
         var services = new ServiceCollection();
+        var key = "qPG6tDtfxFYZifHW3sEueQ==";
         var config = new ConfigurationBuilder().AddInMemoryCollection([
             new("Authentication:Schemes:Bearer:ValidIssuer", "dotnet-user-jwts"),
             new("Authentication:Schemes:Bearer:ValidIssuers:0", "dotnet-user-jwts-2"),
@@ -965,6 +965,9 @@ public void CanReadJwtBearerOptionsFromConfig()
             new("Authentication:Schemes:Bearer:BackchannelTimeout", "00:01:00"),
             new("Authentication:Schemes:Bearer:RequireHttpsMetadata", "false"),
             new("Authentication:Schemes:Bearer:SaveToken", "True"),
+            new("Authentication:Schemes:Bearer:SigningKeys:0:Issuer", "dotnet-user-jwts"),
+            new("Authentication:Schemes:Bearer:SigningKeys:0:Value", key),
+            new("Authentication:Schemes:Bearer:SigningKeys:0:Length", "32"),
         ]).Build();
         services.AddSingleton<IConfiguration>(config);
 
@@ -987,6 +990,10 @@ public void CanReadJwtBearerOptionsFromConfig()
         Assert.True(jwtBearerOptions.MapInboundClaims);
         Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateIssuer);
         Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateAudience);
+
+        var securityKey = Assert.Single(jwtBearerOptions.TokenValidationParameters.IssuerSigningKeys);
+        var symmetricKey = Assert.IsType<SymmetricSecurityKey>(securityKey);
+        Assert.Equal(key, Convert.ToBase64String(symmetricKey.Key));
     }
 
     [Fact]
diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
index d94b1c3cbc57..64bcf143aa82 100644
--- a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
+++ b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)test\Certificates\Certificates.cs" />
+    <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" />
 
     <Content Include="WsFederation\federationmetadata.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -49,6 +50,7 @@
     <Reference Include="Microsoft.AspNetCore.Authentication.WsFederation" />
     <Reference Include="Microsoft.AspNetCore.HttpOverrides" />
     <Reference Include="Microsoft.AspNetCore.TestHost" />
+    <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <Reference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <Reference Include="Microsoft.Net.Http.Headers" />
   </ItemGroup>
diff --git a/src/Security/Authentication/test/MicrosoftAccountTests.cs b/src/Security/Authentication/test/MicrosoftAccountTests.cs
index 91e9fa4e9f1a..97517451fa14 100644
--- a/src/Security/Authentication/test/MicrosoftAccountTests.cs
+++ b/src/Security/Authentication/test/MicrosoftAccountTests.cs
@@ -43,6 +43,13 @@ protected override void ConfigureDefaults(MicrosoftAccountOptions o)
         o.SignInScheme = "auth1";
     }
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new MicrosoftAccountOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task ChallengeWillTriggerApplyRedirectEvent()
     {
diff --git a/src/Security/Authentication/test/OAuthTests.cs b/src/Security/Authentication/test/OAuthTests.cs
index 43463f2e15bf..3349ae96b6ec 100644
--- a/src/Security/Authentication/test/OAuthTests.cs
+++ b/src/Security/Authentication/test/OAuthTests.cs
@@ -31,6 +31,13 @@ protected override void RegisterAuth(AuthenticationBuilder services, Action<OAut
         });
     }
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new OAuthOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task ThrowsIfClientIdMissing()
     {
diff --git a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectChallengeTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectChallengeTests.cs
index abc76954193c..39504a60c711 100644
--- a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectChallengeTests.cs
+++ b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectChallengeTests.cs
@@ -441,15 +441,15 @@ public async Task ChallengeSetsNonceAndStateCookies(OpenIdConnectRedirectBehavio
         Assert.True(nonceCookie.Expires.HasValue);
         Assert.True(nonceCookie.Expires > DateTime.UtcNow);
         Assert.True(nonceCookie.HttpOnly);
-        Assert.Equal("/signin-oidc", nonceCookie.Path);
-        Assert.Equal("N", nonceCookie.Value);
+        Assert.Equal("/signin-oidc", nonceCookie.Path.AsSpan());
+        Assert.Equal("N", nonceCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.None, nonceCookie.SameSite);
 
         var correlationCookie = challengeCookies.Where(cookie => cookie.Name.StartsWith(".AspNetCore.Correlation.", StringComparison.Ordinal)).Single();
         Assert.True(correlationCookie.Expires.HasValue);
         Assert.True(nonceCookie.Expires > DateTime.UtcNow);
         Assert.True(correlationCookie.HttpOnly);
-        Assert.Equal("/signin-oidc", correlationCookie.Path);
+        Assert.Equal("/signin-oidc", correlationCookie.Path.AsSpan());
         Assert.False(StringSegment.IsNullOrEmpty(correlationCookie.Value));
         Assert.Equal(Net.Http.Headers.SameSiteMode.None, correlationCookie.SameSite);
 
@@ -847,7 +847,7 @@ public async Task Challenge_WithPushedAuthorization_Handled()
         var res = transaction.Response;
 
         Assert.Equal(HttpStatusCode.Redirect, res.StatusCode);
-        
+
         Assert.Contains("request_uri=request_uri_from_event", res.Headers.Location.Query);
         Assert.Empty(mockBackchannel.PushedParameters);
     }
diff --git a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests.cs
index b54800821e43..6d52c0f40d1c 100644
--- a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests.cs
+++ b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests.cs
@@ -1014,7 +1014,7 @@ public async Task OnRemoteSignOut_Invoked()
         events.ValidateExpectations();
         Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out var values));
         Assert.True(SetCookieHeaderValue.TryParseStrictList(values.ToList(), out var parsedValues));
-        Assert.Equal(1, parsedValues.Count);
+        Assert.Single(parsedValues);
         Assert.True(StringSegment.IsNullOrEmpty(parsedValues.Single().Value));
     }
 
diff --git a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests_Handler.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests_Handler.cs
index 7279b02a724a..f696d5fc9a8d 100644
--- a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests_Handler.cs
+++ b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectEventTests_Handler.cs
@@ -1014,7 +1014,7 @@ public async Task OnRemoteSignOut_Invoked()
         events.ValidateExpectations();
         Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out var values));
         Assert.True(SetCookieHeaderValue.TryParseStrictList(values.ToList(), out var parsedValues));
-        Assert.Equal(1, parsedValues.Count);
+        Assert.Single(parsedValues);
         Assert.True(StringSegment.IsNullOrEmpty(parsedValues.Single().Value));
     }
 
diff --git a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectTests.cs
index 49977e6c80e9..e1f014079c80 100644
--- a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectTests.cs
+++ b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectTests.cs
@@ -25,6 +25,13 @@ public class OpenIdConnectTests
     static readonly string nonceDelimiter = ".";
     const string DefaultHost = @"https://example.com";
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new OpenIdConnectOptions();
+        Assert.NotNull(options.Events);
+    }
+
     /// <summary>
     /// Tests RedirectForSignOutContext replaces the OpenIdConnectMesssage correctly.
     /// </summary>
diff --git a/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs b/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs
index 219ae141f622..23b7dc7d2f6d 100644
--- a/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs
+++ b/src/Security/Authentication/test/OpenIdConnect/TestSettings.cs
@@ -78,7 +78,7 @@ public IDictionary<string, string> ValidateChallengeFormPost(string responseBody
             }
 
             Debug.WriteLine(buf.ToString());
-            Assert.True(false, buf.ToString());
+            Assert.Fail(buf.ToString());
         }
 
         return formInputs;
@@ -116,7 +116,7 @@ public IDictionary<string, string> ValidateSignoutFormPost(TestTransaction trans
             }
 
             Debug.WriteLine(buf.ToString());
-            Assert.True(false, buf.ToString());
+            Assert.Fail(buf.ToString());
         }
 
         return formInputs;
@@ -155,7 +155,7 @@ private IDictionary<string, string> ValidateRedirectCore(Uri redirectUri, OpenId
             }
 
             Debug.WriteLine(buf.ToString());
-            Assert.True(false, buf.ToString());
+            Assert.Fail(buf.ToString());
         }
 
         return queryDict;
diff --git a/src/Security/Authentication/test/TwitterTests.cs b/src/Security/Authentication/test/TwitterTests.cs
index d70230e53c4e..3e6e6174d8fd 100644
--- a/src/Security/Authentication/test/TwitterTests.cs
+++ b/src/Security/Authentication/test/TwitterTests.cs
@@ -41,6 +41,13 @@ protected override void ConfigureDefaults(TwitterOptions o)
         o.SignInScheme = "auth1";
     }
 
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new TwitterOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task ChallengeWillTriggerApplyRedirectEvent()
     {
diff --git a/src/Security/Authentication/test/WsFederation/WsFederationTest.cs b/src/Security/Authentication/test/WsFederation/WsFederationTest.cs
index 6ea9ebdb733e..b4b561b7718d 100644
--- a/src/Security/Authentication/test/WsFederation/WsFederationTest.cs
+++ b/src/Security/Authentication/test/WsFederation/WsFederationTest.cs
@@ -23,6 +23,13 @@ namespace Microsoft.AspNetCore.Authentication.WsFederation;
 
 public class WsFederationTest
 {
+    [Fact]
+    public void EventsPropertyIsInitializedOnConstruction()
+    {
+        var options = new WsFederationOptions();
+        Assert.NotNull(options.Events);
+    }
+
     [Fact]
     public async Task VerifySchemeDefaults()
     {
diff --git a/src/Security/Authorization/Core/src/AuthorizationMetrics.cs b/src/Security/Authorization/Core/src/AuthorizationMetrics.cs
new file mode 100644
index 000000000000..6812d2faa470
--- /dev/null
+++ b/src/Security/Authorization/Core/src/AuthorizationMetrics.cs
@@ -0,0 +1,66 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Authorization;
+
+internal sealed class AuthorizationMetrics
+{
+    public const string MeterName = "Microsoft.AspNetCore.Authorization";
+
+    private readonly Meter _meter;
+    private readonly Counter<long> _authorizedCount;
+
+    public AuthorizationMetrics(IMeterFactory meterFactory)
+    {
+        _meter = meterFactory.Create(MeterName);
+
+        _authorizedCount = _meter.CreateCounter<long>(
+            "aspnetcore.authorization.attempts",
+            unit: "{attempt}",
+            description: "The total number of authorization attempts.");
+    }
+
+    public void AuthorizeAttemptCompleted(ClaimsPrincipal user, string? policyName, AuthorizationResult? result, Exception? exception)
+    {
+        if (_authorizedCount.Enabled)
+        {
+            AuthorizeAttemptCore(user, policyName, result, exception);
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private void AuthorizeAttemptCore(ClaimsPrincipal user, string? policyName, AuthorizationResult? result, Exception? exception)
+    {
+        var tags = new TagList([
+            new("aspnetcore.user.is_authenticated", user.Identity?.IsAuthenticated ?? false)
+        ]);
+
+        if (policyName is not null)
+        {
+            tags.Add("aspnetcore.authorization.policy", policyName);
+        }
+
+        if (result is not null)
+        {
+            var resultTagValue = result.Succeeded ? "success" : "failure";
+            tags.Add("aspnetcore.authorization.result", resultTagValue);
+        }
+
+        if (exception is not null)
+        {
+            tags.Add("error.type", exception.GetType().FullName);
+        }
+
+        _authorizedCount.Add(1, tags);
+    }
+}
diff --git a/src/Security/Authorization/Core/src/AuthorizationOptions.cs b/src/Security/Authorization/Core/src/AuthorizationOptions.cs
index 31edaf2f075b..de6e29b8ac36 100644
--- a/src/Security/Authorization/Core/src/AuthorizationOptions.cs
+++ b/src/Security/Authorization/Core/src/AuthorizationOptions.cs
@@ -24,21 +24,26 @@ public class AuthorizationOptions
     public bool InvokeHandlersAfterFailure { get; set; } = true;
 
     /// <summary>
-    /// Gets or sets the default authorization policy. Defaults to require authenticated users.
+    /// Gets or sets the default authorization policy. Defaults to requiring authenticated users.
     /// </summary>
     /// <remarks>
-    /// The default policy used when evaluating <see cref="IAuthorizeData"/> with no policy name specified.
+    /// - The `DefaultPolicy` applies whenever authorization is required, but no specific policy is set.
+    /// - If an `[Authorize]` attribute is present without a policy name, the `DefaultPolicy` is used instead of the `FallbackPolicy`.
+    /// - This behavior ensures that endpoints explicitly requesting authorization (via `[Authorize]` or `RequireAuthorization()`) default to a secure policy.
+    /// - When non-default behavior is needed, developers should define named policies.
     /// </remarks>
     public AuthorizationPolicy DefaultPolicy { get; set; } = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build();
 
     /// <summary>
     /// Gets or sets the fallback authorization policy used by <see cref="AuthorizationPolicy.CombineAsync(IAuthorizationPolicyProvider, IEnumerable{IAuthorizeData})"/>
-    /// when no IAuthorizeData have been provided. As a result, the AuthorizationMiddleware uses the fallback policy
-    /// if there are no <see cref="IAuthorizeData"/> instances for a resource. If a resource has any <see cref="IAuthorizeData"/>
-    /// then they are evaluated instead of the fallback policy. By default the fallback policy is null, and usually will have no
-    /// effect unless you have the AuthorizationMiddleware in your pipeline. It is not used in any way by the
-    /// default <see cref="IAuthorizationService"/>.
+    /// when no authorization metadata (e.g., `[Authorize]` attribute, `RequireAuthorization()`) is explicitly provided for a resource.
     /// </summary>
+    /// <remarks>
+    /// - The `FallbackPolicy` only applies when there are no authorization attributes or explicit policies set.
+    /// - If a resource has an `[Authorize]` attribute (even without a policy name), the `DefaultPolicy` is used instead of the `FallbackPolicy`.
+    /// - This means `FallbackPolicy` is mainly relevant for middleware-based authorization flows where no per-endpoint authorization is specified.
+    /// - By default, `FallbackPolicy` is `null`, meaning it has no effect unless explicitly set.
+    /// </remarks>
     public AuthorizationPolicy? FallbackPolicy { get; set; }
 
     /// <summary>
diff --git a/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs b/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs
index 273f3c5ff563..77ad7ff6752b 100644
--- a/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs
+++ b/src/Security/Authorization/Core/src/AuthorizationServiceCollectionExtensions.cs
@@ -27,7 +27,10 @@ public static IServiceCollection AddAuthorizationCore(this IServiceCollection se
         // aren't included by default.
         services.AddOptions();
 
-        services.TryAdd(ServiceDescriptor.Transient<IAuthorizationService, DefaultAuthorizationService>());
+        services.AddMetrics();
+
+        services.TryAdd(ServiceDescriptor.Singleton<AuthorizationMetrics, AuthorizationMetrics>());
+        services.TryAdd(ServiceDescriptor.Transient<IAuthorizationService, DefaultAuthorizationServiceImpl>());
         services.TryAdd(ServiceDescriptor.Transient<IAuthorizationPolicyProvider, DefaultAuthorizationPolicyProvider>());
         services.TryAdd(ServiceDescriptor.Transient<IAuthorizationHandlerProvider, DefaultAuthorizationHandlerProvider>());
         services.TryAdd(ServiceDescriptor.Transient<IAuthorizationEvaluator, DefaultAuthorizationEvaluator>());
diff --git a/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs b/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs
index 324d613cf8f5..47d381136f25 100644
--- a/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs
+++ b/src/Security/Authorization/Core/src/AuthorizationServiceExtensions.cs
@@ -21,8 +21,8 @@ public static class AuthorizationServiceExtensions
     /// <param name="resource">The resource to evaluate the policy against.</param>
     /// <param name="requirement">The requirement to evaluate the policy against.</param>
     /// <returns>
-    /// A flag indicating whether requirement evaluation has succeeded or failed.
-    /// This value is <c>true</c> when the user fulfills the policy, otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether requirement evaluation has succeeded or failed.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, object? resource, IAuthorizationRequirement requirement)
     {
@@ -40,8 +40,8 @@ public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationServic
     /// <param name="resource">The resource to evaluate the policy against.</param>
     /// <param name="policy">The policy to evaluate.</param>
     /// <returns>
-    /// A flag indicating whether policy evaluation has succeeded or failed.
-    /// This value is <c>true</c> when the user fulfills the policy, otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether policy evaluation has succeeded or failed.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, object? resource, AuthorizationPolicy policy)
     {
@@ -58,8 +58,8 @@ public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationServic
     /// <param name="user">The user to evaluate the policy against.</param>
     /// <param name="policy">The policy to evaluate.</param>
     /// <returns>
-    /// A flag indicating whether policy evaluation has succeeded or failed.
-    /// This value is <c>true</c> when the user fulfills the policy, otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether policy evaluation has succeeded or failed.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, AuthorizationPolicy policy)
     {
@@ -76,8 +76,8 @@ public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationServic
     /// <param name="user">The user to evaluate the policy against.</param>
     /// <param name="policyName">The name of the policy to evaluate.</param>
     /// <returns>
-    /// A flag indicating whether policy evaluation has succeeded or failed.
-    /// This value is <c>true</c> when the user fulfills the policy, otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether policy evaluation has succeeded or failed.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     public static Task<AuthorizationResult> AuthorizeAsync(this IAuthorizationService service, ClaimsPrincipal user, string policyName)
     {
diff --git a/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs
index 24073df62676..0a1b4c37b382 100644
--- a/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs
+++ b/src/Security/Authorization/Core/src/DefaultAuthorizationService.cs
@@ -56,8 +56,8 @@ public DefaultAuthorizationService(IAuthorizationPolicyProvider policyProvider,
     /// <param name="resource">The resource to evaluate the requirements against.</param>
     /// <param name="requirements">The requirements to evaluate.</param>
     /// <returns>
-    /// A flag indicating whether authorization has succeeded.
-    /// This value is <c>true</c> when the user fulfills the policy, otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether authorization has succeeded.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     public virtual async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, IEnumerable<IAuthorizationRequirement> requirements)
     {
@@ -93,18 +93,19 @@ public virtual async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal us
     /// <param name="resource">The resource the policy should be checked with.</param>
     /// <param name="policyName">The name of the policy to check against a specific context.</param>
     /// <returns>
-    /// A flag indicating whether authorization has succeeded.
-    /// This value is <c>true</c> when the user fulfills the policy otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether authorization has succeeded.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     public virtual async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, string policyName)
     {
-        ArgumentNullThrowHelper.ThrowIfNull(policyName);
-
-        var policy = await _policyProvider.GetPolicyAsync(policyName).ConfigureAwait(false);
-        if (policy == null)
-        {
-            throw new InvalidOperationException($"No policy found: {policyName}.");
-        }
+        var policy = await GetPolicyAsync(policyName).ConfigureAwait(false);
         return await this.AuthorizeAsync(user, resource, policy).ConfigureAwait(false);
     }
+
+    // For use in DefaultAuthorizationServiceImpl.
+    private protected async Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+    {
+        ArgumentNullThrowHelper.ThrowIfNull(policyName);
+        return await _policyProvider.GetPolicyAsync(policyName).ConfigureAwait(false) ?? throw new InvalidOperationException($"No policy found: {policyName}.");
+    }
 }
diff --git a/src/Security/Authorization/Core/src/DefaultAuthorizationServiceImpl.cs b/src/Security/Authorization/Core/src/DefaultAuthorizationServiceImpl.cs
new file mode 100644
index 000000000000..a63033783472
--- /dev/null
+++ b/src/Security/Authorization/Core/src/DefaultAuthorizationServiceImpl.cs
@@ -0,0 +1,62 @@
+// 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.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Shared;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authorization;
+
+internal sealed class DefaultAuthorizationServiceImpl(
+    IAuthorizationPolicyProvider policyProvider,
+    IAuthorizationHandlerProvider handlers,
+    ILogger<DefaultAuthorizationService> logger,
+    IAuthorizationHandlerContextFactory contextFactory,
+    IAuthorizationEvaluator evaluator,
+    IOptions<AuthorizationOptions> options,
+    AuthorizationMetrics metrics)
+    : DefaultAuthorizationService(policyProvider, handlers, logger, contextFactory, evaluator, options)
+{
+    public override async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, IEnumerable<IAuthorizationRequirement> requirements)
+    {
+        AuthorizationResult result;
+        try
+        {
+            result = await base.AuthorizeAsync(user, resource, requirements).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            metrics.AuthorizeAttemptCompleted(user, policyName: null, result: null, ex);
+            throw;
+        }
+
+        metrics.AuthorizeAttemptCompleted(user, policyName: null, result, exception: null);
+        return result;
+    }
+
+    public override async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, string policyName)
+    {
+        AuthorizationResult result;
+        try
+        {
+            var policy = await GetPolicyAsync(policyName).ConfigureAwait(false);
+
+            // Note that we deliberately call the base method of the other overload here.
+            // This is because the base implementation for this overload dispatches to the other overload,
+            // which would cause metrics to be recorded twice.
+            result = await base.AuthorizeAsync(user, resource, policy.Requirements).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            metrics.AuthorizeAttemptCompleted(user, policyName, result: null, ex);
+            throw;
+        }
+
+        metrics.AuthorizeAttemptCompleted(user, policyName, result, exception: null);
+        return result;
+    }
+}
diff --git a/src/Security/Authorization/Core/src/IAuthorizationService.cs b/src/Security/Authorization/Core/src/IAuthorizationService.cs
index 64ac3b5cd514..5c612869d4de 100644
--- a/src/Security/Authorization/Core/src/IAuthorizationService.cs
+++ b/src/Security/Authorization/Core/src/IAuthorizationService.cs
@@ -22,8 +22,8 @@ public interface IAuthorizationService
     /// </param>
     /// <param name="requirements">The requirements to evaluate.</param>
     /// <returns>
-    /// A flag indicating whether authorization has succeeded.
-    /// This value is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether authorization has succeeded.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the user fulfills the policy; otherwise <c>false</c>.
     /// </returns>
     /// <remarks>
     /// Resource is an optional parameter and may be null. Please ensure that you check it is not
@@ -41,9 +41,8 @@ public interface IAuthorizationService
     /// </param>
     /// <param name="policyName">The name of the policy to check against a specific context.</param>
     /// <returns>
-    /// A flag indicating whether authorization has succeeded.
-    /// Returns a flag indicating whether the user, and optional resource has fulfilled the policy.
-    /// <c>true</c> when the policy has been fulfilled; otherwise <c>false</c>.
+    /// A <see cref="Task{TResult}"/> that contains an <see cref="AuthorizationResult"/> indicating whether authorization has succeeded.
+    /// The result's <see cref="AuthorizationResult.Succeeded"/> property is <c>true</c> when the policy has been fulfilled; otherwise <c>false</c>.
     /// </returns>
     /// <remarks>
     /// Resource is an optional parameter and may be null. Please ensure that you check it is not
diff --git a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
index 44df5654138a..1d2f6d562069 100644
--- a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
+++ b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj
@@ -17,6 +17,7 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Metadata" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Diagnostics" />
     <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
@@ -31,4 +32,8 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
     <Compile Include="$(SharedSourceRoot)Debugger\DebuggerHelpers.cs" LinkBase="Shared" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Authorization.Test" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Shipped.txt
rename to src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt
rename to src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
diff --git a/src/Security/Authorization/test/AuthorizationBuilderTests.cs b/src/Security/Authorization/test/AuthorizationBuilderTests.cs
index 46c2b6606682..40b1d5a890e9 100644
--- a/src/Security/Authorization/test/AuthorizationBuilderTests.cs
+++ b/src/Security/Authorization/test/AuthorizationBuilderTests.cs
@@ -99,7 +99,7 @@ public void CanAddPolicyDelegate()
         // Assert
         var policy = options.GetPolicy("name");
         Assert.NotNull(policy);
-        Assert.Equal(1, policy.Requirements.Count);
+        Assert.Single(policy.Requirements);
         Assert.IsType<AssertionRequirement>(policy.Requirements.First());
     }
 }
diff --git a/src/Security/Authorization/test/AuthorizationEndpointConventionBuilderExtensionsTests.cs b/src/Security/Authorization/test/AuthorizationEndpointConventionBuilderExtensionsTests.cs
index 8cc43a7d2f7f..e887ee338f21 100644
--- a/src/Security/Authorization/test/AuthorizationEndpointConventionBuilderExtensionsTests.cs
+++ b/src/Security/Authorization/test/AuthorizationEndpointConventionBuilderExtensionsTests.cs
@@ -161,7 +161,7 @@ public void RequireAuthorization_PolicyCallback()
         Assert.Null(authMetadata.Policy);
 
         var policy = Assert.IsAssignableFrom<AuthorizationPolicy>(endpointModel.Metadata[1]);
-        Assert.Equal(1, policy.Requirements.Count);
+        Assert.Single(policy.Requirements);
         Assert.Equal(requirement, policy.Requirements[0]);
     }
 
@@ -187,7 +187,7 @@ public void RequireAuthorization_PolicyCallbackWithAuthorize()
         Assert.Equal(2, endpointModel.Metadata.Count);
         Assert.Equal(authorize, endpointModel.Metadata[0]);
         var policy = Assert.IsAssignableFrom<AuthorizationPolicy>(endpointModel.Metadata[1]);
-        Assert.Equal(1, policy.Requirements.Count);
+        Assert.Single(policy.Requirements);
         Assert.Equal(requirement, policy.Requirements[0]);
     }
 
diff --git a/src/Security/Authorization/test/AuthorizationMetricsTest.cs b/src/Security/Authorization/test/AuthorizationMetricsTest.cs
new file mode 100644
index 000000000000..7b9253232498
--- /dev/null
+++ b/src/Security/Authorization/test/AuthorizationMetricsTest.cs
@@ -0,0 +1,206 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Security.Claims;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+
+namespace Microsoft.AspNetCore.Authorization.Test;
+
+public class AuthorizationMetricsTest
+{
+    [Fact]
+    public async Task Authorize_WithPolicyName_Success()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var authorizationService = BuildAuthorizationService(meterFactory);
+        var meter = meterFactory.Meters.Single();
+        var user = new ClaimsPrincipal(new ClaimsIdentity([new Claim("Permission", "CanViewPage")], authenticationType: "someAuthentication"));
+
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
+
+        // Act
+        await authorizationService.AuthorizeAsync(user, "Basic");
+
+        // Assert
+        Assert.Equal(AuthorizationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("Basic", (string)measurement.Tags["aspnetcore.authorization.policy"]);
+        Assert.Equal("success", (string)measurement.Tags["aspnetcore.authorization.result"]);
+        Assert.True((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
+    }
+
+    [Fact]
+    public async Task Authorize_WithPolicyName_Failure()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var authorizationService = BuildAuthorizationService(meterFactory);
+        var meter = meterFactory.Meters.Single();
+        var user = new ClaimsPrincipal(new ClaimsIdentity([])); // Will fail due to missing required claim
+
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
+
+        // Act
+        await authorizationService.AuthorizeAsync(user, "Basic");
+
+        // Assert
+        Assert.Equal(AuthorizationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("Basic", (string)measurement.Tags["aspnetcore.authorization.policy"]);
+        Assert.Equal("failure", (string)measurement.Tags["aspnetcore.authorization.result"]);
+        Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
+    }
+
+    [Fact]
+    public async Task Authorize_WithPolicyName_PolicyNotFound()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var authorizationService = BuildAuthorizationService(meterFactory);
+        var meter = meterFactory.Meters.Single();
+        var user = new ClaimsPrincipal(new ClaimsIdentity([])); // Will fail due to missing required claim
+
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
+
+        // Act
+        await Assert.ThrowsAsync<InvalidOperationException>(() => authorizationService.AuthorizeAsync(user, "UnknownPolicy"));
+
+        // Assert
+        Assert.Equal(AuthorizationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("UnknownPolicy", (string)measurement.Tags["aspnetcore.authorization.policy"]);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+        Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
+        Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.result"));
+    }
+
+    [Fact]
+    public async Task Authorize_WithoutPolicyName_Success()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var authorizationService = BuildAuthorizationService(meterFactory, services =>
+        {
+            services.AddSingleton<IAuthorizationHandler>(new AlwaysHandler(succeed: true));
+        });
+        var meter = meterFactory.Meters.Single();
+        var user = new ClaimsPrincipal(new ClaimsIdentity([]));
+
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
+
+        // Act
+        await authorizationService.AuthorizeAsync(user, resource: null, new TestRequirement());
+
+        // Assert
+        Assert.Equal(AuthorizationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("success", (string)measurement.Tags["aspnetcore.authorization.result"]);
+        Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
+        Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.policy"));
+    }
+
+    [Fact]
+    public async Task Authorize_WithoutPolicyName_Failure()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var authorizationService = BuildAuthorizationService(meterFactory); // Will fail because there is no handler registered
+        var meter = meterFactory.Meters.Single();
+        var user = new ClaimsPrincipal(new ClaimsIdentity([]));
+
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
+
+        // Act
+        await authorizationService.AuthorizeAsync(user, resource: null, new TestRequirement());
+
+        // Assert
+        Assert.Equal(AuthorizationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("failure", (string)measurement.Tags["aspnetcore.authorization.result"]);
+        Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
+        Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.policy"));
+    }
+
+    [Fact]
+    public async Task Authorize_WithoutPolicyName_ExceptionThrownInHandler()
+    {
+        // Arrange
+        var meterFactory = new TestMeterFactory();
+        var authorizationService = BuildAuthorizationService(meterFactory, services =>
+        {
+            services.AddSingleton<IAuthorizationHandler>(new AlwaysThrowHandler());
+        });
+        var meter = meterFactory.Meters.Single();
+        var user = new ClaimsPrincipal(new ClaimsIdentity([]));
+
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
+
+        // Act
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authorizationService.AuthorizeAsync(user, resource: null, new TestRequirement()));
+
+        // Assert
+        Assert.Equal("An error occurred in the authorization handler", ex.Message);
+        Assert.Equal(AuthorizationMetrics.MeterName, meter.Name);
+        Assert.Null(meter.Version);
+
+        var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
+        Assert.Equal(1, measurement.Value);
+        Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
+        Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
+        Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.policy"));
+        Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.result"));
+    }
+
+    private static IAuthorizationService BuildAuthorizationService(TestMeterFactory meterFactory, Action<IServiceCollection> setupServices = null)
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton(new AuthorizationMetrics(meterFactory));
+        services.AddAuthorizationBuilder()
+            .AddPolicy("Basic", policy => policy.RequireClaim("Permission", "CanViewPage"));
+        services.AddLogging();
+        services.AddOptions();
+        setupServices?.Invoke(services);
+        return services.BuildServiceProvider().GetRequiredService<IAuthorizationService>();
+    }
+
+    private sealed class AlwaysHandler(bool succeed) : AuthorizationHandler<TestRequirement>
+    {
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, TestRequirement requirement)
+        {
+            if (succeed)
+            {
+                context.Succeed(requirement);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+
+    private sealed class AlwaysThrowHandler : AuthorizationHandler<TestRequirement>
+    {
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, TestRequirement requirement)
+        {
+            throw new InvalidOperationException("An error occurred in the authorization handler");
+        }
+    }
+
+    private sealed class TestRequirement : IAuthorizationRequirement;
+}
diff --git a/src/Security/Authorization/test/AuthorizationPolicyFacts.cs b/src/Security/Authorization/test/AuthorizationPolicyFacts.cs
index 9a3a4d78a89a..657c6f98f319 100644
--- a/src/Security/Authorization/test/AuthorizationPolicyFacts.cs
+++ b/src/Security/Authorization/test/AuthorizationPolicyFacts.cs
@@ -62,7 +62,7 @@ public async Task CanReplaceDefaultPolicyDirectly()
         var combined = await AuthorizationPolicy.CombineAsync(provider, attributes, policies);
 
         // Assert
-        Assert.Equal(1, combined.Requirements.Count);
+        Assert.Single(combined.Requirements);
         Assert.Empty(combined.Requirements.OfType<DenyAnonymousAuthorizationRequirement>());
     }
 
diff --git a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj
index 11fe6d5589af..8eeed805c2c9 100644
--- a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj
+++ b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj
@@ -10,7 +10,12 @@
     <Reference Include="Microsoft.AspNetCore.Authorization.Policy" />
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <Reference Include="Microsoft.Extensions.Logging" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Security/CookiePolicy/test/CookieChunkingTests.cs b/src/Security/CookiePolicy/test/CookieChunkingTests.cs
index c0a841fe4f85..3b8cc719d6d5 100644
--- a/src/Security/CookiePolicy/test/CookieChunkingTests.cs
+++ b/src/Security/CookiePolicy/test/CookieChunkingTests.cs
@@ -223,7 +223,7 @@ public void DeleteChunkedCookieWithOptions_AllDeleted()
             "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
             "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
             "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
-        }, cookies);
+        }, cookies.ToArray());
     }
 
     [Fact]
@@ -240,7 +240,7 @@ public void DeleteChunkedCookieWithMissingRequestCookies_OnlyPresentCookiesDelet
             "TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
-        }, cookies);
+        }, cookies.ToArray());
     }
 
     [Fact]
@@ -258,7 +258,7 @@ public void DeleteChunkedCookieWithMissingRequestCookies_StopsAtMissingChunk()
             "TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
             "TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
-        }, cookies);
+        }, cookies.ToArray());
     }
 
     [Fact]
@@ -311,6 +311,6 @@ public void DeleteChunkedCookieWithOptionsAndResponseCookies_AllDeleted()
                 "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
                 "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension",
                 "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; extension"
-            }, httpContext.Response.Headers[HeaderNames.SetCookie]);
+            }, httpContext.Response.Headers[HeaderNames.SetCookie].ToArray());
     }
 }
diff --git a/src/Security/CookiePolicy/test/CookieConsentTests.cs b/src/Security/CookiePolicy/test/CookieConsentTests.cs
index 321447c14f7c..e0c51f55c810 100644
--- a/src/Security/CookiePolicy/test/CookieConsentTests.cs
+++ b/src/Security/CookiePolicy/test/CookieConsentTests.cs
@@ -46,7 +46,7 @@ public async Task ConsentEnabledForTemplateScenario()
             context.Response.Cookies.Append("Test", "Value");
             return Task.CompletedTask;
         });
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -65,7 +65,7 @@ public async Task NonEssentialCookiesWithOptionsExcluded()
             context.Response.Cookies.Append("Test", "Value", new CookieOptions() { IsEssential = false });
             return Task.CompletedTask;
         });
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -140,7 +140,7 @@ public async Task EssentialCookiesCanBeExcludedByOnAppendCookie()
             context.Response.Cookies.Append("Test", "Value", new CookieOptions() { IsEssential = true });
             return Task.CompletedTask;
         });
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -186,7 +186,7 @@ public async Task HasConsentIgnoresInvalidRequestCookie()
             context.Response.Cookies.Append("Test", "Value");
             return Task.CompletedTask;
         });
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -217,15 +217,15 @@ public async Task GrantConsentSetsCookie()
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
         Assert.Equal(2, cookies.Count);
         var consentCookie = cookies[0];
-        Assert.Equal(".AspNet.Consent", consentCookie.Name);
-        Assert.Equal("yes", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent", consentCookie.Name.AsSpan());
+        Assert.Equal("yes", consentCookie.Value.AsSpan());
         Assert.True(consentCookie.Expires.HasValue);
         Assert.True(consentCookie.Expires.Value > DateTimeOffset.Now + TimeSpan.FromDays(364));
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
         var testCookie = cookies[1];
-        Assert.Equal("Test", testCookie.Name);
-        Assert.Equal("Value", testCookie.Value);
+        Assert.Equal("Test", testCookie.Name.AsSpan());
+        Assert.Equal("Value", testCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, testCookie.SameSite);
         Assert.Null(testCookie.Expires);
     }
@@ -239,8 +239,8 @@ public async Task GrantConsentAppliesPolicyToConsentCookie()
             options.MinimumSameSitePolicy = Http.SameSiteMode.Strict;
             options.OnAppendCookie = context =>
             {
-                Assert.Equal(".AspNet.Consent", context.CookieName);
-                Assert.Equal("yes", context.CookieValue);
+                Assert.Equal(".AspNet.Consent", context.CookieName.AsSpan());
+                Assert.Equal("yes", context.CookieValue.AsSpan());
                 Assert.Equal(Http.SameSiteMode.Strict, context.CookieOptions.SameSite);
                 context.CookieName += "1";
                 context.CookieValue += "1";
@@ -265,10 +265,10 @@ public async Task GrantConsentAppliesPolicyToConsentCookie()
         });
 
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var consentCookie = cookies[0];
-        Assert.Equal(".AspNet.Consent1", consentCookie.Name);
-        Assert.Equal("yes1", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent1", consentCookie.Name.AsSpan());
+        Assert.Equal("yes1", consentCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Strict, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
         Assert.Contains("extension", consentCookie.Extensions);
@@ -335,7 +335,7 @@ public async Task GrantConsentAfterResponseStartsSetsHasConsentButDoesNotSetCook
 
         var reader = new StreamReader(httpContext.Response.Body);
         Assert.Equal("Started.Granted.", await reader.ReadToEndAsync());
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -363,7 +363,7 @@ public async Task WithdrawConsentWhenNotHasConsentNoOps()
             return Task.CompletedTask;
         });
 
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -398,13 +398,13 @@ public async Task WithdrawConsentDeletesCookie()
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
         Assert.Equal(2, cookies.Count);
         var testCookie = cookies[0];
-        Assert.Equal("Test", testCookie.Name);
-        Assert.Equal("Value1", testCookie.Value);
+        Assert.Equal("Test", testCookie.Name.AsSpan());
+        Assert.Equal("Value1", testCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, testCookie.SameSite);
         Assert.Null(testCookie.Expires);
         var consentCookie = cookies[1];
-        Assert.Equal(".AspNet.Consent", consentCookie.Name);
-        Assert.Equal("", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent", consentCookie.Name.AsSpan());
+        Assert.Equal("", consentCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
     }
@@ -418,7 +418,7 @@ public async Task WithdrawConsentAppliesPolicyToDeleteCookie()
             options.MinimumSameSitePolicy = Http.SameSiteMode.Strict;
             options.OnDeleteCookie = context =>
             {
-                Assert.Equal(".AspNet.Consent", context.CookieName);
+                Assert.Equal(".AspNet.Consent", context.CookieName.AsSpan());
                 context.CookieName += "1";
             };
         },
@@ -443,10 +443,10 @@ public async Task WithdrawConsentAppliesPolicyToDeleteCookie()
         });
 
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var consentCookie = cookies[0];
-        Assert.Equal(".AspNet.Consent1", consentCookie.Name);
-        Assert.Equal("", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent1", consentCookie.Name.AsSpan());
+        Assert.Equal("", consentCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Strict, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
     }
@@ -508,10 +508,10 @@ public async Task DeleteCookieDoesNotRequireConsent()
         });
 
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var testCookie = cookies[0];
-        Assert.Equal("Test", testCookie.Name);
-        Assert.Equal("", testCookie.Value);
+        Assert.Equal("Test", testCookie.Name.AsSpan());
+        Assert.Equal("", testCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, testCookie.SameSite);
         Assert.NotNull(testCookie.Expires);
     }
@@ -541,7 +541,7 @@ public async Task OnDeleteCookieCanSuppressCookie()
             return Task.CompletedTask;
         });
 
-        Assert.Empty(httpContext.Response.Headers.SetCookie);
+        Assert.Equal(0, httpContext.Response.Headers.SetCookie.Count);
     }
 
     [Fact]
@@ -572,15 +572,15 @@ public async Task CreateConsentCookieMatchesGrantConsentCookie()
         });
 
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var consentCookie = cookies[0];
-        Assert.Equal(".AspNet.Consent", consentCookie.Name);
-        Assert.Equal("yes", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent", consentCookie.Name.AsSpan());
+        Assert.Equal("yes", consentCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
 
         cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers["ManualCookie"]);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var manualCookie = cookies[0];
         Assert.Equal(consentCookie.Name, manualCookie.Name);
         Assert.Equal(consentCookie.Value, manualCookie.Value);
@@ -625,15 +625,15 @@ public async Task CreateConsentCookieAppliesPolicy()
         });
 
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var consentCookie = cookies[0];
-        Assert.Equal(".AspNet.Consent1", consentCookie.Name);
-        Assert.Equal("yes1", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent1", consentCookie.Name.AsSpan());
+        Assert.Equal("yes1", consentCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Strict, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
 
         cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers["ManualCookie"]);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var manualCookie = cookies[0];
         Assert.Equal(consentCookie.Name, manualCookie.Name);
         Assert.Equal(consentCookie.Value, manualCookie.Value);
@@ -670,15 +670,15 @@ public async Task CreateConsentCookieMatchesGrantConsentCookieWhenCookieValueIsC
         });
 
         var cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers.SetCookie);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var consentCookie = cookies[0];
-        Assert.Equal(".AspNet.Consent", consentCookie.Name);
-        Assert.Equal("true", consentCookie.Value);
+        Assert.Equal(".AspNet.Consent", consentCookie.Name.AsSpan());
+        Assert.Equal("true", consentCookie.Value.AsSpan());
         Assert.Equal(Net.Http.Headers.SameSiteMode.Unspecified, consentCookie.SameSite);
         Assert.NotNull(consentCookie.Expires);
 
         cookies = SetCookieHeaderValue.ParseList(httpContext.Response.Headers["ManualCookie"]);
-        Assert.Equal(1, cookies.Count);
+        Assert.Single(cookies);
         var manualCookie = cookies[0];
         Assert.Equal(consentCookie.Name, manualCookie.Name);
         Assert.Equal(consentCookie.Value, manualCookie.Value);
diff --git a/src/Security/CookiePolicy/test/CookiePolicyTests.cs b/src/Security/CookiePolicy/test/CookiePolicyTests.cs
index bdee31a54268..44a95186ee77 100644
--- a/src/Security/CookiePolicy/test/CookiePolicyTests.cs
+++ b/src/Security/CookiePolicy/test/CookiePolicyTests.cs
@@ -58,10 +58,10 @@ await RunTest("/secureAlways",
                 transaction =>
                 {
                     Assert.NotNull(transaction.SetCookie);
-                    Assert.Equal("A=A; path=/; secure", transaction.SetCookie[0]);
-                    Assert.Equal("B=B; path=/; secure", transaction.SetCookie[1]);
-                    Assert.Equal("C=C; path=/; secure", transaction.SetCookie[2]);
-                    Assert.Equal("D=D; path=/; secure", transaction.SetCookie[3]);
+                    Assert.Equal("A=A; path=/; secure", transaction.SetCookie[0].AsSpan());
+                    Assert.Equal("B=B; path=/; secure", transaction.SetCookie[1].AsSpan());
+                    Assert.Equal("C=C; path=/; secure", transaction.SetCookie[2].AsSpan());
+                    Assert.Equal("D=D; path=/; secure", transaction.SetCookie[3].AsSpan());
                 }));
     }
 
@@ -311,7 +311,7 @@ public async Task CookiePolicyCanHijackDelete()
         var transaction = await server.SendAsync("http://example.com/login");
 
         Assert.NotNull(transaction.SetCookie);
-        Assert.Equal(1, transaction.SetCookie.Count);
+        Assert.Single(transaction.SetCookie);
         Assert.Equal("A=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; secure", transaction.SetCookie[0]);
     }
 
@@ -396,12 +396,12 @@ public async Task CookiePolicyAppliesToCookieAuth()
         var transaction = await server.SendAsync("http://example.com/login");
 
         Assert.NotNull(transaction.SetCookie);
-        Assert.Equal(1, transaction.SetCookie.Count);
+        Assert.Single(transaction.SetCookie);
         var cookie = SetCookieHeaderValue.Parse(transaction.SetCookie[0]);
-        Assert.Equal("TestCookie", cookie.Name);
+        Assert.Equal("TestCookie", cookie.Name.AsSpan());
         Assert.True(cookie.HttpOnly);
         Assert.True(cookie.Secure);
-        Assert.Equal("/", cookie.Path);
+        Assert.Equal("/", cookie.Path.AsSpan());
         Assert.Contains("extension", cookie.Extensions);
     }
 
@@ -450,25 +450,25 @@ public async Task CookiePolicyAppliesToCookieAuthChunks()
         Assert.Equal(3, transaction.SetCookie.Count);
 
         var cookie = SetCookieHeaderValue.Parse(transaction.SetCookie[0]);
-        Assert.Equal("TestCookie", cookie.Name);
-        Assert.Equal("chunks-2", cookie.Value);
+        Assert.Equal("TestCookie", cookie.Name.AsSpan());
+        Assert.Equal("chunks-2", cookie.Value.AsSpan());
         Assert.True(cookie.HttpOnly);
         Assert.True(cookie.Secure);
-        Assert.Equal("/", cookie.Path);
+        Assert.Equal("/", cookie.Path.AsSpan());
         Assert.Contains("ext", cookie.Extensions);
 
         cookie = SetCookieHeaderValue.Parse(transaction.SetCookie[1]);
-        Assert.Equal("TestCookieC1", cookie.Name);
+        Assert.Equal("TestCookieC1", cookie.Name.AsSpan());
         Assert.True(cookie.HttpOnly);
         Assert.True(cookie.Secure);
-        Assert.Equal("/", cookie.Path);
+        Assert.Equal("/", cookie.Path.AsSpan());
         Assert.Contains("ext", cookie.Extensions);
 
         cookie = SetCookieHeaderValue.Parse(transaction.SetCookie[2]);
-        Assert.Equal("TestCookieC2", cookie.Name);
+        Assert.Equal("TestCookieC2", cookie.Name.AsSpan());
         Assert.True(cookie.HttpOnly);
         Assert.True(cookie.Secure);
-        Assert.Equal("/", cookie.Path);
+        Assert.Equal("/", cookie.Path.AsSpan());
         Assert.Contains("ext", cookie.Extensions);
     }
 
diff --git a/src/Security/Security.slnf b/src/Security/Security.slnf
index c43aff4a8d2b..8c93361a8e2f 100644
--- a/src/Security/Security.slnf
+++ b/src/Security/Security.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
diff --git a/src/Security/samples/ClaimsTransformation/Program.cs b/src/Security/samples/ClaimsTransformation/Program.cs
index baae17098bd5..0558a7a4fa93 100644
--- a/src/Security/samples/ClaimsTransformation/Program.cs
+++ b/src/Security/samples/ClaimsTransformation/Program.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace AuthSamples.ClaimsTransformer;
@@ -17,12 +17,15 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args)
+        CreateHostBuilder(args)
             .Build()
             .Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/samples/Cookies/Program.cs b/src/Security/samples/Cookies/Program.cs
index 240ddd39b220..a9f09625f97c 100644
--- a/src/Security/samples/Cookies/Program.cs
+++ b/src/Security/samples/Cookies/Program.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace AuthSamples.Cookies;
@@ -17,12 +17,15 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args)
+        CreateHostBuilder(args)
             .Build()
             .Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/samples/CustomPolicyProvider/Program.cs b/src/Security/samples/CustomPolicyProvider/Program.cs
index 10f33513900e..0065f0a3c09e 100644
--- a/src/Security/samples/CustomPolicyProvider/Program.cs
+++ b/src/Security/samples/CustomPolicyProvider/Program.cs
@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace CustomPolicyProvider;
 
@@ -10,10 +10,13 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args).Build().Run();
+        CreateHostBuilder(args).Build().Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/samples/DynamicSchemes/Program.cs b/src/Security/samples/DynamicSchemes/Program.cs
index 00d316db6003..adc9fad08bec 100644
--- a/src/Security/samples/DynamicSchemes/Program.cs
+++ b/src/Security/samples/DynamicSchemes/Program.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace AuthSamples.DynamicSchemes;
@@ -17,12 +17,15 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args)
+        CreateHostBuilder(args)
             .Build()
             .Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/samples/Identity.ExternalClaims/Program.cs b/src/Security/samples/Identity.ExternalClaims/Program.cs
index 76c69844b73e..29eecc68e7cf 100644
--- a/src/Security/samples/Identity.ExternalClaims/Program.cs
+++ b/src/Security/samples/Identity.ExternalClaims/Program.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Identity.ExternalClaims;
@@ -17,10 +17,13 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args).Build().Run();
+        CreateHostBuilder(args).Build().Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/samples/PathSchemeSelection/Program.cs b/src/Security/samples/PathSchemeSelection/Program.cs
index 03721b631e82..af44ce8957b2 100644
--- a/src/Security/samples/PathSchemeSelection/Program.cs
+++ b/src/Security/samples/PathSchemeSelection/Program.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace AuthSamples.PathSchemeSelection;
@@ -17,10 +17,13 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args).Build().Run();
+        CreateHostBuilder(args).Build().Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/samples/StaticFilesAuth/Program.cs b/src/Security/samples/StaticFilesAuth/Program.cs
index 822a376c55d5..d0183d9aa6d6 100644
--- a/src/Security/samples/StaticFilesAuth/Program.cs
+++ b/src/Security/samples/StaticFilesAuth/Program.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace StaticFilesAuth;
@@ -17,10 +17,13 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateWebHostBuilder(args).Build().Run();
+        CreateHostBuilder(args).Build().Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            });
 }
diff --git a/src/Security/startvscode.cmd b/src/Security/startvscode.cmd
new file mode 100644
index 000000000000..d403f3028231
--- /dev/null
+++ b/src/Security/startvscode.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvscode.cmd %~dp0
diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
index 5339db095419..27c4ba614c7a 100644
--- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
+++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
@@ -16,7 +16,6 @@
     <Reference Include="Microsoft.AspNetCore.TestHost" />
     <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <Reference Include="AngleSharp" />
-    <Reference Include="System.Net.Http" />
   </ItemGroup>
 
   <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
diff --git a/src/Servers/Connections.Abstractions/src/ConnectionBuilder.cs b/src/Servers/Connections.Abstractions/src/ConnectionBuilder.cs
index e3a5fc761730..72d151be972a 100644
--- a/src/Servers/Connections.Abstractions/src/ConnectionBuilder.cs
+++ b/src/Servers/Connections.Abstractions/src/ConnectionBuilder.cs
@@ -42,7 +42,7 @@ public ConnectionDelegate Build()
             return Task.CompletedTask;
         };
 
-        foreach (var component in _components.Reverse())
+        foreach (var component in Enumerable.Reverse(_components))
         {
             app = component(app);
         }
diff --git a/src/Servers/Connections.Abstractions/src/Features/ITlsHandshakeFeature.cs b/src/Servers/Connections.Abstractions/src/Features/ITlsHandshakeFeature.cs
index 99f82881643c..2ae3411d79c6 100644
--- a/src/Servers/Connections.Abstractions/src/Features/ITlsHandshakeFeature.cs
+++ b/src/Servers/Connections.Abstractions/src/Features/ITlsHandshakeFeature.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Security.Authentication;
+using System.Security.Cryptography;
+using System;
+using Microsoft.AspNetCore.Shared;
 
 #if NETCOREAPP
 using System.Net.Security;
@@ -35,30 +38,48 @@ public interface ITlsHandshakeFeature
     /// <summary>
     /// Gets the <see cref="CipherAlgorithmType"/>.
     /// </summary>
+#if NETCOREAPP
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
+#endif
     CipherAlgorithmType CipherAlgorithm { get; }
 
     /// <summary>
     /// Gets the cipher strength.
     /// </summary>
+#if NETCOREAPP
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
+#endif
     int CipherStrength { get; }
 
     /// <summary>
     /// Gets the <see cref="HashAlgorithmType"/>.
     /// </summary>
+#if NETCOREAPP
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
+#endif
     HashAlgorithmType HashAlgorithm { get; }
 
     /// <summary>
     /// Gets the hash strength.
     /// </summary>
+#if NETCOREAPP
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
+#endif
     int HashStrength { get; }
 
     /// <summary>
-    /// Gets the <see cref="KeyExchangeAlgorithm"/>.
+    /// Gets the <see cref="ExchangeAlgorithmType"/>.
     /// </summary>
+#if NETCOREAPP
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
+#endif
     ExchangeAlgorithmType KeyExchangeAlgorithm { get; }
 
     /// <summary>
     /// Gets the key exchange algorithm strength.
     /// </summary>
+#if NETCOREAPP
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
+#endif
     int KeyExchangeStrength { get; }
 }
diff --git a/src/Servers/Connections.Abstractions/src/IMemoryPoolFactory.cs b/src/Servers/Connections.Abstractions/src/IMemoryPoolFactory.cs
new file mode 100644
index 000000000000..1cfa7e7f9215
--- /dev/null
+++ b/src/Servers/Connections.Abstractions/src/IMemoryPoolFactory.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+
+namespace Microsoft.AspNetCore.Connections;
+
+/// <summary>
+/// Interface for creating memory pools.
+/// </summary>
+public interface IMemoryPoolFactory<T>
+{
+    /// <summary>
+    /// Creates a new instance of a memory pool.
+    /// </summary>
+    /// <param name="options">Options for configuring the memory pool.</param>
+    /// <returns>A new memory pool instance.</returns>
+    MemoryPool<T> Create(MemoryPoolOptions? options = null);
+}
diff --git a/src/Servers/Connections.Abstractions/src/MemoryPoolOptions.cs b/src/Servers/Connections.Abstractions/src/MemoryPoolOptions.cs
new file mode 100644
index 000000000000..7d966729a6d1
--- /dev/null
+++ b/src/Servers/Connections.Abstractions/src/MemoryPoolOptions.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Connections;
+
+/// <summary>
+/// Options for configuring a memory pool.
+/// </summary>
+public class MemoryPoolOptions
+{
+    /// <summary>
+    /// Gets or sets the owner of the memory pool. This is used for logging and diagnostics purposes.
+    /// </summary>
+    public string? Owner { get; set; }
+}
diff --git a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
index 25784a904c42..3bcc44991e67 100644
--- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
+++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Core components of ASP.NET Core networking protocol stack.</Description>
     <TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="! $(TargetFrameworks.Contains('$(CurrentLtsTargetFramework)'))">$(TargetFrameworks);$(CurrentLtsTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -22,6 +23,7 @@
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)TrimmingAttributes.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs
index 26dcf46314ff..ae89e73e6e6c 100644
--- a/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs
+++ b/src/Servers/Connections.Abstractions/src/MultiplexedConnectionBuilder.cs
@@ -42,7 +42,7 @@ public MultiplexedConnectionDelegate Build()
             return Task.CompletedTask;
         };
 
-        foreach (var component in _components.Reverse())
+        foreach (var component in Enumerable.Reverse(_components))
         {
             app = component(app);
         }
diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Shipped.txt
rename to src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..4e96c215b0ab
--- /dev/null
+++ b/src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
@@ -0,0 +1,7 @@
+#nullable enable
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
+Microsoft.AspNetCore.Connections.MemoryPoolOptions
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net462/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net462/PublicAPI.Unshipped.txt
index 7dc5c58110bf..4e96c215b0ab 100644
--- a/src/Servers/Connections.Abstractions/src/PublicAPI/net462/PublicAPI.Unshipped.txt
+++ b/src/Servers/Connections.Abstractions/src/PublicAPI/net462/PublicAPI.Unshipped.txt
@@ -1 +1,7 @@
 #nullable enable
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
+Microsoft.AspNetCore.Connections.MemoryPoolOptions
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 7dc5c58110bf..4e96c215b0ab 100644
--- a/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1,7 @@
 #nullable enable
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
+Microsoft.AspNetCore.Connections.MemoryPoolOptions
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt
index 7dc5c58110bf..4e96c215b0ab 100644
--- a/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt
+++ b/src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt
@@ -1 +1,7 @@
 #nullable enable
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
+Microsoft.AspNetCore.Connections.MemoryPoolOptions
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
+Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
diff --git a/src/Servers/HttpSys/HttpSysServer.slnf b/src/Servers/HttpSys/HttpSysServer.slnf
index 492b2dfc1077..b9171033dd0d 100644
--- a/src/Servers/HttpSys/HttpSysServer.slnf
+++ b/src/Servers/HttpSys/HttpSysServer.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
@@ -38,6 +38,7 @@
       "src\\Servers\\HttpSys\\samples\\QueueSharing\\QueueSharing.csproj",
       "src\\Servers\\HttpSys\\samples\\SelfHostServer\\SelfHostServer.csproj",
       "src\\Servers\\HttpSys\\samples\\TestClient\\TestClient.csproj",
+      "src\\Servers\\HttpSys\\samples\\TlsFeaturesObserve\\TlsFeaturesObserve.csproj",
       "src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj",
       "src\\Servers\\HttpSys\\test\\FunctionalTests\\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj",
       "src\\Servers\\HttpSys\\test\\NonHelixTests\\Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj",
@@ -54,4 +55,4 @@
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Servers/HttpSys/samples/TlsFeaturesObserve/HttpSys/HttpSysConfigurator.cs b/src/Servers/HttpSys/samples/TlsFeaturesObserve/HttpSys/HttpSysConfigurator.cs
new file mode 100644
index 000000000000..3865ecd59451
--- /dev/null
+++ b/src/Servers/HttpSys/samples/TlsFeaturesObserve/HttpSys/HttpSysConfigurator.cs
@@ -0,0 +1,123 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using System.Runtime.InteropServices;
+
+namespace TlsFeaturesObserve.HttpSys;
+
+internal static class HttpSysConfigurator
+{
+    const uint HTTP_INITIALIZE_CONFIG = 0x00000002;
+    const uint ERROR_ALREADY_EXISTS = 183;
+
+    static readonly HTTPAPI_VERSION HttpApiVersion = new HTTPAPI_VERSION(1, 0);
+
+    internal static void ConfigureCacheTlsClientHello()
+    {
+        // Arbitrarily chosen port, but must match the port used in the web server. Via UrlPrefixes or launchsettings.
+        var ipPort = new IPEndPoint(new IPAddress([0, 0, 0, 0]), 6000);
+        var certThumbprint = "" /* your cert thumbprint here */;
+        var appId = Guid.NewGuid();
+        var sslCertStoreName = "My";
+
+        CallHttpApi(() => SetConfiguration(ipPort, certThumbprint, appId, sslCertStoreName));
+    }
+
+    static void SetConfiguration(IPEndPoint ipPort, string certThumbprint, Guid appId, string sslCertStoreName)
+    {
+        var sockAddrHandle = CreateSockaddrStructure(ipPort);
+        var pIpPort = sockAddrHandle.AddrOfPinnedObject();
+        var httpServiceConfigSslKey = new HTTP_SERVICE_CONFIG_SSL_KEY(pIpPort);
+
+        var hash = GetHash(certThumbprint);
+        var handleHash = GCHandle.Alloc(hash, GCHandleType.Pinned);
+        var configSslParam = new HTTP_SERVICE_CONFIG_SSL_PARAM
+        {
+            AppId = appId,
+            DefaultFlags = 0x00008000 /* HTTP_SERVICE_CONFIG_SSL_FLAG_ENABLE_CACHE_CLIENT_HELLO */,
+            DefaultRevocationFreshnessTime = 0,
+            DefaultRevocationUrlRetrievalTimeout = 15,
+            pSslCertStoreName = sslCertStoreName,
+            pSslHash = handleHash.AddrOfPinnedObject(),
+            SslHashLength = hash.Length,
+            pDefaultSslCtlIdentifier = null,
+            pDefaultSslCtlStoreName = sslCertStoreName
+        };
+
+        var configSslSet = new HTTP_SERVICE_CONFIG_SSL_SET
+        {
+            ParamDesc = configSslParam,
+            KeyDesc = httpServiceConfigSslKey
+        };
+
+        var pInputConfigInfo = Marshal.AllocCoTaskMem(
+            Marshal.SizeOf(typeof(HTTP_SERVICE_CONFIG_SSL_SET)));
+        Marshal.StructureToPtr(configSslSet, pInputConfigInfo, false);
+
+        var status = HttpSetServiceConfiguration(nint.Zero,
+            HTTP_SERVICE_CONFIG_ID.HttpServiceConfigSSLCertInfo,
+            pInputConfigInfo,
+            Marshal.SizeOf(configSslSet),
+            nint.Zero);
+
+        if (status == ERROR_ALREADY_EXISTS || status == 0) // already present or success
+        {
+            Console.WriteLine($"HttpServiceConfiguration is correct");
+        }
+        else
+        {
+            Console.WriteLine("Failed to HttpSetServiceConfiguration: " + status);
+        }
+    }
+
+    static byte[] GetHash(string thumbprint)
+    {
+        var length = thumbprint.Length;
+        var bytes = new byte[length / 2];
+        for (var i = 0; i < length; i += 2)
+        {
+            bytes[i / 2] = Convert.ToByte(thumbprint.Substring(i, 2), 16);
+        }
+
+        return bytes;
+    }
+
+    static GCHandle CreateSockaddrStructure(IPEndPoint ipEndPoint)
+    {
+        var socketAddress = ipEndPoint.Serialize();
+
+        // use an array of bytes instead of the sockaddr structure 
+        var sockAddrStructureBytes = new byte[socketAddress.Size];
+        var sockAddrHandle = GCHandle.Alloc(sockAddrStructureBytes, GCHandleType.Pinned);
+        for (var i = 0; i < socketAddress.Size; ++i)
+        {
+            sockAddrStructureBytes[i] = socketAddress[i];
+        }
+        return sockAddrHandle;
+    }
+
+    static void CallHttpApi(Action body)
+    {
+        const uint flags = HTTP_INITIALIZE_CONFIG;
+        var retVal = HttpInitialize(HttpApiVersion, flags, IntPtr.Zero);
+        body();
+    }
+
+// disabled warning since it is just a sample
+#pragma warning disable SYSLIB1054 // Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time
+    [DllImport("httpapi.dll", SetLastError = true)]
+    private static extern uint HttpInitialize(
+            HTTPAPI_VERSION version,
+            uint flags,
+            IntPtr pReserved);
+
+    [DllImport("httpapi.dll", SetLastError = true)]
+    public static extern uint HttpSetServiceConfiguration(
+        nint serviceIntPtr,
+        HTTP_SERVICE_CONFIG_ID configId,
+        nint pConfigInformation,
+        int configInformationLength,
+        nint pOverlapped);
+#pragma warning restore SYSLIB1054 // Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time
+}
diff --git a/src/Servers/HttpSys/samples/TlsFeaturesObserve/HttpSys/Native.cs b/src/Servers/HttpSys/samples/TlsFeaturesObserve/HttpSys/Native.cs
new file mode 100644
index 000000000000..b939163d2252
--- /dev/null
+++ b/src/Servers/HttpSys/samples/TlsFeaturesObserve/HttpSys/Native.cs
@@ -0,0 +1,97 @@
+// 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.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace TlsFeaturesObserve.HttpSys;
+
+// Http.Sys types from https://learn.microsoft.com/windows/win32/api/http/
+
+[StructLayout(LayoutKind.Sequential, Pack = 2)]
+public struct HTTPAPI_VERSION
+{
+    public ushort HttpApiMajorVersion;
+    public ushort HttpApiMinorVersion;
+
+    public HTTPAPI_VERSION(ushort majorVersion, ushort minorVersion)
+    {
+        HttpApiMajorVersion = majorVersion;
+        HttpApiMinorVersion = minorVersion;
+    }
+}
+
+public enum HTTP_SERVICE_CONFIG_ID
+{
+    HttpServiceConfigIPListenList = 0,
+    HttpServiceConfigSSLCertInfo,
+    HttpServiceConfigUrlAclInfo,
+    HttpServiceConfigMax
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct HTTP_SERVICE_CONFIG_SSL_SET
+{
+    public HTTP_SERVICE_CONFIG_SSL_KEY KeyDesc;
+    public HTTP_SERVICE_CONFIG_SSL_PARAM ParamDesc;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct HTTP_SERVICE_CONFIG_SSL_KEY
+{
+    public IntPtr pIpPort;
+
+    public HTTP_SERVICE_CONFIG_SSL_KEY(IntPtr pIpPort)
+    {
+        this.pIpPort = pIpPort;
+    }
+}
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+public struct HTTP_SERVICE_CONFIG_SSL_PARAM
+{
+    public int SslHashLength;
+    public IntPtr pSslHash;
+    public Guid AppId;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string pSslCertStoreName;
+    public CertCheckModes DefaultCertCheckMode;
+    public int DefaultRevocationFreshnessTime;
+    public int DefaultRevocationUrlRetrievalTimeout;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string pDefaultSslCtlIdentifier;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string pDefaultSslCtlStoreName;
+    public uint DefaultFlags; // HTTP_SERVICE_CONFIG_SSL_FLAG
+}
+
+[Flags]
+public enum CertCheckModes : uint
+{
+    /// <summary>
+    /// Enables the client certificate revocation check.
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Client certificate is not to be verified for revocation. 
+    /// </summary>
+    DoNotVerifyCertificateRevocation = 1,
+
+    /// <summary>
+    /// Only cached certificate is to be used the revocation check. 
+    /// </summary>
+    VerifyRevocationWithCachedCertificateOnly = 2,
+
+    /// <summary>
+    /// The RevocationFreshnessTime setting is enabled.
+    /// </summary>
+    EnableRevocationFreshnessTime = 4,
+
+    /// <summary>
+    /// No usage check is to be performed.
+    /// </summary>
+    NoUsageCheck = 0x10000
+}
diff --git a/src/Servers/HttpSys/samples/TlsFeaturesObserve/Program.cs b/src/Servers/HttpSys/samples/TlsFeaturesObserve/Program.cs
new file mode 100644
index 000000000000..1b9e03dc5706
--- /dev/null
+++ b/src/Servers/HttpSys/samples/TlsFeaturesObserve/Program.cs
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.HttpSys;
+using Microsoft.Extensions.Hosting;
+using TlsFeaturesObserve.HttpSys;
+
+HttpSysConfigurator.ConfigureCacheTlsClientHello();
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.WebHost.UseHttpSys(options =>
+{
+    options.UrlPrefixes.Add("https://*:6000");
+    options.Authentication.Schemes = AuthenticationSchemes.None;
+    options.Authentication.AllowAnonymous = true;
+});
+
+var app = builder.Build();
+
+app.Use(async (context, next) =>
+{
+    var connectionFeature = context.Features.GetRequiredFeature<IHttpConnectionFeature>();
+    var httpSysPropFeature = context.Features.GetRequiredFeature<IHttpSysRequestPropertyFeature>();
+    var tlsHandshakeFeature = context.Features.GetRequiredFeature<ITlsHandshakeFeature>();
+
+    // first time invocation to find out required size
+    var success = httpSysPropFeature.TryGetTlsClientHello(Array.Empty<byte>(), out var bytesReturned);
+    Debug.Assert(!success);
+    Debug.Assert(bytesReturned > 0);
+
+    // rent with enough memory span and invoke
+    var bytes = ArrayPool<byte>.Shared.Rent(bytesReturned);
+    success = httpSysPropFeature.TryGetTlsClientHello(bytes, out _);
+    Debug.Assert(success);
+
+    await context.Response.WriteAsync(
+        $"""
+            connectionId            = {connectionFeature.ConnectionId};
+            negotiated cipher suite = {tlsHandshakeFeature.NegotiatedCipherSuite}; 
+            tlsClientHello.length   = {bytesReturned};
+            tlsclienthello start    = {string.Join(' ', bytes.AsSpan(0, 30).ToArray())}
+        """);
+        
+    await next(context);
+});
+
+app.Run();
diff --git a/src/Servers/HttpSys/samples/TlsFeaturesObserve/Properties/launchSettings.json b/src/Servers/HttpSys/samples/TlsFeaturesObserve/Properties/launchSettings.json
new file mode 100644
index 000000000000..c9d6b5efcb3c
--- /dev/null
+++ b/src/Servers/HttpSys/samples/TlsFeaturesObserve/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "TlsFeaturesObserve": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5000",
+      "nativeDebugging": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Servers/HttpSys/samples/TlsFeaturesObserve/TlsFeaturesObserve.csproj b/src/Servers/HttpSys/samples/TlsFeaturesObserve/TlsFeaturesObserve.csproj
new file mode 100644
index 000000000000..3ba4390b4e73
--- /dev/null
+++ b/src/Servers/HttpSys/samples/TlsFeaturesObserve/TlsFeaturesObserve.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
+    <Reference Include="Microsoft.Extensions.Hosting" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
+  </ItemGroup>
+</Project>
diff --git a/src/Servers/HttpSys/src/HttpSysListener.cs b/src/Servers/HttpSys/src/HttpSysListener.cs
index 81d333e027ff..2aa28395b78e 100644
--- a/src/Servers/HttpSys/src/HttpSysListener.cs
+++ b/src/Servers/HttpSys/src/HttpSysListener.cs
@@ -3,8 +3,10 @@
 
 using System.Buffers;
 using System.Diagnostics;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpSys.Internal;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Windows.Win32;
 using Windows.Win32.Foundation;
@@ -32,7 +34,7 @@ internal sealed partial class HttpSysListener : IDisposable
     // 0.5 seconds per request.  Respond with a 400 Bad Request.
     private const int UnknownHeaderLimit = 1000;
 
-    internal MemoryPool<byte> MemoryPool { get; } = PinnedBlockMemoryPoolFactory.Create();
+    internal MemoryPool<byte> MemoryPool { get; }
 
     private volatile State _state; // m_State is set only within lock blocks, but often read outside locks.
 
@@ -43,7 +45,7 @@ internal sealed partial class HttpSysListener : IDisposable
 
     private readonly object _internalLock;
 
-    public HttpSysListener(HttpSysOptions options, ILoggerFactory loggerFactory)
+    public HttpSysListener(HttpSysOptions options, IMemoryPoolFactory<byte> memoryPoolFactory, ILoggerFactory loggerFactory)
     {
         ArgumentNullException.ThrowIfNull(options);
         ArgumentNullException.ThrowIfNull(loggerFactory);
@@ -53,6 +55,8 @@ public HttpSysListener(HttpSysOptions options, ILoggerFactory loggerFactory)
             throw new PlatformNotSupportedException();
         }
 
+        MemoryPool = memoryPoolFactory.Create(new MemoryPoolOptions { Owner = "httpsys" });
+
         Options = options;
 
         Logger = loggerFactory.CreateLogger<HttpSysListener>();
@@ -70,11 +74,9 @@ public HttpSysListener(HttpSysOptions options, ILoggerFactory loggerFactory)
         try
         {
             _serverSession = new ServerSession();
-
-            _requestQueue = new RequestQueue(options.RequestQueueName, options.RequestQueueMode, Logger);
-
+            _requestQueue = new RequestQueue(options.RequestQueueName, options.RequestQueueMode,
+                options.RequestQueueSecurityDescriptor, Logger);
             _urlGroup = new UrlGroup(_serverSession, _requestQueue, Logger);
-
             _disconnectListener = new DisconnectListener(_requestQueue, Logger);
         }
         catch (Exception exception)
@@ -97,20 +99,9 @@ internal enum State
 
     internal ILogger Logger { get; private set; }
 
-    internal UrlGroup UrlGroup
-    {
-        get { return _urlGroup; }
-    }
-
-    internal RequestQueue RequestQueue
-    {
-        get { return _requestQueue; }
-    }
-
-    internal DisconnectListener DisconnectListener
-    {
-        get { return _disconnectListener; }
-    }
+    internal UrlGroup UrlGroup => _urlGroup;
+    internal RequestQueue RequestQueue => _requestQueue;
+    internal DisconnectListener DisconnectListener => _disconnectListener;
 
     public HttpSysOptions Options { get; }
 
@@ -352,7 +343,7 @@ internal unsafe void SendError(ulong requestId, int httpStatusCode, IList<string
         }
 
         httpResponse.Base.StatusCode = checked((ushort)httpStatusCode);
-        var statusDescription = HttpReasonPhrase.Get(httpStatusCode) ?? string.Empty;
+        var statusDescription = ReasonPhrases.GetReasonPhrase(httpStatusCode);
         uint dataWritten = 0;
         uint statusCode;
 
diff --git a/src/Servers/HttpSys/src/HttpSysOptions.cs b/src/Servers/HttpSys/src/HttpSysOptions.cs
index 44bc0bc5faa8..3d47e5cea32d 100644
--- a/src/Servers/HttpSys/src/HttpSysOptions.cs
+++ b/src/Servers/HttpSys/src/HttpSysOptions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using System.Security.AccessControl;
 using System.Text;
 using Microsoft.AspNetCore.Http.Features;
 
@@ -167,6 +168,14 @@ public long RequestQueueLimit
         }
     }
 
+    /// <summary>
+    /// Gets or sets the security descriptor for the request queue.
+    /// </summary>
+    /// <remarks>
+    /// Only applies when creating a new request queue, see <see cref="RequestQueueMode" />.
+    /// </remarks>
+    public GenericSecurityDescriptor? RequestQueueSecurityDescriptor { get; set; }
+
     /// <summary>
     /// Gets or sets the maximum allowed size of any request body in bytes.
     /// When set to null, the maximum request body size is unlimited.
@@ -237,7 +246,7 @@ public Http503VerbosityLevel Http503Verbosity
     /// Configures request headers to use <see cref="Encoding.Latin1"/> encoding.
     /// </summary>
     /// <remarks>
-    /// Defaults to `false`, in which case <see cref="Encoding.UTF8"/> will be used. />.
+    /// Defaults to <c>false</c>, in which case <see cref="Encoding.UTF8"/> will be used. />.
     /// </remarks>
     public bool UseLatin1RequestHeaders { get; set; }
 
diff --git a/src/Servers/HttpSys/src/IHttpSysRequestPropertyFeature.cs b/src/Servers/HttpSys/src/IHttpSysRequestPropertyFeature.cs
new file mode 100644
index 000000000000..392e11cb73e6
--- /dev/null
+++ b/src/Servers/HttpSys/src/IHttpSysRequestPropertyFeature.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Server.HttpSys;
+
+/// <summary>
+/// Provides API to read HTTP_REQUEST_PROPERTY value from the HTTP.SYS request.
+/// <see href="https://learn.microsoft.com/windows/win32/api/http/ne-http-http_request_property"/>
+/// </summary>
+public interface IHttpSysRequestPropertyFeature
+{
+    /// <summary>
+    /// Reads the TLS client hello from HTTP.SYS
+    /// </summary>
+    /// <param name="tlsClientHelloBytesDestination">Where the raw bytes of the TLS Client Hello message are written.</param>
+    /// <param name="bytesReturned">
+    /// Returns the number of bytes written to <paramref name="tlsClientHelloBytesDestination"/>.
+    /// Or can return the size of the buffer needed if <paramref name="tlsClientHelloBytesDestination"/> wasn't large enough.
+    /// </param>
+    /// <remarks>
+    /// Works only if <c>HTTP_SERVICE_CONFIG_SSL_FLAG_ENABLE_CACHE_CLIENT_HELLO</c> flag is set on http.sys service configuration.
+    /// See <see href="https://learn.microsoft.com/windows/win32/api/http/nf-http-httpsetserviceconfiguration"/>
+    /// and <see href="https://learn.microsoft.com/windows/win32/api/http/ne-http-http_service_config_id"/>
+    /// <br/><br/>
+    /// If you don't want to guess the required <paramref name="tlsClientHelloBytesDestination"/> size before first invocation,
+    /// you should first call with <paramref name="tlsClientHelloBytesDestination"/> set to empty size, so that you can retrieve the required buffer size from <paramref name="bytesReturned"/>,
+    /// then allocate that amount of memory and retry the query.
+    /// </remarks>
+    /// <returns>
+    /// True, if fetching TLS client hello was successful, false if <paramref name="tlsClientHelloBytesDestination"/> size is not large enough.
+    /// If unsuccessful for other reason throws an exception.
+    /// </returns>
+    /// <exception cref="HttpSysException">Any HttpSys error except for ERROR_INSUFFICIENT_BUFFER or ERROR_MORE_DATA.</exception>
+    /// <exception cref="InvalidOperationException">If HttpSys does not support querying the TLS Client Hello.</exception>
+    bool TryGetTlsClientHello(Span<byte> tlsClientHelloBytesDestination, out int bytesReturned);
+}
diff --git a/src/Servers/HttpSys/src/LoggerEventIds.cs b/src/Servers/HttpSys/src/LoggerEventIds.cs
index 5bc0b6b65ed6..a9f2c969c6bc 100644
--- a/src/Servers/HttpSys/src/LoggerEventIds.cs
+++ b/src/Servers/HttpSys/src/LoggerEventIds.cs
@@ -59,4 +59,6 @@ internal static class LoggerEventIds
     public const int AcceptCancelExpectationMismatch = 52;
     public const int AcceptObserveExpectationMismatch = 53;
     public const int RequestParsingError = 54;
+    public const int TlsListenerError = 55;
+    public const int QueryTlsCipherSuiteError = 56;
 }
diff --git a/src/Servers/HttpSys/src/MessagePump.cs b/src/Servers/HttpSys/src/MessagePump.cs
index 695c45d3b4e9..ae0a8a5a66cc 100644
--- a/src/Servers/HttpSys/src/MessagePump.cs
+++ b/src/Servers/HttpSys/src/MessagePump.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http.Features;
@@ -27,12 +28,13 @@ internal sealed partial class MessagePump : IServer, IServerDelegationFeature
 
     private readonly ServerAddressesFeature _serverAddresses;
 
-    public MessagePump(IOptions<HttpSysOptions> options, ILoggerFactory loggerFactory, IAuthenticationSchemeProvider authentication)
+    public MessagePump(IOptions<HttpSysOptions> options, IMemoryPoolFactory<byte> memoryPoolFactory,
+        ILoggerFactory loggerFactory, IAuthenticationSchemeProvider authentication)
     {
         ArgumentNullException.ThrowIfNull(options);
         ArgumentNullException.ThrowIfNull(loggerFactory);
         _options = options.Value;
-        Listener = new HttpSysListener(_options, loggerFactory);
+        Listener = new HttpSysListener(_options, memoryPoolFactory, loggerFactory);
         _logger = loggerFactory.CreateLogger<MessagePump>();
 
         if (_options.Authentication.Schemes != AuthenticationSchemes.None)
diff --git a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
index 50ed94c1a45d..868990b89816 100644
--- a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
+++ b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
@@ -28,6 +28,7 @@
     <Compile Include="$(SharedSourceRoot)ServerInfrastructure\StringUtilities.cs" LinkBase="ServerInfrastructure\StringUtilities.cs" />
     <Compile Include="$(SharedSourceRoot)ServerInfrastructure\HttpCharacters.cs" LinkBase="ServerInfrastructure\HttpCharacters.cs" />
     <Compile Include="$(SharedSourceRoot)TaskToApm.cs" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" Link="Shared\Obsoletions.cs" />
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Debugger\StringValuesDictionaryDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)PathNormalizer\**\*.cs" LinkBase="RequestProcessing" />
diff --git a/src/Servers/HttpSys/src/NativeInterop/ErrorCodes.cs b/src/Servers/HttpSys/src/NativeInterop/ErrorCodes.cs
index d66397390430..b8263ef12a1a 100644
--- a/src/Servers/HttpSys/src/NativeInterop/ErrorCodes.cs
+++ b/src/Servers/HttpSys/src/NativeInterop/ErrorCodes.cs
@@ -13,6 +13,7 @@ internal static class ErrorCodes
     internal const uint ERROR_HANDLE_EOF = 38;
     internal const uint ERROR_NOT_SUPPORTED = 50;
     internal const uint ERROR_INVALID_PARAMETER = 87;
+    internal const uint ERROR_INSUFFICIENT_BUFFER = 122;
     internal const uint ERROR_INVALID_NAME = 123;
     internal const uint ERROR_ALREADY_EXISTS = 183;
     internal const uint ERROR_MORE_DATA = 234;
diff --git a/src/Servers/HttpSys/src/NativeInterop/HttpApi.cs b/src/Servers/HttpSys/src/NativeInterop/HttpApi.cs
index 1fec2ffea7e6..fbada3843642 100644
--- a/src/Servers/HttpSys/src/NativeInterop/HttpApi.cs
+++ b/src/Servers/HttpSys/src/NativeInterop/HttpApi.cs
@@ -35,22 +35,42 @@ internal static partial class HttpApi
     internal static partial uint CancelIoEx(SafeHandle handle, SafeNativeOverlapped overlapped);
 
     internal unsafe delegate uint HttpGetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
-        void* qualifier, uint qualifierSize, void* output, uint outputSize, uint* bytesReturned, IntPtr overlapped);
+        void* qualifier, uint qualifierSize, void* output, uint outputSize, IntPtr bytesReturned, IntPtr overlapped);
 
-    internal unsafe delegate uint HttpSetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId, void* input, uint inputSize, IntPtr overlapped);
+    internal unsafe delegate uint HttpSetRequestPropertyInvoker(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
+        void* input, uint inputSize, IntPtr overlapped);
 
     // HTTP_PROPERTY_FLAGS.Present (1)
     internal static HTTP_PROPERTY_FLAGS HTTP_PROPERTY_FLAGS_PRESENT { get; } = new() { _bitfield = 0x00000001 };
     // This property is used by HttpListener to pass the version structure to the native layer in API calls.
     internal static HTTPAPI_VERSION Version { get; } = new () { HttpApiMajorVersion = 2 };
     internal static SafeLibraryHandle? HttpApiModule { get; }
-    internal static HttpGetRequestPropertyInvoker? HttpGetRequestProperty { get; }
-    internal static HttpSetRequestPropertyInvoker? HttpSetRequestProperty { get; }
-    [MemberNotNullWhen(true, nameof(HttpSetRequestProperty))]
+
+    private static HttpGetRequestPropertyInvoker? HttpGetRequestInvoker { get; }
+    private static HttpSetRequestPropertyInvoker? HttpSetRequestInvoker { get; }
+
+    internal static bool HttpGetRequestPropertySupported => HttpGetRequestInvoker is not null;
+    internal static bool HttpSetRequestPropertySupported => HttpSetRequestInvoker is not null;
+
+    internal static unsafe uint HttpGetRequestProperty(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
+        void* qualifier, uint qualifierSize, void* output, uint outputSize, IntPtr bytesReturned, IntPtr overlapped)
+    {
+        return HttpGetRequestInvoker!(requestQueueHandle, requestId, propertyId, qualifier, qualifierSize, output, outputSize, bytesReturned, overlapped);
+    }
+
+    internal static unsafe uint HttpSetRequestProperty(SafeHandle requestQueueHandle, ulong requestId, HTTP_REQUEST_PROPERTY propertyId,
+        void* input, uint inputSize, IntPtr overlapped)
+    {
+        return HttpSetRequestInvoker!(requestQueueHandle, requestId, propertyId, input, inputSize, overlapped);
+    }
+
+    [MemberNotNullWhen(true, nameof(HttpSetRequestInvoker))]
     internal static bool SupportsTrailers { get; }
-    [MemberNotNullWhen(true, nameof(HttpSetRequestProperty))]
+    [MemberNotNullWhen(true, nameof(HttpSetRequestInvoker))]
     internal static bool SupportsReset { get; }
     internal static bool SupportsDelegation { get; }
+    internal static bool SupportsClientHello { get; }
+    internal static bool SupportsQueryTlsCipherInfo { get; }
     internal static bool Supported { get; }
 
     static unsafe HttpApi()
@@ -61,11 +81,13 @@ static unsafe HttpApi()
         {
             Supported = true;
             HttpApiModule = SafeLibraryHandle.Open(HTTPAPI);
-            HttpGetRequestProperty = HttpApiModule.GetProcAddress<HttpGetRequestPropertyInvoker>("HttpQueryRequestProperty", throwIfNotFound: false);
-            HttpSetRequestProperty = HttpApiModule.GetProcAddress<HttpSetRequestPropertyInvoker>("HttpSetRequestProperty", throwIfNotFound: false);
-            SupportsReset = HttpSetRequestProperty != null;
+            HttpGetRequestInvoker = HttpApiModule.GetProcAddress<HttpGetRequestPropertyInvoker>("HttpQueryRequestProperty", throwIfNotFound: false);
+            HttpSetRequestInvoker = HttpApiModule.GetProcAddress<HttpSetRequestPropertyInvoker>("HttpSetRequestProperty", throwIfNotFound: false);
+            SupportsReset = HttpSetRequestPropertySupported;
             SupportsTrailers = IsFeatureSupported(HTTP_FEATURE_ID.HttpFeatureResponseTrailers);
             SupportsDelegation = IsFeatureSupported(HTTP_FEATURE_ID.HttpFeatureDelegateEx);
+            SupportsClientHello = IsFeatureSupported((HTTP_FEATURE_ID)11 /* HTTP_FEATURE_ID.HttpFeatureCacheTlsClientHello */) && HttpGetRequestPropertySupported;
+            SupportsQueryTlsCipherInfo = IsFeatureSupported((HTTP_FEATURE_ID)15 /* HTTP_FEATURE_ID.HttpFeatureQueryCipherInfo */) && HttpGetRequestPropertySupported;
         }
     }
 
diff --git a/src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs b/src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs
index 810bdcce3c57..a2e86245de75 100644
--- a/src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs
+++ b/src/Servers/HttpSys/src/NativeInterop/RequestQueue.cs
@@ -3,9 +3,11 @@
 
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Security.AccessControl;
 using Microsoft.Extensions.Logging;
 using Windows.Win32;
 using Windows.Win32.Networking.HttpServer;
+using Windows.Win32.Security;
 
 namespace Microsoft.AspNetCore.Server.HttpSys;
 
@@ -16,15 +18,15 @@ internal sealed partial class RequestQueue
     private bool _disposed;
 
     internal RequestQueue(string requestQueueName, ILogger logger)
-        : this(requestQueueName, RequestQueueMode.Attach, logger, receiver: true)
+        : this(requestQueueName, RequestQueueMode.Attach, securityDescriptor: null, logger, receiver: true)
     {
     }
 
-    internal RequestQueue(string? requestQueueName, RequestQueueMode mode, ILogger logger)
-        : this(requestQueueName, mode, logger, false)
+    internal RequestQueue(string? requestQueueName, RequestQueueMode mode, GenericSecurityDescriptor? securityDescriptor, ILogger logger)
+        : this(requestQueueName, mode, securityDescriptor, logger, false)
     { }
 
-    private RequestQueue(string? requestQueueName, RequestQueueMode mode, ILogger logger, bool receiver)
+    private RequestQueue(string? requestQueueName, RequestQueueMode mode, GenericSecurityDescriptor? securityDescriptor, ILogger logger, bool receiver)
     {
         _mode = mode;
         _logger = logger;
@@ -32,66 +34,100 @@ private RequestQueue(string? requestQueueName, RequestQueueMode mode, ILogger lo
         var flags = 0u;
         Created = true;
 
-        if (_mode == RequestQueueMode.Attach)
+        SECURITY_ATTRIBUTES? securityAttributes = null;
+        nint? pSecurityDescriptor = null;
+
+        try
         {
-            flags = PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING;
-            Created = false;
-            if (receiver)
+            if (_mode == RequestQueueMode.Attach)
             {
-                flags |= PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_DELEGATION;
+                flags = PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING;
+                Created = false;
+                if (receiver)
+                {
+                    flags |= PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_DELEGATION;
+                }
+            }
+            else if (securityDescriptor is not null) // Create or CreateOrAttach
+            {
+                // Convert the security descriptor to a byte array
+                byte[] securityDescriptorBytes = new byte[securityDescriptor.BinaryLength];
+                securityDescriptor.GetBinaryForm(securityDescriptorBytes, 0);
+
+                // Allocate native memory for the security descriptor
+                pSecurityDescriptor = Marshal.AllocHGlobal(securityDescriptorBytes.Length);
+                Marshal.Copy(securityDescriptorBytes, 0, pSecurityDescriptor.Value, securityDescriptorBytes.Length);
+
+                unsafe
+                {
+                    securityAttributes = new SECURITY_ATTRIBUTES
+                    {
+                        nLength = (uint)Marshal.SizeOf<SECURITY_ATTRIBUTES>(),
+                        lpSecurityDescriptor = pSecurityDescriptor.Value.ToPointer(),
+                        bInheritHandle = false
+                    };
+                }
             }
-        }
-
-        var statusCode = PInvoke.HttpCreateRequestQueue(
-                HttpApi.Version,
-                requestQueueName,
-                default,
-                flags,
-                out var requestQueueHandle);
 
-        if (_mode == RequestQueueMode.CreateOrAttach && statusCode == ErrorCodes.ERROR_ALREADY_EXISTS)
-        {
-            // Tried to create, but it already exists so attach to it instead.
-            Created = false;
-            flags = PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING;
-            statusCode = PInvoke.HttpCreateRequestQueue(
+            var statusCode = PInvoke.HttpCreateRequestQueue(
                     HttpApi.Version,
                     requestQueueName,
-                    default,
+                    securityAttributes,
                     flags,
-                    out requestQueueHandle);
-        }
+                    out var requestQueueHandle);
 
-        if ((flags & PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING) != 0 && statusCode == ErrorCodes.ERROR_FILE_NOT_FOUND)
-        {
-            throw new HttpSysException((int)statusCode, $"Failed to attach to the given request queue '{requestQueueName}', the queue could not be found.");
-        }
-        else if (statusCode == ErrorCodes.ERROR_INVALID_NAME)
-        {
-            throw new HttpSysException((int)statusCode, $"The given request queue name '{requestQueueName}' is invalid.");
-        }
-        else if (statusCode != ErrorCodes.ERROR_SUCCESS)
-        {
-            throw new HttpSysException((int)statusCode);
-        }
+            if (_mode == RequestQueueMode.CreateOrAttach && statusCode == ErrorCodes.ERROR_ALREADY_EXISTS)
+            {
+                // Tried to create, but it already exists so attach to it instead.
+                Created = false;
+                flags = PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING;
+                statusCode = PInvoke.HttpCreateRequestQueue(
+                        HttpApi.Version,
+                        requestQueueName,
+                        SecurityAttributes: default, // Attaching should not pass any security attributes
+                        flags,
+                        out requestQueueHandle);
+            }
 
-        // Disabling callbacks when IO operation completes synchronously (returns ErrorCodes.ERROR_SUCCESS)
-        if (HttpSysListener.SkipIOCPCallbackOnSuccess &&
-            !PInvoke.SetFileCompletionNotificationModes(
-                requestQueueHandle,
-                (byte)(PInvoke.FILE_SKIP_COMPLETION_PORT_ON_SUCCESS |
-                PInvoke.FILE_SKIP_SET_EVENT_ON_HANDLE)))
-        {
-            requestQueueHandle.Dispose();
-            throw new HttpSysException(Marshal.GetLastWin32Error());
-        }
+            if ((flags & PInvoke.HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING) != 0 && statusCode == ErrorCodes.ERROR_FILE_NOT_FOUND)
+            {
+                throw new HttpSysException((int)statusCode, $"Failed to attach to the given request queue '{requestQueueName}', the queue could not be found.");
+            }
+            else if (statusCode == ErrorCodes.ERROR_INVALID_NAME)
+            {
+                throw new HttpSysException((int)statusCode, $"The given request queue name '{requestQueueName}' is invalid.");
+            }
+            else if (statusCode != ErrorCodes.ERROR_SUCCESS)
+            {
+                throw new HttpSysException((int)statusCode);
+            }
+
+            // Disabling callbacks when IO operation completes synchronously (returns ErrorCodes.ERROR_SUCCESS)
+            if (HttpSysListener.SkipIOCPCallbackOnSuccess &&
+                !PInvoke.SetFileCompletionNotificationModes(
+                    requestQueueHandle,
+                    (byte)(PInvoke.FILE_SKIP_COMPLETION_PORT_ON_SUCCESS |
+                    PInvoke.FILE_SKIP_SET_EVENT_ON_HANDLE)))
+            {
+                requestQueueHandle.Dispose();
+                throw new HttpSysException(Marshal.GetLastWin32Error());
+            }
 
-        Handle = requestQueueHandle;
-        BoundHandle = ThreadPoolBoundHandle.BindHandle(Handle);
+            Handle = requestQueueHandle;
+            BoundHandle = ThreadPoolBoundHandle.BindHandle(Handle);
 
-        if (!Created)
+            if (!Created)
+            {
+                Log.AttachedToQueue(_logger, requestQueueName);
+            }
+        }
+        finally
         {
-            Log.AttachedToQueue(_logger, requestQueueName);
+            if (pSecurityDescriptor is not null)
+            {
+                // Free the allocated memory for the security descriptor
+                Marshal.FreeHGlobal(pSecurityDescriptor.Value);
+            }
         }
     }
 
@@ -143,6 +179,9 @@ public void Dispose()
         }
 
         _disposed = true;
+
+        PInvoke.HttpCloseRequestQueue(Handle);
+
         BoundHandle.Dispose();
         Handle.Dispose();
     }
diff --git a/src/Servers/HttpSys/src/NativeMethods.txt b/src/Servers/HttpSys/src/NativeMethods.txt
index 3d6f700d6101..0ad43a083c5d 100644
--- a/src/Servers/HttpSys/src/NativeMethods.txt
+++ b/src/Servers/HttpSys/src/NativeMethods.txt
@@ -42,6 +42,7 @@ HTTPAPI_VERSION
 HttpCancelHttpRequest
 HttpCloseServerSession
 HttpCloseUrlGroup
+HttpCloseRequestQueue
 HttpCreateRequestQueue
 HttpCreateServerSession
 HttpCreateUrlGroup
@@ -57,3 +58,8 @@ HttpSetRequestQueueProperty
 HttpSetUrlGroupProperty
 HttpSetUrlGroupProperty
 SetFileCompletionNotificationModes
+SOCKADDR_IN
+SOCKADDR_IN6
+GetSecurityInfo
+GetSecurityDescriptorLength
+LocalFree
diff --git a/src/Servers/HttpSys/src/PublicAPI.Shipped.txt b/src/Servers/HttpSys/src/PublicAPI.Shipped.txt
index a911df29099f..bf2c554f1c03 100644
--- a/src/Servers/HttpSys/src/PublicAPI.Shipped.txt
+++ b/src/Servers/HttpSys/src/PublicAPI.Shipped.txt
@@ -8,6 +8,10 @@ Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.AuthenticationDisplayN
 Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.AuthenticationDisplayName.set -> void
 Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.AutomaticAuthentication.get -> bool
 Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.AutomaticAuthentication.set -> void
+Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.CaptureCredentials.get -> bool
+Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.CaptureCredentials.set -> void
+Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.EnableKerberosCredentialCaching.get -> bool
+Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.EnableKerberosCredentialCaching.set -> void
 Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.Schemes.get -> Microsoft.AspNetCore.Server.HttpSys.AuthenticationSchemes
 Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.Schemes.set -> void
 Microsoft.AspNetCore.Server.HttpSys.AuthenticationSchemes
diff --git a/src/Servers/HttpSys/src/PublicAPI.Unshipped.txt b/src/Servers/HttpSys/src/PublicAPI.Unshipped.txt
index f68a65d79547..20bc39698c15 100644
--- a/src/Servers/HttpSys/src/PublicAPI.Unshipped.txt
+++ b/src/Servers/HttpSys/src/PublicAPI.Unshipped.txt
@@ -1,5 +1,5 @@
 #nullable enable
-Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.CaptureCredentials.get -> bool
-Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.CaptureCredentials.set -> void
-Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.EnableKerberosCredentialCaching.get -> bool
-Microsoft.AspNetCore.Server.HttpSys.AuthenticationManager.EnableKerberosCredentialCaching.set -> void
+Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.RequestQueueSecurityDescriptor.get -> System.Security.AccessControl.GenericSecurityDescriptor?
+Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions.RequestQueueSecurityDescriptor.set -> void
+Microsoft.AspNetCore.Server.HttpSys.IHttpSysRequestPropertyFeature
+Microsoft.AspNetCore.Server.HttpSys.IHttpSysRequestPropertyFeature.TryGetTlsClientHello(System.Span<byte> tlsClientHelloBytesDestination, out int bytesReturned) -> bool
diff --git a/src/Servers/HttpSys/src/RequestProcessing/HttpReasonPhrase.cs b/src/Servers/HttpSys/src/RequestProcessing/HttpReasonPhrase.cs
deleted file mode 100644
index 421bfdbd620b..000000000000
--- a/src/Servers/HttpSys/src/RequestProcessing/HttpReasonPhrase.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Microsoft.AspNetCore.Server.HttpSys;
-
-internal static class HttpReasonPhrase
-{
-    private static readonly string?[]?[] HttpReasonPhrases = new string?[]?[]
-    {
-            null,
-
-            new string?[]
-            {
-                /* 100 */ "Continue",
-                /* 101 */ "Switching Protocols",
-                /* 102 */ "Processing"
-            },
-
-            new string?[]
-            {
-                /* 200 */ "OK",
-                /* 201 */ "Created",
-                /* 202 */ "Accepted",
-                /* 203 */ "Non-Authoritative Information",
-                /* 204 */ "No Content",
-                /* 205 */ "Reset Content",
-                /* 206 */ "Partial Content",
-                /* 207 */ "Multi-Status"
-            },
-
-            new string?[]
-            {
-                /* 300 */ "Multiple Choices",
-                /* 301 */ "Moved Permanently",
-                /* 302 */ "Found",
-                /* 303 */ "See Other",
-                /* 304 */ "Not Modified",
-                /* 305 */ "Use Proxy",
-                /* 306 */ null,
-                /* 307 */ "Temporary Redirect"
-            },
-
-            new string?[]
-            {
-                /* 400 */ "Bad Request",
-                /* 401 */ "Unauthorized",
-                /* 402 */ "Payment Required",
-                /* 403 */ "Forbidden",
-                /* 404 */ "Not Found",
-                /* 405 */ "Method Not Allowed",
-                /* 406 */ "Not Acceptable",
-                /* 407 */ "Proxy Authentication Required",
-                /* 408 */ "Request Timeout",
-                /* 409 */ "Conflict",
-                /* 410 */ "Gone",
-                /* 411 */ "Length Required",
-                /* 412 */ "Precondition Failed",
-                /* 413 */ "Request Entity Too Large",
-                /* 414 */ "Request-Uri Too Long",
-                /* 415 */ "Unsupported Media Type",
-                /* 416 */ "Requested Range Not Satisfiable",
-                /* 417 */ "Expectation Failed",
-                /* 418 */ null,
-                /* 419 */ null,
-                /* 420 */ null,
-                /* 421 */ null,
-                /* 422 */ "Unprocessable Entity",
-                /* 423 */ "Locked",
-                /* 424 */ "Failed Dependency",
-                /* 425 */ null,
-                /* 426 */ "Upgrade Required", // RFC 2817
-            },
-
-            new string?[]
-            {
-                /* 500 */ "Internal Server Error",
-                /* 501 */ "Not Implemented",
-                /* 502 */ "Bad Gateway",
-                /* 503 */ "Service Unavailable",
-                /* 504 */ "Gateway Timeout",
-                /* 505 */ "Http Version Not Supported",
-                /* 506 */ null,
-                /* 507 */ "Insufficient Storage"
-            }
-    };
-
-    internal static string? Get(int code)
-    {
-        if (code >= 100 && code < 600)
-        {
-            int i = code / 100;
-            int j = code % 100;
-            if (j < HttpReasonPhrases[i]!.Length)
-            {
-                return HttpReasonPhrases[i]![j];
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/Servers/HttpSys/src/RequestProcessing/Request.cs b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
index f02507251cab..3d99fe8e718b 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/Request.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
@@ -3,6 +3,7 @@
 
 using System.Globalization;
 using System.Net;
+using System.Net.Security;
 using System.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography;
@@ -10,6 +11,7 @@
 using System.Security.Principal;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpSys.Internal;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
@@ -263,10 +265,7 @@ public long? MaxRequestBodySize
         set
         {
             EnsureRequestStream();
-            if (_nativeStream != null)
-            {
-                _nativeStream.MaxSize = value;
-            }
+            _nativeStream?.MaxSize = value;
         }
     }
 
@@ -336,28 +335,40 @@ private AspNetCore.HttpSys.Internal.SocketAddress LocalEndPoint
 
     public SslProtocols Protocol { get; private set; }
 
+    public TlsCipherSuite? NegotiatedCipherSuite { get; private set; }
+
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public CipherAlgorithmType CipherAlgorithm { get; private set; }
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int CipherStrength { get; private set; }
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public HashAlgorithmType HashAlgorithm { get; private set; }
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int HashStrength { get; private set; }
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public ExchangeAlgorithmType KeyExchangeAlgorithm { get; private set; }
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int KeyExchangeStrength { get; private set; }
 
     private void GetTlsHandshakeResults()
     {
         var handshake = RequestContext.GetTlsHandshake();
         Protocol = (SslProtocols)handshake.Protocol;
+
+        NegotiatedCipherSuite = RequestContext.GetTlsCipherSuite();
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
         CipherAlgorithm = (CipherAlgorithmType)handshake.CipherType;
         CipherStrength = (int)handshake.CipherStrength;
         HashAlgorithm = (HashAlgorithmType)handshake.HashType;
         HashStrength = (int)handshake.HashStrength;
         KeyExchangeAlgorithm = (ExchangeAlgorithmType)handshake.KeyExchangeType;
         KeyExchangeStrength = (int)handshake.KeyExchangeStrength;
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
         var sni = RequestContext.GetClientSni();
         SniHostName = sni.Hostname.ToString();
diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs
index e1931dc0fc6b..a66e44d1484c 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.IO.Pipelines;
 using System.Net;
+using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Claims;
 using System.Security.Cryptography.X509Certificates;
@@ -36,6 +37,7 @@ internal partial class RequestContext :
     IHttpResponseTrailersFeature,
     IHttpResetFeature,
     IHttpSysRequestDelegationFeature,
+    IHttpSysRequestPropertyFeature,
     IConnectionLifetimeNotificationFeature
 {
     private IFeatureCollection? _features;
@@ -592,6 +594,9 @@ bool IHttpBodyControlFeature.AllowSynchronousIO
 
     SslProtocols ITlsHandshakeFeature.Protocol => Request.Protocol;
 
+    TlsCipherSuite? ITlsHandshakeFeature.NegotiatedCipherSuite => Request.NegotiatedCipherSuite;
+
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
     CipherAlgorithmType ITlsHandshakeFeature.CipherAlgorithm => Request.CipherAlgorithm;
 
     int ITlsHandshakeFeature.CipherStrength => Request.CipherStrength;
@@ -603,6 +608,7 @@ bool IHttpBodyControlFeature.AllowSynchronousIO
     ExchangeAlgorithmType ITlsHandshakeFeature.KeyExchangeAlgorithm => Request.KeyExchangeAlgorithm;
 
     int ITlsHandshakeFeature.KeyExchangeStrength => Request.KeyExchangeStrength;
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
     string ITlsHandshakeFeature.HostName => Request.SniHostName;
 
@@ -751,4 +757,9 @@ void IConnectionLifetimeNotificationFeature.RequestClose()
             Response.Headers[HeaderNames.Connection] = "close";
         }
     }
+
+    public bool TryGetTlsClientHello(Span<byte> tlsClientHelloBytesDestination, out int bytesReturned)
+    {
+        return TryGetTlsClientHelloMessageBytes(tlsClientHelloBytesDestination, out bytesReturned);
+    }
 }
diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs
index 41b1cf480d5a..0fce6896778b 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs
@@ -20,5 +20,11 @@ private static partial class Log
 
         [LoggerMessage(LoggerEventIds.RequestParsingError, LogLevel.Debug, "Failed to parse request.", EventName = "RequestParsingError")]
         public static partial void RequestParsingError(ILogger logger, Exception exception);
+
+        [LoggerMessage(LoggerEventIds.RequestParsingError, LogLevel.Debug, "Failed to invoke QueryTlsClientHello; RequestId: {RequestId}; Win32 Error code: {Win32Error}", EventName = "TlsClientHelloRetrieveError")]
+        public static partial void TlsClientHelloRetrieveError(ILogger logger, ulong requestId, uint win32Error);
+
+        [LoggerMessage(LoggerEventIds.QueryTlsCipherSuiteError, LogLevel.Debug, "Failed to invoke QueryTlsCipherSuite; RequestId: {RequestId}; Win32 Error code: {Win32Error}", EventName = "QueryTlsCipherSuiteError")]
+        public static partial void QueryTlsCipherSuiteError(ILogger logger, ulong requestId, uint win32Error);
     }
 }
diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs
index 20cd8056b04f..5aefb9df1cf3 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs
@@ -1,10 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Net.Security;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpSys.Internal;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Windows.Win32;
 using Windows.Win32.Networking.HttpServer;
@@ -101,7 +103,7 @@ public Task<Stream> UpgradeAsync()
 
         // Set the status code and reason phrase
         Response.StatusCode = StatusCodes.Status101SwitchingProtocols;
-        Response.ReasonPhrase = HttpReasonPhrase.Get(StatusCodes.Status101SwitchingProtocols);
+        Response.ReasonPhrase = ReasonPhrases.GetReasonPhrase(StatusCodes.Status101SwitchingProtocols);
 
         Response.SendOpaqueUpgrade(); // TODO: Async
         Request.SwitchToOpaqueMode();
@@ -218,28 +220,123 @@ internal void ForceCancelRequest()
         }
     }
 
+    /// <summary>
+    /// Gets TLS cipher suite used for the request, if supported by the OS and http.sys.
+    /// </summary>
+    /// <returns>
+    /// null, if query of TlsCipherSuite is not supported or the query failed.
+    /// TlsCipherSuite value, if query is successful.
+    /// </returns>
+    internal unsafe TlsCipherSuite? GetTlsCipherSuite()
+    {
+        if (!HttpApi.SupportsQueryTlsCipherInfo)
+        {
+            return default;
+        }
+
+        var requestId = PinsReleased ? Request.RequestId : RequestId;
+
+        SecPkgContext_CipherInfo cipherInfo = default;
+
+        var statusCode = HttpApi.HttpGetRequestProperty(
+            requestQueueHandle: Server.RequestQueue.Handle,
+            requestId,
+            propertyId: (HTTP_REQUEST_PROPERTY)14 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsCipherInfo */,
+            qualifier: null,
+            qualifierSize: 0,
+            output: &cipherInfo,
+            outputSize: (uint)sizeof(SecPkgContext_CipherInfo),
+            bytesReturned: IntPtr.Zero,
+            overlapped: IntPtr.Zero);
+
+        if (statusCode is ErrorCodes.ERROR_SUCCESS)
+        {
+            return checked((TlsCipherSuite)cipherInfo.dwCipherSuite);
+        }
+
+        // OS supports querying TlsCipherSuite, but request failed.
+        Log.QueryTlsCipherSuiteError(Logger, requestId, statusCode);
+        return null;
+    }
+
+    /// <summary>
+    /// Attempts to get the client hello message bytes from the http.sys.
+    /// If successful writes the bytes into <paramref name="destination"/>, and shows how many bytes were written in <paramref name="bytesReturned"/>.
+    /// If not successful because <paramref name="destination"/> is not large enough, returns false and shows a size of <paramref name="destination"/> required in <paramref name="bytesReturned"/>.
+    /// If not successful for other reason - throws exception with message/errorCode.
+    /// </summary>
+    internal unsafe bool TryGetTlsClientHelloMessageBytes(
+        Span<byte> destination,
+        out int bytesReturned)
+    {
+        bytesReturned = default;
+        if (!HttpApi.SupportsClientHello)
+        {
+            // not supported, so we just return and don't invoke the callback
+            throw new InvalidOperationException("Windows HTTP Server API does not support HTTP_FEATURE_ID.HttpFeatureCacheTlsClientHello or HttpQueryRequestProperty. See HTTP_FEATURE_ID for details.");
+        }
+
+        uint statusCode;
+        var requestId = PinsReleased ? Request.RequestId : RequestId;
+
+        uint bytesReturnedValue = 0;
+        uint* bytesReturnedPointer = &bytesReturnedValue;
+
+        fixed (byte* pBuffer = destination)
+        {
+            statusCode = HttpApi.HttpGetRequestProperty(
+                requestQueueHandle: Server.RequestQueue.Handle,
+                requestId,
+                propertyId: (HTTP_REQUEST_PROPERTY)11 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsClientHello  */,
+                qualifier: null,
+                qualifierSize: 0,
+                output: pBuffer,
+                outputSize: (uint)destination.Length,
+                bytesReturned: (IntPtr)bytesReturnedPointer,
+                overlapped: IntPtr.Zero);
+
+            bytesReturned = checked((int)bytesReturnedValue);
+
+            if (statusCode is ErrorCodes.ERROR_SUCCESS)
+            {
+                return true;
+            }
+
+            // if buffer supplied is too small, `bytesReturned` has proper size
+            if (statusCode is ErrorCodes.ERROR_MORE_DATA or ErrorCodes.ERROR_INSUFFICIENT_BUFFER)
+            {
+                return false;
+            }
+        }
+
+        Log.TlsClientHelloRetrieveError(Logger, requestId, statusCode);
+        throw new HttpSysException((int)statusCode);
+    }
+
     internal unsafe HTTP_REQUEST_PROPERTY_SNI GetClientSni()
     {
-        if (HttpApi.HttpGetRequestProperty != null)
+        if (!HttpApi.HttpGetRequestPropertySupported)
         {
-            var buffer = new byte[HttpApiTypes.SniPropertySizeInBytes];
-            fixed (byte* pBuffer = buffer)
+            return default;
+        }
+
+        var buffer = new byte[HttpApiTypes.SniPropertySizeInBytes];
+        fixed (byte* pBuffer = buffer)
+        {
+            var statusCode = HttpApi.HttpGetRequestProperty(
+                Server.RequestQueue.Handle,
+                RequestId,
+                HTTP_REQUEST_PROPERTY.HttpRequestPropertySni,
+                qualifier: null,
+                qualifierSize: 0,
+                pBuffer,
+                (uint)buffer.Length,
+                bytesReturned: IntPtr.Zero,
+                IntPtr.Zero);
+
+            if (statusCode == ErrorCodes.ERROR_SUCCESS)
             {
-                var statusCode = HttpApi.HttpGetRequestProperty(
-                    Server.RequestQueue.Handle,
-                    RequestId,
-                    HTTP_REQUEST_PROPERTY.HttpRequestPropertySni,
-                    qualifier: null,
-                    qualifierSize: 0,
-                    (void*)pBuffer,
-                    (uint)buffer.Length,
-                    bytesReturned: null,
-                    IntPtr.Zero);
-
-                if (statusCode == ErrorCodes.ERROR_SUCCESS)
-                {
-                    return Marshal.PtrToStructure<HTTP_REQUEST_PROPERTY_SNI>((IntPtr)pBuffer);
-                }
+                return Marshal.PtrToStructure<HTTP_REQUEST_PROPERTY_SNI>((IntPtr)pBuffer);
             }
         }
 
diff --git a/src/Servers/HttpSys/src/RequestProcessing/Response.cs b/src/Servers/HttpSys/src/RequestProcessing/Response.cs
index 0fb275227994..541199729a49 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/Response.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/Response.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpSys.Internal;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 using Windows.Win32;
@@ -123,7 +124,7 @@ private string GetReasonPhrase(int statusCode)
         if (string.IsNullOrWhiteSpace(reasonPhrase))
         {
             // If the user hasn't set this then it is generated on the fly if possible.
-            reasonPhrase = HttpReasonPhrase.Get(statusCode) ?? string.Empty;
+            reasonPhrase = ReasonPhrases.GetReasonPhrase(statusCode);
         }
         return reasonPhrase;
     }
@@ -185,10 +186,7 @@ public TimeSpan? CacheTtl
     // callers if they try to add them too late. E.g. after Content-Length or CompleteAsync().
     internal void MakeTrailersReadOnly()
     {
-        if (_trailers != null)
-        {
-            _trailers.IsReadOnly = true;
-        }
+        _trailers?.IsReadOnly = true;
     }
 
     internal void Abort()
diff --git a/src/Servers/HttpSys/src/StandardFeatureCollection.cs b/src/Servers/HttpSys/src/StandardFeatureCollection.cs
index dda57166921e..1c7d078d8253 100644
--- a/src/Servers/HttpSys/src/StandardFeatureCollection.cs
+++ b/src/Servers/HttpSys/src/StandardFeatureCollection.cs
@@ -27,6 +27,7 @@ internal sealed class StandardFeatureCollection : IFeatureCollection
         { typeof(IHttpBodyControlFeature), _identityFunc },
         { typeof(IHttpSysRequestInfoFeature), _identityFunc },
         { typeof(IHttpSysRequestTimingFeature), _identityFunc },
+        { typeof(IHttpSysRequestPropertyFeature), _identityFunc },
         { typeof(IHttpResponseTrailersFeature), ctx => ctx.GetResponseTrailersFeature() },
         { typeof(IHttpResetFeature), ctx => ctx.GetResetFeature() },
         { typeof(IConnectionLifetimeNotificationFeature), ctx => ctx.GetConnectionLifetimeNotificationFeature() },
diff --git a/src/Servers/HttpSys/src/WebHostBuilderHttpSysExtensions.cs b/src/Servers/HttpSys/src/WebHostBuilderHttpSysExtensions.cs
index fb0feaa23609..cf768cc64469 100644
--- a/src/Servers/HttpSys/src/WebHostBuilderHttpSysExtensions.cs
+++ b/src/Servers/HttpSys/src/WebHostBuilderHttpSysExtensions.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.Versioning;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Server.HttpSys;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Hosting;
@@ -45,6 +47,8 @@ public static IWebHostBuilder UseHttpSys(this IWebHostBuilder hostBuilder)
                 };
             });
             services.AddAuthenticationCore();
+
+            services.TryAddSingleton<IMemoryPoolFactory<byte>, DefaultMemoryPoolFactory>();
         });
     }
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/DelegateSupportedConditionAttribute.cs b/src/Servers/HttpSys/test/FunctionalTests/DelegateSupportedConditionAttribute.cs
index 981b6f2c9b78..7d9fdb793945 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/DelegateSupportedConditionAttribute.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/DelegateSupportedConditionAttribute.cs
@@ -9,9 +9,14 @@ namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests;
 public class DelegateSupportedConditionAttribute : Attribute, ITestCondition
 {
     private readonly bool _isSupported;
-    public DelegateSupportedConditionAttribute(bool isSupported) => _isSupported = isSupported;
+    private readonly bool _httpApiSupportsDelegation;
+    public DelegateSupportedConditionAttribute(bool isSupported)
+    {
+        _isSupported = isSupported;
+        try { _httpApiSupportsDelegation = HttpApi.SupportsDelegation; } catch { }
+    }
 
-    public bool IsMet => HttpApi.SupportsDelegation == _isSupported;
+    public bool IsMet => _httpApiSupportsDelegation == _isSupported;
 
     public string SkipReason => $"Http.Sys does {(_isSupported ? "not" : "")} support delegating requests";
 }
diff --git a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
index 79b77e32a93e..daa5dd7d466c 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
@@ -3,13 +3,17 @@
 
 using System.Net.Http;
 using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.Security.Principal;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.HttpSys.Internal;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Security;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests;
 
@@ -217,6 +221,7 @@ public async Task UpdateDelegationRuleTest()
 
     [ConditionalFact]
     [DelegateSupportedCondition(true)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60141")]
     public async Task DelegateAfterReceiverRestart()
     {
         var queueName = Guid.NewGuid().ToString();
@@ -265,6 +270,95 @@ public async Task DelegateAfterReceiverRestart()
         destination?.Dispose();
     }
 
+    [ConditionalFact]
+    [DelegateSupportedCondition(true)]
+    public async Task DelegateRequestTestCanSetSecurityDescriptor()
+    {
+        // Create a new security descriptor
+        CommonSecurityDescriptor securityDescriptor = new CommonSecurityDescriptor(false, false, string.Empty);
+
+        // Create a discretionary access control list (DACL)
+        DiscretionaryAcl dacl = new DiscretionaryAcl(false, false, 2);
+        dacl.AddAccess(AccessControlType.Allow, new SecurityIdentifier(WellKnownSidType.BuiltinUsersSid, null), -1, InheritanceFlags.None, PropagationFlags.None);
+        dacl.AddAccess(AccessControlType.Deny, new SecurityIdentifier(WellKnownSidType.BuiltinGuestsSid, null), -1, InheritanceFlags.None, PropagationFlags.None);
+
+        // Assign the DACL to the security descriptor
+        securityDescriptor.DiscretionaryAcl = dacl;
+
+        var queueName = Guid.NewGuid().ToString();
+        using var receiver = Utilities.CreateHttpServer(out var receiverAddress, async httpContext =>
+        {
+            await httpContext.Response.WriteAsync(_expectedResponseString);
+        },
+        options =>
+        {
+            options.RequestQueueName = queueName;
+            options.RequestQueueSecurityDescriptor = securityDescriptor;
+        }, LoggerFactory);
+
+        DelegationRule destination = default;
+
+        using var delegator = Utilities.CreateHttpServer(out var delegatorAddress, httpContext =>
+        {
+            var delegateFeature = httpContext.Features.Get<IHttpSysRequestDelegationFeature>();
+            delegateFeature.DelegateRequest(destination);
+            return Task.CompletedTask;
+        }, LoggerFactory);
+
+        var delegationProperty = delegator.Features.Get<IServerDelegationFeature>();
+        destination = delegationProperty.CreateDelegationRule(queueName, receiverAddress);
+
+        AssertPermissions(destination.Queue.Handle);
+        unsafe void AssertPermissions(SafeHandle handle)
+        {
+            PSECURITY_DESCRIPTOR pSecurityDescriptor = new();
+
+            WIN32_ERROR result = PInvoke.GetSecurityInfo(
+                handle,
+                Windows.Win32.Security.Authorization.SE_OBJECT_TYPE.SE_KERNEL_OBJECT,
+                4, // DACL_SECURITY_INFORMATION
+                null,
+                null,
+                null,
+                null,
+                &pSecurityDescriptor);
+
+            var length = (int)PInvoke.GetSecurityDescriptorLength(pSecurityDescriptor);
+
+            // Copy the security descriptor to a managed byte array
+            byte[] securityDescriptorBytes = new byte[length];
+            Marshal.Copy(new IntPtr(pSecurityDescriptor.Value), securityDescriptorBytes, 0, length);
+
+            // Convert the byte array to a RawSecurityDescriptor
+            var securityDescriptor = new RawSecurityDescriptor(securityDescriptorBytes, 0);
+
+            var checkedAllowUser = false;
+            var checkedDenyGuest = false;
+
+            foreach (CommonAce ace in securityDescriptor.DiscretionaryAcl)
+            {
+                if (ace.SecurityIdentifier.IsWellKnown(WellKnownSidType.BuiltinGuestsSid))
+                {
+                    Assert.Equal(AceType.AccessDenied, ace.AceType);
+                    checkedDenyGuest = true;
+                }
+                else if (ace.SecurityIdentifier.IsWellKnown(WellKnownSidType.BuiltinUsersSid))
+                {
+                    Assert.Equal(AceType.AccessAllowed, ace.AceType);
+                    checkedAllowUser = true;
+                }
+            }
+
+            PInvoke.LocalFree((HLOCAL)pSecurityDescriptor.Value);
+
+            Assert.True(checkedDenyGuest && checkedAllowUser, "DACL does not contain the expected ACEs");
+        }
+
+        var responseString = await SendRequestAsync(delegatorAddress);
+        Assert.Equal(_expectedResponseString, responseString);
+        destination?.Dispose();
+    }
+
     private async Task<string> SendRequestAsync(string uri)
     {
         using var client = new HttpClient();
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs b/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
index 82f54efdb270..bbd7f6e9a1c3 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
@@ -21,7 +21,6 @@
 
 namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests;
 
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class Http2Tests : LoggedTest
 {
     private const string VersionForReset = "10.0.19529";
diff --git a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
index ec3be7a25f6e..9b2b4134c681 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
@@ -165,20 +165,26 @@ public async Task Https_SetsITlsHandshakeFeature()
             Assert.True(protocol > SslProtocols.None, "Protocol: " + protocol);
             Assert.True(Enum.IsDefined(typeof(SslProtocols), protocol), "Defined: " + protocol); // Mapping is required, make sure it's current
 
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
             var cipherAlgorithm = (CipherAlgorithmType)result.GetProperty("cipherAlgorithm").GetInt32();
             Assert.True(cipherAlgorithm > CipherAlgorithmType.Null, "Cipher: " + cipherAlgorithm);
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
             var cipherStrength = result.GetProperty("cipherStrength").GetInt32();
             Assert.True(cipherStrength > 0, "CipherStrength: " + cipherStrength);
 
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
             var hashAlgorithm = (HashAlgorithmType)result.GetProperty("hashAlgorithm").GetInt32();
             Assert.True(hashAlgorithm >= HashAlgorithmType.None, "HashAlgorithm: " + hashAlgorithm);
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
             var hashStrength = result.GetProperty("hashStrength").GetInt32();
             Assert.True(hashStrength >= 0, "HashStrength: " + hashStrength); // May be 0 for some algorithms
 
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
             var keyExchangeAlgorithm = (ExchangeAlgorithmType)result.GetProperty("keyExchangeAlgorithm").GetInt32();
             Assert.True(keyExchangeAlgorithm >= ExchangeAlgorithmType.None, "KeyExchangeAlgorithm: " + keyExchangeAlgorithm);
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
             var keyExchangeStrength = result.GetProperty("keyExchangeStrength").GetInt32();
             Assert.True(keyExchangeStrength >= 0, "KeyExchangeStrength: " + keyExchangeStrength);
@@ -213,12 +219,36 @@ public async Task Https_ITlsHandshakeFeature_MatchesIHttpSysExtensionInfoFeature
                 }
 
                 // Assert.Equal(tlsFeature.Protocol, tlsCopy.Protocol); // These don't directly match because the native and managed enums use different values.
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
                 Assert.Equal((uint)tlsFeature.CipherAlgorithm, tlsCopy.CipherType);
                 Assert.Equal(tlsFeature.CipherStrength, (int)tlsCopy.CipherStrength);
                 Assert.Equal((uint)tlsFeature.HashAlgorithm, tlsCopy.HashType);
                 Assert.Equal(tlsFeature.HashStrength, (int)tlsCopy.HashStrength);
                 Assert.Equal((uint)tlsFeature.KeyExchangeAlgorithm, tlsCopy.KeyExchangeType);
                 Assert.Equal(tlsFeature.KeyExchangeStrength, (int)tlsCopy.KeyExchangeStrength);
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
+            }
+            catch (Exception ex)
+            {
+                await httpContext.Response.WriteAsync(ex.ToString());
+            }
+        }, LoggerFactory))
+        {
+            string response = await SendRequestAsync(address);
+            Assert.Equal(string.Empty, response);
+        }
+    }
+
+    [ConditionalFact]
+    [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2)]
+    public async Task Https_SetsIHttpSysRequestPropertyFeature()
+    {
+        using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
+        {
+            try
+            {
+                var requestPropertyFeature = httpContext.Features.Get<IHttpSysRequestPropertyFeature>();
+                Assert.NotNull(requestPropertyFeature);
             }
             catch (Exception ex)
             {
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs
index 8a7a9d4da76e..d961ce3a0353 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers;
 using System.IO;
 using System.Net;
 using System.Net.Http;
@@ -132,7 +133,7 @@ public void Server_RegisterUnavailablePrefix_ThrowsActionableHttpSysException()
 
         var options = new HttpSysOptions();
         options.UrlPrefixes.Add(address1);
-        using var listener = new HttpSysListener(options, new LoggerFactory());
+        using var listener = new HttpSysListener(options, new DefaultMemoryPoolFactory(), new LoggerFactory());
 
         var exception = Assert.Throws<HttpSysException>(() => listener.Start());
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/Utilities.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/Utilities.cs
index 409faaa5b13d..5e9cdadfdb62 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/Utilities.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/Utilities.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.HttpSys.Internal;
 using Microsoft.Extensions.Logging;
@@ -47,7 +48,7 @@ internal static HttpSysListener CreateDynamicHttpServer(string basePath, out str
                 var options = new HttpSysOptions();
                 options.UrlPrefixes.Add(prefix);
                 options.RequestQueueName = prefix.Port; // Convention for use with CreateServerOnExistingQueue
-                var listener = new HttpSysListener(options, new LoggerFactory());
+                var listener = new HttpSysListener(options, new DefaultMemoryPoolFactory(), new LoggerFactory());
                 try
                 {
                     listener.Start();
@@ -76,7 +77,7 @@ internal static HttpSysListener CreateHttpsServer()
 
     internal static HttpSysListener CreateServer(string scheme, string host, int port, string path)
     {
-        var listener = new HttpSysListener(new HttpSysOptions(), new LoggerFactory());
+        var listener = new HttpSysListener(new HttpSysOptions(), new DefaultMemoryPoolFactory(), new LoggerFactory());
         listener.Options.UrlPrefixes.Add(UrlPrefix.Create(scheme, host, port, path));
         listener.Start();
         return listener;
@@ -86,7 +87,7 @@ internal static HttpSysListener CreateServer(Action<HttpSysOptions> configureOpt
     {
         var options = new HttpSysOptions();
         configureOptions(options);
-        var listener = new HttpSysListener(options, new LoggerFactory());
+        var listener = new HttpSysListener(options, new DefaultMemoryPoolFactory(), new LoggerFactory());
         listener.Start();
         return listener;
     }
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
index 08276e6a23fd..f59ba8ab7c22 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
+++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -20,7 +20,7 @@
     <Compile Include="$(SharedSourceRoot)ValueTaskExtensions\**\*.cs" LinkBase="Shared\" />
     <Compile Remove="$(SharedSourceRoot)ServerInfrastructure\DuplexPipe.cs" />
     <Compile Remove="$(SharedSourceRoot)ServerInfrastructure\StringUtilities.cs" />
-    <Compile Include="$(SharedSourceRoot)InternalHeaderNames.cs" Linkbase="shared"/>
+    <Compile Include="$(SharedSourceRoot)InternalHeaderNames.cs" Linkbase="shared" />
     <Compile Include="$(SharedSourceRoot)TestResources.cs" LinkBase="shared" />
     <Content Include="$(SharedSourceRoot)TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
     <Compile Include="$(SharedSourceRoot)TransportTestHelpers\MsQuicSupportedAttribute.cs" LinkBase="shared\" />
@@ -32,6 +32,7 @@
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="System.Net.Http.WinHttpHandler" />
+    <Reference Include="Microsoft.Extensions.TimeProvider.Testing" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Utilities.cs b/src/Servers/HttpSys/test/FunctionalTests/Utilities.cs
index ef28510f1dac..c1b17c72fc59 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Utilities.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Utilities.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -112,13 +113,13 @@ internal static IHost CreateDynamicHost(string basePath, out string root, out st
     }
 
     internal static MessagePump CreatePump(ILoggerFactory loggerFactory)
-        => new MessagePump(Options.Create(new HttpSysOptions()), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
+        => new MessagePump(Options.Create(new HttpSysOptions()), new DefaultMemoryPoolFactory(), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
 
     internal static MessagePump CreatePump(Action<HttpSysOptions> configureOptions, ILoggerFactory loggerFactory)
     {
         var options = new HttpSysOptions();
         configureOptions(options);
-        return new MessagePump(Options.Create(options), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
+        return new MessagePump(Options.Create(options), new DefaultMemoryPoolFactory(), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
     }
 
     internal static IServer CreateDynamicHttpServer(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app, ILoggerFactory loggerFactory)
diff --git a/src/Servers/HttpSys/test/NonHelixTests/DelegateSupportedConditionAttribute.cs b/src/Servers/HttpSys/test/NonHelixTests/DelegateSupportedConditionAttribute.cs
index f4f49b040076..9d9797b49eee 100644
--- a/src/Servers/HttpSys/test/NonHelixTests/DelegateSupportedConditionAttribute.cs
+++ b/src/Servers/HttpSys/test/NonHelixTests/DelegateSupportedConditionAttribute.cs
@@ -9,9 +9,14 @@ namespace Microsoft.AspNetCore.Server.HttpSys.NonHelixTests;
 public class DelegateSupportedConditionAttribute : Attribute, ITestCondition
 {
     private readonly bool _isSupported;
-    public DelegateSupportedConditionAttribute(bool isSupported) => _isSupported = isSupported;
+    private readonly bool _httpApiSupportsDelegation;
+    public DelegateSupportedConditionAttribute(bool isSupported)
+    {
+        _isSupported = isSupported;
+        try { _httpApiSupportsDelegation = HttpApi.SupportsDelegation; } catch { }
+    }
 
-    public bool IsMet => HttpApi.SupportsDelegation == _isSupported;
+    public bool IsMet =>  _httpApiSupportsDelegation == _isSupported;
 
     public string SkipReason => $"Http.Sys does {(_isSupported ? "not" : "")} support delegating requests";
 }
diff --git a/src/Servers/HttpSys/test/NonHelixTests/Utilities.cs b/src/Servers/HttpSys/test/NonHelixTests/Utilities.cs
index aa5880561e54..a276f56d93ca 100644
--- a/src/Servers/HttpSys/test/NonHelixTests/Utilities.cs
+++ b/src/Servers/HttpSys/test/NonHelixTests/Utilities.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
@@ -31,13 +32,13 @@ internal static IServer CreateHttpServer(out string baseAddress, RequestDelegate
     }
 
     internal static MessagePump CreatePump(ILoggerFactory loggerFactory = null)
-        => new MessagePump(Options.Create(new HttpSysOptions()), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
+        => new MessagePump(Options.Create(new HttpSysOptions()), new DefaultMemoryPoolFactory(), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
 
     internal static MessagePump CreatePump(Action<HttpSysOptions> configureOptions, ILoggerFactory loggerFactory = null)
     {
         var options = new HttpSysOptions();
         configureOptions(options);
-        return new MessagePump(Options.Create(options), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
+        return new MessagePump(Options.Create(options), new DefaultMemoryPoolFactory(), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
     }
 
     internal static IServer CreateDynamicHttpServer(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app)
diff --git a/src/Servers/HttpSys/test/Tests/NativeInterop/SocketAddressTests.cs b/src/Servers/HttpSys/test/Tests/NativeInterop/SocketAddressTests.cs
new file mode 100644
index 000000000000..7304f66c0d3d
--- /dev/null
+++ b/src/Servers/HttpSys/test/Tests/NativeInterop/SocketAddressTests.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Net;
+using Microsoft.AspNetCore.HttpSys.Internal;
+using Windows.Win32.Networking.WinSock;
+using Xunit;
+using static Microsoft.AspNetCore.HttpSys.Internal.SocketAddress;
+using SocketAddress = Microsoft.AspNetCore.HttpSys.Internal.SocketAddress;
+
+namespace Microsoft.AspNetCore.Server.HttpSys.Tests.NativeInterop;
+
+public class SocketAddressTests
+{
+    [Theory]
+    [InlineData(80)]
+    [InlineData(443)]
+    [InlineData(8080)]
+    [InlineData(32767)]  // max signed short
+    [InlineData(32768)]  // min value that causes negative when cast to short
+    [InlineData(42000)]
+    [InlineData(65535)]  // Max port number
+    public void IPv6_GetPort_ReturnsCorrectPort_ForAllValidPorts(ushort expectedPort)
+    {
+        var nativeIpV6Address = new SOCKADDR_IN6
+        {
+            sin6_family = ADDRESS_FAMILY.AF_INET6,
+            sin6_port = (ushort)IPAddress.HostToNetworkOrder((short)expectedPort)
+        };
+
+        var socketAddress = new SocketAddressIPv6(nativeIpV6Address);
+        var actualPort = socketAddress.GetPort();
+
+        Assert.Equal(expectedPort, actualPort);
+        Assert.True(actualPort >= 0, "Port should never be negative");
+        Assert.True(actualPort <= 65535, "Port should not exceed maximum valid port");
+    }
+
+    [Theory]
+    [InlineData(80)]
+    [InlineData(443)]
+    [InlineData(8080)]
+    [InlineData(42000)]
+    [InlineData(32767)]
+    [InlineData(32768)]
+    [InlineData(65535)]
+    public void IPv4_GetPort_ReturnsCorrectPort_ForAllValidPorts(ushort expectedPort)
+    {
+        var nativeIpV4Address = new SOCKADDR_IN
+        {
+            sin_family = ADDRESS_FAMILY.AF_INET,
+            sin_port = (ushort)IPAddress.HostToNetworkOrder((short)expectedPort)
+        };
+
+        var socketAddress = new SocketAddressIPv4(nativeIpV4Address);
+        var actualPort = socketAddress.GetPort();
+
+        Assert.Equal(expectedPort, actualPort);
+        Assert.True(actualPort >= 0, "Port should never be negative");
+        Assert.True(actualPort <= 65535, "Port should not exceed maximum valid port");
+    }
+}
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
index 8e1eb1f7c700..f2cc28d372b2 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
@@ -4,7 +4,7 @@
     <ProjectGuid>{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}</ProjectGuid>
     <RootNamespace>AspNetCoreModule</RootNamespace>
     <ProjectName>AspNetCore</ProjectName>
-    <TargetName>aspnetcorev2</TargetName>
+    <TargetName>httpbridge</TargetName>
     <LinkIncremental>false</LinkIncremental>
     <OutDirName>AspNetCoreModuleShim</OutDirName>
   </PropertyGroup>
@@ -16,6 +16,7 @@
     <ClCompile>
       <PreprocessorDefinitions>_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\IISLib;.\Inc;..\CommonLib;$(LibNetHostPath)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;libnethost.lib</AdditionalDependencies>
@@ -69,17 +70,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ancm.mof" />
+    <None Include="httpbridge.mof" />
     <None Include="Source.def" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="aspnetcoremodule.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="aspnetcore_schema_v2.xml">
+    <Content Include="httpplatform_schema.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ancm.mof">
+    <Content Include="httpbridge.mof">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -91,9 +92,6 @@
       <DeploymentContent>true</DeploymentContent>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Xml Include="aspnetcore_schema_v2.xml" />
-  </ItemGroup>
   <ItemGroup>
     <MessageFile Include="..\CommonLib\aspnetcore_msg.mc" />
   </ItemGroup>
@@ -110,4 +108,4 @@
     </ItemGroup>
     <WriteLinesToFile File="$(InstallersOutputPath)aspnetcoremodule.version" Lines="@(VersionFileContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
index fcd4205138c9..1a1a11096ae0 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "HandlerResolver.h"
@@ -17,7 +18,7 @@
 #include "RedirectionOutput.h"
 
 const PCWSTR HandlerResolver::s_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll";
-const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll";
+const PCWSTR HandlerResolver::s_pwzAspnetcoreOutOfProcessRequestHandlerName = L"httpbridge_outofprocess.dll";
 
 HandlerResolver::HandlerResolver(HMODULE hModule, const IHttpServer &pServer)
     : m_hModule(hModule),
@@ -89,7 +90,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication
         }
         else
         {
-            errorContext.generalErrorType = "ASP.NET Core IIS hosting failure (out-of-process)";
+            errorContext.generalErrorType = "HTTP Bridge IIS hosting failure";
 
             if (FAILED_LOG(hr = FindNativeAssemblyFromGlobalLocation(pConfiguration, pstrHandlerDllName, handlerDllPath)))
             {
@@ -102,7 +103,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication
                 errorContext.detailedErrorContent = to_multi_byte_string(format(ASPNETCORE_EVENT_OUT_OF_PROCESS_RH_MISSING_MSG, handlerName), CP_UTF8);
                 errorContext.statusCode = 500i16;
                 errorContext.subStatusCode = 36i16;
-                errorContext.errorReason = "The out of process request handler, aspnetcorev2_outofprocess.dll, could not be found next to the aspnetcorev2.dll.";
+                errorContext.errorReason = "The out of process request handler, httpbridge_outofprocess.dll, could not be found next to the httpbridge.dll.";
 
                 return hr;
             }
@@ -110,7 +111,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication
 
         LOG_INFOF(L"Loading request handler:  '%ls'", handlerDllPath.c_str());
 
-        hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str());
+        hRequestHandlerDll = LoadLibraryEx(handlerDllPath.c_str(), nullptr, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
         RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll);
 
         if (preventUnload)
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ModuleEnvironment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ModuleEnvironment.cpp
index 7b333bdda889..de8966f458fb 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ModuleEnvironment.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ModuleEnvironment.cpp
@@ -38,21 +38,21 @@ static std::wstring ToVirtualPath(const std::wstring& configurationPath) {
 }
 
 void SetApplicationEnvironmentVariables(_In_ IHttpServer &server, _In_ IHttpContext &pHttpContext) {
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_VERSION", GetIISVersion().c_str());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_VERSION", GetIISVersion().c_str());
 
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_APP_POOL_ID", server.GetAppPoolName());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_APP_POOL_ID", server.GetAppPoolName());
 
     IHttpServer2* server2;
     if (SUCCEEDED(HttpGetExtendedInterface(&server, &server, &server2))) {
-        SetEnvironmentVariable(L"ASPNETCORE_IIS_APP_POOL_CONFIG_FILE", server2->GetAppPoolConfigFile());
+        SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_APP_POOL_CONFIG_FILE", server2->GetAppPoolConfigFile());
     }
 
     IHttpSite* site = pHttpContext.GetSite();
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_SITE_NAME", site->GetSiteName());
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_SITE_ID", std::to_wstring(site->GetSiteId()).c_str());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_SITE_NAME", site->GetSiteName());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_SITE_ID", std::to_wstring(site->GetSiteId()).c_str());
 
     IHttpApplication* app = pHttpContext.GetApplication();
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_APP_CONFIG_PATH", app->GetAppConfigPath());
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_APPLICATION_ID", app->GetApplicationId());
-    SetEnvironmentVariable(L"ASPNETCORE_IIS_APPLICATION_VIRTUAL_PATH", ToVirtualPath(app->GetAppConfigPath()).c_str());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_APP_CONFIG_PATH", app->GetAppConfigPath());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_APPLICATION_ID", app->GetApplicationId());
+    SetEnvironmentVariable(L"HTTP_PLATFORM_IIS_APPLICATION_VIRTUAL_PATH", ToVirtualPath(app->GetAppConfigPath()).c_str());
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp
index 88865cd9b132..576e800390fc 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "ShimOptions.h"
@@ -13,7 +14,7 @@
 #define CS_ASPNETCORE_CLEAN_SHADOW_DIRECTORY_CONTENT     L"cleanShadowCopyDirectory"
 #define CS_ASPNETCORE_DISALLOW_ROTATE_CONFIG             L"disallowRotationOnConfigChange"
 #define CS_ASPNETCORE_SHUTDOWN_DELAY                     L"shutdownDelay"
-#define CS_ASPNETCORE_SHUTDOWN_DELAY_ENV                 L"ANCM_shutdownDelay"
+#define CS_ASPNETCORE_SHUTDOWN_DELAY_ENV                 L"HTTP_PLATFORM_shutdownDelay"
 
 ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
         m_hostingModel(HOSTING_UNKNOWN),
@@ -44,14 +45,14 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
         m_strHandlerVersion = find_element(handlerSettings, CS_ASPNETCORE_HANDLER_VERSION).value_or(std::wstring());
     }
 
-    auto enableShadowCopyElement = find_element(handlerSettings, CS_ASPNETCORE_SHADOW_COPY).value_or(std::wstring());
-    m_fEnableShadowCopying = equals_ignore_case(L"true", enableShadowCopyElement);
+    //auto enableShadowCopyElement = find_element(handlerSettings, CS_ASPNETCORE_SHADOW_COPY).value_or(std::wstring());
+    //m_fEnableShadowCopying = equals_ignore_case(L"true", enableShadowCopyElement);
 
-    auto cleanShadowCopyDirectory = find_element(handlerSettings, CS_ASPNETCORE_CLEAN_SHADOW_DIRECTORY_CONTENT).value_or(std::wstring());
-    m_fCleanShadowCopyDirectory = equals_ignore_case(L"true", cleanShadowCopyDirectory);
+    //auto cleanShadowCopyDirectory = find_element(handlerSettings, CS_ASPNETCORE_CLEAN_SHADOW_DIRECTORY_CONTENT).value_or(std::wstring());
+    //m_fCleanShadowCopyDirectory = equals_ignore_case(L"true", cleanShadowCopyDirectory);
 
-    m_strShadowCopyingDirectory = find_element(handlerSettings, CS_ASPNETCORE_SHADOW_COPY_DIRECTORY)
-        .value_or(m_fEnableShadowCopying ? L"ShadowCopyDirectory" : std::wstring());
+    //m_strShadowCopyingDirectory = find_element(handlerSettings, CS_ASPNETCORE_SHADOW_COPY_DIRECTORY)
+    //    .value_or(m_fEnableShadowCopying ? L"ShadowCopyDirectory" : std::wstring());
 
     auto disallowRotationOnConfigChange = find_element(handlerSettings, CS_ASPNETCORE_DISALLOW_ROTATE_CONFIG).value_or(std::wstring());
     m_fDisallowRotationOnConfigChange = equals_ignore_case(L"true", disallowRotationOnConfigChange);
@@ -60,7 +61,7 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
     m_strArguments = section->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT);
     m_fStdoutLogEnabled = section->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED);
     m_struStdoutLogFile = section->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE);
-    m_fDisableStartupPage = section->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE);
+    /*m_fDisableStartupPage = section->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE);*/
 
     auto environmentVariables = section->GetMap(CS_ASPNETCORE_ENVIRONMENT_VARIABLES);
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h
index 4e13190be6dd..87e053866a99 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
@@ -53,11 +54,11 @@ class ShimOptions: NonCopyable
         return m_struStdoutLogFile;
     }
 
-    bool
-    QueryDisableStartupPage() const noexcept
-    {
-        return m_fDisableStartupPage;
-    }
+    //bool
+    //QueryDisableStartupPage() const noexcept
+    //{
+    //    return m_fDisableStartupPage;
+    //}
 
     bool
     QueryShowDetailedErrors() const noexcept
@@ -65,23 +66,23 @@ class ShimOptions: NonCopyable
         return m_fShowDetailedErrors;
     }
 
-    bool
-    QueryShadowCopyEnabled() const noexcept
-    {
-        return m_fEnableShadowCopying;
-    }
+    //bool
+    //QueryShadowCopyEnabled() const noexcept
+    //{
+    //    return m_fEnableShadowCopying;
+    //}
 
-    bool
-    QueryCleanShadowCopyDirectory() const noexcept
-    {
-        return m_fCleanShadowCopyDirectory;
-    }
+    //bool
+    //QueryCleanShadowCopyDirectory() const noexcept
+    //{
+    //    return m_fCleanShadowCopyDirectory;
+    //}
 
-    const std::wstring&
-    QueryShadowCopyDirectory() const noexcept
-    {
-        return m_strShadowCopyingDirectory;
-    }
+    //const std::wstring&
+    //QueryShadowCopyDirectory() const noexcept
+    //{
+    //    return m_strShadowCopyingDirectory;
+    //}
 
     bool
     QueryDisallowRotationOnConfigChange() const noexcept
@@ -104,12 +105,12 @@ class ShimOptions: NonCopyable
     std::wstring                   m_strHandlerVersion;
     std::wstring                   m_struStdoutLogFile;
     bool                           m_fStdoutLogEnabled;
-    bool                           m_fDisableStartupPage;
+    //bool                           m_fDisableStartupPage;
     bool                           m_fShowDetailedErrors;
-    bool                           m_fEnableShadowCopying;
-    bool                           m_fCleanShadowCopyDirectory;
+    //bool                           m_fEnableShadowCopying;
+    //bool                           m_fCleanShadowCopyDirectory;
     bool                           m_fDisallowRotationOnConfigChange;
-    std::wstring                   m_strShadowCopyingDirectory;
+    //std::wstring                   m_strShadowCopyingDirectory;
     std::chrono::milliseconds      m_fShutdownDelay;
 
     void SetShutdownDelay(const std::wstring& shutdownDelay);
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/Source.def b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/Source.def
index 74135f48355d..7a06898563b6 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/Source.def
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/Source.def
@@ -1,4 +1,4 @@
-LIBRARY aspnetcorev2
+LIBRARY httpbridge
 
 EXPORTS
     RegisterModule
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm_error_page.htm b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm_error_page.htm
index b8720028c4a3..d410a3b6ddf8 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm_error_page.htm
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm_error_page.htm
@@ -73,7 +73,7 @@ <h2> Troubleshooting steps: </h2>
 
         <h2>
             For more guidance on diagnosing and handling these errors, visit
-            %s <a href="https://go.microsoft.com/fwlink/?LinkID=2028526"> <cite>Troubleshoot ASP.NET Core on Azure App Service and IIS</cite></a>.
+            %s <a href="https://docs.lextudio.com/services/consulting"> <cite>Troubleshoot HTTP Bridge on Azure App Service and IIS</cite></a>.
         </h2>
     </body>
 </html>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
index 519a36da628e..35b17b750d00 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "applicationinfo.h"
@@ -94,7 +95,7 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
             m_pApplication = make_application<ServerErrorApplication>(
                 pHttpApplication,
                 E_FAIL,
-                options.QueryDisableStartupPage() /* disableStartupPage */,
+                FALSE,//options.QueryDisableStartupPage() /* disableStartupPage */,
                 "" /* responseContent */,
                 503i16 /* statusCode */,
                 0i16 /* subStatusCode */,
@@ -130,7 +131,7 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
             m_pApplication = make_application<ServerErrorApplication>(
                 pHttpApplication,
                 hr,
-                options.QueryDisableStartupPage(),
+                FALSE, // options.QueryDisableStartupPage(),
                 responseContent,
                 errorContext.statusCode,
                 errorContext.subStatusCode,
@@ -169,7 +170,7 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
 HRESULT
 APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options, ErrorContext& error)
 {
-    const auto startupEvent = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_STARTUP_SUSPEND_EVENT");
+    /*const auto startupEvent = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_STARTUP_SUSPEND_EVENT");
     if (startupEvent.has_value())
     {
         LOG_INFOF(L"Startup suspend event %ls", startupEvent.value().c_str());
@@ -191,9 +192,9 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt
             }
             LOG_LAST_ERROR_IF(WaitForSingleObject(eventHandle, INFINITE) != WAIT_OBJECT_0);
         }
-    }
+    }*/
 
-    auto shadowCopyPath = HandleShadowCopy(options, pHttpContext);
+    auto shadowCopyPath = HandleShadowCopy();//options, pHttpContext);
 
     RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), shadowCopyPath, m_pApplicationFactory, options, error));
     LOG_INFO(L"Creating handler application");
@@ -275,10 +276,11 @@ APPLICATION_INFO::ShutDownApplication(const bool fServerInitiated)
  * we will start a thread that deletes all other folders in that directory.
  */
 std::filesystem::path
-APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHttpContext)
+APPLICATION_INFO::HandleShadowCopy()//const ShimOptions& options, IHttpContext& pHttpContext)
 {
     std::filesystem::path shadowCopyPath;
 
+    /*
     // Only support shadow copying for IIS.
     if (options.QueryShadowCopyEnabled() && !m_pServer.IsCommandLineLaunch())
     {
@@ -301,7 +303,7 @@ APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHt
         auto shadowCopyBaseDirectory = std::filesystem::directory_entry(shadowCopyPath);
         if (!shadowCopyBaseDirectory.exists())
         {
-            CreateDirectory(shadowCopyBaseDirectory.path().wstring().c_str(), NULL);
+            CreateDirectory(shadowCopyBaseDirectory.path().wstring().c_str(), nullptr);
         }
 
         for (auto& entry : std::filesystem::directory_iterator(shadowCopyPath))
@@ -343,6 +345,7 @@ APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHt
             return std::wstring();
         }
     }
+    //*/
 
     return shadowCopyPath;
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h
index a54107eb8bee..93eadde4ed5c 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.h
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
@@ -80,7 +81,7 @@ class APPLICATION_INFO: NonCopyable
     TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options, ErrorContext& error);
 
     std::filesystem::path
-    HandleShadowCopy(const ShimOptions& options, IHttpContext& pHttpContext);
+    HandleShadowCopy();//const ShimOptions& options, IHttpContext& pHttpContext);
 
     IHttpServer            &m_pServer;
     HandlerResolver        &m_handlerResolver;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h
index efc466dc7ca9..7d19257c134d 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h
@@ -8,7 +8,7 @@
 #include <unordered_map>
 
 //
-// This class will manage the lifecycle of all Asp.Net Core application
+// This class will manage the lifecycle of all HTTP Bridge Module hosted application
 // It should be global singleton.
 // Should always call GetInstance to get the object instance
 //
@@ -31,7 +31,7 @@ class APPLICATION_MANAGER
 
     VOID
     ShutDown();
-    
+
     APPLICATION_MANAGER(HMODULE hModule, IHttpServer& pHttpServer) :
                             m_pApplicationInfoHash(NULL),
                             m_fDebugInitialize(FALSE),
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
index fc95f57bf01e..a3dad4d83569 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
@@ -10,7 +10,7 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-#define FileDescription "IIS ASP.NET Core Module V2. Commit: " CommitHash
+#define FileDescription "IIS HTTP Bridge Module. Commit: " CommitHash
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -19,12 +19,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 //1 11
 //BEGIN
-//    0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010, 
-//    0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 
-//    0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 
-//    0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 
-//    0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 
-//    0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 
+//    0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010,
+//    0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001,
+//    0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025,
+//    0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031,
+//    0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d,
+//    0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a,
 //    0x0000, 0x0000
 //END
 
@@ -35,17 +35,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "..\CommonLib\resources.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
@@ -76,13 +76,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Microsoft"
+            VALUE "CompanyName", "LeXtudio"
             VALUE "FileDescription", FileDescription
             VALUE "FileVersion", FileVersionStr
-            VALUE "InternalName", "aspnetcore"
-            VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"
-            VALUE "OriginalFilename", "aspnetcore.dll"
-            VALUE "ProductName", "ASP.NET Core Module"
+            VALUE "InternalName", "IIS HTTP Bridge Module"
+            VALUE "LegalCopyright", "Copyright (C) LeXtudio Inc."
+            VALUE "OriginalFilename", "httpbridge.dll"
+            VALUE "ProductName", "IIS HTTP Bridge Module Extensions"
             VALUE "ProductVersion", ProductVersionStr
         END
     END
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp
index 4d55e36b80d9..328e33df45fa 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "applicationinfo.h"
@@ -12,7 +13,7 @@
 #include "EventLog.h"
 #include "RegistryKey.h"
 
-DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll");
+DECLARE_DEBUG_PRINT_OBJECT("httpbridge.dll");
 
 HANDLE              g_hEventLog = nullptr;
 BOOL                g_fRecycleProcessCalled = FALSE;
@@ -57,6 +58,7 @@ BOOL WINAPI DllMain(HMODULE hModule,
         // this is a bug in IIS. To try to avoid AVs, we will set a global flag
         g_fInShutdown = TRUE;
         StaticCleanup();
+        break;
     default:
         break;
     }
@@ -102,15 +104,15 @@ HRESULT
         g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER);
     }
 
-    auto fDisableModule = RegistryKey::TryGetDWORD(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", L"DisableANCM");
+    //auto fDisableModule = RegistryKey::TryGetDWORD(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters", L"DisableANCM");
 
-    if (fDisableModule.has_value() && fDisableModule.value() != 0)
-    {
-        EventLog::Warn(ASPNETCORE_EVENT_MODULE_DISABLED, ASPNETCORE_EVENT_MODULE_DISABLED_MSG);
-        // this will return 500 error to client
-        // as we did not register the module
-        return S_OK;
-    }
+    //if (fDisableModule.has_value() && fDisableModule.value() != 0)
+    //{
+    //    EventLog::Warn(ASPNETCORE_EVENT_MODULE_DISABLED, ASPNETCORE_EVENT_MODULE_DISABLED_MSG);
+    //    // this will return 500 error to client
+    //    // as we did not register the module
+    //    return S_OK;
+    //}
 
     //
     // Create the factory before any static initialization.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/httpbridge.mof
similarity index 55%
rename from src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm.mof
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/httpbridge.mof
index 359806f8a2a4..ff514fbe3c2b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm.mof
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/httpbridge.mof
@@ -3,7 +3,7 @@
 #pragma autorecover
 
 /*
- * AspNetCore module trace events layout
+ * HTTP Bridge Module trace events layout
  * Uncomment the following class to run mof2trace to generate header file
  * comment it back before checking it in
 [Dynamic,
@@ -14,11 +14,11 @@ class IIS_Trace:EventTrace
 {
     [Description ("Enable Flags") : amended,
         ValueDescriptions{
-            "AspNetCore module events" } : amended,
+            "HTTP Bridge Module events" } : amended,
         DefineValues{
-            "ETW_IIS_ANCM" },
+            "ETW_IIS_HTTP_PLATFORM" },
         Values{
-            "ANCM" },
+            "HTTP_PLATFORM" },
         ValueMap{
             "0x10000" }
     ]
@@ -56,14 +56,14 @@ class IIS_Trace:EventTrace
 */
 
 [Dynamic,
- Description("ANCM runtime events") : amended,
- Guid("{82ADEAD7-12B2-4781-BDCA-5A4B6C757191}"),
+ Description("HTTP_PLATFORM runtime events") : amended,
+ Guid("{831d632f-b8af-416e-ac29-5bee2ecfea09}"),
  EventVersion(1),
- DisplayName("ANCM"),
- EventANCMRuntime,
+ DisplayName("HTTP_PLATFORM"),
+ EventHttpPlatformRuntime,
  locale("MS\\0x409")
 ]
-class ANCM_Events:IIS_Trace
+class Http_Platform_Events:IIS_Trace
 {
 };
 
@@ -71,9 +71,9 @@ class ANCM_Events:IIS_Trace
  Description("Start application success") : amended,
  EventType(1),
  EventLevel(4),
- EventTypeName("ANCM_START_APPLICATION_SUCCESS") : amended
+ EventTypeName("HTTP_PLATFORM_START_APPLICATION_SUCCESS") : amended
 ]
-class ANCMAppStart:ANCM_Events
+class Http_Platform_AppStart:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -93,9 +93,9 @@ class ANCMAppStart:ANCM_Events
  Description("Start application failed") : amended,
  EventType(2),
  EventLevel(2),
- EventTypeName("ANCM_START_APPLICATION_FAIL") : amended
+ EventTypeName("HTTP_PLATFORM_START_APPLICATION_FAIL") : amended
 ]
-class ANCMAppStartFail:ANCM_Events
+class Http_Platform_AppStartFail:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -115,9 +115,9 @@ class ANCMAppStartFail:ANCM_Events
  Description("Start forwarding request") : amended,
  EventType(3),
  EventLevel(4),
- EventTypeName("ANCM_REQUEST_FORWARD_START") : amended
+ EventTypeName("HTTP_PLATFORM_REQUEST_FORWARD_START") : amended
 ]
-class ANCMForwardStart:ANCM_Events
+class Http_Platform_ForwardStart:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -131,9 +131,9 @@ class ANCMForwardStart:ANCM_Events
  Description("Finish forwarding request") : amended,
  EventType(4),
  EventLevel(4),
- EventTypeName("ANCM_REQUEST_FORWARD_END") : amended
+ EventTypeName("HTTP_PLATFORM_REQUEST_FORWARD_END") : amended
 ]
-class ANCMForwardEnd:ANCM_Events
+class Http_Platform_ForwardEnd:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -147,9 +147,9 @@ class ANCMForwardEnd:ANCM_Events
  Description("Forwarding request failure") : amended,
  EventType(5),
  EventLevel(2),
- EventTypeName("ANCM_REQUEST_FORWARD_FAIL") : amended
+ EventTypeName("HTTP_PLATFORM_REQUEST_FORWARD_FAIL") : amended
 ]
-class ANCMForwardFail:ANCM_Events
+class Http_Platform_ForwardFail:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -168,9 +168,9 @@ class ANCMForwardFail:ANCM_Events
  Description("Receiving callback from WinHttp") : amended,
  EventType(6),
  EventLevel(4),
- EventTypeName("ANCM_WINHTTP_CALLBACK") : amended
+ EventTypeName("HTTP_PLATFORM_WINHTTP_CALLBACK") : amended
 ]
-class ANCMWinHttpCallBack:ANCM_Events
+class Http_Platform_WinHttpCallBack:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -185,135 +185,13 @@ class ANCMWinHttpCallBack:ANCM_Events
      uint32  InternetStatus;
 };
 
-[Dynamic,
- Description("Starting inprocess execute request") : amended,
- EventType(7),
- EventLevel(4),
- EventTypeName("ANCM_INPROC_EXECUTE_REQUEST_START") : amended
-]
-class ANCMExecuteStart:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
-[Dynamic,
- Description("Ending inprocess execute request") : amended,
- EventType(8),
- EventLevel(5),
- EventTypeName("ANCM_INPROC_EXECUTE_REQUEST_COMPLETION") : amended
-]
-class ANCMExecuteEnd:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("Notification status") : amended,
-     format("d"),
-     read]
-     uint32  requestStatus;
-};
-
-[Dynamic,
- Description("Starting inprocess async completion") : amended,
- EventType(9),
- EventLevel(5),
- EventTypeName("ANCM_INPROC_ASYNC_COMPLETION_START") : amended
-]
-class ANCMAsyncStart:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
-[Dynamic,
- Description("Ending inprocess async completion") : amended,
- EventType(10),
- EventLevel(5),
- EventTypeName("ANCM_INPROC_ASYNC_COMPLETION_COMPLETION") : amended
-]
-class ANCMAsyncEnd:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("Notification status") : amended,
-     format("d"),
-     read]
-     uint32  requestStatus;
-};
-
-[Dynamic,
- Description("Inprocess app shutdown") : amended,
- EventType(11),
- EventLevel(4),
- EventTypeName("ANCM_INPROC_REQUEST_SHUTDOWN") : amended
-]
-class ANCMRequestShutdown:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
-[Dynamic,
- Description("Inprocess request disconnect") : amended,
- EventType(12),
- EventLevel(4),
- EventTypeName("ANCM_INPROC_REQUEST_DISCONNECT") : amended
-]
-class ANCMRequestDisconnect:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
-[Dynamic,
- Description("Indicate managed request complete") : amended,
- EventType(13),
- EventLevel(4),
- EventTypeName("ANCM_INPROC_MANAGED_REQUEST_COMPLETION") : amended
-]
-class ANCMManagedRequestCompletion:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
 [Dynamic,
  Description("Failed HRESULT") : amended,
  EventType(14),
  EventLevel(3),
- EventTypeName("ANCM_HRESULT_FAILED") : amended
+ EventTypeName("HTTP_PLATFORM_HRESULT_FAILED") : amended
 ]
-class ANCMHRESULTFailed:ANCM_Events
+class Http_Platform_HRESULTFailed:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
@@ -342,9 +220,9 @@ class ANCMHRESULTFailed:ANCM_Events
  Description("Caught exception") : amended,
  EventType(15),
  EventLevel(3),
- EventTypeName("ANCM_EXCEPTION_CAUGHT") : amended
+ EventTypeName("HTTP_PLATFORM_EXCEPTION_CAUGHT") : amended
 ]
-class ANCMExceptionCaughFailed:ANCM_Events
+class Http_Platform_ExceptionCaughFailed:Http_Platform_Events
 {
     [WmiDataId(1),
      Description("Context ID") : amended,
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/httpplatform_schema.xml
similarity index 81%
rename from src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml
rename to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/httpplatform_schema.xml
index d65be071958c..58960ac42807 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema_v2.xml
+++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/httpplatform_schema.xml
@@ -1,31 +1,27 @@
 <!--
-    
-    IIS Asp.Net Core Extension Schema
-    
+
+    IIS Http Platform Handler Schema
+
     ** Please DO NOT edit this file yourself. **
-    
-    If you want to add configuration sections to the schema, you may place 
-    them in .xml files similar to this one, in this directory. They will be 
+
+    If you want to add configuration sections to the schema, you may place
+    them in .xml files similar to this one, in this directory. They will be
     picked up automatically on startup.
 
 -->
 
 <configSchema>
-    <sectionSchema name="system.webServer/aspNetCore">
+    <sectionSchema name="system.webServer/httpPlatform">
         <attribute name="processPath" type="string" expanded="true"/>
         <attribute name="arguments" type="string" expanded="true" defaultValue=""/>
         <attribute name="startupTimeLimit" type="uint" defaultValue="120" validationType="integerRange" validationParameter="0,3600"/>
         <!-- in seconds -->
-        <attribute name="shutdownTimeLimit" type="uint" defaultValue="10" validationType="integerRange" validationParameter="0,600"/>
-        <!-- in seconds -->
         <attribute name="rapidFailsPerMinute" type="uint" defaultValue="10" validationType="integerRange" validationParameter="0,100"/>
         <attribute name="requestTimeout" type="timeSpan" defaultValue="00:02:00" validationType="timeSpanRange" validationParameter="0,1296000,1"/>
         <attribute name="stdoutLogEnabled" type="bool" defaultValue="false" />
-        <attribute name="stdoutLogFile" type="string" defaultValue=".\aspnetcore-stdout" expanded="true"/>
+        <attribute name="stdoutLogFile" type="string" defaultValue=".\httpplatform-stdout" expanded="true"/>
         <attribute name="processesPerApplication" type="uint" defaultValue="1" validationType="integerRange" validationParameter="1,100"/>
         <attribute name="forwardWindowsAuthToken" type="bool" defaultValue="true" />
-        <attribute name="disableStartUpErrorPage" type="bool" defaultValue="false" />
-        <attribute name="hostingModel" type="string" />
         <element name="recycleOnFileChange">
             <collection addElement="file" clearElement="clear">
                 <attribute name="path" type="string" required="true" validationType="nonEmptyString" expanded="true"/>
@@ -44,4 +40,4 @@
             </collection>
         </element>
     </sectionSchema>
-</configSchema>
+</configSchema>
\ No newline at end of file
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
index 4e8a906e079f..4ef83441f2d8 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
@@ -8,6 +8,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\iislib;$(LibNetHostPath)</AdditionalIncludeDirectories>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">/FS %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">/FS %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h
index a0145c9afead..8b194b40bf97 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSource.h
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
@@ -9,7 +10,7 @@
 #include "NonCopyable.h"
 #include "ConfigurationSection.h"
 
-#define CS_ASPNETCORE_SECTION                            L"system.webServer/aspNetCore"
+#define CS_ASPNETCORE_SECTION                            L"system.webServer/httpPlatform"
 #define CS_WINDOWS_AUTHENTICATION_SECTION                L"system.webServer/security/authentication/windowsAuthentication"
 #define CS_BASIC_AUTHENTICATION_SECTION                  L"system.webServer/security/authentication/basicAuthentication"
 #define CS_ANONYMOUS_AUTHENTICATION_SECTION              L"system.webServer/security/authentication/anonymousAuthentication"
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
index c49200ce8d2f..b0d5a8b2266b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
@@ -133,6 +133,23 @@ std::wstring Environment::GetDllDirectoryValue()
     return expandedStr;
 }
 
+ProcessorArchitecture Environment::GetCurrentProcessArchitecture()
+{
+    // Use compile-time detection - we know which architectures we support
+    // and this is the most reliable and efficient approach. IsWow64Process2
+    // doesn't show the correct architecture when running under x64 emulation
+    // on ARM64.
+#if defined(_M_ARM64)
+    return ProcessorArchitecture::ARM64;
+#elif defined(_M_AMD64)
+    return ProcessorArchitecture::AMD64;
+#elif defined(_M_IX86)
+    return ProcessorArchitecture::x86;
+#else
+    static_assert(false, "Unknown target architecture");
+#endif
+}
+
 bool Environment::IsRunning64BitProcess()
 {
     // Check the bitness of the currently running process
@@ -168,7 +185,7 @@ void Environment::CopyToDirectoryInner(const std::filesystem::path& source, cons
     auto destinationDirEntry = std::filesystem::directory_entry(destination);
     if (!destinationDirEntry.exists())
     {
-        CreateDirectory(destination.wstring().c_str(), NULL);
+        CreateDirectory(destination.wstring().c_str(), nullptr);
     }
 
     for (auto& path : std::filesystem::directory_iterator(source))
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h
index 9e3e1b1bf772..a9e6e85d9ecc 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h
@@ -5,6 +5,7 @@
 
 #include <string>
 #include <optional>
+#include "ProcessorArchitecture.h"
 
 class Environment
 {
@@ -23,6 +24,8 @@ class Environment
     static
     bool IsRunning64BitProcess();
     static
+    ProcessorArchitecture GetCurrentProcessArchitecture();
+    static
     HRESULT CopyToDirectory(const std::wstring& source, const std::filesystem::path& destination, bool cleanDest, const std::filesystem::path& directoryToIgnore, int& copiedFileCount);
     static
     bool CheckUpToDate(const std::wstring& source, const std::filesystem::path& destination, const std::wstring& extension, const std::filesystem::path& directoryToIgnore);
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.cpp
index fb66d9d65c74..3ec4cc4a3447 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventLog.cpp
@@ -36,11 +36,11 @@ EventLog::LogEventNoTrace(
         dwEventInfoType,
         0,        // wCategory
         dwEventId,
-        NULL,     // lpUserSid
+        nullptr,     // lpUserSid
         static_cast<WORD>(eventLogDataStrings.size()), // wNumStrings
         0,        // dwDataSize,
         eventLogDataStrings.data(),
-        NULL      // lpRawData
+        nullptr      // lpRawData
     );
 }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventTracing.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventTracing.h
index 3734068aaeff..ced9a6de5f12 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventTracing.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/EventTracing.h
@@ -4,14 +4,8 @@
 #pragma once
 
 #include <httptrace.h>
-
-#pragma warning( push )
-#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS )
-
 #include "aspnetcore_event.h"
 
-#pragma warning( pop )
-
 template< class EVENT, typename ...Params >
 void RaiseEvent(IHttpTraceContext * pTraceContext,Params&&... params)
 {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp
index b02fcfc44592..ff28cba8dd97 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/GlobalVersionUtility.cpp
@@ -13,17 +13,17 @@ namespace fs = std::filesystem;
 std::wstring
 GlobalVersionUtility::GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath, PCWSTR pwzHandlerVersion, PCWSTR pwzHandlerName)
 {
-    if (pwzAspNetCoreFolderPath == NULL)
+    if (pwzAspNetCoreFolderPath == nullptr)
     {
         throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL");
     }
 
-    if (pwzHandlerVersion == NULL)
+    if (pwzHandlerVersion == nullptr)
     {
         throw new std::invalid_argument("pwzHandlerVersion is NULL");
     }
 
-    if (pwzHandlerName == NULL)
+    if (pwzHandlerName == nullptr)
     {
         throw new std::invalid_argument("pwzHandlerName is NULL");
     }
@@ -47,7 +47,7 @@ GlobalVersionUtility::GetGlobalRequestHandlerPath(PCWSTR pwzAspNetCoreFolderPath
 std::vector<fx_ver_t>
 GlobalVersionUtility::GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath)
 {
-    if (pwzAspNetCoreFolderPath == NULL)
+    if (pwzAspNetCoreFolderPath == nullptr)
     {
         throw new std::invalid_argument("pwzAspNetCoreFolderPath is NULL");
     }
@@ -74,7 +74,7 @@ GlobalVersionUtility::GetRequestHandlerVersions(PCWSTR pwzAspNetCoreFolderPath)
 std::wstring
 GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath)
 {
-    if (pwzAspNetCoreFolderPath == NULL)
+    if (pwzAspNetCoreFolderPath == nullptr)
     {
         throw std::invalid_argument("pwzAspNetCoreFolderPath is NULL");
     }
@@ -82,7 +82,7 @@ GlobalVersionUtility::FindHighestGlobalVersion(PCWSTR pwzAspNetCoreFolderPath)
     std::vector<fx_ver_t> versionsInDirectory = GetRequestHandlerVersions(pwzAspNetCoreFolderPath);
     if (versionsInDirectory.empty())
     {
-        throw std::runtime_error("Cannot find request handler next to aspnetcorev2.dll. Verify a version of the request handler is installed in a version folder.");
+        throw std::runtime_error("Cannot find request handler next to httpbridge.dll. Verify a version of the request handler is installed in a version folder.");
     }
     std::sort(versionsInDirectory.begin(), versionsInDirectory.end());
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp
index 9b12cd0132b4..8fc74b47c993 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp
@@ -197,7 +197,7 @@ HostFxrResolver::TryGetHostFxrPath(
     size_t size = MAX_PATH * 2;
     hostfxrPath.resize(size);
 
-    get_hostfxr_parameters params;
+    get_hostfxr_parameters params{};
     params.size = sizeof(get_hostfxr_parameters);
     params.assembly_path = applicationPath.c_str();
     params.dotnet_root = dotnetRoot.c_str();
@@ -393,40 +393,39 @@ HostFxrResolver::GetAbsolutePathToDotnetFromHostfxr(const fs::path& hostfxrPath)
 // Tries to call where.exe to find the location of dotnet.exe.
 // Will check that the bitness of dotnet matches the current
 // worker process bitness.
-// Returns true if a valid dotnet was found, else false.R
+// Returns true if a valid dotnet was found, else false.
 //
 std::optional<fs::path>
 HostFxrResolver::InvokeWhereToFindDotnet()
 {
     HRESULT             hr = S_OK;
     // Arguments to call where.exe
-    STARTUPINFOW        startupInfo = { 0 };
-    PROCESS_INFORMATION processInformation = { 0 };
-    SECURITY_ATTRIBUTES securityAttributes;
+    STARTUPINFOW        startupInfo{};
+    PROCESS_INFORMATION processInformation{};
+    SECURITY_ATTRIBUTES securityAttributes{};
 
-    CHAR                pzFileContents[READ_BUFFER_SIZE];
+    CHAR                pzFileContents[READ_BUFFER_SIZE]{0};
     HandleWrapper<InvalidHandleTraits>     hStdOutReadPipe;
     HandleWrapper<InvalidHandleTraits>     hStdOutWritePipe;
     HandleWrapper<InvalidHandleTraits>     hProcess;
     HandleWrapper<InvalidHandleTraits>     hThread;
-    CComBSTR            pwzDotnetName = NULL;
-    DWORD               dwFilePointer;
-    BOOL                fIsCurrentProcess64Bit;
-    DWORD               dwExitCode;
+    CComBSTR            pwzDotnetName = nullptr;
+    DWORD               dwFilePointer = 0;
+    DWORD               dwExitCode = 0;
     STRU                struDotnetSubstring;
     STRU                struDotnetLocationsString;
-    DWORD               dwNumBytesRead;
-    DWORD               dwBinaryType;
+    DWORD               dwNumBytesRead = 0;
     INT                 index = 0;
     INT                 prevIndex = 0;
     std::optional<fs::path> result;
 
     // Set the security attributes for the read/write pipe
     securityAttributes.nLength = sizeof(securityAttributes);
-    securityAttributes.lpSecurityDescriptor = NULL;
+    securityAttributes.lpSecurityDescriptor = nullptr;
     securityAttributes.bInheritHandle = TRUE;
 
     LOG_INFO(L"Invoking where.exe to find dotnet.exe");
+    auto currentProcessArch = Environment::GetCurrentProcessArchitecture();
 
     // Create a read/write pipe that will be used for reading the result of where.exe
     FINISHED_LAST_ERROR_IF(!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0));
@@ -443,14 +442,14 @@ HostFxrResolver::InvokeWhereToFindDotnet()
     pwzDotnetName = L"\"where.exe\" dotnet.exe";
 
     // Create a process to invoke where.exe
-    FINISHED_LAST_ERROR_IF(!CreateProcessW(NULL,
+    FINISHED_LAST_ERROR_IF(!CreateProcessW(nullptr,
         pwzDotnetName,
-        NULL,
-        NULL,
+        nullptr,
+        nullptr,
         TRUE,
         CREATE_NO_WINDOW,
-        NULL,
-        NULL,
+        nullptr,
+        nullptr,
         &startupInfo,
         &processInformation
     ));
@@ -480,7 +479,7 @@ HostFxrResolver::InvokeWhereToFindDotnet()
 
     // Where succeeded.
     // Reset file pointer to the beginning of the file.
-    dwFilePointer = SetFilePointer(hStdOutReadPipe, 0, NULL, FILE_BEGIN);
+    dwFilePointer = SetFilePointer(hStdOutReadPipe, 0, nullptr, FILE_BEGIN);
     if (dwFilePointer == INVALID_SET_FILE_POINTER)
     {
         FINISHED_IF_FAILED(E_FAIL);
@@ -490,7 +489,7 @@ HostFxrResolver::InvokeWhereToFindDotnet()
     // As the call to where.exe succeeded (dotnet.exe was found), ReadFile should not hang.
     // TODO consider putting ReadFile in a separate thread with a timeout to guarantee it doesn't block.
     //
-    FINISHED_LAST_ERROR_IF (!ReadFile(hStdOutReadPipe, pzFileContents, READ_BUFFER_SIZE, &dwNumBytesRead, NULL));
+    FINISHED_LAST_ERROR_IF (!ReadFile(hStdOutReadPipe, pzFileContents, READ_BUFFER_SIZE, &dwNumBytesRead, nullptr));
 
     if (dwNumBytesRead >= READ_BUFFER_SIZE)
     {
@@ -500,13 +499,9 @@ HostFxrResolver::InvokeWhereToFindDotnet()
     }
 
     FINISHED_IF_FAILED(struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead));
-
     LOG_INFOF(L"where.exe invocation returned: '%ls'", struDotnetLocationsString.QueryStr());
 
-    fIsCurrentProcess64Bit = Environment::IsRunning64BitProcess();
-
-    LOG_INFOF(L"Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit);
-
+    // Look for a dotnet.exe that matches the current process architecture
     while (TRUE)
     {
         index = struDotnetLocationsString.IndexOf(L"\r\n", prevIndex);
@@ -519,26 +514,83 @@ HostFxrResolver::InvokeWhereToFindDotnet()
         // \r\n is two wchars, so add 2 here.
         prevIndex = index + 2;
 
-        LOG_INFOF(L"Processing entry '%ls'", struDotnetSubstring.QueryStr());
-
-        if (LOG_LAST_ERROR_IF(!GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType)))
+        ProcessorArchitecture dotnetArch = GetFileProcessorArchitecture(struDotnetSubstring.QueryStr());
+        if (dotnetArch == currentProcessArch)
         {
-            continue;
-        }
-
-        LOG_INFOF(L"Binary type %d", dwBinaryType);
+            LOG_INFOF(L"Found dotnet.exe matching current process architecture (%ls) '%ls'",
+                ProcessorArchitectureToString(dotnetArch),
+                struDotnetSubstring.QueryStr());
 
-        if (fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY))
-        {
-            // The bitness of dotnet matched with the current worker process bitness.
             return std::make_optional(struDotnetSubstring.QueryStr());
         }
+        else
+        {
+            LOG_INFOF(L"Skipping dotnet.exe with non-matching architecture %ls (need %ls). '%ls'",
+                ProcessorArchitectureToString(dotnetArch),
+                ProcessorArchitectureToString(currentProcessArch),
+                struDotnetSubstring.QueryStr());
+        }
     }
 
     Finished:
     return result;
 }
 
+// Reads the PE header of the binary to determine its architecture.
+ProcessorArchitecture HostFxrResolver::GetFileProcessorArchitecture(const WCHAR* binaryPath)
+{
+    // Errors while reading from the file shouldn't throw unless
+    // file.exception(bits) is set
+    std::ifstream file(binaryPath, std::ios::binary);
+    if (!file.is_open())
+    {
+        LOG_TRACEF(L"Failed to open file %ls", binaryPath);
+        return ProcessorArchitecture::Unknown;
+    }
+
+    // Read the DOS header
+    IMAGE_DOS_HEADER dosHeader{};
+    file.read(reinterpret_cast<char*>(&dosHeader), sizeof(dosHeader));
+    if (dosHeader.e_magic != IMAGE_DOS_SIGNATURE) // 'MZ'
+    {
+        LOG_TRACEF(L"%ls is not a valid executable file (missing MZ header).", binaryPath);
+        return ProcessorArchitecture::Unknown;
+    }
+
+    // Seek to the PE header
+    file.seekg(dosHeader.e_lfanew, std::ios::beg);
+
+    // Read the PE header
+    DWORD peSignature{};
+    file.read(reinterpret_cast<char*>(&peSignature), sizeof(peSignature));
+    if (peSignature != IMAGE_NT_SIGNATURE) // 'PE\0\0'
+    {
+        LOG_TRACEF(L"%ls is not a valid PE file (missing PE header).", binaryPath);
+        return ProcessorArchitecture::Unknown;
+    }
+
+    // Read the file header
+    IMAGE_FILE_HEADER fileHeader{};
+    file.read(reinterpret_cast<char*>(&fileHeader), sizeof(fileHeader));
+
+    // Determine the architecture based on the machine type
+    switch (fileHeader.Machine)
+    {
+        case IMAGE_FILE_MACHINE_I386:
+            LOG_INFOF(L"%ls is x86 (32-bit)", binaryPath);
+            return ProcessorArchitecture::x86;
+        case IMAGE_FILE_MACHINE_AMD64:
+            LOG_INFOF(L"%ls is AMD64 (x64)", binaryPath);
+            return ProcessorArchitecture::AMD64;
+        case IMAGE_FILE_MACHINE_ARM64:
+            LOG_INFOF(L"%ls is ARM64", binaryPath);
+            return ProcessorArchitecture::ARM64;
+        default:
+            LOG_INFOF(L"%ls has unknown architecture (machine type: 0x%X)", binaryPath, fileHeader.Machine);
+            return ProcessorArchitecture::Unknown;
+    }
+}
+
 std::optional<fs::path>
 HostFxrResolver::GetAbsolutePathToDotnetFromProgramFiles()
 {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h
index 519f6df52c97..9065e2aecd2b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h
@@ -8,8 +8,8 @@
 #include <filesystem>
 #include <optional>
 #include <string>
-
 #include "ErrorContext.h"
+#include "ProcessorArchitecture.h"
 
 #define READ_BUFFER_SIZE 4096
 
@@ -74,6 +74,8 @@ class HostFxrResolver
         const std::filesystem::path & requestedPath
     );
 
+    static ProcessorArchitecture GetFileProcessorArchitecture(const WCHAR* binaryPath);
+
     struct LocalFreeDeleter
     {
          void operator ()(_In_ LPWSTR* ptr) const
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h
new file mode 100644
index 000000000000..195feddcae7b
--- /dev/null
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+#pragma once
+
+enum class ProcessorArchitecture
+{
+    Unknown,
+    x86,
+    AMD64,
+    ARM64
+};
+
+inline const wchar_t* ProcessorArchitectureToString(ProcessorArchitecture arch)
+{
+    switch (arch)
+    {
+        case ProcessorArchitecture::x86:
+            return L"x86";
+        case ProcessorArchitecture::AMD64:
+            return L"AMD64";
+        case ProcessorArchitecture::ARM64:
+            return L"ARM64";
+        case ProcessorArchitecture::Unknown:
+        default:
+            return L"Unknown";
+    }
+}
\ No newline at end of file
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/RegistryKey.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/RegistryKey.cpp
index 63828821f93c..475edbe6b90f 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/RegistryKey.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/RegistryKey.cpp
@@ -18,7 +18,7 @@ std::optional<DWORD> RegistryKey::TryGetDWORD(HKEY section, const std::wstring&
 
 std::optional<std::wstring> RegistryKey::TryGetString(HKEY section, const std::wstring& subSectionName, const std::wstring& valueName)
 {
-    DWORD cbData;
+    DWORD cbData{};
 
     if (!CheckReturnValue(RegGetValue(section, subSectionName.c_str(), valueName.c_str(), RRF_RT_REG_SZ, nullptr, nullptr, &cbData)))
     {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
index 77d94230b256..ee99b743f7e5 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ServerErrorHandler.h
@@ -15,7 +15,7 @@ class ServerErrorHandler : public REQUEST_HANDLER
         m_disableStartupPage(disableStartupPage),
         m_statusCode(statusCode),
         m_subStatusCode(subStatusCode),
-        m_statusText(std::move(statusText)),
+        m_statusText(statusText),
         m_ExceptionInfoContent(responseContent)
     {
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StandardStreamRedirection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StandardStreamRedirection.cpp
index 4abb04f85b93..b094cda378a9 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StandardStreamRedirection.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StandardStreamRedirection.cpp
@@ -55,8 +55,8 @@ StandardStreamRedirection::~StandardStreamRedirection() noexcept(false)
 void StandardStreamRedirection::Start()
 {
     SECURITY_ATTRIBUTES     saAttr = { 0 };
-    HANDLE                  hStdErrReadPipe;
-    HANDLE                  hStdErrWritePipe;
+    HANDLE                  hStdErrReadPipe = nullptr;
+    HANDLE                  hStdErrWritePipe = nullptr;
 
     // To make Console.* functions work, allocate a console
     // in the current process.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp
index 809864f06a21..b3c2b6bd3aa2 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StdWrapper.cpp
@@ -32,7 +32,7 @@ StdWrapper::~StdWrapper() = default;
 HRESULT
 StdWrapper::StartRedirection()
 {
-    HANDLE stdHandle;
+    HANDLE stdHandle = nullptr;
 
     // In IIS, stdout and stderr are set to null as w3wp is created with DETACHED_PROCESS,
     // so fileno(m_stdStream) returns -2.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp
index 4fb06330950b..bc81d5d00ecc 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/StringHelpers.cpp
@@ -41,7 +41,7 @@ std::wstring to_wide_string(const std::string& source, const int length, const u
 
     std::wstring destination;
 
-    int nChars = MultiByteToWideChar(codePage, 0, source.data(), length, NULL, 0);
+    int nChars = MultiByteToWideChar(codePage, 0, source.data(), length, nullptr, 0);
     THROW_LAST_ERROR_IF(nChars == 0);
 
     destination.resize(nChars);
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp
index 71d53e187c5d..af182a522519 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/WebConfigConfigurationSection.cpp
@@ -65,7 +65,7 @@ std::optional<std::shared_ptr<ConfigurationSection>> WebConfigConfigurationSecti
 std::vector<std::shared_ptr<ConfigurationSection>> WebConfigConfigurationSection::GetCollection() const
 {
     std::vector<std::shared_ptr<ConfigurationSection>> elements;
-    HRESULT findElementResult;
+    HRESULT findElementResult = S_OK;
     CComPtr<IAppHostElementCollection> elementCollection = nullptr;
     CComPtr<IAppHostElement>           collectionEntry = nullptr;
     ENUM_INDEX                         index{};
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h
index d3ed02223a3d..7f72512d4804 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h
@@ -49,7 +49,7 @@ class WWWServerTraceProvider
         {
         case 0x10000: return L"ANCM";
         }
-        return NULL;
+        return nullptr;
     };
 
     static
@@ -59,10 +59,9 @@ class WWWServerTraceProvider
         enumAreaFlags       AreaFlags,
         DWORD               dwVerbosity )
     {
-        HRESULT                  hr;
         HTTP_TRACE_CONFIGURATION TraceConfig;
         TraceConfig.pProviderGuid = GetProviderGuid();
-        hr = pHttpTraceContext->GetTraceConfiguration( &TraceConfig );
+        HRESULT hr = pHttpTraceContext->GetTraceConfiguration( &TraceConfig );
         if ( FAILED( hr )  || !TraceConfig.fProviderEnabled )
         {
             return FALSE;
@@ -127,8 +126,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 2;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -139,13 +138,13 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"AppDescription";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string)
             Items[ 1 ].pbData = (PBYTE) pAppDescription;
             Items[ 1 ].cbData  = 
-                 ( Items[ 1 ].pbData == NULL )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData  ) ) );
-            Items[ 1 ].pszDataDescription = NULL;
+                 ( Items[ 1 ].pbData == nullptr )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData  ) ) );
+            Items[ 1 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -194,8 +193,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 2;
             Event.cEventItems = 2;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -206,13 +205,13 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"FailureDescription";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCWSTR; // mof type (string)
             Items[ 1 ].pbData = (PBYTE) pFailureDescription;
             Items[ 1 ].cbData  = 
-                 ( Items[ 1 ].pbData == NULL )? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData  ) ) );
-            Items[ 1 ].pszDataDescription = NULL;
+                 ( Items[ 1 ].pbData == nullptr)? 0 : ( sizeof(WCHAR) * (1 + (DWORD) wcslen( (PWSTR) Items[ 1 ].pbData  ) ) );
+            Items[ 1 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -260,8 +259,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -272,7 +271,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -320,8 +319,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -332,7 +331,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -381,8 +380,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 2;
             Event.cEventItems = 2;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -393,12 +392,12 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"ErrorCode";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 1 ].pbData = (PBYTE) &ErrorCode;
             Items[ 1 ].cbData = 4;
-            Items[ 1 ].pszDataDescription = NULL;
+            Items[ 1 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -447,8 +446,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 2;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -459,12 +458,12 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"InternetStatus";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 1 ].pbData = (PBYTE) &InternetStatus;
             Items[ 1 ].cbData = 4;
-            Items[ 1 ].pszDataDescription = NULL;
+            Items[ 1 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -512,8 +511,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -524,7 +523,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -573,8 +572,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 5;
             Event.cEventItems = 2;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -585,12 +584,12 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"requestStatus";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 1 ].pbData = (PBYTE) &requestStatus;
             Items[ 1 ].cbData = 4;
-            Items[ 1 ].pszDataDescription = NULL;
+            Items[ 1 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -638,8 +637,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 5;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -650,7 +649,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -699,8 +698,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 5;
             Event.cEventItems = 2;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -711,12 +710,12 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"requestStatus";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 1 ].pbData = (PBYTE) &requestStatus;
             Items[ 1 ].cbData = 4;
-            Items[ 1 ].pszDataDescription = NULL;
+            Items[ 1 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -764,8 +763,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -776,7 +775,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -824,8 +823,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -836,7 +835,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -884,8 +883,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 4;
             Event.cEventItems = 1;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -896,7 +895,7 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -947,8 +946,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 3;
             Event.cEventItems = 4;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -959,23 +958,23 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"File";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCSTR; // mof type (string)
             Items[ 1 ].pbData = (PBYTE) pFile;
             Items[ 1 ].cbData  = 
-                 ( Items[ 1 ].pbData == NULL )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 1 ].pbData ) );
-            Items[ 1 ].pszDataDescription = NULL;
+                 ( Items[ 1 ].pbData == nullptr )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 1 ].pbData ) );
+            Items[ 1 ].pszDataDescription = nullptr;
             Items[ 2 ].pszName = L"Line";
             Items[ 2 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 2 ].pbData = (PBYTE) &Line;
             Items[ 2 ].cbData = 4;
-            Items[ 2 ].pszDataDescription = NULL;
+            Items[ 2 ].pszDataDescription = nullptr;
             Items[ 3 ].pszName = L"HResult";
             Items[ 3 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 3 ].pbData = (PBYTE) &HResult;
             Items[ 3 ].cbData = 4;
-            Items[ 3 ].pszDataDescription = NULL;
+            Items[ 3 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -1026,8 +1025,8 @@ class ANCMEvents
             Event.dwEventVersion = 1;
             Event.dwVerbosity = 3;
             Event.cEventItems = 4;
-            Event.pActivityGuid = NULL;
-            Event.pRelatedActivityGuid = NULL;
+            Event.pActivityGuid = nullptr;
+            Event.pRelatedActivityGuid = nullptr;
             Event.dwTimeStamp = 0;
             Event.dwFlags = HTTP_TRACE_EVENT_FLAG_STATIC_DESCRIPTIVE_FIELDS;
     
@@ -1038,24 +1037,24 @@ class ANCMEvents
             Items[ 0 ].dwDataType = HTTP_TRACE_TYPE_LPCGUID; // mof type (object)
             Items[ 0 ].pbData = (PBYTE) pContextId;
             Items[ 0 ].cbData = 16;
-            Items[ 0 ].pszDataDescription = NULL;
+            Items[ 0 ].pszDataDescription = nullptr;
             Items[ 1 ].pszName = L"File";
             Items[ 1 ].dwDataType = HTTP_TRACE_TYPE_LPCSTR; // mof type (string)
             Items[ 1 ].pbData = (PBYTE) pFile;
             Items[ 1 ].cbData  = 
-                 ( Items[ 1 ].pbData == NULL )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 1 ].pbData ) );
-            Items[ 1 ].pszDataDescription = NULL;
+                 ( Items[ 1 ].pbData == nullptr )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 1 ].pbData ) );
+            Items[ 1 ].pszDataDescription = nullptr;
             Items[ 2 ].pszName = L"Line";
             Items[ 2 ].dwDataType = HTTP_TRACE_TYPE_ULONG; // mof type (uint32)
             Items[ 2 ].pbData = (PBYTE) &Line;
             Items[ 2 ].cbData = 4;
-            Items[ 2 ].pszDataDescription = NULL;
+            Items[ 2 ].pszDataDescription = nullptr;
             Items[ 3 ].pszName = L"Description";
             Items[ 3 ].dwDataType = HTTP_TRACE_TYPE_LPCSTR; // mof type (string)
             Items[ 3 ].pbData = (PBYTE) pDescription;
             Items[ 3 ].cbData  = 
-                 ( Items[ 3 ].pbData == NULL )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 3 ].pbData ) );
-            Items[ 3 ].pszDataDescription = NULL;
+                 ( Items[ 3 ].pbData == nullptr )? 0 : (1 + (DWORD) strlen( (PSTR) Items[ 3 ].pbData ) );
+            Items[ 3 ].pszDataDescription = nullptr;
             Event.pEventItems = Items;
             pHttpTraceContext->RaiseTraceEvent( &Event );
             return S_OK;
@@ -1074,4 +1073,4 @@ class ANCMEvents
         };
     };
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/config_utility.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/config_utility.h
index e621447753ab..1e3e1a60b749 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/config_utility.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/config_utility.h
@@ -61,7 +61,7 @@ class ConfigUtility
     HRESULT
     FindKeyValuePair(IAppHostElement* pElement, PCWSTR key, STRU& strHandlerVersionValue)
     {
-        HRESULT hr;
+        HRESULT hr = S_OK;
         CComPtr<IAppHostElement>           pHandlerSettings = nullptr;
         CComPtr<IAppHostElementCollection> pHandlerSettingsCollection = nullptr;
         CComPtr<IAppHostElement>           pHandlerVar = nullptr;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp
index 513c571cdbed..a6506a3f4131 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/debugutil.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "debugutil.h"
@@ -73,7 +74,7 @@ GetVersionInfoString()
     {
         DWORD  verHandle = 0;
         UINT   size = 0;
-        LPVOID lpBuffer = NULL;
+        LPVOID lpBuffer = nullptr;
 
         auto path = GetModuleName();
 
@@ -92,7 +93,7 @@ GetVersionInfoString()
             RETURN_IF_FAILED(E_FAIL);
         }
 
-        LPVOID pvProductName = NULL;
+        LPVOID pvProductName = nullptr;
         unsigned int iProductNameLen = 0;
         RETURN_LAST_ERROR_IF(!VerQueryValue(verData.data(), _T("\\StringFileInfo\\040904b0\\FileDescription"), &pvProductName, &iProductNameLen));
 
@@ -114,7 +115,7 @@ std::wstring
 GetModuleName()
 {
     WCHAR path[MAX_PATH];
-    LOG_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, sizeof(path)));
+    LOG_LAST_ERROR_IF(!GetModuleFileName(g_hModule, path, _countof(path)));
     return path;
 }
 
@@ -206,19 +207,19 @@ DebugInitialize(HMODULE hModule)
     InitializeSRWLock(&g_logFileLock);
 
     if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-            L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters",
+            L"SOFTWARE\\LeXtudio\\IIS Extensions\\IIS HTTP Bridge\\Parameters",
             0,
             KEY_READ,
             &hKey) == NO_ERROR)
     {
-        DWORD dwType;
-        DWORD dwData;
-        DWORD cbData;
+        DWORD dwType{0};
+        DWORD dwData{0};
+        DWORD cbData{0};
 
         cbData = sizeof(dwData);
         if ((RegQueryValueEx(hKey,
             L"DebugFlags",
-            NULL,
+            nullptr,
             &dwType,
             (LPBYTE)&dwData,
             &cbData) == NO_ERROR) &&
@@ -232,7 +233,7 @@ DebugInitialize(HMODULE hModule)
 
     try
     {
-        SetDebugFlags(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L""));
+        SetDebugFlags(Environment::GetEnvironmentVariableValue(L"HTTP_PLATFORM_MODULE_DEBUG").value_or(L""));
     }
     catch (...)
     {
@@ -265,7 +266,7 @@ DebugInitializeFromConfig(IHttpServer& pHttpServer, IHttpApplication& pHttpAppli
 
     CComPtr<IAppHostElement>        pAspNetCoreElement;
 
-    const CComBSTR bstrAspNetCoreSection = L"system.webServer/aspNetCore";
+    const CComBSTR bstrAspNetCoreSection = L"system.webServer/httpPlatform";
     CComBSTR bstrConfigPath = pHttpApplication.GetAppConfigPath();
 
     RETURN_IF_FAILED(pHttpServer.GetAdminManager()->GetAdminSection(bstrAspNetCoreSection,
@@ -373,7 +374,7 @@ DebugPrintW(
 
         if (IsEnabled(ASPNETCORE_DEBUG_FLAG_EVENTLOG))
         {
-            WORD eventType;
+            WORD eventType = EVENTLOG_INFORMATION_TYPE;
             switch (dwFlag)
             {
                 case ASPNETCORE_DEBUG_FLAG_ERROR:
@@ -409,7 +410,10 @@ DebugPrintfW(
 
         hr = strCooked.SafeVsnwprintf(szFormat, args );
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // va_end uses 0
         va_end( args );
+#pragma warning(pop)
 
         if (FAILED (hr))
         {
@@ -453,7 +457,10 @@ DebugPrintf(
 
         hr = strCooked.SafeVsnprintf(szFormat, args );
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // va_end uses 0
         va_end( args );
+#pragma warning(pop)
 
         if (FAILED (hr))
         {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp
index c7d3b47deda5..2c67d968cbd5 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.cpp
@@ -41,7 +41,7 @@ FILE_UTILITY::ConvertPathToFullPath(
 {
     HRESULT hr = S_OK;
     STRU strFileFullPath;
-    LPWSTR pszFullPath = NULL;
+    LPWSTR pszFullPath = nullptr;
 
     // if relative path, prefix with root path and then convert to absolute path.
     if ( PathIsRelative(pszPath) )
@@ -72,7 +72,7 @@ FILE_UTILITY::ConvertPathToFullPath(
 
     if(_wfullpath( pszFullPath,
                    strFileFullPath.QueryStr(),
-                   strFileFullPath.QueryCCH() + 1 ) == NULL )
+                   strFileFullPath.QueryCCH() + 1 ) == nullptr )
     {
         hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
         goto Finished;
@@ -87,10 +87,10 @@ FILE_UTILITY::ConvertPathToFullPath(
 
 Finished:
 
-    if ( pszFullPath != NULL )
+    if ( pszFullPath != nullptr )
     {
         delete[] pszFullPath;
-        pszFullPath = NULL;
+        pszFullPath = nullptr;
     }
 
     return hr;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h
index afa39b0ca021..38f0e58f7941 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/resources.h
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
@@ -8,15 +9,15 @@
 #define IDS_INVALID_PROPERTY        1000
 #define IDS_SERVER_ERROR            1001
 
-#define ASPNETCORE_EVENT_PROVIDER L"IIS AspNetCore Module V2"
-#define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express AspNetCore Module V2"
+#define ASPNETCORE_EVENT_PROVIDER L"IIS HTTP Bridge Module"
+#define ASPNETCORE_IISEXPRESS_EVENT_PROVIDER L"IIS Express HTTP Bridge Module"
 
 #define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG           L"Application '%s' started process '%d' successfully and process '%d' is listening on port '%d'."
 #define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG       L"Maximum rapid fail count per minute of '%d' exceeded."
 #define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG             L"Application '%s' with physical root '%s' failed to start process with commandline '%s' at stage '%s', ErrorCode = '0x%x', assigned port %d, retryCounter '%d'."
 #define ASPNETCORE_EVENT_PROCESS_START_FAILURE_MSG           L"Application '%s' with physical root '%s' failed to start process with commandline '%s' with multiple retries. Failed to bind to port '%d'. First 30KB characters of captured stdout and stderr logs from multiple retries:\r\n%s"
 #define ASPNETCORE_EVENT_PROCESS_START_STATUS_ERROR_MSG      L"Application '%s' with physical root '%s' failed to start process with commandline '%s', ErrorCode = '0x%x', processId '%d', processStatus '%d'."
-#define ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG   L"Application '%s' with physical root '%s' failed to choose listen port '%d' given port range '%d - %d', ErrorCode = '0x%x'. If environment variable 'ASPNETCORE_PORT' was set, try removing it such that a random port is selected instead."
+#define ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG   L"Application '%s' with physical root '%s' failed to choose listen port '%d' given port range '%d - %d', ErrorCode = '0x%x'. If environment variable 'HTTP_PLATFORM_PORT' was set, try removing it such that a random port is selected instead."
 #define ASPNETCORE_EVENT_PROCESS_START_WRONGPORT_ERROR_MSG   L"Application '%s' with physical root '%s' created process with commandline '%s' but failed to listen on the given port '%d'"
 #define ASPNETCORE_EVENT_PROCESS_START_NOTREADY_ERROR_MSG    L"Application '%s' with physical root '%s' created process with commandline '%s' but either crashed, did not respond, or did not listen on the given port '%d', ErrorCode = '0x%x'"
 #define ASPNETCORE_EVENT_PROCESS_SHUTDOWN_MSG                L"Application '%s' with physical root '%s' shut down process with Id '%d' listening on port '%d'"
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h
index 86b62b6fcf2a..5aff426345cc 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h
@@ -13,7 +13,7 @@ class STTIMER
 public:
 
     STTIMER()
-        : _pTimer( NULL )
+        : _pTimer( nullptr )
     {
         fInCanel = FALSE;
     }
@@ -25,7 +25,7 @@ class STTIMER
         {
             CancelTimer();
             CloseThreadpoolTimer( _pTimer );
-            _pTimer = NULL;
+            _pTimer = nullptr;
         }
     }
 
@@ -39,7 +39,7 @@ class STTIMER
     {
         _pTimer = CreateThreadpoolTimer( pfnCallback,
                                          pContext,
-                                         NULL );
+                                         nullptr );
 
         if ( !_pTimer )
         {
@@ -61,7 +61,7 @@ class STTIMER
         DWORD dwPeriod = 0
         )
     {
-        FILETIME ftInitialWait;
+        FILETIME ftInitialWait{};
 
         if ( dwInitialWait == 0 && dwPeriod == 0 )
         {
@@ -74,9 +74,9 @@ class STTIMER
             // re-enabled by setting non-zero initial wait or
             // period values.
             //
-            if (_pTimer != NULL)
+            if (_pTimer != nullptr)
             {
-                SetThreadpoolTimer(_pTimer, NULL, 0, 0);
+                SetThreadpoolTimer(_pTimer, nullptr, 0, 0);
             }
 
             return;
@@ -106,7 +106,7 @@ class STTIMER
         // Wait until any callbacks queued prior to disabling
         // have completed.
         //
-        if (_pTimer != NULL)
+        if (_pTimer != nullptr)
         {
             WaitForThreadpoolTimerCallbacks(_pTimer, TRUE);
         }
@@ -124,13 +124,13 @@ class STTIMER
     )
     {
         STRU*                   pstruLogFilePath = (STRU*)Context;
-        HANDLE                  hStdoutHandle = NULL;
+        HANDLE                  hStdoutHandle = nullptr;
         SECURITY_ATTRIBUTES     saAttr = { 0 };
         HRESULT                 hr = S_OK;
 
         saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
         saAttr.bInheritHandle = TRUE;
-        saAttr.lpSecurityDescriptor = NULL;
+        saAttr.lpSecurityDescriptor = nullptr;
 
         hStdoutHandle = CreateFileW(pstruLogFilePath->QueryStr(),
                                     FILE_READ_DATA,
@@ -138,7 +138,7 @@ class STTIMER
                                     &saAttr,
                                     OPEN_ALWAYS,
                                     FILE_ATTRIBUTE_NORMAL,
-                                    NULL);
+                                    nullptr);
         if (hStdoutHandle == INVALID_HANDLE_VALUE)
         {
             hr = HRESULT_FROM_WIN32(GetLastError());
@@ -186,12 +186,10 @@ class STELAPSED
           _dwPerfCountsPerMillisecond( 0 ),
           _fUsingHighResolution( FALSE )
     {
-        LARGE_INTEGER li;
-        BOOL          fResult;
-
+        LARGE_INTEGER li{};
         _dwInitTickCount = GetTickCount64();
 
-        fResult = QueryPerformanceFrequency( &li );
+        BOOL fResult = QueryPerformanceFrequency( &li );
 
         if ( !fResult )
         {
@@ -224,7 +222,7 @@ class STELAPSED
     LONGLONG
     QueryElapsedTime()
     {
-        LARGE_INTEGER li;
+        LARGE_INTEGER li{};
 
         if ( _fUsingHighResolution && QueryPerformanceCounter( &li ) )
         {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
index e85b795c685a..e2e17265c7c8 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj
@@ -9,7 +9,7 @@
     <ProjectGuid>{1eac8125-1765-4e2d-8cbe-56dc98a1c8c1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(PlatformToolsetVersion)</PlatformToolset>
+    <PlatformToolset>v$(PlatformToolsetVersion)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <IsTestProject>true</IsTestProject>
     <DisableArcadeTestFramework>true</DisableArcadeTestFramework>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp
index 86c764df8533..3e1bbc1add95 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp
@@ -8,5 +8,5 @@ DECLARE_DEBUG_PRINT_OBJECT2("tests", ASPNETCORE_DEBUG_FLAG_INFO | ASPNETCORE_DEB
 int wmain(int argc, wchar_t* argv[])
 {
     ::testing::InitGoogleTest(&argc, argv);
-    RUN_ALL_TESTS();
+    return RUN_ALL_TESTS();
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset
index 1c2bbdaeaf40..4928786e7a2d 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset
+++ b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="DefaultRules" ToolsVersion="15.0">
+<RuleSet Name="DefaultRules" ToolsVersion="17.0">
   <Include Path="allrules.ruleset" Action="Default" />
   <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
     <Rule Id="C26100" Action="Error" />
@@ -12,14 +12,14 @@
     <Rule Id="C26116" Action="Error" />
     <Rule Id="C26117" Action="Error" />
     <Rule Id="C26130" Action="Error" />
-    <Rule Id="C26135" Action="Error" />
+    <Rule Id="C26135" Action="None" /> <!-- Missing annotation <annotation> at function '<func>' -->
     <Rule Id="C26140" Action="Error" />
-    <Rule Id="C26160" Action="Error" />
+    <Rule Id="C26160" Action="None" /> <!-- Caller possibly failing to hold lock '<lock>' before calling function '<func>'. -->
     <Rule Id="C26165" Action="Error" />
     <Rule Id="C26166" Action="Error" />
     <Rule Id="C26167" Action="Error" />
-    <Rule Id="C26400" Action="Error" />
-    <Rule Id="C26401" Action="Error" />
+    <Rule Id="C26400" Action="None" /> <!-- Do not assign the result of an allocation or a function call with an owner<T> return value to a raw pointer -->
+    <Rule Id="C26401" Action="None" /> <!-- Do not delete a raw pointer that is not an owner<T> -->
     <Rule Id="C26402" Action="Error" />
     <Rule Id="C26403" Action="Error" />
     <Rule Id="C26404" Action="Error" />
@@ -27,73 +27,82 @@
     <Rule Id="C26406" Action="Error" />
     <Rule Id="C26407" Action="Error" />
     <Rule Id="C26408" Action="Error" />
-    <Rule Id="C26409" Action="Error" />
+    <Rule Id="C26409" Action="None" /> <!-- Avoid calling new and delete explicitly, use std::make_unique<T> instead -->
     <Rule Id="C26410" Action="Error" />
     <Rule Id="C26411" Action="Error" />
-    <Rule Id="C26414" Action="Error" />
-    <Rule Id="C26415" Action="Error" />
+    <Rule Id="C26414" Action="None" /> <!-- Move, copy, reassign or reset a local smart pointer. -->
+    <Rule Id="C26415" Action="None" /> <!-- Smart pointer parameter is used only to access contained pointer. Use T* or T& instead. -->
     <Rule Id="C26416" Action="Error" />
     <Rule Id="C26417" Action="Error" />
-    <Rule Id="C26418" Action="Error" />
+    <Rule Id="C26418" Action="None" /> <!-- Shared pointer parameter is not copied or moved. Use T* or T& instead. -->
     <Rule Id="C26426" Action="Error" />
     <Rule Id="C26427" Action="Error" />
-    <Rule Id="C26429" Action="None" />
-    <Rule Id="C26430" Action="Error" />
+    <Rule Id="C26429" Action="None" /> <!-- Symbol is never tested for nullness, it can be marked as gsl::not_null. -->
+    <Rule Id="C26430" Action="None" /> <!-- Symbol '<var>' is not tested for nullness on all paths  -->
     <Rule Id="C26431" Action="Error" />
-    <Rule Id="C26432" Action="None" />
-    <Rule Id="C26433" Action="Error" />
-    <Rule Id="C26434" Action="Error" />
+    <Rule Id="C26432" Action="None" /> <!-- If you define or delete any default operation in the type 'type-name', define or delete them all -->
+    <Rule Id="C26433" Action="None" /> <!-- Function should be marked with override -->
+    <Rule Id="C26434" Action="None" /> <!-- Function 'derived::function' hides a non-virtual function 'base::function' -->
     <Rule Id="C26435" Action="Error" />
-    <Rule Id="C26436" Action="Error" />
+    <Rule Id="C26436" Action="None" /> <!-- The type 'symbol' with a virtual function needs either public virtual or protected non-virtual destructor -->
     <Rule Id="C26437" Action="Error" />
-    <Rule Id="C26438" Action="Error" />
+    <Rule Id="C26438" Action="None" /> <!-- Avoid goto -->
     <Rule Id="C26439" Action="Error" />
-    <Rule Id="C26440" Action="Error" />
+    <Rule Id="C26440" Action="None" /> <!-- Function can be declared 'noexcept'. -->
     <Rule Id="C26441" Action="Error" />
     <Rule Id="C26443" Action="Error" />
     <Rule Id="C26444" Action="Error" />
     <Rule Id="C26445" Action="Error" />
-    <Rule Id="C26446" Action="None" />
-    <Rule Id="C26447" Action="Error" />
-    <Rule Id="C26448" Action="None" />
+    <Rule Id="C26446" Action="None" /> <!-- Prefer to use gsl::at() instead of unchecked subscript operator -->
+    <Rule Id="C26447" Action="None" /> <!-- The function is declared noexcept but calls function function_name that may throw exceptions -->
+    <Rule Id="C26448" Action="None" /> <!-- Consider using gsl::finally if final action is intended -->
     <Rule Id="C26449" Action="Error" />
     <Rule Id="C26450" Action="Error" />
-    <Rule Id="C26451" Action="Error" />
+    <Rule Id="C26451" Action="None" /> <!-- Arithmetic overflow: Using operator '+' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '+' to avoid overflow -->
     <Rule Id="C26452" Action="Error" />
     <Rule Id="C26453" Action="Error" />
     <Rule Id="C26454" Action="Error" />
+    <Rule Id="C26455" Action="None" /> <!-- Default constructor should not throw. Declare it 'noexcept' -->
+    <Rule Id="C26457" Action="None" /> <!--  (void) should not be used to ignore return values, use 'std::ignore =' instead -->
     <Rule Id="C26459" Action="Error" />
-    <Rule Id="C26460" Action="Error" />
-    <Rule Id="C26461" Action="Error" />
-    <Rule Id="C26462" Action="Error" />
+    <Rule Id="C26460" Action="None" /> <!-- The reference argument 'argument' for function 'function' can be marked as const -->
+    <Rule Id="C26461" Action="None" /> <!-- The pointer argument 'argument' for function 'function' can be marked as a pointer to const -->
+    <Rule Id="C26462" Action="None" /> <!--  The value pointed to by '<var>' is assigned only once, mark it as a pointer to const -->
     <Rule Id="C26463" Action="Error" />
     <Rule Id="C26464" Action="Error" />
     <Rule Id="C26465" Action="Error" />
     <Rule Id="C26466" Action="Error" />
-    <Rule Id="C26471" Action="Error" />
-    <Rule Id="C26472" Action="None" />
-    <Rule Id="C26473" Action="Error" />
+    <Rule Id="C26467" Action="None" /> <!-- Converting from floating point to unsigned integral types results in non-portable code if the double/float has a negative value. -->
+    <Rule Id="C26471" Action="None" /> <!-- Don't use reinterpret_cast. A cast from void* can use static_cast -->
+    <Rule Id="C26472" Action="None" /> <!-- Don't use a static_cast for arithmetic conversions. Use brace initialization, gsl::narrow_cast, or gsl::narrow. -->
+    <Rule Id="C26473" Action="None" /> <!-- Don't cast between pointer types where the source type and the target type are the same -->
     <Rule Id="C26474" Action="Error" />
     <Rule Id="C26475" Action="Error" />
-    <Rule Id="C26476" Action="Error" />
+    <Rule Id="C26476" Action="None" /> <!-- Expression/symbol 'name' uses a naked union 'union' with multiple type pointers: Use variant instead -->
     <Rule Id="C26477" Action="Error" />
-    <Rule Id="C26481" Action="Error" />
-    <Rule Id="C26482" Action="Error" />
+    <Rule Id="C26478" Action="Error" />
+    <Rule Id="C26481" Action="None" /> <!-- Don't use pointer arithmetic. Use span instead -->
+    <Rule Id="C26482" Action="None" /> <!-- Only index into arrays using constant expressions. -->
     <Rule Id="C26483" Action="Error" />
-    <Rule Id="C26485" Action="Error" />
-    <Rule Id="C26486" Action="None" />
-    <Rule Id="C26487" Action="Error" />
-    <Rule Id="C26489" Action="None" />
-    <Rule Id="C26490" Action="Error" />
+    <Rule Id="C26485" Action="None" /> <!-- Expression 'array-name': No array to pointer decay -->
+    <Rule Id="C26486" Action="None" /> <!-- Don't pass a pointer that may be invalid (dangling) as a parameter to a function. -->
+    <Rule Id="C26487" Action="None" /> <!-- Don't allow a function to return an invalid pointer, either through a formal return statement or through output parameters. -->
+    <Rule Id="C26489" Action="None" /> <!-- Don't dereference a pointer that may be invalid. -->
+    <Rule Id="C26490" Action="None" /> <!-- Don't use reinterpret_cast. -->
     <Rule Id="C26491" Action="Error" />
-    <Rule Id="C26492" Action="Error" />
-    <Rule Id="C26493" Action="Error" />
-    <Rule Id="C26494" Action="Error" />
-    <Rule Id="C26495" Action="Error" />
-    <Rule Id="C26496" Action="Error" />
+    <Rule Id="C26492" Action="None" /> <!-- Don't use const_cast to cast away const. -->
+    <Rule Id="C26493" Action="None" /> <!-- Don't use C-style casts. -->
+    <Rule Id="C26494" Action="Error" /> <!-- Variable 'variable' is uninitialized. Always initialize an object. -->
+    <Rule Id="C26495" Action="None" /> <!-- Variable 'variable' is uninitialized. Always initialize a member variable -->
+    <Rule Id="C26496" Action="None" /> <!-- The variable 'variable' is assigned only once, mark it as const. -->
     <Rule Id="C26497" Action="Error" />
     <Rule Id="C26498" Action="Error" />
-    <Rule Id="C28020" Action="Error" />
+    <Rule Id="C26814" Action="None" /> <!-- The const variable 'variable' can be computed at compile time. Consider using constexpr -->
+    <Rule Id="C26818" Action="None" /> <!-- Switch statement does not cover all cases. Consider adding a 'default' label -->
+    <Rule Id="C26819" Action="Error" />
+    <Rule Id="C26826" Action="None" /> <!-- Don't use C-style variable arguments -->
+    <Rule Id="C26859" Action="None" /> <!-- Empty optional '<var>' is unwrapped, will throw exception. -->
+    <Rule Id="C28020" Action="None" /> <!-- The expression 'expr' is not true at this call -->
     <Rule Id="C28021" Action="Error" />
     <Rule Id="C28022" Action="Error" />
     <Rule Id="C28023" Action="Error" />
@@ -142,7 +151,7 @@
     <Rule Id="C28156" Action="Error" />
     <Rule Id="C28157" Action="Error" />
     <Rule Id="C28158" Action="Error" />
-    <Rule Id="C28159" Action="Error" />
+    <Rule Id="C28159" Action="None" /> <!-- Consider using *function_name_1* instead of *function_name_2*. -->
     <Rule Id="C28160" Action="Error" />
     <Rule Id="C28161" Action="Error" />
     <Rule Id="C28162" Action="Error" />
@@ -213,9 +222,9 @@
     <Rule Id="C28245" Action="Error" />
     <Rule Id="C28246" Action="Error" />
     <Rule Id="C28250" Action="Error" />
-    <Rule Id="C28251" Action="Error" />
-    <Rule Id="C28252" Action="Error" />
-    <Rule Id="C28253" Action="Error" />
+    <Rule Id="C28251" Action="None" /> <!-- Inconsistent annotation for function: this instance has an error -->
+    <Rule Id="C28252" Action="None" /> <!-- Inconsistent annotation for '<func>': <param> has '<annotation>' on the prior instance. -->
+    <Rule Id="C28253" Action="None" /> <!-- Inconsistent annotation for '<func>': <param> has '<annotations>' on this instance -->
     <Rule Id="C28254" Action="Error" />
     <Rule Id="C28260" Action="Error" />
     <Rule Id="C28262" Action="Error" />
@@ -286,9 +295,9 @@
     <Rule Id="C6011" Action="Error" />
     <Rule Id="C6014" Action="Error" />
     <Rule Id="C6029" Action="Error" />
-    <Rule Id="C6031" Action="Error" />
+    <Rule Id="C6031" Action="None" /> <!-- Return value ignored: '<func>'. -->
     <Rule Id="C6053" Action="Error" />
-    <Rule Id="C6054" Action="Error" />
+    <Rule Id="C6054" Action="None" /> <!-- String '<var>' might not be zero-terminated. -->
     <Rule Id="C6059" Action="Error" />
     <Rule Id="C6063" Action="Error" />
     <Rule Id="C6064" Action="Error" />
@@ -319,7 +328,7 @@
     <Rule Id="C6248" Action="Error" />
     <Rule Id="C6250" Action="Error" />
     <Rule Id="C6255" Action="Error" />
-    <Rule Id="C6258" Action="Error" />
+    <Rule Id="C6258" Action="None" /> <!-- Using TerminateThread does not allow proper thread clean up. -->
     <Rule Id="C6259" Action="Error" />
     <Rule Id="C6260" Action="Error" />
     <Rule Id="C6262" Action="Error" />
@@ -383,14 +392,14 @@
     <Rule Id="C6334" Action="Error" />
     <Rule Id="C6335" Action="Error" />
     <Rule Id="C6336" Action="Error" />
-    <Rule Id="C6340" Action="Error" />
+    <Rule Id="C6340" Action="None" /> <!-- sign mismatch -->
     <Rule Id="C6381" Action="Error" />
     <Rule Id="C6383" Action="Error" />
     <Rule Id="C6384" Action="Error" />
     <Rule Id="C6385" Action="Error" />
     <Rule Id="C6386" Action="Error" />
-    <Rule Id="C6387" Action="Error" />
-    <Rule Id="C6388" Action="Error" />
+    <Rule Id="C6387" Action="None" /> <!-- '<expr>' could be '<val>':  this does not adhere to the specification for the function '<func>' -->
+    <Rule Id="C6388" Action="None" /> <!-- '<var>' might not be '<val>':  this does not adhere to the specification for the function '<func>' -->
     <Rule Id="C6400" Action="Error" />
     <Rule Id="C6401" Action="Error" />
     <Rule Id="C6411" Action="Error" />
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.cpp
index d2de16a7ae31..bff419bd2aa7 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/acache.cpp
@@ -3,12 +3,15 @@
 
 #include "precomp.h"
 
-#pragma warning( push )
-#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS )
-
 LONG    ALLOC_CACHE_HANDLER::sm_nFillPattern = 0xACA50000;
 HANDLE  ALLOC_CACHE_HANDLER::sm_hHeap;
 
+#if defined(_MSC_VER)
+static_assert(_MSC_VER >= 1600, "This code requires MSVC 10 or later.");
+#else
+static_assert(false, "This code requires MSVC");
+#endif
+
 //
 // This class is used to implement the free list.  We cast the free'd
 // memory block to a FREE_LIST_HEADER*.  The signature is used to guard against
@@ -33,7 +36,7 @@ class FREE_LIST_HEADER
 ALLOC_CACHE_HANDLER::ALLOC_CACHE_HANDLER(
 ) : m_nThreshold(0),
     m_cbSize(0),
-    m_pFreeLists(NULL),
+    m_pFreeLists(nullptr),
     m_nTotal(0)
 {
 }
@@ -41,11 +44,11 @@ ALLOC_CACHE_HANDLER::ALLOC_CACHE_HANDLER(
 ALLOC_CACHE_HANDLER::~ALLOC_CACHE_HANDLER(
 )
 {
-    if (m_pFreeLists != NULL)
+    if (m_pFreeLists != nullptr)
     {
         CleanupLookaside();
         m_pFreeLists->Dispose();
-        m_pFreeLists = NULL;
+        m_pFreeLists = nullptr;
     }
 }
 
@@ -140,7 +143,7 @@ VOID
 ALLOC_CACHE_HANDLER::StaticTerminate(
 )
 {
-    sm_hHeap = NULL;
+    sm_hHeap = nullptr;
 }
 
 VOID
@@ -163,13 +166,12 @@ ALLOC_CACHE_HANDLER::CleanupLookaside(
     // memory must be 16 bytes aligned and currently it is 64.
     //
 
-#if defined(_MSC_VER) && _MSC_VER >= 1600 // VC10
     auto Predicate = [=] (SLIST_HEADER * pListHeader)
     {
         LONG NodesToDelete = QueryDepthSList( pListHeader );
 
         PSLIST_ENTRY pl = InterlockedPopEntrySList(pListHeader);
-        while ( pl != NULL && --NodesToDelete >= 0 )
+        while ( pl != nullptr && --NodesToDelete >= 0 )
         {
             InterlockedDecrement( &m_nTotal);
 
@@ -178,48 +180,22 @@ ALLOC_CACHE_HANDLER::CleanupLookaside(
             pl = InterlockedPopEntrySList(pListHeader);
         }
     };
-#else
-    class Functor
-    {
-    public:
-        explicit Functor(ALLOC_CACHE_HANDLER * pThis) : _pThis(pThis)
-        {
-        }
-        void operator()(SLIST_HEADER * pListHeader)
-        {
-            PSLIST_ENTRY pl;
-            LONG NodesToDelete = QueryDepthSList( pListHeader );
-
-            pl = InterlockedPopEntrySList( pListHeader );
-            while ( pl != NULL && --NodesToDelete >= 0 )
-            {
-                InterlockedDecrement( &_pThis->m_nTotal);
-
-                ::HeapFree( sm_hHeap, 0, pl );
-
-                pl = InterlockedPopEntrySList(pListHeader);
-            }
-        }
-    private:
-        ALLOC_CACHE_HANDLER * _pThis;
-    } Predicate(this);
-#endif
 
     m_pFreeLists ->ForEach(Predicate);
 }
-
+
 LPVOID
 ALLOC_CACHE_HANDLER::Alloc(
 )
 {
-    LPVOID pMemory = NULL;
+    LPVOID pMemory = nullptr;
 
     if ( m_nThreshold > 0 )
     {
         SLIST_HEADER * pListHeader = m_pFreeLists ->GetLocal();
         pMemory = (LPVOID) InterlockedPopEntrySList(pListHeader);  // get the real object
 
-        if (pMemory != NULL)
+        if (pMemory != nullptr)
         {
             FREE_LIST_HEADER* pfl = static_cast<FREE_LIST_HEADER*>(pMemory);
             //
@@ -231,7 +207,7 @@ ALLOC_CACHE_HANDLER::Alloc(
         }
     }
 
-    if ( pMemory == NULL )
+    if ( pMemory == nullptr )
     {
         //
         // No free entry. Need to alloc a new object.
@@ -240,7 +216,7 @@ ALLOC_CACHE_HANDLER::Alloc(
                                         0,
                                         m_cbSize );
 
-        if ( pMemory != NULL )
+        if ( pMemory != nullptr )
         {
             //
             // Update counters.
@@ -249,7 +225,7 @@ ALLOC_CACHE_HANDLER::Alloc(
         }
     }
 
-    if ( pMemory == NULL )
+    if ( pMemory == nullptr )
     {
         SetLastError( ERROR_NOT_ENOUGH_MEMORY );
     }
@@ -261,7 +237,7 @@ ALLOC_CACHE_HANDLER::Alloc(
 
     return pMemory;
 }
-
+
 VOID
 ALLOC_CACHE_HANDLER::Free(
     __in LPVOID pMemory
@@ -270,7 +246,7 @@ ALLOC_CACHE_HANDLER::Free(
     //
     // Assume that this is allocated using the Alloc() function.
     //
-    DBG_ASSERT(NULL != pMemory);
+    DBG_ASSERT(nullptr != pMemory);
 
     //
     // Use a signature to check against double deletions.
@@ -339,7 +315,7 @@ Return Value:
 {
     DWORD Count = 0;
 
-    if (m_pFreeLists  != NULL)
+    if (m_pFreeLists  != nullptr)
     {
 #if defined(_MSC_VER) && _MSC_VER >= 1600 // VC10
         auto Predicate = [&Count] (SLIST_HEADER * pListHeader)
@@ -377,17 +353,17 @@ ALLOC_CACHE_HANDLER::IsPageheapEnabled(
 {
     BOOL        fRet = FALSE;
     BOOL        fLockedHeap = FALSE;
-    HMODULE     hModule = NULL;
-    HANDLE      hHeap = NULL;
-    PROCESS_HEAP_ENTRY heapEntry = {0};
+    HMODULE     hModule = nullptr;
+    HANDLE      hHeap = nullptr;
+    PROCESS_HEAP_ENTRY heapEntry = {};
 
     //
     // If verifier.dll is loaded - we are running under app verifier == pageheap is enabled
     //
     hModule = GetModuleHandle( L"verifier.dll" );
-    if ( hModule != NULL )
+    if ( hModule != nullptr)
     {
-        hModule = NULL;
+        hModule = nullptr;
         fRet = TRUE;
         goto Finished;
     }
@@ -397,7 +373,7 @@ ALLOC_CACHE_HANDLER::IsPageheapEnabled(
     // otherwise HeapWalk turns off lookasides for a useful heap
     //
     hHeap = ::HeapCreate( 0, 0, 0 );
-    if ( hHeap == NULL )
+    if ( hHeap == nullptr )
     {
         fRet = FALSE;
         goto Finished;
@@ -429,17 +405,14 @@ ALLOC_CACHE_HANDLER::IsPageheapEnabled(
 
     if ( fLockedHeap )
     {
-        fLockedHeap = FALSE;
         DBG_REQUIRE( ::HeapUnlock( hHeap ) );
     }
 
     if ( hHeap )
     {
         DBG_REQUIRE( ::HeapDestroy( hHeap ) );
-        hHeap = NULL;
+        hHeap = nullptr;
     }
 
     return fRet;
 }
-
-#pragma warning( pop )
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp
index 449469ea1b0b..0bf9a1def8ed 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp
@@ -43,7 +43,7 @@ SetElementProperty(
     if( bstrPropName )
     {
         SysFreeString( bstrPropName );
-        bstrPropName = NULL;
+        bstrPropName = nullptr;
     }
 
     return hr;
@@ -90,9 +90,9 @@ GetElementStringProperty(
 {
     HRESULT hr = S_OK;
     BSTR bstrPropName = SysAllocString( szPropName );
-    IAppHostProperty* pProperty = NULL;
+    IAppHostProperty* pProperty = nullptr;
 
-    *pbstrPropValue = NULL;
+    *pbstrPropValue = nullptr;
 
     if (!bstrPropName)
     {
@@ -140,8 +140,8 @@ GetElementStringProperty(
 {
     HRESULT hr = S_OK;
     BSTR bstrPropName = SysAllocString( szPropName );
-    IAppHostProperty* pProperty = NULL;
-    BSTR bstrPropValue = NULL;
+    IAppHostProperty* pProperty = nullptr;
+    BSTR bstrPropValue = nullptr;
 
     if (!bstrPropName)
     {
@@ -199,7 +199,7 @@ GetElementChildByName(
 )
 {
     BSTR bstrElementName = SysAllocString(pszElementName);
-    if (bstrElementName == NULL)
+    if (bstrElementName == nullptr)
     {
         return E_OUTOFMEMORY;
     }
@@ -235,13 +235,13 @@ GetElementBoolProperty(
 )
 {
     HRESULT hr = S_OK;
-    IAppHostProperty * pProperty = NULL;
+    IAppHostProperty * pProperty = nullptr;
     VARIANT            varValue;
 
     VariantInit( &varValue );
 
     BSTR bstrPropertyName = SysAllocString(pszPropertyName);
-    if ( bstrPropertyName == NULL )
+    if ( bstrPropertyName == nullptr )
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -275,16 +275,16 @@ GetElementBoolProperty(
 
     VariantClear( &varValue );
 
-    if ( bstrPropertyName != NULL )
+    if ( bstrPropertyName != nullptr )
     {
         SysFreeString( bstrPropertyName );
-        bstrPropertyName = NULL;
+        bstrPropertyName = nullptr;
     }
 
-    if ( pProperty != NULL )
+    if ( pProperty != nullptr )
     {
         pProperty->Release();
-        pProperty = NULL;
+        pProperty = nullptr;
     }
 
     return hr;
@@ -299,13 +299,13 @@ GetElementDWORDProperty(
 )
 {
     HRESULT            hr = S_OK;
-    IAppHostProperty * pProperty = NULL;
+    IAppHostProperty * pProperty = nullptr;
     VARIANT            varValue;
 
     VariantInit( &varValue );
 
     BSTR bstrName = SysAllocString(pwszName);
-    if ( bstrName == NULL )
+    if ( bstrName == nullptr )
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -338,16 +338,16 @@ GetElementDWORDProperty(
 
     VariantClear( &varValue );
 
-    if ( pProperty != NULL )
+    if ( pProperty != nullptr )
     {
         pProperty->Release();
-        pProperty = NULL;
+        pProperty = nullptr;
     }
 
-    if ( bstrName != NULL )
+    if ( bstrName != nullptr )
     {
         SysFreeString( bstrName );
-        bstrName = NULL;
+        bstrName = nullptr;
     }
 
     return hr;
@@ -361,13 +361,13 @@ GetElementLONGLONGProperty(
 )
 {
     HRESULT            hr = S_OK;
-    IAppHostProperty * pProperty = NULL;
+    IAppHostProperty * pProperty = nullptr;
     VARIANT            varValue;
 
     VariantInit( &varValue );
 
     BSTR bstrName = SysAllocString(pwszName);
-    if ( bstrName == NULL )
+    if ( bstrName == nullptr )
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -400,16 +400,16 @@ GetElementLONGLONGProperty(
 
     VariantClear( &varValue );
 
-    if ( pProperty != NULL )
+    if ( pProperty != nullptr )
     {
         pProperty->Release();
-        pProperty = NULL;
+        pProperty = nullptr;
     }
 
-    if ( bstrName != NULL )
+    if ( bstrName != nullptr )
     {
         SysFreeString( bstrName );
-        bstrName = NULL;
+        bstrName = nullptr;
     }
 
     return hr;
@@ -423,13 +423,13 @@ GetElementRawTimeSpanProperty(
 )
 {
     HRESULT hr = S_OK;
-    IAppHostProperty * pProperty = NULL;
+    IAppHostProperty * pProperty = nullptr;
     VARIANT            varValue;
 
     VariantInit( &varValue );
 
     BSTR bstrPropertyName = SysAllocString(pszPropertyName);
-    if ( bstrPropertyName == NULL )
+    if ( bstrPropertyName == nullptr )
     {
         hr = HRESULT_FROM_WIN32( ERROR_NOT_ENOUGH_MEMORY );
         goto Finished;
@@ -463,16 +463,16 @@ GetElementRawTimeSpanProperty(
 
     VariantClear( &varValue );
 
-    if ( bstrPropertyName != NULL )
+    if ( bstrPropertyName != nullptr )
     {
         SysFreeString( bstrPropertyName );
-        bstrPropertyName = NULL;
+        bstrPropertyName = nullptr;
     }
 
-    if ( pProperty != NULL )
+    if ( pProperty != nullptr )
     {
         pProperty->Release();
-        pProperty = NULL;
+        pProperty = nullptr;
     }
 
     return hr;
@@ -489,7 +489,7 @@ DeleteElementFromCollection(
     )
 {
     HRESULT hr = NOERROR;
-    ULONG index;
+    ULONG index = 0;
 
     VARIANT varIndex;
     VariantInit( &varIndex );
@@ -627,15 +627,13 @@ FindElementInCollection(
     VARIANT varKeyValue;
     VariantInit( &varKeyValue );
 
-    DWORD   count;
-    DWORD   i;
+    DWORD   count = 0;
+    DWORD   i = 0;
 
-    BSTR bstrKeyName = NULL;
-    PFN_FIND_COMPARE_PROC compareProc;
-
-    compareProc = (BehaviorFlags & FIND_ELEMENT_CASE_INSENSITIVE)
-                      ? &FindCompareCaseInsensitive
-                      : &FindCompareCaseSensitive;
+    BSTR bstrKeyName = nullptr;
+    PFN_FIND_COMPARE_PROC compareProc = (BehaviorFlags & FIND_ELEMENT_CASE_INSENSITIVE)
+                                      ? &FindCompareCaseInsensitive
+                                      : &FindCompareCaseSensitive;
 
     bstrKeyName = SysAllocString( szKeyName );
     if( !bstrKeyName )
@@ -738,7 +736,7 @@ VariantAssign(
 
     pv->vt = VT_BSTR;
     pv->bstrVal = bstr;
-    bstr = NULL;
+    bstr = nullptr;
 
 exit:
 
@@ -761,9 +759,7 @@ GetLocationFromFile(
     CComPtr<IAppHostConfigLocationCollection>   pLocationCollection;
     CComPtr<IAppHostConfigLocation>             pLocation;
 
-    BSTR bstrLocationPath = NULL;
-
-    *ppLocation = NULL;
+    *ppLocation = nullptr;
     *pFound = FALSE;
 
     hr = GetLocationCollection( pAdminMgr,
@@ -773,11 +769,11 @@ GetLocationFromFile(
     if( FAILED(hr) )
     {
         DBGERROR_HR(hr);
-        goto exit;
+        return hr;
     }
 
-    DWORD count;
-    DWORD i;
+    DWORD count = 0;
+    DWORD i = 0;
     VARIANT varIndex;
     VariantInit( &varIndex );
 
@@ -785,9 +781,11 @@ GetLocationFromFile(
     if( FAILED(hr) )
     {
         DBGERROR_HR(hr);
-        goto exit;
+        return hr;
     }
 
+    BSTR bstrLocationPath = nullptr;
+
     for( i = 0; i < count; i++ )
     {
         varIndex.vt = VT_UI4;
@@ -819,7 +817,7 @@ GetLocationFromFile(
         pLocation.Release();
 
         SysFreeString( bstrLocationPath );
-        bstrLocationPath = NULL;
+        bstrLocationPath = nullptr;
     }
 
 exit:
@@ -841,16 +839,16 @@ GetSectionFromLocation(
 
     CComPtr<IAppHostElement>    pSectionElement;
 
-    DWORD count;
-    DWORD i;
+    DWORD count = 0;
+    DWORD i = 0;
 
     VARIANT varIndex;
     VariantInit( &varIndex );
 
-    BSTR bstrSectionName = NULL;
+    BSTR bstrSectionName = nullptr;
 
     *pFound = FALSE;
-    *ppSectionElement = NULL;
+    *ppSectionElement = nullptr;
 
     hr = pLocation->get_Count( &count );
     if( FAILED(hr) )
@@ -890,7 +888,7 @@ GetSectionFromLocation(
         pSectionElement.Release();
 
         SysFreeString( bstrSectionName );
-        bstrSectionName = NULL;
+        bstrSectionName = nullptr;
     }
 
 exit:
@@ -914,7 +912,7 @@ GetAdminElement(
     BSTR bstrConfigPath = SysAllocString(szConfigPath);
     BSTR bstrElementName = SysAllocString(szElementName);
 
-    if (bstrConfigPath == NULL || bstrElementName == NULL)
+    if (bstrConfigPath == nullptr || bstrElementName == nullptr)
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -933,15 +931,15 @@ GetAdminElement(
 
 exit:
 
-    if ( bstrElementName != NULL )
+    if ( bstrElementName != nullptr )
     {
         SysFreeString(bstrElementName);
-        bstrElementName = NULL;
+        bstrElementName = nullptr;
     }
-    if ( bstrConfigPath != NULL )
+    if ( bstrConfigPath != nullptr )
     {
         SysFreeString(bstrConfigPath);
-        bstrConfigPath = NULL;
+        bstrConfigPath = nullptr;
     }
 
     return hr;
@@ -1002,8 +1000,8 @@ ClearElementFromAllSites(
     CComPtr<IAppHostElementCollection> pSitesCollection;
     CComPtr<IAppHostElement> pSiteElement;
     CComPtr<IAppHostChildElementCollection> pChildCollection;
-    ENUM_INDEX index;
-    BOOL found;
+    ENUM_INDEX index{};
+    BOOL found = false;
 
     //
     // Enumerate the sites, remove the specified elements.
@@ -1074,7 +1072,7 @@ ClearElementFromAllLocations(
     CComPtr<IAppHostConfigLocationCollection> pLocationCollection;
     CComPtr<IAppHostConfigLocation> pLocation;
     CComPtr<IAppHostChildElementCollection> pChildCollection;
-    ENUM_INDEX index;
+    ENUM_INDEX index{};
 
     //
     // Enum the <location> tags, remove the specified elements.
@@ -1125,10 +1123,10 @@ ClearLocationElements(
     IN      CONST WCHAR *               szElementName
     )
 {
-    HRESULT hr;
+    HRESULT hr = S_OK;
     CComPtr<IAppHostElement> pElement;
-    ENUM_INDEX index;
-    BOOL matched;
+    ENUM_INDEX index{};
+    BOOL matched = false;
 
     for (hr = FindFirstLocationElement(pLocation, &index, &pElement) ;
          SUCCEEDED(hr) ;
@@ -1168,7 +1166,7 @@ CompareElementName(
     OUT     BOOL *                      pMatched
     )
 {
-    BSTR bstrElementName = NULL;
+    BSTR bstrElementName = nullptr;
 
     *pMatched = FALSE;  // until proven otherwise
 
@@ -1199,10 +1197,10 @@ ClearChildElementsByName(
     OUT     BOOL *                              pFound
     )
 {
-    HRESULT hr;
+    HRESULT hr = S_OK;
     CComPtr<IAppHostElement> pElement;
-    ENUM_INDEX index;
-    BOOL matched;
+    ENUM_INDEX index{};
+    BOOL matched = false;
 
     *pFound = FALSE;
 
@@ -1253,14 +1251,14 @@ GetSitesCollection(
     OUT     IAppHostElementCollection **        pSitesCollection
     )
 {
-    HRESULT hr;
+    HRESULT hr = S_OK;
     CComPtr<IAppHostElement> pSitesElement;
 
     BSTR bstrConfigPath = SysAllocString(szConfigPath);
     BSTR bstrSitesSectionName = SysAllocString(L"system.applicationHost/sites");
-    *pSitesCollection = NULL;
+    *pSitesCollection = nullptr;
 
-    if (bstrConfigPath == NULL || bstrSitesSectionName == NULL)
+    if (bstrConfigPath == nullptr || bstrSitesSectionName == nullptr)
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -1304,14 +1302,14 @@ GetLocationCollection(
     OUT     IAppHostConfigLocationCollection ** pLocationCollection
     )
 {
-    HRESULT hr;
+    HRESULT hr = S_OK;
     CComPtr<IAppHostConfigManager>      pConfigMgr;
     CComPtr<IAppHostConfigFile>         pConfigFile;
 
     BSTR bstrConfigPath = SysAllocString(szConfigPath);
-    *pLocationCollection = NULL;
+    *pLocationCollection = nullptr;
 
-    if (bstrConfigPath == NULL)
+    if (bstrConfigPath == nullptr)
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -1378,7 +1376,7 @@ FindNextElement(
     OUT     IAppHostElement **                  pElement
     )
 {
-    *pElement = NULL;
+    *pElement = nullptr;
 
     if (pIndex->Index.ulVal >= pIndex->Count)
     {
@@ -1424,7 +1422,7 @@ FindNextChildElement(
     OUT     IAppHostElement **                  pElement
     )
 {
-    *pElement = NULL;
+    *pElement = nullptr;
 
     if (pIndex->Index.ulVal >= pIndex->Count)
     {
@@ -1470,7 +1468,7 @@ FindNextLocation(
     OUT     IAppHostConfigLocation **           pLocation
     )
 {
-    *pLocation = NULL;
+    *pLocation = nullptr;
 
     if (pIndex->Index.ulVal >= pIndex->Count)
     {
@@ -1516,7 +1514,7 @@ FindNextLocationElement(
     OUT     IAppHostElement **                  pElement
     )
 {
-    *pElement = NULL;
+    *pElement = nullptr;
 
     if (pIndex->Index.ulVal >= pIndex->Count)
     {
@@ -1552,16 +1550,16 @@ Return Value:
 --*/
 {
     HRESULT                 hr = S_OK;
-    IAppHostAdminManager    *pAdminManager = NULL;
+    IAppHostAdminManager    *pAdminManager = nullptr;
 
-    BSTR                    bstrConfigPath = NULL;
+    BSTR                    bstrConfigPath = nullptr;
 
-    IAppHostElement *       pConfigRedirSection = NULL;
+    IAppHostElement *       pConfigRedirSection = nullptr;
 
 
     BSTR bstrSectionName = SysAllocString(L"configurationRedirection");
 
-    if ( bstrSectionName == NULL )
+    if ( bstrSectionName == nullptr )
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -1569,7 +1567,7 @@ Return Value:
     }
 
     bstrConfigPath = SysAllocString( L"MACHINE/REDIRECTION" );
-    if ( bstrConfigPath == NULL )
+    if ( bstrConfigPath == nullptr )
     {
         hr = E_OUTOFMEMORY;
         DBGERROR_HR(hr);
@@ -1577,7 +1575,7 @@ Return Value:
     }
 
     hr = CoCreateInstance( CLSID_AppHostAdminManager,
-                           NULL,
+                           nullptr,
                            CLSCTX_INPROC_SERVER,
                            IID_IAppHostAdminManager,
                            (VOID **)&pAdminManager );
@@ -1607,7 +1605,7 @@ Return Value:
     }
 
     pConfigRedirSection->Release();
-    pConfigRedirSection = NULL;
+    pConfigRedirSection = nullptr;
 
 
 exit:
@@ -1616,22 +1614,22 @@ Return Value:
     // dump config exception to setup log file (if available)
     //
 
-    if ( pConfigRedirSection != NULL )
+    if ( pConfigRedirSection != nullptr )
     {
         pConfigRedirSection->Release();
     }
 
-    if ( pAdminManager != NULL )
+    if ( pAdminManager != nullptr )
     {
         pAdminManager->Release();
     }
 
-    if ( bstrConfigPath != NULL )
+    if ( bstrConfigPath != nullptr )
     {
         SysFreeString( bstrConfigPath );
     }
 
-    if ( bstrSectionName != NULL )
+    if ( bstrSectionName != nullptr )
     {
         SysFreeString( bstrSectionName );
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp
index 0122dcb33ec5..8c2d5bda4eb1 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp
@@ -40,22 +40,28 @@ Return Values:
         '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
     };
 
-    DWORD   ib;
-    DWORD   ich;
-    DWORD   cchEncoded;
-    BYTE    b0, b1, b2;
+    DWORD   ib{0};
+    DWORD   ich{0};
+    DWORD   cchEncoded{0};
+    BYTE    b0{0}, b1{0}, b2{0};
     BYTE *  pbDecodedBuffer = static_cast<BYTE*>(pDecodedBuffer);
 
     // Calculate encoded string size.
     cchEncoded = 1 + (cbDecodedBufferSize + 2) / 3 * 4;
 
-    if (NULL != pcchEncoded) {
+    if (nullptr != pcchEncoded) {
         *pcchEncoded = cchEncoded;
     }
 
-    if (cchEncodedStringSize == 0 && pszEncodedString == NULL) {
+    if (cchEncodedStringSize == 0 && pszEncodedString == nullptr) {
         return ERROR_SUCCESS;
     }
+    else if (pszEncodedString == nullptr)
+    {
+        return ERROR_INVALID_PARAMETER;
+    }
+
+    *pszEncodedString = 0;
 
     if (cchEncodedStringSize < cchEncoded) {
         // Given buffer is too small to hold encoded string.
@@ -66,8 +72,16 @@ Return Values:
     ib = ich = 0;
     while (ib < cbDecodedBufferSize) {
         b0 = pbDecodedBuffer[ib++];
-        b1 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0;
-        b2 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0;
+        b1 = 0;
+        b2 = 0;
+        if (ib < cbDecodedBufferSize)
+        {
+            b1 = pbDecodedBuffer[ib++];
+        }
+        if (ib < cbDecodedBufferSize)
+        {
+            b2 = pbDecodedBuffer[ib++];
+        }
 
         //
         // The checks below for buffer overflow seems redundant to me.
@@ -126,122 +140,6 @@ Return Values:
 }
 
 
-DWORD
-Base64Decode(
-    __in    PCWSTR      pszEncodedString,
-    __out_opt VOID *      pDecodeBuffer,
-    __in    DWORD       cbDecodeBufferSize,
-    __out_opt DWORD *   pcbDecoded
-    )
-/*++
-
-Routine Description:
-
-    Decode a base64-encoded string.
-
-Arguments:
-
-    pszEncodedString (IN) - base64-encoded string to decode.
-    cbDecodeBufferSize (IN) - size in bytes of the decode buffer.
-    pbDecodeBuffer (OUT) - holds the decoded data.
-    pcbDecoded (OUT) - number of data bytes in the decoded data (if success or
-        STATUS_BUFFER_TOO_SMALL).
-
-Return Values:
-
-    0 - success.
-    E_OUTOFMEMORY
-    E_INVALIDARG
-
---*/
-{
-constexpr auto NA = (255);
-#define DECODE(x) (((ULONG)(x) < sizeof(rgbDecodeTable)) ? rgbDecodeTable[x] : NA)
-
-    static BYTE rgbDecodeTable[128] = {
-       NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA,  // 0-15
-       NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA,  // 16-31
-       NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 62, NA, NA, NA, 63,  // 32-47
-       52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NA, NA, NA,  0, NA, NA,  // 48-63
-       NA,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  // 64-79
-       15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, NA, NA, NA, NA, NA,  // 80-95
-       NA, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,  // 96-111
-       41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NA, NA, NA, NA, NA,  // 112-127
-    };
-
-    DWORD   cbDecoded;
-    DWORD   cchEncodedSize;
-    DWORD   ich;
-    DWORD   ib;
-    BYTE    b0, b1, b2, b3;
-    BYTE *  pbDecodeBuffer = (BYTE *) pDecodeBuffer;
-
-    cchEncodedSize = (DWORD)wcslen(pszEncodedString);
-    if (NULL != pcbDecoded) {
-        *pcbDecoded = 0;
-    }
-
-    if ((0 == cchEncodedSize) || (0 != (cchEncodedSize % 4))) {
-        // Input string is not sized correctly to be base64.
-        return ERROR_INVALID_PARAMETER;
-    }
-
-    // Calculate decoded buffer size.
-    cbDecoded = (cchEncodedSize + 3) / 4 * 3;
-    if (pszEncodedString[cchEncodedSize-1] == '=') {
-        if (pszEncodedString[cchEncodedSize-2] == '=') {
-            // Only one data byte is encoded in the last cluster.
-            cbDecoded -= 2;
-        }
-        else {
-            // Only two data bytes are encoded in the last cluster.
-            cbDecoded -= 1;
-        }
-    }
-
-    if (NULL != pcbDecoded) {
-        *pcbDecoded = cbDecoded;
-    }
-
-    if (cbDecodeBufferSize == 0 && pDecodeBuffer == NULL) {
-        return ERROR_SUCCESS;
-    }
-
-    if (cbDecoded > cbDecodeBufferSize) {
-        // Supplied buffer is too small.
-        return ERROR_INSUFFICIENT_BUFFER;
-    }
-
-    // Decode each four-byte cluster into the corresponding three data bytes.
-    ich = ib = 0;
-    while (ich < cchEncodedSize) {
-        b0 = DECODE(pszEncodedString[ich]); ich++;
-        b1 = DECODE(pszEncodedString[ich]); ich++;
-        b2 = DECODE(pszEncodedString[ich]); ich++;
-        b3 = DECODE(pszEncodedString[ich]); ich++;
-
-        if ((NA == b0) || (NA == b1) || (NA == b2) || (NA == b3)) {
-            // Contents of input string are not base64.
-            return ERROR_INVALID_PARAMETER;
-        }
-
-        pbDecodeBuffer[ib++] = (b0 << 2) | (b1 >> 4);
-
-        if (ib < cbDecoded) {
-            pbDecodeBuffer[ib++] = (b1 << 4) | (b2 >> 2);
-
-            if (ib < cbDecoded) {
-                pbDecodeBuffer[ib++] = (b2 << 6) | b3;
-            }
-        }
-    }
-
-    DBG_ASSERT(ib == cbDecoded);
-
-    return ERROR_SUCCESS;
-}
-
-
 DWORD
 Base64Encode(
     __in_bcount(cbDecodedBufferSize)    VOID *  pDecodedBuffer,
@@ -279,22 +177,28 @@ Return Values:
         '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
     };
 
-    DWORD   ib;
-    DWORD   ich;
-    DWORD   cchEncoded;
-    BYTE    b0, b1, b2;
+    DWORD   ib{0};
+    DWORD   ich{0};
+    DWORD   cchEncoded{0};
+    BYTE    b0{0}, b1{0}, b2{0};
     BYTE *  pbDecodedBuffer = (BYTE *) pDecodedBuffer;
 
     // Calculate encoded string size.
     cchEncoded = 1 + (cbDecodedBufferSize + 2) / 3 * 4;
 
-    if (NULL != pcchEncoded) {
+    if (nullptr != pcchEncoded) {
         *pcchEncoded = cchEncoded;
     }
 
-    if (cchEncodedStringSize == 0 && pszEncodedString == NULL) {
+    if (cchEncodedStringSize == 0 && pszEncodedString == nullptr) {
         return ERROR_SUCCESS;
     }
+    else if (pszEncodedString == nullptr)
+    {
+        return ERROR_INVALID_PARAMETER;
+    }
+
+    *pszEncodedString = 0;
 
     if (cchEncodedStringSize < cchEncoded) {
         // Given buffer is too small to hold encoded string.
@@ -305,8 +209,16 @@ Return Values:
     ib = ich = 0;
     while (ib < cbDecodedBufferSize) {
         b0 = pbDecodedBuffer[ib++];
-        b1 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0;
-        b2 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0;
+        b1 = 0;
+        b2 = 0;
+        if (ib < cbDecodedBufferSize)
+        {
+            b1 = pbDecodedBuffer[ib++];
+        }
+        if (ib < cbDecodedBufferSize)
+        {
+            b2 = pbDecodedBuffer[ib++];
+        }
 
         //
         // The checks below for buffer overflow seems redundant to me.
@@ -363,120 +275,3 @@ Return Values:
 
     return ERROR_SUCCESS;
 }
-
-
-DWORD
-Base64Decode(
-    __in    PCSTR       pszEncodedString,
-    __out_opt   VOID *      pDecodeBuffer,
-    __in    DWORD       cbDecodeBufferSize,
-    __out_opt DWORD *   pcbDecoded
-    )
-/*++
-
-Routine Description:
-
-    Decode a base64-encoded string.
-
-Arguments:
-
-    pszEncodedString (IN) - base64-encoded string to decode.
-    cbDecodeBufferSize (IN) - size in bytes of the decode buffer.
-    pbDecodeBuffer (OUT) - holds the decoded data.
-    pcbDecoded (OUT) - number of data bytes in the decoded data (if success or
-        STATUS_BUFFER_TOO_SMALL).
-
-Return Values:
-
-    0 - success.
-    E_OUTOFMEMORY
-    E_INVALIDARG
-
---*/
-{
-#define NA (255)
-#define DECODE(x) (((ULONG)(x) < sizeof(rgbDecodeTable)) ? rgbDecodeTable[x] : NA)
-
-    static BYTE rgbDecodeTable[128] = {
-       NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA,  // 0-15
-       NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA,  // 16-31
-       NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 62, NA, NA, NA, 63,  // 32-47
-       52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NA, NA, NA,  0, NA, NA,  // 48-63
-       NA,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  // 64-79
-       15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, NA, NA, NA, NA, NA,  // 80-95
-       NA, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,  // 96-111
-       41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NA, NA, NA, NA, NA,  // 112-127
-    };
-
-    DWORD   cbDecoded;
-    DWORD   cchEncodedSize;
-    DWORD   ich;
-    DWORD   ib;
-    BYTE    b0, b1, b2, b3;
-    BYTE *  pbDecodeBuffer = (BYTE *) pDecodeBuffer;
-
-    cchEncodedSize = (DWORD)strlen(pszEncodedString);
-    if (NULL != pcbDecoded) {
-        *pcbDecoded = 0;
-    }
-
-    if ((0 == cchEncodedSize) || (0 != (cchEncodedSize % 4))) {
-        // Input string is not sized correctly to be base64.
-        return ERROR_INVALID_PARAMETER;
-    }
-
-    // Calculate decoded buffer size.
-    cbDecoded = (cchEncodedSize + 3) / 4 * 3;
-    if (pszEncodedString[cchEncodedSize-1] == '=') {
-        if (pszEncodedString[cchEncodedSize-2] == '=') {
-            // Only one data byte is encoded in the last cluster.
-            cbDecoded -= 2;
-        }
-        else {
-            // Only two data bytes are encoded in the last cluster.
-            cbDecoded -= 1;
-        }
-    }
-
-    if (NULL != pcbDecoded) {
-        *pcbDecoded = cbDecoded;
-    }
-
-    if (cbDecodeBufferSize == 0 && pDecodeBuffer == NULL) {
-        return ERROR_SUCCESS;
-    }
-
-    if (cbDecoded > cbDecodeBufferSize) {
-        // Supplied buffer is too small.
-        return ERROR_INSUFFICIENT_BUFFER;
-    }
-
-    // Decode each four-byte cluster into the corresponding three data bytes.
-    ich = ib = 0;
-    while (ich < cchEncodedSize) {
-        b0 = DECODE(pszEncodedString[ich]); ich++;
-        b1 = DECODE(pszEncodedString[ich]); ich++;
-        b2 = DECODE(pszEncodedString[ich]); ich++;
-        b3 = DECODE(pszEncodedString[ich]); ich++;
-
-        if ((NA == b0) || (NA == b1) || (NA == b2) || (NA == b3)) {
-            // Contents of input string are not base64.
-            return ERROR_INVALID_PARAMETER;
-        }
-
-        pbDecodeBuffer[ib++] = (b0 << 2) | (b1 >> 4);
-
-        if (ib < cbDecoded) {
-            pbDecodeBuffer[ib++] = (b1 << 4) | (b2 >> 2);
-
-            if (ib < cbDecoded) {
-                pbDecodeBuffer[ib++] = (b2 << 6) | b3;
-            }
-        }
-    }
-
-    DBG_ASSERT(ib == cbDecoded);
-
-    return ERROR_SUCCESS;
-}
-
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h
index 885abdc6e3b2..265116d1cf52 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h
@@ -15,14 +15,6 @@ Base64Encode(
     __out_opt DWORD *                           pcchEncoded
     );
 
-DWORD
-Base64Decode(
-    __in    PCWSTR                              pszEncodedString,
-    __out_opt   VOID *                              pDecodeBuffer,
-    __in    DWORD                               cbDecodeBufferSize,
-    __out_opt DWORD *                           pcbDecoded
-    );
-
 DWORD
 Base64Encode(
     __in_bcount( cbDecodedBufferSize ) VOID *   pDecodedBuffer,
@@ -32,13 +24,5 @@ Base64Encode(
     __out_opt DWORD *                           pcchEncoded
     );
 
-DWORD
-Base64Decode(
-    __in    PCSTR                               pszEncodedString,
-    __out_opt   VOID *                              pDecodeBuffer,
-    __in    DWORD                               cbDecodeBufferSize,
-    __out_opt DWORD *                           pcbDecoded
-    );
-
 #endif // _BASE64_HXX_
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h
index 385b73d717e3..85e44e8137e6 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h
@@ -6,9 +6,6 @@
 #include <crtdbg.h>
 #include <CodeAnalysis/Warnings.h>
 
-#pragma warning( push )
-#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS )
-
 //
 // BUFFER_T class shouldn't be used directly. Use BUFFER specialization class instead.
 // The only BUFFER_T partners are STRU and STRA classes.
@@ -69,7 +66,7 @@ class BUFFER_T
 
     --*/
     {
-        _ASSERTE( NULL != pbInit );
+        _ASSERTE(nullptr != pbInit );
         _ASSERTE( cbInit > 0 );
     }
 
@@ -77,9 +74,9 @@ class BUFFER_T
     {
         if( IsHeapAllocated() )
         {
-            _ASSERTE( NULL != m_pBuffer );
+            _ASSERTE( nullptr != m_pBuffer );
             HeapFree( GetProcessHeap(), 0, m_pBuffer );
-            m_pBuffer = NULL;
+            m_pBuffer = nullptr;
             m_cbBuffer = 0;
             m_fHeapAllocated = false;
         }
@@ -131,7 +128,7 @@ class BUFFER_T
 
     --*/
     {
-        PVOID pNewMem;
+        PVOID pNewMem = nullptr;
 
         if ( cbNewSize <= m_cbBuffer )
         {
@@ -155,7 +152,7 @@ class BUFFER_T
             pNewMem = HeapAlloc( GetProcessHeap(), dwHeapAllocFlags, cbNewSize );
         }
 
-        if( pNewMem == NULL )
+        if( pNewMem == nullptr )
         {
             SetLastError( ERROR_NOT_ENOUGH_MEMORY );
             return false;
@@ -259,7 +256,7 @@ C_ASSERT( sizeof(VOID*) <= sizeof(ULONGLONG) );
 //  bytes. If the buffer overflows then a heap buffer will be allocated.
 //
 #define STACK_BUFFER( _name, _size )    \
-    ULONGLONG   __aqw##_name[ ( ( (_size) + sizeof(ULONGLONG) - 1 ) / sizeof(ULONGLONG) ) ]; \
+    ULONGLONG   __aqw##_name[ ( ( (_size) + sizeof(ULONGLONG) - 1 ) / sizeof(ULONGLONG) ) ]{}; \
     BUFFER      _name( (BYTE*)__aqw##_name, sizeof(__aqw##_name) )
 
 //
@@ -272,5 +269,3 @@ C_ASSERT( sizeof(VOID*) <= sizeof(ULONGLONG) );
 
 #define INLINE_BUFFER_INIT( _name )     \
     _name( (BYTE*)__aqw##_name, sizeof( __aqw##_name ) )
-
-#pragma warning( pop )
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashfn.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashfn.h
index a7bfeda2cfad..881fd8eb4abf 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashfn.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashfn.h
@@ -12,7 +12,7 @@
 // the low end of the hashtable otherwise.  LKRhash applies this internally
 // to all hash signatures for exactly this reason.
 
-inline DWORD
+inline constexpr DWORD
 HashScramble(DWORD dwHash)
 {
     // Here are 10 primes slightly greater than 10^9
@@ -20,9 +20,9 @@ HashScramble(DWORD dwHash)
     //  1000000093, 1000000097, 1000000103, 1000000123, 1000000181.
 
     // default value for "scrambling constant"
-    const DWORD RANDOM_CONSTANT = 314159269UL;
+    constexpr DWORD RANDOM_CONSTANT = 314159269UL;
     // large prime number, also used for scrambling
-    const DWORD RANDOM_PRIME =   1000000007UL;
+    constexpr DWORD RANDOM_PRIME =   1000000007UL;
 
     return (RANDOM_CONSTANT * dwHash) % RANDOM_PRIME ;
 }
@@ -30,7 +30,7 @@ HashScramble(DWORD dwHash)
 
 // Faster scrambling function suggested by Eric Jacobsen
 
-inline DWORD
+inline DWORD constexpr
 HashRandomizeBits(DWORD dw)
 {
 	return (((dw * 1103515245 + 12345) >> 16)
@@ -39,7 +39,7 @@ HashRandomizeBits(DWORD dw)
 
 
 // Small prime number used as a multiplier in the supplied hash functions
-const DWORD HASH_MULTIPLIER = 101;
+constexpr DWORD HASH_MULTIPLIER = 101;
 
 #undef HASH_SHIFT_MULTIPLY
 
@@ -273,51 +273,51 @@ Hash(
 }
 
 // Identity hash functions: scalar values map to themselves
-inline DWORD Hash(char c)
+inline constexpr DWORD Hash(char c)
 { return c; }
 
-inline DWORD Hash(unsigned char uc)
+inline constexpr DWORD Hash(unsigned char uc)
 { return uc; }
 
-inline DWORD Hash(signed char sc)
+inline constexpr DWORD Hash(signed char sc)
 { return sc; }
 
-inline DWORD Hash(short sh)
+inline constexpr DWORD Hash(short sh)
 { return sh; }
 
-inline DWORD Hash(unsigned short ush)
+inline constexpr DWORD Hash(unsigned short ush)
 { return ush; }
 
-inline DWORD Hash(int i)
+inline constexpr DWORD Hash(int i)
 { return i; }
 
-inline DWORD Hash(unsigned int u)
+inline constexpr DWORD Hash(unsigned int u)
 { return u; }
 
-inline DWORD Hash(long l)
+inline constexpr DWORD Hash(long l)
 { return l; }
 
-inline DWORD Hash(unsigned long ul)
+inline constexpr DWORD Hash(unsigned long ul)
 { return ul; }
 
-inline DWORD Hash(float f)
+inline constexpr DWORD Hash(float f)
 {
     // be careful of rounding errors when computing keys
     union {
         float f;
         DWORD dw;
-    } u;
+    } u{};
     u.f = f;
     return u.dw;
 }
 
-inline DWORD Hash(double dbl)
+inline constexpr DWORD Hash(double dbl)
 {
     // be careful of rounding errors when computing keys
     union {
         double dbl;
         DWORD  dw[2];
-    } u;
+    } u{};
     u.dbl = dbl;
     return u.dw[0] * HASH_MULTIPLIER + u.dw[1];
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h
index cde38374fe67..23443a362cfd 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h
@@ -16,14 +16,14 @@ class HASH_NODE
     HASH_NODE(
         _Record *       pRecord,
         DWORD           dwHash
-    ) : _pNext (NULL),
+    ) : _pNext (nullptr),
         _pRecord (pRecord),
         _dwHash (dwHash)
     {}
 
     ~HASH_NODE()
     {
-        _ASSERTE(_pRecord == NULL);
+        _ASSERTE(_pRecord == nullptr);
     }
 
  private:
@@ -57,7 +57,7 @@ class HASH_TABLE
     HASH_TABLE(
         VOID
     )
-      : _ppBuckets( NULL ),
+      : _ppBuckets(nullptr),
         _nBuckets( 0 ),
         _nItems( 0 )
     {
@@ -158,7 +158,7 @@ class HASH_TABLE
         __deref_out
         HASH_NODE<_Record> **   ppNode,
         __deref_opt_out
-        HASH_NODE<_Record> ***  pppPreviousNodeNextPointer = NULL
+        HASH_NODE<_Record> ***  pppPreviousNodeNextPointer = nullptr
     );
 
     VOID
@@ -166,10 +166,10 @@ class HASH_TABLE
         HASH_NODE<_Record> *    pNode
     )
     {
-        if (pNode->_pRecord != NULL)
+        if (pNode->_pRecord != nullptr)
         {
             DereferenceRecord(pNode->_pRecord);
-            pNode->_pRecord = NULL;
+            pNode->_pRecord = nullptr;
         }
 
         delete pNode;
@@ -210,8 +210,8 @@ HASH_TABLE<_Record,_Key>::Initialize(
         goto Failed;
     }
 
-    _ASSERTE(_ppBuckets == NULL );
-    if ( _ppBuckets != NULL )
+    _ASSERTE(_ppBuckets == nullptr);
+    if (_ppBuckets != nullptr)
     {
         hr = E_INVALIDARG;
         goto Failed;
@@ -227,7 +227,7 @@ HASH_TABLE<_Record,_Key>::Initialize(
                             GetProcessHeap(),
                             HEAP_ZERO_MEMORY,
                             nBuckets*sizeof(HASH_NODE<_Record> *));
-    if (_ppBuckets == NULL)
+    if (_ppBuckets == nullptr)
     {
         hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
         goto Failed;
@@ -243,7 +243,7 @@ HASH_TABLE<_Record,_Key>::Initialize(
         HeapFree(GetProcessHeap(),
                  0,
                  _ppBuckets);
-        _ppBuckets = NULL;
+        _ppBuckets = nullptr;
     }
 
     return hr;
@@ -253,7 +253,7 @@ HASH_TABLE<_Record,_Key>::Initialize(
 template <class _Record, class _Key>
 HASH_TABLE<_Record,_Key>::~HASH_TABLE()
 {
-    if (_ppBuckets == NULL)
+    if (_ppBuckets == nullptr)
     {
         return;
     }
@@ -263,7 +263,7 @@ HASH_TABLE<_Record,_Key>::~HASH_TABLE()
     HeapFree(GetProcessHeap(),
              0,
              _ppBuckets);
-    _ppBuckets = NULL;
+    _ppBuckets = nullptr;
     _nBuckets = 0;
 }
 
@@ -288,8 +288,8 @@ template <class _Record, class _Key>
 VOID
 HASH_TABLE<_Record,_Key>::Clear()
 {
-    HASH_NODE<_Record> *pCurrent;
-    HASH_NODE<_Record> *pNext;
+    HASH_NODE<_Record> *pCurrent = nullptr;
+    HASH_NODE<_Record> *pNext = nullptr;
 
     // This is here in the off cases where someone instantiates a hashtable
     // and then does an automatic "clear" before its destruction WITHOUT
@@ -304,8 +304,8 @@ HASH_TABLE<_Record,_Key>::Clear()
     for (DWORD i=0; i<_nBuckets; i++)
     {
         pCurrent = _ppBuckets[i];
-        _ppBuckets[i] = NULL;
-        while (pCurrent != NULL)
+        _ppBuckets[i] = nullptr;
+        while (pCurrent != nullptr)
         {
             pNext = pCurrent->_pNext;
             DeleteNode(pCurrent);
@@ -318,7 +318,7 @@ HASH_TABLE<_Record,_Key>::Clear()
 }
 
 template <class _Record, class _Key>
-__success(*ppNode != NULL && return != FALSE)
+__success(*ppNode != nullptr && return != FALSE)
 BOOL
 HASH_TABLE<_Record,_Key>::FindNodeInternal(
     _Key                    key,
@@ -338,13 +338,13 @@ HASH_TABLE<_Record,_Key>::FindNodeInternal(
   This routine may be called under either read or write lock
 --*/
 {
-    HASH_NODE<_Record> **ppPreviousNodeNextPointer;
-    HASH_NODE<_Record> *pNode;
+    HASH_NODE<_Record> **ppPreviousNodeNextPointer = nullptr;
+    HASH_NODE<_Record> *pNode = nullptr;
     BOOL fFound = FALSE;
 
     ppPreviousNodeNextPointer = _ppBuckets + (dwHash % _nBuckets);
     pNode = *ppPreviousNodeNextPointer;
-    while (pNode != NULL)
+    while (pNode != nullptr)
     {
         if (pNode->_dwHash == dwHash)
         {
@@ -364,10 +364,10 @@ HASH_TABLE<_Record,_Key>::FindNodeInternal(
         pNode = *ppPreviousNodeNextPointer;
     }
 
-    __analysis_assume( (pNode == NULL && fFound == FALSE) ||
-                       (pNode != NULL && fFound == TRUE ) );
+    __analysis_assume( (pNode == nullptr && fFound == FALSE) ||
+                       (pNode != nullptr && fFound == TRUE ) );
     *ppNode = pNode;
-    if (pppPreviousNodeNextPointer != NULL)
+    if (pppPreviousNodeNextPointer != nullptr)
     {
         *pppPreviousNodeNextPointer = ppPreviousNodeNextPointer;
     }
@@ -381,16 +381,19 @@ HASH_TABLE<_Record,_Key>::FindKey(
     _Record **          ppRecord
 )
 {
-    HASH_NODE<_Record> *pNode;
+    HASH_NODE<_Record> *pNode = nullptr;
 
-    *ppRecord = NULL;
+    *ppRecord = nullptr;
 
     DWORD dwHash = CalcKeyHash(key);
 
     _tableLock.SharedAcquire();
 
+    // Dereferencing NULL pointer 'pNode'
+    // FindNodeInternal will set a non-null pNode when true is returned, just need to figure out how to correctly SAL the method
+#pragma warning(suppress: 6011)
     if (FindNodeInternal(key, dwHash, &pNode) &&
-        pNode->_pRecord != NULL)
+        pNode->_pRecord != nullptr)
     {
         ReferenceRecord(pNode->_pRecord);
         *ppRecord = pNode->_pRecord;
@@ -421,9 +424,9 @@ HASH_TABLE<_Record,_Key>::InsertRecord(
     _Key key = ExtractKey(pRecord);
     DWORD dwHash = CalcKeyHash(key);
     HRESULT hr = S_OK;
-    HASH_NODE<_Record> *    pNewNode;
-    HASH_NODE<_Record> *    pNextNode;
-    HASH_NODE<_Record> **   ppPreviousNodeNextPointer;
+    HASH_NODE<_Record> *    pNewNode = nullptr;
+    HASH_NODE<_Record> *    pNextNode = nullptr;
+    HASH_NODE<_Record> **   ppPreviousNodeNextPointer = nullptr;
 
     //
     // Ownership of pRecord is not transferred to pNewNode yet, so remember
@@ -432,7 +435,7 @@ HASH_TABLE<_Record,_Key>::InsertRecord(
     // which users may view as getting flushed out of the hash-table
     //
     pNewNode = new HASH_NODE<_Record>(pRecord, dwHash);
-    if (pNewNode == NULL)
+    if (pNewNode == nullptr)
     {
         hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
         goto Finished;
@@ -451,7 +454,7 @@ HASH_TABLE<_Record,_Key>::InsertRecord(
             //
             // If node already there, return error
             //
-            pNewNode->_pRecord = NULL;
+            pNewNode->_pRecord = nullptr;
             DeleteNode(pNewNode);
 
             //
@@ -470,10 +473,10 @@ HASH_TABLE<_Record,_Key>::InsertRecord(
                                                pNewNode,
                                                pNextNode) != pNextNode);
     // pass ownership of pRecord now
-    if (pRecord != NULL)
+    if (pRecord != nullptr)
     {
         ReferenceRecord(pRecord);
-        pRecord = NULL;
+        pRecord = nullptr;
     }
     InterlockedIncrement((LONG *)&_nItems);
 
@@ -498,8 +501,8 @@ HASH_TABLE<_Record,_Key>::DeleteKey(
     _Key        key
 )
 {
-    HASH_NODE<_Record> *pNode;
-    HASH_NODE<_Record> **ppPreviousNodeNextPointer;
+    HASH_NODE<_Record> *pNode = nullptr;
+    HASH_NODE<_Record> **ppPreviousNodeNextPointer = nullptr;
 
     DWORD dwHash = CalcKeyHash(key);
 
@@ -507,6 +510,9 @@ HASH_TABLE<_Record,_Key>::DeleteKey(
 
     if (FindNodeInternal(key, dwHash, &pNode, &ppPreviousNodeNextPointer))
     {
+        // Dereferencing NULL pointer 'pNode'
+        // FindNodeInternal will set a non-null pNode when true is returned, just need to figure out how to correctly SAL the method
+#pragma warning(suppress: 6011)
         *ppPreviousNodeNextPointer = pNode->_pNext;
         DeleteNode(pNode);
         _nItems--;
@@ -522,8 +528,8 @@ HASH_TABLE<_Record,_Key>::DeleteIf(
     PVOID                       pvContext
 )
 {
-    HASH_NODE<_Record> *pNode;
-    HASH_NODE<_Record> **ppPreviousNodeNextPointer;
+    HASH_NODE<_Record> *pNode = nullptr;
+    HASH_NODE<_Record> **ppPreviousNodeNextPointer = nullptr;
 
     _tableLock.ExclusiveAcquire();
 
@@ -531,7 +537,7 @@ HASH_TABLE<_Record,_Key>::DeleteIf(
     {
         ppPreviousNodeNextPointer = _ppBuckets + i;
         pNode = *ppPreviousNodeNextPointer;
-        while (pNode != NULL)
+        while (pNode != nullptr)
         {
             //
             // Non empty nodes deleted based on DeleteIf, empty nodes deleted
@@ -562,16 +568,16 @@ HASH_TABLE<_Record,_Key>::Apply(
     PVOID                       pvContext
 )
 {
-    HASH_NODE<_Record> *pNode;
+    HASH_NODE<_Record> *pNode = nullptr;
 
     _tableLock.SharedAcquire();
 
     for (DWORD i=0; i<_nBuckets; i++)
     {
         pNode = _ppBuckets[i];
-        while (pNode != NULL)
+        while (pNode != nullptr)
         {
-            if (pNode->_pRecord != NULL)
+            if (pNode->_pRecord != nullptr)
             {
                 pfnApply(pNode->_pRecord, pvContext);
             }
@@ -589,13 +595,13 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded(
     VOID
 )
 {
-    HASH_NODE<_Record> **ppBuckets;
-    DWORD nBuckets;
-    HASH_NODE<_Record> *pNode;
-    HASH_NODE<_Record> *pNextNode;
-    HASH_NODE<_Record> **ppNextPointer;
-    HASH_NODE<_Record> *pNewNextNode;
-    DWORD               nNewBuckets;
+    HASH_NODE<_Record> **ppBuckets = nullptr;
+    DWORD nBuckets = 0;
+    HASH_NODE<_Record> *pNode = nullptr;
+    HASH_NODE<_Record> *pNextNode = nullptr;
+    HASH_NODE<_Record> **ppNextPointer = nullptr;
+    HASH_NODE<_Record> *pNewNextNode = nullptr;
+    DWORD               nNewBuckets = 0;
 
     //
     // If number of items has become too many, we will double the hash table
@@ -624,7 +630,7 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded(
                         GetProcessHeap(),
                         HEAP_ZERO_MEMORY,
                         nBuckets*sizeof(HASH_NODE<_Record> *));
-    if (ppBuckets == NULL)
+    if (ppBuckets == nullptr)
     {
         goto Finished;
     }
@@ -636,13 +642,13 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded(
     for (DWORD i=0; i<_nBuckets; i++)
     {
         pNode = _ppBuckets[i];
-        while (pNode != NULL)
+        while (pNode != nullptr)
         {
             pNextNode = pNode->_pNext;
 
             ppNextPointer = ppBuckets + (pNode->_dwHash % nBuckets);
             pNewNextNode = *ppNextPointer;
-            while (pNewNextNode != NULL &&
+            while (pNewNextNode != nullptr &&
                    pNewNextNode->_dwHash <= pNode->_dwHash)
             {
                 ppNextPointer = &pNewNextNode->_pNext;
@@ -658,7 +664,7 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded(
     HeapFree(GetProcessHeap(), 0, _ppBuckets);
     _ppBuckets = ppBuckets;
     _nBuckets = nBuckets;
-    ppBuckets = NULL;
+    ppBuckets = nullptr;
 
 Finished:
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h
index 80b70e97a937..3ed86513d30a 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h
@@ -39,8 +39,8 @@ RemoveEntryList(
     IN PLIST_ENTRY Entry
     )
 {
-    PLIST_ENTRY Blink;
-    PLIST_ENTRY Flink;
+    PLIST_ENTRY Blink = nullptr;
+    PLIST_ENTRY Flink = nullptr;
 
     Flink = Entry->Flink;
     Blink = Entry->Blink;
@@ -55,8 +55,8 @@ RemoveHeadList(
     IN PLIST_ENTRY ListHead
     )
 {
-    PLIST_ENTRY Flink;
-    PLIST_ENTRY Entry;
+    PLIST_ENTRY Flink = nullptr;
+    PLIST_ENTRY Entry = nullptr;
 
     Entry = ListHead->Flink;
     Flink = Entry->Flink;
@@ -73,8 +73,8 @@ RemoveTailList(
     IN PLIST_ENTRY ListHead
     )
 {
-    PLIST_ENTRY Blink;
-    PLIST_ENTRY Entry;
+    PLIST_ENTRY Blink = nullptr;
+    PLIST_ENTRY Entry = nullptr;
 
     Entry = ListHead->Blink;
     Blink = Entry->Blink;
@@ -140,7 +140,7 @@ PopEntryList(
 {
     PSINGLE_LIST_ENTRY FirstEntry;
     FirstEntry = ListHead->Next;
-    if (FirstEntry != NULL) {
+    if (FirstEntry != nullptr) {
         ListHead->Next = FirstEntry->Next;
     }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp
index 1342e2ffd28e..f4273f2ae676 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp
@@ -7,12 +7,7 @@
 #include "precomp.h"
 #include "multisz.h"
 
-//
-//  Private Definitions
-//
-
 #define MAXULONG 4294967295
-#define ISWHITE( ch )       ((ch) == L' ' || (ch) == L'\t' || (ch) == L'\r')
 
 //
 //  When appending data, this is the extra amount we request to avoid
@@ -35,7 +30,7 @@ MULTISZ::CalcLength( const WCHAR * str,
         count++;
     }
 
-    if( pcStrings != NULL ) {
+    if( pcStrings != nullptr ) {
         *pcStrings = count;
     }
 
@@ -44,74 +39,6 @@ MULTISZ::CalcLength( const WCHAR * str,
 }   // MULTISZ::CalcLength
 
 
-BOOL
-MULTISZ::FindString( const WCHAR * str ) const
-{
-    //
-    // Sanity check.
-    //
-
-    DBG_ASSERT( QueryStr() != NULL );
-    DBG_ASSERT( str != NULL );
-    DBG_ASSERT( *str != '\0' );
-
-    //
-    // Scan it.
-    //
-
-    WCHAR* multisz = QueryStr();
-
-    while( *multisz != '\0' ) {
-
-        if( !::wcscmp( multisz, str ) ) {
-
-            return TRUE;
-
-        }
-
-        multisz += ::wcslen( multisz ) + 1;
-
-    }
-
-    return FALSE;
-
-}   // MULTISZ::FindString
-
-
-BOOL
-MULTISZ::FindStringNoCase( const WCHAR * str ) const
-{
-    //
-    // Sanity check.
-    //
-
-    DBG_ASSERT( QueryStr() != NULL );
-    DBG_ASSERT( str != NULL );
-    DBG_ASSERT( *str != '\0' );
-
-    //
-    // Scan it.
-    //
-
-    WCHAR* multisz = QueryStr();
-
-    while( *multisz != '\0' ) {
-
-        if( !_wcsicmp( multisz, str ) ) {
-
-            return TRUE;
-
-        }
-
-        multisz += wcslen( multisz ) + 1;
-
-    }
-
-    return FALSE;
-
-}   // MULTISZ::FindStringNoCase
-
-
 VOID
 MULTISZ::AuxInit( const WCHAR * pInit )
 {
@@ -149,7 +76,7 @@ MULTISZ::AuxInit( const WCHAR * pInit )
 
 BOOL MULTISZ::AuxAppend( const WCHAR * pStr, UINT cbStr, BOOL fAddSlop )
 {
-    DBG_ASSERT( pStr != NULL );
+    DBG_ASSERT( pStr != nullptr );
 
     UINT cbThis = QueryCB();
 
@@ -247,7 +174,7 @@ MULTISZ::CopyToBuffer( WCHAR * lpszBuffer, LPDWORD lpcch) const
 {
    BOOL fReturn = TRUE;
 
-    if ( lpcch == NULL) {
+    if ( lpcch == nullptr ) {
         SetLastError( ERROR_INVALID_PARAMETER);
         return ( FALSE);
     }
@@ -305,7 +232,7 @@ MULTISZ::CopyToBuffer( __out_ecount_opt(*lpcch) WCHAR * lpszBuffer, LPDWORD lpcc
 {
    BOOL fReturn = TRUE;
 
-    if ( lpcch == NULL) {
+    if ( lpcch == nullptr ) {
         SetLastError( ERROR_INVALID_PARAMETER);
         return ( FALSE);
     }
@@ -335,7 +262,7 @@ MULTISZ::Equals(
 // Compares this to pmszRhs, returns TRUE if equal
 //
 {
-    DBG_ASSERT( NULL != pmszRhs );
+    DBG_ASSERT( nullptr != pmszRhs );
 
     PCWSTR pszLhs = First( );
     PCWSTR pszRhs = pmszRhs->First( );
@@ -345,9 +272,9 @@ MULTISZ::Equals(
         return FALSE;
     }
 
-    while( NULL != pszLhs )
+    while( nullptr  != pszLhs )
     {
-        DBG_ASSERT( NULL != pszRhs );
+        DBG_ASSERT( nullptr != pszRhs );
 
         if( 0 != wcscmp( pszLhs, pszRhs ) )
         {
@@ -361,104 +288,4 @@ MULTISZ::Equals(
     return TRUE;
 }
 
-HRESULT
-SplitCommaDelimitedString(
-    PCWSTR                      pszList,
-    BOOL                        fTrimEntries,
-    BOOL                        fRemoveEmptyEntries,
-    MULTISZ *                   pmszList
-)
-/*++
-
-Routine Description:
-
-    Split comma delimited string into a multisz. Additional leading empty
-    entries after the first are discarded.
-
-Arguments:
-
-    pszList - List to split up
-    fTrimEntries - Whether each entry should be trimmed before added to multisz
-    fRemoveEmptyEntries - Whether empty entires should be discarded
-    pmszList - Filled with MULTISZ list
-
-Return Value:
-
-    HRESULT
-
---*/
-{
-    HRESULT                 hr = S_OK;
-
-    if ( pszList == NULL ||
-         pmszList == NULL )
-    {
-        DBG_ASSERT( FALSE );
-        hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
-        goto Finished;
-    }
-
-    pmszList->Reset();
-
-    /*
-        pszCurrent: start of the current entry which may be the comma that
-                    precedes the next entry if the entry is empty
-
-        pszNext: the comma that precedes the next entry. If
-                 pszCurrent == pszNext, then the entry is empty
-
-        pszEnd: just past the end of the current entry
-    */
-
-    for ( PCWSTR pszCurrent = pszList,
-                 pszNext = wcschr( pszCurrent, L',' )
-            ;
-            ;
-          pszCurrent = pszNext + 1,
-          pszNext = wcschr( pszCurrent, L',' ) )
-    {
-        PCWSTR pszEnd = NULL;
-
-        if ( pszNext != NULL )
-        {
-            pszEnd = pszNext;
-        }
-        else
-        {
-            pszEnd = pszCurrent + wcslen( pszCurrent );
-        }
-
-        if ( fTrimEntries )
-        {
-            while ( pszCurrent < pszEnd && ISWHITE( pszCurrent[ 0 ] ) )
-            {
-                pszCurrent++;
-            }
-
-            while ( pszEnd > pszCurrent && ISWHITE( pszEnd[ -1 ] ) )
-            {
-                pszEnd--;
-            }
-        }
-
-        if ( pszCurrent != pszEnd || !fRemoveEmptyEntries  )
-        {
-            if ( !pmszList->Append( pszCurrent, (DWORD) ( pszEnd - pszCurrent ) ) )
-            {
-                hr = HRESULT_FROM_WIN32( GetLastError() );
-                goto Finished;
-            }
-        }
-
-        if ( pszNext == NULL )
-        {
-            break;
-        }
-    }
-
-Finished:
-
-    return hr;
-}
-
 #pragma warning(default:4267)
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.h
index fe60762f0120..86b416fab794 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.h
@@ -8,9 +8,6 @@
 #include "ntassert.h"
 #include <CodeAnalysis/Warnings.h>
 
-#pragma warning( push )
-#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS )
-
 /*++
   class MULTISZ:
 
@@ -20,9 +17,6 @@
     This object is derived from BUFFER class.
     It maintains following state:
 
-     m_fValid  - whether this object is valid -
-        used only by MULTISZ() init functions
-        * NYI: I need to kill this someday *
      m_cchLen - string length cached when we update the string.
      m_cStrings - number of strings.
 
@@ -65,26 +59,13 @@ class MULTISZ : public BUFFER
           m_cStrings(0)
     { AuxInit( str.QueryStr()); }
 
-//    BOOL IsValid(VOID) const { return ( BUFFER::IsValid()) ; }
-    //
-    //  Checks and returns TRUE if this string has no valid data else FALSE
-    //
-    BOOL IsEmpty() const      { return ( *QueryStr() == L'\0'); }
-
     BOOL Append( const WCHAR  * pchInit ) {
-      return ((pchInit != NULL) ? (AuxAppend( pchInit,
+      return ((pchInit != nullptr) ? (AuxAppend( pchInit,
                                               static_cast<DWORD>(wcslen(pchInit)) * sizeof(WCHAR)
                                               )) :
               TRUE);
     }
 
-
-    BOOL Append( const WCHAR  * pchInit, DWORD cchLen ) {
-      return ((pchInit != NULL) ? (AuxAppend( pchInit,
-                                              cchLen * sizeof(WCHAR))) :
-              TRUE);
-    }
-
     BOOL Append( STRU & str )
       { return AuxAppend( str.QueryStr(),
                           (str.QueryCCH()) * sizeof(WCHAR)); }
@@ -100,7 +81,7 @@ class MULTISZ : public BUFFER
 
     BOOL Copy( const WCHAR  * pchInit, IN DWORD cbLen ) {
       if ( QueryPtr() ) { Reset(); }
-      return ( (pchInit != NULL) ?
+      return ( (pchInit != nullptr) ?
                AuxAppend( pchInit, cbLen, FALSE ):
                TRUE);
     }
@@ -120,12 +101,6 @@ class MULTISZ : public BUFFER
     //
     UINT QueryCCH() const { return (m_cchLen); }
 
-    //
-    //  Returns # of strings in the multisz.
-    //
-
-    DWORD QueryStringCount() const { return m_cStrings; }
-
     //
     // Makes a copy of the stored string in given buffer
     //
@@ -134,28 +109,8 @@ class MULTISZ : public BUFFER
     //
     //  Return the string buffer
     //
-    WCHAR * QueryStrA() const { return ( QueryStr()); }
     WCHAR * QueryStr() const { return ((WCHAR *) QueryPtr()); }
 
-    //
-    //  Makes a clone of the current string in the string pointer passed in.
-    //
-    BOOL
-      Clone( OUT MULTISZ * pstrClone) const
-        {
-          return ((pstrClone == NULL) ?
-                  (SetLastError(ERROR_INVALID_PARAMETER), FALSE) :
-                  (pstrClone->Copy( *this))
-                  );
-        } // MULTISZ::Clone()
-
-    //
-    //  Recalculates the length of *this because we've modified the buffers
-    //  directly
-    //
-
-    VOID RecalcLen()
-        { m_cchLen = CalcLength( QueryStr(), &m_cStrings ); }
 
     //
     // Calculate total character length of a MULTI_SZ, including the
@@ -165,34 +120,16 @@ class MULTISZ : public BUFFER
     static DWORD CalcLength( const WCHAR * str,
                                     LPDWORD pcStrings = NULL );
 
-    //
-    // Determine if the MULTISZ contains a specific string.
-    //
-
-    BOOL FindString( const WCHAR * str ) const;
-
-    BOOL FindString( STRU & str )
-        { return FindString( str.QueryStr() ); }
-
-    //
-    // Determine if the MULTISZ contains a specific string - case-insensitive
-    //
-
-    BOOL FindStringNoCase( const WCHAR * str ) const;
-
-    BOOL FindStringNoCase( STRU & str )
-        { return FindStringNoCase( str.QueryStr() ); }
-
     //
     // Used for scanning a multisz.
     //
 
     const WCHAR * First() const
-        { return *QueryStr() == L'\0' ? NULL : QueryStr(); }
+        { return *QueryStr() == L'\0' ? nullptr : QueryStr(); }
 
     const WCHAR * Next( const WCHAR * Current ) const
         { Current += wcslen( Current ) + 1;
-          return *Current == L'\0' ? NULL : Current; }
+          return *Current == L'\0' ? nullptr : Current; }
 
     BOOL
     Equals(
@@ -209,22 +146,4 @@ class MULTISZ : public BUFFER
 
 };
 
-//
-//  Quick macro for declaring a MULTISZ that will use stack memory of <size>
-//  bytes.  If the buffer overflows then a heap buffer will be allocated
-//
-
-#define STACK_MULTISZ( name, size )     WCHAR __ach##name[size]; \
-                                    MULTISZ name( __ach##name, sizeof( __ach##name ))
-
-HRESULT
-SplitCommaDelimitedString(
-    PCWSTR                      pszList,
-    BOOL                        fTrimEntries,
-    BOOL                        fRemoveEmptyEntries,
-    MULTISZ *                   pmszList
-);
-
-#pragma warning( pop )
-
-#endif // !_MULTISZ_HXX_
+#endif // !_MULTISZ_H_
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp
index 0f36fc663cc9..ac5994999445 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp
@@ -10,7 +10,6 @@
 //
 
 #define MAXULONG 4294967295
-#define ISWHITE( ch )       ((ch) == L' ' || (ch) == L'\t' || (ch) == L'\r')
 
 //
 //  When appending data, this is the extra amount we request to avoid
@@ -33,7 +32,7 @@ MULTISZA::CalcLength( const CHAR * str,
         count++;
     }
 
-    if( pcStrings != NULL ) {
+    if( pcStrings != nullptr ) {
         *pcStrings = count;
     }
 
@@ -42,74 +41,6 @@ MULTISZA::CalcLength( const CHAR * str,
 }   // MULTISZA::CalcLength
 
 
-BOOL
-MULTISZA::FindString( const CHAR * str ) const
-{
-    //
-    // Sanity check.
-    //
-
-    DBG_ASSERT( QueryStr() != NULL );
-    DBG_ASSERT( str != NULL );
-    DBG_ASSERT( *str != '\0' );
-
-    //
-    // Scan it.
-    //
-
-    CHAR* multisz = QueryStr();
-
-    while( *multisz != '\0' ) {
-
-        if( !::strcmp( multisz, str ) ) {
-
-            return TRUE;
-
-        }
-
-        multisz += ::strlen( multisz ) + 1;
-
-    }
-
-    return FALSE;
-
-}   // MULTISZA::FindString
-
-
-BOOL
-MULTISZA::FindStringNoCase( const CHAR * str ) const
-{
-    //
-    // Sanity check.
-    //
-
-    DBG_ASSERT( QueryStr() != NULL );
-    DBG_ASSERT( str != NULL );
-    DBG_ASSERT( *str != '\0' );
-
-    //
-    // Scan it.
-    //
-
-    CHAR* multisz = QueryStr();
-
-    while( *multisz != '\0' ) {
-
-        if( !_stricmp( multisz, str ) ) {
-
-            return TRUE;
-
-        }
-
-        multisz += strlen( multisz ) + 1;
-
-    }
-
-    return FALSE;
-
-}   // MULTISZA::FindStringNoCase
-
-
 VOID
 MULTISZA::AuxInit( const CHAR * pInit )
 {
@@ -147,7 +78,7 @@ MULTISZA::AuxInit( const CHAR * pInit )
 
 BOOL MULTISZA::AuxAppend( const CHAR * pStr, UINT cbStr, BOOL fAddSlop )
 {
-    DBG_ASSERT( pStr != NULL );
+    DBG_ASSERT( pStr != nullptr);
 
     UINT cbThis = QueryCB();
 
@@ -217,50 +148,6 @@ BOOL MULTISZA::AuxAppend( const CHAR * pStr, UINT cbStr, BOOL fAddSlop )
 
 } // MULTISZA::AuxAppend()
 
-BOOL
-MULTISZA::CopyToBuffer( __out_ecount_opt(*lpcch) CHAR * lpszBuffer, LPDWORD lpcch) const
-/*++
-    Description:
-        Copies the string into the CHAR buffer passed in if the buffer
-          is sufficient to hold the translated string.
-        If the buffer is small, the function returns small and sets *lpcch
-          to contain the required number of characters.
-
-    Arguments:
-        lpszBuffer      pointer to CHAR buffer which on return contains
-                        the string on success.
-        lpcch           pointer to DWORD containing the length of the buffer.
-                        If *lpcch == 0 then the function returns TRUE with
-                        the count of characters required stored in lpcch.
-                        Also in this case lpszBuffer is not affected.
-    Returns:
-        TRUE on success.
-        FALSE on failure.  Use GetLastError() for further details.
---*/
-{
-   BOOL fReturn = TRUE;
-
-    if ( lpcch == NULL) {
-        SetLastError( ERROR_INVALID_PARAMETER);
-        return ( FALSE);
-    }
-
-   DWORD cch = QueryCCH();
-
-    if ( *lpcch >= cch) {
-
-        DBG_ASSERT( lpszBuffer);
-        memcpy( lpszBuffer, QueryStr(), cch * sizeof(CHAR));
-    } else {
-        DBG_ASSERT( *lpcch < cch);
-        SetLastError( ERROR_INSUFFICIENT_BUFFER);
-        fReturn = FALSE;
-    }
-
-    *lpcch = cch;
-
-    return ( fReturn);
-} // MULTISZA::CopyToBuffer()
 
 BOOL
 MULTISZA::Equals(
@@ -270,7 +157,7 @@ MULTISZA::Equals(
 // Compares this to pmszRhs, returns TRUE if equal
 //
 {
-    DBG_ASSERT( NULL != pmszRhs );
+    DBG_ASSERT(nullptr != pmszRhs );
 
     PCSTR pszLhs = First( );
     PCSTR pszRhs = pmszRhs->First( );
@@ -280,9 +167,9 @@ MULTISZA::Equals(
         return FALSE;
     }
 
-    while( NULL != pszLhs )
+    while( nullptr != pszLhs )
     {
-        DBG_ASSERT( NULL != pszRhs );
+        DBG_ASSERT( nullptr != pszRhs );
 
         if( 0 != strcmp( pszLhs, pszRhs ) )
         {
@@ -296,103 +183,4 @@ MULTISZA::Equals(
     return TRUE;
 }
 
-HRESULT
-SplitCommaDelimitedString(
-    PCSTR                        pszList,
-    BOOL                         fTrimEntries,
-    BOOL                         fRemoveEmptyEntries,
-    MULTISZA *                   pmszList
-)
-/*++
-
-Routine Description:
-
-    Split comma delimited string into a MULTISZA. Additional leading empty
-    entries after the first are discarded.
-
-Arguments:
-
-    pszList - List to split up
-    fTrimEntries - Whether each entry should be trimmed before added to MULTISZA
-    fRemoveEmptyEntries - Whether empty entires should be discarded
-    pmszList - Filled with MULTISZA list
-
-Return Value:
-
-    HRESULT
-
---*/
-{
-    HRESULT                 hr = S_OK;
-
-    if ( pszList == NULL ||
-         pmszList == NULL )
-    {
-        DBG_ASSERT( FALSE );
-        hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
-        goto Finished;
-    }
-    
-    pmszList->Reset();
-
-    /*
-        pszCurrent: start of the current entry which may be the comma that
-                    precedes the next entry if the entry is empty
-
-        pszNext: the comma that precedes the next entry. If
-                 pszCurrent == pszNext, then the entry is empty
-
-        pszEnd: just past the end of the current entry
-    */
-    
-    for ( PCSTR pszCurrent = pszList,
-                 pszNext = strchr( pszCurrent, L',' )
-            ;
-            ;
-          pszCurrent = pszNext + 1,
-          pszNext = strchr( pszCurrent, L',' ) )
-    {
-        PCSTR pszEnd = NULL;
-
-        if ( pszNext != NULL )
-        {
-            pszEnd = pszNext;
-        }
-        else
-        {
-            pszEnd = pszCurrent + strlen( pszCurrent );
-        }
-
-        if ( fTrimEntries )
-        {
-            while ( pszCurrent < pszEnd && ISWHITE( pszCurrent[ 0 ] ) )
-            {
-                pszCurrent++;
-            }
-
-            while ( pszEnd > pszCurrent && ISWHITE( pszEnd[ -1 ] ) )
-            {
-                pszEnd--;
-            }
-        }
-
-        if ( pszCurrent != pszEnd || !fRemoveEmptyEntries  )
-        {
-            if ( !pmszList->Append( pszCurrent, static_cast<DWORD>(pszEnd - pszCurrent) ) )
-            {
-                hr = HRESULT_FROM_WIN32( GetLastError() );
-                goto Finished;
-            }
-        }
-        
-        if ( pszNext == NULL )
-        {
-            break;
-        }
-    }
-
-Finished:
-
-    return hr;
-}
 #pragma warning(default:4267)
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h
index 7ea28881f3fb..8ef366662d7e 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h
@@ -9,7 +9,7 @@
 
 
 /*++
-  class MULTISZ:
+  class MULTISZA:
 
   Intention:
     A light-weight multi-string class supporting encapsulated string class.
@@ -17,9 +17,6 @@
     This object is derived from BUFFER class.
     It maintains following state:
 
-     m_fValid  - whether this object is valid -
-        used only by MULTISZ() init functions
-        * NYI: I need to kill this someday *
      m_cchLen - string length cached when we update the string.
      m_cStrings - number of strings.
 
@@ -62,33 +59,15 @@ class MULTISZA : public BUFFER
           m_cStrings(0)
     { AuxInit( str.QueryStr()); }
 
-//    BOOL IsValid(VOID) const { return ( BUFFER::IsValid()) ; }
-    //
-    //  Checks and returns TRUE if this string has no valid data else FALSE
-    //
-    BOOL IsEmpty( VOID) const      { return ( *QueryStr() == L'\0'); }
-
-    BOOL Append( const CHAR  * pchInit ) {
-      return ((pchInit != NULL) ? (AuxAppend( pchInit,
-                                              (DWORD) (::strlen(pchInit)) * sizeof(CHAR)
-                                              )) :
-              TRUE);
-    }
-
-
     BOOL Append( const CHAR  * pchInit, DWORD cchLen ) {
-      return ((pchInit != NULL) ? (AuxAppend( pchInit,
+      return ((pchInit != nullptr) ? (AuxAppend( pchInit,
                                               cchLen * sizeof(CHAR))) :
               TRUE);
     }
 
-    BOOL Append( STRA & str )
-      { return AuxAppend( str.QueryStr(),
-                          (str.QueryCCH()) * sizeof(CHAR)); }
-
     // Resets the internal string to be NULL string. Buffer remains cached.
     VOID Reset()
-    { DBG_ASSERT( QueryPtr() != NULL);
+    { DBG_ASSERT( QueryPtr() != nullptr );
       QueryStr()[0] = L'\0';
       QueryStr()[1] = L'\0';
       m_cchLen = 2;
@@ -97,7 +76,7 @@ class MULTISZA : public BUFFER
 
     BOOL Copy( const CHAR  * pchInit, IN DWORD cbLen ) {
       if ( QueryPtr() ) { Reset(); }
-      return ( (pchInit != NULL) ?
+      return ( (pchInit != nullptr) ?
                AuxAppend( pchInit, cbLen, FALSE ):
                TRUE);
     }
@@ -112,26 +91,10 @@ class MULTISZA : public BUFFER
     UINT QueryCB() const
         { return ( m_cchLen * sizeof(CHAR)); }
 
-    //
-    //  Returns # of characters in the string including the terminating NULLs
-    //
-    UINT QueryCCH() const { return (m_cchLen); }
-
-    //
-    //  Returns # of strings in the MULTISZA.
-    //
-
-    DWORD QueryStringCount() const { return m_cStrings; }
-
-    //
-    // Makes a copy of the stored string in given buffer
-    //
-    BOOL CopyToBuffer( __out_ecount_opt(*lpcch) CHAR * lpszBuffer,  LPDWORD lpcch) const;
 
     //
     //  Return the string buffer
     //
-    CHAR * QueryStrA() const { return ( QueryStr()); }
     CHAR * QueryStr() const { return reinterpret_cast<CHAR*>(QueryPtr()); }
 
     //
@@ -140,19 +103,12 @@ class MULTISZA : public BUFFER
     BOOL
       Clone( OUT MULTISZA * pstrClone) const
         {
-          return ((pstrClone == NULL) ?
+          return ((pstrClone == nullptr) ?
                   (SetLastError(ERROR_INVALID_PARAMETER), FALSE) :
                   (pstrClone->Copy( *this))
                   );
         } // MULTISZA::Clone()
 
-    //
-    //  Recalculates the length of *this because we've modified the buffers
-    //  directly
-    //
-
-    VOID RecalcLen()
-        { m_cchLen = MULTISZA::CalcLength( QueryStr(), &m_cStrings ); }
 
     //
     // Calculate total character length of a MULTI_SZ, including the
@@ -160,36 +116,18 @@ class MULTISZA : public BUFFER
     //
 
     static DWORD CalcLength( const CHAR * str,
-                                    LPDWORD pcStrings = NULL );
-
-    //
-    // Determine if the MULTISZA contains a specific string.
-    //
-
-    BOOL FindString( const CHAR * str ) const;
-
-    BOOL FindString( STRA & str ) const
-    { return FindString( str.QueryStr() ); }
-
-    //
-    // Determine if the MULTISZA contains a specific string - case-insensitive
-    //
-
-    BOOL FindStringNoCase( const CHAR * str ) const;
-
-    BOOL FindStringNoCase( STRA & str ) const
-    { return FindStringNoCase( str.QueryStr() ); }
+                                    LPDWORD pcStrings = nullptr );
 
     //
     // Used for scanning a MULTISZA.
     //
 
     const CHAR * First( VOID ) const
-        { return *QueryStr() == L'\0' ? NULL : QueryStr(); }
+        { return *QueryStr() == L'\0' ? nullptr : QueryStr(); }
 
     const CHAR * Next( const CHAR * Current ) const
         { Current += ::strlen( Current ) + 1;
-          return *Current == L'\0' ? NULL : Current; }
+          return *Current == L'\0' ? nullptr : Current; }
 
     BOOL
     Equals(
@@ -206,21 +144,5 @@ class MULTISZA : public BUFFER
 
 };
 
-//
-//  Quick macro for declaring a MULTISZA that will use stack memory of <size>
-//  bytes.  If the buffer overflows then a heap buffer will be allocated
-//
-
-#define STACK_MULTISZA( name, size )     CHAR __ach##name[size]; \
-                                    MULTISZA name( __ach##name, sizeof( __ach##name ))
-
-HRESULT
-SplitCommaDelimitedString(
-    PCSTR                       pszList,
-    BOOL                        fTrimEntries,
-    BOOL                        fRemoveEmptyEntries,
-    MULTISZA *                  pmszList
-);
-
-#endif // !_MULTISZA_HXX_
+#endif // !_MULTISZA_H_
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/percpu.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/percpu.h
index 46d7b7e5e7fd..455f9e23dec0 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/percpu.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/percpu.h
@@ -94,7 +94,7 @@ PER_CPU<T>::Create(
     DWORD           CacheLineSize = 0;
     DWORD           ObjectCacheLineSize = 0;
     DWORD           NumberOfProcessors = 0;
-    PER_CPU<T> *    pInstance = NULL;
+    PER_CPU<T> *    pInstance = nullptr;
 
     hr = GetProcessorInformation(&CacheLineSize,
                                  &NumberOfProcessors);
@@ -124,7 +124,7 @@ PER_CPU<T>::Create(
         SIZE_T Size = CacheLineSize + NumberOfProcessors * ObjectCacheLineSize;
 
         pInstance = (PER_CPU<T>*) _aligned_malloc(Size, CacheLineSize);
-        if (pInstance == NULL)
+        if (pInstance == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -150,17 +150,17 @@ PER_CPU<T>::Create(
     }
 
     *ppInstance = pInstance;
-    pInstance = NULL;
+    pInstance = nullptr;
 
 Finished:
 
-    if (pInstance != NULL)
+    if (pInstance != nullptr)
     {
         //
         // Free the instance without disposing it.
         //
         pInstance->Dispose();
-        pInstance = NULL;
+        pInstance = nullptr;
     }
 
     return hr;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.c b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.c
index 37f46c5ebddb..f0308395226b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.c
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.c
@@ -4,7 +4,6 @@
 #include <windows.h>
 #include "reftrace.h"
 
-
 PTRACE_LOG
 CreateRefTraceLog(
     IN LONG LogSize,
@@ -40,7 +39,6 @@ Return Value:
 
 }   // CreateRefTraceLog
 
-
 VOID
 DestroyRefTraceLog(
     IN PTRACE_LOG Log
@@ -66,7 +64,6 @@ Return Value:
 
 }   // DestroyRefTraceLog
 
-
 //
 // N.B. For RtlCaptureBacktrace() to work properly, the calling function
 // *must* be __cdecl, and must have a "normal" stack frame. So, we decorate
@@ -118,9 +115,6 @@ Return Value:
 
 }   // WriteRefTraceLog
 
-
-
-
 LONG
 __cdecl
 WriteRefTraceLogEx(
@@ -161,9 +155,9 @@ Return Value:
 --*/
 {
 
-    REF_TRACE_LOG_ENTRY entry;
-    ULONG hash;
-    DWORD cStackFramesSkipped;
+    REF_TRACE_LOG_ENTRY entry{};
+    ULONG hash = 0;
+    DWORD cStackFramesSkipped = 0;
 
     //
     // Initialize the entry.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h
index e90ca0444a71..68e8221eee01 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h
@@ -23,7 +23,7 @@ extern "C" {
 
 // No-op value for the Context1,2,3 parameters of WriteRefTraceLogEx
 //#define REF_TRACE_EMPTY_CONTEXT ((PVOID) -1)
-#define REF_TRACE_EMPTY_CONTEXT NULL
+#define REF_TRACE_EMPTY_CONTEXT nullptr
 
 
 //
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h
index dc7ccf834bef..1db1627f0679 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h
@@ -160,21 +160,25 @@ class CWSDRWLock
         return S_OK;
     }
 
+    _Acquires_shared_lock_(this->m_rwLock)
     void SharedAcquire()
     {
         AcquireSRWLockShared(&m_rwLock);
     }
-    
+
+    _Releases_shared_lock_(this->m_rwLock)
     void SharedRelease()
     {
         ReleaseSRWLockShared(&m_rwLock);
     }
 
+    _Acquires_exclusive_lock_(this->m_rwLock)
     void ExclusiveAcquire()
     {
         AcquireSRWLockExclusive(&m_rwLock);
     }
-    
+
+    _Releases_exclusive_lock_(this->m_rwLock)
     void ExclusiveRelease()
     {
         ReleaseSRWLockExclusive(&m_rwLock);
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp
index 8e2cbfe9caf0..52daffecd7e5 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp
@@ -32,15 +32,13 @@ STRA::STRA(
 
 --*/
 {
-    _ASSERTE( NULL != pbInit );
+    _ASSERTE( nullptr != pbInit );
     _ASSERTE( cchInit > 0 );
     _ASSERTE( pbInit[0] == '\0' );
 }
 
 BOOL
-STRA::IsEmpty(
-    VOID
-) const
+STRA::IsEmpty() const
 {
     return ( m_cchLen == 0 );
 }
@@ -51,7 +49,7 @@ STRA::Equals(
     __in BOOL   fIgnoreCase /*= FALSE*/
 ) const
 {
-    _ASSERTE( NULL != pszRhs );
+    _ASSERTE( nullptr != pszRhs );
 
     if( fIgnoreCase )
     {
@@ -63,27 +61,16 @@ STRA::Equals(
 
 BOOL
 STRA::Equals(
-    __in const STRA *   pstrRhs,
-    __in BOOL           fIgnoreCase /*= FALSE*/
-) const
-{
-    _ASSERTE( NULL != pstrRhs );
-    return Equals( pstrRhs->QueryStr(), fIgnoreCase );
-}
-
-BOOL
-STRA::Equals(
-    __in const STRA &  strRhs,
+    __in const STRA* pstrRhs,
     __in BOOL           fIgnoreCase /*= FALSE*/
 ) const
 {
-    return Equals( strRhs.QueryStr(), fIgnoreCase );
+    _ASSERTE(nullptr != pstrRhs);
+    return Equals(pstrRhs->QueryStr(), fIgnoreCase);
 }
 
 DWORD
-STRA::QueryCB(
-    VOID
-) const
+STRA::QueryCB() const
 //
 // Returns the number of bytes in the string excluding the terminating NULL
 //
@@ -92,9 +79,7 @@ STRA::QueryCB(
 }
 
 DWORD
-STRA::QueryCCH(
-    VOID
-) const
+STRA::QueryCCH() const
 //
 //  Returns the number of characters in the string excluding the terminating NULL
 //
@@ -125,9 +110,7 @@ STRA::QuerySize(
 __nullterminated
 __bcount(this->m_cchLen)
 CHAR *
-STRA::QueryStr(
-    VOID
-) const
+STRA::QueryStr() const
 //
 //  Return the string buffer
 //
@@ -135,6 +118,12 @@ STRA::QueryStr(
     return m_Buff.QueryPtr();
 }
 
+VOID STRA::EnsureNullTerminated()
+{
+    // m_cchLen represents the string's length, not the underlying buffer length
+    m_Buff.QueryPtr()[m_cchLen] = '\0';
+}
+
 VOID
 STRA::Reset(
 )
@@ -142,7 +131,7 @@ STRA::Reset(
 // Resets the internal string to be NULL string. Buffer remains cached.
 //
 {
-    _ASSERTE( QueryStr() != NULL );
+    _ASSERTE( QueryStr() != nullptr );
     *(QueryStr()) = '\0';
     m_cchLen = 0;
 }
@@ -220,7 +209,7 @@ STRA::Copy(
     __in const STRA * pstrRhs
 )
 {
-    _ASSERTE( pstrRhs != NULL );
+    _ASSERTE( pstrRhs != nullptr );
     return Copy( pstrRhs->QueryStr(), pstrRhs->QueryCCH() );
 }
 
@@ -248,41 +237,6 @@ STRA::CopyW(
     return CopyW( pszCopyW, cchLen );
 }
 
-HRESULT
-STRA::CopyWTruncate(
-    __in PCWSTR pszCopyWTruncate
-)
-{
-    size_t      cchLen;
-    HRESULT hr = StringCchLengthW(pszCopyWTruncate,
-                                  STRSAFE_MAX_CCH,
-                                  &cchLen);
-    if ( FAILED( hr ) )
-    {
-        return hr;
-    }
-    return CopyWTruncate( pszCopyWTruncate, cchLen );
-}
-
-HRESULT
-STRA::CopyWTruncate(
-    __in_ecount(cchLen)
-    PCWSTR          pszCopyWTruncate,
-    __in SIZE_T     cchLen
-)
-//
-// The "Truncate" methods do not do proper conversion. They do a (CHAR) caste
-//
-{
-    _ASSERTE( cchLen <= MAXDWORD );
-
-    return AuxAppendWTruncate(
-        pszCopyWTruncate,
-        static_cast<DWORD>(cchLen),
-        0
-    );
-}
-
 HRESULT
 STRA::Append(
     __in PCSTR pszAppend
@@ -318,15 +272,6 @@ STRA::Append(
     );
 }
 
-HRESULT
-STRA::Append(
-    __in const STRA * pstrRhs
-)
-{
-    _ASSERTE( pstrRhs != NULL );
-    return Append( pstrRhs->QueryStr(), pstrRhs->QueryCCH() );
-}
-
 HRESULT
 STRA::Append(
     __in const STRA & strRhs
@@ -335,44 +280,6 @@ STRA::Append(
     return Append( strRhs.QueryStr(), strRhs.QueryCCH() );
 }
 
-HRESULT
-STRA::AppendWTruncate(
-    __in PCWSTR pszAppendWTruncate
-)
-{
-    size_t      cchLen;
-    HRESULT hr = StringCchLengthW(pszAppendWTruncate,
-                                  STRSAFE_MAX_CCH,
-                                  &cchLen);
-    if ( FAILED( hr ) )
-    {
-        return hr;
-    }
-    return AppendWTruncate( pszAppendWTruncate, cchLen );
-}
-
-HRESULT
-STRA::AppendWTruncate(
-    __in_ecount(cchLen)
-    PCWSTR          pszAppendWTruncate,
-    __in SIZE_T     cchLen
-)
-//
-// The "Truncate" methods do not do proper conversion. They do a (CHAR) caste
-//
-{
-    _ASSERTE( cchLen <= MAXDWORD );
-    if ( cchLen == 0 )
-    {
-        return S_OK;
-    }
-    return AuxAppendWTruncate(
-        pszAppendWTruncate,
-        static_cast<DWORD>(cchLen),
-        QueryCB()
-    );
-}
-
 HRESULT
 STRA::CopyToBuffer(
     __out_bcount(*pcb) CHAR*    pszBuffer,
@@ -382,8 +289,8 @@ STRA::CopyToBuffer(
 // Makes a copy of the stored string into the given buffer
 //
 {
-    _ASSERTE( NULL != pszBuffer );
-    _ASSERTE( NULL != pcb );
+    _ASSERTE( nullptr != pszBuffer );
+    _ASSERTE( nullptr != pcb );
 
     HRESULT hr          = S_OK;
     DWORD   cbNeeded    = QueryCB() + sizeof( CHAR );
@@ -403,71 +310,6 @@ STRA::CopyToBuffer(
     return hr;
 }
 
-HRESULT
-STRA::SetLen(
-    __in DWORD cchLen
-)
-/*++
- *
-Routine Description:
-
-    Set the length of the string and null terminate, if there
-    is sufficient buffer already allocated. Will not reallocate.
-
-Arguments:
-
-    cchLen - The number of characters in the new string.
-
-Return Value:
-
-    HRESULT
-
---*/
-{
-    if( cchLen >= QuerySizeCCH() )
-    {
-        return HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
-    }
-
-    *( QueryStr() + cchLen ) = '\0';
-    m_cchLen = cchLen;
-
-    return S_OK;
-}
-
-
-HRESULT
-STRA::SafeSnprintf(
-    __in __format_string
-    PCSTR       pszFormatString,
-    ...
-)
-/*++
-
-Routine Description:
-
-    Writes to a STRA, growing it as needed. It arbitrarily caps growth at 64k chars.
-
-Arguments:
-
-    pszFormatString    - printf format
-    ...                - printf args
-
-Return Value:
-
-    HRESULT
-
---*/
-{
-    va_list     argsList;
-    va_start(   argsList, pszFormatString );
-
-    HRESULT hr = SafeVsnprintf(pszFormatString, argsList);
-
-    va_end( argsList );
-    return hr;
-}
-
 HRESULT
 STRA::SafeVsnprintf(
     __in __format_string
@@ -575,516 +417,139 @@ Return Value:
     return hr;
 }
 
-bool
-FShouldEscapeUtf8(
-    BYTE ch
-    )
-{
-    if ( ( ch >= 128 ) )
-    {
-        return true;
-    }
-
-    return false;
-}
-
-bool
-FShouldEscapeUrl(
-    BYTE ch
-    )
+HRESULT
+STRA::CopyWToUTF8Unescaped(
+    __in LPCWSTR cpchStr
+)
 {
-    if ( ( ch >= 128   ||
-           ch <= 32    ||
-           ch == '<'   ||
-           ch == '>'   ||
-           ch == '%'   ||
-           ch == '?'   ||
-           ch == '#' ) &&
-         !( ch == '\n' || ch == '\r' ) )
-    {
-        return true;
-    }
-
-    return false;
+    return STRA::CopyWToUTF8Unescaped(cpchStr, static_cast<DWORD>(wcslen(cpchStr)));
 }
 
 HRESULT
-STRA::Escape(
-    VOID
+STRA::CopyWToUTF8Unescaped(
+    __in_ecount(cch)
+    LPCWSTR         cpchStr,
+    __in DWORD      cch
 )
-/*++
-
-Routine Description:
-
-    Escapes a STRA
-
-Arguments:
+{
+    HRESULT hr = S_OK;
 
-    None
+    if (cch == 0)
+    {
+        Reset();
+        return S_OK;
+    }
 
-Return Value:
+    int iRet = ConvertUnicodeToUTF8(cpchStr,
+                                    &m_Buff,
+                                    cch);
+    if (-1 == iRet)
+    {
+        // could not convert
+        hr = HRESULT_FROM_WIN32(GetLastError());
+        goto Finished;
+    }
 
-    None
+    m_cchLen = iRet;
 
---*/
-{
-    return EscapeInternal( FShouldEscapeUrl );
+    _ASSERTE(strlen(m_Buff.QueryPtr()) == m_cchLen);
+Finished:
+    return hr;
 }
 
 HRESULT
-STRA::EscapeUtf8(
+STRA::AuxAppend(
+    __in_ecount(cbLen)
+    LPCSTR          pStr,
+    __in DWORD      cbLen,
+    __in DWORD      cbOffset
 )
-/*++
-
-Routine Description:
+{
+    _ASSERTE( nullptr != pStr );
+    _ASSERTE( cbOffset <= QueryCB() );
 
-    Escapes the high-bit chars in a STRA.  LWS, CR, LF & controls are untouched.
+    ULONGLONG cb64NewSize = static_cast<ULONGLONG>(cbOffset) + cbLen + sizeof( CHAR );
+    if( cb64NewSize > MAXDWORD )
+    {
+        return HRESULT_FROM_WIN32( ERROR_ARITHMETIC_OVERFLOW );
+    }
 
-Arguments:
+    if( m_Buff.QuerySize() < cb64NewSize )
+    {
+        if( !m_Buff.Resize( static_cast<SIZE_T>(cb64NewSize) ) )
+        {
+            return E_OUTOFMEMORY;
+        }
+    }
 
-    None
+    memcpy( reinterpret_cast<BYTE*>(m_Buff.QueryPtr()) + cbOffset, pStr, cbLen );
 
-Return Value:
+    m_cchLen = cbLen + cbOffset;
 
-    None
+    *( QueryStr() + m_cchLen ) = '\0';
 
---*/
-{
-    return EscapeInternal( FShouldEscapeUtf8 );
+    return S_OK;
 }
 
-
 HRESULT
-STRA::EscapeInternal(
-    PFN_F_SHOULD_ESCAPE pfnFShouldEscape
+STRA::AuxAppendW(
+    __in_ecount(cchAppendW)
+    PCWSTR          pszAppendW,
+    __in DWORD      cchAppendW,
+    __in DWORD      cbOffset,
+    __in UINT       CodePage,
+    __in BOOL       fFailIfNoTranslation,
+    __in DWORD      dwFlags
 )
-/*++
-
-Routine Description:
-
-    Escapes a STRA according to the predicate function passed in
-
-Arguments:
-
-    None
-
-Return Value:
-
-    None
-
---*/
 {
-    LPCSTR  pch     = QueryStr();
-    __analysis_assume( pch != NULL );
-    int     i      = 0;
-    BYTE    ch;
-    HRESULT hr      = S_OK;
-    ULONG64  NewSize = 0;
+    HRESULT hr          = S_OK;
+    DWORD   cbRet       = 0;
+    DWORD cbAvailable   = 0;
+    UNREFERENCED_PARAMETER(fFailIfNoTranslation);
+
+    //
+    // There are only two expect places to append
+    //
+    _ASSERTE( 0 == cbOffset || QueryCB() == cbOffset );
 
-    // Set to true if any % escaping occurs
-    BOOL fEscapingDone = FALSE;
+    if ( cchAppendW == 0 )
+    {
+        goto Finished;
+    }
 
     //
-    // If there are any characters that need to be escaped we copy the entire string
-    // character by character into straTemp, escaping as we go, then at the end
-    // copy all of straTemp over. Don't modify InlineBuffer directly.
+    // start by assuming 1 char to 1 char will be enough space
     //
-    CHAR InlineBuffer[512];
-    InlineBuffer[0] = '\0';
-    STRA straTemp(InlineBuffer, sizeof(InlineBuffer)/sizeof(*InlineBuffer));
+    if( !m_Buff.Resize( cbOffset + cchAppendW + sizeof( CHAR ) ) )
+    {
+        hr = E_OUTOFMEMORY;
+        goto Finished;
+    }
 
-    _ASSERTE( pch );
+    cbAvailable = m_Buff.QuerySize() - cbOffset;
 
-    while (pch[i] != NULL)
+    cbRet = WideCharToMultiByte(
+        CodePage,
+        dwFlags,
+        pszAppendW,
+        cchAppendW,
+        QueryStr() + cbOffset,
+        cbAvailable,
+        nullptr,
+        nullptr
+    );
+    if( 0 != cbRet )
     {
+        if(!m_Buff.Resize(cbOffset + cbRet + 1))
+        {
+            hr = E_OUTOFMEMORY;
+        }
+
         //
-        //  Escape characters that are in the non-printable range
-        //  but ignore CR and LF
+        // not zero --> success, so we're done
         //
-
-        ch = pch[i];
-        if ( pfnFShouldEscape( ch ) )
-        {
-            if (FALSE == fEscapingDone)
-            {
-                // first character in the string that needed escaping
-                fEscapingDone = TRUE;
-
-                // guess that the size needs to be larger than
-                // what we used to have times two
-                NewSize = static_cast<ULONG64>(QueryCCH()) * 2;
-                if ( NewSize > MAXDWORD )
-                {
-                    hr = HRESULT_FROM_WIN32( ERROR_ARITHMETIC_OVERFLOW );
-                    return hr;
-                }
-
-                hr = straTemp.Resize( static_cast<DWORD>(NewSize) );
-
-                if (FAILED(hr))
-                {
-                    return hr;
-                }
-
-                // Copy all of the previous buffer into buffTemp, only if it is not the first character:
-
-                if ( i > 0)
-                {
-                    hr = straTemp.Copy(QueryStr(),
-                                       i * sizeof(CHAR));
-                    if (FAILED(hr))
-                    {
-                        return hr;
-                    }
-                }
-            }
-
-            // resize the temporary (if needed) with the slop of the entire buffer length
-            // this fixes constant reallocation if the entire string needs to be escaped
-            NewSize = static_cast<ULONG64>(QueryCCH()) + 2 * sizeof(CHAR) + 1 * sizeof(CHAR);
-            if ( NewSize > MAXDWORD )
-            {
-                hr = HRESULT_FROM_WIN32( ERROR_ARITHMETIC_OVERFLOW );
-                return hr;
-            }
-
-            BOOL fRet = straTemp.m_Buff.Resize(static_cast<size_t>(NewSize));
-            if ( !fRet )
-            {
-                hr = HRESULT_FROM_WIN32(GetLastError());
-                return hr;
-            }
-
-            //
-            //  Create the string to append for the current character
-            //
-
-            CHAR chHex[3];
-            chHex[0] = '%';
-
-            //
-            //  Convert the low then the high character to hex
-            //
-
-            UINT nLowDigit = static_cast<UINT>(ch % 16);
-            chHex[2] = TODIGIT( nLowDigit );
-
-            ch /= 16;
-
-            UINT nHighDigit = static_cast<UINT>(ch % 16);
-
-            chHex[1] = TODIGIT( nHighDigit );
-
-            //
-            // Actually append the converted character to the end of the temporary
-            //
-            hr = straTemp.Append(chHex, 3);
-            if (FAILED(hr))
-            {
-                return hr;
-            }
-        }
-        else
-        {
-            // if no escaping done, no need to copy
-            if (fEscapingDone)
-            {
-                // if ANY escaping done, copy current character into new buffer
-                straTemp.Append(&pch[i], 1);
-            }
-        }
-
-        // inspect the next character in the string
-        i++;
-    }
-
-    if (fEscapingDone)
-    {
-        // the escaped string is now in straTemp
-        hr = Copy(straTemp);
-    }
-
-    return hr;
-
-} // EscapeInternal()
-
-VOID
-STRA::Unescape(
-)
-/*++
-
-Routine Description:
-
-    Unescapes a STRA
-
-    Supported escape sequences are:
-      %uxxxx unescapes Unicode character xxxx into system codepage
-      %xx    unescapes character xx
-      %      without following hex digits is ignored
-
-Arguments:
-
-    None
-
-Return Value:
-
-    None
-
---*/
-{
-    CHAR   *pScan;
-    WCHAR   wch;
-    DWORD   dwLen;
-    BOOL    fChanged = FALSE;
-
-    //
-    // Now take care of any escape characters
-    //
-    CHAR* pDest = pScan = strchr(QueryStr(), '%');
-
-    while (pScan)
-    {
-        if ((pScan[1] == 'u' || pScan[1] == 'U') &&
-            SAFEIsXDigit(pScan[2]) &&
-            SAFEIsXDigit(pScan[3]) &&
-            SAFEIsXDigit(pScan[4]) &&
-            SAFEIsXDigit(pScan[5]))
-        {
-            wch = TOHEX(pScan[2]) * 4096 + TOHEX(pScan[3]) * 256
-                + TOHEX(pScan[4]) * 16 + TOHEX(pScan[5]);
-
-            dwLen = WideCharToMultiByte(CP_ACP,
-                                        WC_NO_BEST_FIT_CHARS,
-                                        &wch,
-                                        1,
-                                        static_cast<LPSTR>(pDest),
-                                        6,
-                                        NULL,
-                                        NULL);
-
-            pDest += dwLen;
-            pScan += 6;
-            fChanged = TRUE;
-        }
-        else if (SAFEIsXDigit(pScan[1]) && SAFEIsXDigit(pScan[2]))
-        {
-            *pDest = TOHEX(pScan[1]) * 16 + TOHEX(pScan[2]);
-
-            pDest ++;
-            pScan += 3;
-            fChanged = TRUE;
-        }
-        else   // Not an escaped char, just a '%'
-        {
-            if (fChanged)
-            {
-                *pDest = *pScan;
-            }
-
-            pDest++;
-            pScan++;
-        }
-
-        //
-        // Copy all the information between this and the next escaped char
-        //
-        CHAR* pNextScan = strchr(pScan, '%');
-
-        if (fChanged)   // pScan!=pDest, so we have to copy the char's
-        {
-            if (!pNextScan)   // That was the last '%' in the string
-            {
-                memmove(pDest,
-                        pScan,
-                        QueryCCH() - DIFF(pScan - QueryStr()) + 1);
-            }
-            else
-            {
-                // There is another '%', move intermediate chars
-                if ((dwLen = static_cast<DWORD>(DIFF(pNextScan - pScan))) != 0)
-                {
-                    memmove(pDest,
-                            pScan,
-                            dwLen);
-                    pDest += dwLen;
-                }
-            }
-        }
-
-        pScan = pNextScan;
-    }
-
-    if (fChanged)
-    {
-        m_cchLen = static_cast<DWORD>(strlen(QueryStr()));  // for safety recalc the length
-    }
-}
-
-HRESULT
-STRA::CopyWToUTF8Unescaped(
-    __in LPCWSTR cpchStr
-)
-{
-    return STRA::CopyWToUTF8Unescaped(cpchStr, static_cast<DWORD>(wcslen(cpchStr)));
-}
-
-HRESULT
-STRA::CopyWToUTF8Unescaped(
-    __in_ecount(cch)
-    LPCWSTR         cpchStr,
-    __in DWORD      cch
-)
-{
-    HRESULT hr = S_OK;
-
-    if (cch == 0)
-    {
-        Reset();
-        return S_OK;
-    }
-
-    int iRet = ConvertUnicodeToUTF8(cpchStr,
-                                    &m_Buff,
-                                    cch);
-    if (-1 == iRet)
-    {
-        // could not convert
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        goto Finished;
-    }
-
-    m_cchLen = iRet;
-
-    _ASSERTE(strlen(m_Buff.QueryPtr()) == m_cchLen);
-Finished:
-    return hr;
-}
-
-HRESULT
-STRA::CopyWToUTF8Escaped(
-    __in LPCWSTR cpchStr
-)
-{
-    return STRA::CopyWToUTF8Escaped(cpchStr, static_cast<DWORD>(wcslen(cpchStr)));
-}
-
-HRESULT
-STRA::CopyWToUTF8Escaped(
-    __in_ecount(cch)
-    LPCWSTR         cpchStr,
-    __in DWORD      cch
-)
-{
-    HRESULT hr = CopyWToUTF8Unescaped(cpchStr, cch);
-    if (FAILED(hr))
-    {
-        goto Finished;
-    }
-
-    hr = Escape();
-    if (FAILED(hr))
-    {
-        goto Finished;
-    }
-
-    hr = S_OK;
-Finished:
-    return hr;
-}
-
-HRESULT
-STRA::AuxAppend(
-    __in_ecount(cbLen)
-    LPCSTR          pStr,
-    __in DWORD      cbLen,
-    __in DWORD      cbOffset
-)
-{
-    _ASSERTE( NULL != pStr );
-    _ASSERTE( cbOffset <= QueryCB() );
-
-    ULONGLONG cb64NewSize = static_cast<ULONGLONG>(cbOffset) + cbLen + sizeof( CHAR );
-    if( cb64NewSize > MAXDWORD )
-    {
-        return HRESULT_FROM_WIN32( ERROR_ARITHMETIC_OVERFLOW );
-    }
-
-    if( m_Buff.QuerySize() < cb64NewSize )
-    {
-        if( !m_Buff.Resize( static_cast<SIZE_T>(cb64NewSize) ) )
-        {
-            return E_OUTOFMEMORY;
-        }
-    }
-
-    memcpy( reinterpret_cast<BYTE*>(m_Buff.QueryPtr()) + cbOffset, pStr, cbLen );
-
-    m_cchLen = cbLen + cbOffset;
-
-    *( QueryStr() + m_cchLen ) = '\0';
-
-    return S_OK;
-}
-
-HRESULT
-STRA::AuxAppendW(
-    __in_ecount(cchAppendW)
-    PCWSTR          pszAppendW,
-    __in DWORD      cchAppendW,
-    __in DWORD      cbOffset,
-    __in UINT       CodePage,
-    __in BOOL       fFailIfNoTranslation,
-    __in DWORD      dwFlags
-)
-{
-    HRESULT hr          = S_OK;
-    DWORD   cbRet       = 0;
-    DWORD cbAvailable   = 0;
-    UNREFERENCED_PARAMETER(fFailIfNoTranslation);
-
-    //
-    // There are only two expect places to append
-    //
-    _ASSERTE( 0 == cbOffset || QueryCB() == cbOffset );
-
-    if ( cchAppendW == 0 )
-    {
-        goto Finished;
-    }
-
-    //
-    // start by assuming 1 char to 1 char will be enough space
-    //
-    if( !m_Buff.Resize( cbOffset + cchAppendW + sizeof( CHAR ) ) )
-    {
-        hr = E_OUTOFMEMORY;
-        goto Finished;
-    }
-
-    cbAvailable = m_Buff.QuerySize() - cbOffset;
-
-    cbRet = WideCharToMultiByte(
-        CodePage,
-        dwFlags,
-        pszAppendW,
-        cchAppendW,
-        QueryStr() + cbOffset,
-        cbAvailable,
-        NULL,
-        NULL
-    );
-    if( 0 != cbRet )
-    {
-        if(!m_Buff.Resize(cbOffset + cbRet + 1))
-        {
-            hr = E_OUTOFMEMORY;
-        }
-
-        //
-        // not zero --> success, so we're done
-        //
-        goto Finished;
-    }
+        goto Finished;
+    }
 
     //
     // We only know how to handle ERROR_INSUFFICIENT_BUFFER
@@ -1104,10 +569,10 @@ STRA::AuxAppendW(
         dwFlags,
         pszAppendW,
         cchAppendW,
-        NULL,
+        nullptr,
         0,
-        NULL,
-        NULL
+        nullptr,
+        nullptr
     );
     if( 0 == cbRet )
     {
@@ -1133,8 +598,8 @@ STRA::AuxAppendW(
         cchAppendW,
         QueryStr() + cbOffset,
         cbAvailable,
-        NULL,
-        NULL
+        nullptr,
+        nullptr
     );
     if( 0 == cbRet )
     {
@@ -1153,7 +618,7 @@ STRA::AuxAppendW(
     // ensure we're still NULL terminated in the right spot
     // (regardless of success or failure)
     //
-    QueryStr()[m_cchLen] = '\0';
+    EnsureNullTerminated();
 
     return hr;
 }
@@ -1169,7 +634,7 @@ STRA::AuxAppendWTruncate(
 // Cheesey WCHAR --> CHAR conversion
 //
 {
-    _ASSERTE( NULL != pszAppendW );
+    _ASSERTE( nullptr != pszAppendW );
     _ASSERTE( 0 == cbOffset || cbOffset == QueryCB() );
 
     if( !pszAppendW )
@@ -1213,10 +678,10 @@ STRA::ConvertUnicodeToCodePage(
     __in UINT                   uCodePage
 )
 {
-    _ASSERTE(NULL != pszSrcUnicodeString);
-    _ASSERTE(NULL != pbufDstAnsiString);
+    _ASSERTE(nullptr != pszSrcUnicodeString);
+    _ASSERTE(nullptr != pbufDstAnsiString);
 
-    DWORD dwFlags;
+    DWORD dwFlags{0};
 
     if (uCodePage == CP_ACP)
     {
@@ -1233,17 +698,17 @@ STRA::ConvertUnicodeToCodePage(
                                       dwStringLen,
                                       static_cast<LPSTR>(pbufDstAnsiString->QueryPtr()),
                                       static_cast<int>(pbufDstAnsiString->QuerySize()),
-                                      NULL,
-                                      NULL);
+                                      nullptr,
+                                      nullptr);
     if ((iStrLen == 0) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) {
         iStrLen = WideCharToMultiByte(uCodePage,
                                       dwFlags,
                                       pszSrcUnicodeString,
                                       dwStringLen,
-                                      NULL,
+                                      nullptr,
                                       0,
-                                      NULL,
-                                      NULL);
+                                      nullptr,
+                                      nullptr);
         if (iStrLen != 0) {
             // add one just for the extra NULL
             BOOL bTemp = pbufDstAnsiString->Resize(iStrLen + 1);
@@ -1259,8 +724,8 @@ STRA::ConvertUnicodeToCodePage(
                                               dwStringLen,
                                               static_cast<LPSTR>(pbufDstAnsiString->QueryPtr()),
                                               static_cast<int>(pbufDstAnsiString->QuerySize()),
-                                              NULL,
-                                              NULL);
+                                              nullptr,
+                                              nullptr);
             }
 
         }
@@ -1280,21 +745,6 @@ STRA::ConvertUnicodeToCodePage(
     return iStrLen;
 }
 
-// static
-HRESULT
-STRA::ConvertUnicodeToMultiByte(
-    __in_ecount(dwStringLen)
-    LPCWSTR                     pszSrcUnicodeString,
-    __in BUFFER_T<CHAR,1> *     pbufDstAnsiString,
-    __in DWORD                  dwStringLen
-)
-{
-    return ConvertUnicodeToCodePage( pszSrcUnicodeString,
-                                      pbufDstAnsiString,
-                                      dwStringLen,
-                                      CP_ACP );
-}
-
 // static
 HRESULT
 STRA::ConvertUnicodeToUTF8(
@@ -1309,403 +759,3 @@ STRA::ConvertUnicodeToUTF8(
                                       dwStringLen,
                                       CP_UTF8 );
 }
-
-/*++
-
-Routine Description:
-
-    Removes leading and trailing whitespace
-
---*/
-
-VOID
-STRA::Trim()
-{
-    PSTR    pszString               = QueryStr();
-    DWORD   cchNewLength            = m_cchLen;
-    DWORD   cchLeadingWhitespace    = 0;
-
-    for (LONG ixString = m_cchLen - 1; ixString >= 0; ixString--)
-    {
-        if (isspace(static_cast<unsigned char>(pszString[ixString])) != 0)
-        {
-            pszString[ixString] = '\0';
-            cchNewLength--;
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    DWORD cchTempLength = cchNewLength;
-    for (DWORD ixString = 0; ixString < cchTempLength; ixString++)
-    {
-        if (isspace(static_cast<unsigned char>(pszString[ixString])) != 0)
-        {
-            cchLeadingWhitespace++;
-            cchNewLength--;
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    if (cchNewLength == 0)
-    {
-
-        Reset();
-    }
-    else if (cchLeadingWhitespace > 0)
-    {
-        memmove(pszString, pszString + cchLeadingWhitespace, cchNewLength * sizeof(CHAR));
-        pszString[cchNewLength] = '\0';
-    }
-
-    SyncWithBuffer();
-}
-
-/*++
-
-Routine Description:
-
-    Compares the string to the provided prefix to check for equality
-
-Arguments:
-
-    pStraPrefix - string to compare with
-    fIgnoreCase - indicates whether the string comparison should be case-sensitive
-
-Return Value:
-
-    TRUE if prefix string matches with internal string, FALSE otherwise
-
---*/
-BOOL
-STRA::StartsWith(
-    __in const STRA *   pStraPrefix,
-    __in bool           fIgnoreCase) const
-{
-    _ASSERTE( pStraPrefix != NULL );
-    return StartsWith(pStraPrefix->QueryStr(), fIgnoreCase);
-}
-
-/*++
-
-Routine Description:
-
-    Compares the string to the provided prefix to check for equality
-
-Arguments:
-
-    straPrefix  - string to compare with
-    fIgnoreCase - indicates whether the string comparison should be case-sensitive
-
-Return Value:
-
-    TRUE if prefix string matches with internal string, FALSE otherwise
-
---*/
-BOOL
-STRA::StartsWith(
-    __in const STRA &   straPrefix,
-    __in bool           fIgnoreCase) const
-{
-    return StartsWith(straPrefix.QueryStr(), fIgnoreCase);
-}
-
-/*++
-
-Routine Description:
-
-    Compares the string to the provided prefix to check for equality
-
-Arguments:
-
-    pszPrefix   - string to compare with
-    fIgnoreCase - indicates whether the string comparison should be case-sensitive
-
-Return Value:
-
-    TRUE if prefix string matches with internal string, FALSE otherwise
-
---*/
-BOOL
-STRA::StartsWith(
-    __in PCSTR          pszPrefix,
-    __in bool           fIgnoreCase) const
-{
-    if (pszPrefix == NULL)
-    {
-        return FALSE;
-    }
-
-    size_t  cchPrefix   = 0;
-    HRESULT hr = StringCchLengthA(pszPrefix, STRSAFE_MAX_CCH, &cchPrefix);
-    if (FAILED(hr))
-    {
-        return FALSE;
-    }
-
-    _ASSERTE( cchPrefix <= MAXDWORD );
-    if (cchPrefix > m_cchLen)
-    {
-        return FALSE;
-    }
-
-    BOOL fMatch = FALSE;
-    if ( fIgnoreCase )
-    {
-        fMatch = ( 0 == _strnicmp( QueryStr(), pszPrefix, cchPrefix ) );
-    }
-    else
-    {
-        fMatch = ( 0 == strncmp( QueryStr(), pszPrefix, cchPrefix ) );
-    }
-
-    return fMatch;
-}
-
-/*++
-
-Routine Description:
-
-    Compares the string to the provided suffix to check for equality
-
-Arguments:
-
-    pStraSuffix - string to compare with
-    fIgnoreCase - indicates whether the string comparison should be case-sensitive
-
-Return Value:
-
-    TRUE if suffix string matches with internal string, FALSE otherwise
-
---*/
-BOOL
-STRA::EndsWith(
-    __in const STRA *   pStraSuffix,
-    __in bool           fIgnoreCase) const
-{
-    _ASSERTE( pStraSuffix != NULL );
-    return EndsWith(pStraSuffix->QueryStr(), fIgnoreCase);
-}
-
-
-/*++
-
-Routine Description:
-
-    Compares the string to the provided suffix to check for equality
-
-Arguments:
-
-    straSuffix  - string to compare with
-    fIgnoreCase - indicates whether the string comparison should be case-sensitive
-
-Return Value:
-
-    TRUE if suffix string matches with internal string, FALSE otherwise
-
---*/
-BOOL
-STRA::EndsWith(
-    __in const STRA &   straSuffix,
-    __in bool           fIgnoreCase) const
-{
-    return EndsWith(straSuffix.QueryStr(), fIgnoreCase);
-}
-
-
-/*++
-
-Routine Description:
-
-    Compares the string to the provided suffix to check for equality
-
-Arguments:
-
-    pszSuffix   - string to compare with
-    fIgnoreCase - indicates whether the string comparison should be case-sensitive
-
-Return Value:
-
-    TRUE if suffix string matches with internal string, FALSE otherwise
-
---*/
-BOOL
-STRA::EndsWith(
-    __in PCSTR          pszSuffix,
-    __in bool           fIgnoreCase) const
-{
-    PSTR      pszString   = QueryStr();
-
-    if (pszSuffix == NULL)
-    {
-        return FALSE;
-    }
-
-    size_t    cchSuffix   = 0;
-    HRESULT hr = StringCchLengthA(pszSuffix, STRSAFE_MAX_CCH, &cchSuffix);
-    if (FAILED(hr))
-    {
-        return FALSE;
-    }
-
-    _ASSERTE( cchSuffix <= MAXDWORD );
-    if (cchSuffix > m_cchLen)
-    {
-        return FALSE;
-    }
-
-    ptrdiff_t ixOffset = m_cchLen - cchSuffix;
-    _ASSERTE(ixOffset >= 0 && ixOffset <= MAXDWORD);
-
-    BOOL fMatch = FALSE;
-    if ( fIgnoreCase )
-    {
-        fMatch = ( 0 == _strnicmp( pszString + ixOffset, pszSuffix, cchSuffix ) );
-    }
-    else
-    {
-        fMatch = ( 0 == strncmp( pszString + ixOffset, pszSuffix, cchSuffix ) );
-    }
-
-    return fMatch;
-}
-
-
-/*++
-
-Routine Description:
-
-    Searches the string for the first occurrence of the specified character.
-
-Arguments:
-
-    charValue       - character to find
-    dwStartIndex    - the initial index.
-
-Return Value:
-
-    The index for the first character occurrence in the string.
-
-    -1 if not found.
-
---*/
-INT
-STRA::IndexOf(
-    __in CHAR           charValue,
-    __in DWORD          dwStartIndex
-    ) const
-{
-    INT nIndex = -1;
-
-    // Make sure that there are no buffer overruns.
-    if ( dwStartIndex >= QueryCCH() )
-    {
-        return nIndex;
-    }
-
-    const CHAR* pChar = strchr( QueryStr() + dwStartIndex, charValue );
-
-    // Determine the index if found
-    if ( pChar )
-    {
-        // nIndex will be set to -1 on failure.
-        (VOID)SizeTToInt( pChar - QueryStr(), &nIndex );
-    }
-
-    return nIndex;
-}
-
-
-/*++
-
-Routine Description:
-
-    Searches the string for the first occurrence of the specified substring.
-
-Arguments:
-
-    pszValue        - substring to find
-    dwStartIndex    - initial index.
-
-Return Value:
-
-    The index for the first character occurrence in the string.
-
-    -1 if not found.
-
---*/
-INT
-STRA::IndexOf(
-    __in PCSTR          pszValue,
-    __in DWORD          dwStartIndex
-    ) const
-{
-    INT nIndex = -1;
-
-    // Validate input parameters
-    if( dwStartIndex >= QueryCCH() || !pszValue )
-    {
-        return nIndex;
-    }
-
-    const CHAR* pChar = strstr( QueryStr() + dwStartIndex, pszValue );
-
-    // Determine the index if found
-    if( pChar )
-    {
-        // nIndex will be set to -1 on failure.
-        (VOID)SizeTToInt( pChar - QueryStr(), &nIndex );
-    }
-
-    return nIndex;
-}
-
-
-/*++
-
-Routine Description:
-
-    Searches the string for the last occurrence of the specified character.
-
-Arguments:
-
-    charValue       - character to find
-    dwStartIndex    - initial index.
-
-Return Value:
-
-    The index for the last character occurrence in the string.
-
-    -1 if not found.
-
---*/
-INT
-STRA::LastIndexOf(
-    __in CHAR           charValue,
-    __in DWORD          dwStartIndex
-    ) const
-{
-    INT nIndex = -1;
-
-    // Make sure that there are no buffer overruns.
-    if( dwStartIndex >= QueryCCH() )
-    {
-        return nIndex;
-    }
-
-    const CHAR* pChar = strrchr( QueryStr() + dwStartIndex, charValue );
-
-    // Determine the index if found
-    if( pChar )
-    {
-        // nIndex will be set to -1 on failure.
-        (VOID)SizeTToInt( pChar - QueryStr(), &nIndex );
-    }
-
-    return nIndex;
-}
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h
index 0d1f50d50c93..546895b47ce2 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h
@@ -6,10 +6,6 @@
 #include "buffer.h"
 #include <strsafe.h>
 
-
-#pragma warning( push )
-#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS )
-
 class STRA
 {
 
@@ -39,88 +35,6 @@ class STRA
         __in BOOL           fIgnoreCase = FALSE
     ) const;
 
-    BOOL
-    Equals(
-        __in const STRA &  strRhs,
-        __in BOOL           fIgnoreCase = FALSE
-    ) const;
-
-    static
-    BOOL
-    Equals(
-        __in PCSTR          pszLhs,
-        __in PCSTR          pszRhs,
-        __in bool           fIgnoreCase = false
-    )
-    {
-        // Return FALSE if either or both strings are NULL.
-        if (!pszLhs || !pszRhs) return FALSE;
-
-        if( fIgnoreCase )
-        {
-            return ( 0 == _stricmp( pszLhs, pszRhs ) );
-        }
-
-        return ( 0 == strcmp( pszLhs, pszRhs ) );
-    }
-
-    VOID
-    Trim();
-
-    BOOL
-    StartsWith(
-        __in const STRA *   pStraPrefix,
-        __in bool           fIgnoreCase = FALSE
-    ) const;
-
-    BOOL
-    StartsWith(
-        __in const STRA &   straPrefix,
-        __in bool           fIgnoreCase = FALSE
-    ) const;
-
-    BOOL
-    StartsWith(
-        __in PCSTR          pszPrefix,
-        __in bool           fIgnoreCase = FALSE
-    ) const;
-
-    BOOL
-    EndsWith(
-        __in const STRA *   pStraSuffix,
-        __in bool           fIgnoreCase = FALSE
-    ) const;
-
-    BOOL
-    EndsWith(
-        __in const STRA &   straSuffix,
-        __in bool           fIgnoreCase = FALSE
-    ) const;
-
-    BOOL
-    EndsWith(
-        __in PCSTR          pszSuffix,
-        __in bool           fIgnoreCase = FALSE
-    ) const;
-
-    INT
-    IndexOf(
-        __in CHAR           charValue,
-        __in DWORD          dwStartIndex = 0
-    ) const;
-
-    INT
-    IndexOf(
-        __in PCSTR          pszValue,
-        __in DWORD          dwStartIndex = 0
-    ) const;
-
-    INT
-    LastIndexOf(
-        __in CHAR           charValue,
-        __in DWORD          dwStartIndex = 0
-    ) const;
-
     DWORD
     QueryCB(
     ) const;
@@ -143,6 +57,8 @@ class STRA
     QueryStr(
     ) const;
 
+    VOID EnsureNullTerminated();
+
     VOID
     Reset(
     );
@@ -203,18 +119,6 @@ class STRA
         );
     }
 
-    HRESULT
-    CopyWTruncate(
-        __in PCWSTR pszCopyWTruncate
-    );
-
-    HRESULT
-    CopyWTruncate(
-        __in_ecount(cchLen)
-        PCWSTR          pszCopyWTruncate,
-        __in SIZE_T     cchLen
-    );
-
     HRESULT
     Append(
         __in PCSTR pszAppend
@@ -227,11 +131,6 @@ class STRA
         __in SIZE_T cbLen
     );
 
-    HRESULT
-    Append(
-        __in const STRA * pstrRhs
-    );
-
     HRESULT
     Append(
         __in const STRA & strRhs
@@ -276,36 +175,12 @@ class STRA
         );
     }
 
-    HRESULT
-    AppendWTruncate(
-        __in PCWSTR pszAppendWTruncate
-    );
-
-    HRESULT
-    AppendWTruncate(
-        __in_ecount(cchLen)
-        PCWSTR          pszAppendWTruncate,
-        __in SIZE_T     cchLen
-    );
-
     HRESULT
     CopyToBuffer(
         __out_bcount(*pcb) CHAR*    pszBuffer,
         __inout DWORD *             pcb
     ) const;
 
-    HRESULT
-    SetLen(
-        __in DWORD cchLen
-    );
-
-    HRESULT
-    SafeSnprintf(
-        __in __format_string
-        PCSTR       pszFormatString,
-        ...
-    );
-
     HRESULT
     SafeVsnprintf(
         __in __format_string
@@ -313,18 +188,6 @@ class STRA
         va_list     argsList
     );
 
-    HRESULT
-    Escape(
-    );
-
-    HRESULT
-    EscapeUtf8(
-    );
-
-    VOID
-    Unescape(
-    );
-
     HRESULT
     CopyWToUTF8Unescaped(
         __in LPCWSTR cpchStr
@@ -337,18 +200,6 @@ class STRA
         __in DWORD      cch
     );
 
-    HRESULT
-    CopyWToUTF8Escaped(
-        __in LPCWSTR cpchStr
-    );
-
-    HRESULT
-    CopyWToUTF8Escaped(
-        __in_ecount(cch)
-        LPCWSTR         cpchStr,
-        __in DWORD      cch
-    );
-
 private:
 
     //
@@ -431,15 +282,6 @@ class STRA
         __in UINT                   uCodePage
     );
 
-    static
-    HRESULT
-    ConvertUnicodeToMultiByte(
-        __in_ecount(dwStringLen)
-        LPCWSTR                     pszSrcUnicodeString,
-        __in BUFFER_T<CHAR,1> *     pbufDstAnsiString,
-        __in DWORD                  dwStringLen
-    );
-
     static
     HRESULT
     ConvertUnicodeToUTF8(
@@ -451,11 +293,6 @@ class STRA
 
     typedef bool (* PFN_F_SHOULD_ESCAPE)(BYTE ch);
 
-    HRESULT
-    EscapeInternal(
-        PFN_F_SHOULD_ESCAPE pfnFShouldEscape
-    );
-
     //
     // Buffer with an inline buffer of 1,
     // enough to hold null-terminating character.
@@ -464,28 +301,6 @@ class STRA
     DWORD               m_cchLen;
 };
 
-inline
-HRESULT
-AppendToString(
-    ULONGLONG Number,
-    STRA & String
-)
-{
-    // prefast complains Append requires input
-    // to be null terminated, so zero initialize
-    // and pass the size of the buffer minus one
-    // to _ui64toa_s
-    CHAR chNumber[32] = {0};
-    if (_ui64toa_s(Number,
-                   chNumber,
-                   sizeof(chNumber) - sizeof(CHAR),
-                   10) != 0)
-    {
-        return E_INVALIDARG;
-    }
-    return String.Append(chNumber);
-}
-
 template<DWORD size>
 CHAR* InitHelper(__out CHAR (&psz)[size])
 {
@@ -498,10 +313,3 @@ CHAR* InitHelper(__out CHAR (&psz)[size])
 //
 #define STACK_STRA(name, size)  CHAR __ach##name[size];\
                                 STRA  name(InitHelper(__ach##name), sizeof(__ach##name))
-
-#define INLINE_STRA(name, size) CHAR __ach##name[size];\
-                                STRA  name;
-
-#define INLINE_STRA_INIT(name) name(InitHelper(__ach##name), sizeof(__ach##name))
-
-#pragma warning( pop )
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.cpp
index e76087708297..b6350d90ba5b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.cpp
@@ -4,12 +4,8 @@
 
 #include "precomp.h"
 
-#pragma warning( push )
-#pragma warning ( disable : 4267 ALL_CODE_ANALYSIS_WARNINGS )
-
-STRU::STRU(
-    VOID
-) : m_cchLen( 0 )
+STRU::STRU()
+    : m_cchLen( 0 )
 {
     *(QueryStr()) = L'\0';
 }
@@ -38,7 +34,7 @@ STRU::STRU(
 --*/
 {
     _ASSERTE( cchInit <= (MAXDWORD / sizeof( WCHAR )) );
-    _ASSERTE( NULL != pbInit );
+    _ASSERTE(nullptr != pbInit );
     _ASSERTE(cchInit > 0 );
     _ASSERTE(pbInit[0] == L'\0');
 }
@@ -99,7 +95,7 @@ STRU::Reset(
 // Resets the internal string to be NULL string. Buffer remains cached.
 //
 {
-    _ASSERTE( QueryStr() != NULL );
+    _ASSERTE(QueryStr() != nullptr);
     *(QueryStr()) = L'\0';
     m_cchLen = 0;
 }
@@ -181,7 +177,7 @@ STRU::Copy(
     __in const STRU * pstrRhs
 )
 {
-    _ASSERTE( NULL != pstrRhs );
+    _ASSERTE(nullptr != pstrRhs);
     return Copy( pstrRhs->QueryStr(), pstrRhs->QueryCCH() );
 }
 
@@ -322,7 +318,7 @@ STRU::Append(
     __in const STRU * pstrRhs
 )
 {
-    _ASSERTE( NULL != pstrRhs );
+    _ASSERTE(nullptr != pstrRhs);
     return Append( pstrRhs->QueryStr(), pstrRhs->QueryCCH() );
 }
 
@@ -383,8 +379,8 @@ STRU::CopyToBuffer(
 // Makes a copy of the stored string into the given buffer
 //
 {
-    _ASSERTE( NULL != pszBuffer );
-    _ASSERTE( NULL != pcb );
+    _ASSERTE(nullptr != pszBuffer);
+    _ASSERTE(nullptr != pcb);
 
     HRESULT hr          = S_OK;
     DWORD   cbNeeded    = QueryCB() + sizeof( WCHAR );
@@ -466,7 +462,11 @@ Return Value:
 
     HRESULT hr = SafeVsnwprintf(pwszFormatString, argsList);
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // va_end uses 0
     va_end( argsList );
+#pragma warning(pop)
+
     return hr;
 }
 
@@ -610,8 +610,8 @@ Return Value:
     //
     for ( SIZE_T i = 0; i < cNumStrings; i++ )
     {
-        _ASSERTE( rgpszStrings[ i ] != NULL );
-        if ( NULL == rgpszStrings[ i ] )
+        _ASSERTE( rgpszStrings[ i ] != nullptr );
+        if ( nullptr == rgpszStrings[ i ] )
         {
             return E_INVALIDARG;
         }
@@ -700,7 +700,7 @@ Return Value:
 
 --*/
 {
-    _ASSERTE( NULL != pStr );
+    _ASSERTE( nullptr != pStr );
     _ASSERTE( 0 == cbStr % sizeof( WCHAR ) );
     _ASSERTE( cbOffset <= QueryCB() );
     _ASSERTE( 0 == cbOffset % sizeof( WCHAR ) );
@@ -756,11 +756,11 @@ Return Value:
 
 --*/
 {
-    _ASSERTE( NULL != pStr );
+    _ASSERTE( nullptr != pStr );
     _ASSERTE( cbOffset <= QueryCB() );
     _ASSERTE( 0 == cbOffset % sizeof( WCHAR ) );
 
-    if ( NULL == pStr )
+    if ( nullptr == pStr )
     {
         return E_INVALIDARG;
     }
@@ -905,7 +905,7 @@ STRU::StartsWith(
     __in PCWSTR         pwszPrefix,
     __in bool           fIgnoreCase) const
 {
-    if (pwszPrefix == NULL)
+    if (pwszPrefix == nullptr)
     {
         return FALSE;
     }
@@ -923,23 +923,20 @@ STRU::StartsWith(
         return FALSE;
     }
 
-    BOOL fMatch = FALSE;
-#if defined( NTDDI_VERSION ) && NTDDI_VERSION >= NTDDI_LONGHORN
-    fMatch = ( CSTR_EQUAL == CompareStringOrdinal( QueryStr(),
-                                                    cchPrefix,
-                                                    pwszPrefix,
-                                                    cchPrefix,
-                                                    fIgnoreCase ) );
-#else
-    if( fIgnoreCase )
-    {
-        fMatch = ( 0 == _wcsnicmp( QueryStr(), pwszPrefix, cchPrefix ) );
-    }
-    else
+    if (cchPrefix > MAXINT)
     {
-        fMatch = ( 0 == wcsncmp( QueryStr(), pwszPrefix, cchPrefix ) );
+        return FALSE;
     }
-#endif
+
+    int cchPrefixInt = static_cast<int>(cchPrefix);
+
+    BOOL fMatch = FALSE;
+    fMatch = (CSTR_EQUAL == CompareStringOrdinal(
+        QueryStr(),
+        cchPrefixInt,
+        pwszPrefix,
+        cchPrefixInt,
+        fIgnoreCase));
 
     return fMatch;
 }
@@ -970,7 +967,7 @@ STRU::EndsWith(
     PWSTR       pwszString  = QueryStr();
     size_t      cchSuffix   = 0;
 
-    if (pwszSuffix == NULL)
+    if (pwszSuffix == nullptr)
     {
         return FALSE;
     }
@@ -987,26 +984,23 @@ STRU::EndsWith(
         return FALSE;
     }
 
+    if (cchSuffix > MAXINT)
+    {
+        return FALSE;
+    }
+
+    int cchSuffixInt = static_cast<int>(cchSuffix);
+
     ptrdiff_t ixOffset = m_cchLen - cchSuffix;
     _ASSERTE(ixOffset >= 0 && ixOffset <= MAXDWORD);
 
     BOOL fMatch = FALSE;
-#if defined( NTDDI_VERSION ) && NTDDI_VERSION >= NTDDI_LONGHORN
-    fMatch = ( CSTR_EQUAL == CompareStringOrdinal( pwszString + ixOffset,
-                                                    cchSuffix,
-                                                    pwszSuffix,
-                                                    cchSuffix,
-                                                    fIgnoreCase ) );
-#else
-    if( fIgnoreCase )
-    {
-        fMatch = ( 0 == _wcsnicmp( pwszString + ixOffset, pwszSuffix, cchSuffix ) );
-    }
-    else
-    {
-        fMatch = ( 0 == wcsncmp( pwszString + ixOffset, pwszSuffix, cchSuffix ) );
-    }
-#endif
+    fMatch = (CSTR_EQUAL == CompareStringOrdinal(
+        pwszString + ixOffset,
+        cchSuffixInt,
+        pwszSuffix,
+        cchSuffixInt,
+        fIgnoreCase));
 
     return fMatch;
 }
@@ -1144,58 +1138,3 @@ STRU::LastIndexOf(
 
     return nIndex;
 }
-
-//static
-HRESULT
-STRU::ExpandEnvironmentVariables(
-    __in  PCWSTR                  pszString,
-    __out STRU *                  pstrExpandedString
-    )
-/*++
-Routine Description:
-    Expand the environment variables in a string
-Arguments:
-    pszString - String with environment variables to expand
-    pstrExpandedString - Receives expanded string on success
-Return Value:
-    HRESULT
---*/
-{
-    if (pszString == NULL || pstrExpandedString == NULL)
-    {
-        DBG_ASSERT( FALSE );
-        return HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
-    }
-
-    DWORD cchNewSize = ExpandEnvironmentStrings(pszString,
-                                                pstrExpandedString->QueryStr(),
-                                                pstrExpandedString->QuerySizeCCH());
-    if (cchNewSize == 0)
-    {
-        return HRESULT_FROM_WIN32(GetLastError());
-    }
-
-    if (cchNewSize > pstrExpandedString->QuerySizeCCH())
-    {
-        HRESULT hr = pstrExpandedString->Resize(( cchNewSize + 1 ) * sizeof( WCHAR ));
-        if (FAILED(hr))
-        {
-            return hr;
-        }
-
-        cchNewSize = ExpandEnvironmentStrings(
-            pszString,
-            pstrExpandedString->QueryStr(),
-            pstrExpandedString->QuerySizeCCH()
-            );
-        if (cchNewSize == 0 || cchNewSize > pstrExpandedString->QuerySizeCCH())
-        {
-            return HRESULT_FROM_WIN32( GetLastError() );
-        }
-    }
-
-    pstrExpandedString->SyncWithBuffer();
-    return S_OK;
-}
-
-#pragma warning( pop )
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.h
index cde9aa00e584..3c8348fc41aa 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringu.h
@@ -7,9 +7,6 @@
 #include <CodeAnalysis/Warnings.h>
 #include <strsafe.h>
 
-#pragma warning( push )
-#pragma warning ( disable : ALL_CODE_ANALYSIS_WARNINGS )
-
 class STRU
 {
 
@@ -53,7 +50,7 @@ class STRU
     ) const
     {
         _ASSERTE( NULL != pszRhs );
-        if ( NULL == pszRhs )
+        if ( nullptr == pszRhs )
         {
             return FALSE;
         }
@@ -348,12 +345,7 @@ class STRU
         __in PCWSTR pwszFormatString,
         va_list     argsList
     );
-    
-    static
-    HRESULT  ExpandEnvironmentVariables(
-        __in PCWSTR                  pszString,
-        __out STRU *                 pstrExpandedString
-    );
+
 private:
 
     //
@@ -423,4 +415,3 @@ MakePathCanonicalizationProof(
     IN PCWSTR               pszName,
     OUT STRU *              pstrPath
 );
-#pragma warning( pop )
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c
index 6c0d08029932..d16019f1e986 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c
@@ -10,7 +10,6 @@
 #define FREE_MEM(ptr) (VOID)LocalFree( (HLOCAL)(ptr) )
 
 
-
 PTRACE_LOG
 CreateTraceLog(
     IN LONG LogSize,
@@ -46,7 +45,7 @@ Return Value:
     ULONG ulEntrySize = 0;
     ULONG ulTmpResult = 0;
     ULONG ulExtraBytesInHeader = 0;
-    PTRACE_LOG log = NULL;
+    PTRACE_LOG log = nullptr;
     HRESULT hr = S_OK;
 
     //
@@ -67,14 +66,14 @@ Return Value:
     ulExtraBytesInHeader = (ULONG) ExtraBytesInHeader;
 
     //
-    // Check if the multiplication operation will overflow a LONG 
+    // Check if the multiplication operation will overflow a LONG
     // ulTotalSize = LogSize * EntrySize;
     //
     hr = ULongMult( ulLogSize, ulEntrySize, &ulTotalSize );
     if ( FAILED(hr) )
-    { 
+    {
         SetLastError( ERROR_ARITHMETIC_OVERFLOW );
-        return NULL;
+        return nullptr;
     }
 
     //
@@ -83,26 +82,26 @@ Return Value:
     //
     hr = ULongAdd( (ULONG) sizeof(TRACE_LOG), ulExtraBytesInHeader, &ulTmpResult );
     if ( FAILED(hr) )
-    { 
+    {
         SetLastError( ERROR_ARITHMETIC_OVERFLOW );
-        return NULL;
+        return nullptr;
     }
-  
+
     //
     // check for overflow in addition operation.
     // ulTotalSize = ulTotalSize + ulTmpResult;
     //
     hr = ULongAdd( ulTmpResult, ulTotalSize, &ulTotalSize );
     if ( FAILED(hr) )
-    { 
+    {
         SetLastError( ERROR_ARITHMETIC_OVERFLOW );
-        return NULL;
+        return nullptr;
     }
 
     if ( ulTotalSize > (ULONG) 0x7FFFFFFF )
-    { 
+    {
         SetLastError( ERROR_ARITHMETIC_OVERFLOW );
-        return NULL;
+        return nullptr;
     }
 
     //
@@ -115,7 +114,7 @@ Return Value:
     // Initialize it.
     //
 
-    if( log != NULL ) {
+    if( log != nullptr ) {
 
         RtlZeroMemory( log, ulTotalSize );
 
@@ -130,7 +129,6 @@ Return Value:
 
 }   // CreateTraceLog
 
-
 VOID
 DestroyTraceLog(
     IN PTRACE_LOG Log
@@ -151,7 +149,7 @@ Return Value:
 
 --*/
 {
-        if ( Log != NULL ) {
+        if ( Log != nullptr ) {
         //DBG_ASSERT( Log->Signature == TRACE_LOG_SIGNATURE );
 
         Log->Signature = TRACE_LOG_SIGNATURE_X;
@@ -160,7 +158,6 @@ Return Value:
 
 }   // DestroyTraceLog
 
-
 LONG
 WriteTraceLog(
     IN PTRACE_LOG Log,
@@ -187,8 +184,8 @@ Return Value:
 --*/
 {
 
-    PUCHAR target;
-    ULONG index;
+    PUCHAR target = nullptr;
+    ULONG index = 0;
 
     //DBG_ASSERT( Log != NULL );
     //DBG_ASSERT( Log->Signature == TRACE_LOG_SIGNATURE );
@@ -213,7 +210,6 @@ Return Value:
     return index;
 }   // WriteTraceLog
 
-
 VOID
 ResetTraceLog(
     IN PTRACE_LOG Log
@@ -231,4 +227,3 @@ ResetTraceLog(
     Log->NextEntry = -1;
 
 }   // ResetTraceLog
-
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/treehash.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/treehash.h
deleted file mode 100644
index 087e8abf7470..000000000000
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/treehash.h
+++ /dev/null
@@ -1,850 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#pragma once
-
-#include <crtdbg.h>
-#include "rwlock.h"
-#include "prime.h"
-
-template <class _Record>
-class TREE_HASH_NODE
-{
-    template <class _Record>
-    friend class TREE_HASH_TABLE;
-
- private:
-    // Next node in the hash table look-aside
-    TREE_HASH_NODE<_Record> *_pNext;
-
-    // links in the tree structure
-    TREE_HASH_NODE *    _pParentNode;
-    TREE_HASH_NODE *    _pFirstChild;
-    TREE_HASH_NODE *    _pNextSibling;
-
-    // actual record
-    _Record *           _pRecord;
-
-    // hash value
-    PCWSTR              _pszPath;
-    DWORD               _dwHash;
-};
-
-template <class _Record>
-class TREE_HASH_TABLE
-{
-protected:
-    typedef BOOL
-    (PFN_DELETE_IF)(
-        _Record *           pRecord,
-        PVOID               pvContext
-    );
-
-    typedef VOID
-    (PFN_APPLY)(
-        _Record *           pRecord,
-        PVOID               pvContext
-    );
-
-public:
-    TREE_HASH_TABLE(
-        BOOL    fCaseSensitive
-    ) : _ppBuckets( NULL ),
-        _nBuckets( 0 ),
-        _nItems( 0 ),
-        _fCaseSensitive( fCaseSensitive )
-    {
-    }
-
-    virtual
-    ~TREE_HASH_TABLE();
-
-    virtual
-    VOID
-    ReferenceRecord(
-        _Record *   pRecord
-    ) = 0;
-
-    virtual
-    VOID
-    DereferenceRecord(
-        _Record *   pRecord
-    ) = 0;
-
-    virtual
-    PCWSTR
-    GetKey(
-        _Record *   pRecord
-    ) = 0;
-
-    DWORD
-    Count()
-    {
-        return _nItems;
-    }
-
-    virtual
-    VOID
-    Clear();
-
-    HRESULT
-    Initialize(
-        DWORD           nBucketSize
-    );
-
-    DWORD
-    CalcHash(
-        PCWSTR      pszKey
-    )
-    {
-        return _fCaseSensitive ? HashString(pszKey) : HashStringNoCase(pszKey);
-    }
-
-    virtual
-    VOID
-    FindKey(
-        PCWSTR      pszKey,
-        _Record **  ppRecord
-    );
-
-    virtual
-    HRESULT
-    InsertRecord(
-        _Record *   pRecord
-    );
-
-    virtual
-    VOID
-    DeleteKey(
-        PCWSTR      pszKey
-    );
-
-    virtual
-    VOID
-    DeleteIf(
-        PFN_DELETE_IF       pfnDeleteIf,
-        PVOID               pvContext
-    );
-
-    VOID
-    Apply(
-        PFN_APPLY           pfnApply,
-        PVOID               pvContext
-    );
-
-private:
-
-    BOOL
-    FindNodeInternal(
-        PCWSTR                      pszKey,
-        DWORD                       dwHash,
-        TREE_HASH_NODE<_Record> **  ppNode,
-        TREE_HASH_NODE<_Record> *** pppPreviousNodeNextPointer = NULL
-    );
-
-    HRESULT
-    AddNodeInternal(
-        PCWSTR                      pszPath,
-        DWORD                       dwHash,
-        _Record *                   pRecord,
-        TREE_HASH_NODE<_Record> *   pParentNode,
-        TREE_HASH_NODE<_Record> **  ppNewNode
-    );
-
-    HRESULT
-    AllocateNode(
-        PCWSTR                      pszPath,
-        DWORD                       dwHash,
-        _Record *                   pRecord,
-        TREE_HASH_NODE<_Record> *   pParentNode,
-        TREE_HASH_NODE<_Record> **  ppNewNode
-    );
-
-    VOID
-    DeleteNode(
-        TREE_HASH_NODE<_Record> *   pNode
-    )
-    {
-        if (pNode->_pRecord != NULL)
-        {
-            DereferenceRecord(pNode->_pRecord);
-            pNode->_pRecord = NULL;
-        }
-
-        HeapFree(GetProcessHeap(),
-                 0,
-                 pNode);
-    }
-
-    VOID
-    DeleteNodeInternal(
-        TREE_HASH_NODE<_Record> **  ppPreviousNodeNextPointer,
-        TREE_HASH_NODE<_Record> *   pNode
-    );
-
-    VOID
-    RehashTableIfNeeded(
-        VOID
-    );
-
-    TREE_HASH_NODE<_Record> **  _ppBuckets;
-    DWORD                       _nBuckets;
-    DWORD                       _nItems;
-    BOOL                        _fCaseSensitive;
-    CWSDRWLock                  _tableLock;
-};
-
-template <class _Record>
-HRESULT
-TREE_HASH_TABLE<_Record>::AllocateNode(
-    PCWSTR                      pszPath,
-    DWORD                       dwHash,
-    _Record *                   pRecord,
-    TREE_HASH_NODE<_Record> *   pParentNode,
-    TREE_HASH_NODE<_Record> **  ppNewNode
-)
-{
-    //
-    // Allocate enough extra space for pszPath
-    //
-    DWORD cchPath = (DWORD) wcslen(pszPath);
-    if (cchPath >= ((0xffffffff - sizeof(TREE_HASH_NODE<_Record>))/sizeof(WCHAR) - 1))
-    {
-        return HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-    }
-    TREE_HASH_NODE<_Record> *pNode = (TREE_HASH_NODE<_Record> *)HeapAlloc(
-            GetProcessHeap(),
-            HEAP_ZERO_MEMORY,
-            sizeof(TREE_HASH_NODE<_Record>) + (cchPath+1)*sizeof(WCHAR));
-    if (pNode == NULL)
-    {
-        return HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-    }
-
-    memcpy(pNode+1, pszPath, (cchPath+1)*sizeof(WCHAR));
-    pNode->_pszPath = (PCWSTR)(pNode+1);
-    pNode->_dwHash = dwHash;
-    pNode->_pNext = pNode->_pNextSibling = pNode->_pFirstChild = NULL;
-    pNode->_pParentNode = pParentNode;
-    pNode->_pRecord = pRecord;
-
-    *ppNewNode = pNode;
-    return S_OK;
-}
-
-template <class _Record>
-HRESULT
-TREE_HASH_TABLE<_Record>::Initialize(
-    DWORD   nBuckets
-)
-{
-    HRESULT hr = S_OK;
-
-    if ( nBuckets == 0 )
-    {
-        hr = E_INVALIDARG;
-        goto Failed;
-    }
-
-    hr = _tableLock.Init();
-    if ( FAILED( hr ) )
-    {
-        goto Failed;
-    }
-
-    if (nBuckets >= 0xffffffff/sizeof(TREE_HASH_NODE<_Record> *))
-    {
-        hr = E_INVALIDARG;
-        goto Failed;
-    }
-
-    _ppBuckets = (TREE_HASH_NODE<_Record> **)HeapAlloc(
-                            GetProcessHeap(),
-                            HEAP_ZERO_MEMORY,
-                            nBuckets*sizeof(TREE_HASH_NODE<_Record> *));
-    if (_ppBuckets == NULL)
-    {
-        hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-        goto Failed;
-    }
-    _nBuckets = nBuckets;
-
-    return S_OK;
-
-Failed:
-
-    if (_ppBuckets)
-    {
-        HeapFree(GetProcessHeap(),
-                 0,
-                 _ppBuckets);
-        _ppBuckets = NULL;
-    }
-
-    return hr;
-}
-
-
-template <class _Record>
-TREE_HASH_TABLE<_Record>::~TREE_HASH_TABLE()
-{
-    if (_ppBuckets == NULL)
-    {
-        return;
-    }
-
-    _ASSERTE(_nItems == 0);
-
-    HeapFree(GetProcessHeap(),
-             0,
-             _ppBuckets);
-    _ppBuckets = NULL;
-    _nBuckets = 0;
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::Clear()
-{
-    TREE_HASH_NODE<_Record> *pCurrent;
-    TREE_HASH_NODE<_Record> *pNext;
-
-    _tableLock.ExclusiveAcquire();
-
-    for (DWORD i=0; i<_nBuckets; i++)
-    {
-        pCurrent = _ppBuckets[i];
-        _ppBuckets[i] = NULL;
-        while (pCurrent != NULL)
-        {
-            pNext = pCurrent->_pNext;
-            DeleteNode(pCurrent);
-            pCurrent = pNext;
-        }
-    }
-
-    _nItems = 0;
-    _tableLock.ExclusiveRelease();
-}
-
-template <class _Record>
-BOOL
-TREE_HASH_TABLE<_Record>::FindNodeInternal(
-    PCWSTR                  pszKey,
-    DWORD                   dwHash,
-    TREE_HASH_NODE<_Record> **   ppNode,
-    TREE_HASH_NODE<_Record> ***  pppPreviousNodeNextPointer
-)
-/*++
-  Return value indicates whether the item is found
-  key, dwHash - key and hash for the node to find
-  ppNode - on successful return, the node found, on failed return, the first
-  node with hash value greater than the node to be found
-  pppPreviousNodeNextPointer - the pointer to previous node's _pNext
-
-  This routine may be called under either read or write lock
---*/
-{
-    TREE_HASH_NODE<_Record> **ppPreviousNodeNextPointer;
-    TREE_HASH_NODE<_Record> *pNode;
-    BOOL fFound = FALSE;
-
-    ppPreviousNodeNextPointer = _ppBuckets + (dwHash % _nBuckets);
-    pNode = *ppPreviousNodeNextPointer;
-    while (pNode != NULL)
-    {
-        if (pNode->_dwHash == dwHash)
-        {
-            if (CompareStringOrdinal(pszKey,
-                                     -1,
-                                     pNode->_pszPath,
-                                     -1,
-                                     !_fCaseSensitive) == CSTR_EQUAL)
-            {
-                fFound = TRUE;
-                break;
-            }
-        }
-        else if (pNode->_dwHash > dwHash)
-        {
-            break;
-        }
-
-        ppPreviousNodeNextPointer = &(pNode->_pNext);
-        pNode = *ppPreviousNodeNextPointer;
-    }
-
-    *ppNode = pNode;
-    if (pppPreviousNodeNextPointer != NULL)
-    {
-        *pppPreviousNodeNextPointer = ppPreviousNodeNextPointer;
-    }
-    return fFound;
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::FindKey(
-    PCWSTR              pszKey,
-    _Record **          ppRecord
-)
-{
-    TREE_HASH_NODE<_Record> *pNode;
-
-    *ppRecord = NULL;
-
-    DWORD dwHash = CalcHash(pszKey);
-
-    _tableLock.SharedAcquire();
-
-    if (FindNodeInternal(pszKey, dwHash, &pNode) &&
-        pNode->_pRecord != NULL)
-    {
-        ReferenceRecord(pNode->_pRecord);
-        *ppRecord = pNode->_pRecord;
-    }
-
-    _tableLock.SharedRelease();
-}
-
-template <class _Record>
-HRESULT
-TREE_HASH_TABLE<_Record>::AddNodeInternal(
-    PCWSTR                      pszPath,
-    DWORD                       dwHash,
-    _Record *                   pRecord,
-    TREE_HASH_NODE<_Record> *   pParentNode,
-    TREE_HASH_NODE<_Record> **  ppNewNode
-)
-/*++
-  Return value is HRESULT indicating success or failure
-  pszPath, dwHash, pRecord - path, hash value and record to be inserted
-  pParentNode - this will be the parent of the node being inserted
-  ppNewNode - on successful return, the new node created and inserted
-
-  This function may be called under a read or write lock
---*/
-{
-    TREE_HASH_NODE<_Record> *pNewNode;
-    TREE_HASH_NODE<_Record> *pNextNode;
-    TREE_HASH_NODE<_Record> **ppNextPointer;
-    HRESULT hr;
-
-    //
-    // Ownership of pRecord is not transferred to pNewNode yet, so remember
-    // to either set it to null before deleting pNewNode or add an extra
-    // reference later - this is to make sure we do not do an extra ref/deref
-    // which users may view as getting flushed out of the hash-table
-    //
-    hr = AllocateNode(pszPath,
-                      dwHash,
-                      pRecord,
-                      pParentNode,
-                      &pNewNode);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-
-    do
-    {
-        //
-        // Find the right place to add this node
-        //
-
-        if (FindNodeInternal(pszPath, dwHash, &pNextNode, &ppNextPointer))
-        {
-            //
-            // If node already there, record may still need updating
-            //
-            if (pRecord != NULL &&
-                InterlockedCompareExchangePointer((PVOID *)&pNextNode->_pRecord,
-                                                  pRecord,
-                                                  NULL) == NULL)
-            {
-                ReferenceRecord(pRecord);
-                hr = S_OK;
-            }
-            else
-            {
-                hr = HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS);
-            }
-
-            // ownership of pRecord has either passed to existing record or
-            // not to anyone at all
-            pNewNode->_pRecord = NULL;
-            DeleteNode(pNewNode);
-            *ppNewNode = pNextNode;
-            return hr;
-        }
-
-        //
-        // If another node got inserted in betwen, we will have to retry
-        //
-        pNewNode->_pNext = pNextNode;
-    } while (InterlockedCompareExchangePointer((PVOID *)ppNextPointer,
-                                               pNewNode,
-                                               pNextNode) != pNextNode);
-    // pass ownership of pRecord now
-    if (pRecord != NULL)
-    {
-        ReferenceRecord(pRecord);
-        pRecord = NULL;
-    }
-    InterlockedIncrement((LONG *)&_nItems);
-
-    //
-    // update the parent
-    //
-    if (pParentNode != NULL)
-    {
-        ppNextPointer = &pParentNode->_pFirstChild;
-        do
-        {
-            pNextNode = *ppNextPointer;
-            pNewNode->_pNextSibling = pNextNode;
-        } while (InterlockedCompareExchangePointer((PVOID *)ppNextPointer,
-                                                   pNewNode,
-                                                   pNextNode) != pNextNode);
-    }
-
-    *ppNewNode = pNewNode;
-    return S_OK;
-}
-
-template <class _Record>
-HRESULT
-TREE_HASH_TABLE<_Record>::InsertRecord(
-    _Record *           pRecord
-)
-/*++
-  This method inserts a node for this record and also empty nodes for paths
-  in the hierarchy leading upto this path
-
-  The insert is done under only a read-lock - this is possible by keeping
-  the hashes in a bucket in increasing order and using interlocked operations
-  to actually insert the item in the hash-bucket lookaside list and the parent
-  children list
-
-  Returns HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) if the record already exists.
-  Never leak this error to the end user because "*file* already exists" may be confusing.
---*/
-{
-    PCWSTR pszKey = GetKey(pRecord);
-    STACK_STRU( strPartialPath, 256);
-    PWSTR pszPartialPath;
-    DWORD dwHash;
-    DWORD cchEnd;
-    HRESULT hr;
-    TREE_HASH_NODE<_Record> *pParentNode = NULL;
-
-    hr = strPartialPath.Copy(pszKey);
-    if (FAILED(hr))
-    {
-        goto Finished;
-    }
-    pszPartialPath = strPartialPath.QueryStr();
-
-    _tableLock.SharedAcquire();
-
-    //
-    // First find the lowest parent node present
-    //
-    for (cchEnd = strPartialPath.QueryCCH() - 1; cchEnd > 0; cchEnd--)
-    {
-        if (pszPartialPath[cchEnd] == L'/' || pszPartialPath[cchEnd] == L'\\')
-        {
-            pszPartialPath[cchEnd] = L'\0';
-
-            dwHash = CalcHash(pszPartialPath);
-            if (FindNodeInternal(pszPartialPath, dwHash, &pParentNode))
-            {
-                pszPartialPath[cchEnd] = pszKey[cchEnd];
-                break;
-            }
-            pParentNode = NULL;
-        }
-    }
-
-    //
-    // Now go ahead and add the rest of the tree (including our record)
-    //
-    for (; cchEnd <= strPartialPath.QueryCCH(); cchEnd++)
-    {
-        if (pszPartialPath[cchEnd] == L'\0')
-        {
-            dwHash = CalcHash(pszPartialPath);
-            hr = AddNodeInternal(
-                    pszPartialPath,
-                    dwHash,
-                    (cchEnd == strPartialPath.QueryCCH()) ? pRecord : NULL,
-                    pParentNode,
-                    &pParentNode);
-            if (FAILED(hr) &&
-                hr != HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS))
-            {
-                goto Finished;
-            }
-
-            pszPartialPath[cchEnd] = pszKey[cchEnd];
-        }
-    }
-
-Finished:
-    _tableLock.SharedRelease();
-
-    if (SUCCEEDED(hr))
-    {
-        RehashTableIfNeeded();
-    }
-
-    return hr;
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::DeleteNodeInternal(
-    TREE_HASH_NODE<_Record> **  ppNextPointer,
-    TREE_HASH_NODE<_Record> *   pNode
-)
-/*++
-  pNode is the node to be deleted
-  ppNextPointer is the pointer to the previous node's next pointer pointing
-  to this node
-
-  This function should be called under write-lock
---*/
-{
-    //
-    // First remove this node from hash table
-    //
-    *ppNextPointer = pNode->_pNext;
-
-    //
-    // Now fixup parent
-    //
-    if (pNode->_pParentNode != NULL)
-    {
-        ppNextPointer = &pNode->_pParentNode->_pFirstChild;
-        while (*ppNextPointer != pNode)
-        {
-            ppNextPointer = &(*ppNextPointer)->_pNextSibling;
-        }
-        *ppNextPointer = pNode->_pNextSibling;
-    }
-
-    //
-    // Now remove all children recursively
-    //
-    TREE_HASH_NODE<_Record> *pChild = pNode->_pFirstChild;
-    TREE_HASH_NODE<_Record> *pNextChild;
-    while (pChild != NULL)
-    {
-        pNextChild = pChild->_pNextSibling;
-
-        ppNextPointer = _ppBuckets + (pChild->_dwHash % _nBuckets);
-        while (*ppNextPointer != pChild)
-        {
-            ppNextPointer = &(*ppNextPointer)->_pNext;
-        }
-        pChild->_pParentNode = NULL;
-        DeleteNodeInternal(ppNextPointer, pChild);
-
-        pChild = pNextChild;
-    }
-
-    DeleteNode(pNode);
-    _nItems--;
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::DeleteKey(
-    PCWSTR      pszKey
-)
-{
-    TREE_HASH_NODE<_Record> *pNode;
-    TREE_HASH_NODE<_Record> **ppPreviousNodeNextPointer;
-
-    DWORD dwHash = CalcHash(pszKey);
-
-    _tableLock.ExclusiveAcquire();
-
-    if (FindNodeInternal(pszKey, dwHash, &pNode, &ppPreviousNodeNextPointer))
-    {
-        DeleteNodeInternal(ppPreviousNodeNextPointer, pNode);
-    }
-
-    _tableLock.ExclusiveRelease();
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::DeleteIf(
-    PFN_DELETE_IF               pfnDeleteIf,
-    PVOID                       pvContext
-)
-{
-    TREE_HASH_NODE<_Record> *pNode;
-    TREE_HASH_NODE<_Record> **ppPreviousNodeNextPointer;
-    BOOL fDelete;
-
-    _tableLock.ExclusiveAcquire();
-
-    for (DWORD i=0; i<_nBuckets; i++)
-    {
-        ppPreviousNodeNextPointer = _ppBuckets + i;
-        pNode = *ppPreviousNodeNextPointer;
-        while (pNode != NULL)
-        {
-            //
-            // Non empty nodes deleted based on DeleteIf, empty nodes deleted
-            // if they have no children
-            //
-            fDelete = FALSE;
-            if (pNode->_pRecord != NULL)
-            {
-                if (pfnDeleteIf(pNode->_pRecord, pvContext))
-                {
-                    fDelete = TRUE;
-                }
-            }
-            else if (pNode->_pFirstChild == NULL)
-            {
-                fDelete =  TRUE;
-            }
-
-            if (fDelete)
-            {
-                if (pNode->_pFirstChild == NULL)
-                {
-                    DeleteNodeInternal(ppPreviousNodeNextPointer, pNode);
-                }
-                else
-                {
-                    DereferenceRecord(pNode->_pRecord);
-                    pNode->_pRecord = NULL;
-                }
-            }
-            else
-            {
-                ppPreviousNodeNextPointer = &pNode->_pNext;
-            }
-
-            pNode = *ppPreviousNodeNextPointer;
-        }
-    }
-
-    _tableLock.ExclusiveRelease();
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::Apply(
-    PFN_APPLY                   pfnApply,
-    PVOID                       pvContext
-)
-{
-    TREE_HASH_NODE<_Record> *pNode;
-
-    _tableLock.SharedAcquire();
-
-    for (DWORD i=0; i<_nBuckets; i++)
-    {
-        pNode = _ppBuckets[i];
-        while (pNode != NULL)
-        {
-            if (pNode->_pRecord != NULL)
-            {
-                pfnApply(pNode->_pRecord, pvContext);
-            }
-
-            pNode = pNode->_pNext;
-        }
-    }
-
-    _tableLock.SharedRelease();
-}
-
-template <class _Record>
-VOID
-TREE_HASH_TABLE<_Record>::RehashTableIfNeeded(
-    VOID
-)
-{
-    TREE_HASH_NODE<_Record> **ppBuckets;
-    DWORD nBuckets;
-    TREE_HASH_NODE<_Record> *pNode;
-    TREE_HASH_NODE<_Record> *pNextNode;
-    TREE_HASH_NODE<_Record> **ppNextPointer;
-    TREE_HASH_NODE<_Record> *pNewNextNode;
-    DWORD               nNewBuckets;
-
-    //
-    // If number of items has become too many, we will double the hash table
-    // size (we never reduce it however)
-    //
-    if (_nItems <= PRIME::GetPrime(2*_nBuckets))
-    {
-        return;
-    }
-
-    _tableLock.ExclusiveAcquire();
-
-    nNewBuckets = PRIME::GetPrime(2*_nBuckets);
-
-    if (_nItems <= nNewBuckets)
-    {
-        goto Finished;
-    }
-
-    nBuckets = nNewBuckets;
-    if (nBuckets >= 0xffffffff/sizeof(TREE_HASH_NODE<_Record> *))
-    {
-        goto Finished;
-    }
-    ppBuckets = (TREE_HASH_NODE<_Record> **)HeapAlloc(
-                        GetProcessHeap(),
-                        HEAP_ZERO_MEMORY,
-                        nBuckets*sizeof(TREE_HASH_NODE<_Record> *));
-    if (ppBuckets == NULL)
-    {
-        goto Finished;
-    }
-
-    //
-    // Take out nodes from the old hash table and insert in the new one, make
-    // sure to keep the hashes in increasing order
-    //
-    for (DWORD i=0; i<_nBuckets; i++)
-    {
-        pNode = _ppBuckets[i];
-        while (pNode != NULL)
-        {
-            pNextNode = pNode->_pNext;
-
-            ppNextPointer = ppBuckets + (pNode->_dwHash % nBuckets);
-            pNewNextNode = *ppNextPointer;
-            while (pNewNextNode != NULL &&
-                   pNewNextNode->_dwHash <= pNode->_dwHash)
-            {
-                ppNextPointer = &pNewNextNode->_pNext;
-                pNewNextNode = pNewNextNode->_pNext;
-            }
-            pNode->_pNext = pNewNextNode;
-            *ppNextPointer = pNode;
-
-            pNode = pNextNode;
-        }
-    }
-
-    HeapFree(GetProcessHeap(), 0, _ppBuckets);
-    _ppBuckets = ppBuckets;
-    _nBuckets = nBuckets;
-    ppBuckets = NULL;
-
-Finished:
-
-    _tableLock.ExclusiveRelease();
-}
-
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp
index 214ee65abfe4..207fc1daa1e1 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp
@@ -27,7 +27,7 @@ Return Values:
 
 --*/
 {
-    HRESULT hr;
+    HRESULT hr = S_OK;
 
     if (pszName[0] == L'\\' && pszName[1] == L'\\')
     {
@@ -47,6 +47,9 @@ Return Values:
                 // we need to change it to Win32 from ("\\?\")
                 //
 
+                // Buffer overrun while writing to 'pstrPath->QueryStr()'
+                // We know it's not an overrun because we just copied pszName into pstrPath and pszName is at least 4 in length
+#pragma warning(suppress: 6386)
                 pstrPath->QueryStr()[2] = L'?';
             }
 
@@ -71,7 +74,7 @@ Return Values:
     else
     {
         pstrPath->Reset();
-    }  
+    }
 
     return pstrPath->Append(pszName);
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp
index 157f0dda2265..7c2218a79e65 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp
@@ -65,7 +65,7 @@ InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSourc
     const auto handlerSettings = aspNetCoreSection->GetKeyValuePairs(CS_ASPNETCORE_HANDLER_SETTINGS);
     m_fSetCurrentDirectory = equals_ignore_case(find_element(handlerSettings, CS_ASPNETCORE_HANDLER_SET_CURRENT_DIRECTORY).value_or(L"true"), L"true");
     m_fCallStartupHook = equals_ignore_case(find_element(handlerSettings, CS_ASPNETCORE_HANDLER_CALL_STARTUP_HOOK).value_or(L"true"), L"true");
-    m_strStackSize = find_element(handlerSettings, CS_ASPNETCORE_HANDLER_STACK_SIZE).value_or(L"1048576");
+    m_strStackSize = find_element(handlerSettings, CS_ASPNETCORE_HANDLER_STACK_SIZE).value_or(L"0x100000"); // 1 MB in hex
     m_fSuppressRecycleOnStartupTimeout = equals_ignore_case(find_element(handlerSettings, CS_ASPNETCORE_SUPPRESS_RECYCLE_ON_STARTUP_TIMEOUT).value_or(L"false"), L"true");
 
     m_dwStartupTimeLimitInMS = aspNetCoreSection->GetRequiredLong(CS_ASPNETCORE_PROCESS_STARTUP_TIME_LIMIT) * 1000;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
index 131099756f92..f37bd6a5685b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj
@@ -16,6 +16,7 @@
     <ClCompile>
       <PreprocessorDefinitions>REQUESTHANDLER_EXPORTS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib</AdditionalIncludeDirectories>
+      <AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;$(LibNetHostPath)\libnethost.lib</AdditionalDependencies>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
index d3e50e620fa8..2793c7c404f2 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
@@ -24,7 +24,7 @@ class StartupExceptionApplication : public InProcessApplicationBase
         m_error(errorPageContent),
         m_statusCode(statusCode),
         m_subStatusCode(subStatusCode),
-        m_statusText(std::move(statusText)),
+        m_statusText(statusText),
         InProcessApplicationBase(pServer, pApplication)
     {
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
index 3040e06924a5..cc2d5e3c45bf 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
@@ -24,10 +24,10 @@ DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll");
 BOOL                g_fGlobalInitialize = FALSE;
 BOOL                g_fProcessDetach = FALSE;
 SRWLOCK             g_srwLockRH;
-IHttpServer *       g_pHttpServer = NULL;
+IHttpServer *       g_pHttpServer = nullptr;
 HINSTANCE           g_hWinHttpModule;
 HINSTANCE           g_hAspNetCoreModule;
-HANDLE              g_hEventLog = NULL;
+HANDLE              g_hEventLog = nullptr;
 bool                g_fInProcessApplicationCreated = false;
 std::string         g_errorPageContent;
 HINSTANCE           g_hServerModule;
@@ -50,11 +50,11 @@ InitializeGlobalConfiguration(
 
             if (pServer->IsCommandLineLaunch())
             {
-                g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER);
+                g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER);
             }
             else
             {
-                g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER);
+                g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER);
             }
 
             DebugInitializeFromConfig(*pServer, *pHttpApplication);
@@ -85,6 +85,7 @@ BOOL APIENTRY DllMain(HMODULE hModule,
         IN_PROCESS_HANDLER::StaticTerminate();
         ALLOC_CACHE_HANDLER::StaticTerminate();
         DebugStop();
+        break;
     default:
         break;
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
index c510ecdb7f97..3993ce31e31b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
@@ -14,7 +14,7 @@
 #include "Environment.h"
 #include "HostFxr.h"
 
-IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL;
+IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = nullptr;
 
 IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION(
     IHttpServer& pHttpServer,
@@ -327,11 +327,11 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
 
         if (m_pConfig->QueryCallStartupHook())
         {
-            PWSTR startupHookValue = NULL;
+            PWSTR startupHookValue = nullptr;
             // Will get property not found if the environment variable isn't set.
             context->m_hostFxr.GetRuntimePropertyValue(DOTNETCORE_STARTUP_HOOK, &startupHookValue);
 
-            if (startupHookValue == NULL)
+            if (startupHookValue == nullptr)
             {
                 RETURN_IF_NOT_ZERO(context->m_hostFxr.SetRuntimePropertyValue(DOTNETCORE_STARTUP_HOOK, ASPNETCORE_STARTUP_ASSEMBLY));
             }
@@ -351,7 +351,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
             RETURN_IF_NOT_ZERO(context->m_hostFxr.SetRuntimePropertyValue(APP_CONTEXT_BASE_DIRECTORY, Environment::GetCurrentDirectoryValue().c_str()));
         }
 
-        bool clrThreadExited;
+        bool clrThreadExited = false;
         {
             //Start CLR thread
             m_clrThread = std::thread(ClrThreadEntryPoint, context);
@@ -556,9 +556,9 @@ IN_PROCESS_APPLICATION::SetEnvironmentVariablesOnWorkerProcess()
         m_pConfig->QueryWindowsAuthEnabled(),
         m_pConfig->QueryBasicAuthEnabled(),
         m_pConfig->QueryAnonymousAuthEnabled(),
-        false, // fAddHostingStartup
-        QueryApplicationPhysicalPath().c_str(),
-        nullptr);
+        //false, // fAddHostingStartup
+        QueryApplicationPhysicalPath().c_str()/*,
+        nullptr*/);
 
     for (const auto& variable : variables)
     {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
index 8f5e3ae56b75..d4a68da2bafa 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
@@ -6,7 +6,7 @@
 #include "ShuttingDownApplication.h"
 #include "ntassert.h"
 
-ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL;
+ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = nullptr;
 
 IN_PROCESS_HANDLER::IN_PROCESS_HANDLER(
     _In_ std::unique_ptr<IN_PROCESS_APPLICATION, IAPPLICATION_DELETER> pApplication,
@@ -37,7 +37,7 @@ IN_PROCESS_HANDLER::ExecuteRequestHandler()
 {
     ::RaiseEvent<ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_START>(m_pW3Context, nullptr);
 
-    if (m_pRequestHandler == NULL)
+    if (m_pRequestHandler == nullptr)
     {
         ::RaiseEvent<ANCMEvents::ANCM_INPROC_EXECUTE_REQUEST_COMPLETION>(m_pW3Context, nullptr, RQ_NOTIFICATION_FINISH_REQUEST);
         return RQ_NOTIFICATION_FINISH_REQUEST;
@@ -198,10 +198,10 @@ IN_PROCESS_HANDLER::SetManagedHttpContext(
 // static
 void * IN_PROCESS_HANDLER::operator new(size_t)
 {
-    DBG_ASSERT(sm_pAlloc != NULL);
-    if (sm_pAlloc == NULL)
+    DBG_ASSERT(sm_pAlloc != nullptr);
+    if (sm_pAlloc == nullptr)
     {
-        return NULL;
+        return nullptr;
     }
     return sm_pAlloc->Alloc();
 }
@@ -209,8 +209,8 @@ void * IN_PROCESS_HANDLER::operator new(size_t)
 // static
 void IN_PROCESS_HANDLER::operator delete(void * pMemory)
 {
-    DBG_ASSERT(sm_pAlloc != NULL);
-    if (sm_pAlloc != NULL)
+    DBG_ASSERT(sm_pAlloc != nullptr);
+    if (sm_pAlloc != nullptr)
     {
         sm_pAlloc->Free(pMemory);
     }
@@ -234,7 +234,7 @@ HRESULT
     HRESULT                         hr = S_OK;
 
     sm_pAlloc = new ALLOC_CACHE_HANDLER;
-    if (sm_pAlloc == NULL)
+    if (sm_pAlloc == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
@@ -255,9 +255,9 @@ HRESULT
 void
 IN_PROCESS_HANDLER::StaticTerminate(VOID)
 {
-    if (sm_pAlloc != NULL)
+    if (sm_pAlloc != nullptr)
     {
         delete sm_pAlloc;
-        sm_pAlloc = NULL;
+        sm_pAlloc = nullptr;
     }
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp
index 23639860527a..abc20ef05ecf 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp
@@ -29,7 +29,7 @@ class __declspec(uuid("1a2acc57-cae2-4f28-b4ab-00c8f96b12ec"))
         PCSTR
         GetTrailer(
             _In_  PCSTR    pszHeaderName,
-            _Out_ USHORT* pcchHeaderValue = NULL
+            _Out_ USHORT* pcchHeaderValue = nullptr
         ) const = 0;
 
     virtual
@@ -70,7 +70,7 @@ register_callbacks(
     _In_ VOID* pvShutdownHandlerContext
 )
 {
-    if (pInProcessApplication == NULL)
+    if (pInProcessApplication == nullptr)
     {
         return E_INVALIDARG;
     }
@@ -114,8 +114,10 @@ http_get_server_variable(
     _Out_ BSTR* pwszReturn
 )
 {
-    PCWSTR pszVariableValue;
-    DWORD cbLength;
+    PCWSTR pszVariableValue = nullptr;
+    DWORD cbLength = 0;
+
+    *pwszReturn = nullptr;
 
     HRESULT hr = pInProcessHandler
         ->QueryHttpContext()
@@ -128,7 +130,7 @@ http_get_server_variable(
 
     *pwszReturn = SysAllocString(pszVariableValue);
 
-    if (*pwszReturn == NULL)
+    if (*pwszReturn == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
@@ -245,7 +247,7 @@ http_get_application_properties(
 )
 {
     auto pInProcessApplication = IN_PROCESS_APPLICATION::GetInstance();
-    if (pInProcessApplication == NULL)
+    if (pInProcessApplication == nullptr)
     {
         return E_FAIL;
     }
@@ -276,8 +278,9 @@ http_read_request_bytes(
 )
 {
     HRESULT hr = S_OK;
+    *pvBuffer = 0;
 
-    if (pInProcessHandler == NULL)
+    if (pInProcessHandler == nullptr)
     {
         return E_FAIL;
     }
@@ -513,7 +516,13 @@ http_get_authentication_information(
 )
 {
     *pstrAuthType = SysAllocString(pInProcessHandler->QueryHttpContext()->GetUser()->GetAuthenticationType());
+    // prefer GetPrimaryToken over GetImpersonationToken as that's what we've been using since before .NET 10
+    // we'll fallback to GetImpersonationToken if GetPrimaryToken is not available
     *pvToken = pInProcessHandler->QueryHttpContext()->GetUser()->GetPrimaryToken();
+    if (*pvToken == nullptr)
+    {
+        *pvToken = pInProcessHandler->QueryHttpContext()->GetUser()->GetImpersonationToken();
+    }
 
     return S_OK;
 }
@@ -522,7 +531,7 @@ EXTERN_C __declspec(dllexport)
 HRESULT
 http_stop_calls_into_managed(_In_ IN_PROCESS_APPLICATION* pInProcessApplication)
 {
-    if (pInProcessApplication == NULL)
+    if (pInProcessApplication == nullptr)
     {
         return E_INVALIDARG;
     }
@@ -535,7 +544,7 @@ EXTERN_C __declspec(dllexport)
 HRESULT
 http_stop_incoming_requests(_In_ IN_PROCESS_APPLICATION* pInProcessApplication)
 {
-    if (pInProcessApplication == NULL)
+    if (pInProcessApplication == nullptr)
     {
         return E_INVALIDARG;
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
index 451d1afcba48..2927a5de74c3 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj
@@ -10,12 +10,13 @@
   </PropertyGroup>
   <Import Project="..\..\build\Build.Dll.Settings" />
   <PropertyGroup>
-    <TargetName>aspnetcorev2_outofprocess</TargetName>
+    <TargetName>httpbridge_outofprocess</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>REQUESTHANDLER_EXPORTS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib</AdditionalIncludeDirectories>
+      <AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
     </ClCompile>
     <Link>
 <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib</AdditionalDependencies>
@@ -80,4 +81,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def
index 37d763da5ab7..d2818276ef6b 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def
@@ -1,4 +1,4 @@
-LIBRARY aspnetcorev2_outofprocess
+LIBRARY httpbridge_outofprocess
 
 EXPORTS
     CreateApplication
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
index a89165dd72b4..7cd03d6dd742 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
@@ -4,7 +4,7 @@
 #include <VersionHelpers.h>
 #include "exceptions.h"
 
-DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_outofprocess.dll");
+DECLARE_DEBUG_PRINT_OBJECT("httpbridge_outofprocess.dll");
 
 BOOL                g_fWebSocketStaticInitialize = FALSE;
 BOOL                g_fEnableReferenceCountTracing = FALSE;
@@ -16,19 +16,19 @@ BOOL                g_fProcessDetach = FALSE;
 DWORD               g_OptionalWinHttpFlags = 0;
 DWORD               g_dwTlsIndex = TLS_OUT_OF_INDEXES;
 SRWLOCK             g_srwLockRH;
-HINTERNET           g_hWinhttpSession = NULL;
-IHttpServer *       g_pHttpServer = NULL;
+HINTERNET           g_hWinhttpSession = nullptr;
+IHttpServer *       g_pHttpServer = nullptr;
 HINSTANCE           g_hWinHttpModule;
 HINSTANCE           g_hOutOfProcessRHModule;
 HINSTANCE           g_hAspNetCoreModule;
-HANDLE              g_hEventLog = NULL;
+HANDLE              g_hEventLog = nullptr;
 
 VOID
 InitializeGlobalConfiguration(
     IHttpServer * pServer
 )
 {
-    HKEY hKey;
+    HKEY hKey{};
     BOOL fLocked = FALSE;
 
     if (!g_fGlobalInitialize)
@@ -45,27 +45,27 @@ InitializeGlobalConfiguration(
         g_pHttpServer = pServer;
         if (pServer->IsCommandLineLaunch())
         {
-            g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER);
+            g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER);
         }
         else
         {
-            g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER);
+            g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER);
         }
 
         if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-            L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters",
+            L"SOFTWARE\\LeXtudio\\IIS Extensions\\IIS HTTP Bridge\\Parameters",
             0,
             KEY_READ,
             &hKey) == NO_ERROR)
         {
-            DWORD dwType;
-            DWORD dwData;
-            DWORD cbData;
+            DWORD dwType = 0;
+            DWORD dwData = 0;
+            DWORD cbData = 0;
 
             cbData = sizeof(dwData);
             if ((RegQueryValueEx(hKey,
                 L"OptionalWinHttpFlags",
-                NULL,
+                nullptr,
                 &dwType,
                 (LPBYTE)&dwData,
                 &cbData) == NO_ERROR) &&
@@ -77,7 +77,7 @@ InitializeGlobalConfiguration(
             cbData = sizeof(dwData);
             if ((RegQueryValueEx(hKey,
                 L"EnableReferenceCountTracing",
-                NULL,
+                nullptr,
                 &dwType,
                 (LPBYTE)&dwData,
                 &cbData) == NO_ERROR) &&
@@ -136,7 +136,7 @@ EnsureOutOfProcessInitializtion(IHttpApplication *pHttpApplication)
 
         g_hWinHttpModule = GetModuleHandle(TEXT("winhttp.dll"));
 
-        g_hAspNetCoreModule = GetModuleHandle(TEXT("aspnetcorev2.dll"));
+        g_hAspNetCoreModule = GetModuleHandle(TEXT("httpbridge.dll"));
 
         hr = WINHTTP_HELPER::StaticInitialize();
         if (FAILED_LOG(hr))
@@ -151,12 +151,16 @@ EnsureOutOfProcessInitializtion(IHttpApplication *pHttpApplication)
             }
         }
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
         g_hWinhttpSession = WinHttpOpen(L"",
             WINHTTP_ACCESS_TYPE_NO_PROXY,
             WINHTTP_NO_PROXY_NAME,
             WINHTTP_NO_PROXY_BYPASS,
             WINHTTP_FLAG_ASYNC);
-        FINISHED_LAST_ERROR_IF(g_hWinhttpSession == NULL);
+#pragma warning(pop)
+
+        FINISHED_LAST_ERROR_IF(g_hWinhttpSession == nullptr);
 
         //
         // Don't set non-blocking callbacks WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS,
@@ -171,7 +175,7 @@ EnsureOutOfProcessInitializtion(IHttpApplication *pHttpApplication)
             FORWARDING_HANDLER::OnWinHttpCompletion,
             (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS |
                 WINHTTP_CALLBACK_STATUS_SENDING_REQUEST),
-            NULL) == WINHTTP_INVALID_STATUS_CALLBACK);
+            0) == WINHTTP_INVALID_STATUS_CALLBACK);
 
         //
         // Make sure we see the redirects (rather than winhttp doing it
@@ -219,6 +223,7 @@ BOOL APIENTRY DllMain(HMODULE hModule,
         FORWARDING_HANDLER::StaticTerminate();
         ALLOC_CACHE_HANDLER::StaticTerminate();
         DebugStop();
+        break;
     default:
         break;
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp
index ee49e992422c..bb335374b234 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp
@@ -7,7 +7,7 @@
 FORWARDER_CONNECTION::FORWARDER_CONNECTION(
     VOID
 ) : m_cRefs (1),
-    m_hConnection (NULL)
+    m_hConnection (nullptr)
 {
 }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h
index 232e23988826..89ba58d560c5 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h
@@ -88,10 +88,10 @@ class FORWARDER_CONNECTION
 
     ~FORWARDER_CONNECTION()
     {
-        if (m_hConnection != NULL)
+        if (m_hConnection != nullptr)
         {
             WinHttpCloseHandle(m_hConnection);
-            m_hConnection = NULL;
+            m_hConnection = nullptr;
         }
     }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp
index d30883ea5332..842c4037d700 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "forwardinghandler.h"
@@ -20,10 +21,10 @@ C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632);
 #define FORWARDING_HANDLER_SIGNATURE        ((DWORD)'FHLR')
 #define FORWARDING_HANDLER_SIGNATURE_FREE   ((DWORD)'fhlr')
 
-ALLOC_CACHE_HANDLER *       FORWARDING_HANDLER::sm_pAlloc = NULL;
-TRACE_LOG *                 FORWARDING_HANDLER::sm_pTraceLog = NULL;
+ALLOC_CACHE_HANDLER *       FORWARDING_HANDLER::sm_pAlloc = nullptr;
+TRACE_LOG *                 FORWARDING_HANDLER::sm_pTraceLog = nullptr;
 PROTOCOL_CONFIG             FORWARDING_HANDLER::sm_ProtocolConfig;
-RESPONSE_HEADER_HASH *      FORWARDING_HANDLER::sm_pResponseHeaderHash = NULL;
+RESPONSE_HEADER_HASH *      FORWARDING_HANDLER::sm_pResponseHeaderHash = nullptr;
 
 FORWARDING_HANDLER::FORWARDING_HANDLER(
     _In_ IHttpContext                  *pW3Context,
@@ -36,12 +37,12 @@ FORWARDING_HANDLER::FORWARDING_HANDLER(
     m_fDoReverseRewriteHeaders(FALSE),
     m_fFinishRequest(FALSE),
     m_fHasError(FALSE),
-    m_pszHeaders(NULL),
+    m_pszHeaders(nullptr),
     m_cchHeaders(0),
     m_BytesToReceive(0),
     m_BytesToSend(0),
     m_fWebSocketEnabled(FALSE),
-    m_pWebSocket(NULL),
+    m_pWebSocket(nullptr),
     m_dwHandlers (1), // default http handler
     m_fDoneAsyncCompletion(FALSE),
     m_fHttpHandleInClose(FALSE),
@@ -87,7 +88,7 @@ FORWARDING_HANDLER::~FORWARDING_HANDLER(
     if (m_pWebSocket)
     {
         m_pWebSocket->Terminate();
-        m_pWebSocket = NULL;
+        m_pWebSocket = nullptr;
     }
 }
 
@@ -100,12 +101,12 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
     BOOL                        fRequestLocked = FALSE;
     BOOL                        fFailedToStartKestrel = FALSE;
     BOOL                        fSecure = FALSE;
-    HINTERNET                   hConnect = NULL;
+    HINTERNET                   hConnect = nullptr;
     IHttpRequest               *pRequest = m_pW3Context->GetRequest();
     IHttpResponse              *pResponse = m_pW3Context->GetResponse();
-    IHttpConnection            *pClientConnection = NULL;
+    IHttpConnection            *pClientConnection = nullptr;
     PROTOCOL_CONFIG            *pProtocol = &sm_ProtocolConfig;
-    SERVER_PROCESS             *pServerProcess = NULL;
+    SERVER_PROCESS             *pServerProcess = nullptr;
 
     USHORT                      cchHostName = 0;
 
@@ -124,13 +125,13 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
 
     // check connection
     pClientConnection = m_pW3Context->GetConnection();
-    if (pClientConnection == NULL ||
+    if (pClientConnection == nullptr ||
         !pClientConnection->IsConnected())
     {
         FAILURE(HRESULT_FROM_WIN32(WSAECONNRESET));
     }
 
-    if (m_pApplication == NULL)
+    if (m_pApplication == nullptr)
     {
         FAILURE(E_INVALIDARG);
     }
@@ -142,13 +143,13 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
         FAILURE(hr);
     }
 
-    if (pServerProcess == NULL)
+    if (pServerProcess == nullptr)
     {
         fFailedToStartKestrel = TRUE;
         FAILURE(HRESULT_FROM_WIN32(ERROR_CREATE_FAILED));
     }
 
-    if (pServerProcess->QueryWinHttpConnection() == NULL)
+    if (pServerProcess->QueryWinHttpConnection() == nullptr)
     {
         FAILURE(HRESULT_FROM_WIN32(ERROR_INVALID_HANDLE));
     }
@@ -180,6 +181,10 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
         if (cchHeader == 9 && _stricmp(pszWebSocketHeader, "websocket") == 0)
         {
             m_fWebSocketEnabled = TRUE;
+
+            // WinHttp does not support any extensions being returned by the server, so we remove the request header to avoid the server
+            // responding with any accepted extensions.
+            pRequest->DeleteHeader("Sec-WebSocket-Extensions");
         }
     }
 
@@ -200,11 +205,11 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
     // before staring a WinHTTP operation.
     //
     DBG_ASSERT(fRequestLocked);
-    DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL);
+    DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr);
     TlsSetValue(g_dwTlsIndex, this);
     DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this);
 
-    if (m_hRequest == NULL)
+    if (m_hRequest == nullptr)
     {
         FAILURE(HRESULT_FROM_WIN32(WSAECONNRESET));
     }
@@ -219,7 +224,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
     //
     DWORD cbContentLength = 0;
     PCSTR pszContentLength = pRequest->GetHeader(HttpHeaderContentLength);
-    if (pszContentLength != NULL)
+    if (pszContentLength != nullptr)
     {
         cbContentLength = m_BytesToReceive = atol(pszContentLength);
         if (m_BytesToReceive == INFINITE)
@@ -227,7 +232,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
             FAILURE(HRESULT_FROM_WIN32(WSAECONNRESET));
         }
     }
-    else if (pRequest->GetHeader(HttpHeaderTransferEncoding) != NULL)
+    else if (pRequest->GetHeader(HttpHeaderTransferEncoding) != nullptr)
     {
         m_BytesToReceive = INFINITE;
     }
@@ -239,7 +244,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
         //
         if (!WinHttpSetOption(m_hRequest,
             WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET,
-            NULL,
+            nullptr,
             0))
         {
             FINISHED(HRESULT_FROM_WIN32(GetLastError()));
@@ -253,16 +258,16 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
     {
         ANCMEvents::ANCM_REQUEST_FORWARD_START::RaiseEvent(
             m_pW3Context->GetTraceContext(),
-            NULL);
+            nullptr);
     }
 
     if (!WinHttpSendRequest(m_hRequest,
         m_pszHeaders,
         m_cchHeaders,
-        NULL,
+        nullptr,
         0,
         cbContentLength,
-        reinterpret_cast<DWORD_PTR>(static_cast<PVOID>(this))))
+        reinterpret_cast<DWORD_PTR>(this)))
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
 
@@ -273,7 +278,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
         {
             ANCMEvents::ANCM_REQUEST_FORWARD_FAIL::RaiseEvent(
                 m_pW3Context->GetTraceContext(),
-                NULL,
+                nullptr,
                 hr);
         }
 
@@ -309,7 +314,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
             ANCM_ERROR_PAGE,
             502,
             5,
-            "ANCM Out-Of-Process Startup Failure",
+            "HTTP Bridge Startup Failure",
             "<ul><li> The application process failed to start </li><li> The application process started but then stopped </li><li> The application process started but failed to listen on the configured port </li></ul>");
 
         ServerErrorHandler handler(*m_pW3Context,
@@ -338,9 +343,9 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
     if (fRequestLocked)
     {
         DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this);
-        TlsSetValue(g_dwTlsIndex, NULL);
+        TlsSetValue(g_dwTlsIndex, nullptr);
         ReleaseSRWLockShared(&m_RequestLock);
-        DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL);
+        DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr);
     }
 
     DereferenceRequestHandler();
@@ -382,8 +387,8 @@ REQUEST_NOTIFICATION_STATUS
     BOOL                        fClosed = FALSE;
     BOOL                        fWebSocketUpgraded = FALSE;
 
-    DBG_ASSERT(m_pW3Context != NULL);
-    __analysis_assume(m_pW3Context != NULL);
+    DBG_ASSERT(m_pW3Context != nullptr);
+    __analysis_assume(m_pW3Context != nullptr);
 
     //
     // Take a reference so that object does not go away as a result of
@@ -391,7 +396,7 @@ REQUEST_NOTIFICATION_STATUS
     //
     ReferenceRequestHandler();
 
-    if (sm_pTraceLog != NULL)
+    if (sm_pTraceLog != nullptr)
     {
         WriteRefTraceLogEx(sm_pTraceLog,
             m_cRefs,
@@ -424,7 +429,7 @@ REQUEST_NOTIFICATION_STATUS
         // This should be the write completion of the 101 response.
         //
         m_pWebSocket = new WEBSOCKET_HANDLER();
-        if (m_pWebSocket == NULL)
+        if (m_pWebSocket == nullptr)
         {
             FAILURE(E_OUTOFMEMORY);
         }
@@ -447,7 +452,7 @@ REQUEST_NOTIFICATION_STATUS
         m_fHttpHandleInClose = TRUE;
         fClosed = WinHttpCloseHandle(m_hRequest);
         DBG_ASSERT(fClosed);
-        m_hRequest = NULL;
+        m_hRequest = nullptr;
 
         if (!fClosed)
         {
@@ -490,7 +495,7 @@ REQUEST_NOTIFICATION_STATUS
 
     default:
         DBG_ASSERT(m_RequestStatus == FORWARDER_DONE);
-        if (m_hRequest == NULL && m_pWebSocket == NULL)
+        if (m_hRequest == nullptr && m_pWebSocket == nullptr)
         {
             // Request must have been done
             if (!m_fFinishRequest)
@@ -567,7 +572,7 @@ REQUEST_NOTIFICATION_STATUS
                     0,
                     strDescription.QueryStr(),
                     strDescription.QuerySizeCCH(),
-                    NULL);
+                    nullptr);
             }
             else
             {
@@ -598,17 +603,17 @@ REQUEST_NOTIFICATION_STATUS
         }
     }
 
-    if (m_pWebSocket != NULL && !m_fWebSocketHandleInClose)
+    if (m_pWebSocket != nullptr && !m_fWebSocketHandleInClose)
     {
         m_fWebSocketHandleInClose = TRUE;
         m_pWebSocket->TerminateRequest();
     }
 
-    if (m_hRequest != NULL && !m_fHttpHandleInClose)
+    if (m_hRequest != nullptr && !m_fHttpHandleInClose)
     {
         m_fHttpHandleInClose = TRUE;
         WinHttpCloseHandle(m_hRequest);
-        m_hRequest = NULL;
+        m_hRequest = nullptr;
     }
 
 Finished:
@@ -694,33 +699,33 @@ HRESULT
 VOID
 FORWARDING_HANDLER::StaticTerminate()
 {
-    if (sm_pResponseHeaderHash != NULL)
+    if (sm_pResponseHeaderHash != nullptr)
     {
         sm_pResponseHeaderHash->Clear();
         delete sm_pResponseHeaderHash;
-        sm_pResponseHeaderHash = NULL;
+        sm_pResponseHeaderHash = nullptr;
     }
 
-    if (sm_pTraceLog != NULL)
+    if (sm_pTraceLog != nullptr)
     {
         DestroyRefTraceLog(sm_pTraceLog);
-        sm_pTraceLog = NULL;
+        sm_pTraceLog = nullptr;
     }
 
-    if (sm_pAlloc != NULL)
+    if (sm_pAlloc != nullptr)
     {
         delete sm_pAlloc;
-        sm_pAlloc = NULL;
+        sm_pAlloc = nullptr;
     }
 }
 
 // static
 void * FORWARDING_HANDLER::operator new(size_t)
 {
-    DBG_ASSERT(sm_pAlloc != NULL);
-    if (sm_pAlloc == NULL)
+    DBG_ASSERT(sm_pAlloc != nullptr);
+    if (sm_pAlloc == nullptr)
     {
-        return NULL;
+        return nullptr;
     }
     return sm_pAlloc->Alloc();
 }
@@ -728,8 +733,8 @@ void * FORWARDING_HANDLER::operator new(size_t)
 // static
 void FORWARDING_HANDLER::operator delete(void * pMemory)
 {
-    DBG_ASSERT(sm_pAlloc != NULL);
-    if (sm_pAlloc != NULL)
+    DBG_ASSERT(sm_pAlloc != nullptr);
+    if (sm_pAlloc != nullptr)
     {
         sm_pAlloc->Free(pMemory);
     }
@@ -744,17 +749,17 @@ FORWARDING_HANDLER::GetHeaders(
     _Inout_ DWORD *                 pcchHeaders
 )
 {
-    PCSTR pszCurrentHeader;
-    PCSTR ppHeadersToBeRemoved;
-    PCSTR pszFinalHeader;
-    USHORT cchCurrentHeader;
-    DWORD cchFinalHeader;
+    PCSTR pszCurrentHeader = nullptr;
+    PCSTR ppHeadersToBeRemoved = nullptr;
+    PCSTR pszFinalHeader = nullptr;
+    USHORT cchCurrentHeader = 0;
+    DWORD cchFinalHeader = 0;
     BOOL  fSecure = FALSE;  // dummy. Used in SplitUrl. Value will not be used
                             // as ANCM always use http protocol to communicate with backend
     STRU  struDestination;
     STRU  struUrl;
     STACK_STRA(strTemp, 64);
-    HTTP_REQUEST_HEADERS *pHeaders;
+    HTTP_REQUEST_HEADERS *pHeaders = nullptr;
     IHttpRequest *pRequest = m_pW3Context->GetRequest();
     MULTISZA mszMsAspNetCoreHeaders;
 
@@ -797,13 +802,13 @@ FORWARDING_HANDLER::GetHeaders(
     // iterate the list of headers to be removed and delete them from the request.
     //
 
-    while (ppHeadersToBeRemoved != NULL)
+    while (ppHeadersToBeRemoved != nullptr)
     {
         m_pW3Context->GetRequest()->DeleteHeader(ppHeadersToBeRemoved);
         ppHeadersToBeRemoved = mszMsAspNetCoreHeaders.Next(ppHeadersToBeRemoved);
     }
 
-    if (pServerProcess->QueryGuid() != NULL)
+    if (pServerProcess->QueryGuid() != nullptr)
     {
         RETURN_IF_FAILED(m_pW3Context->GetRequest()->SetHeader("MS-ASPNETCORE-TOKEN",
             pServerProcess->QueryGuid(),
@@ -815,11 +820,20 @@ FORWARDING_HANDLER::GetHeaders(
         (_wcsicmp(m_pW3Context->GetUser()->GetAuthenticationType(), L"negotiate") == 0 ||
             _wcsicmp(m_pW3Context->GetUser()->GetAuthenticationType(), L"ntlm") == 0))
     {
-        if (m_pW3Context->GetUser()->GetPrimaryToken() != NULL &&
-            m_pW3Context->GetUser()->GetPrimaryToken() != INVALID_HANDLE_VALUE)
+        // prefer GetPrimaryToken over GetImpersonationToken as that's what we've been using since before .NET 10
+        // we'll fallback to GetImpersonationToken if GetPrimaryToken is not available
+        HANDLE authToken = m_pW3Context->GetUser()->GetPrimaryToken();
+        if (authToken == nullptr ||
+            authToken == INVALID_HANDLE_VALUE)
+        {
+            authToken = m_pW3Context->GetUser()->GetImpersonationToken();
+        }
+
+        if (authToken != nullptr &&
+            authToken != INVALID_HANDLE_VALUE)
         {
-            HANDLE hTargetTokenHandle = NULL;
-            RETURN_IF_FAILED(pServerProcess->SetWindowsAuthToken(m_pW3Context->GetUser()->GetPrimaryToken(),
+            HANDLE hTargetTokenHandle = nullptr;
+            RETURN_IF_FAILED(pServerProcess->SetWindowsAuthToken(authToken,
                 &hTargetTokenHandle));
 
             //
@@ -831,7 +845,7 @@ FORWARDING_HANDLER::GetHeaders(
                 RETURN_HR(HRESULT_FROM_WIN32(ERROR_INVALID_DATA));
             }
 
-            RETURN_IF_FAILED(m_pW3Context->GetRequest()->SetHeader("MS-ASPNETCORE-WINAUTHTOKEN",
+            RETURN_IF_FAILED(m_pW3Context->GetRequest()->SetHeader("X-IIS-WINDOWSAUTHTOKEN",
                 pszHandleStr,
                 (USHORT)strlen(pszHandleStr),
                 TRUE));
@@ -843,7 +857,7 @@ FORWARDING_HANDLER::GetHeaders(
         strTemp.Reset();
 
         pszCurrentHeader = pRequest->GetHeader(pProtocol->QueryXForwardedForName()->QueryStr(), &cchCurrentHeader);
-        if (pszCurrentHeader != NULL)
+        if (pszCurrentHeader != nullptr)
         {
             RETURN_IF_FAILED(strTemp.Copy(pszCurrentHeader, cchCurrentHeader));
             RETURN_IF_FAILED(strTemp.Append(", ", 2));
@@ -884,7 +898,7 @@ FORWARDING_HANDLER::GetHeaders(
     {
         const HTTP_SSL_INFO *pSslInfo = pRequest->GetRawHttpRequest()->pSslInfo;
         LPSTR pszScheme = "http";
-        if (pSslInfo != NULL)
+        if (pSslInfo != nullptr)
         {
             pszScheme = "https";
         }
@@ -892,7 +906,7 @@ FORWARDING_HANDLER::GetHeaders(
         strTemp.Reset();
 
         pszCurrentHeader = pRequest->GetHeader(pProtocol->QuerySslHeaderName()->QueryStr(), &cchCurrentHeader);
-        if (pszCurrentHeader != NULL)
+        if (pszCurrentHeader != nullptr)
         {
             RETURN_IF_FAILED(strTemp.Copy(pszCurrentHeader, cchCurrentHeader));
             RETURN_IF_FAILED(strTemp.Append(", ", 2));
@@ -908,8 +922,8 @@ FORWARDING_HANDLER::GetHeaders(
 
     if (!pProtocol->QueryClientCertName()->IsEmpty())
     {
-        if (pRequest->GetRawHttpRequest()->pSslInfo == NULL ||
-            pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo == NULL)
+        if (pRequest->GetRawHttpRequest()->pSslInfo == nullptr ||
+            pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo == nullptr)
         {
             pRequest->DeleteHeader(pProtocol->QueryClientCertName()->QueryStr());
         }
@@ -924,7 +938,7 @@ FORWARDING_HANDLER::GetHeaders(
                 pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo->CertEncodedSize,
                 strTemp.QueryStr(),
                 strTemp.QuerySize(),
-                NULL);
+                nullptr);
             strTemp.SyncWithBuffer();
 
             RETURN_IF_FAILED(pRequest->SetHeader(
@@ -963,8 +977,8 @@ FORWARDING_HANDLER::CreateWinHttpRequest(
 )
 {
     HRESULT         hr = S_OK;
-    PCWSTR          pszVersion = NULL;
-    PCSTR           pszVerb;
+    PCWSTR          pszVersion = nullptr;
+    PCSTR           pszVerb = nullptr;
     DWORD           dwTimeout = INFINITE;
     STACK_STRU(strVerb, 32);
 
@@ -976,7 +990,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest(
     FINISHED_IF_FAILED(strVerb.CopyA(pszVerb));
 
     //pszVersion = pProtocol->QueryVersion();
-    if (pszVersion == NULL)
+    if (pszVersion == nullptr)
     {
         DWORD cchUnused;
         FINISHED_IF_FAILED(m_pW3Context->GetServerVariable(
@@ -985,6 +999,8 @@ FORWARDING_HANDLER::CreateWinHttpRequest(
             &cchUnused));
     }
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
     m_hRequest = WinHttpOpenRequest(hConnect,
         strVerb.QueryStr(),
         pstrUrl->QueryStr(),
@@ -993,6 +1009,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest(
         WINHTTP_DEFAULT_ACCEPT_TYPES,
         WINHTTP_FLAG_ESCAPE_DISABLE_QUERY
         | g_OptionalWinHttpFlags);
+#pragma warning(pop)
 
     FINISHED_LAST_ERROR_IF_NULL (m_hRequest);
 
@@ -1038,7 +1055,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest(
         (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS |
             WINHTTP_CALLBACK_FLAG_HANDLES |
             WINHTTP_CALLBACK_STATUS_SENDING_REQUEST),
-        NULL) == WINHTTP_INVALID_STATUS_CALLBACK);
+        0) == WINHTTP_INVALID_STATUS_CALLBACK);
 
     FINISHED_IF_FAILED(GetHeaders(pProtocol,
                     m_pApplication->QueryConfig()->QueryForwardWindowsAuthToken(),
@@ -1060,7 +1077,7 @@ FORWARDING_HANDLER::OnWinHttpCompletion(
 )
 {
     FORWARDING_HANDLER * pThis = static_cast<FORWARDING_HANDLER *>(reinterpret_cast<PVOID>(dwContext));
-    if (pThis == NULL)
+    if (pThis == nullptr)
     {
         //error happened, nothing can be done here
         return;
@@ -1105,11 +1122,11 @@ None
     BOOL fAnotherCompletionExpected = FALSE;
     BOOL fDoPostCompletion = FALSE;
     BOOL fHandleClosing = (dwInternetStatus == WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING);
-    DWORD dwHandlers = 1; // defaullt for http handler
+    DWORD dwHandlers = 1; // default for http handler
 
 
-    DBG_ASSERT(m_pW3Context != NULL);
-    __analysis_assume(m_pW3Context != NULL);
+    DBG_ASSERT(m_pW3Context != nullptr);
+    __analysis_assume(m_pW3Context != nullptr);
     IHttpResponse * pResponse = m_pW3Context->GetResponse();
 
     // Reference the request handler to prevent it from being released prematurely
@@ -1117,14 +1134,14 @@ None
 
     UNREFERENCED_PARAMETER(dwStatusInformationLength);
 
-    if (sm_pTraceLog != NULL)
+    if (sm_pTraceLog != nullptr)
     {
         WriteRefTraceLogEx(sm_pTraceLog,
             m_cRefs,
             this,
             "FORWARDING_HANDLER::OnWinHttpCompletionInternal Enter",
             reinterpret_cast<PVOID>(static_cast<DWORD_PTR>(dwInternetStatus)),
-            NULL);
+            nullptr);
     }
 
     //FREB log
@@ -1132,7 +1149,7 @@ None
     {
         ANCMEvents::ANCM_WINHTTP_CALLBACK::RaiseEvent(
             m_pW3Context->GetTraceContext(),
-            NULL,
+            nullptr,
             dwInternetStatus);
     }
 
@@ -1149,11 +1166,11 @@ None
 
     if (TlsGetValue(g_dwTlsIndex) != this)
     {
-        DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL);
+        DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr);
         if (m_RequestStatus != FORWARDER_RECEIVED_WEBSOCKET_RESPONSE)
         {
-            // Webscoket has already been guarded by critical section
-            // Only require exclisive lock for non-websocket scenario which has duplex channel
+            // Websocket has already been guarded by critical section
+            // Only require exclusive lock for non-websocket scenario which has duplex channel
             // Otherwise, there will be a deadlock
             AcquireLockExclusive();
             fExclusiveLocked = TRUE;
@@ -1195,7 +1212,7 @@ None
     if (m_RequestStatus == FORWARDER_RECEIVED_WEBSOCKET_RESPONSE)
     {
         fAnotherCompletionExpected = TRUE;
-        if (m_pWebSocket == NULL)
+        if (m_pWebSocket == nullptr)
         {
             goto Finished;
         }
@@ -1280,14 +1297,14 @@ None
         {
             ANCMEvents::ANCM_REQUEST_FORWARD_END::RaiseEvent(
                 m_pW3Context->GetTraceContext(),
-                NULL);
+                nullptr);
         }
         if (m_RequestStatus != FORWARDER_DONE)
         {
             hr = LOG_IF_FAILED(ERROR_CONNECTION_ABORTED);
             fClientError = m_fClientDisconnected;
         }
-        m_hRequest = NULL;
+        m_hRequest = nullptr;
         fAnotherCompletionExpected = FALSE;
         break;
 
@@ -1301,14 +1318,14 @@ None
         //
         DBG_ASSERT(FALSE);
         hr = LOG_IF_FAILED(E_UNEXPECTED);
-        if (sm_pTraceLog != NULL)
+        if (sm_pTraceLog != nullptr)
         {
             WriteRefTraceLogEx(sm_pTraceLog,
                 m_cRefs,
                 this,
                 "FORWARDING_HANDLER::OnWinHttpCompletionInternal Unexpected WinHTTP Status",
                 reinterpret_cast<PVOID>(static_cast<DWORD_PTR>(dwInternetStatus)),
-                NULL);
+                nullptr);
         }
         break;
     }
@@ -1372,7 +1389,7 @@ None
                     0,
                     strDescription.QueryStr(),
                     strDescription.QuerySizeCCH(),
-                    NULL) == 0)
+                    nullptr) == 0)
             {
                 LoadString(g_hAspNetCoreModule,
                     IDS_SERVER_ERROR,
@@ -1396,7 +1413,7 @@ None
     {
         ANCMEvents::ANCM_REQUEST_FORWARD_FAIL::RaiseEvent(
             m_pW3Context->GetTraceContext(),
-            NULL,
+            nullptr,
             hr);
     }
 
@@ -1421,10 +1438,10 @@ None
         RemoveRequest();
         m_fFinishRequest = TRUE;
         fDoPostCompletion = TRUE;
-        if (m_pWebSocket != NULL)
+        if (m_pWebSocket != nullptr)
         {
             m_pWebSocket->Terminate();
-            m_pWebSocket = NULL;
+            m_pWebSocket = nullptr;
         }
     }
     else if (m_RequestStatus == FORWARDER_DONE)
@@ -1433,14 +1450,14 @@ None
         // Error path
         //
         RemoveRequest();
-        if (m_hRequest != NULL && !m_fHttpHandleInClose)
+        if (m_hRequest != nullptr && !m_fHttpHandleInClose)
         {
             m_fHttpHandleInClose = TRUE;
             WinHttpCloseHandle(m_hRequest);
-            m_hRequest = NULL;
+            m_hRequest = nullptr;
         }
 
-        if (m_pWebSocket != NULL && !m_fWebSocketHandleInClose)
+        if (m_pWebSocket != nullptr && !m_fWebSocketHandleInClose)
         {
             m_fWebSocketHandleInClose = TRUE;
             m_pWebSocket->TerminateRequest();
@@ -1475,9 +1492,9 @@ None
     else if (fSharedLocked)
     {
         DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this);
-        TlsSetValue(g_dwTlsIndex, NULL);
+        TlsSetValue(g_dwTlsIndex, nullptr);
         ReleaseSRWLockShared(&m_RequestLock);
-        DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL);
+        DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr);
     }
 
     DereferenceRequestHandler();
@@ -1495,6 +1512,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete(
     HRESULT hr = S_OK;
     IHttpRequest *      pRequest = m_pW3Context->GetRequest();
 
+    *pfClientError = FALSE;
+
     //
     // completion for sending the initial request or request entity to
     // winhttp, get more request entity if available, else start receiving
@@ -1502,27 +1521,27 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete(
     //
     if (m_BytesToReceive > 0)
     {
-        if (m_pEntityBuffer == NULL)
+        if (m_pEntityBuffer == nullptr)
         {
             FINISHED_IF_NULL_ALLOC(m_pEntityBuffer = GetNewResponseBuffer(
                 ENTITY_BUFFER_SIZE));
         }
 
-        if (sm_pTraceLog != NULL)
+        if (sm_pTraceLog != nullptr)
         {
             WriteRefTraceLogEx(sm_pTraceLog,
                 m_cRefs,
                 this,
                 "Calling ReadEntityBody",
-                NULL,
-                NULL);
+                nullptr,
+                nullptr);
         }
         hr = pRequest->ReadEntityBody(
             m_pEntityBuffer + 6,
             min(m_BytesToReceive, BUFFER_SIZE),
             TRUE,       // fAsync
-            NULL,       // pcbBytesReceived
-            NULL);      // pfCompletionPending
+            nullptr,       // pcbBytesReceived
+            nullptr);      // pfCompletionPending
         if (hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF))
         {
             DBG_ASSERT(m_BytesToReceive == 0 ||
@@ -1548,7 +1567,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete(
                 if (!WinHttpWriteData(m_hRequest,
                     "0\r\n\r\n",
                     5,
-                    NULL))
+                    nullptr))
                 {
                     FINISHED(HRESULT_FROM_WIN32(GetLastError()));
                     //DereferenceForwardingHandler();
@@ -1577,7 +1596,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete(
 
     m_RequestStatus = FORWARDER_RECEIVING_RESPONSE;
 
-    FINISHED_LAST_ERROR_IF(!WinHttpReceiveResponse(hRequest, NULL));
+    FINISHED_LAST_ERROR_IF(!WinHttpReceiveResponse(hRequest, nullptr));
     *pfAnotherCompletionExpected = TRUE;
 
 Finished:
@@ -1596,7 +1615,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable(
     STACK_STRA(strHeaders, 2048);
     DWORD         dwHeaderSize = bufHeaderBuffer.QuerySize();
 
-    UNREFERENCED_PARAMETER(pfAnotherCompletionExpected);
+    *pfAnotherCompletionExpected = FALSE;
 
     //
     // Headers are available, read the status line and headers and pass
@@ -1605,6 +1624,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable(
     // WinHttpQueryHeaders operates synchronously,
     // no need for taking reference.
     //
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
     dwHeaderSize = bufHeaderBuffer.QuerySize();
     if (!WinHttpQueryHeaders(hRequest,
         WINHTTP_QUERY_RAW_HEADERS_CRLF,
@@ -1629,6 +1650,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable(
             &dwHeaderSize,
             WINHTTP_NO_HEADER_INDEX));
     }
+#pragma warning(pop)
 
     FINISHED_IF_FAILED(strHeaders.CopyW(reinterpret_cast<PWSTR>(bufHeaderBuffer.QueryPtr())));
 
@@ -1664,8 +1686,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable(
         hr = m_pW3Context->GetResponse()->Flush(
             TRUE,
             TRUE,
-            NULL,
-            NULL);
+            nullptr,
+            nullptr);
 
         if (FAILED_LOG(hr))
         {
@@ -1691,6 +1713,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusDataAvailable(
 {
     HRESULT hr = S_OK;
 
+    *pfAnotherCompletionExpected = FALSE;
+
     //
     // Response data is available from winhttp, read it
     //
@@ -1726,7 +1750,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusDataAvailable(
     FINISHED_LAST_ERROR_IF(!WinHttpReadData(hRequest,
         m_pEntityBuffer,
         min(m_BytesToSend, BUFFER_SIZE),
-        NULL));
+        nullptr));
 
     *pfAnotherCompletionExpected = TRUE;
 
@@ -1744,6 +1768,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete(
 {
     HRESULT hr = S_OK;
 
+    *pfAnotherCompletionExpected = FALSE;
+
     //
     // Response data has been read from winhttp, send it to the client
     //
@@ -1799,7 +1825,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete(
         //
         FINISHED_IF_FAILED(pResponse->Flush(TRUE,     // fAsync
             TRUE,     // fMoreData
-            NULL));    // pcbSent
+            nullptr));    // pcbSent
 
         *pfAnotherCompletionExpected = TRUE;
     }
@@ -1820,6 +1846,8 @@ FORWARDING_HANDLER::OnSendingRequest(
     __out BOOL *                pfClientError
 )
 {
+    *pfClientError = FALSE;
+
     //
     // This is a completion for a read from http.sys, abort in case
     // of failure, if we read anything write it out over WinHTTP,
@@ -1836,18 +1864,18 @@ FORWARDING_HANDLER::OnSendingRequest(
             RETURN_LAST_ERROR_IF(!WinHttpWriteData(m_hRequest,
                 "0\r\n\r\n",
                 5,
-                NULL));
+                nullptr));
         }
         else
         {
             m_RequestStatus = FORWARDER_RECEIVING_RESPONSE;
 
-            RETURN_LAST_ERROR_IF(!WinHttpReceiveResponse(m_hRequest, NULL));
+            RETURN_LAST_ERROR_IF(!WinHttpReceiveResponse(m_hRequest, nullptr));
         }
     }
     else if (SUCCEEDED(hrCompletionStatus))
     {
-        DWORD cbOffset;
+        DWORD cbOffset = 0;
 
         if (m_BytesToReceive != INFINITE)
         {
@@ -1904,7 +1932,7 @@ FORWARDING_HANDLER::OnSendingRequest(
         RETURN_LAST_ERROR_IF(!WinHttpWriteData(m_hRequest,
             m_pEntityBuffer + cbOffset,
             cbCompletion,
-            NULL));
+            nullptr));
     }
     else
     {
@@ -1946,17 +1974,17 @@ FORWARDING_HANDLER::OnReceivingResponse(
         //
         // No buffering enabled.
         //
-        RETURN_LAST_ERROR_IF(!WinHttpQueryDataAvailable(m_hRequest, NULL));
+        RETURN_LAST_ERROR_IF(!WinHttpQueryDataAvailable(m_hRequest, nullptr));
     }
     else
     {
         //
         // Buffering enabled.
         //
-        if (m_pEntityBuffer == NULL)
+        if (m_pEntityBuffer == nullptr)
         {
             m_pEntityBuffer = GetNewResponseBuffer(min(m_BytesToSend, BUFFER_SIZE));
-            if (m_pEntityBuffer == NULL)
+            if (m_pEntityBuffer == nullptr)
             {
                 RETURN_HR(E_OUTOFMEMORY);
             }
@@ -1965,7 +1993,7 @@ FORWARDING_HANDLER::OnReceivingResponse(
         RETURN_LAST_ERROR_IF(!WinHttpReadData(m_hRequest,
             m_pEntityBuffer,
             min(m_BytesToSend, BUFFER_SIZE),
-            NULL));
+            nullptr));
     }
 
     return S_OK;
@@ -1981,15 +2009,15 @@ FORWARDING_HANDLER::GetNewResponseBuffer(
         !m_buffEntityBuffers.Resize(
             max(dwNeededSize, m_buffEntityBuffers.QuerySize() * 2)))
     {
-        return NULL;
+        return nullptr;
     }
 
     BYTE *pBuffer = (BYTE *)HeapAlloc(GetProcessHeap(),
         0, // dwFlags
         dwBufferSize);
-    if (pBuffer == NULL)
+    if (pBuffer == nullptr)
     {
-        return NULL;
+        return nullptr;
     }
 
     m_buffEntityBuffers.QueryPtr()[m_cEntityBuffers] = pBuffer;
@@ -2009,7 +2037,7 @@ FORWARDING_HANDLER::FreeResponseBuffers()
             pBuffers[i]);
     }
     m_cEntityBuffers = 0;
-    m_pEntityBuffer = NULL;
+    m_pEntityBuffer = nullptr;
     m_cBytesBuffered = 0;
 }
 
@@ -2024,17 +2052,17 @@ FORWARDING_HANDLER::SetStatusAndHeaders(
     STACK_STRA(strHeaderName, 128);
     STACK_STRA(strHeaderValue, 2048);
     DWORD           index = 0;
-    PSTR            pchNewline;
-    PCSTR           pchEndofHeaderValue;
+    PSTR            pchNewline = nullptr;
+    PCSTR           pchEndofHeaderValue = nullptr;
     BOOL            fServerHeaderPresent = FALSE;
 
-    _ASSERT(pszHeaders != NULL);
+    _ASSERT(pszHeaders != nullptr);
 
     //
     // The first line is the status line
     //
     PSTR pchStatus = const_cast<PSTR>(strchr(pszHeaders, ' '));
-    if (pchStatus == NULL)
+    if (pchStatus == nullptr)
     {
         return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
     }
@@ -2054,7 +2082,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders(
     }
 
     pchStatus = strchr(pchStatus, ' ');
-    if (pchStatus == NULL)
+    if (pchStatus == nullptr)
     {
         return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
     }
@@ -2068,7 +2096,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders(
     }
 
     pchNewline = strchr(pchStatus, '\n');
-    if (pchNewline == NULL)
+    if (pchNewline == nullptr)
     {
         return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
     }
@@ -2096,7 +2124,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders(
                 strHeaderValue.QueryStr(),
                 0,
                 S_OK,
-                NULL,
+                nullptr,
                 TRUE));
     }
 
@@ -2114,7 +2142,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders(
         //
         pchNewline = const_cast<PSTR>(strchr(pszHeaders + index, '\n'));
 
-        if (pchNewline == NULL)
+        if (pchNewline == nullptr)
         {
             return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
         }
@@ -2129,8 +2157,8 @@ FORWARDING_HANDLER::SetStatusAndHeaders(
         }
 
         DBG_ASSERT(
-            (pchColon != NULL) && (pchColon < pchNewline));
-        if ((pchColon == NULL) || (pchColon >= pchNewline))
+            (pchColon != nullptr) && (pchColon < pchNewline));
+        if ((pchColon == nullptr) || (pchColon >= pchNewline))
         {
             return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
         }
@@ -2265,19 +2293,19 @@ FORWARDING_HANDLER::DoReverseRewrite(
 )
 {
     DBG_ASSERT(pResponse == m_pW3Context->GetResponse());
-    BOOL fSecure = (m_pW3Context->GetRequest()->GetRawHttpRequest()->pSslInfo != NULL);
+    BOOL fSecure = (m_pW3Context->GetRequest()->GetRawHttpRequest()->pSslInfo != nullptr);
     STRA strTemp;
-    PCSTR pszHeader;
-    PCSTR pszStartHost;
-    PCSTR pszEndHost;
-    HTTP_RESPONSE_HEADERS *pHeaders;
+    PCSTR pszHeader = nullptr;
+    PCSTR pszStartHost = nullptr;
+    PCSTR pszEndHost = nullptr;
+    HTTP_RESPONSE_HEADERS *pHeaders = nullptr;
 
     //
     // Content-Location and Location are easy, one known header in
     // http[s]://host/url format
     //
     pszHeader = pResponse->GetHeader(HttpHeaderContentLocation);
-    if (pszHeader != NULL)
+    if (pszHeader != nullptr)
     {
         if (_strnicmp(pszHeader, "http://", 7) == 0)
         {
@@ -2297,7 +2325,7 @@ FORWARDING_HANDLER::DoReverseRewrite(
         RETURN_IF_FAILED(strTemp.Copy(fSecure ? "https://" : "http://"));
         RETURN_IF_FAILED(strTemp.Append(m_pszOriginalHostHeader));
 
-        if (pszEndHost != NULL)
+        if (pszEndHost != nullptr)
         {
             RETURN_IF_FAILED(strTemp.Append(pszEndHost));
         }
@@ -2310,7 +2338,7 @@ FORWARDING_HANDLER::DoReverseRewrite(
 Location:
 
     pszHeader = pResponse->GetHeader(HttpHeaderLocation);
-    if (pszHeader != NULL)
+    if (pszHeader != nullptr)
     {
         if (_strnicmp(pszHeader, "http://", 7) == 0)
         {
@@ -2330,7 +2358,7 @@ FORWARDING_HANDLER::DoReverseRewrite(
         RETURN_IF_FAILED(strTemp.Copy(fSecure ? "https://" : "http://"));
         RETURN_IF_FAILED(strTemp.Append(m_pszOriginalHostHeader));
 
-        if (pszEndHost != NULL)
+        if (pszEndHost != nullptr)
         {
             RETURN_IF_FAILED(strTemp.Append(pszEndHost));
         }
@@ -2356,7 +2384,7 @@ FORWARDING_HANDLER::DoReverseRewrite(
 
         pszHeader = pHeaders->pUnknownHeaders[i].pRawValue;
         pszStartHost = strchr(pszHeader, ';');
-        while (pszStartHost != NULL)
+        while (pszStartHost != nullptr)
         {
             pszStartHost++;
             while (IsSpace(*pszStartHost))
@@ -2401,7 +2429,7 @@ FORWARDING_HANDLER::DoReverseRewrite(
             RETURN_IF_FAILED(strTemp.Append(pszEndHost));
 
             pszHeader = (PCSTR)m_pW3Context->AllocateRequestMemory(strTemp.QueryCCH() + 1);
-            if (pszHeader == NULL)
+            if (pszHeader == nullptr)
             {
                 RETURN_HR(E_OUTOFMEMORY);
             }
@@ -2460,20 +2488,22 @@ FORWARDING_HANDLER::NotifyDisconnect()
     }
 }
 
+_Acquires_exclusive_lock_(this->m_RequestLock)
 VOID
 FORWARDING_HANDLER::AcquireLockExclusive()
 {
-    DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL);
+    DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr);
     AcquireSRWLockExclusive(&m_RequestLock);
     TlsSetValue(g_dwTlsIndex, this);
     DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this);
 }
 
+_Releases_exclusive_lock_(this->m_RequestLock)
 VOID
 FORWARDING_HANDLER::ReleaseLockExclusive()
 {
     DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this);
-    TlsSetValue(g_dwTlsIndex, NULL);
+    TlsSetValue(g_dwTlsIndex, nullptr);
     ReleaseSRWLockExclusive(&m_RequestLock);
-    DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL);
+    DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr);
 }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h
index c564a7b4f03a..8e5c5c74d250 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h
@@ -77,9 +77,11 @@ class FORWARDING_HANDLER : public REQUEST_HANDLER
 
 private:
 
+    _Acquires_exclusive_lock_(this->m_RequestLock)
     VOID
     AcquireLockExclusive();
 
+    _Releases_exclusive_lock_(this->m_RequestLock)
     VOID
     ReleaseLockExclusive();
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc
index 654496a8c5b4..1d8f764c8183 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc
@@ -9,7 +9,7 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-#define FileDescription "IIS ASP.NET Core Module V2 Request Handler. Commit: " CommitHash
+#define FileDescription "IIS Http Bridge Module Request Handler. Commit: " CommitHash
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -18,12 +18,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 //1 11
 //BEGIN
-//    0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010, 
-//    0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 
-//    0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 
-//    0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 
-//    0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 
-//    0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 
+//    0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010,
+//    0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001,
+//    0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025,
+//    0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031,
+//    0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d,
+//    0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a,
 //    0x0000, 0x0000
 //END
 
@@ -34,17 +34,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "..\CommonLib\resources.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
@@ -75,13 +75,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Microsoft"
+            VALUE "CompanyName", "LeXtudio"
             VALUE "FileDescription", FileDescription
             VALUE "FileVersion", FileVersionStr
-            VALUE "InternalName", "aspnetcorev2_outofprocess.dll"
-            VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"
-            VALUE "OriginalFilename", "aspnetcorev2_outofprocess.dll"
-            VALUE "ProductName", "ASP.NET Core Module Request Handler"
+            VALUE "InternalName", "httpbridge_outofprocess.dll"
+            VALUE "LegalCopyright", "Copyright (C) LeXtudio Inc."
+            VALUE "OriginalFilename", "httpbridge_outofprocess.dll"
+            VALUE "ProductName", "HTTP Bridge Module Request Handler"
             VALUE "ProductVersion", ProductVersionStr
         END
     END
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
index 897a97d17c05..05e019724659 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
@@ -4,6 +4,8 @@
 #include "outprocessapplication.h"
 #include "SRWExclusiveLock.h"
 #include "exceptions.h"
+#include <filesystem>
+#include <EventLog.h>
 
 OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION(
     IHttpApplication& pApplication,
@@ -12,17 +14,17 @@ OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION(
     m_fWebSocketSupported(WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN),
     m_pConfig(std::move(pConfig))
 {
-    m_pProcessManager = NULL;
+    m_pProcessManager = nullptr;
 }
 
 OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION()
 {
     SRWExclusiveLock lock(m_stopLock);
-    if (m_pProcessManager != NULL)
+    if (m_pProcessManager != nullptr)
     {
         m_pProcessManager->Shutdown();
         m_pProcessManager->DereferenceProcessManager();
-        m_pProcessManager = NULL;
+        m_pProcessManager = nullptr;
     }
 }
 
@@ -30,11 +32,15 @@ HRESULT
 OUT_OF_PROCESS_APPLICATION::Initialize(
 )
 {
-    if (m_pProcessManager == NULL)
+    if (m_pProcessManager == nullptr)
     {
         m_pProcessManager = new PROCESS_MANAGER();
         RETURN_IF_FAILED(m_pProcessManager->Initialize());
     }
+
+    // Start monitoring files configured for recycleOnFileChange
+    RETURN_IF_FAILED(StartMonitoringConfiguredFiles());
+
     return S_OK;
 }
 
@@ -50,9 +56,20 @@ __override
 VOID
 OUT_OF_PROCESS_APPLICATION::StopInternal(bool fServerInitiated)
 {
+    // Stop all file watchers before stopping the application
+    for (auto& fileWatcher : m_fileWatchers)
+    {
+        if (fileWatcher != nullptr)
+        {
+            fileWatcher->StopMonitor();
+        }
+    }
+    m_fileWatchers.clear();
+
+    // Call parent class implementation
     AppOfflineTrackingApplication::StopInternal(fServerInitiated);
 
-    if (m_pProcessManager != NULL)
+    if (m_pProcessManager != nullptr)
     {
         m_pProcessManager->Shutdown();
     }
@@ -63,7 +80,7 @@ OUT_OF_PROCESS_APPLICATION::CreateHandler(
     _In_  IHttpContext       *pHttpContext,
     _Out_ IREQUEST_HANDLER  **pRequestHandler)
 {
-    IREQUEST_HANDLER* pHandler = NULL;
+    IREQUEST_HANDLER* pHandler = nullptr;
 
     //add websocket check here
     if (m_fWebSocketSupported == WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN)
@@ -105,3 +122,79 @@ OUT_OF_PROCESS_APPLICATION::QueryWebsocketStatus() const
 {
     return m_fWebSocketSupported == WEBSOCKET_STATUS::WEBSOCKET_SUPPORTED;
 }
+
+HRESULT
+OUT_OF_PROCESS_APPLICATION::StartMonitoringConfiguredFiles()
+{
+    // Don't monitor files if app is stopping/stopped
+    if (m_fStopCalled)
+    {
+        return S_OK;
+    }
+
+    const auto& filesToMonitor = m_pConfig->QueryRecycleOnFileChangeFiles();
+    if (filesToMonitor.empty())
+    {
+        // No files to monitor
+        return S_OK;
+    }
+
+    LOG_INFOF(L"Starting file change monitoring for %d files in application '%ls'",
+        filesToMonitor.size(), QueryApplicationPhysicalPath().c_str());
+
+    try
+    {
+        for (const auto& filePath : filesToMonitor)
+        {
+            // Create full path if it's not already absolute
+            std::wstring fullPath = filePath;
+            if (!std::filesystem::path(filePath).is_absolute())
+            {
+                // Combine app path with relative path
+                fullPath = QueryApplicationPhysicalPath() + filePath;
+            }
+
+            std::filesystem::path path(fullPath);
+            std::wstring directoryPath = path.parent_path().wstring();
+            std::wstring fileName = path.filename().wstring();
+
+            auto fileWatcher = std::make_unique<FILE_WATCHER>();
+            LOG_INFOF(L"Creating file watcher for '%ls' in directory '%ls'", fileName.c_str(), directoryPath.c_str());
+
+            RETURN_IF_FAILED(fileWatcher->Create(
+                directoryPath.c_str(),
+                fileName.c_str(),
+                L"", // No shadow copy path for file monitoring
+                this,
+                m_shutdownTimeout));
+
+            m_fileWatchers.push_back(std::move(fileWatcher));
+        }
+    }
+    catch (...)
+    {
+        OBSERVE_CAUGHT_EXCEPTION();
+        return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+    }
+
+    return S_OK;
+}
+
+VOID
+OUT_OF_PROCESS_APPLICATION::OnFileChanged()
+{
+    if (m_fStopCalled)
+    {
+        return;
+    }
+
+    LOG_INFOF(L"File change detected in application '%ls', triggering application restart", QueryApplicationPhysicalPath().c_str());
+
+    EventLog::Info(
+        ASPNETCORE_EVENT_RECYCLE_CONFIGURATION,
+        ASPNETCORE_EVENT_RECYCLE_FILECHANGE_MSG,
+        QueryApplicationPhysicalPath().c_str());
+
+    // Stopping the application will cause IIS to recycle it
+    Stop(/*fServerInitiated*/ false);
+}
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
index 278f23be2c25..a3abcfc19ed9 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "AppOfflineTrackingApplication.h"
+#include <vector>
 
 class OUT_OF_PROCESS_APPLICATION : public AppOfflineTrackingApplication
 {
@@ -51,6 +52,21 @@ class OUT_OF_PROCESS_APPLICATION : public AppOfflineTrackingApplication
         return m_pConfig.get();
     }
 
+    VOID
+    OnFileChanged();
+    
+    // Override OnConfigurationFileChange from base class
+    __override
+    VOID
+    OnConfigurationFileChange() override
+    {
+        // When a configuration file changes, call OnFileChanged
+        OnFileChanged();
+    }
+
+    HRESULT
+    StartMonitoringConfiguredFiles();
+
 private:
 
     VOID SetWebsocketStatus(IHttpContext *pHttpContext);
@@ -60,4 +76,5 @@ class OUT_OF_PROCESS_APPLICATION : public AppOfflineTrackingApplication
 
     WEBSOCKET_STATUS              m_fWebSocketSupported;
     std::unique_ptr<REQUESTHANDLER_CONFIG> m_pConfig;
+    std::vector<std::unique_ptr<FILE_WATCHER>> m_fileWatchers;
 };
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp
index fdcc7210ad7d..db783aed2a77 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp
@@ -13,8 +13,8 @@ PROCESS_MANAGER::Initialize(
     VOID
 )
 {
-    WSADATA                              wsaData;
-    int                                  result;
+    WSADATA                              wsaData{};
+    int                                  result = 0;
 
     if( !sm_fWSAStartupDone )
     {
@@ -32,12 +32,12 @@ PROCESS_MANAGER::Initialize(
 
     m_dwRapidFailTickStart = GetTickCount();
 
-    if( m_hNULHandle == NULL )
+    if( m_hNULHandle == nullptr )
     {
         SECURITY_ATTRIBUTES saAttr;
         saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
         saAttr.bInheritHandle = TRUE;
-        saAttr.lpSecurityDescriptor = NULL;
+        saAttr.lpSecurityDescriptor = nullptr;
 
         m_hNULHandle = CreateFileW( L"NUL",
                                     FILE_WRITE_DATA,
@@ -45,7 +45,7 @@ PROCESS_MANAGER::Initialize(
                                     &saAttr,
                                     CREATE_ALWAYS,
                                     FILE_ATTRIBUTE_NORMAL,
-                                    NULL );
+                                    nullptr );
         RETURN_LAST_ERROR_IF( m_hNULHandle == INVALID_HANDLE_VALUE );
     }
 
@@ -82,7 +82,7 @@ PROCESS_MANAGER::GetProcess(
 
             for (DWORD i = 0; i < m_dwProcessesPerApplication; ++i)
             {
-                m_ppServerProcessList[i] = NULL;
+                m_ppServerProcessList[i] = nullptr;
             }
         }
         m_fServerProcessListReady = TRUE;
@@ -97,7 +97,7 @@ PROCESS_MANAGER::GetProcess(
         dwProcessIndex = InterlockedIncrement(&m_dwRouteToProcessIndex);
         dwProcessIndex = dwProcessIndex % m_dwProcessesPerApplication;
 
-        if (m_ppServerProcessList[dwProcessIndex] != NULL &&
+        if (m_ppServerProcessList[dwProcessIndex] != nullptr &&
             m_ppServerProcessList[dwProcessIndex]->IsReady())
         {
             *ppServerProcess = m_ppServerProcessList[dwProcessIndex];
@@ -106,12 +106,12 @@ PROCESS_MANAGER::GetProcess(
     }
 
     // should make the lock per process so that we can start processes simultaneously ?
-    if (m_ppServerProcessList[dwProcessIndex] == NULL ||
+    if (m_ppServerProcessList[dwProcessIndex] == nullptr ||
         !m_ppServerProcessList[dwProcessIndex]->IsReady())
     {
         auto lock = SRWExclusiveLock(m_srwLock);
 
-        if (m_ppServerProcessList[dwProcessIndex] != NULL)
+        if (m_ppServerProcessList[dwProcessIndex] != nullptr)
         {
             if (!m_ppServerProcessList[dwProcessIndex]->IsReady())
             {
@@ -143,7 +143,7 @@ PROCESS_MANAGER::GetProcess(
             RETURN_HR(HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED));
         }
 
-        if (m_ppServerProcessList[dwProcessIndex] == NULL)
+        if (m_ppServerProcessList[dwProcessIndex] == nullptr)
         {
 
             pSelectedServerProcess = std::make_unique<SERVER_PROCESS>();
@@ -163,8 +163,8 @@ PROCESS_MANAGER::GetProcess(
                     pConfig->QueryStdoutLogFile(),
                     pConfig->QueryApplicationPhysicalPath(),   // physical path
                     pConfig->QueryApplicationPath(),           // app path
-                    pConfig->QueryApplicationVirtualPath(),     // App relative virtual path,
-                    pConfig->QueryBindings()
+                    pConfig->QueryApplicationVirtualPath()//,     // App relative virtual path,
+                    //pConfig->QueryBindings()
             ));
             RETURN_IF_FAILED(pSelectedServerProcess->StartProcess());
         }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h
index 764e77d59563..119c5eb1366f 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h
@@ -53,12 +53,12 @@ class PROCESS_MANAGER
 
         for(DWORD i = 0; i < m_dwProcessesPerApplication; ++i )
         {
-            if( m_ppServerProcessList != NULL && 
-                m_ppServerProcessList[i] != NULL )
+            if( m_ppServerProcessList != nullptr && 
+                m_ppServerProcessList[i] != nullptr )
             {
                 m_ppServerProcessList[i]->SendSignal();
                 m_ppServerProcessList[i]->DereferenceServerProcess();
-                m_ppServerProcessList[i] = NULL;
+                m_ppServerProcessList[i] = nullptr;
             }
         }
 
@@ -107,8 +107,8 @@ class PROCESS_MANAGER
     }
 
     PROCESS_MANAGER() : 
-        m_ppServerProcessList( NULL ),
-        m_hNULHandle( NULL ),
+        m_ppServerProcessList(nullptr),
+        m_hNULHandle(nullptr),
         m_cRapidFailCount( 0 ),
         m_dwProcessesPerApplication( 1 ),
         m_dwRouteToProcessIndex( 0 ),
@@ -116,7 +116,7 @@ class PROCESS_MANAGER
         m_lStopping(0),
         m_cRefs( 1 )
     {
-        m_ppServerProcessList = NULL;
+        m_ppServerProcessList = nullptr;
         m_fServerProcessListReady = FALSE;
         InitializeSRWLock( &m_srwLock );
     }
@@ -151,14 +151,14 @@ class PROCESS_MANAGER
     {
         for(DWORD i = 0; i < m_dwProcessesPerApplication; ++i )
         {
-            if( m_ppServerProcessList != NULL && 
-                m_ppServerProcessList[i] != NULL && 
+            if( m_ppServerProcessList != nullptr &&
+                m_ppServerProcessList[i] != nullptr &&
                 m_ppServerProcessList[i]->GetPort() == pServerProcess->GetPort() )
             {
                 // shutdown pServerProcess if not already shutdown.
                 m_ppServerProcessList[i]->StopProcess();
                 m_ppServerProcessList[i]->DereferenceServerProcess();
-                m_ppServerProcessList[i] = NULL;
+                m_ppServerProcessList[i] = nullptr;
             }
         }
     }
@@ -170,13 +170,13 @@ class PROCESS_MANAGER
     {
         for(DWORD i = 0; i < m_dwProcessesPerApplication; ++i )
         {
-            if( m_ppServerProcessList != NULL &&
-                m_ppServerProcessList[i] != NULL )
+            if( m_ppServerProcessList != nullptr &&
+                m_ppServerProcessList[i] != nullptr)
             {
                 // shutdown pServerProcess if not already shutdown.
                 m_ppServerProcessList[i]->SendSignal();
                 m_ppServerProcessList[i]->DereferenceServerProcess();
-                m_ppServerProcessList[i] = NULL;
+                m_ppServerProcessList[i] = nullptr;
             }
         }
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h
index 54f9c8295426..05b595f6bdcb 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h
@@ -73,10 +73,10 @@ class RESPONSE_HEADER_HASH: public HASH_TABLE<HEADER_RECORD, PCSTR>
         PCSTR             pszName
     )
     {
-        HEADER_RECORD *       pRecord = NULL;
+        HEADER_RECORD* pRecord = nullptr;
 
         FindKey(pszName, &pRecord);
-        if (pRecord != NULL)
+        if (pRecord != nullptr)
         {
             return pRecord->_ulHeaderIndex;
         }
@@ -96,7 +96,7 @@ class RESPONSE_HEADER_HASH: public HASH_TABLE<HEADER_RECORD, PCSTR>
             return sm_rgHeaders[ulIndex]._pszName;
         }
 
-        return NULL;
+        return nullptr;
     }
     
 private:
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp
index 52146c27d5cb..4dd02680ac9f 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "serverprocess.h"
@@ -25,8 +26,8 @@ SERVER_PROCESS::Initialize(
     STRU                  *pstruStdoutLogFile,
     STRU                  *pszAppPhysicalPath,
     STRU                  *pszAppPath,
-    STRU                  *pszAppVirtualPath,
-    STRU                  *pszHttpsPort
+    STRU                  *pszAppVirtualPath//,
+    //STRU                  *pszHttpsPort
 )
 {
     m_pProcessManager = pProcessManager;
@@ -48,7 +49,7 @@ SERVER_PROCESS::Initialize(
         FAILED_LOG(hr = m_struAppFullPath.Copy(*pszAppPath))||
         FAILED_LOG(hr = m_struAppVirtualPath.Copy(*pszAppVirtualPath))||
         FAILED_LOG(hr = m_Arguments.Copy(*pszArguments)) ||
-        FAILED_LOG(hr = m_struHttpsPort.Copy(*pszHttpsPort)) ||
+        //FAILED_LOG(hr = m_struHttpsPort.Copy(*pszHttpsPort)) ||
         FAILED_LOG(hr = SetupJobObject()))
     {
         return hr;
@@ -102,8 +103,8 @@ SERVER_PROCESS::GetRandomPort
 
     std::uniform_int_distribution<> dist(MIN_PORT_RANDOM, MAX_PORT);
 
-    BOOL fPortInUse;
-    DWORD dwActualProcessId; // Ignored, but required for the function call.
+    BOOL fPortInUse = FALSE;
+    DWORD dwActualProcessId = 0; // Ignored, but required for the function call.
     constexpr int maxRetries = 10;
     for (int retry = 0; retry < maxRetries; ++retry)
     {
@@ -129,22 +130,64 @@ SERVER_PROCESS::GetRandomPort
 }
 
 HRESULT
-SERVER_PROCESS::SetupListenPort(
-    ENVIRONMENT_VAR_HASH    *pEnvironmentVarTable,
+SERVER_PROCESS::GetListenPort(
     BOOL*                    pfCriticalError
 )
 {
     HRESULT hr = S_OK;
-    ENVIRONMENT_VAR_ENTRY *pEntry = NULL;
+    *pfCriticalError = FALSE;
+
+    WCHAR buffer[15] = {0};
+    if (FAILED_LOG(hr = GetRandomPort(&m_dwPort)))
+    {
+        goto Finished;
+    }
+
+    if (swprintf_s(buffer, 15, L"%d", m_dwPort) <= 0)
+    {
+        hr = E_INVALIDARG;
+        goto Finished;
+    }
+
+    if (FAILED_LOG(hr = m_struPort.Copy(buffer)))
+    {
+        goto Finished;
+    }
+
+Finished:
+    if (FAILED_LOG(hr))
+    {
+        EventLog::Error(
+            ASPNETCORE_EVENT_PROCESS_START_SUCCESS,
+            ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG,
+            m_struAppFullPath.QueryStr(),
+            m_struPhysicalPath.QueryStr(),
+            m_dwPort,
+            MIN_PORT_RANDOM,
+            MAX_PORT,
+            hr);
+    }
+
+    return hr;
+}
+
+HRESULT
+SERVER_PROCESS::SetupListenPort(
+    ENVIRONMENT_VAR_HASH* pEnvironmentVarTable,
+    BOOL* pfCriticalError
+)
+{
+    HRESULT hr = S_OK;
+    ENVIRONMENT_VAR_ENTRY* pEntry = nullptr;
     *pfCriticalError = FALSE;
 
     pEnvironmentVarTable->FindKey(ASPNETCORE_PORT_ENV_STR, &pEntry);
-    if (pEntry != NULL)
+    if (pEntry != nullptr)
     {
-        if (pEntry->QueryValue() != NULL && pEntry->QueryValue()[0] != L'\0')
+        if (pEntry->QueryValue() != nullptr && pEntry->QueryValue()[0] != L'\0')
         {
             m_dwPort = (DWORD)_wtoi(pEntry->QueryValue());
-            if (m_dwPort >MAX_PORT || m_dwPort < MIN_PORT)
+            if (m_dwPort > MAX_PORT || m_dwPort < MIN_PORT)
             {
                 hr = E_INVALIDARG;
                 *pfCriticalError = TRUE;
@@ -161,41 +204,28 @@ SERVER_PROCESS::SetupListenPort(
             //
             pEnvironmentVarTable->DeleteKey(ASPNETCORE_PORT_ENV_STR);
             pEntry->Dereference();
-            pEntry = NULL;
+            pEntry = nullptr;
         }
     }
 
-    WCHAR buffer[15];
-    if (FAILED_LOG(hr = GetRandomPort(&m_dwPort)))
-    {
-        goto Finished;
-    }
-
-    if (swprintf_s(buffer, 15, L"%d", m_dwPort) <= 0)
-    {
-        hr = E_INVALIDARG;
-        goto Finished;
-    }
-
     pEntry = new ENVIRONMENT_VAR_ENTRY();
-    if (pEntry == NULL)
+    if (pEntry == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
     }
 
-    if (FAILED_LOG(hr = pEntry->Initialize(ASPNETCORE_PORT_ENV_STR, buffer)) ||
-        FAILED_LOG(hr = pEnvironmentVarTable->InsertRecord(pEntry)) ||
-        FAILED_LOG(hr = m_struPort.Copy(buffer)))
+    if (FAILED_LOG(hr = pEntry->Initialize(ASPNETCORE_PORT_ENV_STR, m_struPort.QueryStr())) ||
+        FAILED_LOG(hr = pEnvironmentVarTable->InsertRecord(pEntry)))
     {
         goto Finished;
     }
 
 Finished:
-    if (pEntry != NULL)
+    if (pEntry != nullptr)
     {
         pEntry->Dereference();
-        pEntry = NULL;
+        pEntry = nullptr;
     }
 
     if (FAILED_LOG(hr))
@@ -205,7 +235,7 @@ SERVER_PROCESS::SetupListenPort(
             ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG,
             m_struAppFullPath.QueryStr(),
             m_struPhysicalPath.QueryStr(),
-            m_dwPort,
+            m_struPort.QueryStr(),
             MIN_PORT_RANDOM,
             MAX_PORT,
             hr);
@@ -251,21 +281,21 @@ SERVER_PROCESS::SetupAppToken(
 )
 {
     HRESULT     hr = S_OK;
-    UUID        logUuid;
-    PSTR        pszLogUuid = NULL;
+    UUID        logUuid{};
+    PSTR        pszLogUuid = nullptr;
     BOOL        fRpcStringAllocd = FALSE;
-    RPC_STATUS  rpcStatus;
+    RPC_STATUS  rpcStatus = 0;
     STRU        strAppToken;
-    ENVIRONMENT_VAR_ENTRY*  pEntry = NULL;
+    ENVIRONMENT_VAR_ENTRY*  pEntry = nullptr;
 
     pEnvironmentVarTable->FindKey(ASPNETCORE_APP_TOKEN_ENV_STR, &pEntry);
-    if (pEntry != NULL)
+    if (pEntry != nullptr)
     {
         // user sets the environment variable
         m_straGuid.Reset();
         hr = m_straGuid.CopyW(pEntry->QueryValue());
         pEntry->Dereference();
-        pEntry = NULL;
+        pEntry = nullptr;
         goto Finished;
     }
     else
@@ -296,7 +326,7 @@ SERVER_PROCESS::SetupAppToken(
         }
 
         pEntry = new ENVIRONMENT_VAR_ENTRY();
-        if (pEntry == NULL)
+        if (pEntry == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -315,12 +345,12 @@ SERVER_PROCESS::SetupAppToken(
     if (fRpcStringAllocd)
     {
         RpcStringFreeA((BYTE **)&pszLogUuid);
-        pszLogUuid = NULL;
+        pszLogUuid = nullptr;
     }
-    if (pEntry != NULL)
+    if (pEntry != nullptr)
     {
         pEntry->Dereference();
-        pEntry = NULL;
+        pEntry = nullptr;
     }
     return hr;
 }
@@ -333,12 +363,12 @@ SERVER_PROCESS::OutputEnvironmentVariables
 )
 {
     HRESULT    hr = S_OK;
-    LPWSTR     pszEnvironmentVariables = NULL;
-    LPWSTR     pszCurrentVariable = NULL;
-    LPWSTR     pszNextVariable = NULL;
-    LPWSTR     pszEqualChar = NULL;
+    LPWSTR     pszEnvironmentVariables = nullptr;
+    LPWSTR     pszCurrentVariable = nullptr;
+    LPWSTR     pszNextVariable = nullptr;
+    LPWSTR     pszEqualChar = nullptr;
     STRU       strEnvVar;
-    ENVIRONMENT_VAR_ENTRY* pEntry = NULL;
+    ENVIRONMENT_VAR_ENTRY* pEntry = nullptr;
 
     DBG_ASSERT(pmszOutput);
     DBG_ASSERT(pEnvironmentVarTable); // We added some startup variables
@@ -348,7 +378,7 @@ SERVER_PROCESS::OutputEnvironmentVariables
     pmszOutput->Reset();
 
     pszEnvironmentVariables = GetEnvironmentStringsW();
-    if (pszEnvironmentVariables == NULL)
+    if (pszEnvironmentVariables == nullptr)
     {
         hr = HRESULT_FROM_WIN32(ERROR_INVALID_ENVIRONMENT);
         goto Finished;
@@ -358,14 +388,14 @@ SERVER_PROCESS::OutputEnvironmentVariables
     {
         pszNextVariable = pszCurrentVariable + wcslen(pszCurrentVariable) + 1;
         pszEqualChar = wcschr(pszCurrentVariable, L'=');
-        if (pszEqualChar != NULL)
+        if (pszEqualChar != nullptr)
         {
             if (FAILED_LOG(hr = strEnvVar.Copy(pszCurrentVariable, (DWORD)(pszEqualChar - pszCurrentVariable) + 1)))
             {
                 goto Finished;
             }
             pEnvironmentVarTable->FindKey(strEnvVar.QueryStr(), &pEntry);
-            if (pEntry != NULL)
+            if (pEntry != nullptr)
             {
                 // same env variable is defined in configuration, use it
                 if (FAILED_LOG(hr = strEnvVar.Append(pEntry->QueryValue())))
@@ -377,7 +407,7 @@ SERVER_PROCESS::OutputEnvironmentVariables
                 pEntry->Dereference();
                 pEnvironmentVarTable->DeleteKey(pEntry->QueryName());
                 strEnvVar.Reset();
-                pEntry = NULL;
+                pEntry = nullptr;
             }
             else
             {
@@ -386,7 +416,7 @@ SERVER_PROCESS::OutputEnvironmentVariables
         }
         else
         {
-            // env varaible is not well formated
+            // env variable is not well formatted
             hr = HRESULT_FROM_WIN32(ERROR_INVALID_ENVIRONMENT);
             goto Finished;
         }
@@ -397,10 +427,10 @@ SERVER_PROCESS::OutputEnvironmentVariables
     pEnvironmentVarTable->Apply(ENVIRONMENT_VAR_HELPERS::CopyToMultiSz, pmszOutput);
 
 Finished:
-    if (pszEnvironmentVariables != NULL)
+    if (pszEnvironmentVariables != nullptr)
     {
         FreeEnvironmentStringsW(pszEnvironmentVariables);
-        pszEnvironmentVariables = NULL;
+        pszEnvironmentVariables = nullptr;
     }
     return hr;
 }
@@ -411,11 +441,11 @@ SERVER_PROCESS::SetupCommandLine(
 )
 {
     HRESULT    hr = S_OK;
-    LPWSTR     pszPath = NULL;
-    LPWSTR     pszFullPath = NULL;
+    LPWSTR     pszPath = nullptr;
+    LPWSTR     pszFullPath = nullptr;
     STRU       strRelativePath;
     DWORD      dwBufferSize = 0;
-    FILE       *file = NULL;
+    FILE       *file = nullptr;
 
     DBG_ASSERT(pstrCommandLine);
 
@@ -428,7 +458,7 @@ SERVER_PROCESS::SetupCommandLine(
 
     pszPath = m_ProcessPath.QueryStr();
 
-    if ((wcsstr(pszPath, L":") == NULL) && (wcsstr(pszPath, L"%") == NULL))
+    if ((wcsstr(pszPath, L":") == nullptr) && (wcsstr(pszPath, L"%") == nullptr))
     {
         // let's check whether it is a relative path
         if (FAILED_LOG(hr = strRelativePath.Copy(m_struPhysicalPath.QueryStr())) ||
@@ -440,7 +470,7 @@ SERVER_PROCESS::SetupCommandLine(
 
         dwBufferSize = strRelativePath.QueryCCH() + 1;
         pszFullPath = new WCHAR[dwBufferSize];
-        if (pszFullPath == NULL)
+        if (pszFullPath == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -448,13 +478,13 @@ SERVER_PROCESS::SetupCommandLine(
 
         if (_wfullpath(pszFullPath,
             strRelativePath.QueryStr(),
-            dwBufferSize) == NULL)
+            dwBufferSize) == nullptr)
         {
             hr = HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
             goto Finished;
         }
 
-        if ((file = _wfsopen(pszFullPath, L"r", _SH_DENYNO)) != NULL)
+        if ((file = _wfsopen(pszFullPath, L"r", _SH_DENYNO)) != nullptr)
         {
             fclose(file);
             pszPath = pszFullPath;
@@ -469,9 +499,9 @@ SERVER_PROCESS::SetupCommandLine(
     }
 
 Finished:
-    if (pszFullPath != NULL)
+    if (pszFullPath != nullptr)
     {
-        delete pszFullPath;
+        delete[] pszFullPath;
     }
     return hr;
 }
@@ -578,7 +608,7 @@ SERVER_PROCESS::PostStartCheck(
                 m_dwListeningProcessId = m_dwChildProcessIds[i];
                 fProcessMatch = TRUE;
 
-                if (m_hChildProcessHandles[i] != NULL)
+                if (m_hChildProcessHandles[i] != nullptr)
                 {
                     if (fDebuggerAttached == FALSE &&
                         CheckRemoteDebuggerPresent(m_hChildProcessHandles[i], &fDebuggerAttached) == 0)
@@ -664,10 +694,10 @@ SERVER_PROCESS::PostStartCheck(
     // ready to mark the server process ready but before this,
     // create and initialize the FORWARDER_CONNECTION
     //
-    if (m_pForwarderConnection == NULL)
+    if (m_pForwarderConnection == nullptr)
     {
         m_pForwarderConnection = new FORWARDER_CONNECTION();
-        if (m_pForwarderConnection == NULL)
+        if (m_pForwarderConnection == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -694,10 +724,10 @@ SERVER_PROCESS::PostStartCheck(
 
     if (FAILED_LOG(hr))
     {
-        if (m_pForwarderConnection != NULL)
+        if (m_pForwarderConnection != nullptr)
         {
             m_pForwarderConnection->DereferenceForwarderConnection();
-            m_pForwarderConnection = NULL;
+            m_pForwarderConnection = nullptr;
         }
 
         if (!strEventMsg.IsEmpty())
@@ -710,21 +740,38 @@ SERVER_PROCESS::PostStartCheck(
     return hr;
 }
 
+// Modern C++ implementation to replace all occurrences of a substring
+std::wstring ReplaceSubstring(const std::wstring& str, const std::wstring& from, const std::wstring& to) {
+    std::wstring result = str;
+    size_t pos = 0;
+
+    while ((pos = result.find(from, pos)) != std::wstring::npos) {
+        result.replace(pos, from.length(), to);
+        pos += to.length(); // Move past the replaced string
+    }
+
+    return result;
+}
+
 HRESULT
 SERVER_PROCESS::StartProcess(
     VOID
 )
 {
     HRESULT                 hr = S_OK;
-    PROCESS_INFORMATION     processInformation = {0};
-    STARTUPINFOW            startupInfo = {0};
+    PROCESS_INFORMATION     processInformation = {};
+    STARTUPINFOW            startupInfo = {};
     DWORD                   dwRetryCount = 2; // should we allow customer to config it
     DWORD                   dwCreationFlags = 0;
     MULTISZ                 mszNewEnvironment;
-    ENVIRONMENT_VAR_HASH    *pHashTable = NULL;
-    PWSTR                   pStrStage = NULL;
+    ENVIRONMENT_VAR_HASH    *pHashTable = nullptr;
+    PWSTR                   pStrStage = nullptr;
     BOOL                    fCriticalError = FALSE;
     std::map<std::wstring, std::wstring, ignore_case_comparer> variables;
+    // Move these declarations before any goto statements to avoid MSVC C2362 error
+    std::wstring commandLine;
+    std::wstring portStr;
+    std::wstring finalCommandLine;
 
     GetStartupInfoW(&startupInfo);
 
@@ -747,6 +794,15 @@ SERVER_PROCESS::StartProcess(
             goto Failure;
         }
 
+        //
+        // get the port that the backend process will listen on
+        //
+        if (FAILED_LOG(hr = GetListenPort(&fCriticalError)))
+        {
+            pStrStage = L"GetListenPort";
+            goto Failure;
+        }
+
         try
         {
             variables = ENVIRONMENT_VAR_HELPERS::InitEnvironmentVariablesTable(
@@ -754,9 +810,10 @@ SERVER_PROCESS::StartProcess(
                 m_fWindowsAuthEnabled,
                 m_fBasicAuthEnabled,
                 m_fAnonymousAuthEnabled,
-                true, // fAddHostingStartup
-                m_struAppFullPath.QueryStr(),
-                m_struHttpsPort.QueryStr());
+                //true, // fAddHostingStartup
+                m_struAppFullPath.QueryStr()//,
+                //m_struHttpsPort.QueryStr()
+            );
 
             variables = ENVIRONMENT_VAR_HELPERS::AddWebsocketEnabledToEnvironmentVariables(variables, m_fWebSocketSupported);
         }
@@ -768,6 +825,15 @@ SERVER_PROCESS::StartProcess(
         // Copy environment variables to old style hash table
         for (auto & variable : variables)
         {
+            std::wstring& value = variable.second;
+            size_t pos = 0;
+            wchar_t* replaceStr = m_struPort.QueryStr();
+            while ((pos = value.find(ASPNETCORE_PORT_IN_USE_STR, pos)) != std::string::npos)
+            {
+                value.replace(pos, wcslen(ASPNETCORE_PORT_IN_USE_STR), replaceStr);
+                pos += wcslen(replaceStr);
+            }
+
             auto pNewEntry = std::unique_ptr<ENVIRONMENT_VAR_ENTRY, ENVIRONMENT_VAR_ENTRY_DELETER>(new ENVIRONMENT_VAR_ENTRY());
             RETURN_IF_FAILED(pNewEntry->Initialize((variable.first + L"=").c_str(), variable.second.c_str()));
             RETURN_IF_FAILED(pHashTable->InsertRecord(pNewEntry.get()));
@@ -809,16 +875,23 @@ SERVER_PROCESS::StartProcess(
             goto Failure;
         }
 
+
+        commandLine = m_struCommandLine.QueryStr();
+        portStr = m_struPort.QueryStr();
+
+        // Replace port placeholder with actual port
+        finalCommandLine = ReplaceSubstring(commandLine, ASPNETCORE_PORT_IN_USE_STR, portStr);
+
         dwCreationFlags = CREATE_NO_WINDOW |
             CREATE_UNICODE_ENVIRONMENT |
             CREATE_SUSPENDED |
             CREATE_NEW_PROCESS_GROUP;
 
         if (!CreateProcessW(
-            NULL,                   // applicationName
-            m_struCommandLine.QueryStr(),
-            NULL,                   // processAttr
-            NULL,                   // threadAttr
+            nullptr,                   // applicationName
+            const_cast<LPWSTR>(finalCommandLine.c_str()),
+            nullptr,                   // processAttr
+            nullptr,                   // threadAttr
             TRUE,                   // inheritHandles
             dwCreationFlags,
             mszNewEnvironment.QueryStr(),
@@ -840,7 +913,7 @@ SERVER_PROCESS::StartProcess(
             goto Failure;
         }
 
-        if (m_hJobObject != NULL)
+        if (m_hJobObject != nullptr)
         {
             if (!AssignProcessToJobObject(m_hJobObject, m_hProcessHandle))
             {
@@ -900,17 +973,17 @@ SERVER_PROCESS::StartProcess(
             m_dwPort,
             dwRetryCount);
 
-        if (processInformation.hThread != NULL)
+        if (processInformation.hThread != nullptr)
         {
             CloseHandle(processInformation.hThread);
-            processInformation.hThread = NULL;
+            processInformation.hThread = nullptr;
         }
 
-        if (pHashTable != NULL)
+        if (pHashTable != nullptr)
         {
             pHashTable->Clear();
             delete pHashTable;
-            pHashTable = NULL;
+            pHashTable = nullptr;
         }
 
         CleanUp();
@@ -919,24 +992,24 @@ SERVER_PROCESS::StartProcess(
 Finished:
     if (FAILED_LOG(hr) || m_fReady == FALSE)
     {
-        if (m_hStdErrWritePipe != NULL)
+        if (m_hStdErrWritePipe != nullptr)
         {
             if (m_hStdErrWritePipe != INVALID_HANDLE_VALUE)
             {
                 CloseHandle(m_hStdErrWritePipe);
             }
 
-            m_hStdErrWritePipe = NULL;
+            m_hStdErrWritePipe = nullptr;
         }
 
-        if (m_hStdoutHandle != NULL)
+        if (m_hStdoutHandle != nullptr)
         {
             if (m_hStdoutHandle != INVALID_HANDLE_VALUE)
             {
                 CloseHandle(m_hStdoutHandle);
             }
 
-            m_hStdoutHandle = NULL;
+            m_hStdoutHandle = nullptr;
         }
 
         if (m_fStdoutLogEnabled)
@@ -963,8 +1036,9 @@ SERVER_PROCESS::SetWindowsAuthToken(
 )
 {
     HRESULT hr = S_OK;
+    *pTargetTokenHandle = nullptr;
 
-    if (m_hListeningProcessHandle != NULL && m_hListeningProcessHandle != INVALID_HANDLE_VALUE)
+    if (m_hListeningProcessHandle != nullptr && m_hListeningProcessHandle != INVALID_HANDLE_VALUE)
     {
         if (!DuplicateHandle( GetCurrentProcess(),
                              hToken,
@@ -990,8 +1064,8 @@ SERVER_PROCESS::SetupStdHandles(
 )
 {
     HRESULT                 hr = S_OK;
-    SYSTEMTIME              systemTime;
-    SECURITY_ATTRIBUTES     saAttr = { 0 };
+    SYSTEMTIME              systemTime{};
+    SECURITY_ATTRIBUTES     saAttr{};
 
     STRU                    struPath;
 
@@ -999,7 +1073,7 @@ SERVER_PROCESS::SetupStdHandles(
 
     saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
     saAttr.bInheritHandle = TRUE;
-    saAttr.lpSecurityDescriptor = NULL;
+    saAttr.lpSecurityDescriptor = nullptr;
 
     if (!m_fEnableOutOfProcessConsoleRedirection)
     {
@@ -1066,7 +1140,7 @@ SERVER_PROCESS::SetupStdHandles(
         &saAttr,
         CREATE_ALWAYS,
         FILE_ATTRIBUTE_NORMAL,
-        NULL);
+        nullptr);
 
     if (m_hStdoutHandle == INVALID_HANDLE_VALUE)
     {
@@ -1110,8 +1184,8 @@ SERVER_PROCESS::ReadStdErrHandle(
     LPVOID pContext
 )
 {
-    auto pLoggingProvider = static_cast<SERVER_PROCESS*>(pContext);
-    DBG_ASSERT(pLoggingProvider != NULL);
+    SERVER_PROCESS* pLoggingProvider = static_cast<SERVER_PROCESS*>(pContext);
+    DBG_ASSERT(pLoggingProvider != nullptr);
     pLoggingProvider->ReadStdErrHandleInternal();
 }
 
@@ -1164,8 +1238,8 @@ SERVER_PROCESS::CheckIfServerIsUp(
 {
     HRESULT                 hr = S_OK;
     DWORD                   dwResult = ERROR_INSUFFICIENT_BUFFER;
-    MIB_TCPTABLE_OWNER_PID *pTCPInfo = NULL;
-    MIB_TCPROW_OWNER_PID   *pOwner = NULL;
+    MIB_TCPTABLE_OWNER_PID *pTCPInfo = nullptr;
+    MIB_TCPROW_OWNER_PID   *pOwner = nullptr;
     DWORD                   dwSize = 1000; // Initial size for pTCPInfo buffer
     int                     iResult = 0;
     SOCKET                  socketCheck = INVALID_SOCKET;
@@ -1185,13 +1259,13 @@ SERVER_PROCESS::CheckIfServerIsUp(
         // New entries may be added by other processes before calling GetExtendedTcpTable
         dwSize += 200;
 
-        if (pTCPInfo != NULL)
+        if (pTCPInfo != nullptr)
         {
             HeapFree(GetProcessHeap(), 0, pTCPInfo);
         }
 
         pTCPInfo = (MIB_TCPTABLE_OWNER_PID*)HeapAlloc(GetProcessHeap(), 0, dwSize);
-        if (pTCPInfo == NULL)
+        if (pTCPInfo == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -1235,10 +1309,10 @@ SERVER_PROCESS::CheckIfServerIsUp(
         socketCheck = INVALID_SOCKET;
     }
 
-    if (pTCPInfo != NULL)
+    if (pTCPInfo != nullptr)
     {
         HeapFree(GetProcessHeap(), 0, pTCPInfo);
-        pTCPInfo = NULL;
+        pTCPInfo = nullptr;
     }
 
     return hr;
@@ -1252,13 +1326,13 @@ SERVER_PROCESS::SendSignal(
 )
 {
     HRESULT hr      = S_OK;
-    HANDLE  hThread = NULL;
+    HANDLE  hThread = nullptr;
 
     ReferenceServerProcess();
 
     m_hShutdownHandle = OpenProcess(SYNCHRONIZE | PROCESS_TERMINATE, FALSE, m_dwProcessId);
 
-    if (m_hShutdownHandle == NULL)
+    if (m_hShutdownHandle == nullptr)
     {
         // since we cannot open the process. let's terminate the process
         hr = HRESULT_FROM_WIN32(GetLastError());
@@ -1266,14 +1340,14 @@ SERVER_PROCESS::SendSignal(
     }
 
     hThread = CreateThread(
-        NULL,       // default security attributes
+        nullptr,    // default security attributes
         0,          // default stack size
         (LPTHREAD_START_ROUTINE)SendShutDownSignal,
         this,       // thread function arguments
         0,          // default creation flags
-        NULL);      // receive thread identifier
+        nullptr);   // receive thread identifier
 
-    if (hThread == NULL)
+    if (hThread == nullptr)
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
@@ -1291,10 +1365,10 @@ SERVER_PROCESS::SendSignal(
     }
     // thread should already exit
     CloseHandle(hThread);
-    hThread = NULL;
+    hThread = nullptr;
 
 Finished:
-    if (hThread != NULL)
+    if (hThread != nullptr)
     {
         // if the send shutdown message thread is still running, terminate it
         DWORD dwThreadStatus = 0;
@@ -1303,7 +1377,7 @@ SERVER_PROCESS::SendSignal(
             TerminateThread(hThread, STATUS_CONTROL_C_EXIT);
         }
         CloseHandle(hThread);
-        hThread = NULL;
+        hThread = nullptr;
     }
 
     if (FAILED_LOG(hr))
@@ -1311,10 +1385,10 @@ SERVER_PROCESS::SendSignal(
         TerminateBackendProcess();
     }
 
-    if (m_hShutdownHandle != NULL && m_hShutdownHandle != INVALID_HANDLE_VALUE)
+    if (m_hShutdownHandle != nullptr && m_hShutdownHandle != INVALID_HANDLE_VALUE)
     {
         CloseHandle(m_hShutdownHandle);
-        m_hShutdownHandle = NULL;
+        m_hShutdownHandle = nullptr;
     }
 
     DereferenceServerProcess();
@@ -1334,28 +1408,28 @@ SERVER_PROCESS::StopProcess(
 
     m_pProcessManager->IncrementRapidFailCount();
 
-    for (INT i=0; i<MAX_ACTIVE_CHILD_PROCESSES; ++i)
+    for (int i = 0; i < MAX_ACTIVE_CHILD_PROCESSES; ++i)
     {
-        if (m_hChildProcessHandles[i] != NULL)
+        if (m_hChildProcessHandles[i] != nullptr)
         {
             if (m_hChildProcessHandles[i] != INVALID_HANDLE_VALUE)
             {
                 TerminateProcess(m_hChildProcessHandles[i], 0);
                 CloseHandle(m_hChildProcessHandles[i]);
             }
-            m_hChildProcessHandles[i] = NULL;
+            m_hChildProcessHandles[i] = nullptr;
             m_dwChildProcessIds[i] = 0;
         }
     }
 
-    if (m_hProcessHandle != NULL)
+    if (m_hProcessHandle != nullptr)
     {
         if (m_hProcessHandle != INVALID_HANDLE_VALUE)
         {
             TerminateProcess(m_hProcessHandle, 0);
             CloseHandle(m_hProcessHandle);
         }
-        m_hProcessHandle = NULL;
+        m_hProcessHandle = nullptr;
     }
 }
 
@@ -1365,7 +1439,7 @@ SERVER_PROCESS::IsDebuggerIsAttached(
 )
 {
     HRESULT                             hr = S_OK;
-    PJOBOBJECT_BASIC_PROCESS_ID_LIST    processList = NULL;
+    PJOBOBJECT_BASIC_PROCESS_ID_LIST    processList = nullptr;
     DWORD                               dwPid = 0;
     DWORD                               dwWorkerProcessPid = 0;
     DWORD                               cbNumBytes = 1024;
@@ -1379,10 +1453,10 @@ SERVER_PROCESS::IsDebuggerIsAttached(
     {
         dwError = NO_ERROR;
 
-        if (processList != NULL)
+        if (processList != nullptr)
         {
             HeapFree(GetProcessHeap(), 0, processList);
-            processList = NULL;
+            processList = nullptr;
 
             // resize
             cbNumBytes = cbNumBytes * 2;
@@ -1393,7 +1467,7 @@ SERVER_PROCESS::IsDebuggerIsAttached(
                             0,
                             cbNumBytes
                             );
-        if (processList == NULL)
+        if (processList == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -1406,7 +1480,7 @@ SERVER_PROCESS::IsDebuggerIsAttached(
                 JobObjectBasicProcessIdList,
                 processList,
                 cbNumBytes,
-                NULL))
+                nullptr))
         {
             dwError = GetLastError();
             if (dwError != ERROR_MORE_DATA)
@@ -1417,7 +1491,7 @@ SERVER_PROCESS::IsDebuggerIsAttached(
         }
 
     } while (dwRetries++ < 5 &&
-             processList != NULL &&
+             processList != nullptr &&
              (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList ||
               processList->NumberOfProcessIdsInList == 0));
 
@@ -1428,7 +1502,7 @@ SERVER_PROCESS::IsDebuggerIsAttached(
         goto Finished;
     }
 
-    if (processList == NULL ||
+    if (processList == nullptr ||
         (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList ||
         processList->NumberOfProcessIdsInList == 0))
     {
@@ -1454,10 +1528,10 @@ SERVER_PROCESS::IsDebuggerIsAttached(
                     dwPid);
 
             BOOL returnValue = CheckRemoteDebuggerPresent(hProcess, &fDebuggerPresent);
-            if (hProcess != NULL)
+            if (hProcess != nullptr)
             {
                 CloseHandle(hProcess);
-                hProcess = NULL;
+                hProcess = nullptr;
             }
 
             if (!returnValue)
@@ -1474,7 +1548,7 @@ SERVER_PROCESS::IsDebuggerIsAttached(
 
 Finished:
 
-    if (processList != NULL)
+    if (processList != nullptr)
     {
         HeapFree(GetProcessHeap(), 0, processList);
     }
@@ -1488,7 +1562,7 @@ SERVER_PROCESS::GetChildProcessHandles(
 )
 {
     HRESULT                             hr = S_OK;
-    PJOBOBJECT_BASIC_PROCESS_ID_LIST    processList = NULL;
+    PJOBOBJECT_BASIC_PROCESS_ID_LIST    processList = nullptr;
     DWORD                               dwPid = 0;
     DWORD                               dwWorkerProcessPid = 0;
     DWORD                               cbNumBytes = 1024;
@@ -1501,10 +1575,10 @@ SERVER_PROCESS::GetChildProcessHandles(
     {
         dwError = NO_ERROR;
 
-        if (processList != NULL)
+        if (processList != nullptr)
         {
             HeapFree(GetProcessHeap(), 0, processList);
-            processList = NULL;
+            processList = nullptr;
 
             // resize
             cbNumBytes = cbNumBytes * 2;
@@ -1515,7 +1589,7 @@ SERVER_PROCESS::GetChildProcessHandles(
                             0,
                             cbNumBytes
                             );
-        if (processList == NULL)
+        if (processList == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -1528,7 +1602,7 @@ SERVER_PROCESS::GetChildProcessHandles(
                 JobObjectBasicProcessIdList,
                 processList,
                 cbNumBytes,
-                NULL))
+                nullptr))
         {
             dwError = GetLastError();
             if (dwError != ERROR_MORE_DATA)
@@ -1539,7 +1613,7 @@ SERVER_PROCESS::GetChildProcessHandles(
         }
 
     } while (dwRetries++ < 5 &&
-             processList != NULL &&
+             processList != nullptr &&
              (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0));
 
     if (dwError == ERROR_MORE_DATA)
@@ -1549,7 +1623,7 @@ SERVER_PROCESS::GetChildProcessHandles(
         goto Finished;
     }
 
-    if (processList == NULL || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0))
+    if (processList == nullptr || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0))
     {
         hr = HRESULT_FROM_WIN32(ERROR_PROCESS_ABORTED);
         // some error
@@ -1580,7 +1654,7 @@ SERVER_PROCESS::GetChildProcessHandles(
 
 Finished:
 
-    if (processList != NULL)
+    if (processList != nullptr)
     {
         HeapFree(GetProcessHeap(), 0, processList);
     }
@@ -1594,8 +1668,8 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
 )
 {
     HRESULT                             hr = S_OK;
-    PJOBOBJECT_BASIC_PROCESS_ID_LIST    processList = NULL;
-    HANDLE                              hProcess = NULL;
+    PJOBOBJECT_BASIC_PROCESS_ID_LIST    processList = nullptr;
+    HANDLE                              hProcess = nullptr;
     DWORD                               dwWorkerProcessPid = 0;
     DWORD                               cbNumBytes = 1024;
     DWORD                               dwRetries = 0;
@@ -1604,10 +1678,10 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
 
     do
     {
-        if (processList != NULL)
+        if (processList != nullptr)
         {
             HeapFree(GetProcessHeap(), 0, processList);
-            processList = NULL;
+            processList = nullptr;
 
             // resize
             cbNumBytes = cbNumBytes * 2;
@@ -1618,7 +1692,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
                             0,
                             cbNumBytes
                             );
-        if (processList == NULL)
+        if (processList == nullptr)
         {
             hr = E_OUTOFMEMORY;
             goto Finished;
@@ -1631,7 +1705,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
                 JobObjectBasicProcessIdList,
                 processList,
                 cbNumBytes,
-                NULL))
+                nullptr))
         {
             DWORD dwError = GetLastError();
             if (dwError != ERROR_MORE_DATA)
@@ -1642,10 +1716,10 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
         }
 
     } while (dwRetries++ < 5 &&
-             processList != NULL &&
+             processList != nullptr &&
              (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0));
 
-    if (processList == NULL || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0))
+    if (processList == nullptr || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0))
     {
         hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
         // some error
@@ -1659,7 +1733,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
             hProcess = OpenProcess(PROCESS_TERMINATE,
                                    FALSE,
                                    (DWORD)processList->ProcessIdList[i]);
-            if (hProcess != NULL)
+            if (hProcess != nullptr)
             {
                 if (!TerminateProcess(hProcess, 1))
                 {
@@ -1670,10 +1744,10 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
                     WaitForSingleObject(hProcess, INFINITE);
                 }
 
-                if (hProcess != NULL)
+                if (hProcess != nullptr)
                 {
                     CloseHandle(hProcess);
-                    hProcess = NULL;
+                    hProcess = nullptr;
                 }
             }
         }
@@ -1681,7 +1755,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
 
 Finished:
 
-    if (processList != NULL)
+    if (processList != nullptr)
     {
         HeapFree(GetProcessHeap(), 0, processList);
     }
@@ -1691,20 +1765,20 @@ SERVER_PROCESS::StopAllProcessesInJobObject(
 
 SERVER_PROCESS::SERVER_PROCESS() :
     m_cRefs(1),
-    m_hProcessHandle(NULL),
-    m_hProcessWaitHandle(NULL),
+    m_hProcessHandle(nullptr),
+    m_hProcessWaitHandle(nullptr),
     m_dwProcessId(0),
     m_cChildProcess(0),
     m_fReady(FALSE),
     m_lStopping(0L),
-    m_hStdoutHandle(NULL),
+    m_hStdoutHandle(nullptr),
     m_fStdoutLogEnabled(FALSE),
-    m_hJobObject(NULL),
-    m_pForwarderConnection(NULL),
+    m_hJobObject(nullptr),
+    m_pForwarderConnection(nullptr),
     m_dwListeningProcessId(0),
-    m_hListeningProcessHandle(NULL),
-    m_hShutdownHandle(NULL),
-    m_hStdErrWritePipe(NULL),
+    m_hListeningProcessHandle(nullptr),
+    m_hShutdownHandle(nullptr),
+    m_hStdErrWritePipe(nullptr),
     m_hReadThread(nullptr),
     m_randomGenerator(std::random_device()())
 {
@@ -1713,75 +1787,75 @@ SERVER_PROCESS::SERVER_PROCESS() :
     for (INT i=0; i<MAX_ACTIVE_CHILD_PROCESSES; ++i)
     {
         m_dwChildProcessIds[i] = 0;
-        m_hChildProcessHandles[i] = NULL;
-        m_hChildProcessWaitHandles[i] = NULL;
+        m_hChildProcessHandles[i] = nullptr;
+        m_hChildProcessWaitHandles[i] = nullptr;
     }
 }
 
 VOID
 SERVER_PROCESS::CleanUp()
 {
-    if (m_hProcessWaitHandle != NULL)
+    if (m_hProcessWaitHandle != nullptr)
     {
         UnregisterWait(m_hProcessWaitHandle);
-        m_hProcessWaitHandle = NULL;
+        m_hProcessWaitHandle = nullptr;
     }
 
     for (INT i = 0; i<MAX_ACTIVE_CHILD_PROCESSES; ++i)
     {
-        if (m_hChildProcessWaitHandles[i] != NULL)
+        if (m_hChildProcessWaitHandles[i] != nullptr)
         {
             UnregisterWait(m_hChildProcessWaitHandles[i]);
-            m_hChildProcessWaitHandles[i] = NULL;
+            m_hChildProcessWaitHandles[i] = nullptr;
         }
     }
 
-    if (m_hProcessHandle != NULL)
+    if (m_hProcessHandle != nullptr)
     {
         if (m_hProcessHandle != INVALID_HANDLE_VALUE)
         {
             TerminateProcess(m_hProcessHandle, 1);
             CloseHandle(m_hProcessHandle);
         }
-        m_hProcessHandle = NULL;
+        m_hProcessHandle = nullptr;
     }
 
-    if (m_hListeningProcessHandle != NULL)
+    if (m_hListeningProcessHandle != nullptr)
     {
         if (m_hListeningProcessHandle != INVALID_HANDLE_VALUE)
         {
             CloseHandle(m_hListeningProcessHandle);
         }
-        m_hListeningProcessHandle = NULL;
+        m_hListeningProcessHandle = nullptr;
     }
 
     for (INT i = 0; i<MAX_ACTIVE_CHILD_PROCESSES; ++i)
     {
-        if (m_hChildProcessHandles[i] != NULL)
+        if (m_hChildProcessHandles[i] != nullptr)
         {
             if (m_hChildProcessHandles[i] != INVALID_HANDLE_VALUE)
             {
                 TerminateProcess(m_hChildProcessHandles[i], 1);
                 CloseHandle(m_hChildProcessHandles[i]);
             }
-            m_hChildProcessHandles[i] = NULL;
+            m_hChildProcessHandles[i] = nullptr;
             m_dwChildProcessIds[i] = 0;
         }
     }
 
-    if (m_hJobObject != NULL)
+    if (m_hJobObject != nullptr)
     {
         if (m_hJobObject != INVALID_HANDLE_VALUE)
         {
             CloseHandle(m_hJobObject);
         }
-        m_hJobObject = NULL;
+        m_hJobObject = nullptr;
     }
 
-    if (m_pForwarderConnection != NULL)
+    if (m_pForwarderConnection != nullptr)
     {
         m_pForwarderConnection->DereferenceForwarderConnection();
-        m_pForwarderConnection = NULL;
+        m_pForwarderConnection = nullptr;
     }
 
 }
@@ -1792,17 +1866,17 @@ SERVER_PROCESS::~SERVER_PROCESS()
 
     CleanUp();
 
-    // no need to free m_pEnvironmentVarTable, as it references to
-    // the same hash table hold by configuration.
-    // the hashtable memory will be freed once onfiguration got recycled
+    // no need to free m_pEnvironmentVarTable, as it references
+    // the same hash table held by configuration.
+    // the hashtable memory will be freed once configuration gets recycled
 
-    if (m_pProcessManager != NULL)
+    if (m_pProcessManager != nullptr)
     {
         m_pProcessManager->DereferenceProcessManager();
-        m_pProcessManager = NULL;
+        m_pProcessManager = nullptr;
     }
 
-    if (m_hStdErrWritePipe != NULL)
+    if (m_hStdErrWritePipe != nullptr)
     {
         if (m_hStdErrWritePipe != INVALID_HANDLE_VALUE)
         {
@@ -1810,7 +1884,7 @@ SERVER_PROCESS::~SERVER_PROCESS()
             CloseHandle(m_hStdErrWritePipe);
         }
 
-        m_hStdErrWritePipe = NULL;
+        m_hStdErrWritePipe = nullptr;
     }
 
     // Forces ReadFile to cancel, causing the read loop to complete.
@@ -1845,13 +1919,13 @@ SERVER_PROCESS::~SERVER_PROCESS()
         m_hReadThread = nullptr;
     }
 
-    if (m_hStdoutHandle != NULL)
+    if (m_hStdoutHandle != nullptr)
     {
         if (m_hStdoutHandle != INVALID_HANDLE_VALUE)
         {
             CloseHandle(m_hStdoutHandle);
         }
-        m_hStdoutHandle = NULL;
+        m_hStdoutHandle = nullptr;
     }
 
     if (m_fStdoutLogEnabled)
@@ -1896,9 +1970,9 @@ SERVER_PROCESS::RegisterProcessWait(
     HRESULT     hr = S_OK;
     NTSTATUS    status = 0;
 
-    _ASSERT(phWaitHandle != NULL && *phWaitHandle == NULL);
+    _ASSERT(phWaitHandle != nullptr && *phWaitHandle == nullptr);
 
-    *phWaitHandle = NULL;
+    *phWaitHandle = nullptr;
 
     // wait thread will dereference.
     ReferenceServerProcess();
@@ -1922,7 +1996,7 @@ SERVER_PROCESS::RegisterProcessWait(
 
     if (FAILED_LOG(hr))
     {
-        *phWaitHandle = NULL;
+        *phWaitHandle = nullptr;
         DereferenceServerProcess();
     }
 
@@ -1960,9 +2034,9 @@ HRESULT
 SERVER_PROCESS::SendShutdownHttpMessage( VOID )
 {
     HRESULT    hr = S_OK;
-    HINTERNET  hSession = NULL;
-    HINTERNET  hConnect = NULL;
-    HINTERNET  hRequest = NULL;
+    HINTERNET  hSession = nullptr;
+    HINTERNET  hConnect = nullptr;
+    HINTERNET  hRequest = nullptr;
 
     STACK_STRU(strHeaders, 256);
     STRU       strAppToken;
@@ -1970,13 +2044,16 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
     DWORD      dwStatusCode = 0;
     DWORD      dwSize = sizeof(dwStatusCode);
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
     hSession = WinHttpOpen(L"",
         WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
         WINHTTP_NO_PROXY_NAME,
         WINHTTP_NO_PROXY_BYPASS,
         0);
+#pragma warning(pop)
 
-    if (hSession == NULL)
+    if (hSession == nullptr)
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
@@ -1987,7 +2064,7 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
         (USHORT)m_dwPort,
         0);
 
-    if (hConnect == NULL)
+    if (hConnect == nullptr)
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
@@ -2001,15 +2078,18 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
     }
     strUrl.Append(L"/iisintegration");
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
     hRequest = WinHttpOpenRequest(hConnect,
         L"POST",
         strUrl.QueryStr(),
-        NULL,
+        nullptr,
         WINHTTP_NO_REFERER,
-        NULL,
+        nullptr,
         0);
+#pragma warning(pop)
 
-    if (hRequest == NULL)
+    if (hRequest == nullptr)
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
@@ -2035,6 +2115,8 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
         goto Finished;
     }
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
     if (!WinHttpSendRequest(hRequest,
         strHeaders.QueryStr(),  // pwszHeaders
         strHeaders.QueryCCH(),  // dwHeadersLength
@@ -2046,13 +2128,16 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
     }
+#pragma warning(pop)
 
-    if (!WinHttpReceiveResponse(hRequest , NULL))
+    if (!WinHttpReceiveResponse(hRequest , nullptr))
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
     }
 
+#pragma warning(push)
+#pragma warning(disable: 26477) // NULL usage via Windows header
     if (!WinHttpQueryHeaders(hRequest,
         WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER,
         WINHTTP_HEADER_NAME_BY_INDEX,
@@ -2063,6 +2148,7 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
     }
+#pragma warning(pop)
 
     if (dwStatusCode != 202)
     {
@@ -2081,17 +2167,17 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID )
     if (hRequest)
     {
         WinHttpCloseHandle(hRequest);
-        hRequest = NULL;
+        hRequest = nullptr;
     }
     if (hConnect)
     {
         WinHttpCloseHandle(hConnect);
-        hConnect = NULL;
+        hConnect = nullptr;
     }
     if (hSession)
     {
         WinHttpCloseHandle(hSession);
-        hSession = NULL;
+        hSession = nullptr;
     }
     return hr;
 }
@@ -2124,7 +2210,7 @@ SERVER_PROCESS::SendShutDownSignalInternal(
         // failed to send shutdown http message
         // try send ctrl signal
         //
-        HWND  hCurrentConsole = NULL;
+        HWND  hCurrentConsole = nullptr;
         BOOL  fFreeConsole = FALSE;
         hCurrentConsole = GetConsoleWindow();
         if (hCurrentConsole)
@@ -2169,7 +2255,7 @@ SERVER_PROCESS::TerminateBackendProcess(
     if (InterlockedCompareExchange(&m_lStopping, 1L, 0L) == 0L)
     {
         // backend process will be terminated, remove the waitcallback
-        if (m_hProcessWaitHandle != NULL)
+        if (m_hProcessWaitHandle != nullptr)
         {
             UnregisterWait(m_hProcessWaitHandle);
 
@@ -2177,14 +2263,14 @@ SERVER_PROCESS::TerminateBackendProcess(
             // need to dereference the object otherwise memory leak
             DereferenceServerProcess();
 
-            m_hProcessWaitHandle = NULL;
+            m_hProcessWaitHandle = nullptr;
         }
 
         // cannot gracefully shutdown or timeout, terminate the process
-        if (m_hProcessHandle != NULL && m_hProcessHandle != INVALID_HANDLE_VALUE)
+        if (m_hProcessHandle != nullptr && m_hProcessHandle != INVALID_HANDLE_VALUE)
         {
             TerminateProcess(m_hProcessHandle, 0);
-            m_hProcessHandle = NULL;
+            m_hProcessHandle = nullptr;
         }
 
         // log a warning for ungraceful shutdown
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h
index f62272a22238..d2acfafa032a 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.h
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
@@ -19,10 +20,11 @@
 #define MAX_ACTIVE_CHILD_PROCESSES                  16
 #define PIPE_OUTPUT_THREAD_TIMEOUT                  2000
 #define LOCALHOST                                   "127.0.0.1"
-#define ASPNETCORE_PORT_STR                         L"ASPNETCORE_PORT"
-#define ASPNETCORE_PORT_ENV_STR                     L"ASPNETCORE_PORT="
-#define ASPNETCORE_APP_PATH_ENV_STR                 L"ASPNETCORE_APPL_PATH="
-#define ASPNETCORE_APP_TOKEN_ENV_STR                L"ASPNETCORE_TOKEN="
+#define ASPNETCORE_PORT_STR                         L"HTTP_PLATFORM_PORT"
+#define ASPNETCORE_PORT_ENV_STR                     L"HTTP_PLATFORM_PORT="
+#define ASPNETCORE_APP_PATH_ENV_STR                 L"HTTP_PLATFORM_APPL_PATH="
+#define ASPNETCORE_APP_TOKEN_ENV_STR                L"HTTP_PLATFORM_TOKEN="
+#define ASPNETCORE_PORT_IN_USE_STR                  L"%HTTP_PLATFORM_PORT%"
 
 class PROCESS_MANAGER;
 
@@ -48,8 +50,8 @@ class SERVER_PROCESS
         _In_ STRU                 *pstruStdoutLogFile,
         _In_ STRU                 *pszAppPhysicalPath,
         _In_ STRU                 *pszAppPath,
-        _In_ STRU                 *pszAppVirtualPath,
-        _In_ STRU                 *pszHttpsPort
+        _In_ STRU                 *pszAppVirtualPath//,
+        //_In_ STRU                 *pszHttpsPort
         );
 
     HRESULT
@@ -194,6 +196,11 @@ class SERVER_PROCESS
         VOID
     );
 
+    HRESULT
+    GetListenPort(
+        BOOL* pfCriticalError
+    );
+
     HRESULT
     SetupListenPort(
         ENVIRONMENT_VAR_HASH    *pEnvironmentVarTable,
@@ -272,7 +279,7 @@ class SERVER_PROCESS
     STRU                    m_struAppVirtualPath;  // e.g., '/' for site
     STRU                    m_struAppFullPath;     // e.g.,  /LM/W3SVC/4/ROOT/Inproc
     STRU                    m_struPhysicalPath;    // e.g., c:/test/mysite
-    STRU                    m_struHttpsPort;     // e.g.,  /LM/W3SVC/4/ROOT/Inproc
+    //STRU                    m_struHttpsPort;     // e.g.,  /LM/W3SVC/4/ROOT/Inproc
     STRU                    m_struPort;
     STRU                    m_struCommandLine;
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp
index 64118b61b6fe..ce3959adc54f 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp
@@ -66,7 +66,7 @@ Return Value:
     // Find the 3rd slash corresponding to the url
     //
     LPCWSTR pszSlash = wcschr(pszDestinationUrl, L'/');
-    if (pszSlash == NULL)
+    if (pszSlash == nullptr)
     {
         RETURN_IF_FAILED(pstrUrl->Copy(L"/", 1));
         RETURN_IF_FAILED(pstrDestination->Copy(pszDestinationUrl));
@@ -81,14 +81,6 @@ Return Value:
     return S_OK;
 }
 
-// Change a hexadecimal digit to its numerical equivalent
-#define TOHEX( ch )                                     \
-    ((ch) > L'9' ?                                      \
-        (ch) >= L'a' ?                                  \
-            (ch) - L'a' + 10 :                          \
-            (ch) - L'A' + 10                            \
-        : (ch) - L'0')
-
 HRESULT
 URL_UTILITY::EscapeAbsPath(
     IHttpRequest * pRequest,
@@ -96,8 +88,8 @@ URL_UTILITY::EscapeAbsPath(
 )
 {
     STRU    strAbsPath;
-    LPCWSTR pszAbsPath = NULL;
-    LPCWSTR pszFindStr = NULL;
+    LPCWSTR pszAbsPath = nullptr;
+    LPCWSTR pszFindStr = nullptr;
 
     RETURN_IF_FAILED(strAbsPath.Copy( pRequest->GetRawHttpRequest()->CookedUrl.pAbsPath,
         pRequest->GetRawHttpRequest()->CookedUrl.AbsPathLength / sizeof(WCHAR) ));
@@ -105,7 +97,7 @@ URL_UTILITY::EscapeAbsPath(
     pszAbsPath = strAbsPath.QueryStr();
     pszFindStr = wcschr(pszAbsPath, L'?');
 
-    while(pszFindStr != NULL)
+    while(pszFindStr != nullptr)
     {
         RETURN_IF_FAILED(strEscapedUrl->Append( pszAbsPath, pszFindStr - pszAbsPath));
         RETURN_IF_FAILED(strEscapedUrl->Append(L"%3F"));
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp
index ecd97737fe40..8a0d2955a89a 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 /*++
@@ -17,13 +18,13 @@
 -----------------
 Read Loop Design
 -----------------
-When a read IO completes successfully on any endpoints, Asp.Net Core Module doesn't
+When a read IO completes successfully on any endpoints, HTTP Bridge Module doesn't
 immediately issue the next read. The next read is initiated only after
 the read data is sent to the other endpoint. As soon as this send completes,
 we initiate the next IO. It should be noted that the send complete merely
 indicates the API completion from HTTP, and not necessarily over the network.
 
-This prevents the need for data buffering at the Asp.Net Core Module level.
+This prevents the need for data buffering at the HTTP Bridge Module level.
 
 --*/
 
@@ -37,10 +38,10 @@ LIST_ENTRY WEBSOCKET_HANDLER::sm_RequestsListHead;
 TRACE_LOG * WEBSOCKET_HANDLER::sm_pTraceLog;
 
 WEBSOCKET_HANDLER::WEBSOCKET_HANDLER() :
-    _pHttpContext(NULL),
-    _pWebSocketContext(NULL),
-    _hWebSocketRequest(NULL),
-    _pHandler(NULL),
+    _pHttpContext(nullptr),
+    _pWebSocketContext(nullptr),
+    _hWebSocketRequest(nullptr),
+    _pHandler(nullptr),
     _dwOutstandingIo(0),
     _fCleanupInProgress(FALSE),
     _fIndicateCompletionToIis(FALSE),
@@ -64,18 +65,18 @@ WEBSOCKET_HANDLER::Terminate(
     RemoveRequest();
     _fCleanupInProgress = TRUE;
 
-    if (_pHttpContext != NULL)
+    if (_pHttpContext != nullptr)
     {
         _pHttpContext->CancelIo();
-        _pHttpContext = NULL;
+        _pHttpContext = nullptr;
     }
     if (_hWebSocketRequest)
     {
         WinHttpCloseHandle(_hWebSocketRequest);
-        _hWebSocketRequest = NULL;
+        _hWebSocketRequest = nullptr;
     }
 
-    _pWebSocketContext = NULL;
+    _pWebSocketContext = nullptr;
     DeleteCriticalSection(&_RequestLock);
 
     delete this;
@@ -129,7 +130,7 @@ WEBSOCKET_HANDLER::StaticTerminate(
     if (sm_pTraceLog)
     {
         DestroyRefTraceLog(sm_pTraceLog);
-        sm_pTraceLog = NULL;
+        sm_pTraceLog = nullptr;
     }
 }
 
@@ -220,14 +221,14 @@ WEBSOCKET_HANDLER::IndicateCompletionToIIS(
     // Make sure no pending IO as there is no IIS websocket cancelation,
     // any unexpected callback will lead to AV. Revisit it once CanelOutGoingIO works
     //
-    if (_hWebSocketRequest != NULL && _dwOutstandingIo == 0)
+    if (_hWebSocketRequest != nullptr && _dwOutstandingIo == 0)
     {
         LOG_TRACE(L"WEBSOCKET_HANDLER::IndicateCompletionToIIS");
 
         _pHandler->SetStatus(FORWARDER_DONE);
         _fHandleClosed = TRUE;
         WinHttpCloseHandle(_hWebSocketRequest);
-        _hWebSocketRequest = NULL;
+        _hWebSocketRequest = nullptr;
     }
 }
 
@@ -279,7 +280,7 @@ Routine Description:
 
      _pWebSocketContext = (IWebSocketContext *) _pHttpContext->
         GetNamedContextContainer()->GetNamedContext(IIS_WEBSOCKET);
-    if ( _pWebSocketContext == NULL )
+    if ( _pWebSocketContext == nullptr )
     {
         hr = HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND );
         goto Finished;
@@ -292,7 +293,7 @@ Routine Description:
         hRequest,
         (DWORD_PTR) pHandler);
 
-    if (_hWebSocketRequest == NULL)
+    if (_hWebSocketRequest == nullptr)
     {
         hr = HRESULT_FROM_WIN32(GetLastError());
         goto Finished;
@@ -394,7 +395,7 @@ Routine Description:
             &fClose,
             OnReadIoCompletion,
             this,
-            NULL);
+            nullptr);
     if (FAILED_LOG(hr))
     {
         DecrementOutstandingIo();
@@ -428,8 +429,8 @@ Routine Description:
                 _hWebSocketRequest,
                 &_WinHttpReceiveBuffer,
                 RECEIVE_BUFFER_SIZE,
-                NULL,
-                NULL);
+                nullptr,
+                nullptr);
 
     if (dwError != NO_ERROR)
     {
@@ -468,7 +469,7 @@ Routine Description:
         //
 
         DWORD dwError = NO_ERROR;
-        USHORT uStatus;
+        USHORT uStatus = 0;
         DWORD  dwReceived = 0;
         STACK_STRU(strCloseReason, 128);
 
@@ -509,15 +510,15 @@ Routine Description:
         hr = _pWebSocketContext->SendConnectionClose(
             TRUE,
             uStatus,
-            uStatus == 1005 ? NULL : strCloseReason.QueryStr(),
+            uStatus == 1005 ? nullptr : strCloseReason.QueryStr(),
             OnWriteIoCompletion,
             this,
-            NULL);
+            nullptr);
     }
     else
     {
         //
-        // Get equivalant flags for IIS API from buffer type.
+        // Get equivalent flags for IIS API from buffer type.
         //
 
         WINHTTP_HELPER::GetFlagsFromBufferType(eBufferType,
@@ -538,7 +539,7 @@ Routine Description:
                 fFinalFragment,
                 OnWriteIoCompletion,
                 this,
-                NULL);
+                nullptr);
     }
 
     if (FAILED_LOG(hr))
@@ -607,7 +608,7 @@ Routine Description:
         dwError = WINHTTP_HELPER::sm_pfnWinHttpWebSocketShutdown(
             _hWebSocketRequest,
             uStatus,
-            strCloseReason.QueryCCH() == 0 ? NULL : (PVOID) strCloseReason.QueryStr(),
+            strCloseReason.QueryCCH() == 0 ? nullptr : (PVOID) strCloseReason.QueryStr(),
             strCloseReason.QueryCCH());
 
         if (dwError == ERROR_IO_PENDING)
@@ -638,7 +639,7 @@ Routine Description:
         dwError = WINHTTP_HELPER::sm_pfnWinHttpWebSocketSend(
                         _hWebSocketRequest,
                         eBufferType,
-                        cbData == 0 ? NULL : &_IisReceiveBuffer,
+                        cbData == 0 ? nullptr : &_IisReceiveBuffer,
                         cbData
                         );
     }
@@ -991,7 +992,7 @@ Routine Description:
     HRESULT    hr = S_OK;
     BOOL       fLocked = FALSE;
     CleanupReason cleanupReason = CleanupReasonUnknown;
-    WINHTTP_WEB_SOCKET_BUFFER_TYPE  BufferType;
+    WINHTTP_WEB_SOCKET_BUFFER_TYPE  BufferType{};
 
     LOG_TRACE(L"WEBSOCKET_HANDLER::OnIisReceiveComplete");
 
@@ -1099,23 +1100,24 @@ Routine Description:
     if (reason == ClientDisconnect || reason == ServerStateUnavailable)
     {
         //
-        // Calling shutdown to notify the backend about disonnect
+        // Calling shutdown to notify the backend about disconnect
         //
         WINHTTP_HELPER::sm_pfnWinHttpWebSocketShutdown(
             _hWebSocketRequest,
-            1011, // indicate that a server is terminating the connection because it encountered
-                  // an unexpected condition that prevent it from fulfilling the request
-            NULL, // Reason
-            0);   // length og Reason
+            1011,    // indicate that a server is terminating the connection because it encountered
+                     // an unexpected condition that prevent it from fulfilling the request
+            nullptr, // Reason
+            0);      // length of Reason
 
     }
 
     if (reason == ServerDisconnect || reason == ServerStateUnavailable)
     {
         _pHttpContext->CancelIo();
+
         //
-        // CancelIo sometime may not be able to cannel pending websocket IO
-        // ResetConnection to force IISWebsocket module to release the pipeline
+        // CancelIo sometimes may not be able to cancel pending websocket IO.
+        // ResetConnection to force IISWebsocket module to release the pipeline.
         //
         _pHttpContext->GetResponse()->ResetConnection();
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp
index 8f6c5d37204e..1383fdbc45e6 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp
@@ -21,9 +21,7 @@ WINHTTP_HELPER::sm_pfnWinHttpWebSocketQueryCloseStatus;
 
 //static
 HRESULT
-WINHTTP_HELPER::StaticInitialize(
-    VOID
-)
+WINHTTP_HELPER::StaticInitialize()
 {
     //
     // Initialize the function pointers for WinHttp Websocket API's.
@@ -34,27 +32,27 @@ WINHTTP_HELPER::StaticInitialize(
     }
 
     HMODULE  hWinHttp = GetModuleHandleA("winhttp.dll");
-    RETURN_LAST_ERROR_IF (hWinHttp == NULL);
+    RETURN_LAST_ERROR_IF (hWinHttp == nullptr);
 
     sm_pfnWinHttpWebSocketCompleteUpgrade = (PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE)
         GetProcAddress(hWinHttp, "WinHttpWebSocketCompleteUpgrade");
-    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketCompleteUpgrade == NULL);
+    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketCompleteUpgrade == nullptr);
 
     sm_pfnWinHttpWebSocketQueryCloseStatus = (PFN_WINHTTP_WEBSOCKET_QUERY_CLOSE_STATUS)
         GetProcAddress(hWinHttp, "WinHttpWebSocketQueryCloseStatus");
-    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketQueryCloseStatus == NULL);
+    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketQueryCloseStatus == nullptr);
 
     sm_pfnWinHttpWebSocketReceive = (PFN_WINHTTP_WEBSOCKET_RECEIVE)
         GetProcAddress(hWinHttp, "WinHttpWebSocketReceive");
-    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketReceive == NULL);
+    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketReceive == nullptr);
 
     sm_pfnWinHttpWebSocketSend = (PFN_WINHTTP_WEBSOCKET_SEND)
         GetProcAddress(hWinHttp, "WinHttpWebSocketSend");
-    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketSend == NULL);
+    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketSend == nullptr);
 
     sm_pfnWinHttpWebSocketShutdown = (PFN_WINHTTP_WEBSOCKET_SHUTDOWN)
         GetProcAddress(hWinHttp, "WinHttpWebSocketShutdown");
-    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketShutdown == NULL);
+    RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketShutdown == nullptr);
 
     return S_OK;
 }
@@ -69,6 +67,10 @@ WINHTTP_HELPER::GetFlagsFromBufferType(
     __out BOOL *                           pfClose
 )
 {
+    *pfClose = FALSE;
+    *pfFinalFragment = FALSE;
+    *pfUtf8Encoded = FALSE;
+
     switch (BufferType)
     {
     case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE:
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h
index d583f6fb1032..230e8f8a3a95 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.h
@@ -7,7 +7,7 @@ typedef
 HINTERNET
 (WINAPI * PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE)(
     _In_ HINTERNET hRequest,
-    _In_opt_ DWORD_PTR pContext
+    DWORD_PTR pContext
 );
 
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h
index 7b09f647ec07..a60740e5884d 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.h
@@ -16,7 +16,8 @@ class AppOfflineTrackingApplication: public APPLICATION
         m_applicationPath(application.GetApplicationPhysicalPath()),
         m_fileWatcher(nullptr),
         m_fAppOfflineProcessed(false),
-        m_shutdownTimeout(120000) // default to 2 minutes
+        m_shutdownTimeout(120000), // default to 2 minutes
+        m_detectedAppOffline(false)
     {
     }
 
@@ -37,6 +38,23 @@ class AppOfflineTrackingApplication: public APPLICATION
     virtual
     VOID
     OnAppOffline();
+    
+    // New method for file changes other than app_offline.htm
+    virtual
+    VOID
+    OnConfigurationFileChange()
+    {
+        // Default implementation - derived classes can override
+        // Base implementation treats config file changes like app_offline
+        OnAppOffline();
+    }
+    
+    // Returns the name of the file being monitored by the filewatcher
+    std::wstring
+    GetFileBeingMonitored() const
+    {
+        return L"app_offline.htm";
+    }
 
     // TODO protected
     bool                                         m_detectedAppOffline;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h
index 248ca1aa9354..93d6017931f4 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h
@@ -3,17 +3,17 @@
 
 #pragma once
 
-#define HOSTING_STARTUP_ASSEMBLIES_ENV_STR          L"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES"
-#define HOSTING_STARTUP_ASSEMBLIES_VALUE            L"Microsoft.AspNetCore.Server.IISIntegration"
-#define ASPNETCORE_IIS_AUTH_ENV_STR                 L"ASPNETCORE_IIS_HTTPAUTH"
-#define ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR L"ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED"
-#define ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR        L"ASPNETCORE_IIS_PHYSICAL_PATH"
-#define ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR          L"ASPNETCORE_ANCM_HTTPS_PORT"
+//#define HOSTING_STARTUP_ASSEMBLIES_ENV_STR          L"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES"
+//#define HOSTING_STARTUP_ASSEMBLIES_VALUE            L"Microsoft.AspNetCore.Server.IISIntegration"
+#define ASPNETCORE_IIS_AUTH_ENV_STR                 L"HTTP_PLATFORM_IIS_HTTPAUTH"
+#define ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR L"HTTP_PLATFORM_IIS_WEBSOCKETS_SUPPORTED"
+#define ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR        L"HTTP_PLATFORM_IIS_PHYSICAL_PATH"
+//#define ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR          L"ASPNETCORE_ANCM_HTTPS_PORT"
 #define ASPNETCORE_IIS_AUTH_WINDOWS                 L"windows;"
 #define ASPNETCORE_IIS_AUTH_BASIC                   L"basic;"
 #define ASPNETCORE_IIS_AUTH_ANONYMOUS               L"anonymous;"
 #define ASPNETCORE_IIS_AUTH_NONE                    L"none"
-#define ANCM_PREFER_ENVIRONMENT_VARIABLES_ENV_STR   L"ANCM_PREFER_ENVIRONMENT_VARIABLES"
+#define ANCM_PREFER_ENVIRONMENT_VARIABLES_ENV_STR   L"HTTP_PLATFORM_PREFER_ENVIRONMENT_VARIABLES"
 
 //
 // The key used for hash-table lookups, consists of the port on which the http process is created.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
index 3a6fef93353b..5594533d1c03 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
@@ -33,19 +33,19 @@ class ENVIRONMENT_VAR_HELPERS
         _In_ BOOL                           fWindowsAuthEnabled,
         _In_ BOOL                           fBasicAuthEnabled,
         _In_ BOOL                           fAnonymousAuthEnabled,
-        _In_ BOOL                           fAddHostingStartup,
-        _In_ PCWSTR                         pApplicationPhysicalPath,
-        _In_ PCWSTR                         pHttpsPort
+        //_In_ BOOL                           fAddHostingStartup,
+        _In_ PCWSTR                         pApplicationPhysicalPath//,
+        //_In_ PCWSTR                         pHttpsPort
     )
     {
         std::map<std::wstring, std::wstring, ignore_case_comparer> environmentVariables = pInEnvironmentVarTable;
 
         environmentVariables.insert_or_assign(ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR, pApplicationPhysicalPath);
-        if (pHttpsPort)
+/*      if (pHttpsPort)
         {
             environmentVariables.try_emplace(ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR, pHttpsPort);
         }
-
+*/
         std::wstring strIisAuthEnvValue;
         if (fWindowsAuthEnabled)
         {
@@ -65,7 +65,7 @@ class ENVIRONMENT_VAR_HELPERS
         }
 
         environmentVariables.insert_or_assign(ASPNETCORE_IIS_AUTH_ENV_STR, strIisAuthEnvValue);
-
+/*
         if (fAddHostingStartup && environmentVariables.count(HOSTING_STARTUP_ASSEMBLIES_ENV_STR) == 0)
         {
             auto hostingStartupValues = Environment::GetEnvironmentVariableValue(HOSTING_STARTUP_ASSEMBLIES_ENV_STR).value_or(L"");
@@ -77,7 +77,7 @@ class ENVIRONMENT_VAR_HELPERS
 
             environmentVariables.insert_or_assign(HOSTING_STARTUP_ASSEMBLIES_ENV_STR, hostingStartupValues);
         }
-
+*/
         auto preferEnvironmentVariablesSetting = Environment::GetEnvironmentVariableValue(ANCM_PREFER_ENVIRONMENT_VARIABLES_ENV_STR).value_or(L"false");
         auto preferEnvironmentVariables = equals_ignore_case(L"1", preferEnvironmentVariablesSetting) || equals_ignore_case(L"true", preferEnvironmentVariablesSetting);
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
index 828f877e7181..bec4eaa9644a 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
@@ -99,7 +99,7 @@ FILE_WATCHER::Create(
         (LPTHREAD_START_ROUTINE)ChangeNotificationThread,
         this,
         0,
-        NULL));
+        nullptr));
 
     if (pszDirectoryToMonitor == nullptr ||
         pszFileNameToMonitor == nullptr ||
@@ -128,7 +128,7 @@ FILE_WATCHER::Create(
         nullptr,
         OPEN_EXISTING,
         FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED,
-        NULL);
+        nullptr);
 
     RETURN_LAST_ERROR_IF(_hDirectory == INVALID_HANDLE_VALUE);
 
@@ -165,26 +165,28 @@ Win32 error
 --*/
 {
     FILE_WATCHER* pFileMonitor = (FILE_WATCHER*)pvArg;
-    
+
     LOG_INFO(L"Starting file watcher thread");
     DBG_ASSERT(pFileMonitor != nullptr);
 
     while (true)
     {
 
-        DWORD       cbCompletion = 0;
+        DWORD       bytesTransferred = 0;
         OVERLAPPED* pOverlapped = nullptr;
         ULONG_PTR   completionKey;
 
         BOOL success = GetQueuedCompletionStatus(
             pFileMonitor->m_hCompletionPort,
-            &cbCompletion,
+            &bytesTransferred,
             &completionKey,
             &pOverlapped,
             INFINITE);
 
-        DBG_ASSERT(success);
-        (void)success;
+        if (!success)
+        {
+            LOG_INFOF(L"Failure when watching app directory. HR: 0x%x", HRESULT_FROM_WIN32(GetLastError()));
+        }
 
         if (completionKey == FILE_WATCHER_SHUTDOWN_KEY)
         {
@@ -194,7 +196,7 @@ Win32 error
         DBG_ASSERT(pOverlapped != nullptr);
         if (pOverlapped != nullptr)
         {
-            pFileMonitor->HandleChangeCompletion(cbCompletion);
+            pFileMonitor->HandleChangeCompletion(bytesTransferred);
 
             if (!pFileMonitor->_lStopMonitorCalled)
             {
@@ -222,7 +224,7 @@ Win32 error
 
 HRESULT
 FILE_WATCHER::HandleChangeCompletion(
-    _In_ DWORD          cbCompletion
+    _In_ DWORD          bytesTransferred
 )
 /*++
 
@@ -234,7 +236,7 @@ need to be flushed)
 Arguments:
 
 dwCompletionStatus - Completion status
-cbCompletion - Bytes of completion
+bytesTransferred - Bytes of completion
 
 Return Value:
 
@@ -242,8 +244,9 @@ HRESULT
 
 --*/
 {
-    BOOL                        fAppOfflineChanged = FALSE;
+    BOOL                        fFileChanged = FALSE;
     BOOL                        fDllChanged = FALSE;
+    BOOL                        fIsAppOfflineFile = IsAppOfflineMonitoring();
 
     // When directory handle is closed then HandleChangeCompletion
     // happens with cbCompletion = 0 and dwCompletionStatus = 0
@@ -259,13 +262,33 @@ HRESULT
     }
 
     //
-    // There could be a FCN overflow
-    // Let assume the file got changed instead of checking files
-    // Otherwise we have to cache the file info
+    // There could be a FCN overflow, see https://learn.microsoft.com/windows/win32/api/winbase/nf-winbase-readdirectorychangesw#remarks
+    // specifically about lpBytesReturned being zero on a successful call
+    //
+    // We'll do a manual check for the existence of app_offline.htm since it's possible the file was added
+    // When ShadowCopy is enabled we also look for .dll changes, in order to detect a dll change in this edge case we'd need to cache all dll information
+    // and manually iterate over the directory and compare the file attributes. For now we'll assume that if dlls are changing we'll get another
+    // file change notification in that case
     //
-    if (cbCompletion == 0)
+    if (bytesTransferred == 0)
     {
-        fAppOfflineChanged = TRUE;
+        LOG_INFO(L"0 bytes transferred for file notifications. Falling back to manually looking for app_offline.");
+        DWORD fileAttr = GetFileAttributesW(_strFullName.QueryStr());
+        if (fileAttr != INVALID_FILE_ATTRIBUTES && !(fileAttr & FILE_ATTRIBUTE_DIRECTORY))
+        {
+            fFileChanged = TRUE;
+
+            // Mark as app_offline detected if this is app_offline.htm
+            if (fIsAppOfflineFile)
+            {
+                auto app = _pApplication.get();
+                app->m_detectedAppOffline = true;
+            }
+        }
+        else
+        {
+            return S_OK;
+        }
     }
     else
     {
@@ -277,13 +300,19 @@ HRESULT
             //
             // check whether the monitored file got changed
             //
-            if (_wcsnicmp(pNotificationInfo->FileName,
+            if (_strFileName.QuerySizeCCH() == (pNotificationInfo->FileNameLength / sizeof(WCHAR))
+                && _wcsnicmp(pNotificationInfo->FileName,
                 _strFileName.QueryStr(),
                 pNotificationInfo->FileNameLength / sizeof(WCHAR)) == 0)
             {
-                fAppOfflineChanged = TRUE;
-                auto app = _pApplication.get();
-                app->m_detectedAppOffline = true;
+                fFileChanged = TRUE;
+
+                // Mark as app_offline detected if this is app_offline.htm
+                if (fIsAppOfflineFile)
+                {
+                    auto app = _pApplication.get();
+                    app->m_detectedAppOffline = true;
+                }
                 break;
             }
 
@@ -317,11 +346,22 @@ HRESULT
         }
     }
 
-    if (fAppOfflineChanged && !_lStopMonitorCalled)
+    if (fFileChanged && !_lStopMonitorCalled)
     {
         // Reference application before
         _pApplication->ReferenceApplication();
-        RETURN_LAST_ERROR_IF(!QueueUserWorkItem(RunNotificationCallback, _pApplication.get(), WT_EXECUTEDEFAULT));
+
+        LOG_INFOF(L"Detected change in file '%s'", _strFileName.QueryStr());
+
+        // Use appropriate callback based on whether this is app_offline.htm or another file
+        if (fIsAppOfflineFile)
+        {
+            RETURN_LAST_ERROR_IF(!QueueUserWorkItem(RunNotificationCallback, _pApplication.get(), WT_EXECUTEDEFAULT));
+        }
+        else
+        {
+            RETURN_LAST_ERROR_IF(!QueueUserWorkItem(RunFileChangedCallback, _pApplication.get(), WT_EXECUTEDEFAULT));
+        }
     }
 
     if (fDllChanged && m_fShadowCopyEnabled && !_lStopMonitorCalled)
@@ -427,7 +467,7 @@ FILE_WATCHER::Monitor(VOID)
         _buffDirectoryChanges.QueryPtr(),
         _buffDirectoryChanges.QuerySize(),
         FALSE,        // Watching sub dirs. Set to False now as only monitoring app_offline
-        FILE_NOTIFY_VALID_MASK & ~FILE_NOTIFY_CHANGE_LAST_ACCESS,
+        FILE_NOTIFY_VALID_MASK & ~FILE_NOTIFY_CHANGE_LAST_ACCESS & ~FILE_NOTIFY_CHANGE_SECURITY & ~FILE_NOTIFY_CHANGE_ATTRIBUTES,
         &cbRead,
         &_overlapped,
         nullptr));
@@ -457,7 +497,7 @@ FILE_WATCHER::StopMonitor()
     LOG_INFO(L"Stopping file watching.");
 
     // Signal the file watcher thread to exit
-    PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL);
+    PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, nullptr);
     WaitForWatcherThreadExit();
 
     if (m_fShadowCopyEnabled)
@@ -469,3 +509,24 @@ FILE_WATCHER::StopMonitor()
     // Release application reference
     _pApplication.reset(nullptr);
 }
+
+bool
+FILE_WATCHER::IsAppOfflineMonitoring() const
+{
+    return _wcsicmp(_strFileName.QueryStr(), L"app_offline.htm") == 0;
+}
+
+DWORD
+WINAPI
+FILE_WATCHER::RunFileChangedCallback(
+    LPVOID  pvArg
+)
+{
+    // Recapture application instance into unique_ptr
+    auto pApplication = std::unique_ptr<AppOfflineTrackingApplication, IAPPLICATION_DELETER>(static_cast<AppOfflineTrackingApplication*>(pvArg));
+
+    // Call the appropriate handler for configuration file changes
+    pApplication->OnConfigurationFileChange();
+
+    return 0;
+}
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
index c73a76849703..c6f220608c46 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
@@ -41,6 +41,10 @@ class FILE_WATCHER{
     static
     DWORD
     WINAPI RunNotificationCallback(LPVOID);
+    
+    static
+    DWORD
+    WINAPI RunFileChangedCallback(LPVOID);
 
     static
     VOID
@@ -50,10 +54,12 @@ class FILE_WATCHER{
 
     static DWORD WINAPI CopyAndShutdown(FILE_WATCHER* watcher);
 
-    HRESULT HandleChangeCompletion(DWORD cbCompletion);
+    HRESULT HandleChangeCompletion(_In_ DWORD bytesTransferred);
 
     HRESULT Monitor();
     void StopMonitor();
+    
+    bool IsAppOfflineMonitoring() const;
 
 private:
     HandleWrapper<NullHandleTraits>               m_hCompletionPort;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
index c32bc51ced79..5466e308fc8a 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #include "stdafx.h"
@@ -11,10 +12,10 @@
 
 REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG()
 {
-    if (m_ppStrArguments != NULL)
+    if (m_ppStrArguments != nullptr)
     {
         delete[] m_ppStrArguments;
-        m_ppStrArguments = NULL;
+        m_ppStrArguments = nullptr;
     }
 }
 
@@ -27,19 +28,19 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(
 )
 {
     HRESULT                 hr = S_OK;
-    REQUESTHANDLER_CONFIG  *pRequestHandlerConfig = NULL;
+    REQUESTHANDLER_CONFIG  *pRequestHandlerConfig = nullptr;
     STRU                    struHostFxrDllLocation;
     STRU                    struExeLocation;
 
     try
     {
-        if (ppAspNetCoreConfig == NULL)
+        if (ppAspNetCoreConfig == nullptr)
         {
             hr = E_INVALIDARG;
             goto Finished;
         }
 
-        *ppAspNetCoreConfig = NULL;
+        *ppAspNetCoreConfig = nullptr;
 
         pRequestHandlerConfig = new REQUESTHANDLER_CONFIG;
 
@@ -58,7 +59,7 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(
         }
 
         *ppAspNetCoreConfig = pRequestHandlerConfig;
-        pRequestHandlerConfig = NULL;
+        pRequestHandlerConfig = nullptr;
     }
     catch (std::bad_alloc&)
     {
@@ -67,10 +68,10 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(
 
 Finished:
 
-    if (pRequestHandlerConfig != NULL)
+    if (pRequestHandlerConfig != nullptr)
     {
         delete pRequestHandlerConfig;
-        pRequestHandlerConfig = NULL;
+        pRequestHandlerConfig = nullptr;
     }
 
     return hr;
@@ -89,21 +90,26 @@ REQUESTHANDLER_CONFIG::Populate(
     STRU                            strEnvValue;
     STRU                            strExpandedEnvValue;
     STRU                            strApplicationFullPath;
-    IAppHostAdminManager           *pAdminManager = NULL;
-    IAppHostElement                *pAspNetCoreElement = NULL;
-    IAppHostElement                *pWindowsAuthenticationElement = NULL;
-    IAppHostElement                *pBasicAuthenticationElement = NULL;
-    IAppHostElement                *pAnonymousAuthenticationElement = NULL;
+    IAppHostAdminManager           *pAdminManager = nullptr;
+    IAppHostElement                *pAspNetCoreElement = nullptr;
+    IAppHostElement                *pWindowsAuthenticationElement = nullptr;
+    IAppHostElement                *pBasicAuthenticationElement = nullptr;
+    IAppHostElement                *pAnonymousAuthenticationElement = nullptr;
     ULONGLONG                       ullRawTimeSpan = 0;
     DWORD                           dwCounter = 0;
     DWORD                           dwPosition = 0;
-    WCHAR*                          pszPath = NULL;
-    BSTR                            bstrWindowAuthSection = NULL;
-    BSTR                            bstrBasicAuthSection = NULL;
-    BSTR                            bstrAnonymousAuthSection = NULL;
-    BSTR                            bstrAspNetCoreSection = NULL;
+    WCHAR*                          pszPath = nullptr;
+    BSTR                            bstrWindowAuthSection = nullptr;
+    BSTR                            bstrBasicAuthSection = nullptr;
+    BSTR                            bstrAnonymousAuthSection = nullptr;
+    BSTR                            bstrAspNetCoreSection = nullptr;
     std::optional<std::wstring> launcherPathEnv;
     std::optional<std::wstring> launcherArgsEnv;
+    IAppHostElement                *pRecycleOnFileChangeFileList = nullptr;
+    IAppHostElementCollection      *pRecycleOnFileChangeFileCollection = nullptr;
+    IAppHostElement                *pRecycleOnFileChangeFile = nullptr;
+    ENUM_INDEX                      index{};
+    STRU                            strFilePath;
 
     pAdminManager = pHttpServer->GetAdminManager();
     try
@@ -161,7 +167,7 @@ REQUESTHANDLER_CONFIG::Populate(
     }
 
     bstrWindowAuthSection = SysAllocString(CS_WINDOWS_AUTHENTICATION_SECTION);
-    if (bstrWindowAuthSection == NULL)
+    if (bstrWindowAuthSection == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
@@ -188,7 +194,7 @@ REQUESTHANDLER_CONFIG::Populate(
     }
 
     bstrBasicAuthSection = SysAllocString(CS_BASIC_AUTHENTICATION_SECTION);
-    if (bstrBasicAuthSection == NULL)
+    if (bstrBasicAuthSection == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
@@ -213,7 +219,7 @@ REQUESTHANDLER_CONFIG::Populate(
     }
 
     bstrAnonymousAuthSection = SysAllocString(CS_ANONYMOUS_AUTHENTICATION_SECTION);
-    if (bstrAnonymousAuthSection == NULL)
+    if (bstrAnonymousAuthSection == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
@@ -238,7 +244,7 @@ REQUESTHANDLER_CONFIG::Populate(
     }
 
     bstrAspNetCoreSection = SysAllocString(CS_ASPNETCORE_SECTION);
-    if (bstrAspNetCoreSection == NULL)
+    if (bstrAspNetCoreSection == nullptr)
     {
         hr = E_OUTOFMEMORY;
         goto Finished;
@@ -294,30 +300,30 @@ REQUESTHANDLER_CONFIG::Populate(
         }
     }
 
-    hr = GetElementStringProperty(pAspNetCoreElement,
-        CS_ASPNETCORE_HOSTING_MODEL,
-        &strHostingModel);
-    if (FAILED(hr))
-    {
-        // Swallow this error for backward compatability
-        // Use default behavior for empty string
-        hr = S_OK;
-    }
+    // hr = GetElementStringProperty(pAspNetCoreElement,
+    //     CS_ASPNETCORE_HOSTING_MODEL,
+    //     &strHostingModel);
+    // if (FAILED(hr))
+    // {
+    //     // Swallow this error for backward compatability
+    //     // Use default behavior for empty string
+    //     hr = S_OK;
+    // }
 
-    if (strHostingModel.IsEmpty() || strHostingModel.Equals(L"outofprocess", TRUE))
-    {
+    // if (strHostingModel.IsEmpty() || strHostingModel.Equals(L"outofprocess", TRUE))
+    // {
         m_hostingModel = HOSTING_OUT_PROCESS;
-    }
-    else if (strHostingModel.Equals(L"inprocess", TRUE))
-    {
-        m_hostingModel = HOSTING_IN_PROCESS;
-    }
-    else
-    {
-        // block unknown hosting value
-        hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
-        goto Finished;
-    }
+    // }
+    // else if (strHostingModel.Equals(L"inprocess", TRUE))
+    // {
+    //     m_hostingModel = HOSTING_IN_PROCESS;
+    // }
+    // else
+    // {
+    //     // block unknown hosting value
+    //     hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+    //     goto Finished;
+    // }
 
     hr = GetElementDWORDProperty(pAspNetCoreElement,
         CS_ASPNETCORE_RAPID_FAILS_PER_MINUTE,
@@ -355,7 +361,7 @@ REQUESTHANDLER_CONFIG::Populate(
 
     m_dwStartupTimeLimitInMS *= MILLISECONDS_IN_ONE_SECOND;
 
-    hr = GetElementDWORDProperty(
+    /*hr = GetElementDWORDProperty(
         pAspNetCoreElement,
         CS_ASPNETCORE_PROCESS_SHUTDOWN_TIME_LIMIT,
         &m_dwShutdownTimeLimitInMS
@@ -363,7 +369,8 @@ REQUESTHANDLER_CONFIG::Populate(
     if (FAILED(hr))
     {
         goto Finished;
-    }
+    }*/
+    m_dwShutdownTimeLimitInMS = 10;
     m_dwShutdownTimeLimitInMS *= MILLISECONDS_IN_ONE_SECOND;
 
     hr = GetElementBoolProperty(pAspNetCoreElement,
@@ -374,13 +381,14 @@ REQUESTHANDLER_CONFIG::Populate(
         goto Finished;
     }
 
-    hr = GetElementBoolProperty(pAspNetCoreElement,
-        CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE,
-        &m_fDisableStartUpErrorPage);
-    if (FAILED(hr))
-    {
-        goto Finished;
-    }
+    //hr = GetElementBoolProperty(pAspNetCoreElement,
+    //    CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE,
+    //    &m_fDisableStartUpErrorPage);
+    //if (FAILED(hr))
+    //{
+    //    goto Finished;
+    //}
+    m_fDisableStartUpErrorPage = FALSE;
 
     hr = GetElementRawTimeSpanProperty(
         pAspNetCoreElement,
@@ -421,30 +429,87 @@ REQUESTHANDLER_CONFIG::Populate(
         goto Finished;
     }
 
+    //
+    // let's disable this feature for now
+    //
+    // get all files listed in recycleOnFileChange
+    //*
+    hr = GetElementChildByName(pAspNetCoreElement,
+        CS_ASPNETCORE_RECYCLE_ON_FILE_CHANGE,
+        &pRecycleOnFileChangeFileList);
+    if (FAILED(hr))
+    {
+        goto Finished;
+    }
+
+    hr = pRecycleOnFileChangeFileList->get_Collection(&pRecycleOnFileChangeFileCollection);
+    if (FAILED(hr))
+    {
+        goto Finished;
+    }
+
+    for (hr = FindFirstElement(pRecycleOnFileChangeFileCollection, &index, &pRecycleOnFileChangeFile);
+        SUCCEEDED(hr);
+        hr = FindNextElement(pRecycleOnFileChangeFileCollection, &index, &pRecycleOnFileChangeFile))
+    {
+        if (hr == S_FALSE)
+        {
+            hr = S_OK;
+            break;
+        }
+
+        hr = GetElementStringProperty(pRecycleOnFileChangeFile,
+            CS_ASPNETCORE_RECYCLE_ON_FILE_CHANGE_FILE_PATH,
+            &strFilePath);
+        if (FAILED(hr))
+        {
+            goto Finished;
+        }
+
+        m_pRecycleOnFileChangeFiles.push_back(strFilePath.QueryStr());
+
+        strFilePath.Reset();
+        pRecycleOnFileChangeFile->Release();
+        pRecycleOnFileChangeFile = nullptr;
+    }
+    //*/
+
 Finished:
 
-    if (pAspNetCoreElement != NULL)
+    if (pAspNetCoreElement != nullptr)
     {
         pAspNetCoreElement->Release();
-        pAspNetCoreElement = NULL;
+        pAspNetCoreElement = nullptr;
     }
 
-    if (pWindowsAuthenticationElement != NULL)
+    if (pWindowsAuthenticationElement != nullptr)
     {
         pWindowsAuthenticationElement->Release();
-        pWindowsAuthenticationElement = NULL;
+        pWindowsAuthenticationElement = nullptr;
     }
 
-    if (pAnonymousAuthenticationElement != NULL)
+    if (pAnonymousAuthenticationElement != nullptr)
     {
         pAnonymousAuthenticationElement->Release();
-        pAnonymousAuthenticationElement = NULL;
+        pAnonymousAuthenticationElement = nullptr;
     }
 
-    if (pBasicAuthenticationElement != NULL)
+    if (pBasicAuthenticationElement != nullptr)
     {
         pBasicAuthenticationElement->Release();
-        pBasicAuthenticationElement = NULL;
+        pBasicAuthenticationElement = nullptr;
+    }
+
+    if (pRecycleOnFileChangeFile != nullptr)
+    {
+        pRecycleOnFileChangeFile->Release();
+        pRecycleOnFileChangeFile = nullptr;
+    }
+
+    if (pRecycleOnFileChangeFileCollection != nullptr)
+    {
+        pRecycleOnFileChangeFileCollection->Release();
+        pRecycleOnFileChangeFileCollection = nullptr;
     }
 
     return hr;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h
index fc5d01b109e0..39c102a4c0ee 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h
+++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h
@@ -1,10 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) LeXtudio Inc. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
 #define CS_ROOTWEB_CONFIG                                L"MACHINE/WEBROOT/APPHOST/"
 #define CS_ROOTWEB_CONFIG_LEN                            _countof(CS_ROOTWEB_CONFIG)-1
-#define CS_ASPNETCORE_SECTION                            L"system.webServer/aspNetCore"
+#define CS_ASPNETCORE_SECTION                            L"system.webServer/httpPlatform"
 #define CS_WINDOWS_AUTHENTICATION_SECTION                L"system.webServer/security/authentication/windowsAuthentication"
 #define CS_BASIC_AUTHENTICATION_SECTION                  L"system.webServer/security/authentication/basicAuthentication"
 #define CS_ANONYMOUS_AUTHENTICATION_SECTION              L"system.webServer/security/authentication/anonymousAuthentication"
@@ -53,6 +54,8 @@ enum APP_HOSTING_MODEL
 class REQUESTHANDLER_CONFIG
 {
 public:
+    // Returns the list of files to watch for recycle
+    const std::vector<std::wstring>& QueryRecycleOnFileChangeFiles() const { return m_pRecycleOnFileChangeFiles; }
 
 
     ~REQUESTHANDLER_CONFIG();
@@ -236,7 +239,7 @@ class REQUESTHANDLER_CONFIG
     REQUESTHANDLER_CONFIG() :
         m_fStdoutLogEnabled(FALSE),
         m_hostingModel(HOSTING_UNKNOWN),
-        m_ppStrArguments(NULL)
+        m_ppStrArguments(nullptr)
     {
     }
 
@@ -269,6 +272,7 @@ class REQUESTHANDLER_CONFIG
     STRU                   m_fEnableOutOfProcessConsoleRedirection;
     APP_HOSTING_MODEL      m_hostingModel;
     std::map<std::wstring, std::wstring, ignore_case_comparer> m_pEnvironmentVariables;
+    std::vector<std::wstring> m_pRecycleOnFileChangeFiles;
     STRU                   m_struHostFxrLocation;
     PWSTR*                 m_ppStrArguments;
     DWORD                  m_dwArgc;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj
index bf7e421173d9..c02269e206d7 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj
+++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj
@@ -7,6 +7,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CAC1267B-8778-4257-AAC6-CAF481723B01}</ProjectGuid>
     <RootNamespace>gtest</RootNamespace>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <TargetName>gtest</TargetName>
diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props
index e167d783b593..eafaae9aaa42 100644
--- a/src/Servers/IIS/Directory.Build.props
+++ b/src/Servers/IIS/Directory.Build.props
@@ -1,13 +1,28 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-  
+
   <PropertyGroup>
     <KestrelSharedSourceRoot>$(MSBuildThisFileDirectory)..\Kestrel\shared\</KestrelSharedSourceRoot>
+
+    <EnableManagedPackageReferenceSupport>true</EnableManagedPackageReferenceSupport>
     <HostArch>$(Platform)</HostArch>
     <HostArch Condition="'$(Platform)' == 'Win32'">x86</HostArch>
     <HostArch Condition="'$(Platform)' == 'AnyCPU'">x64</HostArch>
-    <LibNetHostPath>$(NetCoreTargetingPackRoot)Microsoft.NETCore.App.Host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native</LibNetHostPath>
+    <HostArch Condition="'$(DotNetBuild)' == 'true' AND '$(DotNetBuildPass)' != '2'">$(TargetArchitecture)</HostArch>
+    <LibNetHostPath>$(NuGetPackageRoot)microsoft.netcore.app.host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native</LibNetHostPath>
     <!-- This tools version MUST match the same version as runtime uses to compile libnethost.lib -->
-    <PlatformToolsetVersion>v142</PlatformToolsetVersion>
+    <PlatformToolsetVersion>143</PlatformToolsetVersion>
   </PropertyGroup>
+
+  <!-- Platform is different during restore than during build. Therefore, restore everything when not building the product. -->
+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and ('$(DotNetBuild)' != 'true' OR '$(DotNetBuildPass)' == '2') ">
+    <PackageReference Include="Microsoft.NETCore.App.Host.win-x64" Version="[$(LibNetHostAppPackVersion)]" PrivateAssets="all" ExcludeAssets="all" />
+    <PackageReference Include="Microsoft.NETCore.App.Host.win-x86" Version="[$(LibNetHostAppPackVersion)]" PrivateAssets="all" ExcludeAssets="all" />
+    <PackageReference Include="Microsoft.NETCore.App.Host.win-arm64" Version="[$(LibNetHostAppPackVersion)]" PrivateAssets="all" ExcludeAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and '$(DotNetBuild)' == 'true' AND '$(DotNetBuildPass)' != '2' ">
+    <PackageReference Include="Microsoft.NETCore.App.Host.win-$(TargetArchitecture)" Version="[$(LibNetHostAppPackVersion)]" PrivateAssets="all" ExcludeAssets="all" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj b/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
index b65ae0e6dbd1..19ea680c8222 100644
--- a/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
+++ b/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
@@ -37,7 +37,6 @@
   <ItemGroup>
     <Reference Include="BenchmarkDotNet" />
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
-    <Reference Include="System.Private.Uri" />
 
     <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
   </ItemGroup>
diff --git a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
index ecde817e707f..fa97a75dd5b0 100644
--- a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
+++ b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
@@ -14,7 +14,6 @@
     <Reference Include="Microsoft.AspNetCore.Server.IIS" />
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
-    <Reference Include="System.Private.Uri" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs b/src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs
index 0ff3b86369c6..e3559fa5b1e0 100644
--- a/src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs
+++ b/src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
@@ -52,6 +53,19 @@ public void Configure(IApplicationBuilder app)
             await context.Response.WriteAsync("ClientCert: " + context.Connection.ClientCertificate + Environment.NewLine);
             await context.Response.WriteAsync(Environment.NewLine);
 
+            var handshakeFeature = context.Features.Get<ITlsHandshakeFeature>();
+            if (handshakeFeature is not null)
+            {
+                await context.Response.WriteAsync(Environment.NewLine);
+                await context.Response.WriteAsync("TLS Information:" + Environment.NewLine);
+                await context.Response.WriteAsync($"Protocol: {handshakeFeature.Protocol}" + Environment.NewLine);
+
+                if (handshakeFeature.NegotiatedCipherSuite.HasValue)
+                {
+                    await context.Response.WriteAsync($"Cipher Suite: {handshakeFeature.NegotiatedCipherSuite.Value}" + Environment.NewLine);
+                }
+            }
+
             await context.Response.WriteAsync("User: " + context.User.Identity.Name + Environment.NewLine);
             if (_authSchemeProvider != null)
             {
diff --git a/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
index 427709d4b774..6e3475a5f1b8 100644
--- a/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
+++ b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
@@ -15,6 +15,7 @@
 using Microsoft.AspNetCore.Http.Features.Authentication;
 using Microsoft.AspNetCore.Server.HttpSys;
 using Microsoft.AspNetCore.Server.IIS.Core.IO;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 
@@ -409,16 +410,22 @@ unsafe X509Certificate2? ITlsConnectionFeature.ClientCertificate
 
     string ITlsHandshakeFeature.HostName => SniHostName;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     CipherAlgorithmType ITlsHandshakeFeature.CipherAlgorithm => CipherAlgorithm;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     int ITlsHandshakeFeature.CipherStrength => CipherStrength;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     HashAlgorithmType ITlsHandshakeFeature.HashAlgorithm => HashAlgorithm;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     int ITlsHandshakeFeature.HashStrength => HashStrength;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     ExchangeAlgorithmType ITlsHandshakeFeature.KeyExchangeAlgorithm => KeyExchangeAlgorithm;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     int ITlsHandshakeFeature.KeyExchangeStrength => KeyExchangeStrength;
 
     IEnumerator<KeyValuePair<Type, object>> IEnumerable<KeyValuePair<Type, object>>.GetEnumerator() => FastEnumerable().GetEnumerator();
diff --git a/src/Servers/IIS/IIS/src/Core/IISHttpContext.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.cs
index f0e04f3b2a95..4a1417ed1b52 100644
--- a/src/Servers/IIS/IIS/src/Core/IISHttpContext.cs
+++ b/src/Servers/IIS/IIS/src/Core/IISHttpContext.cs
@@ -18,6 +18,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.HttpSys.Internal;
 using Microsoft.AspNetCore.Server.IIS.Core.IO;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
@@ -118,11 +119,17 @@ internal unsafe IISHttpContext(
     public SslProtocols Protocol { get; private set; }
     public TlsCipherSuite? NegotiatedCipherSuite { get; private set; }
     public string SniHostName { get; private set; } = default!;
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public CipherAlgorithmType CipherAlgorithm { get; private set; }
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int CipherStrength { get; private set; }
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public HashAlgorithmType HashAlgorithm { get; private set; }
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int HashStrength { get; private set; }
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public ExchangeAlgorithmType KeyExchangeAlgorithm { get; private set; }
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId)]
     public int KeyExchangeStrength { get; private set; }
 
     protected IAsyncIOEngine? AsyncIO { get; set; }
@@ -395,17 +402,43 @@ private void GetTlsHandshakeResults()
     {
         var handshake = GetTlsHandshake();
         Protocol = (SslProtocols)handshake.Protocol;
+
+        NegotiatedCipherSuite = GetTlsCipherSuite();
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
         CipherAlgorithm = (CipherAlgorithmType)handshake.CipherType;
         CipherStrength = (int)handshake.CipherStrength;
         HashAlgorithm = (HashAlgorithmType)handshake.HashType;
         HashStrength = (int)handshake.HashStrength;
         KeyExchangeAlgorithm = (ExchangeAlgorithmType)handshake.KeyExchangeType;
         KeyExchangeStrength = (int)handshake.KeyExchangeStrength;
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
         var sni = GetClientSni();
         SniHostName = sni.Hostname.ToString();
     }
 
+    private unsafe TlsCipherSuite? GetTlsCipherSuite()
+    {
+        SecPkgContext_CipherInfo cipherInfo = default;
+
+        var statusCode = NativeMethods.HttpQueryRequestProperty(
+            RequestId,
+            (HTTP_REQUEST_PROPERTY)14 /* HTTP_REQUEST_PROPERTY.HttpRequestPropertyTlsCipherInfo */,
+            qualifier: null,
+            qualifierSize: 0,
+            output: &cipherInfo,
+            outputSize: (uint)sizeof(SecPkgContext_CipherInfo),
+            bytesReturned: null,
+            overlapped: IntPtr.Zero);
+
+        if (statusCode == NativeMethods.HR_OK)
+        {
+            return checked((TlsCipherSuite)cipherInfo.dwCipherSuite);
+        }
+
+        return default;
+    }
+
     private unsafe HTTP_REQUEST_PROPERTY_SNI GetClientSni()
     {
         var buffer = new byte[HttpApiTypes.SniPropertySizeInBytes];
diff --git a/src/Servers/IIS/IIS/src/Core/IISHttpServer.cs b/src/Servers/IIS/IIS/src/Core/IISHttpServer.cs
index 3390478626a5..d0309104680f 100644
--- a/src/Servers/IIS/IIS/src/Core/IISHttpServer.cs
+++ b/src/Servers/IIS/IIS/src/Core/IISHttpServer.cs
@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http.Features;
@@ -21,14 +22,14 @@ internal sealed class IISHttpServer : IServer
     private const string WebSocketVersionString = "WEBSOCKET_VERSION";
 
     private IISContextFactory? _iisContextFactory;
-    private readonly MemoryPool<byte> _memoryPool = new PinnedBlockMemoryPool();
+    private readonly MemoryPool<byte> _memoryPool;
     private GCHandle _httpServerHandle;
     private readonly IHostApplicationLifetime _applicationLifetime;
     private readonly ILogger<IISHttpServer> _logger;
     private readonly IISServerOptions _options;
     private readonly IISNativeApplication _nativeApplication;
     private readonly ServerAddressesFeature _serverAddressesFeature;
-    private readonly string? _virtualPath;
+    private string? _virtualPath;
 
     private readonly TaskCompletionSource _shutdownSignal = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
     private bool? _websocketAvailable;
@@ -60,17 +61,17 @@ public IISHttpServer(
         IHostApplicationLifetime applicationLifetime,
         IAuthenticationSchemeProvider authentication,
         IConfiguration configuration,
+        IMemoryPoolFactory<byte> memoryPoolFactory,
         IOptions<IISServerOptions> options,
         ILogger<IISHttpServer> logger
         )
     {
+        _memoryPool = memoryPoolFactory.Create(new MemoryPoolOptions { Owner = "iis" });
         _nativeApplication = nativeApplication;
         _applicationLifetime = applicationLifetime;
         _logger = logger;
         _options = options.Value;
         _serverAddressesFeature = new ServerAddressesFeature();
-        var iisConfigData = NativeMethods.HttpGetApplicationProperties();
-        _virtualPath = iisConfigData.pwzVirtualApplicationPath;
 
         if (_options.ForwardWindowsAuthentication)
         {
@@ -106,6 +107,9 @@ public unsafe Task StartAsync<TContext>(IHttpApplication<TContext> application,
             (IntPtr)_httpServerHandle,
             (IntPtr)_httpServerHandle);
 
+        var iisConfigData = NativeMethods.HttpGetApplicationProperties();
+        _virtualPath = iisConfigData.pwzVirtualApplicationPath;
+
         _serverAddressesFeature.Addresses = _options.ServerAddresses;
 
         return Task.CompletedTask;
@@ -132,7 +136,7 @@ public void Dispose()
         _disposed = true;
 
         // Block any more calls into managed from native as we are unloading.
-        _nativeApplication.StopCallsIntoManaged();
+        _nativeApplication.Stop();
         _shutdownSignal.TrySetResult();
 
         if (_httpServerHandle.IsAllocated)
@@ -141,7 +145,6 @@ public void Dispose()
         }
 
         _memoryPool.Dispose();
-        _nativeApplication.Dispose();
     }
 
     [UnmanagedCallersOnly]
@@ -261,7 +264,7 @@ private static void OnRequestsDrained(IntPtr serverContext)
                 return;
             }
 
-            server._nativeApplication.StopCallsIntoManaged();
+            server._nativeApplication.Stop();
             server._shutdownSignal.TrySetResult();
             server._cancellationTokenRegistration.Dispose();
         }
diff --git a/src/Servers/IIS/IIS/src/Core/IISNativeApplication.cs b/src/Servers/IIS/IIS/src/Core/IISNativeApplication.cs
index a031f50aebf7..b38f2068bd50 100644
--- a/src/Servers/IIS/IIS/src/Core/IISNativeApplication.cs
+++ b/src/Servers/IIS/IIS/src/Core/IISNativeApplication.cs
@@ -6,6 +6,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core;
 internal sealed class IISNativeApplication
 {
     private readonly NativeSafeHandle _nativeApplication;
+    private bool _hasRegisteredCallbacks;
     private readonly object _sync = new object();
 
     public IISNativeApplication(NativeSafeHandle nativeApplication)
@@ -24,14 +25,22 @@ public void StopIncomingRequests()
         }
     }
 
-    public void StopCallsIntoManaged()
+    public void Stop()
     {
         lock (_sync)
         {
-            if (!_nativeApplication.IsInvalid)
+            if (_nativeApplication.IsInvalid)
+            {
+                return;
+            }
+
+            if (_hasRegisteredCallbacks)
             {
                 NativeMethods.HttpStopCallsIntoManaged(_nativeApplication);
             }
+
+            _nativeApplication.Dispose();
+            GC.SuppressFinalize(this);
         }
     }
 
@@ -44,6 +53,8 @@ public unsafe void RegisterCallbacks(
         IntPtr pvRequestContext,
         IntPtr pvShutdownContext)
     {
+        _hasRegisteredCallbacks = true;
+
         NativeMethods.HttpRegisterCallbacks(
             _nativeApplication,
             requestCallback,
@@ -55,20 +66,9 @@ public unsafe void RegisterCallbacks(
             pvShutdownContext);
     }
 
-    public void Dispose()
-    {
-        lock (_sync)
-        {
-            GC.SuppressFinalize(this);
-
-            // Don't need to await here because pinvokes should never been called after disposing the safe handle.
-            _nativeApplication.Dispose();
-        }
-    }
-
     ~IISNativeApplication()
     {
         // If this finalize is invoked, try our best to block all calls into managed.
-        StopCallsIntoManaged();
+        Stop();
     }
 }
diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
index a3d525a577e9..a456190bc234 100644
--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -26,6 +26,7 @@
     <Compile Include="$(SharedSourceRoot)RazorViews\*.cs" LinkBase="Shared\" />
     <Compile Include="$(SharedSourceRoot)ErrorPage\*.cs" LinkBase="Shared\" />
     <Compile Include="$(SharedSourceRoot)TaskToApm.cs" Link="Shared\TaskToApm.cs" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" Link="Shared\Obsoletions.cs" />
     <Compile Include="$(SharedSourceRoot)ServerInfrastructure\*.cs" LinkBase="Shared\" />
     <Compile Include="$(SharedSourceRoot)ValueTaskExtensions\**\*.cs" LinkBase="Shared\" />
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
@@ -44,9 +45,11 @@
   </Target>
 
   <ItemGroup Condition=" '$(UseIisNativeAssets)' == 'true' ">
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x64" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="Win32" />
-    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="ARM64" />
+    <!-- Only build the target platform in .NET product build mode. -->
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x64" Condition="'$(DotNetBuild)' != 'true'" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="Win32" Condition="'$(DotNetBuild)' != 'true'" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="ARM64" Condition="'$(DotNetBuild)' != 'true'" />
+    <NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="$(NativePlatform)" Condition="'$(DotNetBuild)' == 'true'" />
 
     <UpToDateCheckInput Include="$(AspNetCoreModuleV2InProcessHandlerDll)" />
   </ItemGroup>
diff --git a/src/Servers/IIS/IIS/src/NativeMethods.txt b/src/Servers/IIS/IIS/src/NativeMethods.txt
index 8d0523a197f3..b1d5e99f923a 100644
--- a/src/Servers/IIS/IIS/src/NativeMethods.txt
+++ b/src/Servers/IIS/IIS/src/NativeMethods.txt
@@ -14,3 +14,5 @@ HTTP_REQUEST_PROPERTY_SNI_HOST_MAX_LENGTH
 HTTP_REQUEST_V1
 HTTP_REQUEST_V2
 HTTP_SSL_PROTOCOL_INFO
+SOCKADDR_IN
+SOCKADDR_IN6
diff --git a/src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs b/src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs
index 302f1af5a6c4..44c1094a8a01 100644
--- a/src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs
+++ b/src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs
@@ -2,10 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Server.IIS;
 using Microsoft.AspNetCore.Server.IIS.Core;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.AspNetCore.Hosting;
 
@@ -53,6 +55,9 @@ public static IWebHostBuilder UseIIS(this IWebHostBuilder hostBuilder)
                             options.IisMaxRequestSizeLimit = iisConfigData.maxRequestBodySize;
                         }
                     );
+
+                    services.TryAddSingleton<IMemoryPoolFactory<byte>, DefaultMemoryPoolFactory>();
+                    services.TryAddSingleton<MemoryPoolMetrics>();
                 });
         }
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AspNetCorePortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AspNetCorePortTests.cs
index 20a52e2128a8..3f0cbd281764 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AspNetCorePortTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AspNetCorePortTests.cs
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class AspNetCorePortTests : IISFunctionalTestBase
 {
     // Port range allowed by ANCM config
@@ -125,7 +124,7 @@ public async Task ShutdownMultipleTimesWorks(TestVariant variant)
         if (i == 10)
         {
             // Didn't restart after 10 retries
-            Assert.False(true);
+            Assert.Fail();
         }
 
         // Shutdown again
@@ -143,7 +142,7 @@ public async Task ShutdownMultipleTimesWorks(TestVariant variant)
         }
 
         // Test failure if this happens.
-        Assert.False(true);
+        Assert.Fail();
     }
 
     private static int GetUnusedRandomPort()
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
index b2fd9a62c5a5..15fc66e9860d 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
@@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class BasicAuthTests : IISFunctionalTestBase
 {
     public BasicAuthTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
index 2d96311e39c7..1649aaa3d8fc 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
@@ -26,7 +26,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(IISCompressionSiteCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class CompressionTests : FixtureLoggedTest
 {
     private readonly IISCompressionSiteFixture _fixture;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/FrebTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/FrebTests.cs
index 9af919c5a044..7b3741bf1d1f 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/FrebTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/FrebTests.cs
@@ -31,7 +31,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class FrebTests : IISFunctionalTestBase
 {
     public FrebTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs
index 82a1adf3fad4..c8d1807de737 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class GlobalVersionTests : IISFunctionalTestBase
 {
     public GlobalVersionTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Http2Tests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Http2Tests.cs
index 54f466487a90..a6bfacf4e455 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Http2Tests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Http2Tests.cs
@@ -38,7 +38,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 /// with newer functionality.
 /// </summary>
 [Collection(IISHttpsTestSiteCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class Http2Tests
 {
     public Http2Tests(IISTestSiteFixture fixture)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
index 3ececd379156..51559e83fc38 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
@@ -31,7 +31,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
 [SkipIfNotAdmin]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ClientCertificateTests : IISFunctionalTestBase
 {
     private readonly ClientCertificateFixture _certFixture;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteCollection.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteCollection.cs
index b0c81b037f30..7a96d25087da 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteCollection.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteCollection.cs
@@ -9,9 +9,15 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 /// This type just maps collection names to available fixtures
 /// </summary>
 [CollectionDefinition(Name)]
-public class IISTestSiteCollection : ICollectionFixture<IISTestSiteFixture>
+public class IISTestSiteCollectionInProc : ICollectionFixture<IISTestSiteFixture>
 {
-    public const string Name = nameof(IISTestSiteCollection);
+    public const string Name = nameof(IISTestSiteCollectionInProc);
+}
+
+[CollectionDefinition(Name)]
+public class IISTestSiteCollectionOutOfProc : ICollectionFixture<IISTestSiteFixture>
+{
+    public const string Name = nameof(IISTestSiteCollectionOutOfProc);
 }
 
 [CollectionDefinition(Name)]
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs
index 73074454b0c1..ec04ad06ba84 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs
@@ -46,6 +46,15 @@ internal IISTestSiteFixture(Action<IISDeploymentParameters> configure)
             ApplicationPublisher = new PublishedApplicationPublisher(Helpers.GetInProcessTestSitesName()),
             ServerType = DeployerSelector.ServerType
         };
+
+        // Uncomment to add IIS debug logs to test output.
+        //DeploymentParameters.EnvironmentVariables.Add("ASPNETCORE_MODULE_DEBUG", "console");
+
+        // This queue does not have websockets enabled currently, adding the module will break all tests using this fixture.
+        if (!HelixHelper.GetTargetHelixQueue().ToLowerInvariant().Contains("windows.amd64.server2022"))
+        {
+            DeploymentParameters.EnableModule("WebSocketModule", "%IIS_BIN%/iiswsock.dll");
+        }
     }
 
     public HttpClient Client => DeploymentResult.HttpClient;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/RequiresIISAttribute.cs
index 7c2e50e594e2..9bb25c50f990 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/RequiresIISAttribute.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/RequiresIISAttribute.cs
@@ -136,7 +136,7 @@ public RequiresIISAttribute(IISCapability capabilities)
                 IsMet &= available;
                 if (!available)
                 {
-                    SkipReason += $"The machine does have {module.Capability} available.";
+                    SkipReason += $"The machine does not have {module.Capability} available.";
                 }
             }
         }
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Latin1Tests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Latin1Tests.cs
index fad27341851e..70a200930ab2 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Latin1Tests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Latin1Tests.cs
@@ -27,7 +27,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class Latin1Tests : IISFunctionalTestBase
 {
     public Latin1Tests(PublishedSitesFixture fixture) : base(fixture)
@@ -36,6 +35,7 @@ public Latin1Tests(PublishedSitesFixture fixture) : base(fixture)
 
     [ConditionalFact]
     [RequiresNewHandler]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61055")]
     public async Task Latin1Works()
     {
         var deploymentParameters = Fixture.GetBaseDeploymentParameters();
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs
index 8fb837872932..448259fb34b0 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class LoggingTests : IISFunctionalTestBase
 {
     public LoggingTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MaxRequestBodySizeTests.cs
index 132e8827edcb..9ed965f0b4c2 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MaxRequestBodySizeTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MaxRequestBodySizeTests.cs
@@ -26,7 +26,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class MaxRequestBodySizeTests : IISFunctionalTestBase
 {
     public MaxRequestBodySizeTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
index 891eafdacb6d..a2215f320a5f 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
@@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class MultiApplicationTests : IISFunctionalTestBase
 {
     private PublishedApplication _publishedApplication;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs
index 6ae4aa2aff36..fd4cd1d42976 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs
@@ -21,7 +21,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(IISSubAppSiteCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
 public class RequestPathBaseTests : FixtureLoggedTest
 {
     private readonly IISSubAppSiteFixture _fixture;
@@ -32,7 +31,6 @@ public RequestPathBaseTests(IISSubAppSiteFixture fixture) : base(fixture)
     }
 
     [ConditionalTheory]
-    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
     [RequiresNewHandler]
     [InlineData("/Sub/App/PathAndPathBase", "/Sub/App/PathAndPathBase", "")]
     [InlineData("/SUb/APp/PathAndPAthBase", "/SUb/APp/PathAndPAthBase", "")]
@@ -53,7 +51,6 @@ public async Task RequestPathBase_Split(string url, string expectedPathBase, str
     }
 
     [ConditionalTheory]
-    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
     [RequiresNewHandler]
     [InlineData("//Sub/App/PathAndPathBase", "//Sub/App/PathAndPathBase", "")]
     [InlineData(@"/\Sub/App/PathAndPathBase/", @"/\Sub/App/PathAndPathBase", "/")]
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs
index c701dd6bea25..502652331578 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs
@@ -29,8 +29,7 @@ namespace Microsoft.AspNetCore.Server.IIS.NewShim.FunctionalTests;
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
-[Collection(IISTestSiteCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
+[Collection(IISTestSiteCollectionInProc.Name)]
 public class RequestResponseTests
 {
     private readonly IISTestSiteFixture _fixture;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs
new file mode 100644
index 000000000000..60e9d589488e
--- /dev/null
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketInProcessTests.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Xunit.Abstractions;
+
+#if !IIS_FUNCTIONALS
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
+
+#if IISEXPRESS_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
+#elif NEWHANDLER_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.NewHandler.FunctionalTests;
+#elif NEWSHIM_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.NewShim.FunctionalTests;
+#endif
+#else
+
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
+#endif
+
+[Collection(IISTestSiteCollectionInProc.Name)]
+[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
+#if IISEXPRESS_FUNCTIONALS
+#else
+// These queues do not have websockets enabled currently for full IIS
+[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.Server2022.Open")]
+#endif
+public class WebSocketsInProcessTests : WebSocketsTests
+{
+    public WebSocketsInProcessTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(fixture, testOutput)
+    {
+        Fixture.DeploymentParameters.HostingModel = HostingModel.InProcess;
+    }
+}
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs
new file mode 100644
index 000000000000..de58729e9817
--- /dev/null
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketOutOfProcessTests.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Xunit.Abstractions;
+
+#if !IIS_FUNCTIONALS
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
+
+#if IISEXPRESS_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
+#elif NEWHANDLER_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.NewHandler.FunctionalTests;
+#elif NEWSHIM_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.NewShim.FunctionalTests;
+#endif
+#else
+
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
+#endif
+
+[Collection(IISTestSiteCollectionOutOfProc.Name)]
+[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
+#if IISEXPRESS_FUNCTIONALS
+#else
+// These queues do not have websockets enabled currently for full IIS
+[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.Server2022.Open")]
+#endif
+public class WebSocketsOutOfProcessTests : WebSocketsTests
+{
+    public WebSocketsOutOfProcessTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(fixture, testOutput)
+    {
+        Fixture.DeploymentParameters.HostingModel = HostingModel.OutOfProcess;
+    }
+}
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs
similarity index 55%
rename from src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
rename to src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs
index a5586af0c0b9..606ba6c8c654 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WebSocketTests.cs
@@ -1,57 +1,72 @@
 // 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.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Sockets;
 using System.Net.WebSockets;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.InternalTesting;
-using Xunit;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
+using Xunit.Abstractions;
+
+#if !IIS_FUNCTIONALS
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
+#if IISEXPRESS_FUNCTIONALS
 namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
+#elif NEWHANDLER_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.NewHandler.FunctionalTests;
+#elif NEWSHIM_FUNCTIONALS
+namespace Microsoft.AspNetCore.Server.IIS.NewShim.FunctionalTests;
+#endif
+#else
 
-[Collection(IISTestSiteCollection.Name)]
-[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "No WebSocket supported on Win7")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
-public class WebSocketsTests
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
+#endif
+
+public abstract class WebSocketsTests : FunctionalTestsBase
 {
-    private readonly string _requestUri;
-    private readonly string _webSocketUri;
+    public IISTestSiteFixture Fixture { get; }
 
-    public WebSocketsTests(IISTestSiteFixture fixture)
+    public WebSocketsTests(IISTestSiteFixture fixture, ITestOutputHelper testOutput) : base(testOutput)
     {
-        _requestUri = fixture.DeploymentResult.ApplicationBaseUri;
-        _webSocketUri = _requestUri.Replace("http:", "ws:");
+        Fixture = fixture;
     }
 
     [ConditionalFact]
     public async Task RequestWithBody_NotUpgradable()
     {
         using var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(200) };
-        using var response = await client.PostAsync(_requestUri + "WebSocketNotUpgradable", new StringContent("Hello World"));
+        using var response = await client.PostAsync(Fixture.DeploymentResult.ApplicationBaseUri + "WebSocketNotUpgradable", new StringContent("Hello World"));
         response.EnsureSuccessStatusCode();
     }
 
     [ConditionalFact]
     public async Task RequestWithoutBody_Upgradable()
     {
+        if (Fixture.DeploymentParameters.HostingModel == HostingModel.OutOfProcess)
+        {
+            // OutOfProcess doesn't support upgrade requests without the "Upgrade": "websocket" header.
+            return;
+        }
+
         using var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(200) };
         // POST with Content-Length: 0 counts as not having a body.
-        using var response = await client.PostAsync(_requestUri + "WebSocketUpgradable", new StringContent(""));
+        using var response = await client.PostAsync(Fixture.DeploymentResult.ApplicationBaseUri + "WebSocketUpgradable", new StringContent(""));
         response.EnsureSuccessStatusCode();
     }
 
     [ConditionalFact]
     public async Task OnStartedCalledForWebSocket()
     {
-        var cws = new ClientWebSocket();
-        await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketLifetimeEvents"), default);
+        var webSocketUri = Fixture.DeploymentResult.ApplicationBaseUri;
+        webSocketUri = webSocketUri.Replace("http:", "ws:");
+
+        using var cws = new ClientWebSocket();
+        await cws.ConnectAsync(new Uri(webSocketUri + "WebSocketLifetimeEvents"), default);
 
         await ReceiveMessage(cws, "OnStarting");
         await ReceiveMessage(cws, "Upgraded");
@@ -60,8 +75,11 @@ public async Task OnStartedCalledForWebSocket()
     [ConditionalFact]
     public async Task WebReadBeforeUpgrade()
     {
-        var cws = new ClientWebSocket();
-        await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketReadBeforeUpgrade"), default);
+        var webSocketUri = Fixture.DeploymentResult.ApplicationBaseUri;
+        webSocketUri = webSocketUri.Replace("http:", "ws:");
+
+        using var cws = new ClientWebSocket();
+        await cws.ConnectAsync(new Uri(webSocketUri + "WebSocketReadBeforeUpgrade"), default);
 
         await ReceiveMessage(cws, "Yay");
     }
@@ -69,8 +87,11 @@ public async Task WebReadBeforeUpgrade()
     [ConditionalFact]
     public async Task CanSendAndReceieveData()
     {
-        var cws = new ClientWebSocket();
-        await cws.ConnectAsync(new Uri(_webSocketUri + "WebSocketEcho"), default);
+        var webSocketUri = Fixture.DeploymentResult.ApplicationBaseUri;
+        webSocketUri = webSocketUri.Replace("http:", "ws:");
+
+        using var cws = new ClientWebSocket();
+        await cws.ConnectAsync(new Uri(webSocketUri + "WebSocketEcho"), default);
 
         for (int i = 0; i < 1000; i++)
         {
@@ -80,10 +101,33 @@ public async Task CanSendAndReceieveData()
         }
     }
 
+    [ConditionalFact]
+    public async Task AttemptCompressionWorks()
+    {
+        var webSocketUri = Fixture.DeploymentResult.ApplicationBaseUri;
+        webSocketUri = webSocketUri.Replace("http:", "ws:");
+
+        using var cws = new ClientWebSocket();
+        cws.Options.DangerousDeflateOptions = new WebSocketDeflateOptions();
+        await cws.ConnectAsync(new Uri(webSocketUri + "WebSocketAllowCompression"), default);
+
+        // Compression doesn't work with OutOfProcess, let's make sure the websocket extensions aren't forwarded and the connection still works
+        var expected = Fixture.DeploymentParameters.HostingModel == HostingModel.InProcess
+            ? "permessage-deflate; client_max_window_bits=15" : "None";
+        await ReceiveMessage(cws, expected);
+
+        for (int i = 0; i < 1000; i++)
+        {
+            var message = i.ToString(CultureInfo.InvariantCulture);
+            await SendMessage(cws, message);
+            await ReceiveMessage(cws, message);
+        }
+    }
+
     [ConditionalFact]
     public async Task Http1_0_Request_NotUpgradable()
     {
-        Uri uri = new Uri(_requestUri + "WebSocketNotUpgradable");
+        Uri uri = new Uri(Fixture.DeploymentResult.ApplicationBaseUri + "WebSocketNotUpgradable");
         using TcpClient client = new TcpClient();
 
         await client.ConnectAsync(uri.Host, uri.Port);
@@ -103,7 +147,7 @@ public async Task Http1_0_Request_NotUpgradable()
     [ConditionalFact]
     public async Task Http1_0_Request_UpgradeErrors()
     {
-        Uri uri = new Uri(_requestUri + "WebSocketUpgradeFails");
+        Uri uri = new Uri(Fixture.DeploymentResult.ApplicationBaseUri + "WebSocketUpgradeFails");
         using TcpClient client = new TcpClient();
 
         await client.ConnectAsync(uri.Host, uri.Port);
@@ -148,6 +192,7 @@ private async Task SendMessage(ClientWebSocket webSocket, string message)
 
     private async Task ReceiveMessage(ClientWebSocket webSocket, string expectedMessage)
     {
+        Debug.Assert(expectedMessage.Length > 0);
         var received = new byte[expectedMessage.Length];
 
         var offset = 0;
@@ -156,7 +201,7 @@ private async Task ReceiveMessage(ClientWebSocket webSocket, string expectedMess
         {
             result = await webSocket.ReceiveAsync(new ArraySegment<byte>(received, offset, received.Length - offset), default);
             offset += result.Count;
-        } while (!result.EndOfMessage);
+        } while (!result.EndOfMessage && result.CloseStatus is null && received.Length - offset > 0);
 
         Assert.Equal(expectedMessage, Encoding.ASCII.GetString(received));
     }
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
index 4de20bac69c3..debc28a9ec42 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Net;
 using System.Net.Http;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
@@ -26,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class WindowsAuthTests : IISFunctionalTestBase
 {
     public WindowsAuthTests(PublishedSitesFixture fixture) : base(fixture)
@@ -58,4 +59,51 @@ public async Task WindowsAuthTest(TestVariant variant)
         Assert.StartsWith("Windows:", responseText);
         Assert.Contains(Environment.UserName, responseText);
     }
+
+    [ConditionalTheory]
+    [RequiresIIS(IISCapability.WindowsAuthentication)]
+    [MemberData(nameof(TestVariants))]
+    public async Task WindowsAuthWithImpersonationLevelTest(TestVariant variant)
+    {
+        var deploymentParameters = Fixture.GetBaseDeploymentParameters(variant);
+        deploymentParameters.SetAnonymousAuth(enabled: false);
+        deploymentParameters.SetWindowsAuth();
+
+        // The default in hosting sets windows auth to true.
+        var deploymentResult = await DeployAsync(deploymentParameters);
+
+        var impersonationLevels = new TokenImpersonationLevel[]
+            {
+                TokenImpersonationLevel.None,
+                TokenImpersonationLevel.Identification,
+                TokenImpersonationLevel.Impersonation,
+                TokenImpersonationLevel.Delegation,
+                TokenImpersonationLevel.Anonymous
+            };
+
+        foreach (var impersonationLevel in impersonationLevels)
+        {
+            // TokenImpersonationLevel is not supported by HttpClient so we need to use HttpWebRequest to test it.
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
+            var request = HttpWebRequest.CreateHttp($"{deploymentResult.HttpClient.BaseAddress}Auth");
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
+            request.ImpersonationLevel = impersonationLevel;
+            request.Method = "GET";
+            request.UseDefaultCredentials = true;
+
+            using var response = request.GetResponse();
+            using var reader = new StreamReader(response.GetResponseStream());
+            var responseText = await reader.ReadToEndAsync();
+
+            try
+            {
+                Assert.StartsWith("Windows:", responseText);
+                Assert.Contains(Environment.UserName, responseText);
+            }
+            catch (Exception ex)
+            {
+                Assert.Fail($"'TokenImpersonationLevel.{impersonationLevel}' failed with: {ex.Message}");
+            }
+        }
+    }
 }
diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs
index d5d241ba3be9..2ada4fc57d9c 100644
--- a/src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs
@@ -27,7 +27,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 // Contains all tests related to shutdown, including app_offline, abort, and app recycle
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ShutdownTests : IISFunctionalTestBase
 {
     public ShutdownTests(PublishedSitesFixture fixture) : base(fixture)
@@ -390,7 +389,6 @@ public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks_O
     }
 
     [ConditionalFact]
-    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
     [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
     public async Task AppOfflineAddedAndRemovedStress_InProcess()
     {
@@ -560,7 +558,6 @@ public async Task OutOfProcessToInProcessHostingModelSwitchWorks()
     }
 
     [ConditionalFact]
-    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
     public async Task ConfigurationTouchedStress_InProcess()
     {
         await ConfigurationTouchedStress(HostingModel.InProcess);
@@ -640,7 +637,7 @@ public async Task ClosesConnectionOnServerAbortInProcess()
             var deploymentResult = await DeployAsync(deploymentParameters);
             var response = await deploymentResult.HttpClient.GetAsync("/Abort").TimeoutAfter(TimeoutExtensions.DefaultTimeoutValue);
 
-            Assert.True(false, "Should not reach here");
+            Assert.Fail("Should not reach here");
         }
         catch (HttpRequestException)
         {
diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs
index 94330d603342..98830f5921ab 100644
--- a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs
@@ -31,7 +31,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 // Contains all tests related to Startup, requiring starting ANCM/IIS every time.
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
 public class StartupTests : IISFunctionalTestBase
 {
     public StartupTests(PublishedSitesFixture fixture) : base(fixture)
@@ -703,6 +702,7 @@ public static Dictionary<string, Func<IISDeploymentParameters, string>> InitStan
 
     [ConditionalFact]
     [RequiresNewHandler]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62802")]
     public async Task SetCurrentDirectoryHandlerSettingWorks()
     {
         var deploymentParameters = Fixture.GetBaseDeploymentParameters();
@@ -1010,6 +1010,7 @@ public async Task CheckStdoutWithLargeWrites_TestSink(string mode)
     }
 
     [ConditionalTheory]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/58108")]
     [InlineData("CheckLargeStdOutWrites")]
     [InlineData("CheckOversizedStdOutWrites")]
     public async Task CheckStdoutWithLargeWrites_LogFile(string mode)
@@ -1297,7 +1298,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM
     [ConditionalFact]
     [RequiresNewHandler]
     [RequiresNewShim]
-    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/62787", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
     public async Task ServerAddressesIncludesBaseAddress()
     {
         var appName = "\u041C\u043E\u0451\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435";
diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http2TrailersResetTests.cs b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http2TrailersResetTests.cs
index 5b6502b7489c..49c92f200551 100644
--- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http2TrailersResetTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http2TrailersResetTests.cs
@@ -26,7 +26,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 /// on IIS Express even on the new Windows versions because IIS Express has its own outdated copy of IIS.
 /// </summary>
 [Collection(IISHttpsTestSiteCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class Http2TrailerResetTests : FunctionalTestsBase
 {
     private const string WindowsVersionForTrailers = "10.0.20238";
@@ -399,6 +398,7 @@ public async Task Reset_BeforeRequestBody_Resets()
     [ConditionalFact]
     [RequiresNewHandler]
     [MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61056")]
     public async Task Reset_DuringRequestBody_Resets()
     {
         await new HostBuilder()
diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http3Tests.cs b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http3Tests.cs
index 382bb9f766e2..bab4227043c3 100644
--- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http3Tests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/Http3Tests.cs
@@ -27,7 +27,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 [MsQuicSupported]
 [HttpSysHttp3Supported]
 [Collection(IISHttpsTestSiteCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class Http3Tests : FunctionalTestsBase
 {
     public Http3Tests(IISTestSiteFixture fixture)
diff --git a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs
index 2f189cc3b686..706079c9f3f2 100644
--- a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs
@@ -12,7 +12,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.NewHandler.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class NewHandlerTests : IISFunctionalTestBase
 {
     public NewHandlerTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/NewShimTests.cs b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/NewShimTests.cs
index 724549c228ec..8a1cae5a4236 100644
--- a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/NewShimTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/NewShimTests.cs
@@ -10,7 +10,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.NewShim.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class NewShimTests : IISFunctionalTestBase
 {
     public NewShimTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/IIS.ShadowCopy.Tests/ShadowCopyTests.cs b/src/Servers/IIS/IIS/test/IIS.ShadowCopy.Tests/ShadowCopyTests.cs
index 0a1e93054413..386579b54b18 100644
--- a/src/Servers/IIS/IIS/test/IIS.ShadowCopy.Tests/ShadowCopyTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.ShadowCopy.Tests/ShadowCopyTests.cs
@@ -7,7 +7,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ShadowCopyTests : IISFunctionalTestBase
 {
     public ShadowCopyTests(PublishedSitesFixture fixture) : base(fixture)
@@ -235,6 +234,7 @@ public async Task ShadowCopyE2EWorksWithOldFoldersPresent()
     }
 
     [ConditionalFact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/58106")]
     public async Task ShadowCopyCleansUpOlderFolders()
     {
         using var directory = TempDirectory.Create();
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs
index 2a8f62afd5d4..30964fd23768 100644
--- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ApplicationInitializationTests : IISFunctionalTestBase
 {
     public ApplicationInitializationTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
index 704f7fd87f5c..805d9451da39 100644
--- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs
@@ -25,7 +25,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 #endif
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class StdOutRedirectionTests : IISFunctionalTestBase
 {
     public StdOutRedirectionTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
index eace234e8f98..71121304fb4f 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
@@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ClientDisconnectTests : StrictTestServerTests
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
index 25133e69b391..6bdb0f61b733 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
@@ -10,7 +10,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ConnectionIdFeatureTests : StrictTestServerTests
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
index 236d48818770..842ae4b82cd5 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
@@ -11,7 +11,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class HttpBodyControlFeatureTests : StrictTestServerTests
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
index cf1467da3aa2..db1558e04b10 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
@@ -21,7 +21,6 @@
     <Reference Include="Microsoft.AspNetCore.Server.IIS" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="System.Diagnostics.EventLog" />
-    <Reference Include="System.Private.Uri" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
index a84fc7560718..0a1a8d9b1b0e 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
@@ -18,7 +18,6 @@ namespace IIS.Tests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class MaxRequestBodySizeTests : LoggedTest
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
index 2bbf13eefbd9..22f7ae324005 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ResponseAbortTests : StrictTestServerTests
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseBodySizeTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseBodySizeTests.cs
index 0314fbe97d5a..ee8edbb8a2b3 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseBodySizeTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseBodySizeTests.cs
@@ -8,7 +8,6 @@ namespace IIS.Tests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class ResponseBodySizeTests : LoggedTest
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
index d8dbae449b4b..5106a1344ca5 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
@@ -11,7 +11,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class TestServerTest : StrictTestServerTests
 {
     [ConditionalFact]
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/TlsHandshakeFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/TlsHandshakeFeatureTests.cs
index 9f42714edbbb..7be0fbe6b98d 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/TlsHandshakeFeatureTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/TlsHandshakeFeatureTests.cs
@@ -10,7 +10,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 
 [SkipIfHostableWebCoreNotAvailable]
 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "https://github.com/aspnet/IISIntegration/issues/866")]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class TlsHandshakeFeatureTests : StrictTestServerTests
 {
     [ConditionalFact]
@@ -33,6 +32,7 @@ public async Task SetsTlsHandshakeFeatureForHttps()
         Assert.True(protocol > SslProtocols.None, "Protocol: " + protocol);
         Assert.True(Enum.IsDefined(typeof(SslProtocols), protocol), "Defined: " + protocol); // Mapping is required, make sure it's current
 
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
         var cipherAlgorithm = tlsHandshakeFeature.CipherAlgorithm;
         Assert.True(cipherAlgorithm > CipherAlgorithmType.Null, "Cipher: " + cipherAlgorithm);
 
@@ -50,6 +50,7 @@ public async Task SetsTlsHandshakeFeatureForHttps()
 
         var keyExchangeStrength = tlsHandshakeFeature.KeyExchangeStrength;
         Assert.True(keyExchangeStrength >= 0, "KeyExchangeStrength: " + keyExchangeStrength);
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
         if (Environment.OSVersion.Version > new Version(10, 0, 19043, 0))
         {
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
index 15ad8db11a2f..f34f4f9e7cee 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
@@ -11,7 +11,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Server.IIS" />
     <ProjectReference Include="..\testassets\IIS.Common.TestLib\IIS.Common.TestLib.csproj" />
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs
index 6bc3892713a4..c77ed72d6b2b 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs
@@ -11,7 +11,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class AppOfflineIISExpressTests : IISFunctionalTestBase
 {
     public AppOfflineIISExpressTests(PublishedSitesFixture fixture) : base(fixture)
@@ -19,6 +18,7 @@ public AppOfflineIISExpressTests(PublishedSitesFixture fixture) : base(fixture)
     }
 
     [ConditionalFact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60482")]
     public async Task AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess()
     {
         // This test often hits a race between debug logging and stdout redirection closing the handle
@@ -55,8 +55,8 @@ public async Task AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess()
                 {
                     // For IISExpress, we need to catch the exception because IISExpress will not restart a process if it crashed.
                     // RemoveAppOffline will fail due to a bad request exception as the server is down.
-                    Assert.Contains(TestSink.Writes, context => context.Message.Contains("Drained all requests, notifying managed."));
                     deploymentResult.AssertWorkerProcessStop();
+                    Assert.Contains(TestSink.Writes, context => context.Message.Contains("Drained all requests, notifying managed."));
                     return;
                 }
             }
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
index 8c21d2f9a70a..fdcfa289338a 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
@@ -45,7 +45,6 @@ public async Task ServerShutsDownWhenMainExits()
     }
 
     [ConditionalFact]
-    [SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
     public async Task ServerShutsDownWhenMainExitsStress()
     {
         var parameters = Fixture.GetBaseDeploymentParameters();
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
index 17b6bd47d615..d7cb1d2c1111 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
@@ -15,7 +15,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class MultipleAppTests : IISFunctionalTestBase
 {
     public MultipleAppTests(PublishedSitesFixture fixture) : base(fixture)
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
index a6f73b467cb0..9e42f41adf13 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
@@ -15,7 +15,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class NtlmAuthenticationTests : IISFunctionalTestBase
 {
     // Test only runs on IISExpress today as our CI machines do not have
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
index cdc9c8194854..202bb791d89c 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
@@ -14,7 +14,6 @@
 namespace Microsoft.AspNetCore.Server.IIS.IISExpress.FunctionalTests;
 
 [Collection(PublishedSitesCollection.Name)]
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class UpgradeFeatureDetectionTests : IISFunctionalTestBase
 {
     private readonly string _isWebsocketsSupported = Environment.OSVersion.Version >= new Version(6, 2) ? "Enabled" : "Disabled";
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
index 16aeeb34a989..f358dd93534e 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
@@ -59,12 +59,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" >
       <AllowExplicitReference>true</AllowExplicitReference>
     </PackageReference>
-    <PackageReference Include="System.Private.Uri" Version="4.3.2" >
-      <AllowExplicitReference>true</AllowExplicitReference>
-    </PackageReference>
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" >
-      <AllowExplicitReference>true</AllowExplicitReference>
-    </PackageReference>
     <Reference Include="xunit.assert" />
   </ItemGroup>
 </Project>
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
index 4fdccefc70e8..658f4c3f9b58 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
@@ -28,12 +28,12 @@
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
+    <Reference Include="Microsoft.AspNetCore.WebSockets" />
     <Reference Include="Microsoft.AspNetCore.WebUtilities" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
-    <Reference Include="System.Private.Uri" />
     <Reference Include="xunit.assert" />
   </ItemGroup>
 </Project>
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs
index 8ae69750afc0..bf867cf99d28 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs
@@ -56,10 +56,14 @@ public static int Main(string[] args)
                 return 12;
             case "HangOnStop":
                 {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
                     var host = new WebHostBuilder()
                         .UseIIS()
                         .UseStartup<Startup>()
                         .Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
                     host.Run();
 
                     Thread.Sleep(Timeout.Infinite);
@@ -67,11 +71,15 @@ public static int Main(string[] args)
                 break;
             case "IncreaseShutdownLimit":
                 {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
                     var host = new WebHostBuilder()
                         .UseIIS()
                         .UseShutdownTimeout(TimeSpan.FromSeconds(120))
                         .UseStartup<Startup>()
                         .Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
                     host.Run();
                 }
@@ -94,11 +102,15 @@ public static int Main(string[] args)
                 return 0;
             case "OverriddenServer":
                 {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
                     var host = new WebHostBuilder()
                             .UseIIS()
                             .ConfigureServices(services => services.AddSingleton<IServer, DummyServer>())
                             .Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); }))
                             .Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
                     host.Run();
                 }
                 break;
@@ -111,6 +123,8 @@ public static int Main(string[] args)
 #if !FORWARDCOMPAT
             case "DecreaseRequestLimit":
                 {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
                     var host = new WebHostBuilder()
                         .ConfigureLogging((_, factory) =>
                         {
@@ -124,6 +138,8 @@ public static int Main(string[] args)
                         })
                         .UseStartup<Startup>()
                         .Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
                     host.Run();
                     break;
@@ -131,6 +147,8 @@ public static int Main(string[] args)
 #endif
             case "ThrowInStartup":
                 {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
                     var host = new WebHostBuilder()
                                     .ConfigureLogging((_, factory) =>
                                     {
@@ -140,6 +158,8 @@ public static int Main(string[] args)
                                     .UseIIS()
                                     .UseStartup<ThrowingStartup>()
                                     .Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
                     host.Run();
                 }
@@ -189,6 +209,8 @@ public static int Main(string[] args)
 
     private static int StartServer()
     {
+#pragma warning disable ASPDEPR004 // Type or member is obsolete
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
         var host = new WebHostBuilder()
             .ConfigureLogging((_, factory) =>
             {
@@ -200,6 +222,8 @@ private static int StartServer()
             .UseIISIntegration()
             .UseStartup<Startup>()
             .Build();
+#pragma warning restore ASPDEPR008 // Type or member is obsolete
+#pragma warning restore ASPDEPR004 // Type or member is obsolete
 
         host.Run();
         return 0;
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
index d0750ef81fd4..c7d502039f55 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Net.WebSockets;
 using System.Text;
@@ -50,6 +51,8 @@ private void WebSocketReadBeforeUpgrade(IApplicationBuilder app)
 
             var ws = await Upgrade(context);
             await SendMessages(ws, "Yay");
+
+            await CloseWebSocket(ws, false);
         });
     }
 
@@ -85,6 +88,8 @@ private void WebSocketLifetimeEvents(IApplicationBuilder app)
             messages.Add("Upgraded");
 
             await SendMessages(ws, messages.ToArray());
+
+            await CloseWebSocket(ws, false);
         });
     }
 
@@ -94,10 +99,38 @@ private void WebSocketUpgradeFails(IApplicationBuilder app)
         {
             var upgradeFeature = context.Features.Get<IHttpUpgradeFeature>();
             var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => upgradeFeature.UpgradeAsync());
-            Assert.Equal("Upgrade requires HTTP/1.1.", ex.Message);
+            if (ex.Message != "Upgrade requires HTTP/1.1."
+                && ex.Message != "Cannot upgrade a non-upgradable request. Check IHttpUpgradeFeature.IsUpgradableRequest to determine if a request can be upgraded.")
+            {
+                throw new InvalidOperationException("Unexpected error from UpgradeAsync.");
+            }
         });
     }
 
+#if !FORWARDCOMPAT
+    private void WebSocketAllowCompression(IApplicationBuilder app)
+    {
+        app.Run(async context =>
+        {
+            var ws = await context.WebSockets.AcceptWebSocketAsync(new WebSocketAcceptContext()
+            {
+                DangerousEnableCompression = true
+            });
+
+            var appLifetime = app.ApplicationServices.GetRequiredService<IHostApplicationLifetime>();
+
+            var extensionsHeader = context.Response.Headers.SecWebSocketExtensions.ToString();
+            if (extensionsHeader.Length == 0)
+            {
+                extensionsHeader = "None";
+            }
+            await ws.SendAsync(Encoding.ASCII.GetBytes(extensionsHeader), WebSocketMessageType.Text, endOfMessage: true, default);
+            using var cts = CancellationTokenSource.CreateLinkedTokenSource(appLifetime.ApplicationStopping, context.RequestAborted);
+            await Echo(ws, cts.Token);
+        });
+    }
+#endif
+
     private static async Task SendMessages(WebSocket webSocket, params string[] messages)
     {
         foreach (var message in messages)
@@ -157,17 +190,30 @@ private async Task Echo(WebSocket webSocket, CancellationToken token)
         }
         else
         {
-            // Server-initiated close handshake due to either of the two conditions:
-            // (1) The applicaton host is performing a graceful shutdown.
-            // (2) The client sent "CloseFromServer" text message to request the server to close (a test scenario).
-            await webSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, closeFromServerCmd, CancellationToken.None);
-
-            // The server has sent the Close frame.
-            // Stop sending but keep receiving until we get the Close frame from the client.
-            while (!result.CloseStatus.HasValue)
-            {
-                result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
-            }
+            await CloseWebSocket(webSocket, false);
+        }
+    }
+
+    private async Task CloseWebSocket(WebSocket webSocket, bool receivedClose)
+    {
+        // Server-initiated close handshake due to either of the two conditions:
+        // (1) The applicaton host is performing a graceful shutdown.
+        // (2) The client sent "CloseFromServer" text message to request the server to close (a test scenario).
+        await webSocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "CloseFromServer", CancellationToken.None);
+
+        if (receivedClose)
+        {
+            return;
+        }
+
+        // The server has sent the Close frame.
+        // Stop sending but keep receiving until we get the Close frame from the client.
+        WebSocketReceiveResult result;
+        var buffer = new byte[100];
+        do
+        {
+            result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
         }
+        while (!result.CloseStatus.HasValue);
     }
 }
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
index fba1940f881e..7588f67559ea 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs
@@ -2,14 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
@@ -44,6 +40,11 @@ public void Configure(IApplicationBuilder app, IHttpContextAccessor httpContextA
         {
             app.UseHttpsRedirection();
         }
+
+#if !FORWARDCOMPAT
+        app.UseWebSockets();
+#endif
+
         TestStartup.Register(app, this);
         _httpContextAccessor = httpContextAccessor;
     }
diff --git a/src/Servers/IIS/IISIntegration.slnf b/src/Servers/IIS/IISIntegration.slnf
index db899fc491a9..1b1ba688e9cb 100644
--- a/src/Servers/IIS/IISIntegration.slnf
+++ b/src/Servers/IIS/IISIntegration.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
@@ -20,6 +20,7 @@
       "src\\Middleware\\HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
       "src\\Middleware\\HttpsPolicy\\src\\Microsoft.AspNetCore.HttpsPolicy.csproj",
       "src\\Middleware\\ResponseCompression\\src\\Microsoft.AspNetCore.ResponseCompression.csproj",
+      "src\\Middleware\\WebSockets\\src\\Microsoft.AspNetCore.WebSockets.csproj",
       "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
       "src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj",
@@ -39,10 +40,10 @@
       "src\\Servers\\IIS\\IIS\\samples\\NativeIISSample\\NativeIISSample.csproj",
       "src\\Servers\\IIS\\IIS\\src\\Microsoft.AspNetCore.Server.IIS.csproj",
       "src\\Servers\\IIS\\IIS\\test\\IIS.FunctionalTests\\IIS.FunctionalTests.csproj",
+      "src\\Servers\\IIS\\IIS\\test\\IIS.LongTests\\IIS.LongTests.csproj",
       "src\\Servers\\IIS\\IIS\\test\\IIS.NewHandler.FunctionalTests\\IIS.NewHandler.FunctionalTests.csproj",
       "src\\Servers\\IIS\\IIS\\test\\IIS.NewShim.FunctionalTests\\IIS.NewShim.FunctionalTests.csproj",
       "src\\Servers\\IIS\\IIS\\test\\IIS.ShadowCopy.Tests\\IIS.ShadowCopy.Tests.csproj",
-      "src\\Servers\\IIS\\IIS\\test\\IIS.LongTests\\IIS.LongTests.csproj",
       "src\\Servers\\IIS\\IIS\\test\\IIS.Tests\\IIS.Tests.csproj",
       "src\\Servers\\IIS\\IIS\\test\\IISExpress.FunctionalTests\\IISExpress.FunctionalTests.csproj",
       "src\\Servers\\IIS\\IIS\\test\\testassets\\IIS.Common.TestLib\\IIS.Common.TestLib.csproj",
diff --git a/src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs b/src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs
index f7e59f5233a7..153f225b4e8a 100644
--- a/src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs
+++ b/src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs
@@ -12,7 +12,6 @@
 
 namespace Microsoft.AspNetCore.Server.IISIntegration;
 
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class IISExtensionTests
 {
     [Fact]
diff --git a/src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs b/src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs
index fec4de45e213..99b606de6ee6 100644
--- a/src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs
+++ b/src/Servers/IIS/IISIntegration/test/Tests/IISMiddlewareTests.cs
@@ -18,7 +18,6 @@
 
 namespace Microsoft.AspNetCore.Server.IISIntegration;
 
-[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
 public class IISMiddlewareTests
 {
     [Fact]
diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index e5f49181de20..c6beee133ff7 100644
--- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -70,8 +70,6 @@
 
     <Reference Include="Microsoft.NETCore.Windows.ApiSets" />
     <Reference Include="Microsoft.Web.Administration" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Security.Cryptography.X509Certificates" />
     <Reference Include="System.ServiceProcess.ServiceController" />
   </ItemGroup>
 
diff --git a/src/Servers/IIS/build/Build.Common.Settings b/src/Servers/IIS/build/Build.Common.Settings
index 196e069eafa4..cebc071c6d4c 100644
--- a/src/Servers/IIS/build/Build.Common.Settings
+++ b/src/Servers/IIS/build/Build.Common.Settings
@@ -32,6 +32,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
 
+  <PropertyGroup>
+     <CodeAnalysisRuleSet>..\DefaultRules.ruleset</CodeAnalysisRuleSet>
+     <RunCodeAnalysis Condition="'$(VCToolsRedistVersion)' != '' AND '$(VCToolsRedistVersion)' >= 14.15.26706">true</RunCodeAnalysis>
+     <EnablePREfast>$(RunCodeAnalysis)</EnablePREfast>
+   </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/src/Servers/IIS/build/Build.Lib.Settings b/src/Servers/IIS/build/Build.Lib.Settings
index 0dcba8c2011a..9327eb363771 100644
--- a/src/Servers/IIS/build/Build.Lib.Settings
+++ b/src/Servers/IIS/build/Build.Lib.Settings
@@ -9,7 +9,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <SDLCheck>false</SDLCheck>
+      <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
diff --git a/src/Servers/Kestrel/Core/src/CoreStrings.resx b/src/Servers/Kestrel/Core/src/CoreStrings.resx
index 7f6c785963f6..c6fb576b6011 100644
--- a/src/Servers/Kestrel/Core/src/CoreStrings.resx
+++ b/src/Servers/Kestrel/Core/src/CoreStrings.resx
@@ -737,4 +737,10 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l
   <data name="NeedHttpsConfigurationToBindHttpsAddresses" xml:space="preserve">
     <value>Call UseKestrelHttpsConfiguration() on IWebHostBuilder to automatically enable HTTPS when an https:// address is used.</value>
   </data>
-</root>
+  <data name="Http3ControlStreamFrameTooLarge" xml:space="preserve">
+    <value>The client sent a {frameType} frame to a control stream that was too large.</value>
+  </data>
+  <data name="BadRequest_BadChunkExtension" xml:space="preserve">
+    <value>Bad chunk extension.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Servers/Kestrel/Core/src/Http2Limits.cs b/src/Servers/Kestrel/Core/src/Http2Limits.cs
index 63bcaf6f22d5..a96cde651c26 100644
--- a/src/Servers/Kestrel/Core/src/Http2Limits.cs
+++ b/src/Servers/Kestrel/Core/src/Http2Limits.cs
@@ -84,7 +84,7 @@ public int MaxFrameSize
     /// <summary>
     /// Indicates the size of the maximum allowed size of a request header field sequence, in octets. This limit applies to both name and value sequences in their compressed and uncompressed representations.
     /// <para>
-    /// Value must be greater than 0, defaults to 2^14 octets (16 KiB).
+    /// Value must be greater than 0, defaults to 2^15 octets (32 KiB).
     /// </para>
     /// </summary>
     public int MaxRequestHeaderFieldSize
diff --git a/src/Servers/Kestrel/Core/src/Http3Limits.cs b/src/Servers/Kestrel/Core/src/Http3Limits.cs
index 0d7801e48bf8..b6556557a340 100644
--- a/src/Servers/Kestrel/Core/src/Http3Limits.cs
+++ b/src/Servers/Kestrel/Core/src/Http3Limits.cs
@@ -37,7 +37,7 @@ internal int HeaderTableSize
     /// <summary>
     /// Indicates the size of the maximum allowed size of a request header field sequence. This limit applies to both name and value sequences in their compressed and uncompressed representations.
     /// <para>
-    /// Value must be greater than 0, defaults to 2^14 (16,384).
+    /// Value must be greater than 0, defaults to 2^15 (32,768).
     /// </para>
     /// </summary>
     public int MaxRequestHeaderFieldSize
diff --git a/src/Servers/Kestrel/Core/src/HttpsConnectionAdapterOptions.cs b/src/Servers/Kestrel/Core/src/HttpsConnectionAdapterOptions.cs
index f13540fa579c..4fad083d87c3 100644
--- a/src/Servers/Kestrel/Core/src/HttpsConnectionAdapterOptions.cs
+++ b/src/Servers/Kestrel/Core/src/HttpsConnectionAdapterOptions.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
@@ -96,6 +97,14 @@ public void AllowAnyClientCertificate()
     /// </summary>
     public Action<ConnectionContext, SslServerAuthenticationOptions>? OnAuthenticate { get; set; }
 
+    /// <summary>
+    /// A callback to be invoked to get the TLS client hello bytes.
+    /// Null by default.
+    /// If you want to store the bytes from the <see cref="System.Buffers.ReadOnlySequence{T}"/>, 
+    /// copy them into a buffer that you control rather than keeping a reference to the <see cref="ReadOnlySequence{T}"/> or <see cref="ReadOnlyMemory{T}"/> instances.
+    /// </summary>
+    public Action<ConnectionContext, ReadOnlySequence<byte>>? TlsClientHelloBytesCallback { get; set; }
+
     /// <summary>
     /// Specifies the maximum amount of time allowed for the TLS/SSL handshake. This must be positive
     /// or <see cref="Timeout.InfiniteTimeSpan"/>. Defaults to 10 seconds.
diff --git a/src/Servers/Kestrel/Core/src/IHttpsConfigurationService.cs b/src/Servers/Kestrel/Core/src/IHttpsConfigurationService.cs
index 7e5a955719fd..171b6a3a86fd 100644
--- a/src/Servers/Kestrel/Core/src/IHttpsConfigurationService.cs
+++ b/src/Servers/Kestrel/Core/src/IHttpsConfigurationService.cs
@@ -90,11 +90,21 @@ void ApplyHttpsConfiguration(
 internal readonly struct CertificateAndConfig
 {
     public readonly X509Certificate2 Certificate;
+    public readonly X509Certificate2Collection CertificateChain;
     public readonly CertificateConfig CertificateConfig;
 
     public CertificateAndConfig(X509Certificate2 certificate, CertificateConfig certificateConfig)
+        : this(
+            certificate,
+            certificateConfig,
+            [])
+    {
+    }
+
+    public CertificateAndConfig(X509Certificate2 certificate, CertificateConfig certificateConfig, X509Certificate2Collection certificateChain)
     {
         Certificate = certificate;
         CertificateConfig = certificateConfig;
+        CertificateChain = certificateChain;
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/AddressBinder.cs b/src/Servers/Kestrel/Core/src/Internal/AddressBinder.cs
index 2a40aad37b91..f892c9796c15 100644
--- a/src/Servers/Kestrel/Core/src/Internal/AddressBinder.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/AddressBinder.cs
@@ -125,10 +125,10 @@ internal static ListenOptions ParseAddress(string address, out bool https)
         {
             options = new ListenOptions(new NamedPipeEndPoint(parsedAddress.NamedPipeName));
         }
-        else if (string.Equals(parsedAddress.Host, "localhost", StringComparison.OrdinalIgnoreCase))
+        else if (IsLocalhost(parsedAddress.Host, out var prefix))
         {
             // "localhost" for both IPv4 and IPv6 can't be represented as an IPEndPoint.
-            options = new LocalhostListenOptions(parsedAddress.Port);
+            options = prefix is null ? new LocalhostListenOptions(parsedAddress.Port) : new LocalhostListenOptions(parsedAddress.Port, prefix);
         }
         else if (TryCreateIPEndPoint(parsedAddress, out var endpoint))
         {
@@ -141,6 +141,28 @@ internal static ListenOptions ParseAddress(string address, out bool https)
         }
 
         return options;
+
+        static bool IsLocalhost(string host, out string? prefix)
+        {
+            // Check for "localhost"
+            if (string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase))
+            {
+                prefix = null;
+                return true;
+            }
+
+            // Check for use of .localhost TLD (Top Level Domain)
+            const string localhostTld = ".localhost";
+            if (host.Length > localhostTld.Length && host.EndsWith(localhostTld, StringComparison.OrdinalIgnoreCase))
+            {
+                // Take all but the .localhost TLD as the prefix
+                prefix = host[..^localhostTld.Length];
+                return true;
+            }
+
+            prefix = null;
+            return false;
+        }
     }
 
     private interface IStrategy
diff --git a/src/Servers/Kestrel/Core/src/Internal/CertificatePathWatcher.cs b/src/Servers/Kestrel/Core/src/Internal/CertificatePathWatcher.cs
index 052255e1a343..73e956c585f9 100644
--- a/src/Servers/Kestrel/Core/src/Internal/CertificatePathWatcher.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/CertificatePathWatcher.cs
@@ -17,7 +17,7 @@ internal sealed partial class CertificatePathWatcher : IDisposable
     private readonly string _contentRootDir;
     private readonly ILogger<CertificatePathWatcher> _logger;
 
-    private readonly object _metadataLock = new();
+    private readonly Lock _metadataLock = new();
 
     /// <remarks>Acquire <see cref="_metadataLock"/> before accessing.</remarks>
     private readonly Dictionary<string, DirectoryWatchMetadata> _metadataForDirectory = new();
diff --git a/src/Servers/Kestrel/Core/src/Internal/Certificates/CertificateConfigLoader.cs b/src/Servers/Kestrel/Core/src/Internal/Certificates/CertificateConfigLoader.cs
index d0239122fcde..8d2f25a336e0 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Certificates/CertificateConfigLoader.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Certificates/CertificateConfigLoader.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
@@ -96,6 +97,42 @@ private static X509Certificate2 LoadCertificateKey(X509Certificate2 certificate,
         const string DSAOid = "1.2.840.10040.4.1";
         const string ECDsaOid = "1.2.840.10045.2.1";
 
+        const string MLDsa44Oid = "2.16.840.1.101.3.4.3.17";
+        const string MLDsa65Oid = "2.16.840.1.101.3.4.3.18";
+        const string MLDsa87Oid = "2.16.840.1.101.3.4.3.19";
+
+        const string SlhDsaSha2_128sOid = "2.16.840.1.101.3.4.3.20";
+        const string SlhDsaSha2_128fOid = "2.16.840.1.101.3.4.3.21";
+        const string SlhDsaSha2_192sOid = "2.16.840.1.101.3.4.3.22";
+        const string SlhDsaSha2_192fOid = "2.16.840.1.101.3.4.3.23";
+        const string SlhDsaSha2_256sOid = "2.16.840.1.101.3.4.3.24";
+        const string SlhDsaSha2_256fOid = "2.16.840.1.101.3.4.3.25";
+        const string SlhDsaShake_128sOid = "2.16.840.1.101.3.4.3.26";
+        const string SlhDsaShake_128fOid = "2.16.840.1.101.3.4.3.27";
+        const string SlhDsaShake_192sOid = "2.16.840.1.101.3.4.3.28";
+        const string SlhDsaShake_192fOid = "2.16.840.1.101.3.4.3.29";
+        const string SlhDsaShake_256sOid = "2.16.840.1.101.3.4.3.30";
+        const string SlhDsaShake_256fOid = "2.16.840.1.101.3.4.3.31";
+
+        const string MLDsa44WithRSA2048PssPreHashSha256Oid = "2.16.840.1.114027.80.9.1.0";
+        const string MLDsa44WithRSA2048Pkcs15PreHashSha256Oid = "2.16.840.1.114027.80.9.1.1";
+        const string MLDsa44WithEd25519PreHashSha512Oid = "2.16.840.1.114027.80.9.1.2";
+        const string MLDsa44WithECDsaP256PreHashSha256Oid = "2.16.840.1.114027.80.9.1.3";
+        const string MLDsa65WithRSA3072PssPreHashSha512Oid = "2.16.840.1.114027.80.9.1.4";
+        const string MLDsa65WithRSA3072Pkcs15PreHashSha512Oid = "2.16.840.1.114027.80.9.1.5";
+        const string MLDsa65WithRSA4096PssPreHashSha512Oid = "2.16.840.1.114027.80.9.1.6";
+        const string MLDsa65WithRSA4096Pkcs15PreHashSha512Oid = "2.16.840.1.114027.80.9.1.7";
+        const string MLDsa65WithECDsaP256PreHashSha512Oid = "2.16.840.1.114027.80.9.1.8";
+        const string MLDsa65WithECDsaP384PreHashSha512Oid = "2.16.840.1.114027.80.9.1.9";
+        const string MLDsa65WithECDsaBrainpoolP256r1PreHashSha512Oid = "2.16.840.1.114027.80.9.1.10";
+        const string MLDsa65WithEd25519PreHashSha512Oid = "2.16.840.1.114027.80.9.1.11";
+        const string MLDsa87WithECDsaP384PreHashSha512Oid = "2.16.840.1.114027.80.9.1.12";
+        const string MLDsa87WithECDsaBrainpoolP384r1PreHashSha512Oid = "2.16.840.1.114027.80.9.1.13";
+        const string MLDsa87WithEd448PreHashShake256_512Oid = "2.16.840.1.114027.80.9.1.14";
+        const string MLDsa87WithRSA3072PssPreHashSha512Oid = "2.16.840.1.114027.80.9.1.15";
+        const string MLDsa87WithRSA4096PssPreHashSha512Oid = "2.16.840.1.114027.80.9.1.16";
+        const string MLDsa87WithECDsaP521PreHashSha512Oid = "2.16.840.1.114027.80.9.1.17";
+
         // Duplication is required here because there are separate CopyWithPrivateKey methods for each algorithm.
         var keyText = File.ReadAllText(keyPath);
         switch (certificate.PublicKey.Oid.Value)
@@ -142,6 +179,77 @@ private static X509Certificate2 LoadCertificateKey(X509Certificate2 certificate,
                         throw CreateErrorGettingPrivateKeyException(keyPath, ex);
                     }
                 }
+            case MLDsa44Oid:
+            case MLDsa65Oid:
+            case MLDsa87Oid:
+                {
+#pragma warning disable SYSLIB5006 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+                    using var mlDsa = ImportMLDsaKeyFromFile(keyText, password);
+
+                    try
+                    {
+                        return certificate.CopyWithPrivateKey(mlDsa);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw CreateErrorGettingPrivateKeyException(keyPath, ex);
+                    }
+                }
+            case SlhDsaSha2_128sOid:
+            case SlhDsaSha2_128fOid:
+            case SlhDsaSha2_192sOid:
+            case SlhDsaSha2_192fOid:
+            case SlhDsaSha2_256sOid:
+            case SlhDsaSha2_256fOid:
+            case SlhDsaShake_128sOid:
+            case SlhDsaShake_128fOid:
+            case SlhDsaShake_192sOid:
+            case SlhDsaShake_192fOid:
+            case SlhDsaShake_256sOid:
+            case SlhDsaShake_256fOid:
+                {
+                    using var slhDsa = ImportSlhDsaKeyFromFile(keyText, password);
+
+                    try
+                    {
+                        return certificate.CopyWithPrivateKey(slhDsa);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw CreateErrorGettingPrivateKeyException(keyPath, ex);
+                    }
+                }
+            case MLDsa44WithRSA2048PssPreHashSha256Oid:
+            case MLDsa44WithRSA2048Pkcs15PreHashSha256Oid:
+            case MLDsa44WithEd25519PreHashSha512Oid:
+            case MLDsa44WithECDsaP256PreHashSha256Oid:
+            case MLDsa65WithRSA3072PssPreHashSha512Oid:
+            case MLDsa65WithRSA3072Pkcs15PreHashSha512Oid:
+            case MLDsa65WithRSA4096PssPreHashSha512Oid:
+            case MLDsa65WithRSA4096Pkcs15PreHashSha512Oid:
+            case MLDsa65WithECDsaP256PreHashSha512Oid:
+            case MLDsa65WithECDsaP384PreHashSha512Oid:
+            case MLDsa65WithECDsaBrainpoolP256r1PreHashSha512Oid:
+            case MLDsa65WithEd25519PreHashSha512Oid:
+            case MLDsa87WithECDsaP384PreHashSha512Oid:
+            case MLDsa87WithECDsaBrainpoolP384r1PreHashSha512Oid:
+            case MLDsa87WithEd448PreHashShake256_512Oid:
+            case MLDsa87WithRSA3072PssPreHashSha512Oid:
+            case MLDsa87WithRSA4096PssPreHashSha512Oid:
+            case MLDsa87WithECDsaP521PreHashSha512Oid:
+                {
+                    using var compositeMLDsa = ImportCompositeMLDsaKeyFromFile(keyText, password);
+
+                    try
+                    {
+                        return certificate.CopyWithPrivateKey(compositeMLDsa);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw CreateErrorGettingPrivateKeyException(keyPath, ex);
+                    }
+                }
+#pragma warning restore SYSLIB5006 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
             default:
                 throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, CoreStrings.UnrecognizedCertificateKeyOid, certificate.PublicKey.Oid.Value));
         }
@@ -174,6 +282,45 @@ private static void ImportKeyFromFile(AsymmetricAlgorithm asymmetricAlgorithm, s
         }
     }
 
+    [Experimental("SYSLIB5006")]
+    private static MLDsa ImportMLDsaKeyFromFile(string keyText, string? password)
+    {
+        if (password == null)
+        {
+            return MLDsa.ImportFromPem(keyText);
+        }
+        else
+        {
+            return MLDsa.ImportFromEncryptedPem(keyText, password);
+        }
+    }
+
+    [Experimental("SYSLIB5006")]
+    private static SlhDsa ImportSlhDsaKeyFromFile(string keyText, string? password)
+    {
+        if (password == null)
+        {
+            return SlhDsa.ImportFromPem(keyText);
+        }
+        else
+        {
+            return SlhDsa.ImportFromEncryptedPem(keyText, password);
+        }
+    }
+
+    [Experimental("SYSLIB5006")]
+    private static CompositeMLDsa ImportCompositeMLDsaKeyFromFile(string keyText, string? password)
+    {
+        if (password == null)
+        {
+            return CompositeMLDsa.ImportFromPem(keyText);
+        }
+        else
+        {
+            return CompositeMLDsa.ImportFromEncryptedPem(keyText, password);
+        }
+    }
+
     private static X509Certificate2 LoadFromStoreCert(CertificateConfig certInfo)
     {
         var subject = certInfo.Subject!;
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs
index 5e426ed25721..6f2b39a205b7 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs
@@ -16,6 +16,7 @@ internal sealed class Http1ChunkedEncodingMessageBody : Http1MessageBody
 {
     // byte consts don't have a data type annotation so we pre-cast it
     private const byte ByteCR = (byte)'\r';
+    private const byte ByteLF = (byte)'\n';
     // "7FFFFFFF\r\n" is the largest chunk size that could be returned as an int.
     private const int MaxChunkPrefixBytes = 10;
 
@@ -27,6 +28,8 @@ internal sealed class Http1ChunkedEncodingMessageBody : Http1MessageBody
     private readonly Pipe _requestBodyPipe;
     private ReadResult _readResult;
 
+    private static readonly bool InsecureChunkedParsing = AppContext.TryGetSwitch("Microsoft.AspNetCore.Server.Kestrel.EnableInsecureChunkedRequestParsing", out var value) && value;
+
     public Http1ChunkedEncodingMessageBody(Http1Connection context, bool keepAlive)
         : base(context, keepAlive)
     {
@@ -345,15 +348,31 @@ private void ParseChunkedPrefix(in ReadOnlySequence<byte> buffer, out SequencePo
         KestrelBadHttpRequestException.Throw(RequestRejectionReason.BadChunkSizeData);
     }
 
+    // https://www.rfc-editor.org/rfc/rfc9112#section-7.1
+    // chunk          = chunk-size [ chunk-ext ] CRLF
+    // chunk-data CRLF
+
+    // https://www.rfc-editor.org/rfc/rfc9112#section-7.1.1
+    // chunk-ext      = *( BWS ";" BWS chunk-ext-name
+    //                     [BWS "=" BWS chunk-ext-val] )
+    // chunk-ext-name = token
+    // chunk-ext-val  = token / quoted-string
     private void ParseExtension(ReadOnlySequence<byte> buffer, out SequencePosition consumed, out SequencePosition examined)
     {
-        // Chunk-extensions not currently parsed
-        // Just drain the data
-        examined = buffer.Start;
+        // Chunk-extensions parsed for \r\n and throws for unpaired \r or \n.
 
         do
         {
-            SequencePosition? extensionCursorPosition = buffer.PositionOf(ByteCR);
+            SequencePosition? extensionCursorPosition;
+            if (InsecureChunkedParsing)
+            {
+                extensionCursorPosition = buffer.PositionOf(ByteCR);
+            }
+            else
+            {
+                extensionCursorPosition = buffer.PositionOfAny(ByteCR, ByteLF);
+            }
+
             if (extensionCursorPosition == null)
             {
                 // End marker not found yet
@@ -361,9 +380,10 @@ private void ParseExtension(ReadOnlySequence<byte> buffer, out SequencePosition
                 examined = buffer.End;
                 AddAndCheckObservedBytes(buffer.Length);
                 return;
-            };
+            }
 
             var extensionCursor = extensionCursorPosition.Value;
+
             var charsToByteCRExclusive = buffer.Slice(0, extensionCursor).Length;
 
             var suffixBuffer = buffer.Slice(extensionCursor);
@@ -378,7 +398,9 @@ private void ParseExtension(ReadOnlySequence<byte> buffer, out SequencePosition
             suffixBuffer = suffixBuffer.Slice(0, 2);
             var suffixSpan = suffixBuffer.ToSpan();
 
-            if (suffixSpan[1] == '\n')
+            if (InsecureChunkedParsing
+                ? (suffixSpan[1] == ByteLF)
+                : (suffixSpan[0] == ByteCR && suffixSpan[1] == ByteLF))
             {
                 // We consumed the \r\n at the end of the extension, so switch modes.
                 _mode = _inputLength > 0 ? Mode.Data : Mode.Trailer;
@@ -387,13 +409,22 @@ private void ParseExtension(ReadOnlySequence<byte> buffer, out SequencePosition
                 examined = suffixBuffer.End;
                 AddAndCheckObservedBytes(charsToByteCRExclusive + 2);
             }
-            else
+            else if (InsecureChunkedParsing)
             {
+                examined = buffer.Start;
                 // Don't consume suffixSpan[1] in case it is also a \r.
                 buffer = buffer.Slice(charsToByteCRExclusive + 1);
                 consumed = extensionCursor;
                 AddAndCheckObservedBytes(charsToByteCRExclusive + 1);
             }
+            else
+            {
+                consumed = suffixBuffer.End;
+                examined = suffixBuffer.End;
+
+                // We have \rX or \nX, that's an invalid extension.
+                KestrelBadHttpRequestException.Throw(RequestRejectionReason.BadChunkExtension);
+            }
         } while (_mode == Mode.Extension);
     }
 
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs
index b8714d601f9c..178007ec06ac 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs
@@ -3,7 +3,6 @@
 
 using System.Buffers;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO.Pipelines;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Connections.Features;
@@ -644,16 +643,24 @@ private void ValidateNonOriginHostHeader(string hostText)
             // authority component, excluding any userinfo subcomponent and its "@"
             // delimiter.
 
+            // Accessing authority always allocates, store it in a local to only allocate once
+            var authority = _absoluteRequestTarget!.Authority;
+
             // System.Uri doesn't not tell us if the port was in the original string or not.
             // When IsDefaultPort = true, we will allow Host: with or without the default port
-            if (hostText != _absoluteRequestTarget!.Authority)
+            if (hostText != authority)
             {
                 if (!_absoluteRequestTarget.IsDefaultPort
-                    || hostText != _absoluteRequestTarget.Authority + ":" + _absoluteRequestTarget.Port.ToString(CultureInfo.InvariantCulture))
+                    || hostText != $"{authority}:{_absoluteRequestTarget.Port}")
                 {
                     if (_context.ServiceContext.ServerOptions.AllowHostHeaderOverride)
                     {
-                        hostText = _absoluteRequestTarget.Authority + ":" + _absoluteRequestTarget.Port.ToString(CultureInfo.InvariantCulture);
+                        // No need to include the port here, it's either already in the Authority
+                        // or it's the default port
+                        // see: https://datatracker.ietf.org/doc/html/rfc2616/#section-14.23
+                        // A "host" without any trailing port information implies the default
+                        // port for the service requested (e.g., "80" for an HTTP URL).
+                        hostText = authority;
                         HttpRequestHeaders.HeaderHost = hostText;
                     }
                     else
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs
index a1778a1cb4b5..9ea1c7b118cf 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs
@@ -34,7 +34,7 @@ internal class Http1OutputProducer : IHttpOutputProducer, IDisposable
     private readonly TimingPipeFlusher _flusher;
 
     // This locks access to all of the below fields
-    private readonly object _contextLock = new object();
+    private readonly Lock _contextLock = new();
 
     private bool _pipeWriterCompleted;
     private bool _aborted;
@@ -51,7 +51,7 @@ internal class Http1OutputProducer : IHttpOutputProducer, IDisposable
     // Once write or flush is called, we modify the _currentChunkMemory to prepend the size of data written
     // and append the end terminator.
 
-    private bool _autoChunk;
+    private ResponseBodyMode _responseBodyMode;
 
     private bool _writeStreamSuffixCalled;
 
@@ -121,7 +121,7 @@ public ValueTask<FlushResult> WriteStreamSuffixAsync()
         {
             if (!_writeStreamSuffixCalled)
             {
-                if (_autoChunk)
+                if (_responseBodyMode == ResponseBodyMode.Chunked)
                 {
                     var writer = new BufferWriter<PipeWriter>(_pipeWriter);
                     result = WriteAsyncInternal(ref writer, EndChunkedResponseBytes);
@@ -147,7 +147,7 @@ public ValueTask<FlushResult> FlushAsync(CancellationToken cancellationToken = d
                 return new ValueTask<FlushResult>(new FlushResult(false, true));
             }
 
-            if (_autoChunk)
+            if (_responseBodyMode == ResponseBodyMode.Chunked)
             {
                 if (_advancedBytesForChunk > 0)
                 {
@@ -173,7 +173,7 @@ static ValueTask<FlushResult> FlushAsyncChunked(Http1OutputProducer producer, Ca
             // Local function so in the common-path the stack space for BufferWriter isn't reserved and cleared when it isn't used.
 
             Debug.Assert(!producer._pipeWriterCompleted);
-            Debug.Assert(producer._autoChunk && producer._advancedBytesForChunk > 0);
+            Debug.Assert(producer._responseBodyMode == ResponseBodyMode.Chunked && producer._advancedBytesForChunk > 0);
 
             var writer = new BufferWriter<PipeWriter>(producer._pipeWriter);
             producer.WriteCurrentChunkMemoryToPipeWriter(ref writer);
@@ -203,7 +203,7 @@ public Memory<byte> GetMemory(int sizeHint = 0)
             {
                 return LeasedMemory(sizeHint);
             }
-            else if (_autoChunk)
+            else if (_responseBodyMode == ResponseBodyMode.Chunked)
             {
                 return GetChunkedMemory(sizeHint);
             }
@@ -228,7 +228,7 @@ public Span<byte> GetSpan(int sizeHint = 0)
             {
                 return LeasedMemory(sizeHint).Span;
             }
-            else if (_autoChunk)
+            else if (_responseBodyMode == ResponseBodyMode.Chunked)
             {
                 return GetChunkedMemory(sizeHint).Span;
             }
@@ -262,7 +262,7 @@ public void Advance(int bytes)
                     _position += bytes;
                 }
             }
-            else if (_autoChunk)
+            else if (_responseBodyMode == ResponseBodyMode.Chunked)
             {
                 if (_advancedBytesForChunk > _currentChunkMemory.Length - _currentMemoryPrefixBytes - EndChunkLength - bytes)
                 {
@@ -333,7 +333,7 @@ private void CommitChunkInternal(ref BufferWriter<PipeWriter> writer, ReadOnlySp
         writer.Commit();
     }
 
-    public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, bool appComplete)
+    public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, bool appComplete)
     {
         lock (_contextLock)
         {
@@ -346,11 +346,11 @@ public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpRespo
 
             var buffer = _pipeWriter;
             var writer = new BufferWriter<PipeWriter>(buffer);
-            WriteResponseHeadersInternal(ref writer, statusCode, reasonPhrase, responseHeaders, autoChunk);
+            WriteResponseHeadersInternal(ref writer, statusCode, reasonPhrase, responseHeaders, responseBodyMode);
         }
     }
 
-    private void WriteResponseHeadersInternal(ref BufferWriter<PipeWriter> writer, int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk)
+    private void WriteResponseHeadersInternal(ref BufferWriter<PipeWriter> writer, int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode)
     {
         writer.Write(HttpVersion11Bytes);
         var statusBytes = ReasonPhrases.ToStatusBytes(statusCode, reasonPhrase);
@@ -360,7 +360,8 @@ private void WriteResponseHeadersInternal(ref BufferWriter<PipeWriter> writer, i
 
         writer.Commit();
 
-        _autoChunk = autoChunk;
+        Debug.Assert(responseBodyMode != ResponseBodyMode.Uninitialized);
+        _responseBodyMode = responseBodyMode;
         WriteDataWrittenBeforeHeaders(ref writer);
         _unflushedBytes += writer.BytesCommitted;
 
@@ -373,11 +374,11 @@ private void WriteDataWrittenBeforeHeaders(ref BufferWriter<PipeWriter> writer)
         {
             foreach (var segment in _completedSegments)
             {
-                if (_autoChunk)
+                if (_responseBodyMode == ResponseBodyMode.Chunked)
                 {
                     CommitChunkInternal(ref writer, segment.Span);
                 }
-                else
+                else if (_responseBodyMode == ResponseBodyMode.ContentLength)
                 {
                     writer.Write(segment.Span);
                     writer.Commit();
@@ -391,16 +392,19 @@ private void WriteDataWrittenBeforeHeaders(ref BufferWriter<PipeWriter> writer)
 
         if (!_currentSegment.IsEmpty)
         {
-            var segment = _currentSegment.Slice(0, _position);
-
-            if (_autoChunk)
-            {
-                CommitChunkInternal(ref writer, segment.Span);
-            }
-            else
+            if (_responseBodyMode != ResponseBodyMode.Disabled)
             {
-                writer.Write(segment.Span);
-                writer.Commit();
+                var segment = _currentSegment.Slice(0, _position);
+
+                if (_responseBodyMode == ResponseBodyMode.Chunked)
+                {
+                    CommitChunkInternal(ref writer, segment.Span);
+                }
+                else if (_responseBodyMode == ResponseBodyMode.ContentLength)
+                {
+                    writer.Write(segment.Span);
+                    writer.Commit();
+                }
             }
 
             _position = 0;
@@ -415,11 +419,8 @@ public void Dispose()
         {
             _pipeWriter.Abort();
 
-            if (_fakeMemoryOwner != null)
-            {
-                _fakeMemoryOwner.Dispose();
-                _fakeMemoryOwner = null;
-            }
+            _fakeMemoryOwner?.Dispose();
+            _fakeMemoryOwner = null;
 
             if (_fakeMemory != null)
             {
@@ -491,7 +492,7 @@ public ValueTask<FlushResult> Write100ContinueAsync()
         return WriteAsync(ContinueBytes);
     }
 
-    public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> buffer, CancellationToken cancellationToken)
+    public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> buffer, CancellationToken cancellationToken)
     {
         lock (_contextLock)
         {
@@ -505,13 +506,13 @@ public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhra
             // Uses same BufferWriter to write response headers and response
             var writer = new BufferWriter<PipeWriter>(_pipeWriter);
 
-            WriteResponseHeadersInternal(ref writer, statusCode, reasonPhrase, responseHeaders, autoChunk);
+            WriteResponseHeadersInternal(ref writer, statusCode, reasonPhrase, responseHeaders, responseBodyMode);
 
             return WriteAsyncInternal(ref writer, buffer, cancellationToken);
         }
     }
 
-    public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> buffer, CancellationToken cancellationToken)
+    public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> buffer, CancellationToken cancellationToken)
     {
         lock (_contextLock)
         {
@@ -525,7 +526,7 @@ public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? rea
             // Uses same BufferWriter to write response headers and chunk
             var writer = new BufferWriter<PipeWriter>(_pipeWriter);
 
-            WriteResponseHeadersInternal(ref writer, statusCode, reasonPhrase, responseHeaders, autoChunk);
+            WriteResponseHeadersInternal(ref writer, statusCode, reasonPhrase, responseHeaders, responseBodyMode);
 
             CommitChunkInternal(ref writer, buffer);
 
@@ -541,7 +542,7 @@ public void Reset()
         Debug.Assert(_completedSegments == null || _completedSegments.Count == 0);
         // Cleared in sequential address ascending order
         _currentMemoryPrefixBytes = 0;
-        _autoChunk = false;
+        _responseBodyMode = ResponseBodyMode.Uninitialized;
         _writeStreamSuffixCalled = false;
         _currentChunkMemoryUpdated = false;
         _startCalled = false;
@@ -570,7 +571,7 @@ private ValueTask<FlushResult> WriteAsyncInternal(
         ReadOnlySpan<byte> buffer,
         CancellationToken cancellationToken = default)
     {
-        if (_autoChunk)
+        if (_responseBodyMode == ResponseBodyMode.Chunked)
         {
             if (_advancedBytesForChunk > 0)
             {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
index 5ef492b5d2b0..ff4fce38d4d5 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
@@ -250,7 +250,7 @@ public bool ParseHeaders(TRequestHandler handler, ref SequenceReader<byte> reade
                         else
                         {
                             // Include the thing after the CR in the rejection exception.
-                            var stopIndex = crIndex + 2;
+                            var stopIndex = Math.Min(crIndex + 2, span.Length);
                             RejectRequestHeader(span[..stopIndex]);
                         }
                     }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs
index 6cfa7f4e8ccb..094ba0058b87 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs
@@ -43,7 +43,7 @@ internal abstract partial class HttpProtocol : IHttpResponseControl
     private Stack<KeyValuePair<Func<object, Task>, object>>? _onStarting;
     private Stack<KeyValuePair<Func<object, Task>, object>>? _onCompleted;
 
-    private readonly object _abortLock = new object();
+    private readonly Lock _abortLock = new();
     protected volatile bool _connectionAborted;
     private bool _preventRequestAbortedCancellation;
     private CancellationTokenSource? _abortedCts;
@@ -54,12 +54,11 @@ internal abstract partial class HttpProtocol : IHttpResponseControl
     // Keep-alive is default for HTTP/1.1 and HTTP/2; parsing and errors will change its value
     // volatile, see: https://msdn.microsoft.com/en-us/library/x13ttww7.aspx
     protected volatile bool _keepAlive = true;
-    // _canWriteResponseBody is set in CreateResponseHeaders.
+    // _responseBodyMode is set in CreateResponseHeaders.
     // If we are writing with GetMemory/Advance before calling StartAsync, assume we can write and throw away contents if we can't.
-    private bool _canWriteResponseBody = true;
+    private ResponseBodyMode _responseBodyMode = ResponseBodyMode.Uninitialized;
     private bool _hasAdvanced;
     private bool _isLeasedMemoryInvalid = true;
-    private bool _autoChunk;
     protected Exception? _applicationException;
     private BadHttpRequestException? _requestRejectedException;
 
@@ -347,7 +346,7 @@ public void Reset()
         _routeValues?.Clear();
 
         _requestProcessingStatus = RequestProcessingStatus.RequestPending;
-        _autoChunk = false;
+        _responseBodyMode = ResponseBodyMode.Uninitialized;
         _applicationException = null;
         _requestRejectedException = null;
 
@@ -397,7 +396,6 @@ public void Reset()
 
         _isLeasedMemoryInvalid = true;
         _hasAdvanced = false;
-        _canWriteResponseBody = true;
 
         if (_scheme == null)
         {
@@ -409,21 +407,20 @@ public void Reset()
 
         _manuallySetRequestAbortToken = null;
 
-        // Lock to prevent CancelRequestAbortedToken from attempting to cancel a disposed CTS.
-        CancellationTokenSource? localAbortCts = null;
-
         lock (_abortLock)
         {
             _preventRequestAbortedCancellation = false;
-            if (_abortedCts?.TryReset() == false)
+
+            // If the connection has already been aborted, allow that to be observed during the next request.
+            if (!_connectionAborted && _abortedCts is not null)
             {
-                localAbortCts = _abortedCts;
-                _abortedCts = null;
+                // _connectionAborted is terminal and only set inside the _abortLock, so if it isn't set here,
+                // _abortedCts has not been canceled yet.
+                var resetSuccess = _abortedCts.TryReset();
+                Debug.Assert(resetSuccess);
             }
         }
 
-        localAbortCts?.Dispose();
-
         Output?.Reset();
 
         _requestHeadersParsed = 0;
@@ -702,7 +699,15 @@ private async Task ProcessRequests<TContext>(IHttpApplication<TContext> applicat
                 // This has to be caught here so StatusCode is set properly before disposing the HttpContext
                 // (DisposeContext logs StatusCode).
                 SetBadRequestState(ex);
-                ReportApplicationError(ex);
+
+                if (!_connectionAborted)
+                {
+                    // Only report bad requests as error-level logs here if the connection hasn't been aborted. This
+                    // prevents noise in the logs for common types of client errors, and we already have a mechanism
+                    // for logging these at a higher level if needed by increasing the log level for
+                    // "Microsoft.AspNetCore.Server.Kestrel.BadRequests".
+                    ReportApplicationError(ex);
+                }
             }
             catch (Exception ex)
             {
@@ -754,7 +759,7 @@ private async Task ProcessRequests<TContext>(IHttpApplication<TContext> applicat
                 }
                 else if (!HasResponseStarted)
                 {
-                    // If the request was aborted and no response was sent, we use status code 499 for logging                    
+                    // If the request was aborted and no response was sent, we use status code 499 for logging
                     StatusCode = StatusCodes.Status499ClientClosedRequest;
                 }
             }
@@ -999,7 +1004,7 @@ private void ProduceStart(bool appCompleted)
 
         var responseHeaders = CreateResponseHeaders(appCompleted);
 
-        Output.WriteResponseHeaders(StatusCode, ReasonPhrase, responseHeaders, _autoChunk, appCompleted);
+        Output.WriteResponseHeaders(StatusCode, ReasonPhrase, responseHeaders, _responseBodyMode, appCompleted);
     }
 
     private void VerifyInitializeState(int firstWriteByteCount)
@@ -1067,7 +1072,7 @@ protected Task ProduceEnd()
 
     private Task WriteSuffix()
     {
-        if (_autoChunk || _httpVersion >= Http.HttpVersion.Http2)
+        if (_responseBodyMode == ResponseBodyMode.Chunked || _httpVersion >= Http.HttpVersion.Http2)
         {
             // For the same reason we call CheckLastWrite() in Content-Length responses.
             PreventRequestAbortedCancellation();
@@ -1161,9 +1166,9 @@ private HttpResponseHeaders CreateResponseHeaders(bool appCompleted)
         }
 
         // Set whether response can have body
-        _canWriteResponseBody = CanWriteResponseBody();
+        _responseBodyMode = CanWriteResponseBody() ? ResponseBodyMode.ContentLength : ResponseBodyMode.Disabled;
 
-        if (!_canWriteResponseBody && hasTransferEncoding)
+        if (_responseBodyMode == ResponseBodyMode.Disabled && hasTransferEncoding)
         {
             RejectInvalidHeaderForNonBodyResponse(appCompleted, HeaderNames.TransferEncoding);
         }
@@ -1197,7 +1202,7 @@ private HttpResponseHeaders CreateResponseHeaders(bool appCompleted)
         }
         else if (!hasTransferEncoding && !responseHeaders.ContentLength.HasValue)
         {
-            if ((appCompleted || !_canWriteResponseBody) && !_hasAdvanced) // Avoid setting contentLength of 0 if we wrote data before calling CreateResponseHeaders
+            if ((appCompleted || _responseBodyMode == ResponseBodyMode.Disabled) && !_hasAdvanced) // Avoid setting contentLength of 0 if we wrote data before calling CreateResponseHeaders
             {
                 if (CanAutoSetContentLengthZeroResponseHeader())
                 {
@@ -1218,8 +1223,11 @@ private HttpResponseHeaders CreateResponseHeaders(bool appCompleted)
             // The chunked transfer encoding defined in Section 4.1 of [RFC7230] MUST NOT be used in HTTP/2.
             else if (_httpVersion == Http.HttpVersion.Http11)
             {
-                _autoChunk = true;
-                responseHeaders.SetRawTransferEncoding("chunked", _bytesTransferEncodingChunked);
+                if (_responseBodyMode == ResponseBodyMode.ContentLength)
+                {
+                    _responseBodyMode = ResponseBodyMode.Chunked;
+                    responseHeaders.SetRawTransferEncoding("chunked", _bytesTransferEncodingChunked);
+                }
             }
             else
             {
@@ -1470,7 +1478,7 @@ public void Advance(int bytes)
             throw new InvalidOperationException("Invalid ordering of calling StartAsync or CompleteAsync and Advance.");
         }
 
-        if (_canWriteResponseBody)
+        if (_responseBodyMode != ResponseBodyMode.Disabled)
         {
             VerifyAndUpdateWrite(bytes);
             Output.Advance(bytes);
@@ -1591,28 +1599,28 @@ public ValueTask<FlushResult> WritePipeAsync(ReadOnlyMemory<byte> data, Cancella
             VerifyAndUpdateWrite(data.Length);
         }
 
-        if (_canWriteResponseBody)
+        switch (_responseBodyMode)
         {
-            if (_autoChunk)
-            {
+            case ResponseBodyMode.Disabled:
+                HandleNonBodyResponseWrite();
+                return default;
+            case ResponseBodyMode.Chunked:
                 if (data.Length == 0)
                 {
                     return default;
                 }
 
                 return Output.WriteChunkAsync(data.Span, cancellationToken);
-            }
-            else
-            {
+            case ResponseBodyMode.ContentLength:
                 CheckLastWrite();
                 return Output.WriteDataToPipeAsync(data.Span, cancellationToken: cancellationToken);
-            }
-        }
-        else
-        {
-            HandleNonBodyResponseWrite();
-            return default;
+            case ResponseBodyMode.Uninitialized:
+                ThrowInvalidOperation();
+                break;
         }
+
+        Debug.Assert(false, "Should not reach here, all cases in above switch statement should return");
+        return default;
     }
 
     private ValueTask<FlushResult> FirstWriteAsync(ReadOnlyMemory<byte> data, CancellationToken cancellationToken)
@@ -1639,30 +1647,30 @@ private ValueTask<FlushResult> FirstWriteAsyncInternal(ReadOnlyMemory<byte> data
     {
         var responseHeaders = InitializeResponseFirstWrite(data.Length);
 
-        if (_canWriteResponseBody)
+        switch (_responseBodyMode)
         {
-            if (_autoChunk)
-            {
+            case ResponseBodyMode.Disabled:
+                Output.WriteResponseHeaders(StatusCode, ReasonPhrase, responseHeaders, _responseBodyMode, appCompleted: false);
+                HandleNonBodyResponseWrite();
+                return Output.FlushAsync(cancellationToken);
+            case ResponseBodyMode.Chunked:
                 if (data.Length == 0)
                 {
-                    Output.WriteResponseHeaders(StatusCode, ReasonPhrase, responseHeaders, _autoChunk, appCompleted: false);
+                    Output.WriteResponseHeaders(StatusCode, ReasonPhrase, responseHeaders, _responseBodyMode, appCompleted: false);
                     return Output.FlushAsync(cancellationToken);
                 }
 
-                return Output.FirstWriteChunkedAsync(StatusCode, ReasonPhrase, responseHeaders, _autoChunk, data.Span, cancellationToken);
-            }
-            else
-            {
+                return Output.FirstWriteChunkedAsync(StatusCode, ReasonPhrase, responseHeaders, _responseBodyMode, data.Span, cancellationToken);
+            case ResponseBodyMode.ContentLength:
                 CheckLastWrite();
-                return Output.FirstWriteAsync(StatusCode, ReasonPhrase, responseHeaders, _autoChunk, data.Span, cancellationToken);
-            }
-        }
-        else
-        {
-            Output.WriteResponseHeaders(StatusCode, ReasonPhrase, responseHeaders, _autoChunk, appCompleted: false);
-            HandleNonBodyResponseWrite();
-            return Output.FlushAsync(cancellationToken);
+                return Output.FirstWriteAsync(StatusCode, ReasonPhrase, responseHeaders, _responseBodyMode, data.Span, cancellationToken);
+            case ResponseBodyMode.Uninitialized:
+                ThrowInvalidOperation();
+                break;
         }
+
+        Debug.Assert(false, "Should not reach here, all cases in above switch statement should return");
+        return default;
     }
 
     public Task FlushAsync(CancellationToken cancellationToken = default)
@@ -1688,27 +1696,34 @@ public async ValueTask<FlushResult> WriteAsyncAwaited(Task initializeTask, ReadO
 
         // WriteAsyncAwaited is only called for the first write to the body.
         // Ensure headers are flushed if Write(Chunked)Async isn't called.
-        if (_canWriteResponseBody)
+        switch (_responseBodyMode)
         {
-            if (_autoChunk)
-            {
+            case ResponseBodyMode.Disabled:
+                HandleNonBodyResponseWrite();
+                return await Output.FlushAsync(cancellationToken);
+            case ResponseBodyMode.Chunked:
                 if (data.Length == 0)
                 {
                     return await Output.FlushAsync(cancellationToken);
                 }
 
                 return await Output.WriteChunkAsync(data.Span, cancellationToken);
-            }
-            else
-            {
+            case ResponseBodyMode.ContentLength:
                 CheckLastWrite();
                 return await Output.WriteDataToPipeAsync(data.Span, cancellationToken: cancellationToken);
-            }
-        }
-        else
-        {
-            HandleNonBodyResponseWrite();
-            return await Output.FlushAsync(cancellationToken);
+            case ResponseBodyMode.Uninitialized:
+                ThrowInvalidOperation();
+                break;
         }
+
+        Debug.Assert(false, "Should not reach here, all cases in above switch statement should return");
+        return default;
+    }
+
+    [DoesNotReturn]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static void ThrowInvalidOperation()
+    {
+        throw new InvalidOperationException();
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/IHttpOutputProducer.cs b/src/Servers/Kestrel/Core/src/Internal/Http/IHttpOutputProducer.cs
index d9733fc1c42d..87fe04f377d4 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/IHttpOutputProducer.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/IHttpOutputProducer.cs
@@ -13,7 +13,7 @@ internal interface IHttpOutputProducer
     ValueTask<FlushResult> WriteChunkAsync(ReadOnlySpan<byte> data, CancellationToken cancellationToken);
     ValueTask<FlushResult> FlushAsync(CancellationToken cancellationToken);
     ValueTask<FlushResult> Write100ContinueAsync();
-    void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, bool appCompleted);
+    void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, bool appCompleted);
     // This takes ReadOnlySpan instead of ReadOnlyMemory because it always synchronously copies data before flushing.
     ValueTask<FlushResult> WriteDataToPipeAsync(ReadOnlySpan<byte> data, CancellationToken cancellationToken);
     // Test hook
@@ -25,7 +25,15 @@ internal interface IHttpOutputProducer
     Memory<byte> GetMemory(int sizeHint = 0);
     void CancelPendingFlush();
     void Stop();
-    ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> data, CancellationToken cancellationToken);
-    ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> data, CancellationToken cancellationToken);
+    ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> data, CancellationToken cancellationToken);
+    ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> data, CancellationToken cancellationToken);
     void Reset();
 }
+
+internal enum ResponseBodyMode
+{
+    Uninitialized,
+    Disabled,
+    Chunked,
+    ContentLength
+}
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs b/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs
index 827192823023..91467c6cb046 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs
@@ -16,6 +16,7 @@ internal enum RequestRejectionReason
     UnexpectedEndOfRequestContent,
     BadChunkSuffix,
     BadChunkSizeData,
+    BadChunkExtension,
     ChunkedRequestIncomplete,
     InvalidRequestTarget,
     InvalidCharactersInHeaderName,
@@ -31,5 +32,5 @@ internal enum RequestRejectionReason
     ConnectMethodRequired,
     MissingHostHeader,
     MultipleHostHeaders,
-    InvalidHostHeader
+    InvalidHostHeader,
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/FlowControl/InputFlowControl.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/FlowControl/InputFlowControl.cs
index 00d8cf43d144..e3d57bad0507 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http2/FlowControl/InputFlowControl.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http2/FlowControl/InputFlowControl.cs
@@ -25,7 +25,7 @@ internal sealed class InputFlowControl
     private FlowControl _flow;
     private int _pendingUpdateSize;
     private bool _windowUpdatesDisabled;
-    private readonly object _flowLock = new object();
+    private readonly Lock _flowLock = new();
 
     public InputFlowControl(uint initialWindowSize, uint minWindowSizeIncrement)
     {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
index 05321d3e73e1..9d3fb8302012 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
@@ -1086,6 +1086,8 @@ private Task ProcessPingFrameAsync(in ReadOnlySequence<byte> payload)
         if (_incomingFrame.PingAck)
         {
             // TODO: verify that payload is equal to the outgoing PING frame
+            // This will be particularly important if we implement dynamic window sizing
+            // (https://github.com/dotnet/aspnetcore/issues/53657).
             return Task.CompletedTask;
         }
 
@@ -1156,8 +1158,12 @@ private Task ProcessWindowUpdateFrameAsync()
         {
             if (stream.RstStreamReceived)
             {
-                // Hard abort, do not allow any more frames on this stream.
-                throw CreateReceivedFrameStreamAbortedException(stream);
+                // WINDOW_UPDATE received after we have already processed an inbound RST_STREAM for this stream.
+                // RFC 7540 (Sections 5.1, 6.9) / RFC 9113 do not explicitly define semantics for WINDOW_UPDATE on a
+                // stream in the "closed" state due to a reset by client. We surface it as a stream error (STREAM_CLOSED)
+                // rather than aborting the entire connection to keep behavior deterministic and consistent with other servers.
+                // https://github.com/dotnet/aspnetcore/issues/63726
+                throw new Http2StreamErrorException(_incomingFrame.StreamId, CoreStrings.Http2StreamAborted, Http2ErrorCode.STREAM_CLOSED);
             }
 
             if (!stream.TryUpdateOutputWindow(_incomingFrame.WindowUpdateSizeIncrement))
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs
index b35082734b9c..426f1c7b31c7 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2FrameWriter.cs
@@ -71,7 +71,7 @@ internal sealed class Http2FrameWriter
 
     private bool IsFlowControlQueueLimitEnabled => _maximumFlowControlQueueSize > 0;
 
-    private readonly object _writeLock = new object();
+    private readonly Lock _writeLock = new();
     private readonly Http2Frame _outgoingFrame;
     private readonly Http2HeadersEnumerator _headersEnumerator = new Http2HeadersEnumerator();
     private readonly ConcurrentPipeWriter _outputWriter;
@@ -99,7 +99,7 @@ internal sealed class Http2FrameWriter
     private bool _completed;
     private bool _aborted;
 
-    private readonly object _windowUpdateLock = new();
+    private readonly Lock _windowUpdateLock = new();
     private long _connectionWindow;
     private readonly Queue<Http2OutputProducer> _waitingForMoreConnectionWindow = new();
     // This is the stream that consumed the last set of connection window
@@ -198,6 +198,17 @@ private async Task WriteToOutputPipe()
                     // Now check the connection window
                     actual = CheckConnectionWindow(actual);
 
+                    // actual is negative means window size has become negative
+                    // this can usually happen if the receiver decreases window size before receiving the previous data frame
+                    // in this case, reset to 0 and continue, no data will be sent but will wait for window update
+                    // RFC 9113 section 6.9.2 specifically calls out that the window size can go negative.  As required,
+                    // we continue to track the negative value but use 0 for the remainder of this write to avoid 
+                    // out-of-range errors.
+                    if (actual < 0)
+                    {
+                        actual = 0;
+                    }
+
                     // Write what we can
                     if (actual < buffer.Length)
                     {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs
index 2c551030a0ca..142f8ba226dc 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs
@@ -28,7 +28,7 @@ internal sealed class Http2OutputProducer : IHttpOutputProducer, IHttpOutputAbor
 
     private readonly MemoryPool<byte> _memoryPool;
     private readonly Http2Stream _stream;
-    private readonly object _dataWriterLock = new object();
+    private readonly Lock _dataWriterLock = new();
     private readonly Pipe _pipe;
     private readonly ConcurrentPipeWriter _pipeWriter;
     private readonly PipeReader _pipeReader;
@@ -232,11 +232,8 @@ public void Complete()
                 _pipeWriter.Complete();
             }
 
-            if (_fakeMemoryOwner != null)
-            {
-                _fakeMemoryOwner.Dispose();
-                _fakeMemoryOwner = null;
-            }
+            _fakeMemoryOwner?.Dispose();
+            _fakeMemoryOwner = null;
 
             if (_fakeMemory != null)
             {
@@ -358,7 +355,7 @@ public ValueTask<FlushResult> Write100ContinueAsync()
         }
     }
 
-    public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, bool appCompleted)
+    public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, bool appCompleted)
     {
         lock (_dataWriterLock)
         {
@@ -552,11 +549,11 @@ public ValueTask<FlushResult> WriteDataToPipeAsync(ReadOnlySpan<byte> data, Canc
         }
     }
 
-    public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
+    public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
     {
         lock (_dataWriterLock)
         {
-            WriteResponseHeaders(statusCode, reasonPhrase, responseHeaders, autoChunk, appCompleted: false);
+            WriteResponseHeaders(statusCode, reasonPhrase, responseHeaders, responseBodyMode, appCompleted: false);
 
             return WriteDataToPipeAsync(data, cancellationToken);
         }
@@ -567,7 +564,7 @@ ValueTask<FlushResult> IHttpOutputProducer.WriteChunkAsync(ReadOnlySpan<byte> da
         throw new NotImplementedException();
     }
 
-    public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
+    public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }
@@ -599,7 +596,7 @@ public void Reset()
 
     internal void OnRequestProcessingEnded()
     {
-        var shouldCompleteStream = false;
+        bool shouldCompleteStream;
         lock (_dataWriterLock)
         {
             if (_requestProcessingComplete)
@@ -625,7 +622,7 @@ internal void OnRequestProcessingEnded()
 
     internal ValueTask<FlushResult> CompleteResponseAsync()
     {
-        var shouldCompleteStream = false;
+        bool shouldCompleteStream;
         ValueTask<FlushResult> task = default;
 
         lock (_dataWriterLock)
@@ -705,8 +702,7 @@ internal Memory<byte> GetFakeMemory(int minSize)
 
     public bool TryUpdateStreamWindow(int bytes)
     {
-        var schedule = false;
-
+        bool schedule;
         lock (_dataWriterLock)
         {
             var maxUpdate = Http2PeerSettings.MaxWindowSize - _streamWindow;
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs
index 42237f871d74..8524b35f3947 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs
@@ -44,7 +44,7 @@ internal abstract partial class Http2Stream : HttpProtocol, IThreadPoolWorkItem,
     internal long DrainExpirationTimestamp { get; set; }
 
     private StreamCompletionFlags _completionState;
-    private readonly object _completionLock = new object();
+    private readonly Lock _completionLock = new();
 
     public void Initialize(Http2StreamContext context)
     {
@@ -129,7 +129,6 @@ public bool ReceivedEmptyRequestBody
     protected override void OnReset()
     {
         _keepAlive = true;
-        _connectionAborted = false;
         _userTrailers = null;
 
         // Reset Http2 Features
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Data.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Data.cs
index 95dbbcb8e4d5..ce1e9b0db815 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Data.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Data.cs
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
 {
     public void PrepareData()
     {
-        Length = 0;
+        RemainingLength = 0;
         Type = Http3FrameType.Data;
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.GoAway.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.GoAway.cs
index fe2eb3a6e42e..de1a73cb830e 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.GoAway.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.GoAway.cs
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
 {
     public void PrepareGoAway()
     {
-        Length = 0;
+        RemainingLength = 0;
         Type = Http3FrameType.GoAway;
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Headers.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Headers.cs
index bcf65929694d..11e8c971ff21 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Headers.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Headers.cs
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
 {
     public void PrepareHeaders()
     {
-        Length = 0;
+        RemainingLength = 0;
         Type = Http3FrameType.Headers;
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Settings.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Settings.cs
index 9e74e07db5b8..03ed2a670250 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Settings.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Settings.cs
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
 {
     public void PrepareSettings()
     {
-        Length = 0;
+        RemainingLength = 0;
         Type = Http3FrameType.Settings;
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.cs
index 076b9640d0bb..5839d515524c 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.cs
@@ -9,7 +9,7 @@ namespace System.Net.Http;
 internal partial class Http3RawFrame
 #pragma warning restore CA1852 // Seal internal types
 {
-    public long Length { get; set; }
+    public long RemainingLength { get; set; }
 
     public Http3FrameType Type { get; internal set; }
 
@@ -17,6 +17,6 @@ internal partial class Http3RawFrame
 
     public override string ToString()
     {
-        return $"{FormattedType} Length: {Length}";
+        return $"{FormattedType} Length: {RemainingLength}";
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs
index 92777ea1d79c..c2db22acd8bd 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs
@@ -35,9 +35,9 @@ internal sealed class Http3Connection : IHttp3StreamLifetimeHandler, IRequestPro
     // so start highest opened request stream ID at -4.
     private const long DefaultHighestOpenedRequestStreamId = -4;
 
-    private readonly object _sync = new();
+    private readonly Lock _sync = new();
     private readonly HttpMultiplexedConnectionContext _context;
-    private readonly object _protocolSelectionLock = new();
+    private readonly Lock _protocolSelectionLock = new();
     private readonly StreamCloseAwaitable _streamCompletionAwaitable = new();
     private readonly IProtocolErrorCodeFeature _errorCodeFeature;
     private readonly Dictionary<long, WebTransportSession>? _webtransportSessions;
@@ -602,15 +602,16 @@ private async Task CreateHttp3Stream<TContext>(ConnectionContext streamContext,
 
         // Check whether there is an existing HTTP/3 stream on the transport stream.
         // A stream will only be cached if the transport stream itself is reused.
-        if (!persistentStateFeature.State.TryGetValue(StreamPersistentStateKey, out var s))
+        if (!persistentStateFeature.State.TryGetValue(StreamPersistentStateKey, out var s) ||
+            s is not Http3Stream<TContext> { CanReuse: true } reusableStream)
         {
             stream = new Http3Stream<TContext>(application, CreateHttpStreamContext(streamContext));
-            persistentStateFeature.State.Add(StreamPersistentStateKey, stream);
+            persistentStateFeature.State[StreamPersistentStateKey] = stream;
         }
         else
         {
-            stream = (Http3Stream<TContext>)s!;
-            stream.InitializeWithExistingContext(streamContext.Transport);
+            stream = reusableStream;
+            reusableStream.InitializeWithExistingContext(streamContext.Transport);
         }
 
         _streamLifetimeHandler.OnStreamCreated(stream);
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs
index dbd99d838a0e..216eb9fc09b9 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Buffers;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO.Pipelines;
 using System.Net.Http;
@@ -19,16 +20,21 @@ internal abstract class Http3ControlStream : IHttp3Stream, IThreadPoolWorkItem
     private const int EncoderStreamTypeId = 2;
     private const int DecoderStreamTypeId = 3;
 
+    // Arbitrarily chosen max frame length
+    // ControlStream frames currently are very small, either a single variable length integer (max 8 bytes), two variable length integers,
+    // or in the case of SETTINGS a small collection of two variable length integers
+    // We'll use a generous value of 10k in case new optional frame(s) are added that might be a little larger than the current frames.
+    private const int MaxFrameSize = 10_000;
+
     private readonly Http3FrameWriter _frameWriter;
     private readonly Http3StreamContext _context;
     private readonly Http3PeerSettings _serverPeerSettings;
     private readonly IStreamIdFeature _streamIdFeature;
     private readonly IStreamClosedFeature _streamClosedFeature;
     private readonly IProtocolErrorCodeFeature _errorCodeFeature;
-    private readonly Http3RawFrame _incomingFrame = new Http3RawFrame();
     private volatile int _isClosed;
     private long _headerType;
-    private readonly object _completionLock = new();
+    private readonly Lock _completionLock = new();
 
     private bool _haveReceivedSettingsFrame;
     private StreamCompletionFlags _completionState;
@@ -159,9 +165,9 @@ private async ValueTask<long> TryReadStreamHeaderAsync()
             {
                 if (!readableBuffer.IsEmpty)
                 {
-                    var id = VariableLengthIntegerHelper.GetInteger(readableBuffer, out consumed, out examined);
-                    if (id != -1)
+                    if (VariableLengthIntegerHelper.TryGetInteger(readableBuffer, out consumed, out var id))
                     {
+                        examined = consumed;
                         return id;
                     }
                 }
@@ -240,6 +246,8 @@ public async Task ProcessRequestAsync<TContext>(IHttpApplication<TContext> appli
         }
         finally
         {
+            await _context.StreamContext.DisposeAsync();
+
             ApplyCompletionFlag(StreamCompletionFlags.Completed);
             _context.StreamLifetimeHandler.OnStreamCompleted(this);
         }
@@ -247,6 +255,8 @@ public async Task ProcessRequestAsync<TContext>(IHttpApplication<TContext> appli
 
     private async Task HandleControlStream()
     {
+        var incomingFrame = new Http3RawFrame();
+        var isContinuedFrame = false;
         while (_isClosed == 0)
         {
             var result = await Input.ReadAsync();
@@ -259,12 +269,33 @@ private async Task HandleControlStream()
                 if (!readableBuffer.IsEmpty)
                 {
                     // need to kick off httpprotocol process request async here.
-                    while (Http3FrameReader.TryReadFrame(ref readableBuffer, _incomingFrame, out var framePayload))
+                    while (Http3FrameReader.TryReadFrame(ref readableBuffer, incomingFrame, isContinuedFrame, out var framePayload))
                     {
-                        Log.Http3FrameReceived(_context.ConnectionId, _streamIdFeature.StreamId, _incomingFrame);
-
-                        consumed = examined = framePayload.End;
-                        await ProcessHttp3ControlStream(framePayload);
+                        Debug.Assert(incomingFrame.RemainingLength >= framePayload.Length);
+
+                        // Only log when parsing the beginning of the frame
+                        if (!isContinuedFrame)
+                        {
+                            Log.Http3FrameReceived(_context.ConnectionId, _streamIdFeature.StreamId, incomingFrame);
+                        }
+
+                        examined = framePayload.End;
+                        await ProcessHttp3ControlStream(incomingFrame, isContinuedFrame, framePayload, out consumed);
+
+                        if (incomingFrame.RemainingLength == framePayload.Length)
+                        {
+                            Debug.Assert(framePayload.Slice(0, consumed).Length == framePayload.Length);
+
+                            incomingFrame.RemainingLength = 0;
+                            isContinuedFrame = false;
+                        }
+                        else
+                        {
+                            incomingFrame.RemainingLength -= framePayload.Slice(0, consumed).Length;
+                            isContinuedFrame = true;
+
+                            Debug.Assert(incomingFrame.RemainingLength > 0);
+                        }
                     }
                 }
 
@@ -294,56 +325,71 @@ private async ValueTask HandleEncodingDecodingTask()
         }
     }
 
-    private ValueTask ProcessHttp3ControlStream(in ReadOnlySequence<byte> payload)
+    private ValueTask ProcessHttp3ControlStream(Http3RawFrame incomingFrame, bool isContinuedFrame, in ReadOnlySequence<byte> payload, out SequencePosition consumed)
     {
-        switch (_incomingFrame.Type)
+        // default to consuming the entire payload, this is so that we don't need to set consumed from all the frame types that aren't implemented yet.
+        // individual frame types can set consumed if they're implemented and want to be able to partially consume the payload.
+        consumed = payload.End;
+        switch (incomingFrame.Type)
         {
             case Http3FrameType.Data:
             case Http3FrameType.Headers:
             case Http3FrameType.PushPromise:
-                // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#section-7.2
-                throw new Http3ConnectionErrorException(CoreStrings.FormatHttp3ErrorUnsupportedFrameOnControlStream(_incomingFrame.FormattedType), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame);
+                // https://www.rfc-editor.org/rfc/rfc9114.html#section-8.1-2.12.1
+                throw new Http3ConnectionErrorException(CoreStrings.FormatHttp3ErrorUnsupportedFrameOnControlStream(incomingFrame.FormattedType), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame);
             case Http3FrameType.Settings:
-                return ProcessSettingsFrameAsync(payload);
+                CheckMaxFrameSize(incomingFrame);
+                return ProcessSettingsFrameAsync(isContinuedFrame, payload, out consumed);
             case Http3FrameType.GoAway:
-                return ProcessGoAwayFrameAsync();
+                return ProcessGoAwayFrameAsync(isContinuedFrame, incomingFrame, payload, out consumed);
             case Http3FrameType.CancelPush:
-                return ProcessCancelPushFrameAsync();
+                return ProcessCancelPushFrameAsync(incomingFrame, payload, out consumed);
             case Http3FrameType.MaxPushId:
-                return ProcessMaxPushIdFrameAsync();
+                return ProcessMaxPushIdFrameAsync(incomingFrame, payload, out consumed);
             default:
-                return ProcessUnknownFrameAsync(_incomingFrame.Type);
+                CheckMaxFrameSize(incomingFrame);
+                return ProcessUnknownFrameAsync(incomingFrame.Type);
         }
-    }
 
-    private ValueTask ProcessSettingsFrameAsync(ReadOnlySequence<byte> payload)
-    {
-        if (_haveReceivedSettingsFrame)
+        static void CheckMaxFrameSize(Http3RawFrame http3RawFrame)
         {
-            // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#name-settings
-            throw new Http3ConnectionErrorException(CoreStrings.Http3ErrorControlStreamMultipleSettingsFrames, Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame);
+            // Not part of the RFC, but it's a good idea to limit the size of frames when we know they're supposed to be small.
+            if (http3RawFrame.RemainingLength >= MaxFrameSize)
+            {
+                throw new Http3ConnectionErrorException(CoreStrings.FormatHttp3ControlStreamFrameTooLarge(http3RawFrame.FormattedType), Http3ErrorCode.FrameError, ConnectionEndReason.InvalidFrameLength);
+            }
         }
+    }
 
-        _haveReceivedSettingsFrame = true;
-        _streamClosedFeature.OnClosed(static state =>
+    private ValueTask ProcessSettingsFrameAsync(bool isContinuedFrame, ReadOnlySequence<byte> payload, out SequencePosition consumed)
+    {
+        if (!isContinuedFrame)
         {
-            var stream = (Http3ControlStream)state!;
-            stream.OnStreamClosed();
-        }, this);
+            if (_haveReceivedSettingsFrame)
+            {
+                // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4
+                throw new Http3ConnectionErrorException(CoreStrings.Http3ErrorControlStreamMultipleSettingsFrames, Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame);
+            }
+
+            _haveReceivedSettingsFrame = true;
+            _streamClosedFeature.OnClosed(static state =>
+            {
+                var stream = (Http3ControlStream)state!;
+                stream.OnStreamClosed();
+            }, this);
+        }
 
         while (true)
         {
-            var id = VariableLengthIntegerHelper.GetInteger(payload, out var consumed, out _);
-            if (id == -1)
+            if (!VariableLengthIntegerHelper.TryGetInteger(payload, out consumed, out var id))
             {
                 break;
             }
 
-            payload = payload.Slice(consumed);
-
-            var value = VariableLengthIntegerHelper.GetInteger(payload, out consumed, out _);
-            if (value == -1)
+            if (!VariableLengthIntegerHelper.TryGetInteger(payload.Slice(consumed), out consumed, out var value))
             {
+                // Reset consumed to very start even though we successfully read 1 varint. It's because we want to keep the id for when we have the value as well.
+                consumed = payload.Start;
                 break;
             }
 
@@ -382,37 +428,48 @@ private void ProcessSetting(long id, long value)
         }
     }
 
-    private ValueTask ProcessGoAwayFrameAsync()
+    private ValueTask ProcessGoAwayFrameAsync(bool isContinuedFrame, Http3RawFrame incomingFrame, ReadOnlySequence<byte> payload, out SequencePosition consumed)
     {
-        EnsureSettingsFrame(Http3FrameType.GoAway);
+        // https://www.rfc-editor.org/rfc/rfc9114.html#name-goaway
+
+        // We've already triggered RequestClose since isContinuedFrame is only true
+        // after we've already parsed the frame type and called the processing function at least once.
+        if (!isContinuedFrame)
+        {
+            EnsureSettingsFrame(Http3FrameType.GoAway);
 
-        // StopProcessingNextRequest must be called before RequestClose to ensure it's considered client initiated.
-        _context.Connection.StopProcessingNextRequest(serverInitiated: false, ConnectionEndReason.ClientGoAway);
-        _context.ConnectionContext.Features.Get<IConnectionLifetimeNotificationFeature>()?.RequestClose();
+            // StopProcessingNextRequest must be called before RequestClose to ensure it's considered client initiated.
+            _context.Connection.StopProcessingNextRequest(serverInitiated: false, ConnectionEndReason.ClientGoAway);
+            _context.ConnectionContext.Features.Get<IConnectionLifetimeNotificationFeature>()?.RequestClose();
+        }
 
-        // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#name-goaway
-        // PUSH is not implemented so nothing to do.
+        // PUSH is not implemented but we still want to parse the frame to do error checking
+        ParseVarIntWithFrameLengthValidation(incomingFrame, payload, out consumed);
 
         // TODO: Double check the connection remains open.
         return default;
     }
 
-    private ValueTask ProcessCancelPushFrameAsync()
+    private ValueTask ProcessCancelPushFrameAsync(Http3RawFrame incomingFrame, ReadOnlySequence<byte> payload, out SequencePosition consumed)
     {
+        // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.3
+
         EnsureSettingsFrame(Http3FrameType.CancelPush);
 
-        // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#name-cancel_push
-        // PUSH is not implemented so nothing to do.
+        // PUSH is not implemented but we still want to parse the frame to do error checking
+        ParseVarIntWithFrameLengthValidation(incomingFrame, payload, out consumed);
 
         return default;
     }
 
-    private ValueTask ProcessMaxPushIdFrameAsync()
+    private ValueTask ProcessMaxPushIdFrameAsync(Http3RawFrame incomingFrame, ReadOnlySequence<byte> payload, out SequencePosition consumed)
     {
+        // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.7
+
         EnsureSettingsFrame(Http3FrameType.MaxPushId);
 
-        // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#name-cancel_push
-        // PUSH is not implemented so nothing to do.
+        // PUSH is not implemented but we still want to parse the frame to do error checking
+        ParseVarIntWithFrameLengthValidation(incomingFrame, payload, out consumed);
 
         return default;
     }
@@ -426,6 +483,23 @@ private ValueTask ProcessUnknownFrameAsync(Http3FrameType frameType)
         return default;
     }
 
+    // Used for frame types that aren't (fully) implemented yet and contain a single var int as part of their framing. (CancelPush, MaxPushId, GoAway)
+    // We want to throw an error if the length field of the frame is larger than the spec defined format of the frame.
+    private static void ParseVarIntWithFrameLengthValidation(Http3RawFrame incomingFrame, ReadOnlySequence<byte> payload, out SequencePosition consumed)
+    {
+        if (!VariableLengthIntegerHelper.TryGetInteger(payload, out consumed, out _))
+        {
+            return;
+        }
+
+        if (incomingFrame.RemainingLength > payload.Slice(0, consumed).Length)
+        {
+            // https://www.rfc-editor.org/rfc/rfc9114.html#section-10.8
+            // An implementation MUST ensure that the length of a frame exactly matches the length of the fields it contains.
+            throw new Http3ConnectionErrorException(CoreStrings.FormatHttp3ControlStreamFrameTooLarge(Http3Formatting.ToFormattedType(incomingFrame.Type)), Http3ErrorCode.FrameError, ConnectionEndReason.InvalidFrameLength);
+        }
+    }
+
     private void EnsureSettingsFrame(Http3FrameType frameType)
     {
         if (!_haveReceivedSettingsFrame)
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameReader.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameReader.cs
index 66740c710f10..2de0472483a1 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameReader.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameReader.cs
@@ -19,36 +19,44 @@ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
         |                       Frame Payload (*)                     ...
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     */
-    internal static bool TryReadFrame(ref ReadOnlySequence<byte> readableBuffer, Http3RawFrame frame, out ReadOnlySequence<byte> framePayload)
+    // Reads and returns partial frames, don't rely on the frame being complete when using this method
+    // Set isContinuedFrame to true when expecting to read more of the previous frame
+    internal static bool TryReadFrame(ref ReadOnlySequence<byte> readableBuffer, Http3RawFrame frame, bool isContinuedFrame, out ReadOnlySequence<byte> framePayload)
     {
         framePayload = ReadOnlySequence<byte>.Empty;
-        SequencePosition consumed;
+        SequencePosition consumed = readableBuffer.Start;
+        var length = frame.RemainingLength;
 
-        var type = VariableLengthIntegerHelper.GetInteger(readableBuffer, out consumed, out _);
-        if (type == -1)
+        if (!isContinuedFrame)
         {
-            return false;
-        }
+            if (!VariableLengthIntegerHelper.TryGetInteger(readableBuffer, out consumed, out var type))
+            {
+                return false;
+            }
 
-        var firstLengthBuffer = readableBuffer.Slice(consumed);
+            var firstLengthBuffer = readableBuffer.Slice(consumed);
 
-        var length = VariableLengthIntegerHelper.GetInteger(firstLengthBuffer, out consumed, out _);
+            if (!VariableLengthIntegerHelper.TryGetInteger(firstLengthBuffer, out consumed, out length))
+            {
+                return false;
+            }
 
-        // Make sure the whole frame is buffered
-        if (length == -1)
-        {
-            return false;
+            frame.RemainingLength = length;
+            frame.Type = (Http3FrameType)type;
         }
 
         var startOfFramePayload = readableBuffer.Slice(consumed);
-        if (startOfFramePayload.Length < length)
+
+        // Get all the available bytes or the rest of the frame whichever is less
+        length = Math.Min(startOfFramePayload.Length, length);
+
+        // If we were expecting a non-empty payload, but haven't received any of it yet,
+        // there is nothing to process until we wait for more data.
+        if (length == 0 && frame.RemainingLength != 0)
         {
             return false;
         }
 
-        frame.Length = length;
-        frame.Type = (Http3FrameType)type;
-
         // The remaining payload minus the extra fields
         framePayload = startOfFramePayload.Slice(0, length);
         readableBuffer = readableBuffer.Slice(framePayload.End);
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameWriter.cs
index 44ade9362ea1..7ddfbd62ec9f 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameWriter.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3FrameWriter.cs
@@ -29,7 +29,7 @@ internal sealed class Http3FrameWriter
     private const int MaxDataFrameSize = 16 * 1024;
     private const int HeaderBufferSize = 16 * 1024;
 
-    private readonly object _writeLock = new object();
+    private readonly Lock _writeLock = new();
 
     private readonly int _maxTotalHeaderSize;
     private readonly ConnectionContext _connectionContext;
@@ -121,7 +121,7 @@ internal Task WriteSettingsAsync(List<Http3PeerSetting> settings)
         WriteSettings(settings, buffer);
 
         // Advance pipe writer and flush
-        _outgoingFrame.Length = totalLength;
+        _outgoingFrame.RemainingLength = totalLength;
         _outputWriter.Advance(totalLength);
 
         return _outputWriter.FlushAsync().GetAsTask();
@@ -186,7 +186,7 @@ private void WriteDataUnsynchronized(in ReadOnlySequence<byte> data, long dataLe
             return;
         }
 
-        _outgoingFrame.Length = (int)dataLength;
+        _outgoingFrame.RemainingLength = (int)dataLength;
 
         WriteHeaderUnsynchronized();
 
@@ -209,7 +209,7 @@ void SplitAndWriteDataUnsynchronized(in ReadOnlySequence<byte> data, long dataLe
             do
             {
                 var currentData = remainingData.Slice(0, dataPayloadLength);
-                _outgoingFrame.Length = dataPayloadLength;
+                _outgoingFrame.RemainingLength = dataPayloadLength;
 
                 WriteHeaderUnsynchronized();
 
@@ -223,7 +223,7 @@ void SplitAndWriteDataUnsynchronized(in ReadOnlySequence<byte> data, long dataLe
 
             } while (dataLength > dataPayloadLength);
 
-            _outgoingFrame.Length = (int)dataLength;
+            _outgoingFrame.RemainingLength = (int)dataLength;
 
             WriteHeaderUnsynchronized();
 
@@ -240,7 +240,7 @@ internal ValueTask<FlushResult> WriteGoAway(long id)
 
         var length = VariableLengthIntegerHelper.GetByteCount(id);
 
-        _outgoingFrame.Length = length;
+        _outgoingFrame.RemainingLength = length;
 
         WriteHeaderUnsynchronized();
 
@@ -253,10 +253,10 @@ internal ValueTask<FlushResult> WriteGoAway(long id)
     private void WriteHeaderUnsynchronized()
     {
         _log.Http3FrameSending(_connectionId, _streamIdFeature.StreamId, _outgoingFrame);
-        var headerLength = WriteHeader(_outgoingFrame.Type, _outgoingFrame.Length, _outputWriter);
+        var headerLength = WriteHeader(_outgoingFrame.Type, _outgoingFrame.RemainingLength, _outputWriter);
 
         // We assume the payload will be written prior to the next flush.
-        _unflushedBytes += headerLength + _outgoingFrame.Length;
+        _unflushedBytes += headerLength + _outgoingFrame.RemainingLength;
     }
 
     public ValueTask<FlushResult> Write100ContinueAsync()
@@ -269,7 +269,7 @@ public ValueTask<FlushResult> Write100ContinueAsync()
             }
 
             _outgoingFrame.PrepareHeaders();
-            _outgoingFrame.Length = ContinueBytes.Length;
+            _outgoingFrame.RemainingLength = ContinueBytes.Length;
             WriteHeaderUnsynchronized();
             _outputWriter.Write(ContinueBytes);
             return TimeFlushUnsynchronizedAsync();
@@ -394,7 +394,7 @@ private void FinishWritingHeaders(int payloadLength, bool done)
 
         ValidateHeadersTotalSize();
 
-        _outgoingFrame.Length = _headerEncodingBuffer.WrittenCount;
+        _outgoingFrame.RemainingLength = _headerEncodingBuffer.WrittenCount;
         WriteHeaderUnsynchronized();
         _outputWriter.Write(_headerEncodingBuffer.WrittenSpan);
 
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3OutputProducer.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3OutputProducer.cs
index ac8307de6e46..4fd2c740c3b1 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3OutputProducer.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3OutputProducer.cs
@@ -24,7 +24,7 @@ internal sealed class Http3OutputProducer : IHttpOutputProducer, IHttpOutputAbor
     private readonly Pipe _pipe;
     private readonly PipeWriter _pipeWriter;
     private readonly PipeReader _pipeReader;
-    private readonly object _dataWriterLock = new object();
+    private readonly Lock _dataWriterLock = new();
     private ValueTask<FlushResult> _dataWriteProcessingTask;
     private bool _startedWritingDataFrames;
     private bool _streamCompleted;
@@ -68,24 +68,18 @@ public void StreamReset()
         _dataWriteProcessingTask = ProcessDataWrites().Preserve();
     }
 
-    public void Dispose()
+    // Called once Application code has exited
+    // Or on Dispose which also would occur after Application code finished
+    public void Complete()
     {
         lock (_dataWriterLock)
         {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-
             Stop();
 
-            if (_fakeMemoryOwner != null)
-            {
-                _fakeMemoryOwner.Dispose();
-                _fakeMemoryOwner = null;
-            }
+            _pipeWriter.Complete();
+
+            _fakeMemoryOwner?.Dispose();
+            _fakeMemoryOwner = null;
 
             if (_fakeMemory != null)
             {
@@ -95,6 +89,21 @@ public void Dispose()
         }
     }
 
+    public void Dispose()
+    {
+        lock (_dataWriterLock)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            _disposed = true;
+
+            Complete();
+        }
+    }
+
     // In HTTP/1.x, this aborts the entire connection. For HTTP/3 we abort the stream.
     void IHttpOutputAborter.Abort(ConnectionAbortedException abortReason, ConnectionEndReason reason)
     {
@@ -138,17 +147,17 @@ public void CancelPendingFlush()
         }
     }
 
-    public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
+    public ValueTask<FlushResult> FirstWriteAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
     {
         lock (_dataWriterLock)
         {
-            WriteResponseHeaders(statusCode, reasonPhrase, responseHeaders, autoChunk, appCompleted: false);
+            WriteResponseHeaders(statusCode, reasonPhrase, responseHeaders, responseBodyMode, appCompleted: false);
 
             return WriteDataToPipeAsync(data, cancellationToken);
         }
     }
 
-    public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
+    public ValueTask<FlushResult> FirstWriteChunkedAsync(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, ReadOnlySpan<byte> data, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }
@@ -288,7 +297,9 @@ public void Stop()
 
             _streamCompleted = true;
 
-            _pipeWriter.Complete(new OperationCanceledException());
+            // Application code could be using this PipeWriter, we cancel the next (or in progress) flush so they can observe this Stop
+            // Additionally, _streamCompleted will cause any future PipeWriter operations to noop
+            _pipeWriter.CancelPendingFlush();
         }
     }
 
@@ -362,7 +373,7 @@ public ValueTask<FlushResult> WriteDataToPipeAsync(ReadOnlySpan<byte> data, Canc
         }
     }
 
-    public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, bool autoChunk, bool appCompleted)
+    public void WriteResponseHeaders(int statusCode, string? reasonPhrase, HttpResponseHeaders responseHeaders, ResponseBodyMode responseBodyMode, bool appCompleted)
     {
         // appCompleted flag is not used here. The write FIN is sent via the transport and not via the frame.
         // Headers are written to buffer and flushed with a FIN when Http3FrameWriter.CompleteAsync is called
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3PendingStream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3PendingStream.cs
index b6db0bb810db..7dabb9654c56 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3PendingStream.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3PendingStream.cs
@@ -60,8 +60,7 @@ public async ValueTask<long> ReadNextStreamHeaderAsync(Http3StreamContext contex
 
                 if (!readableBuffer.IsEmpty)
                 {
-                    var value = VariableLengthIntegerHelper.GetInteger(readableBuffer, out consumed, out _);
-                    if (value != -1)
+                    if (VariableLengthIntegerHelper.TryGetInteger(readableBuffer, out consumed, out var value))
                     {
                         if (!advanceOn.HasValue || value == (long)advanceOn)
                         {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs
index ccf595d7f89f..7ada6890f867 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs
@@ -54,18 +54,31 @@ internal abstract partial class Http3Stream : HttpProtocol, IHttp3Stream, IHttpS
     private bool _isMethodConnect;
     private bool _isWebTransportSessionAccepted;
     private Http3MessageBody? _messageBody;
+    private bool _requestBodyStarted;
 
     private readonly ManualResetValueTaskSource<object?> _appCompletedTaskSource = new();
-    private readonly object _completionLock = new();
+    private readonly Lock _completionLock = new();
 
     protected RequestHeaderParsingState _requestHeaderParsingState;
-    protected readonly Http3RawFrame _incomingFrame = new();
 
     public bool EndStreamReceived => (_completionState & StreamCompletionFlags.EndStreamReceived) == StreamCompletionFlags.EndStreamReceived;
     public bool IsAborted => (_completionState & StreamCompletionFlags.Aborted) == StreamCompletionFlags.Aborted;
     private bool IsAbortedRead => (_completionState & StreamCompletionFlags.AbortedRead) == StreamCompletionFlags.AbortedRead;
     public bool IsCompleted => (_completionState & StreamCompletionFlags.Completed) == StreamCompletionFlags.Completed;
 
+    public bool CanReuse => !_connectionAborted && HasResponseCompleted;
+
+    public bool ReceivedEmptyRequestBody
+    {
+        get
+        {
+            lock (_completionLock)
+            {
+                return EndStreamReceived && !_requestBodyStarted;
+            }
+        }
+    }
+
     public Pipe RequestBodyPipe { get; private set; } = default!;
     public long? InputRemaining { get; internal set; }
     public QPackDecoder QPackDecoder { get; private set; } = default!;
@@ -561,6 +574,10 @@ private void CompleteStream(bool errored)
             TryClose();
         }
 
+        RequestBodyPipe.Reader.Complete();
+
+        _http3Output.Complete();
+
         // Stream will be pooled after app completed.
         // Wait to signal app completed after any potential aborts on the stream.
         _appCompletedTaskSource.SetResult(null);
@@ -607,6 +624,8 @@ public async Task ProcessRequestAsync<TContext>(IHttpApplication<TContext> appli
 
         try
         {
+            var incomingFrame = new Http3RawFrame();
+            var isContinuedFrame = false;
             while (_isClosed == 0)
             {
                 var result = await Input.ReadAsync();
@@ -618,12 +637,19 @@ public async Task ProcessRequestAsync<TContext>(IHttpApplication<TContext> appli
                 {
                     if (!readableBuffer.IsEmpty)
                     {
-                        while (Http3FrameReader.TryReadFrame(ref readableBuffer, _incomingFrame, out var framePayload))
+                        while (Http3FrameReader.TryReadFrame(ref readableBuffer, incomingFrame, isContinuedFrame, out var framePayload))
                         {
-                            Log.Http3FrameReceived(ConnectionId, _streamIdFeature.StreamId, _incomingFrame);
+                            // Only log when parsing the beginning of the frame
+                            if (!isContinuedFrame)
+                            {
+                                Log.Http3FrameReceived(ConnectionId, _streamIdFeature.StreamId, incomingFrame);
+                            }
 
                             consumed = examined = framePayload.End;
-                            await ProcessHttp3Stream(application, framePayload, result.IsCompleted && readableBuffer.IsEmpty);
+                            await ProcessHttp3Stream(application, incomingFrame, isContinuedFrame, framePayload, result.IsCompleted && readableBuffer.IsEmpty);
+
+                            incomingFrame.RemainingLength -= framePayload.Length;
+                            isContinuedFrame = incomingFrame.RemainingLength > 0 ? true : false;
                         }
                     }
 
@@ -746,22 +772,23 @@ private ValueTask OnEndStreamReceived()
         return RequestBodyPipe.Writer.CompleteAsync();
     }
 
-    private Task ProcessHttp3Stream<TContext>(IHttpApplication<TContext> application, in ReadOnlySequence<byte> payload, bool isCompleted) where TContext : notnull
+    private Task ProcessHttp3Stream<TContext>(IHttpApplication<TContext> application, Http3RawFrame incomingFrame, bool isContinuedFrame,
+        in ReadOnlySequence<byte> payload, bool isCompleted) where TContext : notnull
     {
-        return _incomingFrame.Type switch
+        return incomingFrame.Type switch
         {
             Http3FrameType.Data => ProcessDataFrameAsync(payload),
-            Http3FrameType.Headers => ProcessHeadersFrameAsync(application, payload, isCompleted),
+            Http3FrameType.Headers => ProcessHeadersFrameAsync(application, incomingFrame, isContinuedFrame, payload, isCompleted),
             // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#section-7.2.4
             // These frames need to be on a control stream
             Http3FrameType.Settings or
             Http3FrameType.CancelPush or
             Http3FrameType.GoAway or
             Http3FrameType.MaxPushId => throw new Http3ConnectionErrorException(
-                CoreStrings.FormatHttp3ErrorUnsupportedFrameOnRequestStream(_incomingFrame.FormattedType), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame),
+                CoreStrings.FormatHttp3ErrorUnsupportedFrameOnRequestStream(incomingFrame.FormattedType), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame),
             // The server should never receive push promise
             Http3FrameType.PushPromise => throw new Http3ConnectionErrorException(
-                CoreStrings.FormatHttp3ErrorUnsupportedFrameOnServer(_incomingFrame.FormattedType), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame),
+                CoreStrings.FormatHttp3ErrorUnsupportedFrameOnServer(incomingFrame.FormattedType), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame),
             _ => ProcessUnknownFrameAsync(),
         };
     }
@@ -773,11 +800,13 @@ private static Task ProcessUnknownFrameAsync()
         return Task.CompletedTask;
     }
 
-    private async Task ProcessHeadersFrameAsync<TContext>(IHttpApplication<TContext> application, ReadOnlySequence<byte> payload, bool isCompleted) where TContext : notnull
+    private async Task ProcessHeadersFrameAsync<TContext>(IHttpApplication<TContext> application, Http3RawFrame incomingFrame, bool isContinuedFrame,
+        ReadOnlySequence<byte> payload, bool isCompleted) where TContext : notnull
     {
         // HEADERS frame after trailing headers is invalid.
         // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#section-4.1
-        if (_requestHeaderParsingState == RequestHeaderParsingState.Trailers)
+        // Since we parse data as we get it, we can receive partial frames which means we need to check that we're in the middle of handling the trailers header frame
+        if (_requestHeaderParsingState == RequestHeaderParsingState.Trailers && !isContinuedFrame)
         {
             throw new Http3ConnectionErrorException(CoreStrings.FormatHttp3StreamErrorFrameReceivedAfterTrailers(Http3Formatting.ToFormattedType(Http3FrameType.Headers)), Http3ErrorCode.UnexpectedFrame, ConnectionEndReason.UnexpectedFrame);
         }
@@ -789,8 +818,17 @@ private async Task ProcessHeadersFrameAsync<TContext>(IHttpApplication<TContext>
 
         try
         {
-            QPackDecoder.Decode(payload, endHeaders: true, handler: this);
-            QPackDecoder.Reset();
+            var endHeaders = payload.Length == incomingFrame.RemainingLength;
+            QPackDecoder.Decode(payload, endHeaders, handler: this);
+            if (endHeaders)
+            {
+                QPackDecoder.Reset();
+            }
+            else
+            {
+                // Headers frame isn't complete, return to read more of the frame
+                return;
+            }
         }
         catch (QPackDecodingException ex)
         {
@@ -907,6 +945,8 @@ private Task ProcessDataFrameAsync(in ReadOnlySequence<byte> payload)
                 return Task.CompletedTask;
             }
 
+            _requestBodyStarted = true;
+
             foreach (var segment in payload)
             {
                 RequestBodyPipe.Writer.Write(segment.Span);
@@ -919,7 +959,6 @@ private Task ProcessDataFrameAsync(in ReadOnlySequence<byte> payload)
     protected override void OnReset()
     {
         _keepAlive = true;
-        _connectionAborted = false;
         _userTrailers = null;
         _isWebTransportSessionAccepted = false;
         _isMethodConnect = false;
@@ -944,6 +983,11 @@ protected override string CreateRequestId()
 
     protected override MessageBody CreateMessageBody()
     {
+        if (ReceivedEmptyRequestBody)
+        {
+            return MessageBody.ZeroContentLengthClose;
+        }
+
         if (_messageBody != null)
         {
             _messageBody.Reset();
diff --git a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs
index 7538e1df1e26..9fa76f9d2472 100644
--- a/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/HttpConnection.cs
@@ -30,7 +30,7 @@ internal sealed class HttpConnection : ITimeoutHandler
     private readonly TimeProvider _timeProvider;
     private readonly TimeoutControl _timeoutControl;
 
-    private readonly object _protocolSelectionLock = new object();
+    private readonly Lock _protocolSelectionLock = new();
     private ProtocolSelectionState _protocolSelectionState = ProtocolSelectionState.Initializing;
     private Http1Connection? _http1Connection;
 
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs
index 045a4e2e0505..8a2f7635b659 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelConnection.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 internal abstract class KestrelConnection : IConnectionHeartbeatFeature, IConnectionCompleteFeature, IConnectionLifetimeNotificationFeature, IConnectionMetricsContextFeature
 {
     private List<(Action<object> handler, object state)>? _heartbeatHandlers;
-    private readonly object _heartbeatLock = new object();
+    private readonly Lock _heartbeatLock = new();
 
     private Stack<KeyValuePair<Func<object, Task>, object>>? _onCompleted;
     private bool _completed;
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.Http3.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.Http3.cs
index 4159c927e531..54e32f258f00 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.Http3.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.Http3.cs
@@ -37,7 +37,7 @@ public void Http3FrameReceived(string connectionId, long streamId, Http3RawFrame
     {
         if (_http3Logger.IsEnabled(LogLevel.Trace))
         {
-            Http3Log.Http3FrameReceived(_http3Logger, connectionId, Http3Formatting.ToFormattedType(frame.Type), streamId, frame.Length);
+            Http3Log.Http3FrameReceived(_http3Logger, connectionId, Http3Formatting.ToFormattedType(frame.Type), streamId, frame.RemainingLength);
         }
     }
 
@@ -45,7 +45,7 @@ public void Http3FrameSending(string connectionId, long streamId, Http3RawFrame
     {
         if (_http3Logger.IsEnabled(LogLevel.Trace))
         {
-            Http3Log.Http3FrameSending(_http3Logger, connectionId, Http3Formatting.ToFormattedType(frame.Type), streamId, frame.Length);
+            Http3Log.Http3FrameSending(_http3Logger, connectionId, Http3Formatting.ToFormattedType(frame.Type), streamId, frame.RemainingLength);
         }
     }
 
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/PipeWriterHelpers/ConcurrentPipeWriter.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/PipeWriterHelpers/ConcurrentPipeWriter.cs
index 2ca58149e7e3..bd625063782e 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/PipeWriterHelpers/ConcurrentPipeWriter.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/PipeWriterHelpers/ConcurrentPipeWriter.cs
@@ -21,7 +21,7 @@ internal sealed class ConcurrentPipeWriter : PipeWriter
 
     private static readonly Exception _successfullyCompletedSentinel = new UnreachableException();
 
-    private readonly object _sync;
+    private readonly Lock _sync;
     private readonly PipeWriter _innerPipeWriter;
     private readonly MemoryPool<byte> _pool;
     private readonly BufferSegmentStack _bufferSegmentPool = new BufferSegmentStack(InitialSegmentPoolSize);
@@ -50,7 +50,7 @@ internal sealed class ConcurrentPipeWriter : PipeWriter
     // If an Complete() is called while a flush is in progress, we clean up after the flush loop completes, and call Complete() on the inner PipeWriter.
     private Exception? _completeException;
 
-    public ConcurrentPipeWriter(PipeWriter innerPipeWriter, MemoryPool<byte> pool, object sync)
+    public ConcurrentPipeWriter(PipeWriter innerPipeWriter, MemoryPool<byte> pool, Lock sync)
     {
         _innerPipeWriter = innerPipeWriter;
         _pool = pool;
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs
index ba907abd7c5b..165f2c555b60 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs
@@ -16,7 +16,7 @@ internal sealed class TimeoutControl : ITimeoutControl, IConnectionTimeoutFeatur
     private long _lastTimestamp;
     private long _timeoutTimestamp = long.MaxValue;
 
-    private readonly object _readTimingLock = new object();
+    private readonly Lock _readTimingLock = new();
     private MinDataRate? _minReadRate;
     private long _minReadRateGracePeriodTicks;
     private bool _readTimingEnabled;
@@ -28,7 +28,7 @@ internal sealed class TimeoutControl : ITimeoutControl, IConnectionTimeoutFeatur
     private int _concurrentIncompleteRequestBodies;
     private int _concurrentAwaitingReads;
 
-    private readonly object _writeTimingLock = new object();
+    private readonly Lock _writeTimingLock = new();
     private int _concurrentAwaitingWrites;
     private long _writeTimingTimeoutTimestamp;
 
@@ -142,8 +142,7 @@ private void CheckForReadDataRateTimeout(long timestamp)
 
     private void CheckForWriteDataRateTimeout(long timestamp)
     {
-        var timeout = false;
-
+        bool timeout;
         lock (_writeTimingLock)
         {
             // Assume overly long tick intervals are the result of server resource starvation.
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs
index c5651c50d2fa..8e2585e75d74 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 
 internal sealed class TransportManager
 {
-    private readonly List<ActiveTransport> _transports = new List<ActiveTransport>();
+    private readonly List<ActiveTransport> _transports = [];
 
     private readonly List<IConnectionListenerFactory> _transportFactories;
     private readonly List<IMultiplexedConnectionListenerFactory> _multiplexedTransportFactories;
@@ -30,7 +30,6 @@ public TransportManager(
         _serviceContext = serviceContext;
     }
 
-    private ConnectionManager ConnectionManager => _serviceContext.ConnectionManager;
     private KestrelTrace Trace => _serviceContext.Log;
 
     public async Task<EndPoint> BindAsync(EndPoint endPoint, ConnectionDelegate connectionDelegate, EndpointConfig? endpointConfig, CancellationToken cancellationToken)
diff --git a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs
index cefdd3d65282..ab03c06fcaaf 100644
--- a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs
@@ -39,8 +39,10 @@ public KestrelServerImpl(
         IEnumerable<IMultiplexedConnectionListenerFactory> multiplexedFactories,
         IHttpsConfigurationService httpsConfigurationService,
         ILoggerFactory loggerFactory,
-        KestrelMetrics metrics)
-        : this(transportFactories, multiplexedFactories, httpsConfigurationService, CreateServiceContext(options, loggerFactory, diagnosticSource: null, metrics))
+        DiagnosticSource? diagnosticSource,
+        KestrelMetrics metrics,
+        IEnumerable<IHeartbeatHandler> heartbeatHandlers)
+        : this(transportFactories, multiplexedFactories, httpsConfigurationService, CreateServiceContext(options, loggerFactory, diagnosticSource, metrics, heartbeatHandlers))
     {
     }
 
@@ -54,8 +56,8 @@ internal KestrelServerImpl(
     {
         ArgumentNullException.ThrowIfNull(transportFactories);
 
-        _transportFactories = transportFactories.Reverse().ToList();
-        _multiplexedTransportFactories = multiplexedFactories.Reverse().ToList();
+        _transportFactories = Enumerable.Reverse(transportFactories).ToList();
+        _multiplexedTransportFactories = Enumerable.Reverse(multiplexedFactories).ToList();
         _httpsConfigurationService = httpsConfigurationService;
 
         if (_transportFactories.Count == 0 && _multiplexedTransportFactories.Count == 0)
@@ -72,7 +74,8 @@ internal KestrelServerImpl(
         _transportManager = new TransportManager(_transportFactories, _multiplexedTransportFactories, _httpsConfigurationService, ServiceContext);
     }
 
-    private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions> options, ILoggerFactory loggerFactory, DiagnosticSource? diagnosticSource, KestrelMetrics metrics)
+    private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions> options, ILoggerFactory loggerFactory, DiagnosticSource? diagnosticSource, KestrelMetrics metrics,
+        IEnumerable<IHeartbeatHandler> heartbeatHandlers)
     {
         ArgumentNullException.ThrowIfNull(options);
         ArgumentNullException.ThrowIfNull(loggerFactory);
@@ -86,7 +89,7 @@ private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions
         var dateHeaderValueManager = new DateHeaderValueManager(TimeProvider.System);
 
         var heartbeat = new Heartbeat(
-            new IHeartbeatHandler[] { dateHeaderValueManager, connectionManager },
+            [ dateHeaderValueManager, connectionManager, ..heartbeatHandlers ],
             TimeProvider.System,
             DebuggerWrapper.Singleton,
             trace,
@@ -111,7 +114,8 @@ private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions
 
     public KestrelServerOptions Options => ServiceContext.ServerOptions;
 
-    private ServiceContext ServiceContext { get; }
+    // Internal for testing
+    internal ServiceContext ServiceContext { get; }
 
     private KestrelTrace Trace => ServiceContext.Log;
 
diff --git a/src/Servers/Kestrel/Core/src/Internal/PinnedBlockMemoryPoolFactory.cs b/src/Servers/Kestrel/Core/src/Internal/PinnedBlockMemoryPoolFactory.cs
new file mode 100644
index 000000000000..777c7aa611df
--- /dev/null
+++ b/src/Servers/Kestrel/Core/src/Internal/PinnedBlockMemoryPoolFactory.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Collections.Concurrent;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
+
+internal sealed class PinnedBlockMemoryPoolFactory : IMemoryPoolFactory<byte>, IHeartbeatHandler
+{
+    private readonly MemoryPoolMetrics _metrics;
+    private readonly ILogger? _logger;
+    private readonly TimeProvider _timeProvider;
+    // micro-optimization: Using nuint as the value type to avoid GC write barriers; could replace with ConcurrentHashSet if that becomes available
+    private readonly ConcurrentDictionary<PinnedBlockMemoryPool, nuint> _pools = new();
+
+    public PinnedBlockMemoryPoolFactory(MemoryPoolMetrics metrics, TimeProvider? timeProvider = null, ILogger<PinnedBlockMemoryPoolFactory>? logger = null)
+    {
+        _timeProvider = timeProvider ?? TimeProvider.System;
+        _metrics = metrics;
+        _logger = logger;
+    }
+
+    public MemoryPool<byte> Create(MemoryPoolOptions? options = null)
+    {
+        var pool = new PinnedBlockMemoryPool(options?.Owner, _metrics, _logger);
+
+        _pools.TryAdd(pool, nuint.Zero);
+
+        pool.OnPoolDisposed(static (state, self) =>
+        {
+            ((ConcurrentDictionary<PinnedBlockMemoryPool, nuint>)state!).TryRemove(self, out _);
+        }, _pools);
+
+        return pool;
+    }
+
+    public void OnHeartbeat()
+    {
+        var now = _timeProvider.GetUtcNow();
+        foreach (var pool in _pools)
+        {
+            pool.Key.TryScheduleEviction(now);
+        }
+    }
+}
diff --git a/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs b/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs
index 08b2d87c5b84..f700cf41cc32 100644
--- a/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/SniOptionsSelector.cs
@@ -200,6 +200,10 @@ internal static SslServerAuthenticationOptions CloneSslOptions(SslServerAuthenti
             ServerCertificateSelectionCallback = sslOptions.ServerCertificateSelectionCallback,
             CertificateChainPolicy = sslOptions.CertificateChainPolicy,
             AllowTlsResume = sslOptions.AllowTlsResume,
+#pragma warning disable CA1416 // Ignore SupportedOSPlatform checks, we're just copying the value
+            AllowRsaPssPadding = sslOptions.AllowRsaPssPadding,
+            AllowRsaPkcs1Padding = sslOptions.AllowRsaPkcs1Padding,
+#pragma warning restore CA1416
         };
 
     private sealed class SniOptions
diff --git a/src/Servers/Kestrel/Core/src/Internal/TlsConnectionFeature.cs b/src/Servers/Kestrel/Core/src/Internal/TlsConnectionFeature.cs
index 2e23dbe585a5..2e16b0042715 100644
--- a/src/Servers/Kestrel/Core/src/Internal/TlsConnectionFeature.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/TlsConnectionFeature.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
+using Obsoletions = Microsoft.AspNetCore.Shared.Obsoletions;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 
@@ -54,16 +55,22 @@ public X509Certificate2? ClientCertificate
 
     public TlsCipherSuite? NegotiatedCipherSuite => _sslStream.NegotiatedCipherSuite;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public CipherAlgorithmType CipherAlgorithm => _sslStream.CipherAlgorithm;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int CipherStrength => _sslStream.CipherStrength;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public HashAlgorithmType HashAlgorithm => _sslStream.HashAlgorithm;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int HashStrength => _sslStream.HashStrength;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public ExchangeAlgorithmType KeyExchangeAlgorithm => _sslStream.KeyExchangeAlgorithm;
 
+    [Obsolete(Obsoletions.RuntimeTlsCipherAlgorithmEnumsMessage, DiagnosticId = Obsoletions.RuntimeTlsCipherAlgorithmEnumsDiagId, UrlFormat = Obsoletions.RuntimeSharedUrlFormat)]
     public int KeyExchangeStrength => _sslStream.KeyExchangeStrength;
 
     public Task<X509Certificate2?> GetClientCertificateAsync(CancellationToken cancellationToken)
diff --git a/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs b/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs
index 05ae34f89802..6bfa5bfe60c4 100644
--- a/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs
+++ b/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs
@@ -49,6 +49,9 @@ internal static BadHttpRequestException GetException(RequestRejectionReason reas
             case RequestRejectionReason.BadChunkSizeData:
                 ex = new BadHttpRequestException(CoreStrings.BadRequest_BadChunkSizeData, StatusCodes.Status400BadRequest, reason);
                 break;
+            case RequestRejectionReason.BadChunkExtension:
+                ex = new BadHttpRequestException(CoreStrings.BadRequest_BadChunkExtension, StatusCodes.Status400BadRequest, reason);
+                break;
             case RequestRejectionReason.ChunkedRequestIncomplete:
                 ex = new BadHttpRequestException(CoreStrings.BadRequest_ChunkedRequestIncomplete, StatusCodes.Status400BadRequest, reason);
                 break;
diff --git a/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs b/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs
index 49842d4c3389..e7e67c67c6d4 100644
--- a/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs
+++ b/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs
@@ -77,6 +77,8 @@ internal KestrelConfigurationLoader(
     private CertificateConfig? DefaultCertificateConfig { get; set; }
     internal X509Certificate2? DefaultCertificate { get; set; }
 
+    internal X509Certificate2Collection? DefaultCertificateChain { get; set; }
+
     /// <summary>
     /// Specifies a configuration Action to run when an endpoint with the given name is loaded from configuration.
     /// </summary>
@@ -345,12 +347,14 @@ internal void ProcessEndpointsToAdd()
 
         DefaultCertificateConfig = null;
         DefaultCertificate = null;
+        DefaultCertificateChain = null;
 
         ConfigurationReader = new ConfigurationReader(Configuration);
 
         if (_httpsConfigurationService.IsInitialized && _httpsConfigurationService.LoadDefaultCertificate(ConfigurationReader) is CertificateAndConfig certPair)
         {
             DefaultCertificate = certPair.Certificate;
+            DefaultCertificateChain = certPair.CertificateChain;
             DefaultCertificateConfig = certPair.CertificateConfig;
         }
 
diff --git a/src/Servers/Kestrel/Core/src/KestrelServer.cs b/src/Servers/Kestrel/Core/src/KestrelServer.cs
index 75cec0130767..3b91510218f3 100644
--- a/src/Servers/Kestrel/Core/src/KestrelServer.cs
+++ b/src/Servers/Kestrel/Core/src/KestrelServer.cs
@@ -36,7 +36,9 @@ public KestrelServer(IOptions<KestrelServerOptions> options, IConnectionListener
             Array.Empty<IMultiplexedConnectionListenerFactory>(),
             new SimpleHttpsConfigurationService(),
             loggerFactory,
-            new KestrelMetrics(new DummyMeterFactory()));
+            diagnosticSource: null,
+            new KestrelMetrics(new DummyMeterFactory()),
+            heartbeatHandlers: []);
     }
 
     /// <inheritdoc />
diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
index 63efe1767cad..30c703d9d87f 100644
--- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
+++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
@@ -303,6 +303,10 @@ internal void ApplyDefaultCertificate(HttpsConnectionAdapterOptions httpsOptions
         if (ConfigurationLoader?.DefaultCertificate is X509Certificate2 certificateFromLoader)
         {
             httpsOptions.ServerCertificate = certificateFromLoader;
+            if (ConfigurationLoader?.DefaultCertificateChain is X509Certificate2Collection certificateChainFromLoader)
+            {
+                httpsOptions.ServerCertificateChain = certificateChainFromLoader;
+            }
             return;
         }
 
diff --git a/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs b/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs
index 6bb8a8a0b30a..7bec030e3ca1 100644
--- a/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs
+++ b/src/Servers/Kestrel/Core/src/LocalhostListenOptions.cs
@@ -9,6 +9,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core;
 
 internal sealed class LocalhostListenOptions : ListenOptions
 {
+    private readonly string? _hostPrefix;
+
+    internal LocalhostListenOptions(int port, string hostPrefix)
+        : this(port)
+    {
+        _hostPrefix = hostPrefix ?? throw new ArgumentNullException(nameof(hostPrefix));
+    }
+
     internal LocalhostListenOptions(int port)
         : base(new IPEndPoint(IPAddress.Loopback, port))
     {
@@ -23,7 +31,8 @@ internal LocalhostListenOptions(int port)
     /// </summary>
     internal override string GetDisplayName()
     {
-        return $"{Scheme}://localhost:{IPEndPoint!.Port}";
+        var host = _hostPrefix is { } prefix ? $"{prefix}.localhost" : "localhost";
+        return $"{Scheme}://{host}:{IPEndPoint!.Port}";
     }
 
     internal override async Task BindAsync(AddressBindContext context, CancellationToken cancellationToken)
diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
index d53a2a61a10c..c35c22dd8d94 100644
--- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
+++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Core components of ASP.NET Core Kestrel cross-platform web server.</Description>
@@ -34,8 +34,10 @@
     <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Debugger\StringValuesDictionaryDebugView.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)Metrics\MetricsConstants.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Obsoletions.cs" LinkBase="Shared" />
     <Compile Include="$(RepoRoot)src\Shared\TaskToApm.cs" Link="Internal\TaskToApm.cs" />
     <Compile Include="$(SharedSourceRoot)Metrics\MetricsExtensions.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs b/src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs
index 4508204d7fe7..7f6b3bf1b197 100644
--- a/src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs
+++ b/src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs
@@ -17,6 +17,7 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Middleware;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
@@ -44,6 +45,9 @@ internal sealed class HttpsConnectionMiddleware
     private readonly Func<TlsHandshakeCallbackContext, ValueTask<SslServerAuthenticationOptions>>? _tlsCallbackOptions;
     private readonly object? _tlsCallbackOptionsState;
 
+    // Captures raw TLS client hello and invokes a user callback if any
+    private readonly TlsListener? _tlsListener;
+
     // Internal for testing
     internal readonly HttpProtocols _httpProtocols;
 
@@ -112,6 +116,11 @@ public HttpsConnectionMiddleware(ConnectionDelegate next, HttpsConnectionAdapter
             (RemoteCertificateValidationCallback?)null : RemoteCertificateValidationCallback;
 
         _sslStreamFactory = s => new SslStream(s, leaveInnerStreamOpen: false, userCertificateValidationCallback: remoteCertificateValidationCallback);
+
+        if (options.TlsClientHelloBytesCallback is not null)
+        {
+            _tlsListener = new TlsListener(options.TlsClientHelloBytesCallback);
+        }
     }
 
     internal HttpsConnectionMiddleware(
@@ -162,6 +171,10 @@ public async Task OnConnectionAsync(ConnectionContext context)
             using var cancellationTokenSource = _ctsPool.Rent();
             cancellationTokenSource.CancelAfter(_handshakeTimeout);
 
+            if (_tlsListener is not null)
+            {
+                await _tlsListener.OnTlsClientHelloAsync(context, cancellationTokenSource.Token);
+            }
             if (_tlsCallbackOptions is null)
             {
                 await DoOptionsBasedHandshakeAsync(context, sslStream, feature, cancellationTokenSource.Token);
diff --git a/src/Servers/Kestrel/Core/src/Middleware/TlsListener.cs b/src/Servers/Kestrel/Core/src/Middleware/TlsListener.cs
new file mode 100644
index 000000000000..c7207daf05b3
--- /dev/null
+++ b/src/Servers/Kestrel/Core/src/Middleware/TlsListener.cs
@@ -0,0 +1,161 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Connections;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Core.Middleware;
+
+internal sealed class TlsListener
+{
+    private readonly Action<ConnectionContext, ReadOnlySequence<byte>> _tlsClientHelloBytesCallback;
+
+    public TlsListener(Action<ConnectionContext, ReadOnlySequence<byte>> tlsClientHelloBytesCallback)
+    {
+        _tlsClientHelloBytesCallback = tlsClientHelloBytesCallback;
+    }
+
+    /// <summary>
+    /// Sniffs the TLS Client Hello message, and invokes a callback if found.
+    /// </summary>
+    internal async Task OnTlsClientHelloAsync(ConnectionContext connection, CancellationToken cancellationToken)
+    {
+        var input = connection.Transport.Input;
+        ClientHelloParseState parseState = ClientHelloParseState.NotEnoughData;
+        short recordLength = -1; // remembers the length of TLS record to not re-parse header on every iteration
+
+        while (true)
+        {
+            var result = await input.ReadAsync(cancellationToken);
+            var buffer = result.Buffer;
+
+            try
+            {
+                // If the buffer length is less than 6 bytes (handshake + version + length + client-hello byte)
+                // and no more data is coming, we can't block in a loop here because we will not get more data
+                if (result.IsCompleted && buffer.Length < 6)
+                {
+                    break;
+                }
+
+                parseState = TryParseClientHello(buffer, ref recordLength, out var clientHelloBytes);
+                if (parseState == ClientHelloParseState.NotEnoughData)
+                {
+                    // if no data will be added, and we still lack enough bytes
+                    // we can't block in a loop, so just exit
+                    if (result.IsCompleted)
+                    {
+                        break;
+                    }
+
+                    continue;
+                }
+
+                if (parseState == ClientHelloParseState.ValidTlsClientHello)
+                {
+                    _tlsClientHelloBytesCallback(connection, clientHelloBytes);
+                }
+
+                Debug.Assert(parseState is ClientHelloParseState.ValidTlsClientHello or ClientHelloParseState.NotTlsClientHello);
+                break; // We can continue with the middleware pipeline
+            }
+            finally
+            {
+                if (parseState is ClientHelloParseState.NotEnoughData)
+                {
+                    input.AdvanceTo(buffer.Start, buffer.End);
+                }
+                else
+                {
+                    // ready to continue middleware pipeline, reset the buffer to initial state
+                    input.AdvanceTo(buffer.Start);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// RFCs
+    /// ----
+    /// TLS 1.1: https://datatracker.ietf.org/doc/html/rfc4346#section-6.2
+    /// TLS 1.2: https://datatracker.ietf.org/doc/html/rfc5246#section-6.2
+    /// TLS 1.3: https://datatracker.ietf.org/doc/html/rfc8446#section-5.1
+    /// </summary>
+    private static ClientHelloParseState TryParseClientHello(ReadOnlySequence<byte> buffer, ref short recordLength, out ReadOnlySequence<byte> clientHelloBytes)
+    {
+        clientHelloBytes = default;
+
+        // in case bad actor will be sending a TLS client hello one byte at a time
+        // and we know the expected length of TLS client hello,
+        // we can check and fail quickly here instead of re-parsing the TLS client hello "header" on each iteration
+        if (recordLength != -1 && buffer.Length < 5 + recordLength)
+        {
+            return ClientHelloParseState.NotEnoughData;
+        }
+
+        // this means we finally got a full tls record, so we can return without parsing again
+        if (recordLength != -1)
+        {
+            clientHelloBytes = buffer.Slice(0, 5 + recordLength);
+            return ClientHelloParseState.ValidTlsClientHello;
+        }
+
+        if (buffer.Length < 6)
+        {
+            return ClientHelloParseState.NotEnoughData;
+        }
+
+        var reader = new SequenceReader<byte>(buffer);
+
+        // Content type must be 0x16 for TLS Handshake
+        if (!reader.TryRead(out byte contentType) || contentType != 0x16)
+        {
+            return ClientHelloParseState.NotTlsClientHello;
+        }
+
+        // Protocol version
+        if (!reader.TryReadBigEndian(out short version) || !IsValidProtocolVersion(version))
+        {
+            return ClientHelloParseState.NotTlsClientHello;
+        }
+
+        // Record length
+        if (!reader.TryReadBigEndian(out recordLength))
+        {
+            return ClientHelloParseState.NotTlsClientHello;
+        }
+
+        // byte 6: handshake message type (must be 0x01 for ClientHello)
+        if (!reader.TryRead(out byte handshakeType) || handshakeType != 0x01)
+        {
+            return ClientHelloParseState.NotTlsClientHello;
+        }
+
+        // 5 bytes are
+        // 1) Handshake (1 byte)
+        // 2) Protocol version (2 bytes)
+        // 3) Record length (2 bytes)
+        if (buffer.Length < 5 + recordLength)
+        {
+            return ClientHelloParseState.NotEnoughData;
+        }
+
+        clientHelloBytes = buffer.Slice(0, 5 + recordLength);
+        return ClientHelloParseState.ValidTlsClientHello;
+    }
+
+    private static bool IsValidProtocolVersion(short version)
+        => version is 0x0300  // SSL 3.0 (0x0300)
+                   or 0x0301  // TLS 1.0 (0x0301)
+                   or 0x0302  // TLS 1.1 (0x0302)
+                   or 0x0303  // TLS 1.2 (0x0303)
+                   or 0x0304; // TLS 1.3 (0x0304)
+
+    private enum ClientHelloParseState : byte
+    {
+        NotEnoughData,
+        NotTlsClientHello,
+        ValidTlsClientHello
+    }
+}
diff --git a/src/Servers/Kestrel/Core/src/PublicAPI.Shipped.txt b/src/Servers/Kestrel/Core/src/PublicAPI.Shipped.txt
index 9e7d3f10a3d6..5c9b229d4e7e 100644
--- a/src/Servers/Kestrel/Core/src/PublicAPI.Shipped.txt
+++ b/src/Servers/Kestrel/Core/src/PublicAPI.Shipped.txt
@@ -260,6 +260,8 @@ Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.HandleEndpoint(ul
 Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.Load() -> void
 Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.LocalhostEndpoint(int port) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
 Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.LocalhostEndpoint(int port, System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions!>! configure) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
+Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.NamedPipeEndpoint(string! pipeName) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
+Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.NamedPipeEndpoint(string! pipeName, System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions!>! configure) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
 Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.Options.get -> Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions!
 Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.UnixSocketEndpoint(string! socketPath) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
 Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.UnixSocketEndpoint(string! socketPath, System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions!>! configure) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
diff --git a/src/Servers/Kestrel/Core/src/PublicAPI.Unshipped.txt b/src/Servers/Kestrel/Core/src/PublicAPI.Unshipped.txt
index 562e688fc91b..69a983823915 100644
--- a/src/Servers/Kestrel/Core/src/PublicAPI.Unshipped.txt
+++ b/src/Servers/Kestrel/Core/src/PublicAPI.Unshipped.txt
@@ -1,3 +1,3 @@
 #nullable enable
-Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.NamedPipeEndpoint(string! pipeName) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
-Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader.NamedPipeEndpoint(string! pipeName, System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions!>! configure) -> Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader!
+Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions.TlsClientHelloBytesCallback.get -> System.Action<Microsoft.AspNetCore.Connections.ConnectionContext!, System.Buffers.ReadOnlySequence<byte>>?
+Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions.TlsClientHelloBytesCallback.set -> void
diff --git a/src/Servers/Kestrel/Core/src/TlsConfigurationLoader.cs b/src/Servers/Kestrel/Core/src/TlsConfigurationLoader.cs
index 2f19ea9acd26..abeb9df5c392 100644
--- a/src/Servers/Kestrel/Core/src/TlsConfigurationLoader.cs
+++ b/src/Servers/Kestrel/Core/src/TlsConfigurationLoader.cs
@@ -128,9 +128,13 @@ public ListenOptions UseHttpsWithSni(
     {
         if (configurationReader.Certificates.TryGetValue("Default", out var defaultCertConfig))
         {
-            var (defaultCert, _ /* cert chain */) = _certificateConfigLoader.LoadCertificate(defaultCertConfig, "Default");
+            var (defaultCert, defaultCertChain) = _certificateConfigLoader.LoadCertificate(defaultCertConfig, "Default");
             if (defaultCert != null)
             {
+                if (defaultCertChain != null)
+                {
+                    return new CertificateAndConfig(defaultCert, defaultCertConfig, defaultCertChain);
+                }
                 return new CertificateAndConfig(defaultCert, defaultCertConfig);
             }
         }
diff --git a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
index ebd6bd47863e..dbf453bad576 100644
--- a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
+++ b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
@@ -51,6 +51,7 @@ public void DoesNotCreateIPEndPointOnInvalidIPAddress(string address)
     [InlineData("randomhost")]
     [InlineData("+")]
     [InlineData("contoso.com")]
+    [InlineData(".localhost")]
     public void ParseAddressDefaultsToAnyIPOnInvalidIPAddress(string host)
     {
         var listenOptions = AddressBinder.ParseAddress($"http://{host}", out var https);
@@ -72,6 +73,29 @@ public void ParseAddressLocalhost()
         Assert.False(https);
     }
 
+    [Theory]
+    [InlineData("http://sample.localhost:5000", 5000, false)]
+    [InlineData("http://SAMPLE.localhost:5000", 5000, false)]
+    [InlineData("http://SAMPLE.Localhost:5000", 5000, false, "http://SAMPLE.localhost:5000")]
+    [InlineData("HTTP://sample.localhost:5000", 5000, false, "http://sample.localhost:5000")]
+    [InlineData("https://sample.localhost:5001", 5001, true)]
+    [InlineData("http://multilevel.dev.localhost:5000", 5000, false)]
+    [InlineData("https://multilevel.dev.localhost:5001", 5001, true)]
+    public void ParseAddressWithLocalhostTld(string address, int expectedPort, bool expectedHttps, string expectedAddress = null)
+    {
+        var listenOptions = AddressBinder.ParseAddress(address, out var https);
+        Assert.IsType<LocalhostListenOptions>(listenOptions);
+        Assert.IsType<IPEndPoint>(listenOptions.EndPoint);
+        Assert.Equal(IPAddress.Loopback, listenOptions.IPEndPoint.Address);
+        Assert.Equal(expectedPort, listenOptions.IPEndPoint.Port);
+        Assert.Equal(expectedHttps, https);
+        if (https)
+        {
+            listenOptions.IsTls = true;
+        }
+        Assert.Equal(expectedAddress ?? address, listenOptions.GetDisplayName());
+    }
+
     [Fact]
     public void ParseAddress_HasPipeNoSlash()
     {
diff --git a/src/Servers/Kestrel/Core/test/BufferWriterTests.cs b/src/Servers/Kestrel/Core/test/BufferWriterTests.cs
index 2409f4879add..255c10b3c75c 100644
--- a/src/Servers/Kestrel/Core/test/BufferWriterTests.cs
+++ b/src/Servers/Kestrel/Core/test/BufferWriterTests.cs
@@ -197,8 +197,10 @@ public void BufferWriterCountsBytesCommitted()
         writer.Commit();
         Assert.Equal(13, writer.BytesCommitted);
 
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Pipe.Writer.FlushAsync().GetAwaiter().GetResult();
         var readResult = Pipe.Reader.ReadAsync().GetAwaiter().GetResult();
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         // Consuming the buffer does not change BytesCommitted
         Assert.Equal(13, readResult.Buffer.Length);
diff --git a/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs b/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs
index 48f8777bea70..2c7c58d585ff 100644
--- a/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs
+++ b/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs
@@ -25,7 +25,7 @@ public async Task PassthroughIfAllFlushesAreAwaited()
                     new TaskCompletionSource<FlushResult>(TaskCreationOptions.RunContinuationsAsynchronously),
                 };
 
-            var sync = new object();
+            var sync = new Lock();
             var mockPipeWriter = new MockPipeWriter(pipeWriterFlushTcsArray);
             var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, sync);
 
@@ -89,7 +89,7 @@ public async Task QueuesIfFlushIsNotAwaited()
                     new TaskCompletionSource<FlushResult>(TaskCreationOptions.RunContinuationsAsynchronously),
                 };
 
-            var sync = new object();
+            var sync = new Lock();
             var mockPipeWriter = new MockPipeWriter(pipeWriterFlushTcsArray);
             var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, sync);
             var flushTask0 = default(ValueTask<FlushResult>);
@@ -186,7 +186,7 @@ public async Task KeepsQueueIfInnerFlushFinishesBetweenGetMemoryAndAdvance()
                     new TaskCompletionSource<FlushResult>(TaskCreationOptions.RunContinuationsAsynchronously),
                 };
 
-            var sync = new object();
+            var sync = new Lock();
             var mockPipeWriter = new MockPipeWriter(pipeWriterFlushTcsArray);
             var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, sync);
             var memory = default(Memory<byte>);
@@ -270,7 +270,7 @@ public async Task CompleteFlushesQueuedBytes()
                     new TaskCompletionSource<FlushResult>(TaskCreationOptions.RunContinuationsAsynchronously),
                 };
 
-            var sync = new object();
+            var sync = new Lock();
             var mockPipeWriter = new MockPipeWriter(pipeWriterFlushTcsArray);
             var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, sync);
             var memory = default(Memory<byte>);
@@ -338,7 +338,7 @@ public async Task CancelPendingFlushInterruptsFlushLoop()
                     new TaskCompletionSource<FlushResult>(TaskCreationOptions.RunContinuationsAsynchronously),
                 };
 
-            var sync = new object();
+            var sync = new Lock();
             var mockPipeWriter = new MockPipeWriter(pipeWriterFlushTcsArray);
             var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, sync);
             var flushTask0 = default(ValueTask<FlushResult>);
diff --git a/src/Servers/Kestrel/Core/test/DiagnosticMemoryPoolTests.cs b/src/Servers/Kestrel/Core/test/DiagnosticMemoryPoolTests.cs
index 100f50ad7645..adceaa3a5c0e 100644
--- a/src/Servers/Kestrel/Core/test/DiagnosticMemoryPoolTests.cs
+++ b/src/Servers/Kestrel/Core/test/DiagnosticMemoryPoolTests.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// 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.Buffers;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore;
 using Xunit;
 
 namespace Microsoft.Extensions.Internal.Test;
diff --git a/src/Servers/Kestrel/Core/test/HeartbeatTests.cs b/src/Servers/Kestrel/Core/test/HeartbeatTests.cs
index 5d027529f53c..e990a9080be4 100644
--- a/src/Servers/Kestrel/Core/test/HeartbeatTests.cs
+++ b/src/Servers/Kestrel/Core/test/HeartbeatTests.cs
@@ -20,7 +20,8 @@ public void HeartbeatIntervalIsOneSecond()
     }
 
     [Fact]
-    public async void HeartbeatLoopRunsWithSpecifiedInterval()
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60371")]
+    public async Task HeartbeatLoopRunsWithSpecifiedInterval()
     {
         var heartbeatCallCount = 0;
         var tcs = new TaskCompletionSource();
@@ -176,7 +177,7 @@ public async Task HeartbeatTakingLongerThanIntervalIsNotLoggedIfDebuggerAttached
 
         heartbeatHandler.Verify(h => h.OnHeartbeat(), Times.Once());
 
-        Assert.Empty(TestSink.Writes.Where(w => w.EventId.Name == "HeartbeatSlow"));
+        Assert.DoesNotContain(TestSink.Writes, w => w.EventId.Name == "HeartbeatSlow");
     }
 
     [Fact]
diff --git a/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTests.cs b/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTests.cs
index 5578f2115188..9ab7a571ca3a 100644
--- a/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTests.cs
+++ b/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTests.cs
@@ -130,7 +130,7 @@ SequencePosition TakeStartLineAndMessageHeaders()
 
         _transport.Input.AdvanceTo(TakeStartLineAndMessageHeaders());
 
-        Assert.Equal(0, _http1Connection.RequestHeaders.Count);
+        Assert.Empty(_http1Connection.RequestHeaders);
 
         await _application.Output.WriteAsync(Encoding.ASCII.GetBytes($"{headerLine}\r\n"));
         readableBuffer = (await _transport.Input.ReadAsync()).Buffer;
@@ -144,7 +144,7 @@ SequencePosition TakeMessageHeaders()
 
         _transport.Input.AdvanceTo(TakeMessageHeaders());
 
-        Assert.Equal(1, _http1Connection.RequestHeaders.Count);
+        Assert.Single(_http1Connection.RequestHeaders);
         Assert.Equal("makethislargerthanthestartline", _http1Connection.RequestHeaders["Header"]);
     }
 
@@ -277,7 +277,7 @@ public async Task ResetResetsHeaderLimits()
         _transport.Input.AdvanceTo(_consumed, _examined);
 
         Assert.True(takeMessageHeaders);
-        Assert.Equal(1, _http1Connection.RequestHeaders.Count);
+        Assert.Single(_http1Connection.RequestHeaders);
         Assert.Equal("value1", _http1Connection.RequestHeaders["Header-1"]);
 
         _http1Connection.Reset();
@@ -289,7 +289,7 @@ public async Task ResetResetsHeaderLimits()
         _transport.Input.AdvanceTo(_consumed, _examined);
 
         Assert.True(takeMessageHeaders);
-        Assert.Equal(1, _http1Connection.RequestHeaders.Count);
+        Assert.Single(_http1Connection.RequestHeaders);
         Assert.Equal("value2", _http1Connection.RequestHeaders["Header-2"]);
     }
 
@@ -712,7 +712,7 @@ public async Task RequestAbortedTokenIsResetBeforeLastWriteAsyncWithContentLengt
     }
 
     [Fact]
-    public async void BodyWriter_OnAbortedConnection_ReturnsFlushResultWithIsCompletedTrue()
+    public async Task BodyWriter_OnAbortedConnection_ReturnsFlushResultWithIsCompletedTrue()
     {
         var payload = Encoding.UTF8.GetBytes("hello, web browser" + new string(' ', 512) + "\n");
         var writer = _application.Output;
@@ -726,7 +726,7 @@ public async void BodyWriter_OnAbortedConnection_ReturnsFlushResultWithIsComplet
     }
 
     [Fact]
-    public async void BodyWriter_OnConnectionWithCanceledPendingFlush_ReturnsFlushResultWithIsCanceledTrue()
+    public async Task BodyWriter_OnConnectionWithCanceledPendingFlush_ReturnsFlushResultWithIsCanceledTrue()
     {
         var payload = Encoding.UTF8.GetBytes("hello, web browser" + new string(' ', 512) + "\n");
         var writer = _application.Output;
@@ -876,7 +876,7 @@ public async Task AcceptsHeadersAcrossSends(int header0Count, int header1Count)
 
         await _application.Output.WriteAsync(Encoding.ASCII.GetBytes("GET / HTTP/1.0\r\n"));
         await WaitForCondition(TestConstants.DefaultTimeout, () => _http1Connection.RequestHeaders != null);
-        Assert.Equal(0, _http1Connection.RequestHeaders.Count);
+        Assert.Empty(_http1Connection.RequestHeaders);
 
         await _application.Output.WriteAsync(Encoding.ASCII.GetBytes(headers0));
         await WaitForCondition(TestConstants.DefaultTimeout, () => _http1Connection.RequestHeaders.Count >= header0Count);
@@ -908,7 +908,7 @@ public async Task KeepsSameHeaderCollectionAcrossSends(int header0Count, int hea
 
         await _application.Output.WriteAsync(Encoding.ASCII.GetBytes("GET / HTTP/1.0\r\n"));
         await WaitForCondition(TestConstants.DefaultTimeout, () => _http1Connection.RequestHeaders != null);
-        Assert.Equal(0, _http1Connection.RequestHeaders.Count);
+        Assert.Empty(_http1Connection.RequestHeaders);
 
         var newRequestHeaders = new RequestHeadersWrapper(_http1Connection.RequestHeaders);
         _http1Connection.RequestHeaders = newRequestHeaders;
diff --git a/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTestsBase.cs b/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTestsBase.cs
index 3fd5631ed42c..4b460630c9f3 100644
--- a/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTestsBase.cs
+++ b/src/Servers/Kestrel/Core/test/Http1/Http1ConnectionTestsBase.cs
@@ -31,7 +31,7 @@ protected override void Initialize(TestContext context, MethodInfo methodInfo, o
     {
         base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
 
-        _pipelineFactory = PinnedBlockMemoryPoolFactory.Create();
+        _pipelineFactory = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(_pipelineFactory, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/Core/test/Http1/Http1HttpProtocolFeatureCollectionTests.cs b/src/Servers/Kestrel/Core/test/Http1/Http1HttpProtocolFeatureCollectionTests.cs
index af82ee077f53..9c92eb75b033 100644
--- a/src/Servers/Kestrel/Core/test/Http1/Http1HttpProtocolFeatureCollectionTests.cs
+++ b/src/Servers/Kestrel/Core/test/Http1/Http1HttpProtocolFeatureCollectionTests.cs
@@ -47,28 +47,15 @@ public Http1HttpProtocolFeatureCollectionTests()
     }
 
     [Fact]
-    public int FeaturesStartAsSelf()
+    public void FeaturesStartAsSelf()
     {
-        var featureCount = 0;
-        foreach (var featureIter in _collection)
-        {
-            Type type = featureIter.Key;
-            if (type.IsAssignableFrom(typeof(HttpProtocol)))
-            {
-                var featureLookup = _collection[type];
-                Assert.Same(featureLookup, featureIter.Value);
-                Assert.Same(featureLookup, _collection);
-                featureCount++;
-            }
-        }
+        var featureCount = GetFeaturesCount();
 
         Assert.NotEqual(0, featureCount);
-
-        return featureCount;
     }
 
     [Fact]
-    public int FeaturesCanBeAssignedTo()
+    public void FeaturesCanBeAssignedTo()
     {
         var featureCount = SetFeaturesToNonDefault();
         Assert.NotEqual(0, featureCount);
@@ -86,8 +73,6 @@ public int FeaturesCanBeAssignedTo()
         }
 
         Assert.NotEqual(0, featureCount);
-
-        return featureCount;
     }
 
     [Fact]
@@ -95,7 +80,7 @@ public void FeaturesResetToSelf()
     {
         var featuresAssigned = SetFeaturesToNonDefault();
         _http1Connection.ResetFeatureCollection();
-        var featuresReset = FeaturesStartAsSelf();
+        var featuresReset = GetFeaturesCount();
 
         Assert.Equal(featuresAssigned, featuresReset);
     }
@@ -108,7 +93,7 @@ public void FeaturesByGenericSameAsByType()
         CompareGenericGetterToIndexer();
 
         _http1Connection.ResetFeatureCollection();
-        var featuresReset = FeaturesStartAsSelf();
+        var featuresReset = GetFeaturesCount();
 
         Assert.Equal(featuresAssigned, featuresReset);
     }
@@ -235,6 +220,23 @@ private int EachHttpProtocolFeatureSetAndUnique()
         return featureCount;
     }
 
+    public int GetFeaturesCount()
+    {
+        var featureCount = 0;
+        foreach (var featureIter in _collection)
+        {
+            Type type = featureIter.Key;
+            if (type.IsAssignableFrom(typeof(HttpProtocol)))
+            {
+                var featureLookup = _collection[type];
+                Assert.Same(featureLookup, featureIter.Value);
+                Assert.Same(featureLookup, _collection);
+                featureCount++;
+            }
+        }
+        return featureCount;
+    }
+
     private int SetFeaturesToNonDefault()
     {
         int featureCount = 0;
diff --git a/src/Servers/Kestrel/Core/test/Http1/Http1OutputProducerTests.cs b/src/Servers/Kestrel/Core/test/Http1/Http1OutputProducerTests.cs
index b927baefa60f..0683b9ea6c84 100644
--- a/src/Servers/Kestrel/Core/test/Http1/Http1OutputProducerTests.cs
+++ b/src/Servers/Kestrel/Core/test/Http1/Http1OutputProducerTests.cs
@@ -22,7 +22,7 @@ public class Http1OutputProducerTests : IDisposable
 
     public Http1OutputProducerTests()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
     }
 
     public void Dispose()
diff --git a/src/Servers/Kestrel/Core/test/Http2/Http2HPackEncoderTests.cs b/src/Servers/Kestrel/Core/test/Http2/Http2HPackEncoderTests.cs
index 2edf4628129e..23a4ca0e3fd3 100644
--- a/src/Servers/Kestrel/Core/test/Http2/Http2HPackEncoderTests.cs
+++ b/src/Servers/Kestrel/Core/test/Http2/Http2HPackEncoderTests.cs
@@ -486,7 +486,7 @@ public void EncodesHeadersInSinglePayloadWhenSpaceAvailable(KeyValuePair<string,
             Assert.True(expectedPayload[i] == payload[i], $"{expectedPayload[i]} != {payload[i]} at {i} (len {length})");
         }
 
-        Assert.Equal(expectedPayload, new ArraySegment<byte>(payload, 0, length));
+        Assert.Equal(expectedPayload, new ArraySegment<byte>(payload, 0, length).ToArray());
     }
 
     [Theory]
diff --git a/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs b/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs
index 98fdbd8a0270..090c295681c2 100644
--- a/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs
+++ b/src/Servers/Kestrel/Core/test/HttpConnectionManagerTests.cs
@@ -53,7 +53,7 @@ private void UnrootedConnectionsGetRemovedFromHeartbeatInnerScope(
         httpConnectionManager.Walk(_ => connectionCount++);
 
         Assert.Equal(1, connectionCount);
-        Assert.Empty(TestSink.Writes.Where(c => c.EventId.Name == "ApplicationNeverCompleted"));
+        Assert.DoesNotContain(TestSink.Writes, c => c.EventId.Name == "ApplicationNeverCompleted");
 
         // Ensure httpConnection doesn't get GC'd before this point.
         GC.KeepAlive(httpConnection);
diff --git a/src/Servers/Kestrel/Core/test/HttpParserTests.cs b/src/Servers/Kestrel/Core/test/HttpParserTests.cs
index 6837913a30ed..69e1693a3b15 100644
--- a/src/Servers/Kestrel/Core/test/HttpParserTests.cs
+++ b/src/Servers/Kestrel/Core/test/HttpParserTests.cs
@@ -795,6 +795,27 @@ public void ParseHeadersWithSplitBuffersThrowsForSmallHeader()
         Assert.Equal(StatusCodes.Status400BadRequest, exception.StatusCode);
     }
 
+    [Fact]
+    public void ParseMultispanHeaderWithCrAtSpanEnd()
+    {
+        var parser = CreateParser(CreateEnabledTrace(), false);
+
+        var buffer = ReadOnlySequenceFactory.CreateSegments(
+            Encoding.ASCII.GetBytes("Head\r"),
+            Encoding.ASCII.GetBytes("va\r"));
+        var requestHandler = new RequestHandler();
+
+        var reader = new SequenceReader<byte>(buffer);
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        var exception = Assert.Throws<BadHttpRequestException>(() =>
+#pragma warning restore CS0618 // Type or member is obsolete
+        {
+            var reader = new SequenceReader<byte>(buffer);
+            parser.ParseHeaders(requestHandler, ref reader);
+        });
+    }
+
     private bool ParseRequestLine(IHttpParser<RequestHandler> parser, RequestHandler requestHandler, ReadOnlySequence<byte> readableBuffer, out SequencePosition consumed, out SequencePosition examined)
     {
         var reader = new SequenceReader<byte>(readableBuffer);
diff --git a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs
index df394889ad70..7a9b6dea0f78 100644
--- a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs
+++ b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs
@@ -22,7 +22,7 @@ public void InitialDictionaryIsEmpty()
     {
         IDictionary<string, StringValues> headers = new HttpRequestHeaders();
 
-        Assert.Equal(0, headers.Count);
+        Assert.Empty(headers);
         Assert.False(headers.IsReadOnly);
     }
 
@@ -320,7 +320,7 @@ public void ClearRemovesAllHeaders()
 
         headers.Clear();
 
-        Assert.Equal(0, headers.Count);
+        Assert.Empty(headers);
         Assert.False(headers.TryGetValue("host", out value));
         Assert.False(headers.TryGetValue("custom", out value));
         Assert.False(headers.TryGetValue("Content-Length", out value));
@@ -350,7 +350,7 @@ public void RemoveTakesHeadersOutOfDictionary()
         Assert.True(headers.Remove("custom"));
         Assert.False(headers.Remove("custom"));
 
-        Assert.Equal(1, headers.Count);
+        Assert.Single(headers);
         Assert.False(headers.TryGetValue("host", out value));
         Assert.False(headers.TryGetValue("custom", out value));
         Assert.True(headers.TryGetValue("Content-Length", out value));
@@ -358,7 +358,7 @@ public void RemoveTakesHeadersOutOfDictionary()
         Assert.True(headers.Remove("Content-Length"));
         Assert.False(headers.Remove("Content-Length"));
 
-        Assert.Equal(0, headers.Count);
+        Assert.Empty(headers);
         Assert.False(headers.TryGetValue("host", out value));
         Assert.False(headers.TryGetValue("custom", out value));
         Assert.False(headers.TryGetValue("Content-Length", out value));
@@ -379,13 +379,13 @@ public void CopyToMovesDataIntoArray()
         Assert.Equal(new StringValues(), entries[0].Value);
 
         Assert.Equal("Host", entries[1].Key);
-        Assert.Equal(new[] { "localhost" }, entries[1].Value);
+        Assert.Equal(new[] { "localhost" }, entries[1].Value.ToArray());
 
         Assert.Equal("Content-Length", entries[2].Key);
-        Assert.Equal(new[] { "0" }, entries[2].Value);
+        Assert.Equal(new[] { "0" }, entries[2].Value.ToArray());
 
         Assert.Equal("custom", entries[3].Key);
-        Assert.Equal(new[] { "value" }, entries[3].Value);
+        Assert.Equal(new[] { "value" }, entries[3].Value.ToArray());
 
         Assert.Null(entries[4].Key);
         Assert.Equal(new StringValues(), entries[4].Value);
@@ -882,7 +882,7 @@ private static string ChangeNameCase(string name, int variant)
         }
 
         // Never reached
-        Assert.False(true);
+        Assert.Fail();
         return name;
     }
 
diff --git a/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs b/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs
index 38779ac9b77d..e2105939f504 100644
--- a/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs
+++ b/src/Servers/Kestrel/Core/test/HttpResponseHeadersTests.cs
@@ -21,7 +21,7 @@ public class HttpResponseHeadersTests
     [Fact]
     public void InitialDictionaryIsEmpty()
     {
-        using (var memoryPool = PinnedBlockMemoryPoolFactory.Create())
+        using (var memoryPool = TestMemoryPoolFactory.Create())
         {
             var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
             var pair = DuplexPipe.CreateConnectionPair(options, options);
@@ -46,7 +46,7 @@ public void InitialDictionaryIsEmpty()
 
             IDictionary<string, StringValues> headers = http1Connection.ResponseHeaders;
 
-            Assert.Equal(0, headers.Count);
+            Assert.Empty(headers);
             Assert.False(headers.IsReadOnly);
         }
     }
diff --git a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs
index a0709d00ad19..be0c0de49cd5 100644
--- a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs
+++ b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs
@@ -309,7 +309,9 @@ private static KestrelServerImpl CreateKestrelServer(
             multiplexedFactories,
             httpsConfigurationService,
             loggerFactory ?? new LoggerFactory(new[] { new KestrelTestLoggerProvider() }),
-            metrics ?? new KestrelMetrics(new TestMeterFactory()));
+            diagnosticSource: null,
+            metrics ?? new KestrelMetrics(new TestMeterFactory()),
+            heartbeatHandlers: []);
     }
 
     [Fact]
diff --git a/src/Servers/Kestrel/Core/test/MessageBodyTests.cs b/src/Servers/Kestrel/Core/test/MessageBodyTests.cs
index 8cd5db8c8cbe..fa27c98f399a 100644
--- a/src/Servers/Kestrel/Core/test/MessageBodyTests.cs
+++ b/src/Servers/Kestrel/Core/test/MessageBodyTests.cs
@@ -338,14 +338,14 @@ public async Task ReadExitsGivenIncompleteChunkedExtension()
             var stream = new HttpRequestStream(Mock.Of<IHttpBodyControlFeature>(), reader);
             reader.StartAcceptingReads(body);
 
-            input.Add("5;\r\0");
+            input.Add("5;\r");
 
             var buffer = new byte[1024];
             var readTask = stream.ReadAsync(buffer, 0, buffer.Length);
 
             Assert.False(readTask.IsCompleted);
 
-            input.Add("\r\r\r\nHello\r\n0\r\n\r\n");
+            input.Add("\nHello\r\n0\r\n\r\n");
 
             Assert.Equal(5, await readTask.DefaultTimeout());
             try
@@ -1449,7 +1449,7 @@ public override void Write(byte[] buffer, int offset, int count)
 
         public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
-            throw new XunitException();
+            throw new NotImplementedException();
         }
 
         public override bool CanRead { get; }
@@ -1489,7 +1489,7 @@ public override void Write(byte[] buffer, int offset, int count)
         public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
             await Task.Delay(1);
-            throw new XunitException();
+            throw new NotImplementedException();
         }
 
         public override bool CanRead { get; }
diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
index 509856074d7c..37aea90bcf3c 100644
--- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
+++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj
@@ -14,7 +14,6 @@
     <Compile Include="$(KestrelSharedSourceRoot)KnownHeaders.cs" LinkBase="shared" />
     <Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Http2\HPackHeaderWriter.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Http2\Http2HeadersEnumerator.cs" />
-    <Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
     <Compile Include="$(KestrelSharedSourceRoot)\CorrelationIdGenerator.cs" Link="Internal\CorrelationIdGenerator.cs" />
     <Compile Include="$(SharedSourceRoot)test\Shared.Tests\runtime\Http2\*.cs" LinkBase="Shared\runtime\Http2" />
     <Compile Include="$(SharedSourceRoot)test\Shared.Tests\runtime\Http3\*.cs" LinkBase="Shared\runtime\Http3" />
@@ -29,6 +28,7 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
     <Reference Include="Microsoft.Extensions.Logging" />
+    <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <Reference Include="Microsoft.Extensions.TimeProvider.Testing" />
   </ItemGroup>
 </Project>
diff --git a/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolFactoryTests.cs b/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolFactoryTests.cs
new file mode 100644
index 000000000000..7ca077aeff26
--- /dev/null
+++ b/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolFactoryTests.cs
@@ -0,0 +1,131 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Collections.Concurrent;
+using System.Reflection;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
+using Microsoft.Extensions.Time.Testing;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
+
+public class PinnedBlockMemoryPoolFactoryTests
+{
+    [Fact]
+    public void CreatePool()
+    {
+        var factory = CreateMemoryPoolFactory();
+        var pool = factory.Create();
+        Assert.NotNull(pool);
+        Assert.IsType<PinnedBlockMemoryPool>(pool);
+        Assert.Null(Assert.IsType<PinnedBlockMemoryPool>(pool).Owner);
+    }
+
+    [Fact]
+    public void CreatePoolWithOwner()
+    {
+        var factory = CreateMemoryPoolFactory();
+        var pool = factory.Create(new MemoryPoolOptions { Owner = "test" });
+        Assert.NotNull(pool);
+        Assert.Equal("test", Assert.IsType<PinnedBlockMemoryPool>(pool).Owner);
+    }
+
+    [Fact]
+    public void CreateMultiplePools()
+    {
+        var factory = CreateMemoryPoolFactory();
+        var pool1 = factory.Create();
+        var pool2 = factory.Create();
+
+        Assert.NotNull(pool1);
+        Assert.NotNull(pool2);
+        Assert.NotSame(pool1, pool2);
+    }
+
+    [Fact]
+    public void DisposePoolRemovesFromFactory()
+    {
+        var factory = CreateMemoryPoolFactory();
+        var pool = factory.Create();
+        Assert.NotNull(pool);
+
+        var dict = (ConcurrentDictionary<PinnedBlockMemoryPool, nuint>)(typeof(PinnedBlockMemoryPoolFactory)
+            .GetField("_pools", BindingFlags.NonPublic | BindingFlags.Instance)
+            ?.GetValue(factory));
+        Assert.Single(dict);
+
+        pool.Dispose();
+        Assert.Empty(dict);
+    }
+
+    [Fact]
+    public async Task FactoryHeartbeatWorks()
+    {
+        var timeProvider = new FakeTimeProvider(DateTimeOffset.UtcNow.AddDays(1));
+        var factory = CreateMemoryPoolFactory(timeProvider);
+
+        // Use 2 pools to make sure they all get triggered by the heartbeat
+        var pool = Assert.IsType<PinnedBlockMemoryPool>(factory.Create());
+        var pool2 = Assert.IsType<PinnedBlockMemoryPool>(factory.Create());
+
+        var blocks = new List<IMemoryOwner<byte>>();
+        for (var i = 0; i < 10000; i++)
+        {
+            blocks.Add(pool.Rent());
+            blocks.Add(pool2.Rent());
+        }
+
+        foreach (var block in blocks)
+        {
+            block.Dispose();
+        }
+        blocks.Clear();
+
+        // First eviction pass likely won't do anything since the pool was just very active
+        factory.OnHeartbeat();
+
+        var previousCount = pool.BlockCount();
+        var previousCount2 = pool2.BlockCount();
+        timeProvider.Advance(TimeSpan.FromSeconds(10));
+        factory.OnHeartbeat();
+
+        await VerifyPoolEviction(pool, previousCount);
+        await VerifyPoolEviction(pool2, previousCount2);
+
+        timeProvider.Advance(TimeSpan.FromSeconds(10));
+
+        previousCount = pool.BlockCount();
+        previousCount2 = pool2.BlockCount();
+        factory.OnHeartbeat();
+
+        await VerifyPoolEviction(pool, previousCount);
+        await VerifyPoolEviction(pool2, previousCount2);
+
+        static async Task VerifyPoolEviction(PinnedBlockMemoryPool pool, int previousCount)
+        {
+            // Because the eviction happens on a thread pool thread, we need to wait for it to complete
+            // and the only way to do that (without adding a test hook in the pool code) is to delay.
+            // But we don't want to add an arbitrary delay, so we do a short delay with block count checks
+            // to reduce the wait time.
+            var maxWait = TimeSpan.FromSeconds(5);
+            while (pool.BlockCount() > previousCount - (previousCount / 30) && maxWait > TimeSpan.Zero)
+            {
+                await Task.Delay(50);
+                maxWait -= TimeSpan.FromMilliseconds(50);
+            }
+
+            // Assert that the block count has decreased by 3.3-10%.
+            // This relies on the current implementation of eviction logic which may change in the future.
+            Assert.InRange(pool.BlockCount(), previousCount - (previousCount / 10), previousCount - (previousCount / 30));
+        }
+    }
+
+    private static PinnedBlockMemoryPoolFactory CreateMemoryPoolFactory(TimeProvider timeProvider = null)
+    {
+        return new PinnedBlockMemoryPoolFactory(
+            new MemoryPoolMetrics(new TestMeterFactory()),
+            timeProvider: timeProvider);
+    }
+}
diff --git a/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs b/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs
index 30d1f1c799a4..4a610563471d 100644
--- a/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs
+++ b/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs
@@ -1,8 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Buffers;
-using Xunit;
+using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
+using Microsoft.Extensions.Diagnostics.Metrics.Testing;
+using Microsoft.Extensions.Time.Testing;
 
 namespace Microsoft.Extensions.Internal.Test;
 
@@ -25,4 +30,410 @@ public void DisposeWithActiveBlocksWorks()
         var block = memoryPool.Rent();
         memoryPool.Dispose();
     }
+
+    [Fact]
+    public void CanEvictBlocks()
+    {
+        using var memoryPool = new PinnedBlockMemoryPool();
+
+        var block = memoryPool.Rent();
+        block.Dispose();
+        Assert.Equal(1, memoryPool.BlockCount());
+
+        // First eviction does nothing because we double counted the initial rent due to it needing to allocate
+        memoryPool.PerformEviction();
+        Assert.Equal(1, memoryPool.BlockCount());
+
+        memoryPool.PerformEviction();
+        Assert.Equal(0, memoryPool.BlockCount());
+    }
+
+    [Fact]
+    public void EvictsSmallAmountOfBlocksWhenTrafficIsTheSame()
+    {
+        using var memoryPool = new PinnedBlockMemoryPool();
+
+        var blocks = new List<IMemoryOwner<byte>>();
+        for (var i = 0; i < 10000; i++)
+        {
+            blocks.Add(memoryPool.Rent());
+        }
+        Assert.Equal(0, memoryPool.BlockCount());
+        memoryPool.PerformEviction();
+
+        foreach (var block in blocks)
+        {
+            block.Dispose();
+        }
+        blocks.Clear();
+        Assert.Equal(10000, memoryPool.BlockCount());
+        memoryPool.PerformEviction();
+
+        var originalCount = memoryPool.BlockCount();
+        for (var j = 0; j < 100; j++)
+        {
+            var previousCount = memoryPool.BlockCount();
+            // Rent and return at the same rate
+            for (var i = 0; i < 100; i++)
+            {
+                blocks.Add(memoryPool.Rent());
+            }
+            foreach (var block in blocks)
+            {
+                block.Dispose();
+            }
+            blocks.Clear();
+
+            Assert.Equal(previousCount, memoryPool.BlockCount());
+
+            // Eviction while rent+return is the same
+            memoryPool.PerformEviction();
+            Assert.InRange(memoryPool.BlockCount(), previousCount - (previousCount / 100), previousCount - 1);
+        }
+
+        Assert.True(memoryPool.BlockCount() <= originalCount - 100, "Evictions should have removed some blocks");
+    }
+
+    [Fact]
+    public void DoesNotEvictBlocksWhenActive()
+    {
+        using var memoryPool = new PinnedBlockMemoryPool();
+
+        var blocks = new List<IMemoryOwner<byte>>();
+        for (var i = 0; i < 10000; i++)
+        {
+            blocks.Add(memoryPool.Rent());
+        }
+        Assert.Equal(0, memoryPool.BlockCount());
+        memoryPool.PerformEviction();
+
+        foreach (var block in blocks)
+        {
+            block.Dispose();
+        }
+        blocks.Clear();
+        Assert.Equal(10000, memoryPool.BlockCount());
+        memoryPool.PerformEviction();
+        var previousCount = memoryPool.BlockCount();
+
+        // Simulate active usage, rent without returning
+        for (var i = 0; i < 100; i++)
+        {
+            blocks.Add(memoryPool.Rent());
+        }
+        previousCount -= 100;
+
+        // Eviction while pool is actively used should not remove blocks
+        memoryPool.PerformEviction();
+        Assert.Equal(previousCount, memoryPool.BlockCount());
+    }
+
+    [Fact]
+    public void EvictsBlocksGraduallyWhenIdle()
+    {
+        using var memoryPool = new PinnedBlockMemoryPool();
+
+        var blocks = new List<IMemoryOwner<byte>>();
+        for (var i = 0; i < 10000; i++)
+        {
+            blocks.Add(memoryPool.Rent());
+        }
+        Assert.Equal(0, memoryPool.BlockCount());
+        memoryPool.PerformEviction();
+
+        foreach (var block in blocks)
+        {
+            block.Dispose();
+        }
+        blocks.Clear();
+        Assert.Equal(10000, memoryPool.BlockCount());
+        // Eviction after returning everything to reset internal counters
+        memoryPool.PerformEviction();
+
+        // Eviction should happen gradually over multiple calls
+        for (var i = 0; i < 10; i++)
+        {
+            var previousCount = memoryPool.BlockCount();
+            memoryPool.PerformEviction();
+            // Eviction while idle should remove 10-30% of blocks
+            Assert.InRange(memoryPool.BlockCount(), previousCount - (previousCount / 10), previousCount - (previousCount / 30));
+        }
+
+        // Ensure all blocks are evicted eventually
+        var count = memoryPool.BlockCount();
+        do
+        {
+            count = memoryPool.BlockCount();
+            memoryPool.PerformEviction();
+        }
+        // Make sure the loop makes forward progress
+        while (count != 0 && count != memoryPool.BlockCount());
+
+        Assert.Equal(0, memoryPool.BlockCount());
+    }
+
+    [Fact]
+    public async Task EvictionsAreScheduled()
+    {
+        using var memoryPool = new PinnedBlockMemoryPool();
+
+        var blocks = new List<IMemoryOwner<byte>>();
+        for (var i = 0; i < 10000; i++)
+        {
+            blocks.Add(memoryPool.Rent());
+        }
+        Assert.Equal(0, memoryPool.BlockCount());
+
+        foreach (var block in blocks)
+        {
+            block.Dispose();
+        }
+        blocks.Clear();
+        Assert.Equal(10000, memoryPool.BlockCount());
+        // Eviction after returning everything to reset internal counters
+        memoryPool.PerformEviction();
+
+        Assert.Equal(10000, memoryPool.BlockCount());
+
+        var previousCount = memoryPool.BlockCount();
+
+        // Scheduling only works every 10 seconds and is initialized to UtcNow + 10 when the pool is constructed
+        var time = DateTime.UtcNow;
+        Assert.False(memoryPool.TryScheduleEviction(time));
+
+        Assert.True(memoryPool.TryScheduleEviction(time.AddSeconds(10)));
+
+        var maxWait = TimeSpan.FromSeconds(5);
+        while (memoryPool.BlockCount() > previousCount - (previousCount / 30) && maxWait > TimeSpan.Zero)
+        {
+            await Task.Delay(50);
+            maxWait -= TimeSpan.FromMilliseconds(50);
+        }
+
+        Assert.InRange(memoryPool.BlockCount(), previousCount - (previousCount / 10), previousCount - (previousCount / 30));
+
+        // Since we scheduled successfully, we now need to wait 10 seconds to schedule again.
+        Assert.False(memoryPool.TryScheduleEviction(time.AddSeconds(10)));
+
+        previousCount = memoryPool.BlockCount();
+        Assert.True(memoryPool.TryScheduleEviction(time.AddSeconds(20)));
+
+        maxWait = TimeSpan.FromSeconds(5);
+        while (memoryPool.BlockCount() > previousCount - (previousCount / 30) && maxWait > TimeSpan.Zero)
+        {
+            await Task.Delay(50);
+            maxWait -= TimeSpan.FromMilliseconds(50);
+        }
+
+        Assert.InRange(memoryPool.BlockCount(), previousCount - (previousCount / 10), previousCount - (previousCount / 30));
+    }
+
+    [Fact]
+    public void PooledMemoryMetricTracksPooledMemory()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var currentMemoryMetric = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", MemoryPoolMetrics.PooledMemoryName);
+
+        var pool = CreateMemoryPool(owner: "test", meterFactory: testMeterFactory);
+
+        Assert.Empty(currentMemoryMetric.GetMeasurementSnapshot());
+
+        var mem = pool.Rent();
+        mem.Dispose();
+
+        Assert.Collection(currentMemoryMetric.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            });
+
+        mem = pool.Rent();
+
+        Assert.Equal(-1 * PinnedBlockMemoryPool.BlockSize, currentMemoryMetric.LastMeasurement.Value);
+
+        var mem2 = pool.Rent();
+
+        mem.Dispose();
+        mem2.Dispose();
+
+        Assert.Equal(2 * PinnedBlockMemoryPool.BlockSize, currentMemoryMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+
+        // Eviction after returning everything to reset internal counters
+        pool.PerformEviction();
+
+        // Trigger eviction
+        pool.PerformEviction();
+
+        // Verify eviction updates current memory metric
+        Assert.Equal(0, currentMemoryMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+    }
+
+    [Fact]
+    public void TotalAllocatedMetricTracksAllocatedMemory()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var totalMemoryMetric = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", MemoryPoolMetrics.AllocatedMemoryName);
+
+        var pool = CreateMemoryPool(owner: "test", meterFactory: testMeterFactory);
+
+        Assert.Empty(totalMemoryMetric.GetMeasurementSnapshot());
+
+        var mem1 = pool.Rent();
+        var mem2 = pool.Rent();
+
+        Assert.Collection(totalMemoryMetric.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            },
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            });
+
+        // Each Rent that allocates a new block should increment total memory by block size
+        Assert.Equal(2 * PinnedBlockMemoryPool.BlockSize, totalMemoryMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+
+        mem1.Dispose();
+        mem2.Dispose();
+
+        // Disposing (returning) blocks does not affect total memory
+        Assert.Equal(2 * PinnedBlockMemoryPool.BlockSize, totalMemoryMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+    }
+
+    [Fact]
+    public void TotalRentedMetricTracksRentOperations()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var rentMetric = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", MemoryPoolMetrics.RentedMemoryName);
+
+        var pool = CreateMemoryPool(owner: "test", meterFactory: testMeterFactory);
+
+        Assert.Empty(rentMetric.GetMeasurementSnapshot());
+
+        var mem1 = pool.Rent();
+        var mem2 = pool.Rent();
+
+        // Each Rent should record the size of the block rented
+        Assert.Collection(rentMetric.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            },
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            });
+
+        mem1.Dispose();
+        mem2.Dispose();
+
+        // Disposing does not affect rent metric
+        Assert.Equal(2 * PinnedBlockMemoryPool.BlockSize, rentMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+    }
+
+    [Fact]
+    public void EvictedMemoryMetricTracksEvictedMemory()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var evictMetric = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", MemoryPoolMetrics.EvictedMemoryName);
+
+        var pool = CreateMemoryPool(owner: "test", meterFactory: testMeterFactory);
+
+        // Fill the pool with some blocks
+        var blocks = new List<IMemoryOwner<byte>>();
+        for (int i = 0; i < 10; i++)
+        {
+            blocks.Add(pool.Rent());
+        }
+        foreach (var block in blocks)
+        {
+            block.Dispose();
+        }
+        blocks.Clear();
+
+        Assert.Empty(evictMetric.GetMeasurementSnapshot());
+
+        // Eviction after returning everything to reset internal counters
+        pool.PerformEviction();
+
+        // Trigger eviction
+        pool.PerformEviction();
+
+        // At least some blocks should be evicted, each eviction records block size
+        Assert.NotEmpty(evictMetric.GetMeasurementSnapshot());
+        foreach (var measurement in evictMetric.GetMeasurementSnapshot())
+        {
+            Assert.Equal(PinnedBlockMemoryPool.BlockSize, measurement.Value);
+            Assert.Equal("test", (string)measurement.Tags["aspnetcore.memory_pool.owner"]);
+        }
+    }
+
+    // Smoke test to ensure that metrics are aggregated across multiple pools if the same meter factory is used
+    [Fact]
+    public void MetricsAreAggregatedAcrossPoolsWithSameMeterFactory()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var rentMetric = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", MemoryPoolMetrics.RentedMemoryName);
+
+        var pool1 = CreateMemoryPool(owner: "test", meterFactory: testMeterFactory);
+        var pool2 = CreateMemoryPool(owner: "test", meterFactory: testMeterFactory);
+
+        var mem1 = pool1.Rent();
+        var mem2 = pool2.Rent();
+
+        // Both pools should contribute to the same metric stream
+        Assert.Equal(2 * PinnedBlockMemoryPool.BlockSize, rentMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+
+        mem1.Dispose();
+        mem2.Dispose();
+
+        // Renting and returning from both pools should not interfere with metric collection
+        var mem3 = pool1.Rent();
+        var mem4 = pool2.Rent();
+
+        Assert.Equal(4 * PinnedBlockMemoryPool.BlockSize, rentMetric.GetMeasurementSnapshot().EvaluateAsCounter());
+
+        mem3.Dispose();
+        mem4.Dispose();
+    }
+
+    [Fact]
+    public void MetricsWithDifferentOwners()
+    {
+        var testMeterFactory = new TestMeterFactory();
+        using var rentMetric = new MetricCollector<long>(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", MemoryPoolMetrics.RentedMemoryName);
+
+        var pool1 = CreateMemoryPool(owner: "test1", meterFactory: testMeterFactory);
+        var pool2 = CreateMemoryPool(owner: "test2", meterFactory: testMeterFactory);
+
+        var mem1 = pool1.Rent();
+        var mem2 = pool2.Rent();
+
+        // Both pools should contribute to the same metric stream but with different owners
+        Assert.Collection(rentMetric.GetMeasurementSnapshot(),
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test1", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            },
+            m =>
+            {
+                Assert.Equal(PinnedBlockMemoryPool.BlockSize, m.Value);
+                Assert.Equal("test2", (string)m.Tags["aspnetcore.memory_pool.owner"]);
+            });
+
+        mem1.Dispose();
+        mem2.Dispose();
+    }
+
+    private static PinnedBlockMemoryPool CreateMemoryPool(string owner, TestMeterFactory meterFactory)
+    {
+        return new PinnedBlockMemoryPool(owner: owner, metrics: new MemoryPoolMetrics(meterFactory));
+    }
 }
diff --git a/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs b/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs
index ba9290f961dd..361886b9f3be 100644
--- a/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs
+++ b/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs
@@ -1,23 +1,22 @@
 // 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.Buffers;
 using System.Globalization;
 using System.IO.Pipelines;
 using System.Text;
-using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
-using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
 
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
+
 public class PipelineExtensionTests : IDisposable
 {
     // ulong.MaxValue.ToString().Length
     private const int _ulongMaxValueLength = 20;
 
     private readonly Pipe _pipe;
-    private readonly MemoryPool<byte> _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+    private readonly MemoryPool<byte> _memoryPool = TestMemoryPoolFactory.Create();
 
     public PipelineExtensionTests()
     {
@@ -49,6 +48,25 @@ public void WritesNumericToAscii(ulong number)
         AssertExtensions.Equal(expected, reader.Buffer.Slice(0, numAsStr.Length).ToArray());
     }
 
+    [Fact]
+    public void WritesNumericToAsciiFastPath()
+    {
+        for (ulong number = 0; number < 1000; number++)
+        {
+            var writerBuffer = _pipe.Writer;
+            var writer = new BufferWriter<PipeWriter>(writerBuffer);
+            writer.WriteNumeric(number);
+            writer.Commit();
+            writerBuffer.FlushAsync().GetAwaiter().GetResult();
+
+            var readResult = _pipe.Reader.ReadAsync().GetAwaiter().GetResult();
+            var numAsStr = number.ToString(CultureInfo.InvariantCulture);
+            var expected = Encoding.ASCII.GetBytes(numAsStr);
+            AssertExtensions.Equal(expected, readResult.Buffer.Slice(0, numAsStr.Length).ToArray());
+            _pipe.Reader.AdvanceTo(readResult.Buffer.End);
+        }
+    }
+
     [Theory]
     [InlineData(1)]
     [InlineData(_ulongMaxValueLength / 2)]
diff --git a/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs b/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs
index c73e7b599695..4cb691eb7963 100644
--- a/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs
+++ b/src/Servers/Kestrel/Core/test/SniOptionsSelectorTests.cs
@@ -858,6 +858,12 @@ public void CloneSslOptionsClonesAllProperties()
             CertificateChainPolicy = new X509ChainPolicy(),
             // Defaults to true
             AllowTlsResume = false,
+#pragma warning disable CA1416
+            // Defaults to true
+            AllowRsaPssPadding = false,
+            // Defaults to true
+            AllowRsaPkcs1Padding = false,
+#pragma warning restore CA1416
         };
 
         var clonedOptions = SniOptionsSelector.CloneSslOptions(options);
@@ -906,6 +912,12 @@ public void CloneSslOptionsClonesAllProperties()
         Assert.Equal(options.AllowTlsResume, clonedOptions.AllowTlsResume);
         Assert.True(propertyNames.Remove(nameof(options.AllowTlsResume)));
 
+        Assert.Equal(options.AllowRsaPssPadding, clonedOptions.AllowRsaPssPadding);
+        Assert.True(propertyNames.Remove(nameof(options.AllowRsaPssPadding)));
+
+        Assert.Equal(options.AllowRsaPkcs1Padding, clonedOptions.AllowRsaPkcs1Padding);
+        Assert.True(propertyNames.Remove(nameof(options.AllowRsaPkcs1Padding)));
+
         // Ensure we've checked every property. When new properties get added, we'll have to update this test along with the CloneSslOptions implementation.
         Assert.Empty(propertyNames);
     }
diff --git a/src/Servers/Kestrel/Core/test/StartLineTests.cs b/src/Servers/Kestrel/Core/test/StartLineTests.cs
index d80b9d009ad5..234939468177 100644
--- a/src/Servers/Kestrel/Core/test/StartLineTests.cs
+++ b/src/Servers/Kestrel/Core/test/StartLineTests.cs
@@ -515,7 +515,7 @@ public void AuthorityForms(string rawTarget, string path, string query)
 
     public StartLineTests()
     {
-        MemoryPool = PinnedBlockMemoryPoolFactory.Create();
+        MemoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(MemoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
         Transport = pair.Transport;
diff --git a/src/Servers/Kestrel/Core/test/TestHelpers/ObservablePipeReader.cs b/src/Servers/Kestrel/Core/test/TestHelpers/ObservablePipeReader.cs
new file mode 100644
index 000000000000..299d6491b46b
--- /dev/null
+++ b/src/Servers/Kestrel/Core/test/TestHelpers/ObservablePipeReader.cs
@@ -0,0 +1,47 @@
+// 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.Collections.Generic;
+using System.IO.Pipelines;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests.TestHelpers;
+
+internal class ObservablePipeReader : PipeReader
+{
+    private readonly PipeReader _inner;
+
+    public ObservablePipeReader(PipeReader reader)
+    {
+        _inner = reader;
+    }
+
+    /// <summary>
+    /// Number of times <see cref="ReadAsync(CancellationToken)"/> was called.
+    /// </summary>
+    public int ReadAsyncCounter { get; private set; }
+
+    public override void AdvanceTo(SequencePosition consumed)
+        => _inner.AdvanceTo(consumed);
+
+    public override void AdvanceTo(SequencePosition consumed, SequencePosition examined)
+        => _inner.AdvanceTo(consumed, examined);
+
+    public override void CancelPendingRead()
+        => _inner.CancelPendingRead();
+
+    public override void Complete(Exception exception = null)
+        => _inner.Complete(exception);
+
+    public override ValueTask<ReadResult> ReadAsync(CancellationToken cancellationToken = default)
+    {
+        ReadAsyncCounter++;
+        return _inner.ReadAsync(cancellationToken);
+    }
+
+    public override bool TryRead(out ReadResult result)
+    {
+        return _inner.TryRead(out result);
+    }
+}
diff --git a/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs b/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs
index 914fa9bb5f58..88a5c8cfea69 100644
--- a/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs
+++ b/src/Servers/Kestrel/Core/test/TestHelpers/TestInput.cs
@@ -24,7 +24,7 @@ class TestInput : IDisposable
 
     public TestInput(KestrelTrace log = null, ITimeoutControl timeoutControl = null)
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(pool: _memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
         Transport = pair.Transport;
diff --git a/src/Servers/Kestrel/Core/test/TlsListenerTests.cs b/src/Servers/Kestrel/Core/test/TlsListenerTests.cs
new file mode 100644
index 000000000000..6350465dbe41
--- /dev/null
+++ b/src/Servers/Kestrel/Core/test/TlsListenerTests.cs
@@ -0,0 +1,622 @@
+// 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.Buffers;
+using System.Collections.Generic;
+using System.IO.Pipelines;
+using System.Net;
+using System.Net.Security;
+using System.Security.Authentication;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Middleware;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Tests.TestHelpers;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestPlatform;
+using Moq;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
+
+public class TlsListenerTests
+{
+    [Theory]
+    [MemberData(nameof(ValidClientHelloData))]
+    public Task OnTlsClientHelloAsync_ValidData(int id, byte[] packetBytes)
+        => RunTlsClientHelloCallbackTest(id, packetBytes, tlsClientHelloCallbackExpected: true);
+
+    [Theory]
+    [MemberData(nameof(InvalidClientHelloData))]
+    public Task OnTlsClientHelloAsync_InvalidData(int id, byte[] packetBytes)
+        => RunTlsClientHelloCallbackTest(id, packetBytes, tlsClientHelloCallbackExpected: false);
+
+    [Theory]
+    [MemberData(nameof(ValidClientHelloData_Segmented))]
+    public Task OnTlsClientHelloAsync_ValidData_MultipleSegments(int id, List<byte[]> packets)
+        => RunTlsClientHelloCallbackTest_WithMultipleSegments(id, packets, tlsClientHelloCallbackExpected: true);
+
+    [Theory]
+    [MemberData(nameof(InvalidClientHelloData_Segmented))]
+    public Task OnTlsClientHelloAsync_InvalidData_MultipleSegments(int id, List<byte[]> packets)
+        => RunTlsClientHelloCallbackTest_WithMultipleSegments(id, packets, tlsClientHelloCallbackExpected: false);
+
+    [Fact]
+    public async Task RunTlsClientHelloCallbackTest_WithExtraShortLastingToken()
+    {
+        var serviceContext = new TestServiceContext();
+
+        var pipe = new Pipe();
+        var writer = pipe.Writer;
+        var reader = new ObservablePipeReader(pipe.Reader);
+
+        var transport = new DuplexPipe(reader, writer);
+        var transportConnection = new DefaultConnectionContext("test", transport, transport);
+
+        var tlsClientHelloCallbackInvoked = false;
+        var listener = new TlsListener((ctx, data) => { tlsClientHelloCallbackInvoked = true; });
+
+        var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(3));
+
+        await writer.WriteAsync(new byte[1] { 0x16 });
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(() => listener.OnTlsClientHelloAsync(transportConnection, cts.Token));
+        Assert.False(tlsClientHelloCallbackInvoked);
+    }
+
+    [Fact]
+    public async Task RunTlsClientHelloCallbackTest_WithPreCanceledToken()
+    {
+        var serviceContext = new TestServiceContext();
+
+        var pipe = new Pipe();
+        var writer = pipe.Writer;
+        var reader = new ObservablePipeReader(pipe.Reader);
+
+        var transport = new DuplexPipe(reader, writer);
+        var transportConnection = new DefaultConnectionContext("test", transport, transport);
+
+        var tlsClientHelloCallbackInvoked = false;
+        var listener = new TlsListener((ctx, data) => { tlsClientHelloCallbackInvoked = true; });
+
+        var cts = new CancellationTokenSource();
+        cts.Cancel();
+
+        await writer.WriteAsync(new byte[1] { 0x16 });
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(() => listener.OnTlsClientHelloAsync(transportConnection, cts.Token));
+        Assert.False(tlsClientHelloCallbackInvoked);
+    }
+
+    [Fact]
+    public async Task RunTlsClientHelloCallbackTest_WithPendingCancellation()
+    {
+        var serviceContext = new TestServiceContext();
+
+        var pipe = new Pipe();
+        var writer = pipe.Writer;
+        var reader = new ObservablePipeReader(pipe.Reader);
+
+        var transport = new DuplexPipe(reader, writer);
+        var transportConnection = new DefaultConnectionContext("test", transport, transport);
+
+        var tlsClientHelloCallbackInvoked = false;
+        var listener = new TlsListener((ctx, data) => { tlsClientHelloCallbackInvoked = true; });
+
+        var cts = new CancellationTokenSource();
+        await writer.WriteAsync(new byte[1] { 0x16 });
+        var listenerTask = listener.OnTlsClientHelloAsync(transportConnection, cts.Token);
+        await writer.WriteAsync(new byte[2] { 0x03, 0x01 });
+        cts.Cancel();
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(() => listenerTask);
+        Assert.False(tlsClientHelloCallbackInvoked);
+    }
+
+    [Fact]
+    public async Task RunTlsClientHelloCallbackTest_DeterministicallyReads()
+    {
+        /* Current test ensures that we read the input stream only a limited number of times.
+         * It is a guard against incorrect transport.AdvanceTo() usage leading to infinite loop / more reads than should happen.
+         */
+
+        var serviceContext = new TestServiceContext();
+
+        var pipe = new Pipe();
+        var writer = pipe.Writer;
+        var reader = new ObservablePipeReader(pipe.Reader);
+
+        var transport = new DuplexPipe(reader, writer);
+        var transportConnection = new DefaultConnectionContext("test", transport, transport);
+
+        var tlsClientHelloCallbackInvoked = false;
+        var listener = new TlsListener((ctx, data) => { tlsClientHelloCallbackInvoked = true; });
+
+        await writer.WriteAsync(new byte[1] { 0x16 });
+        var listenerTask = listener.OnTlsClientHelloAsync(transportConnection, CancellationToken.None);
+        await writer.WriteAsync(new byte[2] { 0x03, 0x01 });
+        await writer.WriteAsync(new byte[2] { 0x00, 0x20 });
+        await writer.CompleteAsync();
+
+        await listenerTask;
+        Assert.False(tlsClientHelloCallbackInvoked);
+
+        var readResult = await reader.ReadAsync();
+        Assert.Equal(5, readResult.Buffer.Length);
+
+        // ensuring that we have read limited number of times
+        Assert.True(reader.ReadAsyncCounter is >= 2 && reader.ReadAsyncCounter is <= 5,
+            $"Expected ReadAsync() to happen about 2-5 times. Actually happened {reader.ReadAsyncCounter} times.");
+    }
+
+    private async Task RunTlsClientHelloCallbackTest_WithMultipleSegments(
+        int id,
+        List<byte[]> packets,
+        bool tlsClientHelloCallbackExpected)
+    {
+        var pipe = new Pipe();
+        var writer = pipe.Writer;
+
+        var transport = new DuplexPipe(pipe.Reader, writer);
+        var transportConnection = new DefaultConnectionContext("test", transport, transport);
+
+        var tlsClientHelloCallbackActual = false;
+
+        var fullLength = packets.Sum(p => p.Length);
+
+        var listener = new TlsListener(
+            tlsClientHelloBytesCallback: (ctx, data) =>
+            {
+                tlsClientHelloCallbackActual = true;
+
+                Assert.NotNull(ctx);
+                Assert.False(data.IsEmpty);
+                Assert.Equal(fullLength, data.Length);
+            }
+        );
+
+        // write first packet
+        await writer.WriteAsync(packets[0]);
+        var listenerTask = listener.OnTlsClientHelloAsync(transportConnection, CancellationToken.None);
+
+        /* It is a race condition (middleware's loop and writes here).
+         * We don't know specifically how many packets will be read by middleware's loop
+         * (possibly there are even 2 packets - the first and all others combined).
+         * The goal here is to try simulate multi-segmented approach and test more cases
+         */
+
+        // write all other packets
+        foreach (var packet in packets.Skip(1))
+        {
+            await writer.WriteAsync(packet);
+        }
+        await writer.CompleteAsync();
+        await listenerTask;
+
+        Assert.Equal(tlsClientHelloCallbackExpected, tlsClientHelloCallbackActual);
+
+        if (tlsClientHelloCallbackActual)
+        {
+            var readResult = await pipe.Reader.ReadAsync();
+            Assert.Equal(fullLength, readResult.Buffer.Length);
+        }
+    }
+
+    private async Task RunTlsClientHelloCallbackTest(
+        int id,
+        byte[] packetBytes,
+        bool tlsClientHelloCallbackExpected)
+    {
+        var pipe = new Pipe();
+        var writer = pipe.Writer;
+
+        var transport = new DuplexPipe(pipe.Reader, writer);
+        var transportConnection = new DefaultConnectionContext("test", transport, transport);
+
+        var tlsClientHelloCallbackActual = false;
+
+        var listener = new TlsListener(
+            tlsClientHelloBytesCallback: (ctx, data) =>
+            {
+                tlsClientHelloCallbackActual = true;
+
+                Assert.NotNull(ctx);
+                Assert.False(data.IsEmpty);
+                Assert.Equal(packetBytes.Length, data.Length);
+            }
+        );
+
+        await writer.WriteAsync(packetBytes);
+        await writer.CompleteAsync();
+
+        // call middleware and expect a callback
+        await listener.OnTlsClientHelloAsync(transportConnection, CancellationToken.None);
+
+        Assert.Equal(tlsClientHelloCallbackExpected, tlsClientHelloCallbackActual);
+
+        var readResult = await pipe.Reader.ReadAsync();
+        Assert.Equal(packetBytes.Length, readResult.Buffer.Length);
+    }
+
+    public static IEnumerable<object[]> ValidClientHelloData()
+    {
+        int id = 0;
+        foreach (var clientHello in _validCollection)
+        {
+            yield return new object[] { id++, clientHello };
+        }
+    }
+
+    public static IEnumerable<object[]> InvalidClientHelloData()
+    {
+        int id = 0;
+        foreach (byte[] clientHello in _invalidCollection)
+        {
+            yield return new object[] { id++, clientHello };
+        }
+    }
+
+    public static IEnumerable<object[]> ValidClientHelloData_Segmented()
+    {
+        int id = 0;
+        foreach (var clientHello in _validCollection)
+        {
+            var clientHelloSegments = new List<byte[]>
+            {
+                clientHello.Take(1).ToArray(),
+                clientHello.Skip(1).Take(2).ToArray(),
+                clientHello.Skip(3).Take(2).ToArray(),
+                clientHello.Skip(5).Take(1).ToArray(),
+                clientHello.Skip(6).Take(clientHello.Length - 6).ToArray()
+            };
+
+            yield return new object[] { id++, clientHelloSegments };
+        }
+    }
+
+    public static IEnumerable<object[]> InvalidClientHelloData_Segmented()
+    {
+        int id = 0;
+        foreach (var clientHello in _invalidCollection)
+        {
+            var clientHelloSegments = new List<byte[]>();
+            if (clientHello.Length >= 1)
+            {
+                clientHelloSegments.Add(clientHello.Take(1).ToArray());
+            }
+            if (clientHello.Length >= 3)
+            {
+                clientHelloSegments.Add(clientHello.Skip(1).Take(2).ToArray());
+            }
+            if (clientHello.Length >= 5)
+            {
+                clientHelloSegments.Add(clientHello.Skip(3).Take(2).ToArray());
+            }
+            if (clientHello.Length >= 6)
+            {
+                clientHelloSegments.Add(clientHello.Skip(5).Take(1).ToArray());
+            }
+            if (clientHello.Length >= 7)
+            {
+                clientHelloSegments.Add(clientHello.Skip(6).Take(clientHello.Length - 6).ToArray());
+            }
+
+            yield return new object[] { id++, clientHelloSegments };
+        }
+    }
+
+    private static byte[] _validClientHelloHeader =
+    {
+        // 0x16 = Handshake
+        0x16,
+        // 0x0301 = TLS 1.0
+        0x03, 0x01,
+        // length = 0x0020 (32 bytes)
+        0x00, 0x20,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // 31 bytes (zeros for simplicity)
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0
+    };
+
+    private static byte[] _validSsl3ClientHello =
+    {
+        0x16, 0x03, 0x00,             // ContentType: Handshake, Version: SSL 3.0
+        0x00, 0x2F,                   // Length: 47 bytes
+        0x01,                         // Handshake Type: ClientHello
+        0x00, 0x00, 0x2B,             // Length: 43 bytes
+        0x03, 0x00,                   // Client Version: SSL 3.0
+        // Random (32 bytes)
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x00,                         // Session ID Length
+        0x00, 0x04,                   // Cipher Suites Length
+        0x00, 0x2F, 0x00, 0x35,       // Cipher Suites
+        0x01, 0x00                    // Compression Methods: null
+    };
+
+    private static byte[] _validTls10ClientHello =
+    {
+        0x16, 0x03, 0x01,             // ContentType: Handshake, Version: TLS 1.0
+        0x00, 0x2F,                   // Length: 47 bytes
+        0x01,                         // Handshake Type: ClientHello
+        0x00, 0x00, 0x2B,             // Length: 43 bytes
+        0x03, 0x01,                   // Client Version: TLS 1.0
+        // Random (32 bytes)
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x00,                         // Session ID Length
+        0x00, 0x04,                   // Cipher Suites Length
+        0x00, 0x2F, 0x00, 0x35,       // Cipher Suites
+        0x01, 0x00                    // Compression Methods: null
+    };
+
+    private static byte[] _validTls11ClientHello =
+    {
+        0x16, 0x03, 0x02,             // ContentType: Handshake, Version: TLS 1.1
+        0x00, 0x2F,                   // Length: 47 bytes
+        0x01,                         // Handshake Type: ClientHello
+        0x00, 0x00, 0x2B,             // Length: 43 bytes
+        0x03, 0x02,                   // Client Version: TLS 1.1
+        // Random (32 bytes)
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+        0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x00,                         // Session ID Length
+        0x00, 0x04,                   // Cipher Suites Length
+        0x00, 0x2F, 0x00, 0x35,       // Cipher Suites: TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA
+        0x01, 0x00                    // Compression Methods: null
+    };
+
+    private static byte[] _validTls12ClientHello =
+    {
+        // SslPlainText.(ContentType+ProtocolVersion)
+        0x16, 0x03, 0x03,
+        // SslPlainText.length
+        0x00, 0xD1,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // Handshake.length
+        0x00, 0x00, 0xCD,
+        // ClientHello.client_version
+        0x03, 0x03,
+        // ClientHello.random
+        0x0C, 0x3C, 0x85, 0x78, 0xCA,
+        0x67, 0x70, 0xAA, 0x38, 0xCB,
+        0x28, 0xBC, 0xDC, 0x3E, 0x30,
+        0xBF, 0x11, 0x96, 0x95, 0x1A,
+        0xB9, 0xF0, 0x99, 0xA4, 0x91,
+        0x09, 0x13, 0xB4, 0x89, 0x94,
+        0x27, 0x2E,
+        // ClientHello.SessionId
+        0x00,
+        // ClientHello.cipher_suites_length
+        0x00, 0x5C,
+        // ClientHello.cipher_suites
+        0xC0, 0x30, 0xC0, 0x2C, 0xC0, 0x28, 0xC0, 0x24,
+        0xC0, 0x14, 0xC0, 0x0A, 0x00, 0x9f, 0x00, 0x6B,
+        0x00, 0x39, 0xCC, 0xA9, 0xCC, 0xA8, 0xCC, 0xAA,
+        0xFF, 0x85, 0x00, 0xC4, 0x00, 0x88, 0x00, 0x81,
+        0x00, 0x9D, 0x00, 0x3D, 0x00, 0x35, 0x00, 0xC0,
+        0x00, 0x84, 0xC0, 0x2f, 0xC0, 0x2B, 0xC0, 0x27,
+        0xC0, 0x23, 0xC0, 0x13, 0xC0, 0x09, 0x00, 0x9E,
+        0x00, 0x67, 0x00, 0x33, 0x00, 0xBE, 0x00, 0x45,
+        0x00, 0x9C, 0x00, 0x3C, 0x00, 0x2F, 0x00, 0xBA,
+        0x00, 0x41, 0xC0, 0x11, 0xC0, 0x07, 0x00, 0x05,
+        0x00, 0x04, 0xC0, 0x12, 0xC0, 0x08, 0x00, 0x16,
+        0x00, 0x0a, 0x00, 0xff,
+        // ClientHello.compression_methods
+        0x01, 0x01,
+        // ClientHello.extension_list_length
+        0x00, 0x48,
+        // Extension.extension_type (ec_point_formats)
+        0x00, 0x0b, 0x00, 0x02, 0x01, 0x00,
+        // Extension.extension_type (supported_groups)
+        0x00, 0x0A, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1D,
+        0x00, 0x17, 0x00, 0x18,
+        // Extension.extension_type (session_ticket)
+        0x00, 0x23, 0x00, 0x00,
+        // Extension.extension_type (signature_algorithms)
+        0x00, 0x0D, 0x00, 0x1C, 0x00, 0x1A, 0x06, 0x01,
+        0x06, 0x03, 0xEF, 0xEF, 0x05, 0x01, 0x05, 0x03,
+        0x04, 0x01, 0x04, 0x03, 0xEE, 0xEE, 0xED, 0xED,
+        0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
+        // Extension.extension_type (application_level_Protocol)
+        0x00, 0x10, 0x00, 0x0e, 0x00, 0x0C, 0x02, 0x68,
+        0x32, 0x08, 0x68, 0x74, 0x74, 0x70, 0x2F, 0x31,
+        0x2E, 0x31
+    };
+
+    private static byte[] _validTls13ClientHello =
+    {
+        // SslPlainText.(ContentType+ProtocolVersion)
+        0x16, 0x03, 0x04,
+        // SslPlainText.length
+        0x01, 0x08,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // Handshake.length
+        0x00, 0x01, 0x04,
+        // ClientHello.client_version
+        0x03, 0x03,
+        // ClientHello.random
+        0x0C, 0x3C, 0x85, 0x78, 0xCA, 0x67, 0x70, 0xAA,
+        0x38, 0xCB, 0x28, 0xBC, 0xDC, 0x3E, 0x30, 0xBF,
+        0x11, 0x96, 0x95, 0x1A, 0xB9, 0xF0, 0x99, 0xA4,
+        0x91, 0x09, 0x13, 0xB4, 0x89, 0x94, 0x27, 0x2E,
+        // ClientHello.SessionId_Length
+        0x20,
+        // ClientHello.SessionId
+        0x0C, 0x3C, 0x85, 0x78, 0xCA, 0x67, 0x70, 0xAA,
+        0x38, 0xCB, 0x28, 0xBC, 0xDC, 0x3E, 0x30, 0xBF,
+        0x11, 0x96, 0x95, 0x1A, 0xB9, 0xF0, 0x99, 0xA4,
+        0x91, 0x09, 0x13, 0xB4, 0x89, 0x94, 0x27, 0x2E,
+        // ClientHello.cipher_suites_length
+        0x00, 0x0C,
+        // ClientHello.cipher_suites
+        0x13, 0x02, 0x13, 0x03, 0x13, 0x01, 0xC0, 0x14,
+        0xc0, 0x30, 0x00, 0xFF,
+        // ClientHello.compression_methods
+        0x01, 0x00,
+        // ClientHello.extension_list_length
+        0x00, 0xAF,
+        // Extension.extension_type (server_name) (10.211.55.2)
+        0x00, 0x00, 0x00, 0x10, 0x00, 0x0e, 0x00, 0x00,
+        0x0B, 0x31, 0x30, 0x2E, 0x32, 0x31, 0x31, 0x2E,
+        0x35, 0x35, 0x2E, 0x32,
+        // Extension.extension_type (ec_point_formats)
+        0x00, 0x0B, 0x00, 0x04, 0x03, 0x00, 0x01, 0x02,
+        // Extension.extension_type (supported_groups)
+        0x00, 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x1D,
+        0x00, 0x17, 0x00, 0x1E, 0x00, 0x19, 0x00, 0x18,
+        // Extension.extension_type (application_level_Protocol) (boo)
+        0x00, 0x10, 0x00, 0x06, 0x00, 0x04, 0x03, 0x62,
+        0x6f, 0x6f,
+        // Extension.extension_type (encrypt_then_mac)
+        0x00, 0x16, 0x00, 0x00,
+        // Extension.extension_type (extended_master_key_secret)
+        0x00, 0x17, 0x00, 0x00,
+        // Extension.extension_type (signature_algorithms)
+        0x00, 0x0D, 0x00, 0x30, 0x00, 0x2E,
+        0x06, 0x03, 0xEF, 0xEF, 0x05, 0x01, 0x05, 0x03,
+        0x06, 0x03, 0xEF, 0xEF, 0x05, 0x01, 0x05, 0x03,
+        0x06, 0x03, 0xEF, 0xEF, 0x05, 0x01, 0x05, 0x03,
+        0x04, 0x01, 0x04, 0x03, 0xEE, 0xEE, 0xED, 0xED,
+        0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
+        0x03, 0x01, 0x03, 0x03, 0x02, 0x01,
+        // Extension.extension_type (supported_versions)
+        0x00, 0x2B, 0x00, 0x09, 0x08, 0x03, 0x04, 0x03,
+        0x03, 0x03, 0x02, 0x03, 0x01,
+        // Extension.extension_type (psk_key_exchange_modes)
+        0x00, 0x2D, 0x00, 0x02, 0x01, 0x01,
+        // Extension.extension_type (key_share)
+        0x00, 0x33, 0x00, 0x26, 0x00, 0x24, 0x00, 0x1D,
+        0x00, 0x20,
+        0x04, 0x01, 0x04, 0x03, 0xEE, 0xEE, 0xED, 0xED,
+        0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
+        0x04, 0x01, 0x04, 0x03, 0xEE, 0xEE, 0xED, 0xED,
+        0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03
+    };
+
+    private static byte[] _validTlsClientHelloNoExtensions =
+    {
+        0x16, 0x03, 0x03, 0x00, 0x39, 0x01, 0x00, 0x00,
+        0x35, 0x03, 0x03, 0x62, 0x5d, 0x50, 0x2a, 0x41,
+        0x2f, 0xd8, 0xc3, 0x65, 0x35, 0xea, 0x01, 0x70,
+        0x03, 0x7e, 0x7e, 0x2d, 0xd4, 0xfe, 0x93, 0x39,
+        0xa4, 0x04, 0x66, 0xbb, 0x46, 0x91, 0x41, 0xc3,
+        0x48, 0x87, 0x3d, 0x00, 0x00, 0x0e, 0x00, 0x3d,
+        0x00, 0x3c, 0x00, 0x0a, 0x00, 0x35, 0x00, 0x2f,
+        0x00, 0x05, 0x00, 0x04, 0x01, 0x00
+    };
+
+    private static byte[] _invalidTlsClientHelloHeader =
+    {
+        // Handshake - incorrect
+        0x01,
+        // ProtocolVersion
+        0x03, 0x04,
+        // SslPlainText.length
+        0x00, 0xCB,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // Handshake.length
+        0x00, 0x00, 0xC7,
+    };
+
+    private static byte[] _invalid3BytesMessage =
+    {
+        // Handshake
+        0x016,
+        // Protocol Version
+        0x03, 0x01,
+        // not enough data - so incorrect
+    };
+
+    private static byte[] _invalid9BytesMessage =
+    {
+        // 0x16 = Handshake
+        0x16,
+        // 0x0301 = TLS 1.0
+        0x03, 0x01,
+        // length = 0x0020 (32 bytes)
+        0x00, 0x20,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // should have 31 bytes (zeros for simplicity)
+        0, 0, 0
+        // no other data here - incorrect
+    };
+
+    private static byte[] _invalidUnknownProtocolVersion1 =
+    {
+        // Handshake
+        0x016,
+        // ProtocolVersion - incorrect
+        0x02, 0x05,
+        // SslPlainText.length
+        0x00, 0xCB,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // Handshake.length
+        0x00, 0x00, 0xC7,
+    };
+
+    private static byte[] _invalidUnknownProtocolVersion2 =
+    {
+        // Handshake
+        0x016,
+        // ProtocolVersion - incorrect
+        0x02, 0x01,
+        // SslPlainText.length
+        0x00, 0xCB,
+        // Handshake.msg_type (client hello)
+        0x01,
+        // Handshake.length
+        0x00, 0x00, 0xC7,
+    };
+
+    private static byte[] _invalidIncorrectHandshakeMessageType =
+    {
+        // Handshake
+        0x016,
+        // ProtocolVersion
+        0x02, 0x00,
+        // SslPlainText.length
+        0x00, 0xCB,
+        // Handshake.msg_type (client hello) - incorrect
+        0x02,
+        // Handshake.length
+        0x00, 0x00, 0xC7,
+    };
+
+    private static List<byte[]> _validCollection = new List<byte[]>()
+    {
+        _validClientHelloHeader, _validSsl3ClientHello, _validTls10ClientHello,
+        _validTls11ClientHello, _validTls12ClientHello, _validTls13ClientHello,
+        _validTlsClientHelloNoExtensions
+    };
+
+    private static List<byte[]> _invalidCollection = new List<byte[]>()
+    {
+        _invalidTlsClientHelloHeader, _invalid3BytesMessage, _invalid9BytesMessage,
+        _invalidUnknownProtocolVersion1, _invalidUnknownProtocolVersion2, _invalidIncorrectHandshakeMessageType
+    };
+}
diff --git a/src/Servers/Kestrel/Core/test/VariableIntHelperTests.cs b/src/Servers/Kestrel/Core/test/VariableIntHelperTests.cs
index 8b73bd0e2c48..f8fa53170829 100644
--- a/src/Servers/Kestrel/Core/test/VariableIntHelperTests.cs
+++ b/src/Servers/Kestrel/Core/test/VariableIntHelperTests.cs
@@ -14,7 +14,8 @@ public class VariableIntHelperTests
     [MemberData(nameof(IntegerData))]
     public void CheckDecoding(long expected, byte[] input)
     {
-        var decoded = VariableLengthIntegerHelper.GetInteger(new ReadOnlySequence<byte>(input), out _, out _);
+        var result = VariableLengthIntegerHelper.TryGetInteger(new ReadOnlySequence<byte>(input), out _, out var decoded);
+        Assert.True(result);
         Assert.Equal(expected, decoded);
     }
 
diff --git a/src/Servers/Kestrel/Kestrel.slnf b/src/Servers/Kestrel/Kestrel.slnf
index c17e0ed74cfc..c541fc545693 100644
--- a/src/Servers/Kestrel/Kestrel.slnf
+++ b/src/Servers/Kestrel/Kestrel.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
diff --git a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs
index 7186715a6c5f..47a2962d005b 100644
--- a/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs
+++ b/src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs
@@ -7,7 +7,6 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
-using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -79,15 +78,18 @@ public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder)
     /// </returns>
     public static IWebHostBuilder UseKestrelCore(this IWebHostBuilder hostBuilder)
     {
+        hostBuilder.UseSockets();
         hostBuilder.ConfigureServices(services =>
         {
-            // Don't override an already-configured transport
-            services.TryAddSingleton<IConnectionListenerFactory, SocketTransportFactory>();
-
             services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>();
             services.AddSingleton<IHttpsConfigurationService, HttpsConfigurationService>();
             services.AddSingleton<IServer, KestrelServerImpl>();
             services.AddSingleton<KestrelMetrics>();
+
+            services.AddSingleton<PinnedBlockMemoryPoolFactory>();
+            services.AddSingleton<MemoryPoolMetrics>();
+            services.TryAddEnumerable(ServiceDescriptor.Singleton<IHeartbeatHandler, PinnedBlockMemoryPoolFactory>(sp => sp.GetRequiredService<PinnedBlockMemoryPoolFactory>()));
+            services.AddSingleton<IMemoryPoolFactory<byte>>(sp => sp.GetRequiredService<PinnedBlockMemoryPoolFactory>());
         });
 
         if (OperatingSystem.IsWindows())
diff --git a/src/Servers/Kestrel/Kestrel/test/ConfigurationReaderTests.cs b/src/Servers/Kestrel/Kestrel/test/ConfigurationReaderTests.cs
index 5521121b40a5..b686bf4276e2 100644
--- a/src/Servers/Kestrel/Kestrel/test/ConfigurationReaderTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/ConfigurationReaderTests.cs
@@ -82,7 +82,7 @@ public void ReadCertificatesSection_IsCaseInsensitive()
         var reader = new ConfigurationReader(config);
         var certificates = reader.Certificates;
         Assert.NotNull(certificates);
-        Assert.Equal(1, certificates.Count);
+        Assert.Single(certificates);
 
         var fileCert = certificates["FiLeCeRt"];
         Assert.True(fileCert.IsFileCert);
diff --git a/src/Servers/Kestrel/Kestrel/test/HttpsConfigurationTests.cs b/src/Servers/Kestrel/Kestrel/test/HttpsConfigurationTests.cs
index cb27ce5bc210..07f9e0924811 100644
--- a/src/Servers/Kestrel/Kestrel/test/HttpsConfigurationTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/HttpsConfigurationTests.cs
@@ -4,11 +4,13 @@
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Tests;
 
@@ -21,35 +23,39 @@ public class HttpsConfigurationTests
     [InlineData("https://127.0.0.1:0", false)]
     public async Task BindAddressFromSetting(string address, bool useKestrelHttpsConfiguration)
     {
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .ConfigureKestrel(serverOptions =>
-                {
-                    serverOptions.TestOverrideDefaultCertificate = new X509Certificate2(Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx"), "testPassword");
-                })
-                .Configure(app => { });
-
-        // This is what ASPNETCORE_URLS would populate
-        hostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, address);
-
-        if (useKestrelHttpsConfiguration)
-        {
-            hostBuilder.UseKestrelHttpsConfiguration();
-        }
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
+                    {
+                        serverOptions.TestOverrideDefaultCertificate = new X509Certificate2(Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx"), "testPassword");
+                    })
+                    .Configure(app => { })
+                    // This is what ASPNETCORE_URLS would populate
+                    .UseSetting(WebHostDefaults.ServerUrlsKey, address);
 
-        var host = hostBuilder.Build();
+                if (useKestrelHttpsConfiguration)
+                {
+                    webHostBuilder.UseKestrelHttpsConfiguration();
+                }
+            });
 
-        Assert.Single(host.ServerFeatures.Get<IServerAddressesFeature>().Addresses, address);
+        using var host = hostBuilder.Build();
 
         if (address.StartsWith("https", StringComparison.OrdinalIgnoreCase) && !useKestrelHttpsConfiguration)
         {
-            Assert.Throws<InvalidOperationException>(host.Run);
+            Assert.Throws<InvalidOperationException>(host.Start);
+            Assert.Empty(host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses);
         }
         else
         {
-            // Binding succeeds
             await host.StartAsync();
-            await host.StopAsync();
+
+            var addr = Assert.Single(host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses);
+            // addr will contain the realized port, so we'll remove the port for comparison
+            Assert.Equal(address[..^2].ToString(), addr.Substring(0, addr.LastIndexOf(':')));
         }
     }
 
@@ -59,18 +65,24 @@ public void NoFallbackToHttpAddress()
         const string httpAddress = "http://127.0.0.1:0";
         const string httpsAddress = "https://localhost:5001";
 
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .Configure(app => { });
-
-        // This is what ASPNETCORE_URLS would populate
-        hostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, $"{httpAddress};{httpsAddress}");
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .Configure(app => { })
+                    // This is what ASPNETCORE_URLS would populate
+                    .UseSetting(WebHostDefaults.ServerUrlsKey, $"{httpAddress};{httpsAddress}");
+            });
 
         var host = hostBuilder.Build();
 
-        Assert.Equal(new[] { httpAddress, httpsAddress }, host.ServerFeatures.Get<IServerAddressesFeature>().Addresses);
+        var ex = Assert.Throws<InvalidOperationException>(host.Start);
+        Assert.Contains("Call UseKestrelHttpsConfiguration()", ex.Message);
 
-        Assert.Throws<InvalidOperationException>(host.Run);
+        var addr = Assert.Single(host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses);
+        // addr will contain the realized port, so we'll remove the port for comparison
+        Assert.Equal(httpAddress[..^2].ToString(), addr.Substring(0, addr.LastIndexOf(':')));
     }
 
     [Theory]
@@ -80,24 +92,28 @@ public void NoFallbackToHttpAddress()
     [InlineData("https://127.0.0.1:0", false)]
     public async Task BindAddressFromEndpoint(string address, bool useKestrelHttpsConfiguration)
     {
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .ConfigureKestrel(serverOptions =>
-                {
-                    var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
                     {
-                        new KeyValuePair<string, string>("Endpoints:end1:Url", address),
-                        new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
-                        new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
-                    }).Build();
-                    serverOptions.Configure(config);
-                })
-                .Configure(app => { });
-
-        if (useKestrelHttpsConfiguration)
-        {
-            hostBuilder.UseKestrelHttpsConfiguration();
-        }
+                        var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+                        {
+                            new KeyValuePair<string, string>("Endpoints:end1:Url", address),
+                            new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
+                            new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
+                        }).Build();
+                        serverOptions.Configure(config);
+                    })
+                    .Configure(app => { });
+
+                if (useKestrelHttpsConfiguration)
+                {
+                    webHostBuilder.UseKestrelHttpsConfiguration();
+                }
+            });
 
         var host = hostBuilder.Build();
 
@@ -118,23 +134,27 @@ public async Task BindAddressFromEndpoint(string address, bool useKestrelHttpsCo
     [InlineData(false)]
     public async Task LoadDefaultCertificate(bool useKestrelHttpsConfiguration)
     {
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .ConfigureKestrel(serverOptions =>
-                {
-                    var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
                     {
-                        new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
-                        new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
-                    }).Build();
-                    serverOptions.Configure(config);
-                })
-                .Configure(app => { });
-
-        if (useKestrelHttpsConfiguration)
-        {
-            hostBuilder.UseKestrelHttpsConfiguration();
-        }
+                        var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+                        {
+                            new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
+                            new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
+                        }).Build();
+                        serverOptions.Configure(config);
+                    })
+                    .Configure(app => { });
+
+                if (useKestrelHttpsConfiguration)
+                {
+                    webHostBuilder.UseKestrelHttpsConfiguration();
+                }
+            });
 
         var host = hostBuilder.Build();
 
@@ -150,24 +170,28 @@ public async Task LoadDefaultCertificate(bool useKestrelHttpsConfiguration)
     [InlineData("https://127.0.0.1:0", false)]
     public async Task LoadEndpointCertificate(string address, bool useKestrelHttpsConfiguration)
     {
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .ConfigureKestrel(serverOptions =>
-                {
-                    var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
                     {
-                        new KeyValuePair<string, string>("Endpoints:end1:Url", address),
-                        new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
-                        new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
-                    }).Build();
-                    serverOptions.Configure(config);
-                })
-                .Configure(app => { });
-
-        if (useKestrelHttpsConfiguration)
-        {
-            hostBuilder.UseKestrelHttpsConfiguration();
-        }
+                        var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+                        {
+                            new KeyValuePair<string, string>("Endpoints:end1:Url", address),
+                            new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
+                            new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
+                        }).Build();
+                        serverOptions.Configure(config);
+                    })
+                    .Configure(app => { });
+
+                if (useKestrelHttpsConfiguration)
+                {
+                    webHostBuilder.UseKestrelHttpsConfiguration();
+                }
+            });
 
         var host = hostBuilder.Build();
 
@@ -186,18 +210,22 @@ public async Task LoadEndpointCertificate(string address, bool useKestrelHttpsCo
     [Fact]
     public async Task UseHttpsJustWorks()
     {
-        var hostBuilder = new WebHostBuilder()
-            .UseKestrelCore()
-            .ConfigureKestrel(serverOptions =>
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                serverOptions.TestOverrideDefaultCertificate = new X509Certificate2(Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx"), "testPassword");
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
+                    {
+                        serverOptions.TestOverrideDefaultCertificate = new X509Certificate2(Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx"), "testPassword");
 
-                serverOptions.ListenAnyIP(0, listenOptions =>
-                {
-                    listenOptions.UseHttps();
-                });
-            })
-            .Configure(app => { });
+                        serverOptions.ListenAnyIP(0, listenOptions =>
+                        {
+                            listenOptions.UseHttps();
+                        });
+                    })
+                    .Configure(app => { });
+            });
 
         var host = hostBuilder.Build();
 
@@ -211,19 +239,23 @@ public async Task UseHttpsJustWorks()
     [Fact]
     public async Task UseHttpsMayNotImplyUseKestrelHttpsConfiguration()
     {
-        var hostBuilder = new WebHostBuilder()
-            .UseKestrelCore()
-            .ConfigureKestrel(serverOptions =>
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                serverOptions.ListenAnyIP(0, listenOptions =>
-                {
-                    listenOptions.UseHttps(new HttpsConnectionAdapterOptions()
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
                     {
-                        ServerCertificate = new X509Certificate2(Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx"), "testPassword"),
-                    });
-                });
-            })
-            .Configure(app => { });
+                        serverOptions.ListenAnyIP(0, listenOptions =>
+                        {
+                            listenOptions.UseHttps(new HttpsConnectionAdapterOptions()
+                            {
+                                ServerCertificate = new X509Certificate2(Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx"), "testPassword"),
+                            });
+                        });
+                    })
+                    .Configure(app => { });
+            });
 
         var host = hostBuilder.Build();
 
diff --git a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs
index f361e01c903d..d33ab36cd8c6 100644
--- a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationLoaderTests.cs
@@ -196,6 +196,33 @@ public void ConfigureDefaultsAppliesToNewConfigureEndpoints()
         Assert.False(serverOptions.CodeBackedListenOptions[0].IsTls);
     }
 
+    [Fact]
+    public void ConfigureDefaultCertificatePathLoadsChain()
+    {
+        var serverOptions = CreateServerOptions();
+        var testCertPath = TestResources.GetCertPath("leaf.com.crt");
+        var ran1 = false;
+        var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+        {
+            new KeyValuePair<string, string>("Endpoints:End1:Url", "https://*:5001"),
+            new KeyValuePair<string,string>("Certificates:Default:Path", testCertPath)
+        }).Build();
+
+        serverOptions.Configure(config)
+            .Endpoint("End1", opt =>
+            {
+                ran1 = true;
+                Assert.True(opt.IsHttps);
+                Assert.NotNull(opt.HttpsOptions.ServerCertificate);
+                Assert.NotNull(opt.HttpsOptions.ServerCertificateChain);
+                Assert.Equal(2, opt.HttpsOptions.ServerCertificateChain.Count);
+            }).Load();
+
+        Assert.True(ran1);
+
+        Assert.True(serverOptions.ConfigurationBackedListenOptions[0].IsTls);
+    }
+
     [Fact]
     public void ConfigureEndpointDefaultCanEnableHttps()
     {
@@ -656,47 +683,294 @@ public void ConfigureEndpoint_ThrowsWhen_The_KeyIsPublic()
         Assert.IsAssignableFrom<CryptographicException>(ex.InnerException);
     }
 
+#pragma warning disable SYSLIB5006
+    private static readonly Dictionary<string, MLDsaAlgorithm> _mlDsaAlgorithms = ((IEnumerable<MLDsaAlgorithm>)[
+        MLDsaAlgorithm.MLDsa44,
+        MLDsaAlgorithm.MLDsa65,
+        MLDsaAlgorithm.MLDsa87,
+    ]).ToDictionary(a => a.Name);
+
+    private static readonly Dictionary<string, SlhDsaAlgorithm> _slhDsaAlgorithms = ((IEnumerable<SlhDsaAlgorithm>)[
+        SlhDsaAlgorithm.SlhDsaSha2_128s,
+        SlhDsaAlgorithm.SlhDsaSha2_128f,
+        SlhDsaAlgorithm.SlhDsaSha2_192s,
+        SlhDsaAlgorithm.SlhDsaSha2_192f,
+        SlhDsaAlgorithm.SlhDsaSha2_256s,
+        SlhDsaAlgorithm.SlhDsaSha2_256f,
+        SlhDsaAlgorithm.SlhDsaShake128s,
+        SlhDsaAlgorithm.SlhDsaShake128f,
+        SlhDsaAlgorithm.SlhDsaShake192s,
+        SlhDsaAlgorithm.SlhDsaShake192f,
+        SlhDsaAlgorithm.SlhDsaShake256s,
+        SlhDsaAlgorithm.SlhDsaShake256f,
+    ]).ToDictionary(a => a.Name);
+
+    private static readonly Dictionary<string, CompositeMLDsaAlgorithm> _compositeMLDsaAlgorithms = ((IEnumerable<CompositeMLDsaAlgorithm>)[
+        CompositeMLDsaAlgorithm.MLDsa65WithECDsaP256,
+        CompositeMLDsaAlgorithm.MLDsa65WithRSA3072Pkcs15,
+        CompositeMLDsaAlgorithm.MLDsa65WithEd25519,
+        CompositeMLDsaAlgorithm.MLDsa65WithECDsaP384,
+        CompositeMLDsaAlgorithm.MLDsa87WithRSA4096Pss,
+        CompositeMLDsaAlgorithm.MLDsa65WithECDsaBrainpoolP256r1,
+        CompositeMLDsaAlgorithm.MLDsa44WithRSA2048Pss,
+        CompositeMLDsaAlgorithm.MLDsa44WithRSA2048Pkcs15,
+        CompositeMLDsaAlgorithm.MLDsa44WithEd25519,
+        CompositeMLDsaAlgorithm.MLDsa44WithECDsaP256,
+        CompositeMLDsaAlgorithm.MLDsa65WithRSA4096Pss,
+        CompositeMLDsaAlgorithm.MLDsa87WithECDsaBrainpoolP384r1,
+        CompositeMLDsaAlgorithm.MLDsa87WithECDsaP384,
+        CompositeMLDsaAlgorithm.MLDsa87WithECDsaP521,
+        CompositeMLDsaAlgorithm.MLDsa87WithEd448,
+        CompositeMLDsaAlgorithm.MLDsa87WithRSA3072Pss,
+        CompositeMLDsaAlgorithm.MLDsa65WithRSA3072Pss,
+        CompositeMLDsaAlgorithm.MLDsa65WithRSA4096Pkcs15,
+    ]).ToDictionary(a => a.Name);
+#pragma warning restore SYSLIB5006
+
+    public static TheoryData<string, string, string> GetPemCertificateTestData()
+    {
+        var data = new TheoryData<string, string, string>();
+        List<string> algorithms = [
+            "RSA",
+            "ECDsa",
+            "DSA",
+        ];
+
+#pragma warning disable SYSLIB5006
+        if (MLDsa.IsSupported)
+        {
+            algorithms.AddRange(_mlDsaAlgorithms.Keys);
+        }
+
+        if (SlhDsa.IsSupported)
+        {
+            algorithms.AddRange(_slhDsaAlgorithms.Keys);
+        }
+
+        // Composite ML-DSA certificate generation is not supported at the time
+        // of writing, so we skip it.
+        // When it gets implemented in the future, simply remove the SkipCompositeMLDsa
+        // condition to include it in the tests.
+        const bool SkipCompositeMLDsa = true;
+        if (CompositeMLDsa.IsSupported && !SkipCompositeMLDsa)
+        {
+            algorithms.AddRange(_compositeMLDsaAlgorithms
+                .Where(kvp => CompositeMLDsa.IsAlgorithmSupported(kvp.Value))
+                .Select(kvp => kvp.Key));
+        }
+#pragma warning restore SYSLIB5006
+
+        foreach (var algorithm in algorithms)
+        {
+            // Test with no password
+            data.Add(algorithm, null, ".pem");
+            data.Add(algorithm, null, ".crt");
+
+            // Test with password
+            data.Add(algorithm, "test", ".pem");
+            data.Add(algorithm, "test", ".crt");
+        }
+
+        return data;
+    }
+
     [Theory]
-    [InlineData("https-rsa.pem", "https-rsa.key", null)]
-    [InlineData("https-rsa.pem", "https-rsa-protected.key", "aspnetcore")]
-    [InlineData("https-rsa.crt", "https-rsa.key", null)]
-    [InlineData("https-rsa.crt", "https-rsa-protected.key", "aspnetcore")]
-    [InlineData("https-ecdsa.pem", "https-ecdsa.key", null)]
-    [InlineData("https-ecdsa.pem", "https-ecdsa-protected.key", "aspnetcore")]
-    [InlineData("https-ecdsa.crt", "https-ecdsa.key", null)]
-    [InlineData("https-ecdsa.crt", "https-ecdsa-protected.key", "aspnetcore")]
-    [InlineData("https-dsa.pem", "https-dsa.key", null)]
-    [InlineData("https-dsa.pem", "https-dsa-protected.key", "test")]
-    [InlineData("https-dsa.crt", "https-dsa.key", null)]
-    [InlineData("https-dsa.crt", "https-dsa-protected.key", "test")]
-    public void ConfigureEndpoint_CanLoadPemCertificates(string certificateFile, string certificateKey, string password)
+    [MemberData(nameof(GetPemCertificateTestData))]
+    public void ConfigureEndpoint_CanLoadPemCertificates(string algorithmType, string keyPassword, string extension)
     {
         var serverOptions = CreateServerOptions();
-        var certificate = new X509Certificate2(TestResources.GetCertPath(Path.ChangeExtension(certificateFile, "crt")));
+        X509Certificate2 certificate;
+        string certificateFilePath;
+        string certificateKeyPath;
+        string tempDir = null;
 
-        var ran1 = false;
-        var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+        // For DSA, we rely on a pre-generated certificate since CertificateRequest APIs don't directly
+        // support DSA keys.
+        if (algorithmType == "DSA")
         {
-            new KeyValuePair<string, string>("Endpoints:End1:Url", "https://*:5001"),
-            new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", certificateFile)),
-            new KeyValuePair<string, string>("Certificates:Default:KeyPath", Path.Combine("shared", "TestCertificates", certificateKey)),
+            var baseName = keyPassword == null ? "https-dsa" : "https-dsa";
+            var keyName = keyPassword == null ? "https-dsa.key" : "https-dsa-protected.key";
+
+            certificate = new X509Certificate2(TestResources.GetCertPath("https-dsa.crt"));
+            certificateFilePath = TestResources.GetCertPath(baseName + extension);
+            certificateKeyPath = TestResources.GetCertPath(keyName);
+        }
+        else
+        {
+            // For all other algorithms, we generate the certificate and key dynamically, saving them
+            // in a temporary directory.
+            tempDir = Directory.CreateTempSubdirectory().FullName;
+            try
+            {
+                certificateFilePath = Path.Combine(tempDir, $"test{extension}");
+                certificateKeyPath = Path.Combine(tempDir, "test.key");
+                certificate = GenerateTestCertificateWithAlgorithm(algorithmType, keyPassword, certificateFilePath, certificateKeyPath);
+            }
+            catch
+            {
+                if (Directory.Exists(tempDir))
+                {
+                    Directory.Delete(tempDir, recursive: true);
+                }
+                throw;
+            }
         }
-        .Concat(password != null ? new[] { new KeyValuePair<string, string>("Certificates:Default:Password", password) } : Array.Empty<KeyValuePair<string, string>>()))
-        .Build();
 
-        serverOptions
-            .Configure(config)
-            .Endpoint("End1", opt =>
+        try
+        {
+            var ran1 = false;
+            var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
             {
-                ran1 = true;
-                Assert.True(opt.IsHttps);
-                Assert.Equal(opt.HttpsOptions.ServerCertificate.SerialNumber, certificate.SerialNumber);
-            }).Load();
+                new KeyValuePair<string, string>("Endpoints:End1:Url", "https://*:5001"),
+                new KeyValuePair<string, string>("Certificates:Default:Path", certificateFilePath),
+                new KeyValuePair<string, string>("Certificates:Default:KeyPath", certificateKeyPath),
+            }
+            .Concat(keyPassword != null ? [new KeyValuePair<string, string>("Certificates:Default:Password", keyPassword)] : Array.Empty<KeyValuePair<string, string>>()))
+            .Build();
 
-        Assert.True(ran1);
-        Assert.Null(serverOptions.DevelopmentCertificate); // Not used since configuration cert is present
+            serverOptions
+                .Configure(config)
+                .Endpoint("End1", opt =>
+                {
+                    ran1 = true;
+                    Assert.True(opt.IsHttps);
+                    Assert.Equal(certificate.SerialNumber, opt.HttpsOptions.ServerCertificate.SerialNumber);
+                }).Load();
+
+            Assert.True(ran1);
+            Assert.Null(serverOptions.DevelopmentCertificate); // Not used since configuration cert is present
+        }
+        finally
+        {
+            // Clean up generated certificate directory if it exists.
+            if (tempDir is not null && Directory.Exists(tempDir))
+            {
+                Directory.Delete(tempDir, recursive: true);
+            }
+        }
     }
 
+    private static X509Certificate2 GenerateTestCertificateWithAlgorithm(string algorithmType, string keyPassword, string certificatePath, string keyPath)
+    {
+        var distinguishedName = new X500DistinguishedName($"CN=test.{algorithmType}.local");
+        var sanBuilder = new SubjectAlternativeNameBuilder();
+        sanBuilder.AddDnsName($"test.{algorithmType}.local");
+
+        X509Certificate2 certificate;
+        string keyPem;
+
+        switch (algorithmType)
+        {
+            case "RSA":
+                using (var rsa = RSA.Create(2048))
+                {
+                    var request = new CertificateRequest(distinguishedName, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+                    certificate = CreateTestCertificate(request, sanBuilder);
+                    keyPem = ExportKeyToPem(rsa, keyPassword);
+                }
+                break;
+
+            case "ECDsa":
+                using (var ecdsa = ECDsa.Create(ECCurve.NamedCurves.nistP256))
+                {
+                    var request = new CertificateRequest(distinguishedName, ecdsa, HashAlgorithmName.SHA256);
+                    certificate = CreateTestCertificate(request, sanBuilder);
+                    keyPem = ExportKeyToPem(ecdsa, keyPassword);
+                }
+                break;
+
+#pragma warning disable SYSLIB5006
+            case var x when _mlDsaAlgorithms.TryGetValue(x, out var mlDsaAlgorithm):
+                using (var mlDsa = MLDsa.GenerateKey(mlDsaAlgorithm))
+                {
+                    var request = new CertificateRequest(distinguishedName, mlDsa);
+                    certificate = CreateTestCertificate(request, sanBuilder);
+                    keyPem = ExportMLDsaKeyToPem(mlDsa, keyPassword);
+                }
+                break;
+
+            case var x when _slhDsaAlgorithms.TryGetValue(x, out var slhDsaAlgorithm):
+                using (var slhDsa = SlhDsa.GenerateKey(slhDsaAlgorithm))
+                {
+                    var request = new CertificateRequest(distinguishedName, slhDsa);
+                    certificate = CreateTestCertificate(request, sanBuilder);
+                    keyPem = ExportSlhDsaKeyToPem(slhDsa, keyPassword);
+                }
+                break;
+
+            case var x when _compositeMLDsaAlgorithms.TryGetValue(x, out var compositeMLDsaAlgorithm):
+                using (var compositeMLDsa = CompositeMLDsa.GenerateKey(compositeMLDsaAlgorithm))
+                {
+                    var request = new CertificateRequest(distinguishedName, compositeMLDsa);
+                    certificate = CreateTestCertificate(request, sanBuilder);
+                    keyPem = ExportCompositeMLDsaKeyToPem(compositeMLDsa, keyPassword);
+                }
+                break;
+#pragma warning restore SYSLIB5006
+
+            default:
+                throw new ArgumentException($"Unknown algorithm type: {algorithmType}");
+        }
+
+        if (certificatePath.EndsWith(".pem", StringComparison.OrdinalIgnoreCase))
+        {
+            // Export the certificate in PEM format
+            File.WriteAllText(certificatePath, certificate.ExportCertificatePem());
+        }
+        else
+        {
+            // Export the certificate in DER format
+            File.WriteAllBytes(certificatePath, certificate.Export(X509ContentType.Cert));
+        }
+
+        File.WriteAllText(keyPath, keyPem);
+
+        return certificate;
+    }
+
+    private static X509Certificate2 CreateTestCertificate(CertificateRequest request, SubjectAlternativeNameBuilder sanBuilder)
+    {
+        request.CertificateExtensions.Add(sanBuilder.Build());
+        request.CertificateExtensions.Add(new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: true));
+        request.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension([new Oid("1.3.6.1.5.5.7.3.1")], critical: false)); // Server Authentication
+
+        var notBefore = DateTimeOffset.UtcNow.AddDays(-1);
+        var notAfter = DateTimeOffset.UtcNow.AddYears(1);
+
+        return request.CreateSelfSigned(notBefore, notAfter);
+    }
+
+    private static string ExportKeyToPem(AsymmetricAlgorithm key, string password)
+    {
+        return password is null
+            ? key.ExportPkcs8PrivateKeyPem()
+            : key.ExportEncryptedPkcs8PrivateKeyPem(password.AsSpan(), new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 100_000));
+    }
+
+#pragma warning disable SYSLIB5006
+    private static string ExportMLDsaKeyToPem(MLDsa mlDsa, string password)
+    {
+        return password is null
+            ? mlDsa.ExportPkcs8PrivateKeyPem()
+            : mlDsa.ExportEncryptedPkcs8PrivateKeyPem(password.AsSpan(), new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 100_000));
+    }
+
+    private static string ExportSlhDsaKeyToPem(SlhDsa slhDsa, string password)
+    {
+        return password is null
+            ? slhDsa.ExportPkcs8PrivateKeyPem()
+            : slhDsa.ExportEncryptedPkcs8PrivateKeyPem(password.AsSpan(), new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 100_000));
+    }
+
+    private static string ExportCompositeMLDsaKeyToPem(CompositeMLDsa compositeMLDsa, string password)
+    {
+        return password is null
+            ? compositeMLDsa.ExportPkcs8PrivateKeyPem()
+            : compositeMLDsa.ExportEncryptedPkcs8PrivateKeyPem(password.AsSpan(), new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 100_000));
+    }
+
+#pragma warning restore SYSLIB5006
+
     [Fact]
     public void ConfigureEndpointDevelopmentCertificateGetsIgnoredIfPasswordIsNotCorrect()
     {
diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
index ea39d1e46d6f..301d784d9e6d 100644
--- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
+++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
@@ -18,6 +18,7 @@
     <Content Include="$(KestrelRoot)Core\src\Internal\Infrastructure\HttpUtilities.Generated.cs" LinkBase="shared\GeneratedContent" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" LinkBase="shared\GeneratedContent" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="$(KestrelSharedSourceRoot)\TransportMultiplexedConnection.Generated.cs" LinkBase="shared\GeneratedContent" CopyToOutputDirectory="PreserveNewest" />
+    <Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\NamedPipesSupportedAttribute.cs" Link="shared\TransportTestHelpers\NamedPipesSupportedAttribute.cs" />
 
     <ProjectReference Include="..\..\tools\CodeGenerator\CodeGenerator.csproj" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
diff --git a/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs b/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs
index 759d074a6d82..4de3accacb7e 100644
--- a/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs
@@ -1,15 +1,23 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections;
+using System.Diagnostics;
+using System.IO.Pipelines;
+using System.Reflection;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Tests;
 
@@ -19,9 +27,13 @@ public class WebHostBuilderKestrelExtensionsTests
     public void ApplicationServicesNotNullAfterUseKestrelWithoutOptions()
     {
         // Arrange
-        var hostBuilder = new WebHostBuilder()
-            .UseKestrel()
-            .Configure(app => { });
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .Configure(app => { });
+            });
 
         hostBuilder.ConfigureServices(services =>
         {
@@ -40,13 +52,17 @@ public void ApplicationServicesNotNullAfterUseKestrelWithoutOptions()
     public void ApplicationServicesNotNullDuringUseKestrelWithOptions()
     {
         // Arrange
-        var hostBuilder = new WebHostBuilder()
-            .UseKestrel(options =>
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                // Assert
-                Assert.NotNull(options.ApplicationServices);
-            })
-            .Configure(app => { });
+                webHostBuilder
+                    .UseKestrel(options =>
+                    {
+                        // Assert
+                        Assert.NotNull(options.ApplicationServices);
+                    })
+                    .Configure(app => { });
+            });
 
         // Act
         hostBuilder.Build();
@@ -55,9 +71,13 @@ public void ApplicationServicesNotNullDuringUseKestrelWithOptions()
     [Fact]
     public void DefaultTransportFactoriesConfigured()
     {
-        var hostBuilder = new WebHostBuilder()
-            .UseKestrel()
-            .Configure(app => { });
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .Configure(app => { });
+            });
 
         var transportFactories = hostBuilder.Build().Services.GetServices<IConnectionListenerFactory>();
 
@@ -77,18 +97,26 @@ public void DefaultTransportFactoriesConfigured()
     [Fact]
     public void SocketsTransportCanBeManuallySelectedIndependentOfOrder()
     {
-        var hostBuilder = new WebHostBuilder()
-            .UseKestrel()
-            .UseSockets()
-            .Configure(app => { });
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseSockets()
+                    .Configure(app => { });
+            });
 
         var factories = hostBuilder.Build().Services.GetServices<IConnectionListenerFactory>();
         AssertContainsType<SocketTransportFactory, IConnectionListenerFactory>(factories);
 
-        var hostBuilderReversed = new WebHostBuilder()
-            .UseSockets()
-            .UseKestrel()
-            .Configure(app => { });
+        var hostBuilderReversed = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseSockets()
+                    .UseKestrel()
+                    .Configure(app => { });
+            });
 
         var factoriesReversed = hostBuilderReversed.Build().Services.GetServices<IConnectionListenerFactory>();
         AssertContainsType<SocketTransportFactory, IConnectionListenerFactory>(factoriesReversed);
@@ -102,11 +130,151 @@ static void AssertContainsType<TExpected, TCollection>(IEnumerable<TCollection>
     [Fact]
     public void ServerIsKestrelServerImpl()
     {
-        var hostBuilder = new WebHostBuilder()
-            .UseSockets()
-            .UseKestrel()
-            .Configure(app => { });
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseSockets()
+                    .UseKestrel()
+                    .Configure(app => { });
+            });
+
+        var server = Assert.IsType<KestrelServerImpl>(hostBuilder.Build().Services.GetService<IServer>());
+
+        Assert.NotNull(server.ServiceContext.DiagnosticSource);
+        Assert.IsType<KestrelMetrics>(server.ServiceContext.Metrics);
+        Assert.Equal(PipeScheduler.ThreadPool, server.ServiceContext.Scheduler);
+        Assert.Equal(TimeProvider.System, server.ServiceContext.TimeProvider);
+
+        var handlers = (IHeartbeatHandler[])typeof(Heartbeat).GetField("_callbacks", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(server.ServiceContext.Heartbeat);
+        Assert.Collection(handlers,
+            handler =>
+            {
+                Assert.Equal(typeof(DateHeaderValueManager), handler.GetType());
+            },
+            handler =>
+            {
+                Assert.Equal(typeof(ConnectionManager), handler.GetType());
+            },
+            handler =>
+            {
+                Assert.Equal(typeof(PinnedBlockMemoryPoolFactory), handler.GetType());
+            });
+    }
+
+    [Fact]
+    public void MemoryPoolFactorySetCorrectlyWithSockets()
+    {
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseSockets()
+                    .UseKestrel()
+                    .Configure(app => { });
+            });
+
+        var host = hostBuilder.Build();
+
+        var memoryPoolFactory = Assert.IsType<PinnedBlockMemoryPoolFactory>(host.Services.GetRequiredService<IMemoryPoolFactory<byte>>());
+        Assert.Null(host.Services.GetService<IMemoryPoolFactory<int>>());
+
+        Assert.Same(memoryPoolFactory, host.Services.GetRequiredService<IOptions<SocketTransportOptions>>().Value.MemoryPoolFactory);
+
+        // Swap order of UseKestrel and UseSockets
+        hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseSockets()
+                    .Configure(app => { });
+            });
+
+        host = hostBuilder.Build();
+
+        memoryPoolFactory = Assert.IsType<PinnedBlockMemoryPoolFactory>(host.Services.GetRequiredService<IMemoryPoolFactory<byte>>());
+        Assert.Null(host.Services.GetService<IMemoryPoolFactory<int>>());
+
+        Assert.Same(memoryPoolFactory, host.Services.GetRequiredService<IOptions<SocketTransportOptions>>().Value.MemoryPoolFactory);
+    }
+
+    [Fact]
+    public void SocketsHasDefaultMemoryPool()
+    {
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseSockets()
+                    .Configure(app => { });
+            });
+
+        var host = hostBuilder.Build();
+
+        var memoryPoolFactory = host.Services.GetRequiredService<IMemoryPoolFactory<byte>>();
+        Assert.IsNotType<PinnedBlockMemoryPoolFactory>(memoryPoolFactory);
+        Assert.Null(host.Services.GetService<IMemoryPoolFactory<int>>());
+
+        Assert.Same(memoryPoolFactory, host.Services.GetRequiredService<IOptions<SocketTransportOptions>>().Value.MemoryPoolFactory);
+    }
+
+    [ConditionalFact]
+    [NamedPipesSupported]
+    public void MemoryPoolFactorySetCorrectlyWithNamedPipes()
+    {
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseNamedPipes()
+                    .UseKestrel()
+                    .Configure(app => { });
+            });
+
+        var host = hostBuilder.Build();
+
+        var memoryPoolFactory = Assert.IsType<PinnedBlockMemoryPoolFactory>(host.Services.GetRequiredService<IMemoryPoolFactory<byte>>());
+        Assert.Null(host.Services.GetService<IMemoryPoolFactory<int>>());
+
+        Assert.Same(memoryPoolFactory, host.Services.GetRequiredService<IOptions<NamedPipeTransportOptions>>().Value.MemoryPoolFactory);
+
+        // Swap order of UseKestrel and UseNamedPipes
+        hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseNamedPipes()
+                    .Configure(app => { });
+            });
+
+        host = hostBuilder.Build();
+
+        memoryPoolFactory = Assert.IsType<PinnedBlockMemoryPoolFactory>(host.Services.GetRequiredService<IMemoryPoolFactory<byte>>());
+        Assert.Null(host.Services.GetService<IMemoryPoolFactory<int>>());
+
+        Assert.Same(memoryPoolFactory, host.Services.GetRequiredService<IOptions<NamedPipeTransportOptions>>().Value.MemoryPoolFactory);
+    }
+
+    [ConditionalFact]
+    [NamedPipesSupported]
+    public void NamedPipesHasDefaultMemoryPool()
+    {
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseNamedPipes()
+                    .Configure(app => { });
+            });
+
+        var host = hostBuilder.Build();
+
+        var memoryPoolFactory = host.Services.GetRequiredService<IMemoryPoolFactory<byte>>();
+        Assert.IsNotType<PinnedBlockMemoryPoolFactory>(memoryPoolFactory);
+        Assert.Null(host.Services.GetService<IMemoryPoolFactory<int>>());
 
-        Assert.IsType<KestrelServerImpl>(hostBuilder.Build().Services.GetService<IServer>());
+        Assert.Same(memoryPoolFactory, host.Services.GetRequiredService<IOptions<NamedPipeTransportOptions>>().Value.MemoryPoolFactory);
     }
 }
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnection.cs b/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnection.cs
index f3c56b4c8e07..5f41cf425aab 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnection.cs
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnection.cs
@@ -25,7 +25,7 @@ internal sealed class NamedPipeConnection : TransportConnection, IConnectionName
     private bool _connectionShutdown;
     private bool _streamDisconnected;
     private Exception? _shutdownReason;
-    private readonly object _shutdownLock = new object();
+    private readonly Lock _shutdownLock = new();
 
     // Internal for testing.
     internal Task _receivingTask = Task.CompletedTask;
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnectionListener.cs b/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnectionListener.cs
index ab172bc28476..f5d8c21ae6fb 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnectionListener.cs
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/Internal/NamedPipeConnectionListener.cs
@@ -40,7 +40,7 @@ public NamedPipeConnectionListener(
         _log = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes");
         _endpoint = endpoint;
         _options = options;
-        _memoryPool = options.MemoryPoolFactory();
+        _memoryPool = options.MemoryPoolFactory.Create(new MemoryPoolOptions { Owner = "kestrel" });
         _listeningToken = _listeningTokenSource.Token;
         // Have to create the pool here (instead of DI) because the pool is specific to an endpoint.
         _poolPolicy = new NamedPipeServerStreamPoolPolicy(endpoint, options);
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj b/src/Servers/Kestrel/Transport.NamedPipes/src/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj
index e7b0816ec136..61735851bb84 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj
@@ -21,6 +21,7 @@
     <Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />
+    <Compile Include="$(KestrelSharedSourceRoot)\DefaultSimpleMemoryPoolFactory.cs" Link="Internal\DefaultSimpleMemoryPoolFactory.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/NamedPipeTransportOptions.cs b/src/Servers/Kestrel/Transport.NamedPipes/src/NamedPipeTransportOptions.cs
index a1d7d47f4854..133dc1ca6f8b 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/NamedPipeTransportOptions.cs
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/NamedPipeTransportOptions.cs
@@ -1,8 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Buffers;
 using System.IO.Pipes;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Internal;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes;
 
@@ -116,5 +117,5 @@ public static NamedPipeServerStream CreateDefaultNamedPipeServerStream(CreateNam
         }
     }
 
-    internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = PinnedBlockMemoryPoolFactory.Create;
+    internal IMemoryPoolFactory<byte> MemoryPoolFactory { get; set; } = DefaultSimpleMemoryPoolFactory.Instance;
 }
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Shipped.txt b/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Shipped.txt
index 95024ad9a9e5..25dce3264f33 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Shipped.txt
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Shipped.txt
@@ -1,6 +1,16 @@
 #nullable enable
 Microsoft.AspNetCore.Hosting.WebHostBuilderNamedPipeExtensions
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.CreateNamedPipeServerStreamContext() -> void
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.NamedPipeEndPoint.get -> Microsoft.AspNetCore.Connections.NamedPipeEndPoint!
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.NamedPipeEndPoint.init -> void
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeOptions.get -> System.IO.Pipes.PipeOptions
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeOptions.init -> void
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeSecurity.get -> System.IO.Pipes.PipeSecurity?
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeSecurity.init -> void
 Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CreateNamedPipeServerStream.get -> System.Func<Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext!, System.IO.Pipes.NamedPipeServerStream!>!
+Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CreateNamedPipeServerStream.set -> void
 Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CurrentUserOnly.get -> bool
 Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CurrentUserOnly.set -> void
 Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.ListenerQueueCount.get -> int
@@ -14,3 +24,4 @@ Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptio
 Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.PipeSecurity.set -> void
 static Microsoft.AspNetCore.Hosting.WebHostBuilderNamedPipeExtensions.UseNamedPipes(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
 static Microsoft.AspNetCore.Hosting.WebHostBuilderNamedPipeExtensions.UseNamedPipes(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder, System.Action<Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions!>! configureOptions) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
+static Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CreateDefaultNamedPipeServerStream(Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext! context) -> System.IO.Pipes.NamedPipeServerStream!
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Unshipped.txt b/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Unshipped.txt
index e5e7753bb42a..7dc5c58110bf 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Unshipped.txt
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/PublicAPI.Unshipped.txt
@@ -1,12 +1 @@
 #nullable enable
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.CreateNamedPipeServerStreamContext() -> void
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.NamedPipeEndPoint.get -> Microsoft.AspNetCore.Connections.NamedPipeEndPoint!
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.NamedPipeEndPoint.init -> void
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeOptions.get -> System.IO.Pipes.PipeOptions
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeOptions.init -> void
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeSecurity.get -> System.IO.Pipes.PipeSecurity?
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext.PipeSecurity.init -> void
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CreateNamedPipeServerStream.get -> System.Func<Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext!, System.IO.Pipes.NamedPipeServerStream!>!
-Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CreateNamedPipeServerStream.set -> void
-static Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.NamedPipeTransportOptions.CreateDefaultNamedPipeServerStream(Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.CreateNamedPipeServerStreamContext! context) -> System.IO.Pipes.NamedPipeServerStream!
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/src/WebHostBuilderNamedPipeExtensions.cs b/src/Servers/Kestrel/Transport.NamedPipes/src/WebHostBuilderNamedPipeExtensions.cs
index 53f94f801e74..e9d22d044b24 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/src/WebHostBuilderNamedPipeExtensions.cs
+++ b/src/Servers/Kestrel/Transport.NamedPipes/src/WebHostBuilderNamedPipeExtensions.cs
@@ -33,7 +33,16 @@ public static IWebHostBuilder UseNamedPipes(this IWebHostBuilder hostBuilder)
         {
             services.TryAddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
             services.AddSingleton<IConnectionListenerFactory, NamedPipeTransportFactory>();
+
+            services.TryAddSingleton<IMemoryPoolFactory<byte>, DefaultMemoryPoolFactory>();
+            services.TryAddSingleton<MemoryPoolMetrics>();
+            services.AddOptions<NamedPipeTransportOptions>().Configure((NamedPipeTransportOptions options, IMemoryPoolFactory<byte> factory) =>
+            {
+                // Set the IMemoryPoolFactory from DI on NamedPipeTransportOptions. Usually this should be the PinnedBlockMemoryPoolFactory from UseKestrelCore.
+                options.MemoryPoolFactory = factory;
+            });
         });
+
         return hostBuilder;
     }
 
diff --git a/src/Servers/Kestrel/Transport.NamedPipes/test/NamedPipeConnectionListenerTests.cs b/src/Servers/Kestrel/Transport.NamedPipes/test/NamedPipeConnectionListenerTests.cs
index 3a93723522f7..10ec9cd794f7 100644
--- a/src/Servers/Kestrel/Transport.NamedPipes/test/NamedPipeConnectionListenerTests.cs
+++ b/src/Servers/Kestrel/Transport.NamedPipes/test/NamedPipeConnectionListenerTests.cs
@@ -136,7 +136,7 @@ public async Task AcceptAsync_UnbindAfterCall_CleanExit()
         Assert.DoesNotContain(LogMessages, m => m.LogLevel >= LogLevel.Error);
     }
 
-    [Theory]
+    [ConditionalTheory]
     [InlineData(1)]
     [InlineData(4)]
     [InlineData(16)]
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs
index 9fd38e0a8bfa..58b0c2c5c0a9 100644
--- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs
+++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionContext.cs
@@ -20,9 +20,9 @@ internal partial class QuicConnectionContext : TransportMultiplexedConnection
     private bool _streamPoolHeartbeatInitialized;
     // Ticks updated once per-second in heartbeat event.
     private long _heartbeatTimestamp;
-    private readonly object _poolLock = new object();
+    private readonly Lock _poolLock = new();
 
-    private readonly object _shutdownLock = new object();
+    private readonly Lock _shutdownLock = new();
     private readonly QuicConnection _connection;
     private readonly QuicTransportContext _context;
     private readonly ILogger _log;
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs
index 6d7fd3b3c777..02abcea565bf 100644
--- a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs
+++ b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs
@@ -40,7 +40,7 @@ internal partial class QuicStreamContext : TransportConnection, IPooledStream, I
     private bool _streamClosed;
     private bool _serverAborted;
     private bool _clientAbort;
-    private readonly object _shutdownLock = new object();
+    private readonly Lock _shutdownLock = new();
 
     public QuicStreamContext(QuicConnectionContext connection, QuicTransportContext context)
     {
diff --git a/src/Servers/Kestrel/Transport.Quic/test/QuicStreamContextTests.cs b/src/Servers/Kestrel/Transport.Quic/test/QuicStreamContextTests.cs
index a3a0c1810406..7b9a5672534f 100644
--- a/src/Servers/Kestrel/Transport.Quic/test/QuicStreamContextTests.cs
+++ b/src/Servers/Kestrel/Transport.Quic/test/QuicStreamContextTests.cs
@@ -226,6 +226,7 @@ public async Task BidirectionalStream_ServerWritesDataAndDisposes_ClientReadsDat
 
     [ConditionalFact]
     [MsQuicSupported]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/59978")]
     public async Task BidirectionalStream_MultipleStreamsOnConnection_ReusedFromPool()
     {
         // Arrange
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Client/SocketConnectionFactory.cs b/src/Servers/Kestrel/Transport.Sockets/src/Client/SocketConnectionFactory.cs
index db77bbe811d3..39b7523a7c7c 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/Client/SocketConnectionFactory.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/Client/SocketConnectionFactory.cs
@@ -27,7 +27,7 @@ public SocketConnectionFactory(IOptions<SocketTransportOptions> options, ILogger
         ArgumentNullException.ThrowIfNull(loggerFactory);
 
         _options = options.Value;
-        _memoryPool = options.Value.MemoryPoolFactory();
+        _memoryPool = options.Value.MemoryPoolFactory.Create(SocketConnectionFactoryOptions.MemoryPoolOptions);
         _trace = loggerFactory.CreateLogger("Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Client");
 
         var maxReadBufferSize = _options.MaxReadBufferSize ?? 0;
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs
index f60b8ca9a206..e8655b08d0ff 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketConnection.cs
@@ -12,7 +12,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal;
 
 internal sealed partial class SocketConnection : TransportConnection
 {
-    private static readonly int MinAllocBufferSize = PinnedBlockMemoryPool.BlockSize / 2;
+    // PinnedBlockMemoryPool.BlockSize / 2
+    private const int MinAllocBufferSize = 4096 / 2;
 
     private readonly Socket _socket;
     private readonly ILogger _logger;
@@ -22,7 +23,7 @@ internal sealed partial class SocketConnection : TransportConnection
     private readonly IDuplexPipe _originalTransport;
     private readonly CancellationTokenSource _connectionClosedTokenSource = new CancellationTokenSource();
 
-    private readonly object _shutdownLock = new object();
+    private readonly Lock _shutdownLock = new();
     private volatile Exception? _shutdownReason;
     private Task? _sendingTask;
     private Task? _receivingTask;
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
index 9258e26fcba1..9f225bde1142 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
+++ b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj
@@ -12,12 +12,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
     <Compile Include="$(KestrelSharedSourceRoot)\CorrelationIdGenerator.cs" Link="Internal\CorrelationIdGenerator.cs" />
     <Compile Include="$(SharedSourceRoot)ServerInfrastructure\DuplexPipe.cs" Link="Internal\DuplexPipe.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.cs" Link="Internal\TransportConnection.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.Generated.cs" Link="Internal\TransportConnection.Generated.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\TransportConnection.FeatureCollection.cs" Link="Internal\TransportConnection.FeatureCollection.cs" />
+    <Compile Include="$(KestrelSharedSourceRoot)\DefaultSimpleMemoryPoolFactory.cs" Link="Internal\DefaultSimpleMemoryPoolFactory.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,5 +44,6 @@
     <InternalsVisibleTo Include="IIS.Http.FunctionalTests" />
     <InternalsVisibleTo Include="IIS.LongTests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Server.Kestrel.Tests" />
+    <InternalsVisibleTo Include="Interop.FunctionalTests" />
   </ItemGroup>
 </Project>
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionContextFactory.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionContextFactory.cs
index db98e36842e1..e2bc50ef499e 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionContextFactory.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionContextFactory.cs
@@ -47,7 +47,7 @@ public SocketConnectionContextFactory(SocketConnectionFactoryOptions options, IL
 
             for (var i = 0; i < _settingsCount; i++)
             {
-                var memoryPool = _options.MemoryPoolFactory();
+                var memoryPool = _options.MemoryPoolFactory.Create(SocketConnectionFactoryOptions.MemoryPoolOptions);
                 var transportScheduler = options.UnsafePreferInlineScheduling ? PipeScheduler.Inline : new IOQueue();
 
                 _settings[i] = new QueueSettings()
@@ -62,11 +62,11 @@ public SocketConnectionContextFactory(SocketConnectionFactoryOptions options, IL
         }
         else
         {
-            var memoryPool = _options.MemoryPoolFactory();
+            var memoryPool = _options.MemoryPoolFactory.Create(SocketConnectionFactoryOptions.MemoryPoolOptions);
             var transportScheduler = options.UnsafePreferInlineScheduling ? PipeScheduler.Inline : PipeScheduler.ThreadPool;
 
-            _settings = new QueueSettings[]
-            {
+            _settings =
+            [
                 new QueueSettings()
                 {
                     Scheduler = transportScheduler,
@@ -75,7 +75,7 @@ public SocketConnectionContextFactory(SocketConnectionFactoryOptions options, IL
                     SocketSenderPool = new SocketSenderPool(PipeScheduler.Inline),
                     MemoryPool = memoryPool,
                 }
-            };
+            ];
             _settingsCount = 1;
         }
     }
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionFactoryOptions.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionFactoryOptions.cs
index 403f6fc108de..8290c5602f6c 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionFactoryOptions.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionFactoryOptions.cs
@@ -1,7 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Buffers;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Internal;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 
@@ -67,5 +68,6 @@ internal SocketConnectionFactoryOptions(SocketTransportOptions transportOptions)
     /// </remarks>
     public bool UnsafePreferInlineScheduling { get; set; }
 
-    internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = PinnedBlockMemoryPoolFactory.Create;
+    internal IMemoryPoolFactory<byte> MemoryPoolFactory { get; set; } = DefaultSimpleMemoryPoolFactory.Instance;
+    internal static readonly MemoryPoolOptions MemoryPoolOptions = new MemoryPoolOptions { Owner = "kestrel" };
 }
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs
index ad1a877df63c..822e665b1795 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketTransportOptions.cs
@@ -1,10 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Buffers;
 using System.Net;
 using System.Net.Sockets;
 using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Internal;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 
@@ -166,5 +166,5 @@ public static Socket CreateDefaultBoundListenSocket(EndPoint endpoint)
         return listenSocket;
     }
 
-    internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = System.Buffers.PinnedBlockMemoryPoolFactory.Create;
+    internal IMemoryPoolFactory<byte> MemoryPoolFactory { get; set; } = DefaultSimpleMemoryPoolFactory.Instance;
 }
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs b/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs
index 046522e22048..c5d7c54b77f3 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/WebHostBuilderSocketExtensions.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.AspNetCore.Hosting;
 
@@ -25,7 +27,14 @@ public static IWebHostBuilder UseSockets(this IWebHostBuilder hostBuilder)
     {
         return hostBuilder.ConfigureServices(services =>
         {
-            services.AddSingleton<IConnectionListenerFactory, SocketTransportFactory>();
+            services.TryAddSingleton<IConnectionListenerFactory, SocketTransportFactory>();
+
+            services.TryAddSingleton<IMemoryPoolFactory<byte>, DefaultSimpleMemoryPoolFactory>();
+            services.AddOptions<SocketTransportOptions>().Configure((SocketTransportOptions options, IMemoryPoolFactory<byte> factory) =>
+            {
+                // Set the IMemoryPoolFactory from DI on SocketTransportOptions. Usually this should be the PinnedBlockMemoryPoolFactory from UseKestrelCore.
+                options.MemoryPoolFactory = factory;
+            });
         });
     }
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs
index f4f5ca0348cf..adf66afad01a 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs
@@ -20,7 +20,7 @@ public class ChunkWriterBenchmark
     [GlobalSetup]
     public void Setup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         var pipe = new Pipe(new PipeOptions(_memoryPool));
         _reader = pipe.Reader;
         _writer = pipe.Writer;
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/HeaderCollectionBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HeaderCollectionBenchmark.cs
index 2ba73acc204e..88448414f662 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/HeaderCollectionBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/HeaderCollectionBenchmark.cs
@@ -324,7 +324,7 @@ string ReadHeaders()
     [IterationSetup]
     public void Setup()
     {
-        var memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        var memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs
index 16697ca82441..4c73e1b10d5e 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs
@@ -27,7 +27,7 @@ public class Http1ConnectionBenchmark
     [GlobalSetup]
     public void Setup()
     {
-        var memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        var memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs
index 356953b8cafa..a4cc32b06b6b 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs
@@ -23,7 +23,7 @@ public class Http1ConnectionParsingOverheadBenchmark
     [IterationSetup]
     public void Setup()
     {
-        var memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        var memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs
index fa8d0dddf4e8..35c7b5ad9388 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs
@@ -28,7 +28,7 @@ public class Http1LargeWritingBenchmark
     [GlobalSetup]
     public void GlobalSetup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         _http1Connection = MakeHttp1Connection();
         _consumeResponseBodyTask = ConsumeResponseBody();
     }
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs
index a5c18cbadf4d..8bacc955ad04 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs
@@ -35,7 +35,7 @@ public class Http1ReadingBenchmark
     [GlobalSetup]
     public void GlobalSetup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         _http1Connection = MakeHttp1Connection();
     }
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs
index 31db6447384b..6d6d1de8a350 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs
@@ -35,7 +35,7 @@ public class Http1WritingBenchmark
     [GlobalSetup]
     public void GlobalSetup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         _http1Connection = MakeHttp1Connection();
         _consumeResponseBodyTask = ConsumeResponseBody();
     }
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs
index 8c4f22ddfc42..bf90e4859427 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs
@@ -43,7 +43,7 @@ public abstract class Http2ConnectionBenchmarkBase
 
     public virtual void GlobalSetup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
 
         var options = new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2FrameWriterBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2FrameWriterBenchmark.cs
index 03589ed07b77..138e82a97c85 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2FrameWriterBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2FrameWriterBenchmark.cs
@@ -24,7 +24,7 @@ public class Http2FrameWriterBenchmark
     [GlobalSetup]
     public void GlobalSetup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
 
         var options = new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         _pipe = new Pipe(options);
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs
index bb513fd002af..297325a1e15b 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs
@@ -226,7 +226,7 @@ public IHttpNotFoundFeature Get_IHttpNotFoundFeature()
 
     public HttpProtocolFeatureCollection()
     {
-        var memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        var memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj b/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj
index 528290dd4396..0d4fff0fdc0f 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj
@@ -18,7 +18,6 @@
     <Compile Include="$(KestrelSharedSourceRoot)test\PipeWriterHttp2FrameExtensions.cs" Link="Internal\PipeWriterHttp2FrameExtensions.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Http2\HPackHeaderWriter.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Http2\Http2HeadersEnumerator.cs" />
-    <Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
     <Compile Include="$(KestrelSharedSourceRoot)test\KestrelTestLoggerProvider.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)test\TestApplicationErrorLogger.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)test\TestHttp1Connection.cs" />
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs
index 1327b4262120..6d3bad3efbc5 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks;
 
 public class MockHttpContextFactory : IHttpContextFactory
 {
-    private readonly object _lock = new object();
+    private readonly Lock _lock = new();
     private readonly Queue<DefaultHttpContext> _cache = new Queue<DefaultHttpContext>();
 
     public HttpContext Create(IFeatureCollection featureCollection)
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs
index 9a941cab1b63..3550af9079f0 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs
@@ -19,7 +19,7 @@ public class PipeThroughputBenchmark
     [IterationSetup]
     public void Setup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         _pipe = new Pipe(new PipeOptions(_memoryPool));
     }
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs
index 819ca5441d3b..0a0cb4b9002a 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs
@@ -24,7 +24,7 @@ public class RequestParsingBenchmark
     [IterationSetup]
     public void Setup()
     {
-        _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        _memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs
index 983f39f28eed..359931b0f371 100644
--- a/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs
+++ b/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs
@@ -172,7 +172,7 @@ private void Unknown(int count)
     [IterationSetup]
     public void Setup()
     {
-        var memoryPool = PinnedBlockMemoryPoolFactory.Create();
+        var memoryPool = TestMemoryPoolFactory.Create();
         var options = new PipeOptions(memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false);
         var pair = DuplexPipe.CreateConnectionPair(options, options);
 
diff --git a/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs b/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs
index 8830c9331005..8fb8afe4fcfb 100644
--- a/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs
+++ b/src/Servers/Kestrel/samples/Http2SampleApp/Program.cs
@@ -46,10 +46,14 @@ public static void Main(string[] args)
 
                                 var tlsFeature = context.Features.Get<ITlsHandshakeFeature>();
 
+#pragma warning disable CS0618 // Type or member is obsolete
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
                                 if (tlsFeature.CipherAlgorithm == CipherAlgorithmType.Null)
                                 {
                                     throw new NotSupportedException("Prohibited cipher: " + tlsFeature.CipherAlgorithm);
                                 }
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
+#pragma warning restore CS0618 // Type or member is obsolete
 
                                 return next(context);
                             });
diff --git a/src/Servers/Kestrel/samples/Http3SampleApp/Program.cs b/src/Servers/Kestrel/samples/Http3SampleApp/Program.cs
index d4a810bb386e..d38e473c59b9 100644
--- a/src/Servers/Kestrel/samples/Http3SampleApp/Program.cs
+++ b/src/Servers/Kestrel/samples/Http3SampleApp/Program.cs
@@ -35,6 +35,13 @@ public static void Main(string[] args)
                         listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
                     });
 
+                    // On a machine that supports IPv6, msquic will resolve `localhost` to `::1`, which `IPAddress.Any` will not accept.
+                    // (To make it work, you'd need to use `IPv6Any`, as `ListenAnyIP` does.)  As a result, a client built on msquic, 
+                    // e.g. `HttpClient`, will not be able to make HTTP/3.0 requests to `localhost:5001`.  HTTP/1.x and HTTP/2.0 will
+                    // still work, but will be slower than necessary since they will try and fail the resolved IPv6 address first.
+                    // Example: https://github.com/dotnet/runtime/issues/108259
+                    // msquic: https://github.com/microsoft/msquic/issues/1181 (resolve both)
+                    // System.Net.Quic: https://github.com/dotnet/runtime/issues/82404 (improve consistency with sockets)
                     options.Listen(IPAddress.Any, 5001, listenOptions =>
                     {
                         listenOptions.UseHttps();
diff --git a/src/Servers/Kestrel/shared/DefaultSimpleMemoryPoolFactory.cs b/src/Servers/Kestrel/shared/DefaultSimpleMemoryPoolFactory.cs
new file mode 100644
index 000000000000..9c36cd0cf8fc
--- /dev/null
+++ b/src/Servers/Kestrel/shared/DefaultSimpleMemoryPoolFactory.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using Microsoft.AspNetCore.Connections;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Internal;
+
+internal sealed class DefaultSimpleMemoryPoolFactory : IMemoryPoolFactory<byte>
+{
+    public static DefaultSimpleMemoryPoolFactory Instance { get; } = new DefaultSimpleMemoryPoolFactory();
+
+    public MemoryPool<byte> Create(MemoryPoolOptions? options = null)
+    {
+        return MemoryPool<byte>.Shared;
+    }
+}
diff --git a/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs b/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs
index 64ebcdb07b41..5959bf150726 100644
--- a/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs
+++ b/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.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.Buffers;
 using System.Collections.Concurrent;
 using System.Diagnostics;
@@ -74,7 +73,7 @@ public void OnTimeout(TimeoutReason reason)
     private FakeTimeProvider _fakeTimeProvider;
     internal HttpConnection _httpConnection;
     internal readonly TimeoutControl _timeoutControl;
-    internal readonly MemoryPool<byte> _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+    internal readonly MemoryPool<byte> _memoryPool = TestMemoryPoolFactory.Create();
     internal readonly ConcurrentQueue<TestStreamContext> _streamContextPool = new ConcurrentQueue<TestStreamContext>();
     protected Task _connectionTask;
     internal ILogger Logger { get; }
@@ -395,15 +394,15 @@ private static long GetOutputResponseBufferSize(ServiceContext serviceContext)
         return bufferSize ?? 0;
     }
 
-    internal ValueTask<Http3ControlStream> CreateControlStream()
+    internal ValueTask<Http3ControlStream> CreateControlStream(PipeScheduler clientWriterScheduler = null)
     {
-        return CreateControlStream(id: 0);
+        return CreateControlStream(id: 0, clientWriterScheduler);
     }
 
-    internal async ValueTask<Http3ControlStream> CreateControlStream(int? id)
+    internal async ValueTask<Http3ControlStream> CreateControlStream(int? id, PipeScheduler clientWriterScheduler = null)
     {
         var testStreamContext = new TestStreamContext(canRead: true, canWrite: false, this);
-        testStreamContext.Initialize(streamId: 2);
+        testStreamContext.Initialize(streamId: 2, clientWriterScheduler);
 
         var stream = new Http3ControlStream(this, testStreamContext);
         _runningStreams[stream.StreamId] = stream;
@@ -416,16 +415,17 @@ internal async ValueTask<Http3ControlStream> CreateControlStream(int? id)
         return stream;
     }
 
-    internal async ValueTask<Http3RequestStream> CreateRequestStream(IEnumerable<KeyValuePair<string, string>> headers, Http3RequestHeaderHandler headerHandler = null, bool endStream = false, TaskCompletionSource tsc = null)
+    internal async ValueTask<Http3RequestStream> CreateRequestStream(IEnumerable<KeyValuePair<string, string>> headers,
+        Http3RequestHeaderHandler headerHandler = null, bool endStream = false, TaskCompletionSource tsc = null, PipeScheduler clientWriterScheduler = null)
     {
-        var stream = CreateRequestStreamCore(headerHandler);
+        var stream = CreateRequestStreamCore(headerHandler, clientWriterScheduler);
 
         if (tsc is not null)
         {
             stream.StartStreamDisposeTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         }
 
-        if (headers is not null)
+        if (headers is not null && headers.Any())
         {
             await stream.SendHeadersAsync(headers, endStream);
         }
@@ -437,9 +437,10 @@ internal async ValueTask<Http3RequestStream> CreateRequestStream(IEnumerable<Key
         return stream;
     }
 
-    internal async ValueTask<Http3RequestStream> CreateRequestStream(Http3HeadersEnumerator headers, Http3RequestHeaderHandler headerHandler = null, bool endStream = false, TaskCompletionSource tsc = null)
+    internal async ValueTask<Http3RequestStream> CreateRequestStream(Http3HeadersEnumerator headers, Http3RequestHeaderHandler headerHandler = null,
+        bool endStream = false, TaskCompletionSource tsc = null, PipeScheduler clientWriterScheduler = null)
     {
-        var stream = CreateRequestStreamCore(headerHandler);
+        var stream = CreateRequestStreamCore(headerHandler, clientWriterScheduler);
 
         if (tsc is not null)
         {
@@ -455,7 +456,7 @@ internal async ValueTask<Http3RequestStream> CreateRequestStream(Http3HeadersEnu
         return stream;
     }
 
-    private Http3RequestStream CreateRequestStreamCore(Http3RequestHeaderHandler headerHandler)
+    private Http3RequestStream CreateRequestStreamCore(Http3RequestHeaderHandler headerHandler, PipeScheduler clientWriterScheduler)
     {
         var requestStreamId = GetStreamId(0x00);
         if (!_streamContextPool.TryDequeue(out var testStreamContext))
@@ -466,7 +467,7 @@ private Http3RequestStream CreateRequestStreamCore(Http3RequestHeaderHandler hea
         {
             Logger.LogDebug($"Reusing context for request stream {requestStreamId}.");
         }
-        testStreamContext.Initialize(requestStreamId);
+        testStreamContext.Initialize(requestStreamId, clientWriterScheduler);
 
         return new Http3RequestStream(this, Connection, testStreamContext, headerHandler ?? new Http3RequestHeaderHandler());
     }
@@ -566,7 +567,7 @@ internal async ValueTask<Http3FrameWithPayload> ReceiveFrameAsync(bool expectEnd
                     throw new InvalidOperationException("No data received.");
                 }
 
-                if (Http3FrameReader.TryReadFrame(ref buffer, frame, out var framePayload))
+                if (Http3FrameReader.TryReadFrame(ref buffer, frame, isContinuedFrame: false, out var framePayload))
                 {
                     consumed = examined = framePayload.End;
                     frame.Payload = framePayload.ToArray();
@@ -844,16 +845,14 @@ internal async ValueTask<Dictionary<long, long>> ExpectSettingsAsync()
         var settings = new Dictionary<long, long>();
         while (true)
         {
-            var id = VariableLengthIntegerHelper.GetInteger(payload, out var consumed, out _);
-            if (id == -1)
+            if (!VariableLengthIntegerHelper.TryGetInteger(payload, out var consumed, out var id))
             {
                 break;
             }
 
             payload = payload.Slice(consumed);
 
-            var value = VariableLengthIntegerHelper.GetInteger(payload, out consumed, out _);
-            if (value == -1)
+            if (!VariableLengthIntegerHelper.TryGetInteger(payload, out consumed, out var value))
             {
                 break;
             }
@@ -934,9 +933,9 @@ public async ValueTask<long> TryReadStreamIdAsync()
             {
                 if (!readableBuffer.IsEmpty)
                 {
-                    var id = VariableLengthIntegerHelper.GetInteger(readableBuffer, out consumed, out examined);
-                    if (id != -1)
+                    if (VariableLengthIntegerHelper.TryGetInteger(readableBuffer, out consumed, out var id))
                     {
+                        examined = consumed;
                         return id;
                     }
                 }
@@ -1013,6 +1012,7 @@ public TestMultiplexedConnectionContext(Http3InMemory testBase)
         Features.Set<IConnectionMetricsContextFeature>(this);
         Features.Set<IConnectionMetricsTagsFeature>(this);
         ConnectionClosedRequested = ConnectionClosingCts.Token;
+        ConnectionClosed = ConnectionClosedCts.Token;
 
         MetricsContext = TestContextFactory.CreateMetricsContext(this);
     }
@@ -1027,6 +1027,8 @@ public TestMultiplexedConnectionContext(Http3InMemory testBase)
 
     public CancellationTokenSource ConnectionClosingCts { get; set; } = new CancellationTokenSource();
 
+    public CancellationTokenSource ConnectionClosedCts { get; set; } = new CancellationTokenSource();
+
     public long Error
     {
         get => _error ?? -1;
@@ -1046,6 +1048,7 @@ public override void Abort(ConnectionAbortedException abortReason)
     {
         ToServerAcceptQueue.Writer.TryComplete();
         ToClientAcceptQueue.Writer.TryComplete();
+        ConnectionClosedCts.Cancel();
     }
 
     public override async ValueTask<ConnectionContext> AcceptAsync(CancellationToken cancellationToken = default)
@@ -1119,38 +1122,30 @@ public TestStreamContext(bool canRead, bool canWrite, Http3InMemory testBase)
         _testBase = testBase;
     }
 
-    public void Initialize(long streamId)
+    public void Initialize(long streamId, PipeScheduler clientWriterScheduler = null)
     {
-        if (!_isComplete)
-        {
-            // Create new pipes when test stream context is reused rather than reseting them.
-            // This is required because the client tests read from these directly from these pipes.
-            // When a request is finished they'll check to see whether there is anymore content
-            // in the Application.Output pipe. If it has been reset then that code will error.
-            var inputOptions = Http3InMemory.GetInputPipeOptions(_testBase._serviceContext, _testBase._memoryPool, PipeScheduler.ThreadPool);
-            var outputOptions = Http3InMemory.GetOutputPipeOptions(_testBase._serviceContext, _testBase._memoryPool, PipeScheduler.ThreadPool);
-
-            _inputPipe = new Pipe(inputOptions);
-            _outputPipe = new Pipe(outputOptions);
-
-            _transportPipeReader = new CompletionPipeReader(_inputPipe.Reader);
-            _transportPipeWriter = new CompletionPipeWriter(_outputPipe.Writer);
-
-            _pair = new DuplexPipePair(
-                new DuplexPipe(_transportPipeReader, _transportPipeWriter),
-                new DuplexPipe(_outputPipe.Reader, _inputPipe.Writer));
-        }
-        else
+        if (_isComplete)
         {
             _pair.Application.Input.Complete();
             _pair.Application.Output.Complete();
+        }
 
-            _transportPipeReader.Reset();
-            _transportPipeWriter.Reset();
+        // Create new pipes when test stream context is reused rather than reseting them.
+        // This is required because the client tests read from these directly from these pipes.
+        // When a request is finished they'll check to see whether there is anymore content
+        // in the Application.Output pipe. If it has been reset then that code will error.
+        var inputOptions = Http3InMemory.GetInputPipeOptions(_testBase._serviceContext, _testBase._memoryPool, clientWriterScheduler ?? PipeScheduler.ThreadPool);
+        var outputOptions = Http3InMemory.GetOutputPipeOptions(_testBase._serviceContext, _testBase._memoryPool, PipeScheduler.ThreadPool);
 
-            _inputPipe.Reset();
-            _outputPipe.Reset();
-        }
+        _inputPipe = new Pipe(inputOptions);
+        _outputPipe = new Pipe(outputOptions);
+
+        _transportPipeReader = new CompletionPipeReader(_inputPipe.Reader);
+        _transportPipeWriter = new CompletionPipeWriter(_outputPipe.Writer);
+
+        _pair = new DuplexPipePair(
+            new DuplexPipe(_transportPipeReader, _transportPipeWriter),
+            new DuplexPipe(_outputPipe.Reader, _inputPipe.Writer));
 
         Features.Set<IStreamDirectionFeature>(this);
         Features.Set<IStreamIdFeature>(this);
diff --git a/src/Servers/Kestrel/shared/test/HttpParsingData.cs b/src/Servers/Kestrel/shared/test/HttpParsingData.cs
index 6b240e18b5c8..a301e27e3877 100644
--- a/src/Servers/Kestrel/shared/test/HttpParsingData.cs
+++ b/src/Servers/Kestrel/shared/test/HttpParsingData.cs
@@ -497,8 +497,10 @@ public static TheoryData<string, string> HostHeaderData
                     { "GET /pub/WWW/", "www.example.org" },
                     { "GET http://localhost/", "localhost" },
                     { "GET http://localhost:80/", "localhost:80" },
+                    { "GET http://localhost:80/", "localhost" },
                     { "GET https://localhost/", "localhost" },
                     { "GET https://localhost:443/", "localhost:443" },
+                    { "GET https://localhost:443/", "localhost" },
                     { "CONNECT asp.net:80", "asp.net:80" },
                     { "CONNECT asp.net:443", "asp.net:443" },
                     { "CONNECT user-images.githubusercontent.com:443", "user-images.githubusercontent.com:443" },
@@ -534,10 +536,13 @@ public static TheoryData<string, string> HostHeaderInvalidData
                 data.Add("CONNECT contoso.com", host);
             }
 
-            // port mismatch when target contains port
+            // port mismatch when target contains default https port
             data.Add("GET https://contoso.com:443/", "contoso.com:5000");
             data.Add("CONNECT contoso.com:443", "contoso.com:5000");
 
+            // port mismatch when target contains default http port
+            data.Add("GET http://contoso.com:80/", "contoso.com:5000");
+
             return data;
         }
     }
diff --git a/src/Servers/Kestrel/shared/test/TestContextFactory.cs b/src/Servers/Kestrel/shared/test/TestContextFactory.cs
index 3baf69b6348a..c019bc0939fb 100644
--- a/src/Servers/Kestrel/shared/test/TestContextFactory.cs
+++ b/src/Servers/Kestrel/shared/test/TestContextFactory.cs
@@ -93,7 +93,7 @@ public static HttpMultiplexedConnectionContext CreateHttp3ConnectionContext(
             connectionContext,
             serviceContext ?? CreateServiceContext(new KestrelServerOptions()),
             connectionFeatures ?? new FeatureCollection(),
-            memoryPool ?? PinnedBlockMemoryPoolFactory.Create(),
+            memoryPool ?? TestMemoryPoolFactory.Create(),
             localEndPoint,
             remoteEndPoint,
             metricsContext)
diff --git a/src/Servers/Kestrel/shared/test/TestServiceContext.cs b/src/Servers/Kestrel/shared/test/TestServiceContext.cs
index 85692f1fe341..30b7135d939b 100644
--- a/src/Servers/Kestrel/shared/test/TestServiceContext.cs
+++ b/src/Servers/Kestrel/shared/test/TestServiceContext.cs
@@ -3,6 +3,7 @@
 
 using System.Buffers;
 using System.IO.Pipelines;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
@@ -73,7 +74,19 @@ private void Initialize(ILoggerFactory loggerFactory, KestrelTrace kestrelTrace,
 
     public FakeTimeProvider FakeTimeProvider { get; set; }
 
-    public Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = System.Buffers.PinnedBlockMemoryPoolFactory.Create;
+    public IMemoryPoolFactory<byte> MemoryPoolFactory { get; set; } = new WrappingMemoryPoolFactory(() => TestMemoryPoolFactory.Create());
 
     public string DateHeaderValue => DateHeaderValueManager.GetDateHeaderValues().String;
+
+    internal sealed class WrappingMemoryPoolFactory : IMemoryPoolFactory<byte>
+    {
+        private readonly Func<MemoryPool<byte>> _memoryPoolFactory;
+
+        public WrappingMemoryPoolFactory(Func<MemoryPool<byte>> memoryPoolFactory)
+        {
+            _memoryPoolFactory = memoryPoolFactory;
+        }
+
+        public MemoryPool<byte> Create(MemoryPoolOptions options = null) => _memoryPoolFactory();
+    }
 }
diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs
index d27bf8e11635..ebaeec3f3074 100644
--- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs
+++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/DiagnosticMemoryPoolFactory.cs
@@ -6,10 +6,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Connections;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests;
 
-public class DiagnosticMemoryPoolFactory
+public class DiagnosticMemoryPoolFactory : IMemoryPoolFactory<byte>
 {
     private readonly bool _allowLateReturn;
 
@@ -24,11 +25,11 @@ public DiagnosticMemoryPoolFactory(bool allowLateReturn = false, bool rentTracki
         _pools = new List<DiagnosticMemoryPool>();
     }
 
-    public MemoryPool<byte> Create()
+    public MemoryPool<byte> Create(MemoryPoolOptions options = null)
     {
         lock (_pools)
         {
-            var pool = new DiagnosticMemoryPool(new PinnedBlockMemoryPool(), _allowLateReturn, _rentTracking);
+            var pool = new DiagnosticMemoryPool(new PinnedBlockMemoryPool(options?.Owner), _allowLateReturn, _rentTracking);
             _pools.Add(pool);
             return pool;
         }
diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/IWebHostPortExtensions.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/IWebHostPortExtensions.cs
index c2774908200c..2290a3b226e7 100644
--- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/IWebHostPortExtensions.cs
+++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/IWebHostPortExtensions.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable ASPDEPR008 // Type or member is obsolete
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs
index 4c1813ed371a..88ad8f350c17 100644
--- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs
+++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/TestServer.cs
@@ -1,26 +1,19 @@
 // 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.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests;
 
@@ -74,7 +67,7 @@ public TestServer(RequestDelegate app, TestServiceContext context, Action<Kestre
         _app = app;
         Context = context;
 
-        _host = TransportSelector.GetHostBuilder(context.MemoryPoolFactory, context.ServerOptions.Limits.MaxRequestBufferSize)
+        _host = TransportSelector.GetHostBuilder(context.ServerOptions.Limits.MaxRequestBufferSize)
             .ConfigureWebHost(webHostBuilder =>
             {
                 webHostBuilder
@@ -85,6 +78,10 @@ public TestServer(RequestDelegate app, TestServiceContext context, Action<Kestre
                     })
                     .ConfigureServices(services =>
                     {
+                        if (context.MemoryPoolFactory != null)
+                        {
+                            services.AddSingleton<IMemoryPoolFactory<byte>>(context.MemoryPoolFactory);
+                        }
                         services.AddSingleton<IStartup>(this);
                         services.AddSingleton(context.LoggerFactory);
                         services.AddSingleton<IHttpsConfigurationService, HttpsConfigurationService>();
diff --git a/src/Servers/Kestrel/startvscode.cmd b/src/Servers/Kestrel/startvscode.cmd
new file mode 100644
index 000000000000..1f6448bbdff9
--- /dev/null
+++ b/src/Servers/Kestrel/startvscode.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\..\startvscode.cmd %~dp0
diff --git a/src/Servers/Kestrel/startvscode.sh b/src/Servers/Kestrel/startvscode.sh
new file mode 100644
index 000000000000..9e44ad5032a9
--- /dev/null
+++ b/src/Servers/Kestrel/startvscode.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../../.."
+"$repo_root/startvscode.sh" $DIR
diff --git a/src/Servers/Kestrel/stress/HttpStress.slnf b/src/Servers/Kestrel/stress/HttpStress.slnf
index a729e42d4f31..0e1622c41383 100644
--- a/src/Servers/Kestrel/stress/HttpStress.slnf
+++ b/src/Servers/Kestrel/stress/HttpStress.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\..\\AspNetCore.slnx",
     "projects" : [
       "src\\Servers\\Kestrel\\stress\\HttpStress.csproj"
     ]
diff --git a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
index 18fbf82b9e03..d72b912870cc 100644
--- a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
+++ b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
@@ -630,7 +630,7 @@ public async Task OverrideDirectConfigurationWithIServerAddressesFeature_Succeed
             // If this isn't working properly, we'll get the HTTPS endpoint defined in UseKestrel
             // instead of the HTTP endpoint defined in UseUrls.
             var serverAddresses = host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses;
-            Assert.Equal(1, serverAddresses.Count);
+            Assert.Single(serverAddresses);
             var useUrlsAddressWithPort = $"http://127.0.0.1:{port}";
             Assert.Equal(serverAddresses.First(), useUrlsAddressWithPort);
 
@@ -675,7 +675,7 @@ public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_
             // If this isn't working properly, we'll get the HTTP endpoint defined in UseUrls
             // instead of the HTTPS endpoint defined in UseKestrel.
             var serverAddresses = host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses;
-            Assert.Equal(1, serverAddresses.Count);
+            Assert.Single(serverAddresses);
             var endPointAddress = $"https://127.0.0.1:{port}";
             Assert.Equal(serverAddresses.First(), endPointAddress);
 
@@ -715,7 +715,7 @@ public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_
 
             // If this isn't working properly, we'll not get the HTTPS endpoint defined in UseKestrel.
             var serverAddresses = host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses;
-            Assert.Equal(1, serverAddresses.Count);
+            Assert.Single(serverAddresses);
             var endPointAddress = $"https://127.0.0.1:{port}";
             Assert.Equal(serverAddresses.First(), endPointAddress);
 
@@ -994,12 +994,12 @@ log.Exception is null &&
 
         if (addressInUseCount >= 10)
         {
-            Assert.True(false, $"The corresponding {otherAddressFamily} address was already in use 10 times.");
+            Assert.Fail($"The corresponding {otherAddressFamily} address was already in use 10 times.");
         }
 
         if (wrongMessageCount >= 10)
         {
-            Assert.True(false, $"An error for a conflict with {otherAddressFamily} was thrown 10 times.");
+            Assert.Fail($"An error for a conflict with {otherAddressFamily} was thrown 10 times.");
         }
     }
 
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
index 7b2469a1b217..7d9ba4bd8f70 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
@@ -168,7 +168,7 @@ public async Task GracefulTurnsAbortiveIfRequestsDoNotFinish()
 
         var testContext = new TestServiceContext(LoggerFactory)
         {
-            MemoryPoolFactory = () => new PinnedBlockMemoryPool()
+            MemoryPoolFactory = new TestServiceContext.WrappingMemoryPoolFactory(() => TestMemoryPoolFactory.CreatePinnedBlockMemoryPool()),
         };
 
         ThrowOnUngracefulShutdown = false;
diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
index be0340a9dd19..3ddaa21972e5 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
@@ -1,23 +1,17 @@
 // 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.Buffers;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Server.Kestrel.FunctionalTests;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.Kestrel.FunctionalTests;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Xunit;
 
 #if SOCKETS
 namespace Microsoft.AspNetCore.Server.Kestrel.Sockets.FunctionalTests;
@@ -132,7 +126,7 @@ public async Task LargeUpload(long? maxRequestBufferSize, bool connectionAdapter
 
         var memoryPoolFactory = new DiagnosticMemoryPoolFactory(allowLateReturn: true);
 
-        using (var host = await StartHost(maxRequestBufferSize, data, connectionAdapter, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory.Create))
+        using (var host = await StartHost(maxRequestBufferSize, data, connectionAdapter, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory))
         {
             var port = host.GetPort();
             using (var socket = CreateSocket(port))
@@ -225,7 +219,7 @@ public async Task ServerShutsDownGracefullyWhenMaxRequestBufferSizeExceeded()
 
         var memoryPoolFactory = new DiagnosticMemoryPoolFactory(allowLateReturn: true);
 
-        using (var host = await StartHost(16 * 1024, data, false, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory.Create))
+        using (var host = await StartHost(16 * 1024, data, false, startReadingRequestBody, clientFinishedSendingRequestBody, memoryPoolFactory))
         {
             var port = host.GetPort();
             using (var socket = CreateSocket(port))
@@ -279,22 +273,26 @@ public async Task ServerShutsDownGracefullyWhenMaxRequestBufferSizeExceeded()
 
                 // Dispose host prior to closing connection to verify the server doesn't throw during shutdown
                 // if a connection no longer has alloc and read callbacks configured.
-                try
-                {
-                    await host.StopAsync();
-                }
-                // Remove when https://github.com/dotnet/runtime/issues/40290 is fixed
-                catch (OperationCanceledException)
-                {
-
-                }
+                await host.StopAsync();
                 host.Dispose();
             }
         }
         // Allow appfunc to unblock
         startReadingRequestBody.SetResult();
         clientFinishedSendingRequestBody.SetResult();
-        await memoryPoolFactory.WhenAllBlocksReturned(TestConstants.DefaultTimeout);
+
+        try
+        {
+            await memoryPoolFactory.WhenAllBlocksReturned(TestConstants.DefaultTimeout);
+        }
+        catch (AggregateException)
+        {
+            // This test is inherently racey. The server could try to use blocks that have been disposed.
+            // Ignore errors related to this:
+            //
+            // System.AggregateException : Exceptions occurred while accessing blocks(Block is backed by disposed slab)
+            // ---- System.InvalidOperationException : Block is backed by disposed slab
+        }
     }
 
     private async Task<IHost> StartHost(long? maxRequestBufferSize,
@@ -302,9 +300,9 @@ private async Task<IHost> StartHost(long? maxRequestBufferSize,
         bool useConnectionAdapter,
         TaskCompletionSource startReadingRequestBody,
         TaskCompletionSource clientFinishedSendingRequestBody,
-        Func<MemoryPool<byte>> memoryPoolFactory = null)
+        IMemoryPoolFactory<byte> memoryPoolFactory = null)
     {
-        var host = TransportSelector.GetHostBuilder(memoryPoolFactory, maxRequestBufferSize)
+        var host = TransportSelector.GetHostBuilder(maxRequestBufferSize)
             .ConfigureWebHost(webHostBuilder =>
             {
                 webHostBuilder
@@ -337,6 +335,13 @@ private async Task<IHost> StartHost(long? maxRequestBufferSize,
                         options.Limits.MaxRequestBodySize = _dataLength;
                     })
                     .UseContentRoot(Directory.GetCurrentDirectory())
+                    .ConfigureServices(services =>
+                    {
+                        if (memoryPoolFactory != null)
+                        {
+                            services.AddSingleton<IMemoryPoolFactory<byte>>(memoryPoolFactory);
+                        }
+                    })
                     .Configure(app => app.Run(async context =>
                     {
                         await startReadingRequestBody.Task.TimeoutAfter(TimeSpan.FromSeconds(120));
@@ -409,7 +414,7 @@ private static async Task AssertStreamContains(Stream stream, string expectedSub
 
             if (count == 0)
             {
-                Assert.True(false, "Stream completed without expected substring.");
+                Assert.Fail("Stream completed without expected substring.");
             }
 
             for (var i = 0; i < count && matchedChars < exptectedLength; i++)
diff --git a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
index 8ae6842a2e62..bdae9d88ccb8 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
@@ -399,6 +399,68 @@ await connection.Receive(
         Assert.False(loggedHigherThanDebug);
     }
 
+    [Fact]
+    public async Task IncompleteRequestBodyDoesNotLogAsApplicationError()
+    {
+        var appErrorLogged = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var badRequestLogged = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var connectionStoppedLogged = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        const int badRequestEventId = 17;
+        const int appErrorEventId = 13;
+        const int connectionStopEventId = 2;
+
+        // Listen for the expected log message
+        TestSink.MessageLogged += context =>
+        {
+            if (context.LoggerName == "Microsoft.AspNetCore.Server.Kestrel.BadRequests"
+                && context.EventId == badRequestEventId
+                && context.LogLevel == LogLevel.Debug)
+            {
+                badRequestLogged.TrySetResult();
+            }
+            else if (context.LoggerName == "Microsoft.AspNetCore.Server.Kestrel"
+                    && context.EventId.Id == appErrorEventId
+                    && context.LogLevel > LogLevel.Debug)
+            {
+                appErrorLogged.TrySetResult();
+            }
+            else if (context.LoggerName == "Microsoft.AspNetCore.Server.Kestrel.Connections"
+                    && context.EventId == connectionStopEventId)
+            {
+                connectionStoppedLogged.TrySetResult();
+            }
+        };
+
+        await using var server = new TestServer(async context =>
+        {
+            var buffer = new byte[1024];
+
+            // Attempt to read more of the body than will show up.
+            await context.Request.Body.ReadAsync(buffer, 0, buffer.Length);
+        }, new TestServiceContext(LoggerFactory));
+
+        using (var connection = server.CreateConnection())
+        {
+            await connection.Send(
+                "POST / HTTP/1.1",
+                "Host:",
+                "Connection: keep-alive",
+                "Content-Type: application/json",
+                "Content-Length: 100",  // Declare a larger body than will be sent
+                "",
+                "");
+        }
+
+        await connectionStoppedLogged.Task.DefaultTimeout();
+
+        // Bad request log message should have fired.
+        await badRequestLogged.Task.DefaultTimeout();
+
+        // App error log message should not have fired.
+        Assert.False(appErrorLogged.Task.IsCompleted);
+    }
+
     [Fact]
     public async Task ConnectionResetBetweenRequestsIsLoggedAsDebug()
     {
@@ -1150,7 +1212,7 @@ private static async Task AssertStreamContains(Stream stream, string expectedSub
 
             if (count == 0)
             {
-                Assert.True(false, "Stream completed without expected substring.");
+                Assert.Fail("Stream completed without expected substring.");
             }
 
             for (var i = 0; i < count && matchedChars < expectedLength; i++)
diff --git a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
index 95dd1549615f..0cddee38b305 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
@@ -348,6 +348,7 @@ await connection.Send(
     }
 
     [Theory]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60110")]
     [MemberData(nameof(ConnectionMiddlewareData))]
     public async Task AppCanHandleClientAbortingConnectionMidResponse(ListenOptions listenOptions)
     {
@@ -414,7 +415,7 @@ await connection.Send(
         var transportLogs = TestSink.Writes.Where(w => w.LoggerName == "Microsoft.AspNetCore.Server.Kestrel" ||
                                                         w.LoggerName == "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets");
 
-        Assert.Empty(transportLogs.Where(w => w.LogLevel > LogLevel.Debug));
+        Assert.DoesNotContain(transportLogs, w => w.LogLevel > LogLevel.Debug);
     }
 
     [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/52464")]
@@ -454,8 +455,8 @@ await connection.Send(
         // partial headers to be read leading to a bad request.
         var coreLogs = TestSink.Writes.Where(w => w.LoggerName == "Microsoft.AspNetCore.Server.Kestrel");
 
-        Assert.Empty(transportLogs.Where(w => w.LogLevel > LogLevel.Debug));
-        Assert.Empty(coreLogs.Where(w => w.LogLevel > LogLevel.Information));
+        Assert.DoesNotContain(transportLogs, w => w.LogLevel > LogLevel.Debug);
+        Assert.DoesNotContain(coreLogs, w => w.LogLevel > LogLevel.Information);
 
         await connectionDuration.WaitForMeasurementsAsync(minCount: 1).DefaultTimeout();
 
@@ -466,6 +467,7 @@ await connection.Send(
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/49974")]
     public async Task ConnectionClosedWhenResponseDoesNotSatisfyMinimumDataRate(bool fin)
     {
         var logger = LoggerFactory.CreateLogger($"{ typeof(ResponseTests).FullName}.{ nameof(ConnectionClosedWhenResponseDoesNotSatisfyMinimumDataRate)}");
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs
index d7076dacfd4c..af9d93aea3d6 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs
@@ -153,9 +153,12 @@ public Task BadRequestIfHostHeaderDoesNotMatchRequestTarget(string requestTarget
     }
 
     [Theory]
-    [InlineData("Host: www.foo.comConnection: keep-alive")] // Corrupted - missing line-break
-    [InlineData("Host: www.notfoo.com")] // Syntactically correct but not matching
-    public async Task CanOptOutOfBadRequestIfHostHeaderDoesNotMatchRequestTarget(string hostHeader)
+    [InlineData("http://www.foo.com", "Host: www.foo.comConnection: keep-alive", "www.foo.com")] // Corrupted - missing line-break
+    [InlineData("http://www.foo.com/", "Host: www.notfoo.com", "www.foo.com")] // Syntactically correct but not matching
+    [InlineData("http://www.foo.com:80", "Host: www.notfoo.com", "www.foo.com")] // Explicit default port in request string
+    [InlineData("http://www.foo.com:5129", "Host: www.foo.com", "www.foo.com:5129")] // Non-default port in request string
+    [InlineData("http://www.foo.com:5129", "Host: www.foo.com:5128", "www.foo.com:5129")] // Different port in host header
+    public async Task CanOptOutOfBadRequestIfHostHeaderDoesNotMatchRequestTarget(string requestString, string hostHeader, string expectedHost)
     {
         var testMeterFactory = new TestMeterFactory();
         using var connectionDuration = new MetricCollector<double>(testMeterFactory, "Microsoft.AspNetCore.Server.Kestrel", "kestrel.connection.duration");
@@ -175,13 +178,13 @@ public async Task CanOptOutOfBadRequestIfHostHeaderDoesNotMatchRequestTarget(str
         {
             using (var client = server.CreateConnection())
             {
-                await client.SendAll($"GET http://www.foo.com/api/data HTTP/1.1\r\n{hostHeader}\r\n\r\n");
+                await client.SendAll($"GET {requestString} HTTP/1.1\r\n{hostHeader}\r\n\r\n");
 
                 await client.Receive("HTTP/1.1 200 OK");
             }
         }
 
-        Assert.Equal("www.foo.com:80", receivedHost);
+        Assert.Equal(expectedHost, receivedHost);
 
         Assert.Collection(connectionDuration.GetMeasurementSnapshot(), m => MetricsAssert.NoError(m.Tags));
     }
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs
index f5ee2b28228e..0e37009b4544 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs
@@ -4,6 +4,7 @@
 using System.Buffers;
 using System.Globalization;
 using System.Text;
+using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -18,6 +19,70 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests;
 
 public class ChunkedRequestTests : LoggedTest
 {
+    [Theory]
+    [InlineData("2;\rxx\r\nxy\r\n0")] // \r in chunk extensions
+    [InlineData("2;\nxx\r\nxy\r\n0")] // \n in chunk extensions
+    public async Task RejectsInvalidChunkExtensions(string invalidChunkLine)
+    {
+        var testContext = new TestServiceContext(LoggerFactory);
+
+        await using (var server = new TestServer(AppChunked, testContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                    "POST / HTTP/1.1",
+                    "Host:",
+                    "Transfer-Encoding: chunked",
+                    "Content-Type: text/plain",
+                    "",
+                    invalidChunkLine,
+                    "",
+                    "");
+                await connection.ReceiveEnd(
+                    "HTTP/1.1 400 Bad Request",
+                    "Content-Length: 0",
+                    "Connection: close",
+                    $"Date: {testContext.DateHeaderValue}",
+                    "",
+                    "");
+            }
+        }
+    }
+
+    [Theory]
+    [InlineData("2;a=b;b=c\r\nxy\r\n0")] // Multiple chunk extensions
+    [InlineData("2; \r\nxy\r\n0")] // Space in chunk extensions (BWS)
+    [InlineData("2;;;\r\nxy\r\n0")] // Multiple ';' in chunk extensions
+    [InlineData("2;novalue\r\nxy\r\n0")] // Name only chunk extension
+    //[InlineData("2 ;\r\nxy\r\n0")] // Technically allowed per spec, but we never supported it, and no one should be sending it
+    public async Task AllowsValidChunkExtensions(string chunkLine)
+    {
+        var testContext = new TestServiceContext(LoggerFactory);
+
+        await using (var server = new TestServer(AppChunked, testContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                "POST / HTTP/1.1",
+                "Host:",
+                "Transfer-Encoding: chunked",
+                "Content-Type: text/plain",
+                "",
+                chunkLine,
+                "",
+                "");
+                await connection.Receive(
+                "HTTP/1.1 200 OK",
+                "Content-Length: 2",
+                $"Date: {testContext.DateHeaderValue}",
+                "",
+                "xy");
+            }
+        }
+    }
+
     private async Task App(HttpContext httpContext)
     {
         var request = httpContext.Request;
@@ -740,6 +805,9 @@ await connection.ReceiveEnd(
                     "",
                     "");
             }
+
+            // The 400 response should have been logged by default at Error level since the connection wasn't aborted when the bad request was handled.
+            Assert.Contains(TestSink.Writes, w => w.LoggerName == "Microsoft.AspNetCore.Server.Kestrel" && w.EventId.Id == 13 && w.LogLevel > LogLevel.Debug);
         }
     }
 
@@ -1117,4 +1185,86 @@ await connection.Receive(
             }
         }
     }
+
+    [Fact]
+    public async Task MultiReadWithInvalidNewlineAcrossReads()
+    {
+        // Inline so that we know when the first connection.Send has been parsed so we can send the next part
+        var testContext = new TestServiceContext(LoggerFactory)
+            { Scheduler = System.IO.Pipelines.PipeScheduler.Inline };
+
+        var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        await using (var server = new TestServer(async httpContext =>
+        {
+            var request = httpContext.Request;
+            var readTask = request.BodyReader.ReadAsync();
+            tcs.TrySetResult();
+            var readResult = await readTask;
+            request.BodyReader.AdvanceTo(readResult.Buffer.End);
+        }, testContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.SendAll(
+                    "GET / HTTP/1.1",
+                    "Host:",
+                    "Transfer-Encoding: chunked",
+                    "",
+                    "1;\r");
+                await tcs.Task;
+                await connection.SendAll(
+                    "\r");
+
+                await connection.ReceiveEnd(
+                    "HTTP/1.1 400 Bad Request",
+                    "Content-Length: 0",
+                    "Connection: close",
+                    $"Date: {testContext.DateHeaderValue}",
+                    "",
+                    "");
+            }
+        }
+    }
+
+    [Fact]
+    public async Task InvalidNewlineInFirstReadWithPartialChunkExtension()
+    {
+        // Inline so that we know when the first connection.Send has been parsed so we can send the next part
+        var testContext = new TestServiceContext(LoggerFactory)
+            { Scheduler = System.IO.Pipelines.PipeScheduler.Inline };
+
+        var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        await using (var server = new TestServer(async httpContext =>
+        {
+            var request = httpContext.Request;
+            var readTask = request.BodyReader.ReadAsync();
+            tcs.TrySetResult();
+            var readResult = await readTask;
+            request.BodyReader.AdvanceTo(readResult.Buffer.End);
+        }, testContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.SendAll(
+                    "GET / HTTP/1.1",
+                    "Host:",
+                    "Transfer-Encoding: chunked",
+                    "",
+                    "1;\n");
+                await tcs.Task;
+                await connection.SendAll(
+                    "t");
+
+                await connection.ReceiveEnd(
+                    "HTTP/1.1 400 Bad Request",
+                    "Content-Length: 0",
+                    "Connection: close",
+                    $"Date: {testContext.DateHeaderValue}",
+                    "",
+                    "");
+            }
+        }
+    }
 }
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs
index 93a6c3e4e9ba..05f528a2f379 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs
@@ -423,7 +423,7 @@ private class TestEventListener : EventListener
         private readonly ConcurrentQueue<EventSnapshot> _events = new ConcurrentQueue<EventSnapshot>();
         private readonly ILogger _logger;
 
-        private readonly object _disposeLock = new object();
+        private readonly Lock _disposeLock = new();
         private bool _disposed;
 
         public TestEventListener()
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs
index d858d0dcfd28..9ab5ceaa4d52 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs
@@ -404,9 +404,11 @@ public async Task StreamPool_SingleStream_ReturnedToPool()
     {
         // Add stream to Http2Connection._completedStreams inline with SetResult().
         var serverTcs = new TaskCompletionSource();
+        var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
         await InitializeConnectionAsync(async context =>
         {
+            appTcs.TrySetResult();
             await serverTcs.Task;
             await _echoApplication(context);
         });
@@ -415,6 +417,8 @@ await InitializeConnectionAsync(async context =>
 
         await StartStreamAsync(1, _browserRequestHeaders, endStream: true);
 
+        // If app code is running we know the stream has been created
+        await appTcs.Task;
         var stream = _connection._streams[1];
         serverTcs.SetResult();
 
@@ -434,7 +438,6 @@ await ExpectAsync(Http2FrameType.HEADERS,
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/39477")]
     public async Task StreamPool_MultipleStreamsConcurrent_StreamsReturnedToPool()
     {
         await InitializeConnectionAsync(_echoApplication);
@@ -474,6 +477,8 @@ await ExpectAsync(Http2FrameType.DATA,
             withFlags: (byte)Http2DataFrameFlags.END_STREAM,
             withStreamId: 3);
 
+        await WaitForAllStreamsAsync().DefaultTimeout();
+
         // TriggerTick will trigger the stream to be returned to the pool so we can assert it
         TriggerTick();
 
@@ -489,9 +494,12 @@ public async Task StreamPool_MultipleStreamsInSequence_PooledStreamReused()
         TaskCompletionSource appDelegateTcs = null;
         object persistedState = null;
         var requestCount = 0;
+        var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
         await InitializeConnectionAsync(async context =>
         {
+            appTcs.TrySetResult();
+
             requestCount++;
             var persistentStateCollection = context.Features.Get<IPersistentStateFeature>().State;
             if (persistentStateCollection.TryGetValue("Counter", out var value))
@@ -508,6 +516,9 @@ await InitializeConnectionAsync(async context =>
         appDelegateTcs = new TaskCompletionSource();
         await StartStreamAsync(1, _browserRequestHeaders, endStream: true);
 
+        // If app code is running we know the stream has been created
+        await appTcs.Task;
+        appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         // Get the in progress stream
         var stream = _connection._streams[1];
 
@@ -533,6 +544,8 @@ await ExpectAsync(Http2FrameType.HEADERS,
         appDelegateTcs = new TaskCompletionSource();
         await StartStreamAsync(3, _browserRequestHeaders, endStream: true);
 
+        await appTcs.Task;
+
         // New stream has been taken from the pool
         Assert.Equal(0, _connection.StreamPool.Count);
 
@@ -559,14 +572,15 @@ await ExpectAsync(Http2FrameType.HEADERS,
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40626")]
     public async Task StreamPool_StreamIsInvalidState_DontReturnedToPool()
     {
         // Add (or don't add) stream to Http2Connection._completedStreams inline with SetResult().
         var serverTcs = new TaskCompletionSource();
+        var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
         await InitializeConnectionAsync(async context =>
         {
+            appTcs.TrySetResult();
             await serverTcs.Task.DefaultTimeout();
 
             await context.Response.WriteAsync("Content");
@@ -575,6 +589,8 @@ await InitializeConnectionAsync(async context =>
 
         await StartStreamAsync(1, _browserRequestHeaders, endStream: true);
 
+        // If app code is running we know the stream has been created
+        await appTcs.Task;
         var stream = _connection._streams[1];
         serverTcs.SetResult();
 
@@ -1711,7 +1727,6 @@ public Task Frame_MultipleStreams_RequestsNotFinished_LowMaxStreamsPerConnection
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30309")]
     public Task Frame_MultipleStreams_RequestsNotFinished_DefaultMaxStreamsPerConnection_EnhanceYourCalmAfterDoubleMaxStreams()
     {
         // Kestrel tracks max streams per connection * 2
@@ -3584,7 +3599,6 @@ public async Task RST_STREAM_IncompleteRequest_AdditionalResetFrame_IgnoreAdditi
         AssertConnectionNoError();
     }
 
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/53744")]
     [Fact]
     public async Task RST_STREAM_IncompleteRequest_AdditionalWindowUpdateFrame_ConnectionAborted()
     {
@@ -3602,10 +3616,13 @@ public async Task RST_STREAM_IncompleteRequest_AdditionalWindowUpdateFrame_Conne
         await SendDataAsync(1, new byte[1], endStream: false);
         await SendRstStreamAsync(1);
         await SendWindowUpdateAsync(1, 1024);
-        tcs.TrySetResult();
 
-        await WaitForConnectionErrorAsync<Http2ConnectionErrorException>(ignoreNonGoAwayFrames: false, expectedLastStreamId: 1,
-            Http2ErrorCode.STREAM_CLOSED, CoreStrings.FormatHttp2ErrorStreamAborted(Http2FrameType.WINDOW_UPDATE, 1));
+        await WaitForStreamErrorAsync(expectedStreamId: 1, Http2ErrorCode.STREAM_CLOSED, CoreStrings.Http2StreamAborted);
+
+        tcs.TrySetResult(); // Don't let the response start until after the abort
+
+        await StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
+        AssertConnectionNoError();
     }
 
     [Fact]
@@ -4751,6 +4768,52 @@ await ExpectAsync(Http2FrameType.DATA,
         Assert.True(_helloWorldBytes.AsSpan(9, 3).SequenceEqual(dataFrame3.PayloadSequence.ToArray()));
     }
 
+    [Fact]
+    public async Task WINDOW_UPDATE_Received_OnStream_Resumed_WhenInitialWindowSizeNegativeMidStream()
+    {
+        const int windowSize = 3;
+        _clientSettings.InitialWindowSize = windowSize;
+        var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        await InitializeConnectionAsync(async context =>
+        {
+            var bodyControlFeature = context.Features.Get<IHttpBodyControlFeature>();
+            bodyControlFeature.AllowSynchronousIO = true;
+            await context.Response.Body.WriteAsync(new byte[windowSize - 1], 0, windowSize - 1);
+            await tcs.Task;
+            await context.Response.Body.WriteAsync(new byte[windowSize], 0, windowSize);
+        });
+        await StartStreamAsync(1, _browserRequestHeaders, endStream: true);
+        await ExpectAsync(Http2FrameType.HEADERS,
+            withLength: 32,
+            withFlags: (byte)Http2HeadersFrameFlags.END_HEADERS,
+            withStreamId: 1);
+
+        // Decrease window size after server has already sent the current window - 1 size of data
+        _clientSettings.InitialWindowSize = windowSize - 2;
+        await SendSettingsAsync();
+        await ExpectAsync(Http2FrameType.DATA,
+            withLength: windowSize - 1,
+            withFlags: (byte)Http2DataFrameFlags.NONE,
+            withStreamId: 1);
+        await ExpectAsync(Http2FrameType.SETTINGS,
+            withLength: 0,
+            withFlags: (byte)Http2DataFrameFlags.END_STREAM,
+            withStreamId: 0);
+        tcs.SetResult();
+
+        // send window update to receive the next frame data
+        await SendWindowUpdateAsync(1, windowSize + 1);
+        await ExpectAsync(Http2FrameType.DATA,
+            withLength: windowSize,
+            withFlags: (byte)Http2DataFrameFlags.NONE,
+            withStreamId: 1);
+        await ExpectAsync(Http2FrameType.DATA,
+            withLength: 0,
+            withFlags: (byte)Http2DataFrameFlags.END_STREAM,
+            withStreamId: 1);
+        await StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
+    }
+
     [Fact]
     public async Task CONTINUATION_Received_Decoded()
     {
@@ -5178,7 +5241,6 @@ await ExpectAsync(Http2FrameType.DATA,
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41172")]
     public async Task AcceptNewStreamsDuringClosingConnection()
     {
         await InitializeConnectionAsync(_echoApplication);
@@ -5227,6 +5289,7 @@ await ExpectAsync(Http2FrameType.DATA,
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60111")]
     public async Task IgnoreNewStreamsDuringClosedConnection()
     {
         // Remove callback that completes _pair.Application.Output on abort.
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
index fe3190b2f26a..89b3fced2a79 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
@@ -5239,10 +5239,10 @@ await InitializeConnectionAsync(async context =>
 
                 await context.Response.CompleteAsync().DefaultTimeout();
 
-                Assert.True(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);
-
                 // Make sure the client gets our results from CompleteAsync instead of from the request delegate exiting.
                 await clientTcs.Task.DefaultTimeout();
+
+                Assert.True(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);
                 appTcs.SetResult();
             }
             catch (Exception ex)
@@ -5432,6 +5432,7 @@ await WaitForStreamErrorAsync(1, Http2ErrorCode.INTERNAL_ERROR,
     public async Task AbortAfterCompleteAsync_GETWithResponseBodyAndTrailers_ResetsAfterResponse()
     {
         var startingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var trailersTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var headers = new[]
@@ -5453,6 +5454,9 @@ await InitializeConnectionAsync(async context =>
                 context.Response.AppendTrailer("CustomName", "Custom Value");
 
                 await context.Response.CompleteAsync().DefaultTimeout();
+                // Http2FrameWriter sets Trailers.IsReadOnly to true, but since it's a background task we have to wait for something to indicate it ran
+                // That something is the client side receiving the trailers.
+                await trailersTcs.Task;
 
                 Assert.True(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);
 
@@ -5484,6 +5488,7 @@ await InitializeConnectionAsync(async context =>
             withLength: 25,
             withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM),
             withStreamId: 1);
+        trailersTcs.SetResult();
         // Stream should return an INTERNAL_ERROR. If there is an unexpected exception from app TCS instead, then throw it here to avoid timeout waiting for the stream error.
         await Task.WhenAny(WaitForStreamErrorAsync(1, Http2ErrorCode.INTERNAL_ERROR, expectedErrorMessage: null), appTcs.Task).Unwrap();
 
@@ -5512,6 +5517,7 @@ await InitializeConnectionAsync(async context =>
     public async Task AbortAfterCompleteAsync_POSTWithResponseBodyAndTrailers_RequestBodyThrows()
     {
         var startingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var trailersTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var headers = new[]
@@ -5535,7 +5541,10 @@ await InitializeConnectionAsync(async context =>
                 context.Response.AppendTrailer("CustomName", "Custom Value");
 
                 await context.Response.CompleteAsync().DefaultTimeout();
-
+                // Http2FrameWriter sets Trailers.IsReadOnly to true, but since it's a background task we have to wait for something to indicate it ran
+                // That something is the client side receiving the trailers.
+                await trailersTcs.Task;
+                
                 Assert.True(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);
 
                 // RequestAborted will no longer fire after CompleteAsync.
@@ -5569,6 +5578,7 @@ await InitializeConnectionAsync(async context =>
             withLength: 25,
             withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM),
             withStreamId: 1);
+        trailersTcs.SetResult();
         await WaitForStreamErrorAsync(1, Http2ErrorCode.INTERNAL_ERROR, expectedErrorMessage: null);
 
         clientTcs.SetResult();
@@ -5596,6 +5606,7 @@ await InitializeConnectionAsync(async context =>
     public async Task ResetAfterCompleteAsync_GETWithResponseBodyAndTrailers_ResetsAfterResponse()
     {
         var startingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var trailersTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var headers = new[]
@@ -5617,6 +5628,9 @@ await InitializeConnectionAsync(async context =>
                 context.Response.AppendTrailer("CustomName", "Custom Value");
 
                 await context.Response.CompleteAsync().DefaultTimeout();
+                // Http2FrameWriter sets Trailers.IsReadOnly to true, but since it's a background task we have to wait for something to indicate it ran
+                // That something is the client side receiving the trailers.
+                await trailersTcs.Task;
 
                 Assert.True(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);
 
@@ -5650,6 +5664,7 @@ await InitializeConnectionAsync(async context =>
             withLength: 25,
             withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM),
             withStreamId: 1);
+        trailersTcs.SetResult();
         await WaitForStreamErrorAsync(1, Http2ErrorCode.NO_ERROR, expectedErrorMessage:
             "The HTTP/2 stream was reset by the application with error code NO_ERROR.");
 
@@ -5678,6 +5693,7 @@ await WaitForStreamErrorAsync(1, Http2ErrorCode.NO_ERROR, expectedErrorMessage:
     public async Task ResetAfterCompleteAsync_POSTWithResponseBodyAndTrailers_RequestBodyThrows()
     {
         var startingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var trailersTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var headers = new[]
@@ -5701,6 +5717,9 @@ await InitializeConnectionAsync(async context =>
                 context.Response.AppendTrailer("CustomName", "Custom Value");
 
                 await context.Response.CompleteAsync().DefaultTimeout();
+                // Http2FrameWriter sets Trailers.IsReadOnly to true, but since it's a background task we have to wait for something to indicate it ran
+                // That something is the client side receiving the trailers.
+                await trailersTcs.Task;
 
                 Assert.True(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);
 
@@ -5737,6 +5756,7 @@ await InitializeConnectionAsync(async context =>
             withLength: 25,
             withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM),
             withStreamId: 1);
+        trailersTcs.SetResult();
         await WaitForStreamErrorAsync(1, Http2ErrorCode.NO_ERROR, expectedErrorMessage:
             "The HTTP/2 stream was reset by the application with error code NO_ERROR.");
 
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
index b0a921b13830..6fdfc0153206 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs
@@ -112,7 +112,7 @@ protected static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeader
     protected static readonly byte[] _noData = new byte[0];
     protected static readonly byte[] _maxData = Encoding.ASCII.GetBytes(new string('a', Http2PeerSettings.MinAllowedMaxFrameSize));
 
-    private readonly MemoryPool<byte> _memoryPool = PinnedBlockMemoryPoolFactory.Create();
+    private readonly MemoryPool<byte> _memoryPool = TestMemoryPoolFactory.Create();
 
     internal readonly Http2PeerSettings _clientSettings = new Http2PeerSettings();
     internal readonly HPackDecoder _hpackDecoder;
@@ -131,7 +131,7 @@ protected static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeader
     protected readonly Dictionary<string, string> _decodedHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
     protected readonly RequestFields _receivedRequestFields = new RequestFields();
     protected readonly HashSet<int> _abortedStreamIds = new HashSet<int>();
-    protected readonly object _abortedStreamIdsLock = new object();
+    protected readonly Lock _abortedStreamIdsLock = new();
     protected readonly TaskCompletionSource _closingStateReached = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
     protected readonly TaskCompletionSource _closedStateReached = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs
index acd7c805e2f8..0774fec645b1 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs
@@ -516,11 +516,18 @@ await InitializeConnectionAsync(async context =>
     [Fact]
     public async Task ExtendedCONNECTMethod_CanHaveNon200ResponseWithBody()
     {
+        var finishedSendingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
         await InitializeConnectionAsync(async context =>
         {
             var connectFeature = context.Features.Get<IHttpExtendedConnectFeature>();
             Assert.True(connectFeature.IsExtendedConnect);
 
+            // The EndStreamReceived flag might not have been sent let alone received by the server by the time application code completes
+            // which would result in a RST_STREAM being sent to the client. We wait for the data frame to finish sending
+            // before allowing application code to complete (relies on inline Pipe completions which we use for tests)
+            await finishedSendingTcs.Task;
+
             context.Response.StatusCode = Http.StatusCodes.Status418ImATeapot;
             context.Response.ContentLength = 2;
             await context.Response.Body.WriteAsync(new byte[1] { 0x01 });
@@ -543,6 +550,8 @@ await InitializeConnectionAsync(async context =>
 
         await SendDataAsync(1, new byte[10241], endStream: true);
 
+        finishedSendingTcs.SetResult();
+
         var headersFrame = await ExpectAsync(Http2FrameType.HEADERS,
             withLength: 40,
             withFlags: (byte)Http2HeadersFrameFlags.END_HEADERS,
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs
index 06d96adc238f..ab8bc5e9a1e6 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs
@@ -360,6 +360,35 @@ await Http3Api.WaitForConnectionErrorAsync<Http3ConnectionErrorException>(
         MetricsAssert.Equal(ConnectionEndReason.ClosedCriticalStream, Http3Api.ConnectionTags);
     }
 
+    [Theory]
+    [InlineData((int)Http3FrameType.Settings, 20_000)]
+    //[InlineData((int)Http3FrameType.GoAway, 30)] // GoAway frames trigger graceful connection close which races with sending FRAME_ERROR
+    [InlineData((int)Http3FrameType.CancelPush, 30)]
+    [InlineData((int)Http3FrameType.MaxPushId, 30)]
+    [InlineData(int.MaxValue, 20_000)] // Unknown frame type
+    public async Task ControlStream_ClientToServer_LargeFrame_ConnectionError(int frameType, int length)
+    {
+        await Http3Api.InitializeConnectionAsync(_noopApplication);
+
+        var controlStream = await Http3Api.CreateControlStream();
+
+        // Need to send settings frame before other frames, otherwise it's a connection error
+        if (frameType != (int)Http3FrameType.Settings)
+        {
+            await controlStream.SendSettingsAsync(new List<Http3PeerSetting>());
+        }
+
+        await controlStream.SendFrameAsync((Http3FrameType)frameType, new byte[length]);
+
+        await Http3Api.WaitForConnectionErrorAsync<Http3ConnectionErrorException>(
+            ignoreNonGoAwayFrames: true,
+            expectedLastStreamId: 0,
+            expectedErrorCode: Http3ErrorCode.FrameError,
+            matchExpectedErrorMessage: AssertExpectedErrorMessages,
+            expectedErrorMessage: CoreStrings.FormatHttp3ControlStreamFrameTooLarge(Http3Formatting.ToFormattedType((Http3FrameType)frameType)));
+        MetricsAssert.Equal(ConnectionEndReason.InvalidFrameLength, Http3Api.ConnectionTags);
+    }
+
     [Fact]
     public async Task SETTINGS_MaxFieldSectionSizeSent_ServerReceivesValue()
     {
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs
index 6a44a92e6805..0d5e22d295a4 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Globalization;
+using System.IO.Pipelines;
 using System.Net.Http;
 using System.Runtime.ExceptionServices;
 using System.Text;
@@ -11,8 +13,8 @@
 using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3;
-using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
@@ -1977,7 +1979,7 @@ public async Task RequestTrailers_CanReadTrailersFromRequest()
         var trailers = new[]
         {
                 new KeyValuePair<string, string>("TestName", "TestValue"),
-            };
+        };
         var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async c =>
         {
             await c.Request.Body.DrainAsync(default);
@@ -2370,6 +2372,21 @@ public Task HEADERS_Received_HeaderBlockOverLimitx2_ConnectionError()
         return HEADERS_Received_InvalidHeaderFields_StreamError(headers, CoreStrings.BadRequest_HeadersExceedMaxTotalSize, Http3ErrorCode.RequestRejected);
     }
 
+    [Fact]
+    public Task HEADERS_Received_HeaderValueOverLimit_ConnectionError()
+    {
+        var limit = _serviceContext.ServerOptions.Limits.Http3.MaxRequestHeaderFieldSize;
+        // Single header value exceeds limit
+        var headers = new[]
+        {
+            new KeyValuePair<string, string>("a", new string('a', limit + 1)),
+        };
+
+        return HEADERS_Received_InvalidHeaderFields_StreamError(headers,
+            SR.Format(SR.net_http_headers_exceeded_length, limit),
+            Http3ErrorCode.InternalError);
+    }
+
     [Fact]
     public async Task HEADERS_Received_TooManyHeaders_431()
     {
@@ -3000,4 +3017,322 @@ public async Task GetMemory_AfterAbort_GetsFakeMemory(int sizeHint)
             context.Response.BodyWriter.Advance(memory.Length);
         }, headers);
     }
+
+    [Fact]
+    public async Task ControlStream_CloseBeforeSendingSettings()
+    {
+        await Http3Api.InitializeConnectionAsync(_noopApplication);
+
+        var outboundcontrolStream = await Http3Api.CreateControlStream();
+
+        await outboundcontrolStream.EndStreamAsync();
+
+        await outboundcontrolStream.ReceiveEndAsync();
+    }
+
+    [Fact]
+    public async Task ControlStream_PartialFrameThenClose()
+    {
+        await Http3Api.InitializeConnectionAsync(_noopApplication);
+
+        var outboundcontrolStream = await Http3Api.CreateControlStream();
+
+        var settings = new List<Http3PeerSetting>
+        {
+            new Http3PeerSetting(Internal.Http3.Http3SettingType.MaxFieldSectionSize, 100),
+            new Http3PeerSetting(Internal.Http3.Http3SettingType.EnableWebTransport, 1),
+            new Http3PeerSetting(Internal.Http3.Http3SettingType.H3Datagram, 1)
+        };
+        var len = Http3FrameWriter.CalculateSettingsSize(settings);
+
+        Http3FrameWriter.WriteHeader(Http3FrameType.Settings, len, outboundcontrolStream.Pair.Application.Output);
+
+        var parameterLength = VariableLengthIntegerHelper.WriteInteger(outboundcontrolStream.Pair.Application.Output.GetSpan(), (long)Internal.Http3.Http3SettingType.MaxFieldSectionSize);
+        outboundcontrolStream.Pair.Application.Output.Advance(parameterLength);
+        await outboundcontrolStream.Pair.Application.Output.FlushAsync();
+
+        await outboundcontrolStream.EndStreamAsync();
+
+        await outboundcontrolStream.ReceiveEndAsync();
+    }
+
+    [Fact]
+    public async Task SendDataObservesBackpressureFromApp()
+    {
+        var headers = new[]
+        {
+            new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"),
+            new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"),
+            new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"),
+            new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"),
+        };
+
+        // Http3Stream hardcodes a 64k size for the RequestBodyPipe there is also the transport Pipe which we can influence with MaxRequestBufferSize
+        // So we need to send enough to fill up the 64k Pipe as well as the 100 byte Pipe.
+        var sendSize = 1024 * 65;
+        _serviceContext.ServerOptions.Limits.MaxRequestBufferSize = 100;
+        var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var startedReadingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async c =>
+        {
+            // Read a single byte to make sure data has gotten here before we start verifying backpressure in the test code
+            var res = await c.Request.BodyReader.ReadAsync();
+            Assert.Equal(sendSize, res.Buffer.Length);
+            c.Request.BodyReader.AdvanceTo(res.Buffer.Slice(1).Start);
+            startedReadingTcs.SetResult();
+
+            await tcs.Task;
+            res = await c.Request.BodyReader.ReadAsync();
+            Assert.Equal(sendSize - 1, res.Buffer.Length);
+            c.Request.BodyReader.AdvanceTo(res.Buffer.End);
+        }, headers);
+
+        var sendTask = requestStream.SendDataAsync(Encoding.ASCII.GetBytes(new string('a', sendSize)));
+
+        // Wait for "app" code to start reading to ensure it has gotten bytes before we start verifying backpressure
+        await startedReadingTcs.Task;
+        Assert.False(sendTask.IsCompleted);
+        tcs.SetResult();
+
+        await sendTask;
+
+        var responseHeaders = await requestStream.ExpectHeadersAsync();
+        Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]);
+
+        await requestStream.ExpectReceiveEndOfStream();
+    }
+
+    [Fact]
+    public async Task Request_FrameParsingSingleByteAtATimeWorks()
+    {
+        var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var total = 0;
+        var trailerValue = string.Empty;
+        await Http3Api.InitializeConnectionAsync(async context =>
+        {
+            var buffer = new byte[100];
+            var read = await context.Request.Body.ReadAsync(buffer, 0, buffer.Length);
+            var captureTcs = tcs;
+            tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+            captureTcs.SetResult();
+            Assert.Equal(1, read);
+            total = read;
+            while (read > 0)
+            {
+                read = await context.Request.Body.ReadAsync(buffer, total, buffer.Length - total);
+                captureTcs = tcs;
+                tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+                captureTcs.SetResult();
+                total += read;
+                if (read == 0)
+                {
+                    break;
+                }
+                Assert.Equal(1, read);
+            }
+
+            trailerValue = context.Request.GetTrailer("TestName");
+        });
+
+        // Use Inline scheduling and buffer size of 1 to guarantee each write will wait for the parsing loop to complete before writing more data
+        _serviceContext.ServerOptions.Limits.MaxRequestBufferSize = 1;
+        var stream = await Http3Api.CreateRequestStream(headers: [], clientWriterScheduler: PipeScheduler.Inline);
+
+        // Use local pipe to write frames so we can get the entire buffer in order to write it one byte at a time
+        var bufferPipe = new Pipe();
+        Http3FrameWriter.WriteHeader(Http3FrameType.Headers, frameLength: 38, bufferPipe.Writer);
+
+        var headersTotalSize = 0;
+        var headers = new Http3HeadersEnumerator();
+        headers.Initialize(new Dictionary<string, StringValues>() {
+            { InternalHeaderNames.Method, "POST" },
+            { InternalHeaderNames.Path, "/" },
+            { InternalHeaderNames.Scheme, "http" }, });
+
+        var mem = bufferPipe.Writer.GetMemory();
+        var done = QPackHeaderWriter.BeginEncodeHeaders(headers, mem.Span, ref headersTotalSize, out var length);
+        Assert.True(done);
+        bufferPipe.Writer.Advance(length);
+        await bufferPipe.Writer.FlushAsync();
+
+        // Write header frame one byte at a time
+        await WriteOneByteAtATime(bufferPipe.Reader, stream.Pair.Application.Output);
+
+        Http3FrameWriter.WriteHeader(Http3FrameType.Data, frameLength: 12, bufferPipe.Writer);
+        await bufferPipe.Writer.FlushAsync();
+
+        // Write data header one byte at a time
+        await WriteOneByteAtATime(bufferPipe.Reader, stream.Pair.Application.Output);
+
+        bufferPipe.Writer.Write(new byte[12]);
+        await bufferPipe.Writer.FlushAsync();
+
+        // Write data in data frame one byte at a time
+        // Don't use WriteOneByteAtATime() as we want to wait on the TCS after every flush to make sure app code consumed the data
+        // before we send another byte
+        var res = await bufferPipe.Reader.ReadAsync();
+        for (var i = 0; i < res.Buffer.Length; i++)
+        {
+            mem = stream.Pair.Application.Output.GetMemory();
+            mem.Span[0] = res.Buffer.Slice(i).FirstSpan[0];
+            stream.Pair.Application.Output.Advance(1);
+            // Use TCS to make sure app can read data before we send more
+            var capturedTcs = tcs;
+            await stream.Pair.Application.Output.FlushAsync();
+            await capturedTcs.Task;
+        }
+        bufferPipe.Reader.AdvanceTo(res.Buffer.End);
+
+        var trailers = new Http3HeadersEnumerator();
+        trailers.Initialize(new Dictionary<string, StringValues>()
+        {
+            { "TestName", "TestValue" }
+        });
+
+        Http3FrameWriter.WriteHeader(Http3FrameType.Headers, frameLength: 22, bufferPipe.Writer);
+        mem = bufferPipe.Writer.GetMemory();
+        done = QPackHeaderWriter.BeginEncodeHeaders(trailers, mem.Span, ref headersTotalSize, out length);
+        Assert.True(done);
+        bufferPipe.Writer.Advance(length);
+        await bufferPipe.Writer.FlushAsync();
+
+        // Write trailer frame one byte at a time
+        await WriteOneByteAtATime(bufferPipe.Reader, stream.Pair.Application.Output);
+
+        await stream.EndStreamAsync();
+
+        var responseHeaders = await stream.ExpectHeadersAsync();
+        Assert.Equal(3, responseHeaders.Count);
+        Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase);
+        Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]);
+        Assert.Equal("0", responseHeaders["content-length"]);
+
+        await stream.ExpectReceiveEndOfStream();
+
+        Assert.Equal(12, total);
+        Assert.Equal("TestValue", trailerValue);
+    }
+
+    [Fact]
+    public async Task Control_FrameParsingSingleByteAtATimeWorks()
+    {
+        await Http3Api.InitializeConnectionAsync(_noopApplication);
+
+        // Use Inline scheduling and buffer size of 1 to guarantee each write will wait for the parsing loop to complete before writing more data
+        _serviceContext.ServerOptions.Limits.MaxRequestBufferSize = 1;
+        var outboundcontrolStream = await Http3Api.CreateControlStream(clientWriterScheduler: PipeScheduler.Inline);
+
+        // Use local pipe to write frames so we can get the entire buffer in order to write it one byte at a time
+        var bufferPipe = new Pipe();
+
+        var settings = new List<Http3PeerSetting>
+        {
+            new Http3PeerSetting(Internal.Http3.Http3SettingType.MaxFieldSectionSize, 100),
+            new Http3PeerSetting(Internal.Http3.Http3SettingType.EnableWebTransport, 1),
+            new Http3PeerSetting(Internal.Http3.Http3SettingType.H3Datagram, 1)
+        };
+        var len = Http3FrameWriter.CalculateSettingsSize(settings);
+
+        Http3FrameWriter.WriteHeader(Http3FrameType.Settings, len, bufferPipe.Writer);
+        var mem = bufferPipe.Writer.GetMemory();
+        Http3FrameWriter.WriteSettings(settings, mem.Span);
+
+        bufferPipe.Writer.Advance(len);
+        await bufferPipe.Writer.FlushAsync();
+
+        // Write Settings frame one byte at a time
+        await WriteOneByteAtATime(bufferPipe.Reader, outboundcontrolStream.Pair.Application.Output);
+
+        var fieldSetting = await Http3Api.ServerReceivedSettingsReader.ReadAsync().DefaultTimeout();
+
+        Assert.Equal(Internal.Http3.Http3SettingType.MaxFieldSectionSize, fieldSetting.Key);
+        Assert.Equal(100, fieldSetting.Value);
+
+        fieldSetting = await Http3Api.ServerReceivedSettingsReader.ReadAsync().DefaultTimeout();
+        Assert.Equal(Internal.Http3.Http3SettingType.EnableWebTransport, fieldSetting.Key);
+        Assert.Equal(1, fieldSetting.Value);
+
+        fieldSetting = await Http3Api.ServerReceivedSettingsReader.ReadAsync().DefaultTimeout();
+        Assert.Equal(Internal.Http3.Http3SettingType.H3Datagram, fieldSetting.Key);
+        Assert.Equal(1, fieldSetting.Value);
+
+        // Frames must be well-formed otherwise we close the connection with a frame error
+        Http3FrameWriter.WriteHeader(Http3FrameType.CancelPush, frameLength: 2, bufferPipe.Writer);
+        var idLength = VariableLengthIntegerHelper.WriteInteger(bufferPipe.Writer.GetSpan(), longToEncode: 1026);
+        bufferPipe.Writer.Advance(idLength);
+        await bufferPipe.Writer.FlushAsync();
+
+        // Write CancelPush frame one byte at a time
+        await WriteOneByteAtATime(bufferPipe.Reader, outboundcontrolStream.Pair.Application.Output);
+
+        // Frames must be well-formed otherwise we close the connection with a frame error
+        Http3FrameWriter.WriteHeader(Http3FrameType.GoAway, frameLength: 4, bufferPipe.Writer);
+        idLength = VariableLengthIntegerHelper.WriteInteger(bufferPipe.Writer.GetSpan(), longToEncode: 100026);
+        bufferPipe.Writer.Advance(idLength);
+        await bufferPipe.Writer.FlushAsync();
+
+        try
+        {
+            // Write GoAway frame one byte at a time
+            await WriteOneByteAtATime(bufferPipe.Reader, outboundcontrolStream.Pair.Application.Output);
+        }
+        // As soon as the GOAWAY frame identifier is processed we initiate the connection close process.
+        // That means it's possible to still be writing to the stream when we close the
+        // connection which would result in an exception. We'll just ignore the exception in this case.
+        catch (Exception) { }
+
+        await outboundcontrolStream.EndStreamAsync();
+
+        // Check that connection is closed.
+        var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        Http3Api.MultiplexedConnectionContext.ConnectionClosed.Register(() => tcs.TrySetResult());
+        await tcs.Task;
+
+        await outboundcontrolStream.ReceiveEndAsync();
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task CanHaveBody_ReturnsFalseWithoutRequestBody(bool endstream)
+    {
+        var headers = new[]
+        {
+            new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"),
+            new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"),
+            new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"),
+            new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"),
+        };
+
+        var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context =>
+        {
+            Assert.NotEqual(endstream, context.Features.Get<IHttpRequestBodyDetectionFeature>().CanHaveBody);
+            context.Response.StatusCode = 200;
+            return Task.CompletedTask;
+        }, headers, endStream: endstream);
+
+        var responseHeaders = await requestStream.ExpectHeadersAsync();
+        Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]);
+
+        await requestStream.ExpectReceiveEndOfStream();
+    }
+
+    private async Task WriteOneByteAtATime(PipeReader reader, PipeWriter writer)
+    {
+        var res = await reader.ReadAsync();
+        try
+        {
+            for (var i = 0; i < res.Buffer.Length; i++)
+            {
+                var mem = writer.GetMemory();
+                mem.Span[0] = res.Buffer.Slice(i).FirstSpan[0];
+                writer.Advance(1);
+                await writer.FlushAsync();
+            }
+        }
+        finally
+        {
+            reader.AdvanceTo(res.Buffer.End);
+        }
+    }
 }
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
index 70005eaf0432..2d4ab6c59018 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
@@ -147,12 +147,14 @@ void ConfigureListenOptions(ListenOptions listenOptions)
             Assert.Equal(expectedHostname, tlsFeature.HostName);
             Assert.True(tlsFeature.Protocol > SslProtocols.None, "Protocol");
             Assert.True(tlsFeature.NegotiatedCipherSuite >= TlsCipherSuite.TLS_NULL_WITH_NULL_NULL, "NegotiatedCipherSuite");
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
             Assert.True(tlsFeature.CipherAlgorithm > CipherAlgorithmType.Null, "Cipher");
             Assert.True(tlsFeature.CipherStrength > 0, "CipherStrength");
             Assert.True(tlsFeature.HashAlgorithm >= HashAlgorithmType.None, "HashAlgorithm"); // May be None on Linux.
             Assert.True(tlsFeature.HashStrength >= 0, "HashStrength"); // May be 0 for some algorithms
             Assert.True(tlsFeature.KeyExchangeAlgorithm >= ExchangeAlgorithmType.None, "KeyExchangeAlgorithm"); // Maybe None on Windows 7
             Assert.True(tlsFeature.KeyExchangeStrength >= 0, "KeyExchangeStrength"); // May be 0 on mac
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
             return context.Response.WriteAsync("hello world");
         }, new TestServiceContext(LoggerFactory), ConfigureListenOptions))
@@ -183,12 +185,14 @@ void ConfigureListenOptions(ListenOptions listenOptions)
             var tlsFeature = context.Features.Get<ITlsHandshakeFeature>();
             Assert.NotNull(tlsFeature);
             Assert.True(tlsFeature.Protocol > SslProtocols.None, "Protocol");
+#pragma warning disable SYSLIB0058 // Type or member is obsolete
             Assert.True(tlsFeature.CipherAlgorithm > CipherAlgorithmType.Null, "Cipher");
             Assert.True(tlsFeature.CipherStrength > 0, "CipherStrength");
             Assert.True(tlsFeature.HashAlgorithm >= HashAlgorithmType.None, "HashAlgorithm"); // May be None on Linux.
             Assert.True(tlsFeature.HashStrength >= 0, "HashStrength"); // May be 0 for some algorithms
             Assert.True(tlsFeature.KeyExchangeAlgorithm >= ExchangeAlgorithmType.None, "KeyExchangeAlgorithm"); // Maybe None on Windows 7
             Assert.True(tlsFeature.KeyExchangeStrength >= 0, "KeyExchangeStrength"); // May be 0 on mac
+#pragma warning restore SYSLIB0058 // Type or member is obsolete
 
             return context.Response.WriteAsync("hello world");
         }, new TestServiceContext(LoggerFactory), ConfigureListenOptions))
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
index 3fd95d1cc652..1a69f20b58af 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
@@ -17,7 +17,6 @@
     <Compile Include="$(KestrelSharedSourceRoot)test\Http3\*.cs" LinkBase="shared" />
     <Compile Include="$(KestrelSharedSourceRoot)\HPackHeaderWriter.cs" Link="Http2\HPackHeaderWriter.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\Http2HeadersEnumerator.cs" Link="Http2\Http2HeadersEnumerator.cs" />
-    <Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
     <Compile Include="$(KestrelSharedSourceRoot)\CompletionPipeReader.cs" Link="Internal\CompletionPipeReader.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\CompletionPipeWriter.cs" Link="Internal\CompletionPipeWriter.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)\ConnectionCompletion.cs" Link="Internal\ConnectionCompletion.cs" />
@@ -34,7 +33,6 @@
     <Content Include="$(SharedSourceRoot)TestCertificates\*.key" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="$(SharedSourceRoot)TestCertificates\*.pem" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
 
-    <Reference Include="System.Threading.Channels" />
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Diagnostics.Testing" />
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs
index 310ae4349bba..efa7e242aa78 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs
@@ -171,7 +171,12 @@ public async Task Http1Connection_RequestEndsWithIncompleteReadAsync()
         await using var server = new TestServer(async context =>
         {
             var result = await context.Request.BodyReader.ReadAsync();
-            await context.Response.BodyWriter.WriteAsync(result.Buffer.ToArray());
+
+            // The request body might be incomplete, but there should be something in the first read.
+            Assert.True(result.Buffer.Length > 0);
+            Assert.Equal(result.Buffer.ToSpan(), "Hello World?"u8[..(int)result.Buffer.Length]);
+
+            await context.Response.WriteAsync("Hello World?");
             // No BodyReader.Advance. Connection will fail when attempting to complete body.
         }, serviceContext);
 
@@ -268,7 +273,7 @@ public async Task Http1Connection_ServerShutdown_Abort()
 
         var serviceContext = new TestServiceContext(LoggerFactory, metrics: new KestrelMetrics(testMeterFactory))
         {
-            MemoryPoolFactory = PinnedBlockMemoryPoolFactory.CreatePinnedBlockMemoryPool,
+            MemoryPoolFactory = new TestServiceContext.WrappingMemoryPoolFactory(() => TestMemoryPoolFactory.CreatePinnedBlockMemoryPool()),
             ShutdownTimeout = TimeSpan.Zero
         };
 
@@ -393,17 +398,25 @@ public async Task Http1Connection_ServerAbort_HasErrorType()
         var serviceContext = new TestServiceContext(LoggerFactory, metrics: new KestrelMetrics(testMeterFactory));
 
         var sendString = "POST / HTTP/1.0\r\nContent-Length: 12\r\n\r\nHello World?";
+        var finishedSendingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
-        await using var server = new TestServer(c =>
+        await using var server = new TestServer(async c =>
         {
+            await c.Request.Body.ReadUntilEndAsync();
+
+            // An extra check to ensure that client is done sending before the server aborts.
+            // This might not be necessary since we're reading to the end of the request body, but it doesn't hurt.
+            await finishedSendingTcs.Task;
+
             c.Abort();
-            return Task.CompletedTask;
         }, serviceContext);
 
         using (var connection = server.CreateConnection())
         {
             await connection.Send(sendString).DefaultTimeout();
 
+            finishedSendingTcs.SetResult();
+
             await connection.ReceiveEnd().DefaultTimeout();
 
             await connection.WaitForConnectionClose().DefaultTimeout();
@@ -599,7 +612,7 @@ public async Task Http2Connection_ServerShutdown_Abort()
         var serviceContext = new TestServiceContext(LoggerFactory, metrics: new KestrelMetrics(testMeterFactory))
         {
             ShutdownTimeout = TimeSpan.Zero,
-            MemoryPoolFactory = PinnedBlockMemoryPoolFactory.CreatePinnedBlockMemoryPool
+            MemoryPoolFactory = new TestServiceContext.WrappingMemoryPoolFactory(() => TestMemoryPoolFactory.CreatePinnedBlockMemoryPool())
         };
 
         var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
index e8ec0b6152d4..3319a5e22740 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
@@ -264,15 +264,15 @@ await connection.Receive($"HTTP/1.1 200 OK",
                     "Done");
 
                 await Task.WhenAll(pathTcs.Task, rawTargetTcs.Task, queryTcs.Task).DefaultTimeout();
-                Assert.Equal(new PathString(expectedPath), pathTcs.Task.Result);
-                Assert.Equal(requestUrl, rawTargetTcs.Task.Result);
+                Assert.Equal(new PathString(expectedPath), await pathTcs.Task);
+                Assert.Equal(requestUrl, await rawTargetTcs.Task);
                 if (queryValue == null)
                 {
-                    Assert.False(queryTcs.Task.Result.ContainsKey("q"));
+                    Assert.False((await queryTcs.Task).ContainsKey("q"));
                 }
                 else
                 {
-                    Assert.Equal(queryValue, queryTcs.Task.Result["q"]);
+                    Assert.Equal(queryValue, (await queryTcs.Task)["q"]);
                 }
             }
         }
@@ -1891,7 +1891,7 @@ await connection.Send(
             }
         }
 
-        Assert.Empty(LogMessages.Where(m => m.LogLevel >= LogLevel.Warning));
+        Assert.DoesNotContain(LogMessages, m => m.LogLevel >= LogLevel.Warning);
     }
 
     [Fact]
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseHeaderTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseHeaderTests.cs
index cf6be74877bb..d546fabefcac 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseHeaderTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseHeaderTests.cs
@@ -109,11 +109,11 @@ public async Task ResponseHeaders_NullEntriesAreIgnored()
 
         await using var server = new TestServer(context =>
         {
-            Assert.Empty(context.Response.Headers[tag]);
+            Assert.Equal(0, context.Response.Headers[tag].Count);
 
             context.Response.Headers.Add(tag, new StringValues((string)null));
 
-            Assert.Empty(context.Response.Headers[tag]);
+            Assert.Equal(0, context.Response.Headers[tag].Count);
 
             // this should not throw
             context.Response.Headers.Add(tag, new StringValues("Hello"));
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs
index f3ba92d368f6..22624e266216 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs
@@ -1254,7 +1254,7 @@ await connection.Receive(
         }
 
         // With the server disposed we know all connections were drained and all messages were logged.
-        Assert.Empty(TestSink.Writes.Where(c => c.EventId.Name == "ApplicationError"));
+        Assert.DoesNotContain(TestSink.Writes, c => c.EventId.Name == "ApplicationError");
     }
 
     [Fact]
@@ -1329,7 +1329,7 @@ await connection.Receive(
             }
         }
 
-        Assert.Empty(LogMessages.Where(message => message.LogLevel == LogLevel.Error));
+        Assert.DoesNotContain(LogMessages, message => message.LogLevel == LogLevel.Error);
     }
 
     // https://tools.ietf.org/html/rfc7230#section-3.3.3
@@ -1365,7 +1365,7 @@ await connection.Receive(
             }
         }
 
-        Assert.Empty(LogMessages.Where(message => message.LogLevel == LogLevel.Error));
+        Assert.DoesNotContain(LogMessages, message => message.LogLevel == LogLevel.Error);
     }
 
     // https://tools.ietf.org/html/rfc7230#section-3.3.3
@@ -1401,7 +1401,7 @@ await connection.Receive(
             }
         }
 
-        Assert.Empty(LogMessages.Where(message => message.LogLevel == LogLevel.Error));
+        Assert.DoesNotContain(LogMessages, message => message.LogLevel == LogLevel.Error);
     }
 
     [Fact]
@@ -1426,12 +1426,15 @@ await connection.Receive(
                     $"Date: {server.Context.DateHeaderValue}",
                     "",
                     "");
+
+                connection.ShutdownSend();
+                await connection.ReceiveEnd();
             }
         }
     }
 
     [Fact]
-    public async Task HeadResponseBodyNotWrittenWithAsyncWrite()
+    public async Task HeadResponseHeadersWrittenWithAsyncWriteBeforeAppCompletes()
     {
         var flushed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
@@ -1461,8 +1464,68 @@ await connection.Receive(
         }
     }
 
+    [Fact]
+    public async Task HeadResponseBodyNotWrittenWithAsyncWrite()
+    {
+        await using (var server = new TestServer(async httpContext =>
+        {
+            httpContext.Response.ContentLength = 12;
+            await httpContext.Response.WriteAsync("hello, world");
+        }, new TestServiceContext(LoggerFactory)))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                    "HEAD / HTTP/1.1",
+                    "Host:",
+                    "",
+                    "");
+                await connection.Receive(
+                    "HTTP/1.1 200 OK",
+                    "Content-Length: 12",
+                    $"Date: {server.Context.DateHeaderValue}",
+                    "",
+                    "");
+
+                connection.ShutdownSend();
+                await connection.ReceiveEnd();
+            }
+        }
+    }
+
     [Fact]
     public async Task HeadResponseBodyNotWrittenWithSyncWrite()
+    {
+        var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } };
+
+        await using (var server = new TestServer(httpContext =>
+        {
+            httpContext.Response.ContentLength = 12;
+            httpContext.Response.Body.Write(Encoding.ASCII.GetBytes("hello, world"), 0, 12);
+            return Task.CompletedTask;
+        }, serviceContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                    "HEAD / HTTP/1.1",
+                    "Host:",
+                    "",
+                    "");
+                await connection.Receive(
+                    "HTTP/1.1 200 OK",
+                    "Content-Length: 12",
+                    $"Date: {server.Context.DateHeaderValue}",
+                    "",
+                    "");
+                connection.ShutdownSend();
+                await connection.ReceiveEnd();
+            }
+        }
+    }
+
+    [Fact]
+    public async Task HeadResponseHeadersWrittenWithSyncWriteBeforeAppCompletes()
     {
         var flushed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
@@ -1471,7 +1534,7 @@ public async Task HeadResponseBodyNotWrittenWithSyncWrite()
         await using (var server = new TestServer(async httpContext =>
         {
             httpContext.Response.ContentLength = 12;
-            await httpContext.Response.BodyWriter.WriteAsync(new Memory<byte>(Encoding.ASCII.GetBytes("hello, world"), 0, 12));
+            httpContext.Response.Body.Write(Encoding.ASCII.GetBytes("hello, world"), 0, 12);
             await flushed.Task;
         }, serviceContext))
         {
@@ -1494,6 +1557,131 @@ await connection.Receive(
         }
     }
 
+    [Fact]
+    public async Task HeadResponseBodyNotWrittenWithAdvanceBeforeFlush()
+    {
+        var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } };
+
+        await using (var server = new TestServer(async httpContext =>
+        {
+            var span = httpContext.Response.BodyWriter.GetSpan(5);
+            for (var i = 0; i < span.Length; i++)
+            {
+                span[i] = (byte)'h';
+            }
+            httpContext.Response.BodyWriter.Advance(span.Length);
+            await httpContext.Response.BodyWriter.FlushAsync();
+        }, serviceContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                    "HEAD / HTTP/1.1",
+                    "Host:",
+                    "",
+                    "");
+                await connection.Receive(
+                    "HTTP/1.1 200 OK",
+                    $"Date: {server.Context.DateHeaderValue}",
+                    "",
+                    "");
+
+                connection.ShutdownSend();
+                await connection.ReceiveEnd();
+            }
+        }
+    }
+
+    // Rough attempt at checking that a non-body response doesn't affect future body responses
+    [Fact]
+    public async Task GetRequestAfterHeadRequestWorks()
+    {
+        var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } };
+
+        await using (var server = new TestServer(async httpContext =>
+        {
+            await httpContext.Response.BodyWriter.WriteAsync(new byte[] { 35, 35, 35 });
+        }, serviceContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                    "HEAD / HTTP/1.1",
+                    "Host:",
+                    "",
+                    "");
+                await connection.Receive(
+                    "HTTP/1.1 200 OK",
+                    $"Date: {server.Context.DateHeaderValue}",
+                    "",
+                    "");
+
+                await connection.Send(
+                    "GET /a HTTP/1.1",
+                    "Host:",
+                    "",
+                    "");
+                await connection.Receive(
+                    "HTTP/1.1 200 OK",
+                    $"Date: {server.Context.DateHeaderValue}",
+                    "Transfer-Encoding: chunked",
+                    "",
+                    "3",
+                    "###",
+                    "0",
+                    "",
+                    "");
+                connection.ShutdownSend();
+                await connection.ReceiveEnd();
+            }
+        }
+    }
+
+    [Fact]
+    public async Task HeadResponseBodyNotWrittenWithAdvanceBeforeAndAfterFlush()
+    {
+        var serviceContext = new TestServiceContext(LoggerFactory) { ServerOptions = { AllowSynchronousIO = true } };
+
+        await using (var server = new TestServer(async httpContext =>
+        {
+            // Make response chunked
+            var span = httpContext.Response.BodyWriter.GetSpan(5);
+            for (var i = 0; i < span.Length; i++)
+            {
+                span[i] = (byte)'h';
+            }
+            httpContext.Response.BodyWriter.Advance(span.Length);
+            await httpContext.Response.BodyWriter.FlushAsync();
+
+            // Send after headers flushed
+            span = httpContext.Response.BodyWriter.GetSpan(5);
+            for (var i = 0; i < span.Length; i++)
+            {
+                span[i] = (byte)'h';
+            }
+            httpContext.Response.BodyWriter.Advance(span.Length);
+            await httpContext.Response.BodyWriter.FlushAsync();
+        }, serviceContext))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.Send(
+                    "HEAD / HTTP/1.1",
+                    "Host:",
+                    "",
+                    "");
+                await connection.Receive(
+                    "HTTP/1.1 200 OK",
+                    $"Date: {server.Context.DateHeaderValue}",
+                    "",
+                    "");
+
+                connection.ShutdownSend();
+                await connection.ReceiveEnd();
+            }
+        }
+    }
+
     [Fact]
     public async Task ZeroLengthWritesFlushHeaders()
     {
@@ -2786,7 +2974,7 @@ await connection.ReceiveEnd(
             }
         }
 
-        Assert.Empty(LogMessages.Where(message => message.LogLevel == LogLevel.Error));
+        Assert.DoesNotContain(LogMessages, message => message.LogLevel == LogLevel.Error);
     }
 
     [Fact]
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs
index b6f510a722a4..086694908360 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/InMemoryTransportConnection.cs
@@ -63,13 +63,11 @@ public override void Abort(ConnectionAbortedException abortReason)
 
     public void OnClosed()
     {
-        if (_isClosed)
+        if (Interlocked.CompareExchange(ref _isClosed, true, false) == true)
         {
             return;
         }
 
-        _isClosed = true;
-
         ThreadPool.UnsafeQueueUserWorkItem(state =>
         {
             state._connectionClosedTokenSource.Cancel();
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs
index 0ee3a41d48ec..5270e2a551b2 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TestTransport/TestServer.cs
@@ -70,7 +70,7 @@ public TestServer(RequestDelegate app, TestServiceContext context, Action<Kestre
     {
         _app = app;
         Context = context;
-        _memoryPool = context.MemoryPoolFactory();
+        _memoryPool = context.MemoryPoolFactory.Create(new MemoryPoolOptions { Owner = "test_server" });
         _transportFactory = new InMemoryTransportFactory();
         HttpClientSlim = new InMemoryHttpClientSlim(this);
 
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/TlsListenerTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TlsListenerTests.cs
new file mode 100644
index 000000000000..f835e452ff21
--- /dev/null
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/TlsListenerTests.cs
@@ -0,0 +1,108 @@
+// 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.Collections.Generic;
+using System.IO.Pipelines;
+using System.Net;
+using System.Net.Security;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+using Xunit.Sdk;
+
+namespace InMemory.FunctionalTests;
+
+public class TlsListenerTests : TestApplicationErrorLoggerLoggedTest
+{
+    private static readonly X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();
+
+    [Fact]
+    public async Task TlsClientHelloBytesCallback_InvokedAndHasTlsMessageBytes()
+    {
+        var tlsClientHelloCallbackInvoked = false;
+
+        var testContext = new TestServiceContext(LoggerFactory);
+        await using (var server = new TestServer(context => Task.CompletedTask,
+            testContext,
+            listenOptions =>
+            {
+                listenOptions.UseHttps(_x509Certificate2, httpsOptions =>
+                {
+                    httpsOptions.TlsClientHelloBytesCallback = (connection, clientHelloBytes) =>
+                    {
+                        Logger.LogDebug("[Received TlsClientHelloBytesCallback] Connection: {0}; TLS client hello buffer: {1}", connection.ConnectionId, clientHelloBytes.Length);
+                        tlsClientHelloCallbackInvoked = true;
+                        Assert.True(clientHelloBytes.Length > 32);
+                        Assert.NotNull(connection);
+                    };
+                });
+            }))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                using (var sslStream = new SslStream(connection.Stream, false, (sender, cert, chain, errors) => true, null))
+                {
+                    await sslStream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions
+                    {
+                        TargetHost = "localhost",
+                        EnabledSslProtocols = SslProtocols.None
+                    }, CancellationToken.None);
+
+                    var request = Encoding.ASCII.GetBytes("GET / HTTP/1.1\r\nHost:\r\n\r\n");
+                    await sslStream.WriteAsync(request, 0, request.Length);
+                    await sslStream.ReadAsync(new Memory<byte>(new byte[1024]));
+                }
+            }
+        }
+
+        Assert.True(tlsClientHelloCallbackInvoked);
+    }
+
+    [Fact]
+    public async Task TlsClientHelloBytesCallback_UsesOptionsTimeout()
+    {
+        var tlsClientHelloCallbackInvoked = false;
+        var testContext = new TestServiceContext(LoggerFactory);
+        await using (var server = new TestServer(context => Task.CompletedTask,
+            testContext,
+            listenOptions =>
+            {
+                listenOptions.UseHttps(_x509Certificate2, httpsOptions =>
+                {
+                    httpsOptions.HandshakeTimeout = TimeSpan.FromMilliseconds(1);
+
+                    httpsOptions.TlsClientHelloBytesCallback = (connection, clientHelloBytes) =>
+                    {
+                        Logger.LogDebug("[Received TlsClientHelloBytesCallback] Connection: {0}; TLS client hello buffer: {1}", connection.ConnectionId, clientHelloBytes.Length);
+                        tlsClientHelloCallbackInvoked = true;
+                        Assert.True(clientHelloBytes.Length > 32);
+                        Assert.NotNull(connection);
+                    };
+                });
+            }))
+        {
+            using (var connection = server.CreateConnection())
+            {
+                await connection.TransportConnection.Input.WriteAsync(new byte[] { 0x16 });
+                var readResult = await connection.TransportConnection.Output.ReadAsync();
+
+                // HttpsConnectionMiddleware catches the exception, so we can only check the effects of the timeout here
+                Assert.True(readResult.IsCompleted);
+            }
+        }
+
+        Assert.False(tlsClientHelloCallbackInvoked);
+    }
+}
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
index 2ca11e9e2685..5a0c4c954c7b 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
@@ -61,7 +61,8 @@ public static TheoryData<H2SpecTestCase> H2SpecTestCases
         get
         {
             var dataset = new TheoryData<H2SpecTestCase>();
-            var toSkip = new string[] { "http2/6.9.1/2" };
+            // { Test name, Skip Reason }
+            var toSkip = new Dictionary<string, string>();
 
             var testCases = H2SpecCommands.EnumerateTestCases();
 
@@ -79,9 +80,9 @@ public static TheoryData<H2SpecTestCase> H2SpecTestCases
             foreach (var testcase in testCases)
             {
                 string skip = null;
-                if (toSkip.Contains(testcase.Item1))
+                if (toSkip.TryGetValue(testcase.Item1, out var skipReason))
                 {
-                    skip = "https://github.com/dotnet/aspnetcore/issues/30373";
+                    skip = skipReason;
                 }
 
                 dataset.Add(new H2SpecTestCase
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs
index 19f784809387..e9f280b5e7b6 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs
@@ -219,10 +219,9 @@ public async Task GET_NoTLS_Http11RequestToHttp2Endpoint_400Result()
         }
     }
 
-    [Theory]
+    [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/41074")]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41074")]
     public async Task GET_RequestReturnsLargeData_GracefulShutdownDuringRequest_RequestGracefullyCompletes(bool hasTrailers)
     {
         // Enable client logging.
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs
index 1b7ae1ff0132..e0840b525f6d 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs
@@ -1,12 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Diagnostics;
 using System.Diagnostics.Metrics;
 using System.Net;
 using System.Net.Http;
 using System.Net.Security;
 using System.Text;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Hosting;
@@ -700,6 +702,7 @@ public async Task GET_ServerAbort_ClientReceivesAbort(HttpProtocols protocol)
 
     [ConditionalFact]
     [MsQuicSupported]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57373")]
     public async Task POST_Expect100Continue_Get100Continue()
     {
         // Arrange
@@ -876,6 +879,160 @@ public async Task GET_MultipleRequestsInSequence_ReusedState()
         }
     }
 
+    [ConditionalFact]
+    [MsQuicSupported]
+    public async Task GET_RequestAbortedByClient_StateNotReused()
+    {
+        // Arrange
+        object persistedState = null;
+        var requestCount = 0;
+        var abortedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var requestStartedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        var builder = CreateHostBuilder(async context =>
+        {
+            requestCount++;
+            var persistentStateCollection = context.Features.Get<IPersistentStateFeature>().State;
+            if (persistentStateCollection.TryGetValue("Counter", out var value))
+            {
+                persistedState = value;
+            }
+            persistentStateCollection["Counter"] = requestCount;
+
+            if (requestCount == 1)
+            {
+                // For the first request, wait for RequestAborted to fire before returning
+                context.RequestAborted.Register(() =>
+                {
+                    Logger.LogInformation("Server received cancellation");
+                    abortedTcs.SetResult();
+                });
+
+                // Signal that the request has started and is ready to be cancelled
+                requestStartedTcs.SetResult();
+
+                // Wait for the request to be aborted
+                await abortedTcs.Task;
+            }
+        });
+
+        using (var host = builder.Build())
+        using (var client = HttpHelpers.CreateClient())
+        {
+            await host.StartAsync();
+
+            // Act - Send first request and cancel it
+            var cts1 = new CancellationTokenSource();
+            var request1 = new HttpRequestMessage(HttpMethod.Get, $"https://127.0.0.1:{host.GetPort()}/");
+            request1.Version = HttpVersion.Version30;
+            request1.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
+
+            var responseTask1 = client.SendAsync(request1, cts1.Token);
+
+            // Wait for the server to start processing the request
+            await requestStartedTcs.Task.DefaultTimeout();
+
+            // Cancel the first request
+            cts1.Cancel();
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(() => responseTask1).DefaultTimeout();
+
+            // Wait for the server to process the abort
+            await abortedTcs.Task.DefaultTimeout();
+
+            // Store the state from the first (aborted) request
+            var firstRequestState = persistedState;
+
+            // Delay to ensure the stream has enough time to return to pool
+            await Task.Delay(100);
+
+            // Send second request (should not reuse state from aborted request)
+            var request2 = new HttpRequestMessage(HttpMethod.Get, $"https://127.0.0.1:{host.GetPort()}/");
+            request2.Version = HttpVersion.Version30;
+            request2.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
+
+            var response2 = await client.SendAsync(request2, CancellationToken.None);
+            response2.EnsureSuccessStatusCode();
+            var secondRequestState = persistedState;
+
+            // Assert
+            // First request has no persisted state (it was aborted)
+            Assert.Null(firstRequestState);
+
+            // Second request should also have no persisted state since the first request was aborted
+            // and state should not be reused from aborted requests
+            Assert.Null(secondRequestState);
+
+            await host.StopAsync();
+        }
+    }
+
+    [ConditionalFact]
+    [MsQuicSupported]
+    public async Task GET_RequestAbortedByServer_StateNotReused()
+    {
+        // Arrange
+        object persistedState = null;
+        var requestCount = 0;
+
+        var builder = CreateHostBuilder(context =>
+        {
+            requestCount++;
+            var persistentStateCollection = context.Features.Get<IPersistentStateFeature>().State;
+            if (persistentStateCollection.TryGetValue("Counter", out var value))
+            {
+                persistedState = value;
+            }
+            persistentStateCollection["Counter"] = requestCount;
+
+            if (requestCount == 1)
+            {
+                context.Abort();
+            }
+
+            return Task.CompletedTask;
+        });
+
+        using (var host = builder.Build())
+        using (var client = HttpHelpers.CreateClient())
+        {
+            await host.StartAsync();
+
+            var request1 = new HttpRequestMessage(HttpMethod.Get, $"https://127.0.0.1:{host.GetPort()}/");
+            request1.Version = HttpVersion.Version30;
+            request1.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
+
+            var responseTask1 = client.SendAsync(request1, CancellationToken.None);
+            var ex = await Assert.ThrowsAnyAsync<HttpRequestException>(() => responseTask1).DefaultTimeout();
+            var innerEx = Assert.IsType<HttpProtocolException>(ex.InnerException);
+            Assert.Equal(Http3ErrorCode.InternalError, (Http3ErrorCode)innerEx.ErrorCode);
+
+            // Store the state from the first (aborted) request
+            var firstRequestState = persistedState;
+
+            // Delay to ensure the stream has enough time to return to pool
+            await Task.Delay(100);
+
+            // Send second request (should not reuse state from aborted request)
+            var request2 = new HttpRequestMessage(HttpMethod.Get, $"https://127.0.0.1:{host.GetPort()}/");
+            request2.Version = HttpVersion.Version30;
+            request2.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
+
+            var response2 = await client.SendAsync(request2, CancellationToken.None);
+            response2.EnsureSuccessStatusCode();
+            var secondRequestState = persistedState;
+
+            // Assert
+            // First request has no persisted state (it was aborted)
+            Assert.Null(firstRequestState);
+
+            // Second request should also have no persisted state since the first request was aborted
+            // and state should not be reused from aborted requests
+            Assert.Null(secondRequestState);
+
+            await host.StopAsync();
+        }
+    }
+
     [ConditionalFact]
     [MsQuicSupported]
     public async Task GET_MultipleRequests_RequestVersionOrHigher_UpgradeToHttp3()
@@ -959,6 +1116,7 @@ await ServerRetryHelper.BindPortsWithRetry(async port =>
     [MsQuicSupported]
     [InlineData(HttpProtocols.Http3)]
     [InlineData(HttpProtocols.Http2)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/38008")]
     public async Task POST_ClientCancellationBidirectional_RequestAbortRaised(HttpProtocols protocol)
     {
         // Arrange
@@ -1051,7 +1209,7 @@ public async Task POST_ClientCancellationBidirectional_RequestAbortRaised(HttpPr
         var badLogWrite = TestSink.Writes.FirstOrDefault(w => w.LogLevel == LogLevel.Critical);
         if (badLogWrite != null)
         {
-            Assert.True(false, "Bad log write: " + badLogWrite + Environment.NewLine + badLogWrite.Exception);
+            Assert.Fail("Bad log write: " + badLogWrite + Environment.NewLine + badLogWrite.Exception);
         }
     }
 
@@ -1137,11 +1295,142 @@ public async Task POST_Bidirectional_LargeData_Cancellation_Error(HttpProtocols
             var badLogWrite = TestSink.Writes.FirstOrDefault(w => w.LogLevel >= LogLevel.Critical);
             if (badLogWrite != null)
             {
-                Assert.True(false, "Bad log write: " + badLogWrite + Environment.NewLine + badLogWrite.Exception);
+                Assert.Fail("Bad log write: " + badLogWrite + Environment.NewLine + badLogWrite.Exception);
+            }
+
+            // Assert
+            await host.StopAsync().DefaultTimeout();
+        }
+    }
+
+    internal class MemoryPoolFeature : IMemoryPoolFeature
+    {
+        public MemoryPool<byte> MemoryPool { get; set; }
+    }
+
+    [ConditionalTheory]
+    [MsQuicSupported]
+    [InlineData(HttpProtocols.Http3)]
+    [InlineData(HttpProtocols.Http2)]
+    public async Task ApplicationWriteWhenConnectionClosesPreservesMemory(HttpProtocols protocol)
+    {
+        // Arrange
+        var memoryPool = new DiagnosticMemoryPool(new PinnedBlockMemoryPool(), allowLateReturn: true);
+
+        var writingTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var cancelTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var completionTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        var builder = CreateHostBuilder(async context =>
+        {
+            try
+            {
+                var requestBody = context.Request.Body;
+
+                await context.Response.BodyWriter.FlushAsync();
+
+                // Test relies on Htt2Stream/Http3Stream aborting the token after stopping Http2OutputProducer/Http3OutputProducer
+                // It's very fragile but it is sort of a best effort test anyways
+                // Additionally, Http2 schedules it's stopping, so doesn't directly do anything to the PipeWriter when calling stop on Http2OutputProducer
+                context.RequestAborted.Register(() =>
+                {
+                    cancelTcs.SetResult();
+                });
+
+                while (true)
+                {
+                    var memory = context.Response.BodyWriter.GetMemory();
+
+                    // Unblock client-side to close the connection
+                    writingTcs.TrySetResult();
+
+                    await cancelTcs.Task;
+
+                    // Verify memory is still rented from the memory pool after the producer has been stopped
+                    Assert.True(memoryPool.ContainsMemory(memory));
+
+                    context.Response.BodyWriter.Advance(memory.Length);
+                    var flushResult = await context.Response.BodyWriter.FlushAsync();
+
+                    if (flushResult.IsCanceled || flushResult.IsCompleted)
+                    {
+                        break;
+                    }
+                }
+
+                completionTcs.SetResult();
+            }
+            catch (Exception ex)
+            {
+                writingTcs.TrySetException(ex);
+                // Exceptions annoyingly don't show up on the client side when doing E2E + cancellation testing
+                // so we need to use a TCS to observe any unexpected errors
+                completionTcs.TrySetException(ex);
+                throw;
             }
+        }, protocol: protocol,
+        configureKestrel: o =>
+        {
+            o.Listen(IPAddress.Parse("127.0.0.1"), 0, listenOptions =>
+            {
+                listenOptions.Protocols = protocol;
+                listenOptions.UseHttps(TestResources.GetTestCertificate()).Use(@delegate =>
+                {
+                    // Connection middleware for Http/1.1 and Http/2
+                    return (context) =>
+                    {
+                        // Set the memory pool used by the connection so we can observe if memory from the PipeWriter is still rented from the pool
+                        context.Features.Set<IMemoryPoolFeature>(new MemoryPoolFeature() { MemoryPool = memoryPool });
+                        return @delegate(context);
+                    };
+                });
+
+                IMultiplexedConnectionBuilder multiplexedConnectionBuilder = listenOptions;
+                multiplexedConnectionBuilder.Use(@delegate =>
+                {
+                    // Connection middleware for Http/3
+                    return (context) =>
+                    {
+                        // Set the memory pool used by the connection so we can observe if memory from the PipeWriter is still rented from the pool
+                        context.Features.Set<IMemoryPoolFeature>(new MemoryPoolFeature() { MemoryPool = memoryPool });
+                        return @delegate(context);
+                    };
+                });
+            });
+        });
+
+        var httpClientHandler = new HttpClientHandler();
+        httpClientHandler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+
+        using (var host = builder.Build())
+        using (var client = new HttpClient(httpClientHandler))
+        {
+            await host.StartAsync().DefaultTimeout();
+
+            var cts = new CancellationTokenSource();
+
+            var request = new HttpRequestMessage(HttpMethod.Post, $"https://127.0.0.1:{host.GetPort()}/");
+            request.Version = GetProtocol(protocol);
+            request.VersionPolicy = HttpVersionPolicy.RequestVersionExact;
+
+            // Act
+            var responseTask = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+
+            Logger.LogInformation("Client waiting for headers.");
+            var response = await responseTask.DefaultTimeout();
+            await writingTcs.Task;
+
+            Logger.LogInformation("Client canceled request.");
+            response.Dispose();
 
             // Assert
             await host.StopAsync().DefaultTimeout();
+
+            await completionTcs.Task;
+
+            memoryPool.Dispose();
+
+            await memoryPool.WhenAllBlocksReturnedAsync(TimeSpan.FromSeconds(15));
         }
     }
 
@@ -1858,6 +2147,10 @@ public async Task GET_GracefulServerShutdown_AbortRequestsAfterHostTimeout(HttpP
         var readAsyncTask = new TaskCompletionSource<Task>(TaskCreationOptions.RunContinuationsAsynchronously);
         var requestAbortedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 
+        // Wait 2.5 seconds in debug (local development) and 15 seconds in production (CI)
+        // Use half the default timeout to ensure the host shuts down before the test throws an error while waiting.
+        var shutdownTimeout = Microsoft.AspNetCore.InternalTesting.TaskExtensions.DefaultTimeoutTimeSpan / 2;
+
         var builder = CreateHostBuilder(async context =>
         {
             context.RequestAborted.Register(() => requestAbortedTcs.SetResult());
@@ -1887,7 +2180,8 @@ public async Task GET_GracefulServerShutdown_AbortRequestsAfterHostTimeout(HttpP
                 listenOptions.Protocols = protocol;
                 listenOptions.UseHttps(TestResources.GetTestCertificate());
             });
-        });
+        },
+        shutdownTimeout: shutdownTimeout);
 
         using (var host = builder.Build())
         using (var client = HttpHelpers.CreateClient())
@@ -1927,17 +2221,21 @@ await WaitForLogAsync(logs =>
                 }, "Check for initial GOAWAY frame sent on server initiated shutdown.");
             }
 
+            Logger.LogInformation("Getting read task");
             var readTask = await readAsyncTask.Task.DefaultTimeout();
 
             // Assert
+            Logger.LogInformation("Waiting for error from read task");
             var ex = await Assert.ThrowsAnyAsync<Exception>(() => readTask).DefaultTimeout();
-            while (ex.InnerException != null)
+
+            var rootException = ex;
+            while (rootException.InnerException != null)
             {
-                ex = ex.InnerException;
+                rootException = rootException.InnerException;
             }
 
-            Assert.IsType<ConnectionAbortedException>(ex);
-            Assert.Equal("The connection was aborted because the server is shutting down and request processing didn't complete within the time specified by HostOptions.ShutdownTimeout.", ex.Message);
+            Assert.IsType<ConnectionAbortedException>(rootException);
+            Assert.Equal("The connection was aborted because the server is shutting down and request processing didn't complete within the time specified by HostOptions.ShutdownTimeout.", rootException.Message);
 
             await requestAbortedTcs.Task.DefaultTimeout();
 
@@ -2057,8 +2355,8 @@ public async Task ServerReset_InvalidErrorCode()
         Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
     }
 
-    private IHostBuilder CreateHostBuilder(RequestDelegate requestDelegate, HttpProtocols? protocol = null, Action<KestrelServerOptions> configureKestrel = null)
+    private IHostBuilder CreateHostBuilder(RequestDelegate requestDelegate, HttpProtocols? protocol = null, Action<KestrelServerOptions> configureKestrel = null, TimeSpan? shutdownTimeout = null)
     {
-        return HttpHelpers.CreateHostBuilder(AddTestLogging, requestDelegate, protocol, configureKestrel);
+        return HttpHelpers.CreateHostBuilder(AddTestLogging, requestDelegate, protocol, configureKestrel, shutdownTimeout: shutdownTimeout);
     }
 }
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs
index 78279c042bf7..ac66ad3a72ed 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs
@@ -345,39 +345,43 @@ public async Task TlsHandshakeCallbackOptions_Invoked()
     [InlineData(false, false, false)]
     public async Task UseKestrelCore_CodeBased(bool useQuic, bool useHttps, bool useHttpsEnablesHttpsConfiguration)
     {
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .ConfigureKestrel(serverOptions =>
-                {
-                    serverOptions.ListenAnyIP(0, listenOptions =>
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
                     {
-                        listenOptions.Protocols = HttpProtocols.Http3;
-                        if (useHttps)
+                        serverOptions.ListenAnyIP(0, listenOptions =>
                         {
-                            if (useHttpsEnablesHttpsConfiguration)
+                            listenOptions.Protocols = HttpProtocols.Http3;
+                            if (useHttps)
                             {
-                                listenOptions.UseHttps(httpsOptions =>
+                                if (useHttpsEnablesHttpsConfiguration)
                                 {
-                                    httpsOptions.ServerCertificate = TestResources.GetTestCertificate();
-                                });
-                            }
-                            else
-                            {
-                                // Specifically choose an overload that doesn't enable https configuration
-                                listenOptions.UseHttps(new HttpsConnectionAdapterOptions
+                                    listenOptions.UseHttps(httpsOptions =>
+                                    {
+                                        httpsOptions.ServerCertificate = TestResources.GetTestCertificate();
+                                    });
+                                }
+                                else
                                 {
-                                    ServerCertificate = TestResources.GetTestCertificate()
-                                });
+                                    // Specifically choose an overload that doesn't enable https configuration
+                                    listenOptions.UseHttps(new HttpsConnectionAdapterOptions
+                                    {
+                                        ServerCertificate = TestResources.GetTestCertificate()
+                                    });
+                                }
                             }
-                        }
-                    });
-                })
-                .Configure(app => { });
+                        });
+                    })
+                    .Configure(app => { });
 
-        if (useQuic)
-        {
-            hostBuilder.UseQuic();
-        }
+                if (useQuic)
+                {
+                    webHostBuilder.UseQuic();
+                }
+            });
 
         var host = hostBuilder.Build();
 
@@ -400,25 +404,29 @@ public async Task UseKestrelCore_CodeBased(bool useQuic, bool useHttps, bool use
     [InlineData(false)]
     public void UseKestrelCore_ConfigurationBased(bool useQuic)
     {
-        var hostBuilder = new WebHostBuilder()
-                .UseKestrelCore()
-                .ConfigureKestrel(serverOptions =>
-                {
-                    var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+        var hostBuilder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrelCore()
+                    .ConfigureKestrel(serverOptions =>
                     {
-                        new KeyValuePair<string, string>("Endpoints:end1:Url", "https://127.0.0.1:0"),
-                        new KeyValuePair<string, string>("Endpoints:end1:Protocols", "Http3"),
-                        new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
-                        new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
-                    }).Build();
-                    serverOptions.Configure(config);
-                })
-                .Configure(app => { });
-
-        if (useQuic)
-        {
-            hostBuilder.UseQuic();
-        }
+                        var config = new ConfigurationBuilder().AddInMemoryCollection(new[]
+                        {
+                            new KeyValuePair<string, string>("Endpoints:end1:Url", "https://127.0.0.1:0"),
+                            new KeyValuePair<string, string>("Endpoints:end1:Protocols", "Http3"),
+                            new KeyValuePair<string, string>("Certificates:Default:Path", Path.Combine("shared", "TestCertificates", "aspnetdevcert.pfx")),
+                            new KeyValuePair<string, string>("Certificates:Default:Password", "testPassword"),
+                        }).Build();
+                        serverOptions.Configure(config);
+                    })
+                    .Configure(app => { });
+
+                if (useQuic)
+                {
+                    webHostBuilder.UseQuic();
+                }
+            });
 
         var host = hostBuilder.Build();
 
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpHelpers.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpHelpers.cs
index 92bb131c4ed4..9621bb0cf768 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpHelpers.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpHelpers.cs
@@ -63,7 +63,7 @@ public static HttpMessageInvoker CreateClient(TimeSpan? idleTimeout = null, Time
         return new HttpMessageInvoker(handler);
     }
 
-    public static IHostBuilder CreateHostBuilder(Action<IServiceCollection> configureServices, RequestDelegate requestDelegate, HttpProtocols? protocol = null, Action<KestrelServerOptions> configureKestrel = null, bool? plaintext = null)
+    public static IHostBuilder CreateHostBuilder(Action<IServiceCollection> configureServices, RequestDelegate requestDelegate, HttpProtocols? protocol = null, Action<KestrelServerOptions> configureKestrel = null, bool? plaintext = null, TimeSpan? shutdownTimeout = null)
     {
         return new HostBuilder()
             .ConfigureWebHost(webHostBuilder =>
@@ -102,7 +102,7 @@ public static IHostBuilder CreateHostBuilder(Action<IServiceCollection> configur
                 }
                 else
                 {
-                    o.ShutdownTimeout = TimeSpan.FromSeconds(5);
+                    o.ShutdownTimeout = shutdownTimeout ?? TimeSpan.FromSeconds(5);
                 }
             });
     }
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
index 7d5156c84f9d..e44eb2d00fca 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
@@ -27,6 +27,7 @@
     <Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
     <Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\TlsAlpnSupportedAttribute.cs" Link="shared\TransportTestHelpers\TlsAlpnSupportedAttribute.cs" />
     <Compile Include="$(KestrelSharedSourceRoot)test\ServerRetryHelper.cs" LinkBase="shared" />
+    <Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs b/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs
index f5933759a282..0584487755c7 100644
--- a/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs
+++ b/src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs
@@ -1,8 +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.Buffers;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
@@ -10,18 +8,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests;
 
 public static class TransportSelector
 {
-    public static IHostBuilder GetHostBuilder(Func<MemoryPool<byte>> memoryPoolFactory = null,
-                                                    long? maxReadBufferSize = null)
+    public static IHostBuilder GetHostBuilder(long? maxReadBufferSize = null)
     {
         return new HostBuilder()
             .ConfigureWebHost(webHostBuilder =>
             {
-                webHostBuilder
-                    .UseSockets(options =>
-                    {
-                        options.MemoryPoolFactory = memoryPoolFactory ?? options.MemoryPoolFactory;
-                        options.MaxReadBufferSize = maxReadBufferSize;
-                    });
+                webHostBuilder.UseSockets(options =>
+                {
+                    options.MaxReadBufferSize = maxReadBufferSize;
+                });
             });
     }
 }
diff --git a/src/Servers/test/FunctionalTests/FunctionalTests.slnf b/src/Servers/test/FunctionalTests/FunctionalTests.slnf
index 0bad9062a7a2..99ada8a31d40 100644
--- a/src/Servers/test/FunctionalTests/FunctionalTests.slnf
+++ b/src/Servers/test/FunctionalTests/FunctionalTests.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\..\\..\\AspNetCore.sln",
+    "path": "..\\..\\..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
diff --git a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
index 0cbd9331a4bd..4e899c1ff903 100644
--- a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
+++ b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
@@ -172,7 +172,7 @@ private static async Task CheckNoCompressionAsync(HttpClient client, ILogger log
         {
             Assert.Equal(HelloWorldBody, responseText);
             Assert.Equal(HelloWorldBody.Length.ToString(CultureInfo.InvariantCulture), GetContentLength(response));
-            Assert.Equal(0, response.Content.Headers.ContentEncoding.Count);
+            Assert.Empty(response.Content.Headers.ContentEncoding);
         }
         catch (XunitException)
         {
@@ -204,7 +204,7 @@ private static async Task CheckCompressionAsync(HttpClient client, string url, I
         {
             responseText = await ReadCompressedAsStringAsync(response.Content);
             Assert.Equal(HelloWorldBody, responseText);
-            Assert.Equal(1, response.Content.Headers.ContentEncoding.Count);
+            Assert.Single(response.Content.Headers.ContentEncoding);
             Assert.Equal("gzip", response.Content.Headers.ContentEncoding.First());
         }
         catch (XunitException)
diff --git a/src/Servers/testassets/ServerComparison.TestSites/Program.cs b/src/Servers/testassets/ServerComparison.TestSites/Program.cs
index aa623fb9cd33..5af832b70304 100644
--- a/src/Servers/testassets/ServerComparison.TestSites/Program.cs
+++ b/src/Servers/testassets/ServerComparison.TestSites/Program.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.HttpSys;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace ServerComparison.TestSites;
@@ -13,38 +14,43 @@ public static class Program
 {
     public static void Main(string[] args)
     {
-        var builder = new WebHostBuilder()
-            .UseConfiguration(new ConfigurationBuilder()
-                .AddCommandLine(args)
-                .Build())
+        var configuration = new ConfigurationBuilder()
+            .AddCommandLine(args)
+            .Build();
+
+        var builder = new HostBuilder()
             .ConfigureLogging((_, factory) =>
             {
                 factory.AddConsole();
                 factory.AddFilter("Console", level => level >= LogLevel.Warning);
             })
-            .UseStartup("ServerComparison.TestSites");
-
-        builder.UseKestrel();
-        builder.UseIISIntegration();
-        builder.UseIIS();
-
-        // Switch between Kestrel, IIS, and HttpSys for different tests. Default to Kestrel for normal app execution.
-        if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.HttpSys", StringComparison.OrdinalIgnoreCase))
-        {
-            builder.UseHttpSys(options =>
+            .ConfigureWebHost(webHostBuilder =>
             {
-                if (string.Equals(builder.GetSetting("environment") ??
-                    Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"),
-                    "NtlmAuthentication", StringComparison.OrdinalIgnoreCase))
+                webHostBuilder
+                    .UseConfiguration(configuration)
+                    .UseStartup("ServerComparison.TestSites")
+                    .UseKestrel()
+                    .UseIISIntegration()
+                    .UseIIS();
+
+                // Switch between Kestrel, IIS, and HttpSys for different tests. Default to Kestrel for normal app execution.
+                if (string.Equals(configuration["server"], "Microsoft.AspNetCore.Server.HttpSys", StringComparison.OrdinalIgnoreCase))
                 {
-                    // Set up NTLM authentication for HttpSys as follows.
-                    // For IIS and IISExpress use inetmgr to setup NTLM authentication on the application or
-                    // modify the applicationHost.config to enable NTLM.
-                    options.Authentication.AllowAnonymous = true;
-                    options.Authentication.Schemes = AuthenticationSchemes.Negotiate | AuthenticationSchemes.NTLM;
+                    webHostBuilder.UseHttpSys(options =>
+                    {
+                        if (string.Equals(configuration["environment"] ??
+                            Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"),
+                            "NtlmAuthentication", StringComparison.OrdinalIgnoreCase))
+                        {
+                            // Set up NTLM authentication for HttpSys as follows.
+                            // For IIS and IISExpress use inetmgr to setup NTLM authentication on the application or
+                            // modify the applicationHost.config to enable NTLM.
+                            options.Authentication.AllowAnonymous = true;
+                            options.Authentication.Schemes = AuthenticationSchemes.Negotiate | AuthenticationSchemes.NTLM;
+                        }
+                    });
                 }
             });
-        }
 
         var host = builder.Build();
 
diff --git a/src/Hosting/Hosting/test/Internal/AsyncEnumerableExtensions.cs b/src/Shared/AsyncEnumerableExtensions.cs
similarity index 51%
rename from src/Hosting/Hosting/test/Internal/AsyncEnumerableExtensions.cs
rename to src/Shared/AsyncEnumerableExtensions.cs
index 2c520cdac00b..353440b39cb6 100644
--- a/src/Hosting/Hosting/test/Internal/AsyncEnumerableExtensions.cs
+++ b/src/Shared/AsyncEnumerableExtensions.cs
@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Numerics;
+using Microsoft.Extensions.Logging;
 
-namespace System.Collections.Generic;
+namespace Microsoft.AspNetCore.InternalTesting;
 
 internal static class AsyncEnumerableExtensions
 {
-    public static async Task WaitForValueAsync<T>(this IAsyncEnumerator<T> values, T expectedValue) where T : INumber<T>
+    public static async Task WaitForValueAsync<T>(this IAsyncEnumerator<T> values, T expectedValue, string operationName, ILogger logger) where T : INumber<T>
     {
         T value = T.Zero;
         try
@@ -17,37 +18,18 @@ public static async Task WaitForValueAsync<T>(this IAsyncEnumerator<T> values, T
                 value = values.Current;
                 if (value == expectedValue)
                 {
+                    logger.LogDebug("Operation {OperationName} completed with value {Value}.", operationName, value);
                     return;
                 }
-            }
-
-            throw new InvalidOperationException("Data ended without match.");
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException($"Results ended with final value of {value}. Expected value of {expectedValue}.", ex);
-        }
-    }
 
-    public static async Task WaitForSumValueAsync<T>(this IAsyncEnumerator<T> values, T expectedValue) where T: INumber<T>
-    {
-        T value = T.Zero;
-        try
-        {
-            while (await values.MoveNextAsync())
-            {
-                value += values.Current;
-                if (value == expectedValue)
-                {
-                    return;
-                }
+                logger.LogDebug("Operation {OperationName} expected {ExpectedValue} but got {Value}.", operationName, expectedValue, value);
             }
 
             throw new InvalidOperationException("Data ended without match.");
         }
         catch (Exception ex)
         {
-            throw new InvalidOperationException($"Results ended with final sum value of {value}. Expected sum value of {expectedValue}.", ex);
+            throw new InvalidOperationException($"Results ended with final value of {value}. Expected value of {expectedValue}.", ex);
         }
     }
 }
diff --git a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs
index 892a7ac124a2..085dbe60714c 100644
--- a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs
+++ b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs
@@ -44,6 +44,8 @@ public DefaultCoreConfig()
                 .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net8.0", null, ".NET Core 8.0")))
 #elif NET9_0
                 .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net9.0", null, ".NET Core 9.0")))
+#elif NET10_0
+                .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net10.0", null, ".NET Core 10.0")))
 #else
 #error Target frameworks need to be updated.
 #endif
diff --git a/src/Shared/Buffers.MemoryPool/DefaultMemoryPoolFactory.cs b/src/Shared/Buffers.MemoryPool/DefaultMemoryPoolFactory.cs
new file mode 100644
index 000000000000..46679c1422bb
--- /dev/null
+++ b/src/Shared/Buffers.MemoryPool/DefaultMemoryPoolFactory.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Buffers;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore;
+
+#nullable enable
+
+internal sealed class DefaultMemoryPoolFactory : IMemoryPoolFactory<byte>, IAsyncDisposable
+{
+    private readonly MemoryPoolMetrics? _metrics;
+    private readonly ConcurrentDictionary<PinnedBlockMemoryPool, bool> _pools = new();
+    private readonly PeriodicTimer _timer;
+    private readonly Task _timerTask;
+    private readonly ILogger? _logger;
+
+    public DefaultMemoryPoolFactory(MemoryPoolMetrics? metrics = null, ILogger<DefaultMemoryPoolFactory>? logger = null)
+    {
+        _metrics = metrics;
+        _logger = logger;
+        _timer = new PeriodicTimer(PinnedBlockMemoryPool.DefaultEvictionDelay);
+        _timerTask = Task.Run(async () =>
+        {
+            try
+            {
+                while (await _timer.WaitForNextTickAsync())
+                {
+                    foreach (var pool in _pools.Keys)
+                    {
+                        pool.PerformEviction();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger?.LogCritical(ex, "Error while evicting memory from pools.");
+            }
+        });
+    }
+
+    public MemoryPool<byte> Create(MemoryPoolOptions? options = null)
+    {
+        var pool = new PinnedBlockMemoryPool(options?.Owner, _metrics, _logger);
+
+        _pools.TryAdd(pool, true);
+
+        pool.OnPoolDisposed(static (state, self) =>
+        {
+            ((ConcurrentDictionary<PinnedBlockMemoryPool, bool>)state!).TryRemove(self, out _);
+        }, _pools);
+
+        return pool;
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        _timer.Dispose();
+        await _timerTask;
+    }
+}
diff --git a/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs b/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs
index 2a35f095e630..064b1ef8ceff 100644
--- a/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs
+++ b/src/Shared/Buffers.MemoryPool/DiagnosticMemoryPool.cs
@@ -1,9 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Linq;
 
-namespace System.Buffers;
+namespace Microsoft.AspNetCore;
 
 /// <summary>
 /// Used to allocate and distribute re-usable blocks of memory.
@@ -160,4 +161,27 @@ public async Task WhenAllBlocksReturnedAsync(TimeSpan timeout)
 
         await task;
     }
+
+    public bool ContainsMemory(Memory<byte> memory)
+    {
+        lock (_syncObj)
+        {
+            foreach (var block in _blocks)
+            {
+                unsafe
+                {
+                    fixed (byte* inUseMemoryPtr = memory.Span)
+                    fixed (byte* beginPooledMemoryPtr = block.Memory.Span)
+                    {
+                        byte* endPooledMemoryPtr = beginPooledMemoryPtr + block.Memory.Length;
+                        if (inUseMemoryPtr >= beginPooledMemoryPtr && inUseMemoryPtr < endPooledMemoryPtr)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/src/Shared/Buffers.MemoryPool/DiagnosticPoolBlock.cs b/src/Shared/Buffers.MemoryPool/DiagnosticPoolBlock.cs
index d2c0dfd18917..411e98f9df00 100644
--- a/src/Shared/Buffers.MemoryPool/DiagnosticPoolBlock.cs
+++ b/src/Shared/Buffers.MemoryPool/DiagnosticPoolBlock.cs
@@ -1,12 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 #nullable enable
 
-namespace System.Buffers;
+namespace Microsoft.AspNetCore;
 
 /// <summary>
 /// Block tracking object used by the byte buffer memory pool. A slab is a large allocation which is divided into smaller blocks. The
diff --git a/src/Shared/Buffers.MemoryPool/MemoryPoolBlock.cs b/src/Shared/Buffers.MemoryPool/MemoryPoolBlock.cs
index abeca699c6b7..cf2233188c37 100644
--- a/src/Shared/Buffers.MemoryPool/MemoryPoolBlock.cs
+++ b/src/Shared/Buffers.MemoryPool/MemoryPoolBlock.cs
@@ -1,9 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Runtime.InteropServices;
 
-namespace System.Buffers;
+namespace Microsoft.AspNetCore;
 
 /// <summary>
 /// Wraps an array allocated in the pinned object heap in a reusable block of managed memory
diff --git a/src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs b/src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs
index 68880100c9c7..204f9b789818 100644
--- a/src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs
+++ b/src/Shared/Buffers.MemoryPool/MemoryPoolFactory.cs
@@ -1,21 +1,26 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace System.Buffers;
+using System.Buffers;
+using System.Diagnostics.Metrics;
 
-internal static class PinnedBlockMemoryPoolFactory
+namespace Microsoft.AspNetCore;
+
+#nullable enable
+
+internal static class TestMemoryPoolFactory
 {
-    public static MemoryPool<byte> Create()
+    public static MemoryPool<byte> Create(string? owner = null, IMeterFactory? meterFactory = null)
     {
 #if DEBUG
-        return new DiagnosticMemoryPool(CreatePinnedBlockMemoryPool());
+        return new DiagnosticMemoryPool(CreatePinnedBlockMemoryPool(owner, meterFactory));
 #else
-        return CreatePinnedBlockMemoryPool();
+        return CreatePinnedBlockMemoryPool(owner, meterFactory);
 #endif
     }
 
-    public static MemoryPool<byte> CreatePinnedBlockMemoryPool()
+    public static MemoryPool<byte> CreatePinnedBlockMemoryPool(string? owner = null, IMeterFactory? meterFactory = null)
     {
-        return new PinnedBlockMemoryPool();
+        return new PinnedBlockMemoryPool(owner: owner, metrics: meterFactory != null ? new MemoryPoolMetrics(meterFactory) : null);
     }
 }
diff --git a/src/Shared/Buffers.MemoryPool/MemoryPoolMetrics.cs b/src/Shared/Buffers.MemoryPool/MemoryPoolMetrics.cs
new file mode 100644
index 000000000000..a8d085390fcd
--- /dev/null
+++ b/src/Shared/Buffers.MemoryPool/MemoryPoolMetrics.cs
@@ -0,0 +1,122 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+
+#nullable enable
+
+namespace Microsoft.AspNetCore;
+
+internal sealed class MemoryPoolMetrics
+{
+    public const string MeterName = "Microsoft.AspNetCore.MemoryPool";
+
+    public const string PooledMemoryName = "aspnetcore.memory_pool.pooled";
+    public const string AllocatedMemoryName = "aspnetcore.memory_pool.allocated";
+    public const string EvictedMemoryName = "aspnetcore.memory_pool.evicted";
+    public const string RentedMemoryName = "aspnetcore.memory_pool.rented";
+
+    private readonly Meter _meter;
+    private readonly UpDownCounter<long> _pooledMemoryCounter;
+    private readonly Counter<long> _allocatedMemoryCounter;
+    private readonly Counter<long> _evictedMemoryCounter;
+    private readonly Counter<long> _rentedMemoryCounter;
+
+    public MemoryPoolMetrics(IMeterFactory meterFactory)
+    {
+        _meter = meterFactory.Create(MeterName);
+
+        _pooledMemoryCounter = _meter.CreateUpDownCounter<long>(
+            PooledMemoryName,
+            unit: "By",
+            description: "Number of bytes currently pooled and available for reuse.");
+
+        _allocatedMemoryCounter = _meter.CreateCounter<long>(
+            AllocatedMemoryName,
+            unit: "By",
+            description: "Total number of bytes allocated by the memory pool. Allocation occurs when a memory rental request exceeds the available pooled memory.");
+
+        _evictedMemoryCounter = _meter.CreateCounter<long>(
+            EvictedMemoryName,
+            unit: "By",
+            description: "Total number of bytes evicted from the memory pool. Eviction occurs when idle pooled memory is reclaimed. Evicted memory is available for garbage collection.");
+
+        _rentedMemoryCounter = _meter.CreateCounter<long>(
+            RentedMemoryName,
+            unit: "By",
+            description: "Total number of bytes rented from the memory pool.");
+    }
+
+    public void UpdatePooledMemory(int bytes, string? owner)
+    {
+        if (_pooledMemoryCounter.Enabled)
+        {
+            UpdatePooledMemoryCore(bytes, owner);
+        }
+    }
+
+    private void UpdatePooledMemoryCore(int bytes, string? owner)
+    {
+        var tags = new TagList();
+        AddOwner(ref tags, owner);
+
+        _pooledMemoryCounter.Add(bytes, tags);
+    }
+
+    public void AddAllocatedMemory(int bytes, string? owner)
+    {
+        if (_allocatedMemoryCounter.Enabled)
+        {
+            AddAllocatedMemoryCore(bytes, owner);
+        }
+    }
+
+    private void AddAllocatedMemoryCore(int bytes, string? owner)
+    {
+        var tags = new TagList();
+        AddOwner(ref tags, owner);
+
+        _allocatedMemoryCounter.Add(bytes, tags);
+    }
+
+    public void AddEvictedMemory(int bytes, string? owner)
+    {
+        if (_evictedMemoryCounter.Enabled)
+        {
+            AddEvictedMemoryCore(bytes, owner);
+        }
+    }
+
+    private void AddEvictedMemoryCore(int bytes, string? owner)
+    {
+        var tags = new TagList();
+        AddOwner(ref tags, owner);
+
+        _evictedMemoryCounter.Add(bytes, tags);
+    }
+
+    public void AddRentedMemory(int bytes, string? owner)
+    {
+        if (_rentedMemoryCounter.Enabled)
+        {
+            AddRentedMemoryCore(bytes, owner);
+        }
+    }
+
+    private void AddRentedMemoryCore(int bytes, string? owner)
+    {
+        var tags = new TagList();
+        AddOwner(ref tags, owner);
+
+        _rentedMemoryCounter.Add(bytes, tags);
+    }
+
+    private static void AddOwner(ref TagList tags, string? owner)
+    {
+        if (!string.IsNullOrEmpty(owner))
+        {
+            tags.Add("aspnetcore.memory_pool.owner", owner);
+        }
+    }
+}
diff --git a/src/Shared/Buffers.MemoryPool/MemoryPoolThrowHelper.cs b/src/Shared/Buffers.MemoryPool/MemoryPoolThrowHelper.cs
index de41f133a1a2..036f00798237 100644
--- a/src/Shared/Buffers.MemoryPool/MemoryPoolThrowHelper.cs
+++ b/src/Shared/Buffers.MemoryPool/MemoryPoolThrowHelper.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 
-namespace System.Buffers;
+namespace Microsoft.AspNetCore;
 
 internal sealed class MemoryPoolThrowHelper
 {
diff --git a/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPool.cs b/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPool.cs
index 6c74b477c821..c50f2b6adcd4 100644
--- a/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPool.cs
+++ b/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPool.cs
@@ -1,33 +1,42 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Collections.Concurrent;
+using System.Diagnostics.Metrics;
+using Microsoft.Extensions.Logging;
 
 #nullable enable
 
-namespace System.Buffers;
+namespace Microsoft.AspNetCore;
 
 /// <summary>
 /// Used to allocate and distribute re-usable blocks of memory.
 /// </summary>
-internal sealed class PinnedBlockMemoryPool : MemoryPool<byte>
+internal sealed class PinnedBlockMemoryPool : MemoryPool<byte>, IThreadPoolWorkItem
 {
     /// <summary>
     /// The size of a block. 4096 is chosen because most operating systems use 4k pages.
     /// </summary>
     private const int _blockSize = 4096;
 
-    /// <summary>
-    /// Max allocation block size for pooled blocks,
-    /// larger values can be leased but they will be disposed after use rather than returned to the pool.
-    /// </summary>
-    public override int MaxBufferSize { get; } = _blockSize;
+    // 10 seconds chosen arbitrarily. Trying to avoid running eviction too frequently
+    // to avoid trashing if the server gets batches of requests, but want to run often
+    // enough to avoid memory bloat if the server is idle for a while.
+    // This can be tuned later if needed.
+    public static readonly TimeSpan DefaultEvictionDelay = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// The size of a block. 4096 is chosen because most operating systems use 4k pages.
     /// </summary>
     public static int BlockSize => _blockSize;
 
+    /// <summary>
+    /// Max allocation block size for pooled blocks,
+    /// larger values can be leased but they will be disposed after use rather than returned to the pool.
+    /// </summary>
+    public override int MaxBufferSize { get; } = _blockSize;
+
     /// <summary>
     /// Thread-safe collection of blocks which are currently in the pool. A slab will pre-allocate all of the block tracking objects
     /// and add them to this collection. When memory is requested it is taken from here first, and when it is returned it is re-added.
@@ -39,13 +48,44 @@ internal sealed class PinnedBlockMemoryPool : MemoryPool<byte>
     /// </summary>
     private bool _isDisposed; // To detect redundant calls
 
+    private readonly string? _owner;
+    private readonly MemoryPoolMetrics? _metrics;
+    private readonly ILogger? _logger;
+
+    private DateTimeOffset _nextEviction = DateTime.UtcNow.Add(DefaultEvictionDelay);
+
+    private ulong _rentCount;
+    private ulong _returnCount;
+
     private readonly object _disposeSync = new object();
 
+    private Action<object?, PinnedBlockMemoryPool>? _onPoolDisposed;
+    private object? _onPoolDisposedState;
+
+    // Internal for tests.
+    internal string? Owner => _owner;
+
     /// <summary>
     /// This default value passed in to Rent to use the default value for the pool.
     /// </summary>
     private const int AnySize = -1;
 
+    public PinnedBlockMemoryPool(string? owner = null, MemoryPoolMetrics? metrics = null, ILogger? logger = null)
+    {
+        _metrics = metrics;
+        _owner = owner;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Register a callback to call when the pool is being disposed.
+    /// </summary>
+    public void OnPoolDisposed(Action<object?, PinnedBlockMemoryPool> onPoolDisposed, object? state = null)
+    {
+        _onPoolDisposed = onPoolDisposed;
+        _onPoolDisposedState = state;
+    }
+
     public override IMemoryOwner<byte> Rent(int size = AnySize)
     {
         if (size > _blockSize)
@@ -58,11 +98,25 @@ public override IMemoryOwner<byte> Rent(int size = AnySize)
             MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPool);
         }
 
+        Interlocked.Increment(ref _rentCount);
+
         if (_blocks.TryDequeue(out var block))
         {
+            _metrics?.UpdatePooledMemory(-block.Memory.Length, _owner);
+            _metrics?.AddRentedMemory(block.Memory.Length, _owner);
+
             // block successfully taken from the stack - return it
             return block;
         }
+
+        _metrics?.AddAllocatedMemory(BlockSize, _owner);
+        _metrics?.AddRentedMemory(BlockSize, _owner);
+
+        // We already counted this Rent call above, but since we're now allocating (need more blocks)
+        // that means the pool is 'very' active and we probably shouldn't evict blocks, so we count again
+        // to reduce the chance of eviction occurring this cycle.
+        Interlocked.Increment(ref _rentCount);
+
         return new MemoryPoolBlock(this, BlockSize);
     }
 
@@ -77,17 +131,96 @@ public override IMemoryOwner<byte> Rent(int size = AnySize)
     internal void Return(MemoryPoolBlock block)
     {
 #if BLOCK_LEASE_TRACKING
-            Debug.Assert(block.Pool == this, "Returned block was not leased from this pool");
-            Debug.Assert(block.IsLeased, $"Block being returned to pool twice: {block.Leaser}{Environment.NewLine}");
-            block.IsLeased = false;
+        Debug.Assert(block.Pool == this, "Returned block was not leased from this pool");
+        Debug.Assert(block.IsLeased, $"Block being returned to pool twice: {block.Leaser}{Environment.NewLine}");
+        block.IsLeased = false;
 #endif
 
+        Interlocked.Increment(ref _returnCount);
+
         if (!_isDisposed)
         {
+            _metrics?.UpdatePooledMemory(block.Memory.Length, _owner);
+
             _blocks.Enqueue(block);
         }
     }
 
+    public bool TryScheduleEviction(DateTimeOffset now)
+    {
+        if (now >= _nextEviction)
+        {
+            _nextEviction = now.Add(DefaultEvictionDelay);
+            ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false);
+            return true;
+        }
+
+        return false;
+    }
+
+    void IThreadPoolWorkItem.Execute()
+    {
+        try
+        {
+            PerformEviction();
+        }
+        catch (Exception ex)
+        {
+            // Log the exception, but don't let it crash the thread pool
+            _logger?.LogError(ex, "Error while performing eviction in PinnedBlockMemoryPool.");
+        }
+    }
+
+    /// <summary>
+    /// Examines the current usage and activity of the memory pool and evicts a calculated number of unused memory blocks.
+    /// The eviction policy is adaptive: if the pool is underutilized or idle, more blocks are evicted;
+    /// if activity is high, fewer or no blocks are evicted.
+    /// Evicted blocks are removed from the pool and their memory is unrooted for garbage collection.
+    /// </summary>
+    internal void PerformEviction()
+    {
+        var currentCount = (ulong)_blocks.Count;
+        var burstAmount = 0ul;
+
+        var rentCount = _rentCount;
+        var returnCount = _returnCount;
+        _rentCount = 0;
+        _returnCount = 0;
+
+        // If any activity
+        if (rentCount + returnCount > 0)
+        {
+            // Trending less traffic
+            if (returnCount > rentCount)
+            {
+                // Remove the lower of 1% of the current blocks and 20% of the difference between rented and returned
+                burstAmount = Math.Min(currentCount / 100, (returnCount - rentCount) / 5);
+            }
+            // Traffic staying the same, try removing some blocks since we probably have excess
+            else if (returnCount == rentCount)
+            {
+                // Remove 1% of the current blocks (or at least 1)
+                burstAmount = Math.Max(1, currentCount / 100);
+            }
+            // else trending more traffic so we don't want to evict anything
+        }
+        // If no activity
+        else
+        {
+            // Remove 5% of the current blocks (or at least 10)
+            burstAmount = Math.Max(10, currentCount / 20);
+        }
+
+        // Remove from queue and let GC clean the memory up
+        while (burstAmount > 0 && _blocks.TryDequeue(out var block))
+        {
+            _metrics?.UpdatePooledMemory(-block.Memory.Length, _owner);
+            _metrics?.AddEvictedMemory(block.Memory.Length, _owner);
+
+            burstAmount--;
+        }
+    }
+
     protected override void Dispose(bool disposing)
     {
         if (_isDisposed)
@@ -97,8 +230,15 @@ protected override void Dispose(bool disposing)
 
         lock (_disposeSync)
         {
+            if (_isDisposed)
+            {
+                return;
+            }
+
             _isDisposed = true;
 
+            _onPoolDisposed?.Invoke(_onPoolDisposedState, this);
+
             if (disposing)
             {
                 // Discard blocks in pool
@@ -109,4 +249,7 @@ protected override void Dispose(bool disposing)
             }
         }
     }
+
+    // Used for testing
+    public int BlockCount() => _blocks.Count;
 }
diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs
index 96e5630c43f1..aba1240c7b12 100644
--- a/src/Shared/CertificateGeneration/CertificateManager.cs
+++ b/src/Shared/CertificateGeneration/CertificateManager.cs
@@ -9,6 +9,9 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 #nullable enable
 
@@ -16,7 +19,8 @@ namespace Microsoft.AspNetCore.Certificates.Generation;
 
 internal abstract class CertificateManager
 {
-    internal const int CurrentAspNetCoreCertificateVersion = 2;
+    internal const int CurrentAspNetCoreCertificateVersion = 4;
+    internal const int CurrentMinimumAspNetCoreCertificateVersion = 4;
 
     // OID used for HTTPS certs
     internal const string AspNetHttpsOid = "1.3.6.1.4.1.311.84.1.1";
@@ -24,7 +28,16 @@ internal abstract class CertificateManager
 
     private const string ServerAuthenticationEnhancedKeyUsageOid = "1.3.6.1.5.5.7.3.1";
     private const string ServerAuthenticationEnhancedKeyUsageOidFriendlyName = "Server Authentication";
+    
+    // dns names of the host from a container
+    private const string LocalhostDockerHttpsDnsName = "host.docker.internal";
+    private const string ContainersDockerHttpsDnsName = "host.containers.internal";
 
+    // wildcard DNS names
+    private const string LocalhostWildcardHttpsDnsName = "*.dev.localhost";
+    private const string InternalWildcardHttpsDnsName = "*.dev.internal";
+
+    // main cert subject
     private const string LocalhostHttpsDnsName = "localhost";
     internal const string LocalhostHttpsDistinguishedName = "CN=" + LocalhostHttpsDnsName;
 
@@ -46,7 +59,28 @@ public int AspNetHttpsCertificateVersion
     {
         get;
         // For testing purposes only
-        internal set;
+        internal set
+        {
+            ArgumentOutOfRangeException.ThrowIfLessThan(
+                value,
+                MinimumAspNetHttpsCertificateVersion,
+                $"{nameof(AspNetHttpsCertificateVersion)} cannot be lesser than {nameof(MinimumAspNetHttpsCertificateVersion)}");
+            field = value;
+        }
+    }
+
+    public int MinimumAspNetHttpsCertificateVersion
+    {
+        get;
+        // For testing purposes only
+        internal set
+        {
+            ArgumentOutOfRangeException.ThrowIfGreaterThan(
+                value,
+                AspNetHttpsCertificateVersion,
+                $"{nameof(MinimumAspNetHttpsCertificateVersion)} cannot be greater than {nameof(AspNetHttpsCertificateVersion)}");
+            field = value;
+        }
     }
 
     public string Subject { get; }
@@ -57,9 +91,16 @@ public CertificateManager() : this(LocalhostHttpsDistinguishedName, CurrentAspNe
 
     // For testing purposes only
     internal CertificateManager(string subject, int version)
+        : this(subject, version, version)
+    {
+    }
+
+    // For testing purposes only
+    internal CertificateManager(string subject, int generatedVersion, int minimumVersion)
     {
         Subject = subject;
-        AspNetHttpsCertificateVersion = version;
+        AspNetHttpsCertificateVersion = generatedVersion;
+        MinimumAspNetHttpsCertificateVersion = minimumVersion;
     }
 
     /// <remarks>
@@ -147,30 +188,30 @@ bool HasOid(X509Certificate2 certificate, string oid) =>
             certificate.Extensions.OfType<X509Extension>()
                 .Any(e => string.Equals(oid, e.Oid?.Value, StringComparison.Ordinal));
 
-        static byte GetCertificateVersion(X509Certificate2 c)
-        {
-            var byteArray = c.Extensions.OfType<X509Extension>()
-                .Where(e => string.Equals(AspNetHttpsOid, e.Oid?.Value, StringComparison.Ordinal))
-                .Single()
-                .RawData;
-
-            if ((byteArray.Length == AspNetHttpsOidFriendlyName.Length && byteArray[0] == (byte)'A') || byteArray.Length == 0)
-            {
-                // No Version set, default to 0
-                return 0b0;
-            }
-            else
-            {
-                // Version is in the only byte of the byte array.
-                return byteArray[0];
-            }
-        }
-
         bool IsValidCertificate(X509Certificate2 certificate, DateTimeOffset currentDate, bool requireExportable) =>
             certificate.NotBefore <= currentDate &&
             currentDate <= certificate.NotAfter &&
             (!requireExportable || IsExportable(certificate)) &&
-            GetCertificateVersion(certificate) >= AspNetHttpsCertificateVersion;
+            GetCertificateVersion(certificate) >= MinimumAspNetHttpsCertificateVersion;
+    }
+
+    internal static byte GetCertificateVersion(X509Certificate2 c)
+    {
+        var byteArray = c.Extensions.OfType<X509Extension>()
+            .Where(e => string.Equals(AspNetHttpsOid, e.Oid?.Value, StringComparison.Ordinal))
+            .Single()
+            .RawData;
+
+        if ((byteArray.Length == AspNetHttpsOidFriendlyName.Length && byteArray[0] == (byte)'A') || byteArray.Length == 0)
+        {
+            // No Version set, default to 0
+            return 0b0;
+        }
+        else
+        {
+            // Version is in the only byte of the byte array.
+            return byteArray[0];
+        }
     }
 
     protected virtual void PopulateCertificatesFromStore(X509Store store, List<X509Certificate2> certificates, bool requireExportable)
@@ -328,6 +369,7 @@ public EnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate(
                 var exportDir = Path.GetDirectoryName(path);
                 if (!string.IsNullOrEmpty(exportDir) && !Directory.Exists(exportDir))
                 {
+                    result = EnsureCertificateResult.ErrorExportingTheCertificateToNonExistentDirectory;
                     throw new InvalidOperationException($"The directory '{exportDir}' does not exist.  Choose permissions carefully when creating it.");
                 }
 
@@ -486,7 +528,7 @@ public void CleanupHttpsCertificates()
     /// <remarks>Implementations may choose to throw, rather than returning <see cref="TrustLevel.None"/>.</remarks>
     protected abstract TrustLevel TrustCertificateCore(X509Certificate2 certificate);
 
-    protected abstract bool IsExportable(X509Certificate2 c);
+    internal abstract bool IsExportable(X509Certificate2 c);
 
     protected abstract void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate);
 
@@ -648,6 +690,10 @@ internal X509Certificate2 CreateAspNetCoreHttpsDevelopmentCertificate(DateTimeOf
         var extensions = new List<X509Extension>();
         var sanBuilder = new SubjectAlternativeNameBuilder();
         sanBuilder.AddDnsName(LocalhostHttpsDnsName);
+        sanBuilder.AddDnsName(LocalhostWildcardHttpsDnsName);
+        sanBuilder.AddDnsName(InternalWildcardHttpsDnsName);
+        sanBuilder.AddDnsName(LocalhostDockerHttpsDnsName);
+        sanBuilder.AddDnsName(ContainersDockerHttpsDnsName);
 
         var keyUsage = new X509KeyUsageExtension(X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature, critical: true);
         var enhancedKeyUsage = new X509EnhancedKeyUsageExtension(
diff --git a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs
index cb6b7e145428..5c28eaca3063 100644
--- a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs
+++ b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs
@@ -10,6 +10,7 @@ internal enum EnsureCertificateResult
     ErrorCreatingTheCertificate,
     ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore,
     ErrorExportingTheCertificate,
+    ErrorExportingTheCertificateToNonExistentDirectory,
     FailedToTrustTheCertificate,
     PartiallyFailedToTrustTheCertificate,
     UserCancelledTrustStep,
diff --git a/src/Shared/CertificateGeneration/MacOSCertificateManager.cs b/src/Shared/CertificateGeneration/MacOSCertificateManager.cs
index a38e22762190..36b0c92d895c 100644
--- a/src/Shared/CertificateGeneration/MacOSCertificateManager.cs
+++ b/src/Shared/CertificateGeneration/MacOSCertificateManager.cs
@@ -302,7 +302,7 @@ private static bool IsCertOnKeychain(string keychain, X509Certificate2 certifica
     }
 
     // We don't have a good way of checking on the underlying implementation if it is exportable, so just return true.
-    protected override bool IsExportable(X509Certificate2 c) => true;
+    internal override bool IsExportable(X509Certificate2 c) => true;
 
     protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName, StoreLocation storeLocation)
     {
diff --git a/src/Shared/CertificateGeneration/UnixCertificateManager.cs b/src/Shared/CertificateGeneration/UnixCertificateManager.cs
index c583c4d370ed..10cfcc08d38f 100644
--- a/src/Shared/CertificateGeneration/UnixCertificateManager.cs
+++ b/src/Shared/CertificateGeneration/UnixCertificateManager.cs
@@ -62,18 +62,32 @@ public override TrustLevel GetTrustLevel(X509Certificate2 certificate)
         // Building the chain will check whether dotnet trusts the cert.  We could, instead,
         // enumerate the Root store and/or look for the file in the OpenSSL directory, but
         // this tests the real-world behavior.
-        using var chain = new X509Chain();
-        // This is just a heuristic for whether or not we should prompt the user to re-run with `--trust`
-        // so we don't need to check revocation (which doesn't really make sense for dev certs anyway)
-        chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
-        if (chain.Build(certificate))
+        var chain = new X509Chain();
+        try
         {
-            sawTrustSuccess = true;
+            // This is just a heuristic for whether or not we should prompt the user to re-run with `--trust`
+            // so we don't need to check revocation (which doesn't really make sense for dev certs anyway)
+            chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
+            if (chain.Build(certificate))
+            {
+                sawTrustSuccess = true;
+            }
+            else
+            {
+                sawTrustFailure = true;
+                Log.UnixNotTrustedByDotnet();
+            }
         }
-        else
+        finally
         {
-            sawTrustFailure = true;
-            Log.UnixNotTrustedByDotnet();
+            // Disposing the chain does not dispose the elements we potentially built.
+            // Do the full walk manually to dispose.
+            for (var i = 0; i < chain.ChainElements.Count; i++)
+            {
+                chain.ChainElements[i].Certificate.Dispose();
+            }
+
+            chain.Dispose();
         }
 
         // Will become the name of the file on disk and the nickname in the NSS DBs
@@ -94,7 +108,7 @@ public override TrustLevel GetTrustLevel(X509Certificate2 certificate)
                 var certPath = Path.Combine(sslCertDir, certificateNickname + ".pem");
                 if (File.Exists(certPath))
                 {
-                    var candidate = X509CertificateLoader.LoadCertificateFromFile(certPath);
+                    using var candidate = X509CertificateLoader.LoadCertificateFromFile(certPath);
                     if (AreCertificatesEqual(certificate, candidate))
                     {
                         foundCert = true;
@@ -179,7 +193,7 @@ internal override void CorrectCertificateState(X509Certificate2 candidate)
         // This is about correcting storage, not trust.
     }
 
-    protected override bool IsExportable(X509Certificate2 c) => true;
+    internal override bool IsExportable(X509Certificate2 c) => true;
 
     protected override TrustLevel TrustCertificateCore(X509Certificate2 certificate)
     {
@@ -776,7 +790,7 @@ private static List<NssDb> GetNssDbs(string homeDirectory)
     }
 
     [GeneratedRegex("OPENSSLDIR:\\s*\"([^\"]+)\"")]
-    private static partial Regex OpenSslVersionRegex();
+    private static partial Regex OpenSslVersionRegex { get; }
 
     /// <remarks>
     /// It is the caller's responsibility to ensure that <see cref="OpenSslCommand"/> is available.
@@ -803,7 +817,7 @@ private static bool TryGetOpenSslDirectory([NotNullWhen(true)] out string? openS
                 return false;
             }
 
-            var match = OpenSslVersionRegex().Match(stdout);
+            var match = OpenSslVersionRegex.Match(stdout);
             if (!match.Success)
             {
                 Log.UnixOpenSslVersionParsingFailed();
@@ -858,14 +872,14 @@ private static bool TryGetOpenSslHash(string certificatePath, [NotNullWhen(true)
     }
 
     [GeneratedRegex("^[0-9a-f]+\\.[0-9]+$")]
-    private static partial Regex OpenSslHashFilenameRegex();
+    private static partial Regex OpenSslHashFilenameRegex { get; }
 
     /// <remarks>
     /// We only ever use .pem, but someone will eventually put their own cert in this directory,
     /// so we should handle the same extensions as c_rehash (other than .crl).
     /// </remarks>
     [GeneratedRegex("\\.(pem|crt|cer)$")]
-    private static partial Regex OpenSslCertificateExtensionRegex();
+    private static partial Regex OpenSslCertificateExtensionRegex { get; }
 
     /// <remarks>
     /// This is a simplified version of c_rehash from OpenSSL.  Using the real one would require
@@ -876,21 +890,17 @@ private static bool TryRehashOpenSslCertificates(string certificateDirectory)
         try
         {
             // First, delete all the existing symlinks, so we don't have to worry about fragmentation or leaks.
-
-            var hashRegex = OpenSslHashFilenameRegex();
-            var extensionRegex = OpenSslCertificateExtensionRegex();
-
             var certs = new List<FileInfo>();
 
             var dirInfo = new DirectoryInfo(certificateDirectory);
             foreach (var file in dirInfo.EnumerateFiles())
             {
                 var isSymlink = (file.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
-                if (isSymlink && hashRegex.IsMatch(file.Name))
+                if (isSymlink && OpenSslHashFilenameRegex.IsMatch(file.Name))
                 {
                     file.Delete();
                 }
-                else if (extensionRegex.IsMatch(file.Name))
+                else if (OpenSslCertificateExtensionRegex.IsMatch(file.Name))
                 {
                     certs.Add(file);
                 }
diff --git a/src/Shared/CertificateGeneration/WindowsCertificateManager.cs b/src/Shared/CertificateGeneration/WindowsCertificateManager.cs
index 85a72be37c66..1cf1ebd9480e 100644
--- a/src/Shared/CertificateGeneration/WindowsCertificateManager.cs
+++ b/src/Shared/CertificateGeneration/WindowsCertificateManager.cs
@@ -27,7 +27,7 @@ internal WindowsCertificateManager(string subject, int version)
     {
     }
 
-    protected override bool IsExportable(X509Certificate2 c)
+    internal override bool IsExportable(X509Certificate2 c)
     {
 #if XPLAT
         // For the first run experience we don't need to know if the certificate can be exported.
diff --git a/src/Shared/Components/ComponentMarker.cs b/src/Shared/Components/ComponentMarker.cs
index 9b42677a9302..8bf072db25af 100644
--- a/src/Shared/Components/ComponentMarker.cs
+++ b/src/Shared/Components/ComponentMarker.cs
@@ -3,8 +3,11 @@
 
 #nullable enable
 
+using System.Diagnostics;
+
 namespace Microsoft.AspNetCore.Components;
 
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 internal struct ComponentMarker
 {
     public const string ServerMarkerType = "server";
@@ -88,6 +91,21 @@ public void WriteWebAssemblyData(string assembly, string typeName, string parame
 
     private static string GeneratePrerenderId()
         => Guid.NewGuid().ToString("N");
+
+    private string GetDebuggerDisplay()
+    {
+        switch (Type)
+        {
+            case ServerMarkerType:
+                return $"Server Component: {TypeName}, Sequence: {Sequence}, Key: {Key?.FormattedComponentKey} Descriptor: {Descriptor?.Substring(5)}...";
+            case WebAssemblyMarkerType:
+                return $"WebAssembly Component: {TypeName}, Assembly: {Assembly}, Key: {Key?.FormattedComponentKey}";
+            case AutoMarkerType:
+                return $"Auto Component: {TypeName}, Assembly: {Assembly}, Key: {Key?.FormattedComponentKey}, Descriptor: {Descriptor?.Substring(5)}...";
+            default:
+                return $"Unknown Component Type: {Type}, Key: {Key?.FormattedComponentKey}";
+        }
+    }
 }
 
 internal struct ComponentEndMarker
@@ -95,6 +113,7 @@ internal struct ComponentEndMarker
     public string? PrerenderId { get; set; }
 }
 
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
 internal struct ComponentMarkerKey : IEquatable<ComponentMarkerKey>
 {
     public ComponentMarkerKey(string locationHash, string? formattedComponentKey)
@@ -128,4 +147,13 @@ public override readonly bool Equals(object? obj)
 
     public override readonly int GetHashCode()
         => HashCode.Combine(LocationHash, FormattedComponentKey);
+
+    private readonly string GetDebuggerDisplay() => $"LocationHash: {LocationHash}, Key: {FormattedComponentKey ?? "null"}";
+
+    internal readonly string? Serialized()
+    {
+        return this == default
+            ? null
+            : $"{LocationHash}:{FormattedComponentKey}";
+    }
 }
diff --git a/src/Shared/Components/ComponentsActivityLinkStore.cs b/src/Shared/Components/ComponentsActivityLinkStore.cs
new file mode 100644
index 000000000000..7ada7041a949
--- /dev/null
+++ b/src/Shared/Components/ComponentsActivityLinkStore.cs
@@ -0,0 +1,66 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Components.RenderTree;
+
+// this internal helper class is used in both Components and Components.Server projects as a different type
+// the namespace is different to avoid conflicts with internalVisibleTo in unit tests
+#if COMPONENTS 
+namespace Microsoft.AspNetCore.Components.Infrastructure;
+#else
+namespace Microsoft.AspNetCore.Components.Infrastructure.Server;
+#endif
+
+using CategoryLink = Tuple<ActivityContext, KeyValuePair<string, object?>?>;
+
+/// <summary>
+/// Helper for storing links between diagnostic activities in Blazor components.
+/// </summary>
+internal class ComponentsActivityLinkStore
+{
+    public const string Http = "Http";
+    public const string SignalR = "SignalR";
+    public const string Route = "Route";
+    public const string Circuit = "Circuit";
+    public const string Event = "Event";
+
+    private readonly Dictionary<string, CategoryLink> _store;
+
+    public ComponentsActivityLinkStore(Renderer? instance)
+    {
+        _store = instance == null
+            ? new Dictionary<string, CategoryLink>(StringComparer.OrdinalIgnoreCase)
+            : (Dictionary<string, CategoryLink>)GetActivityLinksStore(instance);
+        Debug.Assert(_store != null, "Activity links store should not be null.");
+    }
+
+    public void SetActivityContext(string category, ActivityContext activityLink, KeyValuePair<string, object?>? tag)
+    {
+        _store[category] = new CategoryLink(activityLink, tag);
+    }
+
+    public void AddActivityContexts(string exceptCategory, Activity targetActivity)
+    {
+        foreach (var kvp in _store)
+        {
+            if (kvp.Key != exceptCategory)
+            {
+                var link = kvp.Value.Item1;
+                var tag = kvp.Value.Item2;
+                if (link != default)
+                {
+                    targetActivity.AddLink(new ActivityLink(link));
+                }
+                if (tag != null)
+                {
+                    targetActivity.SetTag(tag.Value.Key, tag.Value.Value);
+                }
+            }
+        }
+    }
+
+    [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "get_ActivityLinksStore")]
+    static extern object GetActivityLinksStore(Renderer instance);
+}
diff --git a/src/Shared/Components/PrerenderComponentApplicationStore.cs b/src/Shared/Components/PrerenderComponentApplicationStore.cs
index 8c66acead0cc..761f9c4521fc 100644
--- a/src/Shared/Components/PrerenderComponentApplicationStore.cs
+++ b/src/Shared/Components/PrerenderComponentApplicationStore.cs
@@ -16,7 +16,7 @@ internal class PrerenderComponentApplicationStore : IPersistentComponentStateSto
 
     public PrerenderComponentApplicationStore()
     {
-        ExistingState = new();
+        ExistingState = new Dictionary<string, byte[]>();
     }
 
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Simple deserialize of primitive types.")]
diff --git a/src/Shared/Components/ProtectedPrerenderComponentApplicationStore.cs b/src/Shared/Components/ProtectedPrerenderComponentApplicationStore.cs
index 6025dc48f205..8e3f16969ac1 100644
--- a/src/Shared/Components/ProtectedPrerenderComponentApplicationStore.cs
+++ b/src/Shared/Components/ProtectedPrerenderComponentApplicationStore.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.AspNetCore.Components;
 
-internal sealed class ProtectedPrerenderComponentApplicationStore : PrerenderComponentApplicationStore
+internal sealed class ProtectedPrerenderComponentApplicationStore : PrerenderComponentApplicationStore, IClearableStore
 {
     private IDataProtector _protector = default!; // Assigned in all constructor paths
 
@@ -21,6 +21,12 @@ public ProtectedPrerenderComponentApplicationStore(string existingState, IDataPr
         DeserializeState(_protector.Unprotect(Convert.FromBase64String(existingState)));
     }
 
+    public ProtectedPrerenderComponentApplicationStore(IReadOnlyDictionary<string, byte[]> deserializedState, IDataProtectionProvider dataProtectionProvider)
+    {
+        CreateProtector(dataProtectionProvider);
+        ExistingState = new Dictionary<string, byte[]>(deserializedState);
+    }
+
     protected override byte[] SerializeState(IReadOnlyDictionary<string, byte[]> state)
     {
         var bytes = base.SerializeState(state);
@@ -33,4 +39,14 @@ private void CreateProtector(IDataProtectionProvider dataProtectionProvider) =>
     public override bool SupportsRenderMode(IComponentRenderMode renderMode) =>
         renderMode is null ||
         renderMode is InteractiveServerRenderMode || renderMode is InteractiveAutoRenderMode;
+
+    public void Clear()
+    {
+        ExistingState.Clear();
+    }
+}
+
+internal interface IClearableStore : IPersistentComponentStateStore
+{
+    void Clear();
 }
diff --git a/src/Shared/Components/ResourceCollectionResolver.cs b/src/Shared/Components/ResourceCollectionResolver.cs
index a0b39aa8208e..f5a56cbdb20a 100644
--- a/src/Shared/Components/ResourceCollectionResolver.cs
+++ b/src/Shared/Components/ResourceCollectionResolver.cs
@@ -42,9 +42,21 @@ public ResourceAssetCollection ResolveResourceCollection()
 #if !MVC_VIEWFEATURES
             string? label = null;
             string? integrity = null;
+            string? preloadRel = null;
+            string? preloadAs = null;
+            string? preloadPriority = null;
+            string? preloadCrossorigin = null;
+            string? preloadOrder = null;
+            string? preloadGroup = null;
 #else
             string label = null;
             string integrity = null;
+            string preloadRel = null;
+            string preloadAs = null;
+            string preloadPriority = null;
+            string preloadCrossorigin = null;
+            string preloadOrder = null;
+            string preloadGroup = null;
 #endif
 
             // If there's a selector this means that this is an alternative representation for a resource, so skip it.
@@ -59,15 +71,44 @@ public ResourceAssetCollection ResolveResourceCollection()
                         label = property.Value;
                         foundProperties++;
                     }
-
                     else if (property.Name.Equals("integrity", StringComparison.OrdinalIgnoreCase))
                     {
                         integrity = property.Value;
                         foundProperties++;
                     }
+                    else if (property.Name.Equals("preloadrel", StringComparison.OrdinalIgnoreCase))
+                    {
+                        preloadRel = property.Value;
+                        foundProperties++;
+                    }
+                    else if (property.Name.Equals("preloadas", StringComparison.OrdinalIgnoreCase))
+                    {
+                        preloadAs = property.Value;
+                        foundProperties++;
+                    }
+                    else if (property.Name.Equals("preloadpriority", StringComparison.OrdinalIgnoreCase))
+                    {
+                        preloadPriority = property.Value;
+                        foundProperties++;
+                    }
+                    else if (property.Name.Equals("preloadcrossorigin", StringComparison.OrdinalIgnoreCase))
+                    {
+                        preloadCrossorigin = property.Value;
+                        foundProperties++;
+                    }
+                    else if (property.Name.Equals("preloadorder", StringComparison.OrdinalIgnoreCase))
+                    {
+                        preloadOrder = property.Value;
+                        foundProperties++;
+                    }
+                    else if (property.Name.Equals("preloadgroup", StringComparison.OrdinalIgnoreCase))
+                    {
+                        preloadGroup = property.Value;
+                        foundProperties++;
+                    }
                 }
 
-                AddResource(resources, descriptor, label, integrity, foundProperties);
+                AddResource(resources, descriptor, label, integrity, preloadRel, preloadAs, preloadPriority, preloadCrossorigin, preloadOrder, preloadGroup, foundProperties);
             }
         }
 
@@ -97,11 +138,23 @@ private static void AddResource(
 #if !MVC_VIEWFEATURES
         string? label,
         string? integrity,
+        string? preloadRel,
+        string? preloadAs,
+        string? preloadPriority,
+        string? preloadCrossorigin,
+        string? preloadOrder,
+        string? preloadGroup,
 #else
         string label,
         string integrity,
+        string preloadRel,
+        string preloadAs,
+        string preloadPriority,
+        string preloadCrossorigin,
+        string preloadOrder,
+        string preloadGroup,
 #endif
-        int foundProperties)
+    int foundProperties)
     {
         if (label != null || integrity != null)
         {
@@ -115,6 +168,30 @@ private static void AddResource(
             {
                 properties[index++] = new ResourceAssetProperty("integrity", integrity);
             }
+            if (preloadRel != null)
+            {
+                properties[index++] = new ResourceAssetProperty("preloadrel", preloadRel);
+            }
+            if (preloadAs != null)
+            {
+                properties[index++] = new ResourceAssetProperty("preloadas", preloadAs);
+            }
+            if (preloadPriority != null)
+            {
+                properties[index++] = new ResourceAssetProperty("preloadpriority", preloadPriority);
+            }
+            if (preloadCrossorigin != null)
+            {
+                properties[index++] = new ResourceAssetProperty("preloadcrossorigin", preloadCrossorigin);
+            }
+            if (preloadOrder != null)
+            {
+                properties[index++] = new ResourceAssetProperty("preloadorder", preloadOrder);
+            }
+            if (preloadGroup != null)
+            {
+                properties[index++] = new ResourceAssetProperty("preloadgroup", preloadGroup);
+            }
 
             resources.Add(new ResourceAsset(descriptor.Route, properties));
         }
diff --git a/src/Components/Endpoints/src/DependencyInjection/ServerComponentInvocationSequence.cs b/src/Shared/Components/ServerComponentInvocationSequence.cs
similarity index 100%
rename from src/Components/Endpoints/src/DependencyInjection/ServerComponentInvocationSequence.cs
rename to src/Shared/Components/ServerComponentInvocationSequence.cs
diff --git a/src/Components/Endpoints/src/DependencyInjection/ServerComponentSerializer.cs b/src/Shared/Components/ServerComponentSerializer.cs
similarity index 80%
rename from src/Components/Endpoints/src/DependencyInjection/ServerComponentSerializer.cs
rename to src/Shared/Components/ServerComponentSerializer.cs
index b559a9fac715..a6bbdd347e6a 100644
--- a/src/Components/Endpoints/src/DependencyInjection/ServerComponentSerializer.cs
+++ b/src/Shared/Components/ServerComponentSerializer.cs
@@ -16,9 +16,15 @@ public ServerComponentSerializer(IDataProtectionProvider dataProtectionProvider)
             .CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
             .ToTimeLimitedDataProtector();
 
-    public void SerializeInvocation(ref ComponentMarker marker, ServerComponentInvocationSequence invocationId, Type type, ParameterView parameters)
+    public void SerializeInvocation(
+        ref ComponentMarker marker,
+        ServerComponentInvocationSequence invocationId,
+        Type type,
+        ParameterView parameters,
+        TimeSpan? dataExpiration = default)
     {
-        var (sequence, serverComponent) = CreateSerializedServerComponent(invocationId, type, parameters, marker.Key);
+        var expiration = dataExpiration ?? ServerComponentSerializationSettings.DataExpiration;
+        var (sequence, serverComponent) = CreateSerializedServerComponent(invocationId, type, parameters, marker.Key, expiration);
         marker.WriteServerData(sequence, serverComponent);
     }
 
@@ -26,7 +32,8 @@ public void SerializeInvocation(ref ComponentMarker marker, ServerComponentInvoc
         ServerComponentInvocationSequence invocationId,
         Type rootComponent,
         ParameterView parameters,
-        ComponentMarkerKey? key)
+        ComponentMarkerKey? key,
+        TimeSpan dataExpiration)
     {
         var sequence = invocationId.Next();
 
@@ -42,7 +49,7 @@ public void SerializeInvocation(ref ComponentMarker marker, ServerComponentInvoc
             invocationId.Value);
 
         var serializedServerComponentBytes = JsonSerializer.SerializeToUtf8Bytes(serverComponent, ServerComponentSerializationSettings.JsonSerializationOptions);
-        var protectedBytes = _dataProtector.Protect(serializedServerComponentBytes, ServerComponentSerializationSettings.DataExpiration);
+        var protectedBytes = _dataProtector.Protect(serializedServerComponentBytes, dataExpiration);
         return (serverComponent.Sequence, Convert.ToBase64String(protectedBytes));
     }
 }
diff --git a/src/Shared/Diagnostics/ActivityCreator.cs b/src/Shared/Diagnostics/ActivityCreator.cs
index 170e9cff267d..9960ff91be84 100644
--- a/src/Shared/Diagnostics/ActivityCreator.cs
+++ b/src/Shared/Diagnostics/ActivityCreator.cs
@@ -7,6 +7,11 @@ namespace Microsoft.AspNetCore.Shared;
 
 internal static class ActivityCreator
 {
+    public static bool IsActivityCreated(ActivitySource activitySource, bool diagnosticsOrLoggingEnabled)
+    {
+        return activitySource.HasListeners() || diagnosticsOrLoggingEnabled;
+    }
+
     /// <summary>
     /// Create an activity with details received from a remote source.
     /// </summary>
diff --git a/src/Shared/Diagnostics/RouteDiagnosticsHelpers.cs b/src/Shared/Diagnostics/RouteDiagnosticsHelpers.cs
new file mode 100644
index 000000000000..3084f3caf57d
--- /dev/null
+++ b/src/Shared/Diagnostics/RouteDiagnosticsHelpers.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Shared;
+
+internal static class RouteDiagnosticsHelpers
+{
+    public static string ResolveHttpRoute(string route)
+    {
+        // A route that matches the root of the website could be an empty string. This is problematic.
+        // 1. It is potentially confusing, "What does empty string mean?"
+        // 2. Some telemetry tools have problems with empty string values, e.g. https://github.com/dotnet/aspnetcore/pull/62432
+        //
+        // The fix is to resolve empty string route to "/" in metrics.
+        return string.IsNullOrEmpty(route) ? "/" : route;
+    }
+}
diff --git a/src/Shared/E2ETesting/BrowserFixture.cs b/src/Shared/E2ETesting/BrowserFixture.cs
index a2dc7bc692fa..e046634232b3 100644
--- a/src/Shared/E2ETesting/BrowserFixture.cs
+++ b/src/Shared/E2ETesting/BrowserFixture.cs
@@ -14,6 +14,8 @@ namespace Microsoft.AspNetCore.E2ETesting;
 public class BrowserFixture : IAsyncLifetime
 {
     public static string StreamingContext { get; } = "streaming";
+    public static string RoutingTestContext { get; } = "routing";
+
     private readonly ConcurrentDictionary<string, (IWebDriver browser, ILogs log)> _browsers = new();
 
     public BrowserFixture(IMessageSink diagnosticsMessageSink)
@@ -63,14 +65,20 @@ public static bool IsHostAutomationSupported()
 
     public async Task DisposeAsync()
     {
-        var browsers = _browsers.Values;
-        foreach (var (browser, _) in browsers)
+        try
         {
-            browser?.Quit();
-            browser?.Dispose();
-        }
+            var browsers = _browsers.Values;
+            foreach (var (browser, _) in browsers)
+            {
+                browser?.Quit();
+                browser?.Dispose();
+            }
 
-        await DeleteBrowserUserProfileDirectoriesAsync();
+            await DeleteBrowserUserProfileDirectoriesAsync();
+        }
+        catch
+        {
+        }
     }
 
     private async Task DeleteBrowserUserProfileDirectoriesAsync()
@@ -123,6 +131,17 @@ private async Task DeleteBrowserUserProfileDirectoriesAsync()
     {
         var opts = new ChromeOptions();
 
+        if (context?.StartsWith(RoutingTestContext, StringComparison.Ordinal) == true)
+        {
+            // Enables WebDriver BiDi, which is required to allow the 'beforeunload' event
+            // to display an alert dialog. This is needed by some of our routing tests.
+            // See: https://w3c.github.io/webdriver/#user-prompts
+            // We could consider making this the default for all tests when the BiDi spec
+            // becomes standard (it's in draft at the time of writing).
+            // See: https://w3c.github.io/webdriver-bidi/
+            opts.UseWebSocketUrl = true;
+        }
+
         if (context?.StartsWith(StreamingContext, StringComparison.Ordinal) == true)
         {
             // Tells Selenium not to wait until the page navigation has completed before continuing with the tests
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 7a1927fe22cf..a7e66a3169f9 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -16,6 +16,7 @@ public class BrowserTestBase : IClassFixture<BrowserFixture>, IAsyncLifetime
 
     private ExceptionDispatchInfo _exceptionDispatchInfo;
     private IWebDriver _browser;
+    private System.Drawing.Size? _originalWindowSize;
 
     public BrowserTestBase(BrowserFixture browserFixture, ITestOutputHelper output)
     {
@@ -49,8 +50,21 @@ public IWebDriver Browser
 
     public BrowserFixture BrowserFixture { get; }
 
-    public Task DisposeAsync()
+    public virtual Task DisposeAsync()
     {
+        try
+        {
+            if (_originalWindowSize.HasValue && _originalWindowSize.Value != Browser.Manage().Window.Size)
+            {
+                Browser.SetWindowSize(_originalWindowSize.Value.Width, _originalWindowSize.Value.Height);
+            }
+        }
+        catch (WebDriverException)
+        {
+            // An exception is thrown if the browser has been closed in the test.
+            // In that case we don't need to reset the window size.
+        }
+
         return Task.CompletedTask;
     }
 
@@ -78,6 +92,11 @@ protected void InitializeBrowser(string isolationContext)
             _asyncBrowser.Value = browser;
             _logs.Value = logs;
 
+            if (!_originalWindowSize.HasValue)
+            {
+                _originalWindowSize = browser.Manage().Window.Size;
+            }
+
             Browser = browser;
         }
         catch (Exception ex)
diff --git a/src/Shared/E2ETesting/WaitAssert.cs b/src/Shared/E2ETesting/WaitAssert.cs
index 022870aec08a..a3bb53520f30 100644
--- a/src/Shared/E2ETesting/WaitAssert.cs
+++ b/src/Shared/E2ETesting/WaitAssert.cs
@@ -35,6 +35,14 @@ public static void True(this IWebDriver driver, Func<bool> actual)
     public static void True(this IWebDriver driver, Func<bool> actual, TimeSpan timeout)
         => WaitAssertCore(driver, () => Assert.True(actual()), timeout);
 
+    public static void True(this IWebDriver driver, Func<bool> actual, TimeSpan timeout, string message)
+        => WaitAssertCore(driver, () => Assert.True(actual(), message), timeout);
+    public static void True(this IWebDriver driver, Func<bool> actual, string message)
+        => WaitAssertCore(driver, () => Assert.True(actual(), message));
+
+    public static void False(this IWebDriver driver, Func<bool> actual, string message)
+        => WaitAssertCore(driver, () => Assert.False(actual(), message));
+
     public static void False(this IWebDriver driver, Func<bool> actual)
         => WaitAssertCore(driver, () => Assert.False(actual()));
 
@@ -116,7 +124,7 @@ private static TResult WaitAssertCore<TResult>(IWebDriver driver, Func<TResult>
             // tests running concurrently might use the DefaultTimeout in their current assertion, which is fine.
             TestRunFailed = true;
 
-            var innerHtml = driver.FindElement(By.CssSelector(":first-child"))?.GetAttribute("innerHTML");
+            var innerHtml = driver.FindElement(By.CssSelector(":first-child"))?.GetDomProperty("innerHTML");
 
             var fileId = $"{Guid.NewGuid():N}.png";
             var screenShotPath = Path.Combine(Path.GetFullPath(E2ETestOptions.Instance.ScreenShotsPath), fileId);
diff --git a/src/Shared/E2ETesting/WebDriverExtensions.cs b/src/Shared/E2ETesting/WebDriverExtensions.cs
index 50cbefdc9e3a..12a3b70f97ad 100644
--- a/src/Shared/E2ETesting/WebDriverExtensions.cs
+++ b/src/Shared/E2ETesting/WebDriverExtensions.cs
@@ -51,4 +51,11 @@ private static bool ShouldIgnore(LogEntry entry)
 
         return false;
     }
+
+    public static void SetWindowSize(this IWebDriver driver, int width, int height)
+    {
+        ArgumentNullException.ThrowIfNull(driver);
+
+        driver.Manage().Window.Size = new System.Drawing.Size(width, height);
+    }
 }
diff --git a/src/Shared/Encoding/Int7BitEncodingUtils.cs b/src/Shared/Encoding/Int7BitEncodingUtils.cs
new file mode 100644
index 000000000000..ca97096d1c17
--- /dev/null
+++ b/src/Shared/Encoding/Int7BitEncodingUtils.cs
@@ -0,0 +1,52 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Shared;
+
+internal static class Int7BitEncodingUtils
+{
+    public static int Measure7BitEncodedUIntLength(this int value)
+        => Measure7BitEncodedUIntLength((uint)value);
+
+    public static int Measure7BitEncodedUIntLength(this uint value)
+    {
+#if NET10_0_OR_GREATER
+        return ((31 - System.Numerics.BitOperations.LeadingZeroCount(value | 1)) / 7) + 1;
+#else
+        int count = 1;
+        while ((value >>= 7) != 0)
+        {
+            count++;
+        }
+        return count;
+#endif
+    }
+
+    public static int Write7BitEncodedInt(this Span<byte> target, int value)
+        => Write7BitEncodedInt(target, (uint)value);
+
+    public static int Write7BitEncodedInt(this Span<byte> target, uint uValue)
+    {
+        // Write out an int 7 bits at a time. The high bit of the byte,
+        // when on, tells reader to continue reading more bytes.
+        //
+        // Using the constants 0x7F and ~0x7F below offers smaller
+        // codegen than using the constant 0x80.
+
+        int index = 0;
+        while (uValue > 0x7Fu)
+        {
+            target[index++] = (byte)(uValue | ~0x7Fu);
+            uValue >>= 7;
+        }
+
+        target[index++] = (byte)uValue;
+        return index;
+    }
+}
diff --git a/src/Shared/EndpointMetadataPopulator.cs b/src/Shared/EndpointMetadataPopulator.cs
index 2c8fe12d3e9e..3087f6b2715d 100644
--- a/src/Shared/EndpointMetadataPopulator.cs
+++ b/src/Shared/EndpointMetadataPopulator.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Http;
 internal static class EndpointMetadataPopulator
 {
     private static readonly MethodInfo PopulateMetadataForParameterMethod = typeof(EndpointMetadataPopulator).GetMethod(nameof(PopulateMetadataForParameter), BindingFlags.NonPublic | BindingFlags.Static)!;
-    private static readonly MethodInfo PopulateMetadataForEndpointMethod = typeof(EndpointMetadataPopulator).GetMethod(nameof(PopulateMetadataForEndpoint), BindingFlags.NonPublic | BindingFlags.Static)!;
+    internal static readonly MethodInfo PopulateMetadataForEndpointMethod = typeof(EndpointMetadataPopulator).GetMethod(nameof(PopulateMetadataForEndpoint), BindingFlags.NonPublic | BindingFlags.Static)!;
 
     public static void PopulateMetadata(MethodInfo methodInfo, EndpointBuilder builder, IEnumerable<ParameterInfo>? parameters = null)
     {
diff --git a/src/Shared/ErrorPage/GeneratePage.ps1 b/src/Shared/ErrorPage/GeneratePage.ps1
index 6e9e51d0618c..ae830e3d4393 100644
--- a/src/Shared/ErrorPage/GeneratePage.ps1
+++ b/src/Shared/ErrorPage/GeneratePage.ps1
@@ -1,5 +1,5 @@
 $RepoRoot = Resolve-Path "$PSScriptRoot\..\..\.."
-$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net9.0\dotnet-razorpagegenerator.exe"
+$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net10.0\dotnet-razorpagegenerator.exe"
 
 if (!(Test-Path "$ToolPath")) {
     throw "Unable to find razor page generator tool at $ToolPath"
diff --git a/src/Shared/EventSource.Testing/TestCounterListener.cs b/src/Shared/EventSource.Testing/TestCounterListener.cs
index 6dbcab1fbb56..34de12abae66 100644
--- a/src/Shared/EventSource.Testing/TestCounterListener.cs
+++ b/src/Shared/EventSource.Testing/TestCounterListener.cs
@@ -9,6 +9,12 @@
 
 namespace Microsoft.AspNetCore.Internal;
 
+internal sealed class CounterValues(string counterName, IAsyncEnumerator<double> values)
+{
+    public string CounterName { get; } = counterName;
+    public IAsyncEnumerator<double> Values { get; } = values;
+}
+
 internal sealed class TestCounterListener : EventListener
 {
     private readonly Dictionary<string, Channel<double>> _counters = new Dictionary<string, Channel<double>>();
@@ -30,9 +36,10 @@ public TestCounterListener(ILoggerFactory loggerFactory, string eventSourceName,
         _eventSourceName = eventSourceName;
     }
 
-    public IAsyncEnumerable<double> GetCounterValues(string counterName, CancellationToken cancellationToken = default)
+    public CounterValues GetCounterValues(string counterName, CancellationToken cancellationToken = default)
     {
-        return _counters[counterName].Reader.ReadAllAsync(cancellationToken);
+        var values = _counters[counterName].Reader.ReadAllAsync(cancellationToken).GetAsyncEnumerator(cancellationToken);
+        return new CounterValues(counterName, values);
     }
 
     protected override void OnEventWritten(EventWrittenEventArgs eventData)
diff --git a/src/Shared/Http2cat/Http2CatIServiceCollectionExtensions.cs b/src/Shared/Http2cat/Http2CatIServiceCollectionExtensions.cs
index 4544b04b2da2..b8e43139277a 100644
--- a/src/Shared/Http2cat/Http2CatIServiceCollectionExtensions.cs
+++ b/src/Shared/Http2cat/Http2CatIServiceCollectionExtensions.cs
@@ -12,6 +12,7 @@ internal static class Http2CatIServiceCollectionExtensions
 {
     public static IServiceCollection UseHttp2Cat(this IServiceCollection services, Action<Http2CatOptions> configureOptions)
     {
+        services.AddMetrics();
         services.AddSingleton<IConnectionFactory, SocketConnectionFactory>();
         services.AddHostedService<Http2CatHostedService>();
         services.Configure(configureOptions);
diff --git a/src/Shared/HttpExtensions.cs b/src/Shared/HttpExtensions.cs
index 4a0d50de25fd..3e2bde30e848 100644
--- a/src/Shared/HttpExtensions.cs
+++ b/src/Shared/HttpExtensions.cs
@@ -58,10 +58,6 @@ internal static void ClearEndpoint(HttpContext context)
             context.SetEndpoint(endpoint: null);
         }
 
-        var routeValuesFeature = context.Features.Get<IRouteValuesFeature>();
-        if (routeValuesFeature != null)
-        {
-            routeValuesFeature.RouteValues = null!;
-        }
+        context.Features.Get<IRouteValuesFeature>()?.RouteValues = null!;
     }
 }
diff --git a/src/Shared/HttpSys/NativeInterop/SecPkgContext_CipherInfo.cs b/src/Shared/HttpSys/NativeInterop/SecPkgContext_CipherInfo.cs
new file mode 100644
index 000000000000..1bba1c1afcef
--- /dev/null
+++ b/src/Shared/HttpSys/NativeInterop/SecPkgContext_CipherInfo.cs
@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.AspNetCore.HttpSys.Internal;
+
+// From Schannel.h
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+internal unsafe struct SecPkgContext_CipherInfo
+{
+    private const int SZ_ALG_MAX_SIZE = 64;
+
+    private readonly int dwVersion;
+    private readonly int dwProtocol;
+    public readonly int dwCipherSuite;
+    private readonly int dwBaseCipherSuite;
+    private fixed char szCipherSuite[SZ_ALG_MAX_SIZE];
+    private fixed char szCipher[SZ_ALG_MAX_SIZE];
+    private readonly int dwCipherLen;
+    private readonly int dwCipherBlockLen; // in bytes
+    private fixed char szHash[SZ_ALG_MAX_SIZE];
+    private readonly int dwHashLen;
+    private fixed char szExchange[SZ_ALG_MAX_SIZE];
+    private readonly int dwMinExchangeLen;
+    private readonly int dwMaxExchangeLen;
+    private fixed char szCertificate[SZ_ALG_MAX_SIZE];
+    private readonly int dwKeyType;
+}
diff --git a/src/Shared/HttpSys/NativeInterop/SocketAddress.cs b/src/Shared/HttpSys/NativeInterop/SocketAddress.cs
index a75ea57ba739..b38af58c0638 100644
--- a/src/Shared/HttpSys/NativeInterop/SocketAddress.cs
+++ b/src/Shared/HttpSys/NativeInterop/SocketAddress.cs
@@ -1,96 +1,78 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.Contracts;
+using System.Buffers.Binary;
 using System.Net;
-using System.Net.Sockets;
+using Windows.Win32.Networking.WinSock;
 
 namespace Microsoft.AspNetCore.HttpSys.Internal;
 
-internal sealed class SocketAddress
+internal abstract class SocketAddress
 {
-    private const int NumberOfIPv6Labels = 8;
-    private const int IPv6AddressSize = 28;
-    private const int IPv4AddressSize = 16;
-    private const int WriteableOffset = 2;
+    internal abstract int GetPort();
 
-    private readonly byte[] _buffer;
-    private readonly int _size;
+    internal abstract IPAddress? GetIPAddress();
 
-    private SocketAddress(AddressFamily family, int size)
+    internal static unsafe SocketAddress? CopyOutAddress(SOCKADDR* pSockaddr)
     {
-        ArgumentOutOfRangeException.ThrowIfLessThan(size, WriteableOffset);
-        Family = family;
-        _size = size;
-        // Sized to match the native structure
-        _buffer = new byte[((size / IntPtr.Size) + 2) * IntPtr.Size]; // sizeof DWORD
+        // Per https://learn.microsoft.com/windows/win32/api/ws2def/ns-ws2def-sockaddr,
+        // use the SOCKADDR* pointer only to read the address family, then cast the pointer to
+        // the appropriate family type and continue processing.
+        return pSockaddr->sa_family switch
+        {
+            ADDRESS_FAMILY.AF_INET => new SocketAddressIPv4(*(SOCKADDR_IN*)pSockaddr),
+            ADDRESS_FAMILY.AF_INET6 => new SocketAddressIPv6(*(SOCKADDR_IN6*)pSockaddr),
+            _ => null
+        };
     }
 
-    internal AddressFamily Family { get; }
-
-    internal int GetPort()
+    // internal for testing
+    internal sealed class SocketAddressIPv4 : SocketAddress
     {
-        return (_buffer[2] << 8 & 0xFF00) | (_buffer[3]);
-    }
+        private readonly SOCKADDR_IN _sockaddr;
 
-    internal IPAddress? GetIPAddress()
-    {
-        if (Family == AddressFamily.InterNetworkV6)
+        internal SocketAddressIPv4(in SOCKADDR_IN sockaddr)
         {
-            return GetIpv6Address();
+            _sockaddr = sockaddr;
         }
-        else if (Family == AddressFamily.InterNetwork)
+
+        internal override int GetPort()
         {
-            return GetIPv4Address();
+            // _sockaddr.sin_port has network byte order.
+            // cast to ushort is important to avoid negative values for the TCP port
+            return (ushort)IPAddress.NetworkToHostOrder((short)_sockaddr.sin_port);
         }
-        else
+
+        internal override IPAddress? GetIPAddress()
         {
-            return null;
+            // address is network byte order
+            return new IPAddress(_sockaddr.sin_addr.S_un.S_addr);
         }
     }
 
-    private IPAddress GetIpv6Address()
-    {
-        Contract.Assert(_size >= IPv6AddressSize);
-        var bytes = new byte[NumberOfIPv6Labels * 2];
-        Array.Copy(_buffer, 8, bytes, 0, NumberOfIPv6Labels * 2);
-        return new IPAddress(bytes); // TODO: Does scope id matter?
-    }
-
-    private IPAddress GetIPv4Address()
+    // internal for testing
+    internal sealed class SocketAddressIPv6 : SocketAddress
     {
-        Contract.Assert(_size >= IPv4AddressSize);
-        return new IPAddress(new byte[] { _buffer[4], _buffer[5], _buffer[6], _buffer[7] });
-    }
+        private readonly SOCKADDR_IN6 _sockaddr;
 
-    internal static unsafe SocketAddress? CopyOutAddress(IntPtr address)
-    {
-        var addressFamily = *((ushort*)address);
-        if (addressFamily == (ushort)AddressFamily.InterNetwork)
+        internal SocketAddressIPv6(in SOCKADDR_IN6 sockaddr)
         {
-            var v4address = new SocketAddress(AddressFamily.InterNetwork, IPv4AddressSize);
-            fixed (byte* pBuffer = v4address._buffer)
-            {
-                for (var index = 2; index < IPv4AddressSize; index++)
-                {
-                    pBuffer[index] = ((byte*)address)[index];
-                }
-            }
-            return v4address;
+            _sockaddr = sockaddr;
         }
-        if (addressFamily == (ushort)AddressFamily.InterNetworkV6)
+
+        internal override int GetPort()
         {
-            var v6address = new SocketAddress(AddressFamily.InterNetworkV6, IPv6AddressSize);
-            fixed (byte* pBuffer = v6address._buffer)
-            {
-                for (var index = 2; index < IPv6AddressSize; index++)
-                {
-                    pBuffer[index] = ((byte*)address)[index];
-                }
-            }
-            return v6address;
+            // _sockaddr.sin6_port has network byte order.
+            // cast to ushort is important to avoid negative values for the TCP port
+            return (ushort)IPAddress.NetworkToHostOrder((short)_sockaddr.sin6_port);
         }
 
-        return null;
+        internal override IPAddress? GetIPAddress()
+        {
+            // address is network byte order
+            // when CsWin32 gets support for inline arrays, remove 'AsReadOnlySpan' call below.
+            // https://github.com/microsoft/CsWin32/issues/1086
+            return new IPAddress(_sockaddr.sin6_addr.u.Byte.AsReadOnlySpan()); // TODO: Does scope id matter?
+        }
     }
 }
diff --git a/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs b/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs
index 882afdcf1e37..a9a25b8f0092 100644
--- a/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs
+++ b/src/Shared/HttpSys/RequestProcessing/NativeRequestContext.cs
@@ -17,6 +17,7 @@
 using Microsoft.Extensions.Primitives;
 using Windows.Win32;
 using Windows.Win32.Networking.HttpServer;
+using Windows.Win32.Networking.WinSock;
 
 namespace Microsoft.AspNetCore.HttpSys.Internal;
 
@@ -33,9 +34,11 @@ internal unsafe class NativeRequestContext : IDisposable
     private MemoryHandle _memoryHandle;
     private readonly int _bufferAlignment;
     private readonly bool _permanentlyPinned;
-    private bool _disposed;
     private IReadOnlyDictionary<int, ReadOnlyMemory<byte>>? _requestInfo;
 
+    private bool _disposed;
+    private bool _pinsReleased;
+
     [MemberNotNullWhen(false, nameof(_backingBuffer))]
     private bool PermanentlyPinned => _permanentlyPinned;
 
@@ -170,6 +173,11 @@ internal uint Size
         }
     }
 
+    /// <summary>
+    /// Shows whether <see cref="ReleasePins"/> was already invoked on this native request context
+    /// </summary>
+    internal bool PinsReleased => _pinsReleased;
+
     // ReleasePins() should be called exactly once.  It must be called before Dispose() is called, which means it must be called
     // before an object (Request) which closes the RequestContext on demand is returned to the application.
     internal void ReleasePins()
@@ -179,6 +187,7 @@ internal void ReleasePins()
         _memoryHandle.Dispose();
         _memoryHandle = default;
         _nativeRequest = null;
+        _pinsReleased = true;
     }
 
     public bool TryGetTimestamp(HttpSysRequestTimingType timestampType, out long timestamp)
@@ -656,7 +665,8 @@ private void GetUnknownHeadersHelper(IDictionary<string, StringValues> unknownHe
         {
             return null;
         }
-        var address = (IntPtr)(pMemoryBlob + _bufferAlignment - (byte*)_originalBufferAddress + source);
+
+        var address = (SOCKADDR*)(pMemoryBlob + _bufferAlignment - (byte*)_originalBufferAddress + source);
         return SocketAddress.CopyOutAddress(address);
     }
 
diff --git a/src/Shared/Metrics/MetricsConstants.cs b/src/Shared/Metrics/MetricsConstants.cs
index 6cd103eb3d35..6c527315bbf9 100644
--- a/src/Shared/Metrics/MetricsConstants.cs
+++ b/src/Shared/Metrics/MetricsConstants.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Generic;
+
 namespace Microsoft.AspNetCore.Http;
 
 internal static class MetricsConstants
@@ -10,4 +12,13 @@ internal static class MetricsConstants
 
     // Not based on a standard. Larger bucket sizes for longer lasting operations, e.g. HTTP connection duration. See https://github.com/open-telemetry/semantic-conventions/issues/336
     public static readonly IReadOnlyList<double> LongSecondsBucketBoundaries = [0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 30, 60, 120, 300];
+
+    // For Blazor rendering, which should be very fast.
+    public static readonly IReadOnlyList<double> BlazorRenderingSecondsBucketBoundaries = [0.000001, 0.00001, 0.0001, 0.001, 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10];
+
+    // For measuring the length of HTML diff in Blazor rendering.
+    public static readonly IReadOnlyList<int> BlazorRenderingDiffLengthBucketBoundaries = [0, 1, 2, 4, 6, 8, 10, 20, 30, 40, 50, 100];
+
+    // For Blazor circuit sessions, which can last a long time.
+    public static readonly IReadOnlyList<double> BlazorCircuitSecondsBucketBoundaries = [1, 3, 10, 30, 1 * 60, 3 * 60, 10 * 60, 30 * 60, 1 * 60 * 60, 3 * 60 * 60, 10 * 60 * 60, 24 * 60 * 60];
 }
diff --git a/src/Shared/Metrics/TestMeterFactory.cs b/src/Shared/Metrics/TestMeterFactory.cs
index 26f6b5f32a43..83b02580addd 100644
--- a/src/Shared/Metrics/TestMeterFactory.cs
+++ b/src/Shared/Metrics/TestMeterFactory.cs
@@ -8,13 +8,24 @@ namespace Microsoft.AspNetCore.InternalTesting;
 
 internal sealed class TestMeterFactory : IMeterFactory
 {
+    private readonly Lock _lock = new();
+
     public List<Meter> Meters { get; } = new List<Meter>();
 
     public Meter Create(MeterOptions options)
     {
-        var meter = new Meter(options.Name, options.Version, Array.Empty<KeyValuePair<string, object>>(), scope: this);
-        Meters.Add(meter);
-        return meter;
+        lock (_lock)
+        {
+            // Simulate DefaultMeterFactory behavior of returning the same meter instance for the same name/version.
+            if (Meters.FirstOrDefault(m => m.Name == options.Name && m.Version == options.Version) is { } existingMeter)
+            {
+                return existingMeter;
+            }
+
+            var meter = new Meter(options.Name, options.Version, Array.Empty<KeyValuePair<string, object>>(), scope: this);
+            Meters.Add(meter);
+            return meter;
+        }
     }
 
     public void Dispose()
diff --git a/src/Shared/Obsoletions.cs b/src/Shared/Obsoletions.cs
new file mode 100644
index 000000000000..62085ec6b61d
--- /dev/null
+++ b/src/Shared/Obsoletions.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Shared;
+
+internal sealed class Obsoletions
+{
+    internal const string RuntimeSharedUrlFormat = "https://aka.ms/dotnet-warnings/{0}";
+
+    internal const string RuntimeTlsCipherAlgorithmEnumsMessage = "KeyExchangeAlgorithm, KeyExchangeStrength, CipherAlgorithm, CipherStrength, HashAlgorithm and HashStrength properties are obsolete. Use NegotiatedCipherSuite instead.";
+    internal const string RuntimeTlsCipherAlgorithmEnumsDiagId = "SYSLIB0058";
+
+    // ASP.NET Core deprecated API URLs (not using {0} placeholder - these are explicit URLs)
+    internal const string AspNetCoreDeprecate002Url = "https://aka.ms/aspnet/deprecate/002";
+    internal const string AspNetCoreDeprecate003Url = "https://aka.ms/aspnet/deprecate/003";
+    internal const string AspNetCoreDeprecate004Url = "https://aka.ms/aspnet/deprecate/004";
+    internal const string AspNetCoreDeprecate005Url = "https://aka.ms/aspnet/deprecate/005";
+    internal const string AspNetCoreDeprecate006Url = "https://aka.ms/aspnet/deprecate/006";
+    internal const string AspNetCoreDeprecate008Url = "https://aka.ms/aspnet/deprecate/008";
+    internal const string AspNetCoreDeprecate009Url = "https://aka.ms/aspnet/deprecate/009";
+}
diff --git a/src/Shared/PooledArrayBufferWriter.cs b/src/Shared/PooledArrayBufferWriter.cs
index 9fad4a0a404a..cf580650d4ce 100644
--- a/src/Shared/PooledArrayBufferWriter.cs
+++ b/src/Shared/PooledArrayBufferWriter.cs
@@ -93,7 +93,7 @@ public void Dispose()
 
         ClearHelper();
         ArrayPool<T>.Shared.Return(_rentedBuffer);
-        _rentedBuffer = null;
+        _rentedBuffer = null!;
     }
 
     private void CheckIfDisposed()
diff --git a/src/Shared/ProblemDetails/ProblemDetailsDefaults.cs b/src/Shared/ProblemDetails/ProblemDetailsDefaults.cs
index f02a32dcc202..967c1aa48637 100644
--- a/src/Shared/ProblemDetails/ProblemDetailsDefaults.cs
+++ b/src/Shared/ProblemDetails/ProblemDetailsDefaults.cs
@@ -46,6 +46,12 @@ internal static class ProblemDetailsDefaults
             "Not Acceptable"
         ),
 
+        [407] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.8",
+            "Proxy Authentication Required"
+        ),
+
         [408] =
         (
             "https://tools.ietf.org/html/rfc9110#section-15.5.9",
@@ -58,18 +64,60 @@ internal static class ProblemDetailsDefaults
             "Conflict"
         ),
 
+        [410] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.11",
+            "Gone"
+        ),
+
+        [411] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.12",
+            "Length Required"
+        ),
+
         [412] =
         (
             "https://tools.ietf.org/html/rfc9110#section-15.5.13",
             "Precondition Failed"
         ),
 
+        [413] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.14",
+            "Content Too Large"
+        ),
+
+        [414] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.15",
+            "URI Too Long"
+        ),
+
         [415] =
         (
             "https://tools.ietf.org/html/rfc9110#section-15.5.16",
             "Unsupported Media Type"
         ),
 
+        [416] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.17",
+            "Range Not Satisfiable"
+        ),
+
+        [417] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.18",
+            "Expectation Failed"
+        ),
+
+        [421] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.5.20",
+            "Misdirected Request"
+        ),
+
         [422] =
         (
             "https://tools.ietf.org/html/rfc4918#section-11.2",
@@ -88,6 +136,12 @@ internal static class ProblemDetailsDefaults
             "An error occurred while processing your request."
         ),
 
+        [501] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.6.2",
+            "Not Implemented"
+        ),
+
         [502] =
         (
             "https://tools.ietf.org/html/rfc9110#section-15.6.3",
@@ -105,6 +159,12 @@ internal static class ProblemDetailsDefaults
             "https://tools.ietf.org/html/rfc9110#section-15.6.5",
             "Gateway Timeout"
         ),
+
+        [505] =
+        (
+            "https://tools.ietf.org/html/rfc9110#section-15.6.6",
+            "HTTP Version Not Supported"
+        ),
     };
 
     public static void Apply(ProblemDetails problemDetails, int? statusCode)
diff --git a/src/Shared/ResultsTests/FileContentResultTestBase.cs b/src/Shared/ResultsTests/FileContentResultTestBase.cs
index def39cd36f56..fc782b7f03af 100644
--- a/src/Shared/ResultsTests/FileContentResultTestBase.cs
+++ b/src/Shared/ResultsTests/FileContentResultTestBase.cs
@@ -77,7 +77,7 @@ public async Task WriteFileAsync_PreconditionStateShouldProcess_WritesRangeReque
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
         Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
@@ -115,7 +115,7 @@ public async Task WriteFileAsync_IfRangeHeaderValid_WritesRangeRequest()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
 
@@ -154,7 +154,7 @@ public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestIgnored()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -188,7 +188,7 @@ public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestIgnored()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -219,8 +219,8 @@ public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestIgnore
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
-        Assert.Empty(httpResponse.Headers.ContentRange);
+        var body = await streamReader.ReadToEndAsync();
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -250,7 +250,7 @@ public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestedNotS
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         var contentRange = new ContentRangeHeaderValue(byteArray.Length);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -287,11 +287,11 @@ public async Task WriteFileAsync_PreconditionFailed_RangeRequestedIgnored()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Empty(body);
     }
 
@@ -321,12 +321,12 @@ public async Task WriteFileAsync_NotModified_RangeRequestedIgnored()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
         Assert.False(httpResponse.Headers.ContainsKey(HeaderNames.ContentType));
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Empty(body);
     }
 
diff --git a/src/Shared/ResultsTests/FileStreamResultTestBase.cs b/src/Shared/ResultsTests/FileStreamResultTestBase.cs
index f9f63e3318d7..1d2f84b1f8bc 100644
--- a/src/Shared/ResultsTests/FileStreamResultTestBase.cs
+++ b/src/Shared/ResultsTests/FileStreamResultTestBase.cs
@@ -55,7 +55,7 @@ public async Task WriteFileAsync_PreconditionStateShouldProcess_WritesRangeReque
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, byteArray.Length);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -96,7 +96,7 @@ public async Task WriteFileAsync_IfRangeHeaderValid_WritesRequestedRange()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
         var contentRange = new ContentRangeHeaderValue(0, 4, byteArray.Length);
@@ -137,7 +137,7 @@ public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestedIgnored
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -174,7 +174,7 @@ public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestedIgnored()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -207,8 +207,8 @@ public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestIgnore
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
-        Assert.Empty(httpResponse.Headers.ContentRange);
+        var body = await streamReader.ReadToEndAsync();
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -240,7 +240,7 @@ public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestedNotS
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         var contentRange = new ContentRangeHeaderValue(byteArray.Length);
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
@@ -279,11 +279,11 @@ public async Task WriteFileAsync_RangeRequested_PreconditionFailed()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Empty(body);
         Assert.False(readStream.CanSeek);
     }
@@ -318,9 +318,9 @@ public async Task WriteFileAsync_NotModified_RangeRequestedIgnored()
         var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
         Assert.False(httpResponse.Headers.ContainsKey(HeaderNames.ContentType));
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Empty(body);
         Assert.False(readStream.CanSeek);
     }
@@ -356,7 +356,7 @@ public async Task WriteFileAsync_RangeRequested_FileLengthZeroOrNull(long? fileL
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(lastModified.ToString("R"), httpResponse.Headers.LastModified);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
         var contentRange = new ContentRangeHeaderValue(byteArray.Length);
diff --git a/src/Shared/ResultsTests/PhysicalFileResultTestBase.cs b/src/Shared/ResultsTests/PhysicalFileResultTestBase.cs
index 6c37f6775693..dedcf6ad1713 100644
--- a/src/Shared/ResultsTests/PhysicalFileResultTestBase.cs
+++ b/src/Shared/ResultsTests/PhysicalFileResultTestBase.cs
@@ -55,7 +55,7 @@ public async Task WriteFileAsync_WritesRangeRequested(long? start, long? end, lo
         Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(contentLength, httpResponse.ContentLength);
         Assert.Equal(Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt")), sendFile.Name);
         Assert.Equal(startResult, sendFile.Offset);
@@ -86,7 +86,7 @@ public async Task WriteFileAsync_IfRangeHeaderValid_WritesRequestedRange()
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         var contentRange = new ContentRangeHeaderValue(0, 3, 34);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(entityTag.ToString(), httpResponse.Headers.ETag);
         Assert.Equal(4, httpResponse.ContentLength);
         Assert.Equal(Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt")), sendFile.Name);
@@ -115,7 +115,7 @@ public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestedIgnored
         // Assert
         var httpResponse = httpContext.Response;
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt")), sendFile.Name);
         Assert.Equal(0, sendFile.Offset);
         Assert.Null(sendFile.Length);
@@ -142,7 +142,7 @@ public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestedIgnored()
         // Assert
         var httpResponse = httpContext.Response;
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt")), sendFile.Name);
         Assert.Equal(0, sendFile.Offset);
         Assert.Null(sendFile.Length);
@@ -170,8 +170,8 @@ public async Task WriteFileAsync_RangeHeaderMalformed_RangeRequestIgnored(string
         // Assert
         var httpResponse = httpContext.Response;
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt")), sendFile.Name);
         Assert.Equal(0, sendFile.Offset);
         Assert.Null(sendFile.Length);
@@ -198,12 +198,12 @@ public async Task WriteFileAsync_RangeRequestedNotSatisfiable(string rangeString
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         var contentRange = new ContentRangeHeaderValue(34);
         Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(0, httpResponse.ContentLength);
         Assert.Empty(body);
     }
@@ -227,11 +227,11 @@ public async Task WriteFileAsync_RangeRequested_PreconditionFailed()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Empty(body);
     }
 
@@ -254,11 +254,11 @@ public async Task WriteFileAsync_RangeRequested_NotModified()
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.False(httpResponse.Headers.ContainsKey(HeaderNames.ContentType));
         Assert.Empty(body);
     }
@@ -315,7 +315,7 @@ public async Task ExecuteResultAsync_CallsSendFileAsyncWithRequestedRange_IfIHtt
         Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(contentLength, httpResponse.ContentLength);
     }
 
@@ -387,7 +387,7 @@ public async Task ExecuteAsync_ThrowsNotSupported_ForNonRootedPaths(string path)
         Assert.Equal(expectedMessage, ex.Message);
     }
 
-    [Theory]
+    [Theory(Skip = "Throws NotSupportedException instead of DirectoryNotFoundException")]
     [InlineData("/SubFolder/SubFolderTestFile.txt")]
     [InlineData("\\SubFolder\\SubFolderTestFile.txt")]
     [InlineData("/SubFolder\\SubFolderTestFile.txt")]
@@ -396,26 +396,26 @@ public async Task ExecuteAsync_ThrowsNotSupported_ForNonRootedPaths(string path)
     [InlineData(".\\SubFolder\\SubFolderTestFile.txt")]
     [InlineData("./SubFolder\\SubFolderTestFile.txt")]
     [InlineData(".\\SubFolder/SubFolderTestFile.txt")]
-    public void ExecuteAsync_ThrowsDirectoryNotFound_IfItCanNotFindTheDirectory_ForRootPaths(string path)
+    public async Task ExecuteAsync_ThrowsDirectoryNotFound_IfItCanNotFindTheDirectory_ForRootPaths(string path)
     {
         // Arrange
         var httpContext = GetHttpContext();
 
         // Act & Assert
-        Assert.ThrowsAsync<DirectoryNotFoundException>(
+        await Assert.ThrowsAsync<DirectoryNotFoundException>(
             () => ExecuteAsync(httpContext, path, "text/plain"));
     }
 
-    [Theory]
+    [Theory(Skip = "Throws NotSupportedException instead of FileNotFoundException")]
     [InlineData("/FilePathResultTestFile.txt")]
     [InlineData("\\FilePathResultTestFile.txt")]
-    public void ExecuteAsync_ThrowsFileNotFound_WhenFileDoesNotExist_ForRootPaths(string path)
+    public async Task ExecuteAsync_ThrowsFileNotFound_WhenFileDoesNotExist_ForRootPaths(string path)
     {
         // Arrange
         var httpContext = GetHttpContext();
 
         // Act & Assert
-        Assert.ThrowsAsync<FileNotFoundException>(
+        await Assert.ThrowsAsync<FileNotFoundException>(
             () => ExecuteAsync(httpContext, path, "text/plain"));
     }
 
diff --git a/src/Shared/ResultsTests/VirtualFileResultTestBase.cs b/src/Shared/ResultsTests/VirtualFileResultTestBase.cs
index 23d276eb24d7..b3b5b44b9e34 100644
--- a/src/Shared/ResultsTests/VirtualFileResultTestBase.cs
+++ b/src/Shared/ResultsTests/VirtualFileResultTestBase.cs
@@ -67,7 +67,7 @@ public async Task WriteFileAsync_WritesRangeRequested(
         Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(contentLength, httpResponse.ContentLength);
         Assert.Equal(path, sendFileFeature.Name);
         Assert.Equal(startResult, sendFileFeature.Offset);
@@ -205,8 +205,8 @@ public async Task WriteFileAsync_RangeHeaderMalformed_RangeRequestIgnored(string
         // Assert
         var httpResponse = httpContext.Response;
         Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(path, sendFileFeature.Name);
         Assert.Equal(0, sendFileFeature.Offset);
         Assert.Null(sendFileFeature.Length);
@@ -240,12 +240,12 @@ public async Task WriteFileAsync_RangeRequestedNotSatisfiable(string rangeString
         var httpResponse = httpContext.Response;
         httpResponse.Body.Seek(0, SeekOrigin.Begin);
         var streamReader = new StreamReader(httpResponse.Body);
-        var body = streamReader.ReadToEndAsync().Result;
+        var body = await streamReader.ReadToEndAsync();
         var contentRange = new ContentRangeHeaderValue(33);
         Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(0, httpResponse.ContentLength);
         Assert.Empty(body);
     }
@@ -276,8 +276,8 @@ public async Task WriteFileAsync_RangeRequested_PreconditionFailed()
         var httpResponse = httpContext.Response;
         Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Null(sendFileFeature.Name); // Not called
     }
 
@@ -307,8 +307,8 @@ public async Task WriteFileAsync_RangeRequested_NotModified()
         var httpResponse = httpContext.Response;
         Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
         Assert.Null(httpResponse.ContentLength);
-        Assert.Empty(httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.Equal(0, httpResponse.Headers.ContentRange.Count);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.False(httpResponse.Headers.ContainsKey(HeaderNames.ContentType));
         Assert.Null(sendFileFeature.Name); // Not called
     }
@@ -350,7 +350,7 @@ public async Task ExecuteResultAsync_CallsSendFileAsyncWithRequestedRange_IfIHtt
         Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
         Assert.Equal("bytes", httpResponse.Headers.AcceptRanges);
         Assert.Equal(contentRange.ToString(), httpResponse.Headers.ContentRange);
-        Assert.NotEmpty(httpResponse.Headers.LastModified);
+        Assert.NotEqual(0, httpResponse.Headers.LastModified.Count);
         Assert.Equal(contentLength, httpResponse.ContentLength);
     }
 
diff --git a/src/Shared/Roslyn/MvcFacts.cs b/src/Shared/Roslyn/MvcFacts.cs
index f8408803a598..d4c74f64fb78 100644
--- a/src/Shared/Roslyn/MvcFacts.cs
+++ b/src/Shared/Roslyn/MvcFacts.cs
@@ -70,7 +70,8 @@ public static bool IsControllerAction(IMethodSymbol method, INamedTypeSymbol non
         }
 
         // Overridden methods from Object class, e.g. Equals(Object), GetHashCode(), etc., are not valid.
-        if (GetDeclaringType(method).SpecialType == SpecialType.System_Object)
+        var declaringType = GetDeclaringType(method);
+        if (declaringType == null || declaringType.SpecialType == SpecialType.System_Object)
         {
             return false;
         }
@@ -98,13 +99,13 @@ public static bool IsControllerAction(IMethodSymbol method, INamedTypeSymbol non
         return method.DeclaredAccessibility == Accessibility.Public;
     }
 
-    private static INamedTypeSymbol GetDeclaringType(IMethodSymbol method)
+    private static INamedTypeSymbol? GetDeclaringType(IMethodSymbol method)
     {
         while (method.IsOverride)
         {
             if (method.OverriddenMethod == null)
             {
-                throw new InvalidOperationException($"{nameof(method.OverriddenMethod)} cannot be null.");
+                return null;
             }
 
             method = method.OverriddenMethod;
diff --git a/src/Shared/RoslynUtils/SymbolExtensions.cs b/src/Shared/RoslynUtils/SymbolExtensions.cs
index cb41458638fc..cc8eb3d68710 100644
--- a/src/Shared/RoslynUtils/SymbolExtensions.cs
+++ b/src/Shared/RoslynUtils/SymbolExtensions.cs
@@ -67,6 +67,25 @@ public static bool HasAttribute(this ImmutableArray<AttributeData> attributes, I
         return attributes.TryGetAttribute(attributeType, out _);
     }
 
+    public static bool HasAttribute(this ITypeSymbol typeSymbol, INamedTypeSymbol attributeSymbol)
+    {
+        var current = typeSymbol;
+
+        while (current is not null)
+        {
+            if (current.GetAttributes().Any(attr =>
+                attr.AttributeClass is not null &&
+                SymbolEqualityComparer.Default.Equals(attr.AttributeClass, attributeSymbol)))
+            {
+                return true;
+            }
+
+            current = current.BaseType;
+        }
+
+        return false;
+    }
+
     public static bool TryGetAttribute(this ImmutableArray<AttributeData> attributes, INamedTypeSymbol attributeType, [NotNullWhen(true)] out AttributeData? matchedAttribute)
     {
         foreach (var attributeData in attributes)
@@ -177,11 +196,27 @@ public static string GetDefaultValueString(this IParameterSymbol parameterSymbol
     {
         return !parameterSymbol.HasExplicitDefaultValue
             ? "null"
-            : InnerGetDefaultValueString(parameterSymbol.ExplicitDefaultValue);
+            : InnerGetDefaultValueString(parameterSymbol.ExplicitDefaultValue, parameterSymbol.Type);
     }
 
-    private static string InnerGetDefaultValueString(object? defaultValue)
+    private static string InnerGetDefaultValueString(object? defaultValue, ITypeSymbol parameterType)
     {
+        // Handle enum types with proper casting
+        if (IsEnumType(parameterType, out var enumType))
+        {
+            return $"({enumType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}){SymbolDisplay.FormatPrimitive(defaultValue!, false, false)}";
+        }
+
+        // Handle nullable enum types
+        if (IsNullableEnumType(parameterType, out var underlyingEnumType))
+        {
+            if (defaultValue == null)
+            {
+                return "default";
+            }
+            return $"({underlyingEnumType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}){SymbolDisplay.FormatPrimitive(defaultValue!, false, false)}";
+        }
+
         return defaultValue switch
         {
             string s => SymbolDisplay.FormatLiteral(s, true),
@@ -196,7 +231,7 @@ private static string InnerGetDefaultValueString(object? defaultValue)
             double d when d is double.PositiveInfinity => "double.PositiveInfinity",
             double d when d is double.NaN => "double.NaN",
             decimal d => $"{SymbolDisplay.FormatPrimitive(d, false, false)}M",
-            _ => SymbolDisplay.FormatPrimitive(defaultValue, false, false),
+            _ => SymbolDisplay.FormatPrimitive(defaultValue, false, false)!,
         };
     }
 
@@ -227,4 +262,26 @@ public static string GetParameterInfoFromConstructorCode(this IParameterSymbol p
         }
         return "null";
     }
+
+    private static bool IsEnumType(ITypeSymbol typeSymbol, out ITypeSymbol enumType)
+    {
+        enumType = typeSymbol;
+        return typeSymbol.TypeKind == TypeKind.Enum;
+    }
+
+    private static bool IsNullableEnumType(ITypeSymbol typeSymbol, [NotNullWhen(true)] out ITypeSymbol? underlyingEnumType)
+    {
+        underlyingEnumType = null;
+        if (typeSymbol.OriginalDefinition?.SpecialType == SpecialType.System_Nullable_T &&
+            typeSymbol is INamedTypeSymbol namedType)
+        {
+            var underlyingType = namedType.TypeArguments.FirstOrDefault();
+            if (underlyingType?.TypeKind == TypeKind.Enum)
+            {
+                underlyingEnumType = underlyingType;
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/Shared/RoslynUtils/WellKnownTypeData.cs b/src/Shared/RoslynUtils/WellKnownTypeData.cs
index 7a4fa428c105..a64dd1a426e8 100644
--- a/src/Shared/RoslynUtils/WellKnownTypeData.cs
+++ b/src/Shared/RoslynUtils/WellKnownTypeData.cs
@@ -32,6 +32,7 @@ public enum WellKnownType
         Microsoft_AspNetCore_Http_IFormCollection,
         Microsoft_AspNetCore_Http_IFormFileCollection,
         Microsoft_AspNetCore_Http_IFormFile,
+        System_Collections_IEnumerable,
         System_DateOnly,
         System_DateTimeOffset,
         System_IO_Stream,
@@ -117,6 +118,15 @@ public enum WellKnownType
         Microsoft_AspNetCore_Authorization_IAllowAnonymous,
         Microsoft_AspNetCore_Authorization_IAuthorizeData,
         System_AttributeUsageAttribute,
+        System_Text_Json_Serialization_JsonDerivedTypeAttribute,
+        System_Text_Json_Serialization_JsonIgnoreAttribute,
+        System_ComponentModel_DataAnnotations_DisplayAttribute,
+        System_ComponentModel_DataAnnotations_ValidationAttribute,
+        System_ComponentModel_DataAnnotations_RequiredAttribute,
+        System_ComponentModel_DataAnnotations_CustomValidationAttribute,
+        System_ComponentModel_DataAnnotations_IValidatableObject,
+        Microsoft_Extensions_Validation_SkipValidationAttribute,
+        System_Type,
     }
 
     public static string[] WellKnownTypeNames =
@@ -146,6 +156,7 @@ public enum WellKnownType
         "Microsoft.AspNetCore.Http.IFormCollection",
         "Microsoft.AspNetCore.Http.IFormFileCollection",
         "Microsoft.AspNetCore.Http.IFormFile",
+        "System.Collections.IEnumerable",
         "System.DateOnly",
         "System.DateTimeOffset",
         "System.IO.Stream",
@@ -231,5 +242,14 @@ public enum WellKnownType
         "Microsoft.AspNetCore.Authorization.IAllowAnonymous",
         "Microsoft.AspNetCore.Authorization.IAuthorizeData",
         "System.AttributeUsageAttribute",
+        "System.Text.Json.Serialization.JsonDerivedTypeAttribute",
+        "System.Text.Json.Serialization.JsonIgnoreAttribute",
+        "System.ComponentModel.DataAnnotations.DisplayAttribute",
+        "System.ComponentModel.DataAnnotations.ValidationAttribute",
+        "System.ComponentModel.DataAnnotations.RequiredAttribute",
+        "System.ComponentModel.DataAnnotations.CustomValidationAttribute",
+        "System.ComponentModel.DataAnnotations.IValidatableObject",
+        "Microsoft.Extensions.Validation.SkipValidationAttribute",
+        "System.Type",
     ];
 }
diff --git a/src/Shared/RoslynUtils/WellKnownTypes.cs b/src/Shared/RoslynUtils/WellKnownTypes.cs
index a3a5cd3061b7..05925ddf68bc 100644
--- a/src/Shared/RoslynUtils/WellKnownTypes.cs
+++ b/src/Shared/RoslynUtils/WellKnownTypes.cs
@@ -58,7 +58,28 @@ public INamedTypeSymbol Get(SpecialType type)
         return _compilation.GetSpecialType(type);
     }
 
+    /// <summary>
+    /// Returns the type symbol for the specified well-known type, or throws if the type cannot be found.
+    /// </summary>
     public INamedTypeSymbol Get(WellKnownTypeData.WellKnownType type)
+    {
+        return Get(type, throwOnNotFound: true);
+    }
+
+    /// <summary>
+    /// Returns the type symbol for the specified well-known type, or a special marker type symbol if the type cannot be found.
+    /// </summary>
+    /// <remarks>
+    /// We use a special marker type for cases where some types can be legitimately missing.
+    /// E.g. The Microsoft.Extensions.Validation source generator checks against some types
+    /// from the shared framework which are missing in Blazor WebAssembly SDK projects.
+    /// </remarks>
+    public INamedTypeSymbol GetOptional(WellKnownTypeData.WellKnownType type)
+    {
+        return Get(type, throwOnNotFound: false);
+    }
+
+    private INamedTypeSymbol Get(WellKnownTypeData.WellKnownType type, bool throwOnNotFound)
     {
         var index = (int)type;
         var symbol = _lazyWellKnownTypes[index];
@@ -69,16 +90,22 @@ public INamedTypeSymbol Get(WellKnownTypeData.WellKnownType type)
 
         // Symbol hasn't been added to the cache yet.
         // Resolve symbol from name, cache, and return.
-        return GetAndCache(index);
+        return GetAndCache(index, throwOnNotFound);
     }
 
-    private INamedTypeSymbol GetAndCache(int index)
+    private INamedTypeSymbol GetAndCache(int index, bool throwOnNotFound)
     {
         var result = GetTypeByMetadataNameInTargetAssembly(WellKnownTypeData.WellKnownTypeNames[index]);
-        if (result == null)
+
+        if (result == null && throwOnNotFound)
         {
             throw new InvalidOperationException($"Failed to resolve well-known type '{WellKnownTypeData.WellKnownTypeNames[index]}'.");
         }
+        else
+        {
+            result ??= _compilation.GetTypeByMetadataName(typeof(MissingType).FullName!)!;
+        }
+
         Interlocked.CompareExchange(ref _lazyWellKnownTypes[index], result, null);
 
         // GetTypeByMetadataName should always return the same instance for a name.
@@ -159,4 +186,6 @@ public static bool Implements(ITypeSymbol? type, ITypeSymbol interfaceType)
         }
         return false;
     }
+
+    internal class MissingType { }
 }
diff --git a/src/Shared/ServerInfrastructure/BufferExtensions.cs b/src/Shared/ServerInfrastructure/BufferExtensions.cs
index d68ccc114560..64a0704edd3e 100644
--- a/src/Shared/ServerInfrastructure/BufferExtensions.cs
+++ b/src/Shared/ServerInfrastructure/BufferExtensions.cs
@@ -129,52 +129,41 @@ internal static void WriteAscii(ref this BufferWriter<PipeWriter> buffer, string
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static unsafe void WriteNumeric(ref this BufferWriter<PipeWriter> buffer, ulong number)
+    internal static void WriteNumeric(ref this BufferWriter<PipeWriter> bufferWriter, ulong number)
     {
         const byte AsciiDigitStart = (byte)'0';
 
-        var span = buffer.Span;
-        var bytesLeftInBlock = span.Length;
+        var buffer = bufferWriter.Span;
 
         // Fast path, try copying to the available memory directly
-        var simpleWrite = true;
-        fixed (byte* output = span)
+        if (number < 10 && buffer.Length >= 1)
         {
-            var start = output;
-            if (number < 10 && bytesLeftInBlock >= 1)
-            {
-                *(start) = (byte)(((uint)number) + AsciiDigitStart);
-                buffer.Advance(1);
-            }
-            else if (number < 100 && bytesLeftInBlock >= 2)
-            {
-                var val = (uint)number;
-                var tens = (byte)((val * 205u) >> 11); // div10, valid to 1028
-
-                *(start) = (byte)(tens + AsciiDigitStart);
-                *(start + 1) = (byte)(val - (tens * 10) + AsciiDigitStart);
-                buffer.Advance(2);
-            }
-            else if (number < 1000 && bytesLeftInBlock >= 3)
-            {
-                var val = (uint)number;
-                var digit0 = (byte)((val * 41u) >> 12); // div100, valid to 1098
-                var digits01 = (byte)((val * 205u) >> 11); // div10, valid to 1028
-
-                *(start) = (byte)(digit0 + AsciiDigitStart);
-                *(start + 1) = (byte)(digits01 - (digit0 * 10) + AsciiDigitStart);
-                *(start + 2) = (byte)(val - (digits01 * 10) + AsciiDigitStart);
-                buffer.Advance(3);
-            }
-            else
-            {
-                simpleWrite = false;
-            }
+            buffer[0] = (byte)(((uint)number) + AsciiDigitStart);
+            bufferWriter.Advance(1);
         }
+        else if (number < 100 && buffer.Length >= 2)
+        {
+            var val = (uint)number;
+            var tens = (uint)(byte)((val * 205u) >> 11); // div10, valid to 1028
 
-        if (!simpleWrite)
+            buffer[0] = (byte)(tens + AsciiDigitStart);
+            buffer[1] = (byte)(val - (tens * 10) + AsciiDigitStart);
+            bufferWriter.Advance(2);
+        }
+        else if (number < 1000 && buffer.Length >= 3)
+        {
+            var val = (uint)number;
+            var digit0 = (uint)(byte)((val * 41u) >> 12); // div100, valid to 1098
+            var digits01 = (uint)(byte)((val * 205u) >> 11); // div10, valid to 1028
+
+            buffer[0] = (byte)(digit0 + AsciiDigitStart);
+            buffer[1] = (byte)(digits01 - (digit0 * 10) + AsciiDigitStart);
+            buffer[2] = (byte)(val - (digits01 * 10) + AsciiDigitStart);
+            bufferWriter.Advance(3);
+        }
+        else
         {
-            WriteNumericMultiWrite(ref buffer, number);
+            WriteNumericMultiWrite(ref bufferWriter, number);
         }
     }
 
diff --git a/src/Shared/ServerInfrastructure/DuplexPipeStreamAdapter.cs b/src/Shared/ServerInfrastructure/DuplexPipeStreamAdapter.cs
index aa2fd03a6d9a..668e18577254 100644
--- a/src/Shared/ServerInfrastructure/DuplexPipeStreamAdapter.cs
+++ b/src/Shared/ServerInfrastructure/DuplexPipeStreamAdapter.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 internal class DuplexPipeStreamAdapter<TStream> : DuplexPipeStream, IDuplexPipe where TStream : Stream
 {
     private bool _disposed;
-    private readonly object _disposeLock = new object();
+    private readonly Lock _disposeLock = new();
 
     public DuplexPipeStreamAdapter(IDuplexPipe duplexPipe, Func<Stream, TStream> createStream) :
         this(duplexPipe, new StreamPipeReaderOptions(leaveOpen: true), new StreamPipeWriterOptions(leaveOpen: true), createStream)
diff --git a/src/Shared/Shared.slnf b/src/Shared/Shared.slnf
index ab5931604623..9708482ea323 100644
--- a/src/Shared/Shared.slnf
+++ b/src/Shared/Shared.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
       "src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
diff --git a/src/Shared/SizeLimitedStream.cs b/src/Shared/SizeLimitedStream.cs
index 6ee758e57de3..4d249a36b360 100644
--- a/src/Shared/SizeLimitedStream.cs
+++ b/src/Shared/SizeLimitedStream.cs
@@ -1,19 +1,22 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable enable
+
 internal sealed class SizeLimitedStream : Stream
 {
     private readonly Stream _innerStream;
     private readonly long? _sizeLimit;
-
+    private readonly Action<long>? _handleSizeLimit;
     private long _totalBytesRead;
 
-    public SizeLimitedStream(Stream innerStream, long? sizeLimit)
+    public SizeLimitedStream(Stream innerStream, long? sizeLimit, Action<long>? handleSizeLimit = null)
     {
         ArgumentNullException.ThrowIfNull(innerStream);
 
         _innerStream = innerStream;
         _sizeLimit = sizeLimit;
+        _handleSizeLimit = handleSizeLimit;
     }
 
     public override bool CanRead => _innerStream.CanRead;
@@ -48,7 +51,14 @@ public override int Read(byte[] buffer, int offset, int count)
         _totalBytesRead += bytesRead;
         if (_totalBytesRead > _sizeLimit)
         {
-            throw new InvalidOperationException("The maximum number of bytes have been read.");
+            if (_handleSizeLimit != null)
+            {
+                _handleSizeLimit(_sizeLimit.Value);
+            }
+            else
+            {
+                throw new InvalidOperationException("The maximum number of bytes have been read.");
+            }
         }
 
         return bytesRead;
@@ -81,7 +91,14 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer, Cancellation
         _totalBytesRead += bytesRead;
         if (_totalBytesRead > _sizeLimit)
         {
-            throw new InvalidOperationException("The maximum number of bytes have been read.");
+            if (_handleSizeLimit != null)
+            {
+                _handleSizeLimit(_sizeLimit.Value);
+            }
+            else
+            {
+                throw new InvalidOperationException("The maximum number of bytes have been read.");
+            }
         }
 
         return bytesRead;
diff --git a/src/Shared/StackTrace/StackFrame/StackTraceHelper.cs b/src/Shared/StackTrace/StackFrame/StackTraceHelper.cs
index dd4bb9f6f49f..960199742dee 100644
--- a/src/Shared/StackTrace/StackFrame/StackTraceHelper.cs
+++ b/src/Shared/StackTrace/StackFrame/StackTraceHelper.cs
@@ -46,7 +46,7 @@ public static IList<StackFrameInfo> GetFrames(Exception exception, out Aggregate
             var method = frame.GetMethod();
 
             // MethodInfo should always be available for methods in the stack, but double check for null here.
-            // Apps with trimming enabled may remove some metdata. Better to be safe than sorry.
+            // Apps with trimming enabled may remove some metadata. Better to be safe than sorry.
             if (method == null)
             {
                 continue;
diff --git a/src/Shared/TestCertificates/https-rsa-protected.key b/src/Shared/TestCertificates/https-rsa-protected.key
deleted file mode 100644
index 34fba0f776de..000000000000
--- a/src/Shared/TestCertificates/https-rsa-protected.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFNjBgBgkqhkiG9w0BBQ0wUzAyBgkqhkiG9w0BBQwwJQQQ93oRxzJ5UoNOb/zN
-x5cdsAIDAYagMAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAuHsE18X/Z9ZVe
-aBl7C55nBIIE0AABqjc9ERcLYNpCRpA6c/TFG62m4Mr9J4dU4g1WD07t7uLxZiRi
-Pl0YOjCulljMsevAW5PlLxi4ffJ+I0/UB1WOfzEMhcj7o1qG0Uv55B7WRuWKw1Zr
-jo0bDY5Man48ZjpqMMBdnWhyHdIDm+WD0OyN98mpsN6SCQMjvx91M+klrsp7LOMM
-88HHS0RFVKGF9hYSy6rCwMJWf+7QGO2wXfq+MKvJ/bBgPGDLwN4phUCyocnR0swD
-/XZNiiw0xIC8OxAKhc6BV4AJkjNs32THdBOCGY6B4P/9Zo5W29S3ja/hGsMQAA27
-QtIDg74HpX7TgIyqoc1oiLNIWW/+jUHSEYJsTPlg5VYWsXUfSHZpz8EJvKt2tyvt
-vBGOCLDDZD4GVXhPigKG6zJSJeTe94/VlwPhNSEucKeaALdax5t3HvPNzWKFX57E
-aC82/IxRrjgHmgsGSZdMi08HY6K9GAVBFpIGvXOGtRq7w8zO/KagAvSwAOLLtOs7
-iEuAQxD+cKLRT59c4E7r5W7BT+faq85ovqdXe5Edtl3cT81zsl27pZvQrcrTPbZe
-4OeIdWxOmOnC/bXvRHNd9XuYadXXazBoFbe9yPwjqnflEh39CyvlOZXeaQXSdsEM
-1IBhddRTorO/I8M/znu9glqIa5ya1NA+4ujmf4OnJLtsrlKQa65VPVTrFdeYuMr0
-VfOuuIye2OdyJ6jS0a1PYQm4bEEz6UR88dnmnhDx6i8/l2wW5+CArA/x8IBYboBM
-NJpJY9bHpic1AhjnjnTtFz2s4uYPi5g9peBizarZn+6OJvgYqs4a8SI92dA3E2o4
-a/1j7xlLlgXnVRLBMibxqzjMt4Zt7Nj+BaN1owrB/q04AWS2M4TSQz+NYOZwNFxB
-dzb+fysTLK5XNEYq6rSg+0i+EKZl8Jb/t4d8SLPVr/tdfDt9BtZ0nTgjvy1HWy1p
-kQdm13XfK1/9KsePH/Jb6dvN/u6ubV+ZqI7Bc7VyTi0bKMdpH2K8/dtopNyDZ/P+
-/IsyyDYTorgJB/klSih/W0hqpSBbEAmlSBfBxP1/ozBEGR2oF20JOCFyD6UXQR/1
-V7r2KtplpyfXaIWh4fABitAMHz7VgmEIQ2H9cB4Ey9jdRPQ/1p+OgGjfaFJQ0uYM
-987TDtjkuukJYnPZNIIx0Yv3iAX16XmhzJixWSMUIJiWfSiz0aTjBxsPQVPTQV+M
-6BgFf3riBApZYlVVJsGIie2XTvu/tHRhfQrxccl63HN7yAeJheQnoscin6Z5TKN/
-U8Ouy/QGiATatKUEUjr4lN+BYySf8F6e3cAAeAx/ZnFvGw5z8fwNYBjVWg/83bTw
-9rS+tSk8VsvTdkcKoNbbDtw+SwYfZSbMUBFm0B13190iJZoyWI+5ZKPnZ2CvOZhX
-PjGTOnh6Diq907l2Q7S/v8SLe0bCHCHVBy+CcPWVDZ6Z7V5cJ/W8TvFPcSGw1UCl
-tKPp862uDaPKvGxqGDq0vGouEUrtJKZ279Lnrtz1n8raUj0Gxa+KXqLACh8dXCzK
-ZgCTPhfAjZcYgA73edW0whNNH9MNInDGulT/arCK3HTkFPczD+7wA8Ojw/LxKFJs
-0d8vtILbmLv46CO+wvIdWrW1c7PCrGJDf9Zuw06vIH7hpW9swSM55k9/
------END ENCRYPTED PRIVATE KEY-----
\ No newline at end of file
diff --git a/src/Shared/TestCertificates/https-rsa.crt b/src/Shared/TestCertificates/https-rsa.crt
deleted file mode 100644
index 0421f377734d..000000000000
Binary files a/src/Shared/TestCertificates/https-rsa.crt and /dev/null differ
diff --git a/src/Shared/TestCertificates/https-rsa.key b/src/Shared/TestCertificates/https-rsa.key
deleted file mode 100644
index 3462b060b3d5..000000000000
--- a/src/Shared/TestCertificates/https-rsa.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwK6M1tIuVqrKn
-JDT/uBvEz+dMR5dExiWh9Df0aHVL6ZIQs2upwiqoViJSduE3rvSdjZMpvOzE1YUO
-Mh8dAsHrcTkXzeF77yF4GnR8XA6FNvIWYhiCxSM1f/cOdLDv0wmaANHoNYHYtr9W
-nofuH4QQzI+njLWIE3ZEl95+YXM80nnP+L4ggD46nu2Dd5LRBcpFP6FkCthF+iN+
-IUMdVHylsxhRPY3Dj+xEccPmAUZvCchWXWgGwsW0UygFECqLhWupt0Ysd8rKGRTx
-HaI7z/5S1c8VlUgk4Q7FRxq7HiiNdbkrViJkES3ghJ2LbKYMwkGXmfbnam1qRagO
-BWnYnnZpAgMBAAECggEBAKlBs7Pke3tXHf/RnI3XX+6OZMX3vlDYIs3f6maKea9u
-f+RFzXmyz/MdliouhyFNmT1KCQq/tadDEWvbIeNog9Fl3ZmON0YwMLLIkAPvGhBJ
-AvwYUT5KkxJSmJWt7VTtKDtq8EEuL0t8AIcDFsvkQak2MAqk+L/9GtK6Koy3qdTT
-Nx0to6jcSvAz6cBC/WY4u2fmGJb6RoQR0K7KWdovkhb60/5PF+tI5afDF4zO6UzD
-c7qxb9/rPqhsqomC1isS+MdRWl6edW28RYzhZNxtux0KKy+HYfbrlya41HIYOdCN
-h9IEc46tOuEZ4aARHq0eNkLr8oBARcjHUlfPnBpmDGUCgYEA1DYAd45N13DTAITd
-MIwiKLHDH5XLmKdCGPk/LNd0asyw7Yw0ffJ2LUtCKt1HyvVKaRsCjzmC7pN1d/JG
-Sni+zDgdip9f9vERVF/F/sA9h+zH+Qwx5DUDhu6a4naey3t3t2hyRSbH+e+M7+1b
-4/i0nlsD35/lmwwfM7zgSZSmCIcCgYEA1IXOATUURWPilI9HoHt7yhGEvgXvquXC
-KF4K+1XNnC7AXO2jwz62xg6rnkFBxiPtvnN+fCVajMusyxCwarc/QyuctcQEm8jK
-+vOI1dJM4Qgy+MNzcat7MjJCBpi6oFXAKDu3CGzfUw0SKNepc9cST8x9FsMgcC8K
-OKbLWLK2dY8CgYAIgMlwAPG5ijnKMYizY0oTG1xYLaZkzX7mhUY0w8VUajNEsXOB
-AHAfzH4wPYGc7ks2/vARURqf+KSiU8DhRwlOIYl9fnlX6bzqBpRmasmMYr54ijaN
-kFo909286Uffm2jmnnbFspIcv66EBpzB+7sxBTCYi02l8sxlRFIwYJZujQKBgAO5
-2NPCl3lj9+v82xegMppnVjlypzIK1y2YAH9JkNJFK5A1hmJ87f1o8m9S25FavedR
-5QzOJtlDFON2hnFIhy5pTFUPe7kzewONU3/UMQ7c8u/TlWmPxRgrM2ckNFltR3It
-Idde+UdeekwHA+yI/8QwZJ0KjL4KxRYbLoN+lp5XAoGAbVNfX57Hjc/TxrC7nTyQ
-0Mqi8S1t7Yo/Je/5Ow/8W3zVrzMYTipwJyBrAMhhhOTuvWc6lnJFW6XkyftQPwI6
-RDD3i9DELPhIPhh4kz7ID5OPtRnf3hrvXDOyucSV66RpxSSb5l7i92a8wTFWeGlN
-nLbTYpaPuX1fCIbRnigXI3A=
------END PRIVATE KEY-----
diff --git a/src/Shared/TestCertificates/https-rsa.pem b/src/Shared/TestCertificates/https-rsa.pem
deleted file mode 100644
index 2a2d0312f342..000000000000
--- a/src/Shared/TestCertificates/https-rsa.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIIS+Mx2/wTMMQwDQYJKoZIhvcNAQELBQAwFDESMBAGA1UE
-AxMJbG9jYWxob3N0MB4XDTIwMDcwMTE5MjcwOVoXDTIxMDcwMTE5MjcwOVowFDES
-MBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsCujNbSLlaqypyQ0/7gbxM/nTEeXRMYlofQ39Gh1S+mSELNrqcIqqFYiUnbh
-N670nY2TKbzsxNWFDjIfHQLB63E5F83he+8heBp0fFwOhTbyFmIYgsUjNX/3DnSw
-79MJmgDR6DWB2La/Vp6H7h+EEMyPp4y1iBN2RJfefmFzPNJ5z/i+IIA+Op7tg3eS
-0QXKRT+hZArYRfojfiFDHVR8pbMYUT2Nw4/sRHHD5gFGbwnIVl1oBsLFtFMoBRAq
-i4VrqbdGLHfKyhkU8R2iO8/+UtXPFZVIJOEOxUcaux4ojXW5K1YiZBEt4ISdi2ym
-DMJBl5n252ptakWoDgVp2J52aQIDAQABo2IwYDAMBgNVHRMBAf8EAjAAMA4GA1Ud
-DwEB/wQEAwIFoDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDATAXBgNVHREBAf8EDTAL
-gglsb2NhbGhvc3QwDwYKKwYBBAGCN1QBAQQBATANBgkqhkiG9w0BAQsFAAOCAQEA
-ZD9JA++dIuBke7GYYlJuKTMHJB0Sm1Ug2idNi1JiocXYsCVzY05sd4Qh+34PcED7
-B6592o1h47bgOh1ISolrOkt/23VjJweWGsa9rqt1zMdmmCulmPPFOiWWzMSm1OkN
-Q/Q5pzWXojxp/ArWLZbrghA44t+A4WJpWyEpEKKu5pD+ufG6dX6oPgz7yRXpkyJw
-rln219tjGACm2pXLgTO/WQdesaaquv6v2MEb5jJcxFeK5cQN/anYFqhjJvth1Wr0
-FQwbO4drt1lD+a30r6VjL/sEIlKK2Mi68rHQzeHug+663GLTtw2bZyvAoMwZoxo4
-Vwy3e5F7dw23onqQB92IoQ==
------END CERTIFICATE-----
diff --git a/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs b/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs
index fc1d5c847d74..1c44975d5a3b 100644
--- a/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs
+++ b/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs
@@ -18,7 +18,7 @@ public static void ThrowIfNull(
 #if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER
         [NotNull]
 #endif
-        object? argument, [CallerArgumentExpression("argument")] string? paramName = null)
+        object? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
     {
 #if !NET7_0_OR_GREATER || NETSTANDARD || NETFRAMEWORK
         if (argument is null)
@@ -30,6 +30,29 @@ public static void ThrowIfNull(
 #endif
     }
 
+    /// <summary>Throws an <see cref="ArgumentException"/> if <paramref name="argument"/> is null or empty.</summary>
+    /// <param name="argument">The <see cref="string"/> argument to validate as non-null and non-empty.</param>
+    /// <param name="paramName">The name of the parameter with which <paramref name="argument"/> corresponds.</param>
+    public static void ThrowIfNullOrEmpty(
+#if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER
+        [NotNull]
+#endif
+        string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+    {
+#if !NET7_0_OR_GREATER || NETSTANDARD || NETFRAMEWORK
+        if (argument is null)
+        {
+            Throw(paramName);
+        }
+        else if (argument.Length == 0)
+        {
+            throw new ArgumentException("Must not be null or empty", paramName);
+        }
+#else
+        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
+#endif
+    }
+
 #if !NET7_0_OR_GREATER || NETSTANDARD || NETFRAMEWORK
 #if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER
     [DoesNotReturn]
diff --git a/src/Shared/ThrowHelpers/ArgumentThrowHelper.cs b/src/Shared/ThrowHelpers/ArgumentThrowHelper.cs
index ec3de1adc36b..cba2b9f6b8fe 100644
--- a/src/Shared/ThrowHelpers/ArgumentThrowHelper.cs
+++ b/src/Shared/ThrowHelpers/ArgumentThrowHelper.cs
@@ -18,7 +18,7 @@ public static void ThrowIfNullOrEmpty(
 #if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER
         [NotNull]
 #endif
-        string? argument, [CallerArgumentExpression("argument")] string? paramName = null)
+        string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
     {
 #if !NET7_0_OR_GREATER || NETSTANDARD || NETFRAMEWORK
         if (argument is null || argument == string.Empty)
@@ -46,7 +46,7 @@ public static void ThrowIfNullOrWhiteSpace(
 #if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER
         [NotNull]
 #endif
-        string? argument, [CallerArgumentExpression("argument")] string? paramName = null)
+        string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
     {
         ArgumentNullThrowHelper.ThrowIfNull(argument);
 
diff --git a/src/Shared/ValueStopwatch/ValueStopwatch.cs b/src/Shared/ValueStopwatch/ValueStopwatch.cs
index d96ec70f87bb..7366ee2f2a06 100644
--- a/src/Shared/ValueStopwatch/ValueStopwatch.cs
+++ b/src/Shared/ValueStopwatch/ValueStopwatch.cs
@@ -23,6 +23,17 @@ private ValueStopwatch(long startTimestamp)
 
     public static ValueStopwatch StartNew() => new ValueStopwatch(Stopwatch.GetTimestamp());
 
+    public static TimeSpan GetElapsedTime(long startingTimestamp, long endingTimestamp)
+    {
+#if !NET7_0_OR_GREATER
+        var timestampDelta = endingTimestamp - startingTimestamp;
+        var ticks = (long)(TimestampToTicks * timestampDelta);
+        return new TimeSpan(ticks);
+#else
+        return Stopwatch.GetElapsedTime(startingTimestamp, endingTimestamp);
+#endif
+    }
+
     public TimeSpan GetElapsedTime()
     {
         // Start timestamp can't be zero in an initialized ValueStopwatch. It would have to be literally the first thing executed when the machine boots to be 0.
@@ -34,12 +45,6 @@ public TimeSpan GetElapsedTime()
 
         var end = Stopwatch.GetTimestamp();
 
-#if !NET7_0_OR_GREATER
-        var timestampDelta = end - _startTimestamp;
-        var ticks = (long)(TimestampToTicks * timestampDelta);
-        return new TimeSpan(ticks);
-#else
-        return Stopwatch.GetElapsedTime(_startTimestamp, end);
-#endif
+        return GetElapsedTime(_startTimestamp, end);
     }
 }
diff --git a/src/Shared/runtime/Http2/Hpack/DynamicTable.cs b/src/Shared/runtime/Http2/Hpack/DynamicTable.cs
index 821ca75e1478..bf4ef061966d 100644
--- a/src/Shared/runtime/Http2/Hpack/DynamicTable.cs
+++ b/src/Shared/runtime/Http2/Hpack/DynamicTable.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
+
 namespace System.Net.Http.HPack
 {
     internal sealed class DynamicTable
@@ -14,7 +16,7 @@ internal sealed class DynamicTable
 
         public DynamicTable(int maxSize)
         {
-            _buffer = new HeaderField[maxSize / HeaderField.RfcOverhead];
+            _buffer = [];
             _maxSize = maxSize;
         }
 
@@ -67,18 +69,17 @@ public void Insert(int? staticTableIndex, ReadOnlySpan<byte> name, ReadOnlySpan<
                 return;
             }
 
-            var entry = new HeaderField(staticTableIndex, name, value);
-            _buffer[_insertIndex] = entry;
-            _insertIndex = (_insertIndex + 1) % _buffer.Length;
-            _size += entry.Length;
-            _count++;
-        }
-
-        public void Resize(int maxSize)
-        {
-            if (maxSize > _maxSize)
+            // Ensure that we have at least one slot available.
+            if (_count == _buffer.Length)
             {
-                var newBuffer = new HeaderField[maxSize / HeaderField.RfcOverhead];
+                int maxCapacity = _maxSize / HeaderField.RfcOverhead;
+                Debug.Assert(_count + 1 <= maxCapacity);
+
+                // Double the size of the current buffer, starting with at least 16 entries.
+                int newBufferSize = Math.Min(Math.Max(16, _buffer.Length * 2), maxCapacity);
+                Debug.Assert(newBufferSize > _count);
+
+                var newBuffer = new HeaderField[newBufferSize];
 
                 int headCount = Math.Min(_buffer.Length - _removeIndex, _count);
                 int tailCount = _count - headCount;
@@ -89,11 +90,27 @@ public void Resize(int maxSize)
                 _buffer = newBuffer;
                 _removeIndex = 0;
                 _insertIndex = _count;
-                _maxSize = maxSize;
             }
-            else
+
+            var entry = new HeaderField(staticTableIndex, name, value);
+            _buffer[_insertIndex] = entry;
+
+            if (++_insertIndex == _buffer.Length)
+            {
+                _insertIndex = 0;
+            }
+
+            _size += entry.Length;
+            _count++;
+        }
+
+        public void UpdateMaxSize(int maxSize)
+        {
+            int previousMax = _maxSize;
+            _maxSize = maxSize;
+
+            if (maxSize < previousMax)
             {
-                _maxSize = maxSize;
                 EnsureAvailable(0);
             }
         }
@@ -107,7 +124,11 @@ private void EnsureAvailable(int available)
                 field = default;
 
                 _count--;
-                _removeIndex = (_removeIndex + 1) % _buffer.Length;
+
+                if (++_removeIndex == _buffer.Length)
+                {
+                    _removeIndex = 0;
+                }
             }
         }
     }
diff --git a/src/Shared/runtime/Http2/Hpack/HPackDecoder.cs b/src/Shared/runtime/Http2/Hpack/HPackDecoder.cs
index 1f9083e29645..6b4fcb3a77ca 100644
--- a/src/Shared/runtime/Http2/Hpack/HPackDecoder.cs
+++ b/src/Shared/runtime/Http2/Hpack/HPackDecoder.cs
@@ -27,8 +27,13 @@ private enum State : byte
             DynamicTableSizeUpdate
         }
 
+        // https://datatracker.ietf.org/doc/html/rfc9113#name-defined-settings
+        // Initial value for SETTINGS_HEADER_TABLE_SIZE is 4,096 octets.
         public const int DefaultHeaderTableSize = 4096;
-        public const int DefaultStringOctetsSize = 4096;
+
+        // This is the initial size. Buffers will be dynamically resized as needed.
+        public const int DefaultStringOctetsSize = 32;
+
         public const int DefaultMaxHeadersLength = 64 * 1024;
 
         // http://httpwg.org/specs/rfc7541.html#rfc.section.6.1
@@ -670,7 +675,7 @@ private void SetDynamicHeaderTableSize(int size)
                 throw new HPackDecodingException(SR.Format(SR.net_http_hpack_large_table_size_update, size, _maxDynamicTableSize));
             }
 
-            _dynamicTable.Resize(size);
+            _dynamicTable.UpdateMaxSize(size);
         }
     }
 }
diff --git a/src/Shared/runtime/Http2/Hpack/HuffmanDecodingException.cs b/src/Shared/runtime/Http2/Hpack/HuffmanDecodingException.cs
index b83ca6502e8c..181d441c5458 100644
--- a/src/Shared/runtime/Http2/Hpack/HuffmanDecodingException.cs
+++ b/src/Shared/runtime/Http2/Hpack/HuffmanDecodingException.cs
@@ -19,26 +19,20 @@ public HuffmanDecodingException(string message)
         {
         }
 
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
-#endif
         private HuffmanDecodingException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
 
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
-#endif
         void ISerializable.GetObjectData(SerializationInfo serializationInfo, StreamingContext streamingContext)
         {
             base.GetObjectData(serializationInfo, streamingContext);
         }
 
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#endif
         public override void GetObjectData(SerializationInfo serializationInfo, StreamingContext streamingContext)
         {
             base.GetObjectData(serializationInfo, streamingContext);
diff --git a/src/Shared/runtime/Http3/Helpers/VariableLengthIntegerHelper.cs b/src/Shared/runtime/Http3/Helpers/VariableLengthIntegerHelper.cs
index 3a343a62a4cc..c7f1ec908d0f 100644
--- a/src/Shared/runtime/Http3/Helpers/VariableLengthIntegerHelper.cs
+++ b/src/Shared/runtime/Http3/Helpers/VariableLengthIntegerHelper.cs
@@ -128,19 +128,19 @@ static bool TryReadSlow(ref SequenceReader<byte> reader, out long value)
             }
         }
 
-        public static long GetInteger(in ReadOnlySequence<byte> buffer, out SequencePosition consumed, out SequencePosition examined)
+        // If callsite has 'examined', set it to buffer.End if the integer wasn't successfully read, otherwise set examined = consumed.
+        public static bool TryGetInteger(in ReadOnlySequence<byte> buffer, out SequencePosition consumed, out long integer)
         {
             var reader = new SequenceReader<byte>(buffer);
-            if (TryRead(ref reader, out long value))
+            if (TryRead(ref reader, out integer))
             {
-                consumed = examined = buffer.GetPosition(reader.Consumed);
-                return value;
+                consumed = buffer.GetPosition(reader.Consumed);
+                return true;
             }
             else
             {
-                consumed = default;
-                examined = buffer.End;
-                return -1;
+                consumed = buffer.Start;
+                return false;
             }
         }
 
diff --git a/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs b/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs
index aa157ab41b67..aee248efc78a 100644
--- a/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs
+++ b/src/Shared/runtime/Http3/QPack/H3StaticTable.Http3.cs
@@ -1,24 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Generic;
 using System.Text;
 
 namespace System.Net.Http.QPack
 {
     internal static partial class H3StaticTable
     {
-        private static readonly Dictionary<HttpMethod, int> s_methodIndex = new Dictionary<HttpMethod, int>
-        {
-            // TODO connect is internal to system.net.http
-            [HttpMethod.Delete] = 16,
-            [HttpMethod.Get] = 17,
-            [HttpMethod.Head] = 18,
-            [HttpMethod.Options] = 19,
-            [HttpMethod.Post] = 20,
-            [HttpMethod.Put] = 21,
-        };
-
         public static bool TryGetStatusIndex(int status, out int index)
         {
             index = status switch
@@ -45,9 +33,6 @@ public static bool TryGetStatusIndex(int status, out int index)
 
         public static int Count => s_staticTable.Length;
 
-        // TODO: just use Dictionary directly to avoid interface dispatch.
-        public static IReadOnlyDictionary<HttpMethod, int> MethodIndex => s_methodIndex;
-
         public static ref readonly HeaderField Get(int index) => ref s_staticTable[index];
 
         private static readonly HeaderField[] s_staticTable = new HeaderField[]
diff --git a/src/Shared/runtime/Http3/QPack/QPackDecodingException.cs b/src/Shared/runtime/Http3/QPack/QPackDecodingException.cs
index 5de0efff935d..0442ef2252e6 100644
--- a/src/Shared/runtime/Http3/QPack/QPackDecodingException.cs
+++ b/src/Shared/runtime/Http3/QPack/QPackDecodingException.cs
@@ -21,9 +21,7 @@ public QPackDecodingException(string message, Exception innerException) : base(m
         {
         }
 
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
-#endif
         private QPackDecodingException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
         }
diff --git a/src/Shared/runtime/Http3/QPack/QPackEncodingException.cs b/src/Shared/runtime/Http3/QPack/QPackEncodingException.cs
index 7e6eb6f1b792..f2eb1b694494 100644
--- a/src/Shared/runtime/Http3/QPack/QPackEncodingException.cs
+++ b/src/Shared/runtime/Http3/QPack/QPackEncodingException.cs
@@ -18,9 +18,7 @@ public QPackEncodingException(string message, Exception innerException)
         {
         }
 
-#if NET8_0_OR_GREATER
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
-#endif
         private QPackEncodingException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
         }
diff --git a/src/Shared/test/Shared.Tests/CommandLineApplicationTests.cs b/src/Shared/test/Shared.Tests/CommandLineApplicationTests.cs
index a99ed7069732..e9a2e6fc6a4e 100644
--- a/src/Shared/test/Shared.Tests/CommandLineApplicationTests.cs
+++ b/src/Shared/test/Shared.Tests/CommandLineApplicationTests.cs
@@ -907,7 +907,7 @@ public void NestedInheritedOptions()
     [InlineData(new[] { "-t", "val", "--", "a", "--", "b" }, new[] { "a", "--", "b" }, "val")]
     [InlineData(new[] { "--", "--help" }, new[] { "--help" }, null)]
     [InlineData(new[] { "--", "--version" }, new[] { "--version" }, null)]
-    public void ArgumentSeparator(string[] input, string[] expectedRemaining, string topLevelValue)
+    public void ArgumentSeparator(string[] input, string[] expectedRemaining, string? topLevelValue)
     {
         var app = new CommandLineApplication(throwOnUnexpectedArg: false)
         {
@@ -936,7 +936,7 @@ public void ArgumentSeparator(string[] input, string[] expectedRemaining, string
     public void ArgumentSeparator_TreatedAsUexpected(
         string[] input,
         string[] expectedRemaining,
-        string topLevelValue,
+        string? topLevelValue,
         bool isShowingInformation)
     {
         var app = new CommandLineApplication(throwOnUnexpectedArg: false);
@@ -963,7 +963,7 @@ public void ArgumentSeparator_TreatedAsUexpected(
     public void ArgumentSeparator_TreatedAsUexpected_Default(
         string[] input,
         string[] expectedRemaining,
-        string topLevelValue,
+        string? topLevelValue,
         bool isShowingInformation)
     {
         var app = new CommandLineApplication(throwOnUnexpectedArg: false);
@@ -990,7 +990,7 @@ public void ArgumentSeparator_TreatedAsUexpected_Default(
     public void ArgumentSeparator_TreatedAsUexpected_Continue(
         string[] input,
         string[] expectedRemaining,
-        string topLevelValue,
+        string? topLevelValue,
         bool isShowingInformation)
     {
         var app = new CommandLineApplication(throwOnUnexpectedArg: false, continueAfterUnexpectedArg: true);
diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
index f72f75419dd0..72496024ef3b 100644
--- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
+++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
@@ -46,8 +46,6 @@
 
   <ItemGroup>
     <Reference Include="FSharp.Core" />
-    <Reference Include="System.Reflection.Metadata" />
-    <Reference Include="System.Threading.Tasks.Extensions" />
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
diff --git a/src/Shared/test/Shared.Tests/NativeMethods.txt b/src/Shared/test/Shared.Tests/NativeMethods.txt
index 268b666b0111..25965baf247f 100644
--- a/src/Shared/test/Shared.Tests/NativeMethods.txt
+++ b/src/Shared/test/Shared.Tests/NativeMethods.txt
@@ -1,2 +1,4 @@
 // https://github.com/microsoft/cswin32
 Windows.Win32.Networking.HttpServer
+SOCKADDR_IN
+SOCKADDR_IN6
diff --git a/src/Shared/test/Shared.Tests/PropertyHelperTest.cs b/src/Shared/test/Shared.Tests/PropertyHelperTest.cs
index 70a7db7f5a77..c7157ab881e8 100644
--- a/src/Shared/test/Shared.Tests/PropertyHelperTest.cs
+++ b/src/Shared/test/Shared.Tests/PropertyHelperTest.cs
@@ -636,7 +636,7 @@ public void ObjectToDictionary_WithNullObject_ReturnsEmptyDictionary()
 
         // Assert
         Assert.NotNull(dictValues);
-        Assert.Equal(0, dictValues.Count);
+        Assert.Empty(dictValues);
     }
 
     [Fact]
@@ -650,7 +650,7 @@ public void ObjectToDictionary_WithPlainObjectType_ReturnsEmptyDictionary()
 
         // Assert
         Assert.NotNull(dictValues);
-        Assert.Equal(0, dictValues.Count);
+        Assert.Empty(dictValues);
     }
 
     [Fact]
@@ -664,7 +664,7 @@ public void ObjectToDictionary_WithPrimitiveType_LooksUpPublicProperties()
 
         // Assert
         Assert.NotNull(dictValues);
-        Assert.Equal(1, dictValues.Count);
+        Assert.Single(dictValues);
         Assert.Equal(4, dictValues["Length"]);
     }
 
diff --git a/src/Shared/test/Shared.Tests/QueryStringEnumerableTest.cs b/src/Shared/test/Shared.Tests/QueryStringEnumerableTest.cs
index b0c99d878dc2..4318da340b92 100644
--- a/src/Shared/test/Shared.Tests/QueryStringEnumerableTest.cs
+++ b/src/Shared/test/Shared.Tests/QueryStringEnumerableTest.cs
@@ -69,7 +69,7 @@ public void ParseQueryWithEncodedValueWorks()
     [InlineData("")]
     [InlineData(null)]
     [InlineData("?&&")]
-    public void ParseEmptyOrNullQueryWorks(string queryString)
+    public void ParseEmptyOrNullQueryWorks(string? queryString)
     {
         Assert.Empty(Parse(queryString));
     }
diff --git a/src/Shared/test/Shared.Tests/TypeNameHelperTest.cs b/src/Shared/test/Shared.Tests/TypeNameHelperTest.cs
index bfc329545496..077922e26869 100644
--- a/src/Shared/test/Shared.Tests/TypeNameHelperTest.cs
+++ b/src/Shared/test/Shared.Tests/TypeNameHelperTest.cs
@@ -117,7 +117,7 @@ public void Can_pretty_print_array_name(Type type, bool fullName, string expecte
         Assert.Equal(expected, TypeNameHelper.GetTypeDisplayName(type, fullName));
     }
 
-    public static TheoryData GetOpenGenericsTestData()
+    public static TheoryData<Type, bool, string> GetOpenGenericsTestData()
     {
         var openDictionaryType = typeof(Dictionary<,>);
         var genArgsDictionary = openDictionaryType.GetGenericArguments();
@@ -176,7 +176,7 @@ public void Can_pretty_print_open_generics(Type type, bool fullName, string expe
         Assert.Equal(expected, TypeNameHelper.GetTypeDisplayName(type, fullName));
     }
 
-    public static TheoryData GetTypeDisplayName_IncludesGenericParameterNamesWhenOptionIsSetData =>
+    public static TheoryData<Type, string> GetTypeDisplayName_IncludesGenericParameterNamesWhenOptionIsSetData =>
         new TheoryData<Type, string>
         {
                 {  typeof(B<>),"Microsoft.Extensions.Internal.TypeNameHelperTest+B<T>" },
@@ -196,7 +196,7 @@ public void GetTypeDisplayName_IncludesGenericParameterNamesWhenOptionIsSet(Type
         Assert.Equal(expected, actual);
     }
 
-    public static TheoryData GetTypeDisplayName_WithoutFullName_IncludesGenericParameterNamesWhenOptionIsSetData =>
+    public static TheoryData<Type, string> GetTypeDisplayName_WithoutFullName_IncludesGenericParameterNamesWhenOptionIsSetData =>
         new TheoryData<Type, string>
         {
                 {  typeof(B<>),"B<T>" },
diff --git a/src/Shared/test/Shared.Tests/runtime/Http2/DynamicTableTest.cs b/src/Shared/test/Shared.Tests/runtime/Http2/DynamicTableTest.cs
index 9576a9e67b5f..bd7f854a9f56 100644
--- a/src/Shared/test/Shared.Tests/runtime/Http2/DynamicTableTest.cs
+++ b/src/Shared/test/Shared.Tests/runtime/Http2/DynamicTableTest.cs
@@ -94,15 +94,33 @@ public void DynamicTable_InsertEntryLargerThanRemainingSpace_NoOp()
             Assert.Equal(0, dynamicTable.Size);
         }
 
+        public static IEnumerable<object[]> DynamicTable_WrapsRingBuffer_Success_MemberData()
+        {
+            foreach (int maxSize in new[] { 100, 256, 1000 })
+            {
+                int maxCount = maxSize / (2 * "header-0".Length + HeaderField.RfcOverhead);
+
+                for (int i = 0; i < maxCount; i++)
+                {
+                    yield return new object[] { maxSize, i };
+                }
+            }
+        }
+
         [Theory]
-        [InlineData(0)]
-        [InlineData(1)]
-        [InlineData(2)]
-        [InlineData(3)]
-        public void DynamicTable_WrapsRingBuffer_Success(int targetInsertIndex)
+        [MemberData(nameof(DynamicTable_WrapsRingBuffer_Success_MemberData))]
+        public void DynamicTable_WrapsRingBuffer_Success(int maxSize, int targetInsertIndex)
         {
+            DynamicTable table = new DynamicTable(maxSize);
+
+            // The table grows its internal buffer dynamically.
+            // Fill it with enough entries to force it to grow to max size.
+            for (int i = 0; i < table.MaxSize / HeaderField.RfcOverhead; i++)
+            {
+                table.Insert("a"u8, "b"u8);
+            }
+
             FieldInfo insertIndexField = typeof(DynamicTable).GetField("_insertIndex", BindingFlags.NonPublic | BindingFlags.Instance);
-            DynamicTable table = new DynamicTable(maxSize: 256);
             Stack<byte[]> insertedHeaders = new Stack<byte[]>();
 
             // Insert into dynamic table until its insert index into its ring buffer loops back to 0.
@@ -167,7 +185,7 @@ public void DynamicTable_Resize_Success(int initialMaxSize, int finalMaxSize, in
                 headers.Add(dynamicTable[i]);
             }
 
-            dynamicTable.Resize(finalMaxSize);
+            dynamicTable.UpdateMaxSize(finalMaxSize);
 
             int expectedCount = Math.Min(finalMaxSize / 64, headers.Count);
             Assert.Equal(expectedCount, dynamicTable.Count);
@@ -188,7 +206,7 @@ public void DynamicTable_ResizingEvictsOldestEntries()
 
             VerifyTableEntries(dynamicTable, _header2, _header1);
 
-            dynamicTable.Resize(_header2.Length);
+            dynamicTable.UpdateMaxSize(_header2.Length);
 
             VerifyTableEntries(dynamicTable, _header2);
         }
@@ -200,7 +218,7 @@ public void DynamicTable_ResizingToZeroEvictsAllEntries()
             dynamicTable.Insert(_header1.Name, _header1.Value);
             dynamicTable.Insert(_header2.Name, _header2.Value);
 
-            dynamicTable.Resize(0);
+            dynamicTable.UpdateMaxSize(0);
 
             Assert.Equal(0, dynamicTable.Count);
             Assert.Equal(0, dynamicTable.Size);
@@ -219,7 +237,7 @@ public void DynamicTable_CanBeResizedToLargerMaxSize()
             Assert.Equal(0, dynamicTable.Count);
             Assert.Equal(0, dynamicTable.Size);
 
-            dynamicTable.Resize(dynamicTable.MaxSize + _header2.Length);
+            dynamicTable.UpdateMaxSize(dynamicTable.MaxSize + _header2.Length);
             dynamicTable.Insert(_header2.Name, _header2.Value);
 
             VerifyTableEntries(dynamicTable, _header2);
diff --git a/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs b/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs
index ff141b846b39..2dde54407bcd 100644
--- a/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs
+++ b/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs
@@ -151,6 +151,25 @@ public void DecodesIndexedHeaderField_DynamicTable()
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_headerNameString]);
         }
 
+        [Fact]
+        public void DecodesIndexedHeaderField_DynamicTable_ReferencedEntryRemovedOnInsertion()
+        {
+            // Pre-populate the dynamic table so we'll have something to reference.
+            // This entry will have index 62 (0x3E).
+            _dynamicTable.Insert(_headerNameBytes, _headerValueBytes);
+            Assert.Equal(1, _dynamicTable.Count);
+
+            Assert.InRange(_dynamicTable.MaxSize, 1, _literalHeaderNameBytes.Length); // Assert that our string will be too big
+
+            byte[] encoded = (new byte[] { 0x40 | 0x3E }) // Indexing enabled (0x40) | dynamic table (62 = 0x3E) as a 6-integer, 
+                .Concat(_literalHeaderName) // A header value that's too large to fit in the dynamic table
+                .ToArray();
+
+            _decoder.Decode(encoded, endHeaders: true, handler: _handler);
+            Assert.Equal(0, _dynamicTable.Count); // The large entry caused the table to be wiped
+            Assert.Equal(_literalHeaderNameString, _handler.DecodedHeaders[_headerNameString]); // but we got the header anyway
+        }
+
         [Fact]
         public void DecodesIndexedHeaderField_OutOfRange_Error()
         {
diff --git a/src/Shared/test/Shared.Tests/runtime/Http3/VariableLengthIntegerHelperTests.cs b/src/Shared/test/Shared.Tests/runtime/Http3/VariableLengthIntegerHelperTests.cs
index d67d24c0ba25..e461bfd41ed4 100644
--- a/src/Shared/test/Shared.Tests/runtime/Http3/VariableLengthIntegerHelperTests.cs
+++ b/src/Shared/test/Shared.Tests/runtime/Http3/VariableLengthIntegerHelperTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
@@ -223,12 +223,12 @@ public void GetInteger_ValidSegmentedSequence()
             MemorySegment<byte> memorySegment2 = memorySegment1.Append(new byte[] { 0, 0, 0, 0, 0, 0, 2 });
             ReadOnlySequence<byte> readOnlySequence = new ReadOnlySequence<byte>(
                 memorySegment1, 0, memorySegment2, memorySegment2.Memory.Length);
-            long result = VariableLengthIntegerHelper.GetInteger(readOnlySequence,
-                out SequencePosition consumed, out SequencePosition examined);
+            bool result = VariableLengthIntegerHelper.TryGetInteger(readOnlySequence,
+                out SequencePosition consumed, out long integer);
 
-            Assert.Equal(2, result);
+            Assert.True(result);
+            Assert.Equal(2, integer);
             Assert.Equal(7, consumed.GetInteger());
-            Assert.Equal(7, examined.GetInteger());
         }
 
         [Fact]
@@ -238,12 +238,11 @@ public void GetInteger_NotValidSegmentedSequence()
             MemorySegment<byte> memorySegment2 = memorySegment1.Append(new byte[] { 0, 0, 0, 0, 0, 2 });
             ReadOnlySequence<byte> readOnlySequence = new ReadOnlySequence<byte>(
                 memorySegment1, 0, memorySegment2, memorySegment2.Memory.Length);
-            long result = VariableLengthIntegerHelper.GetInteger(readOnlySequence,
-                out SequencePosition consumed, out SequencePosition examined);
+            bool result = VariableLengthIntegerHelper.TryGetInteger(readOnlySequence,
+                out SequencePosition consumed, out long integer);
 
-            Assert.Equal(-1, result);
+            Assert.False(result);
             Assert.Equal(0, consumed.GetInteger());
-            Assert.Equal(6, examined.GetInteger());
         }
 
         [Fact]
diff --git a/src/SignalR/SignalR.slnf b/src/SignalR/SignalR.slnf
index 28592c935943..850c98487bce 100644
--- a/src/SignalR/SignalR.slnf
+++ b/src/SignalR/SignalR.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
       "src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs
index 51c8941054ca..942ac147b363 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.Log.cs
@@ -337,5 +337,8 @@ public static void ErrorHandshakeTimedOut(ILogger logger, TimeSpan handshakeTime
 
         [LoggerMessage(93, LogLevel.Debug, "HubProtocol '{Protocol} v{Version}' does not support Stateful Reconnect. Disabling the feature.", EventName = "DisablingReconnect")]
         public static partial void DisablingReconnect(ILogger logger, string protocol, int version);
+
+        [LoggerMessage(94, LogLevel.Error, "Failed to bind argument received in stream '{StreamId}'.", EventName = "StreamBindingFailure")]
+        public static partial void StreamBindingFailure(ILogger logger, string? streamId, Exception exception);
     }
 }
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
index 5b20d770d9ba..f52e5ba32357 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
@@ -97,6 +97,8 @@ public partial class HubConnection : IAsyncDisposable
     /// If this event was triggered from a connection error, the <see cref="Exception"/> that occurred will be passed in as the
     /// sole argument to this handler. If this event was triggered intentionally by either the client or server, then
     /// the argument will be <see langword="null"/>.
+    ///
+    /// The <see cref="Task"/> result does not block <see cref="HubConnection"/> operations.
     /// </remarks>
     /// <example>
     /// The following example attaches a handler to the <see cref="Closed"/> event, and checks the provided argument to determine
@@ -123,6 +125,8 @@ public partial class HubConnection : IAsyncDisposable
     /// </summary>
     /// <remarks>
     /// The <see cref="Exception"/> that occurred will be passed in as the sole argument to this handler.
+    ///
+    /// The <see cref="Task"/> result does not block <see cref="HubConnection"/> operations.
     /// </remarks>
     /// <example>
     /// The following example attaches a handler to the <see cref="Reconnecting"/> event, and checks the provided argument to log the error.
@@ -141,6 +145,8 @@ public partial class HubConnection : IAsyncDisposable
     /// </summary>
     /// <remarks>
     /// The <see cref="string"/> parameter will be the <see cref="HubConnection"/>'s new ConnectionId or null if negotiation was skipped.
+    ///
+    /// The <see cref="Task"/> result does not block <see cref="HubConnection"/> operations.
     /// </remarks>
     /// <example>
     /// The following example attaches a handler to the <see cref="Reconnected"/> event, and checks the provided argument to log the ConnectionId.
@@ -1301,6 +1307,10 @@ private async Task SendWithLock(ConnectionState expectedConnectionState, HubMess
                     await SendWithLock(connectionState, CompletionMessage.WithError(bindingFailure.InvocationId, "Client failed to parse argument(s)."), cancellationToken: default).ConfigureAwait(false);
                 }
                 break;
+            case StreamBindingFailureMessage bindingFailure:
+                // The server can't receive a response, so we just drop the message and log
+                Log.StreamBindingFailure(_logger, bindingFailure.Id, bindingFailure.BindingFailure.SourceException);
+                break;
             case InvocationMessage invocation:
                 Log.ReceivedInvocation(_logger, invocation.InvocationId, invocation.Target, invocation.Arguments);
                 await invocationMessageWriter.WriteAsync(invocation).ConfigureAwait(false);
@@ -1596,7 +1606,7 @@ private async Task ReceiveLoop(ConnectionState connectionState)
         var timer = new TimerAwaitable(TickRate, TickRate);
         var timerTask = connectionState.TimerLoop(timer);
 
-        var uploadStreamSource = new CancellationTokenSource();
+        using var uploadStreamSource = new CancellationTokenSource();
         connectionState.UploadStreamToken = uploadStreamSource.Token;
         var invocationMessageChannel = Channel.CreateUnbounded<InvocationMessage>(_receiveLoopOptions);
 
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsync.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsync.cs
index 859f8c3c9798..de4a5ed9f28e 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsync.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsync.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.AspNetCore.SignalR.Client;
 
 /// <summary>
-/// Extension methods for <see cref="HubConnectionExtensions"/>.
+/// Extension methods for <see cref="HubConnection"/>.
 /// </summary>
 public partial class HubConnectionExtensions
 {
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsyncGeneric.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsyncGeneric.cs
index 4def1b390694..ce0cd3aad2e1 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsyncGeneric.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.InvokeAsyncGeneric.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.AspNetCore.SignalR.Client;
 
 /// <summary>
-/// Extension methods for <see cref="HubConnectionExtensions"/>.
+/// Extension methods for <see cref="HubConnection"/>.
 /// </summary>
 public static partial class HubConnectionExtensions
 {
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.OnResult.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.OnResult.cs
index ad0832586606..d3c9362bd809 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.OnResult.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.OnResult.cs
@@ -9,6 +9,10 @@
 using Microsoft.AspNetCore.Shared;
 
 namespace Microsoft.AspNetCore.SignalR.Client;
+
+/// <summary>
+/// Extension methods for <see cref="HubConnection"/>.
+/// </summary>
 public static partial class HubConnectionExtensions
 {
     private static IDisposable On<TResult>(this HubConnection hubConnection, string methodName, Type[] parameterTypes, Func<object?[], TResult> handler)
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.SendAsync.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.SendAsync.cs
index 68c10e1b8214..c1ab06798f7d 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.SendAsync.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.SendAsync.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.AspNetCore.SignalR.Client;
 
 /// <summary>
-/// Extension methods for <see cref="HubConnectionExtensions"/>.
+/// Extension methods for <see cref="HubConnection"/>.
 /// </summary>
 public static partial class HubConnectionExtensions
 {
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsChannelAsync.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsChannelAsync.cs
index 4485d6f19153..9ec7a2867c04 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsChannelAsync.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsChannelAsync.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.AspNetCore.SignalR.Client;
 
 /// <summary>
-/// Extension methods for <see cref="HubConnectionExtensions"/>.
+/// Extension methods for <see cref="HubConnection"/>.
 /// </summary>
 public static partial class HubConnectionExtensions
 {
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsync.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsync.cs
index e3011217c180..fa15140575e3 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsync.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.StreamAsync.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.AspNetCore.SignalR.Client;
 
 /// <summary>
-/// Extension methods for <see cref="HubConnectionExtensions"/>.
+/// Extension methods for <see cref="HubConnection"/>.
 /// </summary>
 public static partial class HubConnectionExtensions
 {
diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.cs
index f8cbb39c00f5..ccf774c5a402 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnectionExtensions.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.AspNetCore.SignalR.Client;
 
 /// <summary>
-/// Extension methods for <see cref="HubConnectionExtensions"/>.
+/// Extension methods for <see cref="HubConnection"/>.
 /// </summary>
 public static partial class HubConnectionExtensions
 {
diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
index 16c662419d25..93470d863615 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
+++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
@@ -33,7 +33,7 @@
     <Reference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.Logging" />
-    <Reference Include="System.Threading.Channels" />
+    <Reference Include="System.Threading.Channels" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'">
diff --git a/src/SignalR/clients/csharp/Client.Core/src/PACKAGE.md b/src/SignalR/clients/csharp/Client.Core/src/PACKAGE.md
new file mode 100644
index 000000000000..1a9644353ef8
--- /dev/null
+++ b/src/SignalR/clients/csharp/Client.Core/src/PACKAGE.md
@@ -0,0 +1,46 @@
+## About
+
+`Microsoft.AspNetCore.SignalR.Client.Core` provides core functionality for the .NET client for ASP.NET Core SignalR.
+
+> [!NOTE]
+> This package contains only the connection-agnostic components of the .NET SignalR client, and does not provide a default connection implementation. In most scenarios, the [`Microsoft.AspNetCore.SignalR.Client`](https://www.nuget.org/packages/Microsoft.AspNetCore.SignalR.Client) package should be used because it provides an HTTP connection implementation.
+
+## Key Features
+
+SignalR provides the following capabilities:
+* Automatic connection management
+* Sending messages to all connected clients simultaneously
+* Sending messages to specific clients or groups of clients
+* Scaling to handle increasing traffic
+
+## How to Use
+
+To use `Microsoft.AspNetCore.SignalR.Client.Core`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.SignalR.Client.Core
+```
+
+### Configuration
+
+The .NET SignalR client requires a connection implementation. To use an HTTP connection implementation, install the  [`Microsoft.AspNetCore.SignalR.Client`](https://www.nuget.org/packages/Microsoft.AspNetCore.SignalR.Client) package.
+
+## Main Types
+
+The main types provided by `Microsoft.AspNetCore.SignalR.Client.Core` include:
+* `HubConnectionBuilder`: Provides an abstraction to construct new SignalR hub connections
+* `HubConnection`: Defines methods for managing a hub connection, including:
+  * Starting and stopping the connection
+  * Sending and receiving messages
+  * Handling disconnects and attempting reconnects
+* `HubConnectionOptions`: Provides options for configuring a `HubConnection`
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/signalr/dotnet-client) on the .NET client for ASP.NET Core SignalR.
+
+## Feedback & Contributing
+
+`Microsoft.AspNetCore.SignalR.Client.Core` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/SignalR/clients/csharp/Client.SourceGenerator/src/DiagnosticDescriptors.cs b/src/SignalR/clients/csharp/Client.SourceGenerator/src/DiagnosticDescriptors.cs
index 296207920db7..a039ef73d1bb 100644
--- a/src/SignalR/clients/csharp/Client.SourceGenerator/src/DiagnosticDescriptors.cs
+++ b/src/SignalR/clients/csharp/Client.SourceGenerator/src/DiagnosticDescriptors.cs
@@ -7,6 +7,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.SourceGenerator;
 
 internal static class DiagnosticDescriptors
 {
+    private const string SignalRClientSourceGeneratorCategory = "SignalR.Client.SourceGenerator";
+
     // Ranges
     // SSG0000-0099: HubServerProxyGenerator
     // SSG0100-0199: HubClientProxyGenerator
@@ -15,7 +17,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0000",
         title: "Non-interface generic type argument",
         messageFormat: "Only interfaces are accepted. '{0}' is not an interface.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -23,7 +25,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0001",
         title: "Unsupported return type",
         messageFormat: "'{0}' has a return type of '{1}' but only Task, ValueTask, Task<T> and ValueTask<T> are supported for source generation.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Warning,
         isEnabledByDefault: true);
 
@@ -31,7 +33,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0002",
         title: "Too many HubServerProxy attributed methods",
         messageFormat: "There can only be one HubServerProxy attributed method.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -39,7 +41,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0003",
         title: "HubServerProxy attributed method has bad accessibility",
         messageFormat: "HubServerProxy attributed method may only have an accessibility of public, internal, protected, protected internal or private.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -47,7 +49,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0004",
         title: "HubServerProxy attributed method is not partial",
         messageFormat: "HubServerProxy attributed method must be partial.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -55,7 +57,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0005",
         title: "HubServerProxy attributed method is not an extension method",
         messageFormat: "HubServerProxy attributed method must be an extension method for HubConnection.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -63,7 +65,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0006",
         title: "HubServerProxy attributed method has bad number of type arguments",
         messageFormat: "HubServerProxy attributed method must have exactly one type argument.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -71,7 +73,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0007",
         title: "HubServerProxy attributed method type argument and return type does not match",
         messageFormat: "HubServerProxy attributed method must have the same type argument and return type.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -79,7 +81,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0008",
         title: "HubServerProxy attributed method has bad number of arguments",
         messageFormat: "HubServerProxy attributed method must have exactly one argument which must be of type HubConnection.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -87,7 +89,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0009",
         title: "HubServerProxy attributed method has argument of wrong type",
         messageFormat: "HubServerProxy attributed method must have exactly one argument which must be of type HubConnection.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -97,7 +99,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0100",
         title: "Unsupported return type",
         messageFormat: "'{0}' has a return type of '{1}' but only void and Task are supported for callback methods.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Warning,
         isEnabledByDefault: true);
 
@@ -105,7 +107,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0102",
         title: "Too many HubClientProxy attributed methods",
         messageFormat: "There can only be one HubClientProxy attributed method.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -113,7 +115,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0103",
         title: "HubClientProxy attributed method has bad accessibility",
         messageFormat: "HubClientProxy attributed method may only have an accessibility of public, internal, protected, protected internal or private.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -121,7 +123,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0104",
         title: "HubClientProxy attributed method is not partial",
         messageFormat: "HubClientProxy attributed method must be partial.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -129,7 +131,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0105",
         title: "HubClientProxy attributed method is not an extension method",
         messageFormat: "HubClientProxy attributed method must be an extension method for HubConnection.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -137,7 +139,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0106",
         title: "HubClientProxy attributed method has bad number of type arguments",
         messageFormat: "HubClientProxy attributed method must have exactly one type argument.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -145,7 +147,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0107",
         title: "HubClientProxy attributed method type argument and return type does not match",
         messageFormat: "HubClientProxy attributed method must have the same type argument and return type.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -153,7 +155,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0108",
         title: "HubClientProxy attributed method has bad number of arguments",
         messageFormat: "HubClientProxy attributed method must have exactly two arguments.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -161,7 +163,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0109",
         title: "HubClientProxy attributed method has first argument of wrong type",
         messageFormat: "HubClientProxy attributed method must have its first argument type be HubConnection.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
@@ -169,7 +171,7 @@ internal static class DiagnosticDescriptors
         id: "SSG0110",
         title: "HubClientProxy attributed method has wrong return type",
         messageFormat: "HubClientProxy attributed method must have a return type of IDisposable.",
-        category: "SignalR.Client.SourceGenerator",
+        category: SignalRClientSourceGeneratorCategory,
         defaultSeverity: DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 }
diff --git a/src/SignalR/clients/csharp/Client/src/PACKAGE.md b/src/SignalR/clients/csharp/Client/src/PACKAGE.md
new file mode 100644
index 000000000000..768d97aea388
--- /dev/null
+++ b/src/SignalR/clients/csharp/Client/src/PACKAGE.md
@@ -0,0 +1,58 @@
+## About
+
+`Microsoft.AspNetCore.SignalR.Client` provides the .NET client for ASP.NET Core SignalR, which simplifies adding real-time web functionality to apps.
+
+## Key Features
+
+SignalR provides the following capabilities:
+* Automatic connection management
+* Sending messages to all connected clients simultaneously
+* Sending messages to specific clients or groups of clients
+* Scaling to handle increasing traffic
+
+## How to Use
+
+To use `Microsoft.AspNetCore.SignalR.Client`, follow these steps:
+
+### Installation
+
+```shell
+dotnet add package Microsoft.AspNetCore.SignalR.Client
+```
+
+### Configuration
+
+See the [ASP.NET Core SignalR docs](https://learn.microsoft.com/aspnet/core/signalr/hubs) for information about how to configure SignalR hubs on the server.
+
+Then, you can configure the client to connect to the hub. For example:
+
+```csharp
+var connection = new HubConnectionBuilder()
+    .WithUrl("http://localhost:53353/Chat")
+    .Build();
+
+connection.On("ReceiveMessage", (string user, string message) =>
+{
+    Console.WriteLine($"{user}: {message}");
+});
+
+await connection.StartAsync();
+```
+
+## Main Types
+
+The main types provided by `Microsoft.AspNetCore.SignalR.Client` include:
+* `HubConnectionBuilder`: Provides an abstraction to construct new SignalR hub connections
+* `HubConnection`: Defines methods for managing a hub connection, including:
+  * Starting and stopping the connection
+  * Sending and receiving messages
+  * Handling disconnects and attempting reconnects
+* `HubConnectionOptions`: Provides options for configuring a `HubConnection`
+
+## Additional Documentation
+
+For additional documentation and examples, refer to the [official documentation](https://learn.microsoft.com/aspnet/core/signalr/dotnet-client) on the .NET client for ASP.NET Core SignalR.
+
+## Feedback & Contributing
+
+`Microsoft.AspNetCore.SignalR.Client` is released as open-source under the [MIT license](https://licenses.nuget.org/MIT). Bug reports and contributions are welcome at [the GitHub repository](https://github.com/dotnet/aspnetcore).
diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.Tracing.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.Tracing.cs
index 8cd134bcceba..84ed84cc5de2 100644
--- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.Tracing.cs
+++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.Tracing.cs
@@ -506,7 +506,7 @@ bool ExpectedErrors(WriteContext writeContext)
                 {
                     await foreach (var streamValue in asyncEnumerable)
                     {
-                        Assert.True(false, "Expected an exception from the streaming invocation.");
+                        Assert.Fail("Expected an exception from the streaming invocation.");
                     }
                 });
 
diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
index be7cd64e1a64..d14d9cc4ce7b 100644
--- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
+++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
@@ -577,7 +577,7 @@ public async Task StreamAsyncDoesNotStartIfTokenAlreadyCanceled(string protocolN
                     var stream = connection.StreamAsync<int>("Stream", 5, cts.Token);
                     await foreach (var streamValue in stream)
                     {
-                        Assert.True(false, "Expected an exception from the streaming invocation.");
+                        Assert.Fail("Expected an exception from the streaming invocation.");
                     }
                 });
             }
@@ -658,7 +658,7 @@ bool ExpectedErrors(WriteContext writeContext)
                 {
                     await foreach (var streamValue in asyncEnumerable)
                     {
-                        Assert.True(false, "Expected an exception from the streaming invocation.");
+                        Assert.Fail("Expected an exception from the streaming invocation.");
                     }
                 });
 
@@ -2336,6 +2336,7 @@ public async Task CanBlockOnAsyncOperationsWithOneAtATimeSynchronizationContext(
             // Yield first so the rest of the test runs in the OneAtATimeSynchronizationContext.Run loop
             await Task.Yield();
 
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
             Assert.True(connection.StartAsync().Wait(DefaultTimeout));
 
             var invokeTask = connection.InvokeAsync<string>(nameof(TestHub.HelloWorld));
@@ -2343,6 +2344,7 @@ public async Task CanBlockOnAsyncOperationsWithOneAtATimeSynchronizationContext(
             Assert.Equal("Hello World!", invokeTask.Result);
 
             Assert.True(connection.DisposeAsync().AsTask().Wait(DefaultTimeout));
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         }
         catch (Exception ex)
         {
diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs
index cd7eff93f282..8d6f08f8e308 100644
--- a/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs
+++ b/src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.Protocol.cs
@@ -409,6 +409,38 @@ public async Task StreamYieldsItemsAsTheyArrive()
             }
         }
 
+        [Fact]
+        public async Task StreamBindingErrorLogsError()
+        {
+            using (StartVerifiableLog(expectedErrorsFilter: w => w.EventId.Name == "StreamBindingFailure"))
+            {
+                var connection = new TestConnection();
+                var hubConnection = CreateHubConnection(connection, loggerFactory: LoggerFactory);
+                try
+                {
+                    await hubConnection.StartAsync().DefaultTimeout();
+
+                    var channel = await hubConnection.StreamAsChannelAsync<string>("Foo").DefaultTimeout();
+
+                    // Expects string, send int
+                    await connection.ReceiveJsonMessage(new { invocationId = "1", type = 2, item = 1 }).DefaultTimeout();
+                    // Check that connection is still active, i.e. we ignore stream failures and keep things working.
+                    await connection.ReceiveJsonMessage(new { invocationId = "1", type = 2, item = "1" }).DefaultTimeout();
+                    await connection.ReceiveJsonMessage(new { invocationId = "1", type = 3 }).DefaultTimeout();
+
+                    var notifications = await channel.ReadAndCollectAllAsync().DefaultTimeout();
+
+                    Assert.Contains(TestSink.Writes, w => w.EventId.Name == "StreamBindingFailure");
+                    Assert.Equal(["1"], notifications.ToArray());
+                }
+                finally
+                {
+                    await hubConnection.DisposeAsync().DefaultTimeout();
+                    await connection.DisposeAsync().DefaultTimeout();
+                }
+            }
+        }
+
         [Fact]
         public async Task HandlerRegisteredWithOnIsFiredWhenInvocationReceived()
         {
diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/TestServerTests.cs b/src/SignalR/clients/csharp/Client/test/UnitTests/TestServerTests.cs
index 4e5580c7fbe2..b8992a84e9f9 100644
--- a/src/SignalR/clients/csharp/Client/test/UnitTests/TestServerTests.cs
+++ b/src/SignalR/clients/csharp/Client/test/UnitTests/TestServerTests.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.SignalR.Tests;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -19,20 +20,30 @@ public async Task WebSocketsWorks()
     {
         using (StartVerifiableLog())
         {
-            var builder = new WebHostBuilder().ConfigureServices(s =>
-            {
-                s.AddLogging();
-                s.AddSingleton(LoggerFactory);
-                s.AddSignalR();
-            }).Configure(app =>
-            {
-                app.UseRouting();
-                app.UseEndpoints(endpoints =>
+            using var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
                 {
-                    endpoints.MapHub<EchoHub>("/echo");
-                });
-            });
-            var server = new TestServer(builder);
+                    webHostBuilder
+                        .UseTestServer()
+                        .ConfigureServices(s =>
+                        {
+                            s.AddLogging();
+                            s.AddSingleton(LoggerFactory);
+                            s.AddSignalR();
+                        })
+                        .Configure(app =>
+                        {
+                            app.UseRouting();
+                            app.UseEndpoints(endpoints =>
+                            {
+                                endpoints.MapHub<EchoHub>("/echo");
+                            });
+                        });
+                })
+                .Build();
+
+            await host.StartAsync();
+            var server = host.GetTestServer();
 
             var webSocketFactoryCalled = false;
             var connectionBuilder = new HubConnectionBuilder()
@@ -52,7 +63,7 @@ public async Task WebSocketsWorks()
                 });
             connectionBuilder.Services.AddLogging();
             connectionBuilder.Services.AddSingleton(LoggerFactory);
-            var connection = connectionBuilder.Build();
+            await using var connection = connectionBuilder.Build();
 
             var originalMessage = "message";
             connection.On<string>("Echo", (receivedMessage) =>
@@ -71,20 +82,30 @@ public async Task LongPollingWorks()
     {
         using (StartVerifiableLog())
         {
-            var builder = new WebHostBuilder().ConfigureServices(s =>
-            {
-                s.AddLogging();
-                s.AddSingleton(LoggerFactory);
-                s.AddSignalR();
-            }).Configure(app =>
-            {
-                app.UseRouting();
-                app.UseEndpoints(endpoints =>
+            using var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
                 {
-                    endpoints.MapHub<EchoHub>("/echo");
-                });
-            });
-            var server = new TestServer(builder);
+                    webHostBuilder
+                        .UseTestServer()
+                        .ConfigureServices(s =>
+                        {
+                            s.AddLogging();
+                            s.AddSingleton(LoggerFactory);
+                            s.AddSignalR();
+                        })
+                        .Configure(app =>
+                        {
+                            app.UseRouting();
+                            app.UseEndpoints(endpoints =>
+                            {
+                                endpoints.MapHub<EchoHub>("/echo");
+                            });
+                        });
+                })
+                .Build();
+
+            await host.StartAsync();
+            var server = host.GetTestServer();
 
             var connectionBuilder = new HubConnectionBuilder()
                 .WithUrl(server.BaseAddress + "echo", options =>
@@ -97,7 +118,7 @@ public async Task LongPollingWorks()
                 });
             connectionBuilder.Services.AddLogging();
             connectionBuilder.Services.AddSingleton(LoggerFactory);
-            var connection = connectionBuilder.Build();
+            await using var connection = connectionBuilder.Build();
 
             var originalMessage = "message";
             connection.On<string>("Echo", (receivedMessage) =>
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs
index 4ec8efe7c59a..f18ef5eef7a1 100644
--- a/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs
+++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs
@@ -75,7 +75,7 @@ public WebSocketsTransport(HttpConnectionOptions httpConnectionOptions, ILoggerF
         bool useStatefulReconnect = false)
     {
         _useStatefulReconnect = useStatefulReconnect;
-        _logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger(typeof(WebSocketsTransport));
+        _logger = loggerFactory?.CreateLogger(typeof(WebSocketsTransport)) ?? NullLogger.Instance;
         _httpConnectionOptions = httpConnectionOptions ?? new HttpConnectionOptions();
 
         _closeTimeout = _httpConnectionOptions.CloseTimeout;
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
index 7c9977be80e2..4086df48687e 100644
--- a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
+++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
@@ -25,7 +25,7 @@
     <Reference Include="Microsoft.AspNetCore.Http.Connections.Common" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
-    <Reference Include="System.Net.ServerSentEvents" />
+    <Reference Include="System.Net.ServerSentEvents" Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle
index 7314185e2fa4..3e192445c97e 100644
--- a/src/SignalR/clients/java/signalr/build.gradle
+++ b/src/SignalR/clients/java/signalr/build.gradle
@@ -6,13 +6,12 @@ buildscript {
   }
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:6.6.1"
-    classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
   }
 }
 
 plugins {
     id 'java'
-    id 'maven'
+    id 'maven-publish'
 }
 
 allprojects {
@@ -22,7 +21,9 @@ allprojects {
     // If we're run from outside MSBuild, just assign a bogus dev version.
     version project.findProperty('packageVersion') ?: "99.99.99-dev"
 
-    sourceCompatibility = 1.8
+    java {
+        sourceCompatibility = 1.9
+    }
 
     repositories {
         mavenCentral()
@@ -52,4 +53,4 @@ spotless {
         indentWithSpaces(4)
         removeUnusedImports() // removes any unused imports
     }
-}
\ No newline at end of file
+}
diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle
index 8d6dbc010274..b719ae0cffe9 100644
--- a/src/SignalR/clients/java/signalr/core/build.gradle
+++ b/src/SignalR/clients/java/signalr/core/build.gradle
@@ -1,10 +1,15 @@
 plugins {
     id 'java'
-    id 'maven'
+    id 'maven-publish'
 }
 
 group 'com.microsoft.signalr'
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
@@ -12,49 +17,49 @@ dependencies {
     implementation 'org.slf4j:slf4j-api:1.7.25'
 }
 
-archivesBaseName = 'signalr'
-
-task sourceJar(type: Jar) {
-    classifier "sources"
-    from sourceSets.main.allJava
+base {
+    archivesName = 'signalr'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier "javadoc"
-    from javadoc.destinationDir
-}
+publishing {
+    publications {
+        release(MavenPublication) {
+            from components.java
 
-task generatePOM {
-    pom {
-        project {
             artifactId 'signalr'
-            inceptionYear '2018'
-            description 'ASP.NET Core SignalR Client for Java applications'
-            url 'https://github.com/dotnet/aspnetcore'
-            name groupId + ':' + artifactId
-            licenses {
-                license {
-                    name 'MIT License'
-                    url 'https://opensource.org/licenses/MIT'
-                    distribution 'repo'
+
+            pom {
+                packaging = 'jar'
+                inceptionYear = '2018'
+                url = 'https://github.com/dotnet/aspnetcore'
+                name = groupId + ':' + artifactId
+                description = 'ASP.NET Core SignalR Client for Java applications'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'https://opensource.org/licenses/MIT'
+                        distribution = 'repo'
+                    }
                 }
-            }
-            scm {
-                connection 'scm:git:https://github.com/dotnet/aspnetcore.git'
-                developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git'
-                url 'https://github.com/dotnet/aspnetcore/tree/main'
-            }
-            developers {
-                developer {
-                    id 'microsoft'
-                    name 'Microsoft'
+                scm {
+                    connection = 'scm:git:https://github.com/dotnet/aspnetcore.git'
+                    developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git'
+                    url = 'https://github.com/dotnet/aspnetcore/tree/main'
+                }
+                developers {
+                    developer {
+                        id = 'microsoft'
+                        name = 'Microsoft'
+                    }
                 }
             }
         }
-    }.writeTo("${buildDir}/libs/signalr-${project.version}.pom")
+    }
 }
 
-task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM])
+tasks.withType(GenerateMavenPom).all {
+    destination = layout.buildDirectory.file("libs/signalr-${project.version}.pom").get().asFile
+}
 
 task generateVersionClass {
     inputs.property "version", project.version
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
index 767f306cd9b6..3ef3a6968843 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
@@ -116,9 +116,9 @@ public Single<HttpResponse> send(HttpRequest httpRequest, ByteBuffer bodyContent
             case "POST":
                 RequestBody body;
                 if (bodyContent != null) {
-                    body = RequestBody.create(MediaType.parse("text/plain"), ByteString.of(bodyContent));
+                    body = RequestBody.Companion.create(ByteString.of(bodyContent), MediaType.parse("text/plain"));
                 } else {
-                    body = RequestBody.create(null, new byte[]{});
+                    body = RequestBody.Companion.create(new byte[]{}, null);
                 }
 
                 requestBuilder.post(body);
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java
index 042ca484806f..026f5da7e0a2 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java
@@ -92,13 +92,26 @@ public List<HubMessage> parseMessages(ByteBuffer payload, InvocationBinder binde
                             error = reader.nextString();
                             break;
                         case "result":
-                        case "item":
                             if (invocationId == null || binder.getReturnType(invocationId) == null) {
                                 resultToken = JsonParser.parseReader(reader);
                             } else {
                                 result = gson.fromJson(reader, binder.getReturnType(invocationId));
                             }
                             break;
+                        case "item":
+                            if (invocationId == null || binder.getReturnType(invocationId) == null) {
+                                resultToken = JsonParser.parseReader(reader);
+                            } else {
+                                try {
+                                    result = gson.fromJson(reader, binder.getReturnType(invocationId));
+                                } catch (Exception ex) {
+                                    argumentBindingException = ex;
+                                    // Since we failed to parse the value, tell the reader to skip the failed item
+                                    // so it can successfully continue reading
+                                    reader.skipValue();
+                                }
+                            }
+                            break;
                         case "arguments":
                             if (target != null) {
                                 boolean startedArray = false;
@@ -126,7 +139,14 @@ public List<HubMessage> parseMessages(ByteBuffer payload, InvocationBinder binde
                             }
                             break;
                         case "headers":
-                            throw new RuntimeException("Headers not implemented yet.");
+                            // Parse headers as Map<String, String> but don't store for now as it's unused
+                            reader.beginObject();
+                            while (reader.hasNext()) {
+                                reader.nextName(); // Read the key
+                                reader.nextString(); // Read the value
+                            }
+                            reader.endObject();
+                            break;
                         default:
                             // Skip unknown property, allows new clients to still work with old protocols
                             reader.skipValue();
@@ -167,9 +187,17 @@ public List<HubMessage> parseMessages(ByteBuffer payload, InvocationBinder binde
                     case STREAM_ITEM:
                         if (resultToken != null) {
                             Type returnType = binder.getReturnType(invocationId);
-                            result = gson.fromJson(resultToken, returnType != null ? returnType : Object.class);
+                            try {
+                                result = gson.fromJson(resultToken, returnType != null ? returnType : Object.class);
+                            } catch (Exception ex) {
+                                argumentBindingException = ex;
+                            }
+                        }
+                        if (argumentBindingException != null) {
+                            hubMessages.add(new StreamBindingFailureMessage(invocationId, argumentBindingException));
+                        } else {
+                            hubMessages.add(new StreamItem(null, invocationId, result));
                         }
-                        hubMessages.add(new StreamItem(null, invocationId, result));
                         break;
                     case STREAM_INVOCATION:
                     case CANCEL_INVOCATION:
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
index 7ae85b551cde..455a0323b6f9 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
@@ -445,7 +445,8 @@ private Completable stop(String errorMessage) {
         CompletableSubject subject = CompletableSubject.create();
         startTask.onErrorComplete().subscribe(() ->
         {
-            Completable stop = connectionState.transport.stop();
+            Transport transport = connectionState.transport;
+            Completable stop = (transport != null) ? transport.stop() : Completable.complete();
             stop.subscribe(() -> subject.onComplete(), e -> subject.onError(e));
         });
 
@@ -483,6 +484,11 @@ private void ReceiveLoop(ByteBuffer payload)
                             null, "Client failed to parse argument(s)."));
                     }
                     break;
+                case STREAM_BINDING_FAILURE:
+                    // The server can't receive a response, so we just drop the message and log
+                    StreamBindingFailureMessage streamError = (StreamBindingFailureMessage)message;
+                    logger.error("Failed to bind argument received in stream '{}'.", streamError.getInvocationId(), streamError.getException());
+                    break;
                 case INVOCATION:
                     InvocationMessage invocationMessage = (InvocationMessage) message;
                     connectionState.dispatchInvocation(invocationMessage);
diff --git a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties
index 3eb10089fafd..df5ca3a8b779 100644
--- a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties
+++ b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle
index 4787c62e3aae..159ddba3bc82 100644
--- a/src/SignalR/clients/java/signalr/messagepack/build.gradle
+++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle
@@ -1,56 +1,62 @@
 plugins {
     id 'java'
-    id 'maven'
+    id 'maven-publish'
 }
 
 group 'com.microsoft.signalr.messagepack'
 
+java
+{
+    withJavadocJar()
+    withSourcesJar()
+}
+
 dependencies {
     implementation project(':core')
-    compile 'org.msgpack:msgpack-core:0.8.20'
-    compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20'
+    implementation 'org.msgpack:msgpack-core:0.8.20'
+    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20'
 }
 
-archivesBaseName = 'signalr-messagepack'
-
-task sourceJar(type: Jar) {
-    classifier "sources"
-    from sourceSets.main.allJava
+base {
+    archivesName = 'signalr-messagepack'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier "javadoc"
-    from javadoc.destinationDir
-}
+publishing {
+    publications {
+        release(MavenPublication) {
+            from components.java
 
-task generatePOM {
-    pom {
-        project {
             artifactId 'signalr-messagepack'
-            inceptionYear '2020'
-            description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications'
-            url 'https://github.com/dotnet/aspnetcore'
-            name groupId + ':' + artifactId
-            licenses {
-                license {
-                    name 'MIT License'
-                    url 'https://opensource.org/licenses/MIT'
-                    distribution 'repo'
+
+            pom {
+                packaging = 'jar'
+                inceptionYear = '2020'
+                url = 'https://github.com/dotnet/aspnetcore'
+                name = groupId + ':' + artifactId
+                description = 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'https://opensource.org/licenses/MIT'
+                        distribution = 'repo'
+                    }
                 }
-            }
-            scm {
-                connection 'scm:git:https://github.com/dotnet/aspnetcore.git'
-                developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git'
-                url 'https://github.com/dotnet/aspnetcore/tree/main'
-            }
-            developers {
-                developer {
-                    id 'microsoft'
-                    name 'Microsoft'
+                scm {
+                    connection = 'scm:git:https://github.com/dotnet/aspnetcore.git'
+                    developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git'
+                    url = 'https://github.com/dotnet/aspnetcore/tree/main'
+                }
+                developers {
+                    developer {
+                        id = 'microsoft'
+                        name = 'Microsoft'
+                    }
                 }
             }
         }
-    }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom")
+    }
 }
 
-task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM])
+tasks.withType(GenerateMavenPom).all {
+    destination = layout.buildDirectory.file("libs/signalr-messagepack-${project.version}.pom").get().asFile
+}
diff --git a/src/SignalR/clients/java/signalr/test/build.gradle b/src/SignalR/clients/java/signalr/test/build.gradle
index 2fefd54f6481..8c06c5418456 100644
--- a/src/SignalR/clients/java/signalr/test/build.gradle
+++ b/src/SignalR/clients/java/signalr/test/build.gradle
@@ -1,16 +1,60 @@
-apply plugin: 'org.junit.platform.gradle.plugin'
+plugins {
+    id 'java'
+}
+
+configurations {
+    antJUnit
+}
 
 dependencies {
-    implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
-    compile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
-    runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    compile 'ch.qos.logback:logback-classic:1.2.3'
+    implementation 'org.junit.jupiter:junit-jupiter-params:5.11.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
+    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'ch.qos.logback:logback-classic:1.2.3'
     implementation project(':core')
     implementation project(':messagepack')
-    compile project(':messagepack')
+    antJUnit 'org.apache.ant:ant-junit:1.10.15'
+}
+
+sourceSets {
+  test {
+    java {
+      srcDir 'src'
+    }
+  }
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
+    reports {
+        html.required = false
+        junitXml.outputPerTestCase = true
+        junitXml.required = true
+    }
+}
+
+// Merge test results into a single file for Helix to detect JUnit test file
+task testReport {
+    ext {
+        resultsDir = file("$buildDir/test-results")
+        mergedFile = "test-results/junit-results.xml"
+    }
+
+    doLast {
+        mkdir 'test-results'
+        ant.taskdef(name: 'junitreport',
+                    classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
+                    classpath: configurations.antJUnit.asPath)
+
+        ant.junitreport(tofile: mergedFile) {
+            fileset(dir: resultsDir, includes: '**/TEST-*.xml')
+        }
+    }
 }
 
-junitPlatform {
-    reportsDir file('test-results')
-}
\ No newline at end of file
+test.finalizedBy(testReport)
\ No newline at end of file
diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
index 3e8dfac79be9..8068629f03b3 100644
--- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
+++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
@@ -6,6 +6,8 @@
     <!-- Installing Java on ARM will take some work -->
     <SkipHelixArm>true</SkipHelixArm>
     <SkipHelixAlpine>true</SkipHelixAlpine>
+    <!-- Temporary while Mac machines get new JDK -->
+    <SkipHelixQueues>OSX.15.Amd64.Open;$(SkipHelixQueues)</SkipHelixQueues>
     <PublishDir>$(OutputPath)</PublishDir>
     <TestDependsOnJava>true</TestDependsOnJava>
   </PropertyGroup>
@@ -49,8 +51,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' != 'true'" Include="cp %24{HELIX_WORKITEM_ROOT}/test/test-results/TEST-junit-jupiter.xml %24{HELIX_WORKITEM_ROOT}/junit-results.xml" />
-    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="copy %25HELIX_WORKITEM_ROOT%25\test\test-results\TEST-junit-jupiter.xml %25HELIX_WORKITEM_ROOT%25\junit-results.xml" />
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' != 'true'" Include="cp %24{HELIX_WORKITEM_ROOT}/test/test-results/junit-results.xml %24{HELIX_WORKITEM_ROOT}/junit-results.xml" />
+    <HelixPostCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="copy %25HELIX_WORKITEM_ROOT%25\test\test-results\junit-results.xml %25HELIX_WORKITEM_ROOT%25\junit-results.xml" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
index 53454be031b6..2ecfd483c7f5 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
@@ -444,7 +444,7 @@ public void invocationBindingFailureWhenParsingLocalDateTimeWithoutAppropriateTy
         assertEquals(HubMessageType.INVOCATION_BINDING_FAILURE, message.getMessageType());
         InvocationBindingFailureMessage failureMessage = (InvocationBindingFailureMessage) messages.get(0);
 
-        assertEquals("java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 41 path $.arguments[0]", failureMessage.getException().getMessage());
+        assertEquals("com.google.gson.JsonSyntaxException", failureMessage.getException().getClass().getName());
     }
 
     @Test
@@ -527,4 +527,98 @@ public void canRegisterTypeAdaptorWithoutAffectingJsonProtocol() {
         assertEquals(3, (int) invocationMessage.getArguments()[0]);
         assertEquals("four", invocationMessage.getArguments()[1]);
     }
+
+    @Test
+    public void canParseInvocationMessageWithHeaders() {
+        String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42],\"headers\":{\"a\":\"b\",\"c\":\"d\"}}\u001E";
+        ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage);
+        TestBinder binder = new TestBinder(new Type[] { int.class }, null);
+
+        List<HubMessage> messages = hubProtocol.parseMessages(message, binder);
+
+        assertNotNull(messages);
+        assertEquals(1, messages.size());
+
+        assertEquals(HubMessageType.INVOCATION, messages.get(0).getMessageType());
+        InvocationMessage invocationMessage = (InvocationMessage) messages.get(0);
+
+        assertEquals("test", invocationMessage.getTarget());
+        assertEquals(null, invocationMessage.getInvocationId());
+        int messageResult = (int)invocationMessage.getArguments()[0];
+        assertEquals(42, messageResult);
+        // Headers are parsed but not stored, so we just verify the message was processed successfully
+    }
+
+    @Test
+    public void canParseInvocationMessageWithEmptyHeaders() {
+        String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42],\"headers\":{}}\u001E";
+        ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage);
+        TestBinder binder = new TestBinder(new Type[] { int.class }, null);
+
+        List<HubMessage> messages = hubProtocol.parseMessages(message, binder);
+
+        assertNotNull(messages);
+        assertEquals(1, messages.size());
+
+        assertEquals(HubMessageType.INVOCATION, messages.get(0).getMessageType());
+        InvocationMessage invocationMessage = (InvocationMessage) messages.get(0);
+
+        assertEquals("test", invocationMessage.getTarget());
+        int messageResult = (int)invocationMessage.getArguments()[0];
+        assertEquals(42, messageResult);
+    }
+
+    @Test
+    public void canParseCompletionMessageWithHeaders() {
+        String stringifiedMessage = "{\"type\":3,\"invocationId\":\"1\",\"result\":42,\"headers\":{\"a\":\"b\",\"c\":\"d\"}}\u001E";
+        ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage);
+        TestBinder binder = new TestBinder(null, int.class);
+
+        List<HubMessage> messages = hubProtocol.parseMessages(message, binder);
+
+        assertNotNull(messages);
+        assertEquals(1, messages.size());
+
+        assertEquals(HubMessageType.COMPLETION, messages.get(0).getMessageType());
+        CompletionMessage completionMessage = (CompletionMessage) messages.get(0);
+        assertEquals("1", completionMessage.getInvocationId());
+        assertEquals(42, completionMessage.getResult());
+        assertEquals(null, completionMessage.getError());
+    }
+
+    @Test
+    public void canParseStreamItemMessageWithHeaders() {
+        String stringifiedMessage = "{\"type\":2,\"invocationId\":\"1\",\"item\":\"test-item\",\"headers\":{\"a\":\"b\"}}\u001E";
+        ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage);
+        TestBinder binder = new TestBinder(null, String.class);
+
+        List<HubMessage> messages = hubProtocol.parseMessages(message, binder);
+
+        assertNotNull(messages);
+        assertEquals(1, messages.size());
+
+        assertEquals(HubMessageType.STREAM_ITEM, messages.get(0).getMessageType());
+        StreamItem streamItem = (StreamItem) messages.get(0);
+        assertEquals("1", streamItem.getInvocationId());
+        assertEquals("test-item", streamItem.getItem());
+    }
+
+    @Test
+    public void canParseMessageWithHeadersInDifferentOrder() {
+        String stringifiedMessage = "{\"headers\":{\"First\":\"value1\",\"Second\":\"value2\"},\"type\":1,\"target\":\"test\",\"arguments\":[42]}\u001E";
+        ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage);
+        TestBinder binder = new TestBinder(new Type[] { int.class }, null);
+
+        List<HubMessage> messages = hubProtocol.parseMessages(message, binder);
+
+        assertNotNull(messages);
+        assertEquals(1, messages.size());
+
+        assertEquals(HubMessageType.INVOCATION, messages.get(0).getMessageType());
+        InvocationMessage invocationMessage = (InvocationMessage) messages.get(0);
+
+        assertEquals("test", invocationMessage.getTarget());
+        int messageResult = (int)invocationMessage.getArguments()[0];
+        assertEquals(42, messageResult);
+    }
 }
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
index 34a9d631b411..e68009f51039 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
@@ -3,7 +3,11 @@
 
 package com.microsoft.signalr;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
@@ -17,7 +21,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -1097,6 +1100,37 @@ public void checkStreamCompletionError() {
         assertEquals("There was an error", exception.getMessage());
     }
 
+    @Test
+    public void checkStreamItemBindingFailure() {
+        try (TestLogger logger = new TestLogger()) {
+            MockTransport mockTransport = new MockTransport();
+            HubConnection hubConnection = TestUtils.createHubConnection("http://example.com", mockTransport);
+
+            hubConnection.start().timeout(30, TimeUnit.SECONDS).blockingAwait();
+
+            AtomicBoolean onNextCalled = new AtomicBoolean();
+            Observable<Integer> result = hubConnection.stream(Integer.class, "echo", "message");
+            result.subscribe((item) -> onNextCalled.set(true),
+                    (error) -> {},
+                    () -> {});
+
+            assertEquals("{\"type\":4,\"invocationId\":\"1\",\"target\":\"echo\",\"arguments\":[\"message\"]}" + RECORD_SEPARATOR,
+                    TestUtils.byteBufferToString(mockTransport.getSentMessages()[1]));
+            assertFalse(onNextCalled.get());
+
+            mockTransport.receiveMessage("{\"type\":2,\"invocationId\":\"1\",\"item\":\"str\"}" + RECORD_SEPARATOR);
+
+            assertFalse(onNextCalled.get());
+
+            mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"result\":1}" + RECORD_SEPARATOR);
+
+            assertEquals(1, result.timeout(30, TimeUnit.SECONDS).blockingFirst());
+
+            ILoggingEvent log = logger.assertLog("Failed to bind argument received in stream '1'.");
+            assertTrue(log.getThrowableProxy().getClassName().contains("gson.JsonSyntaxException"));
+        }
+    }
+
     @Test
     public void checkStreamCompletionErrorWithMessagePack() {
         MockTransport mockTransport = new MockTransport();
@@ -2749,6 +2783,32 @@ public void negotiateSentOnStart() {
         assertEquals("http://example.com/negotiate?negotiateVersion=1", sentRequests.get(0).getUrl());
     }
 
+    @Test
+    public void closeWithPendingNegotiate() {
+        SingleSubject<HttpResponse> responseSubject = SingleSubject.create();
+
+        TestHttpClient client = new TestHttpClient()
+                .on("POST", (req) -> responseSubject);
+
+        HubConnection hubConnection = HubConnectionBuilder
+                .create("http://example.com")
+                .withHttpClient(client)
+                .build();
+
+        Completable start = hubConnection.start();
+        assertEquals(HubConnectionState.CONNECTING, hubConnection.getConnectionState());
+
+        Completable stop = hubConnection.stop();
+
+        responseSubject.onSuccess(new HttpResponse(404, "", TestUtils.emptyByteBuffer));
+        stop.timeout(3, TimeUnit.SECONDS).blockingAwait();
+        assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState());
+
+        HttpRequestException exception = assertThrows(HttpRequestException.class, () -> start.blockingAwait(10, TimeUnit.SECONDS));
+        assertEquals("Unexpected status code returned from negotiate: 404 .", exception.getMessage());
+        assertEquals(404, exception.getStatusCode());
+    }
+
     @Test
     public void negotiateThatRedirectsForeverFailsAfter100Tries() {
         TestHttpClient client = new TestHttpClient().on("POST", "http://example.com/negotiate?negotiateVersion=1",
diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json
index 515f26d01c9b..6f5c28f87072 100644
--- a/src/SignalR/clients/ts/FunctionalTests/package.json
+++ b/src/SignalR/clients/ts/FunctionalTests/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "functionaltests",
+  "name": "@microsoft/functionaltests",
   "private": true,
   "version": "1.0.0",
   "description": "",
@@ -38,7 +38,7 @@
     "rxjs": "^6.3.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.0.2",
-    "webpack": "^5.76.3",
+    "webpack": "^5.94.0",
     "ws": " ^6.0.0"
   },
   "scripts": {
diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
index 97a60bd23e50..a00f69a5f677 100644
--- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
@@ -232,7 +232,7 @@ function runJest(httpsUrl: string, httpUrl: string) {
 
 (async () => {
     try {
-        const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net9.0", "SignalR.Client.FunctionalTestApp.dll");
+        const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net10.0", "SignalR.Client.FunctionalTestApp.dll");
 
         debug(`Launching Functional Test Server: ${serverPath}`);
         let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0";
diff --git a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
index 7135ca18f550..61d5ae02ccfe 100644
--- a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
@@ -302,7 +302,7 @@ describe("hubConnection", () => {
                 // client side method names are case insensitive
                 let methodName = "message";
                 const idx = Math.floor(Math.random() * (methodName.length - 1));
-                methodName = methodName.substr(0, idx) + methodName[idx].toUpperCase() + methodName.substr(idx + 1);
+                methodName = methodName.substring(0, idx) + methodName[idx].toUpperCase() + methodName.substring(idx + 1);
 
                 const receivePromise = new PromiseSource<string>();
                 hubConnection.on(methodName, (msg) => {
@@ -328,7 +328,7 @@ describe("hubConnection", () => {
                 // client side method names are case insensitive
                 let methodName = "message";
                 const idx = Math.floor(Math.random() * (methodName.length - 1));
-                methodName = methodName.substr(0, idx) + methodName[idx].toUpperCase() + methodName.substr(idx + 1);
+                methodName = methodName.substring(0, idx) + methodName[idx].toUpperCase() + methodName.substring(idx + 1);
 
                 let closeCount = 0;
                 let invocationCount = 0;
diff --git a/src/SignalR/clients/ts/package.json b/src/SignalR/clients/ts/package.json
index b353c6f9e48d..fb29ef1f1538 100644
--- a/src/SignalR/clients/ts/package.json
+++ b/src/SignalR/clients/ts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "client-ts",
+  "name": "@microsoft/client-ts",
   "version": "1.0.0",
   "description": "Common dependencies used during dev time. DO NOT PUBLISH",
   "private": true,
@@ -27,7 +27,7 @@
     "ts-jest": "^29.0.5",
     "ts-loader": "^8.0.17",
     "typescript": "^4.9.5",
-    "webpack": "^5.76.3",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.9.2"
   },
   "dependencies": {},
diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json
index c9cc83805bbc..3f9769cdc736 100644
--- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json
+++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/signalr-protocol-msgpack",
-  "version": "5.0.0-dev",
+  "version": "10.0.0-dev",
   "description": "MsgPack Protocol support for ASP.NET Core SignalR",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -41,11 +41,11 @@
     "src/**/*"
   ],
   "dependencies": {
-    "@microsoft/signalr": "*",
+    "@microsoft/signalr": ">=10.0.0-dev",
     "@msgpack/msgpack": "^2.7.0"
   },
   "overrides": {
     "ws": ">=7.4.6",
     "tough-cookie": ">=4.1.3"
   }
-}
+}
\ No newline at end of file
diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json
index 9be27b13d8b3..a13e0ba8ee8b 100644
--- a/src/SignalR/clients/ts/signalr/package.json
+++ b/src/SignalR/clients/ts/signalr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/signalr",
-  "version": "5.0.0-dev",
+  "version": "10.0.0-dev",
   "description": "ASP.NET Core SignalR Client",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -45,7 +45,7 @@
     "eventsource": "^2.0.2",
     "fetch-cookie": "^2.0.3",
     "node-fetch": "^2.6.7",
-    "ws": "^7.4.5"
+    "ws": "^7.5.10"
   },
   "overrides": {
     "ansi-regex": "5.0.1",
diff --git a/src/SignalR/clients/ts/signalr/src/HubConnection.ts b/src/SignalR/clients/ts/signalr/src/HubConnection.ts
index f89d63a21e66..53fc6fafa069 100644
--- a/src/SignalR/clients/ts/signalr/src/HubConnection.ts
+++ b/src/SignalR/clients/ts/signalr/src/HubConnection.ts
@@ -721,10 +721,19 @@ export class HubConnection {
             // Set the timeout timer
             this._timeoutHandle = setTimeout(() => this.serverTimeout(), this.serverTimeoutInMilliseconds);
 
+            // Immediately fire Keep-Alive ping if nextPing is overdue to avoid dependency on JS timers
+            let nextPing = this._nextKeepAlive - new Date().getTime();
+            if (nextPing < 0) {
+                if (this._connectionState === HubConnectionState.Connected) {
+                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                    this._trySendPingMessage();
+                }
+                return;
+            }
+
             // Set keepAlive timer if there isn't one
             if (this._pingServerHandle === undefined)
             {
-                let nextPing = this._nextKeepAlive - new Date().getTime();
                 if (nextPing < 0) {
                     nextPing = 0;
                 }
@@ -732,13 +741,7 @@ export class HubConnection {
                 // The timer needs to be set from a networking callback to avoid Chrome timer throttling from causing timers to run once a minute
                 this._pingServerHandle = setTimeout(async () => {
                     if (this._connectionState === HubConnectionState.Connected) {
-                        try {
-                            await this._sendMessage(this._cachedPingMessage);
-                        } catch {
-                            // We don't care about the error. It should be seen elsewhere in the client.
-                            // The connection is probably in a bad or closed state now, cleanup the timer so it stops triggering
-                            this._cleanupPingTimer();
-                        }
+                        await this._trySendPingMessage();
                     }
                 }, nextPing);
             }
@@ -871,7 +874,7 @@ export class HubConnection {
         let previousReconnectAttempts = 0;
         let retryError = error !== undefined ? error : new Error("Attempting to reconnect due to a unknown error.");
 
-        let nextRetryDelay = this._getNextRetryDelay(previousReconnectAttempts++, 0, retryError);
+        let nextRetryDelay = this._getNextRetryDelay(previousReconnectAttempts, 0, retryError);
 
         if (nextRetryDelay === null) {
             this._logger.log(LogLevel.Debug, "Connection not reconnecting because the IRetryPolicy returned null on the first reconnect attempt.");
@@ -902,7 +905,7 @@ export class HubConnection {
         }
 
         while (nextRetryDelay !== null) {
-            this._logger.log(LogLevel.Information, `Reconnect attempt number ${previousReconnectAttempts} will start in ${nextRetryDelay} ms.`);
+            this._logger.log(LogLevel.Information, `Reconnect attempt number ${previousReconnectAttempts + 1} will start in ${nextRetryDelay} ms.`);
 
             await new Promise((resolve) => {
                 this._reconnectDelayHandle = setTimeout(resolve, nextRetryDelay!);
@@ -941,8 +944,9 @@ export class HubConnection {
                     return;
                 }
 
+                previousReconnectAttempts++;
                 retryError = e instanceof Error ? e : new Error((e as any).toString());
-                nextRetryDelay = this._getNextRetryDelay(previousReconnectAttempts++, Date.now() - reconnectStartTime, retryError);
+                nextRetryDelay = this._getNextRetryDelay(previousReconnectAttempts, Date.now() - reconnectStartTime, retryError);
             }
         }
 
@@ -1148,4 +1152,14 @@ export class HubConnection {
     private _createCloseMessage(): CloseMessage {
         return { type: MessageType.Close };
     }
+
+    private async _trySendPingMessage(): Promise<void> {
+        try {
+            await this._sendMessage(this._cachedPingMessage);
+        } catch {
+            // We don't care about the error. It should be seen elsewhere in the client.
+            // The connection is probably in a bad or closed state now, cleanup the timer so it stops triggering
+            this._cleanupPingTimer();
+        }
+    }
 }
diff --git a/src/SignalR/clients/ts/signalr/src/Utils.ts b/src/SignalR/clients/ts/signalr/src/Utils.ts
index 242c050a8095..4e2c03c432b2 100644
--- a/src/SignalR/clients/ts/signalr/src/Utils.ts
+++ b/src/SignalR/clients/ts/signalr/src/Utils.ts
@@ -87,7 +87,7 @@ export function formatArrayBuffer(data: ArrayBuffer): string {
     });
 
     // Trim of trailing space.
-    return str.substr(0, str.length - 1);
+    return str.substring(0, str.length - 1);
 }
 
 // Also in signalr-protocol-msgpack/Utils.ts
diff --git a/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs b/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs
index 8ed01395df6c..cd094cbf300e 100644
--- a/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs
+++ b/src/SignalR/common/Http.Connections/src/ConnectionEndpointRouteBuilderExtensions.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Http.Connections.Internal;
+using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Http.Timeouts;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
@@ -125,6 +126,9 @@ public static ConnectionEndpointRouteBuilder MapConnections(this IEndpointRouteB
             {
                 e.Metadata.Add(data);
             }
+
+            // Add IDisableCookieRedirectMetadata to indicate this is a non-browser endpoint (SignalR)
+            e.Metadata.Add(DisableCookieRedirectMetadata.Instance);
         });
 
         return new ConnectionEndpointRouteBuilder(compositeConventionBuilder);
@@ -155,4 +159,9 @@ public void Finally(Action<EndpointBuilder> finalConvention)
             }
         }
     }
+
+    private sealed class DisableCookieRedirectMetadata : IDisableCookieRedirectMetadata
+    {
+        public static DisableCookieRedirectMetadata Instance { get; } = new();
+    }
 }
diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
index 038b66fbcbf8..3ba5e15984bf 100644
--- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
+++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
@@ -1504,7 +1504,7 @@ public async Task RequestToActiveConnectionIdKillsPreviousConnectionLongPolling(
             }
             if (count == 50)
             {
-                Assert.True(false, "Poll took too long to start");
+                Assert.Fail("Poll took too long to start");
             }
 
             var request2 = dispatcher.ExecuteAsync(context2, options, app);
@@ -1524,7 +1524,7 @@ public async Task RequestToActiveConnectionIdKillsPreviousConnectionLongPolling(
             }
             if (count == 50)
             {
-                Assert.True(false, "Poll took too long to start");
+                Assert.Fail("Poll took too long to start");
             }
             Assert.Equal(HttpConnectionStatus.Active, connection.Status);
 
@@ -3525,7 +3525,7 @@ public async Task RequestTimeoutDisabledWhenConnected(HttpTransportType transpor
                     app.UseRouting();
                     app.UseEndpoints(endpoints =>
                     {
-                        endpoints.MapConnectionHandler<TestConnectionHandler>("/foo");
+                        endpoints.MapConnectionHandler<EchoConnectionHandler>("/foo");
                     });
                 })
                 .UseUrls("http://127.0.0.1:0");
@@ -3550,6 +3550,10 @@ public async Task RequestTimeoutDisabledWhenConnected(HttpTransportType transpor
 
             await connection.StartAsync();
 
+            // Easy way to make sure everything is set is to send and receive data over the connection
+            await connection.Transport.Output.WriteAsync(new byte[2]);
+            await connection.Transport.Input.ReadAsync();
+
             var negotiateResponse = NegotiateProtocol.ParseResponse(stream.ToArray());
 
             Assert.True(manager.TryGetConnection(negotiateResponse.ConnectionToken, out var context));
@@ -3898,6 +3902,34 @@ public override async Task OnConnectedAsync(ConnectionContext connection)
     }
 }
 
+public class EchoConnectionHandler : ConnectionHandler
+{
+    public override async Task OnConnectedAsync(ConnectionContext connection)
+    {
+        while (true)
+        {
+            var result = await connection.Transport.Input.ReadAsync();
+            var buffer = result.Buffer;
+
+            try
+            {
+                if (!buffer.IsEmpty)
+                {
+                    await connection.Transport.Output.WriteAsync(buffer.ToArray());
+                }
+                else if (result.IsCompleted)
+                {
+                    break;
+                }
+            }
+            finally
+            {
+                connection.Transport.Input.AdvanceTo(result.Buffer.End);
+            }
+        }
+    }
+}
+
 public class ServiceProviderConnectionHandler : ConnectionHandler
 {
     public override async Task OnConnectedAsync(ConnectionContext connection)
diff --git a/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs b/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs
index 1e20f296d37c..e204702c13c0 100644
--- a/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs
+++ b/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs
@@ -52,7 +52,7 @@ public void MapConnectionHandlerFindsMetadataPolicyOnEndPoint()
                     var policies = endpoint.Metadata.GetOrderedMetadata<AuthorizationPolicy>();
                     Assert.Equal(2, policies.Count);
                     Assert.Equal(policy1, policies[0]);
-                    Assert.Equal(1, policies[1].Requirements.Count);
+                    Assert.Single(policies[1].Requirements);
                     Assert.Equal(req, policies[1].Requirements.First());
                 },
                 endpoint =>
@@ -62,7 +62,7 @@ public void MapConnectionHandlerFindsMetadataPolicyOnEndPoint()
                     var policies = endpoint.Metadata.GetOrderedMetadata<AuthorizationPolicy>();
                     Assert.Equal(2, policies.Count);
                     Assert.Equal(policy1, policies[0]);
-                    Assert.Equal(1, policies[1].Requirements.Count);
+                    Assert.Single(policies[1].Requirements);
                     Assert.Equal(req, policies[1].Requirements.First());
                 });
         }
diff --git a/src/SignalR/common/Http.Connections/test/WebSocketsTests.cs b/src/SignalR/common/Http.Connections/test/WebSocketsTests.cs
index 380235665c04..684aaf386cd7 100644
--- a/src/SignalR/common/Http.Connections/test/WebSocketsTests.cs
+++ b/src/SignalR/common/Http.Connections/test/WebSocketsTests.cs
@@ -100,7 +100,7 @@ public async Task WebSocketTransportSetsMessageTypeBasedOnTransferFormatFeature(
                 await feature.Client.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None);
                 await transport;
 
-                Assert.Equal(1, clientSummary.Received.Count);
+                Assert.Single(clientSummary.Received);
                 Assert.True(clientSummary.Received[0].EndOfMessage);
                 Assert.Equal((WebSocketMessageType)Enum.Parse(typeof(WebSocketMessageType), expectedMessageType), clientSummary.Received[0].MessageType);
                 Assert.Equal("Hello", Encoding.UTF8.GetString(clientSummary.Received[0].Buffer));
diff --git a/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml b/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
index be6f0bab32e3..f1ac288c2877 100644
--- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
+++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
@@ -6,6 +6,9 @@
     <RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
+    <!-- Avoid a warning that is emitted by APICompat when it can't find Microsoft.NET.StringTools.dll
+         which is a dependency of MessagePack.dll but is excluded from "compile" in the package's nuspec. -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml b/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/SignalR/common/Shared/MessageBuffer.cs b/src/SignalR/common/Shared/MessageBuffer.cs
index 17b9ae170fe0..f08fff86aa40 100644
--- a/src/SignalR/common/Shared/MessageBuffer.cs
+++ b/src/SignalR/common/Shared/MessageBuffer.cs
@@ -121,15 +121,16 @@ private async Task RunTimer()
 
     public ValueTask<FlushResult> WriteAsync(SerializedHubMessage hubMessage, CancellationToken cancellationToken)
     {
-        return WriteAsyncCore(hubMessage.Message!, hubMessage.GetSerializedMessage(_protocol), cancellationToken);
+        // Default to HubInvocationMessage as that's the only type we use SerializedHubMessage for currently when Message is null. Should harden this in the future.
+        return WriteAsyncCore(hubMessage.Message?.GetType() ?? typeof(HubInvocationMessage), hubMessage.GetSerializedMessage(_protocol), cancellationToken);
     }
 
     public ValueTask<FlushResult> WriteAsync(HubMessage hubMessage, CancellationToken cancellationToken)
     {
-        return WriteAsyncCore(hubMessage, _protocol.GetMessageBytes(hubMessage), cancellationToken);
+        return WriteAsyncCore(hubMessage.GetType(), _protocol.GetMessageBytes(hubMessage), cancellationToken);
     }
 
-    private async ValueTask<FlushResult> WriteAsyncCore(HubMessage hubMessage, ReadOnlyMemory<byte> messageBytes, CancellationToken cancellationToken)
+    private async ValueTask<FlushResult> WriteAsyncCore(Type hubMessageType, ReadOnlyMemory<byte> messageBytes, CancellationToken cancellationToken)
     {
         // TODO: Add backpressure based on message count
         if (_bufferedByteCount > _bufferLimit)
@@ -158,7 +159,7 @@ private async ValueTask<FlushResult> WriteAsyncCore(HubMessage hubMessage, ReadO
         await _writeLock.WaitAsync(cancellationToken: default).ConfigureAwait(false);
         try
         {
-            if (hubMessage is HubInvocationMessage invocationMessage)
+            if (typeof(HubInvocationMessage).IsAssignableFrom(hubMessageType))
             {
                 _totalMessageCount++;
                 _bufferedByteCount += messageBytes.Length;
diff --git a/src/SignalR/common/Shared/Utf8BufferTextWriter.cs b/src/SignalR/common/Shared/Utf8BufferTextWriter.cs
index 6c993f11be7a..f86432af249a 100644
--- a/src/SignalR/common/Shared/Utf8BufferTextWriter.cs
+++ b/src/SignalR/common/Shared/Utf8BufferTextWriter.cs
@@ -35,6 +35,12 @@ public Utf8BufferTextWriter()
         _encoder = _utf8NoBom.GetEncoder();
     }
 
+    public Utf8BufferTextWriter(IFormatProvider formatProvider)
+        : base(formatProvider)
+    {
+        _encoder = _utf8NoBom.GetEncoder();
+    }
+
     public static Utf8BufferTextWriter Get(IBufferWriter<byte> bufferWriter)
     {
         var writer = _cachedInstance;
diff --git a/src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
similarity index 100%
rename from src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Shipped.txt
rename to src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Shipped.txt
diff --git a/src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt
rename to src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt
diff --git a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTests.cs b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTests.cs
index faf8b575a45b..aa12769a7f2d 100644
--- a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTests.cs
+++ b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTests.cs
@@ -286,6 +286,6 @@ private static void PersonEqual(object expected, object actual)
             PersonEqual(expectedPerson.Child, actualPerson.Child);
         }
 
-        Assert.False(true, "Passed in unexpected object(s)");
+        Assert.Fail("Passed in unexpected object(s)");
     }
 }
diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj
index ff022626496b..3061127181c5 100644
--- a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj
+++ b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj
@@ -33,8 +33,6 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Moq" />
     <Reference Include="System.Reactive.Linq" />
-    <Reference Include="System.Threading.Channels" />
-    <Reference Include="System.Threading.Tasks.Extensions" />
 
 
     <Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1
index 3247f288225c..2709414ec669 100644
--- a/src/SignalR/publish-apps.ps1
+++ b/src/SignalR/publish-apps.ps1
@@ -1,4 +1,4 @@
-param($RootDirectory = (Get-Location), $Framework = "net9.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber)
+param($RootDirectory = (Get-Location), $Framework = "net10.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber)
 
 # De-Powershell the path
 $RootDirectory = (Convert-Path $RootDirectory)
diff --git a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs
index 24c675a5aa8f..5e914b31e29e 100644
--- a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs
+++ b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs
@@ -726,7 +726,26 @@ private void ReplaceArguments(HubMethodDescriptor descriptor, HubMethodInvocatio
         var hubInvocationArgumentPointer = 0;
         for (var parameterPointer = 0; parameterPointer < arguments.Length; parameterPointer++)
         {
-            if (hubMethodInvocationMessage.Arguments?.Length > hubInvocationArgumentPointer &&
+            // populate the synthetic arguments first
+            if (descriptor.IsServiceArgument(parameterPointer))
+            {
+                arguments[parameterPointer] = descriptor.GetService(scope.ServiceProvider, parameterPointer, descriptor.OriginalParameterTypes[parameterPointer]);
+            }
+            else if (descriptor.OriginalParameterTypes[parameterPointer] == typeof(CancellationToken))
+            {
+                cts = CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted);
+                arguments[parameterPointer] = cts.Token;
+            }
+            else if (isStreamCall && ReflectionHelper.IsStreamingType(descriptor.OriginalParameterTypes[parameterPointer], mustBeDirectType: true))
+            {
+                Log.StartingParameterStream(_logger, hubMethodInvocationMessage.StreamIds![streamPointer]);
+                var itemType = descriptor.StreamingParameters![streamPointer];
+                arguments[parameterPointer] = connection.StreamTracker.AddStream(hubMethodInvocationMessage.StreamIds[streamPointer],
+                    itemType, descriptor.OriginalParameterTypes[parameterPointer]);
+
+                streamPointer++;
+            }
+           else if (hubMethodInvocationMessage.Arguments?.Length > hubInvocationArgumentPointer &&
                 (hubMethodInvocationMessage.Arguments[hubInvocationArgumentPointer] == null ||
                 descriptor.OriginalParameterTypes[parameterPointer].IsAssignableFrom(hubMethodInvocationMessage.Arguments[hubInvocationArgumentPointer]?.GetType())))
             {
@@ -736,29 +755,8 @@ private void ReplaceArguments(HubMethodDescriptor descriptor, HubMethodInvocatio
             }
             else
             {
-                if (descriptor.OriginalParameterTypes[parameterPointer] == typeof(CancellationToken))
-                {
-                    cts = CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted);
-                    arguments[parameterPointer] = cts.Token;
-                }
-                else if (descriptor.IsServiceArgument(parameterPointer))
-                {
-                    arguments[parameterPointer] = descriptor.GetService(scope.ServiceProvider, parameterPointer, descriptor.OriginalParameterTypes[parameterPointer]);
-                }
-                else if (isStreamCall && ReflectionHelper.IsStreamingType(descriptor.OriginalParameterTypes[parameterPointer], mustBeDirectType: true))
-                {
-                    Log.StartingParameterStream(_logger, hubMethodInvocationMessage.StreamIds![streamPointer]);
-                    var itemType = descriptor.StreamingParameters![streamPointer];
-                    arguments[parameterPointer] = connection.StreamTracker.AddStream(hubMethodInvocationMessage.StreamIds[streamPointer],
-                        itemType, descriptor.OriginalParameterTypes[parameterPointer]);
-
-                    streamPointer++;
-                }
-                else
-                {
-                    // This should never happen
-                    Debug.Assert(false, $"Failed to bind argument of type '{descriptor.OriginalParameterTypes[parameterPointer].Name}' for hub method '{descriptor.MethodExecutor.MethodInfo.Name}'.");
-                }
+                // This should never happen
+                Debug.Assert(false, $"Failed to bind argument of type '{descriptor.OriginalParameterTypes[parameterPointer].Name}' for hub method '{descriptor.MethodExecutor.MethodInfo.Name}'.");
             }
         }
     }
@@ -896,4 +894,4 @@ private static void SetActivityError(Activity? activity, Exception ex)
         activity?.SetTag("error.type", ex.GetType().FullName);
         activity?.SetStatus(ActivityStatusCode.Error);
     }
-}
+}
\ No newline at end of file
diff --git a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs
index d2d064c10378..f32e5a9afc90 100644
--- a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs
+++ b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs
@@ -97,7 +97,7 @@ public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IServiceProvider
                         {
                             if (keyedServiceProvider.IsKeyedService(GetServiceType(p.ParameterType), keyedServicesAttribute.Key))
                             {
-                                KeyedServiceKeys ??= new List<(int, object)>();
+                                KeyedServiceKeys ??= new List<(int, object?)>();
                                 KeyedServiceKeys.Add((index, keyedServicesAttribute.Key));
                                 MarkServiceParameter(index);
                             }
@@ -158,7 +158,7 @@ private bool MarkServiceParameter(int index)
 
     public List<Type>? StreamingParameters { get; private set; }
 
-    public List<(int, object)>? KeyedServiceKeys { get; private set; }
+    public List<(int, object?)>? KeyedServiceKeys { get; private set; }
 
     public ObjectMethodExecutor MethodExecutor { get; }
 
diff --git a/src/SignalR/server/Core/src/SerializedHubMessage.cs b/src/SignalR/server/Core/src/SerializedHubMessage.cs
index e355b0329128..9f4327a4cc58 100644
--- a/src/SignalR/server/Core/src/SerializedHubMessage.cs
+++ b/src/SignalR/server/Core/src/SerializedHubMessage.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using Microsoft.AspNetCore.SignalR.Protocol;
 
 namespace Microsoft.AspNetCore.SignalR;
@@ -40,6 +41,8 @@ public SerializedHubMessage(IReadOnlyList<SerializedMessage> messages)
     /// <param name="message">The hub message for the cache. This will be serialized with an <see cref="IHubProtocol"/> in <see cref="GetSerializedMessage"/> to get the message's serialized representation.</param>
     public SerializedHubMessage(HubMessage message)
     {
+        // Type currently only used for invocation messages, we should probably refactor it to be explicit about that e.g. new property for message type?
+        Debug.Assert(message.GetType().IsAssignableTo(typeof(HubInvocationMessage)));
         Message = message;
     }
 
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/AddSignalRTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/AddSignalRTests.cs
index 01f5b67343d4..d598e99c61d6 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/AddSignalRTests.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/AddSignalRTests.cs
@@ -83,8 +83,8 @@ public void HubSpecificOptionsDoNotAffectGlobalHubOptions()
             });
 
             var serviceProvider = serviceCollection.BuildServiceProvider();
-            Assert.Equal(1, serviceProvider.GetRequiredService<IOptions<HubOptions>>().Value.SupportedProtocols.Count);
-            Assert.Equal(0, serviceProvider.GetRequiredService<IOptions<HubOptions<CustomHub>>>().Value.SupportedProtocols.Count);
+            Assert.Single(serviceProvider.GetRequiredService<IOptions<HubOptions>>().Value.SupportedProtocols);
+            Assert.Empty(serviceProvider.GetRequiredService<IOptions<HubOptions<CustomHub>>>().Value.SupportedProtocols);
 
             Assert.Null(serviceProvider.GetRequiredService<IOptions<HubOptions>>().Value.HubFilters);
             Assert.Single(serviceProvider.GetRequiredService<IOptions<HubOptions<CustomHub>>>().Value.HubFilters);
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
index 0e690a2a3504..30720107f441 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
@@ -515,7 +515,7 @@ public async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated_WebSocket(
         try
         {
             await ServerClosesConnectionWithErrorIfHubCannotBeCreated(HttpTransportType.WebSockets);
-            Assert.True(false, "Expected error was not thrown.");
+            Assert.Fail("Expected error was not thrown.");
         }
         catch
         {
@@ -529,7 +529,7 @@ public async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated_LongPollin
         try
         {
             await ServerClosesConnectionWithErrorIfHubCannotBeCreated(HttpTransportType.LongPolling);
-            Assert.True(false, "Expected error was not thrown.");
+            Assert.Fail("Expected error was not thrown.");
         }
         catch
         {
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTestUtils/Hubs.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTestUtils/Hubs.cs
index 091ffabaad9f..90fabf90265b 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTestUtils/Hubs.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTestUtils/Hubs.cs
@@ -1381,6 +1381,11 @@ public async Task<int> ServicesAndParams(int value, [FromService] Service1 servi
         }
         return total + value;
     }
+    
+    public int ServiceWithStringAttribute([FromService] Service1 service, string value)
+    {
+        return 115;
+    }
 
     public int ServiceWithoutAttribute(Service1 service)
     {
@@ -1464,4 +1469,4 @@ public override async Task OnConnectedAsync()
             await Clients.Client(id).SendAsync("Test", 1);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs
index 61219bedcf29..ba54aa4043b8 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs
@@ -132,7 +132,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders()
                 var headers = new Dictionary<string, string>
                 {
                     {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                    {"tracestate", "TraceState1"},
+                    {"tracestate", "tracestate=1"},
                     {"baggage", "Key1=value1, Key2=value2"}
                 };
 
@@ -149,7 +149,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders()
                 Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat);
                 Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString());
                 Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString());
-                Assert.Equal("TraceState1", invocationActivity.TraceStateString);
+                Assert.Equal("tracestate=1", invocationActivity.TraceStateString);
 
                 client.Dispose();
 
@@ -262,7 +262,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders()
                 var headers = new Dictionary<string, string>
                 {
                     {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                    {"tracestate", "TraceState1"},
+                    {"tracestate", "tracestate=1"},
                     {"baggage", "Key1=value1, Key2=value2"}
                 };
 
@@ -275,7 +275,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders()
                 Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat);
                 Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString());
                 Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString());
-                Assert.Equal("TraceState1", invocationActivity.TraceStateString);
+                Assert.Equal("tracestate=1", invocationActivity.TraceStateString);
 
                 client.Dispose();
 
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs
index ba620cb8b899..486f6c53ea02 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs
@@ -2101,7 +2101,7 @@ bool ExpectedErrors(WriteContext writeContext)
 
                 var messages = await client.StreamAsync(streamMethod);
 
-                Assert.Equal(1, messages.Count);
+                Assert.Single(messages);
                 var completion = messages[0] as CompletionMessage;
                 Assert.NotNull(completion);
                 if (detailedError != null)
@@ -2772,7 +2772,7 @@ public async Task WritesPingMessageIfNothingWrittenWhenKeepAliveIntervalElapses(
                 {
                     if (hasCloseMessage)
                     {
-                        Assert.True(false, "Received message after close");
+                        Assert.Fail("Received message after close");
                     }
 
                     switch (message)
@@ -2784,7 +2784,7 @@ public async Task WritesPingMessageIfNothingWrittenWhenKeepAliveIntervalElapses(
                             hasCloseMessage = true;
                             break;
                         default:
-                            Assert.True(false, "Unexpected message type: " + message.GetType().Name);
+                            Assert.Fail("Unexpected message type: " + message.GetType().Name);
                             break;
                     }
                 }
@@ -3225,7 +3225,7 @@ bool ExpectedErrors(WriteContext writeContext)
 
                 var messages = await client.StreamAsync(nameof(StreamingHub.ThrowStream));
 
-                Assert.Equal(1, messages.Count);
+                Assert.Single(messages);
                 var completion = messages[0] as CompletionMessage;
                 Assert.NotNull(completion);
 
@@ -3260,7 +3260,7 @@ public async Task StreamMethodThatReturnsNullWillCleanup()
 
                 var messages = await client.StreamAsync(nameof(StreamingHub.NullStream));
 
-                Assert.Equal(1, messages.Count);
+                Assert.Single(messages);
                 var completion = messages[0] as CompletionMessage;
                 Assert.NotNull(completion);
 
@@ -4679,6 +4679,24 @@ public async Task HubMethodCanInjectService()
             Assert.True(Assert.IsType<bool>(res.Result));
         }
     }
+    
+    // Regression test for https://github.com/dotnet/aspnetcore/issues/61491
+    [Fact]
+    public async Task HubMethodCanInjectServiceWithNullParameter()
+    {
+        var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider =>
+        {
+            provider.AddSingleton<Service1>();
+        });
+        var connectionHandler = serviceProvider.GetService<HubConnectionHandler<ServicesHub>>();
+
+        using (var client = new TestClient())
+        {
+            var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout();
+            var res = await client.InvokeAsync(nameof(ServicesHub.ServiceWithStringAttribute),(string)null ).DefaultTimeout();
+            Assert.Equal(115L, res.Result);
+        }
+    }
 
     [Fact]
     public async Task HubMethodCanInjectMultipleServices()
@@ -5459,4 +5477,4 @@ public static async Task<IEnumerable<T>> ReadAllAsync<T>(this IAsyncEnumerable<T
 
         return result;
     }
-}
+}
\ No newline at end of file
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/DefaultHubProtocolResolverTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/DefaultHubProtocolResolverTests.cs
index 797c3ed83dc3..aab8df094688 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/DefaultHubProtocolResolverTests.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/DefaultHubProtocolResolverTests.cs
@@ -95,7 +95,7 @@ public void AllProtocolsOnlyReturnsLatestOfSameType()
             }, NullLogger<DefaultHubProtocolResolver>.Instance);
 
         var hubProtocols = resolver.AllProtocols;
-        Assert.Equal(1, hubProtocols.Count);
+        Assert.Single(hubProtocols);
 
         Assert.Same(jsonProtocol2, hubProtocols[0]);
     }
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs
index a7e87d2b8bda..540ea462e199 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs
@@ -2,11 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.IO.Pipelines;
+using System.Text.Json;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.SignalR.Internal;
 using Microsoft.AspNetCore.SignalR.Protocol;
-using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Time.Testing;
 
@@ -169,6 +170,62 @@ public async Task UnAckedMessageResentOnReconnect()
         Assert.False(messageBuffer.ShouldProcessMessage(CompletionMessage.WithResult("1", null)));
     }
 
+    // Regression test for https://github.com/dotnet/aspnetcore/issues/55575
+    [Fact]
+    public async Task UnAckedSerializedMessageResentOnReconnect()
+    {
+        var protocol = new JsonHubProtocol();
+        var connection = new TestConnectionContext();
+        var pipes = DuplexPipe.CreateConnectionPair(new PipeOptions(), new PipeOptions());
+        connection.Transport = pipes.Transport;
+        using var messageBuffer = new MessageBuffer(connection, protocol, bufferLimit: 1000, NullLogger.Instance);
+
+        var invocationMessage = new SerializedHubMessage([new SerializedMessage(protocol.Name,
+            protocol.GetMessageBytes(new InvocationMessage("method1", [1])))]);
+        await messageBuffer.WriteAsync(invocationMessage, default);
+
+        var res = await pipes.Application.Input.ReadAsync();
+
+        var buffer = res.Buffer;
+        Assert.True(protocol.TryParseMessage(ref buffer, new TestBinder(), out var message));
+        var parsedMessage = Assert.IsType<InvocationMessage>(message);
+        Assert.Equal("method1", parsedMessage.Target);
+        Assert.Equal(1, ((JsonElement)Assert.Single(parsedMessage.Arguments)).GetInt32());
+
+        pipes.Application.Input.AdvanceTo(buffer.Start);
+
+        DuplexPipe.UpdateConnectionPair(ref pipes, connection);
+        await messageBuffer.ResendAsync(pipes.Transport.Output);
+
+        Assert.True(messageBuffer.ShouldProcessMessage(PingMessage.Instance));
+        Assert.True(messageBuffer.ShouldProcessMessage(CompletionMessage.WithResult("1", null)));
+        Assert.True(messageBuffer.ShouldProcessMessage(new SequenceMessage(1)));
+
+        res = await pipes.Application.Input.ReadAsync();
+
+        buffer = res.Buffer;
+        Assert.True(protocol.TryParseMessage(ref buffer, new TestBinder(), out message));
+        var seqMessage = Assert.IsType<SequenceMessage>(message);
+        Assert.Equal(1, seqMessage.SequenceId);
+
+        pipes.Application.Input.AdvanceTo(buffer.Start);
+
+        res = await pipes.Application.Input.ReadAsync();
+
+        buffer = res.Buffer;
+        Assert.True(protocol.TryParseMessage(ref buffer, new TestBinder(), out message));
+        parsedMessage = Assert.IsType<InvocationMessage>(message);
+        Assert.Equal("method1", parsedMessage.Target);
+        Assert.Equal(1, ((JsonElement)Assert.Single(parsedMessage.Arguments)).GetInt32());
+
+        pipes.Application.Input.AdvanceTo(buffer.Start);
+
+        messageBuffer.ShouldProcessMessage(new SequenceMessage(1));
+
+        Assert.True(messageBuffer.ShouldProcessMessage(PingMessage.Instance));
+        Assert.False(messageBuffer.ShouldProcessMessage(CompletionMessage.WithResult("1", null)));
+    }
+
     [Fact]
     public async Task AckedMessageNotResentOnReconnect()
     {
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
index 7eeadd7fe437..ad4b91cb958f 100644
--- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
+++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
@@ -87,12 +87,12 @@ public void MapHubFindsAuthAttributeOnHub()
                 endpoint =>
                 {
                     Assert.Equal("/path/negotiate", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                 },
                 endpoint =>
                 {
                     Assert.Equal("/path", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                 });
         }
 
@@ -120,21 +120,21 @@ public void MapHubFindsMetadataPolicyOnHub()
                 endpoint =>
                 {
                     Assert.Equal("/path/negotiate", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                     var policies = endpoint.Metadata.GetOrderedMetadata<AuthorizationPolicy>();
                     Assert.Equal(2, policies.Count);
                     Assert.Equal(policy1, policies[0]);
-                    Assert.Equal(1, policies[1].Requirements.Count);
+                    Assert.Single(policies[1].Requirements);
                     Assert.Equal(req, policies[1].Requirements.First());
                 },
                 endpoint =>
                 {
                     Assert.Equal("/path", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                     var policies = endpoint.Metadata.GetOrderedMetadata<AuthorizationPolicy>();
                     Assert.Equal(2, policies.Count);
                     Assert.Equal(policy1, policies[0]);
-                    Assert.Equal(1, policies[1].Requirements.Count);
+                    Assert.Single(policies[1].Requirements);
                     Assert.Equal(req, policies[1].Requirements.First());
                 });
         }
@@ -159,12 +159,12 @@ public void MapHubFindsAuthAttributeOnInheritedHub()
                 endpoint =>
                 {
                     Assert.Equal("/path/negotiate", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                 },
                 endpoint =>
                 {
                     Assert.Equal("/path", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                 });
         }
 
@@ -217,12 +217,12 @@ public void MapHubEndPointRoutingFindsAttributesOnHub()
                 endpoint =>
                 {
                     Assert.Equal("/path/negotiate", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                 },
                 endpoint =>
                 {
                     Assert.Equal("/path", endpoint.DisplayName);
-                    Assert.Equal(1, endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
+                    Assert.Single(endpoint.Metadata.GetOrderedMetadata<IAuthorizeData>());
                 });
         }
 
diff --git a/src/SignalR/server/StackExchangeRedis/test/DefaultHubMessageSerializerTests.cs b/src/SignalR/server/StackExchangeRedis/test/DefaultHubMessageSerializerTests.cs
index 398125f29e6d..4ec5016e1f93 100644
--- a/src/SignalR/server/StackExchangeRedis/test/DefaultHubMessageSerializerTests.cs
+++ b/src/SignalR/server/StackExchangeRedis/test/DefaultHubMessageSerializerTests.cs
@@ -46,7 +46,7 @@ public void GlobalSupportedProtocolsOverriddenByHubSupportedProtocols()
         var serializer = new DefaultHubMessageSerializer(resolver, new List<string>() { "json" }, new List<string>() { "messagepack" });
         var serializedHubMessage = serializer.SerializeMessage(_testMessage);
 
-        Assert.Equal(1, serializedHubMessage.Count);
+        Assert.Single(serializedHubMessage);
 
         Assert.Equal(new List<byte>() { 0x0D,
                   0x96,
diff --git a/src/SignalR/server/StackExchangeRedis/test/Docker.cs b/src/SignalR/server/StackExchangeRedis/test/Docker.cs
index 76fa6440e672..41315734daea 100644
--- a/src/SignalR/server/StackExchangeRedis/test/Docker.cs
+++ b/src/SignalR/server/StackExchangeRedis/test/Docker.cs
@@ -16,7 +16,8 @@ public class Docker
 {
     private static readonly string _exeSuffix = OperatingSystem.IsWindows() ? ".exe" : string.Empty;
 
-    private static readonly string _dockerContainerName = "redisTestContainer";
+    private static readonly string _redisImageName = "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/library/redis:7.4";
+    private static readonly string _dockerContainerName = "redisTestContainer74";
     private static readonly string _dockerMonitorContainerName = _dockerContainerName + "Monitor";
     private static readonly Lazy<Docker> _instance = new Lazy<Docker>(Create);
 
@@ -112,7 +113,7 @@ void Run()
             // use static name 'redisTestContainer' so if the container doesn't get removed we don't keep adding more
             // use redis base docker image
             // 30 second timeout to allow redis image to be downloaded, should be a rare occurrence, only happening when a new version is released
-            RunProcessAndThrowIfFailed(_path, $"run --rm -p 6379:6379 --name {_dockerContainerName} -d redis", "redis", logger, TimeSpan.FromMinutes(1));
+            RunProcessAndThrowIfFailed(_path, $"run --rm -p 6379:6379 --name {_dockerContainerName} -d {_redisImageName}", "redis", logger, TimeSpan.FromMinutes(1));
         }
     }
 
diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs
index 63445379ac35..03d79a8c93a1 100644
--- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs
+++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs
@@ -1,17 +1,15 @@
 // 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.Collections.Generic;
-using System.Threading.Tasks;
+using System.Net.WebSockets;
 using Microsoft.AspNetCore.Http.Connections;
+using Microsoft.AspNetCore.Http.Connections.Client;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.AspNetCore.SignalR.Protocol;
 using Microsoft.AspNetCore.SignalR.Tests;
-using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Xunit;
 
 namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests;
 
@@ -37,6 +35,7 @@ public RedisEndToEndTests(RedisServerFixture<Startup> serverFixture)
     [ConditionalTheory]
     [SkipIfDockerNotPresent]
     [MemberData(nameof(TransportTypesAndProtocolTypes))]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
     public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType transportType, string protocolName)
     {
         using (StartVerifiableLog())
@@ -57,6 +56,7 @@ public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType trans
     [ConditionalTheory]
     [SkipIfDockerNotPresent]
     [MemberData(nameof(TransportTypesAndProtocolTypes))]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
     public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType transportType, string protocolName)
     {
         using (StartVerifiableLog())
@@ -89,6 +89,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType
     [ConditionalTheory]
     [SkipIfDockerNotPresent]
     [MemberData(nameof(TransportTypesAndProtocolTypes))]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/59991")]
     public async Task CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUser(HttpTransportType transportType, string protocolName)
     {
         using (StartVerifiableLog())
@@ -118,6 +119,7 @@ public async Task CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUs
     [ConditionalTheory]
     [SkipIfDockerNotPresent]
     [MemberData(nameof(TransportTypesAndProtocolTypes))]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
     public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconnects(HttpTransportType transportType, string protocolName)
     {
         // Regression test:
@@ -147,6 +149,7 @@ public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconne
     [ConditionalTheory]
     [SkipIfDockerNotPresent]
     [MemberData(nameof(TransportTypesAndProtocolTypes))]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
     public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatternIsTreatedAsLiteral(HttpTransportType transportType, string protocolName)
     {
         using (StartVerifiableLog())
@@ -179,6 +182,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatter
         }
     }
 
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/53644")]
     [ConditionalTheory]
     [SkipIfDockerNotPresent]
     [MemberData(nameof(TransportTypesAndProtocolTypes))]
@@ -211,7 +215,106 @@ public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLit
         }
     }
 
-    private static HubConnection CreateConnection(string url, HttpTransportType transportType, IHubProtocol protocol, ILoggerFactory loggerFactory, string userName = null)
+    [ConditionalTheory]
+    [SkipIfDockerNotPresent]
+    [InlineData("messagepack")]
+    [InlineData("json")]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
+    public async Task StatefulReconnectPreservesMessageFromOtherServer(string protocolName)
+    {
+        using (StartVerifiableLog())
+        {
+            var protocol = HubProtocolHelpers.GetHubProtocol(protocolName);
+
+            ClientWebSocket innerWs = null;
+            WebSocketWrapper ws = null;
+            TaskCompletionSource reconnectTcs = null;
+            TaskCompletionSource startedReconnectTcs = null;
+
+            var connection = CreateConnection(_serverFixture.FirstServer.Url + "/stateful", HttpTransportType.WebSockets, protocol, LoggerFactory,
+                customizeConnection: builder =>
+                {
+                    builder.WithStatefulReconnect();
+                    builder.Services.Configure<HttpConnectionOptions>(o =>
+                    {
+                        // Replace the websocket creation for the first connection so we can make the client think there was an ungraceful closure
+                        // Which will trigger the stateful reconnect flow
+                        o.WebSocketFactory = async (context, token) =>
+                        {
+                            if (reconnectTcs is null)
+                            {
+                                reconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+                                startedReconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+                            }
+                            else
+                            {
+                                startedReconnectTcs.SetResult();
+                                // We only want to wait on the reconnect, not the initial connection attempt
+                                await reconnectTcs.Task.DefaultTimeout();
+                            }
+
+                            innerWs = new ClientWebSocket();
+                            ws = new WebSocketWrapper(innerWs);
+                            await innerWs.ConnectAsync(context.Uri, token);
+
+                            _ = Task.Run(async () =>
+                            {
+                                try
+                                {
+                                    while (innerWs.State == WebSocketState.Open)
+                                    {
+                                        var buffer = new byte[1024];
+                                        var res = await innerWs.ReceiveAsync(buffer, default);
+                                        ws.SetReceiveResult((res, buffer.AsMemory(0, res.Count)));
+                                    }
+                                }
+                                // Log but ignore receive errors, that likely just means the connection closed
+                                catch (Exception ex)
+                                {
+                                    Logger.LogInformation(ex, "Error while reading from inner websocket");
+                                }
+                            });
+
+                            return ws;
+                        };
+                    });
+                });
+            var secondConnection = CreateConnection(_serverFixture.SecondServer.Url + "/stateful", HttpTransportType.WebSockets, protocol, LoggerFactory);
+
+            var tcs = new TaskCompletionSource<string>();
+            connection.On<string>("SendToAll", message => tcs.TrySetResult(message));
+
+            var tcs2 = new TaskCompletionSource<string>();
+            secondConnection.On<string>("SendToAll", message => tcs2.TrySetResult(message));
+
+            await connection.StartAsync().DefaultTimeout();
+            await secondConnection.StartAsync().DefaultTimeout();
+
+            // Close first connection before the second connection sends a message to all clients
+            await ws.CloseOutputAsync(WebSocketCloseStatus.InternalServerError, statusDescription: null, default);
+            await startedReconnectTcs.Task.DefaultTimeout();
+
+            // Send to all clients, since both clients are on different servers this means the backplane will be used
+            // And we want to test that messages are still preserved for stateful reconnect purposes when a client disconnects
+            // But is on a different server from the original message sender.
+            await secondConnection.SendAsync("SendToAll", "test message").DefaultTimeout();
+
+            // Check that second connection still receives the message
+            Assert.Equal("test message", await tcs2.Task.DefaultTimeout());
+            Assert.False(tcs.Task.IsCompleted);
+
+            // allow first connection to reconnect
+            reconnectTcs.SetResult();
+
+            // Check that first connection received the message once it reconnected
+            Assert.Equal("test message", await tcs.Task.DefaultTimeout());
+
+            await connection.DisposeAsync().DefaultTimeout();
+        }
+    }
+
+    private static HubConnection CreateConnection(string url, HttpTransportType transportType, IHubProtocol protocol, ILoggerFactory loggerFactory, string userName = null,
+        Action<IHubConnectionBuilder> customizeConnection = null)
     {
         var hubConnectionBuilder = new HubConnectionBuilder()
             .WithLoggerFactory(loggerFactory)
@@ -225,6 +328,8 @@ private static HubConnection CreateConnection(string url, HttpTransportType tran
 
         hubConnectionBuilder.Services.AddSingleton(protocol);
 
+        customizeConnection?.Invoke(hubConnectionBuilder);
+
         return hubConnectionBuilder.Build();
     }
 
@@ -253,4 +358,67 @@ public static IEnumerable<object[]> TransportTypesAndProtocolTypes
             }
         }
     }
+
+    internal sealed class WebSocketWrapper : WebSocket
+    {
+        private readonly WebSocket _inner;
+        private TaskCompletionSource<(WebSocketReceiveResult, ReadOnlyMemory<byte>)> _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        public WebSocketWrapper(WebSocket inner)
+        {
+            _inner = inner;
+        }
+
+        public override WebSocketCloseStatus? CloseStatus => _inner.CloseStatus;
+
+        public override string CloseStatusDescription => _inner.CloseStatusDescription;
+
+        public override WebSocketState State => _inner.State;
+
+        public override string SubProtocol => _inner.SubProtocol;
+
+        public override void Abort()
+        {
+            _inner.Abort();
+        }
+
+        public override Task CloseAsync(WebSocketCloseStatus closeStatus, string statusDescription, CancellationToken cancellationToken)
+        {
+            return _inner.CloseAsync(closeStatus, statusDescription, cancellationToken);
+        }
+
+        public override Task CloseOutputAsync(WebSocketCloseStatus closeStatus, string statusDescription, CancellationToken cancellationToken)
+        {
+            _receiveTcs.TrySetException(new IOException("force reconnect"));
+            return Task.CompletedTask;
+        }
+
+        public override void Dispose()
+        {
+            _inner.Dispose();
+        }
+
+        public void SetReceiveResult((WebSocketReceiveResult, ReadOnlyMemory<byte>) result)
+        {
+            _receiveTcs.SetResult(result);
+        }
+
+        public override async Task<WebSocketReceiveResult> ReceiveAsync(ArraySegment<byte> buffer, CancellationToken cancellationToken)
+        {
+            var res = await _receiveTcs.Task;
+            // Handle zero-byte reads
+            if (buffer.Count == 0)
+            {
+                return res.Item1;
+            }
+            _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
+            res.Item2.CopyTo(buffer);
+            return res.Item1;
+        }
+
+        public override Task SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken)
+        {
+            return _inner.SendAsync(buffer, messageType, endOfMessage, cancellationToken);
+        }
+    }
 }
diff --git a/src/SignalR/server/StackExchangeRedis/test/Startup.cs b/src/SignalR/server/StackExchangeRedis/test/Startup.cs
index 3fd461aed98e..1b55bd1cff53 100644
--- a/src/SignalR/server/StackExchangeRedis/test/Startup.cs
+++ b/src/SignalR/server/StackExchangeRedis/test/Startup.cs
@@ -33,6 +33,7 @@ public void Configure(IApplicationBuilder app)
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapHub<EchoHub>("/echo");
+            endpoints.MapHub<StatefulHub>("/stateful", o => o.AllowStatefulReconnects = true);
         });
     }
 
diff --git a/src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs b/src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs
new file mode 100644
index 000000000000..1efa1d84fcd0
--- /dev/null
+++ b/src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests;
+
+public class StatefulHub : Hub
+{
+    public Task SendToAll(string message)
+    {
+        return Clients.All.SendAsync("SendToAll", message);
+    }
+}
diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
new file mode 100644
index 000000000000..8dc226bb2c7a
--- /dev/null
+++ b/src/SiteExtensions/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <MicrosoftWebXdtExtensionsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
+    <MicrosoftWebXdtExtensionsDir Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
+    <MicrosoftWebXdtExtensionsPath>$(MicrosoftWebXdtExtensionsDir)Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))</BaseIntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))</IntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))</IntermediateOutputPath>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
index b0624cf9f9ca..c14ca95f62ef 100644
--- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
@@ -18,6 +18,7 @@
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
     <IsShipping Condition=" '$(PreReleaseVersionLabel)' == 'preview' ">false</IsShipping>
+    <SiteExtensionsReferenceLayoutDir>$(ArtifactsObjDir)SiteExtensionsReferenceLayout/</SiteExtensionsReferenceLayoutDir>
 
     <!-- Grab packages LB.csproj should have just built. -->
     <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
@@ -29,30 +30,56 @@
       $(DefaultNetCoreTargetFramework), add previous SiteExtension packages to the list below. Remove
       entries when packages aren't needed in the bundle anymore.
       -->
-    <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" PrivateAssets="All" />
-    <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" PrivateAssets="All" />
     <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x64" PrivateAssets="All" />
     <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.8.0.x86" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x64" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.9.0.x86" PrivateAssets="All" />
     <!--
       Bundle the just-built LB.csproj package content into this one the easy way. See
       UpdateLatestPackageReferences for the hard way.
     -->
     <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64"
-        Condition=" '$(IsShipping)' == 'false' "
+        Condition=" '$(IsShipping)' == 'false' AND '$(DotNetBuild)' != 'true'"
         PrivateAssets="All"
         Version="$(PackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86"
-        Condition=" '$(IsShipping)' == 'false' "
+        Condition=" '$(IsShipping)' == 'false' AND '$(DotNetBuild)' != 'true'"
         PrivateAssets="All"
         Version="$(PackageVersion)" />
+
+    <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.$(PackageVersion).nupkg"
+        Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64"
+        Condition=" '$(IsShipping)' == 'false' AND '$(DotNetBuild)' == 'true'" />
+    <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.$(PackageVersion).nupkg"
+        Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86"
+        Condition=" '$(IsShipping)' == 'false' AND '$(DotNetBuild)' == 'true'" />
   </ItemGroup>
 
+  <Target Name="BuildSiteExtensionInputs"
+      BeforeTargets="Restore"
+      Condition=" '$(DotNetBuildPass)' == '2' ">
+
+    <MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
+        BuildInParallel="false"
+        Properties="Platform=x64"
+        Targets="_VmrBuild" />
+    <MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
+        BuildInParallel="false"
+        Properties="Platform=x86;TargetRid=win-x86;PortableTargetRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
+        Targets="_VmrBuild" />
+    <MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
+        BuildInParallel="false"
+        Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
+        Targets="_VmrBuild" />
+    <MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
+        BuildInParallel="false"
+        Properties="Platform=x86;TargetRid=win-x86;PortableTargetRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
+        Targets="_VmrBuild" />
+  </Target>
+
   <ItemGroup>
     <Content Include="applicationHost.xdt" />
     <Content Include="scmApplicationHost.xdt" />
-    <Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\$(DefaultNetFxTargetFramework)\Microsoft.Web.Xdt.Extensions.dll"
-        Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\$(DefaultNetFxTargetFramework)\Microsoft.Web.Xdt.Extensions.dll')"
-        PackagePath="content" />
   </ItemGroup>
 
   <ItemGroup>
@@ -68,14 +95,14 @@
   -->
   <Target Name="UpdateLatestPackageReferences"
       BeforeTargets="CollectPackageReferences;ResolveAssemblyReferencesDesignTime;ResolveAssemblyReferences"
-      Condition=" '$(IsShipping)' == 'true' ">
+      Condition=" '$(IsShipping)' == 'true'">
     <!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
     <MSBuild Projects="$(RepoRoot)src\SiteExtensions\LoggingBranch\LB.csproj"
         Targets="_GetPackageVersionInfo">
       <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
     </MSBuild>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(DotNetBuild)' != 'true'">
       <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64"
           PrivateAssets="All"
           Version="%(_ResolvedPackageVersionInfo.PackageVersion)" />
@@ -83,9 +110,24 @@
           PrivateAssets="All"
           Version="%(_ResolvedPackageVersionInfo.PackageVersion)" />
     </ItemGroup>
+
+    <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
+      <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
+          Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64" />
+      <_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
+          Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86" />
+    </ItemGroup>
   </Target>
 
   <Target Name="AddContent" BeforeTargets="_GetPackageFiles">
+    <Unzip
+        SourceFiles="@(_SiteExtensionsReference)"
+        DestinationFolder="$(SiteExtensionsReferenceLayoutDir)%(Name)"
+        OverwriteReadOnlyFiles="true"
+        Condition="'$(DotNetBuild)' == 'true'" />
+
+    <Error Condition="!Exists('$(MicrosoftWebXdtExtensionsPath)')" Text="Microsoft.Web.Xdt.Extensions.dll should be available for SiteExtensions .nupkg, but isn't." />
+
     <ItemGroup>
       <!--
         The x64 & x86 SiteExtension packages have identical deps.json files. We include only the x64 files to
@@ -93,12 +135,17 @@
       -->
       <ContentFilesToPack
           Include="$(NugetPackageRoot)\%(PackageReference.Identity)\%(PackageReference.Version)\content\**\*.*"
-          Exclude="$(NugetPackageRoot)\Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.x86\**\Microsoft.AspNetCore.AzureAppServices.HostingStartup.deps.json"/>
+          Exclude="$(NugetPackageRoot)\Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.x86\**\Microsoft.AspNetCore.AzureAppServices.HostingStartup.deps.json" />
+
+      <ContentFilesToPack
+          Include="$(SiteExtensionsReferenceLayoutDir)\%(_SiteExtensionsReference.Name)\content\**\*.*"
+          Exclude="$(SiteExtensionsReferenceLayoutDir)\Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.x86\**\Microsoft.AspNetCore.AzureAppServices.HostingStartup.deps.json"
+          Condition="'$(DotNetBuild)' == 'true'" />
 
       <!-- Temporarily skip the common files -->
       <FilteredContentFilesToPack Include="@(ContentFilesToPack)" Condition="'%(RecursiveDir)' != ''" />
       <None Include="@(FilteredContentFilesToPack)" PackagePath="content\%(RecursiveDir)%(Filename)%(Extension)" Pack="true" />
+      <Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
     </ItemGroup>
   </Target>
-
 </Project>
diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj
index 7832725de868..d3308c748ded 100644
--- a/src/SiteExtensions/LoggingBranch/LB.csproj
+++ b/src/SiteExtensions/LoggingBranch/LB.csproj
@@ -9,7 +9,7 @@
     <ContentTargetFolders>content</ContentTargetFolders>
     <PackageId>Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).$(TargetArchitecture)</PackageId>
     <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
-    <HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreAppRuntimeVersion)</HostingStartupRuntimeFrameworkVersion>
+    <HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreAppRefVersion)</HostingStartupRuntimeFrameworkVersion>
     <PackageType>AzureSiteExtension</PackageType>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -24,10 +24,12 @@
   <ItemGroup>
     <HostingStartupRuntimeStoreTargets Include="$(DefaultNetCoreTargetFramework)" Runtime="$(TargetRuntimeIdentifier)" />
 
-    <ProjectReference Include="..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
+    <!-- Make sure App.Ref layout is available - not necessary if this is Pass 2 of a VMR build -->
+    <ProjectReference Include="..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
       Private="false"
       ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
+      SkipGetTargetFrameworkProperties="true"
+      Condition="'$(DotNetBuildPass)' != '2'" />
   </ItemGroup>
 
   <!-- Cannot assume this project and Microsoft.AspNetCore.AzureAppServices.HostingStartup have the same package version. -->
@@ -42,4 +44,6 @@
       <HostingStartupPackageReference Include="%(_ResolvedPackageVersionInfo.PackageId)" Version="%(_ResolvedPackageVersionInfo.PackageVersion)" />
     </ItemGroup>
   </Target>
+
+  <Target Name="_VmrBuild" DependsOnTargets="Restore;Build;Pack" Condition=" '$(DotNetBuildPass)' == '2' " />
 </Project>
diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
index bd67ff01be5c..887426a9d2d8 100644
--- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
+++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
@@ -14,6 +14,7 @@
     <DotNetUnpackFolder>$(RedistSharedFrameworkLayoutRoot)</DotNetUnpackFolder>
     <IsPackable>true</IsPackable>
     <NoSemVer20>true</NoSemVer20>
+    <CrossArchitectureInstallerBasePathNormalized>$([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime'))</CrossArchitectureInstallerBasePathNormalized>
   </PropertyGroup>
 
   <Import Project="..\..\..\src\Servers\IIS\build\assets.props" />
@@ -22,9 +23,6 @@
     <Content Include="applicationHost.xdt" />
     <Content Include="scmApplicationHost.xdt" />
     <Content Include="install.cmd" />
-    <Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll"
-        Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll')"
-        PackagePath="content" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,27 +32,46 @@
       SkipGetTargetFrameworkProperties="true" />
 
     <!-- Make sure redist folder is built and ready -->
-    <ProjectReference Include="..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+    <!-- Not necessary if this is Pass 2 of a VMR build -->
+    <ProjectReference Include="..\..\Framework\App.Runtime\src\aspnetcore-runtime.proj"
       Private="false"
       ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true" />
+      SkipGetTargetFrameworkProperties="true"
+      Condition="'$(DotNetBuildPass)' != '2'" />
 
     <NativeProjectReference Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="$(TargetArchitecture)" />
     <NativeProjectReference Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="$(TargetArchitecture)" />
   </ItemGroup>
 
   <Target Name="ResolveReferenceItemsForPackage" DependsOnTargets="ResolveReferences" BeforeTargets="_GetPackageFiles">
+    <ItemGroup>
+      <AspNetRuntimeArchive 
+          Include="$(CrossArchitectureInstallerBasePathNormalized)**\$(RuntimeInstallerBaseName)-*-win-$(Platform).zip"
+          Exclude="$(CrossArchitectureInstallerBasePathNormalized)**\$(RuntimeInstallerBaseName)-composite*" />
+    </ItemGroup>
+
+    <Unzip
+        SourceFiles="@(AspNetRuntimeArchive)"
+        DestinationFolder="$(DotNetUnpackFolder)"
+        OverwriteReadOnlyFiles="true"
+        Condition="'$(DotNetBuildPass)' == '2'" />
+
+    <Error Condition="!Exists('$(DotNetUnpackFolder)')" Text="AspNetCore Shared Framework layout should be available for AspNetCoreRuntime .nupkg, but isn't." />
+    <Error Condition="!Exists('$(MicrosoftWebXdtExtensionsPath)')" Text="Microsoft.Web.Xdt.Extensions.dll should be available for AspNetCoreRuntime .nupkg, but isn't." />
+
     <ItemGroup>
       <Content Include="$(DotNetUnpackFolder)\**\*.*" Exclude="$(DotNetUnpackFolder)\**\.*" PackagePath="content\%(RecursiveDir)" />
       <Content Include="%(ShimComponents.DllLocation)"
             Pack="true"
             Condition="'%(ShimComponents.Platform)' == '$(TargetArchitecture)'"
             PackagePath="content\ancm\%(ShimComponents.TempSubfolder)" />
+      <Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
     </ItemGroup>
   </Target>
 
   <Target Name="CopyFilesToOutputDirectory" />
   <Target Name="CoreCompile" />
   <Target Name="CreateManifestResourceNames" />
+  <Target Name="_VmrBuild" DependsOnTargets="Restore;Build;Pack" Condition=" '$(DotNetBuildPass)' == '2' " />
 
 </Project>
diff --git a/src/StaticAssets/src/Development/StaticAssetDevelopmentRuntimeHandler.cs b/src/StaticAssets/src/Development/StaticAssetDevelopmentRuntimeHandler.cs
index f36e9c0915ed..14ed7a0c3baa 100644
--- a/src/StaticAssets/src/Development/StaticAssetDevelopmentRuntimeHandler.cs
+++ b/src/StaticAssets/src/Development/StaticAssetDevelopmentRuntimeHandler.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Globalization;
 using System.IO.Compression;
 using System.IO.Pipelines;
@@ -22,20 +23,34 @@
 namespace Microsoft.AspNetCore.Builder;
 
 // Handles changes during development to support common scenarios where for example, a developer changes a file in the wwwroot folder.
-internal sealed partial class StaticAssetDevelopmentRuntimeHandler(List<StaticAssetDescriptor> descriptors)
+internal sealed partial class StaticAssetDevelopmentRuntimeHandler
 {
     internal const string ReloadStaticAssetsAtRuntimeKey = "ReloadStaticAssetsAtRuntime";
 
+    private readonly Dictionary<(string Route, string ETag), StaticAssetDescriptor> _descriptorsMap = [];
+
+    public StaticAssetDevelopmentRuntimeHandler(List<StaticAssetDescriptor> descriptors)
+    {
+        CreateDescriptorMap(descriptors);
+    }
+
     public void AttachRuntimePatching(EndpointBuilder builder)
     {
         var original = builder.RequestDelegate!;
         var asset = builder.Metadata.OfType<StaticAssetDescriptor>().Single();
         if (asset.HasContentEncoding())
         {
-            // This is a compressed asset, which might get out of "sync" with the original uncompressed version.
-            // We are going to find the original by using the weak etag from this compressed asset and locating an asset with the same etag.
-            var eTag = asset.GetWeakETag();
-            asset = FindOriginalAsset(eTag.Tag.Value!, descriptors);
+            var originalETag = GetDescriptorOriginalResourceProperty(asset);
+            StaticAssetDescriptor? originalAsset = null;
+            if (originalETag is not null && _descriptorsMap.TryGetValue((asset.Route, originalETag), out originalAsset))
+            {
+                asset = originalAsset;
+            }
+            else
+            {
+                Debug.Assert(originalETag != null, $"The static asset descriptor {asset.Route} - {asset.AssetPath} does not have an original-resource property.");
+                Debug.Assert(originalAsset != null, $"The static asset descriptor {asset.Route} - {asset.AssetPath} has an original-resource property that does not match any known static asset descriptor.");
+            }
         }
 
         builder.RequestDelegate = async context =>
@@ -57,6 +72,57 @@ public void AttachRuntimePatching(EndpointBuilder builder)
         };
     }
 
+    private static string? GetDescriptorOriginalResourceProperty(StaticAssetDescriptor descriptor)
+    {
+        for (var i = 0; i < descriptor.Properties.Count; i++)
+        {
+            var property = descriptor.Properties[i];
+            if (string.Equals(property.Name, "original-resource", StringComparison.OrdinalIgnoreCase))
+            {
+                return property.Value;
+            }
+        }
+
+        return null;
+    }
+
+    private static string? GetDescriptorETagResponseHeader(StaticAssetDescriptor descriptor)
+    {
+        for (var i = 0; i < descriptor.ResponseHeaders.Count; i++)
+        {
+            var header = descriptor.ResponseHeaders[i];
+            if (string.Equals(header.Name, HeaderNames.ETag, StringComparison.OrdinalIgnoreCase))
+            {
+                return header.Value;
+            }
+        }
+
+        return null;
+    }
+
+    private void CreateDescriptorMap(List<StaticAssetDescriptor> descriptors)
+    {
+        for (var i = 0; i < descriptors.Count; i++)
+        {
+            var descriptor = descriptors[i];
+            if (descriptor.HasContentEncoding())
+            {
+                continue;
+            }
+            var etag = GetDescriptorETagResponseHeader(descriptor);
+            if (etag != null && !_descriptorsMap.ContainsKey((descriptor.Route, etag)))
+            {
+                _descriptorsMap[(descriptor.Route, etag)] = descriptor;
+            }
+            else
+            {
+                Debug.Assert(etag != null, $"The static asset descriptor {descriptor.Route} - {descriptor.AssetPath} does not have an ETag response header.");
+                Debug.Assert(_descriptorsMap.ContainsKey((descriptor.Route, etag)),
+                    $"The static asset descriptor {descriptor.Route} - {descriptor.AssetPath} has an ETag response header that is already registered in the map. This should not happen, as the ETag should be unique for each static asset.");
+            }
+        }
+    }
+
     internal static string GetETag(IFileInfo fileInfo)
     {
         using var stream = fileInfo.CreateReadStream();
@@ -114,10 +180,7 @@ public Task SendFileAsync(string path, long offset, long? count, CancellationTok
                 _context.Response.Headers.ContentLength = stream.Length;
 
                 var eTag = Convert.ToBase64String(SHA256.HashData(stream));
-                var weakETag = $"W/{GetETag(fileInfo)}";
-
-                // Here we add the ETag for the Gzip stream as well as the weak ETag for the original asset.
-                _context.Response.Headers.ETag = new StringValues([$"\"{eTag}\"", weakETag]);
+                _context.Response.Headers.ETag = new StringValues($"\"{eTag}\"");
 
                 stream.Seek(0, SeekOrigin.Begin);
                 return stream.CopyToAsync(_context.Response.Body, cancellationToken);
@@ -142,19 +205,6 @@ public Task StartAsync(CancellationToken cancellationToken = default)
         }
     }
 
-    private static StaticAssetDescriptor FindOriginalAsset(string tag, List<StaticAssetDescriptor> descriptors)
-    {
-        for (var i = 0; i < descriptors.Count; i++)
-        {
-            if (descriptors[i].HasETag(tag))
-            {
-                return descriptors[i];
-            }
-        }
-
-        throw new InvalidOperationException("The original asset was not found.");
-    }
-
     internal static bool IsEnabled(bool isBuildManifest, IServiceProvider serviceProvider)
     {
         var config = serviceProvider.GetRequiredService<IConfiguration>();
diff --git a/src/StaticAssets/src/PublicAPI.Shipped.txt b/src/StaticAssets/src/PublicAPI.Shipped.txt
index ab058de62d44..b577e6d02d5f 100644
--- a/src/StaticAssets/src/PublicAPI.Shipped.txt
+++ b/src/StaticAssets/src/PublicAPI.Shipped.txt
@@ -1 +1,34 @@
-#nullable enable
+#nullable enable
+Microsoft.AspNetCore.Builder.StaticAssetsEndpointRouteBuilderExtensions
+Microsoft.AspNetCore.StaticAssets.Infrastructure.StaticAssetsEndpointDataSourceHelper
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.AssetPath.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.AssetPath.set -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Properties.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetProperty!>!
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Properties.set -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.ResponseHeaders.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader!>!
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.ResponseHeaders.set -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Route.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Route.set -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Selectors.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetSelector!>!
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Selectors.set -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.StaticAssetDescriptor() -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetProperty
+Microsoft.AspNetCore.StaticAssets.StaticAssetProperty.Name.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetProperty.StaticAssetProperty(string! name, string! value) -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetProperty.Value.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader
+Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader.Name.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader.StaticAssetResponseHeader(string! name, string! value) -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader.Value.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetSelector
+Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.Name.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.Quality.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.StaticAssetSelector(string! name, string! value, string! quality) -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.Value.get -> string!
+Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder
+Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder.Add(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! convention) -> void
+Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder.Finally(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! convention) -> void
+static Microsoft.AspNetCore.Builder.StaticAssetsEndpointRouteBuilderExtensions.MapStaticAssets(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string? staticAssetsManifestPath = null) -> Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder!
+static Microsoft.AspNetCore.StaticAssets.Infrastructure.StaticAssetsEndpointDataSourceHelper.HasStaticAssetsDataSource(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! builder, string? staticAssetsManifestPath = null) -> bool
+static Microsoft.AspNetCore.StaticAssets.Infrastructure.StaticAssetsEndpointDataSourceHelper.ResolveStaticAssetDescriptors(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpointRouteBuilder, string? manifestPath) -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor!>!
diff --git a/src/StaticAssets/src/PublicAPI.Unshipped.txt b/src/StaticAssets/src/PublicAPI.Unshipped.txt
index ded8dc823703..7dc5c58110bf 100644
--- a/src/StaticAssets/src/PublicAPI.Unshipped.txt
+++ b/src/StaticAssets/src/PublicAPI.Unshipped.txt
@@ -1,33 +1 @@
-Microsoft.AspNetCore.Builder.StaticAssetsEndpointRouteBuilderExtensions
-Microsoft.AspNetCore.StaticAssets.Infrastructure.StaticAssetsEndpointDataSourceHelper
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.AssetPath.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.AssetPath.set -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Properties.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetProperty!>!
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Properties.set -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.ResponseHeaders.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader!>!
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.ResponseHeaders.set -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Route.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Route.set -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Selectors.get -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetSelector!>!
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.Selectors.set -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor.StaticAssetDescriptor() -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetProperty
-Microsoft.AspNetCore.StaticAssets.StaticAssetProperty.Name.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetProperty.StaticAssetProperty(string! name, string! value) -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetProperty.Value.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader
-Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader.Name.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader.StaticAssetResponseHeader(string! name, string! value) -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetResponseHeader.Value.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetSelector
-Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.Name.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.Quality.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.StaticAssetSelector(string! name, string! value, string! quality) -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetSelector.Value.get -> string!
-Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder
-Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder.Add(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! convention) -> void
-Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder.Finally(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! convention) -> void
-static Microsoft.AspNetCore.Builder.StaticAssetsEndpointRouteBuilderExtensions.MapStaticAssets(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, string? staticAssetsManifestPath = null) -> Microsoft.AspNetCore.StaticAssets.StaticAssetsEndpointConventionBuilder!
-static Microsoft.AspNetCore.StaticAssets.Infrastructure.StaticAssetsEndpointDataSourceHelper.HasStaticAssetsDataSource(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! builder, string? staticAssetsManifestPath = null) -> bool
-static Microsoft.AspNetCore.StaticAssets.Infrastructure.StaticAssetsEndpointDataSourceHelper.ResolveStaticAssetDescriptors(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpointRouteBuilder, string? manifestPath) -> System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.StaticAssets.StaticAssetDescriptor!>!
+#nullable enable
diff --git a/src/StaticAssets/src/StaticAssetsEndpointRouteBuilderExtensions.cs b/src/StaticAssets/src/StaticAssetsEndpointRouteBuilderExtensions.cs
index bd80b3951e11..98cfdb98e707 100644
--- a/src/StaticAssets/src/StaticAssetsEndpointRouteBuilderExtensions.cs
+++ b/src/StaticAssets/src/StaticAssetsEndpointRouteBuilderExtensions.cs
@@ -20,8 +20,8 @@ public static class StaticAssetsEndpointRouteBuilderExtensions
     /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
     /// <param name="staticAssetsManifestPath">The path to the static assets manifest file.</param>
     /// <remarks>
-    /// The <paramref name="staticAssetsManifestPath"/> can be null to use the <see cref="IHostEnvironment.ApplicationName"/> to locate the manifes.
-    /// As an alternative, a full path can be specified to the manifest file. If a relative path is used, we'll search for the file in the <see cref="AppContext.BaseDirectory"/>." />
+    /// The <paramref name="staticAssetsManifestPath"/> can be <see langword="null"/> to use the <see cref="IHostEnvironment.ApplicationName"/> to locate the manifest.
+    /// As an alternative, a full path can be specified to the manifest file. If a relative path is used, we'll search for the file in the <see cref="AppContext.BaseDirectory"/>.
     /// </remarks>
     public static StaticAssetsEndpointConventionBuilder MapStaticAssets(this IEndpointRouteBuilder endpoints, string? staticAssetsManifestPath = null)
     {
diff --git a/src/StaticAssets/src/StaticAssetsInvoker.cs b/src/StaticAssets/src/StaticAssetsInvoker.cs
index 1d21cc2929ec..c7555c901b93 100644
--- a/src/StaticAssets/src/StaticAssetsInvoker.cs
+++ b/src/StaticAssets/src/StaticAssetsInvoker.cs
@@ -223,7 +223,7 @@ private async Task SendRangeAsync(StaticAssetInvocationContext requestContext, R
 
         if (requestContext.Response.StatusCode == StatusCodes.Status200OK)
         {
-            requestContext.Response.StatusCode = StatusCodes.Status416RangeNotSatisfiable;
+            requestContext.Response.StatusCode = StatusCodes.Status206PartialContent;
         }
         await ApplyResponseHeadersAsync(requestContext, StatusCodes.Status206PartialContent);
 
diff --git a/src/StaticAssets/test/StaticAssetsIntegrationTests.cs b/src/StaticAssets/test/StaticAssetsIntegrationTests.cs
index 541a468a15a2..2fda7c870791 100644
--- a/src/StaticAssets/test/StaticAssetsIntegrationTests.cs
+++ b/src/StaticAssets/test/StaticAssetsIntegrationTests.cs
@@ -519,13 +519,12 @@ private static void CreateTestManifest(string appName, string webRoot, params Sp
                     Route = resource.Path,
                     AssetPath = $"{resource.Path}.gz",
                     Selectors = [new StaticAssetSelector("Content-Encoding", "gzip", "1.0")],
-                    Properties = [],
+                    Properties = [new("original-resource", $"\"{GetEtag(resource.Content)}\"")],
                     ResponseHeaders = [
                         new ("Accept-Ranges", "bytes"),
                         new ("Content-Type", GetContentType(filePath)),
 
                         new ("Content-Length", length.ToString(CultureInfo.InvariantCulture)),
-                        new ("ETag", $"W/\"{GetEtag(resource.Content)}\""),
                         new ("ETag", $"\"{GetEtagForFile(compressedFilePath)}\""),
                         new ("Last-Modified", lastModified.ToString("ddd, dd MMM yyyy HH:mm:ss 'GMT'", CultureInfo.InvariantCulture)),
 
@@ -989,6 +988,33 @@ public async Task IfUnmodifiedSinceDateLessThanLastModifiedShouldReturn412(HttpM
         Assert.Equal(HttpStatusCode.PreconditionFailed, res2.StatusCode);
     }
 
+    // 14.35.2 Range Retrieval Requests
+    // The presence of a Range header in an unconditional GET modifies
+    // what is returned if the GET is otherwise successful. In other
+    // words, the response carries a status code of 206 (Partial
+    // Content) instead of 200 (OK).
+    [Fact]
+    public async Task RangeGivesMatchingRange()
+    {
+        var client = await CreateClient();
+
+        var req1 = new HttpRequestMessage(HttpMethod.Get, "http://localhost/sample.txt");
+        req1.Headers.Range = new RangeHeaderValue(0, 4);
+        var res1 = await client.SendAsync(req1);
+
+        var req2 = new HttpRequestMessage(HttpMethod.Get, "http://localhost/sample.txt");
+        req2.Headers.Range = new RangeHeaderValue(7, 11);
+        var res2 = await client.SendAsync(req2);
+
+        Assert.Equal(HttpStatusCode.PartialContent, res1.StatusCode);
+        Assert.Equal("Hello", await res1.Content.ReadAsStringAsync());
+        Assert.Equal(5, res1.Content.Headers.ContentLength);
+
+        Assert.Equal(HttpStatusCode.PartialContent, res2.StatusCode);
+        Assert.Equal("World", await res2.Content.ReadAsStringAsync());
+        Assert.Equal(5, res2.Content.Headers.ContentLength);
+    }
+
     public static IEnumerable<object[]> SupportedMethods => new[]
     {
             new [] { HttpMethod.Get },
diff --git a/src/Testing/Testing.slnf b/src/Testing/Testing.slnf
index 7c24244ae4d1..64b5eba35f0b 100644
--- a/src/Testing/Testing.slnf
+++ b/src/Testing/Testing.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Analyzers\\Microsoft.AspNetCore.Analyzer.Testing\\src\\Microsoft.AspNetCore.Analyzer.Testing.csproj",
       "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
diff --git a/src/Testing/src/HttpClientSlim.cs b/src/Testing/src/HttpClientSlim.cs
index 5e301bc29d42..deae7aaff7a7 100644
--- a/src/Testing/src/HttpClientSlim.cs
+++ b/src/Testing/src/HttpClientSlim.cs
@@ -108,11 +108,7 @@ private static async Task<string> ReadResponse(Stream stream)
 
     private static async Task<string> RetryRequest(Func<Task<string>> retryBlock)
     {
-        var retryCount = 1;
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-        {
-            retryCount = 3;
-        }
+        var retryCount = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 1 : 3;
 
         for (var retry = 0; retry < retryCount; retry++)
         {
@@ -190,7 +186,12 @@ public static async Task<Socket> GetSocket(Uri requestUri)
 
         if (socket == null)
         {
+#if NETCOREAPP
+            // Include the host and port explicitly in case there's a parsing issue
+            throw new SocketException((int)socketArgs.SocketError, $"Failed to connect to server {requestUri.Host} on port {requestUri.Port}");
+#else
             throw new SocketException((int)socketArgs.SocketError);
+#endif
         }
         else
         {
diff --git a/src/Testing/src/Logging/LogValuesAssert.cs b/src/Testing/src/Logging/LogValuesAssert.cs
index 55c873148207..2e965bb39005 100644
--- a/src/Testing/src/Logging/LogValuesAssert.cs
+++ b/src/Testing/src/Logging/LogValuesAssert.cs
@@ -44,7 +44,7 @@ public static void Contains(
         {
             if (!actualValues.Contains(expectedPair, comparer))
             {
-                throw new EqualException(
+                throw EqualException.ForMismatchedValues(
                     expected: GetString(expectedValues),
                     actual: GetString(actualValues));
             }
diff --git a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj
index b791c1e90861..e0f01e8fb1fc 100644
--- a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj
+++ b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj
@@ -28,7 +28,7 @@
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Serilog.Extensions.Logging" />
     <Reference Include="Serilog.Sinks.File" />
-    <Reference Include="System.ValueTuple" />
+    <Reference Include="System.ValueTuple" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
 
     <!--
       This intentionally does not reference 'xunit', 'xunit.core', or any runner packages.
diff --git a/src/Testing/src/TestPathUtilities.cs b/src/Testing/src/TestPathUtilities.cs
index 22f01197cbda..1eb2a35663c2 100644
--- a/src/Testing/src/TestPathUtilities.cs
+++ b/src/Testing/src/TestPathUtilities.cs
@@ -22,7 +22,7 @@ public static string GetSolutionRootDirectory(string solution)
                 return projectFileInfo.DirectoryName;
             }
 
-            projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "AspNetCore.sln"));
+            projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "AspNetCore.slnx"));
             if (projectFileInfo.Exists)
             {
                 // Have reached the solution root. Work down through the src/ folder to find the solution filter.
diff --git a/src/Testing/src/xunit/DockerOnlyAttribute.cs b/src/Testing/src/xunit/DockerOnlyAttribute.cs
index ca2c71a22328..d861a3648da5 100644
--- a/src/Testing/src/xunit/DockerOnlyAttribute.cs
+++ b/src/Testing/src/xunit/DockerOnlyAttribute.cs
@@ -31,7 +31,7 @@ public bool IsMet
 
             var lines = File.ReadAllLines(procFile);
             // typically the last line in the file is "1:name=openrc:/docker"
-            return lines.Reverse().Any(l => l.EndsWith("name=openrc:/docker", StringComparison.Ordinal));
+            return Enumerable.Reverse(lines).Any(l => l.EndsWith("name=openrc:/docker", StringComparison.Ordinal));
         }
     }
 }
diff --git a/src/Testing/src/xunit/HelixConstants.cs b/src/Testing/src/xunit/HelixConstants.cs
index 47f938e8446f..d47d10bdd026 100644
--- a/src/Testing/src/xunit/HelixConstants.cs
+++ b/src/Testing/src/xunit/HelixConstants.cs
@@ -6,8 +6,8 @@ namespace Microsoft.AspNetCore.InternalTesting;
 public static class HelixConstants
 {
     public const string Windows10Arm64 = "Windows.10.Arm64v8.Open;";
-    public const string DebianAmd64 = "Debian.11.Amd64.Open;";
-    public const string DebianArm64 = "Debian.11.Arm64.Open;";
-    public const string AlmaLinuxAmd64 = "(AlmaLinux.8.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64;";
+    public const string DebianAmd64 = "Debian.13.Amd64.Open;";
+    public const string DebianArm64 = "Debian.13.Arm64.Open;";
+    public const string AlmaLinuxAmd64 = "(AlmaLinux.9.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-helix-amd64;";
     public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Linux;Windows.11.Amd64.Client.Open;Windows.11.Amd64.Client;Windows.Amd64.Server2022.Open;Windows.Amd64.Server2022;windows.11.arm64.open;windows.11.arm64";
 }
diff --git a/src/Testing/src/xunit/SkipOnHelixAttribute.cs b/src/Testing/src/xunit/SkipOnHelixAttribute.cs
index 38b376cb6808..131303631637 100644
--- a/src/Testing/src/xunit/SkipOnHelixAttribute.cs
+++ b/src/Testing/src/xunit/SkipOnHelixAttribute.cs
@@ -66,7 +66,11 @@ private bool ShouldSkip()
             return true;
         }
 
-        return Queues.ToLowerInvariant().Split(';').Contains(targetQueue);
+        // We have "QueueName" and "QueueName.Open" queues for internal and public builds
+        // If we want to skip the test in the public queue, we want to skip it in the internal queue, and vice versa
+        return Queues.ToLowerInvariant().Split([';'], StringSplitOptions.RemoveEmptyEntries)
+            .Any(q => q.Equals(targetQueue, StringComparison.Ordinal) || q.StartsWith(targetQueue, StringComparison.Ordinal) || 
+            targetQueue.StartsWith(q, StringComparison.Ordinal));
     }
 
     public static bool OnHelix() => HelixHelper.OnHelix();
diff --git a/src/Testing/test/AssemblyFixtureTest.cs b/src/Testing/test/AssemblyFixtureTest.cs
index ef88d41f3534..557aeb3518ba 100644
--- a/src/Testing/test/AssemblyFixtureTest.cs
+++ b/src/Testing/test/AssemblyFixtureTest.cs
@@ -5,6 +5,8 @@
 
 namespace Microsoft.AspNetCore.InternalTesting;
 
+#pragma warning disable xUnit1041 // Fixture arguments to test classes must have fixture sources
+
 // We include a collection and assembly fixture to verify that they both still work.
 [Collection("MyCollection")]
 [TestCaseOrderer("Microsoft.AspNetCore.InternalTesting.AlphabeticalOrderer", "Microsoft.AspNetCore.InternalTesting.Tests")]
diff --git a/src/Testing/test/ConditionalFactTest.cs b/src/Testing/test/ConditionalFactTest.cs
index 76816d6581a4..243d23beed10 100644
--- a/src/Testing/test/ConditionalFactTest.cs
+++ b/src/Testing/test/ConditionalFactTest.cs
@@ -26,7 +26,7 @@ public void TestAlwaysRun()
     [ConditionalFact(Skip = "Test is always skipped.")]
     public void ConditionalFactSkip()
     {
-        Assert.True(false, "This test should always be skipped.");
+        Assert.Fail("This test should always be skipped.");
     }
 
 #if NETCOREAPP
diff --git a/src/Testing/test/ConditionalTheoryTest.cs b/src/Testing/test/ConditionalTheoryTest.cs
index 36273ecebc68..7297dc80d9dd 100644
--- a/src/Testing/test/ConditionalTheoryTest.cs
+++ b/src/Testing/test/ConditionalTheoryTest.cs
@@ -22,7 +22,7 @@ public ConditionalTheoryTest(ConditionalTheoryAsserter asserter)
     [InlineData(0)]
     public void ConditionalTheorySkip(int arg)
     {
-        Assert.True(false, "This test should always be skipped.");
+        Assert.Fail("This test should always be skipped.");
     }
 
     private static int _conditionalTheoryRuns = 0;
@@ -48,7 +48,7 @@ public void ConditionalTheoriesShouldPreserveTraits(int arg)
     [MemberData(nameof(GetInts))]
     public void ConditionalTheoriesWithSkippedMemberData(int arg)
     {
-        Assert.True(false, "This should never run");
+        Assert.Fail("This should never run");
     }
 
     private static int _conditionalMemberDataRuns = 0;
@@ -72,7 +72,7 @@ public static TheoryData<int> GetInts
     [MemberData(nameof(GetActionTestData))]
     public void ConditionalTheoryWithFuncs(Func<int, int> func)
     {
-        Assert.True(false, "This should never run");
+        Assert.Fail("This should never run");
     }
 
     [Fact]
diff --git a/src/Testing/test/LogValuesAssertTest.cs b/src/Testing/test/LogValuesAssertTest.cs
index 21bf6861e595..ea5f4db9b615 100644
--- a/src/Testing/test/LogValuesAssertTest.cs
+++ b/src/Testing/test/LogValuesAssertTest.cs
@@ -119,8 +119,8 @@ public void Asserts_Failure_ExpectedValues_MoreThan_ActualValues(
         var equalException = Assert.Throws<EqualException>(
             () => LogValuesAssert.Contains(expectedValues, actualValues));
 
-        Assert.Equal(GetString(expectedValues), equalException.Expected);
-        Assert.Equal(GetString(actualValues), equalException.Actual);
+        Assert.Contains(GetString(expectedValues), equalException.Message);
+        Assert.Contains(GetString(actualValues), equalException.Message);
     }
 
     [Fact]
@@ -207,8 +207,8 @@ public void DefaultComparer_Performs_CaseSensitiveComparision(
         var equalException = Assert.Throws<EqualException>(
             () => LogValuesAssert.Contains(expectedValues, actualValues));
 
-        Assert.Equal(GetString(expectedValues), equalException.Expected);
-        Assert.Equal(GetString(actualValues), equalException.Actual);
+        Assert.Contains(GetString(expectedValues), equalException.Message);
+        Assert.Contains(GetString(actualValues), equalException.Message);
     }
 
     private string GetString(IEnumerable<KeyValuePair<string, object>> logValues)
diff --git a/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj b/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj
index 9e7bd0e702ba..2ec19113d106 100644
--- a/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj
+++ b/src/Testing/test/Microsoft.AspNetCore.InternalTesting.Tests.csproj
@@ -14,10 +14,10 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.InternalTesting" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472' OR '$(MSBuildRestoreSessionId)' == ''">
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
   </ItemGroup>
 </Project>
diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
index 1617d9edd1ba..4fee2dad60e6 100644
--- a/src/Tools/Directory.Build.targets
+++ b/src/Tools/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
     <!-- Microsoft tool packages are required to target both x64 and x86. -->
-    <PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND '$(DotNetBuildSourceOnly)' != 'true' ">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
+    <PackAsToolShimRuntimeIdentifiers Condition=" '$(IsShippingPackage)' == 'true' AND ('$(DotNetBuild)' != 'true' OR '$(TargetOsName)' == 'win')">win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
     <!-- None of the tool projects are project reference providers. -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
     <!--
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
index 8f7fb3efce7f..381389465acb 100644
--- a/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
+++ b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
@@ -3,6 +3,11 @@
   <PropertyGroup>
     <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)../tasks/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.dll</_ApiDescriptionClientAssemblyPath>
   </PropertyGroup>
+  
+  <!-- Emit deprecation warning for this package -->
+  <Target Name="_WarnMicrosoftExtensionsApiDescriptionClientDeprecated" BeforeTargets="BeforeCompile;Build;Restore">
+    <Warning Code="ASPDEPR001" Text="The 'Microsoft.Extensions.ApiDescription.Client' package is deprecated and will be removed in a future release." HelpLink="https://aka.ms/aspnet/deprecate/001" />
+  </Target>
   <UsingTask TaskName="GetCurrentOpenApiReference" AssemblyFile="$(_ApiDescriptionClientAssemblyPath)" />
   <UsingTask TaskName="GetOpenApiReferenceMetadata" AssemblyFile="$(_ApiDescriptionClientAssemblyPath)" />
 
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
index 3a6fd319472d..1c8153dc2387 100644
--- a/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
+++ b/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
@@ -11,6 +11,11 @@ namespace Microsoft.Extensions.ApiDescription.Client;
 
 public class GetOpenApiReferenceMetadataTest
 {
+    string SortMetadata(string metadata)
+    {
+        return string.Join("|", metadata.Split('|').OrderBy(s => s));
+    }
+
     [Fact]
     public void Execute_AddsExpectedMetadata()
     {
@@ -60,6 +65,8 @@ public void Execute_AddsExpectedMetadata()
             orderedMetadata.Add(key, metadata[key]);
         }
 
+        expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]); 
+        orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
         Assert.Equal(expectedMetadata, orderedMetadata);
     }
 
@@ -118,6 +125,8 @@ public void Execute_DoesNotOverrideClassName()
             orderedMetadata.Add(key, metadata[key]);
         }
 
+        expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
+        orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
         Assert.Equal(expectedMetadata, orderedMetadata);
     }
 
@@ -176,6 +185,8 @@ public void Execute_DoesNotOverrideNamespace()
             orderedMetadata.Add(key, metadata[key]);
         }
 
+        expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
+        orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
         Assert.Equal(expectedMetadata, orderedMetadata);
     }
 
@@ -234,6 +245,9 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
             orderedMetadata.Add(key, metadata[key]);
         }
 
+        // sort the values, since order is undefined for Dictionary
+        expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
+        orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
         Assert.Equal(expectedMetadata, orderedMetadata);
     }
 
@@ -383,7 +397,8 @@ public void Execute_SetsClassName_BasedOnOutputPath()
         {
             orderedMetadata.Add(key, metadata[key]);
         }
-
+        expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
+        orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
         Assert.Equal(expectedMetadata, orderedMetadata);
     }
 
@@ -446,7 +461,8 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
         {
             orderedMetadata.Add(key, metadata[key]);
         }
-
+        expectedMetadata["SerializedMetadata"] = SortMetadata(expectedMetadata["SerializedMetadata"]);
+        orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
         Assert.Equal(expectedMetadata, orderedMetadata);
     }
 
@@ -545,6 +561,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
                     orderedMetadata.Add(key, metadata[key]);
                 }
 
+                expectedMetadata1["SerializedMetadata"] = SortMetadata(expectedMetadata1["SerializedMetadata"]);
+                orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
                 Assert.Equal(expectedMetadata1, orderedMetadata);
             },
             output =>
@@ -556,7 +574,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
                 {
                     orderedMetadata.Add(key, metadata[key]);
                 }
-
+                expectedMetadata2["SerializedMetadata"] = SortMetadata(expectedMetadata2["SerializedMetadata"]);
+                orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
                 Assert.Equal(expectedMetadata2, orderedMetadata);
             },
             output =>
@@ -569,6 +588,8 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
                     orderedMetadata.Add(key, metadata[key]);
                 }
 
+                expectedMetadata3["SerializedMetadata"] = SortMetadata(expectedMetadata3["SerializedMetadata"]);
+                orderedMetadata["SerializedMetadata"] = SortMetadata(orderedMetadata["SerializedMetadata"]);
                 Assert.Equal(expectedMetadata3, orderedMetadata);
             });
     }
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs
index c12361e719cc..da443c935c97 100644
--- a/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs
+++ b/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs
@@ -193,7 +193,10 @@ public void SerializeMetadata_ReturnsExpectedString()
         // Act
         var result = MetadataSerializer.SerializeMetadata(input);
 
-        // Assert
+       // sort the values, since order is undefined for Dictionary
+       expectedResult = string.Join("|", expectedResult.Split('|').OrderBy(s => s));
+       result = string.Join("|", result.Split('|').OrderBy(s => s));
+       // Assert
         Assert.Equal(expectedResult, result);
     }
 
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
index 2db57db2538c..adca7bcf7696 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- Included primarily to ensure dotnet-getdocument and GetDocument.Insider can be referenced. -->
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
 
     <Description>MSBuild tasks and targets for build-time Swagger and OpenApi document generation</Description>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
index 043c70902c70..ff52e9f039e3 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
@@ -8,10 +8,9 @@
     $CommonFileElements$
     <file src="build\*" target="build" />
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
-    <file src="$artifactsBinDir$\dotnet-getdocument\$configuration$\netcoreapp2.1\publish\*.*" target="tools" />
+    <file src="$artifactsBinDir$\dotnet-getdocument\$configuration$\net10.0\publish\*.*" target="tools" />
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net462\*.*" target="tools\net462" />
     <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net462\*.*" target="tools\net462-x86" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net9.0\publish\*.*" target="tools\net9.0" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net10.0\publish\*.*" target="tools\net10.0" />
   </files>
 </package>
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
index fad5b1a0c6eb..f5b2839bd16d 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
+++ b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
@@ -51,8 +51,7 @@
         Text="OpenAPI document generation is not supported when targeting netcoreapp2.0 or earlier. Disable the feature or move to a later target framework." />
 
     <PropertyGroup>
-      <_DotNetGetDocumentOutputPath>$(OpenApiDocumentsDirectory.TrimEnd('\'))</_DotNetGetDocumentOutputPath>
-      <_DotNetGetDocumentOutputPath>$([System.IO.Path]::GetFullPath('$(_DotNetGetDocumentOutputPath)'))</_DotNetGetDocumentOutputPath>
+      <_DotNetGetDocumentOutputPath>$([System.IO.Path]::GetFullPath('$(OpenApiDocumentsDirectory)').TrimEnd('\'))</_DotNetGetDocumentOutputPath>
       <_DotNetGetDocumentCommand>dotnet "$(MSBuildThisFileDirectory)../tools/dotnet-getdocument.dll" --assembly "$(TargetPath)"</_DotNetGetDocumentCommand>
       <_DotNetGetDocumentCommand>$(_DotNetGetDocumentCommand) --file-list "$(_OpenApiDocumentsCache)" --framework "$(TargetFrameworkMoniker)"</_DotNetGetDocumentCommand>
       <_DotNetGetDocumentCommand>$(_DotNetGetDocumentCommand) --output "$(_DotNetGetDocumentOutputPath)" --project "$(MSBuildProjectName)"</_DotNetGetDocumentCommand>
diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
index 09a32825e50e..9e32f87d0ca4 100644
--- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
+++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
@@ -373,7 +373,7 @@ public void EnsureCreateHttpsCertificate_CannotExportToNonExistentDirectory()
             .EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), Path.Combine("NoSuchDirectory", CertificateName));
 
         // Assert
-        Assert.Equal(EnsureCertificateResult.ErrorExportingTheCertificate, result);
+        Assert.Equal(EnsureCertificateResult.ErrorExportingTheCertificateToNonExistentDirectory, result);
     }
 
     [Fact]
@@ -388,6 +388,7 @@ public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateIfVersionIsInc
         ListCertificates();
 
         _manager.AspNetHttpsCertificateVersion = 2;
+        _manager.MinimumAspNetHttpsCertificateVersion = 2;
 
         var httpsCertificateList = _manager.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true);
         Assert.Empty(httpsCertificateList);
@@ -400,17 +401,40 @@ public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateForEmptyVersio
 
         var now = DateTimeOffset.UtcNow;
         now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset);
+        _manager.MinimumAspNetHttpsCertificateVersion = 0;
         _manager.AspNetHttpsCertificateVersion = 0;
         var creation = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
         Output.WriteLine(creation.ToString());
         ListCertificates();
 
         _manager.AspNetHttpsCertificateVersion = 1;
+        _manager.MinimumAspNetHttpsCertificateVersion = 1;
 
         var httpsCertificateList = _manager.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true);
         Assert.Empty(httpsCertificateList);
     }
 
+    [ConditionalFact]
+    [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
+    public void EnsureCreateHttpsCertificate_DoNotOverrideValidOldCertificate()
+    {
+        _fixture.CleanupCertificates();
+
+        var now = DateTimeOffset.UtcNow;
+        now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset);
+        var creation = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
+        Output.WriteLine(creation.ToString());
+        ListCertificates();
+
+        // Simulate a tool with the same min version as the already existing cert but with a more
+        // recent generation version
+        _manager.MinimumAspNetHttpsCertificateVersion = 1;
+        _manager.AspNetHttpsCertificateVersion = 2;
+        var alreadyExist = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
+        Output.WriteLine(alreadyExist.ToString());
+        Assert.Equal(EnsureCertificateResult.ValidCertificatePresent, alreadyExist);
+    }
+
     [ConditionalFact]
     [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
     public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero()
@@ -419,7 +443,7 @@ public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero()
 
         var now = DateTimeOffset.UtcNow;
         now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset);
-        _manager.AspNetHttpsCertificateVersion = 0;
+        _manager.MinimumAspNetHttpsCertificateVersion = 0;
         var creation = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
         Output.WriteLine(creation.ToString());
         ListCertificates();
@@ -441,7 +465,7 @@ public void EnsureCreateHttpsCertificate_ReturnValidIfCertIsNewer()
         Output.WriteLine(creation.ToString());
         ListCertificates();
 
-        _manager.AspNetHttpsCertificateVersion = 1;
+        _manager.MinimumAspNetHttpsCertificateVersion = 1;
         var httpsCertificateList = _manager.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true);
         Assert.NotEmpty(httpsCertificateList);
     }
@@ -455,16 +479,24 @@ public void ListCertificates_AlwaysReturnsTheCertificate_WithHighestVersion()
         var now = DateTimeOffset.UtcNow;
         now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset);
         _manager.AspNetHttpsCertificateVersion = 1;
+        _manager.MinimumAspNetHttpsCertificateVersion = 1;
         var creation = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
         Output.WriteLine(creation.ToString());
         ListCertificates();
 
         _manager.AspNetHttpsCertificateVersion = 2;
+        _manager.MinimumAspNetHttpsCertificateVersion = 2;
         creation = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
         Output.WriteLine(creation.ToString());
         ListCertificates();
 
-        _manager.AspNetHttpsCertificateVersion = 1;
+        _manager.AspNetHttpsCertificateVersion = 3;
+        _manager.MinimumAspNetHttpsCertificateVersion = 3;
+        creation = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, isInteractive: false);
+        Output.WriteLine(creation.ToString());
+        ListCertificates();
+
+        _manager.MinimumAspNetHttpsCertificateVersion = 2;
         var httpsCertificateList = _manager.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true);
         Assert.Equal(2, httpsCertificateList.Count);
 
@@ -475,13 +507,13 @@ public void ListCertificates_AlwaysReturnsTheCertificate_WithHighestVersion()
             firstCertificate.Extensions.OfType<X509Extension>(),
             e => e.Critical == false &&
                 e.Oid.Value == CertificateManager.AspNetHttpsOid &&
-                e.RawData[0] == 2);
+                e.RawData[0] == 3);
 
         Assert.Contains(
             secondCertificate.Extensions.OfType<X509Extension>(),
             e => e.Critical == false &&
                 e.Oid.Value == CertificateManager.AspNetHttpsOid &&
-                e.RawData[0] == 1);
+                e.RawData[0] == 2);
     }
 
     [ConditionalFact]
@@ -532,6 +564,8 @@ public CertFixture()
 
     internal void CleanupCertificates()
     {
+        Manager.MinimumAspNetHttpsCertificateVersion = 1;
+        Manager.AspNetHttpsCertificateVersion = 1;
         Manager.RemoveAllCertificates(StoreName.My, StoreLocation.CurrentUser);
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         {
diff --git a/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
index a50552dfa7ea..0bd4ed9be2dd 100644
--- a/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
+++ b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
@@ -254,17 +254,23 @@ private bool GetDocuments(IServiceProvider services)
             return false;
         }
 
-        // If an explicit document name is provided, then generate only that document.
+        // Get document names
         var documentNames = (IEnumerable<string>)InvokeMethod(getDocumentsMethod, service, _getDocumentsArguments);
         if (documentNames == null)
         {
             return false;
         }
 
-        if (!string.IsNullOrEmpty(_context.DocumentName) && !documentNames.Contains(_context.DocumentName))
+        // If an explicit document name is provided, then generate only that document.
+        if (!string.IsNullOrEmpty(_context.DocumentName))
         {
-            _reporter.WriteError(Resources.FormatDocumentNotFound(_context.DocumentName));
-            return false;
+            if (!documentNames.Contains(_context.DocumentName))
+            {
+                _reporter.WriteError(Resources.FormatDocumentNotFound(_context.DocumentName));
+                return false;
+            }
+
+            documentNames = [_context.DocumentName];
         }
 
         if (!string.IsNullOrWhiteSpace(_context.FileName) && !Regex.IsMatch(_context.FileName, "^([A-Za-z0-9-_]+)$"))
@@ -277,7 +283,10 @@ private bool GetDocuments(IServiceProvider services)
         var found = false;
         Directory.CreateDirectory(_context.OutputDirectory);
         var filePathList = new List<string>();
-        foreach (var documentName in documentNames)
+        var targetDocumentNames = string.IsNullOrEmpty(_context.DocumentName)
+            ? documentNames
+            : [_context.DocumentName];
+        foreach (var documentName in targetDocumentNames)
         {
             var filePath = GetDocument(
                 documentName,
@@ -321,7 +330,7 @@ private string GetDocument(
         _reporter.WriteInformation(Resources.FormatGeneratingDocument(documentName));
 
         using var stream = new MemoryStream();
-        using (var writer = new StreamWriter(stream, _utf8EncodingWithoutBOM, bufferSize: 1024, leaveOpen: true))
+        using (var writer = new InvariantStreamWriter(stream, _utf8EncodingWithoutBOM, bufferSize: 1024, leaveOpen: true))
         {
             var targetMethod = generateWithVersionMethod ?? generateMethod;
             object[] arguments = [documentName, writer];
@@ -338,7 +347,7 @@ private string GetDocument(
                     {
                         _reporter.WriteWarning(Resources.FormatInvalidOpenApiVersion(_context.OpenApiVersion));
                     }
-                    arguments = [documentName, writer, OpenApiSpecVersion.OpenApi3_0];
+                    arguments = [documentName, writer, OpenApiSpecVersion.OpenApi3_1];
                 }
             }
             using var resultTask = (Task)InvokeMethod(targetMethod, service, arguments);
@@ -455,6 +464,12 @@ private object InvokeMethod(MethodInfo method, object instance, object[] argumen
         return result;
     }
 
+    private sealed class InvariantStreamWriter(Stream stream, Encoding? encoding = null, int bufferSize = -1, bool leaveOpen = false)
+        : StreamWriter(stream, encoding, bufferSize, leaveOpen)
+    {
+        public override IFormatProvider FormatProvider => System.Globalization.CultureInfo.InvariantCulture;
+    }
+
 #if NET7_0_OR_GREATER
     private sealed class NoopHostLifetime : IHostLifetime
     {
diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
index b9196a12777a..a5b5cd12beb8 100644
--- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
+++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
     <IsShippingPackage>false</IsShippingPackage>
     <NoWarn>$(NoWarn);nullable</NoWarn>
   </PropertyGroup>
@@ -19,13 +19,7 @@
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0">
-      <AllowExplicitReference>true</AllowExplicitReference>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <Reference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>
 
diff --git a/src/Tools/GetDocumentInsider/tests/GetDocumentInsider.Tests.csproj b/src/Tools/GetDocumentInsider/tests/GetDocumentInsider.Tests.csproj
index de41ba15c714..188f5395e88d 100644
--- a/src/Tools/GetDocumentInsider/tests/GetDocumentInsider.Tests.csproj
+++ b/src/Tools/GetDocumentInsider/tests/GetDocumentInsider.Tests.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <Reference Include="GetDocument.Insider" />
-    <Reference Include="Microsoft.OpenApi.Readers" />
+    <Reference Include="Microsoft.OpenApi.YamlReader" />
     <ProjectReference Include="$(RepoRoot)\src\Tools\GetDocumentInsider\sample\GetDocumentSample.csproj" />
   </ItemGroup>
 
diff --git a/src/Tools/GetDocumentInsider/tests/GetDocumentTests.cs b/src/Tools/GetDocumentInsider/tests/GetDocumentTests.cs
index b6465fa38d49..712ef8bc1f8c 100644
--- a/src/Tools/GetDocumentInsider/tests/GetDocumentTests.cs
+++ b/src/Tools/GetDocumentInsider/tests/GetDocumentTests.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Tools.Internal;
 using Xunit.Abstractions;
 using Microsoft.Extensions.ApiDescription.Tool.Commands;
-using Microsoft.OpenApi.Readers;
 using System.Reflection;
 using System.Runtime.Versioning;
 using Microsoft.OpenApi;
@@ -37,10 +36,12 @@ public void GetDocument_Works()
         ], new GetDocumentCommand(_console), throwOnUnexpectedArg: false);
 
         // Assert
-        var document = new OpenApiStreamReader().Read(File.OpenRead(Path.Combine(outputPath.FullName, "Sample.json")), out var diagnostic);
-        Assert.Empty(diagnostic.Errors);
-        Assert.Equal(OpenApiSpecVersion.OpenApi3_0, diagnostic.SpecificationVersion);
-        Assert.Equal("GetDocumentSample | v1", document.Info.Title);
+        using var stream = new MemoryStream(File.ReadAllBytes(Path.Combine(outputPath.FullName, "Sample.json")));
+        var result = OpenApiDocument.Load(stream, "json");
+        // TODO: Needs https://github.com/microsoft/OpenAPI.NET/issues/2055 to be fixed
+        // Assert.Empty(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiSpecVersion.OpenApi3_1, result.Diagnostic.SpecificationVersion);
+        Assert.Equal("GetDocumentSample | v1", result.Document.Info.Title);
     }
 
     [Fact]
@@ -62,10 +63,11 @@ public void GetDocument_WithOpenApiVersion_Works()
         ], new GetDocumentCommand(_console), throwOnUnexpectedArg: false);
 
         // Assert
-        var document = new OpenApiStreamReader().Read(File.OpenRead(Path.Combine(outputPath.FullName, "Sample.json")), out var diagnostic);
-        Assert.Empty(diagnostic.Errors);
-        Assert.Equal(OpenApiSpecVersion.OpenApi2_0, diagnostic.SpecificationVersion);
-        Assert.Equal("GetDocumentSample | v1", document.Info.Title);
+        using var stream = new MemoryStream(File.ReadAllBytes(Path.Combine(outputPath.FullName, "Sample.json")));
+        var result = OpenApiDocument.Load(stream, "json");
+        Assert.Empty(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiSpecVersion.OpenApi2_0, result.Diagnostic.SpecificationVersion);
+        Assert.Equal("GetDocumentSample | v1", result.Document.Info.Title);
     }
 
     [Fact]
@@ -88,10 +90,11 @@ public void GetDocument_WithInvalidOpenApiVersion_Errors()
 
         // Assert that error was produced and files were generated with v3.
         Assert.Contains("Invalid OpenAPI spec version 'OpenApi4_0' provided. Falling back to default: v3.0.", _console.GetOutput());
-        var document = new OpenApiStreamReader().Read(File.OpenRead(Path.Combine(outputPath.FullName, "Sample.json")), out var diagnostic);
-        Assert.Empty(diagnostic.Errors);
-        Assert.Equal(OpenApiSpecVersion.OpenApi3_0, diagnostic.SpecificationVersion);
-        Assert.Equal("GetDocumentSample | v1", document.Info.Title);
+        using var stream = new MemoryStream(File.ReadAllBytes(Path.Combine(outputPath.FullName, "Sample.json")));
+        var result = OpenApiDocument.Load(stream, "json");
+        Assert.Empty(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiSpecVersion.OpenApi3_1, result.Diagnostic.SpecificationVersion);
+        Assert.Equal("GetDocumentSample | v1", result.Document.Info.Title);
     }
 
     [Fact]
@@ -113,11 +116,19 @@ public void GetDocument_WithDocumentName_Works()
         ], new GetDocumentCommand(_console), throwOnUnexpectedArg: false);
 
         // Assert
-        var document = new OpenApiStreamReader().Read(File.OpenRead(Path.Combine(outputPath.FullName, "Sample_internal.json")), out var diagnostic);
-        Assert.Empty(diagnostic.Errors);
-        Assert.Equal(OpenApiSpecVersion.OpenApi3_0, diagnostic.SpecificationVersion);
+        var expectedDocumentPath = Path.Combine(outputPath.FullName, "Sample_internal.json");
+
+        // There should only be one document when document name is specified
+        var documentNames = Directory.GetFiles(outputPath.FullName).Where(documentName => documentName.EndsWith(".json", StringComparison.Ordinal)).ToList();
+        Assert.Single(documentNames);
+        Assert.Contains(expectedDocumentPath, documentNames);
+
+        using var stream = new MemoryStream(File.ReadAllBytes(Path.Combine(outputPath.FullName, "Sample_internal.json")));
+        var result = OpenApiDocument.Load(stream, "json");
+        Assert.Empty(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiSpecVersion.OpenApi3_1, result.Diagnostic.SpecificationVersion);
         // Document name in the title gives us a clue that the correct document was actually resolved
-        Assert.Equal("GetDocumentSample | internal", document.Info.Title);
+        Assert.Equal("GetDocumentSample | internal", result.Document.Info.Title);
     }
 
     [Fact]
diff --git a/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj b/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj
index 6656919a79c8..71e968b4a552 100644
--- a/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj
+++ b/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj
@@ -15,9 +15,7 @@
   <ItemGroup>
     <!-- Packages required to produce a complete dependency graph for the trimmer -->
     <Reference Include="System.Configuration.ConfigurationManager" />
-    <Reference Include="System.Drawing.Common" />
     <Reference Include="System.Security.Permissions" />
-    <Reference Include="System.Threading.AccessControl" />
   </ItemGroup>
   <Target Name="ILLinkTrimProjects" DependsOnTargets="ResolveReferences" AfterTargets="Build" Condition="'$(DotNetBuildSourceOnly)' != 'true' AND '$(SkipTestBuild)' != 'true'">
     <PropertyGroup>
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
index 3dda9082146e..8c9bcb4585b3 100644
--- a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
@@ -17,8 +17,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
     <Reference Include="Microsoft.Build.Locator" />
-    <Reference Include="System.Private.Uri" />
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
index 28c54b750149..f6f915bdce7a 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
@@ -3,6 +3,7 @@
 
 using System.Text.RegularExpressions;
 using System.Xml;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.DotNet.OpenApi.Tests;
 using Xunit.Abstractions;
 
@@ -143,6 +144,7 @@ public async Task OpenApi_Add_NSwagTypeScript()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61225")]
     public async Task OpenApi_Add_FromJson()
     {
         var project = CreateBasicProject(withOpenApi: true);
@@ -183,6 +185,7 @@ public async Task OpenApi_Add_File_UseProjectOption()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61225")]
     public async Task OpenApi_Add_MultipleTimes_OnlyOneReference()
     {
         var project = CreateBasicProject(withOpenApi: true);
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
index c75900b0530a..40a324181269 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.DotNet.OpenApi.Tests;
 using Xunit.Abstractions;
 
@@ -12,6 +13,7 @@ public class OpenApiAddURLTests : OpenApiTestBase
     public OpenApiAddURLTests(ITestOutputHelper output) : base(output) { }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61225")]
     public async Task OpenApi_Add_Url_WithContentDisposition()
     {
         var project = CreateBasicProject(withOpenApi: false);
@@ -175,6 +177,7 @@ public async Task OpenApi_Add_Url()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61348")]
     public async Task OpenApi_Add_Url_SameName_UniqueFile()
     {
         var project = CreateBasicProject(withOpenApi: false);
@@ -331,6 +334,7 @@ public async Task OpenApi_Add_Url_OutputFile()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61348")]
     public async Task OpenApi_Add_URL_FileAlreadyExists_Fail()
     {
         var project = CreateBasicProject(withOpenApi: false);
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
index 696e714410b7..455978520136 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
@@ -17,7 +17,7 @@ public class OpenApiTestBase : IDisposable
     protected readonly TextWriter _output = new StringWriter();
     protected readonly TextWriter _error = new StringWriter();
     protected readonly ITestOutputHelper _outputHelper;
-    protected const string TestTFM = "net9.0";
+    protected const string TestTFM = "net10.0";
 
     protected const string Content = @"{""x-generator"": ""NSwag""}";
     protected const string ActualUrl = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/api-with-examples.yaml";
diff --git a/src/Tools/SDK-Analyzers/Components/src/DiagnosticDescriptors.cs b/src/Tools/SDK-Analyzers/Components/src/DiagnosticDescriptors.cs
index 884fd2b2ee32..5633c0ff5a6d 100644
--- a/src/Tools/SDK-Analyzers/Components/src/DiagnosticDescriptors.cs
+++ b/src/Tools/SDK-Analyzers/Components/src/DiagnosticDescriptors.cs
@@ -8,61 +8,66 @@ namespace Microsoft.AspNetCore.Components.Analyzers;
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
 internal static class DiagnosticDescriptors
 {
+    private const string Encapsulation = "Encapsulation";
+    private const string Usage = "Usage";
+
+    private static LocalizableResourceString CreateLocalizableResourceString(string resource) => new(resource, Resources.ResourceManager, typeof(Resources));
+
     // Note: The Razor Compiler (including Components features) use the RZ prefix for diagnostics, so there's currently
     // no change of clashing between that and the BL prefix used here.
     //
     // Tracking https://github.com/dotnet/aspnetcore/issues/10382 to rationalize this
     public static readonly DiagnosticDescriptor ComponentParameterSettersShouldBePublic = new DiagnosticDescriptor(
         "BL0001",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Format), Resources.ResourceManager, typeof(Resources)),
-        "Encapsulation",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Format)),
+        Encapsulation,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterSettersShouldBePublic_Description)));
 
     public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesMustBeUnique = new DiagnosticDescriptor(
         "BL0002",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Format)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesMustBeUnique_Description)));
 
     public static readonly DiagnosticDescriptor ComponentParameterCaptureUnmatchedValuesHasWrongType = new DiagnosticDescriptor(
         "BL0003",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Format), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Format)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterCaptureUnmatchedValuesHasWrongType_Description)));
 
     public static readonly DiagnosticDescriptor ComponentParametersShouldBePublic = new DiagnosticDescriptor(
         "BL0004",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Format), Resources.ResourceManager, typeof(Resources)),
-        "Encapsulation",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldBePublic_Format)),
+        Encapsulation,
         DiagnosticSeverity.Error,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParametersShouldBePublic_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParametersShouldBePublic_Description)));
 
     public static readonly DiagnosticDescriptor ComponentParametersShouldNotBeSetOutsideOfTheirDeclaredComponent = new DiagnosticDescriptor(
         "BL0005",
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Format), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Title)),
+        CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Format)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.ComponentParameterShouldNotBeSetOutsideOfTheirDeclaredComponent_Description)));
 
     public static readonly DiagnosticDescriptor DoNotUseRenderTreeTypes = new DiagnosticDescriptor(
         "BL0006",
-        new LocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Title), Resources.ResourceManager, typeof(Resources)),
-        new LocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description), Resources.ResourceManager, typeof(Resources)),
-        "Usage",
+        CreateLocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Title)),
+        CreateLocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description)),
+        Usage,
         DiagnosticSeverity.Warning,
         isEnabledByDefault: true,
-        description: new LocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description), Resources.ResourceManager, typeof(Resources)));
+        description: CreateLocalizableResourceString(nameof(Resources.DoNotUseRenderTreeTypes_Description)));
 }
diff --git a/src/Tools/SDK-Analyzers/Components/test/Verifiers/CodeFixVerifier.cs b/src/Tools/SDK-Analyzers/Components/test/Verifiers/CodeFixVerifier.cs
index 53c978d3f847..0d156fd8d051 100644
--- a/src/Tools/SDK-Analyzers/Components/test/Verifiers/CodeFixVerifier.cs
+++ b/src/Tools/SDK-Analyzers/Components/test/Verifiers/CodeFixVerifier.cs
@@ -109,7 +109,7 @@ private void VerifyFix(string language, DiagnosticAnalyzer analyzer, CodeFixProv
                 document = document.WithSyntaxRoot(Formatter.Format(document.GetSyntaxRootAsync().Result, Formatter.Annotation, document.Project.Solution.Workspace));
                 newCompilerDiagnostics = GetNewDiagnostics(compilerDiagnostics, GetCompilerDiagnostics(document));
 
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Fix introduced new compiler diagnostics:\r\n{0}\r\n\r\nNew document:\r\n{1}\r\n",
diff --git a/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs b/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs
index 8dde75a73683..f1d5a434de28 100644
--- a/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs
+++ b/src/Tools/SDK-Analyzers/Components/test/Verifiers/DiagnosticVerifier.cs
@@ -112,7 +112,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
         {
             string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : "    NONE.";
 
-            Assert.True(false,
+            Assert.Fail(
                 string.Format(CultureInfo.InvariantCulture, "Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput));
         }
 
@@ -125,7 +125,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
             {
                 if (actual.Location != Location.None)
                 {
-                    Assert.True(false,
+                    Assert.Fail(
                         string.Format(CultureInfo.InvariantCulture, "Expected:\nA project diagnostic with No location\nActual:\n{0}",
                         FormatDiagnostics(analyzer, actual)));
                 }
@@ -137,7 +137,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
                 if (additionalLocations.Length != expected.Locations.Length - 1)
                 {
-                    Assert.True(false,
+                    Assert.Fail(
                         string.Format(
                             CultureInfo.InvariantCulture,
                             "Expected {0} additional locations but got {1} for Diagnostic:\r\n    {2}\r\n",
@@ -153,7 +153,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.Id != expected.Id)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -162,7 +162,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.Severity != expected.Severity)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -171,7 +171,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -204,7 +204,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             if (actualLinePosition.Line + 1 != expected.Line)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -217,7 +217,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             if (actualLinePosition.Character + 1 != expected.Column)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
diff --git a/src/Tools/Shared/SecretsHelpers/MsBuildProjectFinder.cs b/src/Tools/Shared/SecretsHelpers/MsBuildProjectFinder.cs
index 6be7bde5299c..e016ed37d06b 100644
--- a/src/Tools/Shared/SecretsHelpers/MsBuildProjectFinder.cs
+++ b/src/Tools/Shared/SecretsHelpers/MsBuildProjectFinder.cs
@@ -46,7 +46,7 @@ public string FindMsBuildProject(string project)
 
         if (!File.Exists(projectPath))
         {
-            throw new FileNotFoundException(SecretsHelpersResources.FormatError_ProjectPath_NotFound(projectPath));
+            throw new FileNotFoundException(SecretsHelpersResources.FormatError_File_NotFound(projectPath));
         }
 
         return projectPath;
diff --git a/src/Tools/Shared/SecretsHelpers/ProjectIdResolver.cs b/src/Tools/Shared/SecretsHelpers/ProjectIdResolver.cs
index d9c794586ae4..4c3c68c77912 100644
--- a/src/Tools/Shared/SecretsHelpers/ProjectIdResolver.cs
+++ b/src/Tools/Shared/SecretsHelpers/ProjectIdResolver.cs
@@ -59,9 +59,9 @@ public string Resolve(string project, string configuration)
                 UseShellExecute = false,
                 ArgumentList =
                     {
-                        "msbuild",
+                        "build",
                         projectFile,
-                        "/nologo",
+                        "--no-restore",
                         "/t:_ExtractUserSecretsMetadata", // defined in SecretManager.targets
                         "/p:_UserSecretsMetadataFile=" + outputFile,
                         "/p:Configuration=" + configuration,
@@ -72,7 +72,7 @@ public string Resolve(string project, string configuration)
             };
 
 #if DEBUG
-            _reporter.Verbose($"Invoking '{psi.FileName} {psi.Arguments}'");
+            _reporter.Verbose($"Invoking '{psi.FileName} {string.Join(' ', psi.ArgumentList)}'");
 #endif
 
             using var process = new Process()
diff --git a/src/Tools/Shared/SecretsHelpers/SecretsHelpersResources.resx b/src/Tools/Shared/SecretsHelpers/SecretsHelpersResources.resx
index bdc7cd88d5e9..acddbeeb55d2 100644
--- a/src/Tools/Shared/SecretsHelpers/SecretsHelpersResources.resx
+++ b/src/Tools/Shared/SecretsHelpers/SecretsHelpersResources.resx
@@ -124,7 +124,7 @@
     <value>Multiple MSBuild project files found in '{projectPath}'. Specify which to use with the --project option.</value>
   </data>
   <data name="Error_NoProjectsFound" xml:space="preserve">
-    <value>Could not find a MSBuild project file in '{projectPath}'. Specify which project to use with the --project option.</value>
+    <value>Could not find a MSBuild project file in '{projectPath}'. Specify which project to use with the --project option. Use --file option for file-based apps.</value>
   </data>
   <data name="Error_ProjectFailedToLoad" xml:space="preserve">
     <value>Could not load the MSBuild project '{project}'.</value>
@@ -132,8 +132,8 @@
   <data name="Error_ProjectMissingId" xml:space="preserve">
     <value>Could not find the global property 'UserSecretsId' in MSBuild project '{project}'. Ensure this property is set in the project or use the '--id' command line option.</value>
   </data>
-  <data name="Error_ProjectPath_NotFound" xml:space="preserve">
-    <value>The project file '{0}' does not exist.</value>
+  <data name="Error_File_NotFound" xml:space="preserve">
+    <value>The file '{0}' does not exist.</value>
   </data>
   <data name="Message_ProjectAlreadyInitialized" xml:space="preserve">
     <value>The MSBuild project '{project}' has already been initialized with a UserSecretsId.</value>
@@ -144,4 +144,4 @@
   <data name="Message_SetUserSecretsIdForProject" xml:space="preserve">
     <value>Set UserSecretsId to '{userSecretsId}' for MSBuild project '{project}'.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Tools/Tools.slnf b/src/Tools/Tools.slnf
index 484313af8712..c8b8ef0269ba 100644
--- a/src/Tools/Tools.slnf
+++ b/src/Tools/Tools.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "..\\..\\AspNetCore.sln",
+    "path": "..\\..\\AspNetCore.slnx",
     "projects": [
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
       "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
@@ -29,6 +29,7 @@
       "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
       "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
       "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
+      "src\\Hosting\\TestHost\\src\\Microsoft.AspNetCore.TestHost.csproj",
       "src\\Html.Abstractions\\src\\Microsoft.AspNetCore.Html.Abstractions.csproj",
       "src\\Http\\Authentication.Abstractions\\src\\Microsoft.AspNetCore.Authentication.Abstractions.csproj",
       "src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
@@ -109,9 +110,9 @@
       "src\\Tools\\Extensions.ApiDescription.Server\\src\\Microsoft.Extensions.ApiDescription.Server.csproj",
       "src\\Tools\\FirstRunCertGenerator\\src\\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj",
       "src\\Tools\\FirstRunCertGenerator\\test\\Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj",
+      "src\\Tools\\GetDocumentInsider\\sample\\GetDocumentSample.csproj",
       "src\\Tools\\GetDocumentInsider\\src\\GetDocument.Insider.csproj",
       "src\\Tools\\GetDocumentInsider\\tests\\GetDocumentInsider.Tests.csproj",
-      "src\\Tools\\GetDocumentInsider\\sample\\GetDocumentSample.csproj",
       "src\\Tools\\LinkabilityChecker\\LinkabilityChecker.csproj",
       "src\\Tools\\Microsoft.dotnet-openapi\\src\\Microsoft.dotnet-openapi.csproj",
       "src\\Tools\\Microsoft.dotnet-openapi\\test\\dotnet-microsoft.openapi.Tests.csproj",
@@ -125,4 +126,4 @@
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/Tools/dotnet-dev-certs/src/Program.cs b/src/Tools/dotnet-dev-certs/src/Program.cs
index 9f5407d9d3e4..bf6a9d964a5c 100644
--- a/src/Tools/dotnet-dev-certs/src/Program.cs
+++ b/src/Tools/dotnet-dev-certs/src/Program.cs
@@ -1,9 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Certificates.Generation;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Tools.Internal;
@@ -98,7 +102,8 @@ public static int Main(string[] args)
 
                 CommandOption trust = null;
                 trust = c.Option("-t|--trust",
-                    "Trust the certificate on the current platform. When combined with the --check option, validates that the certificate is trusted.",
+                    "When not combined with the --check option, trusts the certificate on the current platform, creating one if necessary.\n" +
+                    "                     When combined with the --check option, validates that there is a certificate and it is trusted.",
                     CommandOptionType.NoValue);
 
                 var verbose = c.Option("-v|--verbose",
@@ -109,6 +114,10 @@ public static int Main(string[] args)
                     "Display warnings and errors only.",
                     CommandOptionType.NoValue);
 
+                var checkJsonOutput = c.Option("--check-trust-machine-readable",
+                    "Same as running --check --trust, but output the results in json.",
+                    CommandOptionType.NoValue);
+
                 c.HelpOption("-h|--help");
 
                 c.OnExecute(() =>
@@ -121,9 +130,20 @@ public static int Main(string[] args)
                         listener.EnableEvents(CertificateManager.Log, System.Diagnostics.Tracing.EventLevel.Verbose);
                     }
 
+                    if (checkJsonOutput.HasValue())
+                    {
+                        if (exportPath.HasValue() || trust?.HasValue() == true || format.HasValue() || noPassword.HasValue() || check.HasValue() || clean.HasValue() ||
+                           (!import.HasValue() && password.HasValue()) || 
+                           (import.HasValue() && !password.HasValue()))
+                        {
+                            reporter.Error(InvalidUsageErrorMessage);
+                            return CriticalError;
+                        }
+                    }
+
                     if (clean.HasValue())
                     {
-                        if (exportPath.HasValue() || trust?.HasValue() == true || format.HasValue() || noPassword.HasValue() || check.HasValue() ||
+                        if (exportPath.HasValue() || trust?.HasValue() == true || format.HasValue() || noPassword.HasValue() || check.HasValue() || checkJsonOutput.HasValue() ||
                            (!import.HasValue() && password.HasValue()) ||
                            (import.HasValue() && !password.HasValue()))
                         {
@@ -134,7 +154,7 @@ public static int Main(string[] args)
 
                     if (check.HasValue())
                     {
-                        if (exportPath.HasValue() || password.HasValue() || noPassword.HasValue() || clean.HasValue() || format.HasValue() || import.HasValue())
+                        if (exportPath.HasValue() || password.HasValue() || noPassword.HasValue() || clean.HasValue() || format.HasValue() || import.HasValue() || checkJsonOutput.HasValue())
                         {
                             reporter.Error(InvalidUsageErrorMessage);
                             return CriticalError;
@@ -178,6 +198,11 @@ public static int Main(string[] args)
                         return ImportCertificate(import, password, reporter);
                     }
 
+                    if (checkJsonOutput.HasValue())
+                    {
+                        return CheckHttpsCertificateJsonOutput(reporter);
+                    }
+
                     return EnsureHttpsCertificate(exportPath, password, noPassword, trust, format, reporter);
                 });
             });
@@ -334,6 +359,16 @@ private static void ReportCertificates(IReporter reporter, IReadOnlyList<X509Cer
         });
     }
 
+    private static int CheckHttpsCertificateJsonOutput(IReporter reporter)
+    {
+        var availableCertificates = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true);
+
+        var certReports = availableCertificates.Select(CertificateReport.FromX509Certificate2).ToList();
+        reporter.Output(JsonSerializer.Serialize(certReports, options: new JsonSerializerOptions { WriteIndented = true }));
+
+        return Success;
+    }
+
     private static int EnsureHttpsCertificate(CommandOption exportPath, CommandOption password, CommandOption noPassword, CommandOption trust, CommandOption exportFormat, IReporter reporter)
     {
         var now = DateTimeOffset.Now;
@@ -425,6 +460,10 @@ private static int EnsureHttpsCertificate(CommandOption exportPath, CommandOptio
             case EnsureCertificateResult.ErrorExportingTheCertificate:
                 reporter.Warn("There was an error exporting the HTTPS developer certificate to a file.");
                 return ErrorExportingTheCertificate;
+            case EnsureCertificateResult.ErrorExportingTheCertificateToNonExistentDirectory:
+                // A distinct warning is useful, but a distinct error code is probably not.
+                reporter.Warn("There was an error exporting the HTTPS developer certificate to a file. Please create the target directory before exporting. Choose permissions carefully when creating it.");
+                return ErrorExportingTheCertificate;
             case EnsureCertificateResult.PartiallyFailedToTrustTheCertificate:
                 // A distinct warning is useful, but a distinct error code is probably not.
                 reporter.Warn("There was an error trusting the HTTPS developer certificate. It will be trusted by some clients but not by others.");
@@ -447,3 +486,63 @@ private static int EnsureHttpsCertificate(CommandOption exportPath, CommandOptio
         }
     }
 }
+
+/// <summary>
+/// A Serializable friendly version of the cert report output
+/// </summary>
+internal class CertificateReport
+{
+    public string Thumbprint { get; init; }
+    public string Subject { get; init; }
+    public List<string> X509SubjectAlternativeNameExtension { get; init; }
+    public int Version { get; init; }
+    public DateTime ValidityNotBefore { get; init; }
+    public DateTime ValidityNotAfter { get; init; }
+    public bool IsHttpsDevelopmentCertificate { get; init; }
+    public bool IsExportable { get; init; }
+    public string TrustLevel { get; private set; }
+
+    public static CertificateReport FromX509Certificate2(X509Certificate2 cert)
+    {
+        var certificateManager = CertificateManager.Instance;
+        var status = certificateManager.CheckCertificateState(cert);
+        string statusString;
+        if (!status.Success)
+        {
+            statusString = "Invalid";
+        }
+        else
+        {
+            var trustStatus = certificateManager.GetTrustLevel(cert);
+            statusString = trustStatus.ToString();
+        }
+        return new CertificateReport
+        {
+            Thumbprint = cert.Thumbprint,
+            Subject = cert.Subject,
+            X509SubjectAlternativeNameExtension = GetSanExtension(cert),
+            Version = CertificateManager.GetCertificateVersion(cert),
+            ValidityNotBefore = cert.NotBefore,
+            ValidityNotAfter = cert.NotAfter,
+            IsHttpsDevelopmentCertificate = CertificateManager.IsHttpsDevelopmentCertificate(cert),
+            IsExportable = certificateManager.IsExportable(cert),
+            TrustLevel = statusString
+        };
+
+        static List<string> GetSanExtension(X509Certificate2 cert)
+        {
+            var dnsNames = new List<string>();
+            foreach (var extension in cert.Extensions)
+            {
+                if (extension is X509SubjectAlternativeNameExtension sanExtension)
+                {
+                    foreach (var dns in sanExtension.EnumerateDnsNames())
+                    {
+                        dnsNames.Add(dns);
+                    }
+                }
+            }
+            return dnsNames;
+        }
+    }
+}
diff --git a/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
index 593719792974..a04aab04701f 100644
--- a/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
+++ b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
@@ -79,13 +79,9 @@ protected override int Execute()
                             projectName,
                             targetFramework.Version));
                     }
-                    else if (targetFramework.Version >= new Version(7, 0))
-                    {
-                        toolsDirectory = Path.Combine(thisPath, $"net{targetFramework.Version}");
-                    }
                     else
                     {
-                        toolsDirectory = Path.Combine(thisPath, "netcoreapp2.1");
+                        toolsDirectory = Path.Combine(thisPath, $"net{targetFramework.Version}");
                     }
 
                     executable = DotNetMuxer.MuxerPathOrDefault();
diff --git a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
index 3b37a5ea7841..d8e25cf29741 100644
--- a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
+++ b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <UseAppHost>false</UseAppHost>
     <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>
diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
index d753a475d044..9ecfc17f9ef3 100644
--- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
+++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
@@ -16,8 +16,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.Data.SqlClient" />
     <Reference Include="Azure.Identity" />
-    <Reference Include="System.Private.Uri" />
-    <Reference Include="System.Text.Json" />
+    <Reference Include="System.Runtime.Caching" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tools/dotnet-user-jwts/src/Commands/ClearCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/ClearCommand.cs
index 2b977e3f6313..531b45b6f11e 100644
--- a/src/Tools/dotnet-user-jwts/src/Commands/ClearCommand.cs
+++ b/src/Tools/dotnet-user-jwts/src/Commands/ClearCommand.cs
@@ -19,21 +19,32 @@ public static void Register(ProjectCommandLineApplication app)
                 Resources.ClearCommand_ForceOption_Description,
                 CommandOptionType.NoValue);
 
+            var appsettingsFileOption = cmd.Option(
+                "--appsettings-file",
+                Resources.CreateCommand_appsettingsFileOption_Description,
+                CommandOptionType.SingleValue);
+
             cmd.HelpOption("-h|--help");
 
             cmd.OnExecute(() =>
             {
-                return Execute(cmd.Reporter, cmd.ProjectOption.Value(), forceOption.HasValue());
+                if (!DevJwtCliHelpers.GetProjectAndSecretsId(cmd.ProjectOption.Value(), cmd.Reporter, out var project, out var userSecretsId))
+                {
+                    return 1;
+                }
+
+                if (!DevJwtCliHelpers.GetAppSettingsFile(project, appsettingsFileOption.Value(), cmd.Reporter, out var appsettingsFile))
+                {
+                    return 1;
+                }
+
+                return Execute(cmd.Reporter, project, userSecretsId, forceOption.HasValue(), appsettingsFile);
             });
         });
     }
 
-    private static int Execute(IReporter reporter, string projectPath, bool force)
+    private static int Execute(IReporter reporter, string project, string userSecretsId, bool force, string appsettingsFile)
     {
-        if (!DevJwtCliHelpers.GetProjectAndSecretsId(projectPath, reporter, out var project, out var userSecretsId))
-        {
-            return 1;
-        }
         var jwtStore = new JwtStore(userSecretsId);
         var count = jwtStore.Jwts.Count;
 
@@ -54,7 +65,7 @@ private static int Execute(IReporter reporter, string projectPath, bool force)
             }
         }
 
-        var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), "appsettings.Development.json");
+        var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), appsettingsFile);
         foreach (var jwt in jwtStore.Jwts)
         {
             JwtAuthenticationSchemeSettings.RemoveScheme(appsettingsFilePath, jwt.Value.Scheme);
diff --git a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
index ef3a3b833655..58f3969bab76 100644
--- a/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
+++ b/src/Tools/dotnet-user-jwts/src/Commands/CreateCommand.cs
@@ -77,24 +77,29 @@ public static void Register(ProjectCommandLineApplication app, Program program)
                 Resources.CreateCommand_ValidForOption_Description,
                 CommandOptionType.SingleValue);
 
+            var appsettingsFileOption = cmd.Option(
+                "--appsettings-file",
+                Resources.CreateCommand_appsettingsFileOption_Description,
+                CommandOptionType.SingleValue);
+
             cmd.HelpOption("-h|--help");
 
             cmd.OnExecute(() =>
             {
-                var (options, isValid, optionsString) = ValidateArguments(
-                    cmd.Reporter, cmd.ProjectOption, schemeNameOption, nameOption, audienceOption, issuerOption, notBeforeOption, expiresOnOption, validForOption, rolesOption, scopesOption, claimsOption);
+                var (options, isValid, optionsString, appsettingsFile) = ValidateArguments(
+                    cmd.Reporter, cmd.ProjectOption, schemeNameOption, nameOption, audienceOption, issuerOption, notBeforeOption, expiresOnOption, validForOption, rolesOption, scopesOption, claimsOption, appsettingsFileOption);
 
                 if (!isValid)
                 {
                     return 1;
                 }
 
-                return Execute(cmd.Reporter, cmd.ProjectOption.Value(), options, optionsString, cmd.OutputOption.Value(), program);
+                return Execute(cmd.Reporter, cmd.ProjectOption.Value(), options, optionsString, cmd.OutputOption.Value(), appsettingsFile, program);
             });
         });
     }
 
-    private static (JwtCreatorOptions, bool, string) ValidateArguments(
+    private static (JwtCreatorOptions, bool, string, string) ValidateArguments(
         IReporter reporter,
         CommandOption projectOption,
         CommandOption schemeNameOption,
@@ -106,7 +111,8 @@ private static (JwtCreatorOptions, bool, string) ValidateArguments(
         CommandOption validForOption,
         CommandOption rolesOption,
         CommandOption scopesOption,
-        CommandOption claimsOption)
+        CommandOption claimsOption,
+        CommandOption appsettingsFileOption)
     {
         var isValid = true;
         var finder = new MsBuildProjectFinder(Directory.GetCurrentDirectory());
@@ -121,6 +127,7 @@ private static (JwtCreatorOptions, bool, string) ValidateArguments(
             return (
                 null,
                 isValid,
+                string.Empty,
                 string.Empty
             );
         }
@@ -209,10 +216,19 @@ private static (JwtCreatorOptions, bool, string) ValidateArguments(
             optionsString += $"{Resources.JwtPrint_CustomClaims}: [{string.Join(", ", claims.Select(kvp => $"{kvp.Key}={kvp.Value}"))}]{Environment.NewLine}";
         }
 
+        var appsettingsFile = DevJwtCliHelpers.DefaultAppSettingsFile;
+        if (appsettingsFileOption.HasValue())
+        {
+            isValid = DevJwtCliHelpers.GetAppSettingsFile(project, appsettingsFileOption.Value(), reporter, out appsettingsFile);
+
+            optionsString += appsettingsFileOption.HasValue() ? $"{Resources.JwtPrint_appsettingsFile}: {appsettingsFile}{Environment.NewLine}" : string.Empty;
+        }
+
         return (
             new JwtCreatorOptions(scheme, name, audience, issuer, notBefore, expiresOn, roles, scopes, claims),
             isValid,
-            optionsString);
+            optionsString,
+            appsettingsFile);
 
         static bool ParseDate(string datetime, out DateTime parsedDateTime) =>
             DateTime.TryParseExact(datetime, _dateTimeFormats, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out parsedDateTime);
@@ -224,6 +240,7 @@ private static int Execute(
         JwtCreatorOptions options,
         string optionsString,
         string outputFormat,
+        string appsettingsFile,
         Program program)
     {
         if (!DevJwtCliHelpers.GetProjectAndSecretsId(projectPath, reporter, out var project, out var userSecretsId))
@@ -244,7 +261,7 @@ private static int Execute(
         jwtStore.Jwts.Add(jwtToken.Id, jwt);
         jwtStore.Save();
 
-        var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), "appsettings.Development.json");
+        var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), appsettingsFile);
         var settingsToWrite = new JwtAuthenticationSchemeSettings(options.Scheme, options.Audiences, options.Issuer);
         settingsToWrite.Save(appsettingsFilePath);
 
diff --git a/src/Tools/dotnet-user-jwts/src/Commands/RemoveCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/RemoveCommand.cs
index 0c3a69eaf40e..9260a70b1219 100644
--- a/src/Tools/dotnet-user-jwts/src/Commands/RemoveCommand.cs
+++ b/src/Tools/dotnet-user-jwts/src/Commands/RemoveCommand.cs
@@ -15,6 +15,12 @@ public static void Register(ProjectCommandLineApplication app)
             cmd.Description = Resources.RemoveCommand_Description;
 
             var idArgument = cmd.Argument("[id]", Resources.RemoveCommand_IdArgument_Description);
+
+            var appsettingsFileOption = cmd.Option(
+                "--appsettings-file",
+                Resources.CreateCommand_appsettingsFileOption_Description,
+                CommandOptionType.SingleValue);
+
             cmd.HelpOption("-h|--help");
 
             cmd.OnExecute(() =>
@@ -24,17 +30,24 @@ public static void Register(ProjectCommandLineApplication app)
                     cmd.ShowHelp();
                     return 0;
                 }
-                return Execute(cmd.Reporter, cmd.ProjectOption.Value(), idArgument.Value);
+
+                if (!DevJwtCliHelpers.GetProjectAndSecretsId(cmd.ProjectOption.Value(), cmd.Reporter, out var project, out var userSecretsId))
+                {
+                    return 1;
+                }
+
+                if (!DevJwtCliHelpers.GetAppSettingsFile(project, appsettingsFileOption.Value(), cmd.Reporter, out var appsettingsFile))
+                {
+                    return 1;
+                }
+
+                return Execute(cmd.Reporter, project, userSecretsId, idArgument.Value, appsettingsFile);
             });
         });
     }
 
-    private static int Execute(IReporter reporter, string projectPath, string id)
+    private static int Execute(IReporter reporter, string project, string userSecretsId, string id, string appsettingsFile)
     {
-        if (!DevJwtCliHelpers.GetProjectAndSecretsId(projectPath, reporter, out var project, out var userSecretsId))
-        {
-            return 1;
-        }
         var jwtStore = new JwtStore(userSecretsId);
 
         if (!jwtStore.Jwts.TryGetValue(id, out var jwt))
@@ -43,7 +56,7 @@ private static int Execute(IReporter reporter, string projectPath, string id)
             return 1;
         }
 
-        var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), "appsettings.Development.json");
+        var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), appsettingsFile);
         JwtAuthenticationSchemeSettings.RemoveScheme(appsettingsFilePath, jwt.Scheme);
         jwtStore.Jwts.Remove(id);
         jwtStore.Save();
diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs b/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
index 2d12b67f55a4..38735fb5231f 100644
--- a/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
+++ b/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
@@ -11,6 +11,8 @@ namespace Microsoft.AspNetCore.Authentication.JwtBearer.Tools;
 
 internal static class DevJwtCliHelpers
 {
+    public const string DefaultAppSettingsFile = "appsettings.Development.json";
+
     public static string GetOrSetUserSecretsId(string projectFilePath)
     {
         var resolver = new ProjectIdResolver(NullReporter.Singleton, projectFilePath);
@@ -42,6 +44,27 @@ public static bool GetProjectAndSecretsId(string projectPath, IReporter reporter
         return true;
     }
 
+    public static bool GetAppSettingsFile(string projectPath, string appsettingsFileOption, IReporter reporter, out string appsettingsFile)
+    {
+        appsettingsFile = DevJwtCliHelpers.DefaultAppSettingsFile;
+        if (appsettingsFileOption is not null)
+        {
+            appsettingsFile = appsettingsFileOption;
+            if (!appsettingsFile.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
+            {
+                reporter.Error(Resources.RemoveCommand_InvalidAppsettingsFile_Error);
+                return false;
+            }
+            else if (!File.Exists(Path.Combine(Path.GetDirectoryName(projectPath), appsettingsFile)))
+            {
+                reporter.Error(Resources.FormatRemoveCommand_AppsettingsFileNotFound_Error(Path.Combine(Path.GetDirectoryName(projectPath), appsettingsFile)));
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     public static List<string> GetAudienceCandidatesFromLaunchSettings(string project)
     {
         if (string.IsNullOrEmpty(project))
@@ -213,4 +236,5 @@ public static bool IsNullOrEmpty<T>(this IEnumerable<T> enumerable)
     {
         return enumerable == null || !enumerable.Any();
     }
+
 }
diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs b/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs
index 79ca7f05c935..d32affe119a5 100644
--- a/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs
+++ b/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs
@@ -18,10 +18,7 @@ public JwtStore(string userSecretsId, Program program = null)
         Load();
 
         // For testing.
-        if (program is not null)
-        {
-            program.UserJwtsFilePath = _filePath;
-        }
+        program?.UserJwtsFilePath = _filePath;
     }
 
     public IDictionary<string, Jwt> Jwts { get; private set; } = new Dictionary<string, Jwt>();
diff --git a/src/Tools/dotnet-user-jwts/src/Resources.resx b/src/Tools/dotnet-user-jwts/src/Resources.resx
index 094a066418d9..9f4ff3c041ac 100644
--- a/src/Tools/dotnet-user-jwts/src/Resources.resx
+++ b/src/Tools/dotnet-user-jwts/src/Resources.resx
@@ -150,6 +150,12 @@
   <data name="CreateCommand_ExpiresOnOption_Description" xml:space="preserve">
     <value>The UTC date &amp; time the JWT should expire in the format 'yyyy-MM-dd [[[[HH:mm]]:ss]]'. Defaults to 3 months after the --not-before date. Do not use this option in conjunction with the --valid-for option.</value>
   </data>
+  <data name="CreateCommand_InvalidAppsettingsFile_Error" xml:space="preserve">
+    <value>Invalid Appsettings file extension. Ensure file extension is .json.</value>
+  </data>
+  <data name="CreateCommand_AppsettingsFileNotFound_Error" xml:space="preserve">
+    <value>Could not find Appsettings file in '{0}'. Check the filename and that the file exists.</value>
+  </data>
   <data name="CreateCommand_InvalidClaims_Error" xml:space="preserve">
     <value>Malformed claims supplied. Ensure each claim is in the format "name=value".</value>
   </data>
@@ -189,6 +195,9 @@
   <data name="CreateCommand_ValidForOption_Description" xml:space="preserve">
     <value>The period the JWT should expire after. Specify using a number followed by a duration type like 'd' for days, 'h' for hours, 'm' for minutes, and 's' for seconds, e.g. '365d'. Do not use this option in conjunction with the --expires-on option.</value>
   </data>
+  <data name="CreateCommand_appsettingsFileOption_Description" xml:space="preserve">
+    <value>The appSettings configuration file to add the test scheme to.</value>
+  </data>
   <data name="JwtPrint_Audiences" xml:space="preserve">
     <value>Audience(s)</value>
   </data>
@@ -225,6 +234,9 @@
   <data name="JwtPrint_Scopes" xml:space="preserve">
     <value>Scopes</value>
   </data>
+  <data name="JwtPrint_appsettingsFile" xml:space="preserve">
+    <value>Appsettings File</value>
+  </data>
   <data name="JwtPrint_Token" xml:space="preserve">
     <value>Token</value>
   </data>
@@ -312,6 +324,12 @@
   <data name="RemoveCommand_NoJwtFound" xml:space="preserve">
     <value>No JWT with ID '{0}' found.</value>
   </data>
+  <data name="RemoveCommand_InvalidAppsettingsFile_Error" xml:space="preserve">
+    <value>The specified appsettings file is invalid. Please provide a valid JSON file.</value>
+  </data>
+  <data name="RemoveCommand_AppsettingsFileNotFound_Error" xml:space="preserve">
+    <value>Could not find Appsettings file '{0}'. Check the filename and that the file exists.</value>
+  </data>
   <data name="KeyCommand_IssuerOption_Description" xml:space="preserve">
     <value>The issuer associated with the signing key to be reset or displayed. Defaults to 'dotnet-user-jwts'.</value>
   </data>
diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
index b670eccaa52f..2947cd817fd1 100644
--- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
+++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
@@ -28,7 +28,6 @@
 
   <ItemGroup>
     <Reference Include="System.IdentityModel.Tokens.Jwt" />
-    <Reference Include="System.Text.Json" />
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration" />
     <Reference Include="Microsoft.Extensions.Configuration.Binder" />
diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs
index d584f54d107a..b812a017255c 100644
--- a/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs
+++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs
@@ -14,7 +14,7 @@ public sealed class UserJwtsTestFixture : IDisposable
     private const string ProjectTemplate = @"<Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     {0}
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
@@ -81,6 +81,10 @@ public string CreateProject(bool hasSecret = true)
             Path.Combine(projectPath.FullName, "appsettings.Development.json"),
             "{}");
 
+        File.WriteAllText(
+            Path.Combine(projectPath.FullName, "appsettings.Local.json"),
+            "{}");
+
         if (hasSecret)
         {
             _disposables.Push(() =>
diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
index 71cc2cdb7d10..f98549ba8212 100644
--- a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
+++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
@@ -1,14 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.UserSecrets;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Tools.Internal;
 using Xunit.Abstractions;
-using System.Text.RegularExpressions;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.IdentityModel.Tokens.Jwt;
 
 namespace Microsoft.AspNetCore.Authentication.JwtBearer.Tools.Tests;
 
@@ -62,6 +67,38 @@ public void Create_WritesGeneratedTokenToDisk()
         Assert.Contains("dotnet-user-jwts", File.ReadAllText(appsettings));
     }
 
+    [Fact]
+    public async Task Create_TokenAcceptedByJwtBearerHandler()
+    {
+        var project = Path.Combine(fixture.CreateProject(), "TestProject.csproj");
+        var appsettings = Path.Combine(Path.GetDirectoryName(project), "appsettings.Development.json");
+        var secrets = PathHelper.GetSecretsPathFromSecretsId(fixture.TestSecretsId);
+        var app = new Program(_console);
+
+        app.Run(["create", "--project", project, "-o", "token"]);
+        var token = _console.GetOutput().Trim();
+
+        var builder = WebApplication.CreateEmptyBuilder(new());
+        builder.WebHost.UseTestServer();
+
+        builder.Configuration.AddJsonFile(appsettings);
+        builder.Configuration.AddJsonFile(secrets);
+
+        builder.Services.AddRouting();
+        builder.Services.AddAuthentication().AddJwtBearer();
+        builder.Services.AddAuthorization();
+
+        using var webApp = builder.Build();
+        webApp.MapGet("/secret", (ClaimsPrincipal user) => $"Hello {user.Identity?.Name}!")
+            .RequireAuthorization();
+
+        await webApp.StartAsync();
+
+        var client = webApp.GetTestClient();
+        client.DefaultRequestHeaders.Add("Authorization", $"Bearer {token}");
+        Assert.Equal($"Hello {Environment.UserName}!", await client.GetStringAsync("/secret"));
+    }
+
     [Fact]
     public void Create_CanModifyExistingScheme()
     {
@@ -79,6 +116,23 @@ public void Create_CanModifyExistingScheme()
         Assert.Equal("new-issuer", appSettings["Authentication"]["Schemes"]["Bearer"]["ValidIssuer"].GetValue<string>());
     }
 
+    [Fact]
+    public void Create_CanModifyExistingSchemeInGivenAppSettings()
+    {
+        var project = Path.Combine(fixture.CreateProject(), "TestProject.csproj");
+        var appsettings = Path.Combine(Path.GetDirectoryName(project), "appsettings.Local.json");
+        var app = new Program(_console);
+
+        app.Run(new[] { "create", "--project", project, "--appsettings-file", "appsettings.Local.json" });
+        Assert.Contains("New JWT saved", _console.GetOutput());
+
+        var appSettings = JsonSerializer.Deserialize<JsonObject>(File.ReadAllText(appsettings));
+        Assert.Equal("dotnet-user-jwts", appSettings["Authentication"]["Schemes"]["Bearer"]["ValidIssuer"].GetValue<string>());
+        app.Run(["create", "--project", project, "--issuer", "new-issuer", "--appsettings-file", "appsettings.Local.json"]);
+        appSettings = JsonSerializer.Deserialize<JsonObject>(File.ReadAllText(appsettings));
+        Assert.Equal("new-issuer", appSettings["Authentication"]["Schemes"]["Bearer"]["ValidIssuer"].GetValue<string>());
+    }
+
     [Fact]
     public void Print_ReturnsNothingForMissingToken()
     {
@@ -154,6 +208,24 @@ public void Remove_RemovesGeneratedToken()
         Assert.Contains("Scheme2", appsettingsContent);
     }
 
+    [Fact]
+    public void Remove_RemovesGeneratedTokenInGivenAppsettings()
+    {
+        var project = Path.Combine(fixture.CreateProject(), "TestProject.csproj");
+        var appsettings = Path.Combine(Path.GetDirectoryName(project), "appsettings.Local.json");
+        var app = new Program(_console);
+
+        app.Run(new[] { "create", "--project", project, "--appsettings-file", "appsettings.Local.json" });
+        var matches = Regex.Matches(_console.GetOutput(), "New JWT saved with ID '(.*?)'");
+        var id = matches.SingleOrDefault().Groups[1].Value;
+        app.Run(new[] { "create", "--project", project, "--appsettings-file", "appsettings.Local.json", "--scheme", "Scheme2" });
+
+        app.Run(new[] { "remove", id, "--project", project, "--appsettings-file", "appsettings.Local.json" });
+        var appsettingsContent = File.ReadAllText(appsettings);
+        Assert.DoesNotContain(DevJwtsDefaults.Scheme, appsettingsContent);
+        Assert.Contains("Scheme2", appsettingsContent);
+    }
+
     [Fact]
     public void Clear_RemovesGeneratedTokens()
     {
@@ -172,6 +244,24 @@ public void Clear_RemovesGeneratedTokens()
         Assert.DoesNotContain("Scheme2", appsettingsContent);
     }
 
+    [Fact]
+    public void Clear_RemovesGeneratedTokensInGivenAppsettings()
+    {
+        var project = Path.Combine(fixture.CreateProject(), "TestProject.csproj");
+        var appsettings = Path.Combine(Path.GetDirectoryName(project), "appsettings.Local.json");
+        var app = new Program(_console);
+
+        app.Run(new[] { "create", "--project", project, "--appsettings-file", "appsettings.Local.json" });
+        app.Run(new[] { "create", "--project", project, "--appsettings-file", "appsettings.Local.json", "--scheme", "Scheme2" });
+
+        Assert.Contains("New JWT saved", _console.GetOutput());
+
+        app.Run(new[] { "clear", "--project", project, "--appsettings-file", "appsettings.Local.json", "--force" });
+        var appsettingsContent = File.ReadAllText(appsettings);
+        Assert.DoesNotContain(DevJwtsDefaults.Scheme, appsettingsContent);
+        Assert.DoesNotContain("Scheme2", appsettingsContent);
+    }
+
     [Fact]
     public void Key_CanResetSigningKey()
     {
@@ -625,6 +715,19 @@ public void Create_CanHandleNoProjectOptionProvided_WithNoProjects()
         Assert.DoesNotContain(Resources.CreateCommand_NoAudience_Error, _console.GetOutput());
     }
 
+    [Fact]
+    public void Create_CanHandleAppsettingsOption_WithNoFile()
+    {
+        var projectPath = fixture.CreateProject();
+        Directory.SetCurrentDirectory(projectPath);
+        var expectedAppsettingsPath = Path.Combine(Directory.GetCurrentDirectory(), "appsettings.DoesNotExist.json");
+
+        var app = new Program(_console);
+        app.Run(["create", "--appsettings-file", "appsettings.DoesNotExist.json"]);
+
+        Assert.Contains($"Could not find Appsettings file '{expectedAppsettingsPath}'. Check the filename and that the file exists.", _console.GetOutput());
+    }
+
     [Fact]
     public void Delete_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
@@ -637,6 +740,19 @@ public void Delete_CanHandleNoProjectOptionProvided_WithNoProjects()
         Assert.Contains($"Could not find a MSBuild project file in '{Directory.GetCurrentDirectory()}'. Specify which project to use with the --project option.", _console.GetOutput());
     }
 
+    [Fact]
+    public void Delete_CanHandleAppsettingsOption_WithNoFile()
+    {
+        var projectPath = fixture.CreateProject();
+        Directory.SetCurrentDirectory(projectPath);
+        var expectedAppsettingsPath = Path.Combine(Directory.GetCurrentDirectory(), "appsettings.DoesNotExist.json");
+
+        var app = new Program(_console);
+        app.Run(["remove", "some-id", "--appsettings-file", "appsettings.DoesNotExist.json"]);
+
+        Assert.Contains($"Could not find Appsettings file '{expectedAppsettingsPath}'. Check the filename and that the file exists.", _console.GetOutput());
+    }
+
     [Fact]
     public void Clear_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
@@ -649,6 +765,19 @@ public void Clear_CanHandleNoProjectOptionProvided_WithNoProjects()
         Assert.Contains($"Could not find a MSBuild project file in '{Directory.GetCurrentDirectory()}'. Specify which project to use with the --project option.", _console.GetOutput());
     }
 
+    [Fact]
+    public void Clear_CanHandleAppsettingsOption_WithNoFile()
+    {
+        var projectPath = fixture.CreateProject();
+        Directory.SetCurrentDirectory(projectPath);
+        var expectedAppsettingsPath = Path.Combine(Directory.GetCurrentDirectory(), "appsettings.DoesNotExist.json");
+
+        var app = new Program(_console);
+        app.Run(["clear", "--appsettings-file", "appsettings.DoesNotExist.json"]);
+
+        Assert.Contains($"Could not find Appsettings file '{expectedAppsettingsPath}'. Check the filename and that the file exists.", _console.GetOutput());
+    }
+
     [Fact]
     public void List_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
@@ -704,6 +833,21 @@ public void Create_CanHandleRelativePathAsOption()
         Assert.Contains("New JWT saved", _console.GetOutput());
     }
 
+    [Fact]
+    public void Create_CanHandleRelativePathAsOptionForAppsettingsOption()
+    {
+        var projectPath = fixture.CreateProject();
+        var tempPath = Path.GetTempPath();
+        var targetPath = Path.GetRelativePath(tempPath, projectPath);
+        Directory.SetCurrentDirectory(tempPath);
+
+        var app = new Program(_console);
+        app.Run(new[] { "create", "--project", targetPath, "--appsettings-file", "appsettings.Local.json" });
+        
+        Assert.DoesNotContain($"Could not find Appsettings file '{projectPath}'. Check the filename and that the file exists.", _console.GetOutput());
+        Assert.Contains("New JWT saved", _console.GetOutput());
+    }
+
     [ConditionalFact]
     [OSSkipCondition(OperatingSystems.Windows, SkipReason = "UnixFileMode is not supported on Windows.")]
     public void Create_CreatesFileWithUserOnlyUnixFileMode()
diff --git a/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj b/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj
index 5ad17868a98a..b362c30d0611 100644
--- a/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj
+++ b/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj
@@ -14,4 +14,10 @@
     <ProjectReference Include="..\src\dotnet-user-jwts.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs b/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs
index af97626c7d89..5587c8e340f5 100644
--- a/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs
+++ b/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs
@@ -16,6 +16,7 @@ public class CommandLineOptions
     public bool IsHelp { get; private set; }
     public bool IsVerbose { get; private set; }
     public string Project { get; private set; }
+    public string File { get; private set; }
 
     public static CommandLineOptions Parse(string[] args, IConsole console)
     {
@@ -36,6 +37,9 @@ public static CommandLineOptions Parse(string[] args, IConsole console)
         var optionProject = app.Option("-p|--project <PROJECT>", "Path to project. Defaults to searching the current directory.",
             CommandOptionType.SingleValue, inherited: true);
 
+        var optionFile = app.Option("-f|--file <FILE>", "Path to file-based app.",
+            CommandOptionType.SingleValue, inherited: true);
+
         var optionConfig = app.Option("-c|--configuration <CONFIGURATION>", "The project configuration to use. Defaults to 'Debug'.",
             CommandOptionType.SingleValue, inherited: true);
 
@@ -50,7 +54,7 @@ public static CommandLineOptions Parse(string[] args, IConsole console)
         app.Command("remove", c => RemoveCommand.Configure(c, options));
         app.Command("list", c => ListCommand.Configure(c, options));
         app.Command("clear", c => ClearCommand.Configure(c, options));
-        app.Command("init", c => InitCommandFactory.Configure(c, options));
+        app.Command("init", c => InitCommandFactory.Configure(c, options, optionFile));
 
         // Show help information if no subcommand/option was specified.
         app.OnExecute(() => app.ShowHelp());
@@ -66,6 +70,12 @@ public static CommandLineOptions Parse(string[] args, IConsole console)
         options.IsHelp = app.IsShowingInformation;
         options.IsVerbose = optionVerbose.HasValue();
         options.Project = optionProject.Value();
+        options.File = optionFile.Value();
+
+        if (options.File != null && options.Project != null)
+        {
+            throw new CommandParsingException(app, Resources.Error_ProjectAndFileOptions);
+        }
 
         return options;
     }
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs b/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
index d6aa7edd15ab..cf3a9db65ba5 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
@@ -16,13 +16,18 @@ public class InitCommandFactory : ICommand
 {
     public CommandLineOptions Options { get; }
 
-    internal static void Configure(CommandLineApplication command, CommandLineOptions options)
+    internal static void Configure(CommandLineApplication command, CommandLineOptions options, CommandOption optionFile)
     {
         command.Description = "Set a user secrets ID to enable secret storage";
         command.HelpOption();
 
         command.OnExecute(() =>
         {
+            if (optionFile.HasValue())
+            {
+                throw new CommandParsingException(command, Resources.Error_InitNotSupportedForFileBasedApps);
+            }
+
             options.Command = new InitCommandFactory(options);
         });
     }
diff --git a/src/Tools/dotnet-user-secrets/src/Program.cs b/src/Tools/dotnet-user-secrets/src/Program.cs
index f01b7e434678..87f04ce466c3 100644
--- a/src/Tools/dotnet-user-secrets/src/Program.cs
+++ b/src/Tools/dotnet-user-secrets/src/Program.cs
@@ -106,6 +106,6 @@ internal string ResolveId(CommandLineOptions options, IReporter reporter)
         }
 
         var resolver = new ProjectIdResolver(reporter, _workingDirectory);
-        return resolver.Resolve(options.Project, options.Configuration);
+        return resolver.Resolve(options.Project ?? options.File, options.Configuration);
     }
 }
diff --git a/src/Tools/dotnet-user-secrets/src/Resources.resx b/src/Tools/dotnet-user-secrets/src/Resources.resx
index 30d696946c76..de8dae561692 100644
--- a/src/Tools/dotnet-user-secrets/src/Resources.resx
+++ b/src/Tools/dotnet-user-secrets/src/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -133,15 +133,9 @@ Use the '--help' flag to see info.</value>
   <data name="Error_No_Secrets_Found" xml:space="preserve">
     <value>No secrets configured for this application.</value>
   </data>
-  <data name="Error_NoProjectsFound" xml:space="preserve">
-    <value>Could not find a MSBuild project file in '{projectPath}'. Specify which project to use with the --project option.</value>
-  </data>
   <data name="Error_ProjectMissingId" xml:space="preserve">
     <value>Could not find the global property 'UserSecretsId' in MSBuild project '{project}'. Ensure this property is set in the project or use the '--id' command line option.</value>
   </data>
-  <data name="Error_ProjectPath_NotFound" xml:space="preserve">
-    <value>The project file '{path}' does not exist.</value>
-  </data>
   <data name="Error_ProjectFailedToLoad" xml:space="preserve">
     <value>Could not load the MSBuild project '{project}'.</value>
   </data>
@@ -169,4 +163,10 @@ Use the '--help' flag to see info.</value>
   <data name="Message_SetUserSecretsIdForProject" xml:space="preserve">
     <value>Set UserSecretsId to '{userSecretsId}' for MSBuild project '{project}'.</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="Error_ProjectAndFileOptions" xml:space="preserve">
+    <value>Cannot use both --file and --project options together.</value>
+  </data>
+  <data name="Error_InitNotSupportedForFileBasedApps" xml:space="preserve">
+    <value>Init command is currently not supported for file-based apps. Please add '#:property UserSecretsId=...' manually.</value>
+  </data>
+</root>
diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
index b2ca66d8f7c0..249504b09fdc 100644
--- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
+++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <Reference Include="Newtonsoft.Json" />
-    <Reference Include="System.Text.Json" />
     <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
   </ItemGroup>
 
diff --git a/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs b/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
index 705268000389..5b1e8592908f 100644
--- a/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
+++ b/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Tools;
 using Microsoft.Extensions.Configuration.UserSecrets;
 using Microsoft.Extensions.Configuration.UserSecrets.Tests;
 using Microsoft.Extensions.Tools.Internal;
@@ -64,7 +65,27 @@ public void Error_Project_DoesNotExist()
         var secretManager = CreateProgram();
 
         secretManager.RunInternal("list", "--project", projectPath);
-        Assert.Contains(Resources.FormatError_ProjectPath_NotFound(projectPath), _console.GetOutput());
+        Assert.Contains(SecretsHelpersResources.FormatError_File_NotFound(projectPath), _console.GetOutput());
+    }
+
+    [Fact]
+    public void Error_ProjectAndFileOptions()
+    {
+        var projectPath = Path.Combine(_fixture.GetTempSecretProject(), "does_not_exist", "TestProject.csproj");
+        var secretManager = CreateProgram();
+
+        secretManager.RunInternal("list", "--project", projectPath, "--file", projectPath);
+        Assert.Contains(Resources.Error_ProjectAndFileOptions, _console.GetOutput());
+    }
+
+    [Fact]
+    public void Error_InitFile()
+    {
+        var dir = _fixture.CreateFileBasedApp(null);
+        var secretManager = CreateProgram();
+
+        secretManager.RunInternal("init", "--file", Path.Combine(dir, "app.cs"));
+        Assert.Contains(Resources.Error_InitNotSupportedForFileBasedApps, _console.GetOutput());
     }
 
     [Fact]
@@ -81,9 +102,10 @@ public void SupportsRelativePaths()
     }
 
     [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public void SetSecrets(bool fromCurrentDirectory)
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    [InlineData(true, false)]
+    public void SetSecrets(bool fromCurrentDirectory, bool fileBasedApp)
     {
         var secrets = new KeyValuePair<string, string>[]
                     {
@@ -95,18 +117,22 @@ public void SetSecrets(bool fromCurrentDirectory)
                         new KeyValuePair<string, string>("--twoDashedKey", "--twoDashedValue")
                     };
 
-        var projectPath = _fixture.GetTempSecretProject();
+        var projectPath = fileBasedApp
+            ? _fixture.GetTempFileBasedApp(out _)
+            : _fixture.GetTempSecretProject();
         var dir = fromCurrentDirectory
             ? projectPath
             : Path.GetTempPath();
+        ReadOnlySpan<string> pathArgs = fromCurrentDirectory
+            ? []
+            : (fileBasedApp
+                ? ["-f", Path.Join(projectPath, "app.cs")]
+                : ["-p", projectPath]);
         var secretManager = new Program(_console, dir);
 
         foreach (var secret in secrets)
         {
-            var parameters = fromCurrentDirectory ?
-                new string[] { "set", secret.Key, secret.Value, "--verbose" } :
-                new string[] { "set", secret.Key, secret.Value, "-p", projectPath, "--verbose" };
-            secretManager.RunInternal(parameters);
+            secretManager.RunInternal(["set", secret.Key, secret.Value, .. pathArgs, "--verbose"]);
         }
 
         foreach (var keyValue in secrets)
@@ -117,10 +143,7 @@ public void SetSecrets(bool fromCurrentDirectory)
         }
 
         _console.ClearOutput();
-        var args = fromCurrentDirectory
-            ? new string[] { "list", "--verbose" }
-            : new string[] { "list", "-p", projectPath, "--verbose" };
-        secretManager.RunInternal(args);
+        secretManager.RunInternal(["list", .. pathArgs, "--verbose"]);
         foreach (var keyValue in secrets)
         {
             Assert.Contains(
@@ -132,21 +155,24 @@ public void SetSecrets(bool fromCurrentDirectory)
         _console.ClearOutput();
         foreach (var secret in secrets)
         {
-            var parameters = fromCurrentDirectory ?
-                new string[] { "remove", secret.Key, "--verbose" } :
-                new string[] { "remove", secret.Key, "-p", projectPath, "--verbose" };
-            secretManager.RunInternal(parameters);
+            secretManager.RunInternal(["remove", secret.Key, .. pathArgs, "--verbose"]);
         }
 
         // Verify secrets are removed.
         _console.ClearOutput();
-        args = fromCurrentDirectory
-            ? new string[] { "list", "--verbose" }
-            : new string[] { "list", "-p", projectPath, "--verbose" };
-        secretManager.RunInternal(args);
+        secretManager.RunInternal(["list", .. pathArgs, "--verbose"]);
         Assert.Contains(Resources.Error_No_Secrets_Found, _console.GetOutput());
     }
 
+    [Fact]
+    public void SetSecrets_FileBasedAppInCurrentDirectory()
+    {
+        var directoryPath = _fixture.GetTempFileBasedApp(out _);
+        var secretManager = new Program(_console, directoryPath);
+        secretManager.RunInternal("set", "key1", "value1", "--verbose");
+        Assert.Contains(SecretsHelpersResources.FormatError_NoProjectsFound(directoryPath), _console.GetOutput());
+    }
+
     [Fact]
     public void SetSecret_Update_Existing_Secret()
     {
@@ -268,16 +294,25 @@ public void List_Empty_Secrets_File()
     }
 
     [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public void Clear_Secrets(bool fromCurrentDirectory)
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    [InlineData(true, false)]
+    public void Clear_Secrets(bool fromCurrentDirectory, bool fileBasedApp)
     {
-        var projectPath = _fixture.GetTempSecretProject();
+        var projectPath = fileBasedApp
+            ? _fixture.GetTempFileBasedApp(out _)
+            : _fixture.GetTempSecretProject();
 
         var dir = fromCurrentDirectory
             ? projectPath
             : Path.GetTempPath();
 
+        ReadOnlySpan<string> pathArgs = fromCurrentDirectory
+            ? []
+            : (fileBasedApp
+                ? ["-f", Path.Join(projectPath, "app.cs")]
+                : ["-p", projectPath]);
+
         var secretManager = new Program(_console, dir);
 
         var secrets = new KeyValuePair<string, string>[]
@@ -290,10 +325,7 @@ public void Clear_Secrets(bool fromCurrentDirectory)
 
         foreach (var secret in secrets)
         {
-            var parameters = fromCurrentDirectory ?
-                new string[] { "set", secret.Key, secret.Value, "--verbose" } :
-                new string[] { "set", secret.Key, secret.Value, "-p", projectPath, "--verbose" };
-            secretManager.RunInternal(parameters);
+            secretManager.RunInternal(["set", secret.Key, secret.Value, .. pathArgs, "--verbose"]);
         }
 
         foreach (var keyValue in secrets)
@@ -305,10 +337,7 @@ public void Clear_Secrets(bool fromCurrentDirectory)
 
         // Verify secrets are persisted.
         _console.ClearOutput();
-        var args = fromCurrentDirectory ?
-            new string[] { "list", "--verbose" } :
-            new string[] { "list", "-p", projectPath, "--verbose" };
-        secretManager.RunInternal(args);
+        secretManager.RunInternal(["list", .. pathArgs, "--verbose"]);
         foreach (var keyValue in secrets)
         {
             Assert.Contains(
@@ -318,11 +347,9 @@ public void Clear_Secrets(bool fromCurrentDirectory)
 
         // Clear secrets.
         _console.ClearOutput();
-        args = fromCurrentDirectory ? new string[] { "clear", "--verbose" } : new string[] { "clear", "-p", projectPath, "--verbose" };
-        secretManager.RunInternal(args);
+        secretManager.RunInternal(["clear", .. pathArgs, "--verbose"]);
 
-        args = fromCurrentDirectory ? new string[] { "list", "--verbose" } : new string[] { "list", "-p", projectPath, "--verbose" };
-        secretManager.RunInternal(args);
+        secretManager.RunInternal(["list", .. pathArgs, "--verbose"]);
         Assert.Contains(Resources.Error_No_Secrets_Found, _console.GetOutput());
     }
 
diff --git a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs
index cbaae483a57c..7eb839a879c7 100644
--- a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs
+++ b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs
@@ -36,7 +36,7 @@ public string GetTempSecretProject()
     private const string ProjectTemplate = @"<Project ToolsVersion=""15.0"" Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     {0}
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
@@ -52,6 +52,12 @@ public string GetTempSecretProject(out string userSecretsId)
         return CreateProject(userSecretsId);
     }
 
+    public string GetTempFileBasedApp(out string userSecretsId)
+    {
+        userSecretsId = Guid.NewGuid().ToString();
+        return CreateFileBasedApp(userSecretsId);
+    }
+
     public string CreateProject(string userSecretsId)
     {
         var projectPath = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "usersecretstest", Guid.NewGuid().ToString()));
@@ -63,20 +69,38 @@ public string CreateProject(string userSecretsId)
             Path.Combine(projectPath.FullName, "TestProject.csproj"),
             string.Format(CultureInfo.InvariantCulture, ProjectTemplate, prop));
 
-        var id = userSecretsId;
+        AddToDisposables(userSecretsId, projectPath);
+
+        return projectPath.FullName;
+    }
+
+    public string CreateFileBasedApp(string userSecretsId)
+    {
+        var directory = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "usersecretstest", Guid.NewGuid().ToString()));
+
+        File.WriteAllText(Path.Join(directory.FullName, "app.cs"), $"""
+            #:property UserSecretsId={userSecretsId}
+            Console.WriteLine();
+            """);
+
+        AddToDisposables(userSecretsId, directory);
+
+        return directory.FullName;
+    }
+
+    private void AddToDisposables(string userSecretsId, DirectoryInfo dir)
+    {
         _disposables.Push(() =>
         {
             try
             {
                 // may throw if id is bad
-                var secretsDir = Path.GetDirectoryName(PathHelper.GetSecretsPathFromSecretsId(id));
+                var secretsDir = Path.GetDirectoryName(PathHelper.GetSecretsPathFromSecretsId(userSecretsId));
                 TryDelete(secretsDir);
             }
             catch { }
         });
-        _disposables.Push(() => TryDelete(projectPath.FullName));
-
-        return projectPath.FullName;
+        _disposables.Push(() => TryDelete(dir.FullName));
     }
 
     private static void TryDelete(string directory)
diff --git a/src/Validation/.vsconfig b/src/Validation/.vsconfig
new file mode 100644
index 000000000000..77009588dff2
--- /dev/null
+++ b/src/Validation/.vsconfig
@@ -0,0 +1,12 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.Net.Component.4.6.2.TargetingPack",
+    "Microsoft.Net.Component.4.7.2.SDK",
+    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.VisualStudio.Workload.NetCoreTools",
+    "Microsoft.VisualStudio.Workload.NetWeb",
+    "Microsoft.VisualStudio.Workload.VisualStudioExtension"
+  ]
+}
diff --git a/src/Validation/Validation.slnf b/src/Validation/Validation.slnf
new file mode 100644
index 000000000000..7f6b3ab900ae
--- /dev/null
+++ b/src/Validation/Validation.slnf
@@ -0,0 +1,11 @@
+{
+  "solution": {
+    "path": "..\\..\\AspNetCore.slnx",
+    "projects": [
+      "src\\Validation\\src\\Microsoft.Extensions.Validation.csproj",
+      "src\\Validation\\test\\Microsoft.Extensions.Validation.Tests\\Microsoft.Extensions.Validation.Tests.csproj",
+      "src\\Validation\\gen\\Microsoft.Extensions.Validation.ValidationsGenerator.csproj",
+      "src\\Validation\\test\\Microsoft.Extensions.Validation.GeneratorTests\\Microsoft.Extensions.Validation.GeneratorTests.csproj"
+    ]
+  }
+}
diff --git a/src/Validation/build.cmd b/src/Validation/build.cmd
new file mode 100644
index 000000000000..7be8285e8a42
--- /dev/null
+++ b/src/Validation/build.cmd
@@ -0,0 +1,4 @@
+@ECHO OFF
+SET RepoRoot=%~dp0..\..
+
+call %RepoRoot%\eng\build.cmd -projects %RepoRoot%\src\Validation\**\*.csproj %*
\ No newline at end of file
diff --git a/src/Validation/build.sh b/src/Validation/build.sh
new file mode 100755
index 000000000000..2663e52d431d
--- /dev/null
+++ b/src/Validation/build.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+"$DIR/../../eng/build.sh" --projects "$DIR/**/*.csproj" "$@"
\ No newline at end of file
diff --git a/src/Validation/gen/Emitters/ValidationsGenerator.Emitter.cs b/src/Validation/gen/Emitters/ValidationsGenerator.Emitter.cs
new file mode 100644
index 000000000000..513e376aee81
--- /dev/null
+++ b/src/Validation/gen/Emitters/ValidationsGenerator.Emitter.cs
@@ -0,0 +1,251 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using System.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using System.IO;
+
+namespace Microsoft.Extensions.Validation;
+
+public sealed partial class ValidationsGenerator : IIncrementalGenerator
+{
+    public static string GeneratedCodeConstructor => $@"global::System.CodeDom.Compiler.GeneratedCodeAttribute(""{typeof(ValidationsGenerator).Assembly.FullName}"", ""{typeof(ValidationsGenerator).Assembly.GetName().Version}"")";
+    public static string GeneratedCodeAttribute => $"[{GeneratedCodeConstructor}]";
+
+    internal static void Emit(SourceProductionContext context, (InterceptableLocation? AddValidation, ImmutableArray<ValidatableType> ValidatableTypes) emitInputs)
+    {
+        if (emitInputs.AddValidation is null)
+        {
+            // Avoid generating code if no AddValidation call was found.
+            return;
+        }
+        var source = Emit(emitInputs.AddValidation, emitInputs.ValidatableTypes);
+        context.AddSource("ValidatableInfoResolver.g.cs", SourceText.From(source, Encoding.UTF8));
+    }
+
+    private static string Emit(InterceptableLocation addValidation, ImmutableArray<ValidatableType> validatableTypes) => $$"""
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    {{GeneratedCodeAttribute}}
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    {{GeneratedCodeAttribute}}
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    {{GeneratedCodeAttribute}}
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    {{GeneratedCodeAttribute}}
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+{{EmitTypeChecks(validatableTypes)}}
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file static class GeneratedServiceCollectionExtensions
+    {
+        {{addValidation.GetInterceptsLocationAttributeSyntax()}}
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    {{GeneratedCodeAttribute}}
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
+""";
+
+    private static string EmitTypeChecks(ImmutableArray<ValidatableType> validatableTypes)
+    {
+        var sw = new StringWriter();
+        var cw = new CodeWriter(sw, baseIndent: 3);
+        foreach (var validatableType in validatableTypes)
+        {
+            var typeName = validatableType.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+            cw.WriteLine($"if (type == typeof({typeName}))");
+            cw.StartBlock();
+            cw.WriteLine($"validatableInfo = new GeneratedValidatableTypeInfo(");
+            cw.Indent++;
+            cw.WriteLine($"type: typeof({typeName}),");
+            if (validatableType.Members.IsDefaultOrEmpty)
+            {
+                cw.WriteLine("members: []");
+            }
+            else
+            {
+                cw.WriteLine("members: [");
+                cw.Indent++;
+                foreach (var member in validatableType.Members)
+                {
+                    EmitValidatableMemberForCreate(member, cw);
+                }
+                cw.Indent--;
+                cw.WriteLine("]");
+            }
+            cw.Indent--;
+            cw.WriteLine(");");
+            cw.WriteLine("return true;");
+            cw.EndBlock();
+        }
+        return sw.ToString();
+    }
+
+    private static void EmitValidatableMemberForCreate(ValidatableProperty member, CodeWriter cw)
+    {
+        cw.WriteLine("new GeneratedValidatablePropertyInfo(");
+        cw.Indent++;
+        cw.WriteLine($"containingType: typeof({member.ContainingType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}),");
+        cw.WriteLine($"propertyType: typeof({member.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}),");
+        cw.WriteLine($"name: \"{member.Name}\",");
+        cw.WriteLine($"displayName: \"{member.DisplayName}\"");
+        cw.Indent--;
+        cw.WriteLine("),");
+    }
+}
diff --git a/src/Validation/gen/Extensions/ISymbolExtensions.cs b/src/Validation/gen/Extensions/ISymbolExtensions.cs
new file mode 100644
index 000000000000..a770b7260656
--- /dev/null
+++ b/src/Validation/gen/Extensions/ISymbolExtensions.cs
@@ -0,0 +1,41 @@
+// 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.Linq;
+using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal static class ISymbolExtensions
+{
+    public static string GetDisplayName(this ISymbol property, INamedTypeSymbol displayAttribute)
+    {
+        var displayNameAttribute = property.GetAttributes()
+            .FirstOrDefault(attribute =>
+                attribute.AttributeClass is { } attributeClass &&
+                SymbolEqualityComparer.Default.Equals(attributeClass, displayAttribute));
+
+        if (displayNameAttribute is not null)
+        {
+            if (!displayNameAttribute.NamedArguments.IsDefaultOrEmpty)
+            {
+                foreach (var namedArgument in displayNameAttribute.NamedArguments)
+                {
+                    if (string.Equals(namedArgument.Key, "Name", StringComparison.Ordinal))
+                    {
+                        return namedArgument.Value.Value?.ToString() ?? property.Name;
+                    }
+                }
+            }
+        }
+
+        return property.Name;
+    }
+
+    public static bool IsEqualityContract(this IPropertySymbol prop, WellKnownTypes wellKnownTypes) =>
+        prop.Name == "EqualityContract"
+        && SymbolEqualityComparer.Default.Equals(prop.Type, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Type))
+        && prop.DeclaredAccessibility == Accessibility.Protected;
+}
diff --git a/src/Validation/gen/Extensions/ITypeSymbolExtensions.cs b/src/Validation/gen/Extensions/ITypeSymbolExtensions.cs
new file mode 100644
index 000000000000..63261c68a85d
--- /dev/null
+++ b/src/Validation/gen/Extensions/ITypeSymbolExtensions.cs
@@ -0,0 +1,178 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
+using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal static class ITypeSymbolExtensions
+{
+    public static bool IsEnumerable(this ITypeSymbol type, INamedTypeSymbol enumerable)
+    {
+        if (type.SpecialType == SpecialType.System_String)
+        {
+            return false;
+        }
+
+        return type.ImplementsInterface(enumerable) || SymbolEqualityComparer.Default.Equals(type, enumerable);
+    }
+
+    public static bool ImplementsValidationAttribute(this ITypeSymbol typeSymbol, INamedTypeSymbol validationAttributeSymbol)
+    {
+        var baseType = typeSymbol.BaseType;
+        while (baseType != null)
+        {
+            if (SymbolEqualityComparer.Default.Equals(baseType, validationAttributeSymbol))
+            {
+                return true;
+            }
+            baseType = baseType.BaseType;
+        }
+
+        return false;
+    }
+
+    public static ITypeSymbol UnwrapType(this ITypeSymbol type, INamedTypeSymbol enumerable)
+    {
+        if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T &&
+            type is INamedTypeSymbol { TypeArguments.Length: 1 })
+        {
+            // Extract the T from a Nullable<T>
+            type = ((INamedTypeSymbol)type).TypeArguments[0];
+        }
+
+        if (type.NullableAnnotation == NullableAnnotation.Annotated)
+        {
+            // Remove the nullable annotation but keep any generic arguments, e.g. List<int>? → List<int>
+            // so we can retain them in future steps.
+            type = type.WithNullableAnnotation(NullableAnnotation.NotAnnotated);
+        }
+
+        if (type is INamedTypeSymbol namedType && namedType.IsEnumerable(enumerable) && namedType.TypeArguments.Length == 1)
+        {
+            // Extract the T from an IEnumerable<T> or List<T>
+            type = namedType.TypeArguments[0];
+        }
+
+        return type;
+    }
+
+    internal static bool ImplementsInterface(this ITypeSymbol type, ITypeSymbol interfaceType)
+    {
+        foreach (var iface in type.AllInterfaces)
+        {
+            if (SymbolEqualityComparer.Default.Equals(interfaceType, iface))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    internal static ImmutableArray<INamedTypeSymbol>? GetJsonDerivedTypes(this ITypeSymbol type, INamedTypeSymbol jsonDerivedTypeAttribute)
+    {
+        var derivedTypes = ImmutableArray.CreateBuilder<INamedTypeSymbol>();
+        foreach (var attribute in type.GetAttributes())
+        {
+            if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, jsonDerivedTypeAttribute))
+            {
+                var derivedType = (INamedTypeSymbol?)attribute.ConstructorArguments[0].Value;
+                if (derivedType is not null && !SymbolEqualityComparer.Default.Equals(derivedType, type))
+                {
+                    derivedTypes.Add(derivedType);
+                }
+            }
+        }
+
+        return derivedTypes.Count == 0 ? null : derivedTypes.ToImmutable();
+    }
+
+    // Types exempted here have special binding rules in RDF and RDG and are not validatable
+    // types themselves so we short-circuit on them.
+    internal static bool IsExemptType(this ITypeSymbol type, WellKnownTypes wellKnownTypes)
+    {
+        return SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.GetOptional(WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_HttpContext))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.GetOptional(WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_HttpRequest))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.GetOptional(WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_HttpResponse))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Threading_CancellationToken))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.GetOptional(WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_IFormCollection))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.GetOptional(WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_IFormFileCollection))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.GetOptional(WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_IFormFile))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_IO_Stream))
+               || SymbolEqualityComparer.Default.Equals(type, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_IO_Pipelines_PipeReader));
+    }
+
+    internal static IPropertySymbol? FindPropertyIncludingBaseTypes(this INamedTypeSymbol typeSymbol, string propertyName)
+    {
+        var property = typeSymbol.GetMembers()
+            .OfType<IPropertySymbol>()
+            .FirstOrDefault(p => string.Equals(p.Name, propertyName, System.StringComparison.OrdinalIgnoreCase));
+
+        if (property != null)
+        {
+            return property;
+        }
+
+        // If not found, recursively search base types
+        if (typeSymbol.BaseType is INamedTypeSymbol baseType)
+        {
+            return FindPropertyIncludingBaseTypes(baseType, propertyName);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Checks if the parameter is marked with [FromService] or [FromKeyedService] attributes.
+    /// </summary>
+    /// <param name="parameter">The parameter to check.</param>
+    /// <param name="fromServiceMetadataSymbol">The symbol representing the [FromService] attribute.</param>
+    /// <param name="fromKeyedServiceAttributeSymbol">The symbol representing the [FromKeyedService] attribute.</param>
+    internal static bool IsServiceParameter(this IParameterSymbol parameter, INamedTypeSymbol fromServiceMetadataSymbol, INamedTypeSymbol fromKeyedServiceAttributeSymbol)
+    {
+        return parameter.GetAttributes().Any(attr =>
+            attr.AttributeClass is not null &&
+            (attr.AttributeClass.ImplementsInterface(fromServiceMetadataSymbol) ||
+             SymbolEqualityComparer.Default.Equals(attr.AttributeClass, fromKeyedServiceAttributeSymbol)));
+    }
+
+    /// <summary>
+    /// Checks if the property is marked with [FromServices] or [FromKeyedServices] attributes.
+    /// </summary>
+    /// <param name="property">The property to check.</param>
+    /// <param name="fromServiceMetadataSymbol">The symbol representing the [FromServices] attribute.</param>
+    /// <param name="fromKeyedServiceAttributeSymbol">The symbol representing the [FromKeyedServices] attribute.</param>
+    internal static bool IsServiceProperty(this IPropertySymbol property, INamedTypeSymbol fromServiceMetadataSymbol, INamedTypeSymbol fromKeyedServiceAttributeSymbol)
+    {
+        return property.GetAttributes().Any(attr =>
+            attr.AttributeClass is not null &&
+            (attr.AttributeClass.ImplementsInterface(fromServiceMetadataSymbol) ||
+             SymbolEqualityComparer.Default.Equals(attr.AttributeClass, fromKeyedServiceAttributeSymbol)));
+    }
+
+    /// <summary>
+    /// Checks if the property is marked with [JsonIgnore] attribute.
+    /// </summary>
+    /// <param name="property">The property to check.</param>
+    /// <param name="jsonIgnoreAttributeSymbol">The symbol representing the [JsonIgnore] attribute.</param>
+    internal static bool IsJsonIgnoredProperty(this IPropertySymbol property, INamedTypeSymbol jsonIgnoreAttributeSymbol)
+    {
+        return property.GetAttributes().Any(attr =>
+            attr.AttributeClass is not null &&
+            SymbolEqualityComparer.Default.Equals(attr.AttributeClass, jsonIgnoreAttributeSymbol));
+    }
+
+    internal static bool IsSkippedValidationProperty(this IPropertySymbol property, INamedTypeSymbol skipValidationAttributeSymbol)
+    {
+        return property.HasAttribute(skipValidationAttributeSymbol) || property.Type.HasAttribute(skipValidationAttributeSymbol);
+    }
+
+    internal static bool IsSkippedValidationParameter(this IParameterSymbol parameter, INamedTypeSymbol skipValidationAttributeSymbol)
+    {
+        return parameter.HasAttribute(skipValidationAttributeSymbol) || parameter.Type.HasAttribute(skipValidationAttributeSymbol);
+    }
+}
diff --git a/src/Validation/gen/Extensions/IncrementalValuesProviderExtensions.cs b/src/Validation/gen/Extensions/IncrementalValuesProviderExtensions.cs
new file mode 100644
index 000000000000..45e30b2efcd1
--- /dev/null
+++ b/src/Validation/gen/Extensions/IncrementalValuesProviderExtensions.cs
@@ -0,0 +1,138 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal static class IncrementalValuesProviderExtensions
+{
+    public static IncrementalValuesProvider<TSource> Distinct<TSource>(this IncrementalValuesProvider<TSource> source, IEqualityComparer<TSource> comparer)
+    {
+        return source
+            .Collect()
+            .WithComparer(ImmutableArrayEqualityComparer<TSource>.Instance)
+            .SelectMany((values, cancellationToken) =>
+            {
+                if (values.IsEmpty)
+                {
+                    return values;
+                }
+
+                var results = ImmutableArray.CreateBuilder<TSource>(values.Length);
+                HashSet<TSource> set = new(comparer);
+
+                foreach (var value in values)
+                {
+                    if (set.Add(value))
+                    {
+                        results.Add(value);
+                    }
+                }
+
+                return results.DrainToImmutable();
+            });
+    }
+
+    public static IncrementalValuesProvider<T> Concat<T>(
+        this IncrementalValuesProvider<ImmutableArray<T>> first,
+        IncrementalValuesProvider<ImmutableArray<T>> second)
+    {
+        return first.Collect()
+            .Combine(second.Collect())
+            .SelectMany((tuple, _) =>
+            {
+                if (tuple.Left.IsEmpty && tuple.Right.IsEmpty)
+                {
+                    return [];
+                }
+
+                var results = ImmutableArray.CreateBuilder<T>(tuple.Left.Length + tuple.Right.Length);
+                for (var i = 0; i < tuple.Left.Length; i++)
+                {
+                    results.AddRange(tuple.Left[i]);
+                }
+                for (var i = 0; i < tuple.Right.Length; i++)
+                {
+                    results.AddRange(tuple.Right[i]);
+                }
+                return results.DrainToImmutable();
+            });
+    }
+
+    public static IncrementalValuesProvider<T> Concat<T>(
+        this IncrementalValuesProvider<ImmutableArray<T>> first,
+        IncrementalValuesProvider<T> second)
+    {
+        return first.Collect()
+            .Combine(second.Collect())
+            .SelectMany((tuple, _) =>
+            {
+                if (tuple.Left.IsEmpty)
+                {
+                    return tuple.Right;
+                }
+
+                var results = ImmutableArray.CreateBuilder<T>(tuple.Left.Length + tuple.Right.Length);
+                for (var i = 0; i < tuple.Left.Length; i++)
+                {
+                    results.AddRange(tuple.Left[i]);
+                }
+                for (var i = 0; i < tuple.Right.Length; i++)
+                {
+                    results.AddRange(tuple.Right[i]);
+                }
+                return results.DrainToImmutable();
+            });
+    }
+
+    private sealed class ImmutableArrayEqualityComparer<T> : IEqualityComparer<ImmutableArray<T>>
+    {
+        public static readonly ImmutableArrayEqualityComparer<T> Instance = new();
+
+        public bool Equals(ImmutableArray<T> x, ImmutableArray<T> y)
+        {
+            if (x.IsDefault)
+            {
+                return y.IsDefault;
+            }
+            else if (y.IsDefault)
+            {
+                return false;
+            }
+
+            if (x.Length != y.Length)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < x.Length; i++)
+            {
+                if (!EqualityComparer<T>.Default.Equals(x[i], y[i]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public int GetHashCode(ImmutableArray<T> obj)
+        {
+            if (obj.IsDefault)
+            {
+                return 0;
+            }
+            var hashCode = -450793227;
+            foreach (var item in obj)
+            {
+                hashCode = (hashCode * -1521134295) + EqualityComparer<T>.Default.GetHashCode(item);
+            }
+
+            return hashCode;
+        }
+    }
+}
diff --git a/src/Validation/gen/Microsoft.Extensions.Validation.ValidationsGenerator.csproj b/src/Validation/gen/Microsoft.Extensions.Validation.ValidationsGenerator.csproj
new file mode 100644
index 000000000000..64488ca48463
--- /dev/null
+++ b/src/Validation/gen/Microsoft.Extensions.Validation.ValidationsGenerator.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IsPackable>false</IsPackable>
+    <IsAnalyzersProject>true</IsAnalyzersProject>
+    <AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
+    <Nullable>enable</Nullable>
+    <WarnOnNullable>true</WarnOnNullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="All" IsImplicitlyDefined="true" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="All" IsImplicitlyDefined="true" Version="$(MicrosoftCodeAnalysisVersion_LatestVS)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Extensions.Validation.GeneratorTests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)IsExternalInit.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)HashCode.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\BoundedCacheWithFactory.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\WellKnownTypeData.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\WellKnownTypes.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\CodeWriter.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Diagnostics\AnalyzerDebug.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\ParsabilityHelper.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)RoslynUtils\SymbolExtensions.cs" LinkBase="Shared" />
+    <Compile Include="$(RepoRoot)src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator/StaticRouteHandlerModel/InvocationOperationExtensions.cs" LinkBase="Shared" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Validation/gen/Models/RequiredSymbols.cs b/src/Validation/gen/Models/RequiredSymbols.cs
new file mode 100644
index 000000000000..f6d48f40eb7a
--- /dev/null
+++ b/src/Validation/gen/Models/RequiredSymbols.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal sealed record class RequiredSymbols(
+    INamedTypeSymbol DisplayAttribute,
+    INamedTypeSymbol ValidationAttribute,
+    INamedTypeSymbol IEnumerable,
+    INamedTypeSymbol IValidatableObject,
+    INamedTypeSymbol JsonDerivedTypeAttribute,
+    INamedTypeSymbol JsonIgnoreAttribute,
+    INamedTypeSymbol RequiredAttribute,
+    INamedTypeSymbol CustomValidationAttribute,
+    INamedTypeSymbol HttpContext,
+    INamedTypeSymbol HttpRequest,
+    INamedTypeSymbol HttpResponse,
+    INamedTypeSymbol CancellationToken,
+    INamedTypeSymbol IFormCollection,
+    INamedTypeSymbol IFormFileCollection,
+    INamedTypeSymbol IFormFile,
+    INamedTypeSymbol Stream,
+    INamedTypeSymbol PipeReader
+);
diff --git a/src/Validation/gen/Models/ValidatableProperty.cs b/src/Validation/gen/Models/ValidatableProperty.cs
new file mode 100644
index 000000000000..22b960babcad
--- /dev/null
+++ b/src/Validation/gen/Models/ValidatableProperty.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal sealed record class ValidatableProperty(
+    ITypeSymbol ContainingType,
+    ITypeSymbol Type,
+    string Name,
+    string DisplayName,
+    ImmutableArray<ValidationAttribute> Attributes
+);
diff --git a/src/Validation/gen/Models/ValidatableType.cs b/src/Validation/gen/Models/ValidatableType.cs
new file mode 100644
index 000000000000..06f3df3b6234
--- /dev/null
+++ b/src/Validation/gen/Models/ValidatableType.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal sealed record class ValidatableType(
+    ITypeSymbol Type,
+    ImmutableArray<ValidatableProperty> Members
+);
diff --git a/src/Validation/gen/Models/ValidatableTypeComparer.cs b/src/Validation/gen/Models/ValidatableTypeComparer.cs
new file mode 100644
index 000000000000..56f96a32e47c
--- /dev/null
+++ b/src/Validation/gen/Models/ValidatableTypeComparer.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal sealed class ValidatableTypeComparer : IEqualityComparer<ValidatableType?>
+{
+    public static ValidatableTypeComparer Instance { get; } = new();
+
+    public bool Equals(ValidatableType? x, ValidatableType? y)
+    {
+        if (x is null && y is null)
+        {
+            return true;
+        }
+        if (x is null || y is null)
+        {
+            return false;
+        }
+        return SymbolEqualityComparer.Default.Equals(x.Type, y.Type);
+    }
+
+    public int GetHashCode(ValidatableType? obj)
+    {
+        return SymbolEqualityComparer.Default.GetHashCode(obj?.Type);
+    }
+}
diff --git a/src/Validation/gen/Models/ValidationAttribute.cs b/src/Validation/gen/Models/ValidationAttribute.cs
new file mode 100644
index 000000000000..3558f9fcf6c5
--- /dev/null
+++ b/src/Validation/gen/Models/ValidationAttribute.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.Extensions.Validation;
+
+internal sealed record class ValidationAttribute(
+    string Name,
+    string ClassName,
+    List<string> Arguments,
+    Dictionary<string, string> NamedArguments,
+    bool IsCustomValidationAttribute
+);
diff --git a/src/Validation/gen/Parsers/ValidationsGenerator.AddValidation.cs b/src/Validation/gen/Parsers/ValidationsGenerator.AddValidation.cs
new file mode 100644
index 000000000000..23f0d30b0ec7
--- /dev/null
+++ b/src/Validation/gen/Parsers/ValidationsGenerator.AddValidation.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading;
+using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.Extensions.Validation;
+
+public sealed partial class ValidationsGenerator : IIncrementalGenerator
+{
+    internal bool FindAddValidation(SyntaxNode syntaxNode, CancellationToken cancellationToken)
+    {
+        if (syntaxNode is InvocationExpressionSyntax
+            && syntaxNode.TryGetMapMethodName(out var method)
+            && method == "AddValidation")
+        {
+            return true;
+        }
+        return false;
+    }
+
+    internal InterceptableLocation? TransformAddValidation(GeneratorSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var node = (InvocationExpressionSyntax)context.Node;
+        var semanticModel = context.SemanticModel;
+        var symbol = semanticModel.GetSymbolInfo(node, cancellationToken).Symbol;
+        if (symbol is not IMethodSymbol methodSymbol
+            || methodSymbol.ContainingType.Name != "ValidationServiceCollectionExtensions"
+            || methodSymbol.ContainingAssembly.Name != "Microsoft.Extensions.Validation")
+        {
+            return null;
+        }
+        return semanticModel.GetInterceptableLocation(node, cancellationToken);
+    }
+}
diff --git a/src/Validation/gen/Parsers/ValidationsGenerator.AttributeParser.cs b/src/Validation/gen/Parsers/ValidationsGenerator.AttributeParser.cs
new file mode 100644
index 000000000000..23d7474ee63b
--- /dev/null
+++ b/src/Validation/gen/Parsers/ValidationsGenerator.AttributeParser.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.Extensions.Validation;
+
+public sealed partial class ValidationsGenerator : IIncrementalGenerator
+{
+    internal static bool ShouldTransformSymbolWithAttribute(SyntaxNode syntaxNode, CancellationToken cancellationToken)
+    {
+        return syntaxNode is ClassDeclarationSyntax or RecordDeclarationSyntax;
+    }
+
+    internal ImmutableArray<ValidatableType> TransformValidatableTypeWithAttribute(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var validatableTypes = new HashSet<ValidatableType>(ValidatableTypeComparer.Instance);
+        List<ITypeSymbol> visitedTypes = [];
+        var wellKnownTypes = WellKnownTypes.GetOrCreate(context.SemanticModel.Compilation);
+        if (TryExtractValidatableType((ITypeSymbol)context.TargetSymbol, wellKnownTypes, ref validatableTypes, ref visitedTypes))
+        {
+            return [.. validatableTypes];
+        }
+        return [];
+    }
+}
diff --git a/src/Validation/gen/Parsers/ValidationsGenerator.EndpointsParser.cs b/src/Validation/gen/Parsers/ValidationsGenerator.EndpointsParser.cs
new file mode 100644
index 000000000000..92b84f4b4fb3
--- /dev/null
+++ b/src/Validation/gen/Parsers/ValidationsGenerator.EndpointsParser.cs
@@ -0,0 +1,50 @@
+// 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.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Analyzers.Infrastructure;
+using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
+using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Microsoft.Extensions.Validation;
+
+public sealed partial class ValidationsGenerator : IIncrementalGenerator
+{
+    internal bool FindEndpoints(SyntaxNode syntaxNode, CancellationToken cancellationToken)
+    {
+        if (syntaxNode is InvocationExpressionSyntax
+            && syntaxNode.TryGetMapMethodName(out var method))
+        {
+            return method == "MapMethods" || InvocationOperationExtensions.KnownMethods.Contains(method);
+        }
+        return false;
+    }
+
+    internal IInvocationOperation? TransformEndpoints(GeneratorSyntaxContext context, CancellationToken cancellationToken)
+    {
+        if (context.Node is not InvocationExpressionSyntax node)
+        {
+            return null;
+        }
+        var operation = context.SemanticModel.GetOperation(node, cancellationToken);
+        AnalyzerDebug.Assert(operation != null, "Operation should not be null.");
+        return operation is IInvocationOperation invocationOperation
+            ? invocationOperation
+            : null;
+    }
+
+    internal ImmutableArray<ValidatableType> ExtractValidatableEndpoint(IInvocationOperation? operation, CancellationToken cancellationToken)
+    {
+        AnalyzerDebug.Assert(operation != null, "Operation should not be null.");
+        AnalyzerDebug.Assert(operation.SemanticModel != null, "Operation should have a semantic model.");
+        var wellKnownTypes = WellKnownTypes.GetOrCreate(operation.SemanticModel.Compilation);
+        var validatableTypes = ExtractValidatableTypes(operation, wellKnownTypes);
+        return validatableTypes;
+    }
+}
diff --git a/src/Validation/gen/Parsers/ValidationsGenerator.TypesParser.cs b/src/Validation/gen/Parsers/ValidationsGenerator.TypesParser.cs
new file mode 100644
index 000000000000..71466a8a547b
--- /dev/null
+++ b/src/Validation/gen/Parsers/ValidationsGenerator.TypesParser.cs
@@ -0,0 +1,310 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.AspNetCore.Analyzers.Infrastructure;
+using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
+using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
+using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Microsoft.Extensions.Validation;
+
+public sealed partial class ValidationsGenerator : IIncrementalGenerator
+{
+    private static readonly SymbolDisplayFormat _symbolDisplayFormat = new(
+        globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Included,
+        typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces);
+
+    internal ImmutableArray<ValidatableType> ExtractValidatableTypes(IInvocationOperation operation, WellKnownTypes wellKnownTypes)
+    {
+        AnalyzerDebug.Assert(operation.SemanticModel != null, "SemanticModel should not be null.");
+        var parameters = operation.TryGetRouteHandlerMethod(operation.SemanticModel, out var method)
+            ? method.Parameters
+            : [];
+
+        var fromServiceMetadataSymbol = wellKnownTypes.GetOptional(
+            WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_Metadata_IFromServiceMetadata);
+        var fromKeyedServiceAttributeSymbol = wellKnownTypes.GetOptional(
+            WellKnownTypeData.WellKnownType.Microsoft_Extensions_DependencyInjection_FromKeyedServicesAttribute);
+        var skipValidationAttributeSymbol = wellKnownTypes.Get(
+            WellKnownTypeData.WellKnownType.Microsoft_Extensions_Validation_SkipValidationAttribute);
+
+        var validatableTypes = new HashSet<ValidatableType>(ValidatableTypeComparer.Instance);
+        List<ITypeSymbol> visitedTypes = [];
+
+        foreach (var parameter in parameters)
+        {
+            // Skip parameters that are injected as services
+            if (parameter.IsServiceParameter(fromServiceMetadataSymbol, fromKeyedServiceAttributeSymbol))
+            {
+                continue;
+            }
+
+            // Skip method parameter if it or its type are annotated with SkipValidationAttribute
+            if (parameter.IsSkippedValidationParameter(skipValidationAttributeSymbol))
+            {
+                continue;
+            }
+
+            _ = TryExtractValidatableType(parameter.Type, wellKnownTypes, ref validatableTypes, ref visitedTypes);
+        }
+        return [.. validatableTypes];
+    }
+
+    internal bool TryExtractValidatableType(ITypeSymbol incomingTypeSymbol, WellKnownTypes wellKnownTypes, ref HashSet<ValidatableType> validatableTypes, ref List<ITypeSymbol> visitedTypes)
+    {
+        var typeSymbol = incomingTypeSymbol.UnwrapType(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Collections_IEnumerable));
+        if (typeSymbol.SpecialType != SpecialType.None)
+        {
+            return false;
+        }
+
+        if (visitedTypes.Contains(typeSymbol))
+        {
+            return true;
+        }
+
+        if (typeSymbol.IsExemptType(wellKnownTypes))
+        {
+            return false;
+        }
+
+        // Skip types that are not accessible from generated code
+        if (typeSymbol.DeclaredAccessibility is not Accessibility.Public)
+        {
+            return false;
+        }
+
+        visitedTypes.Add(typeSymbol);
+
+        var hasTypeLevelValidation = HasValidationAttributes(typeSymbol, wellKnownTypes) || HasIValidatableObjectInterface(typeSymbol, wellKnownTypes);
+
+        // Extract validatable types discovered in base types of this type and add them to the top-level list.
+        var current = typeSymbol.BaseType;
+        var hasValidatableBaseType = false;
+        while (current != null && current.SpecialType != SpecialType.System_Object)
+        {
+            hasValidatableBaseType |= TryExtractValidatableType(current, wellKnownTypes, ref validatableTypes, ref visitedTypes);
+            current = current.BaseType;
+        }
+
+        // Extract validatable types discovered in members of this type and add them to the top-level list.
+        ImmutableArray<ValidatableProperty> members = [];
+        if (ParsabilityHelper.GetParsability(typeSymbol, wellKnownTypes) is Parsability.NotParsable)
+        {
+            members = ExtractValidatableMembers(typeSymbol, wellKnownTypes, ref validatableTypes, ref visitedTypes);
+        }
+
+        // Extract the validatable types discovered in the JsonDerivedTypeAttributes of this type and add them to the top-level list.
+        var derivedTypes = typeSymbol.GetJsonDerivedTypes(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Text_Json_Serialization_JsonDerivedTypeAttribute));
+        var hasValidatableDerivedTypes = false;
+        foreach (var derivedType in derivedTypes ?? [])
+        {
+            hasValidatableDerivedTypes |= TryExtractValidatableType(derivedType, wellKnownTypes, ref validatableTypes, ref visitedTypes);
+        }
+
+        // No validatable members or derived types found, so we don't need to add this type.
+        if (members.IsDefaultOrEmpty && !hasTypeLevelValidation && !hasValidatableBaseType && !hasValidatableDerivedTypes)
+        {
+            return false;
+        }
+
+        // Add the type itself as a validatable type itself.
+        validatableTypes.Add(new ValidatableType(
+            Type: typeSymbol,
+            Members: members));
+
+        return true;
+    }
+
+    internal ImmutableArray<ValidatableProperty> ExtractValidatableMembers(ITypeSymbol typeSymbol, WellKnownTypes wellKnownTypes, ref HashSet<ValidatableType> validatableTypes, ref List<ITypeSymbol> visitedTypes)
+    {
+        var members = new List<ValidatableProperty>();
+        var resolvedRecordProperty = new List<IPropertySymbol>();
+
+        var fromServiceMetadataSymbol = wellKnownTypes.GetOptional(
+            WellKnownTypeData.WellKnownType.Microsoft_AspNetCore_Http_Metadata_IFromServiceMetadata);
+        var fromKeyedServiceAttributeSymbol = wellKnownTypes.GetOptional(
+            WellKnownTypeData.WellKnownType.Microsoft_Extensions_DependencyInjection_FromKeyedServicesAttribute);
+        var jsonIgnoreAttributeSymbol = wellKnownTypes.Get(
+            WellKnownTypeData.WellKnownType.System_Text_Json_Serialization_JsonIgnoreAttribute);
+        var skipValidationAttributeSymbol = wellKnownTypes.Get(
+            WellKnownTypeData.WellKnownType.Microsoft_Extensions_Validation_SkipValidationAttribute);
+
+        // Special handling for record types to extract properties from
+        // the primary constructor.
+        if (typeSymbol is INamedTypeSymbol { IsRecord: true } namedType)
+        {
+            // Find the primary constructor for the record, account
+            // for members that are in base types to account for
+            // record inheritance scenarios
+            var primaryConstructor = namedType.Constructors
+                .FirstOrDefault(c => c.Parameters.Length > 0 && c.Parameters.All(p =>
+                    namedType.FindPropertyIncludingBaseTypes(p.Name) != null));
+
+            if (primaryConstructor != null)
+            {
+                // Process all parameters in constructor order to maintain parameter ordering
+                foreach (var parameter in primaryConstructor.Parameters)
+                {
+                    // Find the corresponding property in this type, we ignore
+                    // base types here since that will be handled by the inheritance
+                    // checks in the default ValidatableTypeInfo implementation.
+                    var correspondingProperty = typeSymbol.GetMembers()
+                        .OfType<IPropertySymbol>()
+                        .FirstOrDefault(p => string.Equals(p.Name, parameter.Name, System.StringComparison.OrdinalIgnoreCase));
+
+                    if (correspondingProperty != null)
+                    {
+                        resolvedRecordProperty.Add(correspondingProperty);
+
+                        // Skip parameters that are injected as services
+                        if (parameter.IsServiceParameter(fromServiceMetadataSymbol, fromKeyedServiceAttributeSymbol))
+                        {
+                            continue;
+                        }
+
+                        // Skip primary constructor parameter if it or its type are annotated with SkipValidationAttribute
+                        if (parameter.IsSkippedValidationParameter(skipValidationAttributeSymbol))
+                        {
+                            continue;
+                        }
+
+                        // Skip properties that are not accessible from generated code
+                        if (correspondingProperty.DeclaredAccessibility is not Accessibility.Public)
+                        {
+                            continue;
+                        }
+
+                        // Skip properties that have JsonIgnore attribute
+                        if (correspondingProperty.IsJsonIgnoredProperty(jsonIgnoreAttributeSymbol))
+                        {
+                            continue;
+                        }
+
+                        // Check if the property's type is validatable, this resolves
+                        // validatable types in the inheritance hierarchy
+                        var hasValidatableType = TryExtractValidatableType(
+                            correspondingProperty.Type,
+                            wellKnownTypes,
+                            ref validatableTypes,
+                            ref visitedTypes);
+
+                        members.Add(new ValidatableProperty(
+                            ContainingType: correspondingProperty.ContainingType,
+                            Type: correspondingProperty.Type,
+                            Name: correspondingProperty.Name,
+                            DisplayName: parameter.GetDisplayName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_DisplayAttribute)) ??
+                                        correspondingProperty.GetDisplayName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_DisplayAttribute)),
+                            Attributes: []));
+                    }
+                }
+            }
+        }
+
+        // Handle properties for classes and any properties not handled by the constructor
+        foreach (var member in typeSymbol.GetMembers().OfType<IPropertySymbol>())
+        {
+            // Skip compiler generated properties and properties already processed via
+            // the record processing logic above.
+            if (member.IsImplicitlyDeclared
+                || member.IsEqualityContract(wellKnownTypes)
+                || resolvedRecordProperty.Contains(member, SymbolEqualityComparer.Default))
+            {
+                continue;
+            }
+
+            // Skip properties that are injected as services
+            if (member.IsServiceProperty(fromServiceMetadataSymbol, fromKeyedServiceAttributeSymbol))
+            {
+                continue;
+            }
+
+            // Skip properties that are not accessible from generated code
+            if (member.DeclaredAccessibility is not Accessibility.Public)
+            {
+                continue;
+            }
+
+            // Skip properties that have JsonIgnore attribute
+            if (member.IsJsonIgnoredProperty(jsonIgnoreAttributeSymbol))
+            {
+                continue;
+            }
+
+            // Skip property if it or its type are annotated with SkipValidationAttribute
+            if (member.IsSkippedValidationProperty(skipValidationAttributeSymbol))
+            {
+                continue;
+            }
+
+            var hasValidatableType = TryExtractValidatableType(member.Type, wellKnownTypes, ref validatableTypes, ref visitedTypes);
+            var attributes = ExtractValidationAttributes(member, wellKnownTypes, out var isRequired);
+
+            // If the member has no validation attributes or validatable types and is not required, skip it.
+            if (attributes.IsDefaultOrEmpty && !hasValidatableType && !isRequired)
+            {
+                continue;
+            }
+
+            members.Add(new ValidatableProperty(
+                ContainingType: member.ContainingType,
+                Type: member.Type,
+                Name: member.Name,
+                DisplayName: member.GetDisplayName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_DisplayAttribute)),
+                Attributes: attributes));
+        }
+
+        return [.. members];
+    }
+
+    internal static ImmutableArray<ValidationAttribute> ExtractValidationAttributes(ISymbol symbol, WellKnownTypes wellKnownTypes, out bool isRequired)
+    {
+        var attributes = symbol.GetAttributes();
+        if (attributes.Length == 0)
+        {
+            isRequired = false;
+            return [];
+        }
+
+        var validationAttributes = attributes
+            .Where(attribute => attribute.AttributeClass != null)
+            .Where(attribute => attribute.AttributeClass!.ImplementsValidationAttribute(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_ValidationAttribute)));
+        isRequired = validationAttributes.Any(attr => SymbolEqualityComparer.Default.Equals(attr.AttributeClass, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_RequiredAttribute)));
+        return [.. validationAttributes
+            .Where(attr => !SymbolEqualityComparer.Default.Equals(attr.AttributeClass, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_ValidationAttribute)))
+            .Select(attribute => new ValidationAttribute(
+                Name: symbol.Name + attribute.AttributeClass!.Name,
+                ClassName: attribute.AttributeClass!.ToDisplayString(_symbolDisplayFormat),
+                Arguments: [.. attribute.ConstructorArguments.Select(a => a.ToCSharpString())],
+                NamedArguments: attribute.NamedArguments.ToDictionary(namedArgument => namedArgument.Key, namedArgument => namedArgument.Value.ToCSharpString()),
+                IsCustomValidationAttribute: SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_CustomValidationAttribute))))];
+    }
+
+    internal static bool HasValidationAttributes(ISymbol symbol, WellKnownTypes wellKnownTypes)
+    {
+        var validationAttributeSymbol = wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_ValidationAttribute);
+
+        foreach (var attribute in symbol.GetAttributes())
+        {
+            if (attribute.AttributeClass is not null &&
+                attribute.AttributeClass.ImplementsValidationAttribute(validationAttributeSymbol))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    internal static bool HasIValidatableObjectInterface(ITypeSymbol typeSymbol, WellKnownTypes wellKnownTypes)
+    {
+        var validatableObjectSymbol = wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_IValidatableObject);
+        return typeSymbol.ImplementsInterface(validatableObjectSymbol);
+    }
+}
diff --git a/src/Validation/gen/ValidationsGenerator.cs b/src/Validation/gen/ValidationsGenerator.cs
new file mode 100644
index 000000000000..512f1a37f61b
--- /dev/null
+++ b/src/Validation/gen/ValidationsGenerator.cs
@@ -0,0 +1,68 @@
+// 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.Collections.Immutable;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.App.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+[Generator(LanguageNames.CSharp)]
+public sealed partial class ValidationsGenerator : IIncrementalGenerator
+{
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        // Find the builder.Services.AddValidation() call in the application.
+        var addValidation = context.SyntaxProvider.CreateSyntaxProvider(
+            predicate: FindAddValidation,
+            transform: TransformAddValidation
+        );
+
+        // Extract types that have been marked with framework [ValidatableType].
+        var frameworkValidatableTypes = context.SyntaxProvider.ForAttributeWithMetadataName(
+            "Microsoft.Extensions.Validation.ValidatableTypeAttribute",
+            predicate: ShouldTransformSymbolWithAttribute,
+            transform: TransformValidatableTypeWithAttribute
+        );
+
+        // Extract types that have been marked with generated [ValidatableType].
+        var generatedValidatableTypes = context.SyntaxProvider.ForAttributeWithMetadataName(
+            "Microsoft.Extensions.Validation.Embedded.ValidatableTypeAttribute",
+            predicate: ShouldTransformSymbolWithAttribute,
+            transform: TransformValidatableTypeWithAttribute
+        );
+
+        // Combine both sources of validatable types
+        var validatableTypesWithAttribute = frameworkValidatableTypes.Concat(generatedValidatableTypes);
+
+        // Extract all minimal API endpoints in the application.
+        var endpoints = context.SyntaxProvider
+            .CreateSyntaxProvider(
+                predicate: FindEndpoints,
+                transform: TransformEndpoints)
+            .Where(endpoint => endpoint is not null);
+
+        // Extract validatable types from all endpoints.
+        var validatableTypesFromEndpoints = endpoints
+            .Select(ExtractValidatableEndpoint);
+
+        // Join all validatable types encountered in the type graph.
+        var allValidatableTypesProviders = validatableTypesFromEndpoints
+            .Concat(validatableTypesWithAttribute);
+
+        var validatableTypes = allValidatableTypesProviders
+            .Distinct(ValidatableTypeComparer.Instance)
+            .Collect();
+
+        var emitInputs = addValidation
+            .Combine(validatableTypes);
+
+        // Emit the IValidatableInfo resolver injection and
+        // ValidatableTypeInfo for all validatable types.
+        context.RegisterSourceOutput(emitInputs, (context, emitInputs) =>
+            Emit(context, (emitInputs.Left, emitInputs.Right)));
+    }
+}
diff --git a/src/Validation/src/IValidatableInfo.cs b/src/Validation/src/IValidatableInfo.cs
new file mode 100644
index 000000000000..4b5ab3cd24b2
--- /dev/null
+++ b/src/Validation/src/IValidatableInfo.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Represents an interface for validating a value.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public interface IValidatableInfo
+{
+    /// <summary>
+    /// Validates the specified <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="context">The validation context.</param>
+    /// <param name="cancellationToken">A cancellation token to support cancellation of the validation.</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    Task ValidateAsync(object? value, ValidateContext context, CancellationToken cancellationToken);
+}
diff --git a/src/Validation/src/IValidatableInfoResolver.cs b/src/Validation/src/IValidatableInfoResolver.cs
new file mode 100644
index 000000000000..706204ab6284
--- /dev/null
+++ b/src/Validation/src/IValidatableInfoResolver.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Provides an interface for resolving the validation information associated
+/// with a given <seealso cref="Type"/> or <seealso cref="ParameterInfo"/>.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public interface IValidatableInfoResolver
+{
+    /// <summary>
+    /// Gets validation information for the specified type.
+    /// </summary>
+    /// <param name="type">The type to get validation information for.</param>
+    /// <param name="validatableInfo">
+    /// The output parameter that will contain the validatable information if found.
+    /// </param>
+    /// <returns><see langword="true" /> if the validatable type information was found; otherwise, false.</returns>
+    bool TryGetValidatableTypeInfo(Type type, [NotNullWhen(true)] out IValidatableInfo? validatableInfo);
+
+    /// <summary>
+    /// Gets validation information for the specified parameter.
+    /// </summary>
+    /// <param name="parameterInfo">The parameter to get validation information for.</param>
+    /// <param name="validatableInfo">The output parameter that will contain the validatable information if found.</param>
+    /// <returns><see langword="true" /> if the validatable parameter information was found; otherwise, false.</returns>
+    bool TryGetValidatableParameterInfo(ParameterInfo parameterInfo, [NotNullWhen(true)] out IValidatableInfo? validatableInfo);
+}
diff --git a/src/Validation/src/Microsoft.Extensions.Validation.csproj b/src/Validation/src/Microsoft.Extensions.Validation.csproj
new file mode 100644
index 000000000000..35405452fdd3
--- /dev/null
+++ b/src/Validation/src/Microsoft.Extensions.Validation.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Common validation abstractions and validation infrastructure for .NET applications.</Description>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <IsAspNetCoreApp>true</IsAspNetCoreApp>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>validation</PackageTags>
+    <IsPackable>true</IsPackable>
+    <IsTrimmable>true</IsTrimmable>
+    <EnableDefaultItems>true</EnableDefaultItems>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\Validation\gen\Microsoft.Extensions.Validation.ValidationsGenerator.csproj" Pack="false">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Package the generator in the analyzer directory of the nuget package -->
+    <None Include="$(OutputPath)\$(AssemblyName).ValidationsGenerator.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Options" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Extensions.Validation.Tests" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Validation/src/PublicAPI.Shipped.txt b/src/Validation/src/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..815c92006af7
--- /dev/null
+++ b/src/Validation/src/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
\ No newline at end of file
diff --git a/src/Validation/src/PublicAPI.Unshipped.txt b/src/Validation/src/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..e67bfe44dd6d
--- /dev/null
+++ b/src/Validation/src/PublicAPI.Unshipped.txt
@@ -0,0 +1,54 @@
+#nullable enable
+abstract Microsoft.Extensions.Validation.ValidatableTypeInfo.GetValidationAttributes() -> System.ComponentModel.DataAnnotations.ValidationAttribute![]!
+Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions
+Microsoft.Extensions.Validation.IValidatableInfo
+Microsoft.Extensions.Validation.IValidatableInfo.ValidateAsync(object? value, Microsoft.Extensions.Validation.ValidateContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.Extensions.Validation.IValidatableInfoResolver
+Microsoft.Extensions.Validation.IValidatableInfoResolver.TryGetValidatableParameterInfo(System.Reflection.ParameterInfo! parameterInfo, out Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo) -> bool
+Microsoft.Extensions.Validation.IValidatableInfoResolver.TryGetValidatableTypeInfo(System.Type! type, out Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo) -> bool
+Microsoft.Extensions.Validation.SkipValidationAttribute
+Microsoft.Extensions.Validation.SkipValidationAttribute.SkipValidationAttribute() -> void
+Microsoft.Extensions.Validation.ValidatableParameterInfo
+Microsoft.Extensions.Validation.ValidatableParameterInfo.ValidatableParameterInfo(System.Type! parameterType, string! name, string! displayName) -> void
+Microsoft.Extensions.Validation.ValidatablePropertyInfo
+Microsoft.Extensions.Validation.ValidatablePropertyInfo.ValidatablePropertyInfo(System.Type! declaringType, System.Type! propertyType, string! name, string! displayName) -> void
+Microsoft.Extensions.Validation.ValidatableTypeAttribute
+Microsoft.Extensions.Validation.ValidatableTypeAttribute.ValidatableTypeAttribute() -> void
+Microsoft.Extensions.Validation.ValidatableTypeInfo
+Microsoft.Extensions.Validation.ValidatableTypeInfo.ValidatableTypeInfo(System.Type! type, System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Validation.ValidatablePropertyInfo!>! members) -> void
+Microsoft.Extensions.Validation.ValidateContext
+Microsoft.Extensions.Validation.ValidateContext.CurrentDepth.get -> int
+Microsoft.Extensions.Validation.ValidateContext.CurrentDepth.set -> void
+Microsoft.Extensions.Validation.ValidateContext.CurrentValidationPath.get -> string!
+Microsoft.Extensions.Validation.ValidateContext.CurrentValidationPath.set -> void
+Microsoft.Extensions.Validation.ValidateContext.OnValidationError -> System.Action<Microsoft.Extensions.Validation.ValidationErrorContext>?
+Microsoft.Extensions.Validation.ValidateContext.ValidateContext() -> void
+Microsoft.Extensions.Validation.ValidateContext.ValidationContext.get -> System.ComponentModel.DataAnnotations.ValidationContext!
+Microsoft.Extensions.Validation.ValidateContext.ValidationContext.set -> void
+Microsoft.Extensions.Validation.ValidateContext.ValidationErrors.get -> System.Collections.Generic.Dictionary<string!, string![]!>?
+Microsoft.Extensions.Validation.ValidateContext.ValidationErrors.set -> void
+Microsoft.Extensions.Validation.ValidateContext.ValidationOptions.get -> Microsoft.Extensions.Validation.ValidationOptions!
+Microsoft.Extensions.Validation.ValidateContext.ValidationOptions.set -> void
+Microsoft.Extensions.Validation.ValidationErrorContext
+Microsoft.Extensions.Validation.ValidationErrorContext.Container.get -> object?
+Microsoft.Extensions.Validation.ValidationErrorContext.Container.init -> void
+Microsoft.Extensions.Validation.ValidationErrorContext.Errors.get -> System.Collections.Generic.IReadOnlyList<string!>!
+Microsoft.Extensions.Validation.ValidationErrorContext.Errors.init -> void
+Microsoft.Extensions.Validation.ValidationErrorContext.Name.get -> string!
+Microsoft.Extensions.Validation.ValidationErrorContext.Name.init -> void
+Microsoft.Extensions.Validation.ValidationErrorContext.Path.get -> string!
+Microsoft.Extensions.Validation.ValidationErrorContext.Path.init -> void
+Microsoft.Extensions.Validation.ValidationErrorContext.ValidationErrorContext() -> void
+Microsoft.Extensions.Validation.ValidationOptions
+Microsoft.Extensions.Validation.ValidationOptions.MaxDepth.get -> int
+Microsoft.Extensions.Validation.ValidationOptions.MaxDepth.set -> void
+Microsoft.Extensions.Validation.ValidationOptions.Resolvers.get -> System.Collections.Generic.IList<Microsoft.Extensions.Validation.IValidatableInfoResolver!>!
+Microsoft.Extensions.Validation.ValidationOptions.TryGetValidatableParameterInfo(System.Reflection.ParameterInfo! parameterInfo, out Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo) -> bool
+Microsoft.Extensions.Validation.ValidationOptions.TryGetValidatableTypeInfo(System.Type! type, out Microsoft.Extensions.Validation.IValidatableInfo? validatableTypeInfo) -> bool
+Microsoft.Extensions.Validation.ValidationOptions.ValidationOptions() -> void
+abstract Microsoft.Extensions.Validation.ValidatableParameterInfo.GetValidationAttributes() -> System.ComponentModel.DataAnnotations.ValidationAttribute![]!
+abstract Microsoft.Extensions.Validation.ValidatablePropertyInfo.GetValidationAttributes() -> System.ComponentModel.DataAnnotations.ValidationAttribute![]!
+static Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Validation.ValidationOptions!>? configureOptions = null) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+virtual Microsoft.Extensions.Validation.ValidatableParameterInfo.ValidateAsync(object? value, Microsoft.Extensions.Validation.ValidateContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+virtual Microsoft.Extensions.Validation.ValidatablePropertyInfo.ValidateAsync(object? value, Microsoft.Extensions.Validation.ValidateContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+virtual Microsoft.Extensions.Validation.ValidatableTypeInfo.ValidateAsync(object? value, Microsoft.Extensions.Validation.ValidateContext! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
\ No newline at end of file
diff --git a/src/Validation/src/RuntimeValidatableParameterInfoResolver.cs b/src/Validation/src/RuntimeValidatableParameterInfoResolver.cs
new file mode 100644
index 000000000000..e95490e98e2e
--- /dev/null
+++ b/src/Validation/src/RuntimeValidatableParameterInfoResolver.cs
@@ -0,0 +1,113 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.IO.Pipelines;
+using System.Linq;
+using System.Reflection;
+using System.Security.Claims;
+
+namespace Microsoft.Extensions.Validation;
+
+internal sealed class RuntimeValidatableParameterInfoResolver : IValidatableInfoResolver
+{
+    // TODO: the implementation currently relies on static discovery of types.
+    public bool TryGetValidatableTypeInfo(Type type, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+    {
+        validatableInfo = null;
+        return false;
+    }
+
+    public bool TryGetValidatableParameterInfo(ParameterInfo parameterInfo, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+    {
+        if (parameterInfo.Name == null)
+        {
+            throw new InvalidOperationException($"Encountered a parameter of type '{parameterInfo.ParameterType}' without a name. Parameters must have a name.");
+        }
+
+        // Skip method parameter if it or its type are annotated with SkipValidationAttribute.
+        if (parameterInfo.GetCustomAttribute<SkipValidationAttribute>() != null ||
+            parameterInfo.ParameterType.GetCustomAttribute<SkipValidationAttribute>() != null)
+        {
+            validatableInfo = null;
+            return false;
+        }
+
+        var validationAttributes = parameterInfo
+            .GetCustomAttributes<ValidationAttribute>()
+            .ToArray();
+
+        // If there are no validation attributes and this type is not a complex type
+        // we don't need to validate it. Complex types without attributes are still
+        // validatable because we want to run the validations on the properties.
+        if (validationAttributes.Length == 0 && !IsClass(parameterInfo.ParameterType))
+        {
+            validatableInfo = null;
+            return false;
+        }
+        validatableInfo = new RuntimeValidatableParameterInfo(
+            parameterType: parameterInfo.ParameterType,
+            name: parameterInfo.Name,
+            displayName: GetDisplayName(parameterInfo),
+            validationAttributes: validationAttributes
+        );
+        return true;
+    }
+
+    private static string GetDisplayName(ParameterInfo parameterInfo)
+    {
+        var displayAttribute = parameterInfo.GetCustomAttribute<DisplayAttribute>();
+        if (displayAttribute != null)
+        {
+            return displayAttribute.Name ?? parameterInfo.Name!;
+        }
+
+        return parameterInfo.Name!;
+    }
+
+    internal sealed class RuntimeValidatableParameterInfo(
+        Type parameterType,
+        string name,
+        string displayName,
+        ValidationAttribute[] validationAttributes) :
+            ValidatableParameterInfo(parameterType, name, displayName)
+    {
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+
+        private readonly ValidationAttribute[] _validationAttributes = validationAttributes;
+    }
+
+    private static bool IsClass(Type type)
+    {
+        // Skip primitives, enums, common built-in types, and types that are specially
+        // handled by RDF/RDG that don't need validation if they don't have attributes
+        if (type.IsPrimitive ||
+            type.IsEnum ||
+            type == typeof(string) ||
+            type == typeof(decimal) ||
+            type == typeof(DateTime) ||
+            type == typeof(DateTimeOffset) ||
+            type == typeof(TimeOnly) ||
+            type == typeof(DateOnly) ||
+            type == typeof(TimeSpan) ||
+            type == typeof(Guid) ||
+            type == typeof(ClaimsPrincipal) ||
+            type == typeof(CancellationToken) ||
+            type == typeof(Stream) ||
+            type == typeof(PipeReader))
+        {
+            return false;
+        }
+
+        // Check if the underlying type in a nullable is valid
+        if (Nullable.GetUnderlyingType(type) is { } nullableType)
+        {
+            return IsClass(nullableType);
+        }
+
+        return type.IsClass;
+    }
+}
diff --git a/src/Validation/src/SkipValidationAttribute.cs b/src/Validation/src/SkipValidationAttribute.cs
new file mode 100644
index 000000000000..ddbb2f56531e
--- /dev/null
+++ b/src/Validation/src/SkipValidationAttribute.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Indicates that a property, parameter, or a type should not be validated.
+/// When applied to a property, validation is skipped for that property.
+/// When applied to a parameter, validation is skipped for that parameter.
+/// When applied to a type, validation is skipped for all properties and parameters of that type.
+/// This includes skipping validation of nested properties for complex types.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+public sealed class SkipValidationAttribute : Attribute
+{
+}
diff --git a/src/Validation/src/TypeExtensions.cs b/src/Validation/src/TypeExtensions.cs
new file mode 100644
index 000000000000..0b11e6ec45e5
--- /dev/null
+++ b/src/Validation/src/TypeExtensions.cs
@@ -0,0 +1,134 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+internal static class TypeExtensions
+{
+    /// <summary>
+    /// Determines whether the specified type is an enumerable type.
+    /// </summary>
+    /// <param name="type">The type to check.</param>
+    /// <returns><see langword="true"/> if the type is enumerable; otherwise, <see langword="false"/>.</returns>
+    public static bool IsEnumerable(this Type type)
+    {
+        // Check if type itself is an IEnumerable
+        if (type.IsGenericType &&
+            (type.GetGenericTypeDefinition() == typeof(IEnumerable<>) ||
+            type.GetGenericTypeDefinition() == typeof(ICollection<>) ||
+            type.GetGenericTypeDefinition() == typeof(List<>) ||
+            type.GetGenericTypeDefinition() == typeof(IList<>)))
+        {
+            return true;
+        }
+
+        // Or an array
+        if (type.IsArray)
+        {
+            return true;
+        }
+
+        // Then evaluate if it implements IEnumerable and is not a string
+        if (typeof(IEnumerable).IsAssignableFrom(type) &&
+            type != typeof(string))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Determines whether the specified type is a nullable type.
+    /// </summary>
+    /// <param name="type">The type to check.</param>
+    /// <returns><see langword="true"/> if the type is nullable; otherwise, <see langword="false"/>.</returns>
+    public static bool IsNullable(this Type type)
+    {
+        if (type.IsValueType)
+        {
+            return false;
+        }
+
+        if (type.IsGenericType &&
+            type.GetGenericTypeDefinition() == typeof(Nullable<>))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Tries to get the <see cref="RequiredAttribute"/> from the specified array of validation attributes.
+    /// </summary>
+    /// <param name="attributes">The array of <see cref="ValidationAttribute"/> to search.</param>
+    /// <param name="requiredAttribute">The found <see cref="RequiredAttribute"/> if available, otherwise null.</param>
+    /// <returns><see langword="true"/> if a <see cref="RequiredAttribute"/> is found; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetRequiredAttribute(this ValidationAttribute[] attributes, [NotNullWhen(true)] out RequiredAttribute? requiredAttribute)
+    {
+        foreach (var attribute in attributes)
+        {
+            if (attribute is RequiredAttribute requiredAttr)
+            {
+                requiredAttribute = requiredAttr;
+                return true;
+            }
+        }
+
+        requiredAttribute = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Gets all types that the specified type implements or inherits from.
+    /// </summary>
+    /// <param name="type">The type to analyze.</param>
+    /// <returns>A collection containing all implemented interfaces and all base types of the given type.</returns>
+    public static List<Type> GetAllImplementedTypes([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] this Type type)
+    {
+        ArgumentNullException.ThrowIfNull(type);
+
+        var implementedTypes = new List<Type>();
+
+        // Yield all interfaces directly and indirectly implemented by this type
+        foreach (var interfaceType in type.GetInterfaces())
+        {
+            implementedTypes.Add(interfaceType);
+        }
+
+        // Finally, walk up the inheritance chain
+        var baseType = type.BaseType;
+        while (baseType != null && baseType != typeof(object))
+        {
+            implementedTypes.Add(baseType);
+            baseType = baseType.BaseType;
+        }
+
+        return implementedTypes;
+    }
+
+    /// <summary>
+    /// Determines whether the specified type implements the given interface.
+    /// </summary>
+    /// <param name="type">The type to check.</param>
+    /// <param name="interfaceType">The interface type to check for.</param>
+    /// <returns>True if the type implements the specified interface; otherwise, false.</returns>
+    public static bool ImplementsInterface(this Type type, Type interfaceType)
+    {
+        ArgumentNullException.ThrowIfNull(type);
+        ArgumentNullException.ThrowIfNull(interfaceType);
+
+        // Check if interfaceType is actually an interface
+        if (!interfaceType.IsInterface)
+        {
+            throw new ArgumentException($"Type {interfaceType.FullName} is not an interface.", nameof(interfaceType));
+        }
+
+        return interfaceType.IsAssignableFrom(type);
+    }
+}
diff --git a/src/Validation/src/ValidatableParameterInfo.cs b/src/Validation/src/ValidatableParameterInfo.cs
new file mode 100644
index 000000000000..dca5df305914
--- /dev/null
+++ b/src/Validation/src/ValidatableParameterInfo.cs
@@ -0,0 +1,139 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Contains validation information for a parameter.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public abstract class ValidatableParameterInfo : IValidatableInfo
+{
+    private RequiredAttribute? _requiredAttribute;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="ValidatableParameterInfo"/>.
+    /// </summary>
+    /// <param name="parameterType">The <see cref="Type"/> associated with the parameter.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="displayName">The display name for the parameter.</param>
+    protected ValidatableParameterInfo(
+        Type parameterType,
+        string name,
+        string displayName)
+    {
+        ParameterType = parameterType;
+        Name = name;
+        DisplayName = displayName;
+    }
+
+    /// <summary>
+    /// Gets the parameter type.
+    /// </summary>
+    internal Type ParameterType { get; }
+
+    /// <summary>
+    /// Gets the parameter name.
+    /// </summary>
+    internal string Name { get; }
+
+    /// <summary>
+    /// Gets the display name for the parameter.
+    /// </summary>
+    internal string DisplayName { get; }
+
+    /// <summary>
+    /// Gets the validation attributes for this parameter.
+    /// </summary>
+    /// <returns>An array of validation attributes to apply to this parameter.</returns>
+    protected abstract ValidationAttribute[] GetValidationAttributes();
+
+    /// <inheritdoc />
+    /// <remarks>
+    /// If the parameter is a collection, each item in the collection will be validated.
+    /// If the parameter is not a collection but has a validatable type, the single value will be validated.
+    /// </remarks>
+    public virtual async Task ValidateAsync(object? value, ValidateContext context, CancellationToken cancellationToken)
+    {
+        // Skip validation if value is null and parameter is optional
+        if (value == null && ParameterType.IsNullable())
+        {
+            return;
+        }
+
+        context.ValidationContext.DisplayName = DisplayName;
+        context.ValidationContext.MemberName = Name;
+
+        var validationAttributes = GetValidationAttributes();
+
+        if (_requiredAttribute is not null || validationAttributes.TryGetRequiredAttribute(out _requiredAttribute))
+        {
+            var result = _requiredAttribute.GetValidationResult(value, context.ValidationContext);
+
+            if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null)
+            {
+                var key = string.IsNullOrEmpty(context.CurrentValidationPath) ? Name : $"{context.CurrentValidationPath}.{Name}";
+                context.AddValidationError(Name, key, [result.ErrorMessage], null);
+                return;
+            }
+        }
+
+        // Validate against validation attributes
+        for (var i = 0; i < validationAttributes.Length; i++)
+        {
+            var attribute = validationAttributes[i];
+            try
+            {
+                var result = attribute.GetValidationResult(value, context.ValidationContext);
+                if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null)
+                {
+                    var key = string.IsNullOrEmpty(context.CurrentValidationPath) ? Name : $"{context.CurrentValidationPath}.{Name}";
+                    context.AddOrExtendValidationErrors(Name, key, [result.ErrorMessage], null);
+                }
+            }
+            catch (Exception ex)
+            {
+                var key = string.IsNullOrEmpty(context.CurrentValidationPath) ? Name : $"{context.CurrentValidationPath}.{Name}";
+                context.AddValidationError(Name, key, [ex.Message], null);
+            }
+        }
+
+        // If the parameter is a collection, validate each item
+        if (ParameterType.IsEnumerable() && value is IEnumerable enumerable)
+        {
+            var index = 0;
+            var currentPrefix = context.CurrentValidationPath;
+
+            foreach (var item in enumerable)
+            {
+                if (item != null)
+                {
+                    context.CurrentValidationPath = string.IsNullOrEmpty(currentPrefix)
+                        ? $"{Name}[{index}]"
+                        : $"{currentPrefix}.{Name}[{index}]";
+
+                    if (context.ValidationOptions.TryGetValidatableTypeInfo(item.GetType(), out var validatableType))
+                    {
+                        await validatableType.ValidateAsync(item, context, cancellationToken);
+                    }
+                }
+                index++;
+            }
+
+            context.CurrentValidationPath = currentPrefix;
+        }
+        // If not enumerable, validate the single value
+        else if (value != null)
+        {
+            var valueType = value.GetType();
+            if (context.ValidationOptions.TryGetValidatableTypeInfo(valueType, out var validatableType))
+            {
+                await validatableType.ValidateAsync(value, context, cancellationToken);
+            }
+        }
+    }
+}
diff --git a/src/Validation/src/ValidatablePropertyInfo.cs b/src/Validation/src/ValidatablePropertyInfo.cs
new file mode 100644
index 000000000000..94d7eb606fa3
--- /dev/null
+++ b/src/Validation/src/ValidatablePropertyInfo.cs
@@ -0,0 +1,175 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Contains validation information for a member of a type.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public abstract class ValidatablePropertyInfo : IValidatableInfo
+{
+    private RequiredAttribute? _requiredAttribute;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="ValidatablePropertyInfo"/>.
+    /// </summary>
+    protected ValidatablePropertyInfo(
+        [param: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+        Type declaringType,
+        Type propertyType,
+        string name,
+        string displayName)
+    {
+        DeclaringType = declaringType;
+        PropertyType = propertyType;
+        Name = name;
+        DisplayName = displayName;
+    }
+
+    /// <summary>
+    /// Gets the member type.
+    /// </summary>
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+    internal Type DeclaringType { get; }
+
+    /// <summary>
+    /// Gets the member type.
+    /// </summary>
+    internal Type PropertyType { get; }
+
+    /// <summary>
+    /// Gets the member name.
+    /// </summary>
+    internal string Name { get; }
+
+    /// <summary>
+    /// Gets the display name for the member as designated by the <see cref="DisplayAttribute"/>.
+    /// </summary>
+    internal string DisplayName { get; }
+
+    /// <summary>
+    /// Gets the validation attributes for this member.
+    /// </summary>
+    /// <returns>An array of validation attributes to apply to this member.</returns>
+    protected abstract ValidationAttribute[] GetValidationAttributes();
+
+    /// <inheritdoc />
+    public virtual async Task ValidateAsync(object? value, ValidateContext context, CancellationToken cancellationToken)
+    {
+        var property = DeclaringType.GetProperty(Name) ?? throw new InvalidOperationException($"Property '{Name}' not found on type '{DeclaringType.Name}'.");
+        var propertyValue = property.GetValue(value);
+        var validationAttributes = GetValidationAttributes();
+
+        // Calculate and save the current path
+        var originalPrefix = context.CurrentValidationPath;
+        if (string.IsNullOrEmpty(originalPrefix))
+        {
+            context.CurrentValidationPath = Name;
+        }
+        else
+        {
+            context.CurrentValidationPath = $"{originalPrefix}.{Name}";
+        }
+
+        context.ValidationContext.DisplayName = DisplayName;
+        context.ValidationContext.MemberName = Name;
+
+        // Check required attribute first
+        if (_requiredAttribute is not null || validationAttributes.TryGetRequiredAttribute(out _requiredAttribute))
+        {
+            var result = _requiredAttribute.GetValidationResult(propertyValue, context.ValidationContext);
+
+            if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null)
+            {
+                context.AddValidationError(Name, context.CurrentValidationPath, [result.ErrorMessage], value);
+                context.CurrentValidationPath = originalPrefix; // Restore prefix
+                return;
+            }
+        }
+
+        // Validate any other attributes
+        ValidateValue(propertyValue, Name, context.CurrentValidationPath, validationAttributes, value);
+
+        // Check if we've reached the maximum depth before validating complex properties
+        if (context.CurrentDepth >= context.ValidationOptions.MaxDepth)
+        {
+            throw new InvalidOperationException(
+                $"Maximum validation depth of {context.ValidationOptions.MaxDepth} exceeded at '{context.CurrentValidationPath}' in '{DeclaringType.Name}.{Name}'. " +
+                "This is likely caused by a circular reference in the object graph. " +
+                "Consider increasing the MaxDepth in ValidationOptions if deeper validation is required.");
+        }
+
+        // Increment depth counter
+        context.CurrentDepth++;
+
+        try
+        {
+            // Handle enumerable values
+            if (PropertyType.IsEnumerable() && propertyValue is System.Collections.IEnumerable enumerable)
+            {
+                var index = 0;
+                var currentPrefix = context.CurrentValidationPath;
+
+                foreach (var item in enumerable)
+                {
+                    context.CurrentValidationPath = $"{currentPrefix}[{index}]";
+
+                    if (item != null)
+                    {
+                        var itemType = item.GetType();
+                        if (context.ValidationOptions.TryGetValidatableTypeInfo(itemType, out var validatableType))
+                        {
+                            await validatableType.ValidateAsync(item, context, cancellationToken);
+                        }
+                    }
+
+                    index++;
+                }
+
+                // Restore prefix to the property name before validating the next item
+                context.CurrentValidationPath = currentPrefix;
+            }
+            else if (propertyValue != null)
+            {
+                // Validate as a complex object
+                var valueType = propertyValue.GetType();
+                if (context.ValidationOptions.TryGetValidatableTypeInfo(valueType, out var validatableType))
+                {
+                    await validatableType.ValidateAsync(propertyValue, context, cancellationToken);
+                }
+            }
+        }
+        finally
+        {
+            // Always decrement the depth counter and restore prefix
+            context.CurrentDepth--;
+            context.CurrentValidationPath = originalPrefix;
+        }
+
+        void ValidateValue(object? val, string name, string errorPrefix, ValidationAttribute[] validationAttributes, object? container)
+        {
+            for (var i = 0; i < validationAttributes.Length; i++)
+            {
+                var attribute = validationAttributes[i];
+                try
+                {
+                    var result = attribute.GetValidationResult(val, context.ValidationContext);
+                    if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null)
+                    {
+                        var key = errorPrefix.TrimStart('.');
+                        context.AddOrExtendValidationErrors(name, key, [result.ErrorMessage], container);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var key = errorPrefix.TrimStart('.');
+                    context.AddOrExtendValidationErrors(name, key, [ex.Message], container);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Validation/src/ValidatableTypeAttribute.cs b/src/Validation/src/ValidatableTypeAttribute.cs
new file mode 100644
index 000000000000..c2af4cb2a7da
--- /dev/null
+++ b/src/Validation/src/ValidatableTypeAttribute.cs
@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Indicates that a type is validatable to support discovery by the
+/// validations generator.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public sealed class ValidatableTypeAttribute : Attribute
+{
+}
diff --git a/src/Validation/src/ValidatableTypeInfo.cs b/src/Validation/src/ValidatableTypeInfo.cs
new file mode 100644
index 000000000000..e409778f1f1d
--- /dev/null
+++ b/src/Validation/src/ValidatableTypeInfo.cs
@@ -0,0 +1,203 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Contains validation information for a type.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public abstract class ValidatableTypeInfo : IValidatableInfo
+{
+    private readonly int _membersCount;
+    private readonly List<Type> _superTypes;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="ValidatableTypeInfo"/>.
+    /// </summary>
+    /// <param name="type">The type being validated.</param>
+    /// <param name="members">The members that can be validated.</param>
+    protected ValidatableTypeInfo(
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] Type type,
+        IReadOnlyList<ValidatablePropertyInfo> members)
+    {
+        Type = type;
+        Members = members;
+        _membersCount = members.Count;
+        _superTypes = type.GetAllImplementedTypes();
+    }
+
+    /// <summary>
+    /// Gets the validation attributes for this member.
+    /// </summary>
+    /// <returns>An array of validation attributes to apply to this member.</returns>
+    protected abstract ValidationAttribute[] GetValidationAttributes();
+
+    /// <summary>
+    /// The type being validated.
+    /// </summary>
+    internal Type Type { get; }
+
+    /// <summary>
+    /// The members that can be validated.
+    /// </summary>
+    internal IReadOnlyList<ValidatablePropertyInfo> Members { get; }
+
+    /// <inheritdoc />
+    public virtual async Task ValidateAsync(object? value, ValidateContext context, CancellationToken cancellationToken)
+    {
+        if (value == null)
+        {
+            return;
+        }
+
+        // Check if we've exceeded the maximum depth
+        if (context.CurrentDepth >= context.ValidationOptions.MaxDepth)
+        {
+            throw new InvalidOperationException(
+                $"Maximum validation depth of {context.ValidationOptions.MaxDepth} exceeded at '{context.CurrentValidationPath}' in '{Type.Name}'. " +
+                "This is likely caused by a circular reference in the object graph. " +
+                "Consider increasing the MaxDepth in ValidationOptions if deeper validation is required.");
+        }
+
+        var originalPrefix = context.CurrentValidationPath;
+        var originalErrorCount = context.ValidationErrors?.Count ?? 0;
+
+        try
+        {
+            // First validate direct members
+            await ValidateMembersAsync(value, context, cancellationToken);
+
+            var actualType = value.GetType();
+
+            // Then validate inherited members
+            foreach (var superTypeInfo in GetSuperTypeInfos(actualType, context))
+            {
+                await superTypeInfo.ValidateMembersAsync(value, context, cancellationToken);
+            }
+
+            // If any property-level validation errors were found, return early
+            if (context.ValidationErrors is not null && context.ValidationErrors.Count > originalErrorCount)
+            {
+                return;
+            }
+
+            // Validate type-level attributes
+            ValidateTypeAttributes(value, context);
+
+            // If any type-level attribute errors were found, return early
+            if (context.ValidationErrors is not null && context.ValidationErrors.Count > originalErrorCount)
+            {
+                return;
+            }
+
+            // Finally validate IValidatableObject if implemented
+            ValidateValidatableObjectInterface(value, context);
+        }
+        finally
+        {
+            context.CurrentValidationPath = originalPrefix;
+        }
+    }
+
+    private async Task ValidateMembersAsync(object? value, ValidateContext context, CancellationToken cancellationToken)
+    {
+        var originalPrefix = context.CurrentValidationPath;
+
+        for (var i = 0; i < _membersCount; i++)
+        {
+            try
+            {
+                await Members[i].ValidateAsync(value, context, cancellationToken);
+
+            }
+            finally
+            {
+                context.CurrentValidationPath = originalPrefix;
+            }
+        }
+    }
+
+    private void ValidateTypeAttributes(object? value, ValidateContext context)
+    {
+        var validationAttributes = GetValidationAttributes();
+        var errorPrefix = context.CurrentValidationPath;
+
+        for (var i = 0; i < validationAttributes.Length; i++)
+        {
+            var attribute = validationAttributes[i];
+            var result = attribute.GetValidationResult(value, context.ValidationContext);
+            if (result is not null && result != ValidationResult.Success && result.ErrorMessage is not null)
+            {
+                // Create a validation error for each member name that is provided
+                foreach (var memberName in result.MemberNames)
+                {
+                    var key = string.IsNullOrEmpty(errorPrefix) ? memberName : $"{errorPrefix}.{memberName}";
+                    context.AddOrExtendValidationError(memberName, key, result.ErrorMessage, value);
+                }
+
+                if (!result.MemberNames.Any())
+                {
+                    // If no member names are specified, then treat this as a top-level error
+                    context.AddOrExtendValidationError(string.Empty, errorPrefix, result.ErrorMessage, value);
+                }
+            }
+        }
+    }
+
+    private void ValidateValidatableObjectInterface(object? value, ValidateContext context)
+    {
+        if (Type.ImplementsInterface(typeof(IValidatableObject)) && value is IValidatableObject validatable)
+        {
+            // Important: Set the DisplayName to the type name for top-level validations
+            // and restore the original validation context properties
+            var originalDisplayName = context.ValidationContext.DisplayName;
+            var originalMemberName = context.ValidationContext.MemberName;
+            var errorPrefix = context.CurrentValidationPath;
+
+            // Set the display name to the class name for IValidatableObject validation
+            context.ValidationContext.DisplayName = Type.Name;
+            context.ValidationContext.MemberName = null;
+
+            var validationResults = validatable.Validate(context.ValidationContext);
+            foreach (var validationResult in validationResults)
+            {
+                if (validationResult != ValidationResult.Success && validationResult.ErrorMessage is not null)
+                {
+                    // Create a validation error for each member name that is provided
+                    foreach (var memberName in validationResult.MemberNames)
+                    {
+                        var key = string.IsNullOrEmpty(errorPrefix) ? memberName : $"{errorPrefix}.{memberName}";
+                        context.AddOrExtendValidationError(memberName, key, validationResult.ErrorMessage, value);
+                    }
+
+                    if (!validationResult.MemberNames.Any())
+                    {
+                        // If no member names are specified, then treat this as a top-level error
+                        context.AddOrExtendValidationError(string.Empty, string.Empty, validationResult.ErrorMessage, value);
+                    }
+                }
+            }
+
+            // Restore the original validation context properties
+            context.ValidationContext.DisplayName = originalDisplayName;
+            context.ValidationContext.MemberName = originalMemberName;
+        }
+    }
+
+    private IEnumerable<ValidatableTypeInfo> GetSuperTypeInfos(Type actualType, ValidateContext context)
+    {
+        foreach (var superType in _superTypes.Where(t => t.IsAssignableFrom(actualType)))
+        {
+            if (context.ValidationOptions.TryGetValidatableTypeInfo(superType, out var found)
+                && found is ValidatableTypeInfo superTypeInfo)
+            {
+                yield return superTypeInfo;
+            }
+        }
+    }
+}
diff --git a/src/Validation/src/ValidateContext.cs b/src/Validation/src/ValidateContext.cs
new file mode 100644
index 000000000000..5cce279c4be9
--- /dev/null
+++ b/src/Validation/src/ValidateContext.cs
@@ -0,0 +1,128 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Represents the context for validating a validatable object.
+/// </summary>
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public sealed class ValidateContext
+{
+    /// <summary>
+    /// Gets or sets the validation context used for validating objects that implement <see cref="IValidatableObject"/> or have <see cref="ValidationAttribute"/>.
+    /// This context provides access to service provider and other validation metadata.
+    /// </summary>
+    /// <remarks>
+    /// This property should be set by the consumer of the <see cref="IValidatableInfo"/>
+    /// interface to provide the necessary context for validation. The object should be initialized
+    /// with the current object being validated, the display name, and the service provider to support
+    /// the complete set of validation scenarios.
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// var validationContext = new ValidationContext(objectToValidate, serviceProvider, items);
+    /// var validationOptions = serviceProvider.GetService&lt;IOptions&lt;ValidationOptions&gt;&gt;()?.Value;
+    /// var validateContext = new ValidateContext
+    /// {
+    ///     ValidationContext = validationContext,
+    ///     ValidationOptions = validationOptions
+    /// };
+    /// </code>
+    /// </example>
+    public required ValidationContext ValidationContext { get; set; }
+
+    /// <summary>
+    /// Gets or sets the prefix used to identify the current object being validated in a complex object graph.
+    /// This is used to build property paths in validation error messages (e.g., "Customer.Address.Street").
+    /// </summary>
+    public string CurrentValidationPath { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the validation options that control validation behavior,
+    /// including validation depth limits and resolver registration.
+    /// </summary>
+    public required ValidationOptions ValidationOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the dictionary of validation errors collected during validation.
+    /// Keys are property names or paths, and values are arrays of error messages.
+    /// In the default implementation, this dictionary is initialized when the first error is added.
+    /// </summary>
+    public Dictionary<string, string[]>? ValidationErrors { get; set; }
+
+    /// <summary>
+    /// Gets or sets the current depth in the validation hierarchy.
+    /// This is used to prevent stack overflows from circular references.
+    /// </summary>
+    public int CurrentDepth { get; set; }
+
+    /// <summary>
+    /// Optional event raised when a validation error is reported.
+    /// </summary>
+    public event Action<ValidationErrorContext>? OnValidationError;
+
+    internal void AddValidationError(string propertyName, string key, string[] error, object? container)
+    {
+        ValidationErrors ??= [];
+
+        ValidationErrors[key] = error;
+        OnValidationError?.Invoke(new ValidationErrorContext
+        {
+            Name = propertyName,
+            Path = key,
+            Errors = error,
+            Container = container
+        });
+    }
+
+    internal void AddOrExtendValidationErrors(string propertyName, string key, string[] errors, object? container)
+    {
+        ValidationErrors ??= [];
+
+        if (ValidationErrors.TryGetValue(key, out var existingErrors))
+        {
+            var newErrors = new string[existingErrors.Length + errors.Length];
+            existingErrors.CopyTo(newErrors, 0);
+            errors.CopyTo(newErrors, existingErrors.Length);
+            ValidationErrors[key] = newErrors;
+        }
+        else
+        {
+            ValidationErrors[key] = errors;
+        }
+
+        OnValidationError?.Invoke(new ValidationErrorContext
+        {
+            Name = propertyName,
+            Path = key,
+            Errors = errors,
+            Container = container
+        });
+    }
+
+    internal void AddOrExtendValidationError(string name, string key, string error, object? container)
+    {
+        ValidationErrors ??= [];
+
+        if (ValidationErrors.TryGetValue(key, out var existingErrors) && !existingErrors.Contains(error))
+        {
+            ValidationErrors[key] = [.. existingErrors, error];
+        }
+        else
+        {
+            ValidationErrors[key] = [error];
+        }
+
+        OnValidationError?.Invoke(new ValidationErrorContext
+        {
+            Name = name,
+            Path = key,
+            Errors = [error],
+            Container = container
+        });
+    }
+}
diff --git a/src/Validation/src/ValidationErrorContext.cs b/src/Validation/src/ValidationErrorContext.cs
new file mode 100644
index 000000000000..b159ce2c6209
--- /dev/null
+++ b/src/Validation/src/ValidationErrorContext.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Represents the context of a validation error.
+/// </summary>
+[DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
+[Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+public readonly struct ValidationErrorContext
+{
+    /// <summary>
+    /// Gets the name of the property or parameter that caused the validation error.
+    /// </summary>
+    public required string Name { get; init; }
+
+    /// <summary>
+    /// Gets the full path from the root object to the property or parameter that caused the validation error.
+    /// </summary>
+    public required string Path { get; init; }
+
+    /// <summary>
+    /// Gets the list of error messages associated with the validation error.
+    /// </summary>
+    public required IReadOnlyList<string> Errors { get; init; }
+
+    /// <summary>
+    /// Gets a reference to the container object of the validated property.
+    /// </summary>
+    public required object? Container { get; init; }
+
+    private string GetDebuggerDisplay()
+    {
+        return $"{Path}: {string.Join(",", Errors)}";
+    }
+}
diff --git a/src/Validation/src/ValidationOptions.cs b/src/Validation/src/ValidationOptions.cs
new file mode 100644
index 000000000000..13729b5f124a
--- /dev/null
+++ b/src/Validation/src/ValidationOptions.cs
@@ -0,0 +1,75 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace Microsoft.Extensions.Validation;
+
+/// <summary>
+/// Provides configuration options for the validation system.
+/// </summary>
+public class ValidationOptions
+{
+    /// <summary>
+    /// Gets the list of resolvers that provide validation metadata for types and parameters.
+    /// Resolvers are processed in order, with the first resolver providing a non-null result being used.
+    /// </summary>
+    /// <remarks>
+    /// Source-generated resolvers are typically inserted at the beginning of this list
+    /// to ensure they are checked before any runtime-based resolvers.
+    /// </remarks>
+    [Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+    public IList<IValidatableInfoResolver> Resolvers { get; } = [];
+
+    /// <summary>
+    /// Gets or sets the maximum depth for validation of nested objects.
+    /// This prevents stack overflows from circular references or extremely deep object graphs.
+    /// Default value is 32.
+    /// </summary>
+    public int MaxDepth { get; set; } = 32;
+
+    /// <summary>
+    /// Attempts to get validation information for the specified type.
+    /// </summary>
+    /// <param name="type">The type to get validation information for.</param>
+    /// <param name="validatableTypeInfo">When this method returns, contains the validation information for the specified type,
+    /// if the type was found; otherwise, null.</param>
+    /// <returns>true if validation information was found for the specified type; otherwise, false.</returns>
+    [Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+    public bool TryGetValidatableTypeInfo(Type type, [NotNullWhen(true)] out IValidatableInfo? validatableTypeInfo)
+    {
+        foreach (var resolver in Resolvers)
+        {
+            if (resolver.TryGetValidatableTypeInfo(type, out validatableTypeInfo))
+            {
+                return true;
+            }
+        }
+
+        validatableTypeInfo = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Attempts to get validation information for the specified parameter.
+    /// </summary>
+    /// <param name="parameterInfo">The parameter to get validation information for.</param>
+    /// <param name="validatableInfo">When this method returns, contains the validation information for the specified parameter,
+    /// if validation information was found; otherwise, null.</param>
+    /// <returns>true if validation information was found for the specified parameter; otherwise, false.</returns>
+    [Experimental("ASP0029", UrlFormat = "https://aka.ms/aspnet/analyzer/{0}")]
+    public bool TryGetValidatableParameterInfo(ParameterInfo parameterInfo, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+    {
+        foreach (var resolver in Resolvers)
+        {
+            if (resolver.TryGetValidatableParameterInfo(parameterInfo, out validatableInfo))
+            {
+                return true;
+            }
+        }
+
+        validatableInfo = null;
+        return false;
+    }
+}
diff --git a/src/Validation/src/ValidationServiceCollectionExtensions.cs b/src/Validation/src/ValidationServiceCollectionExtensions.cs
new file mode 100644
index 000000000000..91d45a8d263e
--- /dev/null
+++ b/src/Validation/src/ValidationServiceCollectionExtensions.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// Extension methods for adding validation services.
+/// </summary>
+public static class ValidationServiceCollectionExtensions
+{
+    /// <summary>
+    /// Adds the validation services to the specified <see cref="IServiceCollection" />.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection" /> to add the services to.</param>
+    /// <param name="configureOptions">An optional action to configure the <see cref="ValidationOptions"/>.</param>
+    /// <returns>The <see cref="IServiceCollection" /> for chaining.</returns>
+    public static IServiceCollection AddValidation(this IServiceCollection services, Action<ValidationOptions>? configureOptions = null)
+    {
+        services.Configure<ValidationOptions>(options =>
+        {
+            if (configureOptions is not null)
+            {
+                configureOptions(options);
+            }
+            // Support ParameterInfo resolution at runtime
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+            options.Resolvers.Add(new RuntimeValidatableParameterInfoResolver());
+#pragma warning restore ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        });
+        return services;
+    }
+}
diff --git a/src/Validation/startvs.cmd b/src/Validation/startvs.cmd
new file mode 100644
index 000000000000..f56a8ce36233
--- /dev/null
+++ b/src/Validation/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Validation.slnf
diff --git a/src/Validation/startvscode.cmd b/src/Validation/startvscode.cmd
new file mode 100644
index 000000000000..d403f3028231
--- /dev/null
+++ b/src/Validation/startvscode.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvscode.cmd %~dp0
diff --git a/src/Validation/startvscode.sh b/src/Validation/startvscode.sh
new file mode 100755
index 000000000000..346f74c01e76
--- /dev/null
+++ b/src/Validation/startvscode.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../.."
+"$repo_root/startvscode.sh" $DIR
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/Microsoft.Extensions.Validation.GeneratorTests.csproj b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/Microsoft.Extensions.Validation.GeneratorTests.csproj
new file mode 100644
index 000000000000..db08d20e21a2
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/Microsoft.Extensions.Validation.GeneratorTests.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\Validation\gen\Microsoft.Extensions.Validation.ValidationsGenerator.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp" />
+    <Reference Include="Microsoft.Extensions.Validation" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
+    <Reference Include="Microsoft.AspNetCore.Http.Results" />
+    <Reference Include="Microsoft.AspNetCore" />
+    <Reference Include="Microsoft.AspNetCore.Routing" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
+    <Reference Include="Microsoft.AspNetCore.Mvc.Abstractions" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.Extensions.Hosting" />
+    <Reference Include="Verify.XUnit" />
+    <Reference Include="Verify.SourceGenerators" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <HelixContent Include="$(MSBuildProjectDirectory)\snapshots\**" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ModuleInitializer.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ModuleInitializer.cs
new file mode 100644
index 000000000000..2e42614606d4
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ModuleInitializer.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+public static class ModuleInitializer
+{
+    [ModuleInitializer]
+    public static void Init() =>
+        VerifySourceGenerators.Initialize();
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.AutoGeneratedAttribute.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.AutoGeneratedAttribute.cs
new file mode 100644
index 000000000000..788d488e49b1
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.AutoGeneratedAttribute.cs
@@ -0,0 +1,127 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Validation.GeneratorTests;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+[UsesVerify]
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    private const string GeneratedAttributeSource = """
+        // <auto-generated/>
+        namespace Microsoft.CodeAnalysis
+        {
+            [global::System.AttributeUsage(global::System.AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+            internal sealed class EmbeddedAttribute : global::System.Attribute
+            {
+            }
+        }
+
+        namespace Microsoft.Extensions.Validation.Embedded
+        {
+            [global::Microsoft.CodeAnalysis.EmbeddedAttribute]
+            [global::System.AttributeUsage(global::System.AttributeTargets.Class)]
+            internal sealed class ValidatableTypeAttribute : global::System.Attribute
+            {
+            }
+        }
+        """;
+
+    [Fact]
+    public async Task CanDiscoverGeneratedValidatableTypeAttribute()
+    {
+        var source = """
+
+            namespace MyApp
+            {
+                using Microsoft.AspNetCore.Builder;
+                using Microsoft.Extensions.DependencyInjection;
+                using System.ComponentModel.DataAnnotations;
+                using Microsoft.Extensions.Validation.Embedded;
+
+                public class Program
+                {
+                    public static void Main(string[] args)
+                    {
+                        var builder = WebApplication.CreateBuilder(args);
+                        builder.Services.AddValidation();
+                        var app = builder.Build();
+                        app.MapPost("/customers", (Customer customer) => "OK");
+                        app.Run();
+                    }
+                }
+
+                [ValidatableType]
+                public class Customer
+                {
+                    [Required]
+                    public string Name { get; set; } = "";
+
+                    [EmailAddress]
+                    public string Email { get; set; } = "";
+                }
+            }
+            """;
+
+        // Combine the generated attribute with the user's source
+        var combinedSource = GeneratedAttributeSource + "\n" + source;
+
+        await Verify(combinedSource, out var compilation);
+    }
+
+    [Fact]
+    public async Task CanUseBothFrameworkAndGeneratedValidatableTypeAttributes()
+    {
+        var source = """
+            namespace MyApp
+            {
+                using Microsoft.AspNetCore.Builder;
+                using Microsoft.Extensions.DependencyInjection;
+                using System.ComponentModel.DataAnnotations;
+                using Microsoft.Extensions.Validation.Embedded;
+            
+                public class Program
+                {
+                    public static void Main(string[] args)
+                    {
+                        var builder = WebApplication.CreateBuilder(args);
+                        builder.Services.AddValidation();
+                        var app = builder.Build();
+                        app.MapPost("/customers", (Customer customer) => "OK");
+                        app.Run();
+                    }
+                }
+
+                // Using framework attribute
+                [Microsoft.Extensions.Validation.ValidatableType]
+                public class Customer
+                {
+                    [Required]
+                    public string Name { get; set; } = "";
+            
+                    [EmailAddress]
+                    public string Email { get; set; } = "";
+                }
+            
+                // Using generated attribute
+                [ValidatableType]
+                public class Product
+                {
+                    [Required]
+                    public string ProductName { get; set; } = "";
+            
+                    [Range(0, double.MaxValue)]
+                    public decimal Price { get; set; }
+                }
+            }
+            """;
+
+        // Combine the generated attribute with the user's source
+        var combinedSource = GeneratedAttributeSource + "\n" + source;
+
+        await Verify(combinedSource, out var compilation);
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ClassAttributes.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ClassAttributes.cs
new file mode 100644
index 000000000000..ad2c5ab14b6f
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ClassAttributes.cs
@@ -0,0 +1,170 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// 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.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateValidationAttributesOnClasses()
+    {
+        var source = """
+#pragma warning disable ASP0029
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.Run();
+
+[ValidatableType]
+[SumLimit]
+public class ComplexType : IPoint
+{
+    [Range(0, 15)]
+    public int X { get; set; } = 10;
+
+    [Range(0, 15)]
+    public int Y { get; set; } = 10;
+
+    public NestedType ObjectProperty { get; set; } = new NestedType();
+}
+
+// This class does not have any property-level validation attributes, but it has a class-level validation attribute.
+// Therefore, its type info should still be emitted in the generator output.
+[SumLimit]
+public class NestedType : IPoint
+{
+    public int X { get; set; } = 10;
+
+    public int Y { get; set; } = 10;
+}
+
+public interface IPoint
+{
+    int X { get; }
+    int Y { get; }
+}
+
+public class SumLimitAttribute : ValidationAttribute
+{
+    protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+    {
+        if (value is IPoint point)
+        {
+            if (point.X + point.Y > 20)
+            {
+                return new ValidationResult($"Sum is too high");
+            }
+        }
+        return ValidationResult.Success;
+    }
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyValidatableType(compilation, "ComplexType", async (validationOptions, type) =>
+        {
+            Assert.True(validationOptions.TryGetValidatableTypeInfo(type, out var validatableTypeInfo));
+
+            await InvalidPropertyAttributeCheck_ProducesError_AndShortCircuits(validatableTypeInfo);
+            await ValidClassAttributeCheck_DoesNotProduceError(validatableTypeInfo);
+            await InvalidClassAttributeCheck_ProducesError(validatableTypeInfo);
+            await InvalidNestedClassAttributeCheck_ProducesError_AndShortCircuits(validatableTypeInfo);
+
+            async Task InvalidPropertyAttributeCheck_ProducesError_AndShortCircuits(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("X")?.SetValue(instance, 16);
+                type.GetProperty("Y")?.SetValue(instance, 0);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.NotNull(context.ValidationErrors);
+                var propertyAttributeError = Assert.Single(context.ValidationErrors);
+                Assert.Equal("X", propertyAttributeError.Key);
+                Assert.Equal("The field X must be between 0 and 15.", propertyAttributeError.Value.Single());
+            }
+
+            async Task ValidClassAttributeCheck_DoesNotProduceError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+
+            async Task InvalidClassAttributeCheck_ProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("X")?.SetValue(instance, 11);
+                type.GetProperty("Y")?.SetValue(instance, 12);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.NotNull(context.ValidationErrors);
+                var classAttributeError = Assert.Single(context.ValidationErrors);
+                Assert.Equal(string.Empty, classAttributeError.Key);
+                Assert.Equal("Sum is too high", classAttributeError.Value.Single());
+            }
+
+            async Task InvalidNestedClassAttributeCheck_ProducesError_AndShortCircuits(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var objectPropertyInstance = type.GetProperty("ObjectProperty").GetValue(instance);
+                objectPropertyInstance.GetType().GetProperty("X")?.SetValue(objectPropertyInstance, 11);
+                objectPropertyInstance.GetType().GetProperty("Y")?.SetValue(objectPropertyInstance, 12);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.NotNull(context.ValidationErrors);
+                var classAttributeError = Assert.Single(context.ValidationErrors);
+                Assert.Equal("ObjectProperty", classAttributeError.Key);
+                Assert.Equal("Sum is too high", classAttributeError.Value.Single());
+            }
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ComplexType.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ComplexType.cs
new file mode 100644
index 000000000000..d4bd0ef579f5
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ComplexType.cs
@@ -0,0 +1,626 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateComplexTypesWithJsonIgnore()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc;
+using System.Text.Json.Serialization;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapPost("/complex-type-with-json-ignore", (ComplexTypeWithJsonIgnore complexType) => Results.Ok("Passed"!));
+app.MapPost("/record-type-with-json-ignore", (RecordTypeWithJsonIgnore recordType) => Results.Ok("Passed"!));
+
+app.Run();
+
+public class ComplexTypeWithJsonIgnore
+{
+    [Range(10, 100)]
+    public int ValidatedProperty { get; set; } = 10;
+
+    [JsonIgnore]
+    [Required] // This should be ignored because of [JsonIgnore]
+    public string IgnoredProperty { get; set; } = null!;
+
+    [JsonIgnore]
+    public CircularReferenceType? CircularReference { get; set; }
+}
+
+public class CircularReferenceType
+{
+    [JsonIgnore]
+    public ComplexTypeWithJsonIgnore? Parent { get; set; }
+    
+    public string Name { get; set; } = "test";
+}
+
+public record RecordTypeWithJsonIgnore
+{
+    [Range(10, 100)]
+    public int ValidatedProperty { get; set; } = 10;
+
+    [JsonIgnore]
+    [Required] // This should be ignored because of [JsonIgnore]
+    public string IgnoredProperty { get; set; } = null!;
+
+    [JsonIgnore]
+    public CircularReferenceRecord? CircularReference { get; set; }
+}
+
+public record CircularReferenceRecord
+{
+    [JsonIgnore]
+    public RecordTypeWithJsonIgnore? Parent { get; set; }
+    
+    public string Name { get; set; } = "test";
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/complex-type-with-json-ignore", async (endpoint, serviceProvider) =>
+        {
+            await ValidInputWithJsonIgnoreProducesNoWarnings(endpoint);
+            await InvalidValidatedPropertyProducesError(endpoint);
+
+            async Task ValidInputWithJsonIgnoreProducesNoWarnings(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "ValidatedProperty": 50
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+                await endpoint.RequestDelegate(context);
+
+                Assert.Equal(200, context.Response.StatusCode);
+            }
+
+            async Task InvalidValidatedPropertyProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "ValidatedProperty": 5
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("ValidatedProperty", kvp.Key);
+                    Assert.Equal("The field ValidatedProperty must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+        });
+        
+        await VerifyEndpoint(compilation, "/record-type-with-json-ignore", async (endpoint, serviceProvider) =>
+        {
+            await ValidInputWithJsonIgnoreProducesNoWarningsForRecord(endpoint);
+            await InvalidValidatedPropertyProducesErrorForRecord(endpoint);
+
+            async Task ValidInputWithJsonIgnoreProducesNoWarningsForRecord(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "ValidatedProperty": 50
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+                await endpoint.RequestDelegate(context);
+
+                Assert.Equal(200, context.Response.StatusCode);
+            }
+
+            async Task InvalidValidatedPropertyProducesErrorForRecord(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "ValidatedProperty": 5
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("ValidatedProperty", kvp.Key);
+                    Assert.Equal("The field ValidatedProperty must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+        });
+    }
+    [Fact]
+    public async Task CanValidateComplexTypes()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+builder.Services.AddSingleton<TestService>();
+
+var app = builder.Build();
+
+app.MapPost("/complex-type", (ComplexType complexType) => Results.Ok("Passed"!));
+
+app.Run();
+
+public class ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+
+    [Range(10, 100), Display(Name = "Valid identifier")]
+    public int IntegerWithRangeAndDisplayName { get; set; } = 50;
+
+    [Required]
+    public SubType PropertyWithMemberAttributes { get; set; } = new SubType("some-value", default);
+
+    public SubType PropertyWithoutMemberAttributes { get; set; } = new SubType("some-value", default);
+
+    public SubTypeWithInheritance PropertyWithInheritance { get; set; } = new SubTypeWithInheritance("some-value", default);
+
+    // Nullable to validate https://github.com/dotnet/aspnetcore/issues/61737
+    public List<SubType>? ListOfSubTypes { get; set; } = [];
+
+    [DerivedValidation(ErrorMessage = "Value must be an even number")]
+    public int IntegerWithDerivedValidationAttribute { get; set; }
+
+    [CustomValidation(typeof(CustomValidators), nameof(CustomValidators.Validate))]
+    public int IntegerWithCustomValidation { get; set; } = 0;
+
+    [DerivedValidation, Range(10, 100)]
+    public int PropertyWithMultipleAttributes { get; set; } = 10;
+
+    [FromServices]
+    [Required] // This should be ignored because of [FromServices]
+    public TestService ServiceProperty { get; set; } = null!;
+}
+
+public class DerivedValidationAttribute : ValidationAttribute
+{
+    public override bool IsValid(object? value) => value is int number && number % 2 == 0;
+}
+
+public class SubType(string? requiredProperty, string? stringWithLength)
+{
+    [Required]
+    public string RequiredProperty { get; } = requiredProperty;
+
+    [StringLength(10)]
+    public string? StringWithLength { get; } = stringWithLength;
+}
+
+public class SubTypeWithInheritance(string? requiredProperty, string? stringWithLength) : SubType(requiredProperty, stringWithLength)
+{
+    [EmailAddress]
+    public string? EmailString { get; set; }
+}
+
+public static class CustomValidators
+{
+    public static ValidationResult Validate(int number, ValidationContext validationContext)
+    {
+        var parent = (ComplexType)validationContext.ObjectInstance;
+
+        if (parent.IntegerWithRange == number)
+        {
+            return new ValidationResult(
+                "Can't use the same number value in two properties on the same class.",
+                new[] { validationContext.MemberName });
+        }
+
+        return ValidationResult.Success;
+    }
+}
+
+public class TestService
+{
+    [Range(10, 100)]
+    public int Value { get; set; } = 4;
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/complex-type", async (endpoint, serviceProvider) =>
+        {
+            await InvalidIntegerWithRangeProducesError(endpoint);
+            await InvalidIntegerWithRangeAndDisplayNameProducesError(endpoint);
+            await MissingRequiredSubtypePropertyProducesError(endpoint);
+            await InvalidRequiredSubtypePropertyProducesError(endpoint);
+            await InvalidSubTypeWithInheritancePropertyProducesError(endpoint);
+            await InvalidListOfSubTypesProducesError(endpoint);
+            await InvalidPropertyWithDerivedValidationAttributeProducesError(endpoint);
+            await InvalidPropertyWithMultipleAttributesProducesError(endpoint);
+            await InvalidPropertyWithCustomValidationProducesError(endpoint);
+            await ValidInputProducesNoWarnings(endpoint);
+
+            async Task InvalidIntegerWithRangeProducesError(Endpoint endpoint)
+            {
+
+                var payload = """
+                {
+                    "IntegerWithRange": 5
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidIntegerWithRangeAndDisplayNameProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "IntegerWithRangeAndDisplayName": 5
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRangeAndDisplayName", kvp.Key);
+                    Assert.Equal("The field Valid identifier must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task MissingRequiredSubtypePropertyProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "PropertyWithMemberAttributes": null
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes", kvp.Key);
+                    Assert.Equal("The PropertyWithMemberAttributes field is required.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidRequiredSubtypePropertyProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "PropertyWithMemberAttributes": {
+                        "RequiredProperty": "",
+                        "StringWithLength": "way-too-long"
+                    }
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes.RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes.StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidSubTypeWithInheritancePropertyProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "PropertyWithInheritance": {
+                        "RequiredProperty": "",
+                        "StringWithLength": "way-too-long",
+                        "EmailString": "not-an-email"
+                    }
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithInheritance.EmailString", kvp.Key);
+                    Assert.Equal("The EmailString field is not a valid e-mail address.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithInheritance.RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithInheritance.StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidListOfSubTypesProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "ListOfSubTypes": [
+                        {
+                            "RequiredProperty": "",
+                            "StringWithLength": "way-too-long"
+                        },
+                        {
+                            "RequiredProperty": "valid",
+                            "StringWithLength": "way-too-long"
+                        },
+                        {
+                            "RequiredProperty": "valid",
+                            "StringWithLength": "valid"
+                        }
+                    ]
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("ListOfSubTypes[0].RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("ListOfSubTypes[0].StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("ListOfSubTypes[1].StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidPropertyWithDerivedValidationAttributeProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "IntegerWithDerivedValidationAttribute": 5
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithDerivedValidationAttribute", kvp.Key);
+                    Assert.Equal("Value must be an even number", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidPropertyWithMultipleAttributesProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "PropertyWithMultipleAttributes": 5
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMultipleAttributes", kvp.Key);
+                    Assert.Collection(kvp.Value,
+                    error =>
+                    {
+                        Assert.Equal("The field PropertyWithMultipleAttributes is invalid.", error);
+                    },
+                    error =>
+                    {
+                        Assert.Equal("The field PropertyWithMultipleAttributes must be between 10 and 100.", error);
+                    });
+                });
+            }
+
+            async Task InvalidPropertyWithCustomValidationProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "IntegerWithRange": 42,
+                    "IntegerWithCustomValidation": 42
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithCustomValidation", kvp.Key);
+                    var error = Assert.Single(kvp.Value);
+                    Assert.Equal("Can't use the same number value in two properties on the same class.", error);
+                });
+            }
+
+            async Task ValidInputProducesNoWarnings(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "IntegerWithRange": 50,
+                    "IntegerWithRangeAndDisplayName": 50,
+                    "PropertyWithMemberAttributes": {
+                        "RequiredProperty": "valid",
+                        "StringWithLength": "valid"
+                    },
+                    "PropertyWithoutMemberAttributes": {
+                        "RequiredProperty": "valid",
+                        "StringWithLength": "valid"
+                    },
+                    "PropertyWithInheritance": {
+                        "RequiredProperty": "valid",
+                        "StringWithLength": "valid",
+                        "EmailString": "test@example.com"
+                    },
+                    "ListOfSubTypes": [],
+                    "IntegerWithDerivedValidationAttribute": 2,
+                    "IntegerWithCustomValidation": 0,
+                    "PropertyWithMultipleAttributes": 12
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+                await endpoint.RequestDelegate(context);
+
+                Assert.Equal(200, context.Response.StatusCode);
+            }
+        });
+    }
+
+    [Fact]
+    public async Task SkipsClassesWithNonAccessibleTypes()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapPost("/accessibility-test", (AccessibilityTestType accessibilityTest) => Results.Ok("Passed"!));
+
+app.Run();
+
+public class AccessibilityTestType
+{
+    [Required]
+    public string PublicProperty { get; set; } = "";
+
+    [Required]
+    private string PrivateProperty { get; set; } = "";
+
+    [Required]
+    protected string ProtectedProperty { get; set; } = "";
+
+    [Required]
+    private PrivateNestedType PrivateNestedProperty { get; set; } = new();
+
+    [Required]
+    protected ProtectedNestedType ProtectedNestedProperty { get; set; } = new();
+
+    [Required]
+    internal InternalNestedType InternalNestedProperty { get; set; } = new();
+
+    private class PrivateNestedType
+    {
+        [Required]
+        public string RequiredProperty { get; set; } = "";
+    }
+
+    protected class ProtectedNestedType
+    {
+        [Required]
+        public string RequiredProperty { get; set; } = "";
+    }
+
+    internal class InternalNestedType
+    {
+        [Required]
+        public string RequiredProperty { get; set; } = "";
+    }
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/accessibility-test", async (endpoint, serviceProvider) =>
+        {
+            await ValidPublicPropertyStillValidated(endpoint);
+
+            async Task ValidPublicPropertyStillValidated(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "PublicProperty": ""
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("PublicProperty", kvp.Key);
+                    Assert.Equal("The PublicProperty field is required.", kvp.Value.Single());
+                });
+            }
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.IValidatableObject.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.IValidatableObject.cs
new file mode 100644
index 000000000000..e3fe63ddca97
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.IValidatableObject.cs
@@ -0,0 +1,308 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateIValidatableObject()
+    {
+        var source = """
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+builder.Services.AddSingleton<IRangeService, RangeService>();
+builder.Services.AddKeyedSingleton<TestService>("serviceKey");
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapPost("/validatable-object", (
+    ComplexValidatableType model,
+    // Demonstrates that parameters that are annotated with [FromService] are not processed
+    // by the source generator and not emitted as ValidatableTypes in the generated code.
+    [FromServices] IRangeService rangeService,
+    [FromKeyedServices("serviceKey")] TestService testService) => Results.Ok(rangeService.GetMinimum()));
+
+app.Run();
+
+public class ComplexValidatableType: IValidatableObject
+{
+    [Display(Name = "Value 1")]
+    public int Value1 { get; set; }
+
+    [EmailAddress]
+    [Required]
+    public required string Value2 { get; set; } = "test@example.com";
+
+    public ValidatableSubType SubType { get; set; } = new ValidatableSubType();
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        var rangeService = (IRangeService?)validationContext.GetService(typeof(IRangeService));
+        var minimum = rangeService?.GetMinimum();
+        var maximum = rangeService?.GetMaximum();
+        if (Value1 < minimum || Value1 > maximum)
+        {
+            yield return new ValidationResult($"The field {nameof(Value1)} must be between {minimum} and {maximum}.", [nameof(Value1)]);
+        }
+    }
+}
+
+public class SubType
+{
+    [Required]
+    // This gets ignored since it has an unsupported constructor name
+    [Display(ShortName = "SubType")]
+    public string RequiredProperty { get; set; } = "some-value";
+
+    [StringLength(10)]
+    public string? StringWithLength { get; set; }
+}
+
+public class ValidatableSubType : SubType, IValidatableObject
+{
+    public string Value3 { get; set; } = "some-value";
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (Value3 != "some-value")
+        {
+            yield return new ValidationResult($"The field {validationContext.DisplayName} must be 'some-value'.", [nameof(Value3)]);
+        }
+    }
+}
+
+public interface IRangeService
+{
+    int GetMinimum();
+    int GetMaximum();
+}
+
+public class RangeService : IRangeService
+{
+    public int GetMinimum() => 10;
+    public int GetMaximum() => 100;
+}
+
+public class TestService
+{
+    [Range(10, 100)]
+    public int Value { get; set; } = 4;
+}
+""";
+
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/validatable-object", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodNotCalledIfPropertyValidationsFail();
+            await ValidateForTopLevelInvoked();
+
+            async Task ValidateMethodNotCalledIfPropertyValidationsFail()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "Value1": 5,
+                    "Value2": "",
+                    "SubType": {
+                        "Value3": "foo",
+                        "RequiredProperty": "",
+                        "StringWithLength": ""
+                    }
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value2", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("The Value2 field is required.", msg));
+                    },
+                    error =>
+                    {
+                        Assert.Equal("SubType.RequiredProperty", error.Key);
+                        Assert.Equal("The RequiredProperty field is required.", error.Value.Single());
+                    });
+            }
+
+            async Task ValidateForTopLevelInvoked()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "Value1": 5,
+                    "Value2": "test@test.com",
+                    "SubType": {
+                        "Value3": "some-value",
+                        "RequiredProperty": "some-value-2",
+                        "StringWithLength": "element"
+                    }
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value1", error.Key);
+                        Assert.Equal("The field Value1 must be between 10 and 100.", error.Value.Single());
+                    });
+            }
+        });
+    }
+
+    [Fact]
+    public async Task CanValidateIValidatableObject_WithoutPropertyValidations()
+    {
+        var source = """
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddValidation();
+
+WebApplication app = builder. Build();
+
+app.MapPost("/base", (BaseClass model) => Results.Ok(model));
+app.MapPost("/derived", (DerivedClass model) => Results.Ok(model));
+app.MapPost("/complex", (ComplexClass model) => Results.Ok(model));
+
+app.Run();
+
+public class BaseClass : IValidatableObject
+{
+    public string? Value { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (string.IsNullOrEmpty(Value))
+        {
+            yield return new ValidationResult("Value cannot be null or empty.", [nameof(Value)]);
+        }
+    }
+}
+
+public class DerivedClass : BaseClass
+{
+}
+
+public class ComplexClass
+{
+    public NestedClass? NestedObject { get; set; }
+}
+
+public class NestedClass : IValidatableObject
+{
+    public string? Value { get; set; }
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (string.IsNullOrEmpty(Value))
+        {
+            yield return new ValidationResult("Value cannot be null or empty.", [nameof(Value)]);
+        }
+    }
+}
+""";
+
+        await Verify(source, out var compilation);
+
+        await VerifyEndpoint(compilation, "/base", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodCalled();
+
+            async Task ValidateMethodCalled()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "Value": ""
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("Value cannot be null or empty.", msg));
+                    });
+            }
+        });
+
+        await VerifyEndpoint(compilation, "/derived", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodCalled();
+
+            async Task ValidateMethodCalled()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "Value": ""
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("Value cannot be null or empty.", msg));
+                    });
+            }
+        });
+
+        await VerifyEndpoint(compilation, "/complex", async (endpoint, serviceProvider) =>
+        {
+            await ValidateMethodCalled();
+
+            async Task ValidateMethodCalled()
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "NestedObject": {
+                        "Value": ""
+                    }
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("NestedObject.Value", error.Key);
+                        Assert.Collection(error.Value,
+                            msg => Assert.Equal("Value cannot be null or empty.", msg));
+                    });
+            }
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.MultipleNamespaces.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.MultipleNamespaces.cs
new file mode 100644
index 000000000000..e08f8855a4a3
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.MultipleNamespaces.cs
@@ -0,0 +1,128 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateMultipleNamespaces()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapPost("/namespace-one", (NamespaceOne.Type obj) => Results.Ok("Passed"));
+app.MapPost("/namespace-two", (NamespaceTwo.Type obj) => Results.Ok("Passed"));
+
+app.Run();
+
+namespace NamespaceOne {
+    public class Type
+    {
+        [StringLength(10)]
+        public string StringWithLength { get; set; } = string.Empty;
+    }
+}
+
+namespace NamespaceTwo {
+    public class Type
+    {
+        [StringLength(20)]
+        public string StringWithLength { get; set; } = string.Empty;
+    }
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/namespace-one", async (endpoint, serviceProvider) =>
+        {
+            await InvalidStringWithLengthProducesError(endpoint);
+            await ValidInputProducesNoWarnings(endpoint);
+
+            async Task InvalidStringWithLengthProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "StringWithLength": "abcdefghijk"
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task ValidInputProducesNoWarnings(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "StringWithLength": "abc"
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+                await endpoint.RequestDelegate(context);
+
+                Assert.Equal(200, context.Response.StatusCode);
+            }
+        });
+        await VerifyEndpoint(compilation, "/namespace-two", async (endpoint, serviceProvider) =>
+        {
+            await InvalidStringWithLengthProducesError(endpoint);
+            await ValidInputProducesNoWarnings(endpoint);
+
+            async Task InvalidStringWithLengthProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "StringWithLength": "abcdefghijklmnopqrstu"
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 20.", kvp.Value.Single());
+                });
+            }
+
+            async Task ValidInputProducesNoWarnings(Endpoint endpoint)
+            {
+                var payload = """
+                {
+                    "StringWithLength": "abcdefghijk"
+                }
+                """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+                await endpoint.RequestDelegate(context);
+
+                Assert.Equal(200, context.Response.StatusCode);
+            }
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.NoOp.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.NoOp.cs
new file mode 100644
index 000000000000..ba176e622450
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.NoOp.cs
@@ -0,0 +1,181 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task DoesNotEmitIfNoAddValidationCallExists()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+var app = builder.Build();
+
+app.MapPost("/complex-type", (ComplexType complexType) => Results.Ok("Passed"));
+
+app.Run();
+
+public class ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+}
+""";
+        await Verify(source, out var compilation);
+        // Verify that we don't validate types if no AddValidation call exists
+        await VerifyEndpoint(compilation, "/complex-type", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+                {
+                    "IntegerWithRange": 5
+                }
+                """;
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+            await endpoint.RequestDelegate(context);
+
+            Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+        });
+    }
+
+    [Fact]
+    public async Task DoesNotEmitIfNotCorrectAddValidationCallExists()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation("example");
+SomeExtensions.AddValidation(builder.Services);
+
+var app = builder.Build();
+
+app.MapPost("/complex-type", (ComplexType complexType) => Results.Ok("Passed"));
+
+app.Run();
+
+public class ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+}
+
+public static class SomeExtensions
+{
+    public static IServiceCollection AddValidation(this IServiceCollection services, string someString)
+    {
+        // This is not the correct AddValidation method
+        return services;
+    }
+
+    public static IServiceCollection AddValidation(this IServiceCollection services, Action<ValidationOptions>? configureOptions = null)
+    {
+        // This is not the correct AddValidation method
+        return services;
+    }
+}
+""";
+        await Verify(source, out var compilation);
+        // Verify that we don't validate types if no AddValidation call exists
+        await VerifyEndpoint(compilation, "/complex-type", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+                {
+                    "IntegerWithRange": 5
+                }
+                """;
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+            await endpoint.RequestDelegate(context);
+
+            Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+        });
+    }
+
+    [Fact]
+    public async Task DoesNotEmitForExemptTypes()
+    {
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.IO.Pipelines;
+using System.Threading;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapGet("/exempt-1", (HttpContext context) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-2", (HttpRequest request) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-3", (HttpResponse response) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-4", (IFormCollection formCollection) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-5", (IFormFileCollection formFileCollection) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-6", (IFormFile formFile) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-7", (Stream stream) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-8", (PipeReader pipeReader) => Results.Ok("Exempt Passed!"));
+app.MapGet("/exempt-9", (CancellationToken cancellationToken) => Results.Ok("Exempt Passed!"));
+app.MapPost("/complex-type", (ComplexType complexType) => Results.Ok("Passed"));
+
+app.Run();
+
+public class ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+}
+""";
+        await Verify(source, out var compilation);
+        // Verify that we can validate non-exempt types
+        await VerifyEndpoint(compilation, "/complex-type", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+                {
+                    "IntegerWithRange": 5
+                }
+                """;
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+            await endpoint.RequestDelegate(context);
+
+            var problemDetails = await AssertBadRequest(context);
+            Assert.Collection(problemDetails.Errors, kvp =>
+            {
+                Assert.Equal("IntegerWithRange", kvp.Key);
+                Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+            });
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Parameters.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Parameters.cs
new file mode 100644
index 000000000000..5b90338520eb
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Parameters.cs
@@ -0,0 +1,102 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateParameters()
+    {
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+builder.Services.AddSingleton<TestService>();
+builder.Services.AddKeyedSingleton<TestService>("serviceKey");
+
+var app = builder.Build();
+
+app.MapPost("/params", (
+    // Skipped from validation because it is resolved as a service by IServiceProviderIsService
+    TestService testService,
+    // Skipped from validation because it is marked as a [FromKeyedService] parameter
+    [FromKeyedServices("serviceKey")] TestService testService2,
+    [Range(10, 100)] int value1,
+    [Range(10, 100), Display(Name = "Valid identifier")] int value2,
+    [Required] string value3 = "some-value",
+    [CustomValidation(ErrorMessage = "Value must be an even number")] int value4 = 4,
+    [CustomValidation, Range(10, 100)] int value5 = 10,
+    // Skipped from validation because it is marked as a [FromService] parameter
+    [FromServices] [Range(10, 100)] int? value6 = 4,
+    Dictionary<string, TestService>? testDict = null) => "OK");
+
+app.Run();
+
+public class CustomValidationAttribute : ValidationAttribute
+{
+    public override bool IsValid(object? value) => value is int number && number % 2 == 0;
+}
+
+public class TestService
+{
+    [Range(10, 100)]
+    public int Value { get; set; } = 4;
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/params", async (endpoint, serviceProvider) =>
+        {
+            var context = CreateHttpContext(serviceProvider);
+            context.Request.QueryString = new QueryString("?value1=5&value2=5&value3=&value4=3&value5=5");
+            await endpoint.RequestDelegate(context);
+            var problemDetails = await AssertBadRequest(context);
+            Assert.Collection(problemDetails.Errors,
+                error =>
+                {
+                    Assert.Equal("value1", error.Key);
+                    Assert.Equal("The field value1 must be between 10 and 100.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("value2", error.Key);
+                    Assert.Equal("The field Valid identifier must be between 10 and 100.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("value3", error.Key);
+                    Assert.Equal("The value3 field is required.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("value4", error.Key);
+                    Assert.Equal("Value must be an even number", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("value5", error.Key);
+                    Assert.Collection(error.Value, error =>
+                    {
+                        Assert.Equal("The field value5 is invalid.", error);
+                    },
+                    error =>
+                    {
+                        Assert.Equal("The field value5 must be between 10 and 100.", error);
+                    });
+                });
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Parsable.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Parsable.cs
new file mode 100644
index 000000000000..fb3d133c3515
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Parsable.cs
@@ -0,0 +1,122 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateTypeWithParsableProperties()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapPost("/complex-type-with-parsable-properties", (ComplexTypeWithParsableProperties complexType) => Results.Ok("Passed"!));
+
+app.Run();
+
+public class ComplexTypeWithParsableProperties
+{
+    [RegularExpression("^((?!00000000-0000-0000-0000-000000000000).)*$", ErrorMessage = "Cannot use default Guid")]
+    public Guid? GuidWithRegularExpression { get; set; } = default;
+
+    [Required]
+    public TimeOnly? TimeOnlyWithRequiredValue { get; set; } = TimeOnly.FromDateTime(DateTime.UtcNow);
+
+    [Url(ErrorMessage = "The field Url must be a valid URL.")]
+    public string? Url { get; set; } = "https://example.com";
+
+    [Required]
+    [Range(typeof(DateOnly), "2023-01-01", "2025-12-31", ErrorMessage = "Date must be between 2023-01-01 and 2025-12-31")]
+    public DateOnly? DateOnlyWithRange { get; set; } = DateOnly.FromDateTime(DateTime.UtcNow);
+
+    [Range(typeof(DateTime), "2023-01-01", "2025-12-31", ErrorMessage = "DateTime must be between 2023-01-01 and 2025-12-31")]
+    public DateTime? DateTimeWithRange { get; set; } = DateTime.UtcNow;
+
+    [Range(typeof(decimal), "0.1", "100.5", ErrorMessage = "Amount must be between 0.1 and 100.5", ParseLimitsInInvariantCulture = true)]
+    public decimal? DecimalWithRange { get; set; } = 50.5m;
+
+    [Range(0, 12, ErrorMessage = "Hours must be between 0 and 12")]
+    public TimeSpan? TimeSpanWithHourRange { get; set; } = TimeSpan.FromHours(12);
+
+    [Range(0, 1, ErrorMessage = "Boolean value must be 0 or 1")]
+    public bool BooleanWithRange { get; set; } = true;
+
+    [RegularExpression(@"^\d+\.\d+\.\d+$", ErrorMessage = "Must be a valid version number (e.g. 1.0.0)")]
+    public Version? VersionWithRegex { get; set; } = new Version(1, 0, 0);
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/complex-type-with-parsable-properties", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+            {
+              "TimeOnlyWithRequiredValue": null,
+              "IntWithRange": 150,
+              "StringWithLength": "AB",
+              "Email": "invalid-email",
+              "Url": "invalid-url",
+              "DateOnlyWithRange": "2026-05-01",
+              "DecimalWithRange": "150.75",
+              "TimeSpanWithHourRange": "22:00:00",
+              "VersionWithRegex": "1.0",
+              "EnumProperty": "Invalid"
+            }
+            """;
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+            await endpoint.RequestDelegate(context);
+
+            var problemDetails = await AssertBadRequest(context);
+
+            // Assert on each error with Assert.Collection
+            Assert.Collection(problemDetails.Errors.OrderBy(kvp => kvp.Key),
+                error =>
+                {
+                    Assert.Equal("DateOnlyWithRange", error.Key);
+                    Assert.Contains("Date must be between 2023-01-01 and 2025-12-31", error.Value);
+                },
+                error =>
+                {
+                    Assert.Equal("DecimalWithRange", error.Key);
+                    Assert.Contains("Amount must be between 0.1 and 100.5", error.Value);
+                },
+                error =>
+                {
+                    Assert.Equal("TimeOnlyWithRequiredValue", error.Key);
+                    Assert.Contains("The TimeOnlyWithRequiredValue field is required.", error.Value);
+                },
+                error =>
+                {
+                    Assert.Equal("TimeSpanWithHourRange", error.Key);
+                    Assert.Contains("Hours must be between 0 and 12", error.Value);
+                },
+                error =>
+                {
+                    Assert.Equal("Url", error.Key);
+                    Assert.Contains("The field Url must be a valid URL.", error.Value);
+                },
+                error =>
+                {
+                    Assert.Equal("VersionWithRegex", error.Key);
+                    Assert.Contains("Must be a valid version number (e.g. 1.0.0)", error.Value);
+                }
+            );
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Polymorphism.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Polymorphism.cs
new file mode 100644
index 000000000000..206908d1a059
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Polymorphism.cs
@@ -0,0 +1,197 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidatePolymorphicTypes()
+    {
+        var source = """
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.MapPost("/basic-polymorphism", (BaseType model) => Results.Ok());
+app.MapPost("/validatable-polymorphism", (BaseValidatableType model) => Results.Ok());
+app.MapPost("/polymorphism-container", (ContainerType model) => Results.Ok());
+
+app.Run();
+
+public class ContainerType
+{
+    public BaseType BaseType { get; set; } = new BaseType();
+    public BaseValidatableType BaseValidatableType { get; set; } = new BaseValidatableType();
+}
+
+[JsonDerivedType(typeof(BaseType), typeDiscriminator: "base")]
+[JsonDerivedType(typeof(DerivedType), typeDiscriminator: "derived")]
+public class BaseType
+{
+    [Display(Name = "Value 1")]
+    [Range(10, 100)]
+    public int Value1 { get; set; }
+
+    [EmailAddress]
+    [Required]
+    public string Value2 { get; set; } = "test@example.com";
+}
+
+public class DerivedType : BaseType
+{
+    [Base64String]
+    public string? Value3 { get; set; }
+}
+
+[JsonDerivedType(typeof(BaseValidatableType), typeDiscriminator: "base")]
+[JsonDerivedType(typeof(DerivedValidatableType), typeDiscriminator: "derived")]
+public class BaseValidatableType : IValidatableObject
+{
+    [Display(Name = "Value 1")]
+    public int Value1 { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (Value1 < 10 || Value1 > 100)
+        {
+            yield return new ValidationResult("The field Value 1 must be between 10 and 100.", new[] { nameof(Value1) });
+        }
+    }
+}
+
+public class DerivedValidatableType : BaseValidatableType
+{
+    [EmailAddress]
+    public required string Value3 { get; set; }
+}
+""";
+        await Verify(source, out var compilation);
+
+        await VerifyEndpoint(compilation, "/basic-polymorphism", async (endpoint, serviceProvider) =>
+        {
+            var httpContext = CreateHttpContextWithPayload("""
+            {
+                "$type": "derived",
+                "Value1": 5,
+                "Value2": "invalid-email",
+                "Value3": "invalid-base64"
+            }
+            """, serviceProvider);
+
+            await endpoint.RequestDelegate(httpContext);
+
+            var problemDetails = await AssertBadRequest(httpContext);
+            Assert.Collection(problemDetails.Errors,
+                error =>
+                {
+                    Assert.Equal("Value3", error.Key);
+                    Assert.Equal("The Value3 field is not a valid Base64 encoding.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("Value1", error.Key);
+                    Assert.Equal("The field Value 1 must be between 10 and 100.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("Value2", error.Key);
+                    Assert.Equal("The Value2 field is not a valid e-mail address.", error.Value.Single());
+                });
+        });
+
+        await VerifyEndpoint(compilation, "/validatable-polymorphism", async (endpoint, serviceProvider) =>
+        {
+            var httpContext = CreateHttpContextWithPayload("""
+            {
+                "$type": "derived",
+                "Value1": 5,
+                "Value3": "invalid-email"
+            }
+            """, serviceProvider);
+
+            await endpoint.RequestDelegate(httpContext);
+
+            var problemDetails = await AssertBadRequest(httpContext);
+            Assert.Collection(problemDetails.Errors,
+                error =>
+                {
+                    Assert.Equal("Value3", error.Key);
+                    Assert.Equal("The Value3 field is not a valid e-mail address.", error.Value.Single());
+                });
+
+            httpContext = CreateHttpContextWithPayload("""
+            {
+                "$type": "derived",
+                "Value1": 5,
+                "Value3": "test@example.com"
+            }
+            """, serviceProvider);
+
+            await endpoint.RequestDelegate(httpContext);
+
+            var problemDetails1 = await AssertBadRequest(httpContext);
+            Assert.Collection(problemDetails1.Errors,
+                error =>
+                {
+                    Assert.Equal("Value1", error.Key);
+                    Assert.Equal("The field Value 1 must be between 10 and 100.", error.Value.Single());
+                });
+        });
+
+        await VerifyEndpoint(compilation, "/polymorphism-container", async (endpoint, serviceProvider) =>
+        {
+            var httpContext = CreateHttpContextWithPayload("""
+            {
+                "BaseType": {
+                    "$type": "derived",
+                    "Value1": 5,
+                    "Value2": "invalid-email",
+                    "Value3": "invalid-base64"
+                },
+                "BaseValidatableType": {
+                    "$type": "derived",
+                    "Value1": 5,
+                    "Value3": "test@example.com"
+                }
+            }
+            """, serviceProvider);
+
+            await endpoint.RequestDelegate(httpContext);
+
+            var problemDetails = await AssertBadRequest(httpContext);
+            Assert.Collection(problemDetails.Errors,
+            error =>
+                {
+                    Assert.Equal("BaseType.Value3", error.Key);
+                    Assert.Equal("The Value3 field is not a valid Base64 encoding.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("BaseType.Value1", error.Key);
+                    Assert.Equal("The field Value 1 must be between 10 and 100.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("BaseType.Value2", error.Key);
+                    Assert.Equal("The Value2 field is not a valid e-mail address.", error.Value.Single());
+                },
+                error =>
+                {
+                    Assert.Equal("BaseValidatableType.Value1", error.Key);
+                    Assert.Equal("The field Value 1 must be between 10 and 100.", error.Value.Single());
+                });
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.RecordType.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.RecordType.cs
new file mode 100644
index 000000000000..a5a4b2e09ed0
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.RecordType.cs
@@ -0,0 +1,387 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateRecordTypes()
+    {
+        // Arrange
+        var source = """
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+builder.Services.AddSingleton<TestService>();
+
+var app = builder.Build();
+
+app.MapPost("/validatable-record", (ValidatableRecord validatableRecord) => Results.Ok("Passed"!));
+
+app.Run();
+
+public class DerivedValidationAttribute : ValidationAttribute
+{
+    public override bool IsValid(object? value) => value is int number && number % 2 == 0;
+}
+
+public record SubType([Required] string RequiredProperty = "some-value", [StringLength(10)] string? StringWithLength = default);
+
+public record SubTypeWithInheritance([EmailAddress] string? EmailString, string RequiredProperty, string? StringWithLength) : SubType(RequiredProperty, StringWithLength);
+
+public record SubTypeWithoutConstructor
+{
+    [Required]
+    public string RequiredProperty { get; set; } = "some-value";
+
+    [StringLength(10)]
+    public string? StringWithLength { get; set; }
+
+    [FromServices]
+    [Required]
+    public TestService ServiceProperty { get; set; } = null!;
+}
+
+public static class CustomValidators
+{
+    public static ValidationResult Validate(int number, ValidationContext validationContext)
+    {
+        var parent = (ValidatableRecord)validationContext.ObjectInstance;
+        if (number == parent.IntegerWithRange)
+        {
+            return new ValidationResult(
+                "Can't use the same number value in two properties on the same class.",
+                new[] { validationContext.MemberName });
+        }
+
+        return ValidationResult.Success;
+    }
+}
+
+public class TestService
+{
+    [Range(10, 100)]
+    public int Value { get; set; } = 4;
+}
+
+public record ValidatableRecord(
+    [Range(10, 100)]
+    int IntegerWithRange = 10,
+    [Range(10, 100), Display(Name = "Valid identifier")]
+    int IntegerWithRangeAndDisplayName = 50,
+    SubType PropertyWithMemberAttributes = default,
+    SubType PropertyWithoutMemberAttributes = default,
+    SubTypeWithInheritance PropertyWithInheritance = default,
+    SubTypeWithoutConstructor PropertyOfSubtypeWithoutConstructor = default,
+    List<SubType> ListOfSubTypes = default,
+    [DerivedValidation(ErrorMessage = "Value must be an even number")]
+    int IntegerWithDerivedValidationAttribute = 0,
+    [CustomValidation(typeof(CustomValidators), nameof(CustomValidators.Validate))]
+    int IntegerWithCustomValidation = 0,
+    [DerivedValidation, Range(10, 100)]
+    int PropertyWithMultipleAttributes = 10,
+    [FromServices] [Required] TestService ServiceProperty = null!, // This should be ignored because of [FromServices]
+    [FromKeyedServices("serviceKey")] [Range(10, 100)] int KeyedServiceProperty = 5 // This should be ignored because of [FromKeyedServices]
+);
+""";
+        await Verify(source, out var compilation);
+        await VerifyEndpoint(compilation, "/validatable-record", async (endpoint, serviceProvider) =>
+        {
+            await InvalidIntegerWithRangeProducesError(endpoint);
+            await InvalidIntegerWithRangeAndDisplayNameProducesError(endpoint);
+            await InvalidRequiredSubtypePropertyProducesError(endpoint);
+            await InvalidSubTypeWithInheritancePropertyProducesError(endpoint);
+            await InvalidListOfSubTypesProducesError(endpoint);
+            await InvalidPropertyWithDerivedValidationAttributeProducesError(endpoint);
+            await InvalidPropertyWithMultipleAttributesProducesError(endpoint);
+            await InvalidPropertyWithCustomValidationProducesError(endpoint);
+            await InvalidPropertyOfSubtypeWithoutConstructorProducesError(endpoint);
+            await ValidInputProducesNoWarnings(endpoint);
+
+            async Task InvalidIntegerWithRangeProducesError(Endpoint endpoint)
+            {
+
+                var payload = """
+                    {
+                        "IntegerWithRange": 5
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidIntegerWithRangeAndDisplayNameProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "IntegerWithRangeAndDisplayName": 5
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRangeAndDisplayName", kvp.Key);
+                    Assert.Equal("The field Valid identifier must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidRequiredSubtypePropertyProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "PropertyWithMemberAttributes": {
+                            "RequiredProperty": "",
+                            "StringWithLength": "way-too-long"
+                        }
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes.RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes.StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidSubTypeWithInheritancePropertyProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "PropertyWithInheritance": {
+                            "RequiredProperty": "",
+                            "StringWithLength": "way-too-long",
+                            "EmailString": "not-an-email"
+                        }
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithInheritance.EmailString", kvp.Key);
+                    Assert.Equal("The EmailString field is not a valid e-mail address.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithInheritance.RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyWithInheritance.StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidListOfSubTypesProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "ListOfSubTypes": [
+                            {
+                                "RequiredProperty": "",
+                                "StringWithLength": "way-too-long"
+                            },
+                            {
+                                "RequiredProperty": "valid",
+                                "StringWithLength": "way-too-long"
+                            },
+                            {
+                                "RequiredProperty": "valid",
+                                "StringWithLength": "valid"
+                            }
+                        ]
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("ListOfSubTypes[0].RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("ListOfSubTypes[0].StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("ListOfSubTypes[1].StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidPropertyWithDerivedValidationAttributeProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "IntegerWithDerivedValidationAttribute": 5
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithDerivedValidationAttribute", kvp.Key);
+                    Assert.Equal("Value must be an even number", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidPropertyWithMultipleAttributesProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "PropertyWithMultipleAttributes": 5
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMultipleAttributes", kvp.Key);
+                    Assert.Collection(kvp.Value,
+                    error =>
+                    {
+                        Assert.Equal("The field PropertyWithMultipleAttributes is invalid.", error);
+                    },
+                    error =>
+                    {
+                        Assert.Equal("The field PropertyWithMultipleAttributes must be between 10 and 100.", error);
+                    });
+                });
+            }
+
+            async Task InvalidPropertyWithCustomValidationProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "IntegerWithRange": 42,
+                        "IntegerWithCustomValidation": 42
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors, kvp =>
+                {
+                    Assert.Equal("IntegerWithCustomValidation", kvp.Key);
+                    var error = Assert.Single(kvp.Value);
+                    Assert.Equal("Can't use the same number value in two properties on the same class.", error);
+                });
+            }
+
+            async Task InvalidPropertyOfSubtypeWithoutConstructorProducesError(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "PropertyOfSubtypeWithoutConstructor": {
+                            "RequiredProperty": "",
+                            "StringWithLength": "way-too-long"
+                        }
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+
+                await endpoint.RequestDelegate(context);
+
+                var problemDetails = await AssertBadRequest(context);
+                Assert.Collection(problemDetails.Errors,
+                kvp =>
+                {
+                    Assert.Equal("PropertyOfSubtypeWithoutConstructor.RequiredProperty", kvp.Key);
+                    Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                },
+                kvp =>
+                {
+                    Assert.Equal("PropertyOfSubtypeWithoutConstructor.StringWithLength", kvp.Key);
+                    Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                });
+            }
+
+            async Task ValidInputProducesNoWarnings(Endpoint endpoint)
+            {
+                var payload = """
+                    {
+                        "IntegerWithRange": 50,
+                        "IntegerWithRangeAndDisplayName": 50,
+                        "PropertyWithMemberAttributes": {
+                            "RequiredProperty": "valid",
+                            "StringWithLength": "valid"
+                        },
+                        "PropertyWithoutMemberAttributes": {
+                            "RequiredProperty": "valid",
+                            "StringWithLength": "valid"
+                        },
+                        "PropertyWithInheritance": {
+                            "RequiredProperty": "valid",
+                            "StringWithLength": "valid",
+                            "EmailString": "test@example.com"
+                        },
+                        "ListOfSubTypes": [],
+                        "IntegerWithDerivedValidationAttribute": 2,
+                        "IntegerWithCustomValidation": 0,
+                        "PropertyWithMultipleAttributes": 12
+                    }
+                    """;
+                var context = CreateHttpContextWithPayload(payload, serviceProvider);
+                await endpoint.RequestDelegate(context);
+
+                Assert.Equal(200, context.Response.StatusCode);
+            }
+        });
+
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Recursion.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Recursion.cs
new file mode 100644
index 000000000000..7367e2919ae0
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.Recursion.cs
@@ -0,0 +1,160 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateRecursiveTypes()
+    {
+        var source = """
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+builder.Services.AddValidation(options =>
+{
+    options.MaxDepth = 8;
+});
+
+var app = builder.Build();
+
+app.MapPost("/recursive-type", (RecursiveType model) => Results.Ok());
+
+app.Run();
+
+public class RecursiveType
+{
+    [Range(10, 100)]
+    public int Value { get; set; }
+    public RecursiveType? Next { get; set; }
+}
+""";
+        await Verify(source, out var compilation);
+
+        await VerifyEndpoint(compilation, "/recursive-type", async (endpoint, serviceProvider) =>
+        {
+            await ThrowsExceptionForDeeplyNestedType(endpoint);
+            await ValidatesTypeWithLimitedNesting(endpoint);
+
+            async Task ThrowsExceptionForDeeplyNestedType(Endpoint endpoint)
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "value": 1,
+                    "next": {
+                        "value": 2,
+                        "next": {
+                            "value": 3,
+                            "next": {
+                                "value": 4,
+                                "next": {
+                                    "value": 5,
+                                    "next": {
+                                        "value": 6,
+                                        "next": {
+                                            "value": 7,
+                                            "next": {
+                                                "value": 8,
+                                                "next": {
+                                                    "value": 9,
+                                                    "next": {
+                                                        "value": 10
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                """, serviceProvider);
+
+                var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () => await endpoint.RequestDelegate(httpContext));
+            }
+
+            async Task ValidatesTypeWithLimitedNesting(Endpoint endpoint)
+            {
+                var httpContext = CreateHttpContextWithPayload("""
+                {
+                    "value": 1,
+                    "next": {
+                        "value": 2,
+                        "next": {
+                            "value": 3,
+                            "next": {
+                                "value": 4,
+                                "next": {
+                                    "value": 5,
+                                    "next": {
+                                        "value": 6,
+                                        "next": {
+                                            "value": 7,
+                                            "next": {
+                                                "value": 8
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                """, serviceProvider);
+
+                await endpoint.RequestDelegate(httpContext);
+
+                var problemDetails = await AssertBadRequest(httpContext);
+                Assert.Collection(problemDetails.Errors,
+                    error =>
+                    {
+                        Assert.Equal("Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Next.Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Next.Next.Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Next.Next.Next.Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Next.Next.Next.Next.Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    },
+                    error =>
+                    {
+                        Assert.Equal("Next.Next.Next.Next.Next.Next.Next.Value", error.Key);
+                        Assert.Equal("The field Value must be between 10 and 100.", error.Value.Single());
+                    });
+            }
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.SkipValidation.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.SkipValidation.cs
new file mode 100644
index 000000000000..366b53b174d6
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.SkipValidation.cs
@@ -0,0 +1,515 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// 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.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task DoesNotEmit_ForSkipValidationAttribute_OnClassProperties()
+    {
+        var source = """
+#pragma warning disable ASP0029
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.Run();
+
+[ValidatableType]
+public class ComplexType
+{
+    [SkipValidation]
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+
+    [SkipValidation]
+    public NestedType SkippedObjectProperty { get; set; } = new NestedType();
+
+    public NestedType ObjectProperty { get; set; } = new NestedType();
+
+    [SkipValidation]
+    public List<NestedType> SkippedListOfNestedTypes { get; set; } = [];
+
+    public List<NestedType> ListOfNestedTypes { get; set; } = [];
+
+    [SkipValidation]
+    public NonSkippedBaseType SkippedBaseTypeProperty { get; set; } = new NonSkippedBaseType();
+
+    public NonSkippedSubType NonSkippedSubTypeProperty { get; set; } = new NonSkippedSubType();
+
+    public AlwaysSkippedType AlwaysSkippedProperty { get; set; } = new AlwaysSkippedType();
+
+    public SubTypeOfSkippedBase SubTypeOfSkippedBaseProperty { get; set; } = new SubTypeOfSkippedBase();
+}
+
+public class NestedType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+}
+
+public class NonSkippedBaseType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange1 { get; set; } = 10;
+}
+
+public class NonSkippedSubType : NonSkippedBaseType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange2 { get; set; } = 10;
+}
+
+[SkipValidation]
+public class AlwaysSkippedType
+{
+    public NestedType ObjectProperty { get; set; } = new NestedType();
+}
+
+[SkipValidation]
+public class SkippedBaseType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange1 { get; set; } = 10;
+}
+
+public class SubTypeOfSkippedBase : SkippedBaseType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange2 { get; set; } = 10;
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyValidatableType(compilation, "ComplexType", async (validationOptions, type) =>
+        {
+            Assert.True(validationOptions.TryGetValidatableTypeInfo(type, out var validatableTypeInfo));
+
+            await InvalidSkippedInteger_DoesNotProduceError(validatableTypeInfo);
+            await InvalidNestedInteger_ProducesError(validatableTypeInfo);
+            await InvalidSkippedNestedInteger_DoesNotProduceError(validatableTypeInfo);
+            await InvalidList_ProducesError(validatableTypeInfo);
+            await InvalidSkippedList_DoesNotProduceError(validatableTypeInfo);
+            await InvalidSubTypeNestedIntegers_ProduceErrors(validatableTypeInfo);
+            await InvalidAlwaysSkippedType_DoesNotProduceError(validatableTypeInfo);
+
+            async Task InvalidSkippedInteger_DoesNotProduceError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var intProperty = type.GetProperty("IntegerWithRange");
+                intProperty?.SetValue(instance, 5); // Set invalid value
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+
+            async Task InvalidNestedInteger_ProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var objectPropertyInstance = type.GetProperty("ObjectProperty").GetValue(instance);
+                var nestedIntProperty = objectPropertyInstance.GetType().GetProperty("IntegerWithRange");
+                nestedIntProperty?.SetValue(objectPropertyInstance, 5); // Set invalid value
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("ObjectProperty.IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidSkippedNestedInteger_DoesNotProduceError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var objectPropertyInstance = type.GetProperty("SkippedObjectProperty").GetValue(instance);
+                var nestedIntProperty = objectPropertyInstance.GetType().GetProperty("IntegerWithRange");
+                nestedIntProperty?.SetValue(objectPropertyInstance, 5); // Set invalid value
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+
+            async Task InvalidList_ProducesError(IValidatableInfo validatableInfo)
+            {
+                var rootInstance = Activator.CreateInstance(type);
+                var listInstance = Activator.CreateInstance(typeof(List<>).MakeGenericType(type.Assembly.GetType("NestedType")!));
+
+                // Create invalid item
+                var nestedTypeInstance = Activator.CreateInstance(type.Assembly.GetType("NestedType")!);
+                nestedTypeInstance.GetType().GetProperty("IntegerWithRange")?.SetValue(nestedTypeInstance, 5);
+
+                // Add to list
+                listInstance.GetType().GetMethod("Add")?.Invoke(listInstance, [nestedTypeInstance]);
+
+                type.GetProperty("ListOfNestedTypes")?.SetValue(rootInstance, listInstance);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(rootInstance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(rootInstance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("ListOfNestedTypes[0].IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidSkippedList_DoesNotProduceError(IValidatableInfo validatableInfo)
+            {
+                var rootInstance = Activator.CreateInstance(type);
+                var listInstance = Activator.CreateInstance(typeof(List<>).MakeGenericType(type.Assembly.GetType("NestedType")!));
+
+                // Create invalid item
+                var nestedTypeInstance = Activator.CreateInstance(type.Assembly.GetType("NestedType")!);
+                nestedTypeInstance.GetType().GetProperty("IntegerWithRange")?.SetValue(nestedTypeInstance, 5);
+
+                // Add to list
+                listInstance.GetType().GetMethod("Add")?.Invoke(listInstance, [nestedTypeInstance]);
+
+                type.GetProperty("SkippedListOfNestedTypes")?.SetValue(rootInstance, listInstance);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(rootInstance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(rootInstance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+
+            async Task InvalidSubTypeNestedIntegers_ProduceErrors(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var objectPropertyInstance = type.GetProperty("NonSkippedSubTypeProperty").GetValue(instance);
+                var nestedIntProperty1 = objectPropertyInstance.GetType().GetProperty("IntegerWithRange1");
+                nestedIntProperty1?.SetValue(objectPropertyInstance, 5); // Set invalid value
+                var nestedIntProperty2 = objectPropertyInstance.GetType().GetProperty("IntegerWithRange2");
+                nestedIntProperty2?.SetValue(objectPropertyInstance, 6); // Set invalid value
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                // Errors are (currently) reported in the order from derived to base type.
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("NonSkippedSubTypeProperty.IntegerWithRange2", kvp.Key);
+                        Assert.Equal("The field IntegerWithRange2 must be between 10 and 100.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("NonSkippedSubTypeProperty.IntegerWithRange1", kvp.Key);
+                        Assert.Equal("The field IntegerWithRange1 must be between 10 and 100.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidAlwaysSkippedType_DoesNotProduceError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var objectPropertyInstance = type.GetProperty("AlwaysSkippedProperty").GetValue(instance);
+                var nestedIntProperty = objectPropertyInstance.GetType().GetProperty("IntegerWithRange");
+                nestedIntProperty?.SetValue(objectPropertyInstance, 5); // Set invalid value
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+        });
+    }
+
+    [Fact]
+    public async Task DoesNotEmit_ForSkipValidationAttribute_OnRecordProperties()
+    {
+        var source = """
+#pragma warning disable ASP0029
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+static class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder();
+        builder.Services.AddValidation();
+        var app = builder.Build();
+        app.Run();
+    }
+}
+
+[ValidatableType]
+public record ComplexType(
+    [Range(10, 100)][SkipValidation] int IntegerWithRange,
+    NestedType ObjectProperty,
+    [SkipValidation] NestedType SkippedObjectProperty
+);
+
+public record NestedType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+}
+
+[SkipValidation]
+public record AlwaysSkippedType
+{
+    public NestedType ObjectProperty { get; set; } = new NestedType();
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyValidatableType(compilation, "ComplexType", async (validationOptions, type) =>
+        {
+            Assert.True(validationOptions.TryGetValidatableTypeInfo(type, out var validatableTypeInfo));
+
+            await InvalidNestedIntegerWithRangeProducesError(validatableTypeInfo);
+            await InvalidSkippedNestedIntegerWithRangeDoesNotProduceProduceError(validatableTypeInfo);
+            await InvalidSkippedIntegerWithRangeDoesNotProduceError(validatableTypeInfo);
+
+            async Task InvalidNestedIntegerWithRangeProducesError(IValidatableInfo validatableInfo)
+            {
+                var objectProperty = type.GetProperty("ObjectProperty");
+                var nestedType = objectProperty.PropertyType;
+                var nestedTypeInstance = Activator.CreateInstance(nestedType);
+                var skippedNestedTypeInstance = Activator.CreateInstance(nestedType);
+                nestedTypeInstance.GetType().GetProperty("IntegerWithRange")?.SetValue(nestedTypeInstance, 5); // Set invalid value
+                var instance = Activator.CreateInstance(type, 10, nestedTypeInstance, skippedNestedTypeInstance);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("ObjectProperty.IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidSkippedNestedIntegerWithRangeDoesNotProduceProduceError(IValidatableInfo validatableInfo)
+            {
+                var objectProperty = type.GetProperty("ObjectProperty");
+                var nestedType = objectProperty.PropertyType;
+                var nestedTypeInstance = Activator.CreateInstance(nestedType);
+                var skippedNestedTypeInstance = Activator.CreateInstance(nestedType);
+                skippedNestedTypeInstance.GetType().GetProperty("IntegerWithRange")?.SetValue(skippedNestedTypeInstance, 5); // Set invalid value
+                var instance = Activator.CreateInstance(type, 10, nestedTypeInstance, skippedNestedTypeInstance);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+
+            async Task InvalidSkippedIntegerWithRangeDoesNotProduceError(IValidatableInfo validatableInfo)
+            {
+                var objectProperty = type.GetProperty("ObjectProperty");
+                var nestedType = objectProperty.PropertyType;
+                var nestedTypeInstance = Activator.CreateInstance(nestedType);
+                var instance = Activator.CreateInstance(type, 5, nestedTypeInstance, nestedTypeInstance); // Create with invalid value
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+        });
+    }
+
+    [Fact]
+    public async Task DoesNotEmit_ForSkipValidationAttribute_OnEndpointParameters()
+    {
+        var source = """
+#pragma warning disable ASP0029
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+static class Program
+{
+    public static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder();
+        builder.Services.AddValidation();
+        var app = builder.Build();
+
+        app.MapPost("/simple-params", (
+            [Range(10, 100)] int intParam,
+            [SkipValidation][Range(10, 100)] int skippedIntParam) => "OK");
+
+        app.MapPost("/non-skipped-complex-type", (ComplexType objectParam) => "OK");
+
+        app.MapPost("/skipped-complex-type", ([SkipValidation] ComplexType objectParam) => "OK");
+
+        app.MapPost("/always-skipped-type", (AlwaysSkippedType objectParam) => "OK");
+
+        app.Run();
+    }
+}
+
+// This should have generated validation code
+public class ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+}
+
+// This should have generated validation code
+[SkipValidation]
+public class AlwaysSkippedType
+{
+    public ComplexType ObjectProperty { get; set; } = new ComplexType();
+}
+""";
+        await Verify(source, out var compilation);
+
+        await VerifyEndpoint(compilation, "/simple-params", async (endpoint, serviceProvider) =>
+        {
+            var context = CreateHttpContext(serviceProvider);
+            context.Request.QueryString = new QueryString("?intParam=5&skippedIntParam=5");
+            await endpoint.RequestDelegate(context);
+            var problemDetails = await AssertBadRequest(context);
+
+            Assert.Collection(problemDetails.Errors,
+                error =>
+                {
+                    Assert.Equal("intParam", error.Key);
+                    Assert.Equal("The field intParam must be between 10 and 100.", error.Value.Single());
+                }
+            );
+        });
+
+        await VerifyEndpoint(compilation, "/non-skipped-complex-type", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+                    {
+                        "IntegerWithRange": 5
+                    }
+                    """;
+
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+            await endpoint.RequestDelegate(context);
+            var problemDetails = await AssertBadRequest(context);
+
+            Assert.Collection(problemDetails.Errors,
+                error =>
+                {
+                    Assert.Equal("IntegerWithRange", error.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", error.Value.Single());
+                }
+            );
+        });
+
+        await VerifyEndpoint(compilation, "/skipped-complex-type", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+                    {
+                        "IntegerWithRange": 5
+                    }
+                    """;
+
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+            await endpoint.RequestDelegate(context);
+
+            Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+        });
+
+        await VerifyEndpoint(compilation, "/always-skipped-type", async (endpoint, serviceProvider) =>
+        {
+            var payload = """
+                    {
+                        "IntegerWithRange": 5
+                    }
+                    """;
+
+            var context = CreateHttpContextWithPayload(payload, serviceProvider);
+            await endpoint.RequestDelegate(context);
+
+            Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ValidatableType.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ValidatableType.cs
new file mode 100644
index 000000000000..aff6b34be47a
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ValidatableType.cs
@@ -0,0 +1,750 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
+{
+    [Fact]
+    public async Task CanValidateClassTypesWithAttribute()
+    {
+        var source = """
+#pragma warning disable ASP0029
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.Run();
+
+[ValidatableType]
+public class ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+
+    [Range(10, 100), Display(Name = "Valid identifier")]
+    public int IntegerWithRangeAndDisplayName { get; set; } = 50;
+
+    [Required]
+    public SubType PropertyWithMemberAttributes { get; set; } = new SubType();
+
+    public SubType PropertyWithoutMemberAttributes { get; set; } = new SubType();
+
+    public SubTypeWithInheritance PropertyWithInheritance { get; set; } = new SubTypeWithInheritance();
+
+    public List<SubType> ListOfSubTypes { get; set; } = [];
+
+    [CustomValidation(ErrorMessage = "Value must be an even number")]
+    public int IntegerWithCustomValidationAttribute { get; set; }
+
+    [CustomValidation, Range(10, 100)]
+    public int PropertyWithMultipleAttributes { get; set; } = 10;
+}
+
+public class CustomValidationAttribute : ValidationAttribute
+{
+    public override bool IsValid(object? value) => value is int number && number % 2 == 0;
+}
+
+public class SubType
+{
+    [Required]
+    public string RequiredProperty { get; set; } = "some-value";
+
+    [StringLength(10)]
+    public string? StringWithLength { get; set; }
+}
+
+public class SubTypeWithInheritance : SubType
+{
+    [EmailAddress]
+    public string? EmailString { get; set; }
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyValidatableType(compilation, "ComplexType", async (validationOptions, type) =>
+        {
+            Assert.True(validationOptions.TryGetValidatableTypeInfo(type, out var validatableTypeInfo));
+
+            await InvalidIntegerWithRangeProducesError(validatableTypeInfo);
+            await InvalidIntegerWithRangeAndDisplayNameProducesError(validatableTypeInfo);
+            await MissingRequiredSubtypePropertyProducesError(validatableTypeInfo);
+            await InvalidRequiredSubtypePropertyProducesError(validatableTypeInfo);
+            await InvalidSubTypeWithInheritancePropertyProducesError(validatableTypeInfo);
+            await InvalidListOfSubTypesProducesError(validatableTypeInfo);
+            await InvalidPropertyWithDerivedValidationAttributeProducesError(validatableTypeInfo);
+            await InvalidPropertyWithMultipleAttributesProducesError(validatableTypeInfo);
+            await InvalidPropertyWithCustomValidationProducesError(validatableTypeInfo);
+            await ValidInputProducesNoWarnings(validatableTypeInfo);
+
+            async Task InvalidIntegerWithRangeProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithRange")?.SetValue(instance, 5);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidIntegerWithRangeAndDisplayNameProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithRangeAndDisplayName")?.SetValue(instance, 5);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRangeAndDisplayName", kvp.Key);
+                    Assert.Equal("The field Valid identifier must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task MissingRequiredSubtypePropertyProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("PropertyWithMemberAttributes")?.SetValue(instance, null);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes", kvp.Key);
+                    Assert.Equal("The PropertyWithMemberAttributes field is required.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidRequiredSubtypePropertyProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var subType = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType.GetType().GetProperty("RequiredProperty")?.SetValue(subType, "");
+                subType.GetType().GetProperty("StringWithLength")?.SetValue(subType, "way-too-long");
+                type.GetProperty("PropertyWithMemberAttributes")?.SetValue(instance, subType);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithMemberAttributes.RequiredProperty", kvp.Key);
+                        Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithMemberAttributes.StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidSubTypeWithInheritancePropertyProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var inheritanceType = Activator.CreateInstance(type.Assembly.GetType("SubTypeWithInheritance")!);
+                inheritanceType.GetType().GetProperty("RequiredProperty")?.SetValue(inheritanceType, "");
+                inheritanceType.GetType().GetProperty("StringWithLength")?.SetValue(inheritanceType, "way-too-long");
+                inheritanceType.GetType().GetProperty("EmailString")?.SetValue(inheritanceType, "not-an-email");
+                type.GetProperty("PropertyWithInheritance")?.SetValue(instance, inheritanceType);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithInheritance.EmailString", kvp.Key);
+                        Assert.Equal("The EmailString field is not a valid e-mail address.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithInheritance.RequiredProperty", kvp.Key);
+                        Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithInheritance.StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidListOfSubTypesProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var subTypeList = Activator.CreateInstance(typeof(List<>).MakeGenericType(type.Assembly.GetType("SubType")!));
+
+                // Create first invalid item
+                var subType1 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType1.GetType().GetProperty("RequiredProperty")?.SetValue(subType1, "");
+                subType1.GetType().GetProperty("StringWithLength")?.SetValue(subType1, "way-too-long");
+
+                // Create second invalid item
+                var subType2 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType2.GetType().GetProperty("RequiredProperty")?.SetValue(subType2, "valid");
+                subType2.GetType().GetProperty("StringWithLength")?.SetValue(subType2, "way-too-long");
+
+                // Create valid item
+                var subType3 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType3.GetType().GetProperty("RequiredProperty")?.SetValue(subType3, "valid");
+                subType3.GetType().GetProperty("StringWithLength")?.SetValue(subType3, "valid");
+
+                // Add to list
+                subTypeList.GetType().GetMethod("Add")?.Invoke(subTypeList, [subType1]);
+                subTypeList.GetType().GetMethod("Add")?.Invoke(subTypeList, [subType2]);
+                subTypeList.GetType().GetMethod("Add")?.Invoke(subTypeList, [subType3]);
+
+                type.GetProperty("ListOfSubTypes")?.SetValue(instance, subTypeList);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("ListOfSubTypes[0].RequiredProperty", kvp.Key);
+                        Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("ListOfSubTypes[0].StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("ListOfSubTypes[1].StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidPropertyWithDerivedValidationAttributeProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithCustomValidationAttribute")?.SetValue(instance, 5); // Odd number, should fail
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithCustomValidationAttribute", kvp.Key);
+                    Assert.Equal("Value must be an even number", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidPropertyWithMultipleAttributesProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("PropertyWithMultipleAttributes")?.SetValue(instance, 5);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMultipleAttributes", kvp.Key);
+                    Assert.Collection(kvp.Value,
+                        error =>
+                        {
+                            Assert.Equal("The field PropertyWithMultipleAttributes is invalid.", error);
+                        },
+                        error =>
+                        {
+                            Assert.Equal("The field PropertyWithMultipleAttributes must be between 10 and 100.", error);
+                        });
+                });
+            }
+
+            async Task InvalidPropertyWithCustomValidationProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithCustomValidationAttribute")?.SetValue(instance, 3); // Odd number should fail
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithCustomValidationAttribute", kvp.Key);
+                    Assert.Equal("Value must be an even number", kvp.Value.Single());
+                });
+            }
+
+            async Task ValidInputProducesNoWarnings(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+
+                // Set all properties with valid values
+                type.GetProperty("IntegerWithRange")?.SetValue(instance, 50);
+                type.GetProperty("IntegerWithRangeAndDisplayName")?.SetValue(instance, 50);
+
+                // Create and set PropertyWithMemberAttributes
+                var subType1 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType1.GetType().GetProperty("RequiredProperty")?.SetValue(subType1, "valid");
+                subType1.GetType().GetProperty("StringWithLength")?.SetValue(subType1, "valid");
+                type.GetProperty("PropertyWithMemberAttributes")?.SetValue(instance, subType1);
+
+                // Create and set PropertyWithoutMemberAttributes
+                var subType2 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType2.GetType().GetProperty("RequiredProperty")?.SetValue(subType2, "valid");
+                subType2.GetType().GetProperty("StringWithLength")?.SetValue(subType2, "valid");
+                type.GetProperty("PropertyWithoutMemberAttributes")?.SetValue(instance, subType2);
+
+                // Create and set PropertyWithInheritance
+                var inheritanceType = Activator.CreateInstance(type.Assembly.GetType("SubTypeWithInheritance")!);
+                inheritanceType.GetType().GetProperty("RequiredProperty")?.SetValue(inheritanceType, "valid");
+                inheritanceType.GetType().GetProperty("StringWithLength")?.SetValue(inheritanceType, "valid");
+                inheritanceType.GetType().GetProperty("EmailString")?.SetValue(inheritanceType, "test@example.com");
+                type.GetProperty("PropertyWithInheritance")?.SetValue(instance, inheritanceType);
+
+                // Create empty list for ListOfSubTypes
+                var emptyList = Activator.CreateInstance(typeof(List<>).MakeGenericType(type.Assembly.GetType("SubType")!));
+                type.GetProperty("ListOfSubTypes")?.SetValue(instance, emptyList);
+
+                // Set custom validation attributes
+                type.GetProperty("IntegerWithCustomValidationAttribute")?.SetValue(instance, 2); // Even number should pass
+                type.GetProperty("PropertyWithMultipleAttributes")?.SetValue(instance, 12);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+        });
+    }
+
+    [Fact]
+    public async Task CanValidateRecordTypesWithAttribute()
+    {
+        var source = """
+#pragma warning disable ASP0029
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+var builder = WebApplication.CreateBuilder();
+
+builder.Services.AddValidation();
+
+var app = builder.Build();
+
+app.Run();
+
+[ValidatableType]
+public record ComplexType
+{
+    [Range(10, 100)]
+    public int IntegerWithRange { get; set; } = 10;
+
+    [Range(10, 100), Display(Name = "Valid identifier")]
+    public int IntegerWithRangeAndDisplayName { get; set; } = 50;
+
+    [Required]
+    public SubType PropertyWithMemberAttributes { get; set; } = new SubType();
+
+    public SubType PropertyWithoutMemberAttributes { get; set; } = new SubType();
+
+    public SubTypeWithInheritance PropertyWithInheritance { get; set; } = new SubTypeWithInheritance();
+
+    public List<SubType> ListOfSubTypes { get; set; } = [];
+
+    [CustomValidation(ErrorMessage = "Value must be an even number")]
+    public int IntegerWithCustomValidationAttribute { get; set; }
+
+    [CustomValidation, Range(10, 100)]
+    public int PropertyWithMultipleAttributes { get; set; } = 10;
+}
+
+public class CustomValidationAttribute : ValidationAttribute
+{
+    public override bool IsValid(object? value) => value is int number && number % 2 == 0;
+}
+
+public record SubType
+{
+    [Required]
+    public string RequiredProperty { get; set; } = "some-value";
+
+    [StringLength(10)]
+    public string? StringWithLength { get; set; }
+}
+
+public record SubTypeWithInheritance : SubType
+{
+    [EmailAddress]
+    public string? EmailString { get; set; }
+}
+""";
+        await Verify(source, out var compilation);
+        await VerifyValidatableType(compilation, "ComplexType", async (validationOptions, type) =>
+        {
+            Assert.True(validationOptions.TryGetValidatableTypeInfo(type, out var validatableTypeInfo));
+
+            await InvalidIntegerWithRangeProducesError(validatableTypeInfo);
+            await InvalidIntegerWithRangeAndDisplayNameProducesError(validatableTypeInfo);
+            await MissingRequiredSubtypePropertyProducesError(validatableTypeInfo);
+            await InvalidRequiredSubtypePropertyProducesError(validatableTypeInfo);
+            await InvalidSubTypeWithInheritancePropertyProducesError(validatableTypeInfo);
+            await InvalidListOfSubTypesProducesError(validatableTypeInfo);
+            await InvalidPropertyWithDerivedValidationAttributeProducesError(validatableTypeInfo);
+            await InvalidPropertyWithMultipleAttributesProducesError(validatableTypeInfo);
+            await InvalidPropertyWithCustomValidationProducesError(validatableTypeInfo);
+            await ValidInputProducesNoWarnings(validatableTypeInfo);
+
+            async Task InvalidIntegerWithRangeProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithRange")?.SetValue(instance, 5);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableTypeInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRange", kvp.Key);
+                    Assert.Equal("The field IntegerWithRange must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidIntegerWithRangeAndDisplayNameProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithRangeAndDisplayName")?.SetValue(instance, 5);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithRangeAndDisplayName", kvp.Key);
+                    Assert.Equal("The field Valid identifier must be between 10 and 100.", kvp.Value.Single());
+                });
+            }
+
+            async Task MissingRequiredSubtypePropertyProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("PropertyWithMemberAttributes")?.SetValue(instance, null);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMemberAttributes", kvp.Key);
+                    Assert.Equal("The PropertyWithMemberAttributes field is required.", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidRequiredSubtypePropertyProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var subType = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType.GetType().GetProperty("RequiredProperty")?.SetValue(subType, "");
+                subType.GetType().GetProperty("StringWithLength")?.SetValue(subType, "way-too-long");
+                type.GetProperty("PropertyWithMemberAttributes")?.SetValue(instance, subType);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithMemberAttributes.RequiredProperty", kvp.Key);
+                        Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithMemberAttributes.StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidSubTypeWithInheritancePropertyProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var inheritanceType = Activator.CreateInstance(type.Assembly.GetType("SubTypeWithInheritance")!);
+                inheritanceType.GetType().GetProperty("RequiredProperty")?.SetValue(inheritanceType, "");
+                inheritanceType.GetType().GetProperty("StringWithLength")?.SetValue(inheritanceType, "way-too-long");
+                inheritanceType.GetType().GetProperty("EmailString")?.SetValue(inheritanceType, "not-an-email");
+                type.GetProperty("PropertyWithInheritance")?.SetValue(instance, inheritanceType);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithInheritance.EmailString", kvp.Key);
+                        Assert.Equal("The EmailString field is not a valid e-mail address.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithInheritance.RequiredProperty", kvp.Key);
+                        Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("PropertyWithInheritance.StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidListOfSubTypesProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                var subTypeList = Activator.CreateInstance(typeof(List<>).MakeGenericType(type.Assembly.GetType("SubType")!));
+
+                // Create first invalid item
+                var subType1 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType1.GetType().GetProperty("RequiredProperty")?.SetValue(subType1, "");
+                subType1.GetType().GetProperty("StringWithLength")?.SetValue(subType1, "way-too-long");
+
+                // Create second invalid item
+                var subType2 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType2.GetType().GetProperty("RequiredProperty")?.SetValue(subType2, "valid");
+                subType2.GetType().GetProperty("StringWithLength")?.SetValue(subType2, "way-too-long");
+
+                // Create valid item
+                var subType3 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType3.GetType().GetProperty("RequiredProperty")?.SetValue(subType3, "valid");
+                subType3.GetType().GetProperty("StringWithLength")?.SetValue(subType3, "valid");
+
+                // Add to list
+                subTypeList.GetType().GetMethod("Add")?.Invoke(subTypeList, [subType1]);
+                subTypeList.GetType().GetMethod("Add")?.Invoke(subTypeList, [subType2]);
+                subTypeList.GetType().GetMethod("Add")?.Invoke(subTypeList, [subType3]);
+
+                type.GetProperty("ListOfSubTypes")?.SetValue(instance, subTypeList);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors,
+                    kvp =>
+                    {
+                        Assert.Equal("ListOfSubTypes[0].RequiredProperty", kvp.Key);
+                        Assert.Equal("The RequiredProperty field is required.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("ListOfSubTypes[0].StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    },
+                    kvp =>
+                    {
+                        Assert.Equal("ListOfSubTypes[1].StringWithLength", kvp.Key);
+                        Assert.Equal("The field StringWithLength must be a string with a maximum length of 10.", kvp.Value.Single());
+                    });
+            }
+
+            async Task InvalidPropertyWithDerivedValidationAttributeProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithCustomValidationAttribute")?.SetValue(instance, 5); // Odd number, should fail
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithCustomValidationAttribute", kvp.Key);
+                    Assert.Equal("Value must be an even number", kvp.Value.Single());
+                });
+            }
+
+            async Task InvalidPropertyWithMultipleAttributesProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("PropertyWithMultipleAttributes")?.SetValue(instance, 5);
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("PropertyWithMultipleAttributes", kvp.Key);
+                    Assert.Collection(kvp.Value,
+                        error =>
+                        {
+                            Assert.Equal("The field PropertyWithMultipleAttributes is invalid.", error);
+                        },
+                        error =>
+                        {
+                            Assert.Equal("The field PropertyWithMultipleAttributes must be between 10 and 100.", error);
+                        });
+                });
+            }
+
+            async Task InvalidPropertyWithCustomValidationProducesError(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+                type.GetProperty("IntegerWithCustomValidationAttribute")?.SetValue(instance, 3); // Odd number should fail
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Collection(context.ValidationErrors, kvp =>
+                {
+                    Assert.Equal("IntegerWithCustomValidationAttribute", kvp.Key);
+                    Assert.Equal("Value must be an even number", kvp.Value.Single());
+                });
+            }
+
+            async Task ValidInputProducesNoWarnings(IValidatableInfo validatableInfo)
+            {
+                var instance = Activator.CreateInstance(type);
+
+                // Set all properties with valid values
+                type.GetProperty("IntegerWithRange")?.SetValue(instance, 50);
+                type.GetProperty("IntegerWithRangeAndDisplayName")?.SetValue(instance, 50);
+
+                // Create and set PropertyWithMemberAttributes
+                var subType1 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType1.GetType().GetProperty("RequiredProperty")?.SetValue(subType1, "valid");
+                subType1.GetType().GetProperty("StringWithLength")?.SetValue(subType1, "valid");
+                type.GetProperty("PropertyWithMemberAttributes")?.SetValue(instance, subType1);
+
+                // Create and set PropertyWithoutMemberAttributes
+                var subType2 = Activator.CreateInstance(type.Assembly.GetType("SubType")!);
+                subType2.GetType().GetProperty("RequiredProperty")?.SetValue(subType2, "valid");
+                subType2.GetType().GetProperty("StringWithLength")?.SetValue(subType2, "valid");
+                type.GetProperty("PropertyWithoutMemberAttributes")?.SetValue(instance, subType2);
+
+                // Create and set PropertyWithInheritance
+                var inheritanceType = Activator.CreateInstance(type.Assembly.GetType("SubTypeWithInheritance")!);
+                inheritanceType.GetType().GetProperty("RequiredProperty")?.SetValue(inheritanceType, "valid");
+                inheritanceType.GetType().GetProperty("StringWithLength")?.SetValue(inheritanceType, "valid");
+                inheritanceType.GetType().GetProperty("EmailString")?.SetValue(inheritanceType, "test@example.com");
+                type.GetProperty("PropertyWithInheritance")?.SetValue(instance, inheritanceType);
+
+                // Create empty list for ListOfSubTypes
+                var emptyList = Activator.CreateInstance(typeof(List<>).MakeGenericType(type.Assembly.GetType("SubType")!));
+                type.GetProperty("ListOfSubTypes")?.SetValue(instance, emptyList);
+
+                // Set custom validation attributes
+                type.GetProperty("IntegerWithCustomValidationAttribute")?.SetValue(instance, 2); // Even number should pass
+                type.GetProperty("PropertyWithMultipleAttributes")?.SetValue(instance, 12);
+
+                var context = new ValidateContext
+                {
+                    ValidationOptions = validationOptions,
+                    ValidationContext = new ValidationContext(instance)
+                };
+
+                await validatableInfo.ValidateAsync(instance, context, CancellationToken.None);
+
+                Assert.Null(context.ValidationErrors);
+            }
+        });
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGeneratorTestBase.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGeneratorTestBase.cs
new file mode 100644
index 000000000000..8dd7670a50f1
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGeneratorTestBase.cs
@@ -0,0 +1,601 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Globalization;
+using System.IO.Pipelines;
+using System.Reflection;
+using System.Runtime.Loader;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Validation;
+
+namespace Microsoft.Extensions.Validation.GeneratorTests;
+
+[UsesVerify]
+public partial class ValidationsGeneratorTestBase : LoggedTestBase
+{
+    [GeneratedRegex(@"\[global::System\.Runtime\.CompilerServices\.InterceptsLocationAttribute\([^)]*\)\]")]
+    private static partial Regex InterceptsLocationRegex();
+
+    private static readonly CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview)
+        .WithFeatures([new KeyValuePair<string, string>("InterceptorsNamespaces", "Microsoft.Extensions.Validation.Generated")]);
+
+    internal static Task Verify(string source, out Compilation compilation)
+    {
+        var references = AppDomain.CurrentDomain.GetAssemblies()
+                .Where(assembly => !assembly.IsDynamic && !string.IsNullOrWhiteSpace(assembly.Location))
+                .Select(assembly => MetadataReference.CreateFromFile(assembly.Location))
+                .Concat(
+                [
+                    MetadataReference.CreateFromFile(typeof(WebApplicationBuilder).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(EndpointRouteBuilderExtensions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IApplicationBuilder).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Microsoft.AspNetCore.Mvc.ControllerBase).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(MvcCoreMvcBuilderExtensions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(TypedResults).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(System.Text.Json.Nodes.JsonArray).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Console).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(Uri).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IFormFileCollection).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(PipeReader).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(System.ComponentModel.DataAnnotations.ValidationAttribute).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(RouteData).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IFeatureCollection).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(ValidateOptionsResult).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IHttpMethodMetadata).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IResult).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(HttpJsonServiceExtensions).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(IValidatableInfoResolver).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(EndpointFilterFactoryContext).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(ValidationServiceCollectionExtensions).Assembly.Location),
+                ]);
+        var inputCompilation = CSharpCompilation.Create("ValidationsGeneratorSample",
+            [CSharpSyntaxTree.ParseText(source, options: ParseOptions, path: "Program.cs")],
+            references,
+            new CSharpCompilationOptions(OutputKind.ConsoleApplication));
+        var generator = new ValidationsGenerator();
+        var driver = CSharpGeneratorDriver.Create(generators: [generator.AsSourceGenerator()], parseOptions: ParseOptions);
+        return Verifier
+            .Verify(driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out compilation, out var diagnostics))
+            .ScrubLinesWithReplace(line => InterceptsLocationRegex().Replace(line, "[InterceptsLocation]"))
+            .UseDirectory(SkipOnHelixAttribute.OnHelix() && Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is { } workItemRoot
+                ? Path.Combine(workItemRoot, "snapshots")
+                : "snapshots");
+    }
+
+    internal static async Task VerifyValidatableType(Compilation compilation, string typeName, Func<ValidationOptions, Type, Task> verifyFunc)
+    {
+        if (TryResolveServicesFromCompilation(compilation, targetAssemblyName: "Microsoft.Extensions.Validation", typeName: "Microsoft.Extensions.Validation.ValidationOptions", out var services, out var serviceType, out var outputAssemblyName) is false)
+        {
+            throw new InvalidOperationException("Could not resolve services from compilation.");
+        }
+        var targetAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => assembly.GetName().Name == outputAssemblyName);
+        var type = targetAssembly?.GetType(typeName, throwOnError: false);
+        Debug.Assert(type != null, $"Could not find type {typeName} in assembly {outputAssemblyName}.");
+
+        // Get IOptions<ValidationOptions> first
+        var optionsType = typeof(IOptions<>).MakeGenericType(serviceType);
+        var optionsInstance = services.GetService(optionsType) ?? throw new InvalidOperationException("Could not resolve IOptions<ValidationOptions>.");
+
+        // Then access the Value property
+        var valueProperty = optionsType.GetProperty("Value");
+        var service = (ValidationOptions)valueProperty.GetValue(optionsInstance) ?? throw new InvalidOperationException("Could not resolve ValidationOptions.");
+        await verifyFunc(service, type);
+    }
+
+    internal static async Task VerifyEndpoint(Compilation compilation, string routePattern, Func<Endpoint, IServiceProvider, Task> verifyFunc)
+    {
+        if (TryResolveServicesFromCompilation(compilation, targetAssemblyName: "Microsoft.AspNetCore.Routing", typeName: "Microsoft.AspNetCore.Routing.EndpointDataSource", out var services, out var serviceType, out var outputAssemblyName) is false)
+        {
+            throw new InvalidOperationException("Could not resolve services from compilation.");
+        }
+        var service = services.GetService(serviceType) ?? throw new InvalidOperationException("Could not resolve EndpointDataSource.");
+        var endpoints = (IReadOnlyList<Endpoint>)service.GetType().GetProperty("Endpoints", BindingFlags.Instance | BindingFlags.Public).GetValue(service);
+        var endpoint = endpoints.FirstOrDefault(endpoint => endpoint is RouteEndpoint routeEndpoint && routeEndpoint.RoutePattern.RawText == routePattern);
+        await verifyFunc(endpoint, services);
+    }
+
+    private static bool TryResolveServicesFromCompilation(Compilation compilation, string targetAssemblyName, string typeName, out IServiceProvider serviceProvider, out Type serviceType, out string outputAssemblyName)
+    {
+        serviceProvider = null;
+        serviceType = null;
+        outputAssemblyName = $"TestProject-{Guid.NewGuid()}";
+        var assemblyName = compilation.AssemblyName;
+        var symbolsName = Path.ChangeExtension(assemblyName, "pdb");
+
+        var output = new MemoryStream();
+        var pdb = new MemoryStream();
+
+        var emitOptions = new EmitOptions(
+            debugInformationFormat: DebugInformationFormat.PortablePdb,
+            pdbFilePath: symbolsName,
+            outputNameOverride: outputAssemblyName);
+
+        var embeddedTexts = new List<EmbeddedText>();
+
+        foreach (var syntaxTree in compilation.SyntaxTrees)
+        {
+            var text = syntaxTree.GetText();
+            var encoding = text.Encoding ?? Encoding.UTF8;
+            var buffer = encoding.GetBytes(text.ToString());
+            var sourceText = SourceText.From(buffer, buffer.Length, encoding, canBeEmbedded: true);
+
+            var syntaxRootNode = (CSharpSyntaxNode)syntaxTree.GetRoot();
+            var newSyntaxTree = CSharpSyntaxTree.Create(syntaxRootNode, options: ParseOptions, encoding: encoding, path: syntaxTree.FilePath);
+
+            compilation = compilation.ReplaceSyntaxTree(syntaxTree, newSyntaxTree);
+
+            embeddedTexts.Add(EmbeddedText.FromSource(syntaxTree.FilePath, sourceText));
+        }
+
+        var result = compilation.Emit(output, pdb, options: emitOptions, embeddedTexts: embeddedTexts);
+
+        Assert.Empty(result.Diagnostics.Where(d => d.Severity > DiagnosticSeverity.Warning));
+        Assert.True(result.Success);
+
+        output.Position = 0;
+        pdb.Position = 0;
+
+        var assembly = AssemblyLoadContext.Default.LoadFromStream(output, pdb);
+
+        void ConfigureHostBuilder(object hostBuilder)
+        {
+            ((IHostBuilder)hostBuilder).ConfigureServices((context, services) =>
+            {
+                services.AddSingleton<IServer, NoopServer>();
+                services.AddSingleton<IHostLifetime, NoopHostLifetime>();
+            });
+        }
+
+        var waitForStartTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+        void OnEntryPointExit(Exception exception)
+        {
+            // If the entry point exited, we'll try to complete the wait
+            if (exception != null)
+            {
+                waitForStartTcs.TrySetException(exception);
+            }
+            else
+            {
+                waitForStartTcs.TrySetResult(0);
+            }
+        }
+
+        var factory = HostFactoryResolver.ResolveHostFactory(assembly,
+            stopApplication: false,
+            configureHostBuilder: ConfigureHostBuilder,
+            entrypointCompleted: OnEntryPointExit);
+
+        if (factory == null)
+        {
+            return false;
+        }
+
+        var services = ((IHost)factory([$"--{HostDefaults.ApplicationKey}={assemblyName}"])).Services;
+
+        var applicationLifetime = services.GetRequiredService<IHostApplicationLifetime>();
+        using var registration = applicationLifetime.ApplicationStarted.Register(() => waitForStartTcs.TrySetResult(0));
+        waitForStartTcs.Task.Wait();
+        var targetAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => assembly.GetName().Name == targetAssemblyName);
+        serviceType = targetAssembly.GetType(typeName, throwOnError: false);
+
+        if (serviceType == null)
+        {
+            return false;
+        }
+
+        serviceProvider = services;
+        return true;
+    }
+
+    private sealed class NoopHostLifetime : IHostLifetime
+    {
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+        public Task WaitForStartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+    private sealed class NoopServer : IServer
+    {
+        public IFeatureCollection Features { get; } = new FeatureCollection();
+        public void Dispose() { }
+        public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken) where TContext : notnull => Task.CompletedTask;
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+    private sealed class HostFactoryResolver
+    {
+        private const BindingFlags DeclaredOnlyLookup = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+        public const string BuildWebHost = nameof(BuildWebHost);
+        public const string CreateWebHostBuilder = nameof(CreateWebHostBuilder);
+        public const string CreateHostBuilder = nameof(CreateHostBuilder);
+        private const string TimeoutEnvironmentKey = "DOTNET_HOST_FACTORY_RESOLVER_DEFAULT_TIMEOUT_IN_SECONDS";
+
+        // The amount of time we wait for the diagnostic source events to fire
+        private static readonly TimeSpan s_defaultWaitTimeout = SetupDefaultTimeout();
+
+        private static TimeSpan SetupDefaultTimeout()
+        {
+            if (Debugger.IsAttached)
+            {
+                return Timeout.InfiniteTimeSpan;
+            }
+
+            if (uint.TryParse(Environment.GetEnvironmentVariable(TimeoutEnvironmentKey), out uint timeoutInSeconds))
+            {
+                return TimeSpan.FromSeconds((int)timeoutInSeconds);
+            }
+
+            return TimeSpan.FromMinutes(5);
+        }
+
+        public static Func<string[], TWebHost> ResolveWebHostFactory<TWebHost>(Assembly assembly)
+        {
+            return ResolveFactory<TWebHost>(assembly, BuildWebHost);
+        }
+
+        public static Func<string[], TWebHostBuilder> ResolveWebHostBuilderFactory<TWebHostBuilder>(Assembly assembly)
+        {
+            return ResolveFactory<TWebHostBuilder>(assembly, CreateWebHostBuilder);
+        }
+
+        public static Func<string[], THostBuilder> ResolveHostBuilderFactory<THostBuilder>(Assembly assembly)
+        {
+            return ResolveFactory<THostBuilder>(assembly, CreateHostBuilder);
+        }
+
+        // This helpers encapsulates all of the complex logic required to:
+        // 1. Execute the entry point of the specified assembly in a different thread.
+        // 2. Wait for the diagnostic source events to fire
+        // 3. Give the caller a chance to execute logic to mutate the IHostBuilder
+        // 4. Resolve the instance of the applications's IHost
+        // 5. Allow the caller to determine if the entry point has completed
+        public static Func<string[], object> ResolveHostFactory(Assembly assembly,
+                                                                 TimeSpan waitTimeout = default,
+                                                                 bool stopApplication = true,
+                                                                 Action<object> configureHostBuilder = null,
+                                                                 Action<Exception> entrypointCompleted = null)
+        {
+            if (assembly.EntryPoint is null)
+            {
+                return null;
+            }
+
+            return args => new HostingListener(args, assembly.EntryPoint, waitTimeout == default ? s_defaultWaitTimeout : waitTimeout, stopApplication, configureHostBuilder, entrypointCompleted).CreateHost();
+        }
+
+        private static Func<string[], T> ResolveFactory<T>(Assembly assembly, string name)
+        {
+            var programType = assembly.EntryPoint.DeclaringType;
+            if (programType == null)
+            {
+                return null;
+            }
+
+            var factory = programType.GetMethod(name, DeclaredOnlyLookup);
+            if (!IsFactory<T>(factory))
+            {
+                return null;
+            }
+
+            return args => (T)factory!.Invoke(null, [args])!;
+        }
+
+        // TReturn Factory(string[] args);
+        private static bool IsFactory<TReturn>(MethodInfo factory)
+        {
+            return factory != null
+                && typeof(TReturn).IsAssignableFrom(factory.ReturnType)
+                && factory.GetParameters().Length == 1
+                && typeof(string[]).Equals(factory.GetParameters()[0].ParameterType);
+        }
+
+        // Used by EF tooling without any Hosting references. Looses some return type safety checks.
+        public static Func<string[], IServiceProvider> ResolveServiceProviderFactory(Assembly assembly, TimeSpan waitTimeout = default)
+        {
+            // Prefer the older patterns by default for back compat.
+            var webHostFactory = ResolveWebHostFactory<object>(assembly);
+            if (webHostFactory != null)
+            {
+                return args =>
+                {
+                    var webHost = webHostFactory(args);
+                    return GetServiceProvider(webHost);
+                };
+            }
+
+            var webHostBuilderFactory = ResolveWebHostBuilderFactory<object>(assembly);
+            if (webHostBuilderFactory != null)
+            {
+                return args =>
+                {
+                    var webHostBuilder = webHostBuilderFactory(args);
+                    var webHost = Build(webHostBuilder);
+                    return GetServiceProvider(webHost);
+                };
+            }
+
+            var hostBuilderFactory = ResolveHostBuilderFactory<object>(assembly);
+            if (hostBuilderFactory != null)
+            {
+                return args =>
+                {
+                    var hostBuilder = hostBuilderFactory(args);
+                    var host = Build(hostBuilder);
+                    return GetServiceProvider(host);
+                };
+            }
+
+            var hostFactory = ResolveHostFactory(assembly, waitTimeout: waitTimeout);
+            if (hostFactory != null)
+            {
+                return args =>
+                {
+                    static bool IsApplicationNameArg(string arg)
+                        => arg.Equals("--applicationName", StringComparison.OrdinalIgnoreCase) ||
+                            arg.Equals("/applicationName", StringComparison.OrdinalIgnoreCase);
+
+                    if (!args.Any(arg => IsApplicationNameArg(arg)) && assembly.GetName().Name is string assemblyName)
+                    {
+                        args = [.. args, .. new[] { "--applicationName", assemblyName }];
+                    }
+
+                    var host = hostFactory(args);
+                    return GetServiceProvider(host);
+                };
+            }
+
+            return null;
+        }
+
+        private static object Build(object builder)
+        {
+            var buildMethod = builder.GetType().GetMethod("Build");
+            return buildMethod.Invoke(builder, []);
+        }
+
+        private static IServiceProvider GetServiceProvider(object host)
+        {
+            if (host == null)
+            {
+                return null;
+            }
+            var hostType = host.GetType();
+            var servicesProperty = hostType.GetProperty("Services", DeclaredOnlyLookup);
+            return (IServiceProvider)servicesProperty.GetValue(host);
+        }
+
+        private sealed class HostingListener : IObserver<DiagnosticListener>, IObserver<KeyValuePair<string, object>>
+        {
+            private readonly string[] _args;
+            private readonly MethodInfo _entryPoint;
+            private readonly TimeSpan _waitTimeout;
+            private readonly bool _stopApplication;
+
+            private readonly TaskCompletionSource<object> _hostTcs = new();
+            private IDisposable _disposable;
+            private readonly Action<object> _configure;
+            private readonly Action<Exception> _entrypointCompleted;
+            private static readonly AsyncLocal<HostingListener> _currentListener = new();
+
+            public HostingListener(string[] args, MethodInfo entryPoint, TimeSpan waitTimeout, bool stopApplication, Action<object> configure, Action<Exception> entrypointCompleted)
+            {
+                _args = args;
+                _entryPoint = entryPoint;
+                _waitTimeout = waitTimeout;
+                _stopApplication = stopApplication;
+                _configure = configure;
+                _entrypointCompleted = entrypointCompleted;
+            }
+
+            public object CreateHost()
+            {
+                using var subscription = DiagnosticListener.AllListeners.Subscribe(this);
+
+                // Kick off the entry point on a new thread so we don't block the current one
+                // in case we need to timeout the execution
+                var thread = new Thread(() =>
+                {
+                    Exception exception = null;
+
+                    try
+                    {
+                        // Set the async local to the instance of the HostingListener so we can filter events that
+                        // aren't scoped to this execution of the entry point.
+                        _currentListener.Value = this;
+
+                        var parameters = _entryPoint.GetParameters();
+                        if (parameters.Length == 0)
+                        {
+                            _entryPoint.Invoke(null, []);
+                        }
+                        else
+                        {
+                            _entryPoint.Invoke(null, new object[] { _args });
+                        }
+
+                        // Try to set an exception if the entry point returns gracefully, this will force
+                        // build to throw
+                        _hostTcs.TrySetException(new InvalidOperationException("The entry point exited without ever building an IHost."));
+                    }
+                    catch (TargetInvocationException tie) when (tie.InnerException.GetType().Name == "HostAbortedException")
+                    {
+                        // The host was stopped by our own logic
+                    }
+                    catch (TargetInvocationException tie)
+                    {
+                        exception = tie.InnerException ?? tie;
+
+                        // Another exception happened, propagate that to the caller
+                        _hostTcs.TrySetException(exception);
+                    }
+                    catch (Exception ex)
+                    {
+                        exception = ex;
+
+                        // Another exception happened, propagate that to the caller
+                        _hostTcs.TrySetException(ex);
+                    }
+                    finally
+                    {
+                        // Signal that the entry point is completed
+                        _entrypointCompleted.Invoke(exception);
+                    }
+                })
+                {
+                    // Make sure this doesn't hang the process
+                    IsBackground = true
+                };
+
+                // Start the thread
+                thread.Start();
+
+                try
+                {
+                    // Wait before throwing an exception
+                    if (!_hostTcs.Task.Wait(_waitTimeout))
+                    {
+                        throw new InvalidOperationException($"Timed out waiting for the entry point to build the IHost after {s_defaultWaitTimeout}. This timeout can be modified using the '{TimeoutEnvironmentKey}' environment variable.");
+                    }
+                }
+                catch (AggregateException) when (_hostTcs.Task.IsCompleted)
+                {
+                    // Lets this propagate out of the call to GetAwaiter().GetResult()
+                }
+
+                Debug.Assert(_hostTcs.Task.IsCompleted);
+
+                return _hostTcs.Task.GetAwaiter().GetResult();
+            }
+
+            public void OnCompleted()
+            {
+                _disposable.Dispose();
+            }
+
+            public void OnError(Exception error)
+            {
+
+            }
+
+            public void OnNext(DiagnosticListener value)
+            {
+                if (_currentListener.Value != this)
+                {
+                    // Ignore events that aren't for this listener
+                    return;
+                }
+
+                if (value.Name == "Microsoft.Extensions.Hosting")
+                {
+                    _disposable = value.Subscribe(this);
+                }
+            }
+
+            public void OnNext(KeyValuePair<string, object> value)
+            {
+                if (_currentListener.Value != this)
+                {
+                    // Ignore events that aren't for this listener
+                    return;
+                }
+
+                if (value.Key == "HostBuilding")
+                {
+                    _configure.Invoke(value.Value!);
+                }
+
+                if (value.Key == "HostBuilt")
+                {
+                    _hostTcs.TrySetResult(value.Value!);
+
+                    if (_stopApplication)
+                    {
+                        // Stop the host from running further
+                        ThrowHostAborted();
+                    }
+                }
+            }
+
+            // HostFactoryResolver is used by tools that explicitly don't want to reference Microsoft.Extensions.Hosting assemblies.
+            // So don't depend on the public HostAbortedException directly. Instead, load the exception type dynamically if it can
+            // be found. If it can't (possibly because the app is using an older version), throw a private exception with the same name.
+            private static void ThrowHostAborted()
+            {
+                var publicHostAbortedExceptionType = Type.GetType("Microsoft.Extensions.Hosting.HostAbortedException, Microsoft.Extensions.Hosting.Abstractions", throwOnError: false);
+                if (publicHostAbortedExceptionType != null)
+                {
+                    throw (Exception)Activator.CreateInstance(publicHostAbortedExceptionType)!;
+                }
+                else
+                {
+                    throw new HostAbortedException();
+                }
+            }
+
+            private sealed class HostAbortedException : Exception
+            {
+            }
+        }
+    }
+
+    internal HttpContext CreateHttpContext(IServiceProvider serviceProvider)
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.RequestServices = serviceProvider;
+
+        var outStream = new MemoryStream();
+        httpContext.Response.Body = outStream;
+
+        return httpContext;
+    }
+
+    internal HttpContext CreateHttpContextWithPayload(string requestData, IServiceProvider serviceProvider = null)
+    {
+        var httpContext = CreateHttpContext(serviceProvider);
+        httpContext.Features.Set<IHttpRequestBodyDetectionFeature>(new RequestBodyDetectionFeature(true));
+        httpContext.Request.Headers["Content-Type"] = "application/json";
+
+        var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(requestData));
+        httpContext.Request.Body = stream;
+        httpContext.Request.Headers["Content-Length"] = stream.Length.ToString(CultureInfo.InvariantCulture);
+        return httpContext;
+    }
+
+    internal static async Task<HttpValidationProblemDetails> AssertBadRequest(HttpContext context)
+    {
+        Assert.Equal(StatusCodes.Status400BadRequest, context.Response.StatusCode);
+        context.Response.Body.Position = 0;
+        using var reader = new StreamReader(context.Response.Body);
+        var responseBody = await reader.ReadToEndAsync();
+        return JsonSerializer.Deserialize<HttpValidationProblemDetails>(responseBody);
+    }
+
+    internal sealed class RequestBodyDetectionFeature : IHttpRequestBodyDetectionFeature
+    {
+        public RequestBodyDetectionFeature(bool canHaveBody)
+        {
+            CanHaveBody = canHaveBody;
+        }
+
+        public bool CanHaveBody { get; }
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanDiscoverGeneratedValidatableTypeAttribute#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanDiscoverGeneratedValidatableTypeAttribute#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..528d05df6fae
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanDiscoverGeneratedValidatableTypeAttribute#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,195 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::MyApp.Customer))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::MyApp.Customer),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::MyApp.Customer),
+                            propertyType: typeof(string),
+                            name: "Name",
+                            displayName: "Name"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::MyApp.Customer),
+                            propertyType: typeof(string),
+                            name: "Email",
+                            displayName: "Email"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanUseBothFrameworkAndGeneratedValidatableTypeAttributes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanUseBothFrameworkAndGeneratedValidatableTypeAttributes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..7d5887992ec3
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanUseBothFrameworkAndGeneratedValidatableTypeAttributes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,216 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::MyApp.Customer))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::MyApp.Customer),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::MyApp.Customer),
+                            propertyType: typeof(string),
+                            name: "Name",
+                            displayName: "Name"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::MyApp.Customer),
+                            propertyType: typeof(string),
+                            name: "Email",
+                            displayName: "Email"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::MyApp.Product))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::MyApp.Product),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::MyApp.Product),
+                            propertyType: typeof(string),
+                            name: "ProductName",
+                            displayName: "ProductName"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::MyApp.Product),
+                            propertyType: typeof(decimal),
+                            name: "Price",
+                            displayName: "Price"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateClassTypesWithAttribute#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateClassTypesWithAttribute#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..9043384c0644
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateClassTypesWithAttribute#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,267 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::SubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "RequiredProperty",
+                            displayName: "RequiredProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::SubTypeWithInheritance))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubTypeWithInheritance),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubTypeWithInheritance),
+                            propertyType: typeof(string),
+                            name: "EmailString",
+                            displayName: "EmailString"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRangeAndDisplayName",
+                            displayName: "Valid identifier"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithMemberAttributes",
+                            displayName: "PropertyWithMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithoutMemberAttributes",
+                            displayName: "PropertyWithoutMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubTypeWithInheritance),
+                            name: "PropertyWithInheritance",
+                            displayName: "PropertyWithInheritance"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::System.Collections.Generic.List<global::SubType>),
+                            name: "ListOfSubTypes",
+                            displayName: "ListOfSubTypes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithCustomValidationAttribute",
+                            displayName: "IntegerWithCustomValidationAttribute"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "PropertyWithMultipleAttributes",
+                            displayName: "PropertyWithMultipleAttributes"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateComplexTypes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateComplexTypes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..dc941b30b736
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateComplexTypes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,273 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::SubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "RequiredProperty",
+                            displayName: "RequiredProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::SubTypeWithInheritance))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubTypeWithInheritance),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubTypeWithInheritance),
+                            propertyType: typeof(string),
+                            name: "EmailString",
+                            displayName: "EmailString"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRangeAndDisplayName",
+                            displayName: "Valid identifier"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithMemberAttributes",
+                            displayName: "PropertyWithMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithoutMemberAttributes",
+                            displayName: "PropertyWithoutMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubTypeWithInheritance),
+                            name: "PropertyWithInheritance",
+                            displayName: "PropertyWithInheritance"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::System.Collections.Generic.List<global::SubType>),
+                            name: "ListOfSubTypes",
+                            displayName: "ListOfSubTypes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithDerivedValidationAttribute",
+                            displayName: "IntegerWithDerivedValidationAttribute"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithCustomValidation",
+                            displayName: "IntegerWithCustomValidation"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "PropertyWithMultipleAttributes",
+                            displayName: "PropertyWithMultipleAttributes"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateComplexTypesWithJsonIgnore#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateComplexTypesWithJsonIgnore#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..c6957d8a67ec
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateComplexTypesWithJsonIgnore#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,204 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::ComplexTypeWithJsonIgnore))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexTypeWithJsonIgnore),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithJsonIgnore),
+                            propertyType: typeof(int),
+                            name: "ValidatedProperty",
+                            displayName: "ValidatedProperty"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::RecordTypeWithJsonIgnore))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::RecordTypeWithJsonIgnore),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::RecordTypeWithJsonIgnore),
+                            propertyType: typeof(int),
+                            name: "ValidatedProperty",
+                            displayName: "ValidatedProperty"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..7c3d76702b7c
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,224 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::SubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "RequiredProperty",
+                            displayName: "RequiredProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ValidatableSubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ValidatableSubType),
+                    members: []
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexValidatableType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexValidatableType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexValidatableType),
+                            propertyType: typeof(string),
+                            name: "Value2",
+                            displayName: "Value2"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexValidatableType),
+                            propertyType: typeof(global::ValidatableSubType),
+                            name: "SubType",
+                            displayName: "SubType"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject_WithoutPropertyValidations#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject_WithoutPropertyValidations#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..ecd4ed6edd21
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject_WithoutPropertyValidations#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,213 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::BaseClass))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::BaseClass),
+                    members: []
+                );
+                return true;
+            }
+            if (type == typeof(global::DerivedClass))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::DerivedClass),
+                    members: []
+                );
+                return true;
+            }
+            if (type == typeof(global::NestedClass))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NestedClass),
+                    members: []
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexClass))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexClass),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexClass),
+                            propertyType: typeof(global::NestedClass),
+                            name: "NestedObject",
+                            displayName: "NestedObject"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateMultipleNamespaces#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateMultipleNamespaces#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..358791ffd09d
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateMultipleNamespaces#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,204 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::NamespaceOne.Type))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NamespaceOne.Type),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::NamespaceOne.Type),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::NamespaceTwo.Type))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NamespaceTwo.Type),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::NamespaceTwo.Type),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateParameters#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateParameters#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..81e8cc0ba5a2
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateParameters#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,204 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::TestService))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::TestService),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::TestService),
+                            propertyType: typeof(int),
+                            name: "Value",
+                            displayName: "Value"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::System.Collections.Generic.Dictionary<string, global::TestService>))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::System.Collections.Generic.Dictionary<string, global::TestService>),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::System.Collections.Generic.Dictionary<string, global::TestService>),
+                            propertyType: typeof(global::TestService),
+                            name: "this[]",
+                            displayName: "this[]"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidatePolymorphicTypes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidatePolymorphicTypes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..96f7a763268f
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidatePolymorphicTypes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,254 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::DerivedType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::DerivedType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::DerivedType),
+                            propertyType: typeof(string),
+                            name: "Value3",
+                            displayName: "Value3"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::BaseType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::BaseType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::BaseType),
+                            propertyType: typeof(int),
+                            name: "Value1",
+                            displayName: "Value 1"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::BaseType),
+                            propertyType: typeof(string),
+                            name: "Value2",
+                            displayName: "Value2"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::DerivedValidatableType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::DerivedValidatableType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::DerivedValidatableType),
+                            propertyType: typeof(string),
+                            name: "Value3",
+                            displayName: "Value3"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::BaseValidatableType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::BaseValidatableType),
+                    members: []
+                );
+                return true;
+            }
+            if (type == typeof(global::ContainerType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ContainerType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ContainerType),
+                            propertyType: typeof(global::BaseType),
+                            name: "BaseType",
+                            displayName: "BaseType"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ContainerType),
+                            propertyType: typeof(global::BaseValidatableType),
+                            name: "BaseValidatableType",
+                            displayName: "BaseValidatableType"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..e308777967aa
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,300 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::SubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "RequiredProperty",
+                            displayName: "RequiredProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::SubTypeWithInheritance))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubTypeWithInheritance),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubTypeWithInheritance),
+                            propertyType: typeof(string),
+                            name: "EmailString",
+                            displayName: "EmailString"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::SubTypeWithoutConstructor))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubTypeWithoutConstructor),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubTypeWithoutConstructor),
+                            propertyType: typeof(string),
+                            name: "RequiredProperty",
+                            displayName: "RequiredProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubTypeWithoutConstructor),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ValidatableRecord))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ValidatableRecord),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRangeAndDisplayName",
+                            displayName: "Valid identifier"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithMemberAttributes",
+                            displayName: "PropertyWithMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithoutMemberAttributes",
+                            displayName: "PropertyWithoutMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(global::SubTypeWithInheritance),
+                            name: "PropertyWithInheritance",
+                            displayName: "PropertyWithInheritance"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(global::SubTypeWithoutConstructor),
+                            name: "PropertyOfSubtypeWithoutConstructor",
+                            displayName: "PropertyOfSubtypeWithoutConstructor"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(global::System.Collections.Generic.List<global::SubType>),
+                            name: "ListOfSubTypes",
+                            displayName: "ListOfSubTypes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(int),
+                            name: "IntegerWithDerivedValidationAttribute",
+                            displayName: "IntegerWithDerivedValidationAttribute"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(int),
+                            name: "IntegerWithCustomValidation",
+                            displayName: "IntegerWithCustomValidation"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(int),
+                            name: "PropertyWithMultipleAttributes",
+                            displayName: "PropertyWithMultipleAttributes"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypesWithAttribute#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypesWithAttribute#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..9043384c0644
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypesWithAttribute#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,267 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::SubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "RequiredProperty",
+                            displayName: "RequiredProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubType),
+                            propertyType: typeof(string),
+                            name: "StringWithLength",
+                            displayName: "StringWithLength"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::SubTypeWithInheritance))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::SubTypeWithInheritance),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::SubTypeWithInheritance),
+                            propertyType: typeof(string),
+                            name: "EmailString",
+                            displayName: "EmailString"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRangeAndDisplayName",
+                            displayName: "Valid identifier"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithMemberAttributes",
+                            displayName: "PropertyWithMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubType),
+                            name: "PropertyWithoutMemberAttributes",
+                            displayName: "PropertyWithoutMemberAttributes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::SubTypeWithInheritance),
+                            name: "PropertyWithInheritance",
+                            displayName: "PropertyWithInheritance"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::System.Collections.Generic.List<global::SubType>),
+                            name: "ListOfSubTypes",
+                            displayName: "ListOfSubTypes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithCustomValidationAttribute",
+                            displayName: "IntegerWithCustomValidationAttribute"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "PropertyWithMultipleAttributes",
+                            displayName: "PropertyWithMultipleAttributes"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecursiveTypes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecursiveTypes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..45888276cc09
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecursiveTypes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,195 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::RecursiveType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::RecursiveType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::RecursiveType),
+                            propertyType: typeof(int),
+                            name: "Value",
+                            displayName: "Value"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::RecursiveType),
+                            propertyType: typeof(global::RecursiveType),
+                            name: "Next",
+                            displayName: "Next"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateTypeWithParsableProperties#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateTypeWithParsableProperties#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..4664a3bb4b43
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateTypeWithParsableProperties#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,237 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::ComplexTypeWithParsableProperties))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexTypeWithParsableProperties),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(global::System.Guid?),
+                            name: "GuidWithRegularExpression",
+                            displayName: "GuidWithRegularExpression"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(global::System.TimeOnly?),
+                            name: "TimeOnlyWithRequiredValue",
+                            displayName: "TimeOnlyWithRequiredValue"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(string),
+                            name: "Url",
+                            displayName: "Url"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(global::System.DateOnly?),
+                            name: "DateOnlyWithRange",
+                            displayName: "DateOnlyWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(global::System.DateTime?),
+                            name: "DateTimeWithRange",
+                            displayName: "DateTimeWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(decimal?),
+                            name: "DecimalWithRange",
+                            displayName: "DecimalWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(global::System.TimeSpan?),
+                            name: "TimeSpanWithHourRange",
+                            displayName: "TimeSpanWithHourRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(bool),
+                            name: "BooleanWithRange",
+                            displayName: "BooleanWithRange"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexTypeWithParsableProperties),
+                            propertyType: typeof(global::System.Version),
+                            name: "VersionWithRegex",
+                            displayName: "VersionWithRegex"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateValidationAttributesOnClasses#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateValidationAttributesOnClasses#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..932d48d62b1f
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateValidationAttributesOnClasses#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,209 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::NestedType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NestedType),
+                    members: []
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "X",
+                            displayName: "X"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "Y",
+                            displayName: "Y"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::NestedType),
+                            name: "ObjectProperty",
+                            displayName: "ObjectProperty"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmitForExemptTypes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmitForExemptTypes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..d596a97173f9
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmitForExemptTypes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,189 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnClassProperties#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnClassProperties#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..ef96d04824e1
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnClassProperties#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,246 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::NestedType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NestedType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::NestedType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::NonSkippedBaseType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NonSkippedBaseType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::NonSkippedBaseType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange1",
+                            displayName: "IntegerWithRange1"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::NonSkippedSubType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NonSkippedSubType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::NonSkippedSubType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange2",
+                            displayName: "IntegerWithRange2"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::NestedType),
+                            name: "ObjectProperty",
+                            displayName: "ObjectProperty"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::System.Collections.Generic.List<global::NestedType>),
+                            name: "ListOfNestedTypes",
+                            displayName: "ListOfNestedTypes"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::NonSkippedSubType),
+                            name: "NonSkippedSubTypeProperty",
+                            displayName: "NonSkippedSubTypeProperty"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnEndpointParameters#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnEndpointParameters#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..d596a97173f9
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnEndpointParameters#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,189 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnRecordProperties#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnRecordProperties#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..6012dcb9cac9
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.DoesNotEmit_ForSkipValidationAttribute_OnRecordProperties#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,204 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::NestedType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::NestedType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::NestedType),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRange",
+                            displayName: "IntegerWithRange"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ComplexType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ComplexType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ComplexType),
+                            propertyType: typeof(global::NestedType),
+                            name: "ObjectProperty",
+                            displayName: "ObjectProperty"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.SkipsClassesWithNonAccessibleTypes#ValidatableInfoResolver.g.verified.cs b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.SkipsClassesWithNonAccessibleTypes#ValidatableInfoResolver.g.verified.cs
new file mode 100644
index 000000000000..5fbf16937735
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.SkipsClassesWithNonAccessibleTypes#ValidatableInfoResolver.g.verified.cs
@@ -0,0 +1,189 @@
+//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+#pragma warning disable ASP0029
+
+namespace System.Runtime.CompilerServices
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    file sealed class InterceptsLocationAttribute : System.Attribute
+    {
+        public InterceptsLocationAttribute(int version, string data)
+        {
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Validation.Generated
+{
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatablePropertyInfo : global::Microsoft.Extensions.Validation.ValidatablePropertyInfo
+    {
+        public GeneratedValidatablePropertyInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            global::System.Type propertyType,
+            string name,
+            string displayName) : base(containingType, propertyType, name, displayName)
+        {
+            ContainingType = containingType;
+            Name = name;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+        internal global::System.Type ContainingType { get; }
+        internal string Name { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetPropertyValidationAttributes(ContainingType, Name);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file sealed class GeneratedValidatableTypeInfo : global::Microsoft.Extensions.Validation.ValidatableTypeInfo
+    {
+        public GeneratedValidatableTypeInfo(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type,
+            ValidatablePropertyInfo[] members) : base(type, members)
+        {
+            Type = type;
+        }
+
+        [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+        internal global::System.Type Type { get; }
+
+        protected override global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetValidationAttributes()
+            => ValidationAttributeCache.GetTypeValidationAttributes(Type);
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file class GeneratedValidatableInfoResolver : global::Microsoft.Extensions.Validation.IValidatableInfoResolver
+    {
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            if (type == typeof(global::AccessibilityTestType))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::AccessibilityTestType),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::AccessibilityTestType),
+                            propertyType: typeof(string),
+                            name: "PublicProperty",
+                            displayName: "PublicProperty"
+                        ),
+                    ]
+                );
+                return true;
+            }
+
+            return false;
+        }
+
+        // No-ops, rely on runtime code for ParameterInfo-based resolution
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.Extensions.Validation.IValidatableInfo? validatableInfo)
+        {
+            validatableInfo = null;
+            return false;
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class GeneratedServiceCollectionExtensions
+    {
+        [InterceptsLocation]
+        public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<global::Microsoft.Extensions.Validation.ValidationOptions>? configureOptions = null)
+        {
+            // Use non-extension method to avoid infinite recursion.
+            return global::Microsoft.Extensions.DependencyInjection.ValidationServiceCollectionExtensions.AddValidation(services, options =>
+            {
+                options.Resolvers.Insert(0, new GeneratedValidatableInfoResolver());
+                if (configureOptions is not null)
+                {
+                    configureOptions(options);
+                }
+            });
+        }
+    }
+
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Extensions.Validation.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
+    file static class ValidationAttributeCache
+    {
+        private sealed record CacheKey(
+            [param: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            [property: global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type ContainingType,
+            string PropertyName);
+        private static readonly global::System.Collections.Concurrent.ConcurrentDictionary<CacheKey, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> _propertyCache = new();
+        private static readonly global::System.Lazy<global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]>> _lazyTypeCache = new (() => new ());
+        private static global::System.Collections.Concurrent.ConcurrentDictionary<global::System.Type, global::System.ComponentModel.DataAnnotations.ValidationAttribute[]> TypeCache => _lazyTypeCache.Value;
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetPropertyValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties | global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)]
+            global::System.Type containingType,
+            string propertyName)
+        {
+            var key = new CacheKey(containingType, propertyName);
+            return _propertyCache.GetOrAdd(key, static k =>
+            {
+                var results = new global::System.Collections.Generic.List<global::System.ComponentModel.DataAnnotations.ValidationAttribute>();
+
+                // Get attributes from the property
+                var property = k.ContainingType.GetProperty(k.PropertyName);
+                if (property != null)
+                {
+                    var propertyAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(property, inherit: true);
+
+                    results.AddRange(propertyAttributes);
+                }
+
+                // Check constructors for parameters that match the property name
+                // to handle record scenarios
+                foreach (var constructor in k.ContainingType.GetConstructors())
+                {
+                    // Look for parameter with matching name (case insensitive)
+                    var parameter = global::System.Linq.Enumerable.FirstOrDefault(
+                        constructor.GetParameters(),
+                        p => string.Equals(p.Name, k.PropertyName, global::System.StringComparison.OrdinalIgnoreCase));
+
+                    if (parameter != null)
+                    {
+                        var paramAttributes = global::System.Reflection.CustomAttributeExtensions
+                            .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(parameter, inherit: true);
+
+                        results.AddRange(paramAttributes);
+
+                        break;
+                    }
+                }
+
+                return results.ToArray();
+            });
+        }
+
+
+        public static global::System.ComponentModel.DataAnnotations.ValidationAttribute[] GetTypeValidationAttributes(
+            [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.Interfaces)]
+            global::System.Type type
+        )
+        {
+            return TypeCache.GetOrAdd(type, static t =>
+            {
+                var typeAttributes = global::System.Reflection.CustomAttributeExtensions
+                        .GetCustomAttributes<global::System.ComponentModel.DataAnnotations.ValidationAttribute>(t, inherit: true);
+                return global::System.Linq.Enumerable.ToArray(typeAttributes);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.NativeAotTests/BasicMinimalApiWithValidation.cs b/src/Validation/test/Microsoft.Extensions.Validation.NativeAotTests/BasicMinimalApiWithValidation.cs
new file mode 100644
index 000000000000..4d9e0c25c6d7
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.NativeAotTests/BasicMinimalApiWithValidation.cs
@@ -0,0 +1,253 @@
+// 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.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Net.Http;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Validation;
+
+var builder = WebApplication.CreateSlimBuilder();
+
+builder.Services.AddValidation();
+builder.WebHost.UseUrls("http://localhost:5000");
+builder.Services.ConfigureHttpJsonOptions(options =>
+{
+    options.SerializerOptions.TypeInfoResolverChain.Insert(0, AppJsonSerializerContext.Default);
+});
+
+var app = builder.Build();
+
+// Validation endpoints with different validatable types
+app.MapGet("/customers/{id}", ([Range(1, int.MaxValue)] int id) =>
+    $"Getting customer with ID: {id}");
+
+app.MapPost("/customers", (Customer customer) =>
+    TypedResults.Created($"/customers/{customer.Id}", customer));
+
+app.MapPost("/orders", (Order order) =>
+    TypedResults.Created($"/orders/{order.OrderId}", order));
+
+app.MapPost("/products", (Product product) =>
+    TypedResults.Ok(new ProductResponse("Product created", product)));
+
+app.MapPut("/addresses/{id}", (int id, Address address) =>
+    TypedResults.Ok(new AddressResponse($"Address {id} updated", address)));
+
+app.MapPost("/users", (User user) =>
+    TypedResults.Created($"/users/{user.Id}", user));
+
+app.MapPost("/inventory", ([EvenNumber] int productId, [Required] string name) =>
+    TypedResults.Ok(new InventoryResponse(productId, name)));
+
+// Endpoint with disabled validation
+app.MapPost("/products/bulk", (Product[] products) =>
+    TypedResults.Ok(new BulkProductResponse("Bulk products created", products.Length)))
+    .DisableValidation();
+
+await app.StartAsync().ConfigureAwait(false);
+
+try
+{
+    // Create an HTTP client to test the endpoints
+    using var httpClient = new HttpClient();
+    httpClient.BaseAddress = new Uri("http://localhost:5000");
+
+    // Test 1: Valid ID - should succeed
+    var response = await httpClient.GetAsync("/customers/123").ConfigureAwait(false);
+
+    if (response.IsSuccessStatusCode)
+    {
+        var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        Console.WriteLine($"Test 1 Success: {content}");
+    }
+    else
+    {
+        Console.WriteLine($"Test 1 Failed: {response.StatusCode}");
+        return 1;
+    }
+
+    // Test 2: Invalid ID (0) - should fail validation
+    try
+    {
+        await httpClient.GetAsync("/customers/0").ConfigureAwait(false);
+    }
+    catch (HttpRequestException httpEx)
+    {
+        // Handle HttpRequestException and assert on the response
+        if (httpEx.Data.Contains("HttpResponse"))
+        {
+            var invalidResponse = (HttpResponseMessage)httpEx.Data["HttpResponse"];
+            if (invalidResponse.StatusCode == System.Net.HttpStatusCode.BadRequest)
+            {
+                var errorContent = await invalidResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                Console.WriteLine($"Test 2 Success (Caught HttpRequestException with validation error): {invalidResponse.StatusCode}");
+                Console.WriteLine($"Error content: {errorContent}");
+            }
+            else
+            {
+                Console.WriteLine($"Test 2 Failed: Expected BadRequest in exception but got {invalidResponse.StatusCode}");
+                return 1;
+            }
+        }
+        else
+        {
+            Console.WriteLine($"Test 2 Failed: HttpRequestException without HttpResponse data: {httpEx.Message}");
+            return 1;
+        }
+    }
+}
+catch (Exception ex)
+{
+    Console.WriteLine($"Error: {ex.Message}");
+    return 1;
+}
+finally
+{
+    await app.StopAsync().ConfigureAwait(false);
+}
+
+return 100;
+
+public class Customer
+{
+    [Required]
+    [Range(1, int.MaxValue)]
+    public int Id { get; set; }
+
+    [Required]
+    [StringLength(100, MinimumLength = 2)]
+    public string Name { get; set; } = string.Empty;
+
+    [EmailAddress]
+    public string Email { get; set; } = string.Empty;
+
+    [Range(18, 120)]
+    [Display(Name = "Customer Age")]
+    public int Age { get; set; }
+
+    // Complex property with nested validation
+    public Address Address { get; set; } = new();
+}
+
+public record Product(
+    [Required] string Name,
+    [Range(0.01, double.MaxValue)] decimal Price,
+    [StringLength(500)] string Description = ""
+)
+{
+    [Required]
+    public string Category { get; set; } = string.Empty;
+}
+
+public class Address
+{
+    [Required]
+    [StringLength(200)]
+    public string Street { get; set; } = string.Empty;
+
+    [Required]
+    [StringLength(100)]
+    public string City { get; set; } = string.Empty;
+
+    [Required]
+    [RegularExpression(@"^\d{5}(-\d{4})?$", ErrorMessage = "Invalid ZIP code format")]
+    public string ZipCode { get; set; } = string.Empty;
+
+    [StringLength(2, MinimumLength = 2)]
+    public string State { get; set; } = string.Empty;
+}
+
+public class Order : IValidatableObject
+{
+    [Required]
+    public string OrderId { get; set; } = string.Empty;
+
+    [Required]
+    public int CustomerId { get; set; }
+
+    [Range(0.01, double.MaxValue)]
+    public decimal Total { get; set; }
+
+    public DateTime OrderDate { get; set; } = DateTime.Now;
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        if (OrderDate > DateTime.Now.AddDays(1))
+        {
+            yield return new ValidationResult(
+                "Order date cannot be more than 1 day in the future.",
+                new[] { nameof(OrderDate) });
+        }
+
+        if (Total > 10000 && CustomerId == 0)
+        {
+            yield return new ValidationResult(
+                "High-value orders require a valid customer ID.",
+                new[] { nameof(CustomerId), nameof(Total) });
+        }
+    }
+}
+
+public record User(
+    [Required] [StringLength(50)] string Username,
+    [EmailAddress] string Email,
+    [Phone] string PhoneNumber = ""
+)
+{
+    [Required]
+    [Range(1, int.MaxValue)]
+    public int Id { get; set; }
+
+    [StringLength(100)]
+    public string DisplayName => $"{Username} ({Email})";
+
+    [CreditCard]
+    public string CreditCardNumber { get; set; }
+}
+
+// Custom validation attribute
+public class EvenNumberAttribute : ValidationAttribute
+{
+    protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+    {
+        if (value is int number && number % 2 != 0)
+        {
+            return new ValidationResult("The number must be even.", new[] { validationContext.MemberName });
+        }
+
+        return ValidationResult.Success;
+    }
+}
+
+public record ProductResponse(string Message, Product Product);
+
+public record AddressResponse(string Message, Address Address);
+
+public record InventoryResponse(int ProductId, string Name);
+
+public record BulkProductResponse(string Message, int Count);
+
+[JsonSerializable(typeof(Customer))]
+[JsonSerializable(typeof(Product))]
+[JsonSerializable(typeof(Address))]
+[JsonSerializable(typeof(Order))]
+[JsonSerializable(typeof(User))]
+[JsonSerializable(typeof(ProductResponse))]
+[JsonSerializable(typeof(AddressResponse))]
+[JsonSerializable(typeof(InventoryResponse))]
+[JsonSerializable(typeof(BulkProductResponse))]
+[JsonSerializable(typeof(Product[]))]
+[JsonSerializable(typeof(string))]
+[JsonSerializable(typeof(int))]
+[JsonSerializable(typeof(decimal))]
+[JsonSerializable(typeof(DateTime))]
+[JsonSerializable(typeof(Microsoft.AspNetCore.Http.HttpValidationProblemDetails))]
+internal sealed partial class AppJsonSerializerContext : JsonSerializerContext
+{
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.NativeAotTests/Microsoft.Extensions.Validation.NativeAotTests.proj b/src/Validation/test/Microsoft.Extensions.Validation.NativeAotTests/Microsoft.Extensions.Validation.NativeAotTests.proj
new file mode 100644
index 000000000000..8def5e6973a9
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.NativeAotTests/Microsoft.Extensions.Validation.NativeAotTests.proj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <TestConsoleAppSourceFiles Include="BasicMinimalApiWithValidation.cs">
+      <EnabledProperties>EnableRequestDelegateGenerator</EnabledProperties>
+    </TestConsoleAppSourceFiles>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.Tests/Microsoft.Extensions.Validation.Tests.csproj b/src/Validation/test/Microsoft.Extensions.Validation.Tests/Microsoft.Extensions.Validation.Tests.csproj
new file mode 100644
index 000000000000..f74f56690452
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.Tests/Microsoft.Extensions.Validation.Tests.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Validation" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.Tests/RuntimeValidatableParameterInfoResolverTests.cs b/src/Validation/test/Microsoft.Extensions.Validation.Tests/RuntimeValidatableParameterInfoResolverTests.cs
new file mode 100644
index 000000000000..eebe4032d9af
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.Tests/RuntimeValidatableParameterInfoResolverTests.cs
@@ -0,0 +1,185 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.IO.Pipelines;
+using System.Reflection;
+using System.Security.Claims;
+
+namespace Microsoft.Extensions.Validation.Tests;
+
+public class RuntimeValidatableParameterInfoResolverTests
+{
+    private readonly RuntimeValidatableParameterInfoResolver _resolver = new();
+
+    [Fact]
+    public void TryGetValidatableTypeInfo_AlwaysReturnsFalse()
+    {
+        var result = _resolver.TryGetValidatableTypeInfo(typeof(string), out var validatableInfo);
+
+        Assert.False(result);
+        Assert.Null(validatableInfo);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithNullName_ThrowsInvalidOperationException()
+    {
+        var parameterInfo = new NullNameParameterInfo();
+
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+            _resolver.TryGetValidatableParameterInfo(parameterInfo, out _));
+
+        Assert.Contains("without a name", exception.Message);
+    }
+
+    [Theory]
+    [InlineData(typeof(string))]
+    [InlineData(typeof(int))]
+    [InlineData(typeof(bool))]
+    [InlineData(typeof(DateTime))]
+    [InlineData(typeof(Guid))]
+    [InlineData(typeof(decimal))]
+    [InlineData(typeof(DayOfWeek))] // Enum
+    [InlineData(typeof(ClaimsPrincipal))]
+    [InlineData(typeof(PipeReader))]
+    [InlineData(typeof(DateTimeOffset))]
+    [InlineData(typeof(TimeOnly))]
+    [InlineData(typeof(DateOnly))]
+    [InlineData(typeof(TimeSpan))]
+    [InlineData(typeof(CancellationToken))]
+    public void TryGetValidatableParameterInfo_WithSimpleTypesAndNoAttributes_ReturnsFalse(Type parameterType)
+    {
+        var parameterInfo = GetParameter(parameterType);
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.False(result);
+        Assert.Null(validatableInfo);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithClassTypeAndNoAttributes_ReturnsTrue()
+    {
+        var parameterInfo = GetParameter(typeof(TestClass));
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.True(result);
+        Assert.NotNull(validatableInfo);
+        var parameterValidatableInfo = Assert.IsType<RuntimeValidatableParameterInfoResolver.RuntimeValidatableParameterInfo>(validatableInfo);
+        Assert.Equal("testParam", parameterValidatableInfo.Name);
+        Assert.Equal("testParam", parameterValidatableInfo.DisplayName);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithSimpleTypeAndAttributes_ReturnsTrue()
+    {
+        var parameterInfo = typeof(TestController)
+            .GetMethod(nameof(TestController.MethodWithAttributedParam))!
+            .GetParameters()[0];
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.True(result);
+        Assert.NotNull(validatableInfo);
+        var parameterValidatableInfo = Assert.IsType<RuntimeValidatableParameterInfoResolver.RuntimeValidatableParameterInfo>(validatableInfo);
+        Assert.Equal("value", parameterValidatableInfo.Name);
+        Assert.Equal("value", parameterValidatableInfo.DisplayName);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithDisplayAttribute_UsesDisplayNameFromAttribute()
+    {
+        var parameterInfo = typeof(TestController)
+            .GetMethod(nameof(TestController.MethodWithDisplayAttribute))!
+            .GetParameters()[0];
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.True(result);
+        Assert.NotNull(validatableInfo);
+        var parameterValidatableInfo = Assert.IsType<RuntimeValidatableParameterInfoResolver.RuntimeValidatableParameterInfo>(validatableInfo);
+        Assert.Equal("value", parameterValidatableInfo.Name);
+        Assert.Equal("Custom Display Name", parameterValidatableInfo.DisplayName);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithDisplayAttributeWithNullName_UsesParameterName()
+    {
+        var parameterInfo = typeof(TestController)
+            .GetMethod(nameof(TestController.MethodWithNullDisplayName))!
+            .GetParameters()[0];
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.True(result);
+        Assert.NotNull(validatableInfo);
+        var parameterValidatableInfo = Assert.IsType<RuntimeValidatableParameterInfoResolver.RuntimeValidatableParameterInfo>(validatableInfo);
+        Assert.Equal("value", parameterValidatableInfo.Name);
+        Assert.Equal("value", parameterValidatableInfo.DisplayName);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithNullableValueType_ReturnsFalse()
+    {
+        var parameterInfo = GetParameter(typeof(int?));
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.False(result);
+        Assert.Null(validatableInfo);
+    }
+
+    [Fact]
+    public void TryGetValidatableParameterInfo_WithNullableReferenceType_ReturnsTrue()
+    {
+        var parameterInfo = GetNullableParameter(typeof(TestClass));
+
+        var result = _resolver.TryGetValidatableParameterInfo(parameterInfo, out var validatableInfo);
+
+        Assert.True(result);
+        Assert.NotNull(validatableInfo);
+        var parameterValidatableInfo = Assert.IsType<RuntimeValidatableParameterInfoResolver.RuntimeValidatableParameterInfo>(validatableInfo);
+        Assert.Equal("testParam", parameterValidatableInfo.Name);
+        Assert.Equal("testParam", parameterValidatableInfo.DisplayName);
+    }
+
+    private static ParameterInfo GetParameter(Type parameterType)
+    {
+        return typeof(TestParameterHolder)
+            .GetMethod(nameof(TestParameterHolder.Method))!
+            .MakeGenericMethod(parameterType)
+            .GetParameters()[0];
+    }
+
+    private static ParameterInfo GetNullableParameter(Type parameterType)
+    {
+        return typeof(TestParameterHolder)
+            .GetMethod(nameof(TestParameterHolder.MethodWithNullable))!
+            .MakeGenericMethod(parameterType)
+            .GetParameters()[0];
+    }
+
+    private class TestClass { }
+
+    private class TestParameterHolder
+    {
+        public void Method<T>(T testParam) { }
+        public void MethodWithNullable<T>(T? testParam) { }
+    }
+
+    private class TestController
+    {
+        public void MethodWithAttributedParam([Required] string value) { }
+
+        public void MethodWithDisplayAttribute([Display(Name = "Custom Display Name")][Required] string value) { }
+
+        public void MethodWithNullDisplayName([Display(Name = null)][Required] string value) { }
+    }
+
+    private class NullNameParameterInfo : ParameterInfo
+    {
+        public override string? Name => null;
+        public override Type ParameterType => typeof(string);
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.Tests/TestValidatableTypeInfo.cs b/src/Validation/test/Microsoft.Extensions.Validation.Tests/TestValidatableTypeInfo.cs
new file mode 100644
index 000000000000..09c6a8c8d5cf
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.Tests/TestValidatableTypeInfo.cs
@@ -0,0 +1,18 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.Extensions.Validation.Tests;
+
+internal class TestValidatableTypeInfo(
+    Type type,
+    ValidatablePropertyInfo[] members,
+    ValidationAttribute[]? attributes = default) : ValidatableTypeInfo(type, members)
+{
+    private readonly ValidationAttribute[] _attributes = attributes ?? [];
+
+    protected override ValidationAttribute[] GetValidationAttributes() => _attributes;
+}
\ No newline at end of file
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableInfoResolverTests.cs b/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableInfoResolverTests.cs
new file mode 100644
index 000000000000..5e19a079a7bb
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableInfoResolverTests.cs
@@ -0,0 +1,217 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Moq;
+
+namespace Microsoft.Extensions.Validation.Tests;
+
+public class ValidatableInfoResolverTests
+{
+    public delegate void TryGetValidatableTypeInfoCallback(Type type, out IValidatableInfo? validatableInfo);
+    public delegate void TryGetValidatableParameterInfoCallback(ParameterInfo parameter, out IValidatableInfo? validatableInfo);
+
+    [Fact]
+    public void GetValidatableTypeInfo_ReturnsNull_ForNonValidatableType()
+    {
+        // Arrange
+        var resolver = new Mock<IValidatableInfoResolver>();
+        IValidatableInfo? validatableInfo = null;
+        resolver.Setup(r => r.TryGetValidatableTypeInfo(It.IsAny<Type>(), out validatableInfo)).Returns(false);
+
+        // Act
+        var result = resolver.Object.TryGetValidatableTypeInfo(typeof(NonValidatableType), out validatableInfo);
+
+        // Assert
+        Assert.False(result);
+        Assert.Null(validatableInfo);
+    }
+
+    [Fact]
+    public void GetValidatableTypeInfo_ReturnsTypeInfo_ForValidatableType()
+    {
+        // Arrange
+        var mockTypeInfo = new Mock<ValidatableTypeInfo>(
+            typeof(ValidatableType),
+            Array.Empty<ValidatablePropertyInfo>()).Object;
+
+        var resolver = new Mock<IValidatableInfoResolver>();
+        IValidatableInfo? validatableInfo = null;
+        resolver
+            .Setup(r => r.TryGetValidatableTypeInfo(typeof(ValidatableType), out validatableInfo))
+            .Callback(new TryGetValidatableTypeInfoCallback((t, out info) =>
+            {
+                info = mockTypeInfo; // Set the out parameter to our mock
+            }))
+            .Returns(true);
+
+        // Act
+        var result = resolver.Object.TryGetValidatableTypeInfo(typeof(ValidatableType), out validatableInfo);
+
+        // Assert
+        Assert.True(result);
+        var validatableTypeInfo = Assert.IsAssignableFrom<ValidatableTypeInfo>(validatableInfo);
+        Assert.Equal(typeof(ValidatableType), validatableTypeInfo.Type);
+    }
+
+    [Fact]
+    public void GetValidatableParameterInfo_ReturnsNull_ForNonValidatableParameter()
+    {
+        // Arrange
+        var method = typeof(TestMethods).GetMethod(nameof(TestMethods.MethodWithNonValidatableParam))!;
+        var parameter = method.GetParameters()[0];
+
+        var resolver = new Mock<IValidatableInfoResolver>();
+        IValidatableInfo? validatableInfo = null;
+        resolver.Setup(r => r.TryGetValidatableParameterInfo(It.IsAny<ParameterInfo>(), out validatableInfo)).Returns(false);
+
+        // Act
+        var result = resolver.Object.TryGetValidatableParameterInfo(parameter, out validatableInfo);
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void GetValidatableParameterInfo_ReturnsParameterInfo_ForValidatableParameter()
+    {
+        // Arrange
+        var method = typeof(TestMethods).GetMethod(nameof(TestMethods.MethodWithValidatableParam))!;
+        var parameter = method.GetParameters()[0];
+
+        var mockParamInfo = new Mock<ValidatableParameterInfo>(
+            typeof(string),
+            "model",
+            "model").Object;
+
+        var resolver = new Mock<IValidatableInfoResolver>();
+
+        // Setup using the same pattern as in the type info test
+        resolver.Setup(r => r.TryGetValidatableParameterInfo(parameter, out It.Ref<IValidatableInfo?>.IsAny))
+            .Callback(new TryGetValidatableParameterInfoCallback((ParameterInfo p, out IValidatableInfo? info) =>
+            {
+                info = mockParamInfo; // Set the out parameter to our mock
+            }))
+            .Returns(true);
+
+        // Act
+        var result = resolver.Object.TryGetValidatableParameterInfo(parameter, out var validatableInfo);
+
+        // Assert
+        Assert.True(result);
+        var validatableParamInfo = Assert.IsAssignableFrom<ValidatableParameterInfo>(validatableInfo);
+        Assert.Equal("model", validatableParamInfo.Name);
+    }
+
+    [Fact]
+    public void ResolversChain_ProcessesInCorrectOrder()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        var resolver1 = new Mock<IValidatableInfoResolver>();
+        var resolver2 = new Mock<IValidatableInfoResolver>();
+        var resolver3 = new Mock<IValidatableInfoResolver>();
+
+        // Create the object that will be returned by resolver2
+        var mockTypeInfo = new Mock<ValidatableTypeInfo>(typeof(ValidatableType), Array.Empty<ValidatablePropertyInfo>()).Object;
+
+        // Setup resolver1 to return false (doesn't handle this type)
+        resolver1
+            .Setup(r => r.TryGetValidatableTypeInfo(typeof(ValidatableType), out It.Ref<IValidatableInfo?>.IsAny))
+            .Callback(new TryGetValidatableTypeInfoCallback((Type t, out IValidatableInfo? info) =>
+            {
+                info = null;
+            }))
+            .Returns(false);
+
+        // Setup resolver2 to return true and set the mock type info
+        resolver2
+            .Setup(r => r.TryGetValidatableTypeInfo(typeof(ValidatableType), out It.Ref<IValidatableInfo?>.IsAny))
+            .Callback(new TryGetValidatableTypeInfoCallback((Type t, out IValidatableInfo? info) =>
+            {
+                info = mockTypeInfo;
+            }))
+            .Returns(true);
+
+        services.AddValidation(Options =>
+        {
+            Options.Resolvers.Add(resolver1.Object);
+            Options.Resolvers.Add(resolver2.Object);
+            Options.Resolvers.Add(resolver3.Object);
+        });
+
+        var serviceProvider = services.BuildServiceProvider();
+        var validationOptions = serviceProvider.GetRequiredService<IOptions<ValidationOptions>>().Value;
+
+        // Act
+        var result = validationOptions.TryGetValidatableTypeInfo(typeof(ValidatableType), out var validatableInfo);
+
+        // Assert
+        Assert.True(result);
+        Assert.NotNull(validatableInfo);
+        Assert.Equal(typeof(ValidatableType), ((ValidatableTypeInfo)validatableInfo).Type);
+
+        // Verify that resolvers were called in the expected order
+        resolver1.Verify(r => r.TryGetValidatableTypeInfo(typeof(ValidatableType), out It.Ref<IValidatableInfo?>.IsAny), Times.Once);
+        resolver2.Verify(r => r.TryGetValidatableTypeInfo(typeof(ValidatableType), out It.Ref<IValidatableInfo?>.IsAny), Times.Once);
+        resolver3.Verify(r => r.TryGetValidatableTypeInfo(typeof(ValidatableType), out It.Ref<IValidatableInfo?>.IsAny), Times.Never);
+    }
+
+    // Test types
+    private class NonValidatableType { }
+
+    [ValidatableType]
+    private class ValidatableType
+    {
+        [Required]
+        public string Name { get; set; } = "";
+    }
+
+    private static class TestMethods
+    {
+        public static void MethodWithNonValidatableParam(NonValidatableType param) { }
+        public static void MethodWithValidatableParam(ValidatableType model) { }
+    }
+
+    // Test implementations
+    private class TestValidatablePropertyInfo : ValidatablePropertyInfo
+    {
+        private readonly ValidationAttribute[] _validationAttributes;
+
+        public TestValidatablePropertyInfo(
+            Type containingType,
+            Type propertyType,
+            string name,
+            string displayName,
+            ValidationAttribute[] validationAttributes)
+            : base(containingType, propertyType, name, displayName)
+        {
+            _validationAttributes = validationAttributes;
+        }
+
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+    }
+
+    private class TestValidatableParameterInfo : ValidatableParameterInfo
+    {
+        private readonly ValidationAttribute[] _validationAttributes;
+
+        public TestValidatableParameterInfo(
+            Type parameterType,
+            string name,
+            string displayName,
+            ValidationAttribute[] validationAttributes)
+            : base(parameterType, name, displayName)
+        {
+            _validationAttributes = validationAttributes;
+        }
+
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableParameterInfoTests.cs b/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableParameterInfoTests.cs
new file mode 100644
index 000000000000..0bf7530fecc5
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableParameterInfoTests.cs
@@ -0,0 +1,426 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.Validation.Tests;
+
+public class ValidatableParameterInfoTests
+{
+    [Fact]
+    public async Task Validate_RequiredParameter_AddsErrorWhenNull()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(string),
+            name: "testParam",
+            displayName: "Test Parameter",
+            validationAttributes: [new RequiredAttribute()]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync(null, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("testParam", error.Key);
+        Assert.Equal("The Test Parameter field is required.", error.Value.Single());
+    }
+
+    [Fact]
+    public async Task Validate_RequiredParameter_ShortCircuitsOtherValidations()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(string),
+            name: "testParam",
+            displayName: "Test Parameter",
+            // Most ValidationAttributes skip validation if the value is null
+            // so we use a custom one that always fails to assert on the behavior here
+            validationAttributes: [new RequiredAttribute(), new CustomTestValidationAttribute()]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync(null, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("testParam", error.Key);
+        Assert.Equal("The Test Parameter field is required.", error.Value.Single());
+    }
+
+    [Fact]
+    public async Task Validate_SkipsValidation_WhenNullAndNotRequired()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(string),
+            name: "testParam",
+            displayName: "Test Parameter",
+            validationAttributes: [new StringLengthAttribute(10)]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync(null, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.Null(errors); // No errors added
+    }
+
+    [Fact]
+    public async Task Validate_WithRangeAttribute_ValidatesCorrectly()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(int),
+            name: "testParam",
+            displayName: "Test Parameter",
+            validationAttributes: [new RangeAttribute(10, 100)]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync(5, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("testParam", error.Key);
+        Assert.Equal("The field Test Parameter must be between 10 and 100.", error.Value.First());
+    }
+
+    [Fact]
+    public async Task Validate_WithDisplayNameAttribute_UsesDisplayNameInErrorMessage()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(string),
+            name: "testParam",
+            displayName: "Custom Display Name",
+            validationAttributes: [new RequiredAttribute()]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync(null, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("testParam", error.Key);
+        // The error message should use the display name
+        Assert.Equal("The Custom Display Name field is required.", error.Value.First());
+    }
+
+    [Fact]
+    public async Task Validate_WhenValidatableTypeHasErrors_AddsNestedErrors()
+    {
+        // Arrange
+        var personTypeInfo = new TestValidatableTypeInfo(
+            typeof(Person),
+            [
+                new TestValidatablePropertyInfo(
+                    typeof(Person),
+                    typeof(string),
+                    "Name",
+                    "Name",
+                    [new RequiredAttribute()])
+            ]);
+
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(Person),
+            name: "person",
+            displayName: "Person",
+            validationAttributes: []);
+
+        var typeMapping = new Dictionary<Type, ValidatableTypeInfo>
+        {
+            { typeof(Person), personTypeInfo }
+        };
+
+        var context = CreateValidatableContext(typeMapping);
+        var person = new Person(); // Name is null, so should fail validation
+
+        // Act
+        await paramInfo.ValidateAsync(person, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("Name", error.Key);
+        Assert.Equal("The Name field is required.", error.Value[0]);
+    }
+
+    [Fact]
+    public async Task Validate_WithEnumerableOfValidatableType_ValidatesEachItem()
+    {
+        // Arrange
+        var personTypeInfo = new TestValidatableTypeInfo(
+            typeof(Person),
+            [
+                new TestValidatablePropertyInfo(
+                    typeof(Person),
+                    typeof(string),
+                    "Name",
+                    "Name",
+                    [new RequiredAttribute()])
+            ]);
+
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(IEnumerable<Person>),
+            name: "people",
+            displayName: "People",
+            validationAttributes: []);
+
+        var typeMapping = new Dictionary<Type, ValidatableTypeInfo>
+        {
+            { typeof(Person), personTypeInfo }
+        };
+
+        var context = CreateValidatableContext(typeMapping);
+        var people = new List<Person>
+        {
+            new() { Name = "Valid" },
+            new() // Name is null, should fail
+        };
+
+        // Act
+        await paramInfo.ValidateAsync(people, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("people[1].Name", error.Key);
+        Assert.Equal("The Name field is required.", error.Value[0]);
+    }
+
+    [Fact]
+    public async Task Validate_MultipleErrorsOnSameParameter_CollectsAllErrors()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(int),
+            name: "testParam",
+            displayName: "Test Parameter",
+            validationAttributes:
+            [
+                new RangeAttribute(10, 100) { ErrorMessage = "Range error" },
+                new CustomTestValidationAttribute { ErrorMessage = "Custom error" }
+            ]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync(5, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("testParam", error.Key);
+        Assert.Collection(error.Value,
+            e => Assert.Equal("Range error", e),
+            e => Assert.Equal("Custom error", e));
+    }
+
+    [Fact]
+    public async Task Validate_WithContextPrefix_AddsErrorsWithCorrectPrefix()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(int),
+            name: "testParam",
+            displayName: "Test Parameter",
+            validationAttributes: [new RangeAttribute(10, 100)]);
+
+        var context = CreateValidatableContext();
+        context.CurrentValidationPath = "parent";
+
+        // Act
+        await paramInfo.ValidateAsync(5, context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("parent.testParam", error.Key);
+        Assert.Equal("The field Test Parameter must be between 10 and 100.", error.Value.First());
+    }
+
+    [Fact]
+    public async Task Validate_ExceptionDuringValidation_CapturesExceptionAsError()
+    {
+        // Arrange
+        var paramInfo = CreateTestParameterInfo(
+            parameterType: typeof(string),
+            name: "testParam",
+            displayName: "Test Parameter",
+            validationAttributes: [new ThrowingValidationAttribute()]);
+
+        var context = CreateValidatableContext();
+
+        // Act
+        await paramInfo.ValidateAsync("test", context, default);
+
+        // Assert
+        var errors = context.ValidationErrors;
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("testParam", error.Key);
+        Assert.Equal("Test exception", error.Value.First());
+    }
+
+    private TestValidatableParameterInfo CreateTestParameterInfo(
+        Type parameterType,
+        string name,
+        string displayName,
+        ValidationAttribute[] validationAttributes)
+    {
+        return new TestValidatableParameterInfo(
+            parameterType,
+            name,
+            displayName,
+            validationAttributes);
+    }
+
+    private ValidateContext CreateValidatableContext(
+        Dictionary<Type, ValidatableTypeInfo>? typeMapping = null)
+    {
+        var serviceProvider = new ServiceCollection().BuildServiceProvider();
+        var validationContext = new ValidationContext(new object(), serviceProvider, null);
+
+        return new ValidateContext
+        {
+            ValidationContext = validationContext,
+            ValidationOptions = new TestValidationOptions(typeMapping ?? new Dictionary<Type, ValidatableTypeInfo>())
+        };
+    }
+
+    private class TestValidatableParameterInfo : ValidatableParameterInfo
+    {
+        private readonly ValidationAttribute[] _validationAttributes;
+
+        public TestValidatableParameterInfo(
+            Type parameterType,
+            string name,
+            string displayName,
+            ValidationAttribute[] validationAttributes)
+            : base(parameterType, name, displayName)
+        {
+            _validationAttributes = validationAttributes;
+        }
+
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+    }
+
+    private class TestValidatablePropertyInfo : ValidatablePropertyInfo
+    {
+        private readonly ValidationAttribute[] _validationAttributes;
+
+        public TestValidatablePropertyInfo(
+            Type containingType,
+            Type propertyType,
+            string name,
+            string displayName,
+            ValidationAttribute[] validationAttributes)
+            : base(containingType, propertyType, name, displayName)
+        {
+            _validationAttributes = validationAttributes;
+        }
+
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+    }
+
+    private class TestValidationOptions : ValidationOptions
+    {
+        public TestValidationOptions(Dictionary<Type, ValidatableTypeInfo> typeInfoMappings)
+        {
+            // Create a custom resolver that uses the dictionary
+            var resolver = new DictionaryBasedResolver(typeInfoMappings);
+
+            // Add it to the resolvers collection
+            Resolvers.Add(resolver);
+        }
+
+        // Private resolver implementation that uses a dictionary lookup
+        private class DictionaryBasedResolver : IValidatableInfoResolver
+        {
+            private readonly Dictionary<Type, ValidatableTypeInfo> _typeInfoMappings;
+
+            public DictionaryBasedResolver(Dictionary<Type, ValidatableTypeInfo> typeInfoMappings)
+            {
+                _typeInfoMappings = typeInfoMappings;
+            }
+
+            public ValidatableTypeInfo? TryGetValidatableTypeInfo(Type type)
+            {
+                _typeInfoMappings.TryGetValue(type, out var info);
+                return info;
+            }
+
+            public ValidatableParameterInfo? GetValidatableParameterInfo(ParameterInfo parameterInfo)
+            {
+                // Not implemented in the test
+                return null;
+            }
+
+            public bool TryGetValidatableTypeInfo(Type type, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+            {
+                if (_typeInfoMappings.TryGetValue(type, out var validatableTypeInfo))
+                {
+                    validatableInfo = validatableTypeInfo;
+                    return true;
+                }
+                validatableInfo = null;
+                return false;
+            }
+
+            public bool TryGetValidatableParameterInfo(ParameterInfo parameterInfo, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+            {
+                validatableInfo = null;
+                return false;
+            }
+        }
+    }
+
+    // Test data classes and validation attributes
+
+    private class Person
+    {
+        public string? Name { get; set; }
+    }
+
+    private class CustomTestValidationAttribute : ValidationAttribute
+    {
+        public override bool IsValid(object? value)
+        {
+            // Always fail for testing
+            return false;
+        }
+    }
+
+    private class ThrowingValidationAttribute : ValidationAttribute
+    {
+        public override bool IsValid(object? value)
+        {
+            throw new InvalidOperationException("Test exception");
+        }
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableTypeInfoTests.cs b/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableTypeInfoTests.cs
new file mode 100644
index 000000000000..dd761996442a
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.Tests/ValidatableTypeInfoTests.cs
@@ -0,0 +1,915 @@
+#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace Microsoft.Extensions.Validation.Tests;
+
+public class ValidatableTypeInfoTests
+{
+    [Fact]
+    public async Task Validate_ValidatesComplexType_WithNestedProperties()
+    {
+        // Arrange
+        List<ValidationErrorContext> validationErrors = [];
+
+        var personType = new TestValidatableTypeInfo(
+            typeof(Person),
+            [
+                CreatePropertyInfo(typeof(Person), typeof(string), "Name", "Name",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(Person), typeof(int), "Age", "Age",
+                    [new RangeAttribute(0, 120)]),
+                CreatePropertyInfo(typeof(Person), typeof(Address), "Address", "Address",
+                    [])
+            ]);
+
+        var addressType = new TestValidatableTypeInfo(
+            typeof(Address),
+            [
+                CreatePropertyInfo(typeof(Address), typeof(string), "Street", "Street",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(Address), typeof(string), "City", "City",
+                    [new RequiredAttribute()])
+            ]);
+
+        var validationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+        {
+            { typeof(Person), personType },
+            { typeof(Address), addressType }
+        });
+
+        var personWithMissingRequiredFields = new Person
+        {
+            Age = 150, // Invalid age
+            Address = new Address() // Missing required City and Street
+        };
+        var context = new ValidateContext
+        {
+            ValidationOptions = validationOptions,
+            ValidationContext = new ValidationContext(personWithMissingRequiredFields)
+        };
+
+        context.OnValidationError += validationErrors.Add;
+
+        // Act
+        await personType.ValidateAsync(personWithMissingRequiredFields, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Collection(context.ValidationErrors,
+            kvp =>
+            {
+                Assert.Equal("Name", kvp.Key);
+                Assert.Equal("The Name field is required.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Age", kvp.Key);
+                Assert.Equal("The field Age must be between 0 and 120.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Address.Street", kvp.Key);
+                Assert.Equal("The Street field is required.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Address.City", kvp.Key);
+                Assert.Equal("The City field is required.", kvp.Value.First());
+            });
+
+        Assert.Collection(validationErrors,
+            context =>
+            {
+                Assert.Equal("Name", context.Name);
+                Assert.Equal("Name", context.Path);
+                Assert.Equal("The Name field is required.", context.Errors.Single());
+                Assert.Same(context.Container, personWithMissingRequiredFields);
+            },
+            context =>
+            {
+                Assert.Equal("Age", context.Name);
+                Assert.Equal("Age", context.Path);
+                Assert.Equal("The field Age must be between 0 and 120.", context.Errors.Single());
+                Assert.Same(context.Container, personWithMissingRequiredFields);
+            },
+            context =>
+            {
+                Assert.Equal("Street", context.Name);
+                Assert.Equal("Address.Street", context.Path);
+                Assert.Equal("The Street field is required.", context.Errors.Single());
+                Assert.Same(context.Container, personWithMissingRequiredFields.Address);
+            },
+            context =>
+            {
+                Assert.Equal("City", context.Name);
+                Assert.Equal("Address.City", context.Path);
+                Assert.Equal("The City field is required.", context.Errors.Single());
+                Assert.Same(context.Container, personWithMissingRequiredFields.Address);
+            });
+    }
+
+    [Fact]
+    public async Task Validate_HandlesIValidatableObject_Implementation()
+    {
+        // Arrange
+        var validationErrors = new List<ValidationErrorContext>();
+        var employeeType = new TestValidatableTypeInfo(
+            typeof(Employee),
+            [
+                CreatePropertyInfo(typeof(Employee), typeof(string), "Name", "Name",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(Employee), typeof(string), "Department", "Department",
+                    []),
+                CreatePropertyInfo(typeof(Employee), typeof(decimal), "Salary", "Salary",
+                    [])
+            ]);
+
+        var employee = new Employee
+        {
+            Name = "John Doe",
+            Department = "IT",
+            Salary = -5000 // Negative salary will trigger IValidatableObject validation
+        };
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(Employee), employeeType }
+            }),
+            ValidationContext = new ValidationContext(employee)
+        };
+
+        context.OnValidationError += validationErrors.Add;
+
+        // Act
+        await employeeType.ValidateAsync(employee, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        var error = Assert.Single(context.ValidationErrors);
+        Assert.Equal("Salary", error.Key);
+        Assert.Equal("Salary must be a positive value.", error.Value.First());
+
+        var errorContext = Assert.Single(validationErrors);
+        Assert.Equal("Salary", errorContext.Name);
+        Assert.Equal("Salary", errorContext.Path);
+        Assert.Equal("Salary must be a positive value.", errorContext.Errors.Single());
+        Assert.Same(errorContext.Container, employee);
+    }
+
+    [Fact]
+    public async Task Validate_HandlesPolymorphicTypes_WithSubtypes()
+    {
+        // Arrange
+        var baseType = new TestValidatableTypeInfo(
+            typeof(Vehicle),
+            [
+                CreatePropertyInfo(typeof(Vehicle), typeof(string), "Make", "Make",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(Vehicle), typeof(string), "Model", "Model",
+                    [new RequiredAttribute()])
+            ]);
+
+        var derivedType = new TestValidatableTypeInfo(
+            typeof(Car),
+            [
+                CreatePropertyInfo(typeof(Car), typeof(int), "Doors", "Doors",
+                    [new RangeAttribute(2, 5)])
+            ]);
+
+        var car = new Car
+        {
+            // Missing Make and Model (required in base type)
+            Doors = 7 // Invalid number of doors
+        };
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(Vehicle), baseType },
+                { typeof(Car), derivedType }
+            }),
+            ValidationContext = new ValidationContext(car)
+        };
+
+        // Act
+        await derivedType.ValidateAsync(car, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Collection(context.ValidationErrors,
+            kvp =>
+            {
+                Assert.Equal("Doors", kvp.Key);
+                Assert.Equal("The field Doors must be between 2 and 5.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Make", kvp.Key);
+                Assert.Equal("The Make field is required.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Model", kvp.Key);
+                Assert.Equal("The Model field is required.", kvp.Value.First());
+            });
+    }
+
+    [Fact]
+    public async Task Validate_HandlesCollections_OfValidatableTypes()
+    {
+        // Arrange
+        var itemType = new TestValidatableTypeInfo(
+            typeof(OrderItem),
+            [
+                CreatePropertyInfo(typeof(OrderItem), typeof(string), "ProductName", "ProductName",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(OrderItem), typeof(int), "Quantity", "Quantity",
+                    [new RangeAttribute(1, 100)])
+            ]);
+
+        var orderType = new TestValidatableTypeInfo(
+            typeof(Order),
+            [
+                CreatePropertyInfo(typeof(Order), typeof(string), "OrderNumber", "OrderNumber",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(Order), typeof(List<OrderItem>), "Items", "Items",
+                    [])
+            ]);
+
+        var order = new Order
+        {
+            OrderNumber = "ORD-12345",
+            Items =
+            [
+                new OrderItem { ProductName = "Valid Product", Quantity = 5 },
+                new OrderItem { /* Missing ProductName (required) */ Quantity = 0 /* Invalid quantity */ },
+                new OrderItem { ProductName = "Another Product", Quantity = 200 /* Invalid quantity */ }
+            ]
+        };
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(OrderItem), itemType },
+                { typeof(Order), orderType }
+            }),
+            ValidationContext = new ValidationContext(order)
+        };
+
+        // Act
+        await orderType.ValidateAsync(order, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Collection(context.ValidationErrors,
+            kvp =>
+            {
+                Assert.Equal("Items[1].ProductName", kvp.Key);
+                Assert.Equal("The ProductName field is required.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Items[1].Quantity", kvp.Key);
+                Assert.Equal("The field Quantity must be between 1 and 100.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("Items[2].Quantity", kvp.Key);
+                Assert.Equal("The field Quantity must be between 1 and 100.", kvp.Value.First());
+            });
+    }
+
+    [Fact]
+    public async Task Validate_HandlesNullValues_Appropriately()
+    {
+        // Arrange
+        var personType = new TestValidatableTypeInfo(
+            typeof(Person),
+            [
+                CreatePropertyInfo(typeof(Person), typeof(string), "Name", "Name",
+                    []),
+                CreatePropertyInfo(typeof(Person), typeof(Address), "Address", "Address",
+                    [])
+            ]);
+
+        var person = new Person
+        {
+            Name = null,
+            Address = null
+        };
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(Person), personType }
+            }),
+            ValidationContext = new ValidationContext(person)
+        };
+
+        // Act
+        await personType.ValidateAsync(person, context, default);
+
+        // Assert
+        Assert.Null(context.ValidationErrors); // No validation errors for nullable properties with null values
+    }
+
+    [Fact]
+    public async Task Validate_RespectsMaxDepthOption_ForCircularReferences()
+    {
+        // Arrange
+        // Create a type that can contain itself (circular reference)
+        var nodeType = new TestValidatableTypeInfo(
+            typeof(TreeNode),
+            [
+                CreatePropertyInfo(typeof(TreeNode), typeof(string), "Name", "Name",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(TreeNode), typeof(TreeNode), "Parent", "Parent",
+                    []),
+                CreatePropertyInfo(typeof(TreeNode), typeof(List<TreeNode>), "Children", "Children",
+                    [])
+            ]);
+
+        // Create a validation options with a small max depth
+        var validationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+        {
+            { typeof(TreeNode), nodeType }
+        });
+        validationOptions.MaxDepth = 3; // Set a small max depth to trigger the limit
+
+        // Create a deep tree with circular references
+        var rootNode = new TreeNode { Name = "Root" };
+        var level1 = new TreeNode { Name = "Level1", Parent = rootNode };
+        var level2 = new TreeNode { Name = "Level2", Parent = level1 };
+        var level3 = new TreeNode { Name = "Level3", Parent = level2 };
+        var level4 = new TreeNode { Name = "" }; // Invalid: missing required name
+        var level5 = new TreeNode { Name = "" }; // Invalid but beyond max depth, should not be validated
+
+        rootNode.Children.Add(level1);
+        level1.Children.Add(level2);
+        level2.Children.Add(level3);
+        level3.Children.Add(level4);
+        level4.Children.Add(level5);
+
+        // Add a circular reference
+        level5.Children.Add(rootNode);
+
+        var context = new ValidateContext
+        {
+            ValidationOptions = validationOptions,
+            ValidationErrors = [],
+            ValidationContext = new ValidationContext(rootNode)
+        };
+
+        // Act + Assert
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+        async () => await nodeType.ValidateAsync(rootNode, context, default));
+
+        Assert.NotNull(exception);
+        Assert.Equal("Maximum validation depth of 3 exceeded at 'Children[0].Parent.Children[0]' in 'TreeNode'. This is likely caused by a circular reference in the object graph. Consider increasing the MaxDepth in ValidationOptions if deeper validation is required.", exception.Message);
+        Assert.Equal(0, context.CurrentDepth);
+    }
+
+    [Fact]
+    public async Task Validate_HandlesCustomValidationAttributes()
+    {
+        // Arrange
+        var productType = new TestValidatableTypeInfo(
+            typeof(Product),
+            [
+                CreatePropertyInfo(typeof(Product), typeof(string), "SKU", "SKU", [new RequiredAttribute(), new CustomSkuValidationAttribute()]),
+            ]);
+
+        var product = new Product { SKU = "INVALID-SKU" };
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(Product), productType }
+            }),
+            ValidationContext = new ValidationContext(product)
+        };
+
+        // Act
+        await productType.ValidateAsync(product, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        var error = Assert.Single(context.ValidationErrors);
+        Assert.Equal("SKU", error.Key);
+        Assert.Equal("SKU must start with 'PROD-'.", error.Value.First());
+    }
+
+    [Fact]
+    public async Task Validate_HandlesMultipleErrorsOnSameProperty()
+    {
+        // Arrange
+        var userType = new TestValidatableTypeInfo(
+            typeof(User),
+            [
+                CreatePropertyInfo(typeof(User), typeof(string), "Password", "Password",
+                    [
+                        new RequiredAttribute(),
+                        new MinLengthAttribute(8) { ErrorMessage = "Password must be at least 8 characters." },
+                        new PasswordComplexityAttribute()
+                    ])
+            ]);
+
+        var user = new User { Password = "abc" };  // Too short and not complex enough
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(User), userType }
+            }),
+            ValidationContext = new ValidationContext(user)
+        };
+
+        // Act
+        await userType.ValidateAsync(user, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Single(context.ValidationErrors.Keys); // Only the "Password" key
+        Assert.Equal(2, context.ValidationErrors["Password"].Length); // But with 2 errors
+        Assert.Contains("Password must be at least 8 characters.", context.ValidationErrors["Password"]);
+        Assert.Contains("Password must contain at least one number and one special character.", context.ValidationErrors["Password"]);
+    }
+
+    [Fact]
+    public async Task Validate_HandlesMultiLevelInheritance()
+    {
+        // Arrange
+        var baseType = new TestValidatableTypeInfo(
+            typeof(BaseEntity),
+            [
+                CreatePropertyInfo(typeof(BaseEntity), typeof(Guid), "Id", "Id", [])
+            ]);
+
+        var intermediateType = new TestValidatableTypeInfo(
+            typeof(IntermediateEntity),
+            [
+                CreatePropertyInfo(typeof(IntermediateEntity), typeof(DateTime), "CreatedAt", "CreatedAt", [new PastDateAttribute()])
+            ]);
+
+        var derivedType = new TestValidatableTypeInfo(
+            typeof(DerivedEntity),
+            [
+                CreatePropertyInfo(typeof(DerivedEntity), typeof(string), "Name", "Name", [new RequiredAttribute()])
+            ]);
+
+        var entity = new DerivedEntity
+        {
+            Name = "",  // Invalid: required
+            CreatedAt = DateTime.Now.AddDays(1) // Invalid: future date
+        };
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(BaseEntity), baseType },
+                { typeof(IntermediateEntity), intermediateType },
+                { typeof(DerivedEntity), derivedType }
+            }),
+            ValidationContext = new ValidationContext(entity)
+        };
+
+        // Act
+        await derivedType.ValidateAsync(entity, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Collection(context.ValidationErrors,
+            kvp =>
+            {
+                Assert.Equal("Name", kvp.Key);
+                Assert.Equal("The Name field is required.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("CreatedAt", kvp.Key);
+                Assert.Equal("Date must be in the past.", kvp.Value.First());
+            });
+    }
+
+    [Fact]
+    public async Task Validate_RequiredOnPropertyShortCircuitsOtherValidations()
+    {
+        // Arrange
+        var userType = new TestValidatableTypeInfo(
+            typeof(User),
+            [
+                CreatePropertyInfo(typeof(User), typeof(string), "Password", "Password",
+                    [new RequiredAttribute(), new PasswordComplexityAttribute()])
+            ]);
+
+        var user = new User { Password = null }; // Invalid: required
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(User), userType }
+            }),
+            ValidationContext = new ValidationContext(user) // Invalid: required
+        };
+
+        // Act
+        await userType.ValidateAsync(user, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Single(context.ValidationErrors.Keys);
+        var error = Assert.Single(context.ValidationErrors);
+        Assert.Equal("Password", error.Key);
+        Assert.Equal("The Password field is required.", error.Value.Single());
+    }
+
+    [Fact]
+    public async Task Validate_IValidatableObject_WithZeroAndMultipleMemberNames_BehavesAsExpected()
+    {
+        var globalType = new TestValidatableTypeInfo(
+            typeof(GlobalErrorObject),
+            []); // no properties – nothing sets MemberName
+        var globalErrorInstance = new GlobalErrorObject { Data = -1 };
+
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(GlobalErrorObject), globalType }
+            }),
+            ValidationContext = new ValidationContext(globalErrorInstance)
+        };
+
+        await globalType.ValidateAsync(globalErrorInstance, context, default);
+
+        Assert.NotNull(context.ValidationErrors);
+        var globalError = Assert.Single(context.ValidationErrors);
+        Assert.Equal(string.Empty, globalError.Key);
+        Assert.Equal("Data must be positive.", globalError.Value.Single());
+
+        var multiType = new TestValidatableTypeInfo(
+            typeof(MultiMemberErrorObject),
+            [
+                CreatePropertyInfo(typeof(MultiMemberErrorObject), typeof(string), "FirstName", "FirstName", []),
+                CreatePropertyInfo(typeof(MultiMemberErrorObject), typeof(string), "LastName",  "LastName",  [])
+            ]);
+
+        context.ValidationErrors = [];
+        context.ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+        {
+            { typeof(MultiMemberErrorObject), multiType }
+        });
+
+        var multiErrorInstance = new MultiMemberErrorObject { FirstName = "", LastName = "" };
+        context.ValidationContext = new ValidationContext(multiErrorInstance);
+
+        await multiType.ValidateAsync(multiErrorInstance, context, default);
+
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Collection(context.ValidationErrors,
+            kvp =>
+            {
+                Assert.Equal("FirstName", kvp.Key);
+                Assert.Equal("FirstName and LastName are required.", kvp.Value.First());
+            },
+            kvp =>
+            {
+                Assert.Equal("LastName", kvp.Key);
+                Assert.Equal("FirstName and LastName are required.", kvp.Value.First());
+            });
+    }
+
+    // The expected order of validation is:
+    // 1. Attributes on properties
+    // 2. Attributes on the type
+    // 3. IValidatableObject implementation
+    // If any of these steps report an error, the later steps are skipped.
+    [Fact]
+    public async Task Validate_IValidatableObject_WithPropertyErrors_ShortCircuitsProperly()
+    {
+        var testTypeInfo = new TestValidatableTypeInfo(
+            typeof(PropertyAndTypeLevelErrorObject),
+            [
+                CreatePropertyInfo(typeof(PropertyAndTypeLevelErrorObject), typeof(int), "Value", "Value",
+                    [new RangeAttribute(0, int.MaxValue) {  ErrorMessage = "Property attribute error" }])
+            ],
+            [
+                new CustomValidationAttribute()
+            ]);
+
+        // First case: 
+        var testTypeInstance = new PropertyAndTypeLevelErrorObject { Value = 15 };
+
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(PropertyAndTypeLevelErrorObject), testTypeInfo }
+            }),
+            ValidationContext = new ValidationContext(testTypeInstance)
+        };
+
+        await testTypeInfo.ValidateAsync(testTypeInstance, context, default);
+
+        Assert.NotNull(context.ValidationErrors);
+        var interfaceError = Assert.Single(context.ValidationErrors);
+        Assert.Equal(string.Empty, interfaceError.Key);
+        Assert.Equal("IValidatableObject error", interfaceError.Value.Single());
+
+        // Second case: 
+        testTypeInstance.Value = 5;
+        context.ValidationErrors = [];
+        context.ValidationContext = new ValidationContext(testTypeInstance);
+
+        await testTypeInfo.ValidateAsync(testTypeInstance, context, default);
+
+        Assert.NotNull(context.ValidationErrors);
+        var classAttributeError = Assert.Single(context.ValidationErrors);
+        Assert.Equal(string.Empty, classAttributeError.Key);
+        Assert.Equal("Class attribute error", classAttributeError.Value.Single());
+
+        // Third case: 
+        testTypeInstance.Value = -5;
+        context.ValidationErrors = [];
+        context.ValidationContext = new ValidationContext(testTypeInstance);
+
+        await testTypeInfo.ValidateAsync(testTypeInstance, context, default);
+
+        Assert.NotNull(context.ValidationErrors);
+        var propertyAttributeError = Assert.Single(context.ValidationErrors);
+        Assert.Equal("Value", propertyAttributeError.Key);
+        Assert.Equal("Property attribute error", propertyAttributeError.Value.Single());
+    }
+
+    // Returns no member names to validate https://github.com/dotnet/aspnetcore/issues/61739
+    private class GlobalErrorObject : IValidatableObject
+    {
+        public int Data { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (Data <= 0)
+            {
+                yield return new ValidationResult("Data must be positive.");
+            }
+        }
+    }
+
+    // Returns multiple member names to validate https://github.com/dotnet/aspnetcore/issues/61739
+    private class MultiMemberErrorObject : IValidatableObject
+    {
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (string.IsNullOrEmpty(FirstName) || string.IsNullOrEmpty(LastName))
+            {
+                // MULTIPLE member names
+                yield return new ValidationResult(
+                    "FirstName and LastName are required.",
+                    [nameof(FirstName), nameof(LastName)]);
+            }
+        }
+    }
+
+    [CustomValidation]
+    private class PropertyAndTypeLevelErrorObject : IValidatableObject
+    {
+        [Range(0, int.MaxValue, ErrorMessage = "Property attribute error")]
+        public int Value { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (Value < 20)
+            {
+                yield return new ValidationResult($"IValidatableObject error");
+            }
+        }
+    }
+
+    private class CustomValidationAttribute : ValidationAttribute
+    {
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+        {
+            if (value is PropertyAndTypeLevelErrorObject instance)
+            {
+                if (instance.Value < 10)
+                {
+                    return new ValidationResult($"Class attribute error");
+                }
+            }
+            return ValidationResult.Success;
+        }
+    }
+
+    private ValidatablePropertyInfo CreatePropertyInfo(
+        Type containingType,
+        Type propertyType,
+        string name,
+        string displayName,
+        ValidationAttribute[] validationAttributes)
+    {
+        return new TestValidatablePropertyInfo(
+            containingType,
+            propertyType,
+            name,
+            displayName,
+            validationAttributes);
+    }
+
+    // Test model classes
+    private class Person
+    {
+        public string? Name { get; set; }
+        public int Age { get; set; }
+        public Address? Address { get; set; }
+    }
+
+    private class Address
+    {
+        public string? Street { get; set; }
+        public string? City { get; set; }
+    }
+
+    private class Employee : IValidatableObject
+    {
+        public string? Name { get; set; }
+        public string? Department { get; set; }
+        public decimal Salary { get; set; }
+
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            if (Salary < 0)
+            {
+                yield return new ValidationResult("Salary must be a positive value.", ["Salary"]);
+            }
+        }
+    }
+
+    private class Vehicle
+    {
+        public string? Make { get; set; }
+        public string? Model { get; set; }
+    }
+
+    private class Car : Vehicle
+    {
+        public int Doors { get; set; }
+    }
+
+    private class Order
+    {
+        public string? OrderNumber { get; set; }
+        public List<OrderItem> Items { get; set; } = [];
+    }
+
+    private class OrderItem
+    {
+        public string? ProductName { get; set; }
+        public int Quantity { get; set; }
+    }
+
+    private class TreeNode
+    {
+        public string Name { get; set; } = string.Empty;
+        public TreeNode? Parent { get; set; }
+        public List<TreeNode> Children { get; set; } = [];
+    }
+
+    private class Product
+    {
+        public string SKU { get; set; } = string.Empty;
+    }
+
+    private class User
+    {
+        public string? Password { get; set; } = string.Empty;
+    }
+
+    private class BaseEntity
+    {
+        public Guid Id { get; set; } = Guid.NewGuid();
+    }
+
+    private class IntermediateEntity : BaseEntity
+    {
+        public DateTime CreatedAt { get; set; }
+    }
+
+    private class DerivedEntity : IntermediateEntity
+    {
+        public string Name { get; set; } = string.Empty;
+    }
+
+    private class PastDateAttribute : ValidationAttribute
+    {
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+        {
+            if (value is DateTime date && date > DateTime.Now)
+            {
+                return new ValidationResult("Date must be in the past.");
+            }
+
+            return ValidationResult.Success;
+        }
+    }
+
+    private class CustomSkuValidationAttribute : ValidationAttribute
+    {
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+        {
+            if (value is string sku && !sku.StartsWith("PROD-", StringComparison.Ordinal))
+            {
+                return new ValidationResult("SKU must start with 'PROD-'.");
+            }
+
+            return ValidationResult.Success;
+        }
+    }
+
+    private class PasswordComplexityAttribute : ValidationAttribute
+    {
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+        {
+            if (value is string password)
+            {
+                var hasDigit = password.Any(c => char.IsDigit(c));
+                var hasSpecial = password.Any(c => !char.IsLetterOrDigit(c));
+
+                if (!hasDigit || !hasSpecial)
+                {
+                    return new ValidationResult("Password must contain at least one number and one special character.");
+                }
+            }
+
+            return ValidationResult.Success;
+        }
+    }
+
+    // Test implementations
+    private class TestValidatablePropertyInfo : ValidatablePropertyInfo
+    {
+        private readonly ValidationAttribute[] _validationAttributes;
+
+        public TestValidatablePropertyInfo(
+            Type containingType,
+            Type propertyType,
+            string name,
+            string displayName,
+            ValidationAttribute[] validationAttributes)
+            : base(containingType, propertyType, name, displayName)
+        {
+            _validationAttributes = validationAttributes;
+        }
+
+        protected override ValidationAttribute[] GetValidationAttributes() => _validationAttributes;
+    }
+
+    private class TestValidationOptions : ValidationOptions
+    {
+        public TestValidationOptions(Dictionary<Type, ValidatableTypeInfo> typeInfoMappings)
+        {
+            // Create a custom resolver that uses the dictionary
+            var resolver = new DictionaryBasedResolver(typeInfoMappings);
+
+            // Add it to the resolvers collection
+            Resolvers.Add(resolver);
+        }
+
+        // Private resolver implementation that uses a dictionary lookup
+        private class DictionaryBasedResolver : IValidatableInfoResolver
+        {
+            private readonly Dictionary<Type, ValidatableTypeInfo> _typeInfoMappings;
+
+            public DictionaryBasedResolver(Dictionary<Type, ValidatableTypeInfo> typeInfoMappings)
+            {
+                _typeInfoMappings = typeInfoMappings;
+            }
+
+            public bool TryGetValidatableTypeInfo(Type type, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+            {
+                if (_typeInfoMappings.TryGetValue(type, out var info))
+                {
+                    validatableInfo = info;
+                    return true;
+                }
+                validatableInfo = null;
+                return false;
+            }
+
+            public bool TryGetValidatableParameterInfo(ParameterInfo parameterInfo, [NotNullWhen(true)] out IValidatableInfo? validatableInfo)
+            {
+                validatableInfo = null;
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Validation/test/Microsoft.Extensions.Validation.TrimmingTests/Microsoft.Extensions.Validation.TrimmingTests.proj b/src/Validation/test/Microsoft.Extensions.Validation.TrimmingTests/Microsoft.Extensions.Validation.TrimmingTests.proj
new file mode 100644
index 000000000000..8ab4ee50cbb1
--- /dev/null
+++ b/src/Validation/test/Microsoft.Extensions.Validation.TrimmingTests/Microsoft.Extensions.Validation.TrimmingTests.proj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <TestConsoleAppSourceFiles Include="../Microsoft.Extensions.Validation.NativeAotTests/BasicMinimalApiWithValidation.cs">
+      <EnabledProperties>EnableRequestDelegateGenerator</EnabledProperties>
+    </TestConsoleAppSourceFiles>
+  </ItemGroup>
+
+</Project>
diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp
index ecc4e18ad7a0..9aeb12b9bdb0 160000
--- a/src/submodules/MessagePack-CSharp
+++ b/src/submodules/MessagePack-CSharp
@@ -1 +1 @@
-Subproject commit ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d
+Subproject commit 9aeb12b9bdb024512ffe2e4bddfa2785dca6e39e
diff --git a/src/submodules/googletest b/src/submodules/googletest
index 0953a17a4281..373af2e3df71 160000
--- a/src/submodules/googletest
+++ b/src/submodules/googletest
@@ -1 +1 @@
-Subproject commit 0953a17a4281fc26831da647ad3fcd5e21e6473b
+Subproject commit 373af2e3df71599b87a40ce0e37164523849166b
diff --git a/startvscode.cmd b/startvscode.cmd
index e33ba82e93ea..b70e43831bd4 100644
--- a/startvscode.cmd
+++ b/startvscode.cmd
@@ -14,7 +14,7 @@ SET DOTNET_MULTILEVEL_LOOKUP=0
 SET PATH=%DOTNET_ROOT%;%PATH%
 
 :: Sets TFW for Visual Studio Code usage
-SET TARGET=net9.0
+SET TARGET=net10.0
 
 SET folder=%~1
 
diff --git a/startvscode.sh b/startvscode.sh
index 57efea9d128c..65ab4fc43599 100755
--- a/startvscode.sh
+++ b/startvscode.sh
@@ -13,7 +13,7 @@ export DOTNET_MULTILEVEL_LOOKUP=0
 export PATH="$DOTNET_ROOT:$PATH"
 
 # Sets TFW for Visual Studio Code usage
-export TARGET=net9.0
+export TARGET=net10.0
 
 if [ ! -f "$DOTNET_ROOT/dotnet" ]; then
     echo ".NET Core has not yet been installed. Run `./restore.sh` to install tools."